diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 257d98e1cb..034fa9dccc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -133,7 +133,7 @@ jobs:
           (cd PublishWinForms ; echo 7z a -mx=9 ../dist/rdmp-${{ steps.version.outputs.rdmpversion }}-client.zip . | cmd)
 
       - name: Install Perl dependencies
-        uses: shogo82148/actions-setup-perl@v1.23.0
+        uses: shogo82148/actions-setup-perl@v1.23.1
         with:
           install-modules-with: cpanm
           install-modules: Archive::Zip Archive::Tar
diff --git a/.nuget/packages.config b/.nuget/packages.config
index 4aed222aba..8588e1c7c2 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="NUnit.Console" version="3.9.0" />
   <package id="NUnit.ConsoleRunner" version="3.9.0" />
diff --git a/Application/ResearchDataManagementPlatform/Menus/MenuItems/DataExportMenu.cs b/Application/ResearchDataManagementPlatform/Menus/MenuItems/DataExportMenu.cs
index 3a0b087346..c6017ef0e9 100644
--- a/Application/ResearchDataManagementPlatform/Menus/MenuItems/DataExportMenu.cs
+++ b/Application/ResearchDataManagementPlatform/Menus/MenuItems/DataExportMenu.cs
@@ -14,9 +14,8 @@ namespace ResearchDataManagementPlatform.Menus.MenuItems;
 
 internal class DataExportMenu : RDMPToolStripMenuItem
 {
-    public DataExportMenu(IActivateItems activator):base(activator,"Data Export Options")
+    public DataExportMenu(IActivateItems activator) : base(activator, "Data Export Options")
     {
-
         Enabled = _activator.RepositoryLocator.DataExportRepository != null;
 
         DropDownItems.Add(new ToolStripMenuItem("Configure Disclaimer", null, ConfigureDisclaimer));
diff --git a/Application/ResearchDataManagementPlatform/Menus/MenuItems/LaunchTutorialMenuItem.cs b/Application/ResearchDataManagementPlatform/Menus/MenuItems/LaunchTutorialMenuItem.cs
index 0125482f74..7740f6ef77 100644
--- a/Application/ResearchDataManagementPlatform/Menus/MenuItems/LaunchTutorialMenuItem.cs
+++ b/Application/ResearchDataManagementPlatform/Menus/MenuItems/LaunchTutorialMenuItem.cs
@@ -21,9 +21,10 @@ public class LaunchTutorialMenuItem : ToolStripMenuItem
     private readonly Tutorial _tutorial;
     private readonly TutorialTracker _tracker;
 
-    public LaunchTutorialMenuItem(ToolStripMenuItem parent,IActivateItems activator, Tutorial tutorial, TutorialTracker tracker)
+    public LaunchTutorialMenuItem(ToolStripMenuItem parent, IActivateItems activator, Tutorial tutorial,
+        TutorialTracker tracker)
     {
-        parent.DropDownOpening += parent_DropDownOpening; 
+        parent.DropDownOpening += parent_DropDownOpening;
         _activator = activator;
         _tutorial = tutorial;
         _tracker = tracker;
diff --git a/Application/ResearchDataManagementPlatform/Menus/MenuItems/ResetTutorialsMenuItem.cs b/Application/ResearchDataManagementPlatform/Menus/MenuItems/ResetTutorialsMenuItem.cs
index 357a89abb9..164e6f502b 100644
--- a/Application/ResearchDataManagementPlatform/Menus/MenuItems/ResetTutorialsMenuItem.cs
+++ b/Application/ResearchDataManagementPlatform/Menus/MenuItems/ResetTutorialsMenuItem.cs
@@ -36,6 +36,4 @@ private void parent_DropDownOpening(object sender, EventArgs e)
     {
         Enabled = _tracker.IsClearable();
     }
-
-
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.cs b/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.cs
index b3a107229f..074556ac2b 100644
--- a/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.cs
+++ b/Application/ResearchDataManagementPlatform/Menus/RDMPTopMenuStripUI.cs
@@ -85,10 +85,7 @@ private void BuildSwitchInstanceMenuItems()
         var args = RDMPBootStrapper<RDMPMainForm>.ApplicationArguments;
 
         // somehow app was launched without populating the load args
-        if (args == null)
-        {
-            return;
-        }
+        if (args == null) return;
 
         var origYamlFile = args.ConnectionStringsFileLoaded;
 
@@ -107,13 +104,11 @@ private void BuildSwitchInstanceMenuItems()
 
         // also add yaml files from wherever they got their original yaml file
         if (origYamlFile?.FileLoaded != null && !exeDir.FullName.Equals(origYamlFile.FileLoaded.Directory.FullName))
-        {
             AddMenuItemsForSwitchingToInstancesInYamlFilesOf(origYamlFile, origYamlFile.FileLoaded.Directory);
-        }
-
     }
 
-    private void AddMenuItemsForSwitchingToInstancesInYamlFilesOf(ConnectionStringsYamlFile origYamlFile, DirectoryInfo dir)
+    private void AddMenuItemsForSwitchingToInstancesInYamlFilesOf(ConnectionStringsYamlFile origYamlFile,
+        DirectoryInfo dir)
     {
         foreach (var yaml in dir.GetFiles("*.yaml"))
         {
@@ -121,15 +116,18 @@ private void AddMenuItemsForSwitchingToInstancesInYamlFilesOf(ConnectionStringsY
             if (!ConnectionStringsYamlFile.TryLoadFrom(yaml, out var connectionStrings))
                 continue;
 
-            var isSameAsCurrent = origYamlFile?.FileLoaded != null && yaml.FullName.Equals(origYamlFile.FileLoaded.FullName);
+            var isSameAsCurrent = origYamlFile?.FileLoaded != null &&
+                                  yaml.FullName.Equals(origYamlFile.FileLoaded.FullName);
 
-            var launchNew = new ToolStripMenuItem(connectionStrings.Name ?? yaml.Name, null, (s, e) => { LaunchNew(connectionStrings); })
+            var launchNew = new ToolStripMenuItem(connectionStrings.Name ?? yaml.Name, null,
+                (s, e) => { LaunchNew(connectionStrings); })
             {
                 Checked = isSameAsCurrent,
                 ToolTipText = connectionStrings.Description ?? yaml.FullName
             };
 
-            var switchTo = new ToolStripMenuItem(connectionStrings.Name ?? yaml.Name, null, (s, e) => { SwitchTo(connectionStrings); })
+            var switchTo = new ToolStripMenuItem(connectionStrings.Name ?? yaml.Name, null,
+                (s, e) => { SwitchTo(connectionStrings); })
             {
                 Enabled = !isSameAsCurrent,
                 Checked = isSameAsCurrent,
@@ -138,7 +136,6 @@ private void AddMenuItemsForSwitchingToInstancesInYamlFilesOf(ConnectionStringsY
 
             launchAnotherInstanceToolStripMenuItem.DropDownItems.Add(launchNew);
             switchToInstanceToolStripMenuItem.DropDownItems.Add(switchTo);
-
         }
     }
 
@@ -151,15 +148,13 @@ private static void SwitchTo(ConnectionStringsYamlFile yaml)
 
     private static void LaunchNew(ConnectionStringsYamlFile yaml)
     {
-        var exeName = Path.Combine(UsefulStuff.GetExecutableDirectory().FullName, Process.GetCurrentProcess().ProcessName);
-        if(yaml == null)
-        {
+        var exeName = Path.Combine(UsefulStuff.GetExecutableDirectory().FullName,
+            Process.GetCurrentProcess().ProcessName);
+        if (yaml == null)
             Process.Start(exeName);
-        }
         else
-        {
-            Process.Start(exeName, $"--{nameof(RDMPCommandLineOptions.ConnectionStringsFile)} \"{yaml.FileLoaded.FullName}\"");
-        }
+            Process.Start(exeName,
+                $"--{nameof(RDMPCommandLineOptions.ConnectionStringsFile)} \"{yaml.FileLoaded.FullName}\"");
     }
 
     private void configureExternalServersToolStripMenuItem_Click(object sender, EventArgs e)
@@ -176,9 +171,11 @@ private void setTicketingSystemToolStripMenuItem_Click(object sender, EventArgs
 
     private void governanceReportToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        var generator = new GovernanceReport(new DatasetTimespanCalculator(), Activator.RepositoryLocator.CatalogueRepository);
+        var generator = new GovernanceReport(new DatasetTimespanCalculator(),
+            Activator.RepositoryLocator.CatalogueRepository);
         generator.GenerateReport();
     }
+
     private void logViewerToolStripMenuItem_Click(object sender, EventArgs e)
     {
         var cmd = new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.DataLoadTask));
@@ -219,7 +216,6 @@ private void showPerformanceCounterToolStripMenuItem_Click(object sender, EventA
 
     private void openExeDirectoryToolStripMenuItem_Click(object sender, EventArgs e)
     {
-            
         try
         {
             UsefulStuff.ShowPathInWindowsExplorer(UsefulStuff.GetExecutableDirectory());
@@ -254,7 +250,7 @@ private void generateClassTableSummaryToolStripMenuItem_Click(object sender, Eve
 
     private void showHelpToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        if(_windowManager.Navigation.Current is RDMPSingleControlTab t)
+        if (_windowManager.Navigation.Current is RDMPSingleControlTab t)
             t.ShowHelp(Activator);
     }
 
@@ -264,7 +260,7 @@ public void SetWindowManager(WindowManager windowManager)
 
         _windowManager = windowManager;
         _atomicCommandUIFactory = new AtomicCommandUIFactory(Activator);
-            
+
 
         //top menu strip setup / adjustment
         LocationsMenu.DropDownItems.Add(new DataExportMenu(Activator));
@@ -274,14 +270,15 @@ public void SetWindowManager(WindowManager windowManager)
             Name = "saveToolStripMenuItem",
             Size = new System.Drawing.Size(214, 22)
         };
-        fileToolStripMenuItem.DropDownItems.Insert(3,_saveToolStripMenuItem);
+        fileToolStripMenuItem.DropDownItems.Insert(3, _saveToolStripMenuItem);
 
         _windowManager.TabChanged += WindowFactory_TabChanged;
-        _windowManager.Navigation.Changed += (s,e)=>UpdateForwardBackEnabled();
+        _windowManager.Navigation.Changed += (s, e) => UpdateForwardBackEnabled();
 
         var tracker = new TutorialTracker(Activator);
         foreach (var t in tracker.TutorialsAvailable)
-            tutorialsToolStripMenuItem.DropDownItems.Add(new LaunchTutorialMenuItem(tutorialsToolStripMenuItem, Activator, t, tracker));
+            tutorialsToolStripMenuItem.DropDownItems.Add(new LaunchTutorialMenuItem(tutorialsToolStripMenuItem,
+                Activator, t, tracker));
 
         tutorialsToolStripMenuItem.DropDownItems.Add(new ToolStripSeparator());
 
@@ -294,7 +291,8 @@ public void SetWindowManager(WindowManager windowManager)
 
         // Location menu
         instancesToolStripMenuItem.DropDownItems.Add(_atomicCommandUIFactory.CreateMenuItem(
-            new ExecuteCommandChoosePlatformDatabase(Activator.RepositoryLocator) { OverrideCommandName = "Change Default Instance" }));
+            new ExecuteCommandChoosePlatformDatabase(Activator.RepositoryLocator)
+                { OverrideCommandName = "Change Default Instance" }));
 
         Activator.Theme.ApplyTo(menuStrip1);
 
@@ -307,18 +305,21 @@ public void SetWindowManager(WindowManager windowManager)
             Activator.GlobalErrorCheckNotifier.OnCheckPerformed(
                 new CheckEventArgs("Failed to BuildSwitchInstanceMenuItems", CheckResult.Fail, ex));
         }
-            
-        launchAnotherInstanceToolStripMenuItem.ToolTipText = "Start another copy of the RDMP process targetting the same (or another) RDMP platform database";
 
-        if(switchToInstanceToolStripMenuItem.DropDownItems.Count > 1)
+        launchAnotherInstanceToolStripMenuItem.ToolTipText =
+            "Start another copy of the RDMP process targetting the same (or another) RDMP platform database";
+
+        if (switchToInstanceToolStripMenuItem.DropDownItems.Count > 1)
         {
             switchToInstanceToolStripMenuItem.Enabled = true;
-            switchToInstanceToolStripMenuItem.ToolTipText = "Close the application and start another copy of the RDMP process targetting another RDMP platform database";
+            switchToInstanceToolStripMenuItem.ToolTipText =
+                "Close the application and start another copy of the RDMP process targetting another RDMP platform database";
         }
         else
         {
             switchToInstanceToolStripMenuItem.Enabled = false;
-            switchToInstanceToolStripMenuItem.ToolTipText = "There are no other RDMP platform databases configured, create a .yaml file with connection strings to enable this feature";
+            switchToInstanceToolStripMenuItem.ToolTipText =
+                "There are no other RDMP platform databases configured, create a .yaml file with connection strings to enable this feature";
         }
     }
 
@@ -330,15 +331,15 @@ private IAtomicCommand[] GetNewCommands()
         {
             new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator),
             new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator),
-            new ExecuteCommandImportTableInfo(Activator,null,false),
+            new ExecuteCommandImportTableInfo(Activator, null, false),
             new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator),
             new ExecuteCommandCreateNewLoadMetadata(Activator),
             new ExecuteCommandCreateNewStandardRegex(Activator),
             new ExecuteCommandCreateNewCohortDatabaseUsingWizard(Activator),
-            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator,null),
-            new ExecuteCommandCreateNewCohortFromFile(Activator,null),
+            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null),
+            new ExecuteCommandCreateNewCohortFromFile(Activator, null),
             new ExecuteCommandCreateNewCohortFromCatalogue(Activator),
-            new ExecuteCommandCreateNewCohortFromTable(Activator,null),
+            new ExecuteCommandCreateNewCohortFromTable(Activator, null),
             new ExecuteCommandCreateNewExtractableDataSetPackage(Activator),
             new ExecuteCommandCreateNewDataExtractionProject(Activator),
             new ExecuteCommandRelease(Activator) { OverrideCommandName = "New Release..." },
@@ -360,20 +361,21 @@ private void WindowFactory_TabChanged(object sender, IDockContent newTab)
         var saveable = singleObjectControlTab.Control as ISaveableUI;
 
         //if user wants to emphasise on tab change and there's an object we can emphasise associated with the control
-        if (singleObjectControlTab.Control is IRDMPSingleDatabaseObjectControl singleObject && UserSettings.EmphasiseOnTabChanged && singleObject.DatabaseObject != null)
+        if (singleObjectControlTab.Control is IRDMPSingleDatabaseObjectControl singleObject &&
+            UserSettings.EmphasiseOnTabChanged && singleObject.DatabaseObject != null)
         {
-            var isCicChild = Activator.CoreChildProvider.GetDescendancyListIfAnyFor(singleObject.DatabaseObject)?.Parents?.Any(p=>p is CohortIdentificationConfiguration);
+            var isCicChild = Activator.CoreChildProvider.GetDescendancyListIfAnyFor(singleObject.DatabaseObject)
+                ?.Parents?.Any(p => p is CohortIdentificationConfiguration);
 
             //don't emphasise things that live under cics because it doesn't result in a collection being opened but instead opens the cic Tab (which could result in you being unable to get to your original tab!)
-            if(isCicChild == false)
+            if (isCicChild == false)
             {
                 _windowManager.Navigation.Suspend();
                 Activator.RequestItemEmphasis(this, new EmphasiseRequest(singleObject.DatabaseObject));
                 _windowManager.Navigation.Resume();
             }
-
         }
-                
+
 
         _saveToolStripMenuItem.Saveable = saveable;
     }
@@ -433,7 +435,6 @@ private void findToolStripMenuItem_Click(object sender, EventArgs e)
             InitialSearchTextGuid = new Guid("00a0733b-848f-4bf3-bcde-7028fe159050"),
             IsFind = true,
             TaskDescription = "Enter the name of an object or part of the name or the dataset/project it is in."
-
         }, o => Activator.RequestItemEmphasis(this, new EmphasiseRequest(o)));
     }
 
@@ -444,7 +445,7 @@ private void closeToolStripMenuItem_Click(object sender, EventArgs e)
 
     private void findAndReplaceToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        Activator.ShowWindow(new FindAndReplaceUI(Activator),true);
+        Activator.ShowWindow(new FindAndReplaceUI(Activator), true);
     }
 
     private void navigateBackwardToolStripMenuItem_Click(object sender, EventArgs e)
@@ -466,7 +467,7 @@ private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
         var url = "https://raw.githubusercontent.com/HicServices/RDMP/main/rdmp-client.xml";
 
         // Give user a chance to change the URL that is updating from
-        if(!Activator.TypeText("Update Location","Url:",int.MaxValue,url,out url,false))
+        if (!Activator.TypeText("Update Location", "Url:", int.MaxValue, url, out url, false))
             return;
 
         try
@@ -483,7 +484,8 @@ private void checkForUpdatesToolStripMenuItem_Click(object sender, EventArgs e)
     private void ListAllTypesToolStripMenuItem_Click(object sender, EventArgs e)
     {
         var file = new FileInfo(Path.GetTempFileName());
-        File.WriteAllLines(file.FullName,Activator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes().Select(t=>t.FullName));
+        File.WriteAllLines(file.FullName,
+            Activator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes().Select(t => t.FullName));
         UsefulStuff.ShowPathInWindowsExplorer(file);
     }
 
@@ -493,7 +495,7 @@ private void NewToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WindowTitle = "Create New",
             TaskDescription = "What do you want to create?"
-        },Activator,GetNewCommands(),false);
+        }, Activator, GetNewCommands(), false);
 
         if (dlg.ShowDialog() == DialogResult.OK)
         {
@@ -509,7 +511,7 @@ private void quitToolStripMenuItem_Click(object sender, EventArgs e)
 
     private void newSessionToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        var cmd = new ExecuteCommandStartSession(Activator,null,null);
+        var cmd = new ExecuteCommandStartSession(Activator, null, null);
         cmd.Execute();
     }
 
@@ -523,7 +525,7 @@ private void queryDataExport_Click(object sender, EventArgs e)
             Activator.Show("Cannot Query Database", cmd.ReasonCommandImpossible);
             return;
         }
-                
+
         cmd.Execute();
     }
 
@@ -533,15 +535,17 @@ private void queryCatalogue_Click(object sender, EventArgs e)
 
         if (cmd.IsImpossible)
         {
-            Activator.Show("Cannot Query Database",cmd.ReasonCommandImpossible);
+            Activator.Show("Cannot Query Database", cmd.ReasonCommandImpossible);
             return;
         }
+
         cmd.Execute();
     }
 
     private void restartApplicationToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        if (UserSettings.ConfirmApplicationExiting && Activator.Confirm("Restart Application?", "Confirm Restart") == false)
+        if (UserSettings.ConfirmApplicationExiting &&
+            Activator.Confirm("Restart Application?", "Confirm Restart") == false)
             return;
 
 
@@ -566,10 +570,7 @@ private void launchNewInstanceWithUserSettings_Click(object sender, EventArgs e)
 
     private void terminateProcessToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        if(Activator.YesNo("Terminate the process without saving?","Terminate"))
-        {
-            Process.GetCurrentProcess().Kill();
-        }   
+        if (Activator.YesNo("Terminate the process without saving?", "Terminate")) Process.GetCurrentProcess().Kill();
     }
 
     private void findMultipleToolStripMenuItem_Click(object sender, EventArgs e)
diff --git a/Application/ResearchDataManagementPlatform/NLog.template.config b/Application/ResearchDataManagementPlatform/NLog.template.config
index 8e584958bc..348ad21979 100644
--- a/Application/ResearchDataManagementPlatform/NLog.template.config
+++ b/Application/ResearchDataManagementPlatform/NLog.template.config
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
@@ -9,13 +10,14 @@
   <targets>
     <target xsi:type="ColoredConsole" name="c"
             layout="${longdate} ${uppercase:${level}} ${message} ${all-event-properties}. ${exception:format=toString}" />
-  <target xsi:type="File" name="log4j" fileName="${basedir}/logs/${shortdate}-log4j.log" layout="${log4jxmlevent}" />
-  <target xsi:type="File" name="simple" fileName="${basedir}/logs/${shortdate}-simple.log" layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=toString}" />
-  <target xsi:type="Network" name="u" address="udp4://localhost:878" layout="${log4jxmlevent}" />
+    <target xsi:type="File" name="log4j" fileName="${basedir}/logs/${shortdate}-log4j.log" layout="${log4jxmlevent}" />
+    <target xsi:type="File" name="simple" fileName="${basedir}/logs/${shortdate}-simple.log"
+            layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=toString}" />
+    <target xsi:type="Network" name="u" address="udp4://localhost:878" layout="${log4jxmlevent}" />
   </targets>
   <rules>
-	  <!--<logger name="*" minlevel="Trace" writeTo="c" />
+    <!--<logger name="*" minlevel="Trace" writeTo="c" />
     <logger name="*" minlevel="Trace" writeTo="log4j" />-->
     <logger name="*" minlevel="Trace" writeTo="simple" />
   </rules>
-</nlog>
+</nlog>
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/Program.cs b/Application/ResearchDataManagementPlatform/Program.cs
index 7f0fcf28a3..fa83c3b172 100644
--- a/Application/ResearchDataManagementPlatform/Program.cs
+++ b/Application/ResearchDataManagementPlatform/Program.cs
@@ -23,31 +23,31 @@ internal static class Program
     [DllImport("kernel32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     private static extern bool AttachConsole([MarshalAs(UnmanagedType.U4)] int dwProcessId);
-  
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
+
+    /// <summary>
+    /// The main entry point for the application.
+    /// </summary>
+    [STAThread]
     private static void Main(string[] args)
-        {
-            // if user has the command line built and runnable from the windows
-            // client then don't load the dlls (or we end up with 2 copies!).
-            SafeDirectoryCatalog.IgnoreDll = f => Path.GetFileName(f.DirectoryName)?.Equals("cli")==true;
+    {
+        // if user has the command line built and runnable from the windows
+        // client then don't load the dlls (or we end up with 2 copies!).
+        SafeDirectoryCatalog.IgnoreDll = f => Path.GetFileName(f.DirectoryName)?.Equals("cli") == true;
 
-            try
-            {
-                AttachConsole(-1);
-            }
-            catch (Exception)
-            {
-                Console.WriteLine("Couldn't redirect console. Never mind");
-            }
+        try
+        {
+            AttachConsole(-1);
+        }
+        catch (Exception)
+        {
+            Console.WriteLine("Couldn't redirect console. Never mind");
+        }
 
-            Startup.PreStartup();
+        Startup.PreStartup();
 
-            UsefulStuff.GetParser()
-                .ParseArguments<ResearchDataManagementPlatformOptions>(args)
-                .MapResult(RunApp, err => -1);
+        UsefulStuff.GetParser()
+            .ParseArguments<ResearchDataManagementPlatformOptions>(args)
+            .MapResult(RunApp, err => -1);
     }
 
     private static object RunApp(ResearchDataManagementPlatformOptions arg)
@@ -56,7 +56,7 @@ private static object RunApp(ResearchDataManagementPlatformOptions arg)
         {
             arg.PopulateConnectionStringsFromYamlIfMissing(new ThrowImmediatelyCheckNotifier());
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             ExceptionViewer.Show(ex);
             return -500;
diff --git a/Application/ResearchDataManagementPlatform/Properties/AssemblyInfo.cs b/Application/ResearchDataManagementPlatform/Properties/AssemblyInfo.cs
index edb8d4291b..d3033bf4ac 100644
--- a/Application/ResearchDataManagementPlatform/Properties/AssemblyInfo.cs
+++ b/Application/ResearchDataManagementPlatform/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("cac9817c-fc66-48e8-9333-c740af6ab5b9")]
+[assembly: Guid("cac9817c-fc66-48e8-9333-c740af6ab5b9")]
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/RDMP.nuspec b/Application/ResearchDataManagementPlatform/RDMP.nuspec
index 2c0a9ed8eb..895bcc7243 100644
--- a/Application/ResearchDataManagementPlatform/RDMP.nuspec
+++ b/Application/ResearchDataManagementPlatform/RDMP.nuspec
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-    <metadata>
-        <id>ResearchDataManagementPlatform</id>
-        <version>$version$</version>
-		<authors>Health Informatics Service, University of Dundee</authors>
-		<description>Research Data Management Platform</description>
-    </metadata>
+  <metadata>
+    <id>ResearchDataManagementPlatform</id>
+    <version>$version$</version>
+    <authors>Health Informatics Service, University of Dundee</authors>
+    <description>Research Data Management Platform</description>
+  </metadata>
   <files>
     <file src="bin\$configuration$\net6.0-windows\win-x64\*" target="lib\net6.0-windows7.0" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\Curation\**\*" target="lib\net6.0-windows7.0" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\Icon\**\*" target="lib\net6.0-windows7.0" />
-	<file src="bin\$configuration$\net6.0-windows\win-x64\WindowManagement\**\*" target="lib\net6.0-windows7.0" />
+    <file src="bin\$configuration$\net6.0-windows\win-x64\Curation\**\*" target="lib\net6.0-windows7.0" />
+    <file src="bin\$configuration$\net6.0-windows\win-x64\Icon\**\*" target="lib\net6.0-windows7.0" />
+    <file src="bin\$configuration$\net6.0-windows\win-x64\WindowManagement\**\*" target="lib\net6.0-windows7.0" />
   </files>
 </package>
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/RDMPMainForm.cs b/Application/ResearchDataManagementPlatform/RDMPMainForm.cs
index 7ac447d098..a3ebd55b00 100644
--- a/Application/ResearchDataManagementPlatform/RDMPMainForm.cs
+++ b/Application/ResearchDataManagementPlatform/RDMPMainForm.cs
@@ -60,10 +60,12 @@ public RDMPMainForm()
             if (!string.IsNullOrWhiteSpace(t))
             {
                 var type = Type.GetType(t);
-                _theme = type == null ? new MyVS2015BlueTheme() : (ITheme) System.Activator.CreateInstance(type);
+                _theme = type == null ? new MyVS2015BlueTheme() : (ITheme)System.Activator.CreateInstance(type);
             }
             else
+            {
                 _theme = new MyVS2015BlueTheme();
+            }
         }
         catch (Exception)
         {
@@ -103,52 +105,51 @@ private void RDMPMainForm_Load(object sender, EventArgs e)
         _globalErrorCheckNotifier = exceptionCounter;
         _rdmpTopMenuStrip1.InjectButton(exceptionCounter);
 
-        _windowManager = new WindowManager(_theme,this,_refreshBus, dockPanel1, RepositoryLocator, exceptionCounter);
+        _windowManager = new WindowManager(_theme, this, _refreshBus, dockPanel1, RepositoryLocator, exceptionCounter);
         SetItemActivator(_windowManager.ActivateItems);
 
         _rdmpTopMenuStrip1.SetWindowManager(_windowManager);
-            
+
         //put the version of the software into the window title
-            
-            _version = StartupUI.GetVersion();
-            
+
+        _version = StartupUI.GetVersion();
+
         //put the current platform database into the window title too
         if (Activator?.RepositoryLocator?.CatalogueRepository is TableRepository connectedTo)
         {
             var database = connectedTo.DiscoveredServer?.GetCurrentDatabase();
             var instanceDescription = "";
 
-            var connectionStringsFileLoaded = RDMPBootStrapper<RDMPMainForm>.ApplicationArguments?.ConnectionStringsFileLoaded;
+            var connectionStringsFileLoaded =
+                RDMPBootStrapper<RDMPMainForm>.ApplicationArguments?.ConnectionStringsFileLoaded;
             if (connectionStringsFileLoaded != null)
-            {
                 instanceDescription =
                     $" - {connectionStringsFileLoaded.Name ?? connectionStringsFileLoaded.FileLoaded.Name}";
-            }
-            if (database != null) 
+            if (database != null)
                 _connectedTo = $"({database.GetRuntimeName()} on {database.Server.Name}){instanceDescription}";
         }
-            
+
         Text = "Research Data Management Platform";
 
-        var rdmpDir = new DirectoryInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RDMP"));
-        if(!rdmpDir.Exists)
+        var rdmpDir =
+            new DirectoryInfo(
+                Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RDMP"));
+        if (!rdmpDir.Exists)
             rdmpDir.Create();
 
-        _persistenceFile = new FileInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),"RDMP", "RDMPDockPanelPersist.xml"));
+        _persistenceFile =
+            new FileInfo(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RDMP",
+                "RDMPDockPanelPersist.xml"));
 
         //if there is no persist file or user wants to show the home screen always on startup
         if (!_persistenceFile.Exists || UserSettings.ShowHomeOnStartup)
-        {
             _windowManager.PopHome();
-        }
         else
-        {
             try
             {
                 if (_persistenceFile.Exists)
                     LoadFromXml(new FileStream(_persistenceFile.FullName, FileMode.Open));
-
-                    //load the state using the method
+                //load the state using the method
             }
             catch (Exception ex)
             {
@@ -161,13 +162,13 @@ private void RDMPMainForm_Load(object sender, EventArgs e)
                 _persistenceFile.Delete();
                 ApplicationRestarter.Restart();
             }
-        }
-         
+
         FormClosing += CloseForm;
         Loading = false;
     }
 
-    public override string Text { 
+    public override string Text
+    {
         get => base.Text;
         set => base.Text = (value + " v" + _version + " " + _connectedTo).Trim();
     }
@@ -175,19 +176,15 @@ public override string Text {
     public void LoadFromXml(Stream stream)
     {
         if (dockPanel1.DocumentStyle == DocumentStyle.SystemMdi)
-        {
             foreach (var form in MdiChildren)
                 form.Close();
-        }
         else
-        {
             foreach (var document in dockPanel1.DocumentsToArray())
             {
                 // IMPORANT: dispose all panes.
                 document.DockHandler.DockPanel = null;
                 document.DockHandler.Close();
             }
-        }
 
         foreach (var pane in dockPanel1.Panes.ToList())
         {
@@ -198,17 +195,18 @@ public void LoadFromXml(Stream stream)
         // IMPORTANT: dispose all float windows.
         foreach (var window in dockPanel1.FloatWindows.ToList())
             window.Dispose();
-            
+
         System.Diagnostics.Debug.Assert(dockPanel1.Panes.Count == 0);
         System.Diagnostics.Debug.Assert(dockPanel1.Contents.Count == 0);
         System.Diagnostics.Debug.Assert(dockPanel1.FloatWindows.Count == 0);
 
         dockPanel1.LoadFromXml(stream, DeserializeContent);
     }
+
     public void LoadFromXml(WindowLayout target)
     {
         var uniEncoding = new UnicodeEncoding();
-            
+
         // You might not want to use the outer using statement that I have
         // I wasn't sure how long you would need the MemoryStream object    
         using (var ms = new MemoryStream())
@@ -217,7 +215,7 @@ public void LoadFromXml(WindowLayout target)
             try
             {
                 sw.Write(target.LayoutData);
-                sw.Flush();//otherwise you are risking empty stream
+                sw.Flush(); //otherwise you are risking empty stream
                 ms.Seek(0, SeekOrigin.Begin);
 
                 LoadFromXml(ms);
@@ -256,10 +254,7 @@ private void CloseForm(object sender, FormClosingEventArgs e)
         // give the window manager a chance to cancel closing
         _windowManager.OnFormClosing(e);
 
-        if (e.Cancel)
-        {
-            return;
-        }
+        if (e.Cancel) return;
 
         if (e.CloseReason == CloseReason.UserClosing && UserSettings.ConfirmApplicationExiting)
             if (!Activator.YesNo("Are you sure you want to Exit?", "Confirm Exit"))
@@ -278,9 +273,9 @@ private void CloseForm(object sender, FormClosingEventArgs e)
                 dockPanel1.SaveAsXml(_persistenceFile.FullName); //save when Form closes
             }
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            ExceptionViewer.Show("Could not write persistence file",ex);
+            ExceptionViewer.Show("Could not write persistence file", ex);
         }
     }
 
@@ -295,17 +290,19 @@ private IDockContent DeserializeContent(string persiststring)
                 return toolboxInstance;
             }
 
-            var instruction = PersistenceDecisionFactory.ShouldCreateBasicControl(persiststring,RepositoryLocator) ??
-                              PersistenceDecisionFactory.ShouldCreateSingleObjectControl(persiststring,RepositoryLocator) ??
+            var instruction = PersistenceDecisionFactory.ShouldCreateBasicControl(persiststring, RepositoryLocator) ??
+                              PersistenceDecisionFactory.ShouldCreateSingleObjectControl(persiststring,
+                                  RepositoryLocator) ??
                               PersistenceDecisionFactory.ShouldCreateObjectCollection(persiststring, RepositoryLocator);
 
             if (instruction != null)
-                return _windowManager.ActivateItems.Activate(instruction,_windowManager.ActivateItems);
+                return _windowManager.ActivateItems.Activate(instruction, _windowManager.ActivateItems);
         }
         catch (Exception e)
         {
             _globalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs(
-                $"Could not work out what window to show for persistence string '{persiststring}'",CheckResult.Fail, e));
+                $"Could not work out what window to show for persistence string '{persiststring}'", CheckResult.Fail,
+                e));
         }
 
         return null;
diff --git a/Application/ResearchDataManagementPlatform/Theme/ThemeExtender.cs b/Application/ResearchDataManagementPlatform/Theme/ThemeExtender.cs
index b1bbaf0767..b2f6ca5464 100644
--- a/Application/ResearchDataManagementPlatform/Theme/ThemeExtender.cs
+++ b/Application/ResearchDataManagementPlatform/Theme/ThemeExtender.cs
@@ -18,7 +18,7 @@ internal class ThemeExtender
     private const string Env = "Environment";
 
     public Color TextBoxBackground { get; set; }
-        
+
     public Color ComboBoxBackground { get; set; }
     public Color ComboBoxText { get; set; }
 
@@ -27,7 +27,7 @@ public ThemeExtender(byte[] bytes)
     {
         _xml = XDocument.Load(new StreamReader(new MemoryStream(bytes)));
         TextBoxBackground = ColorTranslatorFromHtml("CommonControls", "TextBoxBackground");
-            
+
         ComboBoxBackground = ColorTranslatorFromHtml(Env, "ComboBoxBackground");
         ComboBoxText = ColorTranslatorFromHtml(Env, "ComboBoxText");
     }
@@ -36,9 +36,11 @@ private Color ColorTranslatorFromHtml(string category, string name, bool foregro
     {
         string color = null;
 
-        var environmentElement = _xml.Root.Element("Theme").Elements("Category").FirstOrDefault(item => item.Attribute("Name").Value == category);
+        var environmentElement = _xml.Root.Element("Theme").Elements("Category")
+            .FirstOrDefault(item => item.Attribute("Name").Value == category);
 
-        var colourElement = environmentElement?.Elements("Color").FirstOrDefault(item => item.Attribute("Name").Value == name);
+        var colourElement = environmentElement?.Elements("Color")
+            .FirstOrDefault(item => item.Attribute("Name").Value == name);
 
         if (colourElement != null)
             color = colourElement.Element(foreground ? "Foreground" : "Background").Attribute("Source").Value;
diff --git a/Application/ResearchDataManagementPlatform/Theme/Themes.cs b/Application/ResearchDataManagementPlatform/Theme/Themes.cs
index 7d87614d61..7708d2abf3 100644
--- a/Application/ResearchDataManagementPlatform/Theme/Themes.cs
+++ b/Application/ResearchDataManagementPlatform/Theme/Themes.cs
@@ -17,18 +17,19 @@ public class MyVS2015BlueTheme : VS2015BlueTheme, ITheme
 {
     private ThemeExtender _extender;
     public bool ApplyThemeToMenus { get; set; }
-        
+
     public MyVS2015BlueTheme()
     {
-        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources", typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
-        var bytes = (byte[]) manager.GetObject("vs2015blue_vstheme",CultureInfo.CurrentCulture);
+        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources",
+            typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
+        var bytes = (byte[])manager.GetObject("vs2015blue_vstheme", CultureInfo.CurrentCulture);
 
         _extender = new ThemeExtender(Decompress(bytes));
     }
 
     public new void ApplyTo(ToolStrip item)
     {
-        if(ApplyThemeToMenus)
+        if (ApplyThemeToMenus)
         {
             base.ApplyTo(item);
             _extender.ApplyTo(item);
@@ -43,7 +44,8 @@ public class MyVS2015DarkTheme : VS2015DarkTheme, ITheme
 
     public MyVS2015DarkTheme()
     {
-        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources", typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
+        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources",
+            typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
         var bytes = (byte[])manager.GetObject("vs2015dark_vstheme", CultureInfo.CurrentCulture);
 
         _extender = new ThemeExtender(Decompress(bytes));
@@ -66,7 +68,8 @@ public class MyVS2015LightTheme : VS2015LightTheme, ITheme
 
     public MyVS2015LightTheme()
     {
-        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources", typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
+        var manager = new System.Resources.ResourceManager("WeifenLuo.WinFormsUI.ThemeVS2015.Resources",
+            typeof(WeifenLuo.WinFormsUI.ThemeVS2015.VS2015ThemeBase).Assembly);
         var bytes = (byte[])manager.GetObject("vs2015light_vstheme", CultureInfo.CurrentCulture);
 
         _extender = new ThemeExtender(Decompress(bytes));
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
index 56dbd17151..8eb9210228 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ActivateItems.cs
@@ -92,8 +92,8 @@ public class ActivateItems : BasicActivateItems, IActivateItems, IRefreshBusSubs
 
     public override void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
     {
-        if(databaseEntity is DatabaseEntity de)
-            RefreshBus.Publish(this,new RefreshObjectEventArgs(de));
+        if (databaseEntity is DatabaseEntity de)
+            RefreshBus.Publish(this, new RefreshObjectEventArgs(de));
     }
 
     public override void Show(string title, string message)
@@ -105,7 +105,7 @@ public override void Show(string title, string message)
             return;
         }
 
-        WideMessageBox.Show(title,message,Environment.StackTrace,true,null,WideMessageBoxTheme.Help);
+        WideMessageBox.Show(title, message, Environment.StackTrace, true, null, WideMessageBoxTheme.Help);
     }
 
     public ICombineableFactory CommandFactory { get; private set; }
@@ -114,7 +114,10 @@ public override void Show(string title, string message)
 
     public List<IProblemProvider> ProblemProviders { get; private set; }
 
-    public ActivateItems(ITheme theme,RefreshBus refreshBus, DockPanel mainDockPanel, IRDMPPlatformRepositoryServiceLocator repositoryLocator, WindowFactory windowFactory, WindowManager windowManager, ICheckNotifier globalErrorCheckNotifier):base(repositoryLocator,globalErrorCheckNotifier)
+    public ActivateItems(ITheme theme, RefreshBus refreshBus, DockPanel mainDockPanel,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, WindowFactory windowFactory,
+        WindowManager windowManager, ICheckNotifier globalErrorCheckNotifier) : base(repositoryLocator,
+        globalErrorCheckNotifier)
     {
         Theme = theme;
         IsWinForms = true;
@@ -128,7 +131,7 @@ public ActivateItems(ITheme theme,RefreshBus refreshBus, DockPanel mainDockPanel
 
         HistoryProvider = new HistoryProvider(repositoryLocator);
 
-        WindowArranger = new WindowArranger(this,_windowManager,_mainDockPanel);
+        WindowArranger = new WindowArranger(this, _windowManager, _mainDockPanel);
 
         CommandFactory = new RDMPCombineableFactory();
         CommandExecutionFactory = new RDMPCommandExecutionFactory(this);
@@ -150,10 +153,7 @@ protected override ICoreChildProvider GetChildProvider()
     {
         var provider = base.GetChildProvider();
 
-        if (RefreshBus != null)
-        {
-            RefreshBus.ChildProvider = provider;
-        }
+        if (RefreshBus != null) RefreshBus.ChildProvider = provider;
 
         return provider;
     }
@@ -163,19 +163,17 @@ public Form ShowWindow(Control singleControlForm, bool asDocument = false)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
             return _mainDockPanel.Invoke<Form>(() => ShowWindow(singleControlForm, asDocument));
-        }
 
         var width = singleControlForm.Size.Width + SystemInformation.BorderSize.Width;
         var height = singleControlForm.Size.Height + SystemInformation.BorderSize.Height;
 
         //use the .Text or fallback on .Name
         var name = string.IsNullOrWhiteSpace(singleControlForm.Text)
-            ? singleControlForm.Name ?? singleControlForm.GetType().Name//or worst case scenario use the type name!
+            ? singleControlForm.Name ?? singleControlForm.GetType().Name //or worst case scenario use the type name!
             : singleControlForm.Text;
 
-        if(singleControlForm is Form && asDocument)
+        if (singleControlForm is Form && asDocument)
             throw new Exception(
                 $"Control '{singleControlForm}' is a Form and asDocument was passed as true.  When asDocument is true you must be a Control not a Form e.g. inherit from RDMPUserControl instead of RDMPForm");
 
@@ -183,12 +181,12 @@ public Form ShowWindow(Control singleControlForm, bool asDocument = false)
 
         c?.SetItemActivator(this);
 
-        var content = WindowFactory.Create(this,singleControlForm,name , null);
+        var content = WindowFactory.Create(this, singleControlForm, name, null);
 
         if (asDocument)
-            content.Show(_mainDockPanel,DockState.Document);
+            content.Show(_mainDockPanel, DockState.Document);
         else
-            content.Show(_mainDockPanel,new Rectangle(0,0,width,height));
+            content.Show(_mainDockPanel, new Rectangle(0, 0, width, height));
 
         return content;
     }
@@ -213,21 +211,20 @@ public override void RequestItemEmphasis(object sender, EmphasiseRequest request
 
         if (root is CohortIdentificationConfiguration cic)
             Activate<CohortIdentificationConfigurationUI, CohortIdentificationConfiguration>(cic);
-        else
-        if (root != null)
+        else if (root != null)
             _windowManager.ShowCollectionWhichSupportsRootObjectType(root);
 
         //really should be a listener now btw since we just launched the relevant Toolbox if it wasn't there before
         //Look at assignments to Sender, the invocation list can change the Sender!
         var args = new EmphasiseEventArgs(request);
-        OnEmphasise(this,args);
+        OnEmphasise(this, args);
 
         //might be different than sender that was passed in
-        if(args.Sender is DockContent content)
+        if (args.Sender is DockContent content)
             content.Activate();
 
         //user is being shown the given object so track it as a recent (e.g. GoTo etc)
-        if(args.Request.ObjectToEmphasise is IMapsDirectlyToDatabaseTable m)
+        if (args.Request.ObjectToEmphasise is IMapsDirectlyToDatabaseTable m)
             HistoryProvider.Add(m);
     }
 
@@ -237,7 +234,7 @@ public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
         if (_mainDockPanel?.InvokeRequired ?? false)
         {
             Enum result = default;
-            var rtn = _mainDockPanel.Invoke<bool>(()=>SelectEnum(args, enumType, out result));
+            var rtn = _mainDockPanel.Invoke<bool>(() => SelectEnum(args, enumType, out result));
             chosen = result;
             return rtn;
         }
@@ -245,15 +242,11 @@ public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
         return SelectObject(args, Enum.GetValues(enumType).Cast<Enum>().ToArray(), out chosen);
     }
 
-    public override bool SelectType(DialogArgs args, Type[] available,out Type chosen)
-    {
-        return SelectObject(args, available, out chosen);
-    }
+    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen) =>
+        SelectObject(args, available, out chosen);
+
+    public override bool CanActivate(object target) => CommandExecutionFactory.CanActivate(target);
 
-    public override bool CanActivate(object target)
-    {
-        return CommandExecutionFactory.CanActivate(target);
-    }
     protected override void ActivateImpl(object o)
     {
         // if on wrong Thread
@@ -297,20 +290,15 @@ public string DescribeProblemIfAny(object model)
         return ProblemProviders.Select(p => p.DescribeProblem(model)).FirstOrDefault(desc => desc != null);
     }
 
-    public string GetDocumentation(Type type)
-    {
-        return RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(type);
-    }
+    public string GetDocumentation(Type type) =>
+        RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(type);
 
     public string CurrentDirectory => Environment.CurrentDirectory;
 
     public DialogResult ShowDialog(Form form)
     {
         // if on wrong Thread
-        if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => ShowDialog(form));
-        }
+        if (_mainDockPanel?.InvokeRequired ?? false) return _mainDockPanel.Invoke(() => ShowDialog(form));
 
         return form.ShowDialog();
     }
@@ -320,13 +308,14 @@ public void KillForm(Form f, Exception reason)
         // if on wrong Thread
         if (f.InvokeRequired)
         {
-            f.Invoke(() => KillForm(f,reason));
+            f.Invoke(() => KillForm(f, reason));
             return;
         }
 
         f.Close();
-        ExceptionViewer.Show("Window Closed",reason);
+        ExceptionViewer.Show("Window Closed", reason);
     }
+
     public void KillForm(Form f, string reason)
     {
         // if on wrong Thread
@@ -337,8 +326,9 @@ public void KillForm(Form f, string reason)
         }
 
         f.Close();
-        WideMessageBox.Show("Window Closed",reason);
+        WideMessageBox.Show("Window Closed", reason);
     }
+
     public void OnRuleRegistered(IBinderRule rule)
     {
         //no special action required
@@ -349,29 +339,25 @@ public void OnRuleRegistered(IBinderRule rule)
     /// </summary>
     /// <param name="databaseEntity"></param>
     /// <returns></returns>
-    public bool ShouldReloadFreshCopy(DatabaseEntity databaseEntity)
-    {
-        return YesNo($"{databaseEntity} is out of date with database, would you like to reload a fresh copy?",
+    public bool ShouldReloadFreshCopy(DatabaseEntity databaseEntity) =>
+        YesNo($"{databaseEntity} is out of date with database, would you like to reload a fresh copy?",
             "Object Changed");
-    }
 
     public T Activate<T, T2>(T2 databaseObject)
         where T : RDMPSingleDatabaseObjectControl<T2>, new()
-        where T2 : DatabaseEntity
-    {
-        return Activate<T, T2>(databaseObject, CoreIconProvider.GetImage(databaseObject));
-    }
+        where T2 : DatabaseEntity =>
+        Activate<T, T2>(databaseObject, CoreIconProvider.GetImage(databaseObject));
 
     public T Activate<T>(IPersistableObjectCollection collection)
-        where T: Control,IObjectCollectionControl,new()
+        where T : Control, IObjectCollectionControl, new()
 
     {
         //if the window is already open
         if (PopExisting(typeof(T), collection, out var existingHostedControlInstance))
         {
             //just update its state
-            var existing = (T) existingHostedControlInstance;
-            existing.SetCollection(this,collection);
+            var existing = (T)existingHostedControlInstance;
+            existing.SetCollection(this, collection);
 
             return existing;
         }
@@ -391,16 +377,17 @@ private T Activate<T, T2>(T2 databaseObject, Image<Rgba32> tabImage)
             return (T)existingHostedControlInstance;
 
         var uiInstance = new T();
-        var floatable = WindowFactory.Create(this,RefreshBus, uiInstance, tabImage, databaseObject);
+        var floatable = WindowFactory.Create(this, RefreshBus, uiInstance, tabImage, databaseObject);
         floatable.Show(_mainDockPanel, DockState.Document);
         uiInstance.SetDatabaseObject(this, databaseObject);
 
-        SetTabText(floatable,uiInstance);
+        SetTabText(floatable, uiInstance);
 
         return uiInstance;
     }
 
-    private bool PopExisting(Type windowType, IMapsDirectlyToDatabaseTable databaseObject, out Control existingHostedControlInstance)
+    private bool PopExisting(Type windowType, IMapsDirectlyToDatabaseTable databaseObject,
+        out Control existingHostedControlInstance)
     {
         var existing = _windowManager.GetActiveWindowIfAnyFor(windowType, databaseObject);
         existingHostedControlInstance = null;
@@ -411,14 +398,16 @@ private bool PopExisting(Type windowType, IMapsDirectlyToDatabaseTable databaseO
             existing.Activate();
 
             // only refresh if there are changes to the underlying object
-            if(databaseObject is IRevertable r && r.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent)
+            if (databaseObject is IRevertable r &&
+                r.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent)
                 existing.HandleUserRequestingTabRefresh(this);
         }
 
         return existing != null;
     }
 
-    private bool PopExisting(Type windowType, IPersistableObjectCollection collection, out Control existingHostedControlInstance)
+    private bool PopExisting(Type windowType, IPersistableObjectCollection collection,
+        out Control existingHostedControlInstance)
     {
         var existing = _windowManager.GetActiveWindowIfAnyFor(windowType, collection);
         existingHostedControlInstance = null;
@@ -429,18 +418,21 @@ private bool PopExisting(Type windowType, IPersistableObjectCollection collectio
             existing.Activate();
 
             // only refresh if there are changes to some of the underlying objects
-            if(collection.DatabaseObjects.OfType<IRevertable>().Any(r=>r.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent))
+            if (collection.DatabaseObjects.OfType<IRevertable>().Any(r =>
+                    r.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent))
                 existing.HandleUserRequestingTabRefresh(this);
         }
 
         return existing != null;
     }
+
     public DockContent Activate(DeserializeInstruction instruction, IActivateItems activator)
     {
         if (instruction.DatabaseObject != null && instruction.ObjectCollection != null)
-            throw new ArgumentException("DeserializeInstruction cannot have both a DatabaseObject and an ObjectCollection");
+            throw new ArgumentException(
+                "DeserializeInstruction cannot have both a DatabaseObject and an ObjectCollection");
 
-        var c = (Control)UIObjectConstructor.Construct(instruction.UIControlType,activator,true);
+        var c = (Control)UIObjectConstructor.Construct(instruction.UIControlType, activator, true);
 
 
         //it has a database object so call SetDatabaseObject
@@ -455,23 +447,26 @@ public DockContent Activate(DeserializeInstruction instruction, IActivateItems a
             if (databaseObject == null)
                 return null;
 
-            DockContent floatable = WindowFactory.Create(this,RefreshBus, uiInstance,CoreIconProvider.GetImage(databaseObject), databaseObject);
+            DockContent floatable = WindowFactory.Create(this, RefreshBus, uiInstance,
+                CoreIconProvider.GetImage(databaseObject), databaseObject);
 
             floatable.Show(_mainDockPanel, DockState.Document);
             try
             {
-                uiInstance.SetDatabaseObject(this,(DatabaseEntity) databaseObject);
-                SetTabText(floatable,uiInstance);
+                uiInstance.SetDatabaseObject(this, (DatabaseEntity)databaseObject);
+                SetTabText(floatable, uiInstance);
             }
             catch (Exception e)
             {
                 floatable.Close();
                 throw new Exception(
-                    $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",e);
+                    $"SetDatabaseObject failed on Control of Type '{instruction.UIControlType.Name}', control closed, see inner Exception for details",
+                    e);
             }
 
             return floatable;
         }
+
         return (DockContent)activator.ShowWindow(c, true);
     }
 
@@ -489,9 +484,10 @@ private static void SetTabText(DockContent floatable, INamedTab tab)
             floatable.ParentForm.Text = $"{tabText} - RDMP";
     }
 
-    public PersistableObjectCollectionDockContent Activate(IObjectCollectionControl collectionControl, IPersistableObjectCollection objectCollection)
+    public PersistableObjectCollectionDockContent Activate(IObjectCollectionControl collectionControl,
+        IPersistableObjectCollection objectCollection)
     {
-        var floatable = WindowFactory.Create(this,collectionControl,objectCollection, null);
+        var floatable = WindowFactory.Create(this, collectionControl, objectCollection, null);
         floatable.Show(_mainDockPanel, DockState.Document);
         return floatable;
     }
@@ -499,12 +495,13 @@ public PersistableObjectCollectionDockContent Activate(IObjectCollectionControl
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
         // if we don't want to do selective refresh or can't (because partial refreshes are not supported on the type)
-        if(HardRefresh || !UserSettings.SelectiveRefresh || !CoreChildProvider.SelectiveRefresh(e.Object))
+        if (HardRefresh || !UserSettings.SelectiveRefresh || !CoreChildProvider.SelectiveRefresh(e.Object))
         {
             //update the child provider with a full refresh
             GetChildProvider();
             HardRefresh = false;
         }
+
         RefreshProblemProviders();
     }
 
@@ -515,7 +512,7 @@ private void RefreshProblemProviders()
     }
 
     /// <inheritdoc/>
-    public override bool YesNo(DialogArgs args,out bool chosen)
+    public override bool YesNo(DialogArgs args, out bool chosen)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
@@ -544,21 +541,24 @@ public override bool YesNo(DialogArgs args,out bool chosen)
         return false;
     }
 
-    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text, bool requireSaneHeaderText)
+    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
+        bool requireSaneHeaderText)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
         {
             string result = default;
-            var rtn = _mainDockPanel.Invoke<bool>(() => TypeText(args,maxLength,initialText,out result,requireSaneHeaderText));
+            var rtn = _mainDockPanel.Invoke<bool>(() =>
+                TypeText(args, maxLength, initialText, out result, requireSaneHeaderText));
             text = result;
             return rtn;
         }
 
-        var textTyper = new TypeTextOrCancelDialog(args, maxLength, initialText, allowBlankText: false, multiLine: maxLength > MultiLineLengthThreshold)
-        {
-            RequireSaneHeaderText = requireSaneHeaderText
-        };
+        var textTyper =
+            new TypeTextOrCancelDialog(args, maxLength, initialText, false, maxLength > MultiLineLengthThreshold)
+            {
+                RequireSaneHeaderText = requireSaneHeaderText
+            };
 
         text = textTyper.ShowDialog() == DialogResult.OK ? textTyper.ResultText : null;
         return !string.IsNullOrWhiteSpace(text);
@@ -568,11 +568,9 @@ public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, st
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return  _mainDockPanel.Invoke(() => SelectDatabase(allowDatabaseCreation,taskDescription));
-        }
+            return _mainDockPanel.Invoke(() => SelectDatabase(allowDatabaseCreation, taskDescription));
 
-        var dialog = new ServerDatabaseTableSelectorDialog(taskDescription,false,true,this);
+        var dialog = new ServerDatabaseTableSelectorDialog(taskDescription, false, true, this);
         dialog.ShowDialog();
 
         if (dialog.DialogResult != DialogResult.OK)
@@ -585,9 +583,7 @@ public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string t
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
             return _mainDockPanel.Invoke(() => SelectTable(allowDatabaseCreation, taskDescription));
-        }
 
         var dialog = new ServerDatabaseTableSelectorDialog(taskDescription, true, true, this)
         {
@@ -619,11 +615,11 @@ public override void Wait(string title, Task task, CancellationTokenSource cts)
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
         {
-            _mainDockPanel.Invoke(() => Wait(title,task,cts));
+            _mainDockPanel.Invoke(() => Wait(title, task, cts));
             return;
         }
 
-        var ui = new WaitUI(title,task,cts);
+        var ui = new WaitUI(title, task, cts);
         ui.ShowDialog();
     }
 
@@ -632,18 +628,17 @@ public override IEnumerable<Type> GetIgnoredCommands()
     {
         yield return typeof(ExecuteCommandRefreshObject);
         yield return typeof(ExecuteCommandChangeExtractability);
-        yield return typeof (ExecuteCommandOpenInExplorer);
-        yield return typeof (ExecuteCommandCreateNewFileBasedProcessTask);
+        yield return typeof(ExecuteCommandOpenInExplorer);
+        yield return typeof(ExecuteCommandCreateNewFileBasedProcessTask);
     }
 
 
-    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects)
+    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
             return _mainDockPanel.Invoke(() => SelectOne(args, availableObjects));
-        }
 
         if (!availableObjects.Any())
         {
@@ -653,15 +648,10 @@ public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDir
 
         //if there is only one object available to select
         if (availableObjects.Length == 1)
-            if(args.AllowAutoSelect)
-            {
+            if (args.AllowAutoSelect)
                 return availableObjects[0];
-            }
 
-        if(SelectObject(args,availableObjects, out var selected))
-        {
-            return selected;
-        }
+        if (SelectObject(args, availableObjects, out var selected)) return selected;
 
         return null; //user didn't select one of the IMapsDirectlyToDatabaseTable objects shown in the dialog
     }
@@ -677,7 +667,7 @@ public override bool SelectObject<T>(DialogArgs args, T[] available, out T selec
             return rtn;
         }
 
-        var pick = new SelectDialog<T>(args,this,available,false);
+        var pick = new SelectDialog<T>(args, this, available, false);
 
         if (pick.ShowDialog() == DialogResult.OK)
         {
@@ -714,13 +704,11 @@ public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] se
         selected = default;
         return false;
     }
+
     public override DirectoryInfo SelectDirectory(string prompt)
     {
         // if on wrong Thread
-        if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => SelectDirectory(prompt));
-        }
+        if (_mainDockPanel?.InvokeRequired ?? false) return _mainDockPanel.Invoke(() => SelectDirectory(prompt));
 
         using (var fb = new FolderBrowserDialog())
         {
@@ -734,10 +722,7 @@ public override DirectoryInfo SelectDirectory(string prompt)
     public override FileInfo SelectFile(string prompt)
     {
         // if on wrong Thread
-        if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => SelectFile(prompt));
-        }
+        if (_mainDockPanel?.InvokeRequired ?? false) return _mainDockPanel.Invoke(() => SelectFile(prompt));
 
         return SelectFile(prompt, null, null);
     }
@@ -746,11 +731,9 @@ public override FileInfo SelectFile(string prompt, string patternDescription, st
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => SelectFile(prompt, patternDescription,pattern));
-        }
+            return _mainDockPanel.Invoke(() => SelectFile(prompt, patternDescription, pattern));
 
-        using (var fb = new OpenFileDialog {CheckFileExists = false,Multiselect = false})
+        using (var fb = new OpenFileDialog { CheckFileExists = false, Multiselect = false })
         {
             if (patternDescription != null && pattern != null)
                 fb.Filter = $"{patternDescription}|{pattern}";
@@ -758,7 +741,7 @@ public override FileInfo SelectFile(string prompt, string patternDescription, st
             if (fb.ShowDialog() == DialogResult.OK)
             {
                 // entering "null" in a winforms file dialog will return something like "D:\Blah\null"
-                if (string.Equals(Path.GetFileName(fb.FileName),"null", StringComparison.CurrentCultureIgnoreCase))
+                if (string.Equals(Path.GetFileName(fb.FileName), "null", StringComparison.CurrentCultureIgnoreCase))
                     return null;
 
                 return new FileInfo(fb.FileName);
@@ -772,17 +755,15 @@ public override FileInfo[] SelectFiles(string prompt, string patternDescription,
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
             return _mainDockPanel.Invoke(() => SelectFiles(prompt, patternDescription, pattern));
-        }
 
-        using (var fb = new OpenFileDialog {CheckFileExists = false,Multiselect = true})
+        using (var fb = new OpenFileDialog { CheckFileExists = false, Multiselect = true })
         {
             if (patternDescription != null && pattern != null)
                 fb.Filter = $"{patternDescription}|{pattern}";
 
             if (fb.ShowDialog() == DialogResult.OK)
-                return fb.FileNames.Select(f=>new FileInfo(f)).ToArray();
+                return fb.FileNames.Select(f => new FileInfo(f)).ToArray();
 
             return null;
         }
@@ -800,7 +781,7 @@ protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, obj
         }
 
         //whatever else it is use string
-        var typeTextDialog = new TypeTextOrCancelDialog(args,1000,initialValue?.ToString());
+        var typeTextDialog = new TypeTextOrCancelDialog(args, 1000, initialValue?.ToString());
 
         if (typeTextDialog.ShowDialog() == DialogResult.OK)
         {
@@ -817,9 +798,7 @@ public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
             return _mainDockPanel.Invoke(() => SelectMany(args, arrayElementType, availableObjects));
-        }
 
         if (!availableObjects.Any())
         {
@@ -837,8 +816,8 @@ public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type
             var ms = selectDialog.MultiSelected.ToList();
             var toReturn = Array.CreateInstance(arrayElementType, ms.Count);
 
-            for(var i = 0;i<ms.Count;i++)
-                toReturn.SetValue(ms[i],i);
+            for (var i = 0; i < ms.Count; i++)
+                toReturn.SetValue(ms[i], i);
 
             return toReturn.Cast<IMapsDirectlyToDatabaseTable>().ToArray();
         }
@@ -850,44 +829,44 @@ public override List<CommandInvokerDelegate> GetDelegates()
     {
         return new List<CommandInvokerDelegate>
         {
-            new CommandInvokerDelegate(typeof(IActivateItems),true,p=>this)
+            new(typeof(IActivateItems), true, p => this)
         };
     }
-    public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialObjects, string initialSearch)
+
+    public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialObjects,
+        string initialSearch)
     {
-        if(initialObjects == null)
+        if (initialObjects == null)
         {
-            initialObjects =  SelectMany(new DialogArgs
+            initialObjects = SelectMany(new DialogArgs
             {
-                WindowTitle = sessionName.StartsWith(ExecuteCommandStartSession.FindResultsTitle) ? "Find Multiple" : "Session Objects",
-                TaskDescription = "Pick which objects you want added to the session window.  You can always add more later",
+                WindowTitle = sessionName.StartsWith(ExecuteCommandStartSession.FindResultsTitle)
+                    ? "Find Multiple"
+                    : "Session Objects",
+                TaskDescription =
+                    "Pick which objects you want added to the session window.  You can always add more later",
                 InitialSearchText = initialSearch,
 
                 IsFind = sessionName.StartsWith(ExecuteCommandStartSession.FindResultsTitle)
-            },typeof(IMapsDirectlyToDatabaseTable),CoreChildProvider.GetAllSearchables().Keys.ToArray())?.ToList();
+            }, typeof(IMapsDirectlyToDatabaseTable), CoreChildProvider.GetAllSearchables().Keys.ToArray())?.ToList();
 
-            if(initialObjects == null || !initialObjects.Any())
-            {
+            if (initialObjects == null || !initialObjects.Any())
                 // user cancelled picking objects
                 return;
-            }
         }
 
-        var panel = WindowFactory.Create(this,new SessionCollectionUI(),new SessionCollection(sessionName)
+        var panel = WindowFactory.Create(this, new SessionCollectionUI(), new SessionCollection(sessionName)
         {
             DatabaseObjects = initialObjects.ToList()
-        },Image.Load<Rgba32>(CatalogueIcons.WindowLayout));
-        panel.Show(_mainDockPanel,DockState.DockLeft);
+        }, Image.Load<Rgba32>(CatalogueIcons.WindowLayout));
+        panel.Show(_mainDockPanel, DockState.DockLeft);
     }
 
 
     /// <inheritdoc/>
-    public IEnumerable<SessionCollectionUI> GetSessions()
-    {
-        return _windowManager.GetAllWindows<SessionCollectionUI>();
-    }
+    public IEnumerable<SessionCollectionUI> GetSessions() => _windowManager.GetAllWindows<SessionCollectionUI>();
 
-    public override IPipelineRunner GetPipelineRunner(DialogArgs args,IPipelineUseCase useCase, IPipeline pipeline)
+    public override IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline)
     {
         var configureAndExecuteDialog = new ConfigureAndExecutePipelineUI(args, useCase, this)
         {
@@ -897,17 +876,17 @@ public override IPipelineRunner GetPipelineRunner(DialogArgs args,IPipelineUseCa
         return configureAndExecuteDialog;
     }
 
-    public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable, IProject project, string cohortInitialDescription)
+    public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable,
+        IProject project, string cohortInitialDescription)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => GetCohortCreationRequest(externalCohortTable, project, cohortInitialDescription));
-        }
+            return _mainDockPanel.Invoke(() =>
+                GetCohortCreationRequest(externalCohortTable, project, cohortInitialDescription));
 
-        var ui = new CohortCreationRequestUI(this,externalCohortTable,project);
+        var ui = new CohortCreationRequestUI(this, externalCohortTable, project);
 
-        if(!string.IsNullOrWhiteSpace(cohortInitialDescription))
+        if (!string.IsNullOrWhiteSpace(cohortInitialDescription))
             ui.CohortDescription = $"{cohortInitialDescription} ({Environment.UserName} - {DateTime.Now})";
 
         if (ui.ShowDialog() != DialogResult.OK)
@@ -916,13 +895,13 @@ public override CohortCreationRequest GetCohortCreationRequest(ExternalCohortTab
         return ui.Result;
     }
 
-    public override ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo, ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string folder)
+    public override ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo,
+        ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string folder)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => CreateAndConfigureCatalogue(tableInfo, extractionIdentifierColumns, initialDescription,projectSpecific,folder));
-        }
+            return _mainDockPanel.Invoke(() => CreateAndConfigureCatalogue(tableInfo, extractionIdentifierColumns,
+                initialDescription, projectSpecific, folder));
 
         var ui = new ConfigureCatalogueExtractabilityUI(this, tableInfo, initialDescription, projectSpecific)
         {
@@ -932,16 +911,17 @@ public override ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo, Col
 
         return ui.CatalogueCreatedIfAny;
     }
-    public override ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository, PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db)
+
+    public override ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository,
+        PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db)
     {
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
-        {
-            return _mainDockPanel.Invoke(() => CreateNewPlatformDatabase(catalogueRepository, defaultToSet, patcher, db));
-        }
+            return _mainDockPanel.Invoke(
+                () => CreateNewPlatformDatabase(catalogueRepository, defaultToSet, patcher, db));
 
         //launch the winforms UI for creating a database
-        return CreatePlatformDatabase.CreateNewExternalServer(catalogueRepository,defaultToSet,patcher);
+        return CreatePlatformDatabase.CreateNewExternalServer(catalogueRepository, defaultToSet, patcher);
     }
 
     public override bool ShowCohortWizard(out CohortIdentificationConfiguration cic)
@@ -968,17 +948,14 @@ public override void SelectAnythingThen(DialogArgs args, Action<IMapsDirectlyToD
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
         {
-            _mainDockPanel.Invoke(() => SelectAnythingThen(args,callback));
+            _mainDockPanel.Invoke(() => SelectAnythingThen(args, callback));
             return;
         }
 
         var select = new SelectDialog<IMapsDirectlyToDatabaseTable>(
             args, this, CoreChildProvider.GetAllSearchables().Select(k => k.Key), false);
 
-        if(select.ShowDialog() == DialogResult.OK && select.Selected != null)
-        {
-            callback(select.Selected);
-        }
+        if (select.ShowDialog() == DialogResult.OK && select.Selected != null) callback(select.Selected);
     }
 
     public override void ShowData(IViewSQLAndResultsCollection collection)
@@ -1010,13 +987,13 @@ public override void ShowLogs(ExternalDatabaseServer loggingServer, LogViewerFil
         // if on wrong Thread
         if (_mainDockPanel?.InvokeRequired ?? false)
         {
-            _mainDockPanel.Invoke(() => ShowLogs(loggingServer,filter));
+            _mainDockPanel.Invoke(() => ShowLogs(loggingServer, filter));
             return;
         }
 
 
-        var loggingTabUI =  Activate<LoggingTabUI, ExternalDatabaseServer>(loggingServer);
-        if(filter != null)
+        var loggingTabUI = Activate<LoggingTabUI, ExternalDatabaseServer>(loggingServer);
+        if (filter != null)
             loggingTabUI.SetFilter(filter);
     }
 
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/CollectionNavigation.cs b/Application/ResearchDataManagementPlatform/WindowManagement/CollectionNavigation.cs
index 4464f525ac..4bd4e65925 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/CollectionNavigation.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/CollectionNavigation.cs
@@ -14,7 +14,7 @@ namespace ResearchDataManagementPlatform.WindowManagement;
 /// <summary>
 /// Records the fact that the user visited a specific object in a tree collection
 /// </summary>
-public class CollectionNavigation: INavigation
+public class CollectionNavigation : INavigation
 {
     public IMapsDirectlyToDatabaseTable Object { get; }
 
@@ -22,12 +22,12 @@ public bool IsAlive
     {
         get
         {
-            if(Object is IMightNotExist o)
+            if (Object is IMightNotExist o)
                 return o.Exists();
 
             return true;
         }
-    } 
+    }
 
     public CollectionNavigation(IMapsDirectlyToDatabaseTable Object)
     {
@@ -36,23 +36,18 @@ public CollectionNavigation(IMapsDirectlyToDatabaseTable Object)
 
     public void Activate(ActivateItems activateItems)
     {
-        activateItems.RequestItemEmphasis(this,new EmphasiseRequest(Object,0));
+        activateItems.RequestItemEmphasis(this, new EmphasiseRequest(Object, 0));
     }
 
     public void Close()
     {
-            
-    }
-    public override string ToString()
-    {
-        return Object.ToString();
     }
 
-    public override bool Equals(object obj)
-    {
-        return obj is CollectionNavigation other &&
-               Object.Equals(other.Object);
-    }
+    public override string ToString() => Object.ToString();
+
+    public override bool Equals(object obj) =>
+        obj is CollectionNavigation other &&
+        Object.Equals(other.Object);
 
     public override int GetHashCode()
     {
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableObjectCollectionDockContent.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableObjectCollectionDockContent.cs
index 9bb352f56d..d12e9ec46d 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableObjectCollectionDockContent.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableObjectCollectionDockContent.cs
@@ -34,14 +34,15 @@ public class PersistableObjectCollectionDockContent : RDMPSingleControlTab
 
     public IPersistableObjectCollection Collection => _control.GetCollection();
 
-    public PersistableObjectCollectionDockContent(IActivateItems activator, IObjectCollectionControl control, IPersistableObjectCollection collection):base(activator.RefreshBus)
+    public PersistableObjectCollectionDockContent(IActivateItems activator, IObjectCollectionControl control,
+        IPersistableObjectCollection collection) : base(activator.RefreshBus)
     {
         _control = control;
         Control = (Control)control;
 
         //tell the control what its collection is
         control.SetCollection(activator, collection);
-            
+
         //ask the control what it wants its name to be
         TabText = _control.GetTabName();
     }
@@ -55,7 +56,7 @@ protected override string GetPersistString()
         var sb = new StringBuilder();
 
         //Output <Prefix>:<The Control Type>:<The Type name of the Collection - must be new()>:
-        sb.Append(Prefix + s + _control.GetType().FullName + s  + collection.GetType().Name + s);
+        sb.Append(Prefix + s + _control.GetType().FullName + s + collection.GetType().Name + s);
 
         sb.Append(PersistStringHelper.GetObjectCollectionPersistString(collection.DatabaseObjects.ToArray()));
 
@@ -69,7 +70,6 @@ protected override string GetPersistString()
     }
 
 
-
     public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
         var newTabName = _control.GetTabName();
@@ -80,8 +80,7 @@ public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventA
         TabText = newTabName;
 
         //pass the info on to the control
-        _control.RefreshBus_RefreshObject(sender,e);
-
+        _control.RefreshBus_RefreshObject(sender, e);
     }
 
     public override void HandleUserRequestingTabRefresh(IActivateItems activator)
@@ -94,7 +93,7 @@ public override void HandleUserRequestingTabRefresh(IActivateItems activator)
             revertable?.RevertToDatabaseState();
         }
 
-        _control.SetCollection(activator,collection);
+        _control.SetCollection(activator, collection);
     }
 
 
@@ -102,12 +101,12 @@ public override void HandleUserRequestingEmphasis(IActivateItems activator)
     {
         var collection = _control.GetCollection();
 
-        if(collection != null)
+        if (collection != null)
             if (collection.DatabaseObjects.Count >= 1)
             {
-                var o = activator.SelectOne("Show", collection.DatabaseObjects.ToArray(),null,true);
+                var o = activator.SelectOne("Show", collection.DatabaseObjects.ToArray(), null, true);
 
-                if(o != null)
+                if (o != null)
                     activator.RequestItemEmphasis(this, new EmphasiseRequest(o));
             }
     }
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs
index 422a237e76..70f7888bc1 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableSingleDatabaseObjectDockContent.cs
@@ -32,20 +32,21 @@ public class PersistableSingleDatabaseObjectDockContent : RDMPSingleControlTab
 
     public const string Prefix = "RDMPSingleDatabaseObjectControl";
 
-    public PersistableSingleDatabaseObjectDockContent(IRDMPSingleDatabaseObjectControl control, IMapsDirectlyToDatabaseTable databaseObject,RefreshBus refreshBus):base(refreshBus)
+    public PersistableSingleDatabaseObjectDockContent(IRDMPSingleDatabaseObjectControl control,
+        IMapsDirectlyToDatabaseTable databaseObject, RefreshBus refreshBus) : base(refreshBus)
     {
         Control = (Control)control;
-            
+
         DatabaseObject = databaseObject;
         TabText = "Loading...";
 
         control.UnSavedChanges += OnUnSavedChanges;
-        Closing += (s,e)=>control.UnSavedChanges -= OnUnSavedChanges;
+        Closing += (s, e) => control.UnSavedChanges -= OnUnSavedChanges;
     }
 
     private void OnUnSavedChanges(object sender, bool unsavedChanges)
     {
-        if(TabText == null)
+        if (TabText == null)
             return;
 
         TabText = unsavedChanges ? $"{TabText.TrimEnd('*')}*" : TabText.TrimEnd('*');
@@ -54,12 +55,13 @@ private void OnUnSavedChanges(object sender, bool unsavedChanges)
     protected override string GetPersistString()
     {
         const char s = PersistStringHelper.Separator;
-        return Prefix + s + Control.GetType().FullName + s + DatabaseObject.Repository.GetType().FullName + s + DatabaseObject.GetType().FullName + s + DatabaseObject.ID;
+        return Prefix + s + Control.GetType().FullName + s + DatabaseObject.Repository.GetType().FullName + s +
+               DatabaseObject.GetType().FullName + s + DatabaseObject.ID;
     }
 
     public override void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        var newTabName = ((IRDMPSingleDatabaseObjectControl) Control).GetTabName();
+        var newTabName = ((IRDMPSingleDatabaseObjectControl)Control).GetTabName();
 
         if (ParentForm is CustomFloatWindow floatWindow)
             floatWindow.Text = newTabName;
@@ -77,6 +79,6 @@ public override void HandleUserRequestingTabRefresh(IActivateItems activator)
 
     public override void HandleUserRequestingEmphasis(IActivateItems activator)
     {
-        activator.RequestItemEmphasis(this,new EmphasiseRequest(DatabaseObject));
+        activator.RequestItemEmphasis(this, new EmphasiseRequest(DatabaseObject));
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableToolboxDockContent.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableToolboxDockContent.cs
index 09f8cbd33a..525e491d28 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableToolboxDockContent.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistableToolboxDockContent.cs
@@ -22,7 +22,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.
 /// </summary>
 [TechnicalUI]
 [System.ComponentModel.DesignerCategory("")]
-public class PersistableToolboxDockContent:DockContent
+public class PersistableToolboxDockContent : DockContent
 {
     public const string Prefix = "Toolbox";
 
@@ -33,11 +33,9 @@ public PersistableToolboxDockContent(RDMPCollection collectionType)
     {
         CollectionType = collectionType;
     }
+
     protected override string GetPersistString()
     {
-
-
-
         var args = new Dictionary<string, string>
         {
             { "Toolbox", CollectionType.ToString() }
@@ -46,10 +44,8 @@ protected override string GetPersistString()
 
         return Prefix + PersistStringHelper.Separator + PersistStringHelper.SaveDictionaryToString(args);
     }
-    public RDMPCollectionUI GetCollection()
-    {
-        return Controls.OfType<RDMPCollectionUI>().SingleOrDefault();
-    }
+
+    public RDMPCollectionUI GetCollection() => Controls.OfType<RDMPCollectionUI>().SingleOrDefault();
 
     public static RDMPCollection? GetToolboxFromPersistString(string persistString)
     {
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistenceDecisionFactory.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistenceDecisionFactory.cs
index 5f1f6b4464..7d5412ad92 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistenceDecisionFactory.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/PersistenceDecisionFactory.cs
@@ -28,7 +28,7 @@ public class PersistenceDecisionFactory
     public PersistenceDecisionFactory()
     {
         //ensure dashboard UI assembly is loaded
-        Assembly.Load(typeof (RacewayRenderAreaUI).Assembly.FullName);
+        Assembly.Load(typeof(RacewayRenderAreaUI).Assembly.FullName);
         //ensure data export UI assembly is loaded
         Assembly.Load(typeof(ExtractionConfigurationUI).Assembly.FullName);
         //ensure DLE UI assembly is loaded
@@ -44,7 +44,8 @@ public PersistenceDecisionFactory()
     /// <param name="persistString"></param>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public static DeserializeInstruction ShouldCreateBasicControl(string persistString, IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    public static DeserializeInstruction ShouldCreateBasicControl(string persistString,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         if (!persistString.StartsWith(RDMPSingleControlTab.BasicPrefix))
             return null;
@@ -69,7 +70,8 @@ public static DeserializeInstruction ShouldCreateBasicControl(string persistStri
         return PersistableToolboxDockContent.GetToolboxFromPersistString(persistString);
     }
 
-    public static DeserializeInstruction ShouldCreateSingleObjectControl(string persistString, IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    public static DeserializeInstruction ShouldCreateSingleObjectControl(string persistString,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         if (!persistString.StartsWith(PersistableSingleDatabaseObjectDockContent.Prefix))
             return null;
@@ -83,45 +85,48 @@ public static DeserializeInstruction ShouldCreateSingleObjectControl(string pers
 
         var controlType = GetTypeByName(tokens[1], typeof(Control), repositoryLocator);
         var o = repositoryLocator.GetArbitraryDatabaseObject(tokens[2], tokens[3], int.Parse(tokens[4]));
-            
-        return new DeserializeInstruction(controlType,o);
 
+        return new DeserializeInstruction(controlType, o);
     }
 
-    public static DeserializeInstruction ShouldCreateObjectCollection(string persistString, IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    public static DeserializeInstruction ShouldCreateObjectCollection(string persistString,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         if (!persistString.StartsWith(PersistableObjectCollectionDockContent.Prefix))
             return null;
-            
-        if(!persistString.Contains(PersistStringHelper.ExtraText))
+
+        if (!persistString.Contains(PersistStringHelper.ExtraText))
             throw new PersistenceException($"Persistence string did not contain '{PersistStringHelper.ExtraText}");
 
         //Looks something like this  RDMPObjectCollection:MyCoolControlUI:MyControlUIsBundleOfObjects:[CatalogueRepository:AggregateConfiguration:105,CatalogueRepository:AggregateConfiguration:102,CatalogueRepository:AggregateConfiguration:101]###EXTRA_TEXT###I've got a lovely bunch of coconuts
         var tokens = persistString.Split(PersistStringHelper.Separator);
 
-        var uiType = GetTypeByName(tokens[1],typeof(Control),repositoryLocator);
-        var collectionType = GetTypeByName(tokens[2], typeof (IPersistableObjectCollection), repositoryLocator);
+        var uiType = GetTypeByName(tokens[1], typeof(Control), repositoryLocator);
+        var collectionType = GetTypeByName(tokens[2], typeof(IPersistableObjectCollection), repositoryLocator);
 
         var objectConstructor = new ObjectConstructor();
         var collectionInstance = (IPersistableObjectCollection)ObjectConstructor.Construct(collectionType);
-                
-        if(collectionInstance.DatabaseObjects == null)
+
+        if (collectionInstance.DatabaseObjects == null)
             throw new PersistenceException(
                 $"Constructor of Type '{collectionType}' did not initialise property DatabaseObjects");
 
         var allObjectsString = PersistStringHelper.MatchCollectionInString(persistString);
 
-        collectionInstance.DatabaseObjects.AddRange(PersistStringHelper.GetObjectCollectionFromPersistString(allObjectsString,repositoryLocator));
+        collectionInstance.DatabaseObjects.AddRange(
+            PersistStringHelper.GetObjectCollectionFromPersistString(allObjectsString, repositoryLocator));
 
         var extraText = PersistStringHelper.GetExtraText(persistString);
         collectionInstance.LoadExtraText(extraText);
 
-        return new DeserializeInstruction(uiType,collectionInstance);
+        return new DeserializeInstruction(uiType, collectionInstance);
     }
 
-    private static Type GetTypeByName(string s, Type expectedBaseClassType,IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    private static Type GetTypeByName(string s, Type expectedBaseClassType,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
-        var toReturn = repositoryLocator.CatalogueRepository.MEF.GetType(s) ?? throw new TypeLoadException($"Could not find Type called '{s}'");
+        var toReturn = repositoryLocator.CatalogueRepository.MEF.GetType(s) ??
+                       throw new TypeLoadException($"Could not find Type called '{s}'");
         if (expectedBaseClassType != null)
             if (!expectedBaseClassType.IsAssignableFrom(toReturn))
                 throw new TypeLoadException(
@@ -129,5 +134,4 @@ private static Type GetTypeByName(string s, Type expectedBaseClassType,IRDMPPlat
 
         return toReturn;
     }
-
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/RDMPSingleControlTab.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/RDMPSingleControlTab.cs
index 4d54276e74..87ec6121dc 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/RDMPSingleControlTab.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ContentWindowTracking/Persistence/RDMPSingleControlTab.cs
@@ -12,8 +12,6 @@
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.Refreshing;
 using Rdmp.UI.SimpleDialogs;
-
-
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.Persistence;
@@ -23,12 +21,13 @@ namespace ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.
 /// </summary>
 [System.ComponentModel.DesignerCategory("")]
 [TechnicalUI]
-public class RDMPSingleControlTab:DockContent,IRefreshBusSubscriber
+public class RDMPSingleControlTab : DockContent, IRefreshBusSubscriber
 {
     /// <summary>
     /// The control hosted on this tab
     /// </summary>
     public Control Control { get; protected set; }
+
     public const string BasicPrefix = "BASIC";
 
     protected RDMPSingleControlTab(RefreshBus refreshBus)
@@ -52,17 +51,16 @@ public RDMPSingleControlTab(RefreshBus refreshBus, Control c)
 
     public virtual void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-
     }
+
     public virtual void HandleUserRequestingTabRefresh(IActivateItems activator)
     {
-
     }
 
     public virtual void HandleUserRequestingEmphasis(IActivateItems activator)
     {
-
     }
+
     protected override string GetPersistString()
     {
         const char s = PersistStringHelper.Separator;
@@ -82,11 +80,12 @@ public void ShowHelp(IActivateItems activator)
             {
                 firstMatch ??= c.GetType().Name;
 
-                sb.AppendLine(typeDocs.GetDocumentationIfExists(c.GetType().Name,false,true));
+                sb.AppendLine(typeDocs.GetDocumentationIfExists(c.GetType().Name, false, true));
                 sb.AppendLine();
             }
 
         if (sb.Length > 0)
-            WideMessageBox.Show(firstMatch, sb.ToString(),Environment.StackTrace,  true,  firstMatch,WideMessageBoxTheme.Help);
+            WideMessageBox.Show(firstMatch, sb.ToString(), Environment.StackTrace, true, firstMatch,
+                WideMessageBoxTheme.Help);
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindow.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindow.cs
index 90d07fc4b9..94af6aebea 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindow.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindow.cs
@@ -10,7 +10,6 @@
 using Rdmp.UI.Menus.MenuItems;
 using Rdmp.UI.SimpleControls;
 using ResearchDataManagementPlatform.WindowManagement.ContentWindowTracking.Persistence;
-
 using WeifenLuo.WinFormsUI.Docking;
 
 namespace ResearchDataManagementPlatform.WindowManagement.ExtenderFunctionality;
@@ -21,14 +20,15 @@ namespace ResearchDataManagementPlatform.WindowManagement.ExtenderFunctionality;
 /// </summary>
 [TechnicalUI]
 [System.ComponentModel.DesignerCategory("")]
-public class CustomFloatWindow:FloatWindow
+public class CustomFloatWindow : FloatWindow
 {
     protected internal CustomFloatWindow(DockPanel dockPanel, DockPane pane) : base(dockPanel, pane)
     {
         Initialize();
-            
     }
-    protected internal CustomFloatWindow(DockPanel dockPanel, DockPane pane, Rectangle bounds): base(dockPanel, pane, bounds)
+
+    protected internal CustomFloatWindow(DockPanel dockPanel, DockPane pane, Rectangle bounds) : base(dockPanel, pane,
+        bounds)
     {
         Initialize();
     }
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindowFactory.cs b/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindowFactory.cs
index 702586fa90..e34dc54c9c 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindowFactory.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/ExtenderFunctionality/CustomFloatWindowFactory.cs
@@ -12,15 +12,10 @@ namespace ResearchDataManagementPlatform.WindowManagement.ExtenderFunctionality;
 /// <summary>
 /// Factory that creates custom Forms when a docked tab is dragged out into a new window (See CustomFloatWindow for implementation)
 /// </summary>
-public class CustomFloatWindowFactory: DockPanelExtender.IFloatWindowFactory
+public class CustomFloatWindowFactory : DockPanelExtender.IFloatWindowFactory
 {
-    public FloatWindow CreateFloatWindow(DockPanel dockPanel, DockPane pane)
-    {
-        return new CustomFloatWindow(dockPanel,pane);
-    }
+    public FloatWindow CreateFloatWindow(DockPanel dockPanel, DockPane pane) => new CustomFloatWindow(dockPanel, pane);
 
-    public FloatWindow CreateFloatWindow(DockPanel dockPanel, DockPane pane, Rectangle bounds)
-    {
-        return new CustomFloatWindow(dockPanel,pane,bounds);
-    }
+    public FloatWindow CreateFloatWindow(DockPanel dockPanel, DockPane pane, Rectangle bounds) =>
+        new CustomFloatWindow(dockPanel, pane, bounds);
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs
index 234c55c193..2ce722c7be 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeBoxUI.cs
@@ -27,18 +27,20 @@ public partial class HomeBoxUI : UserControl
     private bool _doneSetup = false;
     private Type _openType;
 
-    private RDMPCollectionCommonFunctionality CommonTreeFunctionality { get;} = new RDMPCollectionCommonFunctionality();
+    private RDMPCollectionCommonFunctionality CommonTreeFunctionality { get; } = new();
 
     public HomeBoxUI()
     {
         InitializeComponent();
         olvRecent.ItemActivate += OlvRecent_ItemActivate;
     }
-    public void SetUp(IActivateItems activator,string title, Type openType,AtomicCommandUIFactory factory, params IAtomicCommand[] newCommands)
+
+    public void SetUp(IActivateItems activator, string title, Type openType, AtomicCommandUIFactory factory,
+        params IAtomicCommand[] newCommands)
     {
         _openType = openType;
 
-            
+
         if (!_doneSetup)
         {
             _activator = activator;
@@ -56,34 +58,34 @@ public void SetUp(IActivateItems activator,string title, Type openType,AtomicCom
             btnOpen.DisplayStyle = ToolStripItemDisplayStyle.Text;
             btnOpen.Click += (s, e) =>
             {
-                if(activator.SelectObject(new DialogArgs
-                   {
-                       WindowTitle = "Open"
-                   },activator.GetAll(openType).ToArray(),out var selected))
-                {
+                if (activator.SelectObject(new DialogArgs
+                    {
+                        WindowTitle = "Open"
+                    }, activator.GetAll(openType).ToArray(), out var selected))
                     Open(selected);
-                }
             };
 
-            
+
             //if there's only one command for new
             if (newCommands.Length == 1)
             {
                 //don't use the dropdown
                 toolStrip1.Items.Remove(btnNewDropdown);
-                btnNew.Click += (s,e)=>newCommands.Single().Execute();
+                btnNew.Click += (s, e) => newCommands.Single().Execute();
             }
             else
             {
                 toolStrip1.Items.Remove(btnNew);
-                btnNewDropdown.DropDownItems.AddRange(newCommands.Select(factory.CreateMenuItem).Cast<ToolStripItem>().ToArray());    
+                btnNewDropdown.DropDownItems.AddRange(newCommands.Select(factory.CreateMenuItem).Cast<ToolStripItem>()
+                    .ToArray());
             }
 
             olvName.AspectGetter = o => ((HistoryEntry)o).Object.ToString();
-            CommonTreeFunctionality.SetUp(RDMPCollection.None,olvRecent,activator,olvName,olvName,new RDMPCollectionCommonFunctionalitySettings
-            {
-                SuppressChildrenAdder = true
-            });
+            CommonTreeFunctionality.SetUp(RDMPCollection.None, olvRecent, activator, olvName, olvName,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    SuppressChildrenAdder = true
+                });
 
             _doneSetup = true;
         }
@@ -94,12 +96,12 @@ public void SetUp(IActivateItems activator,string title, Type openType,AtomicCom
     private void RefreshHistory()
     {
         olvRecent.ClearObjects();
-        olvRecent.AddObjects(_activator.HistoryProvider.History.Where(h=>h.Object.GetType() == _openType).ToArray());
+        olvRecent.AddObjects(_activator.HistoryProvider.History.Where(h => h.Object.GetType() == _openType).ToArray());
     }
 
     private void Open(IMapsDirectlyToDatabaseTable o)
     {
-        if (!((DatabaseEntity) o).Exists())
+        if (!((DatabaseEntity)o).Exists())
         {
             if (_activator.YesNo($"'{o}' no longer exists, remove from Recent list?", "No longer exists"))
             {
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeUI.cs b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeUI.cs
index 6f8f110392..4f57024a56 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeUI.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/HomePane/HomeUI.cs
@@ -27,7 +27,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.HomePane;
 /// 
 /// <para>You can access the HomeUI at any time by clicking the home icon in the top left of the RDMP tool bar.</para>
 /// </summary>
-public partial class HomeUI : RDMPUserControl,ILifetimeSubscriber
+public partial class HomeUI : RDMPUserControl, ILifetimeSubscriber
 {
     private readonly IActivateItems _activator;
     private readonly AtomicCommandUIFactory _uiFactory;
@@ -41,7 +41,7 @@ public HomeUI(IActivateItems activator)
 
     private void BuildCommandLists()
     {
-        boxCatalogue.SetUp(Activator,"Catalogue",typeof(Catalogue),_uiFactory,
+        boxCatalogue.SetUp(Activator, "Catalogue", typeof(Catalogue), _uiFactory,
             new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator)
             {
                 OverrideCommandName = GlobalStrings.FromFile
@@ -50,27 +50,28 @@ private void BuildCommandLists()
             {
                 OverrideCommandName = GlobalStrings.FromDatabase
             });
-        boxProject.SetUp(Activator,"Project",typeof(Project),_uiFactory, new ExecuteCommandCreateNewDataExtractionProject(_activator));
-            
-        boxCohort.SetUp(Activator,"Cohort Builder", typeof(CohortIdentificationConfiguration),_uiFactory,
+        boxProject.SetUp(Activator, "Project", typeof(Project), _uiFactory,
+            new ExecuteCommandCreateNewDataExtractionProject(_activator));
+
+        boxCohort.SetUp(Activator, "Cohort Builder", typeof(CohortIdentificationConfiguration), _uiFactory,
             new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
             {
                 OverrideCommandName = "Cohort Builder Query",
                 PromptToPickAProject = true
-
             },
-            new ExecuteCommandCreateNewCohortFromFile(_activator,null,null)
+            new ExecuteCommandCreateNewCohortFromFile(_activator, null, null)
             {
                 OverrideCommandName = GlobalStrings.FromFile
             }
         );
-        boxDataLoad.SetUp(Activator,"Data Load",typeof(LoadMetadata),_uiFactory,new ExecuteCommandCreateNewLoadMetadata(_activator));
+        boxDataLoad.SetUp(Activator, "Data Load", typeof(LoadMetadata), _uiFactory,
+            new ExecuteCommandCreateNewLoadMetadata(_activator));
     }
-        
+
     protected override void OnLoad(EventArgs e)
     {
         base.OnLoad(e);
-            
+
         SetItemActivator(_activator);
 
         BuildCommandLists();
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/Licenses/License.cs b/Application/ResearchDataManagementPlatform/WindowManagement/Licenses/License.cs
index ac5c3587de..52517686d5 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/Licenses/License.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/Licenses/License.cs
@@ -58,7 +58,8 @@ public string GetLicenseText()
 
     private Stream GetStream()
     {
-        var stream = typeof (License).Assembly.GetManifestResourceStream(_resourceFilename) ?? throw new Exception($"Could not find EmbeddedResource '{_resourceFilename}'");
+        var stream = typeof(License).Assembly.GetManifestResourceStream(_resourceFilename) ??
+                     throw new Exception($"Could not find EmbeddedResource '{_resourceFilename}'");
         return stream;
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TabNavigation.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TabNavigation.cs
index b04b8abeb1..d598d51cb9 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/TabNavigation.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/TabNavigation.cs
@@ -12,7 +12,7 @@ namespace ResearchDataManagementPlatform.WindowManagement;
 /// <summary>
 /// Records the fact that the user visited a specific <see cref="DockContent"/> (Tab)
 /// </summary>
-public class TabNavigation: INavigation
+public class TabNavigation : INavigation
 {
     public DockContent Tab { get; }
 
@@ -32,22 +32,18 @@ public void Close()
     {
         Tab.Close();
     }
-    public override string ToString()
-    {
-        return Tab.TabText;
-    }
 
-    public override bool Equals(object obj)
-    {
-        return obj is TabNavigation navigation &&
-               EqualityComparer<DockContent>.Default.Equals(Tab, navigation.Tab);
-    }
+    public override string ToString() => Tab.TabText;
+
+    public override bool Equals(object obj) =>
+        obj is TabNavigation navigation &&
+        EqualityComparer<DockContent>.Default.Equals(Tab, navigation.Tab);
 
     public override int GetHashCode()
     {
         unchecked
         {
             return -2031380020 + EqualityComparer<DockContent>.Default.GetHashCode(Tab);
-        }            
+        }
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs
index 380ce48905..9d2e3093c2 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/TabPageContextMenus/RDMPSingleControlTabMenu.cs
@@ -39,20 +39,23 @@ public RDMPSingleControlTabMenu(IActivateItems activator, RDMPSingleControlTab t
             var uiFactory = new AtomicCommandUIFactory(activator);
             var builder = new GoToCommandFactory(activator);
 
-            var gotoMenu = new ToolStripMenuItem(AtomicCommandFactory.GoTo){Enabled = false };
+            var gotoMenu = new ToolStripMenuItem(AtomicCommandFactory.GoTo) { Enabled = false };
             Items.Add(gotoMenu);
 
-            foreach(var cmd in builder.GetCommands(single.DatabaseObject).OfType<ExecuteCommandShow>())
+            foreach (var cmd in builder.GetCommands(single.DatabaseObject).OfType<ExecuteCommandShow>())
             {
                 gotoMenu.DropDownItems.Add(uiFactory.CreateMenuItem(cmd));
                 gotoMenu.Enabled = true;
             }
+
             RDMPContextMenuStrip.RegisterFetchGoToObjecstCallback(gotoMenu);
         }
 
-        Items.Add("Refresh", FamFamFamIcons.arrow_refresh.ImageToBitmap(), (s, e) => _tab.HandleUserRequestingTabRefresh(activator));
+        Items.Add("Refresh", FamFamFamIcons.arrow_refresh.ImageToBitmap(),
+            (s, e) => _tab.HandleUserRequestingTabRefresh(activator));
 
-        var help = new ToolStripMenuItem("Help", FamFamFamIcons.help.ImageToBitmap(), (s, e) => _tab.ShowHelp(activator))
+        var help = new ToolStripMenuItem("Help", FamFamFamIcons.help.ImageToBitmap(),
+            (s, e) => _tab.ShowHelp(activator))
         {
             ShortcutKeys = Keys.F1
         };
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs
index c315d0e8ae..9883ccf518 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/TopBar/RDMPTaskBarUI.cs
@@ -25,7 +25,7 @@ namespace ResearchDataManagementPlatform.WindowManagement.TopBar;
 public partial class RDMPTaskBarUI : UserControl
 {
     private WindowManager _manager;
-        
+
     private const string CreateNewLayout = "<<New Layout>>";
 
     public RDMPTaskBarUI()
@@ -34,23 +34,26 @@ public RDMPTaskBarUI()
 
         btnHome.Image = FamFamFamIcons.application_home.ImageToBitmap();
         btnCatalogues.Image = CatalogueIcons.Catalogue.ImageToBitmap();
-        btnCatalogues.BackgroundImage = BackColorProvider.GetBackgroundImage(btnCatalogues.Size, RDMPCollection.Catalogue);
+        btnCatalogues.BackgroundImage =
+            BackColorProvider.GetBackgroundImage(btnCatalogues.Size, RDMPCollection.Catalogue);
 
         btnCohorts.Image = CatalogueIcons.CohortIdentificationConfiguration.ImageToBitmap();
         btnCohorts.BackgroundImage = BackColorProvider.GetBackgroundImage(btnCohorts.Size, RDMPCollection.Cohort);
 
         btnSavedCohorts.Image = CatalogueIcons.AllCohortsNode.ImageToBitmap();
-        btnSavedCohorts.BackgroundImage = BackColorProvider.GetBackgroundImage(btnSavedCohorts.Size, RDMPCollection.SavedCohorts);
+        btnSavedCohorts.BackgroundImage =
+            BackColorProvider.GetBackgroundImage(btnSavedCohorts.Size, RDMPCollection.SavedCohorts);
 
         btnDataExport.Image = CatalogueIcons.Project.ImageToBitmap();
-        btnDataExport.BackgroundImage = BackColorProvider.GetBackgroundImage(btnDataExport.Size, RDMPCollection.DataExport);
+        btnDataExport.BackgroundImage =
+            BackColorProvider.GetBackgroundImage(btnDataExport.Size, RDMPCollection.DataExport);
 
         btnTables.Image = CatalogueIcons.TableInfo.ImageToBitmap();
         btnTables.BackgroundImage = BackColorProvider.GetBackgroundImage(btnTables.Size, RDMPCollection.Tables);
 
         btnLoad.Image = CatalogueIcons.LoadMetadata.ImageToBitmap();
         btnLoad.BackgroundImage = BackColorProvider.GetBackgroundImage(btnLoad.Size, RDMPCollection.DataLoad);
-            
+
         btnFavourites.Image = CatalogueIcons.Favourite.ImageToBitmap();
         btnDeleteLayout.Image = FamFamFamIcons.delete.ImageToBitmap();
 
@@ -65,23 +68,22 @@ public void SetWindowManager(WindowManager manager)
         _manager = manager;
 
         //Update task bar buttons enabledness when the user navigates somewhere
-        _manager.Navigation.Changed += (s,e)=> UpdateForwardBackEnabled();
+        _manager.Navigation.Changed += (s, e) => UpdateForwardBackEnabled();
 
         btnDataExport.Enabled = manager.RepositoryLocator.DataExportRepository != null;
-            
+
         ReCreateDropDowns();
-            
+
         SetupToolTipText();
 
         _manager.ActivateItems.Theme.ApplyTo(toolStrip1);
 
         // if we don't support commit system then disable the task bar button for it
-        if(!_manager.ActivateItems.RepositoryLocator.CatalogueRepository.SupportsCommits)
+        if (!_manager.ActivateItems.RepositoryLocator.CatalogueRepository.SupportsCommits)
         {
             cbCommits.Enabled = false;
             cbCommits.Text = "Repository does not support commits";
         }
-            
     }
 
     /// <summary>
@@ -109,9 +111,9 @@ private void SetupToolTipText()
         }
         catch (Exception e)
         {
-            _manager.ActivateItems.GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs("Failed to setup tool tips", CheckResult.Fail, e));
+            _manager.ActivateItems.GlobalErrorCheckNotifier.OnCheckPerformed(
+                new CheckEventArgs("Failed to setup tool tips", CheckResult.Fail, e));
         }
-
     }
 
     private void ReCreateDropDowns()
@@ -119,13 +121,14 @@ private void ReCreateDropDowns()
         CreateDropDown<WindowLayout>(cbxLayouts, CreateNewLayout);
     }
 
-    private void CreateDropDown<T>(ToolStripComboBox cbx, string createNewDashboard) where T:IMapsDirectlyToDatabaseTable, INamed
+    private void CreateDropDown<T>(ToolStripComboBox cbx, string createNewDashboard)
+        where T : IMapsDirectlyToDatabaseTable, INamed
     {
         const int xPaddingForComboText = 10;
 
         if (cbx.ComboBox == null)
             throw new Exception("Expected combo box!");
-            
+
         cbx.ComboBox.Items.Clear();
 
         var objects = _manager.RepositoryLocator.CatalogueRepository.GetAllObjects<T>();
@@ -171,17 +174,13 @@ private RDMPCollection ButtonToEnum(object button)
 
         if (button == btnCatalogues)
             collectionToToggle = RDMPCollection.Catalogue;
-        else
-        if (button == btnCohorts)
+        else if (button == btnCohorts)
             collectionToToggle = RDMPCollection.Cohort;
-        else
-        if (button == btnDataExport)
+        else if (button == btnDataExport)
             collectionToToggle = RDMPCollection.DataExport;
-        else
-        if (button == btnTables)
+        else if (button == btnTables)
             collectionToToggle = RDMPCollection.Tables;
-        else
-        if (button == btnLoad)
+        else if (button == btnLoad)
             collectionToToggle = RDMPCollection.DataLoad;
         else if (button == btnSavedCohorts)
             collectionToToggle = RDMPCollection.SavedCohorts;
@@ -193,7 +192,7 @@ private RDMPCollection ButtonToEnum(object button)
         return collectionToToggle;
     }
 
-        
+
     private void cbx_DropDownClosed(object sender, EventArgs e)
     {
         var cbx = (ToolStripComboBox)sender;
@@ -211,7 +210,6 @@ private void cbx_DropDownClosed(object sender, EventArgs e)
     }
 
 
-
     private void cbx_SelectedIndexChanged(object sender, EventArgs e)
     {
         UpdateButtonEnabledness();
@@ -230,7 +228,7 @@ private void AddNewLayout()
         var dialog = new TypeTextOrCancelDialog("Layout Name", "Name", 100, null, false);
         if (dialog.ShowDialog() == DialogResult.OK)
         {
-            var layout = new WindowLayout(_manager.RepositoryLocator.CatalogueRepository, dialog.ResultText,xml);
+            var layout = new WindowLayout(_manager.RepositoryLocator.CatalogueRepository, dialog.ResultText, xml);
 
             var cmd = new ExecuteCommandActivate(_manager.ActivateItems, layout);
             cmd.Execute();
@@ -262,7 +260,7 @@ private void btnDelete_Click(object sender, EventArgs e)
 
     private void btnSaveWindowLayout_Click(object sender, EventArgs e)
     {
-        if(cbxLayouts.SelectedItem is WindowLayout layout)
+        if (cbxLayouts.SelectedItem is WindowLayout layout)
         {
             var xml = _manager.MainForm.GetCurrentLayoutXml();
 
@@ -290,7 +288,7 @@ private void btnBack_DropDownOpening(object sender, EventArgs e)
         foreach (var history in _manager.Navigation.GetHistory(16))
         {
             var i = backIndex++;
-            btnBack.DropDownItems.Add(history.ToString(),null,(a,b)=>_manager.Navigation.Back(i,true));
+            btnBack.DropDownItems.Add(history.ToString(), null, (a, b) => _manager.Navigation.Back(i, true));
         }
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/UIObjectConstructor.cs b/Application/ResearchDataManagementPlatform/WindowManagement/UIObjectConstructor.cs
index 7257c8295c..dcf6724ef4 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/UIObjectConstructor.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/UIObjectConstructor.cs
@@ -13,10 +13,8 @@ namespace ResearchDataManagementPlatform.WindowManagement;
 /// <summary>
 /// Provides UI specific helpful overloads to ObjectConstructor (which is defined in a data class)
 /// </summary>
-public class UIObjectConstructor:ObjectConstructor
+public class UIObjectConstructor : ObjectConstructor
 {
-    public static object Construct(Type t,IActivateItems itemActivator, bool allowBlankConstructors = true)
-    {
-        return ObjectConstructor.Construct(t, itemActivator, allowBlankConstructors);
-    }
+    public static object Construct(Type t, IActivateItems itemActivator, bool allowBlankConstructors = true) =>
+        ObjectConstructor.Construct(t, itemActivator, allowBlankConstructors);
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/WindowArranging/WindowArranger.cs b/Application/ResearchDataManagementPlatform/WindowManagement/WindowArranging/WindowArranger.cs
index 9c4520ff96..712016bcef 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/WindowArranging/WindowArranger.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/WindowArranging/WindowArranger.cs
@@ -25,11 +25,11 @@ public class WindowArranger : IArrangeWindows
     public WindowArranger(IActivateItems activator, WindowManager windowManager, DockPanel mainDockPanel)
     {
         _activator = activator;
-        _windowManager =windowManager;
+        _windowManager = windowManager;
     }
-        
+
     public void SetupEditAnything(object sender, IMapsDirectlyToDatabaseTable o)
-    {            
+    {
         _activator.RequestItemEmphasis(this, new EmphasiseRequest(o));
 
         var activate = new ExecuteCommandActivate(_activator, o);
@@ -39,7 +39,6 @@ public void SetupEditAnything(object sender, IMapsDirectlyToDatabaseTable o)
             activate.Execute();
         else
             _activator.RequestItemEmphasis(this, new EmphasiseRequest(o, 1)); //otherwise just show it
-        
     }
 
     public void Setup(WindowLayout target)
@@ -48,9 +47,9 @@ public void Setup(WindowLayout target)
         var oldXml = _windowManager.MainForm.GetCurrentLayoutXml();
         var newXml = target.LayoutData;
 
-        if(AreBasicallyTheSameLayout(oldXml, newXml))
+        if (AreBasicallyTheSameLayout(oldXml, newXml))
             return;
-            
+
         _windowManager.CloseAllToolboxes();
         _windowManager.CloseAllWindows();
         _windowManager.MainForm.LoadFromXml(target);
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/WindowFactory.cs b/Application/ResearchDataManagementPlatform/WindowManagement/WindowFactory.cs
index 7d52d5c285..099b32cdb1 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/WindowFactory.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/WindowFactory.cs
@@ -40,43 +40,46 @@ public class WindowFactory
 
     private readonly IconFactory _iconFactory = IconFactory.Instance;
 
-        
+
     public WindowFactory(IRDMPPlatformRepositoryServiceLocator repositoryLocator, WindowManager windowManager)
     {
         _windowManager = windowManager;
         RepositoryLocator = repositoryLocator;
     }
 
-    public PersistableToolboxDockContent Create(IActivateItems activator,Control control, string label, Image<Rgba32> image, RDMPCollection collection)
+    public PersistableToolboxDockContent Create(IActivateItems activator, Control control, string label,
+        Image<Rgba32> image, RDMPCollection collection)
     {
         var content = new PersistableToolboxDockContent(collection);
-            
+
         AddControlToDockContent(activator, control, content, label, image);
 
         return content;
     }
-        
-    public PersistableSingleDatabaseObjectDockContent Create(IActivateItems activator, RefreshBus refreshBus,IRDMPSingleDatabaseObjectControl control, Image<Rgba32> image, IMapsDirectlyToDatabaseTable databaseObject)
+
+    public PersistableSingleDatabaseObjectDockContent Create(IActivateItems activator, RefreshBus refreshBus,
+        IRDMPSingleDatabaseObjectControl control, Image<Rgba32> image, IMapsDirectlyToDatabaseTable databaseObject)
     {
-        var content = new PersistableSingleDatabaseObjectDockContent(control, databaseObject,refreshBus);
+        var content = new PersistableSingleDatabaseObjectDockContent(control, databaseObject, refreshBus);
         _windowManager.AddWindow(content);
 
-        AddControlToDockContent(activator, (Control)control,content,"Loading...",image);
-            
+        AddControlToDockContent(activator, (Control)control, content, "Loading...", image);
+
         if (!RDMPMainForm.Loading)
             activator.HistoryProvider.Add(databaseObject);
 
         return content;
     }
 
-    public PersistableObjectCollectionDockContent Create(IActivateItems activator, IObjectCollectionControl control, IPersistableObjectCollection objectCollection, Image<Rgba32> image)
+    public PersistableObjectCollectionDockContent Create(IActivateItems activator, IObjectCollectionControl control,
+        IPersistableObjectCollection objectCollection, Image<Rgba32> image)
     {
         //create a new persistable docking tab
-        var content = new PersistableObjectCollectionDockContent(activator,control,objectCollection);
+        var content = new PersistableObjectCollectionDockContent(activator, control, objectCollection);
 
         //add the control to the tab
-        AddControlToDockContent(activator,(Control)control, content,content.TabText, image);
-            
+        AddControlToDockContent(activator, (Control)control, content, content.TabText, image);
+
         //add to the window tracker
         _windowManager.AddWindow(content);
 
@@ -84,7 +87,8 @@ public PersistableObjectCollectionDockContent Create(IActivateItems activator, I
         return content;
     }
 
-    public PersistableSingleDatabaseObjectDockContent Create(IActivateItems activator, IRDMPSingleDatabaseObjectControl control, DatabaseEntity entity)
+    public PersistableSingleDatabaseObjectDockContent Create(IActivateItems activator,
+        IRDMPSingleDatabaseObjectControl control, DatabaseEntity entity)
     {
         var content = new PersistableSingleDatabaseObjectDockContent(control, entity, activator.RefreshBus);
 
@@ -100,33 +104,30 @@ public PersistableSingleDatabaseObjectDockContent Create(IActivateItems activato
 
     public DockContent Create(IActivateItems activator, Control control, string label, Image<Rgba32> image)
     {
-        DockContent content = new RDMPSingleControlTab(activator.RefreshBus,control);
-            
-        AddControlToDockContent(activator, control, content,label, image);
+        DockContent content = new RDMPSingleControlTab(activator.RefreshBus, control);
+
+        AddControlToDockContent(activator, control, content, label, image);
 
         _windowManager.AddAdhocWindow(content);
 
         return content;
     }
 
-    private void AddControlToDockContent(IActivateItems activator, Control control,DockContent content, string label, Image<Rgba32> image)
+    private void AddControlToDockContent(IActivateItems activator, Control control, DockContent content, string label,
+        Image<Rgba32> image)
     {
         control.Dock = DockStyle.Fill;
         content.Controls.Add(control);
         content.TabText = label;
-            
-        if(image != null)
-        {
-            content.Icon = _iconFactory.GetIcon(image);
-        }
-                
-    
+
+        if (image != null) content.Icon = _iconFactory.GetIcon(image);
+
 
         if (control is IConsultableBeforeClosing consult)
             content.FormClosing += consult.ConsultAboutClosing;
 
-        if(control is ISaveableUI saveable)
-            content.FormClosing += (s,e)=>saveable.GetObjectSaverButton()?.CheckForUnsavedChangesAnOfferToSave();            
+        if (control is ISaveableUI saveable)
+            content.FormClosing += (s, e) => saveable.GetObjectSaverButton()?.CheckForUnsavedChangesAnOfferToSave();
 
         content.KeyPreview = true;
 
@@ -136,21 +137,18 @@ private void AddControlToDockContent(IActivateItems activator, Control control,D
 
             //Create handler for AfterPublish
             RefreshObjectEventHandler handler = null;
-            handler = (s,e)=>
-            { 
+            handler = (s, e) =>
+            {
                 // After global changes, rebuild the context menu
 
-                if(!content.IsDisposed)
+                if (!content.IsDisposed)
                     content.TabPageContextMenuStrip = new RDMPSingleControlTabMenu(activator, tab, _windowManager);
-                else
-                if(handler != null)
+                else if (handler != null)
                     activator.RefreshBus.AfterPublish -= handler; //don't leak handlers
             };
 
             //register the event handler
             activator.RefreshBus.AfterPublish += handler;
-                
         }
-                
     }
 }
\ No newline at end of file
diff --git a/Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs b/Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs
index aad67b5ddb..a660577ea1 100644
--- a/Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs
+++ b/Application/ResearchDataManagementPlatform/WindowManagement/WindowManager.cs
@@ -38,7 +38,7 @@ namespace ResearchDataManagementPlatform.WindowManagement;
 public class WindowManager
 {
     private readonly Dictionary<RDMPCollection, PersistableToolboxDockContent> _visibleToolboxes = new();
-    private readonly List<RDMPSingleControlTab>  _trackedWindows = new();
+    private readonly List<RDMPSingleControlTab> _trackedWindows = new();
     private readonly List<DockContent> _trackedAdhocWindows = new();
 
     public NavigationTrack<INavigation> Navigation { get; private set; }
@@ -61,26 +61,29 @@ public class WindowManager
     private HomeUI _home;
     private DockContent _homeContent;
 
-    public WindowManager(ITheme theme,RDMPMainForm mainForm, RefreshBus refreshBus, DockPanel mainDockPanel, IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier globalErrorCheckNotifier)
+    public WindowManager(ITheme theme, RDMPMainForm mainForm, RefreshBus refreshBus, DockPanel mainDockPanel,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier globalErrorCheckNotifier)
     {
-        _windowFactory = new WindowFactory(repositoryLocator,this);
-        ActivateItems = new ActivateItems(theme,refreshBus, mainDockPanel, repositoryLocator, _windowFactory, this, globalErrorCheckNotifier);
+        _windowFactory = new WindowFactory(repositoryLocator, this);
+        ActivateItems = new ActivateItems(theme, refreshBus, mainDockPanel, repositoryLocator, _windowFactory, this,
+            globalErrorCheckNotifier);
 
-        GlobalExceptionHandler.Instance.Handler = e=>globalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs(e.Message,CheckResult.Fail,e));
+        GlobalExceptionHandler.Instance.Handler = e =>
+            globalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs(e.Message, CheckResult.Fail, e));
 
         _mainDockPanel = mainDockPanel;
-            
+
         MainForm = mainForm;
         RepositoryLocator = repositoryLocator;
 
-        Navigation = new NavigationTrack<INavigation>(c=>c.IsAlive,c=>c.Activate(ActivateItems));
+        Navigation = new NavigationTrack<INavigation>(c => c.IsAlive, c => c.Activate(ActivateItems));
         mainDockPanel.ActiveDocumentChanged += mainDockPanel_ActiveDocumentChanged;
         ActivateItems.Emphasise += RecordEmphasis;
     }
 
     private void RecordEmphasis(object sender, EmphasiseEventArgs args)
     {
-        if(args.Request.ObjectToEmphasise is IMapsDirectlyToDatabaseTable m)
+        if (args.Request.ObjectToEmphasise is IMapsDirectlyToDatabaseTable m)
             Navigation.Append(new CollectionNavigation(m));
     }
 
@@ -90,7 +93,8 @@ private void RecordEmphasis(object sender, EmphasiseEventArgs args)
     /// <param name="collectionToCreate"></param>
     /// <param name="position"></param>
     /// <returns></returns>
-    public PersistableToolboxDockContent Create(RDMPCollection collectionToCreate, DockState position = DockState.DockLeft)
+    public PersistableToolboxDockContent Create(RDMPCollection collectionToCreate,
+        DockState position = DockState.DockLeft)
     {
         PersistableToolboxDockContent toReturn;
         RDMPCollectionUI collection;
@@ -99,41 +103,49 @@ public PersistableToolboxDockContent Create(RDMPCollection collectionToCreate, D
         {
             case RDMPCollection.Catalogue:
                 collection = new CatalogueCollectionUI();
-                toReturn = Show(RDMPCollection.Catalogue, collection, "Catalogues", Image.Load<Rgba32>(CatalogueIcons.Catalogue));
+                toReturn = Show(RDMPCollection.Catalogue, collection, "Catalogues",
+                    Image.Load<Rgba32>(CatalogueIcons.Catalogue));
                 break;
 
             case RDMPCollection.DataLoad:
                 collection = new LoadMetadataCollectionUI();
-                toReturn = Show(RDMPCollection.DataLoad, collection, "Load Configurations", Image.Load<Rgba32>(CatalogueIcons.LoadMetadata));
+                toReturn = Show(RDMPCollection.DataLoad, collection, "Load Configurations",
+                    Image.Load<Rgba32>(CatalogueIcons.LoadMetadata));
                 break;
 
             case RDMPCollection.Tables:
                 collection = new TableInfoCollectionUI();
-                toReturn = Show(RDMPCollection.Tables, collection, "Tables",Image.Load<Rgba32>(CatalogueIcons.TableInfo));
+                toReturn = Show(RDMPCollection.Tables, collection, "Tables",
+                    Image.Load<Rgba32>(CatalogueIcons.TableInfo));
                 break;
 
             case RDMPCollection.DataExport:
                 if (RepositoryLocator.DataExportRepository == null)
                 {
-                    WideMessageBox.Show("Data export database unavailable","Cannot create DataExport Toolbox because DataExportRepository has not been set/created yet");
+                    WideMessageBox.Show("Data export database unavailable",
+                        "Cannot create DataExport Toolbox because DataExportRepository has not been set/created yet");
                     return null;
                 }
 
                 collection = new DataExportCollectionUI();
-                toReturn = Show(RDMPCollection.DataExport,collection, "Projects", Image.Load<Rgba32>(CatalogueIcons.Project));
+                toReturn = Show(RDMPCollection.DataExport, collection, "Projects",
+                    Image.Load<Rgba32>(CatalogueIcons.Project));
                 break;
 
             case RDMPCollection.Cohort:
                 collection = new CohortIdentificationCollectionUI();
-                toReturn = Show(RDMPCollection.Cohort, collection, "Cohort Builder", Image.Load<Rgba32>(CatalogueIcons.CohortIdentificationConfiguration));
+                toReturn = Show(RDMPCollection.Cohort, collection, "Cohort Builder",
+                    Image.Load<Rgba32>(CatalogueIcons.CohortIdentificationConfiguration));
                 break;
             case RDMPCollection.SavedCohorts:
                 collection = new SavedCohortsCollectionUI();
-                toReturn = Show(RDMPCollection.SavedCohorts, collection, "Saved Cohorts", Image.Load<Rgba32>(CatalogueIcons.AllCohortsNode));
+                toReturn = Show(RDMPCollection.SavedCohorts, collection, "Saved Cohorts",
+                    Image.Load<Rgba32>(CatalogueIcons.AllCohortsNode));
                 break;
             case RDMPCollection.Favourites:
                 collection = new FavouritesCollectionUI();
-                toReturn = Show(RDMPCollection.Favourites, collection, "Favourites", Image.Load<Rgba32>(CatalogueIcons.Favourite));
+                toReturn = Show(RDMPCollection.Favourites, collection, "Favourites",
+                    Image.Load<Rgba32>(CatalogueIcons.Favourite));
                 break;
 
             default: throw new ArgumentOutOfRangeException(nameof(collectionToCreate));
@@ -145,9 +157,9 @@ public PersistableToolboxDockContent Create(RDMPCollection collectionToCreate, D
 
         CollectionCreated?.Invoke(this, new RDMPCollectionCreatedEventHandlerArgs(collectionToCreate));
 
-        collection.CommonTreeFunctionality.Tree.SelectionChanged += (s,e)=>
+        collection.CommonTreeFunctionality.Tree.SelectionChanged += (s, e) =>
         {
-            if(collection.CommonTreeFunctionality.Tree.SelectedObject is IMapsDirectlyToDatabaseTable im)
+            if (collection.CommonTreeFunctionality.Tree.SelectedObject is IMapsDirectlyToDatabaseTable im)
                 Navigation.Append(new CollectionNavigation(im));
         };
 
@@ -155,15 +167,17 @@ public PersistableToolboxDockContent Create(RDMPCollection collectionToCreate, D
     }
 
 
-
-    private PersistableToolboxDockContent Show(RDMPCollection collection,RDMPCollectionUI control, string label, Image<Rgba32> image)
+    private PersistableToolboxDockContent Show(RDMPCollection collection, RDMPCollectionUI control, string label,
+        Image<Rgba32> image)
     {
-        var content = _windowFactory.Create(ActivateItems,control, label, image, collection);//these are collections so are not tracked with a window tracker.
+        var content =
+            _windowFactory.Create(ActivateItems, control, label, image,
+                collection); //these are collections so are not tracked with a window tracker.
         content.Closed += (s, e) => content_Closed(collection);
 
         _visibleToolboxes.Add(collection, content);
         content.Show(_mainDockPanel, DockState.DockLeft);
-            
+
         return content;
     }
 
@@ -207,10 +221,7 @@ public void Pop(RDMPCollection collection)
     /// </summary>
     /// <param name="collection"></param>
     /// <returns></returns>
-    public bool IsVisible(RDMPCollection collection)
-    {
-        return _visibleToolboxes.ContainsKey(collection);
-    }
+    public bool IsVisible(RDMPCollection collection) => _visibleToolboxes.ContainsKey(collection);
 
     public RDMPCollection GetFocusedCollection()
     {
@@ -219,18 +230,13 @@ public RDMPCollection GetFocusedCollection()
 
     internal void OnFormClosing(System.Windows.Forms.FormClosingEventArgs e)
     {
-        foreach(var c in _trackedWindows)
-        {
-            if(c.Control is IConsultableBeforeClosing consult)
+        foreach (var c in _trackedWindows)
+            if (c.Control is IConsultableBeforeClosing consult)
             {
                 consult.ConsultAboutClosing(this, e);
 
-                if(e.Cancel)
-                {
-                    return;
-                }
+                if (e.Cancel) return;
             }
-        }
     }
 
 
@@ -244,10 +250,10 @@ public void ShowCollectionWhichSupportsRootObjectType(object root)
     {
         var collection = GetCollectionForRootObject(root);
 
-        if(collection == RDMPCollection.None)
+        if (collection == RDMPCollection.None)
             return;
 
-        if(IsVisible(collection))
+        if (IsVisible(collection))
         {
             Pop(collection);
             return;
@@ -258,25 +264,25 @@ public void ShowCollectionWhichSupportsRootObjectType(object root)
 
     public RDMPCollection GetCollectionForRootObject(object root)
     {
-        if (FavouritesCollectionUI.IsRootObject(ActivateItems,root))
+        if (FavouritesCollectionUI.IsRootObject(ActivateItems, root))
             return RDMPCollection.Favourites;
 
-        if(CatalogueCollectionUI.IsRootObject(root))
+        if (CatalogueCollectionUI.IsRootObject(root))
             return RDMPCollection.Catalogue;
 
-        if(CohortIdentificationCollectionUI.IsRootObject(root))
+        if (CohortIdentificationCollectionUI.IsRootObject(root))
             return RDMPCollection.Cohort;
 
-        if(DataExportCollectionUI.IsRootObject(root))
+        if (DataExportCollectionUI.IsRootObject(root))
             return RDMPCollection.DataExport;
 
-        if(LoadMetadataCollectionUI.IsRootObject(root))
+        if (LoadMetadataCollectionUI.IsRootObject(root))
             return RDMPCollection.DataLoad;
 
-        if(TableInfoCollectionUI.IsRootObject(root))
+        if (TableInfoCollectionUI.IsRootObject(root))
             return RDMPCollection.Tables;
 
-        if(SavedCohortsCollectionUI.IsRootObject(root))
+        if (SavedCohortsCollectionUI.IsRootObject(root))
             return RDMPCollection.SavedCohorts;
 
         return RDMPCollection.None;
@@ -287,11 +293,12 @@ public RDMPCollection GetCollectionForRootObject(object root)
     /// </summary>
     public void PopHome()
     {
-        if(_home == null)
+        if (_home == null)
         {
             _home = new HomeUI(ActivateItems);
 
-            _homeContent = _windowFactory.Create(ActivateItems, _home, "Home", Image.Load<Rgba32>(FamFamFamIcons.application_home));
+            _homeContent = _windowFactory.Create(ActivateItems, _home, "Home",
+                Image.Load<Rgba32>(FamFamFamIcons.application_home));
             _homeContent.Closed += (s, e) => _home = null;
             _homeContent.Show(_mainDockPanel, DockState.Document);
         }
@@ -306,7 +313,7 @@ public void PopHome()
     /// </summary>
     public void CloseAllToolboxes()
     {
-        foreach (RDMPCollection collection in Enum.GetValues(typeof (RDMPCollection)))
+        foreach (RDMPCollection collection in Enum.GetValues(typeof(RDMPCollection)))
             if (IsVisible(collection))
                 Destroy(collection);
     }
@@ -326,7 +333,7 @@ public void CloseAllWindows()
     /// <param name="tab"></param>
     public void CloseAllWindows(RDMPSingleControlTab tab)
     {
-        if(tab != null)
+        if (tab != null)
         {
             CloseAllButThis(tab);
             tab.Close();
@@ -343,9 +350,9 @@ public void CloseAllWindows(RDMPSingleControlTab tab)
 
     private void mainDockPanel_ActiveDocumentChanged(object sender, EventArgs e)
     {
-        var newTab = (DockContent) _mainDockPanel.ActiveDocument;
-            
-        if(newTab != null && newTab.ParentForm != null)
+        var newTab = (DockContent)_mainDockPanel.ActiveDocument;
+
+        if (newTab != null && newTab.ParentForm != null)
         {
             Navigation.Append(new TabNavigation(newTab));
             newTab.ParentForm.Text = $"{newTab.TabText} - RDMP";
@@ -363,13 +370,14 @@ private void mainDockPanel_ActiveDocumentChanged(object sender, EventArgs e)
     /// <param name="window"></param>
     public void AddWindow(RDMPSingleControlTab window)
     {
-        if(window is PersistableSingleDatabaseObjectDockContent singleObjectUI)
-            if(AlreadyActive(singleObjectUI.Control.GetType(),singleObjectUI.DatabaseObject))
-                throw new ArgumentOutOfRangeException($"Cannot create another window for object {singleObjectUI.DatabaseObject} of type {singleObjectUI.Control.GetType()} because there is already a window active for that object/window type");
-            
+        if (window is PersistableSingleDatabaseObjectDockContent singleObjectUI)
+            if (AlreadyActive(singleObjectUI.Control.GetType(), singleObjectUI.DatabaseObject))
+                throw new ArgumentOutOfRangeException(
+                    $"Cannot create another window for object {singleObjectUI.DatabaseObject} of type {singleObjectUI.Control.GetType()} because there is already a window active for that object/window type");
+
         _trackedWindows.Add(window);
 
-        window.FormClosed += (s,e)=>Remove(window);
+        window.FormClosed += (s, e) => Remove(window);
     }
 
     /// <summary>
@@ -387,15 +395,20 @@ private void Remove(RDMPSingleControlTab window)
         _trackedWindows.Remove(window);
     }
 
-    public PersistableSingleDatabaseObjectDockContent GetActiveWindowIfAnyFor(Type windowType, IMapsDirectlyToDatabaseTable databaseObject)
+    public PersistableSingleDatabaseObjectDockContent GetActiveWindowIfAnyFor(Type windowType,
+        IMapsDirectlyToDatabaseTable databaseObject)
     {
-        return _trackedWindows.OfType<PersistableSingleDatabaseObjectDockContent>().SingleOrDefault(t => t.Control.GetType() == windowType && t.DatabaseObject.Equals(databaseObject));
+        return _trackedWindows.OfType<PersistableSingleDatabaseObjectDockContent>().SingleOrDefault(t =>
+            t.Control.GetType() == windowType && t.DatabaseObject.Equals(databaseObject));
     }
 
-    public PersistableObjectCollectionDockContent GetActiveWindowIfAnyFor(Type windowType, IPersistableObjectCollection collection)
+    public PersistableObjectCollectionDockContent GetActiveWindowIfAnyFor(Type windowType,
+        IPersistableObjectCollection collection)
     {
-        return _trackedWindows.OfType<PersistableObjectCollectionDockContent>().SingleOrDefault(t => t.Control.GetType() == windowType && t.Collection.Equals(collection));
+        return _trackedWindows.OfType<PersistableObjectCollectionDockContent>()
+            .SingleOrDefault(t => t.Control.GetType() == windowType && t.Collection.Equals(collection));
     }
+
     /// <summary>
     /// Check whether a given RDMPSingleControlTab is already showing with the given DatabaseObject (e.g. is user currently editing Catalogue bob in CatalogueUI)
     /// </summary>
@@ -408,7 +421,8 @@ public bool AlreadyActive(Type windowType, IMapsDirectlyToDatabaseTable database
         if (!typeof(IRDMPSingleDatabaseObjectControl).IsAssignableFrom(windowType))
             throw new ArgumentException("windowType must be a Type derrived from RDMPSingleControlTab");
 
-        return _trackedWindows.OfType<PersistableSingleDatabaseObjectDockContent>().Any(t => t.Control.GetType() == windowType && t.DatabaseObject.Equals(databaseObject));
+        return _trackedWindows.OfType<PersistableSingleDatabaseObjectDockContent>().Any(t =>
+            t.Control.GetType() == windowType && t.DatabaseObject.Equals(databaseObject));
     }
 
     /// <summary>
@@ -449,7 +463,7 @@ public void CloseCurrentTab()
         finally
         {
             Navigation.Resume();
-            if(_mainDockPanel.ActiveDocument is DockContent dc)
+            if (_mainDockPanel.ActiveDocument is DockContent dc)
                 Navigation.Append(new TabNavigation(dc));
         }
     }
diff --git a/Documentation/CodeTutorials/CreatingANewCollectionTreeNode.md b/Documentation/CodeTutorials/CreatingANewCollectionTreeNode.md
index e91a76df4d..8d0f84cabb 100644
--- a/Documentation/CodeTutorials/CreatingANewCollectionTreeNode.md
+++ b/Documentation/CodeTutorials/CreatingANewCollectionTreeNode.md
@@ -74,10 +74,7 @@ private class FrozenExtractionConfigurationsNode
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Frozen Extraction Configurations";
-    }
+    public override string ToString() => "Frozen Extraction Configurations";
 }
 ```
 
@@ -94,28 +91,19 @@ private class FrozenExtractionConfigurationsNode
 		Project = project;
 	}
 
-	public override string ToString()
-	{
-		return "Frozen Extraction Configurations";
-	}
+	public override string ToString() => "Frozen Extraction Configurations";
 
-	protected bool Equals(FrozenExtractionConfigurationsNode other)
-	{
-		return Equals(Project, other.Project);
-	}
+	protected bool Equals(FrozenExtractionConfigurationsNode other) => Equals(Project, other.Project);
 
 	public override bool Equals(object obj)
 	{
 		if (obj is null) return false;
 		if (ReferenceEquals(this, obj)) return true;
 		if (obj.GetType() != GetType()) return false;
-		return Equals((FrozenExtractionConfigurationsNode) obj);
+		return Equals((FrozenExtractionConfigurationsNode)obj);
 	}
 
-	public override int GetHashCode()
-	{
-		return Project != null ? Project.GetHashCode() : 0;
-	}
+	public override int GetHashCode() => Project?.GetHashCode() ?? 0;
 }
 ```
 
@@ -144,7 +132,7 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
     var frozenConfigurationsNode = new FrozenExtractionConfigurationsNode(extractionConfigurationsNode.Project);
     children.Add(frozenConfigurationsNode);
 
-    var configs = ExtractionConfigurations.Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
+    var configs = ExtractionConfigurations .Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
     foreach (var config in configs)
     {
         AddChildren(config, descendancy.Add(config));
@@ -250,11 +238,11 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
 	children.Add(frozenConfigurationsNode);
 
 	//Add children to the frozen folder
-	AddChildren(frozenConfigurationsNode,descendancy.Add(frozenConfigurationsNode));
+	AddChildren(frozenConfigurationsNode, descendancy.Add(frozenConfigurationsNode));
 
 	//Add ExtractionConfigurations which are not released (frozen)
-	var configs = ExtractionConfigurations.Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
-	foreach (var config in configs.Where(c=>!c.IsReleased))
+	var configs = ExtractionConfigurations .Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
+	foreach (var config in configs.Where(c => !c.IsReleased))
 	{
 		AddChildren(config, descendancy.Add(config));
 		children.Add(config);
@@ -268,14 +256,14 @@ private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConf
 	var children = new HashSet<object>();
 
 	//Add ExtractionConfigurations which are not released (frozen)
-	var configs = ExtractionConfigurations.Where(c => c.Project_ID == frozenExtractionConfigurationsNode.Project.ID).ToArray();
+	var configs = ExtractionConfigurations .Where(c => c.Project_ID == frozenExtractionConfigurationsNode.Project.ID).ToArray();
 	foreach (var config in configs.Where(c => c.IsReleased))
 	{
 		AddChildren(config, descendancy.Add(config));
 		children.Add(config);
 	}
 
-	AddToDictionaries(children,descendancy);
+	AddToDictionaries(children, descendancy);
 }
 ```
 Now when you run RDMP, the final tree should look something like:
diff --git a/Documentation/CodeTutorials/DoubleClickAndDragDrop.md b/Documentation/CodeTutorials/DoubleClickAndDragDrop.md
index f850515396..bb41226e65 100644
--- a/Documentation/CodeTutorials/DoubleClickAndDragDrop.md
+++ b/Documentation/CodeTutorials/DoubleClickAndDragDrop.md
@@ -31,26 +31,20 @@ Create a new class called `ProposeExecutionWhenTargetIs<TypeName>` in namespace
 
 <!--- cae13dde1de14f5cac984330a222c311 --->
 ```csharp
-private class ProposeExecutionWhenTargetIsPipeline:RDMPCommandExecutionProposal<Pipeline>
+private class ProposeExecutionWhenTargetIsPipeline : RDMPCommandExecutionProposal<Pipeline>
 {
     public ProposeExecutionWhenTargetIsPipeline(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(Pipeline target)
-    {
-        return true;
-    }
+    public override bool CanActivate(Pipeline target) => true;
 
     public override void Activate(Pipeline target)
     {
         MessageBox.Show("Double clicked");
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default) => null;
 }
 ```
 
@@ -100,8 +94,8 @@ To add support for dropping an object with an existing `ICombineToMakeCommand` y
 ```csharp
 public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default)
 {
-	if(cmd is CatalogueCombineable sourceCatalogueCombineable)
-		return new ExecuteCommandDelete(ItemActivator,sourceCatalogueCombineable.Catalogue);
+	if (cmd is CatalogueCombineable sourceCatalogueCombineable)
+		return new ExecuteCommandDelete(ItemActivator, sourceCatalogueCombineable.Catalogue);
 
 	return null;
 }
@@ -147,10 +141,7 @@ public class PipelineCombineable : ICombineToMakeCommand
         IsEmpty = Pipeline.PipelineComponents.Count == 0;
     }
 
-    public string GetSqlString()
-    {
-        return "";
-    }
+    public string GetSqlString() => "";
 }
 ```
 
diff --git a/Rdmp.Core.Tests/Caching/Integration/CachingHostTests.cs b/Rdmp.Core.Tests/Caching/Integration/CachingHostTests.cs
index ca8b87751c..8f042e4ef4 100644
--- a/Rdmp.Core.Tests/Caching/Integration/CachingHostTests.cs
+++ b/Rdmp.Core.Tests/Caching/Integration/CachingHostTests.cs
@@ -45,7 +45,7 @@ public void CacheHostOutwithPermissionWindow()
 
         // This feels a bit nasty, but quick and much better than having the test wait for an arbitrary time period.
         var listener = new ExpectedNotificationListener("Download not permitted at this time, sleeping for 60 seconds");
-                        
+
         cp.CacheFillProgress = DateTime.Now.AddDays(-1);
         cp.PermissionWindow_ID = 1;
 
@@ -59,9 +59,9 @@ public void CacheHostOutwithPermissionWindow()
 
 
         //Create a time period that we are outwith (1 hour ago to 30 minutes ago).
-        var start = DateTime.Now.TimeOfDay.Subtract(new TimeSpan(0,1,0,0));
-        var stop = DateTime.Now.TimeOfDay.Subtract(new TimeSpan(0,0,30,0));
-        permissionWindow.SetPermissionWindowPeriods(new List<PermissionWindowPeriod>(new []
+        var start = DateTime.Now.TimeOfDay.Subtract(new TimeSpan(0, 1, 0, 0));
+        var stop = DateTime.Now.TimeOfDay.Subtract(new TimeSpan(0, 0, 30, 0));
+        permissionWindow.SetPermissionWindowPeriods(new List<PermissionWindowPeriod>(new[]
         {
             new PermissionWindowPeriod(
                 (int)DateTime.Now.DayOfWeek,
@@ -85,7 +85,8 @@ public void CacheHostOutwithPermissionWindow()
         var abortTokenSource = new CancellationTokenSource();
         var cancellationToken = new GracefulCancellationToken(stopTokenSource.Token, abortTokenSource.Token);
 
-        var task = Task.Run(() => cacheHost.Start(listener, cancellationToken), cancellationToken.CreateLinkedSource().Token);
+        var task = Task.Run(() => cacheHost.Start(listener, cancellationToken),
+            cancellationToken.CreateLinkedSource().Token);
 
         // Don't want to cancel before the DownloadUntilFinished loop starts and we receive the first "Download not permitted at this time, sleeping for 60 seconds" message
         listener.ReceivedMessage += abortTokenSource.Cancel;
@@ -97,18 +98,17 @@ public void CacheHostOutwithPermissionWindow()
         catch (AggregateException e)
         {
             Assert.AreEqual(1, e.InnerExceptions.Count);
-            Assert.IsInstanceOf(typeof (TaskCanceledException), e.InnerExceptions[0], e.InnerExceptions[0].Message);
+            Assert.IsInstanceOf(typeof(TaskCanceledException), e.InnerExceptions[0], e.InnerExceptions[0].Message);
         }
         finally
         {
             testDir.Delete(true);
         }
     }
-
-
 }
 
 internal delegate void ReceivedMessageHandler();
+
 internal class ExpectedNotificationListener : IDataLoadEventListener
 {
     private readonly string _expectedNotificationString;
diff --git a/Rdmp.Core.Tests/Caching/Integration/CustomDateCachingTests.cs b/Rdmp.Core.Tests/Caching/Integration/CustomDateCachingTests.cs
index 86d9a8e6e2..8786834fe0 100644
--- a/Rdmp.Core.Tests/Caching/Integration/CustomDateCachingTests.cs
+++ b/Rdmp.Core.Tests/Caching/Integration/CustomDateCachingTests.cs
@@ -39,45 +39,46 @@ public void FetchMultipleDays_Success(bool singleDay)
         mef.AddTypeToCatalogForTesting(typeof(TestCacheDestination));
 
         // Create a pipeline that will record the cache chunks
-        var sourceComponent = Mock.Of<IPipelineComponent>(x=>
+        var sourceComponent = Mock.Of<IPipelineComponent>(x =>
             x.Class == "CachingEngineTests.Integration.TestCacheSource" &&
-            x.GetClassAsSystemType()==typeof (TestCacheSource) &&
-            x.GetAllArguments()==Array.Empty<IArgument>());
+            x.GetClassAsSystemType() == typeof(TestCacheSource) &&
+            x.GetAllArguments() == Array.Empty<IArgument>());
 
-        var destinationComponent = Mock.Of<IPipelineComponent>(x=>
+        var destinationComponent = Mock.Of<IPipelineComponent>(x =>
             x.Class == "CachingEngineTests.Integration.TestCacheDestination" &&
-            x.GetClassAsSystemType()==typeof (TestCacheDestination) &&
-            x.GetAllArguments()==Array.Empty<IArgument>());
+            x.GetClassAsSystemType() == typeof(TestCacheDestination) &&
+            x.GetAllArguments() == Array.Empty<IArgument>());
 
-        var pipeline = Mock.Of<IPipeline>(p=>
+        var pipeline = Mock.Of<IPipeline>(p =>
             p.Repository == CatalogueRepository &&
-            p.Source==sourceComponent &&
-            p.Destination==destinationComponent &&
+            p.Source == sourceComponent &&
+            p.Destination == destinationComponent &&
             p.Repository == CatalogueRepository &&
-            p.PipelineComponents==Enumerable.Empty<IPipelineComponent>().OrderBy(o => o).ToList());
+            p.PipelineComponents == Enumerable.Empty<IPipelineComponent>().OrderBy(o => o).ToList());
 
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"delme",true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme",
+                true);
 
         var lmd = Mock.Of<ILoadMetadata>();
         lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
 
-        var loadProgress = Mock.Of<ILoadProgress>(l=>
-            l.OriginDate == new DateTime(2001,01,01) &&
-            l.LoadMetadata==lmd);
-
-        var cacheProgress = Mock.Of<ICacheProgress>(c=>
+        var loadProgress = Mock.Of<ILoadProgress>(l =>
+            l.OriginDate == new DateTime(2001, 01, 01) &&
+            l.LoadMetadata == lmd);
 
+        var cacheProgress = Mock.Of<ICacheProgress>(c =>
             c.Pipeline_ID == -123 &&
-            c.Pipeline==pipeline &&
+            c.Pipeline == pipeline &&
             c.ChunkPeriod == new TimeSpan(1, 0, 0, 0) &&
             c.LoadProgress_ID == -1 &&
             c.Repository == CatalogueRepository &&
-            c.LoadProgress ==loadProgress &&
+            c.LoadProgress == loadProgress &&
             c.CacheFillProgress == new DateTime(2020, 1, 1));
 
         var caching = new CustomDateCaching(cacheProgress, RepositoryLocator.CatalogueRepository);
         var startDate = new DateTime(2016, 1, 1);
-        var endDate = singleDay? new DateTime(2016, 1, 1): new DateTime(2016, 1, 3);
+        var endDate = singleDay ? new DateTime(2016, 1, 1) : new DateTime(2016, 1, 3);
 
         var listener = new LoggingListener();
         var task = caching.Fetch(startDate, endDate, new GracefulCancellationToken(), listener);
@@ -88,7 +89,7 @@ public void FetchMultipleDays_Success(bool singleDay)
             .ToArray();
 
         //should not have been updated because this is a backfill request
-        Assert.AreEqual(new DateTime(2020,1,1),cacheProgress.CacheFillProgress);
+        Assert.AreEqual(new DateTime(2020, 1, 1), cacheProgress.CacheFillProgress);
 
         Assert.IsTrue(task.IsCompleted);
         Assert.IsTrue(dateNotifications.Contains(startDate.ToString("g")));
@@ -124,15 +125,14 @@ public class TestCacheChunk : ICacheChunk
 
     public TestCacheChunk(DateTime fetchDate)
     {
-        Request = new CacheFetchRequest(null,fetchDate){ChunkPeriod = new TimeSpan(1,0,0)};
+        Request = new CacheFetchRequest(null, fetchDate) { ChunkPeriod = new TimeSpan(1, 0, 0) };
     }
-
-        
 }
 
 public class TestCacheSource : CacheSource<TestCacheChunk>
 {
-    public override TestCacheChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public override TestCacheChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var c = new TestCacheChunk(Request.Start);
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"!!{request.Start:g}"));
@@ -147,28 +147,22 @@ public override void Abort(IDataLoadEventListener listener)
     {
     }
 
-    public override TestCacheChunk TryGetPreview()
-    {
-        throw new NotImplementedException();
-    }
+    public override TestCacheChunk TryGetPreview() => throw new NotImplementedException();
 
     public override void Check(ICheckNotifier notifier)
     {
     }
 }
 
-public class TestCacheDestination : IPluginDataFlowComponent<ICacheChunk>, IDataFlowDestination<ICacheChunk>, ICacheFileSystemDestination 
+public class TestCacheDestination : IPluginDataFlowComponent<ICacheChunk>, IDataFlowDestination<ICacheChunk>,
+    ICacheFileSystemDestination
 {
-    public static TestCacheChunk ProcessPipelineData(TestCacheChunk toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-    {
-        return toProcess;
-    }
+    public static TestCacheChunk ProcessPipelineData(TestCacheChunk toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken) => toProcess;
 
     public ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener,
-        GracefulCancellationToken cancellationToken)
-    {
-        return ProcessPipelineData((TestCacheChunk) toProcess, listener, cancellationToken);
-    }
+        GracefulCancellationToken cancellationToken) =>
+        ProcessPipelineData((TestCacheChunk)toProcess, listener, cancellationToken);
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -183,14 +177,11 @@ public void Check(ICheckNotifier notifier)
     }
 
     private ILoadDirectory project;
+
     public void PreInitialize(ILoadDirectory value, IDataLoadEventListener listener)
     {
         project = value;
     }
 
-    public ICacheLayout CreateCacheLayout()
-    {
-        return new BasicCacheLayout(project.Cache);
-    }
-
+    public ICacheLayout CreateCacheLayout() => new BasicCacheLayout(project.Cache);
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Caching/Unit/PipelineExecutionTests.cs b/Rdmp.Core.Tests/Caching/Unit/PipelineExecutionTests.cs
index 5f5bb63661..fb291d0dcb 100644
--- a/Rdmp.Core.Tests/Caching/Unit/PipelineExecutionTests.cs
+++ b/Rdmp.Core.Tests/Caching/Unit/PipelineExecutionTests.cs
@@ -37,13 +37,13 @@ public static void TestSerialPipelineExecution()
         var pipelineExecutor = new SerialPipelineExecution();
 
         // Act
-        pipelineExecutor.Execute(new [] {engine1.Object, engine2.Object}, tokenSource.Token, listener);
+        pipelineExecutor.Execute(new[] { engine1.Object, engine2.Object }, tokenSource.Token, listener);
 
         // engine1 should have been executed once
-        engine1.Verify(e=>e.ExecutePipeline(It.IsAny<GracefulCancellationToken>()),Times.Once);
+        engine1.Verify(e => e.ExecutePipeline(It.IsAny<GracefulCancellationToken>()), Times.Once);
 
         // engine2 should also have been run (locking isn't a thing any more)
-        engine2.Verify(e=>e.ExecutePipeline(It.IsAny<GracefulCancellationToken>()),Times.Once);
+        engine2.Verify(e => e.ExecutePipeline(It.IsAny<GracefulCancellationToken>()), Times.Once);
     }
 
     [Ignore("Tests locking we don't actually have")]
diff --git a/Rdmp.Core.Tests/Caching/Unit/TestIFileDataFlowComponents.cs b/Rdmp.Core.Tests/Caching/Unit/TestIFileDataFlowComponents.cs
index 757edee8bd..28e90c63f8 100644
--- a/Rdmp.Core.Tests/Caching/Unit/TestIFileDataFlowComponents.cs
+++ b/Rdmp.Core.Tests/Caching/Unit/TestIFileDataFlowComponents.cs
@@ -52,7 +52,8 @@ public void Dispose(IDataLoadEventListener listener)
     }
 }
 
-public class FilesystemCacheDestination : IFileDataFlowDestination, IPipelineRequirement<CacheProgress>, IPipelineRequirement<DirectoryInfo>
+public class FilesystemCacheDestination : IFileDataFlowDestination, IPipelineRequirement<CacheProgress>,
+    IPipelineRequirement<DirectoryInfo>
 {
     public CacheProgress CacheProgress { get; set; }
     public DirectoryInfo CacheDirectory { get; set; }
@@ -72,8 +73,9 @@ public IList<FileInfo> ProcessPipelineData(IList<FileInfo> toProcess, IDataLoadE
         // ? where does the date come from?
         // either going to be CacheFillProgress or CacheFillProgress + period, depending on fetch logic
         if (CacheProgress.CacheFillProgress == null)
-            throw new Exception("Should throw, but currently on first cache it is valid for the CacheFIllProgress to be null");
-            
+            throw new Exception(
+                "Should throw, but currently on first cache it is valid for the CacheFIllProgress to be null");
+
 
         return toProcess;
     }
@@ -92,5 +94,4 @@ public void PreInitialize(DirectoryInfo cacheDirectory, IDataLoadEventListener l
     {
         CacheDirectory = cacheDirectory;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Caching/Unit/ZipTests.cs b/Rdmp.Core.Tests/Caching/Unit/ZipTests.cs
index 7ee8610b60..2aa678654b 100644
--- a/Rdmp.Core.Tests/Caching/Unit/ZipTests.cs
+++ b/Rdmp.Core.Tests/Caching/Unit/ZipTests.cs
@@ -28,7 +28,7 @@ public ZipTestLayout(DirectoryInfo dir, string dateFormat, CacheArchiveType cach
 
         public new void ArchiveFiles(FileInfo[] fi, DateTime dt, IDataLoadEventListener l)
         {
-            base.ArchiveFiles(fi,dt,l);
+            base.ArchiveFiles(fi, dt, l);
         }
     }
 
@@ -36,35 +36,48 @@ public ZipTestLayout(DirectoryInfo dir, string dateFormat, CacheArchiveType cach
     public void CreateAndUpdateZip()
     {
         var _dir = TestContext.CurrentContext.WorkDirectory;
-        var _zt = new ZipTestLayout(new DirectoryInfo(_dir), "yyyy-MM-dd", CacheArchiveType.Zip, CacheFileGranularity.Hour, new NoSubdirectoriesCachePathResolver());
+        var _zt = new ZipTestLayout(new DirectoryInfo(_dir), "yyyy-MM-dd", CacheArchiveType.Zip,
+            CacheFileGranularity.Hour, new NoSubdirectoriesCachePathResolver());
         var _listener = new ThrowImmediatelyDataLoadEventListener();
         var when = DateTime.Now;
         var targetzip = _zt.GetArchiveFileInfoForDate(when, _listener);
-        var files =new List<FileInfo>();
+        var files = new List<FileInfo>();
 
         // First create a zip file with one item in
         File.Delete(targetzip.FullName);
         files.Add(new FileInfo(Path.Combine(_dir, Path.GetRandomFileName())));
-        using (var sw =new StreamWriter(files[0].FullName))
+        using (var sw = new StreamWriter(files[0].FullName))
+        {
             sw.WriteLine("Example data file");
+        }
+
         _zt.ArchiveFiles(files.ToArray(), when, _listener);
         using (var zip = ZipFile.Open(targetzip.FullName, ZipArchiveMode.Read))
+        {
             Assert.True(zip.Entries.Count == 1);
+        }
 
         // Create a second file and add that to the zip too
-        files.Add(new FileInfo(Path.Combine(_dir,Path.GetRandomFileName())));
+        files.Add(new FileInfo(Path.Combine(_dir, Path.GetRandomFileName())));
         using (var sw = new StreamWriter(files[1].FullName))
+        {
             sw.WriteLine("Another example data file");
+        }
+
         _zt.ArchiveFiles(files.ToArray(), when, _listener);
-        using (var zip = ZipFile.Open(targetzip.FullName,ZipArchiveMode.Read))
-            Assert.True(zip.Entries.Count==2);
+        using (var zip = ZipFile.Open(targetzip.FullName, ZipArchiveMode.Read))
+        {
+            Assert.True(zip.Entries.Count == 2);
+        }
 
         // Re-add just the first file: resulting zip should still contain both files
-        _zt.ArchiveFiles(files.GetRange(0,1).ToArray(), when, _listener);
+        _zt.ArchiveFiles(files.GetRange(0, 1).ToArray(), when, _listener);
         using (var zip = ZipFile.Open(targetzip.FullName, ZipArchiveMode.Read))
+        {
             Assert.True(zip.Entries.Count == 2);
+        }
 
-        files.ForEach( s => File.Delete(s.FullName));
+        files.ForEach(s => File.Delete(s.FullName));
         File.Delete(targetzip.FullName);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCommitting/CommitCohortExample.cs b/Rdmp.Core.Tests/CohortCommitting/CommitCohortExample.cs
index 2ac81b4f22..b007217b51 100644
--- a/Rdmp.Core.Tests/CohortCommitting/CommitCohortExample.cs
+++ b/Rdmp.Core.Tests/CohortCommitting/CommitCohortExample.cs
@@ -20,12 +20,12 @@
 
 namespace Rdmp.Core.Tests.CohortCommitting;
 
-internal class CommitCohortExample: DatabaseTests
+internal class CommitCohortExample : DatabaseTests
 {
-    [TestCase(DatabaseType.MicrosoftSQLServer,"varchar(10)")]
-    [TestCase(DatabaseType.MySql,"varchar(10)")]
-    [TestCase(DatabaseType.Oracle,"varchar2(10)")]
-    public void CommitCohortExampleTest(DatabaseType dbType,string privateDataType)
+    [TestCase(DatabaseType.MicrosoftSQLServer, "varchar(10)")]
+    [TestCase(DatabaseType.MySql, "varchar(10)")]
+    [TestCase(DatabaseType.Oracle, "varchar2(10)")]
+    public void CommitCohortExampleTest(DatabaseType dbType, string privateDataType)
     {
         RunBlitzDatabases(RepositoryLocator);
 
@@ -33,11 +33,11 @@ public void CommitCohortExampleTest(DatabaseType dbType,string privateDataType)
         var db = GetCleanedServer(dbType);
 
         //create the cohort store table
-        var wizard = new CreateNewCohortDatabaseWizard(db,CatalogueRepository,DataExportRepository,false);
+        var wizard = new CreateNewCohortDatabaseWizard(db, CatalogueRepository, DataExportRepository, false);
         var privateColumn = new PrivateIdentifierPrototype("chi", privateDataType);
-        var externalCohortTable = wizard.CreateDatabase(privateColumn,new ThrowImmediatelyCheckNotifier());
+        var externalCohortTable = wizard.CreateDatabase(privateColumn, new ThrowImmediatelyCheckNotifier());
 
-        Assert.AreEqual(dbType,externalCohortTable.DatabaseType);
+        Assert.AreEqual(dbType, externalCohortTable.DatabaseType);
 
         //create a project into which we want to import a cohort
         var project = new Project(DataExportRepository, "MyProject")
@@ -64,11 +64,13 @@ public void CommitCohortExampleTest(DatabaseType dbType,string privateDataType)
 
         //initialize the destination
         pipelineDestination.PreInitialize(
-            new CohortCreationRequest(project, definition, DataExportRepository,"A cohort created in an example unit test"),
+            new CohortCreationRequest(project, definition, DataExportRepository,
+                "A cohort created in an example unit test"),
             new ThrowImmediatelyDataLoadEventListener());
 
         //process the cohort data table
-        pipelineDestination.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        pipelineDestination.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         //there should be no cohorts yet
         Assert.IsEmpty(DataExportRepository.GetAllObjects<ExtractableCohort>());
@@ -81,17 +83,17 @@ public void CommitCohortExampleTest(DatabaseType dbType,string privateDataType)
 
         //make sure we are all on the same page about what the DBMS type is (nothing cached etc)
         Assert.AreEqual(dbType, cohort.ExternalCohortTable.DatabaseType);
-        Assert.AreEqual(dbType,cohort.GetQuerySyntaxHelper().DatabaseType);
+        Assert.AreEqual(dbType, cohort.GetQuerySyntaxHelper().DatabaseType);
 
-        Assert.AreEqual(500,cohort.ExternalProjectNumber);
-        Assert.AreEqual(2,cohort.CountDistinct);
+        Assert.AreEqual(500, cohort.ExternalProjectNumber);
+        Assert.AreEqual(2, cohort.CountDistinct);
 
         var tbl = externalCohortTable.DiscoverCohortTable();
-        Assert.AreEqual(2,tbl.GetRowCount());
+        Assert.AreEqual(2, tbl.GetRowCount());
         var dtInDatabase = tbl.GetDataTable();
-            
+
         //guid will be something like "6fb23de5-e8eb-46eb-84b5-dd368da21073"
-        Assert.AreEqual(36,dtInDatabase.Rows[0]["ReleaseId"].ToString().Length);
-        Assert.AreEqual("0101010101",dtInDatabase.Rows[0]["chi"]);
+        Assert.AreEqual(36, dtInDatabase.Rows[0]["ReleaseId"].ToString().Length);
+        Assert.AreEqual("0101010101", dtInDatabase.Rows[0]["chi"]);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCommitting/CreateNewCohortDatabaseWizardTests.cs b/Rdmp.Core.Tests/CohortCommitting/CreateNewCohortDatabaseWizardTests.cs
index 2a9f3636d8..71b13741b5 100644
--- a/Rdmp.Core.Tests/CohortCommitting/CreateNewCohortDatabaseWizardTests.cs
+++ b/Rdmp.Core.Tests/CohortCommitting/CreateNewCohortDatabaseWizardTests.cs
@@ -24,7 +24,7 @@
 
 namespace Rdmp.Core.Tests.CohortCommitting;
 
-public class CreateNewCohortDatabaseWizardTests:DatabaseTests
+public class CreateNewCohortDatabaseWizardTests : DatabaseTests
 {
     private Catalogue _cata1;
     private Catalogue _cata2;
@@ -37,7 +37,7 @@ public class CreateNewCohortDatabaseWizardTests:DatabaseTests
 
     private ExtractionInformation _extractionInfo1;
     private ExtractionInformation _extractionInfo2;
-        
+
     [SetUp]
     protected override void SetUp()
     {
@@ -47,16 +47,16 @@ protected override void SetUp()
 
         _cata1 = new Catalogue(CatalogueRepository, "Dataset1");
         _cata2 = new Catalogue(CatalogueRepository, "Dataset2");
-            
+
         _t1 = new TableInfo(CatalogueRepository, "T1");
         _t2 = new TableInfo(CatalogueRepository, "T2");
-            
+
         _c1 = new ColumnInfo(CatalogueRepository, "PrivateIdentifierA", "varchar(10)", _t1);
         _c2 = new ColumnInfo(CatalogueRepository, "PrivateIdentifierB", "int", _t2);
-            
+
         _ci1 = new CatalogueItem(CatalogueRepository, _cata1, "PrivateIdentifierA");
         _ci2 = new CatalogueItem(CatalogueRepository, _cata2, "PrivateIdentifierB");
-            
+
         _extractionInfo1 = new ExtractionInformation(CatalogueRepository, _ci1, _c1, _c1.ToString());
         _extractionInfo2 = new ExtractionInformation(CatalogueRepository, _ci2, _c2, _c2.ToString());
 
@@ -65,34 +65,35 @@ protected override void SetUp()
 
     private string cohortDatabaseName;
 
-        
+
     [Test]
     public void TestMissingColumnInfos()
     {
         _extractionInfo1.IsExtractionIdentifier = true;
         _extractionInfo1.SaveToDatabase();
-        var wizard = new CreateNewCohortDatabaseWizard(null,CatalogueRepository, DataExportRepository,false);
+        var wizard = new CreateNewCohortDatabaseWizard(null, CatalogueRepository, DataExportRepository, false);
 
         //it finds it!
-        Assert.IsTrue(wizard.GetPrivateIdentifierCandidates().Any(prototype => prototype.RuntimeName.Equals("PrivateIdentifierA")));
+        Assert.IsTrue(wizard.GetPrivateIdentifierCandidates()
+            .Any(prototype => prototype.RuntimeName.Equals("PrivateIdentifierA")));
 
         //delete the column info to make it a missing reference
         _c1.DeleteInDatabase();
-            
+
         //now it should gracefully skip over it
         Assert.IsFalse(wizard.GetPrivateIdentifierCandidates()
             .Any(prototype => prototype.RuntimeName.Equals("PrivateIdentifierA")));
-            
     }
 
     [Test]
     public void ProposePrivateIdentifierDatatypes()
     {
-        var wizard = new CreateNewCohortDatabaseWizard(null,CatalogueRepository, DataExportRepository,false);
+        var wizard = new CreateNewCohortDatabaseWizard(null, CatalogueRepository, DataExportRepository, false);
 
         var candidates = wizard.GetPrivateIdentifierCandidates();
 
-        Assert.IsFalse(candidates.Any(c => c.RuntimeName.Equals("PrivateIdentifierA") || c.RuntimeName.Equals("PrivateIdentifierB")));
+        Assert.IsFalse(candidates.Any(c =>
+            c.RuntimeName.Equals("PrivateIdentifierA") || c.RuntimeName.Equals("PrivateIdentifierB")));
 
         _extractionInfo1.IsExtractionIdentifier = true;
         _extractionInfo1.SaveToDatabase();
@@ -100,7 +101,7 @@ public void ProposePrivateIdentifierDatatypes()
 
         var candidate = candidates.Single(c => c.RuntimeName.Equals("PrivateIdentifierA"));
         Assert.AreEqual("varchar(10)", candidate.DataType);
-        Assert.IsTrue(candidate.MatchingExtractionInformations.Single().ID== _extractionInfo1.ID);
+        Assert.IsTrue(candidate.MatchingExtractionInformations.Single().ID == _extractionInfo1.ID);
     }
 
     [TestCase("text")]
@@ -120,18 +121,20 @@ public void TestVarcharMaxNotAllowed(string term)
         _extractionInfo2.SaveToDatabase();
 
         var candidate = wizard.GetPrivateIdentifierCandidates().Single(c => c.RuntimeName.Equals("PrivateIdentifierB"));
-        var ex = Assert.Throws<Exception>(()=>wizard.CreateDatabase(
+        var ex = Assert.Throws<Exception>(() => wizard.CreateDatabase(
             candidate,
             new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Private identifier datatype cannot be varchar(max) style as this prevents Primary Key creation on the table", ex.Message);
+        Assert.AreEqual(
+            "Private identifier datatype cannot be varchar(max) style as this prevents Primary Key creation on the table",
+            ex.Message);
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestActuallyCreatingIt(DatabaseType type)
     {
         var db = GetCleanedServer(type);
 
-        var wizard = new CreateNewCohortDatabaseWizard(db,CatalogueRepository, DataExportRepository,false);
+        var wizard = new CreateNewCohortDatabaseWizard(db, CatalogueRepository, DataExportRepository, false);
 
         _extractionInfo2.IsExtractionIdentifier = true;
         _extractionInfo2.SaveToDatabase();
@@ -141,14 +144,14 @@ public void TestActuallyCreatingIt(DatabaseType type)
             candidate,
             new ThrowImmediatelyCheckNotifier());
 
-        Assert.AreEqual(type,ect.DatabaseType);
+        Assert.AreEqual(type, ect.DatabaseType);
 
         //database should exist
         DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(cohortDatabaseName);
         Assert.IsTrue(db.Exists());
-            
+
         //did it create the correct type?
-        Assert.AreEqual(type,ect.DatabaseType);
+        Assert.AreEqual(type, ect.DatabaseType);
 
         //the ExternalCohortTable should pass tests
         ect.Check(new ThrowImmediatelyCheckNotifier());
@@ -162,7 +165,8 @@ public void TestActuallyCreatingIt(DatabaseType type)
         project.SaveToDatabase();
 
         //the request to put it under there
-        var request = new CohortCreationRequest(project, new CohortDefinition(null, "My cohort", 1, 10, ect), DataExportRepository,"Blah");
+        var request = new CohortCreationRequest(project, new CohortDefinition(null, "My cohort", 1, 10, ect),
+            DataExportRepository, "Blah");
 
         //the actual cohort data
         var dt = new DataTable();
@@ -173,10 +177,10 @@ public void TestActuallyCreatingIt(DatabaseType type)
         var dest = new BasicCohortDestination();
 
         dest.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
-            
+
         //tell it to use the guid allocator
-        dest.ReleaseIdentifierAllocator = typeof (GuidReleaseIdentifierAllocator);
-            
+        dest.ReleaseIdentifierAllocator = typeof(GuidReleaseIdentifierAllocator);
+
         dest.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         dest.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
 
@@ -184,25 +188,25 @@ public void TestActuallyCreatingIt(DatabaseType type)
         Assert.IsNotNull(cohort);
 
         var externalData = cohort.GetExternalData();
-        Assert.AreEqual(10,externalData.ExternalProjectNumber);
+        Assert.AreEqual(10, externalData.ExternalProjectNumber);
         Assert.IsFalse(string.IsNullOrEmpty(externalData.ExternalDescription));
 
 
         Assert.AreEqual(DateTime.Now.Year, externalData.ExternalCohortCreationDate.Value.Year);
         Assert.AreEqual(DateTime.Now.Month, externalData.ExternalCohortCreationDate.Value.Month);
-        Assert.AreEqual(DateTime.Now.Day,  externalData.ExternalCohortCreationDate.Value.Day);
+        Assert.AreEqual(DateTime.Now.Day, externalData.ExternalCohortCreationDate.Value.Day);
         Assert.AreEqual(DateTime.Now.Hour, externalData.ExternalCohortCreationDate.Value.Hour);
 
         cohort.AppendToAuditLog("Test");
-            
+
         Assert.IsTrue(cohort.AuditLog.Contains("Test"));
 
-        Assert.AreEqual(1,cohort.Count); 
-        Assert.AreEqual(1,cohort.CountDistinct);
+        Assert.AreEqual(1, cohort.Count);
+        Assert.AreEqual(1, cohort.CountDistinct);
 
         var cohortTable = cohort.FetchEntireCohort();
 
-        Assert.AreEqual(1,cohortTable.Rows.Count);
+        Assert.AreEqual(1, cohortTable.Rows.Count);
 
         var helper = ect.GetQuerySyntaxHelper();
 
@@ -226,7 +230,7 @@ public void TestActuallyCreatingIt(DatabaseType type)
         Assert.AreEqual("101243", dtAno.Rows[1][cohort.GetPrivateIdentifier(true)]);
 
         //make sure that it shows up in the child provider (provides fast object access in CLI and builds tree model for UI)
-        var repo = new DataExportChildProvider(RepositoryLocator, null,new ThrowImmediatelyCheckNotifier(),null);
+        var repo = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
         var descendancy = repo.GetDescendancyListIfAnyFor(cohort);
         Assert.IsNotNull(descendancy);
     }
@@ -236,7 +240,7 @@ public void Test_IdentifiableExtractions()
     {
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
-        var wizard = new CreateNewCohortDatabaseWizard(db,CatalogueRepository, DataExportRepository,false);
+        var wizard = new CreateNewCohortDatabaseWizard(db, CatalogueRepository, DataExportRepository, false);
 
         _extractionInfo2.IsExtractionIdentifier = true;
         _extractionInfo2.SaveToDatabase();
@@ -251,16 +255,17 @@ public void Test_IdentifiableExtractions()
         ect.ReleaseIdentifierField = ect.PrivateIdentifierField;
         ect.SaveToDatabase();
 
-        UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable,CheckResult.Fail);
+        UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Fail);
 
-        var ex = Assert.Throws<Exception>(()=>ect.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("R004 PrivateIdentifierField and ReleaseIdentifierField are the same, this means your cohort will extract identifiable data (no cohort identifier substitution takes place)", ex.Message);
+        var ex = Assert.Throws<Exception>(() => ect.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(
+            "R004 PrivateIdentifierField and ReleaseIdentifierField are the same, this means your cohort will extract identifiable data (no cohort identifier substitution takes place)",
+            ex.Message);
 
         UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Warning);
 
         ect.Check(new ThrowImmediatelyCheckNotifier());
 
         UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Fail);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/AggregateFilterPublishingTests.cs b/Rdmp.Core.Tests/CohortCreation/AggregateFilterPublishingTests.cs
index ec9b3fd815..16c6911894 100644
--- a/Rdmp.Core.Tests/CohortCreation/AggregateFilterPublishingTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/AggregateFilterPublishingTests.cs
@@ -17,50 +17,58 @@
 
 namespace Rdmp.Core.Tests.CohortCreation;
 
-public class AggregateFilterPublishingTests:CohortIdentificationTests
+public class AggregateFilterPublishingTests : CohortIdentificationTests
 {
-
     private AggregateFilter _filter;
     private AggregateFilterContainer _container;
 
     private ExtractionInformation _chiExtractionInformation;
-                       
+
     [OneTimeSetUp]
     protected override void SetUp()
     {
         base.SetUp();
 
-        aggregate1.RootFilterContainer_ID = new AggregateFilterContainer(CatalogueRepository,FilterContainerOperation.AND).ID;
+        aggregate1.RootFilterContainer_ID =
+            new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND).ID;
         aggregate1.SaveToDatabase();
 
         _chiExtractionInformation = aggregate1.AggregateDimensions.Single().ExtractionInformation;
 
         _container = (AggregateFilterContainer)aggregate1.RootFilterContainer;
 
-        _filter = new AggregateFilter(CatalogueRepository,"folk", _container);
+        _filter = new AggregateFilter(CatalogueRepository, "folk", _container);
     }
 
     [Test]
     public void NotPopulated_Description()
     {
-        var ex = Assert.Throws<Exception>(()=>new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container,_filter, null));
-        Assert.AreEqual("Cannot clone filter called 'folk' because:There is no description",ex?.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container,
+                _filter, null));
+        Assert.AreEqual("Cannot clone filter called 'folk' because:There is no description", ex?.Message);
     }
 
     [Test]
     public void NotPopulated_DescriptionTooShort()
     {
         _filter.Description = "fish";
-        var ex = Assert.Throws<Exception>(()=>new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container, _filter, null));
-        Assert.AreEqual("Cannot clone filter called 'folk' because:Description is not long enough (minimum length is 20 characters)",ex?.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container,
+                _filter, null));
+        Assert.AreEqual(
+            "Cannot clone filter called 'folk' because:Description is not long enough (minimum length is 20 characters)",
+            ex?.Message);
     }
 
     [Test]
     public void NotPopulated_WhereSQLNotSet()
     {
         _filter.Description = "fish swim in the sea and make people happy to be";
-        var ex = Assert.Throws<Exception>(()=>new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container, _filter, null));
-        Assert.AreEqual("Cannot clone filter called 'folk' because:WhereSQL is not populated",ex?.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container,
+                _filter, null));
+        Assert.AreEqual("Cannot clone filter called 'folk' because:WhereSQL is not populated", ex?.Message);
     }
 
     /// <summary>
@@ -74,7 +82,9 @@ public void NotPopulated_ParameterNoComment()
         _filter.SaveToDatabase();
         new ParameterCreator(new AggregateFilterFactory(CatalogueRepository), null, null).CreateAll(_filter, null);
 
-        var importedFilter = new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(null, _filter, null);
+        var importedFilter =
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(null, _filter,
+                null);
         Assert.AreEqual("folk", importedFilter.Name);
     }
 
@@ -84,16 +94,19 @@ public void NotPopulated_ParameterNotSet()
     {
         _filter.Description = "fish swim in the sea and make people happy to be";
         _filter.WhereSQL = "LovelyCoconuts = @coconutCount";
-            
+
         new ParameterCreator(new AggregateFilterFactory(CatalogueRepository), null, null).CreateAll(_filter, null);
         var parameter = _filter.GetAllParameters().Single();
         parameter.Comment = "It's coconut time!";
-        parameter.Value = null;//clear its value
+        parameter.Value = null; //clear its value
         parameter.SaveToDatabase();
 
-        var ex = Assert.Throws<Exception>(()=>new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation),null).ImportFilter(_container, _filter,null));
-        Assert.AreEqual("Cannot clone filter called 'folk' because:Parameter '@coconutCount' was rejected :There is no value/default value listed",ex?.Message);
-
+        var ex = Assert.Throws<Exception>(() =>
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(_container,
+                _filter, null));
+        Assert.AreEqual(
+            "Cannot clone filter called 'folk' because:Parameter '@coconutCount' was rejected :There is no value/default value listed",
+            ex?.Message);
     }
 
     [Test]
@@ -102,16 +115,17 @@ public void ShortcutFiltersWork_ProperlyReplicatesParentAndHasFK()
         _filter.WhereSQL = "folk=1";
         _filter.SaveToDatabase();
 
-        var sql = new CohortQueryBuilder(aggregate1, null,null).SQL;
+        var sql = new CohortQueryBuilder(aggregate1, null, null).SQL;
 
         Console.WriteLine(sql);
         Assert.IsTrue(sql.Contains("folk=1"));
 
 
         var shortcutAggregate =
-            new AggregateConfiguration(CatalogueRepository,testData.catalogue, "UnitTestShortcutAggregate");
+            new AggregateConfiguration(CatalogueRepository, testData.catalogue, "UnitTestShortcutAggregate");
 
-        _=new AggregateDimension(CatalogueRepository,testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("sex")), shortcutAggregate);
+        _ = new AggregateDimension(CatalogueRepository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("sex")), shortcutAggregate);
 
         //before it is a shortcut it has no filters
         Assert.IsFalse(shortcutAggregate.GetQueryBuilder().SQL.Contains("WHERE"));
@@ -121,11 +135,11 @@ public void ShortcutFiltersWork_ProperlyReplicatesParentAndHasFK()
         shortcutAggregate.SaveToDatabase();
 
         var sqlShortcut = shortcutAggregate.GetQueryBuilder().SQL;
-            
+
         //shortcut should have its own dimensions
         Assert.IsTrue(sqlShortcut.Contains("[sex]"));
         Assert.IsFalse(sqlShortcut.Contains("[chi]"));
-            
+
         //but should have a REFERENCE (not a clone!) to aggregate 1's filters
         Assert.IsTrue(sqlShortcut.Contains("folk=1"));
 
@@ -135,10 +149,7 @@ public void ShortcutFiltersWork_ProperlyReplicatesParentAndHasFK()
         Assert.IsTrue(shortcutAggregate.GetQueryBuilder().SQL.Contains("folk=2"));
 
         //shouldn't work because of the dependency of the child - should give a foreign key error
-        if(CatalogueRepository is TableRepository)
-        {
-            Assert.Throws<SqlException>(aggregate1.DeleteInDatabase);
-        }   
+        if (CatalogueRepository is TableRepository) Assert.Throws<SqlException>(aggregate1.DeleteInDatabase);
 
         //delete the child
         shortcutAggregate.DeleteInDatabase();
@@ -151,9 +162,13 @@ public void ShortcutFiltersWork_ProperlyReplicatesParentAndHasFK()
     public void ShortcutFilters_AlreadyHasFilter()
     {
         Assert.IsNotNull(aggregate1.RootFilterContainer_ID);
-        var ex = Assert.Throws<NotSupportedException>(()=>aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = -500);//not ok
-        Assert.AreEqual("Cannot set OverrideFiltersByUsingParentAggregateConfigurationInstead_ID because this AggregateConfiguration already has a filter container set (if you were to be a shortcut and also have a filter tree set it would be very confusing)",ex?.Message);
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = -500); //not ok
+        Assert.AreEqual(
+            "Cannot set OverrideFiltersByUsingParentAggregateConfigurationInstead_ID because this AggregateConfiguration already has a filter container set (if you were to be a shortcut and also have a filter tree set it would be very confusing)",
+            ex?.Message);
     }
+
     [Test]
     public void ShortcutFilters_AlreadyHasFilter_ButSettingItToNull()
     {
@@ -167,10 +182,18 @@ public void ShortcutFilters_AlreadyHasFilter_ButSettingItToNull()
     public void ShortcutFilters_DoesNotHaveFilter_SetOne()
     {
         aggregate1.RootFilterContainer_ID = null;
-        Assert.DoesNotThrow(() => { aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = null; }); // is ok
-        Assert.DoesNotThrow(() => { aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = -19; }); // is ok
-        var ex = Assert.Throws<NotSupportedException>(()=>aggregate1.RootFilterContainer_ID = 123);
-        Assert.AreEqual("This AggregateConfiguration has a shortcut to another AggregateConfiguration's Filters (its OverrideFiltersByUsingParentAggregateConfigurationInstead_ID is -19) which means it cannot be assigned its own RootFilterContainerID",ex?.Message);
+        Assert.DoesNotThrow(() =>
+        {
+            aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = null;
+        }); // is ok
+        Assert.DoesNotThrow(() =>
+        {
+            aggregate1.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID = -19;
+        }); // is ok
+        var ex = Assert.Throws<NotSupportedException>(() => aggregate1.RootFilterContainer_ID = 123);
+        Assert.AreEqual(
+            "This AggregateConfiguration has a shortcut to another AggregateConfiguration's Filters (its OverrideFiltersByUsingParentAggregateConfigurationInstead_ID is -19) which means it cannot be assigned its own RootFilterContainerID",
+            ex?.Message);
     }
 
     [Test]
@@ -190,16 +213,19 @@ public void CloneWorks_AllPropertiesMatchIncludingParameters()
         parameter.Value = "3";
         parameter.SaveToDatabase();
 
-        var newMaster = new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(null, _filter, null);
+        var newMaster =
+            new FilterImporter(new ExtractionFilterFactory(_chiExtractionInformation), null).ImportFilter(null, _filter,
+                null);
 
         //we should now be a clone of the master we just created
-        Assert.AreEqual(_filter.ClonedFromExtractionFilter_ID,newMaster.ID);
+        Assert.AreEqual(_filter.ClonedFromExtractionFilter_ID, newMaster.ID);
         Assert.IsTrue(newMaster.Description.StartsWith(_filter.Description)); //it adds some addendum stuff onto it
-        Assert.AreEqual(_filter.WhereSQL,newMaster.WhereSQL);
+        Assert.AreEqual(_filter.WhereSQL, newMaster.WhereSQL);
 
-        Assert.AreEqual(_filter.GetAllParameters().Single().ParameterName, newMaster.GetAllParameters().Single().ParameterName);
-        Assert.AreEqual(_filter.GetAllParameters().Single().ParameterSQL, newMaster.GetAllParameters().Single().ParameterSQL);
+        Assert.AreEqual(_filter.GetAllParameters().Single().ParameterName,
+            newMaster.GetAllParameters().Single().ParameterName);
+        Assert.AreEqual(_filter.GetAllParameters().Single().ParameterSQL,
+            newMaster.GetAllParameters().Single().ParameterSQL);
         Assert.AreEqual(_filter.GetAllParameters().Single().Value, newMaster.GetAllParameters().Single().Value);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortCompilerRunnerTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortCompilerRunnerTests.cs
index 792704eec6..3ca6faf83a 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortCompilerRunnerTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortCompilerRunnerTests.cs
@@ -21,13 +21,12 @@
 
 namespace Rdmp.Core.Tests.CohortCreation;
 
-public class CohortCompilerRunnerTests:DatabaseTests
+public class CohortCompilerRunnerTests : DatabaseTests
 {
     [Test]
     public void CacheIdentifierListWithRunner_SimpleCase()
     {
-
-        SetupCohort(out DiscoveredDatabase db, out var cic, out var dt);
+        SetupCohort(out var db, out var cic, out var dt);
 
         var compiler = new CohortCompiler(cic);
 
@@ -37,12 +36,12 @@ public void CacheIdentifierListWithRunner_SimpleCase()
         Assert.AreEqual(CohortCompilerRunner.Phase.Finished, runner.ExecutionPhase);
 
         var rootTask = runner.Compiler.Tasks.Single(t => t.Key is AggregationContainerTask);
-            
+
         Assert.IsTrue(rootTask.Value.IsResultsForRootContainer);
         Assert.IsNull(rootTask.Key.CrashMessage);
         Assert.AreEqual(CompilationState.Finished, rootTask.Key.State);
 
-        Assert.AreEqual(dt.Rows.Count,rootTask.Value.Identifiers.Rows.Count);
+        Assert.AreEqual(dt.Rows.Count, rootTask.Value.Identifiers.Rows.Count);
     }
 
     [Test]
@@ -52,7 +51,7 @@ public void CacheIdentifierListWithRunner_WithCaching()
 
         var e = new MasterDatabaseScriptExecutor(db);
         var p = new QueryCachingPatcher();
-        e.CreateAndPatchDatabase(p,new AcceptAllCheckNotifier());
+        e.CreateAndPatchDatabase(p, new AcceptAllCheckNotifier());
 
         var serverReference = new ExternalDatabaseServer(CatalogueRepository, "Cache", p);
         serverReference.SetProperties(db);
@@ -77,6 +76,7 @@ public void CacheIdentifierListWithRunner_WithCaching()
 
         Assert.AreEqual(dt.Rows.Count, rootTask.Value.Identifiers.Rows.Count);
     }
+
     private void SetupCohort(out DiscoveredDatabase db, out CohortIdentificationConfiguration cic, out DataTable dt)
     {
         dt = new DataTable();
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortCompilerTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortCompilerTests.cs
index aaf8231141..d0ceb810ed 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortCompilerTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortCompilerTests.cs
@@ -17,13 +17,13 @@
 
 namespace Rdmp.Core.Tests.CohortCreation;
 
-public class CohortCompilerTests:CohortIdentificationTests
+public class CohortCompilerTests : CohortIdentificationTests
 {
     [Test]
     public void AddSameTaskTwice_StaysAtOne()
     {
         var compiler = new CohortCompiler(cohortIdentificationConfiguration);
-        container1.AddChild(aggregate1,0);
+        container1.AddChild(aggregate1, 0);
         try
         {
             compiler.AddTask(aggregate1, null);
@@ -56,7 +56,6 @@ public void AddSameTaskTwice_StaysAtOne()
             Assert.AreNotSame(oldTask, compiler.Tasks.Single()); //new task should not be the same as the old one
             Assert.IsFalse(compiler.Tasks.Single().Key.CancellationToken.IsCancellationRequested);
             //new task should not be cancelled} finally {
-
         }
         finally
         {
@@ -70,7 +69,7 @@ public void AddContainer_StaysAtOne()
         var compiler = new CohortCompiler(cohortIdentificationConfiguration);
         rootcontainer.AddChild(aggregate1, 1);
 
-        compiler.AddTask(rootcontainer, null);//add the root container
+        compiler.AddTask(rootcontainer, null); //add the root container
 
         Assert.AreEqual(1, compiler.Tasks.Count);
         var oldTask = compiler.Tasks.First();
@@ -83,13 +82,14 @@ public void AddContainer_StaysAtOne()
         rootcontainer.AddChild(aggregate2, 1);
 
         compiler.AddTask(rootcontainer, null);
-        Assert.AreEqual(1, compiler.Tasks.Count);//should still be 1 task
+        Assert.AreEqual(1, compiler.Tasks.Count); //should still be 1 task
 
         // TN: Task was never asked to start so was still at NotScheduled so cancellation wouldn't actually happen
         //old task should have been asked to cancel
         //Assert.IsTrue(oldTask.Key.CancellationToken.IsCancellationRequested);
-        Assert.AreNotSame(oldTask, compiler.Tasks.Single());//new task should not be the same as the old one
-        Assert.IsFalse(compiler.Tasks.Single().Key.CancellationToken.IsCancellationRequested);//new task should not be cancelled
+        Assert.AreNotSame(oldTask, compiler.Tasks.Single()); //new task should not be the same as the old one
+        Assert.IsFalse(compiler.Tasks.Single().Key.CancellationToken
+            .IsCancellationRequested); //new task should not be cancelled
 
         rootcontainer.RemoveChild(aggregate1);
         rootcontainer.RemoveChild(aggregate2);
@@ -102,13 +102,13 @@ public enum TestCompilerAddAllTasksTestCase
         Subcontainer
     }
 
-    [TestCase(TestCompilerAddAllTasksTestCase.CIC,true)]
+    [TestCase(TestCompilerAddAllTasksTestCase.CIC, true)]
     [TestCase(TestCompilerAddAllTasksTestCase.CIC, false)]
     [TestCase(TestCompilerAddAllTasksTestCase.RootContainer, true)]
     [TestCase(TestCompilerAddAllTasksTestCase.RootContainer, false)]
     [TestCase(TestCompilerAddAllTasksTestCase.Subcontainer, true)]
     [TestCase(TestCompilerAddAllTasksTestCase.Subcontainer, false)]
-    public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase,bool includeSubcontainers)
+    public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase, bool includeSubcontainers)
     {
         var aggregate4 =
             new AggregateConfiguration(CatalogueRepository, testData.catalogue, "UnitTestAggregate4")
@@ -116,7 +116,8 @@ public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase,boo
                 CountSQL = null
             };
         aggregate4.SaveToDatabase();
-        new AggregateDimension(CatalogueRepository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate4);
+        new AggregateDimension(CatalogueRepository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate4);
 
         var aggregate5 =
             new AggregateConfiguration(CatalogueRepository, testData.catalogue, "UnitTestAggregate5")
@@ -124,11 +125,14 @@ public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase,boo
                 CountSQL = null
             };
         aggregate5.SaveToDatabase();
-        new AggregateDimension(CatalogueRepository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate5);
+        new AggregateDimension(CatalogueRepository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate5);
+
+        var joinable =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate5);
 
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository,cohortIdentificationConfiguration, aggregate5);
 
-            
         try
         {
             //EXCEPT
@@ -148,29 +152,34 @@ public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase,boo
 
             rootcontainer.AddChild(aggregate2, 3);
 
-            container1.AddChild(aggregate3,1);
+            container1.AddChild(aggregate3, 1);
             container1.AddChild(aggregate4, 2);
 
             cohortIdentificationConfiguration.RootCohortAggregateContainer_ID = rootcontainer.ID;
             cohortIdentificationConfiguration.SaveToDatabase();
-                
+
             //The bit we are testing
             List<ICompileable> tasks;
             switch (testCase)
             {
                 case TestCompilerAddAllTasksTestCase.CIC:
                     tasks = compiler.AddAllTasks(includeSubcontainers);
-                    Assert.AreEqual(joinable,tasks.OfType<JoinableTask>().Single().Joinable); //should be a single joinable
-                    Assert.AreEqual(includeSubcontainers?7:6,tasks.Count); //all joinables, aggregates and root container 
+                    Assert.AreEqual(joinable,
+                        tasks.OfType<JoinableTask>().Single().Joinable); //should be a single joinable
+                    Assert.AreEqual(includeSubcontainers ? 7 : 6,
+                        tasks.Count); //all joinables, aggregates and root container 
 
                     break;
                 case TestCompilerAddAllTasksTestCase.RootContainer:
-                    tasks = compiler.AddTasksRecursively(Array.Empty<ISqlParameter>(), cohortIdentificationConfiguration.RootCohortAggregateContainer, includeSubcontainers);
-                    Assert.AreEqual(includeSubcontainers?6:5,tasks.Count); //all aggregates and root container (but not joinables)
+                    tasks = compiler.AddTasksRecursively(Array.Empty<ISqlParameter>(),
+                        cohortIdentificationConfiguration.RootCohortAggregateContainer, includeSubcontainers);
+                    Assert.AreEqual(includeSubcontainers ? 6 : 5,
+                        tasks.Count); //all aggregates and root container (but not joinables)
                     break;
                 case TestCompilerAddAllTasksTestCase.Subcontainer:
-                    tasks = compiler.AddTasksRecursively(Array.Empty<ISqlParameter>(), container1, includeSubcontainers);
-                    Assert.AreEqual(includeSubcontainers?3:2,tasks.Count); //subcontainer and its aggregates
+                    tasks = compiler.AddTasksRecursively(Array.Empty<ISqlParameter>(), container1,
+                        includeSubcontainers);
+                    Assert.AreEqual(includeSubcontainers ? 3 : 2, tasks.Count); //subcontainer and its aggregates
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(testCase));
@@ -183,7 +192,6 @@ public void TestCompilerAddAllTasks(TestCompilerAddAllTasksTestCase testCase,boo
             container1.RemoveChild(aggregate3);
             container1.RemoveChild(aggregate4);
             container1.MakeIntoAnOrphan();
-
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs
index c00dfe85b8..a783fc26ec 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortContainerAndCloningTests.cs
@@ -53,13 +53,12 @@ public void AggregateOrdering_ExplicitSetting_CorrectOrder()
     [Test]
     public void CloneChild_NamingCorrectNewObject()
     {
-
         //should not follow naming convention
         aggregate1.Name = "fish";
         Assert.IsFalse(cohortIdentificationConfiguration.IsValidNamedConfiguration(aggregate1));
 
         //add a clone using aggregate1 as a template 
-        var clone = cohortIdentificationConfiguration.ImportAggregateConfigurationAsIdentifierList(aggregate1,null);
+        var clone = cohortIdentificationConfiguration.ImportAggregateConfigurationAsIdentifierList(aggregate1, null);
         //add the clone
         rootcontainer.AddChild(clone, 0);
 
@@ -74,7 +73,6 @@ public void CloneChild_NamingCorrectNewObject()
 
             //clone should have a different ID - also it was created after so should be higher ID
             Assert.Greater(aggregateConfigurations[0].ID, aggregate1.ID);
-
         }
         finally
         {
@@ -87,6 +85,7 @@ public void CloneChild_NamingCorrectNewObject()
             clone.DeleteInDatabase();
         }
     }
+
     [Test]
     public void CloneChildWithFilter_IDsDifferent()
     {
@@ -114,7 +113,7 @@ public void CloneChildWithFilter_IDsDifferent()
         var clone = cohortIdentificationConfiguration.ImportAggregateConfigurationAsIdentifierList(aggregate1, null);
 
         //since its a cohort aggregate it should be identical to the origin Aggregate except it has a different ID and no count SQL
-        Assert.AreEqual(clone.CountSQL,null);
+        Assert.AreEqual(clone.CountSQL, null);
 
         //get the original sql
         var aggregateSql = aggregate1.GetQueryBuilder().SQL;
@@ -135,20 +134,20 @@ public void CloneChildWithFilter_IDsDifferent()
             Assert.AreNotEqual(cloneParameter.ID, param.ID);
 
             //it has a different ID and is part of an aggregate filter container (It is presumed to be involved with cohort identification cohortIdentificationConfiguration) which means it will be called cic_X_
-            var cohortAggregateSql = new CohortQueryBuilder(clone,null,null).SQL;
+            var cohortAggregateSql = new CohortQueryBuilder(clone, null, null).SQL;
 
 
 //the basic aggregate has the filter, parameter and group by
             Assert.AreEqual(CollapseWhitespace(
-                string.Format(
-                    @"DECLARE @sex AS varchar(50);
+                    string.Format(
+                        @"DECLARE @sex AS varchar(50);
 SET @sex='M';
 /*cic_{0}_UnitTestAggregate1*/
 SELECT 
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi],
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi],
 count(*)
 FROM 
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 WHERE
 (
 /*MyFilter*/
@@ -156,9 +155,10 @@ public void CloneChildWithFilter_IDsDifferent()
 )
 
 group by 
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 order by 
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]",cohortIdentificationConfiguration.ID)), CollapseWhitespace(aggregateSql));
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]", cohortIdentificationConfiguration.ID)),
+                CollapseWhitespace(aggregateSql));
 
 //the expected differences are
 //1. should not have the count
@@ -199,8 +199,8 @@ public void CohortIdentificationConfiguration_CloneEntirely()
         rootcontainer.AddChild(aggregate1, 5);
 
         rootcontainer.AddChild(container1);
-        container1.AddChild(aggregate2,1);
-        container1.AddChild(aggregate3,2);
+        container1.AddChild(aggregate2, 1);
+        container1.AddChild(aggregate3, 2);
 
 
         //create a filter too
@@ -213,7 +213,7 @@ public void CohortIdentificationConfiguration_CloneEntirely()
         {
             WhereSQL = "sex=@sex"
         };
-        new ParameterCreator(new AggregateFilterFactory(CatalogueRepository), null, null).CreateAll(filter,null);
+        new ParameterCreator(new AggregateFilterFactory(CatalogueRepository), null, null).CreateAll(filter, null);
         filter.SaveToDatabase();
 
         //with a parameter too
@@ -232,28 +232,28 @@ public void CohortIdentificationConfiguration_CloneEntirely()
             Assert.AreNotEqual(cohortIdentificationConfiguration.ID, clone.ID);
             Assert.IsTrue(clone.Name.EndsWith("(Clone)"));
 
-            Assert.AreNotEqual(clone.RootCohortAggregateContainer_ID, cohortIdentificationConfiguration.RootCohortAggregateContainer_ID);
+            Assert.AreNotEqual(clone.RootCohortAggregateContainer_ID,
+                cohortIdentificationConfiguration.RootCohortAggregateContainer_ID);
             Assert.IsNotNull(clone.RootCohortAggregateContainer_ID);
 
-            var beforeSQL = new CohortQueryBuilder(cohortIdentificationConfiguration,null).SQL;
-            var cloneSQL = new CohortQueryBuilder(clone,null).SQL;
+            var beforeSQL = new CohortQueryBuilder(cohortIdentificationConfiguration, null).SQL;
+            var cloneSQL = new CohortQueryBuilder(clone, null).SQL;
 
             beforeSQL = Regex.Replace(beforeSQL, "cic_[0-9]+_", "");
             cloneSQL = Regex.Replace(cloneSQL, "cic_[0-9]+_", "");
 
             //the SQL should be the same for them 
-            Assert.AreEqual(beforeSQL,cloneSQL);
+            Assert.AreEqual(beforeSQL, cloneSQL);
 
             var containerClone = clone.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
                 .Where(a => a.RootFilterContainer_ID != null)
                 .Select(ag => ag.RootFilterContainer).Single();
 
             Assert.AreNotEqual(container, containerClone);
-                
+
             //cleanup phase
             clone.DeleteInDatabase();
             containerClone.DeleteInDatabase();
-
         }
         finally
         {
@@ -265,5 +265,4 @@ public void CohortIdentificationConfiguration_CloneEntirely()
             container.DeleteInDatabase();
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs
index 8ac0f4fb36..73991efe6a 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortIdentificationConfigurationMergerTests.cs
@@ -17,40 +17,47 @@ public void TestSimpleMerge()
     {
         var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
 
-        var cic1 = new CohortIdentificationConfiguration(CatalogueRepository,"cic1");
-        var cic2 = new CohortIdentificationConfiguration(CatalogueRepository,"cic2");
+        var cic1 = new CohortIdentificationConfiguration(CatalogueRepository, "cic1");
+        var cic2 = new CohortIdentificationConfiguration(CatalogueRepository, "cic2");
 
         cic1.CreateRootContainerIfNotExists();
         var root1 = cic1.RootCohortAggregateContainer;
         root1.Name = "Root1";
         root1.SaveToDatabase();
-        root1.AddChild(aggregate1,1);
+        root1.AddChild(aggregate1, 1);
 
         cic2.CreateRootContainerIfNotExists();
         var root2 = cic2.RootCohortAggregateContainer;
         root2.Name = "Root2";
         root2.SaveToDatabase();
-        root2.AddChild(aggregate2,2);
+        root2.AddChild(aggregate2, 2);
 
-        Assert.AreEqual(1,cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
-        Assert.AreEqual(1,cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
         var numberOfCicsBefore = CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length;
 
-        var result = merger.Merge(new []{cic1,cic2 },SetOperation.UNION);
+        var result = merger.Merge(new[] { cic1, cic2 }, SetOperation.UNION);
 
         //original should still be intact
-        Assert.AreEqual(1,cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
-        Assert.AreEqual(1,cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
         //the new merged set should contain both
-        Assert.AreEqual(2,result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(2, result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
-        Assert.IsFalse(result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Any(c=>c.Equals(aggregate1)),"Expected the merge to include clone aggregates not the originals! (aggregate1)");
-        Assert.IsFalse(result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Any(c=>c.Equals(aggregate2)),"Expected the merge to include clone aggregates not the originals! (aggregate2)");
+        Assert.IsFalse(
+            result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
+                .Any(c => c.Equals(aggregate1)),
+            "Expected the merge to include clone aggregates not the originals! (aggregate1)");
+        Assert.IsFalse(
+            result.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
+                .Any(c => c.Equals(aggregate2)),
+            "Expected the merge to include clone aggregates not the originals! (aggregate2)");
 
         // Now should be a new one
-        Assert.AreEqual(numberOfCicsBefore + 1, CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
+        Assert.AreEqual(numberOfCicsBefore + 1,
+            CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
 
         var newCicId = result.ID;
 
@@ -61,13 +68,12 @@ public void TestSimpleMerge()
 
         // And should have
         Assert.AreEqual($"cic_{newCicId}_UnitTestAggregate2", newRoot2.GetAggregateConfigurations()[0].Name);
-        Assert.AreEqual($"cic_{newCicId}_UnitTestAggregate1",newRoot1.GetAggregateConfigurations()[0].Name);
+        Assert.AreEqual($"cic_{newCicId}_UnitTestAggregate1", newRoot1.GetAggregateConfigurations()[0].Name);
 
-        Assert.AreEqual($"Merged cics (IDs {cic1.ID},{cic2.ID})",result.Name);
+        Assert.AreEqual($"Merged cics (IDs {cic1.ID},{cic2.ID})", result.Name);
 
         Assert.IsTrue(cic1.Exists());
         Assert.IsTrue(cic2.Exists());
-
     }
 
     [Test]
@@ -75,20 +81,20 @@ public void TestSimpleUnMerge()
     {
         var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
 
-        var cicInput = new CohortIdentificationConfiguration(CatalogueRepository,"cic99");
+        var cicInput = new CohortIdentificationConfiguration(CatalogueRepository, "cic99");
 
         cicInput.CreateRootContainerIfNotExists();
         var root = cicInput.RootCohortAggregateContainer;
         root.Name = "Root";
         root.SaveToDatabase();
 
-        var sub1 = new CohortAggregateContainer(CatalogueRepository,SetOperation.INTERSECT)
+        var sub1 = new CohortAggregateContainer(CatalogueRepository, SetOperation.INTERSECT)
         {
             Order = 1
         };
         sub1.SaveToDatabase();
 
-        var sub2 = new CohortAggregateContainer(CatalogueRepository,SetOperation.EXCEPT)
+        var sub2 = new CohortAggregateContainer(CatalogueRepository, SetOperation.EXCEPT)
         {
             Order = 2
         };
@@ -97,28 +103,32 @@ public void TestSimpleUnMerge()
         root.AddChild(sub1);
         root.AddChild(sub2);
 
-        sub1.AddChild(aggregate1,0);
-        sub2.AddChild(aggregate2,0);
-        sub2.AddChild(aggregate3,1);
+        sub1.AddChild(aggregate1, 0);
+        sub2.AddChild(aggregate2, 0);
+        sub2.AddChild(aggregate3, 1);
 
         var numberOfCicsBefore = CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length;
 
         var results = merger.UnMerge(root);
 
         // Now should be two new ones
-        Assert.AreEqual(numberOfCicsBefore + 2, CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
-        Assert.AreEqual(2,results.Length);
+        Assert.AreEqual(numberOfCicsBefore + 2,
+            CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
+        Assert.AreEqual(2, results.Length);
 
-        Assert.AreEqual(SetOperation.INTERSECT,results[0].RootCohortAggregateContainer.Operation);
-        Assert.AreEqual(1,results[0].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
-            
-        Assert.IsFalse(results[0].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Intersect(new []{ aggregate1,aggregate2,aggregate3}).Any(),"Expected new aggregates to be new!");
+        Assert.AreEqual(SetOperation.INTERSECT, results[0].RootCohortAggregateContainer.Operation);
+        Assert.AreEqual(1, results[0].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
-        Assert.AreEqual(SetOperation.EXCEPT,results[1].RootCohortAggregateContainer.Operation);
-        Assert.AreEqual(2,results[1].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.IsFalse(
+            results[0].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
+                .Intersect(new[] { aggregate1, aggregate2, aggregate3 }).Any(), "Expected new aggregates to be new!");
 
-        Assert.IsFalse(results[1].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Intersect(new []{ aggregate1,aggregate2,aggregate3}).Any(),"Expected new aggregates to be new!");
+        Assert.AreEqual(SetOperation.EXCEPT, results[1].RootCohortAggregateContainer.Operation);
+        Assert.AreEqual(2, results[1].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
+        Assert.IsFalse(
+            results[1].RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
+                .Intersect(new[] { aggregate1, aggregate2, aggregate3 }).Any(), "Expected new aggregates to be new!");
     }
 
     [Test]
@@ -126,37 +136,37 @@ public void TestSimpleImportCic()
     {
         var merger = new CohortIdentificationConfigurationMerger(CatalogueRepository);
 
-        var cic1 = new CohortIdentificationConfiguration(CatalogueRepository,"cic1");
-        var cic2 = new CohortIdentificationConfiguration(CatalogueRepository,"cic2");
+        var cic1 = new CohortIdentificationConfiguration(CatalogueRepository, "cic1");
+        var cic2 = new CohortIdentificationConfiguration(CatalogueRepository, "cic2");
 
         cic1.CreateRootContainerIfNotExists();
         var root1 = cic1.RootCohortAggregateContainer;
         root1.Name = "Root1";
         root1.SaveToDatabase();
-        root1.AddChild(aggregate1,1);
+        root1.AddChild(aggregate1, 1);
 
         cic2.CreateRootContainerIfNotExists();
         var root2 = cic2.RootCohortAggregateContainer;
         root2.Name = "Root2";
         root2.SaveToDatabase();
-        root2.AddChild(aggregate2,2);
+        root2.AddChild(aggregate2, 2);
 
-        Assert.AreEqual(1,cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
-        Assert.AreEqual(1,cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
+        Assert.AreEqual(1, cic2.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
         var numberOfCicsBefore = CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length;
 
         //import 2 into 1
-        merger.Import(new []{cic2 },cic1.RootCohortAggregateContainer);
+        merger.Import(new[] { cic2 }, cic1.RootCohortAggregateContainer);
 
         //no new cics
-        Assert.AreEqual(numberOfCicsBefore, CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
+        Assert.AreEqual(numberOfCicsBefore,
+            CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>().Length);
 
         // cic 1 should now have both aggregates
-        Assert.AreEqual(2,cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
-            
-        Assert.AreEqual("Root1",cic1.RootCohortAggregateContainer.Name);
-        Assert.AreEqual("Root2",cic1.RootCohortAggregateContainer.GetSubContainers()[0].Name);
+        Assert.AreEqual(2, cic1.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively().Count);
 
+        Assert.AreEqual("Root1", cic1.RootCohortAggregateContainer.Name);
+        Assert.AreEqual("Root2", cic1.RootCohortAggregateContainer.GetSubContainers()[0].Name);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortIdentificationTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortIdentificationTests.cs
index 6dd2d8f721..f5f6702618 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortIdentificationTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortIdentificationTests.cs
@@ -34,7 +34,7 @@ protected override void SetUp()
         SetupTestData(CatalogueRepository);
     }
 
-        
+
     public void SetupTestData(ICatalogueRepository repository)
     {
         BlitzMainDataTables();
@@ -53,7 +53,8 @@ public void SetupTestData(ICatalogueRepository repository)
             };
         aggregate1.SaveToDatabase();
 
-        new AggregateDimension(repository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate1);
+        new AggregateDimension(repository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate1);
 
         aggregate2 =
             new AggregateConfiguration(repository, testData.catalogue, "UnitTestAggregate2")
@@ -63,7 +64,8 @@ public void SetupTestData(ICatalogueRepository repository)
 
         aggregate2.SaveToDatabase();
 
-        new AggregateDimension(repository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate2);
+        new AggregateDimension(repository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate2);
 
         aggregate3 =
             new AggregateConfiguration(repository, testData.catalogue, "UnitTestAggregate3")
@@ -72,7 +74,8 @@ public void SetupTestData(ICatalogueRepository repository)
             };
         aggregate3.SaveToDatabase();
 
-        new AggregateDimension(repository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate3);
+        new AggregateDimension(repository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate3);
 
         cohortIdentificationConfiguration = new CohortIdentificationConfiguration(repository, "UnitTestIdentification");
 
diff --git a/Rdmp.Core.Tests/CohortCreation/CohortMandatoryFilterImportingTests.cs b/Rdmp.Core.Tests/CohortCreation/CohortMandatoryFilterImportingTests.cs
index 6a85ee6e24..a76de6d34d 100644
--- a/Rdmp.Core.Tests/CohortCreation/CohortMandatoryFilterImportingTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/CohortMandatoryFilterImportingTests.cs
@@ -20,7 +20,8 @@ public class CohortMandatoryFilterImportingTests : CohortIdentificationTests
     [Test]
     public void NoMandatoryFilters()
     {
-        var importedAggregate = cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
+        var importedAggregate =
+            cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
         var importedAggregateFilterContainer = importedAggregate.RootFilterContainer;
 
         //Must have a root container
@@ -33,10 +34,10 @@ public void NoMandatoryFilters()
     public void ImportCatalogueWithMandatoryFilter()
     {
         var filter = new ExtractionFilter(CatalogueRepository, "MyMandatoryFilter", testData.extractionInformations[0])
-            {
-                IsMandatory = true,
-                WhereSQL = "There Be Dragons"
-            };
+        {
+            IsMandatory = true,
+            WhereSQL = "There Be Dragons"
+        };
         filter.SaveToDatabase();
 
         //ensure that it is picked SetUp
@@ -45,11 +46,11 @@ public void ImportCatalogueWithMandatoryFilter()
         Assert.AreEqual(filter, mandatoryFilters[0]);
 
         AggregateConfiguration importedAggregate = null;
-            
+
         try
         {
-                
-            importedAggregate = cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue,null);
+            importedAggregate =
+                cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
 
             Assert.AreEqual(ChangeDescription.NoChanges, importedAggregate.HasLocalChanges().Evaluation);
 
@@ -59,24 +60,23 @@ public void ImportCatalogueWithMandatoryFilter()
             Assert.IsNotNull(importedAggregateFilterContainer);
 
             //With an AND operation
-            Assert.AreEqual(FilterContainerOperation.AND,importedAggregateFilterContainer.Operation);
+            Assert.AreEqual(FilterContainerOperation.AND, importedAggregateFilterContainer.Operation);
 
             var importedFilters = importedAggregateFilterContainer.GetFilters();
             Assert.AreEqual(1, importedFilters.Length);
-            
+
             //they are not the same object
             Assert.AreNotEqual(filter, importedFilters[0]);
             //the deployed filter knows its parent it was cloned from
             Assert.AreEqual(filter.ID, importedFilters[0].ClonedFromExtractionFilter_ID);
             //the WHERE SQL of the filters should be the same
             Assert.AreEqual(filter.WhereSQL, importedFilters[0].WhereSQL);
-                
         }
         finally
         {
             filter.DeleteInDatabase();
 
-            if(importedAggregate != null)
+            if (importedAggregate != null)
             {
                 importedAggregate.RootFilterContainer.DeleteInDatabase();
                 importedAggregate.DeleteInDatabase();
@@ -92,14 +92,15 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
         var parameterSQL = "DECLARE @dragonCount as varchar(100)";
 
         var filter = new ExtractionFilter(CatalogueRepository, "MyMandatoryFilter", testData.extractionInformations[0])
-            {
-                IsMandatory = true,
-                WhereSQL = "There Be Dragons AND @dragonCount = 1"
-            };
+        {
+            IsMandatory = true,
+            WhereSQL = "There Be Dragons AND @dragonCount = 1"
+        };
         filter.SaveToDatabase();
 
         //Should result in the creation of a parameter
-        new ParameterCreator(new ExtractionFilterFactory(testData.extractionInformations[0]),null,null).CreateAll(filter,null);
+        new ParameterCreator(new ExtractionFilterFactory(testData.extractionInformations[0]), null, null)
+            .CreateAll(filter, null);
 
         var filterParameters = filter.ExtractionFilterParameters.ToArray();
         Assert.AreEqual(1, filterParameters.Length);
@@ -111,11 +112,11 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
         AnyTableSqlParameter global = null;
 
         if (createAGlobalOverrideBeforeHand)
-        {    
-            global = new AnyTableSqlParameter(CatalogueRepository, cohortIdentificationConfiguration,parameterSQL)
-                {
-                    Value = "'At Least 1000 Dragons'"
-                };
+        {
+            global = new AnyTableSqlParameter(CatalogueRepository, cohortIdentificationConfiguration, parameterSQL)
+            {
+                Value = "'At Least 1000 Dragons'"
+            };
             global.SaveToDatabase();
         }
 
@@ -129,7 +130,8 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
 
         try
         {
-            importedAggregate = cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
+            importedAggregate =
+                cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
             var importedAggregateFilterContainer = importedAggregate.RootFilterContainer;
 
             //Must have a root container
@@ -142,8 +144,10 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
             Assert.AreEqual(1, importedFilters.Length);
 
             //Because the configuration already has a parameter with the same declaration it should not bother to import the parameter from the underlying filter
-            if(createAGlobalOverrideBeforeHand)
-                Assert.AreEqual(0,importedFilters[0].GetAllParameters().Length);
+            if (createAGlobalOverrideBeforeHand)
+            {
+                Assert.AreEqual(0, importedFilters[0].GetAllParameters().Length);
+            }
             else
             {
                 //Because there is no global we should be creating a clone of the parameter too
@@ -151,14 +155,13 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
                 Assert.AreEqual(1, paramClones.Length);
 
                 //clone should have same SQL and Value
-                Assert.AreEqual(parameterSQL,paramClones[0].ParameterSQL);
+                Assert.AreEqual(parameterSQL, paramClones[0].ParameterSQL);
                 Assert.AreEqual(filterParameters[0].ParameterSQL, paramClones[0].ParameterSQL);
                 Assert.AreEqual(filterParameters[0].Value, paramClones[0].Value);
 
                 //but not be the same object in database
                 Assert.AreNotEqual(filterParameters[0], paramClones[0]);
             }
-
         }
         finally
         {
@@ -172,35 +175,33 @@ public void ImportCatalogueWithSingleFilterThatHasAParameter(bool createAGlobalO
                 importedAggregate.DeleteInDatabase();
             }
         }
-
     }
 
     [Test]
     public void ImportCatalogueWithMultipleMandatoryFilters()
     {
-
         //First mandatory
         var filter1 = new ExtractionFilter(CatalogueRepository, "MyMandatoryFilter", testData.extractionInformations[0])
-            {
-                IsMandatory = true,
-                WhereSQL = "There Be Dragons"
-            };
+        {
+            IsMandatory = true,
+            WhereSQL = "There Be Dragons"
+        };
         filter1.SaveToDatabase();
 
         //Second mandatory
         var filter2 = new ExtractionFilter(CatalogueRepository, "MyMandatoryFilter", testData.extractionInformations[1])
-            {
-                IsMandatory = true,
-                WhereSQL = "And Months"
-            };
+        {
+            IsMandatory = true,
+            WhereSQL = "And Months"
+        };
         filter2.SaveToDatabase();
 
         //Then one that is not mandatory
         var filter3 = new ExtractionFilter(CatalogueRepository, "MyMandatoryFilter", testData.extractionInformations[2])
-            {
-                IsMandatory = false,
-                WhereSQL = "But Can Also Be Flies"
-            };
+        {
+            IsMandatory = false,
+            WhereSQL = "But Can Also Be Flies"
+        };
         filter3.SaveToDatabase();
 
         //ensure that both are picked SetUp as mandatory filters by catalogue
@@ -212,7 +213,8 @@ public void ImportCatalogueWithMultipleMandatoryFilters()
         try
         {
             //import the Catalogue               
-            importedAggregate = cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
+            importedAggregate =
+                cohortIdentificationConfiguration.CreateNewEmptyConfigurationForCatalogue(testData.catalogue, null);
             var importedAggregateFilterContainer = importedAggregate.RootFilterContainer;
 
             //Must have a root container
@@ -231,7 +233,7 @@ public void ImportCatalogueWithMultipleMandatoryFilters()
             filter2.DeleteInDatabase();
             filter3.DeleteInDatabase();
 
-            if(importedAggregate != null)
+            if (importedAggregate != null)
             {
                 importedAggregate.RootFilterContainer.DeleteInDatabase();
                 importedAggregate.DeleteInDatabase();
diff --git a/Rdmp.Core.Tests/CohortCreation/PluginCohortCompilerTests.cs b/Rdmp.Core.Tests/CohortCreation/PluginCohortCompilerTests.cs
index 932c60cbec..2ffaf3f092 100644
--- a/Rdmp.Core.Tests/CohortCreation/PluginCohortCompilerTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/PluginCohortCompilerTests.cs
@@ -28,7 +28,8 @@ public class PluginCohortCompilerTests : CohortQueryBuilderWithCacheTests
     [Test]
     public void TestIPluginCohortCompiler_PopulatesCacheCorrectly()
     {
-        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true };
+        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
         // create a cohort config
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "mycic")
@@ -44,7 +45,8 @@ public void TestIPluginCohortCompiler_PopulatesCacheCorrectly()
         cic.CreateRootContainerIfNotExists();
 
         // create a use of the API as an AggregateConfiguration
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator, new CatalogueCombineable(myApi),cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator,
+            new CatalogueCombineable(myApi), cic.RootCohortAggregateContainer);
 
         Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
@@ -52,7 +54,7 @@ public void TestIPluginCohortCompiler_PopulatesCacheCorrectly()
         // run the cic
         var source = new CohortIdentificationConfigurationSource();
         source.PreInitialize(cic, new ThrowImmediatelyDataLoadEventListener());
-        var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         // 5 random chi numbers
         Assert.AreEqual(5, dt.Rows.Count);
@@ -82,12 +84,13 @@ public void TestIPluginCohortCompiler_PopulatesCacheCorrectly()
 
         Assert.AreEqual(results[0], results2[0]);
         Assert.AreEqual(results[1], results2[1]);
-
     }
+
     [Test]
     public void TestIPluginCohortCompiler_TestCloneCic()
     {
-        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true };
+        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
         // create a cohort config
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "mycic")
@@ -103,7 +106,8 @@ public void TestIPluginCohortCompiler_TestCloneCic()
         cic.CreateRootContainerIfNotExists();
 
         // create a use of the API as an AggregateConfiguration
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator, new CatalogueCombineable(myApi), cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator,
+            new CatalogueCombineable(myApi), cic.RootCohortAggregateContainer);
         Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
         cmd.AggregateCreatedIfAny.Description = "33";
@@ -121,7 +125,8 @@ public void TestIPluginCohortCompiler_TestCloneCic()
     [Test]
     public void TestIPluginCohortCompiler_APIsCantHavePatientIndexTables()
     {
-        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true };
+        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
         // create a cohort config
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "mycic")
@@ -137,7 +142,8 @@ public void TestIPluginCohortCompiler_APIsCantHavePatientIndexTables()
         cic.CreateRootContainerIfNotExists();
 
         // We need something in the root container otherwise the cic won't build
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator, new CatalogueCombineable(myApi), cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator,
+            new CatalogueCombineable(myApi), cic.RootCohortAggregateContainer);
         Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
         var regularAggregate = cmd.AggregateCreatedIfAny;
@@ -152,17 +158,19 @@ public void TestIPluginCohortCompiler_APIsCantHavePatientIndexTables()
         var joinables = cic.GetAllJoinables();
 
         // make them join one another
-        var ex = Assert.Throws<NotSupportedException>(()=>
+        var ex = Assert.Throws<NotSupportedException>(() =>
             new JoinableCohortAggregateConfigurationUse(CatalogueRepository, regularAggregate, joinables[0]));
 
-        Assert.AreEqual("API calls cannot join with PatientIndexTables (The API call must be self contained)", ex.Message);
+        Assert.AreEqual("API calls cannot join with PatientIndexTables (The API call must be self contained)",
+            ex.Message);
     }
 
 
     [Test]
     public void TestIPluginCohortCompiler_AsPatientIndexTable()
     {
-        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true };
+        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
         // Create a regular normal boring old table that will join into the results of the API call
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
@@ -170,7 +178,7 @@ public void TestIPluginCohortCompiler_AsPatientIndexTable()
         dt.Columns.Add("chi");
         dt.Rows.Add("0101010101");
 
-        var tbl = db.CreateTable("RegularBoringOldTable",dt);
+        var tbl = db.CreateTable("RegularBoringOldTable", dt);
         var cata = (Catalogue)Import(tbl);
         var eiChi = cata.GetAllExtractionInformation()[0];
 
@@ -191,7 +199,8 @@ public void TestIPluginCohortCompiler_AsPatientIndexTable()
         cic.CreateRootContainerIfNotExists();
 
         // Add the regular table 
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator, new CatalogueCombineable(cata), cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(activator,
+            new CatalogueCombineable(cata), cic.RootCohortAggregateContainer);
         Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
         var regularAggregate = cmd.AggregateCreatedIfAny;
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortCompilerCacheJoinableTest.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortCompilerCacheJoinableTest.cs
index f507c14533..0852492dce 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortCompilerCacheJoinableTest.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortCompilerCacheJoinableTest.cs
@@ -26,7 +26,7 @@ namespace Rdmp.Core.Tests.CohortCreation.QueryTests;
 /// <summary>
 /// Tests caching the results of an <see cref="AggregateConfiguration"/> which hits up multiple underlying tables.
 /// </summary>
-internal class CohortCompilerCacheJoinableTest:FromToDatabaseTests
+internal class CohortCompilerCacheJoinableTest : FromToDatabaseTests
 {
     [Test]
     public void CohortIdentificationConfiguration_Join_PatientIndexTable()
@@ -37,20 +37,20 @@ public void CohortIdentificationConfiguration_Join_PatientIndexTable()
         header.Columns.Add("Age");
         header.Columns.Add("Date");
         header.Columns.Add("Healthboard");
-        header.PrimaryKey = new []{header.Columns["ID"] };
+        header.PrimaryKey = new[] { header.Columns["ID"] };
 
-        header.Rows.Add("1","0101010101",50,new DateTime(2001,1,1),"T");
+        header.Rows.Add("1", "0101010101", 50, new DateTime(2001, 1, 1), "T");
         header.Rows.Add("2", "0202020202", 50, new DateTime(2002, 2, 2), "T");
 
-        var hTbl = From.CreateTable("header",header);
-        var cata = Import(hTbl,out var hTi, out _);
+        var hTbl = From.CreateTable("header", header);
+        var cata = Import(hTbl, out var hTi, out _);
         cata.Name = "My Combo Join Catalogue";
         cata.SaveToDatabase();
 
         var scripter = new MasterDatabaseScriptExecutor(To);
         var patcher = new QueryCachingPatcher();
-        scripter.CreateAndPatchDatabase(patcher,new AcceptAllCheckNotifier());
-        var edsCache = new ExternalDatabaseServer(CatalogueRepository,"Cache", new QueryCachingPatcher());
+        scripter.CreateAndPatchDatabase(patcher, new AcceptAllCheckNotifier());
+        var edsCache = new ExternalDatabaseServer(CatalogueRepository, "Cache", new QueryCachingPatcher());
         edsCache.SetProperties(To);
 
         var results = new DataTable();
@@ -58,78 +58,82 @@ public void CohortIdentificationConfiguration_Join_PatientIndexTable()
         results.Columns.Add("TestCode");
         results.Columns.Add("Result");
 
-        results.Rows.Add("1","HBA1C",50);
+        results.Rows.Add("1", "HBA1C", 50);
         results.Rows.Add("1", "ECOM", "Hi fellas");
         results.Rows.Add("1", "ALB", 100);
         results.Rows.Add("2", "ALB", 50);
 
         var rTbl = From.CreateTable("results", results);
 
-        var importer = new TableInfoImporter(CatalogueRepository,rTbl);
+        var importer = new TableInfoImporter(CatalogueRepository, rTbl);
         importer.DoImport(out var rTi, out var rColInfos);
 
-        var fe = new ForwardEngineerCatalogue(rTi,rColInfos);
+        var fe = new ForwardEngineerCatalogue(rTi, rColInfos);
         fe.ExecuteForwardEngineering(cata);
-            
+
         //Should now be 1 Catalogue with all the columns (tables will have to be joined to build the query though)
-        Assert.AreEqual(8,cata.GetAllExtractionInformation(ExtractionCategory.Core).Length);
+        Assert.AreEqual(8, cata.GetAllExtractionInformation(ExtractionCategory.Core).Length);
 
         var ji = new JoinInfo(CatalogueRepository,
-            rTi.ColumnInfos.Single(ci=>ci.GetRuntimeName().Equals("Header_ID",StringComparison.CurrentCultureIgnoreCase)),
+            rTi.ColumnInfos.Single(ci =>
+                ci.GetRuntimeName().Equals("Header_ID", StringComparison.CurrentCultureIgnoreCase)),
             hTi.ColumnInfos.Single(ci => ci.GetRuntimeName().Equals("ID", StringComparison.CurrentCultureIgnoreCase)),
             ExtractionJoinType.Right,
             null
         );
 
         //setup a cic that uses the cache
-        var cic = new CohortIdentificationConfiguration(CatalogueRepository,"MyCic");
+        var cic = new CohortIdentificationConfiguration(CatalogueRepository, "MyCic");
         cic.CreateRootContainerIfNotExists();
         cic.QueryCachingServer_ID = edsCache.ID;
         cic.SaveToDatabase();
 
         //create a patient index table that shows all the times that they had a test in any HB (with the HB being part of the result set)
-        var acPatIndex = new AggregateConfiguration(CatalogueRepository,cata,"My PatIndes");
+        var acPatIndex = new AggregateConfiguration(CatalogueRepository, cata, "My PatIndes");
 
-        var eiChi = cata.GetAllExtractionInformation(ExtractionCategory.Core).Single(ei => ei.GetRuntimeName().Equals("Chi"));
+        var eiChi = cata.GetAllExtractionInformation(ExtractionCategory.Core)
+            .Single(ei => ei.GetRuntimeName().Equals("Chi"));
         eiChi.IsExtractionIdentifier = true;
         acPatIndex.CountSQL = null;
         eiChi.SaveToDatabase();
 
         acPatIndex.AddDimension(eiChi);
-        acPatIndex.AddDimension(cata.GetAllExtractionInformation(ExtractionCategory.Core).Single(ei => ei.GetRuntimeName().Equals("Date")));
-        acPatIndex.AddDimension(cata.GetAllExtractionInformation(ExtractionCategory.Core).Single(ei => ei.GetRuntimeName().Equals("Healthboard")));
-            
+        acPatIndex.AddDimension(cata.GetAllExtractionInformation(ExtractionCategory.Core)
+            .Single(ei => ei.GetRuntimeName().Equals("Date")));
+        acPatIndex.AddDimension(cata.GetAllExtractionInformation(ExtractionCategory.Core)
+            .Single(ei => ei.GetRuntimeName().Equals("Healthboard")));
+
         cic.EnsureNamingConvention(acPatIndex);
 
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository,cic,acPatIndex);
-            
+        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cic, acPatIndex);
+
         Assert.IsTrue(acPatIndex.IsCohortIdentificationAggregate);
         Assert.IsTrue(acPatIndex.IsJoinablePatientIndexTable());
 
         var compiler = new CohortCompiler(cic);
 
-        var runner = new CohortCompilerRunner(compiler,50);
+        var runner = new CohortCompilerRunner(compiler, 50);
 
         var cancellation = new System.Threading.CancellationToken();
         runner.Run(cancellation);
 
         //they should not be executing and should be completed
-        Assert.IsFalse(compiler.Tasks.Any(t=>t.Value.IsExecuting));
-        Assert.AreEqual(Phase.Finished,runner.ExecutionPhase);
+        Assert.IsFalse(compiler.Tasks.Any(t => t.Value.IsExecuting));
+        Assert.AreEqual(Phase.Finished, runner.ExecutionPhase);
 
         var manager = new CachedAggregateConfigurationResultsManager(edsCache);
 
-        var cacheTableName = manager.GetLatestResultsTableUnsafe(acPatIndex,AggregateOperation.JoinableInceptionQuery);
+        var cacheTableName = manager.GetLatestResultsTableUnsafe(acPatIndex, AggregateOperation.JoinableInceptionQuery);
 
-        Assert.IsNotNull(cacheTableName,"No results were cached!");
+        Assert.IsNotNull(cacheTableName, "No results were cached!");
 
         var cacheTable = To.ExpectTable(cacheTableName.GetRuntimeName());
-            
+
         //chi, Date and TestCode
-        Assert.AreEqual(3,cacheTable.DiscoverColumns().Length);
+        Assert.AreEqual(3, cacheTable.DiscoverColumns().Length);
 
         //healthboard should be a string
-        Assert.AreEqual(typeof(string),cacheTable.DiscoverColumn("Healthboard").DataType.GetCSharpDataType());
+        Assert.AreEqual(typeof(string), cacheTable.DiscoverColumn("Healthboard").DataType.GetCSharpDataType());
 
         /*  Query Cache contains this:
          *
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTests.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTests.cs
index 702ae21af1..dce4a1ba69 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTests.cs
@@ -20,32 +20,34 @@ namespace Rdmp.Core.Tests.CohortCreation.QueryTests;
 public class CohortQueryBuilderTests : CohortIdentificationTests
 {
     private readonly string _scratchDatabaseName = TestDatabaseNames.GetConsistentName("ScratchArea");
-        
+
     [Test]
     public void TestGettingAggregateJustFromConfig_DistinctCHISelect()
     {
-        var builder = new CohortQueryBuilder(aggregate1,null,null);
+        var builder = new CohortQueryBuilder(aggregate1, null, null);
 
         Assert.AreEqual(CollapseWhitespace(string.Format(@"/*cic_{0}_UnitTestAggregate1*/
 SELECT 
 distinct
 [" + _scratchDatabaseName + @"].[dbo].[BulkData].[chi]
 FROM 
-[" + _scratchDatabaseName + @"].[dbo].[BulkData]", cohortIdentificationConfiguration.ID)), CollapseWhitespace(builder.SQL));
+[" + _scratchDatabaseName + @"].[dbo].[BulkData]", cohortIdentificationConfiguration.ID)),
+            CollapseWhitespace(builder.SQL));
     }
-        
+
     [Test]
     public void TestGettingAggregateJustFromConfig_SelectStar()
     {
-        var builder = new CohortQueryBuilder(aggregate1, null,null);
+        var builder = new CohortQueryBuilder(aggregate1, null, null);
 
         Assert.AreEqual(CollapseWhitespace(
-            string.Format(@"/*cic_{0}_UnitTestAggregate1*/
+                string.Format(@"/*cic_{0}_UnitTestAggregate1*/
 	SELECT
 	TOP 1000
 	*
 	FROM 
-	[" + _scratchDatabaseName + @"].[dbo].[BulkData]",cohortIdentificationConfiguration.ID)), CollapseWhitespace(builder.GetDatasetSampleSQL()));
+	[" + _scratchDatabaseName + @"].[dbo].[BulkData]", cohortIdentificationConfiguration.ID)),
+            CollapseWhitespace(builder.GetDatasetSampleSQL()));
     }
 
 
@@ -59,7 +61,7 @@ public void Test_GetDatasetSampleSQL_WithHAVING()
     {
         aggregate1.HavingSQL = "count(*)>1";
 
-        var builder = new CohortQueryBuilder(aggregate1, null,null);
+        var builder = new CohortQueryBuilder(aggregate1, null, null);
 
         Assert.AreEqual(CollapseWhitespace(
             string.Format(@"/*cic_{0}_UnitTestAggregate1*/
@@ -85,13 +87,12 @@ public void TestGettingAggregateSQLFromEntirity()
         rootcontainer.AddChild(aggregate2, 1);
         rootcontainer.AddChild(aggregate1, 5);
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
-        Assert.AreEqual(rootcontainer,aggregate1.GetCohortAggregateContainerIfAny());
+        Assert.AreEqual(rootcontainer, aggregate1.GetCohortAggregateContainerIfAny());
         try
         {
             Assert.AreEqual(
-
                 CollapseWhitespace(string.Format(
                     @"(
 	/*cic_{0}_UnitTestAggregate2*/
@@ -110,11 +111,10 @@ public void TestGettingAggregateSQLFromEntirity()
 	FROM 
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData]
 )"
-       
-                    ,cohortIdentificationConfiguration.ID))
+                    , cohortIdentificationConfiguration.ID))
                 , CollapseWhitespace(builder.SQL));
         }
-        finally 
+        finally
         {
             rootcontainer.RemoveChild(aggregate1);
             rootcontainer.RemoveChild(aggregate2);
@@ -136,7 +136,7 @@ public void TestOrdering_AggregateThenContainer()
         container1.AddChild(aggregate2, 1);
         container1.AddChild(aggregate3, 2);
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
         try
         {
@@ -176,7 +176,7 @@ public void TestOrdering_AggregateThenContainer()
 		[" + _scratchDatabaseName + @"].[dbo].[BulkData]
 	)
 
-)",cohortIdentificationConfiguration.ID))
+)", cohortIdentificationConfiguration.ID))
                 ,
                 CollapseWhitespace(builder.SQL));
         }
@@ -203,7 +203,7 @@ public void TestOrdering_ContainerThenAggregate()
         container1.AddChild(aggregate2, 1);
         container1.AddChild(aggregate3, 2);
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
         try
         {
@@ -239,7 +239,7 @@ public void TestOrdering_ContainerThenAggregate()
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData].[chi]
 	FROM 
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData]
-)",cohortIdentificationConfiguration.ID))
+)", cohortIdentificationConfiguration.ID))
                 , CollapseWhitespace(builder.SQL));
         }
         finally
@@ -254,8 +254,8 @@ public void TestOrdering_ContainerThenAggregate()
     public void TestGettingAggregateSQLFromEntirity_IncludingParametersAtTop()
     {
         //setup a filter (all filters must be in a container so the container is a default AND container)
-        var AND = new AggregateFilterContainer(CatalogueRepository,FilterContainerOperation.AND);
-        var filter = new AggregateFilter(CatalogueRepository,"hithere",AND)
+        var AND = new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND);
+        var filter = new AggregateFilter(CatalogueRepository, "hithere", AND)
         {
             //give the filter an implicit parameter requiring bit of SQL
             WhereSQL = "1=@abracadabra"
@@ -271,19 +271,17 @@ public void TestGettingAggregateSQLFromEntirity_IncludingParametersAtTop()
         new ParameterCreator(new AggregateFilterFactory(CatalogueRepository), null, null).CreateAll(filter, null);
 
         //get the parameter it just created, set its value and save it
-        var param = (AggregateFilterParameter) filter.GetAllParameters().Single();
+        var param = (AggregateFilterParameter)filter.GetAllParameters().Single();
         param.Value = "1";
         param.ParameterSQL = "DECLARE @abracadabra AS int;";
         param.SaveToDatabase();
 
-            
-            
-            
+
         //set the order so that 2 comes before 1
         rootcontainer.AddChild(aggregate2, 1);
         rootcontainer.AddChild(aggregate1, 5);
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
         try
         {
@@ -315,13 +313,12 @@ public void TestGettingAggregateSQLFromEntirity_IncludingParametersAtTop()
 	1=@abracadabra
 	)
 )
-",cohortIdentificationConfiguration.ID))
+", cohortIdentificationConfiguration.ID))
                 , CollapseWhitespace(builder.SQL));
 
 
-            var builder2 = new CohortQueryBuilder(aggregate1, null,null);
+            var builder2 = new CohortQueryBuilder(aggregate1, null, null);
             Assert.AreEqual(
-
                 CollapseWhitespace(
                     string.Format(
                         @"DECLARE @abracadabra AS int;
@@ -336,16 +333,15 @@ public void TestGettingAggregateSQLFromEntirity_IncludingParametersAtTop()
 (
 /*hithere*/
 1=@abracadabra
-)",cohortIdentificationConfiguration.ID)),
+)", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder2.SQL));
 
 
-            var selectStar = new CohortQueryBuilder(aggregate1,null,null).GetDatasetSampleSQL();
+            var selectStar = new CohortQueryBuilder(aggregate1, null, null).GetDatasetSampleSQL();
 
             Assert.AreEqual(
                 CollapseWhitespace(
                     string.Format(
-
                         @"DECLARE @abracadabra AS int;
 SET @abracadabra=1;
 
@@ -354,14 +350,13 @@ public void TestGettingAggregateSQLFromEntirity_IncludingParametersAtTop()
 	TOP 1000
 	*
 	FROM 
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 	WHERE
 	(
 	/*hithere*/
 	1=@abracadabra
-	)",cohortIdentificationConfiguration.ID)),
+	)", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(selectStar));
-
         }
         finally
         {
@@ -370,7 +365,6 @@ TOP 1000
 
             rootcontainer.RemoveChild(aggregate1);
             rootcontainer.RemoveChild(aggregate2);
-
         }
     }
 
@@ -378,11 +372,11 @@ TOP 1000
     [Test]
     public void TestGettingAggregateSQLFromEntirity_StopEarly()
     {
-        rootcontainer.AddChild(aggregate1,1);
-        rootcontainer.AddChild(aggregate2,2);
-        rootcontainer.AddChild(aggregate3,3);
+        rootcontainer.AddChild(aggregate1, 1);
+        rootcontainer.AddChild(aggregate2, 2);
+        rootcontainer.AddChild(aggregate3, 3);
 
-        var builder = new CohortQueryBuilder(rootcontainer, null,null)
+        var builder = new CohortQueryBuilder(rootcontainer, null, null)
         {
             StopContainerWhenYouReach = aggregate2
         };
@@ -392,7 +386,6 @@ public void TestGettingAggregateSQLFromEntirity_StopEarly()
             Assert.AreEqual(
                 CollapseWhitespace(
                     string.Format(
-
                         @"
 (
 	/*cic_{0}_UnitTestAggregate1*/
@@ -411,11 +404,11 @@ public void TestGettingAggregateSQLFromEntirity_StopEarly()
 	FROM 
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData]
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder.SQL));
 
 
-            var builder2 = new CohortQueryBuilder(rootcontainer, null,null)
+            var builder2 = new CohortQueryBuilder(rootcontainer, null, null)
             {
                 StopContainerWhenYouReach = null
             };
@@ -449,7 +442,7 @@ public void TestGettingAggregateSQLFromEntirity_StopEarly()
 	FROM 
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData]
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder2.SQL));
         }
         finally
@@ -457,7 +450,6 @@ public void TestGettingAggregateSQLFromEntirity_StopEarly()
             rootcontainer.RemoveChild(aggregate1);
             rootcontainer.RemoveChild(aggregate2);
             rootcontainer.RemoveChild(aggregate3);
-
         }
     }
 
@@ -468,18 +460,19 @@ public void TestGettingAggregateSQLFromEntirity_StopEarlyContainer()
 
         container1.AddChild(aggregate2, 2);
         container1.AddChild(aggregate3, 3);
-            
+
         rootcontainer.AddChild(container1);
 
         var aggregate4 = new AggregateConfiguration(CatalogueRepository, testData.catalogue, "UnitTestAggregate4");
-        new AggregateDimension(CatalogueRepository, testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate4);
+        new AggregateDimension(CatalogueRepository,
+            testData.extractionInformations.Single(e => e.GetRuntimeName().Equals("chi")), aggregate4);
 
-        rootcontainer.AddChild(aggregate4,5);
-        var builder = new CohortQueryBuilder(rootcontainer, null,null)
+        rootcontainer.AddChild(aggregate4, 5);
+        var builder = new CohortQueryBuilder(rootcontainer, null, null)
         {
             //Looks like:
             /*
-         * 
+         *
         EXCEPT
         Aggregate 1
           UNION            <-----We tell it to stop after this container
@@ -526,7 +519,7 @@ Aggregate 4
 	)
 
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder.SQL));
         }
         finally
@@ -554,10 +547,9 @@ public void TestHavingSQL()
         aggregate1.SaveToDatabase();
         try
         {
-
             rootcontainer.AddChild(container1);
 
-            var builder = new CohortQueryBuilder(rootcontainer, null,null);
+            var builder = new CohortQueryBuilder(rootcontainer, null, null);
             Assert.AreEqual(
                 CollapseWhitespace(
                     string.Format(
@@ -600,9 +592,8 @@ group by
 	)
 
 )
-",cohortIdentificationConfiguration.ID))
+", cohortIdentificationConfiguration.ID))
                 , CollapseWhitespace(builder.SQL));
-
         }
         finally
         {
@@ -619,11 +610,12 @@ group by
     }
 
     [Test]
-    [TestCase(true,true)]
+    [TestCase(true, true)]
     [TestCase(true, false)]
-    [TestCase(false,true)]
+    [TestCase(false, true)]
     [TestCase(false, false)]
-    public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bool valuesAreSame,bool memoryRepository)
+    public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bool valuesAreSame,
+        bool memoryRepository)
     {
         var repo = memoryRepository ? (ICatalogueRepository)new MemoryCatalogueRepository() : CatalogueRepository;
 
@@ -631,14 +623,14 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
         SetupTestData(repo);
 
         //setup a filter (all filters must be in a container so the container is a default AND container)
-        var AND1 = new AggregateFilterContainer(repo,FilterContainerOperation.AND);
-        var filter1_1 = new AggregateFilter(repo,"filter1_1",AND1);
-        var filter1_2 = new AggregateFilter(repo,"filter1_2",AND1);
-
-        var AND2 = new AggregateFilterContainer(repo,FilterContainerOperation.AND);
-        var filter2_1 = new AggregateFilter(repo,"filter2_1",AND2);
-        var filter2_2 = new AggregateFilter(repo,"filter2_2",AND2);
-             
+        var AND1 = new AggregateFilterContainer(repo, FilterContainerOperation.AND);
+        var filter1_1 = new AggregateFilter(repo, "filter1_1", AND1);
+        var filter1_2 = new AggregateFilter(repo, "filter1_2", AND1);
+
+        var AND2 = new AggregateFilterContainer(repo, FilterContainerOperation.AND);
+        var filter2_1 = new AggregateFilter(repo, "filter2_1", AND2);
+        var filter2_2 = new AggregateFilter(repo, "filter2_2", AND2);
+
         //Filters must belong to containers BEFORE parameter creation
         //Make aggregate1 use the filter set we just setup
         aggregate1.RootFilterContainer_ID = AND1.ID;
@@ -653,18 +645,18 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
         rootcontainer.AddChild(aggregate1, 5);
 
         //give the filter an implicit parameter requiring bit of SQL
-        foreach (var filter in new IFilter[]{filter1_1,filter1_2,filter2_1,filter2_2})
+        foreach (var filter in new IFilter[] { filter1_1, filter1_2, filter2_1, filter2_2 })
         {
             filter.WhereSQL = "@bob = 'bob'";
-            filter.SaveToDatabase();     
+            filter.SaveToDatabase();
             //get it to create the parameters for us
             new ParameterCreator(new AggregateFilterFactory(repo), null, null).CreateAll(filter, null);
 
             //get the parameter it just created, set its value and save it
-            var param = (AggregateFilterParameter) filter.GetAllParameters().Single();
+            var param = (AggregateFilterParameter)filter.GetAllParameters().Single();
             param.Value = "'Boom!'";
             param.ParameterSQL = "DECLARE @bob AS varchar(10);";
-                
+
             //if test case is different values then we change the values of the parameters
             if (!valuesAreSame && (filter.Equals(filter2_1) || Equals(filter, filter2_2)))
                 param.Value = "'Grenades Are Go'";
@@ -672,13 +664,12 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
             param.SaveToDatabase();
         }
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
-        Console.WriteLine( builder.SQL);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
+        Console.WriteLine(builder.SQL);
 
         try
         {
             if (valuesAreSame)
-            {
                 Assert.AreEqual(
                     CollapseWhitespace(
                         string.Format(
@@ -718,14 +709,11 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
 	@bob = 'bob'
 	)
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                     CollapseWhitespace(builder.SQL));
-            }
             else
-            {
                 Assert.AreEqual(
-
-                    CollapseWhitespace( 
+                    CollapseWhitespace(
                         string.Format(
                             @"DECLARE @bob AS varchar(10);
 SET @bob='Grenades Are Go';
@@ -736,9 +724,9 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
 	/*cic_{0}_UnitTestAggregate2*/
 	SELECT
 	distinct
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 	FROM 
-	["+TestDatabaseNames.Prefix+ @"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 	WHERE
 	(
 	/*filter2_1*/
@@ -753,9 +741,9 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
 	/*cic_{0}_UnitTestAggregate1*/
 	SELECT
 	distinct
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 	FROM 
-	["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 	WHERE
 	(
 	/*filter1_1*/
@@ -765,9 +753,8 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
 	@bob_2 = 'bob'
 	)
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                     CollapseWhitespace(builder.SQL));
-            }
         }
         finally
         {
@@ -778,10 +765,9 @@ public void TestGettingAggregateSQLFromEntirity_TwoFilterParametersPerDataset(bo
             filter1_2.DeleteInDatabase();
             filter2_1.DeleteInDatabase();
             filter2_2.DeleteInDatabase();
-                 
+
             AND1.DeleteInDatabase();
             AND2.DeleteInDatabase();
-
         }
     }
 
@@ -800,11 +786,10 @@ public void TestGettingAggregateSQL_Aggregate_IsDisabled()
 
         Assert.AreEqual(rootcontainer, aggregate1.GetCohortAggregateContainerIfAny());
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
         try
         {
             Assert.AreEqual(
-
                 CollapseWhitespace(string.Format(
                     @"(
 	/*cic_{0}_UnitTestAggregate2*/
@@ -814,13 +799,11 @@ public void TestGettingAggregateSQL_Aggregate_IsDisabled()
 	FROM 
 	[" + _scratchDatabaseName + @"].[dbo].[BulkData]
 )"
-
                     , cohortIdentificationConfiguration.ID))
                 , CollapseWhitespace(builder.SQL));
         }
         finally
         {
-
             aggregate1.IsDisabled = false;
             aggregate1.SaveToDatabase();
 
@@ -828,7 +811,7 @@ public void TestGettingAggregateSQL_Aggregate_IsDisabled()
             rootcontainer.RemoveChild(aggregate2);
         }
     }
-        
+
     [Test]
     public void TestGettingAggregateSQLFromEntirity_Filter_IsDisabled()
     {
@@ -877,7 +860,7 @@ public void TestGettingAggregateSQLFromEntirity_Filter_IsDisabled()
             param.SaveToDatabase();
         }
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
         Console.WriteLine(builder.SQL);
 
@@ -886,7 +869,6 @@ public void TestGettingAggregateSQLFromEntirity_Filter_IsDisabled()
             Assert.AreEqual(
                 CollapseWhitespace(
                     string.Format(
-
                         @"DECLARE @bob AS varchar(10);
 SET @bob='Grenades Are Go';
 DECLARE @bob_2 AS varchar(10);
@@ -924,11 +906,9 @@ public void TestGettingAggregateSQLFromEntirity_Filter_IsDisabled()
 )
 ", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder.SQL));
-                
         }
         finally
         {
-
             filter2_2.IsDisabled = false;
             filter2_2.SaveToDatabase();
 
@@ -942,7 +922,6 @@ public void TestGettingAggregateSQLFromEntirity_Filter_IsDisabled()
 
             AND1.DeleteInDatabase();
             AND2.DeleteInDatabase();
-
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTestsInvolvingTableValuedParameters.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTestsInvolvingTableValuedParameters.cs
index e9dc5409c5..032b99c501 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTestsInvolvingTableValuedParameters.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderTestsInvolvingTableValuedParameters.cs
@@ -13,10 +13,10 @@
 
 namespace Rdmp.Core.Tests.CohortCreation.QueryTests;
 
-public class CohortQueryBuilderTestsInvolvingTableValuedParameters:DatabaseTests
+public class CohortQueryBuilderTestsInvolvingTableValuedParameters : DatabaseTests
 {
     private TestableTableValuedFunction _function = new();
-        
+
     public void CreateFunction()
     {
         _function.Create(GetCleanedServer(DatabaseType.MicrosoftSQLServer), CatalogueRepository);
@@ -28,20 +28,23 @@ public void CohortGenerationDifferingTableValuedParametersTest()
         CreateFunction();
 
         //In this example we have 2 configurations which both target the same table valued function but which must have different parameter values
-        var config1 = new AggregateConfiguration(CatalogueRepository,_function.Cata, "CohortGenerationDifferingTableValuedParametersTest_1")
-            {
-                CountSQL = null
-            };
+        var config1 = new AggregateConfiguration(CatalogueRepository, _function.Cata,
+            "CohortGenerationDifferingTableValuedParametersTest_1")
+        {
+            CountSQL = null
+        };
         config1.SaveToDatabase();
 
-        var config2 = new AggregateConfiguration(CatalogueRepository,_function.Cata, "CohortGenerationDifferingTableValuedParametersTest_2")
-            {
-                CountSQL = null
-            };
+        var config2 = new AggregateConfiguration(CatalogueRepository, _function.Cata,
+            "CohortGenerationDifferingTableValuedParametersTest_2")
+        {
+            CountSQL = null
+        };
         config2.SaveToDatabase();
 
-        var cic = new CohortIdentificationConfiguration(CatalogueRepository,"CohortGenerationDifferingTableValuedParametersTest");
-            
+        var cic = new CohortIdentificationConfiguration(CatalogueRepository,
+            "CohortGenerationDifferingTableValuedParametersTest");
+
         cic.EnsureNamingConvention(config1);
         cic.EnsureNamingConvention(config2);
 
@@ -50,15 +53,15 @@ public void CohortGenerationDifferingTableValuedParametersTest()
             //make the string column the extraction identifier
             _function.ExtractionInformations[1].IsExtractionIdentifier = true;
             _function.ExtractionInformations[1].SaveToDatabase();
-                
+
             //add the extraction identtifier as the only dimension one ach of the aggregate configurations that we will use for the cohort identification query
-            new AggregateDimension(CatalogueRepository,_function.ExtractionInformations[1], config1);
-            new AggregateDimension(CatalogueRepository,_function.ExtractionInformations[1], config2);
+            new AggregateDimension(CatalogueRepository, _function.ExtractionInformations[1], config1);
+            new AggregateDimension(CatalogueRepository, _function.ExtractionInformations[1], config2);
 
             Assert.IsNull(cic.RootCohortAggregateContainer_ID);
 
             //create a root container for it
-            var container = new CohortAggregateContainer(CatalogueRepository,SetOperation.INTERSECT);
+            var container = new CohortAggregateContainer(CatalogueRepository, SetOperation.INTERSECT);
 
             //set the container as the root container for the cohort identification task object
             cic.RootCohortAggregateContainer_ID = container.ID;
@@ -68,7 +71,7 @@ public void CohortGenerationDifferingTableValuedParametersTest()
             container.AddChild(config1, 0);
             container.AddChild(config2, 1);
 
-            var builder = new CohortQueryBuilder(cic,null);
+            var builder = new CohortQueryBuilder(cic, null);
             Assert.AreEqual(
                 CollapseWhitespace(
                     string.Format(
@@ -85,7 +88,8 @@ public void CohortGenerationDifferingTableValuedParametersTest()
 	distinct
 	MyAwesomeFunction.[Name]
 	FROM 
-	[" + TestDatabaseNames.Prefix+ @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
+	[" + TestDatabaseNames.Prefix +
+                        @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
 
 	INTERSECT
 
@@ -94,25 +98,26 @@ public void CohortGenerationDifferingTableValuedParametersTest()
 	distinct
 	MyAwesomeFunction.[Name]
 	FROM 
-	[" + TestDatabaseNames.Prefix+@"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
+	[" + TestDatabaseNames.Prefix +
+                        @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
 )
-",cic.ID)),
+", cic.ID)),
                 CollapseWhitespace(builder.SQL));
 
             //now override JUST @name
-            var param1 = new AnyTableSqlParameter(CatalogueRepository,config1, "DECLARE @name AS varchar(50);")
- {
-     Value = "'lobster'"
- };
+            var param1 = new AnyTableSqlParameter(CatalogueRepository, config1, "DECLARE @name AS varchar(50);")
+            {
+                Value = "'lobster'"
+            };
             param1.SaveToDatabase();
 
-            var param2 = new AnyTableSqlParameter(CatalogueRepository,config2, "DECLARE @name AS varchar(50);")
- {
-     Value = "'monkey'"
- };
+            var param2 = new AnyTableSqlParameter(CatalogueRepository, config2, "DECLARE @name AS varchar(50);")
+            {
+                Value = "'monkey'"
+            };
             param2.SaveToDatabase();
 
-            var builder2 = new CohortQueryBuilder(cic,null);
+            var builder2 = new CohortQueryBuilder(cic, null);
 
             Assert.AreEqual(
                 CollapseWhitespace(
@@ -132,7 +137,8 @@ public void CohortGenerationDifferingTableValuedParametersTest()
 	distinct
 	MyAwesomeFunction.[Name]
 	FROM 
-	[" + TestDatabaseNames.Prefix+ @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
+	[" + TestDatabaseNames.Prefix +
+                        @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
 
 	INTERSECT
 
@@ -141,9 +147,10 @@ public void CohortGenerationDifferingTableValuedParametersTest()
 	distinct
 	MyAwesomeFunction.[Name]
 	FROM 
-	[" + TestDatabaseNames.Prefix+@"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name_2) AS MyAwesomeFunction
+	[" + TestDatabaseNames.Prefix +
+                        @"ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name_2) AS MyAwesomeFunction
 )
-",cic.ID)),
+", cic.ID)),
                 CollapseWhitespace(builder2.SQL));
         }
         finally
@@ -151,7 +158,6 @@ public void CohortGenerationDifferingTableValuedParametersTest()
             cic.DeleteInDatabase();
             config1.DeleteInDatabase();
             config2.DeleteInDatabase();
-                
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderWithCacheTests.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderWithCacheTests.cs
index 2664dd6874..ea1a9f1478 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderWithCacheTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortQueryBuilderWithCacheTests.cs
@@ -22,7 +22,7 @@ public class CohortQueryBuilderWithCacheTests : CohortIdentificationTests
 {
     protected DiscoveredDatabase queryCacheDatabase;
     protected ExternalDatabaseServer externalDatabaseServer;
-    protected DatabaseColumnRequest _chiColumnSpecification = new("chi","varchar(10)");
+    protected DatabaseColumnRequest _chiColumnSpecification = new("chi", "varchar(10)");
 
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
@@ -39,25 +39,24 @@ protected override void OneTimeSetUp()
 
         var p = new QueryCachingPatcher();
         executor.CreateAndPatchDatabase(p, new AcceptAllCheckNotifier());
-            
-        externalDatabaseServer = new ExternalDatabaseServer(CatalogueRepository, "QueryCacheForUnitTests",p);
+
+        externalDatabaseServer = new ExternalDatabaseServer(CatalogueRepository, "QueryCacheForUnitTests", p);
         externalDatabaseServer.SetProperties(queryCacheDatabase);
     }
-                
+
     [Test]
     public void TestGettingAggregateJustFromConfig_DistinctCHISelect()
     {
+        var manager = new CachedAggregateConfigurationResultsManager(externalDatabaseServer);
 
-        var manager = new CachedAggregateConfigurationResultsManager( externalDatabaseServer);
-            
         cohortIdentificationConfiguration.QueryCachingServer_ID = externalDatabaseServer.ID;
         cohortIdentificationConfiguration.SaveToDatabase();
-            
+
 
         cohortIdentificationConfiguration.CreateRootContainerIfNotExists();
-        cohortIdentificationConfiguration.RootCohortAggregateContainer.AddChild(aggregate1,0);
+        cohortIdentificationConfiguration.RootCohortAggregateContainer.AddChild(aggregate1, 0);
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
         try
         {
             Assert.AreEqual(
@@ -68,15 +67,15 @@ public void TestGettingAggregateJustFromConfig_DistinctCHISelect()
 	/*cic_{0}_UnitTestAggregate1*/
 	SELECT
 	distinct
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 	FROM 
-	["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builder.SQL));
 
             var server = queryCacheDatabase.Server;
-            using(var con = server.GetConnection())
+            using (var con = server.GetConnection())
             {
                 con.Open();
 
@@ -88,13 +87,14 @@ public void TestGettingAggregateJustFromConfig_DistinctCHISelect()
                     string.Format(@"/*cic_{0}_UnitTestAggregate1*/
 SELECT
 distinct
-[" +TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 FROM 
-[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]", cohortIdentificationConfiguration.ID), dt, _chiColumnSpecification, 30));
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]", cohortIdentificationConfiguration.ID), dt,
+                    _chiColumnSpecification, 30));
             }
 
 
-            var builderCached = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+            var builderCached = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
             Assert.AreEqual(
                 CollapseWhitespace(
@@ -102,18 +102,16 @@ public void TestGettingAggregateJustFromConfig_DistinctCHISelect()
                         @"
 (
 	/*Cached:cic_{0}_UnitTestAggregate1*/
-	select * from [" + queryCacheDatabase.GetRuntimeName() + "]..[IndexedExtractionIdentifierList_AggregateConfiguration" + aggregate1.ID + @"]
+	select * from [" + queryCacheDatabase.GetRuntimeName() +
+                        "]..[IndexedExtractionIdentifierList_AggregateConfiguration" + aggregate1.ID + @"]
 
 )
-",cohortIdentificationConfiguration.ID)),
+", cohortIdentificationConfiguration.ID)),
                 CollapseWhitespace(builderCached.SQL));
-
         }
         finally
         {
             cohortIdentificationConfiguration.RootCohortAggregateContainer.RemoveChild(aggregate1);
-                
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortSummaryQueryBuilderTests.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortSummaryQueryBuilderTests.cs
index 20a59cd507..caeab8701c 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortSummaryQueryBuilderTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/CohortSummaryQueryBuilderTests.cs
@@ -16,7 +16,7 @@
 
 namespace Rdmp.Core.Tests.CohortCreation.QueryTests;
 
-public class CohortSummaryQueryBuilderTests:DatabaseTests
+public class CohortSummaryQueryBuilderTests : DatabaseTests
 {
     private Catalogue c;
     private CatalogueItem ci;
@@ -29,7 +29,7 @@ public class CohortSummaryQueryBuilderTests:DatabaseTests
     private AggregateConfiguration acCohort;
     private AggregateConfiguration acDataset;
     private ExtractionInformation ei_Chi;
-        
+
     private CohortIdentificationConfiguration cic;
     private ExtractionInformation ei_Year;
 
@@ -51,7 +51,7 @@ protected override void SetUp()
         col = new ColumnInfo(CatalogueRepository, "mycol", "varchar(10)", t);
         col2 = new ColumnInfo(CatalogueRepository, "myOtherCol", "varchar(10)", t);
 
-           
+
         acCohort = new AggregateConfiguration(CatalogueRepository, c,
             $"{CohortIdentificationConfiguration.CICPrefix}Agg1_Cohort");
         acDataset = new AggregateConfiguration(CatalogueRepository, c, "Agg2_Dataset");
@@ -76,29 +76,38 @@ protected override void SetUp()
 
         cic = new CohortIdentificationConfiguration(CatalogueRepository, "mycic");
         cic.CreateRootContainerIfNotExists();
-        cic.RootCohortAggregateContainer.AddChild(acCohort,0);
+        cic.RootCohortAggregateContainer.AddChild(acCohort, 0);
     }
+
     #region Constructor Arguments
+
     [Test]
     public void ConstructorArguments_SameAggregateTwice()
     {
-        var ex = Assert.Throws<ArgumentException>(()=>new CohortSummaryQueryBuilder(acCohort,acCohort,null));
-        Assert.AreEqual("Summary and Cohort should be different aggregates.  Summary should be a graphable useful aggregate while cohort should return a list of private identifiers",ex.Message);
+        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acCohort, acCohort, null));
+        Assert.AreEqual(
+            "Summary and Cohort should be different aggregates.  Summary should be a graphable useful aggregate while cohort should return a list of private identifiers",
+            ex.Message);
     }
 
     [Test]
     public void ConstructorArguments_Param1AccidentallyACohort()
     {
-        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acCohort, acDataset,null));
-        Assert.AreEqual("The first argument to constructor CohortSummaryQueryBuilder should be a basic AggregateConfiguration (i.e. not a cohort) but the argument you passed ('cic_Agg1_Cohort') was a cohort identification configuration aggregate", ex.Message);
+        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acCohort, acDataset, null));
+        Assert.AreEqual(
+            "The first argument to constructor CohortSummaryQueryBuilder should be a basic AggregateConfiguration (i.e. not a cohort) but the argument you passed ('cic_Agg1_Cohort') was a cohort identification configuration aggregate",
+            ex.Message);
     }
+
     [Test]
     public void ConstructorArguments_Param2AccidentallyAnAggregate()
     {
         //change it in memory so it doesn't look like a cohort aggregate anymore
         acCohort.Name = "RegularAggregate";
-        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acDataset,acCohort,null));
-        Assert.AreEqual("The second argument to constructor CohortSummaryQueryBuilder should be a cohort identification aggregate (i.e. have a single AggregateDimension marked IsExtractionIdentifier and have a name starting with cic_) but the argument you passed ('RegularAggregate') was NOT a cohort identification configuration aggregate", ex.Message);
+        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acDataset, acCohort, null));
+        Assert.AreEqual(
+            "The second argument to constructor CohortSummaryQueryBuilder should be a cohort identification aggregate (i.e. have a single AggregateDimension marked IsExtractionIdentifier and have a name starting with cic_) but the argument you passed ('RegularAggregate') was NOT a cohort identification configuration aggregate",
+            ex.Message);
         acCohort.RevertToDatabaseState();
     }
 
@@ -106,17 +115,20 @@ public void ConstructorArguments_Param2AccidentallyAnAggregate()
     public void ConstructorArguments_DifferentDatasets()
     {
         acCohort.Catalogue_ID = -999999;
-        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acDataset, acCohort,null));
+        var ex = Assert.Throws<ArgumentException>(() => new CohortSummaryQueryBuilder(acDataset, acCohort, null));
 
-        Assert.IsTrue(ex.Message.StartsWith("Constructor arguments to CohortSummaryQueryBuilder must belong to the same dataset"));
+        Assert.IsTrue(
+            ex.Message.StartsWith(
+                "Constructor arguments to CohortSummaryQueryBuilder must belong to the same dataset"));
         acCohort.RevertToDatabaseState();
     }
 
     [Test]
     public void ConstructorArguments_Normal()
     {
-        Assert.DoesNotThrow(() => new CohortSummaryQueryBuilder(acDataset, acCohort,null));
+        Assert.DoesNotThrow(() => new CohortSummaryQueryBuilder(acDataset, acCohort, null));
     }
+
     #endregion
 
 
@@ -140,9 +152,10 @@ order by
     [Test]
     public void QueryGeneration_WithLinkedCohort_WHERECHIIN()
     {
-        var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort,null);
+        var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort, null);
 
-        var ex = Assert.Throws<NotSupportedException>(() => csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereExtractionIdentifiersIn));
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereExtractionIdentifiersIn));
 
         Assert.AreEqual("No Query Caching Server configured", ex.Message);
     }
@@ -150,15 +163,16 @@ public void QueryGeneration_WithLinkedCohort_WHERECHIIN()
     [Test]
     public void QueryGeneration_Parameters_DifferentValues_WHERECHIIN()
     {
-        CreateParameters("'bob'","'fish'");
+        CreateParameters("'bob'", "'fish'");
 
         try
         {
-            var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort,null);
+            var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort, null);
 
-            var ex = Assert.Throws<NotSupportedException>(() => csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereExtractionIdentifiersIn));
+            var ex = Assert.Throws<NotSupportedException>(() =>
+                csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereExtractionIdentifiersIn));
 
-            Assert.AreEqual("No Query Caching Server configured",ex.Message);
+            Assert.AreEqual("No Query Caching Server configured", ex.Message);
         }
         finally
         {
@@ -167,11 +181,10 @@ public void QueryGeneration_Parameters_DifferentValues_WHERECHIIN()
     }
 
 
-
     [Test]
     public void QueryGeneration_NoCohortWhereLogic()
     {
-        var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort,null);
+        var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort, null);
 
         var builder = csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereRecordsIn);
 
@@ -201,7 +214,7 @@ public void QueryGeneration_BothHaveWHEREContainerAndParameters()
         try
         {
             ((IDeleteable)parama1).DeleteInDatabase();
-            var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort,null);
+            var csqb = new CohortSummaryQueryBuilder(acDataset, acCohort, null);
 
             var builder = csqb.GetAdjustedAggregateBuilder(CohortSummaryAdjustment.WhereRecordsIn);
 
@@ -230,7 +243,6 @@ group by
 Year
 order by 
 Year"), CollapseWhitespace(builder.SQL));
-
         }
         finally
         {
@@ -238,6 +250,7 @@ order by
             DestroyParameters();
         }
     }
+
     private void DestroyParameters()
     {
         container1.GetFilters()[0].DeleteInDatabase();
@@ -247,7 +260,7 @@ private void DestroyParameters()
         container2.DeleteInDatabase();
     }
 
-    private void CreateParameters(string param1Value,string param2Value)
+    private void CreateParameters(string param1Value, string param2Value)
     {
         container1 = new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND);
         acDataset.RootFilterContainer_ID = container1.ID;
@@ -281,6 +294,5 @@ private void CreateParameters(string param1Value,string param2Value)
         parama2 = filter2.GetAllParameters()[0];
         parama2.Value = param2Value;
         parama2.SaveToDatabase();
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs b/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs
index 01914e9db9..bce37f84a9 100644
--- a/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/QueryTests/JoinableCohortConfigurationTests.cs
@@ -36,7 +36,8 @@ public void CreateJoinable()
         JoinableCohortAggregateConfiguration joinable = null;
         try
         {
-            joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+            joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
 
             Assert.AreEqual(joinable.CohortIdentificationConfiguration_ID, cohortIdentificationConfiguration.ID);
             Assert.AreEqual(joinable.AggregateConfiguration_ID, aggregate1.ID);
@@ -50,10 +51,14 @@ public void CreateJoinable()
     [Test]
     public void CreateJoinable_IsAlreadyInAContainer()
     {
-        cohortIdentificationConfiguration.RootCohortAggregateContainer.AddChild(aggregate1,1);
-
-        var ex = Assert.Throws<NotSupportedException>(() => new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1));
-        Assert.AreEqual("Cannot make aggregate UnitTestAggregate1 into a Joinable aggregate because it is already in a CohortAggregateContainer", ex.Message);
+        cohortIdentificationConfiguration.RootCohortAggregateContainer.AddChild(aggregate1, 1);
+
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1));
+        Assert.AreEqual(
+            "Cannot make aggregate UnitTestAggregate1 into a Joinable aggregate because it is already in a CohortAggregateContainer",
+            ex.Message);
         cohortIdentificationConfiguration.RootCohortAggregateContainer.RemoveChild(aggregate1);
     }
 
@@ -64,20 +69,27 @@ public void CreateJoinable_NoIsExtractionIdentifier()
         aggregate1.AggregateDimensions.First().DeleteInDatabase();
         aggregate1.ClearAllInjections();
 
-        var ex = Assert.Throws<NotSupportedException>(()=>new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1));
-        Assert.AreEqual("Cannot make aggregate UnitTestAggregate1 into a Joinable aggregate because it has 0 columns marked IsExtractionIdentifier", ex.Message);
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1));
+        Assert.AreEqual(
+            "Cannot make aggregate UnitTestAggregate1 into a Joinable aggregate because it has 0 columns marked IsExtractionIdentifier",
+            ex.Message);
     }
 
     [Test]
     public void CreateJoinable_AddTwice()
     {
         //delete the first dimension (chi)
-        var join1 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+        var join1 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+            aggregate1);
         try
         {
-            if(CatalogueRepository is TableRepository)
+            if (CatalogueRepository is TableRepository)
             {
-                var ex = Assert.Throws<SqlException>(() => new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1));
+                var ex = Assert.Throws<SqlException>(() =>
+                    new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                        aggregate1));
                 Assert.IsTrue(ex.Message.Contains("ix_eachAggregateCanOnlyBeJoinableOnOneProject"));
             }
         }
@@ -90,14 +102,15 @@ public void CreateJoinable_AddTwice()
     [Test]
     public void CreateUsers()
     {
-        JoinableCohortAggregateConfiguration joinable = null; 
+        JoinableCohortAggregateConfiguration joinable = null;
         try
         {
-            joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+            joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
             joinable.AddUser(aggregate2);
 
             Assert.IsTrue(joinable.Users.Length == 1);
-            Assert.AreEqual(aggregate2,joinable.Users[0].AggregateConfiguration);
+            Assert.AreEqual(aggregate2, joinable.Users[0].AggregateConfiguration);
         }
         finally
         {
@@ -108,12 +121,16 @@ public void CreateUsers()
     [Test]
     public void CreateUsers_DuplicateUser()
     {
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+        var joinable =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
         try
         {
             joinable.AddUser(aggregate2);
-            var ex = Assert.Throws<Exception>(()=>joinable.AddUser(aggregate2));
-            Assert.AreEqual($"AggregateConfiguration 'UnitTestAggregate2' already uses 'Patient Index Table:cic_{cohortIdentificationConfiguration.ID}_UnitTestAggregate1'. Only one patient index table join is permitted.", ex.Message);
+            var ex = Assert.Throws<Exception>(() => joinable.AddUser(aggregate2));
+            Assert.AreEqual(
+                $"AggregateConfiguration 'UnitTestAggregate2' already uses 'Patient Index Table:cic_{cohortIdentificationConfiguration.ID}_UnitTestAggregate1'. Only one patient index table join is permitted.",
+                ex.Message);
         }
         finally
         {
@@ -124,11 +141,14 @@ public void CreateUsers_DuplicateUser()
     [Test]
     public void CreateUsers_SelfReferrential()
     {
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+        var joinable =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
         try
         {
-            var ex = Assert.Throws<NotSupportedException>(()=>joinable.AddUser(aggregate1));
-            Assert.AreEqual("Cannot configure AggregateConfiguration UnitTestAggregate1 as a Join user to itself!", ex.Message);
+            var ex = Assert.Throws<NotSupportedException>(() => joinable.AddUser(aggregate1));
+            Assert.AreEqual("Cannot configure AggregateConfiguration UnitTestAggregate1 as a Join user to itself!",
+                ex.Message);
         }
         finally
         {
@@ -139,12 +159,18 @@ public void CreateUsers_SelfReferrential()
     [Test]
     public void CreateUsers_ToAnyOtherJoinable()
     {
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
-        var joinable2 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate2);
+        var joinable =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
+        var joinable2 =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate2);
         try
         {
             var ex = Assert.Throws<NotSupportedException>(() => joinable.AddUser(aggregate2));
-            Assert.AreEqual("Cannot add user UnitTestAggregate2 because that AggregateConfiguration is itself a JoinableCohortAggregateConfiguration", ex.Message);
+            Assert.AreEqual(
+                "Cannot add user UnitTestAggregate2 because that AggregateConfiguration is itself a JoinableCohortAggregateConfiguration",
+                ex.Message);
         }
         finally
         {
@@ -152,10 +178,13 @@ public void CreateUsers_ToAnyOtherJoinable()
             joinable2.DeleteInDatabase();
         }
     }
+
     [Test]
     public void CreateUsers_ToNoExtractionIdentifierTable()
     {
-        var joinable = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate1);
+        var joinable =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate1);
 
         aggregate2.AggregateDimensions.First().DeleteInDatabase();
         aggregate2.ClearAllInjections();
@@ -163,7 +192,9 @@ public void CreateUsers_ToNoExtractionIdentifierTable()
         try
         {
             var ex = Assert.Throws<NotSupportedException>(() => joinable.AddUser(aggregate2));
-            Assert.AreEqual("Cannot configure AggregateConfiguration UnitTestAggregate2 as join user because it does not contain exactly 1 IsExtractionIdentifier dimension", ex.Message);
+            Assert.AreEqual(
+                "Cannot configure AggregateConfiguration UnitTestAggregate2 as join user because it does not contain exactly 1 IsExtractionIdentifier dimension",
+                ex.Message);
         }
         finally
         {
@@ -175,20 +206,21 @@ public void CreateUsers_ToNoExtractionIdentifierTable()
     public void QueryBuilderTest()
     {
         //make aggregate 2 a joinable
-        var joinable2 = new JoinableCohortAggregateConfiguration(CatalogueRepository,cohortIdentificationConfiguration, aggregate2);
+        var joinable2 =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate2);
         joinable2.AddUser(aggregate1);
 
-        var builder = new CohortQueryBuilder(aggregate1, null,null);
+        var builder = new CohortQueryBuilder(aggregate1, null, null);
         Console.WriteLine(builder.SQL);
         try
         {
-                
             using (var con = (SqlConnection)Database.Server.GetConnection())
             {
                 con.Open();
 
                 using var dbReader = new SqlCommand(builder.SQL, con).ExecuteReader();
-                    
+
                 //can read at least one row
                 Assert.IsTrue(dbReader.Read());
             }
@@ -201,19 +233,19 @@ public void QueryBuilderTest()
                     @"/*cic_{1}_UnitTestAggregate1*/
 SELECT
 distinct
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 FROM 
-["+TestDatabaseNames.Prefix+ @"ScratchArea].[dbo].[BulkData]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 LEFT Join (
 	/*cic_{1}_UnitTestAggregate2*/
 	SELECT
 	distinct
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 	FROM 
-	["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 ){0}
-on ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi] = {0}.chi",expectedTableAlias,cohortIdentificationConfiguration.ID), builder.SQL);
-
+on [" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi] = {0}.chi", expectedTableAlias,
+                    cohortIdentificationConfiguration.ID), builder.SQL);
         }
         finally
         {
@@ -225,11 +257,14 @@ LEFT Join (
     [Test]
     public void QueryBuilderTest_AdditionalColumn()
     {
-        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => e.GetRuntimeName().Equals("dtCreated"));
+        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => e.GetRuntimeName().Equals("dtCreated"));
         aggregate2.AddDimension(anotherCol);
 
         //make aggregate 2 a joinable
-        var joinable2 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate2);
+        var joinable2 =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate2);
         joinable2.AddUser(aggregate1);
 
         var expectedTableAlias = $"ix{joinable2.ID}";
@@ -240,7 +275,10 @@ public void QueryBuilderTest_AdditionalColumn()
         var filter1 = new AggregateFilter(CatalogueRepository, "Within 1 year of event", filterContainer1);
         var filter2 = new AggregateFilter(CatalogueRepository, "DateAfter2001", filterContainer2);
 
-        filter1.WhereSQL = string.Format("ABS(DATEDIFF(year, {0}.dtCreated, ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1",expectedTableAlias);
+        filter1.WhereSQL =
+            string.Format(
+                "ABS(DATEDIFF(year, {0}.dtCreated, [" + TestDatabaseNames.Prefix +
+                @"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1", expectedTableAlias);
         filter1.SaveToDatabase();
 
         filter2.WhereSQL = "dtCreated > '2001-01-01'";
@@ -252,12 +290,12 @@ public void QueryBuilderTest_AdditionalColumn()
         aggregate2.RootFilterContainer_ID = filterContainer2.ID;
         aggregate2.SaveToDatabase();
 
-        var builder = new CohortQueryBuilder(aggregate1, null,null);
+        var builder = new CohortQueryBuilder(aggregate1, null, null);
 
 
         Console.WriteLine(builder.SQL);
 
-            
+
         try
         {
             using (var con = (SqlConnection)Database.Server.GetConnection())
@@ -278,29 +316,29 @@ public void QueryBuilderTest_AdditionalColumn()
                         @"/*cic_{1}_UnitTestAggregate1*/
 SELECT
 distinct
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 FROM 
-["+TestDatabaseNames.Prefix+ @"ScratchArea].[dbo].[BulkData]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 LEFT Join (
 	/*cic_{1}_UnitTestAggregate2*/
 	SELECT distinct
-	[" + TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi], ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[dtCreated]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi], [" + TestDatabaseNames.Prefix +
+                        @"ScratchArea].[dbo].[BulkData].[dtCreated]
 	FROM 
-	["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+	[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 	WHERE
 	(
 	/*DateAfter2001*/
 	dtCreated > '2001-01-01'
 	)
 ){0}
-on ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi] = {0}.chi
+on [" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi] = {0}.chi
 
 WHERE
 (
 /*Within 1 year of event*/
-ABS(DATEDIFF(year, {0}.dtCreated, ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1
-)", expectedTableAlias,cohortIdentificationConfiguration.ID)), CollapseWhitespace(builder.SQL));
-
+ABS(DATEDIFF(year, {0}.dtCreated, [" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1
+)", expectedTableAlias, cohortIdentificationConfiguration.ID)), CollapseWhitespace(builder.SQL));
         }
         finally
         {
@@ -310,7 +348,7 @@ SELECT distinct
             filterContainer1.DeleteInDatabase();
 
             filterContainer2.DeleteInDatabase();
-                
+
             joinable2.Users[0].DeleteInDatabase();
             joinable2.DeleteInDatabase();
         }
@@ -319,11 +357,14 @@ SELECT distinct
     [Test]
     public void QueryBuilderTest_JoinableCloning()
     {
-        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => e.GetRuntimeName().Equals("dtCreated"));
+        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => e.GetRuntimeName().Equals("dtCreated"));
         aggregate2.AddDimension(anotherCol);
 
         //make aggregate 2 a joinable
-        var joinable2 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate2);
+        var joinable2 =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate2);
         joinable2.AddUser(aggregate1);
 
         var expectedTableAlias = $"ix{joinable2.ID}";
@@ -334,7 +375,10 @@ public void QueryBuilderTest_JoinableCloning()
         var filter1 = new AggregateFilter(CatalogueRepository, "Within 1 year of event", filterContainer1);
         var filter2 = new AggregateFilter(CatalogueRepository, "DateAfter2001", filterContainer2);
 
-        filter1.WhereSQL = string.Format("ABS(DATEDIFF(year, {0}.dtCreated, ["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1", expectedTableAlias);
+        filter1.WhereSQL =
+            string.Format(
+                "ABS(DATEDIFF(year, {0}.dtCreated, [" + TestDatabaseNames.Prefix +
+                @"ScratchArea].[dbo].[BulkData].dtCreated)) <= 1", expectedTableAlias);
         filter1.SaveToDatabase();
 
         filter2.WhereSQL = "dtCreated > '2001-01-01'";
@@ -347,48 +391,55 @@ public void QueryBuilderTest_JoinableCloning()
         aggregate2.SaveToDatabase();
 
         //add the first aggregate to the configuration
-        rootcontainer.AddChild(aggregate1,1);
+        rootcontainer.AddChild(aggregate1, 1);
 
-        var globalParameter = new AnyTableSqlParameter(CatalogueRepository, cohortIdentificationConfiguration,"DECLARE @fish varchar(50)")
-            {
-                Comment = "Comments for the crazies",
-                Value = "'fishes'"
-            };
+        var globalParameter = new AnyTableSqlParameter(CatalogueRepository, cohortIdentificationConfiguration,
+            "DECLARE @fish varchar(50)")
+        {
+            Comment = "Comments for the crazies",
+            Value = "'fishes'"
+        };
         globalParameter.SaveToDatabase();
 
-        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration,null);
+        var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, null);
 
         try
         {
             var clone = cohortIdentificationConfiguration.CreateClone(new ThrowImmediatelyCheckNotifier());
 
-            var cloneBuilder = new CohortQueryBuilder(clone,null);
+            var cloneBuilder = new CohortQueryBuilder(clone, null);
 
             var origSql = builder.SQL;
             var cloneOrigSql = cloneBuilder.SQL;
 
-            Console.WriteLine("//////////////////////////////////////////////VERBATIM//////////////////////////////////////////////");
+            Console.WriteLine(
+                "//////////////////////////////////////////////VERBATIM//////////////////////////////////////////////");
             Console.WriteLine(origSql);
             Console.WriteLine(cloneOrigSql);
-            Console.WriteLine("//////////////////////////////////////////////END VERBATIM//////////////////////////////////////////////");
+            Console.WriteLine(
+                "//////////////////////////////////////////////END VERBATIM//////////////////////////////////////////////");
 
             var builderSql = Regex.Replace(Regex.Replace(origSql, "cic_[0-9]+_", ""), "ix[0-9]+", "ix");
-            var cloneBuilderSql = Regex.Replace(Regex.Replace(cloneOrigSql, "cic_[0-9]+_", ""), "ix[0-9]+", "ix").Replace("(Clone)", "");//get rid of explicit ix53 etc for the comparison
+            var cloneBuilderSql = Regex.Replace(Regex.Replace(cloneOrigSql, "cic_[0-9]+_", ""), "ix[0-9]+", "ix")
+                .Replace("(Clone)", ""); //get rid of explicit ix53 etc for the comparison
 
-            Console.WriteLine("//////////////////////////////////////////////TEST COMPARISON IS//////////////////////////////////////////////");
+            Console.WriteLine(
+                "//////////////////////////////////////////////TEST COMPARISON IS//////////////////////////////////////////////");
             Console.WriteLine(builderSql);
             Console.WriteLine(cloneBuilderSql);
-            Console.WriteLine("//////////////////////////////////////////////END COMPARISON//////////////////////////////////////////////");
+            Console.WriteLine(
+                "//////////////////////////////////////////////END COMPARISON//////////////////////////////////////////////");
 
             Assert.AreEqual(builderSql, cloneBuilderSql);
 
 
             ////////////////Cleanup Database//////////////////////////////
             //find the WHERE logic too
-            var containerClone = clone.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()//get all the aggregates
-                .Union(clone.GetAllJoinables().Select(j=>j.AggregateConfiguration))//including the joinables
-                .Where(a => a.RootFilterContainer_ID != null)//that have WHERE sql
-                .Select(ag => ag.RootFilterContainer);//grab their containers so we can clean them SetUp
+            var containerClone = clone.RootCohortAggregateContainer
+                .GetAllAggregateConfigurationsRecursively() //get all the aggregates
+                .Union(clone.GetAllJoinables().Select(j => j.AggregateConfiguration)) //including the joinables
+                .Where(a => a.RootFilterContainer_ID != null) //that have WHERE sql
+                .Select(ag => ag.RootFilterContainer); //grab their containers so we can clean them SetUp
 
             ((IDeleteable)clone.GetAllParameters()[0]).DeleteInDatabase();
             clone.DeleteInDatabase();
@@ -423,24 +474,27 @@ public void JoinablesWithCache()
         _queryCachingDatabase = To;
 
         //make aggregate 2 a joinable
-        var joinable2 = new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration, aggregate2);
+        var joinable2 =
+            new JoinableCohortAggregateConfiguration(CatalogueRepository, cohortIdentificationConfiguration,
+                aggregate2);
         joinable2.AddUser(aggregate1);
 
         //make aggregate 2 have an additional column (dtCreated)
-        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => e.GetRuntimeName().Equals("dtCreated"));
+        var anotherCol = aggregate2.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => e.GetRuntimeName().Equals("dtCreated"));
         aggregate2.AddDimension(anotherCol);
 
         //create a caching server
         var scripter = new MasterDatabaseScriptExecutor(_queryCachingDatabase);
         scripter.CreateAndPatchDatabase(new QueryCachingPatcher(), new AcceptAllCheckNotifier());
 
-        var queryCachingDatabaseServer = new ExternalDatabaseServer(CatalogueRepository, queryCachingDatabaseName,null);
+        var queryCachingDatabaseServer =
+            new ExternalDatabaseServer(CatalogueRepository, queryCachingDatabaseName, null);
         queryCachingDatabaseServer.SetProperties(_queryCachingDatabase);
-            
+
         try
         {
-
-            var builderForCaching = new CohortQueryBuilder(aggregate2, null,null);
+            var builderForCaching = new CohortQueryBuilder(aggregate2, null, null);
 
             var cacheDt = new DataTable();
             using (var con = (SqlConnection)Database.Server.GetConnection())
@@ -451,11 +505,12 @@ public void JoinablesWithCache()
             }
 
             var cacheManager = new CachedAggregateConfigurationResultsManager(queryCachingDatabaseServer);
-            cacheManager.CommitResults(new CacheCommitJoinableInceptionQuery(aggregate2, builderForCaching.SQL, cacheDt, null,30));
+            cacheManager.CommitResults(
+                new CacheCommitJoinableInceptionQuery(aggregate2, builderForCaching.SQL, cacheDt, null, 30));
 
             try
             {
-                var builder = new CohortQueryBuilder(aggregate1, null,null)
+                var builder = new CohortQueryBuilder(aggregate1, null, null)
                 {
                     //make the builder use the query cache we just set SetUp
                     CacheServer = queryCachingDatabaseServer
@@ -482,21 +537,20 @@ public void JoinablesWithCache()
                             @"/*cic_{2}_UnitTestAggregate1*/
 SELECT
 distinct
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData].[chi]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi]
 FROM 
-["+TestDatabaseNames.Prefix+@"ScratchArea].[dbo].[BulkData]
+[" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData]
 LEFT Join (
 	/*Cached:cic_{2}_UnitTestAggregate2*/
 	select * from [{3}]..[JoinableInceptionQuery_AggregateConfiguration{1}]
 
 ){0}
 on [" + TestDatabaseNames.Prefix + @"ScratchArea].[dbo].[BulkData].[chi] = {0}.chi",
-                            expectedTableAlias,  //{0}
+                            expectedTableAlias, //{0}
                             aggregate2.ID, //{1}
-                            cohortIdentificationConfiguration.ID,//{2}
+                            cohortIdentificationConfiguration.ID, //{2}
                             queryCachingDatabaseName) //{3}
                     ), CollapseWhitespace(builder.SQL));
-
             }
             finally
             {
@@ -504,16 +558,10 @@ LEFT Join (
                 joinable2.DeleteInDatabase();
             }
         }
-        finally 
+        finally
         {
-
             queryCachingDatabaseServer.DeleteInDatabase();
             DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(queryCachingDatabaseName).Drop();
-                
         }
-            
-            
-
-           
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CohortCreation/SimpleCohortIdentificationTests.cs b/Rdmp.Core.Tests/CohortCreation/SimpleCohortIdentificationTests.cs
index 24802a700c..13cf973454 100644
--- a/Rdmp.Core.Tests/CohortCreation/SimpleCohortIdentificationTests.cs
+++ b/Rdmp.Core.Tests/CohortCreation/SimpleCohortIdentificationTests.cs
@@ -11,18 +11,18 @@
 
 namespace Rdmp.Core.Tests.CohortCreation;
 
-public class SimpleCohortIdentificationTests:DatabaseTests
+public class SimpleCohortIdentificationTests : DatabaseTests
 {
     [Test]
     public void CreateNewCohortIdentificationConfiguration_SaveAndReload()
     {
         var config = new CohortIdentificationConfiguration(CatalogueRepository, "franky");
-            
+
         try
         {
             Assert.IsTrue(config.Exists());
-            Assert.AreEqual("franky",config.Name);
-            
+            Assert.AreEqual("franky", config.Name);
+
             config.Description = "Hi there";
             config.SaveToDatabase();
 
@@ -30,7 +30,7 @@ public void CreateNewCohortIdentificationConfiguration_SaveAndReload()
             var config2 = CatalogueRepository.GetObjectByID<CohortIdentificationConfiguration>(config.ID);
             Assert.AreEqual("Hi there", config2.Description);
         }
-        finally 
+        finally
         {
             config.DeleteInDatabase();
             Assert.IsFalse(config.Exists());
@@ -40,11 +40,11 @@ public void CreateNewCohortIdentificationConfiguration_SaveAndReload()
     [Test]
     public void ContainerCreate()
     {
-        var container = new CohortAggregateContainer(CatalogueRepository,SetOperation.UNION);
+        var container = new CohortAggregateContainer(CatalogueRepository, SetOperation.UNION);
 
         try
         {
-            Assert.AreEqual(SetOperation.UNION,container.Operation);
+            Assert.AreEqual(SetOperation.UNION, container.Operation);
 
             container.Operation = SetOperation.INTERSECT;
             container.SaveToDatabase();
@@ -62,14 +62,14 @@ public void ContainerCreate()
     [Test]
     public void Container_Subcontainering()
     {
-        var container = new CohortAggregateContainer(CatalogueRepository,SetOperation.UNION);
+        var container = new CohortAggregateContainer(CatalogueRepository, SetOperation.UNION);
 
-        var container2 = new CohortAggregateContainer(CatalogueRepository,SetOperation.INTERSECT);
+        var container2 = new CohortAggregateContainer(CatalogueRepository, SetOperation.INTERSECT);
         try
         {
             Assert.AreEqual(0, container.GetSubContainers().Length);
 
-              
+
             Assert.AreEqual(0, container.GetSubContainers().Length);
 
             //set container to parent
diff --git a/Rdmp.Core.Tests/CommandExecution/AxisAndPivotCLITests.cs b/Rdmp.Core.Tests/CommandExecution/AxisAndPivotCLITests.cs
index 04db53097f..05bccda8c9 100644
--- a/Rdmp.Core.Tests/CommandExecution/AxisAndPivotCLITests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/AxisAndPivotCLITests.cs
@@ -18,10 +18,12 @@ public void SetPivot_DimensionNonExistant()
     {
         var ac = WhenIHaveA<AggregateConfiguration>();
 
-        var cmd = new ExecuteCommandSetPivot(GetMockActivator().Object, ac,"fff");
-        var ex = Assert.Throws<Exception>(()=>cmd.Execute());
-            
-        Assert.AreEqual("Could not find AggregateDimension fff in Aggregate My graph so could not set it as a pivot dimension.  Try adding the column to the aggregate first", ex.Message);
+        var cmd = new ExecuteCommandSetPivot(GetMockActivator().Object, ac, "fff");
+        var ex = Assert.Throws<Exception>(() => cmd.Execute());
+
+        Assert.AreEqual(
+            "Could not find AggregateDimension fff in Aggregate My graph so could not set it as a pivot dimension.  Try adding the column to the aggregate first",
+            ex.Message);
     }
 
     [Test]
@@ -29,8 +31,8 @@ public void SetPivot_Exists()
     {
         var ac = WhenIHaveA<AggregateConfiguration>();
         var dim = WhenIHaveA<AggregateDimension>();
-            
-            
+
+
         dim.AggregateConfiguration_ID = ac.ID;
         dim.Alias = "frogmarch";
 
@@ -57,9 +59,10 @@ public void SetPivot_ExistsButIsADate()
         dim.ColumnInfo.Data_type = "datetime";
 
         var cmd = new ExecuteCommandSetPivot(GetMockActivator().Object, ac, "frogmarch");
-        var ex = Assert.Throws<Exception>(()=>cmd.Execute());
+        var ex = Assert.Throws<Exception>(() => cmd.Execute());
 
-        Assert.AreEqual("AggregateDimension frogmarch is a Date so cannot set it as a Pivot for Aggregate My graph",ex.Message);
+        Assert.AreEqual("AggregateDimension frogmarch is a Date so cannot set it as a Pivot for Aggregate My graph",
+            ex.Message);
     }
 
     [Test]
@@ -70,7 +73,9 @@ public void SetAxis_DimensionNonExistant()
         var cmd = new ExecuteCommandSetAxis(GetMockActivator().Object, ac, "fff");
         var ex = Assert.Throws<Exception>(() => cmd.Execute());
 
-        Assert.AreEqual("Could not find AggregateDimension fff in Aggregate My graph so could not set it as an axis dimension.  Try adding the column to the aggregate first", ex.Message);
+        Assert.AreEqual(
+            "Could not find AggregateDimension fff in Aggregate My graph so could not set it as an axis dimension.  Try adding the column to the aggregate first",
+            ex.Message);
     }
 
     [Test]
@@ -110,6 +115,7 @@ public void SetAxis_ExistsButIsNotADate()
         var cmd = new ExecuteCommandSetAxis(GetMockActivator().Object, ac, "frogmarch");
         var ex = Assert.Throws<Exception>(() => cmd.Execute());
 
-        Assert.AreEqual("AggregateDimension frogmarch is not a Date so cannot set it as an axis for Aggregate My graph", ex.Message);
+        Assert.AreEqual("AggregateDimension frogmarch is not a Date so cannot set it as an axis for Aggregate My graph",
+            ex.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/CommandCliTests.cs b/Rdmp.Core.Tests/CommandExecution/CommandCliTests.cs
index 162a407214..e858f51bbe 100644
--- a/Rdmp.Core.Tests/CommandExecution/CommandCliTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/CommandCliTests.cs
@@ -34,15 +34,15 @@ protected override void OneTimeSetUp()
 
     protected CommandInvoker GetInvoker()
     {
-        var invoker = new CommandInvoker(new ConsoleInputManager(RepositoryLocator,new ThrowImmediatelyCheckNotifier())
+        var invoker = new CommandInvoker(new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
         {
             DisallowInput = true
         });
-        invoker.CommandImpossible +=(s,c)=> throw new Exception(c.Command.ReasonCommandImpossible);
+        invoker.CommandImpossible += (s, c) => throw new Exception(c.Command.ReasonCommandImpossible);
 
         return invoker;
     }
-        
+
     protected Mock<IBasicActivateItems> GetMockActivator()
     {
         var mock = new Mock<IBasicActivateItems>();
diff --git a/Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs b/Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs
index 127b2a4f5f..fccca1e382 100644
--- a/Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/CommandInvokerTests.cs
@@ -28,10 +28,10 @@ protected override void OneTimeSetUp()
     [Timeout(5000)]
     public void Test_ListSupportedCommands_NoPicker()
     {
-        var mgr =  GetActivator();
+        var mgr = GetActivator();
         var invoker = new CommandInvoker(mgr);
-            
-        invoker.ExecuteCommand(typeof(ExecuteCommandListSupportedCommands),null);
+
+        invoker.ExecuteCommand(typeof(ExecuteCommandListSupportedCommands), null);
     }
 
     [Test]
@@ -43,8 +43,8 @@ public void Test_Delete_WithPicker()
 
         WhenIHaveA<Catalogue>();
 
-        var picker = new CommandLineObjectPicker(new[] {"Catalogue:*"}, mgr);
-        invoker.ExecuteCommand(typeof(ExecuteCommandDelete),picker);
+        var picker = new CommandLineObjectPicker(new[] { "Catalogue:*" }, mgr);
+        invoker.ExecuteCommand(typeof(ExecuteCommandDelete), picker);
     }
 
     [Test]
@@ -56,24 +56,20 @@ public void Test_Generic_WithPicker()
 
         WhenIHaveA<Catalogue>();
 
-        invoker.ExecuteCommand(typeof(GenericTestCommand<DatabaseEntity>),GetPicker("Catalogue:*"));
-        invoker.ExecuteCommand(typeof(GenericTestCommand<Type>),GetPicker("Pipeline"));
-        invoker.ExecuteCommand(typeof(GenericTestCommand<DiscoveredDatabase,bool>),
+        invoker.ExecuteCommand(typeof(GenericTestCommand<DatabaseEntity>), GetPicker("Catalogue:*"));
+        invoker.ExecuteCommand(typeof(GenericTestCommand<Type>), GetPicker("Pipeline"));
+        invoker.ExecuteCommand(typeof(GenericTestCommand<DiscoveredDatabase, bool>),
             GetPicker(
                 "DatabaseType:MicrosoftSqlServer:Name:imaging:Server=localhost\\sqlexpress;Database=master;Trusted_Connection=True;",
                 "true"));
-            
     }
 
-    private CommandLineObjectPicker GetPicker(params string[] args)
-    {
-        return new CommandLineObjectPicker(args, GetActivator());
-    }
+    private CommandLineObjectPicker GetPicker(params string[] args) => new(args, GetActivator());
 
     private class GenericTestCommand<T> : BasicCommandExecution
     {
         private readonly T _arg;
-            
+
         public GenericTestCommand(T a)
         {
             _arg = a;
@@ -87,11 +83,11 @@ public override void Execute()
         }
     }
 
-    private class GenericTestCommand<T1,T2> : BasicCommandExecution
+    private class GenericTestCommand<T1, T2> : BasicCommandExecution
     {
         private readonly T1 _a;
         private readonly T2 _b;
-            
+
         public GenericTestCommand(T1 a, T2 b)
         {
             _a = a;
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddNewFilterContainerTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddNewFilterContainerTests.cs
index 6b12b39311..17e77483b2 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddNewFilterContainerTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddNewFilterContainerTests.cs
@@ -20,16 +20,17 @@ public void TestNormalCase()
     {
         var ac = WhenIHaveA<AggregateConfiguration>();
         var cmd = new ExecuteCommandAddNewFilterContainer(new ThrowImmediatelyActivator(RepositoryLocator), ac);
-            
+
         Assert.IsNull(ac.RootFilterContainer_ID);
-            
+
         Assert.IsNull(cmd.ReasonCommandImpossible);
         Assert.IsFalse(cmd.IsImpossible);
 
         cmd.Execute();
-            
+
         Assert.IsNotNull(ac.RootFilterContainer_ID);
     }
+
     [Test]
     public void Impossible_BecauseAlreadyHasContainer()
     {
@@ -43,6 +44,7 @@ public void Impossible_BecauseAlreadyHasContainer()
         Assert.AreEqual("There is already a root filter container on this object", cmd.ReasonCommandImpossible);
         Assert.IsTrue(cmd.IsImpossible);
     }
+
     [Test]
     public void Impossible_BecauseAPI()
     {
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddPipelineComponentTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddPipelineComponentTests.cs
index fd05e44237..b27c66e9a8 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddPipelineComponentTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAddPipelineComponentTests.cs
@@ -27,8 +27,8 @@ public void TestCreatePipelineWithCommands()
 
         Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(DelimitedFlatFileDataFlowSource));
 
-        Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(CleanStrings),"2");
-        Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ColumnSwapper),"1");
+        Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(CleanStrings), "2");
+        Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ColumnSwapper), "1");
 
         Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ExecuteFullExtractionToDatabaseMSSql));
 
@@ -49,8 +49,6 @@ public void TestCreatePipelineWithCommands()
         Assert.IsNotNull(p.Destination);
         Assert.AreEqual(typeof(ExecuteFullExtractionToDatabaseMSSql), p.Destination.GetClassAsSystemType());
         Assert.IsNotEmpty(p.Destination.GetAllArguments());
-
-
     }
 
     [Test]
@@ -61,10 +59,12 @@ public void TestCreatePipeline_TooManySources()
         Assert.IsNull(p.Source);
 
         Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(DelimitedFlatFileDataFlowSource));
-        var ex = Assert.Throws<Exception>(()=>Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(DelimitedFlatFileDataFlowSource)));
+        var ex = Assert.Throws<Exception>(() =>
+            Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(DelimitedFlatFileDataFlowSource)));
 
-        Assert.AreEqual("Pipeline 'My Pipeline' already has a source",ex.Message);
+        Assert.AreEqual("Pipeline 'My Pipeline' already has a source", ex.Message);
     }
+
     [Test]
     public void TestCreatePipeline_TooManyDestinations()
     {
@@ -73,7 +73,8 @@ public void TestCreatePipeline_TooManyDestinations()
         Assert.IsNull(p.Source);
 
         Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ExecuteFullExtractionToDatabaseMSSql));
-        var ex = Assert.Throws<Exception>(() => Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ExecuteFullExtractionToDatabaseMSSql)));
+        var ex = Assert.Throws<Exception>(() =>
+            Run("AddPipelineComponent", $"Pipeline:{p.ID}", nameof(ExecuteFullExtractionToDatabaseMSSql)));
 
         Assert.AreEqual("Pipeline 'My Pipeline' already has a destination", ex.Message);
     }
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAlterTableMakeDistinctTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAlterTableMakeDistinctTests.cs
index 8acb1b39d9..1b19ce268f 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAlterTableMakeDistinctTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandAlterTableMakeDistinctTests.cs
@@ -18,7 +18,6 @@ namespace Rdmp.Core.Tests.CommandExecution;
 
 internal class ExecuteCommandAlterTableMakeDistinctTests : DatabaseTests
 {
-
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
     [TestCase(DatabaseType.PostgreSql)]
@@ -36,11 +35,12 @@ public void Test(DatabaseType dbType)
 
         var tbl = db.CreateTable("MyTable", dt);
 
-        Import(tbl, out var tblInfo,out _);
+        Import(tbl, out var tblInfo, out _);
 
         Assert.AreEqual(5, tbl.GetRowCount());
 
-        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true };
+        var activator = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
         var cmd = new ExecuteCommandAlterTableMakeDistinct(activator, tblInfo, 700, true);
 
@@ -49,12 +49,12 @@ public void Test(DatabaseType dbType)
         cmd.Execute();
 
         Assert.AreEqual(2, tbl.GetRowCount());
-            
+
         tbl.CreatePrimaryKey(tbl.DiscoverColumn("fff"));
 
         cmd = new ExecuteCommandAlterTableMakeDistinct(activator, tblInfo, 700, true);
 
-        var ex = Assert.Throws<Exception>(()=>cmd.Execute());
+        var ex = Assert.Throws<Exception>(() => cmd.Execute());
 
         Assert.AreEqual("Table 'MyTable' has primary key columns so cannot contain duplication", ex.Message);
     }
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandConfirmLogsTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandConfirmLogsTests.cs
index 5852a10895..46531505df 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandConfirmLogsTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandConfirmLogsTests.cs
@@ -33,11 +33,11 @@ public void ConfirmLogs_NoEntries_Throws()
         lm.CreateNewLoggingTaskIfNotExists("GGG");
 
         var cmd = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator), lmd);
-        var ex = Assert.Throws<LogsNotConfirmedException>(()=>cmd.Execute());
+        var ex = Assert.Throws<LogsNotConfirmedException>(() => cmd.Execute());
 
         Assert.AreEqual("There are no log entries for MyLmd", ex.Message);
-
     }
+
     [TestCase(true)]
     [TestCase(false)]
     public void ConfirmLogs_HappyEntries_Passes(bool withinTime)
@@ -53,14 +53,14 @@ public void ConfirmLogs_HappyEntries_Passes(bool withinTime)
         var lm = new LogManager(lmd.GetDistinctLoggingDatabase());
         lm.CreateNewLoggingTaskIfNotExists("FFF");
         var logEntry = lm.CreateDataLoadInfo("FFF", "pack o' cards", "going down gambling", null, true);
-            
+
         // we mark it as completed successfully - this is a good, happy log entry
         logEntry.CloseAndMarkComplete();
 
 
         var cmd = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator),
             //within last 10 hours
-            lmd, withinTime ? "10:00:00":null);
+            lmd, withinTime ? "10:00:00" : null);
         Assert.DoesNotThrow(() => cmd.Execute());
     }
 
@@ -86,6 +86,7 @@ public void ConfirmLogs_SadEntry_BecauseNeverEnded_Throws()
 
         StringAssert.IsMatch("Latest logs for MyLmd .* indicate that it did not complete", ex.Message);
     }
+
     [Test]
     public void ConfirmLogs_SadEntryWithEx_Throws()
     {
@@ -106,14 +107,12 @@ public void ConfirmLogs_SadEntryWithEx_Throws()
         var ex = Assert.Throws<LogsNotConfirmedException>(() => cmd.Execute());
 
         StringAssert.IsMatch("Latest logs for MyLmd .* indicate that it failed", ex.Message);
-
     }
 
 
     [Test]
     public void ConfirmLogs_NotWithinTime_Throws()
     {
-
         var lmd = new LoadMetadata(CatalogueRepository, "MyLmd");
         var cata = new Catalogue(CatalogueRepository, "myCata")
         {
@@ -132,10 +131,11 @@ public void ConfirmLogs_NotWithinTime_Throws()
         Thread.Sleep(5000);
 
         // but we want this to have finished in the last second
-        var cmd = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator), lmd,"00:00:01");
+        var cmd = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator), lmd, "00:00:01");
         var ex = Assert.Throws<LogsNotConfirmedException>(() => cmd.Execute());
 
-        StringAssert.IsMatch("Latest logged activity for MyLmd is .*.  This is older than the requested date threshold:.*", ex.Message);
+        StringAssert.IsMatch(
+            "Latest logged activity for MyLmd is .*.  This is older than the requested date threshold:.*", ex.Message);
     }
 
     [Test]
@@ -171,7 +171,8 @@ public void ConfirmLogs_With2CacheProgress_Throws()
         lm.CreateNewLoggingTaskIfNotExists(cp1.GetDistinctLoggingTask());
 
         // create a log entry for cp1 only
-        var logEntry = lm.CreateDataLoadInfo(cp1.GetDistinctLoggingTask(), "pack o' cards", cp1.GetLoggingRunName(), null, true);
+        var logEntry = lm.CreateDataLoadInfo(cp1.GetDistinctLoggingTask(), "pack o' cards", cp1.GetLoggingRunName(),
+            null, true);
 
         // we mark it as completed successfully - this is a good, happy log entry
         logEntry.CloseAndMarkComplete();
@@ -181,7 +182,7 @@ public void ConfirmLogs_With2CacheProgress_Throws()
         Assert.DoesNotThrow(() => cmd1.Execute());
 
         // The second cache has not logged any successes so should be unhappy
-        var cmd2 = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator), cp2,null);
+        var cmd2 = new ExecuteCommandConfirmLogs(new ThrowImmediatelyActivator(RepositoryLocator), cp2, null);
         var ex = Assert.Throws<LogsNotConfirmedException>(() => cmd2.Execute());
 
         Assert.AreEqual("There are no log entries for MyCoolCache", ex.Message);
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewDataLoadDirectoryTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewDataLoadDirectoryTests.cs
index 877d12557b..323f6a89fb 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewDataLoadDirectoryTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewDataLoadDirectoryTests.cs
@@ -16,13 +16,10 @@ internal class ExecuteCommandCreateNewDataLoadDirectoryTests : CommandCliTests
     public void TestCreateNewDataLoadDirectory_CreateDeepFolder_NoLmd()
     {
         var root = Path.Combine(TestContext.CurrentContext.WorkDirectory, "abc");
-        if(Directory.Exists(root))
-        {
-            Directory.Delete(root, true);
-        }
+        if (Directory.Exists(root)) Directory.Delete(root, true);
         var toCreate = Path.Combine(root, "def", "ghi");
 
-        Run("CreateNewDataLoadDirectory","null", toCreate);
+        Run("CreateNewDataLoadDirectory", "null", toCreate);
 
         Assert.IsTrue(Directory.Exists(root));
     }
@@ -31,10 +28,7 @@ public void TestCreateNewDataLoadDirectory_CreateDeepFolder_NoLmd()
     public void TestCreateNewDataLoadDirectory_WithLoadMetadata()
     {
         var root = Path.Combine(TestContext.CurrentContext.WorkDirectory, "def");
-        if (Directory.Exists(root))
-        {
-            Directory.Delete(root, true);
-        }
+        if (Directory.Exists(root)) Directory.Delete(root, true);
         var lmd = WhenIHaveA<LoadMetadata>();
 
         Assert.IsNull(lmd.LocationOfFlatFiles);
@@ -42,6 +36,6 @@ public void TestCreateNewDataLoadDirectory_WithLoadMetadata()
         Run("CreateNewDataLoadDirectory", $"LoadMetadata:{lmd.ID}", root);
 
         Assert.IsTrue(Directory.Exists(root));
-        Assert.AreEqual(root,lmd.LocationOfFlatFiles);
+        Assert.AreEqual(root, lmd.LocationOfFlatFiles);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewFilterCliTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewFilterCliTests.cs
index b614d51795..eb670da760 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewFilterCliTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandCreateNewFilterCliTests.cs
@@ -25,11 +25,12 @@ public void TestNewFilterForAggregate()
 
         // has no container to start with (no filters)
         Assert.IsNull(ac.RootFilterContainer_ID);
-        Run("CreateNewFilter",$"{nameof(AggregateConfiguration)}:{ac.ID}");
+        Run("CreateNewFilter", $"{nameof(AggregateConfiguration)}:{ac.ID}");
 
-        Assert.IsNotNull(ac.RootFilterContainer_ID,"Should now have a container");
+        Assert.IsNotNull(ac.RootFilterContainer_ID, "Should now have a container");
         Assert.AreEqual(1, ac.RootFilterContainer.GetFilters().Length, "Expected a single new filter");
     }
+
     [Test]
     public void TestNewFilterForExtractionConfiguration()
     {
@@ -42,6 +43,7 @@ public void TestNewFilterForExtractionConfiguration()
         Assert.IsNotNull(sds.RootFilterContainer_ID, "Should now have a container");
         Assert.AreEqual(1, sds.RootFilterContainer.GetFilters().Length, "Expected a single new filter");
     }
+
     [Test]
     public void TestNewFilterForCatalogue()
     {
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandDeleteTestsCli.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandDeleteTestsCli.cs
index 368d6e56ce..99b124c39c 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandDeleteTestsCli.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandDeleteTestsCli.cs
@@ -18,7 +18,7 @@ public void TestDeletingACatalogue_NoneInDbIsFine()
         var prev = RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>();
         Assert.IsEmpty(prev);
 
-        Assert.AreEqual(0,Run("delete","Catalogue:bob"));
+        Assert.AreEqual(0, Run("delete", "Catalogue:bob"));
 
         var now = RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>();
         Assert.IsEmpty(now);
@@ -33,6 +33,7 @@ public void TestDeletingACatalogue_DeleteBecauseMatches()
         Assert.AreEqual(0, Run("delete", "Catalogue:bob"));
         Assert.IsFalse(cata.Exists());
     }
+
     [Test]
     public void TestDeletingACatalogue_DoesNotMatchPattern()
     {
@@ -40,10 +41,10 @@ public void TestDeletingACatalogue_DoesNotMatchPattern()
         cata.Name = "ffff";
 
         Assert.AreEqual(0, Run("delete", "Catalogue:bob"));
-            
+
         // should not have been deleted because name does not match what is sought to be deleted
         Assert.IsTrue(cata.Exists());
-            
+
         //cleanup
         cata.DeleteInDatabase();
     }
@@ -56,7 +57,7 @@ public void TestDeleteMany_ThrowsBecauseNotExpected()
         var c2 = WhenIHaveA<Catalogue>();
 
         // delete all catalogues
-        var ex = Assert.Throws<Exception>(()=>Run("delete", "Catalogue"));
+        var ex = Assert.Throws<Exception>(() => Run("delete", "Catalogue"));
 
         Assert.AreEqual(ex.Message,
             "Allow delete many is false but multiple objects were matched for deletion (Mycata,Mycata)");
@@ -64,29 +65,31 @@ public void TestDeleteMany_ThrowsBecauseNotExpected()
         c1.DeleteInDatabase();
         c2.DeleteInDatabase();
     }
+
     [Test]
     public void TestDeleteMany_Allowed()
     {
-
         // 2 catalogues
         var c1 = WhenIHaveA<Catalogue>();
         var c2 = WhenIHaveA<Catalogue>();
 
         // delete all catalogues
-        Assert.AreEqual(0,Run("delete", "Catalogue","true"));
+        Assert.AreEqual(0, Run("delete", "Catalogue", "true"));
 
         Assert.IsFalse(c1.Exists());
         Assert.IsFalse(c2.Exists());
     }
+
     [Test]
     public void TestDeleteMany_BadParameterFormat()
     {
         var c1 = WhenIHaveA<Catalogue>();
 
         // delete all catalogues
-        var ex = Assert.Throws<Exception>(()=> Run("delete", "Catalogue", "FLIBBLE!"));
+        var ex = Assert.Throws<Exception>(() => Run("delete", "Catalogue", "FLIBBLE!"));
 
-        Assert.AreEqual("Expected parameter at index 1 to be a System.Boolean (for parameter 'deleteMany') but it was FLIBBLE!",
+        Assert.AreEqual(
+            "Expected parameter at index 1 to be a System.Boolean (for parameter 'deleteMany') but it was FLIBBLE!",
             ex.Message);
 
         c1.DeleteInDatabase();
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandListTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandListTests.cs
index faf23f2755..651676adfc 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandListTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandListTests.cs
@@ -18,25 +18,27 @@ internal class TestsExecuteCommandList : CommandCliTests
     [Test]
     public void Test_ExecuteCommandList_NoCataloguesParsing()
     {
-        foreach(var cat in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
+        foreach (var cat in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
             cat.DeleteInDatabase();
 
-        Assert.IsEmpty(RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(),"Failed to clear CatalogueRepository");
+        Assert.IsEmpty(RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(),
+            "Failed to clear CatalogueRepository");
 
         GetInvoker().ExecuteCommand(typeof(ExecuteCommandList),
-            new CommandLineObjectPicker(new string[]{ "Catalogue"}, GetActivator()));
+            new CommandLineObjectPicker(new string[] { "Catalogue" }, GetActivator()));
     }
-        
+
     [Test]
     public void Test_ExecuteCommandList_OneCatalogueParsing()
     {
         var c = WhenIHaveA<Catalogue>();
 
         GetInvoker().ExecuteCommand(typeof(ExecuteCommandList),
-            new CommandLineObjectPicker(new string[]{ "Catalogue"}, GetActivator()));
-            
+            new CommandLineObjectPicker(new string[] { "Catalogue" }, GetActivator()));
+
         c.DeleteInDatabase();
     }
+
     [Test]
     public void Test_ExecuteCommandList_OneCatalogue()
     {
@@ -46,8 +48,8 @@ public void Test_ExecuteCommandList_OneCatalogue()
 
         var mock = GetMockActivator();
 
-        var cmd = new ExecuteCommandList(mock.Object,new []{c});
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandList(mock.Object, new[] { c });
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
 
         cmd.Execute();
 
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRefreshBrokenCohortsTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRefreshBrokenCohortsTests.cs
index 473a9cdc5f..e8a8bb5c19 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRefreshBrokenCohortsTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRefreshBrokenCohortsTests.cs
@@ -14,9 +14,8 @@
 
 namespace Rdmp.Core.Tests.CommandExecution;
 
-internal class ExecuteCommandRefreshBrokenCohortsTests 
+internal class ExecuteCommandRefreshBrokenCohortsTests
 {
-
     [Test]
     public void TestBrokenCohort()
     {
@@ -41,11 +40,12 @@ public void TestBrokenCohort()
 
         var repoLocator = new RepositoryProvider(repo);
 
-        var activator = new ConsoleInputManager(repoLocator, new ThrowImmediatelyCheckNotifier()) {
+        var activator = new ConsoleInputManager(repoLocator, new ThrowImmediatelyCheckNotifier())
+        {
             DisallowInput = true
         };
 
-        Assert.AreEqual(1,((DataExportChildProvider)activator.CoreChildProvider).ForbidListedSources.Count);
+        Assert.AreEqual(1, ((DataExportChildProvider)activator.CoreChildProvider).ForbidListedSources.Count);
 
         var cmd = new ExecuteCommandRefreshBrokenCohorts(activator)
         {
@@ -53,7 +53,7 @@ public void TestBrokenCohort()
             // and find it missing again
             NoPublish = true
         };
-            
+
         Assert.IsFalse(cmd.IsImpossible);
         cmd.Execute();
 
@@ -64,8 +64,8 @@ public void TestBrokenCohort()
         cmd = new ExecuteCommandRefreshBrokenCohorts(activator);
         Assert.IsTrue(cmd.IsImpossible);
         Assert.AreEqual("There are no broken ExternalCohortTable to clear status on", cmd.ReasonCommandImpossible);
-            
-        cmd = new ExecuteCommandRefreshBrokenCohorts(activator,ect);
+
+        cmd = new ExecuteCommandRefreshBrokenCohorts(activator, ect);
         Assert.IsTrue(cmd.IsImpossible);
         Assert.AreEqual("'yarg' is not broken", cmd.ReasonCommandImpossible);
     }
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandReplacedByTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandReplacedByTests.cs
index b47fc18639..2b7b3195e8 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandReplacedByTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandReplacedByTests.cs
@@ -19,10 +19,10 @@ public void CommandImpossible_BecauseNotDeprecated()
         var c1 = WhenIHaveA<Catalogue>();
         var c2 = WhenIHaveA<Catalogue>();
 
-        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object,c1,c2);
-            
+        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object, c1, c2);
+
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.Contains("is not marked IsDeprecated",cmd.ReasonCommandImpossible);
+        StringAssert.Contains("is not marked IsDeprecated", cmd.ReasonCommandImpossible);
     }
 
     [Test]
@@ -30,35 +30,36 @@ public void CommandImpossible_BecauseDifferentTypes()
     {
         var c1 = WhenIHaveA<Catalogue>();
         var ci1 = WhenIHaveA<CatalogueItem>();
-            
+
         c1.IsDeprecated = true;
         c1.SaveToDatabase();
 
-        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object,c1,ci1);
-            
+        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object, c1, ci1);
+
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.Contains("because it is a different object Type",cmd.ReasonCommandImpossible);
+        StringAssert.Contains("because it is a different object Type", cmd.ReasonCommandImpossible);
     }
+
     [Test]
     public void CommandImpossible_Allowed()
     {
         var c1 = WhenIHaveA<Catalogue>();
         var c2 = WhenIHaveA<Catalogue>();
-            
+
         c1.IsDeprecated = true;
         c1.SaveToDatabase();
 
-        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object,c1,c2);
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object, c1, c2);
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
 
         cmd.Execute();
 
         var replacement = RepositoryLocator.CatalogueRepository
-            .GetAllObjectsWhere<ExtendedProperty>("Name",ExtendedProperty.ReplacedBy)
-            .Single(r=>r.IsReferenceTo(c1));
+            .GetAllObjectsWhere<ExtendedProperty>("Name", ExtendedProperty.ReplacedBy)
+            .Single(r => r.IsReferenceTo(c1));
 
         Assert.IsTrue(replacement.IsReferenceTo(c1));
-        Assert.AreEqual(c2.ID.ToString(),replacement.Value);
+        Assert.AreEqual(c2.ID.ToString(), replacement.Value);
 
         // running command multiple times shouldn't result in duplicate objects
         cmd.Execute();
@@ -66,16 +67,15 @@ public void CommandImpossible_Allowed()
         cmd.Execute();
         cmd.Execute();
 
-        Assert.AreEqual(1,RepositoryLocator.CatalogueRepository
+        Assert.AreEqual(1, RepositoryLocator.CatalogueRepository
             .GetAllObjectsWhere<ExtendedProperty>("Name", ExtendedProperty.ReplacedBy)
-            .Count(r=>r.IsReferenceTo(c1)));
+            .Count(r => r.IsReferenceTo(c1)));
 
-        cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object,c1,null);
+        cmd = new ExecuteCommandReplacedBy(GetMockActivator().Object, c1, null);
         cmd.Execute();
 
         Assert.IsEmpty(RepositoryLocator.CatalogueRepository
             .GetAllObjectsWhere<ExtendedProperty>("Name", ExtendedProperty.ReplacedBy)
-            .Where(r=>r.IsReferenceTo(c1)));
-           
+            .Where(r => r.IsReferenceTo(c1)));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetArgumentTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetArgumentTests.cs
index 97f880e42d..11a9139918 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetArgumentTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetArgumentTests.cs
@@ -18,22 +18,24 @@ internal class ExecuteCommandSetArgumentTests : CommandCliTests
     [Test]
     public void TestSetArgument_WrongArgCount()
     {
-        var picker = new CommandLineObjectPicker(new []{"yyy" }, GetActivator());
-        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object,picker);
+        var picker = new CommandLineObjectPicker(new[] { "yyy" }, GetActivator());
+        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object, picker);
 
         Assert.IsTrue(cmd.IsImpossible);
-        Assert.AreEqual("Wrong number of parameters supplied to command, expected 3 but got 1",cmd.ReasonCommandImpossible);
+        Assert.AreEqual("Wrong number of parameters supplied to command, expected 3 but got 1",
+            cmd.ReasonCommandImpossible);
     }
+
     [Test]
     public void TestSetArgument_NotAHost()
     {
         var c = WhenIHaveA<Catalogue>();
 
-        var picker = new CommandLineObjectPicker(new []{$"Catalogue:{c.ID}","fff","yyy" }, GetActivator());
-        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object,picker);
+        var picker = new CommandLineObjectPicker(new[] { $"Catalogue:{c.ID}", "fff", "yyy" }, GetActivator());
+        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object, picker);
 
         Assert.IsTrue(cmd.IsImpossible);
-        Assert.AreEqual("First parameter must be an IArgumentHost",cmd.ReasonCommandImpossible);             
+        Assert.AreEqual("First parameter must be an IArgumentHost", cmd.ReasonCommandImpossible);
     }
 
     [Test]
@@ -42,50 +44,51 @@ public void TestSetArgument_NoArgumentFound()
         var pt = WhenIHaveA<ProcessTask>();
 
 
-        var picker = new CommandLineObjectPicker(new []{$"ProcessTask:{pt.ID}","fff","yyy" }, GetActivator());
-        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object,picker);
+        var picker = new CommandLineObjectPicker(new[] { $"ProcessTask:{pt.ID}", "fff", "yyy" }, GetActivator());
+        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object, picker);
 
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.StartsWith("Could not find argument called 'fff' on ",cmd.ReasonCommandImpossible);             
+        StringAssert.StartsWith("Could not find argument called 'fff' on ", cmd.ReasonCommandImpossible);
     }
-        
+
     [Test]
     public void TestSetArgument_ArgumentWrongType()
     {
         var pta = WhenIHaveA<ProcessTaskArgument>();
         var pt = pta.ProcessTask;
-            
+
         pta.Name = "fff";
-            
+
         // Argument expects int but is given string value "yyy"
         pta.SetType(typeof(int));
 
-        var picker = new CommandLineObjectPicker(new []{$"ProcessTask:{pt.ID}","fff","yyy" }, GetActivator());
-        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object,picker);
+        var picker = new CommandLineObjectPicker(new[] { $"ProcessTask:{pt.ID}", "fff", "yyy" }, GetActivator());
+        var cmd = new ExecuteCommandSetArgument(GetMockActivator().Object, picker);
 
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.StartsWith("Provided value 'yyy' does not match expected Type 'Int32' of ",cmd.ReasonCommandImpossible);        
+        StringAssert.StartsWith("Provided value 'yyy' does not match expected Type 'Int32' of ",
+            cmd.ReasonCommandImpossible);
     }
 
-        
+
     [Test]
     public void TestSetArgument_Int_Valid()
     {
         var pta = WhenIHaveA<ProcessTaskArgument>();
         var pt = pta.ProcessTask;
-            
+
         pta.Name = "fff";
         pta.SetType(typeof(int));
 
         Assert.IsNull(pta.Value);
 
-        var picker = new CommandLineObjectPicker(new []{$"ProcessTask:{pt.ID}","fff","5" }, GetActivator());
-            
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument),picker));
+        var picker = new CommandLineObjectPicker(new[] { $"ProcessTask:{pt.ID}", "fff", "5" }, GetActivator());
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument), picker));
 
-        Assert.AreEqual(5,pta.GetValueAsSystemType());
+        Assert.AreEqual(5, pta.GetValueAsSystemType());
     }
-        
+
     [Test]
     public void TestSetArgument_Catalogue_Valid()
     {
@@ -95,18 +98,20 @@ public void TestSetArgument_Catalogue_Valid()
 
         var pta = WhenIHaveA<ProcessTaskArgument>();
         var pt = pta.ProcessTask;
-            
+
         pta.Name = "fff";
         pta.SetType(typeof(Catalogue));
 
         Assert.IsNull(pta.Value);
 
-        var picker = new CommandLineObjectPicker(new []{$"ProcessTask:{pt.ID}","fff",$"Catalogue:kapow splat" }, GetActivator());
-            
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument),picker));
+        var picker = new CommandLineObjectPicker(new[] { $"ProcessTask:{pt.ID}", "fff", $"Catalogue:kapow splat" },
+            GetActivator());
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument), picker));
 
-        Assert.AreEqual(cata,pta.GetValueAsSystemType());
+        Assert.AreEqual(cata, pta.GetValueAsSystemType());
     }
+
     [Test]
     public void TestSetArgument_CatalogueArrayOf1_Valid()
     {
@@ -118,18 +123,20 @@ public void TestSetArgument_CatalogueArrayOf1_Valid()
         //let's also test that PipelineComponentArgument also work (not just ProcessTaskArgument)
         var pca = WhenIHaveA<PipelineComponentArgument>();
         var pc = pca.PipelineComponent;
-            
+
         pca.Name = "ggg";
         pca.SetType(typeof(Catalogue[]));
 
         Assert.IsNull(pca.Value);
 
-        var picker = new CommandLineObjectPicker(new []{$"PipelineComponent:{pc.ID}","ggg",$"Catalogue:lolzzzyy" }, GetActivator());
-            
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument),picker));
+        var picker = new CommandLineObjectPicker(new[] { $"PipelineComponent:{pc.ID}", "ggg", $"Catalogue:lolzzzyy" },
+            GetActivator());
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument), picker));
 
         Assert.Contains(cata1, (System.Collections.ICollection)pca.GetValueAsSystemType());
     }
+
     [Test]
     public void TestSetArgument_CatalogueArrayOf2_Valid()
     {
@@ -144,19 +151,21 @@ public void TestSetArgument_CatalogueArrayOf2_Valid()
         //let's also test that PipelineComponentArgument also work (not just ProcessTaskArgument)
         var pca = WhenIHaveA<PipelineComponentArgument>();
         var pc = pca.PipelineComponent;
-            
+
         pca.Name = "ggg";
         pca.SetType(typeof(Catalogue[]));
 
         Assert.IsNull(pca.Value);
 
-        var picker = new CommandLineObjectPicker(new []{$"PipelineComponent:{pc.ID}","ggg",$"Catalogue:kapow*" }, GetActivator());
-            
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument),picker));
+        var picker = new CommandLineObjectPicker(new[] { $"PipelineComponent:{pc.ID}", "ggg", $"Catalogue:kapow*" },
+            GetActivator());
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument), picker));
 
         Assert.Contains(cata1, (System.Collections.ICollection)pca.GetValueAsSystemType());
         Assert.Contains(cata2, (System.Collections.ICollection)pca.GetValueAsSystemType());
     }
+
     [Test]
     public void TestSetArgument_CatalogueArray_SetToNull_Valid()
     {
@@ -168,17 +177,18 @@ public void TestSetArgument_CatalogueArray_SetToNull_Valid()
         //let's also test that PipelineComponentArgument also work (not just ProcessTaskArgument)
         var pca = WhenIHaveA<PipelineComponentArgument>();
         var pc = pca.PipelineComponent;
-            
+
         pca.Name = "ggg";
         pca.SetType(typeof(Catalogue[]));
-        pca.SetValue(new Catalogue[]{ cata1});
+        pca.SetValue(new Catalogue[] { cata1 });
         pca.SaveToDatabase();
-            
+
         Assert.Contains(cata1, (System.Collections.ICollection)pca.GetValueAsSystemType());
 
-        var picker = new CommandLineObjectPicker(new []{$"PipelineComponent:{pc.ID}","ggg",$"Null" }, GetActivator());
-            
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument),picker));
+        var picker =
+            new CommandLineObjectPicker(new[] { $"PipelineComponent:{pc.ID}", "ggg", $"Null" }, GetActivator());
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetArgument), picker));
 
         Assert.IsNull(pca.GetValueAsSystemType());
     }
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtendedPropertyTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtendedPropertyTests.cs
index 7efde66309..019fed5105 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtendedPropertyTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtendedPropertyTests.cs
@@ -19,11 +19,12 @@ public void CommandImpossible_BecausePropertyDoesNotExist()
     {
         var c1 = WhenIHaveA<Catalogue>();
 
-        var cmd = new ExecuteCommandSetExtendedProperty(GetMockActivator().Object, new[] { c1 },"blarg","fff");
+        var cmd = new ExecuteCommandSetExtendedProperty(GetMockActivator().Object, new[] { c1 }, "blarg", "fff");
 
         Assert.IsTrue(cmd.IsImpossible);
         StringAssert.StartsWith("blarg is not a known property.  Known properties are:", cmd.ReasonCommandImpossible);
     }
+
     [Test]
     public void SetIsTemplate_OnMultipleObjects()
     {
@@ -36,17 +37,17 @@ public void SetIsTemplate_OnMultipleObjects()
         Assert.IsEmpty(
             Repository.CatalogueRepository.GetExtendedProperties(ac2));
 
-        var cmd = new ExecuteCommandSetExtendedProperty(GetMockActivator().Object, new[] { ac1,ac2 },
-            ExtendedProperty.IsTemplate,"true");
+        var cmd = new ExecuteCommandSetExtendedProperty(GetMockActivator().Object, new[] { ac1, ac2 },
+            ExtendedProperty.IsTemplate, "true");
 
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
 
         cmd.Execute();
 
         var declaration1 = Repository.CatalogueRepository.GetExtendedProperties(ac1).Single();
         var declaration2 = Repository.CatalogueRepository.GetExtendedProperties(ac2).Single();
 
-        foreach(var dec in new[] { declaration1,declaration2})
+        foreach (var dec in new[] { declaration1, declaration2 })
         {
             Assert.AreEqual("IsTemplate", dec.Name);
             Assert.AreEqual("true", dec.Value);
@@ -66,6 +67,5 @@ public void SetIsTemplate_OnMultipleObjects()
             Repository.CatalogueRepository.GetExtendedProperties(ac1));
         Assert.IsEmpty(
             Repository.CatalogueRepository.GetExtendedProperties(ac2));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtractionIdentifierTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtractionIdentifierTests.cs
index 6205d12451..344265527f 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtractionIdentifierTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSetExtractionIdentifierTests.cs
@@ -18,23 +18,25 @@ internal class ExecuteCommandSetExtractionIdentifierTests : CommandCliTests
     public void TestSetExtractionIdentifier_Catalogue()
     {
         var ei1 = WhenIHaveA<ExtractionInformation>();
-            
+
         ei1.Alias = "happyfun";
         ei1.IsExtractionIdentifier = false;
         ei1.SaveToDatabase();
 
-        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object,ei1.CatalogueItem.Catalogue,null,"happyfun");
+        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, ei1.CatalogueItem.Catalogue,
+            null, "happyfun");
         cmd.Execute();
 
         Assert.IsTrue(ei1.IsExtractionIdentifier);
     }
+
     [Test]
     public void TestSetExtractionIdentifier_Catalogue_PickOther()
     {
         var ei1 = WhenIHaveA<ExtractionInformation>();
 
         var otherCol = new ColumnInfo(Repository, "Other", "varchar", ei1.ColumnInfo.TableInfo);
-        var otherCatItem = new CatalogueItem(Repository, ei1.CatalogueItem.Catalogue,"Other");
+        var otherCatItem = new CatalogueItem(Repository, ei1.CatalogueItem.Catalogue, "Other");
         var otherEi = new ExtractionInformation(Repository, otherCatItem, otherCol, "FFF");
 
         ei1.Alias = "happyfun";
@@ -46,7 +48,8 @@ public void TestSetExtractionIdentifier_Catalogue_PickOther()
         Assert.IsFalse(otherEi.IsExtractionIdentifier);
 
         // by picking the second (FFF) we should switch
-        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, ei1.CatalogueItem.Catalogue, null, "FFF");
+        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, ei1.CatalogueItem.Catalogue,
+            null, "FFF");
         cmd.Execute();
 
         // original should no longer be the extraction identifer
@@ -55,6 +58,7 @@ public void TestSetExtractionIdentifier_Catalogue_PickOther()
         // and the one picked should now be the only one
         Assert.IsTrue(otherEi.IsExtractionIdentifier);
     }
+
     [Test]
     public void TestSetExtractionIdentifier_Catalogue_ButColumnDoesNotExist()
     {
@@ -64,8 +68,9 @@ public void TestSetExtractionIdentifier_Catalogue_ButColumnDoesNotExist()
         ei1.IsExtractionIdentifier = false;
         ei1.SaveToDatabase();
 
-        var ex = Assert.Throws<Exception>(()=>
-            new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, ei1.CatalogueItem.Catalogue, null, "trollolo")
+        var ex = Assert.Throws<Exception>(() =>
+            new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, ei1.CatalogueItem.Catalogue, null,
+                    "trollolo")
                 .Execute());
         Assert.AreEqual("Could not find column(s) trollolo amongst available columns (happyfun)", ex.Message);
     }
@@ -82,7 +87,7 @@ public void TestSetExtractionIdentifier_Configuration()
 
         var config = Repository.GetObjectByID<ExtractionConfiguration>(ec1.ExtractionConfiguration_ID);
 
-        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object, 
+        var cmd = new ExecuteCommandSetExtractionIdentifier(GetMockActivator().Object,
             ec1.CatalogueExtractionInformation.CatalogueItem.Catalogue,
             config
             , "happyfun");
diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSimilarTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSimilarTests.cs
index 85d1d60de9..486314c57c 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSimilarTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandSimilarTests.cs
@@ -42,7 +42,6 @@ public void FindDifferent_ColumnInfosSame()
 
         c1.DeleteInDatabase();
         c2.DeleteInDatabase();
-
     }
 
     [Test]
@@ -62,6 +61,7 @@ public void FindDifferent_ColumnInfosDiffer_OnType()
         c1.DeleteInDatabase();
         c2.DeleteInDatabase();
     }
+
     [Test]
     public void FindDifferent_ColumnInfosDiffer_OnCollation()
     {
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandAssociateCatalogueWithLoadMetadata.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandAssociateCatalogueWithLoadMetadata.cs
index 43d6f15102..02b623e25e 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandAssociateCatalogueWithLoadMetadata.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandAssociateCatalogueWithLoadMetadata.cs
@@ -14,25 +14,24 @@ namespace Rdmp.Core.Tests.CommandExecution;
 
 internal class TestExecuteCommandAssociateCatalogueWithLoadMetadata : CommandCliTests
 {
-
     [Test]
     public void TestExecuteCommandAssociateCatalogueWithLoadMetadata_Simple()
     {
-        var cata1 = new Catalogue(RepositoryLocator.CatalogueRepository,"fff");
-        var cata2 = new Catalogue(RepositoryLocator.CatalogueRepository,"bbb");
+        var cata1 = new Catalogue(RepositoryLocator.CatalogueRepository, "fff");
+        var cata2 = new Catalogue(RepositoryLocator.CatalogueRepository, "bbb");
 
         Assert.IsNull(cata1.LoadMetadata);
         Assert.IsNull(cata2.LoadMetadata);
 
-        var lmd = new LoadMetadata(RepositoryLocator.CatalogueRepository,"mylmd");
+        var lmd = new LoadMetadata(RepositoryLocator.CatalogueRepository, "mylmd");
 
         GetInvoker().ExecuteCommand(typeof(ExecuteCommandAssociateCatalogueWithLoadMetadata),
-            new CommandLineObjectPicker(new[]{$"LoadMetadata:{lmd.ID}", "Catalogue:fff"}, GetActivator()));
+            new CommandLineObjectPicker(new[] { $"LoadMetadata:{lmd.ID}", "Catalogue:fff" }, GetActivator()));
 
         cata1.RevertToDatabaseState();
         cata2.RevertToDatabaseState();
 
-        Assert.AreEqual(lmd.ID,cata1.LoadMetadata_ID);
+        Assert.AreEqual(lmd.ID, cata1.LoadMetadata_ID);
         Assert.IsNull(cata2.LoadMetadata);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribe.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribe.cs
index ac5d9bf387..fb114b168c 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribe.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribe.cs
@@ -24,8 +24,8 @@ public void TestDescribeCatalogue()
         var c = WhenIHaveA<Catalogue>();
         c.Description = "fish";
 
-        var describe = new ExecuteCommandDescribe(mock.Object,new []{c});
-        Assert.IsFalse(describe.IsImpossible,describe.ReasonCommandImpossible);
+        var describe = new ExecuteCommandDescribe(mock.Object, new[] { c });
+        Assert.IsFalse(describe.IsImpossible, describe.ReasonCommandImpossible);
 
         describe.Execute();
 
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribeCommand.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribeCommand.cs
index c28ba4a2f9..0f060b3134 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribeCommand.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandDescribeCommand.cs
@@ -13,7 +13,6 @@ namespace Rdmp.Core.Tests.CommandExecution;
 
 internal class TestExecuteCommandDescribeCommand : CommandCliTests
 {
-        
     /// <summary>
     /// Asserts that the help text <paramref name="forCommand"/> matches your <paramref name="expectedHelp"/> text
     /// </summary>
@@ -23,8 +22,9 @@ private void AssertHelpIs(string expectedHelp, Type forCommand)
     {
         var activator = GetMockActivator().Object;
 
-        var cmd = new ExecuteCommandDescribe(activator, new CommandLineObjectPicker(new []{forCommand.Name},activator));
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandDescribe(activator,
+            new CommandLineObjectPicker(new[] { forCommand.Name }, activator));
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
 
         cmd.Execute();
         StringAssert.Contains(expectedHelp, cmd.HelpShown);
@@ -36,42 +36,42 @@ public void Test_DescribeDeleteCommand()
         AssertHelpIs(@" Delete <deletables> <deleteMany> 
 
 PARAMETERS:
-deletables	IDeleteable[]	The object(s) you want to delete.  If multiple you must set deleteMany to true", typeof(ExecuteCommandDelete));
+deletables	IDeleteable[]	The object(s) you want to delete.  If multiple you must set deleteMany to true",
+            typeof(ExecuteCommandDelete));
     }
 
 
     [Test]
     public void Test_ImportTableInfo_CommandHelp()
     {
-        AssertHelpIs( 
+        AssertHelpIs(
             @" ImportTableInfo <table> <createCatalogue> 
 
 PARAMETERS:
 table	DiscoveredTable	The table or view you want to reference from RDMP.  See PickTable for syntax
 createCatalogue	Boolean	True to create a Catalogue as well as a TableInfo"
-            ,typeof(ExecuteCommandImportTableInfo));
-
+            , typeof(ExecuteCommandImportTableInfo));
     }
 
     [Test]
     public void Test_DescribeCommand_ExecuteCommandNewObject()
     {
-        AssertHelpIs( @" NewObject <type> <arg1> <arg2> <etc>
+        AssertHelpIs(@" NewObject <type> <arg1> <arg2> <etc>
 
 PARAMETERS:
 type	The object to create e.g. Catalogue
-args    Dynamic list of values to satisfy the types constructor",typeof(ExecuteCommandNewObject));
+args    Dynamic list of values to satisfy the types constructor", typeof(ExecuteCommandNewObject));
     }
 
     [Test]
     public void Test_DescribeCommand_ExecuteCommandSetArgument()
     {
-        AssertHelpIs( @" SetArgument <component> <argName> <argValue>
+        AssertHelpIs(@" SetArgument <component> <argName> <argValue>
 
 PARAMETERS:
 component    Module to set value on e.g. ProcessTask:1
 argName Name of an argument to set on the component e.g. Retry
 argValue    New value for argument e.g. Null, True, Catalogue:5 etc
-",typeof(ExecuteCommandSetArgument));
+", typeof(ExecuteCommandSetArgument));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportFilterContainerTree.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportFilterContainerTree.cs
index 6062e108b2..a665de62cd 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportFilterContainerTree.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportFilterContainerTree.cs
@@ -25,83 +25,82 @@ public void TestImportTree_FromCohortIdentificationConfiguration_ToSelectedDatas
 
         var cata = sds.ExtractableDataSet.Catalogue;
 
-        var cic = new CohortIdentificationConfiguration(Repository,"my cic");
+        var cic = new CohortIdentificationConfiguration(Repository, "my cic");
         cic.CreateRootContainerIfNotExists();
 
-        var ac = new AggregateConfiguration(Repository,cata,"myagg");
+        var ac = new AggregateConfiguration(Repository, cata, "myagg");
         ac.CreateRootContainerIfNotExists();
-        cic.RootCohortAggregateContainer.AddChild(ac,1);
+        cic.RootCohortAggregateContainer.AddChild(ac, 1);
 
-        var filterToImport = new AggregateFilter(Repository,"MyFilter"){WhereSQL = "true" };
+        var filterToImport = new AggregateFilter(Repository, "MyFilter") { WhereSQL = "true" };
         ac.RootFilterContainer.AddChild(filterToImport);
-            
+
         //there should be no root container
         Assert.IsNull(sds.RootFilterContainer);
 
         //run the command
-        var mgr = new ConsoleInputManager(RepositoryLocator,new ThrowImmediatelyCheckNotifier())
+        var mgr = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
         {
             DisallowInput = true
         };
-        var cmd = new ExecuteCommandImportFilterContainerTree(mgr,sds,ac);
-            
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandImportFilterContainerTree(mgr, sds, ac);
+
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
-            
+
         sds.ClearAllInjections();
         Assert.IsNotNull(sds.RootFilterContainer);
-        Assert.AreEqual(1,sds.RootFilterContainer.GetFilters().Length);
-        Assert.AreEqual("MyFilter",sds.RootFilterContainer.GetFilters()[0].Name);
-        Assert.AreEqual("true",sds.RootFilterContainer.GetFilters()[0].WhereSQL);
+        Assert.AreEqual(1, sds.RootFilterContainer.GetFilters().Length);
+        Assert.AreEqual("MyFilter", sds.RootFilterContainer.GetFilters()[0].Name);
+        Assert.AreEqual("true", sds.RootFilterContainer.GetFilters()[0].WhereSQL);
 
-        Assert.AreNotEqual(filterToImport.GetType(),sds.RootFilterContainer.GetFilters()[0].GetType());
+        Assert.AreNotEqual(filterToImport.GetType(), sds.RootFilterContainer.GetFilters()[0].GetType());
     }
 
     [Test]
     public void TestImportTree_FromSelectedDatasets_ToCohortIdentificationConfiguration()
     {
-
         // Import From Selected Dataset
         var sds = WhenIHaveA<SelectedDataSets>();
         sds.CreateRootContainerIfNotExists();
 
-        var filterToImport = new DeployedExtractionFilter(Repository,"MyFilter", (FilterContainer)sds.RootFilterContainer){WhereSQL = "true" };
+        var filterToImport =
+            new DeployedExtractionFilter(Repository, "MyFilter", (FilterContainer)sds.RootFilterContainer)
+                { WhereSQL = "true" };
         filterToImport.SaveToDatabase();
 
         var cata = sds.ExtractableDataSet.Catalogue;
 
         // Into an Aggregate Configuration
-        var cic = new CohortIdentificationConfiguration(Repository,"my cic");
+        var cic = new CohortIdentificationConfiguration(Repository, "my cic");
         cic.CreateRootContainerIfNotExists();
-        var ac = new AggregateConfiguration(Repository,cata,"myagg");
+        var ac = new AggregateConfiguration(Repository, cata, "myagg");
+
+        cic.RootCohortAggregateContainer.AddChild(ac, 1);
 
-        cic.RootCohortAggregateContainer.AddChild(ac,1);
-            
         //there should be no root container
         Assert.IsNull(ac.RootFilterContainer);
 
         //run the command
-        var mgr = new ConsoleInputManager(RepositoryLocator,new ThrowImmediatelyCheckNotifier())
+        var mgr = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
         {
             DisallowInput = true
         };
-        var cmd = new ExecuteCommandImportFilterContainerTree(mgr,ac,sds);
-            
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandImportFilterContainerTree(mgr, ac, sds);
+
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
-            
+
         ac.ClearAllInjections();
         Assert.IsNotNull(ac.RootFilterContainer);
-        Assert.AreEqual(1,ac.RootFilterContainer.GetFilters().Length);
-        Assert.AreEqual("MyFilter",ac.RootFilterContainer.GetFilters()[0].Name);
-        Assert.AreEqual("true",ac.RootFilterContainer.GetFilters()[0].WhereSQL);
-
-        Assert.AreNotEqual(filterToImport.GetType(),ac.RootFilterContainer.GetFilters()[0].GetType());
-            
+        Assert.AreEqual(1, ac.RootFilterContainer.GetFilters().Length);
+        Assert.AreEqual("MyFilter", ac.RootFilterContainer.GetFilters()[0].Name);
+        Assert.AreEqual("true", ac.RootFilterContainer.GetFilters()[0].WhereSQL);
 
+        Assert.AreNotEqual(filterToImport.GetType(), ac.RootFilterContainer.GetFilters()[0].GetType());
     }
 
-        
+
     [Test]
     public void TestImportTree_FromCohortIdentificationConfiguration_ToSelectedDatasets_PreserveOperation()
     {
@@ -109,14 +108,14 @@ public void TestImportTree_FromCohortIdentificationConfiguration_ToSelectedDatas
 
         var cata = sds.ExtractableDataSet.Catalogue;
 
-        var cic = new CohortIdentificationConfiguration(Repository,"my cic");
+        var cic = new CohortIdentificationConfiguration(Repository, "my cic");
         cic.CreateRootContainerIfNotExists();
 
-        var ac = new AggregateConfiguration(Repository,cata,"myagg");
+        var ac = new AggregateConfiguration(Repository, cata, "myagg");
         ac.CreateRootContainerIfNotExists();
-        cic.RootCohortAggregateContainer.AddChild(ac,1);
+        cic.RootCohortAggregateContainer.AddChild(ac, 1);
 
-        var filterToImport = new AggregateFilter(Repository,"MyFilter"){WhereSQL = "true" };
+        var filterToImport = new AggregateFilter(Repository, "MyFilter") { WhereSQL = "true" };
         var root = ac.RootFilterContainer;
         root.AddChild(filterToImport);
         root.Operation = FilterContainerOperation.OR;
@@ -130,26 +129,23 @@ public void TestImportTree_FromCohortIdentificationConfiguration_ToSelectedDatas
         Assert.IsNull(sds.RootFilterContainer);
 
         //run the command
-        var mgr = new ConsoleInputManager(RepositoryLocator,new ThrowImmediatelyCheckNotifier())
+        var mgr = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
         {
             DisallowInput = true
         };
-        var cmd = new ExecuteCommandImportFilterContainerTree(mgr,sds,ac);
-            
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandImportFilterContainerTree(mgr, sds, ac);
+
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
-            
+
         sds.ClearAllInjections();
         Assert.AreEqual(FilterContainerOperation.OR, sds.RootFilterContainer.Operation);
         Assert.IsNotNull(sds.RootFilterContainer);
-        Assert.AreEqual(1,sds.RootFilterContainer.GetFilters().Length);
+        Assert.AreEqual(1, sds.RootFilterContainer.GetFilters().Length);
 
         var subContainers = sds.RootFilterContainer.GetSubContainers();
         Assert.AreEqual(2, subContainers.Length);
-        Assert.AreEqual(1, subContainers.Count(e=>e.Operation == FilterContainerOperation.AND));
+        Assert.AreEqual(1, subContainers.Count(e => e.Operation == FilterContainerOperation.AND));
         Assert.AreEqual(1, subContainers.Count(e => e.Operation == FilterContainerOperation.OR));
-
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportTableInfo.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportTableInfo.cs
index 67457763ed..410d05d1ed 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportTableInfo.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandImportTableInfo.cs
@@ -16,31 +16,34 @@ internal class TestExecuteCommandImportTableInfo : CommandCliTests
     [Test]
     public void Test_ImportTableInfo_NoArguments()
     {
-
         var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandImportTableInfo),
             new CommandLineObjectPicker(Array.Empty<string>(), GetActivator())));
 
-        StringAssert.StartsWith("Expected parameter at index 0 to be a FAnsi.Discovery.DiscoveredTable (for parameter 'table') but it was Missing",ex.Message);
+        StringAssert.StartsWith(
+            "Expected parameter at index 0 to be a FAnsi.Discovery.DiscoveredTable (for parameter 'table') but it was Missing",
+            ex.Message);
     }
 
     [Test]
     public void Test_ImportTableInfo_MalformedArgument()
     {
         var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandImportTableInfo),
-            new CommandLineObjectPicker(new string[]{ "MyTable"}, GetActivator())));
+            new CommandLineObjectPicker(new string[] { "MyTable" }, GetActivator())));
 
-        StringAssert.StartsWith("Expected parameter at index 0 to be a FAnsi.Discovery.DiscoveredTable (for parameter 'table') but it was MyTable",ex.Message);
+        StringAssert.StartsWith(
+            "Expected parameter at index 0 to be a FAnsi.Discovery.DiscoveredTable (for parameter 'table') but it was MyTable",
+            ex.Message);
     }
 
     [Test]
     public void Test_ImportTableInfo_NoTable()
     {
-        var tbl = "Table:MyTable:DatabaseType:MicrosoftSQLServer:Server=myServerAddress;Database=myDataBase;Trusted_Connection=True";
+        var tbl =
+            "Table:MyTable:DatabaseType:MicrosoftSQLServer:Server=myServerAddress;Database=myDataBase;Trusted_Connection=True";
 
         var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandImportTableInfo),
-            new CommandLineObjectPicker(new string[]{ tbl,"true"}, GetActivator())));
-            
-        StringAssert.StartsWith("Could not reach server myServerAddress",ex.Message);
-    }
+            new CommandLineObjectPicker(new string[] { tbl, "true" }, GetActivator())));
 
+        StringAssert.StartsWith("Could not reach server myServerAddress", ex.Message);
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandNewObject.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandNewObject.cs
index 5f34933a5c..1205cf0f7f 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandNewObject.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandNewObject.cs
@@ -19,52 +19,53 @@ internal class TestExecuteCommandNewObject : CommandCliTests
     [Test]
     public void Test_NewObjectCommand_NoArguments()
     {
-
         var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),
             new CommandLineObjectPicker(Array.Empty<string>(), GetActivator())));
 
-        StringAssert.StartsWith("First parameter must be a Type",ex.Message);
+        StringAssert.StartsWith("First parameter must be a Type", ex.Message);
     }
 
     [Test]
     public void Test_NewObjectCommand_NonExistentTypeArgument()
     {
-        var ex = Assert.Throws<Exception>(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),
-            new CommandLineObjectPicker(new[]{"Fissdlkfldfj"}, GetActivator())));
+        var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),
+            new CommandLineObjectPicker(new[] { "Fissdlkfldfj" }, GetActivator())));
 
-        StringAssert.StartsWith("First parameter must be a Type",ex.Message);
+        StringAssert.StartsWith("First parameter must be a Type", ex.Message);
     }
 
     [Test]
     public void Test_NewObjectCommand_WrongTypeArgument()
     {
-        var picker = new CommandLineObjectPicker(new[] {"UnitTests"}, GetActivator());
-        Assert.AreEqual(typeof(UnitTests),picker[0].Type);
+        var picker = new CommandLineObjectPicker(new[] { "UnitTests" }, GetActivator());
+        Assert.AreEqual(typeof(UnitTests), picker[0].Type);
 
-        var ex = Assert.Throws<Exception>(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),picker));
+        var ex = Assert.Throws<Exception>(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject), picker));
 
-        StringAssert.StartsWith("Type must be derived from DatabaseEntity",ex.Message);
+        StringAssert.StartsWith("Type must be derived from DatabaseEntity", ex.Message);
     }
 
     [Test]
     public void Test_NewObjectCommand_MissingNameArgument()
     {
-        var picker = new CommandLineObjectPicker(new[] {"Catalogue"}, GetActivator());
-        Assert.AreEqual(typeof(Catalogue),picker[0].Type);
+        var picker = new CommandLineObjectPicker(new[] { "Catalogue" }, GetActivator());
+        Assert.AreEqual(typeof(Catalogue), picker[0].Type);
 
-        var ex = Assert.Throws<ArgumentException>(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),picker));
+        var ex = Assert.Throws<ArgumentException>(() =>
+            GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject), picker));
 
-        StringAssert.StartsWith("Value needed for parameter 'name' (of type 'System.String')",ex.Message);
+        StringAssert.StartsWith("Value needed for parameter 'name' (of type 'System.String')", ex.Message);
     }
 
     [Test]
     public void Test_NewObjectCommand_Success()
     {
-        var picker = new CommandLineObjectPicker(new[] {"Catalogue","lolzeeeyeahyeah"}, GetActivator());
-        Assert.AreEqual(typeof(Catalogue),picker[0].Type);
+        var picker = new CommandLineObjectPicker(new[] { "Catalogue", "lolzeeeyeahyeah" }, GetActivator());
+        Assert.AreEqual(typeof(Catalogue), picker[0].Type);
+
+        Assert.DoesNotThrow(() => GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject), picker));
 
-        Assert.DoesNotThrow(() =>  GetInvoker().ExecuteCommand(typeof(ExecuteCommandNewObject),picker));
-            
-        Assert.Contains("lolzeeeyeahyeah",RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Select(c=>c.Name).ToArray());
+        Assert.Contains("lolzeeeyeahyeah",
+            RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Select(c => c.Name).ToArray());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSet.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSet.cs
index 5aff358ad2..f878ddfe6f 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSet.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSet.cs
@@ -19,12 +19,13 @@ public void Test_CatalogueDescription_Normal()
     {
         var cata = new Catalogue(Repository.CatalogueRepository, "Bob");
 
-        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet),new CommandLineObjectPicker(new []{
-            $"Catalogue:{cata.ID}","Description","Some long description"}, GetActivator()));
+        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet), new CommandLineObjectPicker(new[]
+        {
+            $"Catalogue:{cata.ID}", "Description", "Some long description"
+        }, GetActivator()));
 
         cata.RevertToDatabaseState();
-        Assert.AreEqual("Some long description",cata.Description);
-
+        Assert.AreEqual("Some long description", cata.Description);
     }
 
     [Test]
@@ -36,12 +37,13 @@ public void Test_CatalogueDescription_Null()
         };
         cata.SaveToDatabase();
 
-        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet),new CommandLineObjectPicker(new []{
-            $"Catalogue:{cata.ID}","Description","NULL"}, GetActivator()));
+        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet), new CommandLineObjectPicker(new[]
+        {
+            $"Catalogue:{cata.ID}", "Description", "NULL"
+        }, GetActivator()));
 
         cata.RevertToDatabaseState();
         Assert.IsNull(cata.Description);
-
     }
 
     [Test]
@@ -62,13 +64,14 @@ public void TestExecuteCommandSet_SetArrayValueFromCLI()
         Assert.IsNull(pta.Value);
         Assert.IsNull(pta.GetValueAsSystemType());
 
-        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet),new CommandLineObjectPicker(new []{"ProcessTaskArgument:TablesToIsolate" ,"Value",ids}, GetActivator()));
+        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSet),
+            new CommandLineObjectPicker(new[] { "ProcessTaskArgument:TablesToIsolate", "Value", ids }, GetActivator()));
 
-        Assert.AreEqual(ids,pta.Value);
+        Assert.AreEqual(ids, pta.Value);
 
-        Assert.Contains(t1,(TableInfo[])pta.GetValueAsSystemType());
-        Assert.Contains(t2,(TableInfo[])pta.GetValueAsSystemType());
-        Assert.Contains(t3,(TableInfo[])pta.GetValueAsSystemType());
-        Assert.Contains(t4,(TableInfo[])pta.GetValueAsSystemType());
+        Assert.Contains(t1, (TableInfo[])pta.GetValueAsSystemType());
+        Assert.Contains(t2, (TableInfo[])pta.GetValueAsSystemType());
+        Assert.Contains(t3, (TableInfo[])pta.GetValueAsSystemType());
+        Assert.Contains(t4, (TableInfo[])pta.GetValueAsSystemType());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSetUserSetting.cs b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSetUserSetting.cs
index 81f4885b72..e95324837e 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSetUserSetting.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestExecuteCommandSetUserSetting.cs
@@ -19,14 +19,15 @@ public void Test_CatalogueDescription_Normal()
     {
         UserSettings.Wait5SecondsAfterStartupUI = false;
 
-        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetUserSetting),new CommandLineObjectPicker(new []{ "Wait5SecondsAfterStartupUI", "true"}, GetActivator()));
+        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetUserSetting),
+            new CommandLineObjectPicker(new[] { "Wait5SecondsAfterStartupUI", "true" }, GetActivator()));
 
         Assert.IsTrue(UserSettings.Wait5SecondsAfterStartupUI);
 
-        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetUserSetting),new CommandLineObjectPicker(new []{ "Wait5SecondsAfterStartupUI", "false"}, GetActivator()));
-            
-        Assert.IsFalse(UserSettings.Wait5SecondsAfterStartupUI);
+        GetInvoker().ExecuteCommand(typeof(ExecuteCommandSetUserSetting),
+            new CommandLineObjectPicker(new[] { "Wait5SecondsAfterStartupUI", "false" }, GetActivator()));
 
+        Assert.IsFalse(UserSettings.Wait5SecondsAfterStartupUI);
     }
 
     [Test]
@@ -34,7 +35,8 @@ public void TestSettingErrorCodeValue_InvalidValue()
     {
         var cmd = new ExecuteCommandSetUserSetting(GetActivator(), "R001", "foo");
         Assert.IsTrue(cmd.IsImpossible);
-        Assert.AreEqual(cmd.ReasonCommandImpossible, "Invalid enum value.  When setting an error code you must supply a value of one of :Success,Warning,Fail");
+        Assert.AreEqual(cmd.ReasonCommandImpossible,
+            "Invalid enum value.  When setting an error code you must supply a value of one of :Success,Warning,Fail");
     }
 
     [Test]
@@ -45,13 +47,13 @@ public void TestSettingErrorCodeValue_Success()
         Assert.AreNotEqual(CheckResult.Success, before);
 
         var cmd = new ExecuteCommandSetUserSetting(GetActivator(), "R001", "Success");
-        Assert.IsFalse(cmd.IsImpossible,cmd.ReasonCommandImpossible);
+        Assert.IsFalse(cmd.IsImpossible, cmd.ReasonCommandImpossible);
         cmd.Execute();
 
         var after = UserSettings.GetErrorReportingLevelFor(ErrorCodes.ExistingExtractionTableInDatabase);
         Assert.AreEqual(CheckResult.Success, after);
 
         //reset the original state of the system (the default)
-        UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExistingExtractionTableInDatabase,before);
+        UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExistingExtractionTableInDatabase, before);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandExecution/TestStartup.cs b/Rdmp.Core.Tests/CommandExecution/TestStartup.cs
index 0967b6297f..965ed8acd8 100644
--- a/Rdmp.Core.Tests/CommandExecution/TestStartup.cs
+++ b/Rdmp.Core.Tests/CommandExecution/TestStartup.cs
@@ -17,8 +17,7 @@ internal class TestStartup : UnitTests
     [Test]
     public void TestStartupWithMemoryRepository()
     {
-        var s = new Rdmp.Core.Startup.Startup(new EnvironmentInfo(),RepositoryLocator);
-        Assert.DoesNotThrow(()=>s.DoStartup(new ThrowImmediatelyCheckNotifier()));
+        var s = new Rdmp.Core.Startup.Startup(new EnvironmentInfo(), RepositoryLocator);
+        Assert.DoesNotThrow(() => s.DoStartup(new ThrowImmediatelyCheckNotifier()));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/AbstractBaseRunnerTests.cs b/Rdmp.Core.Tests/CommandLine/AbstractBaseRunnerTests.cs
index bd7662f9b9..6e48db0a31 100644
--- a/Rdmp.Core.Tests/CommandLine/AbstractBaseRunnerTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/AbstractBaseRunnerTests.cs
@@ -26,7 +26,7 @@ public void SetupMef()
     {
         SetupMEF();
     }
-        
+
     [SetUp]
     public void CleanRemnants()
     {
@@ -41,7 +41,7 @@ public void GetObjectFromCommandLineString_CatalogueByID()
         WhenIHaveA<Catalogue>();
         WhenIHaveA<Catalogue>();
         var r = new TestRunner();
-        Assert.AreEqual(c, TestRunner.GetObjectFromCommandLineString<Catalogue>(RepositoryLocator,c.ID.ToString()));
+        Assert.AreEqual(c, TestRunner.GetObjectFromCommandLineString<Catalogue>(RepositoryLocator, c.ID.ToString()));
     }
 
     [Test]
@@ -130,7 +130,8 @@ public void GetObjectsFromCommandLineString_CatalogueByID()
         WhenIHaveA<Catalogue>();
         var r = new TestRunner();
 
-        var results = TestRunner.GetObjectsFromCommandLineString<Catalogue>(RepositoryLocator,$"{c.ID},{c2.ID}").ToArray();
+        var results = TestRunner.GetObjectsFromCommandLineString<Catalogue>(RepositoryLocator, $"{c.ID},{c2.ID}")
+            .ToArray();
 
         Assert.AreEqual(2, results.Length);
         Assert.AreSame(c, results[0]);
@@ -147,33 +148,28 @@ public void GetObjectsFromCommandLineString_CatalogueByPattern()
         var c2 = WhenIHaveA<Catalogue>();
         c2.Name = "go hard";
         c2.SaveToDatabase();
-            
+
         WhenIHaveA<Catalogue>();
 
         var r = new TestRunner();
-        var results = TestRunner.GetObjectsFromCommandLineString<Catalogue>(RepositoryLocator, "Catalogue:*go*").ToArray();
+        var results = TestRunner.GetObjectsFromCommandLineString<Catalogue>(RepositoryLocator, "Catalogue:*go*")
+            .ToArray();
 
         Assert.AreEqual(2, results.Length);
-        Assert.Contains(c,results);
+        Assert.Contains(c, results);
         Assert.Contains(c2, results);
     }
 
     private class TestRunner : Runner
     {
-        public new static T GetObjectFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg) where T : IMapsDirectlyToDatabaseTable
-        {
-            return Runner.GetObjectFromCommandLineString<T>(locator, arg);
-        }
-
-        public new static IEnumerable<T> GetObjectsFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg) where T : IMapsDirectlyToDatabaseTable
-        {
-            return Runner.GetObjectsFromCommandLineString<T>(locator, arg);
-        }
-
-        public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
-        {
-                
-            return 0;
-        }
+        public new static T GetObjectFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg)
+            where T : IMapsDirectlyToDatabaseTable => Runner.GetObjectFromCommandLineString<T>(locator, arg);
+
+        public new static IEnumerable<T>
+            GetObjectsFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg)
+            where T : IMapsDirectlyToDatabaseTable => Runner.GetObjectsFromCommandLineString<T>(locator, arg);
+
+        public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+            IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token) => 0;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndCacheTest.cs b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndCacheTest.cs
index 72054bc54a..b457e72d08 100644
--- a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndCacheTest.cs
+++ b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndCacheTest.cs
@@ -26,7 +26,6 @@ namespace Rdmp.Core.Tests.CommandLine.AutomationLoopTests;
 
 public class EndToEndCacheTest : DatabaseTests
 {
-
     private Catalogue _cata;
     private LoadMetadata _lmd;
     private LoadProgress _lp;
@@ -43,9 +42,11 @@ protected override void SetUp()
 
         RepositoryLocator.CatalogueRepository.MEF.AddTypeToCatalogForTesting(typeof(TestDataWriter));
         RepositoryLocator.CatalogueRepository.MEF.AddTypeToCatalogForTesting(typeof(TestDataInventor));
-            
+
         _lmd = new LoadMetadata(CatalogueRepository, "Ive got a lovely bunch o' coconuts");
-        _LoadDirectory = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), @"EndToEndCacheTest", true);
+        _LoadDirectory =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                @"EndToEndCacheTest", true);
         _lmd.LocationOfFlatFiles = _LoadDirectory.RootPath.FullName;
         _lmd.SaveToDatabase();
 
@@ -58,12 +59,13 @@ protected override void SetUp()
         _cata.SaveToDatabase();
 
         _lp = new LoadProgress(CatalogueRepository, _lmd);
-        _cp = new CacheProgress(CatalogueRepository, _lp); 
-            
-        _lp.OriginDate = new DateTime(2001,1,1);
+        _cp = new CacheProgress(CatalogueRepository, _lp);
+
+        _lp.OriginDate = new DateTime(2001, 1, 1);
         _lp.SaveToDatabase();
 
-        _testPipeline = new TestDataPipelineAssembler($"EndToEndCacheTestPipeline{Guid.NewGuid()}",CatalogueRepository);
+        _testPipeline =
+            new TestDataPipelineAssembler($"EndToEndCacheTestPipeline{Guid.NewGuid()}", CatalogueRepository);
         _testPipeline.ConfigureCacheProgressToUseThePipeline(_cp);
 
         _cp.CacheFillProgress = DateTime.Now.AddDays(-NumDaysToCache);
@@ -93,7 +95,7 @@ public void FireItUpManually()
         var cacheFiles = _LoadDirectory.Cache.GetFiles().Select(fi => fi.Name).ToArray();
         for (var i = -NumDaysToCache; i < 0; i++)
         {
-            var filename = $"{DateTime.Now.AddDays(i):yyyyMMdd}.csv"; 
+            var filename = $"{DateTime.Now.AddDays(i):yyyyMMdd}.csv";
             Assert.IsTrue(cacheFiles.Contains(filename), filename + " not found");
         }
     }
@@ -105,8 +107,10 @@ public void RunEndToEndCacheTest()
         {
             Assert.AreEqual(0, _LoadDirectory.Cache.GetFiles("*.csv").Length);
 
-            var auto = new CacheRunner(new CacheOptions {CacheProgress = _cp.ID.ToString(), Command = CommandLineActivity.run});
-            auto.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
+            var auto = new CacheRunner(new CacheOptions
+                { CacheProgress = _cp.ID.ToString(), Command = CommandLineActivity.run });
+            auto.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),
+                new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
         });
 
         Assert.True(t.Wait(60000));
diff --git a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLECacheTest.cs b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLECacheTest.cs
index b29b362bea..57d35daa51 100644
--- a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLECacheTest.cs
+++ b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLECacheTest.cs
@@ -17,7 +17,7 @@
 
 namespace Rdmp.Core.Tests.CommandLine.AutomationLoopTests;
 
-public class EndToEndDLECacheTest:TestsRequiringADle
+public class EndToEndDLECacheTest : TestsRequiringADle
 {
     [Test]
     public void RunEndToEndDLECacheTest()
@@ -29,16 +29,16 @@ public void RunEndToEndDLECacheTest()
 
         var lmd = TestLoadMetadata;
 
-        var lp = new LoadProgress(CatalogueRepository,lmd)
+        var lp = new LoadProgress(CatalogueRepository, lmd)
         {
-            DataLoadProgress = new DateTime(2001,1,1),
+            DataLoadProgress = new DateTime(2001, 1, 1),
             DefaultNumberOfDaysToLoadEachTime = 10
         };
         lp.SaveToDatabase();
 
         var cp = new CacheProgress(CatalogueRepository, lp)
         {
-            CacheFillProgress = new DateTime(2001,1,11) //10 days available to load
+            CacheFillProgress = new DateTime(2001, 1, 11) //10 days available to load
         };
         cp.SaveToDatabase();
 
@@ -48,42 +48,42 @@ public void RunEndToEndDLECacheTest()
         //setup the cache process task
         var pt = new ProcessTask(CatalogueRepository, lmd, LoadStage.GetFiles)
         {
-            Path = typeof (BasicCacheDataProvider).FullName,
+            Path = typeof(BasicCacheDataProvider).FullName,
             ProcessTaskType = ProcessTaskType.DataProvider
         };
         pt.SaveToDatabase();
         pt.CreateArgumentsForClassIfNotExists<BasicCacheDataProvider>();
 
         var attacher = lmd.ProcessTasks.Single(p => p.ProcessTaskType == ProcessTaskType.Attacher);
-        var patternArgument  = (ProcessTaskArgument)attacher.GetAllArguments().Single(a => a.Name.Equals("FilePattern"));
+        var patternArgument = (ProcessTaskArgument)attacher.GetAllArguments().Single(a => a.Name.Equals("FilePattern"));
         patternArgument.SetValue("*.csv");
         patternArgument.SaveToDatabase();
 
         //take the forLoading file
-        var csvFile = CreateFileInForLoading("bob.csv",10,new Random(5000));
+        var csvFile = CreateFileInForLoading("bob.csv", 10, new Random(5000));
 
         //and move it to the cache and give it a date in the range we expect for the cached data
-        csvFile.MoveTo(Path.Combine(LoadDirectory.Cache.FullName,"2001-01-09.csv"));
-                       
+        csvFile.MoveTo(Path.Combine(LoadDirectory.Cache.FullName, "2001-01-09.csv"));
+
         RunDLE(timeoutInMilliseconds);
 
-        Assert.AreEqual(10,RowsNow - RowsBefore);
+        Assert.AreEqual(10, RowsNow - RowsBefore);
 
         Assert.AreEqual(0, LoadDirectory.Cache.GetFiles().Length);
         Assert.AreEqual(0, LoadDirectory.ForLoading.GetFiles().Length);
         Assert.AreEqual(1, LoadDirectory.ForArchiving.GetFiles().Length);
 
         var archiveFile = LoadDirectory.ForArchiving.GetFiles()[0];
-        Assert.AreEqual(".zip",archiveFile.Extension);
+        Assert.AreEqual(".zip", archiveFile.Extension);
 
 
         //load progress should be updated to the largest date in the cache (2001-01-09)
         lp.RevertToDatabaseState();
-        Assert.AreEqual(lp.DataLoadProgress, new DateTime(2001,01,09));
+        Assert.AreEqual(lp.DataLoadProgress, new DateTime(2001, 01, 09));
 
         cp.DeleteInDatabase();
         lp.DeleteInDatabase();
 
-        assembler.Destroy();            
+        assembler.Destroy();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLETest.cs b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLETest.cs
index 25dd31ab5a..0c36ecc140 100644
--- a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLETest.cs
+++ b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/EndToEndDLETest.cs
@@ -22,19 +22,19 @@ public class EndToEndDLETest : TestsRequiringADle
     public void RunEndToEndDLETest()
     {
         const int timeoutInMilliseconds = 120000;
-        CreateFileInForLoading("loadmeee.csv",500,new Random(500));
+        CreateFileInForLoading("loadmeee.csv", 500, new Random(500));
         RunDLE(timeoutInMilliseconds);
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestDle_DodgyColumnNames(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
 
-        var tbl = db.CreateTable("Troll Select * Loll",new DatabaseColumnRequest[]
+        var tbl = db.CreateTable("Troll Select * Loll", new DatabaseColumnRequest[]
         {
-            new DatabaseColumnRequest("group by",new DatabaseTypeRequest(typeof(string),100)){IsPrimaryKey = true}, 
-            new DatabaseColumnRequest(",,,,",new DatabaseTypeRequest(typeof(string)))
+            new("group by", new DatabaseTypeRequest(typeof(string), 100)) { IsPrimaryKey = true },
+            new(",,,,", new DatabaseTypeRequest(typeof(string)))
         });
 
         CreateFileInForLoading("Troll.csv", new string[]
@@ -50,16 +50,16 @@ public void TestDle_DodgyColumnNames(DatabaseType dbType)
         };
         lmd.SaveToDatabase();
 
-        CreateFlatFileAttacher(lmd,"Troll.csv",cata.GetTableInfoList(false).Single());
+        CreateFlatFileAttacher(lmd, "Troll.csv", cata.GetTableInfoList(false).Single());
 
         cata.LoadMetadata_ID = lmd.ID;
         cata.SaveToDatabase();
 
-        Assert.AreEqual(0,tbl.GetRowCount());
+        Assert.AreEqual(0, tbl.GetRowCount());
 
-        RunDLE(lmd,30000,true);
+        RunDLE(lmd, 30000, true);
 
-        Assert.AreEqual(1,tbl.GetRowCount());
-        Assert.AreEqual("fishon",tbl.GetDataTable().Rows[0][",,,,"]);
+        Assert.AreEqual(1, tbl.GetRowCount());
+        Assert.AreEqual("fishon", tbl.GetDataTable().Rows[0][",,,,"]);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/FictionalCache/Reading/TestDataCacheReader.cs b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/FictionalCache/Reading/TestDataCacheReader.cs
index c3f3875f5c..fc07a17e9f 100644
--- a/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/FictionalCache/Reading/TestDataCacheReader.cs
+++ b/Rdmp.Core.Tests/CommandLine/AutomationLoopTests/FictionalCache/Reading/TestDataCacheReader.cs
@@ -38,17 +38,11 @@ public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
         throw new NotImplementedException();
     }
 
-    public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
-    {
+    public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken) =>
         throw new NotImplementedException();
-    }
 
     public CacheArchiveType CacheArchiveType { get; set; }
     public string CacheDateFormat { get; set; }
     public Type CacheLayoutType { get; set; }
-    public ILoadCachePathResolver CreateResolver(ILoadProgress loadProgress)
-    {
-        throw new NotImplementedException();
-    }
-
+    public ILoadCachePathResolver CreateResolver(ILoadProgress loadProgress) => throw new NotImplementedException();
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/CommandLineObjectPickerTests.cs b/Rdmp.Core.Tests/CommandLine/CommandLineObjectPickerTests.cs
index a192fdfe16..fa238e5f0a 100644
--- a/Rdmp.Core.Tests/CommandLine/CommandLineObjectPickerTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/CommandLineObjectPickerTests.cs
@@ -18,7 +18,6 @@ namespace Rdmp.Core.Tests.CommandLine;
 
 internal class CommandLineObjectPickerTests : UnitTests
 {
-
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
     {
@@ -32,10 +31,7 @@ protected override void SetUp()
     {
         base.SetUp();
 
-        foreach(var c in Repository.GetAllObjects<Catalogue>())
-        {
-            c.DeleteInDatabase();
-        }
+        foreach (var c in Repository.GetAllObjects<Catalogue>()) c.DeleteInDatabase();
     }
 
 
@@ -43,9 +39,9 @@ protected override void SetUp()
     public void Test_RandomGarbage_GeneratesRawValueOnly()
     {
         var str = $"Shiver me timbers";
-        var picker = new CommandLineObjectPicker(new []{str}, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { str }, GetActivator());
 
-        Assert.AreEqual(str,picker[0].RawValue); 
+        Assert.AreEqual(str, picker[0].RawValue);
         Assert.IsNull(picker[0].DatabaseEntities);
         Assert.IsNull(picker[0].Database);
         Assert.IsNull(picker[0].Table);
@@ -55,17 +51,17 @@ public void Test_RandomGarbage_GeneratesRawValueOnly()
     [Test]
     public void Test_PickCatalogueByID_PickOne()
     {
-        var cata =  WhenIHaveA<Catalogue>();
+        var cata = WhenIHaveA<Catalogue>();
 
-        var picker = new CommandLineObjectPicker(new []{$"Catalogue:{cata.ID}"}, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { $"Catalogue:{cata.ID}" }, GetActivator());
+
+        Assert.AreEqual(cata, picker[0].DatabaseEntities.Single());
 
-        Assert.AreEqual(cata,picker[0].DatabaseEntities.Single());
 
-           
         //specifying the same ID twice shouldn't return duplicate objects
-        picker = new CommandLineObjectPicker(new []{$"Catalogue:{cata.ID},{cata.ID}"}, GetActivator());
+        picker = new CommandLineObjectPicker(new[] { $"Catalogue:{cata.ID},{cata.ID}" }, GetActivator());
 
-        Assert.AreEqual(cata,picker[0].DatabaseEntities.Single());
+        Assert.AreEqual(cata, picker[0].DatabaseEntities.Single());
     }
 
     /// <summary>
@@ -76,39 +72,39 @@ public void Test_PickCatalogueByID_PickOne()
     [TestCase("\r\n")]
     public void Test_PickerForWhitespace(string val)
     {
-        var picker = new CommandLineObjectPicker(new []{val }, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { val }, GetActivator());
+
+        Assert.AreEqual(1, picker.Length);
 
-        Assert.AreEqual(1,picker.Length);
-            
         Assert.IsNull(picker[0].Database);
         Assert.IsNull(picker[0].DatabaseEntities);
         Assert.IsFalse(picker[0].ExplicitNull);
-        Assert.AreEqual(val,picker[0].RawValue);
+        Assert.AreEqual(val, picker[0].RawValue);
         Assert.IsNull(picker[0].Type);
-            
-        Assert.AreEqual(val,picker[0].GetValueForParameterOfType(typeof(string)));
+
+        Assert.AreEqual(val, picker[0].GetValueForParameterOfType(typeof(string)));
         Assert.IsTrue(picker.HasArgumentOfType(0, typeof(string)));
     }
-        
+
     [Test]
     public void Test_PickCatalogueByID_PickTwo()
     {
-        var cata1 =  WhenIHaveA<Catalogue>();
-        var cata2 =  WhenIHaveA<Catalogue>();
+        var cata1 = WhenIHaveA<Catalogue>();
+        var cata2 = WhenIHaveA<Catalogue>();
 
-        var picker = new CommandLineObjectPicker(new []{$"Catalogue:{cata1.ID},{cata2.ID}"}, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { $"Catalogue:{cata1.ID},{cata2.ID}" }, GetActivator());
 
         Assert.AreEqual(2, picker[0].DatabaseEntities.Count);
-        Assert.Contains(cata1,picker[0].DatabaseEntities);
-        Assert.Contains(cata2,picker[0].DatabaseEntities);
+        Assert.Contains(cata1, picker[0].DatabaseEntities);
+        Assert.Contains(cata2, picker[0].DatabaseEntities);
     }
-        
+
     [Test]
     public void Test_PickCatalogueByName_PickTwo()
     {
-        var cata1 =  WhenIHaveA<Catalogue>();
-        var cata2 =  WhenIHaveA<Catalogue>();
-        var cata3 =  WhenIHaveA<Catalogue>();
+        var cata1 = WhenIHaveA<Catalogue>();
+        var cata2 = WhenIHaveA<Catalogue>();
+        var cata3 = WhenIHaveA<Catalogue>();
 
         cata1.Name = "lolzy";
         cata2.Name = "lolxy";
@@ -118,7 +114,7 @@ public void Test_PickCatalogueByName_PickTwo()
         cata2.SaveToDatabase();
         cata3.SaveToDatabase();
 
-        var picker = new CommandLineObjectPicker(new []{$"Catalogue:lol*"}, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { $"Catalogue:lol*" }, GetActivator());
 
         Assert.AreEqual(2, picker[0].DatabaseEntities.Count);
         Assert.Contains(cata1, picker[0].DatabaseEntities);
@@ -128,29 +124,30 @@ public void Test_PickCatalogueByName_PickTwo()
     [Test]
     public void TestPicker_TypeYieldsEmptyArrayOfObjects()
     {
-        foreach(var cat in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
+        foreach (var cat in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
             cat.DeleteInDatabase();
 
         Assert.IsEmpty(RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>());
 
         //when interpreting the string "Catalogue" for a command
-        var picker = new CommandLineObjectPicker(new []{"Catalogue" }, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { "Catalogue" }, GetActivator());
 
         //we can pick it as either a Catalogue or a collection of all the Catalogues
-        Assert.AreEqual(typeof(Catalogue),picker.Arguments.Single().Type);
+        Assert.AreEqual(typeof(Catalogue), picker.Arguments.Single().Type);
         Assert.IsEmpty(picker.Arguments.Single().DatabaseEntities);
 
         //when interpretting as a Type we get Catalogue
         Assert.IsTrue(picker.Arguments.First().HasValueOfType(typeof(Type)));
-        Assert.AreEqual(typeof(Catalogue),picker.Arguments.Single().GetValueForParameterOfType(typeof(Type)));
+        Assert.AreEqual(typeof(Catalogue), picker.Arguments.Single().GetValueForParameterOfType(typeof(Type)));
 
         //if it is looking for an ienumerable of objects
         Assert.IsTrue(picker.Arguments.First().HasValueOfType(typeof(IMapsDirectlyToDatabaseTable[])));
-        Assert.IsEmpty((IMapsDirectlyToDatabaseTable[])picker.Arguments.First().GetValueForParameterOfType(typeof(IMapsDirectlyToDatabaseTable[])));
+        Assert.IsEmpty((IMapsDirectlyToDatabaseTable[])picker.Arguments.First()
+            .GetValueForParameterOfType(typeof(IMapsDirectlyToDatabaseTable[])));
 
         Assert.IsTrue(picker.Arguments.First().HasValueOfType(typeof(Catalogue[])));
-        Assert.IsEmpty(((Catalogue[])picker.Arguments.First().GetValueForParameterOfType(typeof(Catalogue[]))).ToArray());
-
+        Assert.IsEmpty(
+            ((Catalogue[])picker.Arguments.First().GetValueForParameterOfType(typeof(Catalogue[]))).ToArray());
     }
 
     [TestCase(typeof(PickDatabase))]
@@ -173,38 +170,40 @@ public void Pickers_ShouldAllHaveValidExamples_MatchingRegex(Type pickerType)
 
         var picker = (PickObjectBase)ObjectConstructor.Construct(pickerType, GetActivator(new RepositoryProvider(mem)));
 
-        Assert.IsNotEmpty(picker.Help,"No Help for picker {0}",picker);
-        Assert.IsNotEmpty(picker.Format,"No Format for picker {0}",picker);
-        Assert.IsNotNull(picker.Examples,"No Examples for picker {0}",picker);
-        Assert.IsNotEmpty(picker.Examples,"No Examples for picker {0}",picker);
+        Assert.IsNotEmpty(picker.Help, "No Help for picker {0}", picker);
+        Assert.IsNotEmpty(picker.Format, "No Format for picker {0}", picker);
+        Assert.IsNotNull(picker.Examples, "No Examples for picker {0}", picker);
+        Assert.IsNotEmpty(picker.Examples, "No Examples for picker {0}", picker);
 
         foreach (var example in picker.Examples)
         {
             //examples should be matched by the picker!
-            Assert.IsTrue(picker.IsMatch(example,0),"Example of picker '{0}' did not match the regex,listed example is '{1}'",picker,example);
+            Assert.IsTrue(picker.IsMatch(example, 0),
+                "Example of picker '{0}' did not match the regex,listed example is '{1}'", picker, example);
 
             var result = picker.Parse(example, 0);
 
             Assert.IsNotNull(result);
         }
     }
-        
+
     [Test]
     public void PickTypeName()
     {
-        var picker = new CommandLineObjectPicker(new []{"Name"}, GetActivator());
-            
+        var picker = new CommandLineObjectPicker(new[] { "Name" }, GetActivator());
+
         Assert.IsNull(picker[0].Type);
-        Assert.AreEqual("Name",picker[0].RawValue);
+        Assert.AreEqual("Name", picker[0].RawValue);
     }
 
     [TestCase("null")]
     [TestCase("NULL")]
     public void PickNull(string nullString)
     {
-        var picker = new CommandLineObjectPicker(new []{nullString}, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { nullString }, GetActivator());
         Assert.IsTrue(picker[0].ExplicitNull);
     }
+
     [Test]
     public void Test_PickCatalogueByName_WithShortCode()
     {
@@ -266,6 +265,7 @@ public void Test_PickWithPropertyQuery_CatalogueItemsByCatalogue()
         Assert.Contains(ci2, picker[0].DatabaseEntities);
         Assert.IsFalse(picker[0].DatabaseEntities.Contains(ci3));
     }
+
     [Test]
     public void Test_PickWithPropertyQuery_CatalogueByFolder()
     {
@@ -285,6 +285,7 @@ public void Test_PickWithPropertyQuery_CatalogueByFolder()
         Assert.Contains(c3, picker[0].DatabaseEntities);
         Assert.IsFalse(picker[0].DatabaseEntities.Contains(c2));
     }
+
     [Test]
     public void Test_PickWithPropertyQuery_PeriodicityNull()
     {
@@ -295,15 +296,18 @@ public void Test_PickWithPropertyQuery_PeriodicityNull()
         c1.PivotCategory_ExtractionInformation_ID = 10;
         c2.PivotCategory_ExtractionInformation_ID = null;
 
-        var picker = new CommandLineObjectPicker(new[] { $"Catalogue?PivotCategory_ExtractionInformation_ID:null" }, GetActivator());
+        var picker = new CommandLineObjectPicker(new[] { $"Catalogue?PivotCategory_ExtractionInformation_ID:null" },
+            GetActivator());
 
         Assert.AreEqual(1, picker[0].DatabaseEntities.Count);
         Assert.Contains(c2, picker[0].DatabaseEntities);
     }
+
     [Test]
     public void Test_PickWithPropertyQuery_UnknownProperty()
     {
-        var ex = Assert.Throws<Exception>(()=>new CommandLineObjectPicker(new[] { $"Catalogue?Blarg:null" }, GetActivator()));
+        var ex = Assert.Throws<Exception>(() =>
+            new CommandLineObjectPicker(new[] { $"Catalogue?Blarg:null" }, GetActivator()));
         Assert.AreEqual("Unknown property 'Blarg'.  Did not exist on Type 'Catalogue'", ex.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/ExampleDatasetsCreationTests.cs b/Rdmp.Core.Tests/CommandLine/ExampleDatasetsCreationTests.cs
index c2927014d1..5429060c0a 100644
--- a/Rdmp.Core.Tests/CommandLine/ExampleDatasetsCreationTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/ExampleDatasetsCreationTests.cs
@@ -15,7 +15,7 @@
 
 namespace Rdmp.Core.Tests.CommandLine;
 
-internal class ExampleDatasetsCreationTests:DatabaseTests
+internal class ExampleDatasetsCreationTests : DatabaseTests
 {
     /// <summary>
     /// Tests the creation of example datasets during first installation of RDMP or when running "rdmp.exe install [...] -e" from the CLI
@@ -24,24 +24,25 @@ internal class ExampleDatasetsCreationTests:DatabaseTests
     public void Test_ExampleDatasetsCreation()
     {
         //Should be empty RDMP metadata database
-        Assert.AreEqual(0,CatalogueRepository.GetAllObjects<Catalogue>().Length);
-        Assert.AreEqual(0,CatalogueRepository.GetAllObjects<AggregateConfiguration>().Length);
+        Assert.AreEqual(0, CatalogueRepository.GetAllObjects<Catalogue>().Length);
+        Assert.AreEqual(0, CatalogueRepository.GetAllObjects<AggregateConfiguration>().Length);
 
         //create the pipelines
         var pipes = new CataloguePipelinesAndReferencesCreation(RepositoryLocator,null,null);
-        pipes.CreatePipelines();
+        pipes.CreatePipelines(new PlatformDatabaseCreationOptions {});
 
         //create all the stuff
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
-        var creator = new ExampleDatasetsCreation(new ThrowImmediatelyActivator(RepositoryLocator),RepositoryLocator);
-        creator.Create(db,new ThrowImmediatelyCheckNotifier(),new PlatformDatabaseCreationOptions {Seed = 500,DropDatabases = true });
+        var creator = new ExampleDatasetsCreation(new ThrowImmediatelyActivator(RepositoryLocator), RepositoryLocator);
+        creator.Create(db, new ThrowImmediatelyCheckNotifier(),
+            new PlatformDatabaseCreationOptions { Seed = 500, DropDatabases = true });
 
         //should be at least 2 views (marked as view)
         var views = CatalogueRepository.GetAllObjects<TableInfo>().Count(ti => ti.IsView);
-        Assert.GreaterOrEqual(views,2);
+        Assert.GreaterOrEqual(views, 2);
 
         //should have at least created some catalogues, graphs etc
-        Assert.GreaterOrEqual(CatalogueRepository.GetAllObjects<Catalogue>().Length,4);
-        Assert.GreaterOrEqual(CatalogueRepository.GetAllObjects<AggregateConfiguration>().Length,4);
+        Assert.GreaterOrEqual(CatalogueRepository.GetAllObjects<Catalogue>().Length, 4);
+        Assert.GreaterOrEqual(CatalogueRepository.GetAllObjects<AggregateConfiguration>().Length, 4);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/Interactive/ConsoleInputManagerTests.cs b/Rdmp.Core.Tests/CommandLine/Interactive/ConsoleInputManagerTests.cs
index c44ef6883f..7c1e6e8a37 100644
--- a/Rdmp.Core.Tests/CommandLine/Interactive/ConsoleInputManagerTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/Interactive/ConsoleInputManagerTests.cs
@@ -18,10 +18,10 @@ internal class ConsoleInputManagerTests : UnitTests
     public void TestDisallowInput()
     {
         var manager = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier())
- {
-     DisallowInput = true
- };
+        {
+            DisallowInput = true
+        };
 
-        Assert.Throws<InputDisallowedException>(()=>manager.GetString(new DialogArgs { WindowTitle = "bob" }, null));
+        Assert.Throws<InputDisallowedException>(() => manager.GetString(new DialogArgs { WindowTitle = "bob" }, null));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommandLine/NewObjectPoolTests.cs b/Rdmp.Core.Tests/CommandLine/NewObjectPoolTests.cs
index f0b3d9c7f7..42e159a280 100644
--- a/Rdmp.Core.Tests/CommandLine/NewObjectPoolTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/NewObjectPoolTests.cs
@@ -20,7 +20,7 @@ public void TwoCataloguesWithSameName_NoSession()
     {
         SetupMEF();
 
-        var cata1 = new Catalogue(Repository,"Hey");
+        var cata1 = new Catalogue(Repository, "Hey");
 
         // When there is only one object we can pick it by name
         var picker = new CommandLineObjectPicker(new string[] { "Catalogue:Hey" }, GetActivator());
@@ -38,7 +38,7 @@ public void TwoCataloguesWithSameName_WithSession()
     {
         SetupMEF();
 
-        using(NewObjectPool.StartSession())
+        using (NewObjectPool.StartSession())
         {
             var cata1 = new Catalogue(Repository, "Hey");
 
diff --git a/Rdmp.Core.Tests/CommandLine/PickTableTests.cs b/Rdmp.Core.Tests/CommandLine/PickTableTests.cs
index 8229d321fc..3b424bf03e 100644
--- a/Rdmp.Core.Tests/CommandLine/PickTableTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/PickTableTests.cs
@@ -14,22 +14,24 @@ namespace Rdmp.Core.Tests.CommandLine;
 
 internal class PickTableTests : UnitTests
 {
-
     [Test]
     public void TestPickTable()
     {
         var pick = new PickTable();
-        var result = pick.Parse(@"Table:v_cool:Schema:dbo:IsView:True:DatabaseType:MicrosoftSQLServer:Name:MyDb:Server=localhost\sqlexpress;Trusted_Connection=True;",0);
+        var result =
+            pick.Parse(
+                @"Table:v_cool:Schema:dbo:IsView:True:DatabaseType:MicrosoftSQLServer:Name:MyDb:Server=localhost\sqlexpress;Trusted_Connection=True;",
+                0);
 
         Assert.IsNotNull(result.Table);
-            
-        Assert.AreEqual(TableType.View,result.Table.TableType);
-        Assert.AreEqual("dbo",result.Table.Schema);
 
-        Assert.AreEqual("v_cool",result.Table.GetRuntimeName());
-        Assert.AreEqual("MyDb",result.Table.Database.GetRuntimeName());
-        Assert.AreEqual("localhost\\sqlexpress",result.Table.Database.Server.Name);
-        Assert.AreEqual(DatabaseType.MicrosoftSQLServer,result.Table.Database.Server.DatabaseType);
+        Assert.AreEqual(TableType.View, result.Table.TableType);
+        Assert.AreEqual("dbo", result.Table.Schema);
+
+        Assert.AreEqual("v_cool", result.Table.GetRuntimeName());
+        Assert.AreEqual("MyDb", result.Table.Database.GetRuntimeName());
+        Assert.AreEqual("localhost\\sqlexpress", result.Table.Database.Server.Name);
+        Assert.AreEqual(DatabaseType.MicrosoftSQLServer, result.Table.Database.Server.DatabaseType);
         Assert.IsNull(result.Table.Database.Server.ExplicitPasswordIfAny);
         Assert.IsNull(result.Table.Database.Server.ExplicitUsernameIfAny);
     }
diff --git a/Rdmp.Core.Tests/CommandLine/RdmpScriptTests.cs b/Rdmp.Core.Tests/CommandLine/RdmpScriptTests.cs
index 814129adde..721f2a5dd0 100644
--- a/Rdmp.Core.Tests/CommandLine/RdmpScriptTests.cs
+++ b/Rdmp.Core.Tests/CommandLine/RdmpScriptTests.cs
@@ -18,42 +18,43 @@ namespace Rdmp.Core.Tests.CommandLine;
 
 internal class RdmpScriptTests : UnitTests
 {
-    [TestCase("NewObject Catalogue 'trog dor'","trog dor")]
-    [TestCase("NewObject Catalogue \"trog dor\"","trog dor")]
-    [TestCase("NewObject Catalogue \"'trog dor'\"","'trog dor'")]
-    [TestCase("NewObject Catalogue '\"trog dor\"'","\"trog dor\"")]
-
+    [TestCase("NewObject Catalogue 'trog dor'", "trog dor")]
+    [TestCase("NewObject Catalogue \"trog dor\"", "trog dor")]
+    [TestCase("NewObject Catalogue \"'trog dor'\"", "'trog dor'")]
+    [TestCase("NewObject Catalogue '\"trog dor\"'", "\"trog dor\"")]
     public void RdmpScript_NewObject_Catalogue(string command, string expectedName)
     {
-        foreach(var c in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
+        foreach (var c in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
             c.DeleteInDatabase();
 
         var runner = new ExecuteCommandRunner(new ExecuteCommandOptions
         {
             Script = new RdmpScript
             {
-                Commands = new[] {command}
+                Commands = new[] { command }
             }
         });
-            
+
         SetupMEF();
 
-        var exitCode = runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
+        var exitCode = runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),
+            new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
 
-        Assert.AreEqual(0,exitCode);
-        Assert.AreEqual(1,RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Length);
+        Assert.AreEqual(0, exitCode);
+        Assert.AreEqual(1, RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Length);
 
-        Assert.AreEqual(expectedName,RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Single().Name);
+        Assert.AreEqual(expectedName, RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Single().Name);
     }
 
-    [TestCase("NewObject Catalogue 'fffff'","NewObject CatalogueItem Catalogue:*fff* 'bbbb'","bbbb")]
-    [TestCase("NewObject Catalogue '\"fff\"'","NewObject CatalogueItem 'Catalogue:\"fff\"' 'bbbb'","bbbb")]
-    [TestCase("NewObject Catalogue '\"ff ff\"'","NewObject CatalogueItem 'Catalogue:\"ff ff\"' 'bb bb'","bb bb")]
-    [TestCase("NewObject Catalogue '\"ff ff\"'","NewObject CatalogueItem 'Catalogue:\"ff ff\"' bb'bb","bb'bb")]
-    [TestCase("NewObject Catalogue '\"ff ff\"'","NewObject CatalogueItem 'Catalogue:\"ff ff\"' b\"b'bb'","b\"b'bb'")]
-    public void RdmpScript_NewObject_CatalogueItem(string cataCommand,string cataItemCommand, string expectedCataItemName)
+    [TestCase("NewObject Catalogue 'fffff'", "NewObject CatalogueItem Catalogue:*fff* 'bbbb'", "bbbb")]
+    [TestCase("NewObject Catalogue '\"fff\"'", "NewObject CatalogueItem 'Catalogue:\"fff\"' 'bbbb'", "bbbb")]
+    [TestCase("NewObject Catalogue '\"ff ff\"'", "NewObject CatalogueItem 'Catalogue:\"ff ff\"' 'bb bb'", "bb bb")]
+    [TestCase("NewObject Catalogue '\"ff ff\"'", "NewObject CatalogueItem 'Catalogue:\"ff ff\"' bb'bb", "bb'bb")]
+    [TestCase("NewObject Catalogue '\"ff ff\"'", "NewObject CatalogueItem 'Catalogue:\"ff ff\"' b\"b'bb'", "b\"b'bb'")]
+    public void RdmpScript_NewObject_CatalogueItem(string cataCommand, string cataItemCommand,
+        string expectedCataItemName)
     {
-        foreach(var c in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
+        foreach (var c in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
             c.DeleteInDatabase();
 
         var runner = new ExecuteCommandRunner(new ExecuteCommandOptions
@@ -67,34 +68,36 @@ public void RdmpScript_NewObject_CatalogueItem(string cataCommand,string cataIte
                 }
             }
         });
-            
+
         SetupMEF();
 
-        var exitCode = runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
+        var exitCode = runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),
+            new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken());
 
-        Assert.AreEqual(0,exitCode);
-        Assert.AreEqual(1,RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Length);
+        Assert.AreEqual(0, exitCode);
+        Assert.AreEqual(1, RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Length);
         var ci = RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>().Single().CatalogueItems.Single();
 
-        Assert.AreEqual(expectedCataItemName,ci.Name);
-            
+        Assert.AreEqual(expectedCataItemName, ci.Name);
     }
 
     [Test]
     public void Test_SplitCommandLine()
     {
-        var vals = ExecuteCommandRunner.SplitCommandLine("NewObject CatalogueItem 'Catalogue:\"fff\"' 'bbbb'").ToArray();
-        Assert.AreEqual("NewObject",vals[0]);
-        Assert.AreEqual("CatalogueItem",vals[1]);
-        Assert.AreEqual("Catalogue:\"fff\"",vals[2]);
-        Assert.AreEqual("bbbb",vals[3]);
+        var vals = ExecuteCommandRunner.SplitCommandLine("NewObject CatalogueItem 'Catalogue:\"fff\"' 'bbbb'")
+            .ToArray();
+        Assert.AreEqual("NewObject", vals[0]);
+        Assert.AreEqual("CatalogueItem", vals[1]);
+        Assert.AreEqual("Catalogue:\"fff\"", vals[2]);
+        Assert.AreEqual("bbbb", vals[3]);
     }
+
     [Test]
     public void Test_SplitCommandLine_QuotesInStrings()
     {
         var vals = ExecuteCommandRunner.SplitCommandLine("NewObject CatalogueItem bb\"'bb'").ToArray();
-        Assert.AreEqual("NewObject",vals[0]);
-        Assert.AreEqual("CatalogueItem",vals[1]);
-        Assert.AreEqual("bb\"'bb'",vals[2]);
+        Assert.AreEqual("NewObject", vals[0]);
+        Assert.AreEqual("CatalogueItem", vals[1]);
+        Assert.AreEqual("bb\"'bb'", vals[2]);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/CommentStoreTests.cs b/Rdmp.Core.Tests/CommentStoreTests.cs
index 148a6ac09f..8c56debef5 100644
--- a/Rdmp.Core.Tests/CommentStoreTests.cs
+++ b/Rdmp.Core.Tests/CommentStoreTests.cs
@@ -29,8 +29,7 @@ Does some stuff
 
         Assert.AreEqual(
             @"Does some stuff"
-            ,store["WindowFactory"]);
-
+            , store["WindowFactory"]);
     }
 
     [Test]
@@ -52,8 +51,7 @@ Does some stuff
 
         Assert.AreEqual(
             @"Does some stuff"
-            ,store["WindowFactory"]);
-
+            , store["WindowFactory"]);
     }
 
     [Test]
@@ -79,8 +77,7 @@ this is next para
             @"Does some stuff This is still one para
 
 this is next para"
-            ,store["WindowFactory"]);
-
+            , store["WindowFactory"]);
     }
 
 
@@ -99,7 +96,7 @@ public void Test_CommentStoreXmlDoc_EmptyElements()
         store.AddXmlDoc(null);
         //also shouldn't bomb but should be 0
         store.AddXmlDoc(doc.FirstChild.FirstChild);
-            
+
         Assert.IsEmpty(store);
 
         store.AddXmlDoc(doc.FirstChild);
@@ -113,7 +110,7 @@ public void Test_CommentStoreXmlDoc_EmptyElements()
         store.AddXmlDoc(doc.FirstChild);
         Assert.IsEmpty(store);
 
-            
+
         doc.LoadXml(
             @" <member name=""T:ResearchDataManagementPlatform.WindowManagement.WindowFactory"">
                 <summary> a </summary>
@@ -149,8 +146,7 @@ this is next para
             @"Does some stuff This is still one para
 
 this is next para"
-            ,store["WindowFactory"]);
-
+            , store["WindowFactory"]);
     }
 
 
@@ -180,7 +176,6 @@ got it?
             @"Does some stuff And some more stuff IObjectCollectionControl (for RDMPCollectionUI see WindowManager ).
 
 paragraph 2 got it?"
-            ,store["WindowFactory"]);
-
+            , store["WindowFactory"]);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Anonymisation/ANOMigrationTests.cs b/Rdmp.Core.Tests/Curation/Anonymisation/ANOMigrationTests.cs
index 3ce174d44a..a7eccdbd53 100644
--- a/Rdmp.Core.Tests/Curation/Anonymisation/ANOMigrationTests.cs
+++ b/Rdmp.Core.Tests/Curation/Anonymisation/ANOMigrationTests.cs
@@ -26,23 +26,26 @@ public class ANOMigrationTests : TestsRequiringANOStore
     private ANOTable _anoConditionTable;
 
     #region setup
+
     [SetUp]
     protected override void SetUp()
     {
         base.SetUp();
 
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
-            
+
         BlitzMainDataTables();
-            
+
         DeleteANOEndpoint();
 
-        var remnantANO = CatalogueRepository.GetAllObjects<ANOTable>().SingleOrDefault(a => a.TableName.Equals("ANOCondition"));
+        var remnantANO = CatalogueRepository.GetAllObjects<ANOTable>()
+            .SingleOrDefault(a => a.TableName.Equals("ANOCondition"));
 
         remnantANO?.DeleteInDatabase();
 
         //cleanup
-        foreach (var remnant in CatalogueRepository.GetAllObjects<TableInfo>().Where(t => t.GetRuntimeName().Equals(TableName)))
+        foreach (var remnant in CatalogueRepository.GetAllObjects<TableInfo>()
+                     .Where(t => t.GetRuntimeName().Equals(TableName)))
             remnant.DeleteInDatabase();
 
         const string sql = @"
@@ -79,19 +82,19 @@ INSERT [ANOMigration] ([AdmissionDate], [DischargeDate], [Condition1], [Conditio
         using (var con = server.GetConnection())
         {
             con.Open();
-            server.GetCommand(sql,con).ExecuteNonQuery();
+            server.GetCommand(sql, con).ExecuteNonQuery();
         }
 
         var table = db.ExpectTable(TableName);
         var importer = new TableInfoImporter(CatalogueRepository, table);
-        importer.DoImport(out _tableInfo,out _columnInfos);
+        importer.DoImport(out _tableInfo, out _columnInfos);
 
         //Configure the structure of the ANO transform we want - identifiers should have 3 characters and 2 ints and end with _C
-        _anoConditionTable = new ANOTable(CatalogueRepository, ANOStore_ExternalDatabaseServer, "ANOCondition","C")
-            {
-                NumberOfCharactersToUseInAnonymousRepresentation = 3,
-                NumberOfIntegersToUseInAnonymousRepresentation = 2
-            };
+        _anoConditionTable = new ANOTable(CatalogueRepository, ANOStore_ExternalDatabaseServer, "ANOCondition", "C")
+        {
+            NumberOfCharactersToUseInAnonymousRepresentation = 3,
+            NumberOfIntegersToUseInAnonymousRepresentation = 2
+        };
         _anoConditionTable.SaveToDatabase();
         _anoConditionTable.PushToANOServerAsNewTable("varchar(4)", new ThrowImmediatelyCheckNotifier());
     }
@@ -108,28 +111,35 @@ private void DeleteANOEndpoint()
 
     #endregion
 
-        
-    [Test,Order(1)]
+
+    [Test]
+    [Order(1)]
     public void PKsAreCorrect()
     {
-        Assert.IsTrue(_columnInfos.Single(c=>c.GetRuntimeName().Equals("AdmissionDate")).IsPrimaryKey);
+        Assert.IsTrue(_columnInfos.Single(c => c.GetRuntimeName().Equals("AdmissionDate")).IsPrimaryKey);
         Assert.IsTrue(_columnInfos.Single(c => c.GetRuntimeName().Equals("Condition1")).IsPrimaryKey);
         Assert.IsTrue(_columnInfos.Single(c => c.GetRuntimeName().Equals("CHI")).IsPrimaryKey);
     }
 
-    [Test,Order(2)]
+    [Test]
+    [Order(2)]
     public void ConvertPrimaryKeyColumn()
     {
         //The table we created above should have a column called Condition2 in it, we will migrate this data to ANO land
         var condition = _columnInfos.Single(c => c.GetRuntimeName().Equals("Condition1"));
         var converter = new ColumnInfoToANOTableConverter(condition, _anoConditionTable);
-        var ex = Assert.Throws<Exception>(()=>converter.ConvertFullColumnInfo(s => true, new ThrowImmediatelyCheckNotifier())); //say  yes to everything it proposes 
+        var ex = Assert.Throws<Exception>(() =>
+            converter.ConvertFullColumnInfo(s => true,
+                new ThrowImmediatelyCheckNotifier())); //say  yes to everything it proposes 
 
-        StringAssert.IsMatch(@"Could not perform transformation because column \[(.*)\]\.\[dbo\]\.\[.*\]\.\[Condition1\] is not droppable",ex.Message);
+        StringAssert.IsMatch(
+            @"Could not perform transformation because column \[(.*)\]\.\[dbo\]\.\[.*\]\.\[Condition1\] is not droppable",
+            ex.Message);
     }
 
 
-    [Test,Order(3)]
+    [Test]
+    [Order(3)]
     [TestCase("Condition2")]
     [TestCase("Condition3")]
     [TestCase("Condition4")]
@@ -158,11 +168,11 @@ public void ConvertNonPrimaryKeyColumn(string conditionColumn)
                     else
                         rowsObjectFoundIn.Add(r[conditionColumn], new List<int>(new[] {row}));
             }
-            
+
             //The table we created above should have a column called Condition2 in it, we will migrate this data to ANO land
             ColumnInfo condition = _columnInfos.Single(c => c.GetRuntimeName().Equals(conditionColumn));
             ColumnInfoToANOTableConverter converter = new ColumnInfoToANOTableConverter(condition, _anoConditionTable);
-            converter.ConvertFullColumnInfo((s) => true,new AcceptAllCheckNotifier()); //say  yes to everything it proposes 
+            converter.ConvertFullColumnInfo((s) => true,new AcceptAllCheckNotifier()); //say  yes to everything it proposes
 
             //refresh the column infos
             ColumnInfo[] columnInfos = _tableInfo.ColumnInfos;
@@ -185,7 +195,7 @@ public void ConvertNonPrimaryKeyColumn(string conditionColumn)
 
                 DbCommand cmd = server.GetCommand("Select * from " + TableName, con);
                 var r = cmd.ExecuteReader();
-                
+
                 List<object> objectsFound = new List<object>();
 
                 while (r.Read())
diff --git a/Rdmp.Core.Tests/Curation/Anonymisation/ANOStoreFunctionalityTests.cs b/Rdmp.Core.Tests/Curation/Anonymisation/ANOStoreFunctionalityTests.cs
index f170f1c89e..e13eeec805 100644
--- a/Rdmp.Core.Tests/Curation/Anonymisation/ANOStoreFunctionalityTests.cs
+++ b/Rdmp.Core.Tests/Curation/Anonymisation/ANOStoreFunctionalityTests.cs
@@ -13,7 +13,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Anonymisation;
 
-public class ANOStoreFunctionalityTests:TestsRequiringFullAnonymisationSuite
+public class ANOStoreFunctionalityTests : TestsRequiringFullAnonymisationSuite
 {
     [Test]
     public void CanAccessANODatabase_Directly()
@@ -35,7 +35,8 @@ public void CanAccessANODatabase_Directly()
     [Test]
     public void CanAccessANODatabase_ViaExternalServerPointer()
     {
-        using (var connection = DataAccessPortal.ExpectServer(ANOStore_ExternalDatabaseServer, DataAccessContext.DataLoad).GetConnection())
+        using (var connection = DataAccessPortal
+                   .ExpectServer(ANOStore_ExternalDatabaseServer, DataAccessContext.DataLoad).GetConnection())
         {
             connection.Open();
 
@@ -45,7 +46,7 @@ public void CanAccessANODatabase_ViaExternalServerPointer()
                 var version = new Version(cmd.ExecuteScalar().ToString());
                 Assert.GreaterOrEqual(version, new Version("0.0.0.0"));
             }
-                
+
             connection.Close();
         }
     }
@@ -69,7 +70,8 @@ public void CanAccessIdentifierDumpDatabase_Directly()
     [Test]
     public void CanAccessIdentifierDumpDatabase_ViaExternalServerPointer()
     {
-        using(var connection = DataAccessPortal.ExpectServer(IdentifierDump_ExternalDatabaseServer, DataAccessContext.DataLoad).GetConnection())
+        using (var connection = DataAccessPortal
+                   .ExpectServer(IdentifierDump_ExternalDatabaseServer, DataAccessContext.DataLoad).GetConnection())
         {
             connection.Open();
 
@@ -78,7 +80,7 @@ public void CanAccessIdentifierDumpDatabase_ViaExternalServerPointer()
                 var version = new Version(cmd.ExecuteScalar().ToString());
                 Assert.GreaterOrEqual(version, new Version("0.0.0.0"));
             }
-                
+
 
             connection.Close();
         }
diff --git a/Rdmp.Core.Tests/Curation/Anonymisation/ANOTableTests.cs b/Rdmp.Core.Tests/Curation/Anonymisation/ANOTableTests.cs
index 1bfc2b6bb1..1d7b0874e5 100644
--- a/Rdmp.Core.Tests/Curation/Anonymisation/ANOTableTests.cs
+++ b/Rdmp.Core.Tests/Curation/Anonymisation/ANOTableTests.cs
@@ -20,11 +20,12 @@
 
 namespace Rdmp.Core.Tests.Curation.Anonymisation;
 
-public class ANOTableTests:TestsRequiringANOStore
+public class ANOTableTests : TestsRequiringANOStore
 {
     private Regex _anochiPattern = new(@"\d{10}_A");
 
     #region Create New ANOTables
+
     [Test]
     [TestCase("varchar(1)")]
     [TestCase("int")]
@@ -32,15 +33,15 @@ public class ANOTableTests:TestsRequiringANOStore
     [TestCase("bit")]
     public void CreateAnANOTable_PushAs(string datatypeForPush)
     {
-
         var anoTable = GetANOTable();
         Assert.AreEqual("ANOMyTable", anoTable.TableName);
-        anoTable.NumberOfCharactersToUseInAnonymousRepresentation =20;
+        anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 20;
         anoTable.NumberOfIntegersToUseInAnonymousRepresentation = 20;
         anoTable.PushToANOServerAsNewTable(datatypeForPush, new ThrowImmediatelyCheckNotifier());
 
-        var discoveredTable = ANOStore_Database.DiscoverTables(false).SingleOrDefault(t => t.GetRuntimeName().Equals("ANOMyTable"));
-            
+        var discoveredTable = ANOStore_Database.DiscoverTables(false)
+            .SingleOrDefault(t => t.GetRuntimeName().Equals("ANOMyTable"));
+
         //server should have 
         Assert.NotNull(discoveredTable);
         Assert.IsTrue(discoveredTable.Exists());
@@ -61,7 +62,7 @@ public void CreateAnANOTable_Revertable()
 
         anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 63;
         anoTable.RevertToDatabaseState();
-        Assert.AreEqual(1,anoTable.NumberOfCharactersToUseInAnonymousRepresentation);
+        Assert.AreEqual(1, anoTable.NumberOfCharactersToUseInAnonymousRepresentation);
         anoTable.DeleteInDatabase();
     }
 
@@ -80,7 +81,8 @@ public void DuplicateSuffix_Throws()
         var anoTable = GetANOTable();
         try
         {
-            var ex = Assert.Throws<Exception>(()=>new ANOTable(CatalogueRepository, anoTable.Server, "DuplicateSuffix", anoTable.Suffix));
+            var ex = Assert.Throws<Exception>(() =>
+                new ANOTable(CatalogueRepository, anoTable.Server, "DuplicateSuffix", anoTable.Suffix));
             Assert.AreEqual("There is already another ANOTable with the suffix 'A'", ex.Message);
         }
         finally
@@ -88,7 +90,7 @@ public void DuplicateSuffix_Throws()
             anoTable.DeleteInDatabase();
         }
     }
-        
+
     [Test]
     public void CreateAnANOTable_CharCountNegative()
     {
@@ -97,15 +99,14 @@ public void CreateAnANOTable_CharCountNegative()
         {
             anoTable.NumberOfCharactersToUseInAnonymousRepresentation = -500;
             var ex = Assert.Throws<Exception>(anoTable.SaveToDatabase);
-            Assert.AreEqual("NumberOfCharactersToUseInAnonymousRepresentation cannot be negative",ex.Message);
+            Assert.AreEqual("NumberOfCharactersToUseInAnonymousRepresentation cannot be negative", ex.Message);
         }
         finally
         {
             anoTable.DeleteInDatabase();
         }
-            
     }
-        
+
     [Test]
     public void CreateAnANOTable_IntCountNegative()
     {
@@ -121,7 +122,6 @@ public void CreateAnANOTable_IntCountNegative()
         {
             anoTable.DeleteInDatabase();
         }
-            
     }
 
     [Test]
@@ -133,13 +133,14 @@ public void CreateAnANOTable_TotalCountZero()
             anoTable.NumberOfIntegersToUseInAnonymousRepresentation = 0;
             anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 0;
             var ex = Assert.Throws<Exception>(anoTable.SaveToDatabase);
-            Assert.AreEqual("Anonymous representations must have at least 1 integer or character",ex.Message);
+            Assert.AreEqual("Anonymous representations must have at least 1 integer or character", ex.Message);
         }
         finally
         {
             anoTable.DeleteInDatabase();
         }
     }
+
     #endregion
 
     [Test]
@@ -148,30 +149,30 @@ public void SubstituteANOIdentifiers_2CHINumbers()
         var anoTable = GetANOTable();
         anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 0;
         anoTable.NumberOfIntegersToUseInAnonymousRepresentation = 10;
-        anoTable.PushToANOServerAsNewTable("varchar(10)",new ThrowImmediatelyCheckNotifier());
+        anoTable.PushToANOServerAsNewTable("varchar(10)", new ThrowImmediatelyCheckNotifier());
 
 
         var dt = new DataTable();
         dt.Columns.Add("CHI");
         dt.Columns.Add("ANOCHI");
 
-        dt.Rows.Add("0101010101",DBNull.Value);//duplicates
-        dt.Rows.Add("0101010102",DBNull.Value);
-        dt.Rows.Add("0101010101",DBNull.Value);//duplicates
+        dt.Rows.Add("0101010101", DBNull.Value); //duplicates
+        dt.Rows.Add("0101010102", DBNull.Value);
+        dt.Rows.Add("0101010101", DBNull.Value); //duplicates
 
         var transformer = new ANOTransformer(anoTable, new ThrowImmediatelyDataLoadEventListener());
-        transformer.Transform(dt,dt.Columns["CHI"],dt.Columns["ANOCHI"]);
+        transformer.Transform(dt, dt.Columns["CHI"], dt.Columns["ANOCHI"]);
 
-        Assert.IsTrue((string) dt.Rows[0][0] == "0101010101");
-        Assert.IsTrue(_anochiPattern.IsMatch((string) dt.Rows[0][1]));//should be 10 digits and then _A
-        Assert.AreEqual(dt.Rows[0][1], dt.Rows[2][1]);//because of duplication these should both be the same
+        Assert.IsTrue((string)dt.Rows[0][0] == "0101010101");
+        Assert.IsTrue(_anochiPattern.IsMatch((string)dt.Rows[0][1])); //should be 10 digits and then _A
+        Assert.AreEqual(dt.Rows[0][1], dt.Rows[2][1]); //because of duplication these should both be the same
 
         Console.WriteLine($"ANO identifiers created were:{dt.Rows[0][1]},{dt.Rows[1][1]}");
 
         TruncateANOTable(anoTable);
 
         //now test previews
-        transformer.Transform(dt,dt.Columns["CHI"],dt.Columns["ANOCHI"], true);
+        transformer.Transform(dt, dt.Columns["CHI"], dt.Columns["ANOCHI"], true);
         var val1 = dt.Rows[0][1];
 
         transformer.Transform(dt, dt.Columns["CHI"], dt.Columns["ANOCHI"], true);
@@ -181,7 +182,7 @@ public void SubstituteANOIdentifiers_2CHINumbers()
         var val3 = dt.Rows[0][1];
 
         //should always be different
-        Assert.AreNotEqual(val1,val2);
+        Assert.AreNotEqual(val1, val2);
         Assert.AreNotEqual(val1, val3);
 
         //now test repeatability
@@ -193,18 +194,17 @@ public void SubstituteANOIdentifiers_2CHINumbers()
 
         transformer.Transform(dt, dt.Columns["CHI"], dt.Columns["ANOCHI"], false);
         var val6 = dt.Rows[0][1];
-        Assert.AreEqual(val4,val5);
+        Assert.AreEqual(val4, val5);
         Assert.AreEqual(val4, val6);
 
         TruncateANOTable(anoTable);
-        
+
         anoTable.DeleteInDatabase();
     }
 
     [Test]
     public void SubstituteANOIdentifiers_PreviewWithoutPush()
     {
-
         var anoTable = GetANOTable();
         anoTable.NumberOfCharactersToUseInAnonymousRepresentation = 0;
         anoTable.NumberOfIntegersToUseInAnonymousRepresentation = 10;
@@ -221,8 +221,8 @@ public void SubstituteANOIdentifiers_PreviewWithoutPush()
         var transformer = new ANOTransformer(anoTable, new ThrowImmediatelyDataLoadEventListener());
         transformer.Transform(dt, dt.Columns["CHI"], dt.Columns["ANOCHI"], true);
 
-        Assert.IsTrue(_anochiPattern.IsMatch((string)dt.Rows[0][1]));//should be 10 digits and then _A
-            
+        Assert.IsTrue(_anochiPattern.IsMatch((string)dt.Rows[0][1])); //should be 10 digits and then _A
+
         //still not exist yet
         Assert.False(ANOtable.Exists());
 
@@ -258,15 +258,16 @@ public void SubstituteANOIdentifiers_BulkTest()
             var val = r.NextDouble() * 9999999999;
             val = Math.Round(val);
             var valAsString = val.ToString();
-                
+
             while (valAsString.Length < 10)
                 valAsString = $"0{valAsString}";
 
             if (!uniqueSourceSet.Contains(valAsString))
                 uniqueSourceSet.Add(valAsString);
 
-            dt.Rows.Add(valAsString, DBNull.Value);//duplicates    
+            dt.Rows.Add(valAsString, DBNull.Value); //duplicates    
         }
+
         Console.WriteLine($"Time to allocate in C# memory:{sw.Elapsed}");
         Console.WriteLine($"Allocated {dt.Rows.Count} identifiers ({uniqueSourceSet.Count} unique ones)");
 
@@ -302,16 +303,17 @@ public void SubstituteANOIdentifiers_BulkTest()
             var numberOfRows = Convert.ToInt32(cmd.ExecuteScalar());
 
             //should be the same number of unique identifiers in memory as in the database
-            Assert.AreEqual(uniqueSet.Count,numberOfRows);
+            Assert.AreEqual(uniqueSet.Count, numberOfRows);
             Console.WriteLine($"Found {numberOfRows} unique ones");
 
             var cmdNulls = server.GetCommand("select count(*) from ANOMyTable where ANOMyTable is null", con);
             var nulls = Convert.ToInt32(cmdNulls.ExecuteScalar());
-            Assert.AreEqual(0,nulls);
+            Assert.AreEqual(0, nulls);
             Console.WriteLine($"Found {nulls} null ANO identifiers");
 
             con.Close();
         }
+
         sw.Stop();
         Console.WriteLine($"Time to evaluate results:{sw.Elapsed}");
         TruncateANOTable(anoTable);
diff --git a/Rdmp.Core.Tests/Curation/Anonymisation/ForwardEngineerANOCatalogueTwoTableTests.cs b/Rdmp.Core.Tests/Curation/Anonymisation/ForwardEngineerANOCatalogueTwoTableTests.cs
index d5fedb1225..8984ab41b6 100644
--- a/Rdmp.Core.Tests/Curation/Anonymisation/ForwardEngineerANOCatalogueTwoTableTests.cs
+++ b/Rdmp.Core.Tests/Curation/Anonymisation/ForwardEngineerANOCatalogueTwoTableTests.cs
@@ -78,34 +78,34 @@ REFERENCES [dbo].[Tests] ([TestId])
         using (var con = server.GetConnection())
         {
             con.Open();
-            UsefulStuff.ExecuteBatchNonQuery(sql,con);
+            UsefulStuff.ExecuteBatchNonQuery(sql, con);
         }
 
         var importer1 = new TableInfoImporter(CatalogueRepository, From.ExpectTable("Tests"));
         var importer2 = new TableInfoImporter(CatalogueRepository, From.ExpectTable("Results"));
 
-        importer1.DoImport(out t1,out c1);
-            
+        importer1.DoImport(out t1, out c1);
+
         importer2.DoImport(out t2, out c2);
 
         var engineer1 = new ForwardEngineerCatalogue(t1, c1);
         var engineer2 = new ForwardEngineerCatalogue(t2, c2);
 
-        engineer1.ExecuteForwardEngineering(out cata1,out cataItems1,out eis1);
+        engineer1.ExecuteForwardEngineering(out cata1, out cataItems1, out eis1);
         engineer2.ExecuteForwardEngineering(out cata2, out cataItems2, out eis2);
 
         new JoinInfo(CatalogueRepository,
             c1.Single(e => e.GetRuntimeName().Equals("TestId")),
             c2.Single(e => e.GetRuntimeName().Equals("TestId")),
-            ExtractionJoinType.Left,null);
+            ExtractionJoinType.Left, null);
 
         _anoTable = new ANOTable(CatalogueRepository, ANOStore_ExternalDatabaseServer, "ANOTes", "T")
-            {
-                NumberOfCharactersToUseInAnonymousRepresentation = 10
-            };
+        {
+            NumberOfCharactersToUseInAnonymousRepresentation = 10
+        };
         _anoTable.SaveToDatabase();
-        _anoTable.PushToANOServerAsNewTable("int",new ThrowImmediatelyCheckNotifier());
-            
+        _anoTable.PushToANOServerAsNewTable("int", new ThrowImmediatelyCheckNotifier());
+
         _comboCata = new Catalogue(CatalogueRepository, "Combo Catalogue");
 
         //pk
@@ -120,7 +120,7 @@ REFERENCES [dbo].[Tests] ([TestId])
         var colMeasure = c2.Single(c => c.GetRuntimeName().Equals("Measure"));
         ciMeasure.ColumnInfo_ID = colMeasure.ID;
         ciMeasure.SaveToDatabase();
-        var eiMeasure = new ExtractionInformation(CatalogueRepository, ciMeasure,colMeasure, colMeasure.Name);
+        var eiMeasure = new ExtractionInformation(CatalogueRepository, ciMeasure, colMeasure, colMeasure.Name);
 
         //Date
         var ciDate = new CatalogueItem(CatalogueRepository, _comboCata, "Dat");
@@ -151,25 +151,27 @@ public void TestAnonymisingJoinKey()
         var engine1 = new ForwardEngineerANOCatalogueEngine(RepositoryLocator, plan1);
         engine1.Execute();
 
-        var plan1ExtractionInformationsAtDestination = engine1.NewCatalogue.GetAllExtractionInformation(ExtractionCategory.Any);
+        var plan1ExtractionInformationsAtDestination =
+            engine1.NewCatalogue.GetAllExtractionInformation(ExtractionCategory.Any);
 
         var ei1 = plan1ExtractionInformationsAtDestination.Single(e => e.GetRuntimeName().Equals("ANOTestId"));
         Assert.IsTrue(ei1.Exists());
 
         //Now create a plan for the combo Catalogue which contains references to both tables (Tests and Results).  Remember Tests has already been migrated as part of plan1
         var plan2 = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, _comboCata);
-            
+
         //tell it to skip table 1 (Tests) and only anonymise Results
         plan2.SkippedTables.Add(t1);
         plan2.TargetDatabase = _destinationDatabase;
         plan2.Check(new ThrowImmediatelyCheckNotifier());
 
         //Run the anonymisation
-        var engine2 = new ForwardEngineerANOCatalogueEngine(RepositoryLocator,plan2);
+        var engine2 = new ForwardEngineerANOCatalogueEngine(RepositoryLocator, plan2);
         engine2.Execute();
 
         //Did it succesfully pick SetUp the correct ANO column
-        var plan2ExtractionInformationsAtDestination = engine2.NewCatalogue.GetAllExtractionInformation(ExtractionCategory.Any);
+        var plan2ExtractionInformationsAtDestination =
+            engine2.NewCatalogue.GetAllExtractionInformation(ExtractionCategory.Any);
 
         var ei2 = plan2ExtractionInformationsAtDestination.Single(e => e.GetRuntimeName().Equals("ANOTestId"));
         Assert.IsTrue(ei2.Exists());
@@ -183,14 +185,14 @@ public void TestAnonymisingJoinKey()
             con.Open();
 
             var cmd = _destinationDatabase.Server.GetCommand(qb.SQL, con);
-                
-            Assert.DoesNotThrow(()=>cmd.ExecuteNonQuery());
+
+            Assert.DoesNotThrow(() => cmd.ExecuteNonQuery());
         }
 
         Console.WriteLine($"Final migrated combo dataset SQL was:{qb.SQL}");
 
         Assert.IsTrue(_comboCata.CatalogueItems.Any(ci => ci.Name.Equals("Measuree")));
-        Assert.IsTrue(engine2.NewCatalogue.CatalogueItems.Any(ci => ci.Name.Equals("Measuree")),"ANO Catalogue did not respect the original CatalogueItem Name"); 
+        Assert.IsTrue(engine2.NewCatalogue.CatalogueItems.Any(ci => ci.Name.Equals("Measuree")),
+            "ANO Catalogue did not respect the original CatalogueItem Name");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Anonymisation/IdentifierDumpFunctionalityTests.cs b/Rdmp.Core.Tests/Curation/Anonymisation/IdentifierDumpFunctionalityTests.cs
index 940d56ca36..8760bd17ca 100644
--- a/Rdmp.Core.Tests/Curation/Anonymisation/IdentifierDumpFunctionalityTests.cs
+++ b/Rdmp.Core.Tests/Curation/Anonymisation/IdentifierDumpFunctionalityTests.cs
@@ -20,7 +20,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Anonymisation;
 
-public class IdentifierDumpFunctionalityTests:TestsRequiringFullAnonymisationSuite
+public class IdentifierDumpFunctionalityTests : TestsRequiringFullAnonymisationSuite
 {
     private ITableInfo tableInfoCreated;
     private ColumnInfo[] columnInfosCreated;
@@ -32,15 +32,16 @@ protected override void OneTimeSetUp()
         base.OneTimeSetUp();
 
         Console.WriteLine("Setting SetUp bulk test data");
-        _bulkData = new BulkTestsData(RepositoryLocator.CatalogueRepository, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
+        _bulkData = new BulkTestsData(RepositoryLocator.CatalogueRepository,
+            GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
         _bulkData.SetupTestData();
-            
+
         Console.WriteLine("Importing to Catalogue");
         var tbl = _bulkData.Table;
         var importer = new TableInfoImporter(CatalogueRepository, tbl);
 
-        importer.DoImport(out tableInfoCreated,out columnInfosCreated);
-            
+        importer.DoImport(out tableInfoCreated, out columnInfosCreated);
+
         Console.WriteLine($"Imported TableInfo {tableInfoCreated}");
         Console.WriteLine(
             $"Imported ColumnInfos {string.Join(",", columnInfosCreated.Select(c => c.GetRuntimeName()))}");
@@ -60,6 +61,7 @@ protected override void OneTimeSetUp()
 
 
     #region tests that pass
+
     [Test]
     public void DumpAllIdentifiersInTable_Passes()
     {
@@ -83,7 +85,7 @@ public void DumpAllIdentifiersInTable_Passes()
 
             var dt = _bulkData.GetDataTable(1000);
 
-            Assert.AreEqual(1000,dt.Rows.Count);
+            Assert.AreEqual(1000, dt.Rows.Count);
             Assert.IsTrue(dt.Columns.Contains("surname"));
 
             //for checking the final ID table has the correct values in
@@ -91,8 +93,8 @@ public void DumpAllIdentifiersInTable_Passes()
             {
                 var chi = row["chi"].ToString();
 
-                if(!chiToSurnameDictionary.ContainsKey(chi))
-                    chiToSurnameDictionary.Add(chi,new HashSet<string>());
+                if (!chiToSurnameDictionary.ContainsKey(chi))
+                    chiToSurnameDictionary.Add(chi, new HashSet<string>());
 
                 chiToSurnameDictionary[chi].Add(row["surname"] as string);
             }
@@ -112,19 +114,20 @@ public void DumpAllIdentifiersInTable_Passes()
 
                 var cmd = server.GetCommand($"Select * from ID_{BulkTestsData.BulkDataTable}", con);
                 var r = cmd.ExecuteReader();
-                    
+
                 //make sure the values in the ID table match the ones we originally had in the pipeline
                 while (r.Read())
                     if (!chiToSurnameDictionary[r["chi"].ToString()].Any())
                         Assert.IsTrue(r["surname"] == DBNull.Value);
                     else
-                        Assert.IsTrue(chiToSurnameDictionary[r["chi"].ToString()].Contains(r["surname"] as string),"Dictionary did not contain expected surname:" + r["surname"]);
+                        Assert.IsTrue(chiToSurnameDictionary[r["chi"].ToString()].Contains(r["surname"] as string),
+                            "Dictionary did not contain expected surname:" + r["surname"]);
                 r.Close();
 
                 //leave the identifier dump in the way we found it (empty)
                 var tbl = IdentifierDump_Database.ExpectTable($"ID_{BulkTestsData.BulkDataTable}");
 
-                if(tbl.Exists())
+                if (tbl.Exists())
                     tbl.Drop();
 
                 tbl = IdentifierDump_Database.ExpectTable($"ID_{BulkTestsData.BulkDataTable}_Archive");
@@ -136,34 +139,33 @@ public void DumpAllIdentifiersInTable_Passes()
         finally
         {
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
         }
-
     }
 
-
     #endregion
 
 
     #region tests that throw
+
     [Test]
     public void DumpAllIdentifiersInTable_UnexpectedColumnFoundInIdentifierDumpTable()
     {
         var preDiscardedColumn1 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "surname")
-            {
-                Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
-                SqlDataType = "varchar(20)"
-            };
+        {
+            Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
+            SqlDataType = "varchar(20)"
+        };
         preDiscardedColumn1.SaveToDatabase();
 
         var preDiscardedColumn2 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "forename")
-            {
-                Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
-                SqlDataType = "varchar(50)"
-            };
+        {
+            Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
+            SqlDataType = "varchar(50)"
+        };
         preDiscardedColumn2.SaveToDatabase();
-            
+
         //give it the correct server
         tableInfoCreated.IdentifierDumpServer_ID = IdentifierDump_ExternalDatabaseServer.ID;
         tableInfoCreated.SaveToDatabase();
@@ -175,9 +177,9 @@ public void DumpAllIdentifiersInTable_UnexpectedColumnFoundInIdentifierDumpTable
         Assert.IsTrue(tableInDump.Exists(), "ID table did not exist");
 
 
-        var columnsInDump = tableInDump.DiscoverColumns().Select(c=>c.GetRuntimeName()).ToArray();
+        var columnsInDump = tableInDump.DiscoverColumns().Select(c => c.GetRuntimeName()).ToArray();
         //works and creates table on server
-        Assert.Contains("hic_validFrom",columnsInDump);
+        Assert.Contains("hic_validFrom", columnsInDump);
         Assert.Contains("forename", columnsInDump);
         Assert.Contains("chi", columnsInDump);
         Assert.Contains("surname", columnsInDump);
@@ -195,8 +197,10 @@ public void DumpAllIdentifiersInTable_UnexpectedColumnFoundInIdentifierDumpTable
 
         try
         {
-            var ex = Assert.Throws<Exception>(()=>dumper2.Check(thrower));
-            Assert.AreEqual("Column forename was found in the IdentifierDump table ID_BulkData but was not one of the primary keys or a PreLoadDiscardedColumn",ex.Message);
+            var ex = Assert.Throws<Exception>(() => dumper2.Check(thrower));
+            Assert.AreEqual(
+                "Column forename was found in the IdentifierDump table ID_BulkData but was not one of the primary keys or a PreLoadDiscardedColumn",
+                ex.Message);
         }
         finally
         {
@@ -215,11 +219,9 @@ public void DumpAllIdentifiersInTable_UnexpectedColumnFoundInIdentifierDumpTable
             }
 
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
-
         }
-
     }
 
     [Test]
@@ -240,13 +242,15 @@ public void IdentifierDumperCheckFails_StagingNotCalled()
         try
         {
             dumper.Check(new AcceptAllCheckNotifier());
-            var ex = Assert.Throws<Exception>(()=>dumper.DumpAllIdentifiersInTable(_bulkData.GetDataTable(10)));
-            Assert.AreEqual("IdentifierDumper STAGING insert (ID_BulkData_STAGING) failed, make sure you have called CreateSTAGINGTable() before trying to Dump identifiers (also you should call DropStagging() when you are done)",ex.Message);
+            var ex = Assert.Throws<Exception>(() => dumper.DumpAllIdentifiersInTable(_bulkData.GetDataTable(10)));
+            Assert.AreEqual(
+                "IdentifierDumper STAGING insert (ID_BulkData_STAGING) failed, make sure you have called CreateSTAGINGTable() before trying to Dump identifiers (also you should call DropStagging() when you are done)",
+                ex.Message);
         }
         finally
         {
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
         }
     }
@@ -255,10 +259,10 @@ public void IdentifierDumperCheckFails_StagingNotCalled()
     public void IdentifierDumperCheckFails_NoTableExists()
     {
         var preDiscardedColumn1 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "forename")
-            {
-                Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
-                SqlDataType = "varchar(50)"
-            };
+        {
+            Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
+            SqlDataType = "varchar(50)"
+        };
         preDiscardedColumn1.SaveToDatabase();
 
         //give it the correct server
@@ -269,7 +273,7 @@ public void IdentifierDumperCheckFails_NoTableExists()
             .ExpectDatabase(IdentifierDump_ExternalDatabaseServer, DataAccessContext.InternalDataProcessing)
             .ExpectTable("ID_BulkData");
 
-        if(existingTable.Exists())
+        if (existingTable.Exists())
             existingTable.Drop();
 
         var dumper = new IdentifierDumper(tableInfoCreated);
@@ -279,15 +283,15 @@ public void IdentifierDumperCheckFails_NoTableExists()
             var notifier = new ToMemoryCheckNotifier(new AcceptAllCheckNotifier());
             dumper.Check(notifier);
 
-            Assert.IsTrue(notifier.Messages.Any(m=>
-                m.Result == CheckResult.Warning 
+            Assert.IsTrue(notifier.Messages.Any(m =>
+                m.Result == CheckResult.Warning
                 &&
                 m.Message.Contains("Table ID_BulkData was not found")));
         }
         finally
         {
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
         }
     }
@@ -295,13 +299,14 @@ public void IdentifierDumperCheckFails_NoTableExists()
     [Test]
     public void IdentifierDumperCheckFails_ServerIsNotADumpServer()
     {
-        var preDiscardedColumn1 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "NationalSecurityNumber")
+        var preDiscardedColumn1 =
+            new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "NationalSecurityNumber")
             {
                 Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
                 SqlDataType = "varchar(10)"
             };
         preDiscardedColumn1.SaveToDatabase();
-            
+
         //give it the WRONG server
         tableInfoCreated.IdentifierDumpServer_ID = ANOStore_ExternalDatabaseServer.ID;
         tableInfoCreated.SaveToDatabase();
@@ -314,31 +319,34 @@ public void IdentifierDumperCheckFails_ServerIsNotADumpServer()
         }
         catch (Exception ex)
         {
-            Assert.IsTrue(ex.Message.StartsWith("Exception occurred when trying to find stored procedure sp_createIdentifierDump"));
+            Assert.IsTrue(
+                ex.Message.StartsWith(
+                    "Exception occurred when trying to find stored procedure sp_createIdentifierDump"));
             Assert.IsTrue(ex.InnerException.Message.StartsWith("Connected successfully to server"));
-            Assert.IsTrue(ex.InnerException.Message.EndsWith(" but did not find the stored procedure sp_createIdentifierDump in the database (Possibly the ExternalDatabaseServer is not an IdentifierDump database?)"));
+            Assert.IsTrue(ex.InnerException.Message.EndsWith(
+                " but did not find the stored procedure sp_createIdentifierDump in the database (Possibly the ExternalDatabaseServer is not an IdentifierDump database?)"));
         }
         finally
         {
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
         }
-
     }
 
     [Test]
     public void IdentifierDumperCheckFails_NoTableOnServerRejectChange()
     {
-        var preDiscardedColumn1 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "NationalSecurityNumber");
+        var preDiscardedColumn1 =
+            new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "NationalSecurityNumber");
         try
         {
             preDiscardedColumn1.Destination = DiscardedColumnDestination.StoreInIdentifiersDump;
             preDiscardedColumn1.SqlDataType = "varchar(10)";
             preDiscardedColumn1.SaveToDatabase();
 
-            var ex = Assert.Throws<ArgumentException>(()=> new IdentifierDumper(tableInfoCreated));
-            StringAssert.Contains("does not have a listed IdentifierDump ExternalDatabaseServer",ex.Message);
+            var ex = Assert.Throws<ArgumentException>(() => new IdentifierDumper(tableInfoCreated));
+            StringAssert.Contains("does not have a listed IdentifierDump ExternalDatabaseServer", ex.Message);
         }
         finally
         {
@@ -350,10 +358,10 @@ public void IdentifierDumperCheckFails_NoTableOnServerRejectChange()
     public void IdentifierDumperCheckFails_LieAboutDatatype()
     {
         var preDiscardedColumn1 = new PreLoadDiscardedColumn(CatalogueRepository, tableInfoCreated, "forename")
-            {
-                Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
-                SqlDataType = "varchar(50)"
-            };
+        {
+            Destination = DiscardedColumnDestination.StoreInIdentifiersDump,
+            SqlDataType = "varchar(50)"
+        };
         preDiscardedColumn1.SaveToDatabase();
         try
         {
@@ -362,28 +370,28 @@ public void IdentifierDumperCheckFails_LieAboutDatatype()
             tableInfoCreated.SaveToDatabase();
 
             var dumper = new IdentifierDumper(tableInfoCreated);
-            
+
             //table doesnt exist yet it should work
             dumper.Check(new AcceptAllCheckNotifier());
-            
+
             //now it is varbinary
             preDiscardedColumn1.SqlDataType = "varbinary(200)";
             preDiscardedColumn1.SaveToDatabase();
-             
+
             //get a new dumper because we have changed the pre load discarded column
             dumper = new IdentifierDumper(tableInfoCreated);
             //table doesnt exist yet it should work
-            var ex = Assert.Throws<Exception>(()=>dumper.Check(new ThrowImmediatelyCheckNotifier()));
+            var ex = Assert.Throws<Exception>(() => dumper.Check(new ThrowImmediatelyCheckNotifier()));
 
-            Assert.IsTrue(ex.Message.Contains("has data type varbinary(200) in the Catalogue but appears as varchar(50) in the actual IdentifierDump"));
+            Assert.IsTrue(ex.Message.Contains(
+                "has data type varbinary(200) in the Catalogue but appears as varchar(50) in the actual IdentifierDump"));
         }
         finally
         {
             preDiscardedColumn1.DeleteInDatabase();
-            tableInfoCreated.IdentifierDumpServer_ID = null;//reset it back to how it was when we found it
+            tableInfoCreated.IdentifierDumpServer_ID = null; //reset it back to how it was when we found it
             tableInfoCreated.SaveToDatabase();
         }
-            
     }
 
     #endregion
diff --git a/Rdmp.Core.Tests/Curation/CrossPlatformParameterTests/BasicParameterUseTests.cs b/Rdmp.Core.Tests/Curation/CrossPlatformParameterTests/BasicParameterUseTests.cs
index 8abcb8a244..c5b7e43b34 100644
--- a/Rdmp.Core.Tests/Curation/CrossPlatformParameterTests/BasicParameterUseTests.cs
+++ b/Rdmp.Core.Tests/Curation/CrossPlatformParameterTests/BasicParameterUseTests.cs
@@ -21,7 +21,7 @@
 
 namespace Rdmp.Core.Tests.Curation.CrossPlatformParameterTests;
 
-public class BasicParameterUseTests:DatabaseTests
+public class BasicParameterUseTests : DatabaseTests
 {
     [Test]
     [TestCase(DatabaseType.MySql)]
@@ -48,9 +48,9 @@ public void Test_DatabaseTypeQueryWithParameter_IntParameter(DatabaseType dbType
         {
             ///////////////////////UPLOAD THE DataTable TO THE DESTINATION////////////////////////////////////////////
             var uploader = new DataTableUploadDestination();
-            uploader.PreInitialize(db,new ThrowImmediatelyDataLoadJob());
+            uploader.PreInitialize(db, new ThrowImmediatelyDataLoadJob());
             uploader.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
-            uploader.Dispose(new ThrowImmediatelyDataLoadJob(),null );
+            uploader.Dispose(new ThrowImmediatelyDataLoadJob(), null);
 
             var tbl = db.ExpectTable(tableName);
 
@@ -65,25 +65,26 @@ public void Test_DatabaseTypeQueryWithParameter_IntParameter(DatabaseType dbType
             //create an extraction filter
             var extractionInformation = ei.Single();
             var filter = new ExtractionFilter(CatalogueRepository, "Filter by numbers", extractionInformation)
-                {
-                    WhereSQL = $"{extractionInformation.SelectSQL} = @n"
-                };
+            {
+                WhereSQL = $"{extractionInformation.SelectSQL} = @n"
+            };
             filter.SaveToDatabase();
 
             //create the parameters for filter (no globals, masters or scope adjacent parameters)
-            new ParameterCreator(filter.GetFilterFactory(), null, null).CreateAll(filter,null);
+            new ParameterCreator(filter.GetFilterFactory(), null, null).CreateAll(filter, null);
 
             var p = filter.GetAllParameters().Single();
-            Assert.AreEqual("@n",p.ParameterName);
+            Assert.AreEqual("@n", p.ParameterName);
             p.ParameterSQL = p.ParameterSQL.Replace("varchar(50)", "int"); //make it int
             p.Value = "20";
             p.SaveToDatabase();
 
             var qb = new QueryBuilder(null, null);
             qb.AddColumn(extractionInformation);
-            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null, new[] { filter }, FilterContainerOperation.AND);
-            
-            using(var con = db.Server.GetConnection())
+            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,
+                new[] { filter }, FilterContainerOperation.AND);
+
+            using (var con = db.Server.GetConnection())
             {
                 con.Open();
 
diff --git a/Rdmp.Core.Tests/Curation/DublinCoreTests.cs b/Rdmp.Core.Tests/Curation/DublinCoreTests.cs
index 4e610f7648..8a750423d5 100644
--- a/Rdmp.Core.Tests/Curation/DublinCoreTests.cs
+++ b/Rdmp.Core.Tests/Curation/DublinCoreTests.cs
@@ -21,21 +21,23 @@ public void TestWritingDocument()
     {
         var def = new DublinCoreDefinition
         {
-            Title =  "ssssshh",
-            Alternative =  "O'Rly",
+            Title = "ssssshh",
+            Alternative = "O'Rly",
             Description = "Description of stuff",
             Format = "text/html",
             Identifier = new Uri("http://foo.com"),
             Publisher = "University of Dundee",
             IsPartOf = new Uri("http://foo2.com"),
-            Modified = new DateTime(2001,1,1),
+            Modified = new DateTime(2001, 1, 1),
             Subject = "Interesting, PayAttention, HighPriority, Omg"
         };
 
         var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "dublinTest.xml"));
 
-        using(var fw = f.OpenWrite())
+        using (var fw = f.OpenWrite())
+        {
             def.WriteXml(fw);
+        }
 
         var contents = File.ReadAllText(f.FullName);
         StringAssert.Contains(def.Title, contents);
@@ -62,8 +64,6 @@ public void TestWritingDocument()
         Assert.AreEqual(def.Modified, def2.Modified);
         Assert.AreEqual(def.IsPartOf.ToString(), def2.IsPartOf.ToString());
         Assert.AreEqual(def.Identifier.ToString(), def2.Identifier.ToString());
-
-
     }
 
     [Test]
@@ -125,7 +125,7 @@ UKOLN est un centre national d'expertise dans la gestion de l'information
 </metadata>";
 
         var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "dublinTestReading.xml"));
-        File.WriteAllText(fi.FullName,xml);
+        File.WriteAllText(fi.FullName, xml);
 
         var doc = XDocument.Load(fi.FullName);
 
@@ -133,8 +133,9 @@ UKOLN est un centre national d'expertise dans la gestion de l'information
 
         def.LoadFrom(doc.Root);
 
-        Assert.IsTrue(DatabaseTests.AreBasicallyEquals("UKOLN",def.Title));
-        Assert.IsTrue(DatabaseTests.AreBasicallyEquals("UK Office for Library and Information Networking", def.Alternative));
+        Assert.IsTrue(DatabaseTests.AreBasicallyEquals("UKOLN", def.Title));
+        Assert.IsTrue(DatabaseTests.AreBasicallyEquals("UK Office for Library and Information Networking",
+            def.Alternative));
         Assert.IsTrue(DatabaseTests.AreBasicallyEquals(@"national centre, network information support, library
     community, awareness, research, information services,public
     library networking, bibliographic management, distributed
@@ -149,7 +150,7 @@ UKOLN est un centre national d'expertise dans la gestion de l'information
         Assert.IsTrue(DatabaseTests.AreBasicallyEquals("UKOLN, University of Bath", def.Publisher));
         StringAssert.AreEqualIgnoringCase("http://www.bath.ac.uk/", def.IsPartOf.AbsoluteUri);
         StringAssert.AreEqualIgnoringCase("http://www.ukoln.ac.uk/", def.Identifier.AbsoluteUri);
-        Assert.IsTrue(DatabaseTests.AreBasicallyEquals(new DateTime(2001,07,18),def.Modified));
+        Assert.IsTrue(DatabaseTests.AreBasicallyEquals(new DateTime(2001, 07, 18), def.Modified));
     }
 
     /// <summary>
@@ -160,21 +161,23 @@ public void Test_DublinCore_WriteReadFile_NetCore()
     {
         var def1 = new DublinCoreDefinition
         {
-            Title =  "ssssshh",
-            Alternative =  "O'Rly",
+            Title = "ssssshh",
+            Alternative = "O'Rly",
             Description = "Description of stuff",
             Format = "text/html",
             Identifier = new Uri("http://foo.com"),
             Publisher = "University of Dundee",
             IsPartOf = new Uri("http://foo2.com"),
-            Modified = new DateTime(2001,1,1),
+            Modified = new DateTime(2001, 1, 1),
             Subject = "Interesting, PayAttention, HighPriority, Omg"
         };
 
         var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory, "dublin.xml"));
 
-        using(var outStream = fi.OpenWrite())
+        using (var outStream = fi.OpenWrite())
+        {
             def1.WriteXml(outStream);
+        }
 
         using (var inStream = fi.OpenRead())
         {
diff --git a/Rdmp.Core.Tests/Curation/ExtendedPropertyTests.cs b/Rdmp.Core.Tests/Curation/ExtendedPropertyTests.cs
index b066468cee..b710ccbdd6 100644
--- a/Rdmp.Core.Tests/Curation/ExtendedPropertyTests.cs
+++ b/Rdmp.Core.Tests/Curation/ExtendedPropertyTests.cs
@@ -15,26 +15,25 @@ internal class ExtendedPropertyTests : DatabaseTests
     [Test]
     public void ExtendedProperty_Catalogue()
     {
-        var cata = new Catalogue(CatalogueRepository,"My cata");
-        var prop = new ExtendedProperty(CatalogueRepository,cata,"Fish",5);
+        var cata = new Catalogue(CatalogueRepository, "My cata");
+        var prop = new ExtendedProperty(CatalogueRepository, cata, "Fish", 5);
 
-        Assert.AreEqual(5,prop.GetValueAsSystemType());
+        Assert.AreEqual(5, prop.GetValueAsSystemType());
         Assert.IsTrue(prop.IsReferenceTo(cata));
 
         prop.SetValue(10);
         prop.SaveToDatabase();
-            
-        Assert.AreEqual(10,prop.GetValueAsSystemType());
+
+        Assert.AreEqual(10, prop.GetValueAsSystemType());
         Assert.IsTrue(prop.IsReferenceTo(cata));
 
         prop.RevertToDatabaseState();
 
-        Assert.AreEqual(10,prop.GetValueAsSystemType());
+        Assert.AreEqual(10, prop.GetValueAsSystemType());
         Assert.IsTrue(prop.IsReferenceTo(cata));
 
         var prop2 = CatalogueRepository.GetObjectByID<ExtendedProperty>(prop.ID);
-        Assert.AreEqual(10,prop.GetValueAsSystemType());
+        Assert.AreEqual(10, prop.GetValueAsSystemType());
         Assert.IsTrue(prop.IsReferenceTo(cata));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/ImportTests/GatherAndShareTests.cs b/Rdmp.Core.Tests/Curation/ImportTests/GatherAndShareTests.cs
index 9cfe61ef89..916cf99535 100644
--- a/Rdmp.Core.Tests/Curation/ImportTests/GatherAndShareTests.cs
+++ b/Rdmp.Core.Tests/Curation/ImportTests/GatherAndShareTests.cs
@@ -22,49 +22,53 @@
 
 namespace Rdmp.Core.Tests.Curation.ImportTests;
 
-public class GatherAndShareTests:DatabaseTests
+public class GatherAndShareTests : DatabaseTests
 {
     [Test]
     public void Test_SerializeObject_ShareAttribute()
     {
-        var d = new Dictionary<RelationshipAttribute,Guid>();
+        var d = new Dictionary<RelationshipAttribute, Guid>();
 
-        var json = JsonConvertExtensions.SerializeObject(d,RepositoryLocator);
-        var obj = (Dictionary<RelationshipAttribute, Guid>)JsonConvertExtensions.DeserializeObject(json, typeof(Dictionary<RelationshipAttribute, Guid>),RepositoryLocator);
+        var json = JsonConvertExtensions.SerializeObject(d, RepositoryLocator);
+        var obj = (Dictionary<RelationshipAttribute, Guid>)JsonConvertExtensions.DeserializeObject(json,
+            typeof(Dictionary<RelationshipAttribute, Guid>), RepositoryLocator);
 
-        Assert.AreEqual(0,obj.Count);
+        Assert.AreEqual(0, obj.Count);
 
         //now add a key
-        d.Add(new RelationshipAttribute(typeof(string),RelationshipType.SharedObject,"fff"),Guid.Empty);
-                 
-        json = JsonConvertExtensions.SerializeObject(d,RepositoryLocator);
-        obj = (Dictionary<RelationshipAttribute, Guid>)JsonConvertExtensions.DeserializeObject(json, typeof(Dictionary<RelationshipAttribute, Guid>),RepositoryLocator);
+        d.Add(new RelationshipAttribute(typeof(string), RelationshipType.SharedObject, "fff"), Guid.Empty);
 
-        Assert.AreEqual(1,obj.Count);
+        json = JsonConvertExtensions.SerializeObject(d, RepositoryLocator);
+        obj = (Dictionary<RelationshipAttribute, Guid>)JsonConvertExtensions.DeserializeObject(json,
+            typeof(Dictionary<RelationshipAttribute, Guid>), RepositoryLocator);
+
+        Assert.AreEqual(1, obj.Count);
     }
 
     [TestCase(true)]
     [TestCase(false)]
     public void GatherAndShare_ANOTable_Test(bool goViaJson)
     {
-        var anoserver = new ExternalDatabaseServer(CatalogueRepository, "MyGatherAndShareTestANOServer", new ANOStorePatcher());
+        var anoserver =
+            new ExternalDatabaseServer(CatalogueRepository, "MyGatherAndShareTestANOServer", new ANOStorePatcher());
         var anoTable = new ANOTable(CatalogueRepository, anoserver, "ANOMagad", "N");
 
-        Assert.AreEqual(anoTable.Server_ID,anoserver.ID);
+        Assert.AreEqual(anoTable.Server_ID, anoserver.ID);
 
         var g = new Gatherer(RepositoryLocator);
         Assert.IsTrue(g.CanGatherDependencies(anoTable));
 
         var gObj = Gatherer.GatherDependencies(anoTable);
-            
+
         //root should be the server
-        Assert.AreEqual(gObj.Object,anoserver);
+        Assert.AreEqual(gObj.Object, anoserver);
         Assert.AreEqual(gObj.Children.Single().Object, anoTable);
 
         //get the sharing definitions
         var shareManager = new ShareManager(RepositoryLocator);
-        var defParent = gObj.ToShareDefinition(shareManager,new List<ShareDefinition>());
-        var defChild = gObj.Children.Single().ToShareDefinition(shareManager, new List<ShareDefinition>(new []{defParent}));
+        var defParent = gObj.ToShareDefinition(shareManager, new List<ShareDefinition>());
+        var defChild = gObj.Children.Single()
+            .ToShareDefinition(shareManager, new List<ShareDefinition>(new[] { defParent }));
 
         //make it look like we never had it in the first place
         shareManager.GetNewOrExistingExportFor(anoserver).DeleteInDatabase();
@@ -72,17 +76,19 @@ public void GatherAndShare_ANOTable_Test(bool goViaJson)
         anoTable.DeleteInDatabase();
         anoserver.DeleteInDatabase();
 
-        if(goViaJson)
+        if (goViaJson)
         {
-            var sParent = JsonConvertExtensions.SerializeObject(defParent,RepositoryLocator);
+            var sParent = JsonConvertExtensions.SerializeObject(defParent, RepositoryLocator);
             var sChild = JsonConvertExtensions.SerializeObject(defChild, RepositoryLocator);
 
-            defParent = (ShareDefinition)JsonConvertExtensions.DeserializeObject(sParent, typeof(ShareDefinition),RepositoryLocator);
-            defChild = (ShareDefinition)JsonConvertExtensions.DeserializeObject(sChild, typeof(ShareDefinition), RepositoryLocator);
+            defParent = (ShareDefinition)JsonConvertExtensions.DeserializeObject(sParent, typeof(ShareDefinition),
+                RepositoryLocator);
+            defChild = (ShareDefinition)JsonConvertExtensions.DeserializeObject(sChild, typeof(ShareDefinition),
+                RepositoryLocator);
         }
 
         var anoserverAfter = new ExternalDatabaseServer(shareManager, defParent);
-            
+
         Assert.IsTrue(anoserverAfter.Exists());
 
         //new instance
@@ -103,7 +109,8 @@ public void GatherAndShare_ANOTable_Test(bool goViaJson)
         Assert.AreNotEqual(anoTableAfter.Server_ID, anoTable.Server_ID);
 
         //same properties
-        Assert.AreEqual(anoTableAfter.NumberOfCharactersToUseInAnonymousRepresentation, anoTable.NumberOfCharactersToUseInAnonymousRepresentation);
+        Assert.AreEqual(anoTableAfter.NumberOfCharactersToUseInAnonymousRepresentation,
+            anoTable.NumberOfCharactersToUseInAnonymousRepresentation);
         Assert.AreEqual(anoTableAfter.Suffix, anoTable.Suffix);
 
         //change a property and save it
@@ -116,7 +123,7 @@ public void GatherAndShare_ANOTable_Test(bool goViaJson)
 
         Assert.AreEqual(anoTableAfter.ID, anoTableAfter2.ID);
         Assert.AreEqual("N", anoTableAfter2.Suffix);
-            
+
         anoTableAfter.DeleteInDatabase();
         anoserverAfter.DeleteInDatabase();
 
@@ -129,11 +136,11 @@ public void GatherAndShare_Plugin_Test()
     {
         var f1 = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,
             $"Imaginary1{PackPluginRunner.PluginPackageSuffix}"));
-        File.WriteAllBytes(f1.FullName,new byte[]{0x1,0x2});
+        File.WriteAllBytes(f1.FullName, new byte[] { 0x1, 0x2 });
 
-        var plugin = new Core.Curation.Data.Plugin(CatalogueRepository,new FileInfo(
-            $"Imaginary{PackPluginRunner.PluginPackageSuffix}"),new Version(1,1,1),new Version(1,1,1));
-        var lma1 = new LoadModuleAssembly(CatalogueRepository,f1,plugin);
+        var plugin = new Core.Curation.Data.Plugin(CatalogueRepository, new FileInfo(
+            $"Imaginary{PackPluginRunner.PluginPackageSuffix}"), new Version(1, 1, 1), new Version(1, 1, 1));
+        var lma1 = new LoadModuleAssembly(CatalogueRepository, f1, plugin);
 
         Assert.AreEqual(lma1.Plugin_ID, plugin.ID);
 
@@ -144,7 +151,7 @@ public void GatherAndShare_Plugin_Test()
 
         //root should be the server
         Assert.AreEqual(gObj.Object, plugin);
-        Assert.IsTrue(gObj.Children.Any(d=>d.Object.Equals(lma1)));
+        Assert.IsTrue(gObj.Children.Any(d => d.Object.Equals(lma1)));
     }
 
 
@@ -196,7 +203,7 @@ public void GatherAndShare_Catalogue_Test(bool goViaJson)
                 shareDefinition.Select(s => JsonConvertExtensions.SerializeObject(s, RepositoryLocator)).ToList();
             shareDefinition =
                 json.Select(
-                        j => JsonConvertExtensions.DeserializeObject(j, typeof (ShareDefinition), RepositoryLocator))
+                        j => JsonConvertExtensions.DeserializeObject(j, typeof(ShareDefinition), RepositoryLocator))
                     .Cast<ShareDefinition>()
                     .ToList();
         }
@@ -207,7 +214,7 @@ public void GatherAndShare_Catalogue_Test(bool goViaJson)
         cata.LoadMetadata_ID = null;
         cata.Periodicity = Catalogue.CataloguePeriodicity.Unknown;
         cata.SaveToDatabase();
-            
+
         lmd.DeleteInDatabase();
 
         //import the saved copy
@@ -229,11 +236,11 @@ public void GatherAndShare_Catalogue_Test(bool goViaJson)
         cata.SaveToDatabase();
 
         //test importing the Catalogue properties only
-        ShareManager.ImportPropertiesOnly(cata,shareDefinition[0]);
-            
+        ShareManager.ImportPropertiesOnly(cata, shareDefinition[0]);
+
         //import the defined properties but not name
-        Assert.AreEqual("fishfish",cata.Name);
-        Assert.AreEqual(Catalogue.CataloguePeriodicity.BiMonthly,cata.Periodicity); //reset this though
+        Assert.AreEqual("fishfish", cata.Name);
+        Assert.AreEqual(Catalogue.CataloguePeriodicity.BiMonthly, cata.Periodicity); //reset this though
         Assert.IsNull(cata.LoadMetadata_ID);
         cata.SaveToDatabase();
 
@@ -247,9 +254,9 @@ public void GatherAndShare_Catalogue_Test(bool goViaJson)
         //import the saved copy
         var newObjects = shareManager.ImportSharedObject(shareDefinition).ToArray();
 
-        Assert.AreEqual("Cata", ((Catalogue) newObjects[0]).Name);
-        Assert.AreEqual("Ci1", ((CatalogueItem) newObjects[1]).Name);
-        Assert.AreEqual("Ci2", ((CatalogueItem) newObjects[2]).Name);
+        Assert.AreEqual("Cata", ((Catalogue)newObjects[0]).Name);
+        Assert.AreEqual("Ci1", ((CatalogueItem)newObjects[1]).Name);
+        Assert.AreEqual("Ci2", ((CatalogueItem)newObjects[2]).Name);
     }
 
     [Test]
@@ -280,26 +287,27 @@ public void GatherAndShare_ExtractionFilter_Test()
         };
 
         //Give the filter a parameter @a just to make things interesting
-        var declaration = filter.GetQuerySyntaxHelper().GetParameterDeclaration("@a", new DatabaseTypeRequest(typeof (string), 1));
+        var declaration = filter.GetQuerySyntaxHelper()
+            .GetParameterDeclaration("@a", new DatabaseTypeRequest(typeof(string), 1));
         var param = filter.GetFilterFactory().CreateNewParameter(filter, declaration);
 
         //Also create a 'known good value' set i.e. recommended value for the parameter to achive some goal (you can have multiple of these - this will not be shared)
         var set = new ExtractionFilterParameterSet(CatalogueRepository, filter, "Fife");
-        var val = new ExtractionFilterParameterSetValue(CatalogueRepository, set, (ExtractionFilterParameter) param)
-            {
-                Value = "'FISH'"
-            };
+        var val = new ExtractionFilterParameterSetValue(CatalogueRepository, set, (ExtractionFilterParameter)param)
+        {
+            Value = "'FISH'"
+        };
 
         //Gather the dependencies (this is what we are testing)
         var gatherer = new Gatherer(RepositoryLocator);
-            
+
         Assert.IsTrue(gatherer.CanGatherDependencies(filter));
         var gathered = Gatherer.GatherDependencies(filter);
 
         //gatherer should have gathered the filter and the parameter (but not the ExtractionFilterParameterSet sets)
-        Assert.AreEqual(1,gathered.Children.Count);
-        Assert.AreEqual(param,gathered.Children[0].Object);
-             
+        Assert.AreEqual(1, gathered.Children.Count);
+        Assert.AreEqual(param, gathered.Children[0].Object);
+
         //Cleanup
         val.DeleteInDatabase();
         set.DeleteInDatabase();
diff --git a/Rdmp.Core.Tests/Curation/ImportTests/PluginClassTests.cs b/Rdmp.Core.Tests/Curation/ImportTests/PluginClassTests.cs
index d4c779b568..e6630e7524 100644
--- a/Rdmp.Core.Tests/Curation/ImportTests/PluginClassTests.cs
+++ b/Rdmp.Core.Tests/Curation/ImportTests/PluginClassTests.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.Curation.ImportTests;
 
-public class PluginClassTests:UnitTests
+public class PluginClassTests : UnitTests
 {
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
@@ -53,10 +53,10 @@ public void Catalogue_returns_latest_compatible_plugin()
         lma1.Plugin.RdmpVersion = new Version(version); //the version of Rdmp.Core targetted
         lma1.Plugin.PluginVersion = new Version(1, 1, 1, 1); //the version of the plugin
         lma1.Plugin.SaveToDatabase();
-                       
+
         lma2.Plugin.Name = "MyPlugin";
-        lma2.Plugin.RdmpVersion = new Version(version);//the version of Rdmp.Core targetted (same as above)
-        lma2.Plugin.PluginVersion =  new Version(1, 1, 1, 2);//the version of the plugin (higher)
+        lma2.Plugin.RdmpVersion = new Version(version); //the version of Rdmp.Core targetted (same as above)
+        lma2.Plugin.PluginVersion = new Version(1, 1, 1, 2); //the version of the plugin (higher)
         lma2.SaveToDatabase();
 
         var plugins = Repository.PluginManager.GetCompatiblePlugins();
@@ -80,7 +80,7 @@ public void TestPlugin_OrphanImport_Sharing()
             $"Blah3.{PackPluginRunner.PluginPackageSuffix}"));
         File.WriteAllBytes(fi3.FullName, new byte[] { 0x3, 0x4 });
 
-        var p = new Core.Curation.Data.Plugin(Repository, fi,new Version(1,1,1),new Version(1,1,1,1));
+        var p = new Core.Curation.Data.Plugin(Repository, fi, new Version(1, 1, 1), new Version(1, 1, 1, 1));
         var lma = new LoadModuleAssembly(Repository, fi2, p);
         var lma2 = new LoadModuleAssembly(Repository, fi3, p);
 
@@ -104,11 +104,11 @@ public void TestPlugin_OrphanImport_Sharing()
 
         Assert.AreEqual(3, Repository.GetAllObjects<ObjectImport>().Length);
 
-        lma2 = (LoadModuleAssembly) created[2];
+        lma2 = (LoadModuleAssembly)created[2];
 
         //now delete lma2 only
         lma2.DeleteInDatabase();
-            
+
         Assert.AreEqual(2, Repository.GetAllObjects<ObjectImport>().Length);
 
         //import them
@@ -118,14 +118,14 @@ public void TestPlugin_OrphanImport_Sharing()
         Assert.AreEqual(3, created2.Count());
     }
 
-    [TestCase("Rdmp.1.2.3.nupkg","Rdmp")]
-    [TestCase("Rdmp.Dicom.1.2.3.nupkg","Rdmp.Dicom")]
-    [TestCase("Rdmp.Dicom.nupkg","Rdmp.Dicom")]
-    [TestCase("Rdmp.Dicom","Rdmp.Dicom")]
+    [TestCase("Rdmp.1.2.3.nupkg", "Rdmp")]
+    [TestCase("Rdmp.Dicom.1.2.3.nupkg", "Rdmp.Dicom")]
+    [TestCase("Rdmp.Dicom.nupkg", "Rdmp.Dicom")]
+    [TestCase("Rdmp.Dicom", "Rdmp.Dicom")]
     public void Test_Plugin_ShortName(string fullname, string expected)
     {
         var p = WhenIHaveA<Rdmp.Core.Curation.Data.Plugin>();
         p.Name = fullname;
-        Assert.AreEqual(expected,p.GetShortName());
+        Assert.AreEqual(expected, p.GetShortName());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/ImportTests/ShareLoadMetadataTests.cs b/Rdmp.Core.Tests/Curation/ImportTests/ShareLoadMetadataTests.cs
index 98534577e5..7fbe412539 100644
--- a/Rdmp.Core.Tests/Curation/ImportTests/ShareLoadMetadataTests.cs
+++ b/Rdmp.Core.Tests/Curation/ImportTests/ShareLoadMetadataTests.cs
@@ -31,9 +31,9 @@ public void GatherAndShare_LoadMetadata_EmptyLoadMetadata()
         var lmd = new LoadMetadata(Repository, "MyLmd");
 
         var lmd2 = ShareToNewRepository(lmd);
-            
+
         //different repos so not identical
-        Assert.IsFalse(ReferenceEquals(lmd,lmd2));
+        Assert.IsFalse(ReferenceEquals(lmd, lmd2));
         Assert.AreEqual(lmd.Name, lmd2.Name);
     }
 
@@ -48,13 +48,13 @@ public void GatherAndShare_LoadMetadata_WithCatalogue()
         var cata2 = lmd2.GetAllCatalogues().Single();
 
         //different repos so not identical
-        Assert.IsFalse(ReferenceEquals(lmd1,lmd2));
-        Assert.IsFalse(ReferenceEquals(cata1,cata2));
+        Assert.IsFalse(ReferenceEquals(lmd1, lmd2));
+        Assert.IsFalse(ReferenceEquals(cata1, cata2));
 
         Assert.AreEqual(lmd1.Name, lmd2.Name);
         Assert.AreEqual(cata1.Name, cata2.Name);
     }
-        
+
     /// <summary>
     /// Tests sharing a basic process task load metadata
     /// </summary>
@@ -63,20 +63,20 @@ public void GatherAndShare_LoadMetadata_WithProcessTask()
     {
         //create an object
         LoadMetadata lmd1;
-        var lmd2 = ShareToNewRepository(lmd1=WhenIHaveA<ProcessTaskArgument>().ProcessTask.LoadMetadata);
+        var lmd2 = ShareToNewRepository(lmd1 = WhenIHaveA<ProcessTaskArgument>().ProcessTask.LoadMetadata);
 
         var pt1 = lmd1.ProcessTasks.Single();
         var pt2 = lmd2.ProcessTasks.Single();
-            
+
         //different repos so not identical
-        Assert.IsFalse(ReferenceEquals(lmd1,lmd2));
-        AssertAreEqual(lmd1,lmd2);
-            
-        Assert.IsFalse(ReferenceEquals(pt1,pt2));
-        AssertAreEqual(pt1,pt2);
-            
-        Assert.IsFalse(ReferenceEquals(pt1.ProcessTaskArguments.Single(),pt2.ProcessTaskArguments.Single()));
-        AssertAreEqual(pt1.ProcessTaskArguments.Single(),pt2.ProcessTaskArguments.Single());
+        Assert.IsFalse(ReferenceEquals(lmd1, lmd2));
+        AssertAreEqual(lmd1, lmd2);
+
+        Assert.IsFalse(ReferenceEquals(pt1, pt2));
+        AssertAreEqual(pt1, pt2);
+
+        Assert.IsFalse(ReferenceEquals(pt1.ProcessTaskArguments.Single(), pt2.ProcessTaskArguments.Single()));
+        AssertAreEqual(pt1.ProcessTaskArguments.Single(), pt2.ProcessTaskArguments.Single());
     }
 
     /// <summary>
@@ -105,26 +105,26 @@ public void GatherAndShare_LoadMetadata_WithRealProcessTask()
 
 
         var lmd2 = ShareToNewRepository(lmd1);
-            
+
         //different repos so not identical
-        Assert.IsFalse(ReferenceEquals(lmd1,lmd2));
-        AssertAreEqual(lmd1,lmd2);
+        Assert.IsFalse(ReferenceEquals(lmd1, lmd2));
+        AssertAreEqual(lmd1, lmd2);
 
         var pt2 = lmd2.ProcessTasks.Single();
 
-        Assert.IsFalse(ReferenceEquals(pt1,pt2));
-        AssertAreEqual(pt1,pt2);
+        Assert.IsFalse(ReferenceEquals(pt1, pt2));
+        AssertAreEqual(pt1, pt2);
 
-        AssertAreEqual(pt1.GetAllArguments(),pt2.GetAllArguments());
+        AssertAreEqual(pt1.GetAllArguments(), pt2.GetAllArguments());
 
         var f = new RuntimeTaskFactory(Repository);
 
-        var stg = Mock.Of<IStageArgs>(x => x.LoadStage==LoadStage.Mounting);
+        var stg = Mock.Of<IStageArgs>(x => x.LoadStage == LoadStage.Mounting);
 
         f.Create(pt1, stg);
     }
 
-        
+
     /// <summary>
     /// Tests sharing a <see cref="LoadMetadata"/> with a <see cref="ProcessTask"/> which has a reference argument (to
     /// another object in the database.
@@ -139,7 +139,7 @@ public void GatherAndShare_LoadMetadata_WithReferenceProcessTaskArgument()
         SetupMEF();
         var f = new RuntimeTaskFactory(Repository);
         var stg = Mock.Of<IStageArgs>(x =>
-            x.LoadStage==LoadStage.Mounting &&
+            x.LoadStage == LoadStage.Mounting &&
             x.DbInfo == new DiscoveredServer(new SqlConnectionStringBuilder()).ExpectDatabase("d"));
 
         //create a single process task for the load
@@ -158,7 +158,7 @@ public void GatherAndShare_LoadMetadata_WithReferenceProcessTaskArgument()
         pta.SaveToDatabase();
 
         //check that reflection can assemble the master ProcessTask
-        var t = (MutilateDataTablesRuntimeTask) f.Create(pt1, stg);
+        var t = (MutilateDataTablesRuntimeTask)f.Create(pt1, stg);
         Assert.IsNotNull(((SafePrimaryKeyCollisionResolverMutilation)t.MEFPluginClassInstance).ColumnToResolveOn);
 
         //share to the second repository (which won't have that ColumnInfo)
@@ -169,23 +169,22 @@ public void GatherAndShare_LoadMetadata_WithReferenceProcessTaskArgument()
         lmd2.CatalogueRepository.MEF = MEF;
 
         //when we create the shared instance it should not have a valid value for ColumnInfo (since it wasn't - and shouldn't be shared)
-        var t2 = (MutilateDataTablesRuntimeTask) f2.Create(lmd2.ProcessTasks.Single(), stg);
+        var t2 = (MutilateDataTablesRuntimeTask)f2.Create(lmd2.ProcessTasks.Single(), stg);
         Assert.IsNull(((SafePrimaryKeyCollisionResolverMutilation)t2.MEFPluginClassInstance).ColumnToResolveOn);
-
     }
 
     private LoadMetadata ShareToNewRepository(LoadMetadata lmd)
     {
         var gatherer = new Gatherer(RepositoryLocator);
-            
+
         Assert.IsTrue(gatherer.CanGatherDependencies(lmd));
         var rootObj = gatherer.GatherDependencies(lmd);
 
-        var sm = new ShareManager(RepositoryLocator,null);
+        var sm = new ShareManager(RepositoryLocator, null);
         var shareDefinition = rootObj.ToShareDefinitionWithChildren(sm);
 
         var repo2 = new MemoryDataExportRepository();
-        var sm2  = new ShareManager(new RepositoryProvider(repo2));
+        var sm2 = new ShareManager(new RepositoryProvider(repo2));
         return sm2.ImportSharedObject(shareDefinition).OfType<LoadMetadata>().Single();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/ImportTests/TestImportingAnObject.cs b/Rdmp.Core.Tests/Curation/ImportTests/TestImportingAnObject.cs
index f57b202181..71275b231d 100644
--- a/Rdmp.Core.Tests/Curation/ImportTests/TestImportingAnObject.cs
+++ b/Rdmp.Core.Tests/Curation/ImportTests/TestImportingAnObject.cs
@@ -39,9 +39,9 @@ public void TestSharingAPluginIgnoringCollisions()
 
         var p = new Plugin(CatalogueRepository, fi);
         var lma = new LoadModuleAssembly(CatalogueRepository, fi, p);
-        
+
         var n = new SharedPluginImporter(p);
-        
+
         //reject the reuse of an existing one
         var p2 = n.Import(RepositoryLocator, new ThrowImmediatelyCheckNotifier());
 
@@ -76,7 +76,7 @@ public void TestSharingAPluginReplaceBinary()
         newDll.Add("SoftwareVersion", "2.5.0.1");
 
         var n = new SharedPluginImporter(new ShareDefinition<Plugin>(p), new[] { new ShareDefinition<LoadModuleAssembly>(newDll) });
-        
+
         //accept that it is an update
         var p2 = n.Import(RepositoryLocator, new AcceptAllCheckNotifier());
 
@@ -111,9 +111,9 @@ public void TestSharingAPluginReplaceDllBinary(bool fiddleIds)
 
         //edit the binary data to represent a new version of the dll that should be imported
         lmaStateless.Properties["Dll"] =  new byte[] { 0, 1, 0, 1 };
-        
+
         var n = new SharedPluginImporter(pStateless,new []{lmaStateless});
-        
+
         //accept that it is an update
         var p2 = n.Import(RepositoryLocator, new AcceptAllCheckNotifier());
 
diff --git a/Rdmp.Core.Tests/Curation/Integration/AllKeywordsDescribedTest.cs b/Rdmp.Core.Tests/Curation/Integration/AllKeywordsDescribedTest.cs
index 0d4049b3a7..9dca71becd 100644
--- a/Rdmp.Core.Tests/Curation/Integration/AllKeywordsDescribedTest.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/AllKeywordsDescribedTest.cs
@@ -17,9 +17,8 @@
 namespace Rdmp.Core.Tests.Curation.Integration;
 
 [TestFixture]
-public class AllKeywordsDescribedTest :DatabaseTests
+public class AllKeywordsDescribedTest : DatabaseTests
 {
-
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
     {
@@ -36,21 +35,23 @@ public void AllTablesDescribed()
 
         var problems = new List<string>();
 
-        var databaseTypes = typeof(Catalogue).Assembly.GetTypes().Where(t => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract && !t.Name.StartsWith("Spontaneous") && !t.Name.Contains("Proxy")).ToArray();
-            
+        var databaseTypes = typeof(Catalogue).Assembly.GetTypes().Where(t =>
+            typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t) && !t.IsInterface && !t.IsAbstract &&
+            !t.Name.StartsWith("Spontaneous") && !t.Name.Contains("Proxy")).ToArray();
+
         foreach (var type in databaseTypes)
         {
-            var docs = CatalogueRepository.CommentStore[type.Name]??CatalogueRepository.CommentStore[$"I{type.Name}"];
-                
-            if(string.IsNullOrWhiteSpace(docs))
+            var docs = CatalogueRepository.CommentStore[type.Name] ?? CatalogueRepository.CommentStore[$"I{type.Name}"];
+
+            if (string.IsNullOrWhiteSpace(docs))
                 problems.Add(
                     $"Type {type.Name} does not have an entry in the help dictionary (maybe the class doesn't have documentation? - try adding /// <summary> style comments to the class)");
-                
         }
+
         foreach (var problem in problems)
             Console.WriteLine($"Fatal Problem:{problem}");
 
-        Assert.AreEqual(0,problems.Count);
+        Assert.AreEqual(0, problems.Count);
     }
 
     [Test]
@@ -67,11 +68,9 @@ public void AllForeignKeysDescribed()
 
         var problems = new List<string>();
         foreach (var fkName in allKeys)
-        {
             if (!CatalogueRepository.CommentStore.ContainsKey(fkName))
                 problems.Add($"{fkName} is a foreign Key (which does not CASCADE) but does not have any HelpText");
-        }
-            
+
         foreach (var problem in problems)
             Console.WriteLine($"Fatal Problem:{problem}");
 
@@ -92,16 +91,13 @@ public void AllUserIndexesDescribed()
 
         var problems = new List<string>();
         foreach (var idx in allIndexes)
-        {
             if (!CatalogueRepository.CommentStore.ContainsKey(idx))
                 problems.Add($"{idx} is an index but does not have any HelpText");
-        }
-            
+
         foreach (var problem in problems)
             Console.WriteLine($"Fatal Problem:{problem}");
 
-        Assert.AreEqual(0,problems.Count,@"Add a description for each of these to KeywordHelp.txt");
-            
+        Assert.AreEqual(0, problems.Count, @"Add a description for each of these to KeywordHelp.txt");
     }
 
     private static IEnumerable<string> GetForeignKeys(DiscoveredServer server)
@@ -109,7 +105,8 @@ private static IEnumerable<string> GetForeignKeys(DiscoveredServer server)
         using (var con = server.GetConnection())
         {
             con.Open();
-            var r = server.GetCommand(@"select name from sys.foreign_keys where delete_referential_action = 0", con).ExecuteReader();
+            var r = server.GetCommand(@"select name from sys.foreign_keys where delete_referential_action = 0", con)
+                .ExecuteReader();
 
             while (r.Read())
                 yield return (string)r["name"];
diff --git a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ArgumentTypeTests.cs b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ArgumentTypeTests.cs
index 86850949fe..1dd3935153 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ArgumentTypeTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ArgumentTypeTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.ArgumentTests;
 
-public class ArgumentTypeTests:UnitTests
+public class ArgumentTypeTests : UnitTests
 {
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
@@ -23,22 +23,23 @@ protected override void OneTimeSetUp()
         SetupMEF();
     }
 
-    private object[] _expectedAnswers = {
+    private object[] _expectedAnswers =
+    {
         5,
         new CultureInfo("en-us"),
         CultureInfo.CurrentCulture
     };
-               
-    [TestCase(typeof(int),"5",0)]
-    [TestCase(typeof(CultureInfo),"en-us",1)]
+
+    [TestCase(typeof(int), "5", 0)]
+    [TestCase(typeof(CultureInfo), "en-us", 1)]
     public void Test_Type_WithStringValue(Type t, string val, int expectedAnswerIdx)
     {
         var arg = WhenIHaveA<ProcessTaskArgument>();
-            
+
         arg.SetType(t);
         arg.Value = val;
 
-        Assert.AreEqual(_expectedAnswers[expectedAnswerIdx],arg.GetValueAsSystemType());
+        Assert.AreEqual(_expectedAnswers[expectedAnswerIdx], arg.GetValueAsSystemType());
     }
 
     [Test]
@@ -46,14 +47,13 @@ public void TestClassDemandingDouble_CreateArgumentsForClassIfNotExists()
     {
         var args = WhenIHaveA<ProcessTask>().CreateArgumentsForClassIfNotExists<TestClassDemandingDouble>();
 
-        Assert.AreEqual(1.0,args.Single().GetValueAsSystemType());
-        Assert.AreEqual("1",args.Single().Value);
-
+        Assert.AreEqual(1.0, args.Single().GetValueAsSystemType());
+        Assert.AreEqual("1", args.Single().Value);
     }
 
     private class TestClassDemandingDouble
     {
-        [DemandsInitialization("some field",defaultValue:1)]
+        [DemandsInitialization("some field", defaultValue: 1)]
         public double MyVar { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskArgumentTests.cs b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskArgumentTests.cs
index 2a9cdfef82..f07a002dc0 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskArgumentTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskArgumentTests.cs
@@ -19,7 +19,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.ArgumentTests;
 
-public class ProcessTaskArgumentTests:DatabaseTests
+public class ProcessTaskArgumentTests : DatabaseTests
 {
     [Test]
     [TestCase(true)]
@@ -28,7 +28,8 @@ public void TypeOfTableInfo(bool declareAsInterface)
     {
         var tableInfoName = $"TableInfoFor_{new StackTrace().GetFrame(0).GetMethod().Name}";
 
-        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>().SingleOrDefault(t => t.Name.Equals(tableInfoName));
+        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>()
+            .SingleOrDefault(t => t.Name.Equals(tableInfoName));
 
         toCleanup?.DeleteInDatabase();
 
@@ -49,12 +50,12 @@ public void TypeOfTableInfo(bool declareAsInterface)
 
                 var newInstanceOfPTA = CatalogueRepository.GetObjectByID<ProcessTaskArgument>(pta.ID);
 
-                Assert.AreEqual(newInstanceOfPTA.Value,pta.Value);
+                Assert.AreEqual(newInstanceOfPTA.Value, pta.Value);
 
-                var t1 = (TableInfo) pta.GetValueAsSystemType();
+                var t1 = (TableInfo)pta.GetValueAsSystemType();
                 var t2 = (TableInfo)newInstanceOfPTA.GetValueAsSystemType();
 
-                Assert.AreEqual(t1.ID,t2.ID);
+                Assert.AreEqual(t1.ID, t2.ID);
             }
             finally
             {
@@ -66,6 +67,7 @@ public void TypeOfTableInfo(bool declareAsInterface)
             loadMetadata.DeleteInDatabase();
         }
     }
+
     [Test]
     public void TypeOfPreLoadDiscardedColumn()
     {
@@ -73,10 +75,11 @@ public void TypeOfPreLoadDiscardedColumn()
         var tableInfoName = $"TableInfoFor_{methodName}";
         var preLoadDiscardedColumnName = $"PreLoadDiscardedColumnFor_{methodName}";
 
-        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>().SingleOrDefault(t => t.Name.Equals(tableInfoName));
+        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>()
+            .SingleOrDefault(t => t.Name.Equals(tableInfoName));
         var toCleanupCol = CatalogueRepository.GetAllObjects<PreLoadDiscardedColumn>()
             .SingleOrDefault(c => c.RuntimeColumnName.Equals(preLoadDiscardedColumnName));
-            
+
         //must delete pre load discarded first
         toCleanupCol?.DeleteInDatabase();
 
@@ -93,7 +96,8 @@ public void TypeOfPreLoadDiscardedColumn()
 
             var tableInfo = new TableInfo(CatalogueRepository, tableInfoName);
 
-            var preloadDiscardedColumn = new PreLoadDiscardedColumn(CatalogueRepository, tableInfo, preLoadDiscardedColumnName);
+            var preloadDiscardedColumn =
+                new PreLoadDiscardedColumn(CatalogueRepository, tableInfo, preLoadDiscardedColumnName);
             try
             {
                 pta.SetValue(preloadDiscardedColumn);
@@ -124,7 +128,8 @@ public void TableInfoType_FetchAfterDelete_ReturnsNull()
     {
         var tableInfoName = $"TableInfoFor_{new StackTrace().GetFrame(0).GetMethod().Name}";
 
-        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>().SingleOrDefault(t => t.Name.Equals(tableInfoName));
+        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>()
+            .SingleOrDefault(t => t.Name.Equals(tableInfoName));
 
         toCleanup?.DeleteInDatabase();
 
@@ -165,7 +170,8 @@ public void LieToProcessTaskArgumentAboutWhatTypeIs_Throws()
     {
         var tableInfoName = $"TableInfoFor_{new StackTrace().GetFrame(0).GetMethod().Name}";
 
-        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>().SingleOrDefault(t => t.Name.Equals(tableInfoName));
+        var toCleanup = CatalogueRepository.GetAllObjects<TableInfo>()
+            .SingleOrDefault(t => t.Name.Equals(tableInfoName));
 
         toCleanup?.DeleteInDatabase();
 
@@ -181,9 +187,10 @@ public void LieToProcessTaskArgumentAboutWhatTypeIs_Throws()
                 //tell it that we are going to give it a PreLoadDiscardedColumn
                 pta.SetType(typeof(PreLoadDiscardedColumn));
                 //then surprise! heres a TableInfo!
-                var ex = Assert.Throws<Exception>(()=>pta.SetValue(tableInfo));
-                StringAssert.Contains("has an incompatible Type specified (Rdmp.Core.Curation.Data.DataLoad.PreLoadDiscardedColumn)",ex.Message);
-
+                var ex = Assert.Throws<Exception>(() => pta.SetValue(tableInfo));
+                StringAssert.Contains(
+                    "has an incompatible Type specified (Rdmp.Core.Curation.Data.DataLoad.PreLoadDiscardedColumn)",
+                    ex.Message);
             }
             finally
             {
@@ -192,7 +199,6 @@ public void LieToProcessTaskArgumentAboutWhatTypeIs_Throws()
         }
         finally
         {
-
             lmd.DeleteInDatabase();
         }
     }
@@ -238,8 +244,7 @@ public void TestEncryptedPasswordHostArgumentType()
     [Test]
     public void TestArgumentCreation()
     {
-
-        var lmd = new LoadMetadata(CatalogueRepository,"TestArgumentCreation");
+        var lmd = new LoadMetadata(CatalogueRepository, "TestArgumentCreation");
         var pt = new ProcessTask(CatalogueRepository, lmd, LoadStage.AdjustRaw);
         pt.CreateArgumentsForClassIfNotExists<TestArgumentedClass>();
         try
@@ -249,9 +254,8 @@ public void TestArgumentCreation()
             Assert.AreEqual("MyBool", arg.Name);
             Assert.AreEqual("System.Boolean", arg.Type);
             Assert.AreEqual("Fishes", arg.Description);
-            Assert.AreEqual("True",arg.Value);
+            Assert.AreEqual("True", arg.Value);
             Assert.AreEqual(true, arg.GetValueAsSystemType());
-
         }
         finally
         {
@@ -264,7 +268,7 @@ public void TestArgumentCreation()
     public void TestNestedDemandsGetPutIntoDatabaseAndCanBeBroughtBack()
     {
         var pipe = new Pipeline(CatalogueRepository, "NestedPipe");
-        var pc = new PipelineComponent(CatalogueRepository, pipe, typeof (BasicDataReleaseDestination), -1,
+        var pc = new PipelineComponent(CatalogueRepository, pipe, typeof(BasicDataReleaseDestination), -1,
             "Coconuts");
         pipe.DestinationPipelineComponent_ID = pc.ID;
         pipe.SaveToDatabase();
@@ -272,7 +276,8 @@ public void TestNestedDemandsGetPutIntoDatabaseAndCanBeBroughtBack()
         //some of the DemandsInitialization on BasicDataReleaseDestination should be nested
         var f = new ArgumentFactory();
         Assert.True(
-            ArgumentFactory.GetRequiredProperties(typeof(BasicDataReleaseDestination)).Any(r => r.ParentPropertyInfo != null));
+            ArgumentFactory.GetRequiredProperties(typeof(BasicDataReleaseDestination))
+                .Any(r => r.ParentPropertyInfo != null));
 
         //new pc should have no arguments
         Assert.That(pc.GetAllArguments(), Is.Empty);
@@ -289,7 +294,7 @@ public void TestNestedDemandsGetPutIntoDatabaseAndCanBeBroughtBack()
 
         var useCase = ReleaseUseCase.DesignTime();
 
-        var factory = new DataFlowPipelineEngineFactory(useCase,RepositoryLocator.CatalogueRepository.MEF);
+        var factory = new DataFlowPipelineEngineFactory(useCase, RepositoryLocator.CatalogueRepository.MEF);
         var destInstance = DataFlowPipelineEngineFactory.CreateDestinationIfExists(pipe);
 
         Assert.AreEqual(true, ((BasicDataReleaseDestination)destInstance).ReleaseSettings.DeleteFilesOnSuccess);
@@ -304,7 +309,7 @@ public void TestArgumentWithTypeThatIsEnum()
             "c");
 
         var arg = new PipelineComponentArgument(CatalogueRepository, pc);
-            
+
         try
         {
             arg.SetType(typeof(ExitCodeType));
@@ -335,21 +340,21 @@ public void TestArgumentWithTypeThatIsInterface(bool useInterfaceDeclaration)
 
         var arg = new PipelineComponentArgument(CatalogueRepository, pc);
 
-        var server = new ExternalDatabaseServer(CatalogueRepository, "fish",null);
+        var server = new ExternalDatabaseServer(CatalogueRepository, "fish", null);
 
         try
         {
-            arg.SetType(useInterfaceDeclaration ? typeof (IExternalDatabaseServer) : typeof (ExternalDatabaseServer));
+            arg.SetType(useInterfaceDeclaration ? typeof(IExternalDatabaseServer) : typeof(ExternalDatabaseServer));
 
             arg.SetValue(server);
 
             //should have set Value string to the ID of the object
-            Assert.AreEqual(arg.Value,server.ID.ToString());
+            Assert.AreEqual(arg.Value, server.ID.ToString());
 
             arg.SaveToDatabase();
 
             //but as system Type should return the server
-            Assert.AreEqual(arg.GetValueAsSystemType(),server);
+            Assert.AreEqual(arg.GetValueAsSystemType(), server);
         }
         finally
         {
@@ -371,7 +376,7 @@ public void TestArgumentThatIsDictionary()
             {
                 Name = "MyNames"
             };
-            arg.SetType(typeof(Dictionary<TableInfo,string>));
+            arg.SetType(typeof(Dictionary<TableInfo, string>));
             arg.SaveToDatabase();
 
             Assert.AreEqual(typeof(Dictionary<TableInfo, string>), arg.GetConcreteSystemType());
@@ -389,8 +394,8 @@ public void TestArgumentThatIsDictionary()
 
             arg.SaveToDatabase();
 
-            var val2 = (Dictionary<TableInfo, string>) arg.GetValueAsSystemType();
-            Assert.AreEqual(2,val2.Count);
+            var val2 = (Dictionary<TableInfo, string>)arg.GetValueAsSystemType();
+            Assert.AreEqual(2, val2.Count);
             Assert.AreEqual("Fish", val2[ti1]);
             Assert.AreEqual("Fish", val2[ti2]);
         }
@@ -399,5 +404,4 @@ public void TestArgumentThatIsDictionary()
             pipe.DeleteInDatabase();
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskTests.cs b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskTests.cs
index 81fb1c3591..7008c4ff89 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/ProcessTaskTests.cs
@@ -13,7 +13,6 @@ namespace Rdmp.Core.Tests.Curation.Integration.ArgumentTests;
 
 public class ProcessTaskTests : DatabaseTests
 {
-
     [Test]
     public void CloneProcessTask_ToSameLoadMetadataWithoutArguments()
     {
@@ -28,7 +27,7 @@ public void CloneProcessTask_ToSameLoadMetadataWithoutArguments()
         {
             processTask1.SaveToDatabase();
 
-            var clone = processTask1.CloneToNewLoadMetadataStage(test,LoadStage.GetFiles);
+            var clone = processTask1.CloneToNewLoadMetadataStage(test, LoadStage.GetFiles);
             Assert.AreNotSame(clone.ID, processTask1.ID);
             Assert.IsFalse(clone.ID == processTask1.ID);
 
@@ -37,17 +36,17 @@ public void CloneProcessTask_ToSameLoadMetadataWithoutArguments()
             clone = CatalogueRepository.GetObjectByID<ProcessTask>(clone.ID);
 
             Assert.IsFalse(orig.ID == clone.ID);
-            Assert.AreEqual(LoadStage.AdjustRaw,orig.LoadStage);
+            Assert.AreEqual(LoadStage.AdjustRaw, orig.LoadStage);
             Assert.AreEqual(LoadStage.GetFiles, clone.LoadStage);
 
-            Assert.AreEqual(orig.Order,clone.Order);
+            Assert.AreEqual(orig.Order, clone.Order);
             Assert.AreEqual(orig.Path, clone.Path);
             Assert.AreEqual(orig.ProcessTaskType, clone.ProcessTaskType);
             Assert.AreEqual(orig.LoadMetadata_ID, clone.LoadMetadata_ID);
 
             clone.DeleteInDatabase();
         }
-        finally 
+        finally
         {
             processTask1.DeleteInDatabase();
             test.DeleteInDatabase();
@@ -60,9 +59,9 @@ public void CloneProcessTask_ToNewLoadMetadataWithArguments()
         //setup parents
         var parent1 = new LoadMetadata(CatalogueRepository);
         var parent2 = new LoadMetadata(CatalogueRepository);
-            
+
         //make sure we didn't magically create the same ID somehow 
-        Assert.AreNotEqual(parent1.ID,parent2.ID);
+        Assert.AreNotEqual(parent1.ID, parent2.ID);
 
         //setup things to clone in parent1
         var processTask1 = new ProcessTask(CatalogueRepository, parent1, LoadStage.AdjustRaw);
@@ -70,14 +69,14 @@ public void CloneProcessTask_ToNewLoadMetadataWithArguments()
         {
             Name = "TestArg"
         };
-        arg.SetType(typeof (string));
+        arg.SetType(typeof(string));
         arg.SetValue("TestValue");
         arg.SaveToDatabase();
 
         processTask1.Name = "Franky";
         processTask1.Order = 999;
         processTask1.SaveToDatabase();
-            
+
         try
         {
             //clone to parent 2
@@ -89,14 +88,14 @@ public void CloneProcessTask_ToNewLoadMetadataWithArguments()
             //get fresh copy out of database to ensure it is still there
             var orig = CatalogueRepository.GetObjectByID<ProcessTask>(processTask1.ID);
             clone = CatalogueRepository.GetObjectByID<ProcessTask>(clone.ID);
-                
+
             //ids must have changed
             Assert.IsFalse(orig.ID == clone.ID);
 
             //load stages must be correct per what we requested
             Assert.AreEqual(LoadStage.AdjustRaw, orig.LoadStage);
             Assert.AreEqual(LoadStage.GetFiles, clone.LoadStage);
-                
+
             //all regular values must have been cloned successfully
             Assert.AreEqual(orig.Order, clone.Order);
             Assert.AreEqual(orig.Path, clone.Path);
@@ -108,14 +107,14 @@ public void CloneProcessTask_ToNewLoadMetadataWithArguments()
 
             //////////////////////////////////////////////////////////////////CHECK CLONAGE OF ARGUMENTS ////////////////////////////////////////////////////////////
 
-            var clonearg = clone.ProcessTaskArguments.SingleOrDefault(); 
+            var clonearg = clone.ProcessTaskArguments.SingleOrDefault();
             Assert.NotNull(clonearg);
 
-            Assert.AreNotEqual(clonearg.ID,arg.ID);
-            Assert.AreEqual(clonearg.GetType(),arg.GetType());
-            Assert.AreEqual(clonearg.Name,arg.Name);
-            Assert.AreEqual(clonearg.Value,arg.Value);
-                
+            Assert.AreNotEqual(clonearg.ID, arg.ID);
+            Assert.AreEqual(clonearg.GetType(), arg.GetType());
+            Assert.AreEqual(clonearg.Name, arg.Name);
+            Assert.AreEqual(clonearg.Value, arg.Value);
+
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             clone.DeleteInDatabase();
         }
diff --git a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/TestArgumentedClass.cs b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/TestArgumentedClass.cs
index b840df8105..b38d416a2e 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/TestArgumentedClass.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ArgumentTests/TestArgumentedClass.cs
@@ -10,6 +10,6 @@ namespace Rdmp.Core.Tests.Curation.Integration.ArgumentTests;
 
 public class TestArgumentedClass
 {
-    [DemandsInitialization("Fishes", DemandType.Unspecified,true)]
+    [DemandsInitialization("Fishes", DemandType.Unspecified, true)]
     public bool MyBool { get; set; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/BundledLookupTableTests.cs b/Rdmp.Core.Tests/Curation/Integration/BundledLookupTableTests.cs
index a2ea38a818..cc1d94d16d 100644
--- a/Rdmp.Core.Tests/Curation/Integration/BundledLookupTableTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/BundledLookupTableTests.cs
@@ -19,11 +19,12 @@ public class BundledLookupTableTests : UnitTests
     public void TestLookupGetDataTableFetchSql()
     {
         var l = WhenIHaveA<Lookup>();
-        var t =l.PrimaryKey.TableInfo;
+        var t = l.PrimaryKey.TableInfo;
 
         var bundle = new BundledLookupTable(t);
         Assert.AreEqual("select * from [MyDb]..[ChildTable]", bundle.GetDataTableFetchSql());
     }
+
     [Test]
     public void TestLookupGetDataTableFetchSql_WithCatalogue()
     {
@@ -31,7 +32,7 @@ public void TestLookupGetDataTableFetchSql_WithCatalogue()
         var t = l.PrimaryKey.TableInfo;
 
         var engineer = new ForwardEngineerCatalogue(t, t.ColumnInfos);
-        engineer.ExecuteForwardEngineering(out var cata,out _, out var eis);
+        engineer.ExecuteForwardEngineering(out var cata, out _, out var eis);
 
         var bundle = new BundledLookupTable(t);
         Assert.AreEqual(@"
@@ -63,6 +64,8 @@ public void TestLookupGetDataTableFetchSql_WithCatalogue()
 
         // so now there are no columns at all that are extractable
         var ex = Assert.Throws<QueryBuildingException>(() => bundle.GetDataTableFetchSql());
-        Assert.AreEqual("Lookup table 'ChildTable' has a Catalogue defined 'ChildTable' but it has no Core extractable columns", ex.Message);
+        Assert.AreEqual(
+            "Lookup table 'ChildTable' has a Catalogue defined 'ChildTable' but it has no Core extractable columns",
+            ex.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/CatalogueCheckTests.cs b/Rdmp.Core.Tests/Curation/Integration/CatalogueCheckTests.cs
index 5e2351cacc..ab614dac65 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CatalogueCheckTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CatalogueCheckTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class CatalogueCheckTests:DatabaseTests
+public class CatalogueCheckTests : DatabaseTests
 {
     [Test]
     public void CatalogueCheck_DodgyName()
@@ -25,7 +25,7 @@ public void CatalogueCheck_DodgyName()
             Name = @"c:\bob.txt#"
         };
 
-        var ex = Assert.Throws<Exception>(()=>cata.Check(new ThrowImmediatelyCheckNotifier()));
+        var ex = Assert.Throws<Exception>(() => cata.Check(new ThrowImmediatelyCheckNotifier()));
         Assert.IsTrue(ex.Message.Contains("The following invalid characters were found:'\\','.','#'"));
 
         cata.DeleteInDatabase();
@@ -41,14 +41,14 @@ public void CatalogueCheck_FetchData(DatabaseType databaseType)
         dt.Rows.Add("Peter");
 
         var database = GetCleanedServer(databaseType);
-        var tbl = database.CreateTable("CatalogueCheck_CanReadText",dt);
+        var tbl = database.CreateTable("CatalogueCheck_CanReadText", dt);
 
         var cata = Import(tbl);
 
         //shouldn't be any errors
         var tomemory = new ToMemoryCheckNotifier();
         cata.Check(tomemory);
-        Assert.AreEqual(CheckResult.Success,tomemory.GetWorst());
+        Assert.AreEqual(CheckResult.Success, tomemory.GetWorst());
 
         //delete all the records in the table
         tbl.Truncate();
@@ -64,7 +64,5 @@ public void CatalogueCheck_FetchData(DatabaseType databaseType)
 
         //now it should fail checks
         Assert.AreEqual(CheckResult.Fail, tomemory.GetWorst());
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/CatalogueItemTests.cs b/Rdmp.Core.Tests/Curation/Integration/CatalogueItemTests.cs
index c39c751e8b..c0c3f2d43a 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CatalogueItemTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CatalogueItemTests.cs
@@ -12,11 +12,9 @@ namespace Rdmp.Core.Tests.Curation.Integration;
 
 internal class CatalogueItemTests : DatabaseTests
 {
-
     [Test]
     public void constructor_newTestCatalogueItem_pass()
     {
-
         var parent = new Catalogue(CatalogueRepository, "GROG");
 
         var child1 = new CatalogueItem(CatalogueRepository, parent, "GROG_ITEM1");
@@ -26,7 +24,7 @@ public void constructor_newTestCatalogueItem_pass()
         Assert.IsTrue(child2.Catalogue_ID == parent.ID);
 
         Assert.IsTrue(child1.ID != child2.ID);
-            
+
         child1.DeleteInDatabase();
         child2.DeleteInDatabase();
         parent.DeleteInDatabase();
@@ -36,12 +34,11 @@ public void constructor_newTestCatalogueItem_pass()
     [Test]
     public void TestSettingColumnInfoToNull()
     {
-
         var parent = new Catalogue(CatalogueRepository, "GROG");
 
         var child1 = new CatalogueItem(CatalogueRepository, parent, "GROG_ITEM1");
         child1.SetColumnInfo(null);
-            
+
         Assert.IsNull(child1.ColumnInfo_ID);
         child1.DeleteInDatabase();
         parent.DeleteInDatabase();
@@ -57,7 +54,7 @@ public void GetAllCatalogueItemsForCatalogueID_NewCatalogue_pass()
 
         var children = parent.CatalogueItems;
 
-        Assert.AreEqual(children.Length,2);
+        Assert.AreEqual(children.Length, 2);
         Assert.IsTrue(children[0].ID == child1.ID || children[1].ID == child1.ID);
         Assert.IsTrue(children[0].ID == child2.ID || children[1].ID == child2.ID);
         Assert.IsTrue(children[0].ID != children[1].ID);
@@ -106,7 +103,7 @@ public void update_changeAllPropertiesOfCatalogueItem_passes()
     [Test]
     public void clone_CloneCatalogueItemWithIDIntoCatalogue_passes()
     {
-        var parent = new Catalogue(CatalogueRepository,"KONGOR");
+        var parent = new Catalogue(CatalogueRepository, "KONGOR");
         var parent2 = new Catalogue(CatalogueRepository, "KONGOR2");
 
         var child = new CatalogueItem(CatalogueRepository, parent, "KONGOR_SUPERKING")
@@ -142,14 +139,13 @@ public void clone_CloneCatalogueItemWithIDIntoCatalogue_passes()
             Assert.AreEqual(cloneChild.Statistical_cons, child.Statistical_cons);
             Assert.AreEqual(cloneChild.Topic, child.Topic);
         }
-        finally 
+        finally
         {
             cloneChild?.DeleteInDatabase();
 
             child.DeleteInDatabase();
             parent.DeleteInDatabase();
             parent2.DeleteInDatabase();
-                
         }
     }
 
@@ -157,18 +153,15 @@ public void clone_CloneCatalogueItemWithIDIntoCatalogue_passes()
     [TestCase(false)]
     public void TestDeleting_CascadesToExtractionInformations(bool makeOrphanFirst)
     {
-        var c = new Catalogue(CatalogueRepository,"My new cata");
+        var c = new Catalogue(CatalogueRepository, "My new cata");
         var ci = new CatalogueItem(CatalogueRepository, c, "myci");
 
         var t = new TableInfo(CatalogueRepository, "myt");
         var col = new ColumnInfo(CatalogueRepository, "mycol", "varchar(10)", t);
 
-        var ei = new ExtractionInformation(CatalogueRepository, ci, col,"fff");
+        var ei = new ExtractionInformation(CatalogueRepository, ci, col, "fff");
 
-        if(makeOrphanFirst)
-        {
-            col.DeleteInDatabase();
-        }
+        if (makeOrphanFirst) col.DeleteInDatabase();
 
         c.DeleteInDatabase();
 
@@ -177,7 +170,6 @@ public void TestDeleting_CascadesToExtractionInformations(bool makeOrphanFirst)
         Assert.IsFalse(ei.Exists());
 
         Assert.IsTrue(t.Exists());
-        Assert.AreEqual(!makeOrphanFirst,col.Exists());
-
+        Assert.AreEqual(!makeOrphanFirst, col.Exists());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/CatalogueTests.cs b/Rdmp.Core.Tests/Curation/Integration/CatalogueTests.cs
index 9ef3046934..3c6e79564b 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CatalogueTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CatalogueTests.cs
@@ -29,8 +29,8 @@ public void Test_GetObjects_Catalogue()
     [Test]
     public void SettingPropertyViaRelationshipDoesntSave_NoticeHowYouHaveToCacheThePropertyCatalogueToSetIt()
     {
-        var c = new Catalogue(Repository,"frank");
-        var ci = new CatalogueItem(Repository,c,"bob");
+        var c = new Catalogue(Repository, "frank");
+        var ci = new CatalogueItem(Repository, c, "bob");
 
 
         var cata = ci.Catalogue;
@@ -41,12 +41,12 @@ public void SettingPropertyViaRelationshipDoesntSave_NoticeHowYouHaveToCacheTheP
         //now thanks to lazy this works... but it's ambiguous (it works if the property is referenced via IInjectKnown<T>)
         ci.Catalogue.Name = "fish";
         ci.Catalogue.SaveToDatabase();
-        Assert.AreEqual("fish",ci.Catalogue.Name);
+        Assert.AreEqual("fish", ci.Catalogue.Name);
 
         c.DeleteInDatabase();
     }
-        
-        
+
+
     [Test]
     public void update_changeNameOfCatalogue_passes()
     {
@@ -58,25 +58,21 @@ public void update_changeNameOfCatalogue_passes()
         var catas = Repository.GetAllObjects<Catalogue>().ToArray();
 
         foreach (var catalogue in catas)
-        {
             if (catalogue.ID == expectedID)
             {
                 catalogue.Name = "fish";
                 catalogue.SaveToDatabase();
             }
-        }
 
         //find it again and see if its name has changed - then delete it so we don't polute the db
         var catasAfter = Repository.GetAllObjects<Catalogue>().ToArray();
 
         foreach (var catalogue in catasAfter)
-        {
             if (catalogue.ID == expectedID)
             {
                 Assert.AreEqual(catalogue.Name, "fish");
                 catalogue.DeleteInDatabase();
             }
-        }
     }
 
     [Test]
@@ -90,7 +86,6 @@ public void update_changeAllProperties_pass()
         var catas = Repository.GetAllObjects<Catalogue>().ToArray();
 
         foreach (var catalogue in catas)
-        {
             if (catalogue.ID == expectedID)
             {
                 catalogue.Access_options = "backwards,frontwards";
@@ -109,7 +104,7 @@ public void update_changeAllProperties_pass()
                 catalogue.Background_summary = "£50 preferred";
                 catalogue.Periodicity = Catalogue.CataloguePeriodicity.Monthly;
                 catalogue.Query_tool_URL = new Uri("http://querier.html");
-                catalogue.Source_URL =  new Uri("http://blackholeSun.html");
+                catalogue.Source_URL = new Uri("http://blackholeSun.html");
                 catalogue.Time_coverage = "comprehensive";
                 catalogue.Search_keywords = "excitement,fishmongery";
                 catalogue.Type = Catalogue.CatalogueType.ResearchStudy;
@@ -129,56 +124,52 @@ public void update_changeAllProperties_pass()
 
                 catalogue.SaveToDatabase();
             }
-        }
-
 
 
         //find it again and see if it has changed - then delete it so we don't polute the db
         var catasAfter = Repository.GetAllObjects<Catalogue>().ToArray();
 
         foreach (var catalogue in catasAfter)
-        {
             if (catalogue.ID == expectedID)
             {
-                Assert.AreEqual(catalogue.Access_options , "backwards,frontwards");
-                Assert.AreEqual(catalogue.API_access_URL , new Uri("http://API.html"));
-                Assert.AreEqual(catalogue.Acronym , "abc");
-                Assert.AreEqual(catalogue.Attribution_citation , "belongs to dave");
-                Assert.AreEqual(catalogue.Browse_URL , new Uri("http://browse.html"));
-                Assert.AreEqual(catalogue.Bulk_Download_URL , new Uri("http://bulk.html"));
-                Assert.AreEqual(catalogue.Contact_details , "thomasnind");
+                Assert.AreEqual(catalogue.Access_options, "backwards,frontwards");
+                Assert.AreEqual(catalogue.API_access_URL, new Uri("http://API.html"));
+                Assert.AreEqual(catalogue.Acronym, "abc");
+                Assert.AreEqual(catalogue.Attribution_citation, "belongs to dave");
+                Assert.AreEqual(catalogue.Browse_URL, new Uri("http://browse.html"));
+                Assert.AreEqual(catalogue.Bulk_Download_URL, new Uri("http://bulk.html"));
+                Assert.AreEqual(catalogue.Contact_details, "thomasnind");
                 Assert.AreEqual(catalogue.Geographical_coverage, "fullspectrum");
                 Assert.AreEqual(catalogue.Resource_owner, "blackhole");
-                Assert.AreEqual(catalogue.Description , "exciting stuff of great excitement");
-                Assert.AreEqual(catalogue.Detail_Page_URL , new Uri("http://detail.html"));
-                Assert.AreEqual(catalogue.Last_revision_date , DateTime.Parse("01/01/01"));
-                Assert.AreEqual(catalogue.Name , "kaptainshield");
+                Assert.AreEqual(catalogue.Description, "exciting stuff of great excitement");
+                Assert.AreEqual(catalogue.Detail_Page_URL, new Uri("http://detail.html"));
+                Assert.AreEqual(catalogue.Last_revision_date, DateTime.Parse("01/01/01"));
+                Assert.AreEqual(catalogue.Name, "kaptainshield");
                 Assert.AreEqual(catalogue.Background_summary, "£50 preferred");
-                Assert.AreEqual(catalogue.Periodicity , Catalogue.CataloguePeriodicity.Monthly);
-                Assert.AreEqual(catalogue.Query_tool_URL , new Uri("http://querier.html"));
-                Assert.AreEqual(catalogue.Source_URL , new Uri("http://blackholeSun.html"));
-                Assert.AreEqual(catalogue.Time_coverage , "comprehensive");
+                Assert.AreEqual(catalogue.Periodicity, Catalogue.CataloguePeriodicity.Monthly);
+                Assert.AreEqual(catalogue.Query_tool_URL, new Uri("http://querier.html"));
+                Assert.AreEqual(catalogue.Source_URL, new Uri("http://blackholeSun.html"));
+                Assert.AreEqual(catalogue.Time_coverage, "comprehensive");
                 Assert.AreEqual(catalogue.Search_keywords, "excitement,fishmongery");
-                Assert.AreEqual(catalogue.Type , Catalogue.CatalogueType.ResearchStudy);
-                Assert.AreEqual(catalogue.Update_freq , "Every darmn second!");
-                Assert.AreEqual(catalogue.Update_sched , "periodically on request");
-
-
-                Assert.AreEqual(catalogue.Country_of_origin , "United Kingdom");
-                Assert.AreEqual(catalogue.Data_standards , "Highly Standardised");
-                Assert.AreEqual(catalogue.Administrative_contact_address , "Candyland");
-                Assert.AreEqual(catalogue.Administrative_contact_email , "big@brother.com");
-                Assert.AreEqual(catalogue.Administrative_contact_name , "Uncle Sam");
-                Assert.AreEqual(catalogue.Administrative_contact_telephone , "12345 67890");
-                Assert.AreEqual(catalogue.Explicit_consent , true);
-                Assert.AreEqual(catalogue.Ethics_approver , "Tayside Supernatural Department");
-                Assert.AreEqual(catalogue.Source_of_data_collection , "Invented by Unit Test");
+                Assert.AreEqual(catalogue.Type, Catalogue.CatalogueType.ResearchStudy);
+                Assert.AreEqual(catalogue.Update_freq, "Every darmn second!");
+                Assert.AreEqual(catalogue.Update_sched, "periodically on request");
+
+
+                Assert.AreEqual(catalogue.Country_of_origin, "United Kingdom");
+                Assert.AreEqual(catalogue.Data_standards, "Highly Standardised");
+                Assert.AreEqual(catalogue.Administrative_contact_address, "Candyland");
+                Assert.AreEqual(catalogue.Administrative_contact_email, "big@brother.com");
+                Assert.AreEqual(catalogue.Administrative_contact_name, "Uncle Sam");
+                Assert.AreEqual(catalogue.Administrative_contact_telephone, "12345 67890");
+                Assert.AreEqual(catalogue.Explicit_consent, true);
+                Assert.AreEqual(catalogue.Ethics_approver, "Tayside Supernatural Department");
+                Assert.AreEqual(catalogue.Source_of_data_collection, "Invented by Unit Test");
                 Assert.AreEqual(catalogue.SubjectNumbers, "100,000,000");
 
 
                 catalogue.DeleteInDatabase();
             }
-        }
     }
 
     [Test]
@@ -199,13 +190,11 @@ public void create_blankConstructorCatalogue_createsNewInDatabase()
 
         var numberDeleted = 0;
         foreach (var cata in catasAfter)
-        {
             if (cata.ID == expectedID)
             {
                 cata.DeleteInDatabase();
                 numberDeleted++;
             }
-        }
 
         Assert.AreEqual(numberDeleted, 1);
     }
@@ -223,7 +212,7 @@ public void GetCatalogueWithID_validID_pass()
 
         Assert.NotNull(c);
         Assert.True(c.Name == "TEST");
-            
+
         c.DeleteInDatabase();
     }
 
@@ -244,7 +233,7 @@ public void TestGetTablesAndLookupTables()
 
         //2 columns come from table 1
         var t1 = new TableInfo(Repository, "Table1");
-        var t1_c1 = new ColumnInfo(Repository, "Col1","varchar(10)",t1);
+        var t1_c1 = new ColumnInfo(Repository, "Col1", "varchar(10)", t1);
         var t1_c2 = new ColumnInfo(Repository, "Col2", "int", t1);
 
         //2 columns come from table 2
@@ -259,42 +248,42 @@ public void TestGetTablesAndLookupTables()
 
         //wire SetUp virtual columns to underlying columns
         ci1.SetColumnInfo(t1_c1);
-        ci2.SetColumnInfo( t1_c2);
-        ci3.SetColumnInfo( t2_c1);
-        ci4.SetColumnInfo( t2_c2);
-        ci5.SetColumnInfo( t3_c1);
-        ci6.SetColumnInfo( t3_c2);
+        ci2.SetColumnInfo(t1_c2);
+        ci3.SetColumnInfo(t2_c1);
+        ci4.SetColumnInfo(t2_c2);
+        ci5.SetColumnInfo(t3_c1);
+        ci6.SetColumnInfo(t3_c2);
 
         //configure the lookup relationship
-        var lookup = new Lookup(Repository, t3_c1, t1_c2, t3_c2,ExtractionJoinType.Left, "");
+        var lookup = new Lookup(Repository, t3_c1, t1_c2, t3_c2, ExtractionJoinType.Left, "");
         try
         {
             var allTables = cata.GetTableInfoList(true).ToArray();
-            Assert.Contains(t1,allTables);
+            Assert.Contains(t1, allTables);
             Assert.Contains(t2, allTables);
             Assert.Contains(t3, allTables);
 
             var normalTablesOnly = cata.GetTableInfoList(false).ToArray();
-            Assert.AreEqual(2,normalTablesOnly.Length);
-            Assert.Contains(t1,normalTablesOnly);
+            Assert.AreEqual(2, normalTablesOnly.Length);
+            Assert.Contains(t1, normalTablesOnly);
             Assert.Contains(t2, normalTablesOnly);
 
             var lookupTablesOnly = cata.GetLookupTableInfoList();
-            Assert.AreEqual(1,lookupTablesOnly.Length);
-            Assert.Contains(t3,lookupTablesOnly);
+            Assert.AreEqual(1, lookupTablesOnly.Length);
+            Assert.Contains(t3, lookupTablesOnly);
 
             cata.GetTableInfos(out var normalTables, out var lookupTables);
-            Assert.AreEqual(2,normalTables.Count);
+            Assert.AreEqual(2, normalTables.Count);
             Assert.AreEqual(1, lookupTables.Count);
 
-            Assert.Contains(t1,normalTables);
+            Assert.Contains(t1, normalTables);
             Assert.Contains(t2, normalTables);
-            Assert.Contains(t3,lookupTables);
+            Assert.Contains(t3, lookupTables);
         }
         finally
         {
             lookup.DeleteInDatabase();
-                
+
             t1.DeleteInDatabase();
             t2.DeleteInDatabase();
             t3.DeleteInDatabase();
@@ -309,17 +298,18 @@ public void CatalogueFolder_DefaultIsRoot()
         var c = new Catalogue(Repository, "bob");
         try
         {
-            Assert.AreEqual("\\",c.Folder);
+            Assert.AreEqual("\\", c.Folder);
         }
         finally
         {
             c.DeleteInDatabase();
         }
     }
+
     [Test]
     public void CatalogueFolder_ChangeAndSave()
     {
-        var c = new Catalogue(Repository, "bob"); 
+        var c = new Catalogue(Repository, "bob");
         try
         {
             c.Folder = "\\Research\\Important";
@@ -342,8 +332,8 @@ public void CatalogueFolder_CannotSetToNonRoot()
         var c = new Catalogue(Repository, "bob");
         try
         {
-            var ex = Assert.Throws<NotSupportedException>(()=>c.Folder = "fish");
-            Assert.AreEqual(@"All catalogue paths must start with \.  Invalid path was:fish",ex.Message);
+            var ex = Assert.Throws<NotSupportedException>(() => c.Folder = "fish");
+            Assert.AreEqual(@"All catalogue paths must start with \.  Invalid path was:fish", ex.Message);
         }
         finally
         {
@@ -357,15 +347,17 @@ public void CatalogueFolder_CannotSetToNull()
         var c = new Catalogue(Repository, "bob");
         try
         {
-            var ex = Assert.Throws<NotSupportedException>(()=>c.Folder = null);
-            Assert.AreEqual(@"An attempt was made to set Catalogue Folder to null, every Catalogue must have a folder, set it to \ if you want the root", ex.Message);
+            var ex = Assert.Throws<NotSupportedException>(() => c.Folder = null);
+            Assert.AreEqual(
+                @"An attempt was made to set Catalogue Folder to null, every Catalogue must have a folder, set it to \ if you want the root",
+                ex.Message);
         }
         finally
         {
             c.DeleteInDatabase();
         }
     }
-        
+
     [Test]
     public void CatalogueFolder_CannotHaveDoubleSlashes()
     {
@@ -373,8 +365,9 @@ public void CatalogueFolder_CannotHaveDoubleSlashes()
         try
         {
             //notice the @ symbol that makes the double slashes actual double slashes - common error we might make and what this test is designed to prevent
-            var ex = Assert.Throws<NotSupportedException>(()=>c.Folder = @"\\bob\\");
-            Assert.AreEqual(@"Catalogue paths cannot contain double slashes '\\', Invalid path was:\\bob\\", ex.Message);
+            var ex = Assert.Throws<NotSupportedException>(() => c.Folder = @"\\bob\\");
+            Assert.AreEqual(@"Catalogue paths cannot contain double slashes '\\', Invalid path was:\\bob\\",
+                ex.Message);
         }
         finally
         {
@@ -385,16 +378,15 @@ public void CatalogueFolder_CannotHaveDoubleSlashes()
     [Test]
     public void RelatedCatalogueTest_NoCatalogues()
     {
-        var t = new TableInfo(Repository,"MyTable");
+        var t = new TableInfo(Repository, "MyTable");
         try
         {
-            Assert.AreEqual(0,t.GetAllRelatedCatalogues().Length);
+            Assert.AreEqual(0, t.GetAllRelatedCatalogues().Length);
         }
         finally
         {
             t.DeleteInDatabase();
         }
-            
     }
 
     [Test]
@@ -403,10 +395,10 @@ public void RelatedCatalogueTest_NoCatalogues()
     public void RelatedCatalogueTest_OneCatalogue(bool createExtractionInformation)
     {
         var t = new TableInfo(Repository, "MyTable");
-        var c = new ColumnInfo(Repository,"MyCol","varchar(10)",t);
+        var c = new ColumnInfo(Repository, "MyCol", "varchar(10)", t);
 
-        var cata = new Catalogue(Repository,"MyCata");
-        var ci = new CatalogueItem(Repository,cata,"MyCataItem");
+        var cata = new Catalogue(Repository, "MyCata");
+        var ci = new CatalogueItem(Repository, cata, "MyCataItem");
 
         try
         {
@@ -417,7 +409,7 @@ public void RelatedCatalogueTest_OneCatalogue(bool createExtractionInformation)
 
             var catas = t.GetAllRelatedCatalogues();
             Assert.AreEqual(1, catas.Length);
-            Assert.AreEqual(cata,catas[0]);
+            Assert.AreEqual(cata, catas[0]);
         }
         finally
         {
@@ -458,11 +450,9 @@ public void RelatedCatalogueTest_TwoCatalogues_TwoColumnsEach(bool createExtract
                 ci1_2.SetColumnInfo(c2);
                 ci2_1.SetColumnInfo(c2);
                 ci2_2.SetColumnInfo(c1);
-                    
             }
 
 
-
             var catas = t.GetAllRelatedCatalogues();
             Assert.AreEqual(2, catas.Length);
             Assert.IsTrue(catas.Contains(cata1));
@@ -474,14 +464,13 @@ public void RelatedCatalogueTest_TwoCatalogues_TwoColumnsEach(bool createExtract
             cata2.DeleteInDatabase();
             t.DeleteInDatabase();
         }
-
     }
 
 
-    [TestCase("\\","\\")]
+    [TestCase("\\", "\\")]
     [TestCase("\\fish", "fish")]
     [TestCase("\\fish\\dog\\cat", "cat")]
-    public void TestTreeNode_FullName_CleanPaths(string fullName,string expectedName)
+    public void TestTreeNode_FullName_CleanPaths(string fullName, string expectedName)
     {
         var r1 = WhenIHaveA<Catalogue>();
         r1.Folder = fullName;
@@ -489,11 +478,8 @@ public void TestTreeNode_FullName_CleanPaths(string fullName,string expectedName
         var tree = FolderHelper.BuildFolderTree(new[] { r1 });
 
         var bottomFolder = tree;
-                
-        while(bottomFolder.ChildFolders.Any())
-        {
-            bottomFolder = bottomFolder.ChildFolders.Single();
-        }
+
+        while (bottomFolder.ChildFolders.Any()) bottomFolder = bottomFolder.ChildFolders.Single();
 
         Assert.AreEqual(expectedName, bottomFolder.Name);
         Assert.AreEqual(fullName, bottomFolder.FullName);
@@ -527,7 +513,7 @@ public void TestBuildFolderTree()
 
         var objects = new IHasFolder[]
         {
-            r1,r2,cat,fun,morefun
+            r1, r2, cat, fun, morefun
         };
 
 
@@ -561,7 +547,7 @@ public void TestBuildFolderTree_MiddleBranches()
 
         var objects = new IHasFolder[]
         {
-            cata1,cata2
+            cata1, cata2
         };
 
         var tree = FolderHelper.BuildFolderTree(objects);
diff --git a/Rdmp.Core.Tests/Curation/Integration/ColumnInfoTests.cs b/Rdmp.Core.Tests/Curation/Integration/ColumnInfoTests.cs
index 1778e1412b..bf34a0f17f 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ColumnInfoTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ColumnInfoTests.cs
@@ -15,14 +15,11 @@ namespace Rdmp.Core.Tests.Curation.Integration;
 
 internal class ColumnInfoTests : DatabaseTests
 {
-
- 
-
     [Test]
     public void CreateNewColumnInfoInDatabase_NewColumns_NewColumnsAreEqualAfterSave()
     {
         TableInfo parent = null;
-        ColumnInfo child=null;
+        ColumnInfo child = null;
 
         try
         {
@@ -43,28 +40,24 @@ public void CreateNewColumnInfoInDatabase_NewColumns_NewColumnsAreEqualAfterSave
             Assert.AreEqual(child.Description, childAfter.Description);
             Assert.AreEqual(child.Status, childAfter.Status);
             Assert.AreEqual(child.RegexPattern, childAfter.RegexPattern);
-            Assert.AreEqual(child.ValidationRules, childAfter.ValidationRules); 
-
+            Assert.AreEqual(child.ValidationRules, childAfter.ValidationRules);
         }
-        finally 
+        finally
         {
             child.DeleteInDatabase();
             parent.DeleteInDatabase();
         }
-            
-
     }
 
     [Test]
     public void GetAllColumnInfos_moreThan1_pass()
     {
-
         var parent = new TableInfo(CatalogueRepository, "Slalom");
 
         try
         {
-            var ci = new ColumnInfo(CatalogueRepository, "MyAwesomeColumn","varchar(1000)", parent);
-           
+            var ci = new ColumnInfo(CatalogueRepository, "MyAwesomeColumn", "varchar(1000)", parent);
+
             try
             {
                 Assert.IsTrue(CatalogueRepository.GetAllObjectsWithParent<ColumnInfo>(parent).Length == 1);
@@ -84,13 +77,14 @@ public void GetAllColumnInfos_moreThan1_pass()
     public void CreateNewColumnInfoInDatabase_valid_pass()
     {
         var parent = new TableInfo(CatalogueRepository, "Lazors");
-        var columnInfo = new ColumnInfo(CatalogueRepository, "Lazor Reflection Vol","varchar(1000)",parent);
+        var columnInfo = new ColumnInfo(CatalogueRepository, "Lazor Reflection Vol", "varchar(1000)", parent);
 
         Assert.NotNull(columnInfo);
 
         columnInfo.DeleteInDatabase();
 
-        var ex = Assert.Throws<KeyNotFoundException>(() => CatalogueRepository.GetObjectByID<ColumnInfo>(columnInfo.ID));
+        var ex = Assert.Throws<KeyNotFoundException>(() =>
+            CatalogueRepository.GetObjectByID<ColumnInfo>(columnInfo.ID));
         Assert.IsTrue(ex.Message.StartsWith($"Could not find ColumnInfo with ID {columnInfo.ID}"), ex.Message);
 
         parent.DeleteInDatabase();
@@ -100,7 +94,7 @@ public void CreateNewColumnInfoInDatabase_valid_pass()
     public void update_changeAllProperties_pass()
     {
         var parent = new TableInfo(CatalogueRepository, "Rokkits");
-        var column = new ColumnInfo(CatalogueRepository, "ExplosiveVol","varchar(1000)", parent)
+        var column = new ColumnInfo(CatalogueRepository, "ExplosiveVol", "varchar(1000)", parent)
         {
             Digitisation_specs = "Highly digitizable",
             Format = "Jpeg",
@@ -124,7 +118,7 @@ public void update_changeAllProperties_pass()
     }
 
     [Test]
-    public void  Test_GetRAWStageTypeWhenPreLoadDiscardedDilution()
+    public void Test_GetRAWStageTypeWhenPreLoadDiscardedDilution()
     {
         var parent = new TableInfo(CatalogueRepository, "Rokkits");
         var column = new ColumnInfo(CatalogueRepository, "MyCol", "varchar(4)", parent);
@@ -142,6 +136,5 @@ public void  Test_GetRAWStageTypeWhenPreLoadDiscardedDilution()
 
         discard.DeleteInDatabase();
         parent.DeleteInDatabase();
-       
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/CommitInProgressTests.cs b/Rdmp.Core.Tests/Curation/Integration/CommitInProgressTests.cs
index 00134f056b..8124d572f0 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CommitInProgressTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CommitInProgressTests.cs
@@ -27,8 +27,8 @@ public void CommitInProgress_CatalogueModify()
         c.SaveToDatabase();
 
         var activator = new ThrowImmediatelyActivator(RepositoryLocator);
-            
-        Assert.IsNull(start.TryFinish(activator),"No changes made to Catalogue so expected no commit");
+
+        Assert.IsNull(start.TryFinish(activator), "No changes made to Catalogue so expected no commit");
 
         c.Name = "abadaba";
         c.IsDeprecated = true;
@@ -51,10 +51,10 @@ public void CommitInProgress_TestCancellation()
     {
         var c = new Catalogue(CatalogueRepository, "Hey");
 
-        Assert.AreEqual(ChangeDescription.NoChanges,c.HasLocalChanges().Evaluation,
+        Assert.AreEqual(ChangeDescription.NoChanges, c.HasLocalChanges().Evaluation,
             "We just created this Catalogue, how can db copy be different?!");
 
-        var start = new CommitInProgress(RepositoryLocator, new CommitInProgressSettings(c) 
+        var start = new CommitInProgress(RepositoryLocator, new CommitInProgressSettings(c)
         {
             UseTransactions = true
         });
diff --git a/Rdmp.Core.Tests/Curation/Integration/ComprehensiveQueryPerformanceCounterTests.cs b/Rdmp.Core.Tests/Curation/Integration/ComprehensiveQueryPerformanceCounterTests.cs
index 24824b8a18..ef637d7f68 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ComprehensiveQueryPerformanceCounterTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ComprehensiveQueryPerformanceCounterTests.cs
@@ -21,20 +21,19 @@ public void TestPerformance()
         if (TestDatabaseSettings.UseFileSystemRepo)
             Assert.Inconclusive("No queries are run when using file back repository");
 
-        var pCounter =  new ComprehensiveQueryPerformanceCounter();
+        var pCounter = new ComprehensiveQueryPerformanceCounter();
         //enable performance counting
         DatabaseCommandHelper.PerformanceCounter = pCounter;
         try
         {
-
             //send some queries
-            var cata =  new Catalogue(CatalogueRepository, "Fish");
+            var cata = new Catalogue(CatalogueRepository, "Fish");
 
             Assert.IsTrue(cata.Name.Equals("Fish"));
 
             var commands = pCounter.DictionaryOfQueries.Values.ToArray();
             Assert.IsTrue(commands.Any(c => c.QueryText.Contains("SELECT * FROM [Catalogue] WHERE ID=")));
-                
+
             cata.DeleteInDatabase();
         }
         finally
diff --git a/Rdmp.Core.Tests/Curation/Integration/CredentialsTests.cs b/Rdmp.Core.Tests/Curation/Integration/CredentialsTests.cs
index dbb28a0a36..ed1d188bab 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CredentialsTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CredentialsTests.cs
@@ -23,7 +23,6 @@ protected override void OneTimeSetUp()
         base.OneTimeSetUp();
 
         foreach (var table in CatalogueRepository.GetAllObjects<TableInfo>())
-        {
             if (table.Name.Equals("GetCredentialsFromATableInfo")
                 ||
                 table.Name.Equals("Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt1")
@@ -41,19 +40,13 @@ protected override void OneTimeSetUp()
                 table.Name.Equals("Tableinfo1")
                )
                 table.DeleteInDatabase();
-        }
 
         foreach (var cred in CatalogueRepository.GetAllObjects<DataAccessCredentials>())
-        {
-            if(cred.Name.Equals("bob")
-               ||
-               cred.Name.Equals("Test")
-              )
+            if (cred.Name.Equals("bob")
+                ||
+                cred.Name.Equals("Test")
+               )
                 cred.DeleteInDatabase();
-        }
-
-
-            
     }
 
     [Test]
@@ -84,9 +77,10 @@ public void CreateNewCredentialsThenGetByUsernamePasswordCombo()
 
         newCredentials.SaveToDatabase();
 
-        var newCopy = CatalogueRepository.GetAllObjects<DataAccessCredentials>().SingleOrDefault(c=>c.Username == "myusername");
+        var newCopy = CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+            .SingleOrDefault(c => c.Username == "myusername");
         Assert.IsNotNull(newCopy);
-            
+
         try
         {
             Assert.NotNull(newCopy);
@@ -98,7 +92,6 @@ public void CreateNewCredentialsThenGetByUsernamePasswordCombo()
         finally
         {
             newCredentials.DeleteInDatabase();
-                
         }
     }
 
@@ -120,10 +113,8 @@ public void TestThe_Any_EnumValue_CannotRequestAnyCredentials()
             tableInfo.SaveToDatabase();
 
             //attempt to request ANY credentials
-            var ex = Assert.Throws<Exception>(()=> tableInfo.GetCredentialsIfExists(DataAccessContext.Any));
-            Assert.AreEqual("You cannot ask for any credentials, you must supply a usage context.",ex.Message);
-
-
+            var ex = Assert.Throws<Exception>(() => tableInfo.GetCredentialsIfExists(DataAccessContext.Any));
+            Assert.AreEqual("You cannot ask for any credentials, you must supply a usage context.", ex.Message);
         }
         finally
         {
@@ -131,6 +122,7 @@ public void TestThe_Any_EnumValue_CannotRequestAnyCredentials()
             creds.DeleteInDatabase();
         }
     }
+
     [Test]
     public void TestThe_Any_EnumValue()
     {
@@ -145,7 +137,7 @@ public void TestThe_Any_EnumValue()
         {
             creds.Name = "Test";
             creds.SaveToDatabase();
-                
+
             //now create the association as Any
             tableInfo.SetCredentials(creds, DataAccessContext.Any);
 
@@ -156,7 +148,6 @@ public void TestThe_Any_EnumValue()
             Assert.NotNull(creds2);
             creds2 = tableInfo.GetCredentialsIfExists(DataAccessContext.DataLoad);
             Assert.NotNull(creds2);
-
         }
         finally
         {
@@ -176,7 +167,7 @@ public void Test_Any_PrioritisingTheMoreAppropriateCredential()
 
         var creds = new DataAccessCredentials(CatalogueRepository);
         var creds2 = new DataAccessCredentials(CatalogueRepository);
-  
+
         try
         {
             creds.Name = "Test";
@@ -185,10 +176,9 @@ public void Test_Any_PrioritisingTheMoreAppropriateCredential()
             //now create the association as Any
             tableInfo.SetCredentials(creds, DataAccessContext.DataLoad);
             tableInfo.SetCredentials(creds2, DataAccessContext.Any);
-                
-                
-            Assert.AreEqual(creds, tableInfo.GetCredentialsIfExists(DataAccessContext.DataLoad));
 
+
+            Assert.AreEqual(creds, tableInfo.GetCredentialsIfExists(DataAccessContext.DataLoad));
         }
         finally
         {
@@ -216,10 +206,9 @@ public void SaveAndReloadCredentials()
             Assert.AreEqual(originalCredentials.Password, newCopy.Password);
 
             //test overridden Equals
-            Assert.AreEqual(originalCredentials,newCopy);
+            Assert.AreEqual(originalCredentials, newCopy);
             originalCredentials.Password = "fish";
-            Assert.AreEqual(originalCredentials, newCopy);//they are still equal because IDs are the same
-
+            Assert.AreEqual(originalCredentials, newCopy); //they are still equal because IDs are the same
         }
         finally
         {
@@ -230,7 +219,6 @@ public void SaveAndReloadCredentials()
     [Test]
     public void GetCredentialsFromATableInfo()
     {
-
         var tableInfo = new TableInfo(CatalogueRepository, "GetCredentialsFromATableInfo")
         {
             Name = "My Exciting Table"
@@ -246,7 +234,8 @@ public void GetCredentialsFromATableInfo()
             tableInfo.SaveToDatabase();
 
             //Go via TableInfo and get credentials
-            var creds2 = (DataAccessCredentials)tableInfo.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
+            var creds2 =
+                (DataAccessCredentials)tableInfo.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
             Assert.AreEqual(creds2.Name, creds.Name);
         }
         finally
@@ -266,33 +255,33 @@ public void Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt_ThrowsT
 
         try
         {
-            
-            tableInfo1.SetCredentials(creds,DataAccessContext.InternalDataProcessing);
+            tableInfo1.SetCredentials(creds, DataAccessContext.InternalDataProcessing);
             tableInfo2.SetCredentials(creds, DataAccessContext.InternalDataProcessing);
             tableInfo1.SaveToDatabase();
             tableInfo2.SaveToDatabase();
 
-            var ex = Assert.Throws<CredentialsInUseException>(creds.DeleteInDatabase);//the bit that fails (because tables are there)
-            Assert.AreEqual("Cannot delete credentials bob because it is in use by one or more TableInfo objects(Dependency1,Dependency2)",ex.Message);
+            var ex = Assert.Throws<CredentialsInUseException>(creds
+                .DeleteInDatabase); //the bit that fails (because tables are there)
+            Assert.AreEqual(
+                "Cannot delete credentials bob because it is in use by one or more TableInfo objects(Dependency1,Dependency2)",
+                ex.Message);
         }
         finally
         {
-            tableInfo1.DeleteInDatabase();//will work
-            tableInfo2.DeleteInDatabase();//will work
-            creds.DeleteInDatabase();//will work
+            tableInfo1.DeleteInDatabase(); //will work
+            tableInfo2.DeleteInDatabase(); //will work
+            creds.DeleteInDatabase(); //will work
         }
-
-            
-
     }
 
     [Test]
     public void GetAllUsersOfACredential()
     {
-
         //Get all TableInfos that share this credential
-        var tableInfo1 = new TableInfo(CatalogueRepository, "Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt1");
-        var tableInfo2 = new TableInfo(CatalogueRepository, "Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt2");
+        var tableInfo1 = new TableInfo(CatalogueRepository,
+            "Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt1");
+        var tableInfo2 = new TableInfo(CatalogueRepository,
+            "Create2TableInfosThatShareTheSameCredentialAndTestDeletingIt2");
         var creds = new DataAccessCredentials(CatalogueRepository, "bob");
 
         tableInfo1.SetCredentials(creds, DataAccessContext.InternalDataProcessing);
@@ -301,10 +290,11 @@ public void GetAllUsersOfACredential()
         tableInfo2.SaveToDatabase();
 
 
-        var TablesThatUseCredential = creds.GetAllTableInfosThatUseThis()[DataAccessContext.InternalDataProcessing].ToArray();
+        var TablesThatUseCredential =
+            creds.GetAllTableInfosThatUseThis()[DataAccessContext.InternalDataProcessing].ToArray();
 
         Assert.Contains(tableInfo1, TablesThatUseCredential);
-        Assert.Contains(tableInfo2, TablesThatUseCredential); 
+        Assert.Contains(tableInfo2, TablesThatUseCredential);
 
         tableInfo1.DeleteInDatabase();
         tableInfo2.DeleteInDatabase();
@@ -314,10 +304,12 @@ public void GetAllUsersOfACredential()
     [Test]
     public void GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOverride()
     {
-        var c = new Catalogue(CatalogueRepository, "GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOverride");
-        var ci = new CatalogueItem(CatalogueRepository, c,"GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOverride");
+        var c = new Catalogue(CatalogueRepository,
+            "GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOverride");
+        var ci = new CatalogueItem(CatalogueRepository, c,
+            "GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOverride");
         var t = new TableInfo(CatalogueRepository, "Test");
-        var col = new ColumnInfo(CatalogueRepository, "[mydatabase].[dbo].test.col","varchar(10)", t);
+        var col = new ColumnInfo(CatalogueRepository, "[mydatabase].[dbo].test.col", "varchar(10)", t);
 
         var extractionInformation = new ExtractionInformation(CatalogueRepository, ci, col, col.Name);
 
@@ -326,14 +318,14 @@ public void GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOve
         {
             t.Server = "myserver";
             t.Database = "mydatabase";
-                
+
             cred = new DataAccessCredentials(CatalogueRepository, "bob")
             {
                 Username = "bob",
                 Password = "pass"
             };
 
-            Assert.AreNotEqual("pass",cred.Password);
+            Assert.AreNotEqual("pass", cred.Password);
             Assert.AreEqual("pass", cred.GetDecryptedPassword());
 
 
@@ -341,22 +333,20 @@ public void GetConnectionStringFromCatalogueWhereOneTableInfoUsesACredentialsOve
             t.SetCredentials(cred, DataAccessContext.InternalDataProcessing);
             t.SaveToDatabase();
 
-            var constr = (SqlConnectionStringBuilder)c.GetDistinctLiveDatabaseServer(DataAccessContext.InternalDataProcessing,false).Builder;
-            Assert.AreEqual("myserver",constr.DataSource);
+            var constr =
+                (SqlConnectionStringBuilder)c
+                    .GetDistinctLiveDatabaseServer(DataAccessContext.InternalDataProcessing, false).Builder;
+            Assert.AreEqual("myserver", constr.DataSource);
             Assert.False(constr.IntegratedSecurity);
             Assert.AreEqual("bob", constr.UserID);
             Assert.AreEqual("pass", constr.Password);
-
-     
         }
-        finally 
+        finally
         {
             t.DeleteInDatabase();
             cred?.DeleteInDatabase();
-            c.DeleteInDatabase();//no need to delete ci because of cascades
-                
+            c.DeleteInDatabase(); //no need to delete ci because of cascades
         }
-
     }
 
     [Test]
@@ -372,8 +362,8 @@ public void Test_BlankPasswords()
 
 
         var manager = new TableInfoCredentialsManager(CatalogueTableRepository);
-        Assert.AreEqual(creds,manager.GetCredentialByUsernameAndPasswordIfExists("Root",null));
-        Assert.AreEqual(creds,manager.GetCredentialByUsernameAndPasswordIfExists("Root",""));
+        Assert.AreEqual(creds, manager.GetCredentialByUsernameAndPasswordIfExists("Root", null));
+        Assert.AreEqual(creds, manager.GetCredentialByUsernameAndPasswordIfExists("Root", ""));
     }
 
     [Test]
@@ -386,11 +376,12 @@ public void Test_NoDuplicatePasswords()
 
         //if there is a username then we need to associate it with the TableInfo we just created
         var credentialsFactory = new DataAccessCredentialsFactory(CatalogueRepository);
-        var cred = credentialsFactory.Create(t1, "blarg", "flarg",DataAccessContext.Any);
+        var cred = credentialsFactory.Create(t1, "blarg", "flarg", DataAccessContext.Any);
         var cred2 = credentialsFactory.Create(t2, "blarg", "flarg", DataAccessContext.Any);
 
         Assert.AreEqual(credCount + 1, CatalogueRepository.GetAllObjects<DataAccessCredentials>().Length);
-            
-        Assert.AreEqual(cred, cred2, $"Expected {nameof(DataAccessCredentialsFactory)} to reuse existing credentials for both tables as they have the same username/password - e.g. bulk insert");
+
+        Assert.AreEqual(cred, cred2,
+            $"Expected {nameof(DataAccessCredentialsFactory)} to reuse existing credentials for both tables as they have the same username/password - e.g. bulk insert");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/CrossDatabaseTriggerTests.cs b/Rdmp.Core.Tests/Curation/Integration/CrossDatabaseTriggerTests.cs
index 8331cfe35f..9430e838a2 100644
--- a/Rdmp.Core.Tests/Curation/Integration/CrossDatabaseTriggerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/CrossDatabaseTriggerTests.cs
@@ -28,21 +28,21 @@ public void TriggerImplementationTest(DatabaseType type)
         var db = GetCleanedServer(type);
         var tbl = db.CreateTable("MyTable", new[]
         {
-            new DatabaseColumnRequest("name", new DatabaseTypeRequest(typeof (string), 30),false),
-            new DatabaseColumnRequest("bubbles", new DatabaseTypeRequest(typeof (int)))
+            new DatabaseColumnRequest("name", new DatabaseTypeRequest(typeof(string), 30), false),
+            new DatabaseColumnRequest("bubbles", new DatabaseTypeRequest(typeof(int)))
         });
 
         var factory = new TriggerImplementerFactory(type);
         var implementer = factory.Create(tbl);
-            
-        Assert.AreEqual(TriggerStatus.Missing,implementer.GetTriggerStatus());
 
-        Assert.AreEqual(2,tbl.DiscoverColumns().Length);
+        Assert.AreEqual(TriggerStatus.Missing, implementer.GetTriggerStatus());
+
+        Assert.AreEqual(2, tbl.DiscoverColumns().Length);
 
         implementer = factory.Create(tbl);
 
         //no primary keys
-        Assert.Throws<TriggerException>(()=>implementer.CreateTrigger(new ThrowImmediatelyCheckNotifier()));
+        Assert.Throws<TriggerException>(() => implementer.CreateTrigger(new ThrowImmediatelyCheckNotifier()));
 
         tbl.CreatePrimaryKey(tbl.DiscoverColumn("name"));
 
@@ -59,25 +59,33 @@ public void TriggerImplementationTest(DatabaseType type)
 
         Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("name")));
         Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("bubbles")));
-        Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("hic_dataLoadrunID",StringComparison.CurrentCultureIgnoreCase)));
-        Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("hic_validFrom",StringComparison.CurrentCultureIgnoreCase)));
-        Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("hic_validTo",StringComparison.CurrentCultureIgnoreCase)));
-        Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("hic_userID",StringComparison.CurrentCultureIgnoreCase)));
+        Assert.AreEqual(1,
+            archiveTable.DiscoverColumns().Count(c =>
+                c.GetRuntimeName().Equals("hic_dataLoadrunID", StringComparison.CurrentCultureIgnoreCase)));
+        Assert.AreEqual(1,
+            archiveTable.DiscoverColumns().Count(c =>
+                c.GetRuntimeName().Equals("hic_validFrom", StringComparison.CurrentCultureIgnoreCase)));
+        Assert.AreEqual(1,
+            archiveTable.DiscoverColumns().Count(c =>
+                c.GetRuntimeName().Equals("hic_validTo", StringComparison.CurrentCultureIgnoreCase)));
+        Assert.AreEqual(1,
+            archiveTable.DiscoverColumns().Count(c =>
+                c.GetRuntimeName().Equals("hic_userID", StringComparison.CurrentCultureIgnoreCase)));
         Assert.AreEqual(1, archiveTable.DiscoverColumns().Count(c => c.GetRuntimeName().Equals("hic_status")));
-            
+
         //is the trigger now existing
         Assert.AreEqual(TriggerStatus.Enabled, implementer.GetTriggerStatus());
 
         //does it function as expected
-        using(var con = tbl.Database.Server.GetConnection())
+        using (var con = tbl.Database.Server.GetConnection())
         {
             con.Open();
             var cmd = tbl.Database.Server.GetCommand(
-                $"INSERT INTO {tbl.GetRuntimeName()}(name,bubbles) VALUES('bob',1)",con);
+                $"INSERT INTO {tbl.GetRuntimeName()}(name,bubbles) VALUES('bob',1)", con);
             cmd.ExecuteNonQuery();
 
-            Assert.AreEqual(1,tbl.GetRowCount());
-            Assert.AreEqual(0,archiveTable.GetRowCount());
+            Assert.AreEqual(1, tbl.GetRowCount());
+            Assert.AreEqual(0, archiveTable.GetRowCount());
 
             cmd = tbl.Database.Server.GetCommand($"UPDATE {tbl.GetRuntimeName()} set bubbles=2", con);
             cmd.ExecuteNonQuery();
@@ -88,16 +96,17 @@ public void TriggerImplementationTest(DatabaseType type)
             var archive = archiveTable.GetDataTable();
             var dr = archive.Rows.Cast<DataRow>().Single();
 
-            Assert.AreEqual(((DateTime)dr["hic_validTo"]).Date,DateTime.Now.Date);
+            Assert.AreEqual(((DateTime)dr["hic_validTo"]).Date, DateTime.Now.Date);
         }
-            
+
         //do the strict check too
-        Assert.IsTrue(implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody()); 
+        Assert.IsTrue(implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
 
-        tbl.AddColumn("amagad",new DatabaseTypeRequest(typeof(float),null,new DecimalSize(2,2)),true,30);
+        tbl.AddColumn("amagad", new DatabaseTypeRequest(typeof(float), null, new DecimalSize(2, 2)), true, 30);
         implementer = factory.Create(tbl);
 
-        Assert.Throws<IrreconcilableColumnDifferencesInArchiveException>(() => implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
+        Assert.Throws<IrreconcilableColumnDifferencesInArchiveException>(() =>
+            implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
 
         archiveTable.AddColumn("amagad", new DatabaseTypeRequest(typeof(float), null, new DecimalSize(2, 2)), true, 30);
 
@@ -106,7 +115,7 @@ public void TriggerImplementationTest(DatabaseType type)
 
         Assert.IsTrue(implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
 
-            
+
         //does it function as expected
         using (var con = tbl.Database.Server.GetConnection())
         {
@@ -125,11 +134,11 @@ public void TriggerImplementationTest(DatabaseType type)
             Assert.AreEqual(3, archiveTable.GetRowCount());
 
             var archive = archiveTable.GetDataTable();
-            Assert.AreEqual(1,archive.Rows.Cast<DataRow>().Count(r=>Equals(r["amagad"],(decimal)1.00)));
+            Assert.AreEqual(1, archive.Rows.Cast<DataRow>().Count(r => Equals(r["amagad"], (decimal)1.00)));
             Assert.AreEqual(2, archive.Rows.Cast<DataRow>().Count(r => r["amagad"] == DBNull.Value));
         }
 
-        implementer.DropTrigger(out var problems, out string worked);
+        implementer.DropTrigger(out var problems, out var worked);
 
         Assert.IsTrue(string.IsNullOrEmpty(problems));
 
diff --git a/Rdmp.Core.Tests/Curation/Integration/DataAccess/SuperMultiThreadedVolumeAccess.cs b/Rdmp.Core.Tests/Curation/Integration/DataAccess/SuperMultiThreadedVolumeAccess.cs
index 7d7f821c62..1885eb88f0 100644
--- a/Rdmp.Core.Tests/Curation/Integration/DataAccess/SuperMultiThreadedVolumeAccess.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/DataAccess/SuperMultiThreadedVolumeAccess.cs
@@ -19,9 +19,8 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.DataAccess;
 
-public class SuperMultiThreadedVolumeAccess:DatabaseTests
+public class SuperMultiThreadedVolumeAccess : DatabaseTests
 {
-
     [OneTimeSetUp]
     protected override void SetUp()
     {
@@ -36,7 +35,7 @@ var catalogue in
                 .Where(c => c.Name.StartsWith("SuperMultiThreadedTestCatalogue")))
             catalogue.DeleteInDatabase();
 
-        DatabaseCommandHelper.GlobalTimeout=timeoutBefore;
+        DatabaseCommandHelper.GlobalTimeout = timeoutBefore;
     }
 
     [OneTimeTearDown]
@@ -55,7 +54,7 @@ var catalogue in
     [TestCase(false)]
     public void SingleThreadedBulkCatalogueCreation(bool useTransactions)
     {
-        IManagedConnection c= null;
+        IManagedConnection c = null;
 
 
         if (CatalogueRepository is not TableRepository && useTransactions)
@@ -85,9 +84,6 @@ public void SingleThreadedBulkCatalogueCreation(bool useTransactions)
             if (useTransactions)
                 CatalogueTableRepository.EndTransactedConnection(false);
         }
-            
-            
-
     }
 
     [Test]
@@ -139,10 +135,10 @@ private void FireMultiThreaded(Action<bool> method, int numberToFire, bool useTr
         for (var i = 0; i < numberToFire; i++)
         {
             var i1 = i;
-            ts.Add(new Thread(() => {
+            ts.Add(new Thread(() =>
+            {
                 try
                 {
-
                     method(useTransactions && i1 == 0);
                 }
                 catch (Exception ex)
@@ -154,10 +150,10 @@ private void FireMultiThreaded(Action<bool> method, int numberToFire, bool useTr
 
         foreach (var thread in ts)
             thread.Start();
-            
-        while(ts.Any(t=>t.IsAlive))
-            ts.FirstOrDefault(t=>t.IsAlive)?.Join(100);
-            
+
+        while (ts.Any(t => t.IsAlive))
+            ts.FirstOrDefault(t => t.IsAlive)?.Join(100);
+
         Assert.IsEmpty(exes);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/DataAccess/TestDataAccess.cs b/Rdmp.Core.Tests/Curation/Integration/DataAccess/TestDataAccess.cs
index 9786b6cdf2..2c0e66a276 100644
--- a/Rdmp.Core.Tests/Curation/Integration/DataAccess/TestDataAccess.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/DataAccess/TestDataAccess.cs
@@ -24,9 +24,8 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.DataAccess;
 
-public class TestDataAccess:DatabaseTests
+public class TestDataAccess : DatabaseTests
 {
-
     #region Distinct Connection String (from Collection tests - Failing)
 
     [Test]
@@ -34,14 +33,15 @@ public void TestDistinctCredentials_PasswordMismatch()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", "username", "mypas"),
-            new TestAccessPoint("frank", "bob", "username", "mydifferentPass")
+            new("frank", "bob", "username", "mypas"),
+            new("frank", "bob", "username", "mydifferentPass")
         };
 
         //call this
-        var ex = Assert.Throws<Exception>(()=>DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true));
-        StringAssert.Contains("collection could not agree on a single Password",ex.Message);
-
+        var ex = Assert.Throws<Exception>(() =>
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing,
+                true));
+        StringAssert.Contains("collection could not agree on a single Password", ex.Message);
     }
 
     [Test]
@@ -49,14 +49,15 @@ public void TestDistinctCredentials_UsernamePasswordAreNull()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", null, null),
-            new TestAccessPoint("frank", "bob", "username", "mydifferentPass")
+            new("frank", "bob", null, null),
+            new("frank", "bob", "username", "mydifferentPass")
         };
 
         //call this
-        var ex = Assert.Throws<Exception>(()=>DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true));
-        StringAssert.Contains("collection could not agree whether to use Credentials",ex.Message);
-
+        var ex = Assert.Throws<Exception>(() =>
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing,
+                true));
+        StringAssert.Contains("collection could not agree whether to use Credentials", ex.Message);
     }
 
     [Test]
@@ -64,15 +65,16 @@ public void TestDistinctCredentials_UsernameMismatch()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", "usernameasdasd", "mydifferentpass"),
-            new TestAccessPoint("frank", "bob", "username", "mydifferentPass")
+            new("frank", "bob", "usernameasdasd", "mydifferentpass"),
+            new("frank", "bob", "username", "mydifferentPass")
         };
 
         //call this
 
-        var ex = Assert.Throws<Exception>(()=>DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true));
-        StringAssert.Contains("collection could not agree on a single Username",ex.Message);
-
+        var ex = Assert.Throws<Exception>(() =>
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing,
+                true));
+        StringAssert.Contains("collection could not agree on a single Username", ex.Message);
     }
 
 
@@ -81,11 +83,12 @@ public void TestDistinctCredentials_ServerMixedCapitalization_Allowed()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", null, null),
-            new TestAccessPoint("FRANK", "bob", null, null)
+            new("frank", "bob", null, null),
+            new("FRANK", "bob", null, null)
         };
 
-        var server = DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
+        var server =
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
         Assert.AreEqual("frank", server.Name);
     }
 
@@ -94,13 +97,18 @@ public void TestDistinctCredentials_DatabaseMixedCapitalization_NotAllowed()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", null, null),
-            new TestAccessPoint("frank", "BOB", null, null)
+            new("frank", "bob", null, null),
+            new("frank", "BOB", null, null)
         };
 
-        var ex = Assert.Throws<ExpectedIdenticalStringsException>(() => DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true));
-        StringAssert.Contains("All data access points must be into the same database, access points 'frankbob' and 'frankBOB' are into different databases", ex.Message);
+        var ex = Assert.Throws<ExpectedIdenticalStringsException>(() =>
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing,
+                true));
+        StringAssert.Contains(
+            "All data access points must be into the same database, access points 'frankbob' and 'frankBOB' are into different databases",
+            ex.Message);
     }
+
     #endregion
 
     #region Distinct Connection String (from Collection tests - Passing)
@@ -110,11 +118,12 @@ public void TestDistinctCredentials_WrappedDatabaseName()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "[bob's Database]", "username", "mypas"),
-            new TestAccessPoint("frank", "bob's Database", "username", "mypas")
+            new("frank", "[bob's Database]", "username", "mypas"),
+            new("frank", "bob's Database", "username", "mypas")
         };
         //call this
-        var result = DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
+        var result =
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
 
         //test result
         Assert.AreEqual("bob's Database", result.Builder["Initial Catalog"]);
@@ -125,17 +134,18 @@ public void TestDistinctCredentials_PasswordMatch()
     {
         var testPoints = new List<TestAccessPoint>
         {
-            new TestAccessPoint("frank", "bob", "username", "mypas"),
-            new TestAccessPoint("frank", "bob", "username", "mypas")
+            new("frank", "bob", "username", "mypas"),
+            new("frank", "bob", "username", "mypas")
         };
 
         //call this
-        var result = DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
+        var result =
+            DataAccessPortal.ExpectDistinctServer(testPoints.ToArray(), DataAccessContext.InternalDataProcessing, true);
 
         //test result
         Assert.AreEqual("mypas", result.Builder["Password"]);
-
     }
+
     #endregion
 
     [Test]
@@ -153,7 +163,7 @@ public void AsyncTest()
         foreach (var t in threads)
             t.Start();
 
-        while(threads.Any(t=>t.ThreadState != ThreadState.Stopped))
+        while (threads.Any(t => t.ThreadState != ThreadState.Stopped))
             Thread.Sleep(100);
 
         for (var index = 0; index < asyncExceptions.Count; index++)
@@ -162,6 +172,7 @@ public void AsyncTest()
             var asyncException = asyncExceptions[index];
             Console.WriteLine(ExceptionHelper.ExceptionToListOfInnerMessages(asyncException, true));
         }
+
         Assert.IsEmpty(asyncExceptions);
     }
 
@@ -192,10 +203,12 @@ private void MessWithCatalogue()
     [Test]
     public void TestGettingConnectionStrings()
     {
-        foreach (var tbl in CatalogueRepository.GetAllObjects<TableInfo>().Where(table => table.Name.ToLower().Equals("bob")))
+        foreach (var tbl in CatalogueRepository.GetAllObjects<TableInfo>()
+                     .Where(table => table.Name.ToLower().Equals("bob")))
             tbl.DeleteInDatabase();
 
-        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>().Where(cred=>cred.Name.ToLower().Equals("bob")))
+        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+                     .Where(cred => cred.Name.ToLower().Equals("bob")))
             c.DeleteInDatabase();
 
         //test it with TableInfos
@@ -241,17 +254,15 @@ public void TestGettingConnectionStrings()
                 linker.BreakAllLinksBetween(creds, t);
                 creds.DeleteInDatabase();
             }
-
         }
         finally
         {
             t.DeleteInDatabase();
-
         }
     }
 
 
-    internal class TestAccessPoint:IDataAccessPoint,IDataAccessCredentials
+    internal class TestAccessPoint : IDataAccessPoint, IDataAccessCredentials
     {
         public string Server { get; set; }
         public string Database { get; set; }
@@ -277,20 +288,11 @@ public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
         }
 
 
-        public string GetDecryptedPassword()
-        {
-            return Password?? "";
-        }
+        public string GetDecryptedPassword() => Password ?? "";
 
-        public override string ToString()
-        {
-            return Server + Database;
-        }
+        public override string ToString() => Server + Database;
 
-        public IQuerySyntaxHelper GetQuerySyntaxHelper()
-        {
-            return MicrosoftQuerySyntaxHelper.Instance;
-        }
+        public IQuerySyntaxHelper GetQuerySyntaxHelper() => MicrosoftQuerySyntaxHelper.Instance;
 
         public bool DiscoverExistence(DataAccessContext context, out string reason)
         {
@@ -298,6 +300,4 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
             return false;
         }
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/Dependencies/DependencyTests.cs b/Rdmp.Core.Tests/Curation/Integration/Dependencies/DependencyTests.cs
index 040b9007e7..eb17a931b2 100644
--- a/Rdmp.Core.Tests/Curation/Integration/Dependencies/DependencyTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/Dependencies/DependencyTests.cs
@@ -25,12 +25,12 @@ public void ExtractionInformationTriangle()
         try
         {
             //col depends on tr
-            Assert.Contains(t,col.GetObjectsThisDependsOn());
-            Assert.Contains(col,t.GetObjectsDependingOnThis());
+            Assert.Contains(t, col.GetObjectsThisDependsOn());
+            Assert.Contains(col, t.GetObjectsDependingOnThis());
 
             //catalogue depends on catalogue items existing (slightly counter intuitive but think of it as data flow out of technical low level data through transforms into datasets - and then into researchers and research projects)
-            Assert.Contains(cat,ci.GetObjectsDependingOnThis());
-            Assert.Contains(ci,cat.GetObjectsThisDependsOn());
+            Assert.Contains(cat, ci.GetObjectsDependingOnThis());
+            Assert.Contains(ci, cat.GetObjectsThisDependsOn());
 
             //catalogue item should not be relying on anything currently (no link to underlying technical data)
             Assert.IsNull(ci.GetObjectsThisDependsOn());
@@ -38,7 +38,6 @@ public void ExtractionInformationTriangle()
             //now they are associated so the ci should be dependent on the col
             ci.SetColumnInfo(col);
             Assert.Contains(col, ci.GetObjectsDependingOnThis());
-
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/Curation/Integration/DitaExtractorTests.cs b/Rdmp.Core.Tests/Curation/Integration/DitaExtractorTests.cs
index 6c5012f748..8a8a33af42 100644
--- a/Rdmp.Core.Tests/Curation/Integration/DitaExtractorTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/DitaExtractorTests.cs
@@ -38,13 +38,12 @@ protected override void OneTimeSetUp()
             //delete all catalogues with duplicate names
             var catalogues = CatalogueRepository.GetAllObjects<Catalogue>().ToArray();
 
-            foreach (var cata in catalogues.GroupBy(c=>c.Name).Where(g=>g.Count()>1).SelectMany(y => y))
-            {
+            foreach (var cata in catalogues.GroupBy(c => c.Name).Where(g => g.Count() > 1).SelectMany(y => y))
                 cata.DeleteInDatabase();
-            }
 
             //make sure all Catalogues have acronyms, if they don't then assign them a super random one
-            foreach (var cata in CatalogueRepository.GetAllObjects<Catalogue>().Where(c=>string.IsNullOrWhiteSpace(c.Acronym)))
+            foreach (var cata in CatalogueRepository.GetAllObjects<Catalogue>()
+                         .Where(c => string.IsNullOrWhiteSpace(c.Acronym)))
             {
                 cata.Acronym = $"RANDOMACRONYM_{random.Next(10000)}";
                 cata.SaveToDatabase();
@@ -55,7 +54,7 @@ protected override void OneTimeSetUp()
             _setupException = e;
         }
     }
-        
+
     [SetUp]
     protected override void SetUp()
     {
@@ -75,14 +74,17 @@ public void DitaExtractorConstructor_ExtractTestCatalogue_FilesExist()
         var testDir = _directoryHelper.Directory;
 
         //get rid of any old copies lying around
-        var oldCatalogueVersion = CatalogueRepository.GetAllObjects<Catalogue>().SingleOrDefault(c => c.Name.Equals("DitaExtractorConstructor_ExtractTestCatalogue_FilesExist"));
+        var oldCatalogueVersion = CatalogueRepository.GetAllObjects<Catalogue>()
+            .SingleOrDefault(c => c.Name.Equals("DitaExtractorConstructor_ExtractTestCatalogue_FilesExist"));
         oldCatalogueVersion?.DeleteInDatabase();
 
-        var ditaTestCatalogue = new Catalogue(CatalogueRepository, "DitaExtractorConstructor_ExtractTestCatalogue_FilesExist")
+        var ditaTestCatalogue =
+            new Catalogue(CatalogueRepository, "DitaExtractorConstructor_ExtractTestCatalogue_FilesExist")
             {
                 Acronym = "DITA_TEST",
-                Description = $"Test catalogue for the unit test DitaExtractorConstructor_ExtractTestCatalogue_FilesExist in file {typeof(DitaExtractorTests).FullName}.cs"
-            };//name of Catalogue
+                Description =
+                    $"Test catalogue for the unit test DitaExtractorConstructor_ExtractTestCatalogue_FilesExist in file {typeof(DitaExtractorTests).FullName}.cs"
+            }; //name of Catalogue
 
         ditaTestCatalogue.SaveToDatabase();
 
@@ -99,12 +101,13 @@ public void DitaExtractorConstructor_ExtractTestCatalogue_FilesExist()
             Assert.IsTrue(File.Exists(Path.Combine(testDir.FullName, "dataset.dita")));
 
             //make sure the catalogue we created is there
-            var ditaCatalogueAsDotDitaFile = new FileInfo(Path.Combine(testDir.FullName, "ditaextractorconstructor_extracttestcatalogue_filesexist.dita"));//name of Dita file (for the Catalogue we just created)
+            var ditaCatalogueAsDotDitaFile = new FileInfo(Path.Combine(testDir.FullName,
+                "ditaextractorconstructor_extracttestcatalogue_filesexist.dita")); //name of Dita file (for the Catalogue we just created)
             Assert.IsTrue(ditaCatalogueAsDotDitaFile.Exists);
-            Assert.IsTrue(File.ReadAllText(ditaCatalogueAsDotDitaFile.FullName).Contains(ditaTestCatalogue.Description));
-
+            Assert.IsTrue(File.ReadAllText(ditaCatalogueAsDotDitaFile.FullName)
+                .Contains(ditaTestCatalogue.Description));
         }
-        finally 
+        finally
         {
             ditaTestCatalogue.DeleteInDatabase();
             foreach (var file in testDir.GetFiles())
@@ -129,22 +132,20 @@ public void CreateCatalogueWithNoAcronym_CrashesDITAExtractor()
             try
             {
                 var extractor = new DitaCatalogueExtractor(CatalogueRepository, testDir);
-                var ex = Assert.Throws<Exception>(()=>extractor.Extract(new ThrowImmediatelyDataLoadEventListener()));
-                Assert.AreEqual("Dita Extraction requires that each catalogue have a unique Acronym, the catalogue UnitTestCatalogue is missing an Acronym",ex.Message);
-
+                var ex = Assert.Throws<Exception>(() => extractor.Extract(new ThrowImmediatelyDataLoadEventListener()));
+                Assert.AreEqual(
+                    "Dita Extraction requires that each catalogue have a unique Acronym, the catalogue UnitTestCatalogue is missing an Acronym",
+                    ex.Message);
             }
             finally
             {
                 myNewCatalogue.DeleteInDatabase();
             }
-
         }
         finally
         {
             foreach (var file in testDir.GetFiles())
                 file.Delete();
         }
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/EncryptionTests.cs b/Rdmp.Core.Tests/Curation/Integration/EncryptionTests.cs
index 184ca1da83..f6b7e1421f 100644
--- a/Rdmp.Core.Tests/Curation/Integration/EncryptionTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/EncryptionTests.cs
@@ -19,7 +19,6 @@ public class EncryptionTests : DatabaseTests
     [Test]
     public void EncryptAndThenDecryptString()
     {
-
         var encrypter = CatalogueRepository.EncryptionManager.GetEncrypter();
 
         var toEncrypt = "Amagad";
@@ -27,20 +26,19 @@ public void EncryptAndThenDecryptString()
 
         Console.WriteLine($"Encrypted password was:{encrytpedBinaryString}");
         Assert.AreNotEqual(toEncrypt, encrytpedBinaryString);
-        Assert.AreEqual(toEncrypt,encrypter.Decrypt(encrytpedBinaryString));
+        Assert.AreEqual(toEncrypt, encrypter.Decrypt(encrytpedBinaryString));
     }
 
     [Test]
     public void CheckIfThingsAreEncryptedOrNot()
     {
-
         var encrypter = CatalogueRepository.EncryptionManager.GetEncrypter();
 
         var toEncrypt = "Amagad";
         var encrytpedBinaryString = encrypter.Encrypt(toEncrypt);
 
         Console.WriteLine($"Encrypted password was:{encrytpedBinaryString}");
-            
+
         Assert.True(encrypter.IsStringEncrypted(encrytpedBinaryString));
         Assert.False(encrypter.IsStringEncrypted(toEncrypt));
     }
@@ -50,7 +48,8 @@ public void CheckIfThingsAreEncryptedOrNot()
     public void MultiEncryptingShouldntBreakIt()
     {
         //cleanup
-        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>().Where(c => c.Name.Equals("frankieFran")))
+        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+                     .Where(c => c.Name.Equals("frankieFran")))
             c.DeleteInDatabase();
 
         var creds = new DataAccessCredentials(CatalogueRepository, "frankieFran");
@@ -58,10 +57,10 @@ public void MultiEncryptingShouldntBreakIt()
         {
             //as soon as you set a password it should be encrypted by the credentials class in memory
             creds.Password = "fish";
-                
+
             Assert.AreNotEqual("fish", creds.Password);
             Assert.AreEqual("fish", creds.GetDecryptedPassword()); //but we should still be able to decrypt it
-                
+
             //set the password to the encrypted password
             creds.Password = creds.Password;
 
@@ -80,7 +79,8 @@ public void MultiEncryptingShouldntBreakIt()
     public void DataAccessCredentialsEncryption()
     {
         //cleanup
-        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>().Where(c => c.Name.Equals("frankieFran")))
+        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+                     .Where(c => c.Name.Equals("frankieFran")))
             c.DeleteInDatabase();
 
         var creds = new DataAccessCredentials(CatalogueRepository, "frankieFran");
@@ -88,32 +88,35 @@ public void DataAccessCredentialsEncryption()
         {
             //as soon as you set a password it should be encrypted by the credentials class in memory
             creds.Password = "fish";
-            Assert.AreNotEqual("fish",creds.Password);
-            Assert.AreEqual("fish", creds.GetDecryptedPassword());//but we should still be able to decrypt it
-            
+            Assert.AreNotEqual("fish", creds.Password);
+            Assert.AreEqual("fish", creds.GetDecryptedPassword()); //but we should still be able to decrypt it
+
             //save it
             creds.SaveToDatabase();
             using (var con = CatalogueTableRepository.GetConnection())
             {
                 string value;
-                using(var cmd = DatabaseCommandHelper.GetCommand("Select Password from DataAccessCredentials where Name='frankieFran'", con.Connection, con.Transaction))
-                    value = (string) cmd.ExecuteScalar();
+                using (var cmd = DatabaseCommandHelper.GetCommand(
+                           "Select Password from DataAccessCredentials where Name='frankieFran'", con.Connection,
+                           con.Transaction))
+                {
+                    value = (string)cmd.ExecuteScalar();
+                }
 
                 //ensure password in database is encrypted
-                Assert.AreNotEqual("fish",value);
-                Assert.AreEqual(creds.Password,value);//does value in database match value in memory (encrypted)
+                Assert.AreNotEqual("fish", value);
+                Assert.AreEqual(creds.Password, value); //does value in database match value in memory (encrypted)
             }
 
             //get a new copy out of the database
             var newCopy = CatalogueRepository.GetObjectByID<DataAccessCredentials>(creds.ID);
-            Assert.AreEqual(creds.Password,newCopy.Password);//passwords should match
-            Assert.AreNotEqual("fish",creds.Password);//neither should be fish
+            Assert.AreEqual(creds.Password, newCopy.Password); //passwords should match
+            Assert.AreNotEqual("fish", creds.Password); //neither should be fish
             Assert.AreNotEqual("fish", newCopy.Password);
-            
+
             //both should decrypt to the same value (fish
-            Assert.AreEqual("fish",creds.GetDecryptedPassword());
+            Assert.AreEqual("fish", creds.GetDecryptedPassword());
             Assert.AreEqual("fish", newCopy.GetDecryptedPassword());
-
         }
         finally
         {
@@ -128,7 +131,8 @@ public void DataAccessCredentialsEncryption()
     public void TestFreakyPasswordValues(string freakyPassword)
     {
         //cleanup
-        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>().Where(c => c.Name.Equals("frankieFran")))
+        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+                     .Where(c => c.Name.Equals("frankieFran")))
             c.DeleteInDatabase();
 
         var creds = new DataAccessCredentials(CatalogueRepository, "frankieFran");
@@ -137,31 +141,34 @@ public void TestFreakyPasswordValues(string freakyPassword)
             //as soon as you set a password it should be encrypted by the credentials class in memory
             creds.Password = freakyPassword;
             Assert.AreNotEqual(freakyPassword, creds.Password);
-            Assert.AreEqual(freakyPassword, creds.GetDecryptedPassword());//but we should still be able to decrypt it
+            Assert.AreEqual(freakyPassword, creds.GetDecryptedPassword()); //but we should still be able to decrypt it
 
             //save it
             creds.SaveToDatabase();
             using (var con = CatalogueTableRepository.GetConnection())
             {
                 string value;
-                using(var cmd = DatabaseCommandHelper.GetCommand("Select Password from DataAccessCredentials where Name='frankieFran'", con.Connection, con.Transaction))
-                    value = (string) cmd.ExecuteScalar();
+                using (var cmd = DatabaseCommandHelper.GetCommand(
+                           "Select Password from DataAccessCredentials where Name='frankieFran'", con.Connection,
+                           con.Transaction))
+                {
+                    value = (string)cmd.ExecuteScalar();
+                }
 
                 //ensure password in database is encrypted
                 Assert.AreNotEqual(freakyPassword, value);
-                Assert.AreEqual(creds.Password, value);//does value in database match value in memory (encrypted)
+                Assert.AreEqual(creds.Password, value); //does value in database match value in memory (encrypted)
             }
 
             //get a new copy out of the database
             var newCopy = CatalogueRepository.GetObjectByID<DataAccessCredentials>(creds.ID);
-            Assert.AreEqual(creds.Password, newCopy.Password);//passwords should match
-            Assert.AreNotEqual(freakyPassword, creds.Password);//neither should be fish
+            Assert.AreEqual(creds.Password, newCopy.Password); //passwords should match
+            Assert.AreNotEqual(freakyPassword, creds.Password); //neither should be fish
             Assert.AreNotEqual(freakyPassword, newCopy.Password);
 
             //both should decrypt to the same value (fish
             Assert.AreEqual(freakyPassword, creds.GetDecryptedPassword());
             Assert.AreEqual(freakyPassword, newCopy.GetDecryptedPassword());
-
         }
         finally
         {
@@ -174,7 +181,8 @@ public void TestFreakyPasswordValues(string freakyPassword)
     public void MigrationOfOldPasswordsTest()
     {
         //cleanup
-        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>().Where(c => c.Name.Equals("frankieFran")))
+        foreach (var c in CatalogueRepository.GetAllObjects<DataAccessCredentials>()
+                     .Where(c => c.Name.Equals("frankieFran")))
             c.DeleteInDatabase();
 
         //create a new credentials
@@ -185,15 +193,17 @@ public void MigrationOfOldPasswordsTest()
             using (var con = CatalogueTableRepository.GetConnection())
             {
                 using (var cmd = DatabaseCommandHelper.GetCommand(
-                           "UPDATE DataAccessCredentials set Password = 'fish' where Name='frankieFran'", con.Connection,
+                           "UPDATE DataAccessCredentials set Password = 'fish' where Name='frankieFran'",
+                           con.Connection,
                            con.Transaction))
+                {
                     Assert.AreEqual(1, cmd.ExecuteNonQuery());
-                    
+                }
             }
 
             var newCopy = CatalogueRepository.GetObjectByID<DataAccessCredentials>(creds.ID);
-                
-            Assert.AreEqual("fish",newCopy.GetDecryptedPassword());
+
+            Assert.AreEqual("fish", newCopy.GetDecryptedPassword());
             Assert.AreNotEqual("fish", newCopy.Password);
         }
         finally
@@ -205,15 +215,18 @@ public void MigrationOfOldPasswordsTest()
     [Test]
     public void PasswordTooLong()
     {
-        if(RepositoryLocator.CatalogueRepository.EncryptionManager is PasswordEncryptionKeyLocation em && !string.IsNullOrWhiteSpace(em.GetKeyFileLocation()))
-            Assert.Inconclusive("Could not run test because there is already an encryption key set up.  Likely one that handles very long passwords");
+        if (RepositoryLocator.CatalogueRepository.EncryptionManager is PasswordEncryptionKeyLocation em &&
+            !string.IsNullOrWhiteSpace(em.GetKeyFileLocation()))
+            Assert.Inconclusive(
+                "Could not run test because there is already an encryption key set up.  Likely one that handles very long passwords");
 
         var password = "a";
         for (var i = 0; i < 200; i++)
             password += "a";
 
         var ex = Assert.Throws<InvalidOperationException>(() => TestFreakyPasswordValues(password));
-        Assert.AreEqual("The free text Value supplied to this class was too long to be encrypted (Length of string was 201)", ex.Message);
+        Assert.AreEqual(
+            "The free text Value supplied to this class was too long to be encrypted (Length of string was 201)",
+            ex.Message);
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ExtractionFilterTests.cs b/Rdmp.Core.Tests/Curation/Integration/ExtractionFilterTests.cs
index a75a57cf80..97dbf9cf24 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ExtractionFilterTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ExtractionFilterTests.cs
@@ -17,8 +17,9 @@ public class ExtractionFilterTests : DatabaseTests
     public void TestExtractionFilterDeleting_WhenItHas_ExtractionFilterParameterSet_DirectlyFails()
     {
         var filter = GetFilterWithParameterSet();
-        var ex = Assert.Throws<Exception>(()=>filter.DeleteInDatabase());
-        Assert.AreEqual("Cannot delete 'Age' because there are one or more ExtractionFilterParameterSet declared on it", ex.Message);
+        var ex = Assert.Throws<Exception>(() => filter.DeleteInDatabase());
+        Assert.AreEqual("Cannot delete 'Age' because there are one or more ExtractionFilterParameterSet declared on it",
+            ex.Message);
     }
 
     private ExtractionFilter GetFilterWithParameterSet()
@@ -38,7 +39,7 @@ private ExtractionFilter GetFilterWithParameterSet()
 
         var paramSet = new ExtractionFilterParameterSet(CatalogueRepository, filter, "Old");
         paramSet.CreateNewValueEntries();
-            
+
         return filter;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationTests.cs b/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationTests.cs
index 7f5c08b0a9..043f06bace 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationTests.cs
@@ -40,7 +40,6 @@ protected override void SetUp()
 
         //create a link between catalogue item lazor and velocity column
         cataItem.SetColumnInfo(columnInfo);
-                
     }
 
     [Test]
@@ -55,7 +54,6 @@ public void BasicIDsAreCorrect()
     [Test]
     public void test_creating_ExtractionFilter()
     {
-
         ExtractionInformation extractInfo = null;
         ExtractionFilter filterFastThings = null;
         ExtractionFilterParameter parameter = null;
@@ -63,7 +61,8 @@ public void test_creating_ExtractionFilter()
         try
         {
             //define extraction information
-            extractInfo = new ExtractionInformation(CatalogueRepository, cataItem, columnInfo, "ROUND(VelocityOfMatter,2) VelocityOfMatterRounded");
+            extractInfo = new ExtractionInformation(CatalogueRepository, cataItem, columnInfo,
+                "ROUND(VelocityOfMatter,2) VelocityOfMatterRounded");
 
             //define filter and parameter
             filterFastThings = new ExtractionFilter(CatalogueRepository, "FastThings", extractInfo)
@@ -77,16 +76,17 @@ public void test_creating_ExtractionFilter()
             parameter = new ExtractionFilterParameter(CatalogueRepository, "DECLARE @X INT", filterFastThings);
 
             Assert.IsNotNull(parameter);
-            Assert.AreEqual(parameter.ParameterName ,"@X");
+            Assert.AreEqual(parameter.ParameterName, "@X");
 
             parameter.Value = "500";
             parameter.SaveToDatabase();
 
             var afterSave = CatalogueRepository.GetObjectByID<ExtractionFilterParameter>(parameter.ID);
-            Assert.AreEqual(afterSave.Value ,"500");
+            Assert.AreEqual(afterSave.Value, "500");
 
 
-            var filterFastThings_NewCopyFromDB = CatalogueRepository.GetObjectByID<ExtractionFilter>(filterFastThings.ID);
+            var filterFastThings_NewCopyFromDB =
+                CatalogueRepository.GetObjectByID<ExtractionFilter>(filterFastThings.ID);
 
             Assert.AreEqual(filterFastThings.ID, filterFastThings_NewCopyFromDB.ID);
             Assert.AreEqual(filterFastThings.Description, filterFastThings_NewCopyFromDB.Description);
@@ -102,21 +102,15 @@ public void test_creating_ExtractionFilter()
 
             extractInfo?.DeleteInDatabase();
         }
-            
-
-
     }
 
     [Test]
     public void test_creating_ExtractionInformation()
     {
-            
-            
-        ExtractionInformation extractInfo =null;
+        ExtractionInformation extractInfo = null;
 
         try
         {
-           
             //define extraction information
             //change some values and then save it
             extractInfo = new ExtractionInformation(CatalogueRepository, cataItem, columnInfo, "dave")
@@ -125,9 +119,9 @@ public void test_creating_ExtractionInformation()
                 ExtractionCategory = ExtractionCategory.Supplemental
             };
             extractInfo.SaveToDatabase();
-                
+
             //confirm the insert worked
-            Assert.AreEqual(extractInfo.SelectSQL,"dave");
+            Assert.AreEqual(extractInfo.SelectSQL, "dave");
 
             //fetch the extraction information via the linked CatalogueItem - ColumnInfo pair (i.e. we are testing the alternate route to fetch ExtractionInformation - by ID or by colum/item pair)
             var extractInfo2_CameFromLinker = cataItem.ExtractionInformation;
@@ -135,14 +129,12 @@ public void test_creating_ExtractionInformation()
             Assert.AreEqual(extractInfo.SelectSQL, extractInfo2_CameFromLinker.SelectSQL);
 
             //make sure it saves properly
-            Assert.AreEqual(extractInfo2_CameFromLinker.Order,123 );
-            Assert.AreEqual( extractInfo2_CameFromLinker.ExtractionCategory,ExtractionCategory.Supplemental);
-
+            Assert.AreEqual(extractInfo2_CameFromLinker.Order, 123);
+            Assert.AreEqual(extractInfo2_CameFromLinker.ExtractionCategory, ExtractionCategory.Supplemental);
         }
         finally
         {
             extractInfo?.DeleteInDatabase();
-
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationUnitTests.cs b/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationUnitTests.cs
index a48388efc3..31cdf00bf7 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationUnitTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ExtractionInformationUnitTests.cs
@@ -26,15 +26,15 @@ public void NewExtractionInformation_OrderShouldBeContiguous(int? explicitOrder)
             ei.Order = explicitOrder.Value;
             ei.SaveToDatabase();
         }
-                
-        Assert.AreEqual(explicitOrder ?? 1,ei.Order);
+
+        Assert.AreEqual(explicitOrder ?? 1, ei.Order);
 
         // Newly created ones should have the right Order to not collide
         var cata = ei.CatalogueItem.Catalogue;
         var cataItem = new CatalogueItem(RepositoryLocator.CatalogueRepository, cata, "ci");
         var ei2 = new ExtractionInformation(RepositoryLocator.CatalogueRepository, cataItem, ei.ColumnInfo, "fff");
 
-        Assert.AreEqual((explicitOrder ?? 1) + 1,ei2.Order);
+        Assert.AreEqual((explicitOrder ?? 1) + 1, ei2.Order);
     }
 
     [Test]
@@ -48,16 +48,16 @@ public void NewExtractionInformation_OrderShouldBeContiguous_ManyCalls()
         var cataItem2 = new CatalogueItem(RepositoryLocator.CatalogueRepository, cata, "ci");
         var ei2 = new ExtractionInformation(RepositoryLocator.CatalogueRepository, cataItem2, ei1.ColumnInfo, "fff");
 
-        Assert.AreEqual(2,ei2.Order);
+        Assert.AreEqual(2, ei2.Order);
 
         var cataItem3 = new CatalogueItem(RepositoryLocator.CatalogueRepository, cata, "ci");
         var ei3 = new ExtractionInformation(RepositoryLocator.CatalogueRepository, cataItem3, ei1.ColumnInfo, "fff");
 
-        Assert.AreEqual(3,ei3.Order);
+        Assert.AreEqual(3, ei3.Order);
 
         var cataItem4 = new CatalogueItem(RepositoryLocator.CatalogueRepository, cata, "ci");
         var ei4 = new ExtractionInformation(RepositoryLocator.CatalogueRepository, cataItem4, ei1.ColumnInfo, "fff");
 
-        Assert.AreEqual(4,ei4.Order);
+        Assert.AreEqual(4, ei4.Order);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/FilterImporterTests.cs b/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/FilterImporterTests.cs
index 698b214a17..447c5ecc6a 100644
--- a/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/FilterImporterTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/FilterImporterTests.cs
@@ -19,46 +19,45 @@ namespace Rdmp.Core.Tests.Curation.Integration.FilterImportingTests;
 [Category("Unit")]
 public class FilterImporterTests : UnitTests
 {
-        
     [Test]
     public void FilterCreated_NewFilterGetsSameName()
     {
         //Thing we will be cloning
-        var master = Mock.Of<IFilter>(x => 
-            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance && 
+        var master = Mock.Of<IFilter>(x =>
+            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
             x.Name == "Space Odyssey");
 
         //The factory will return this value
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
 
         //The factory Mock
         var factory = new Mock<IFilterFactory>();
         factory.Setup(m => m.CreateNewFilter("Space Odyssey")).Returns(constructed);
 
         //The thing we are testing
-        var filterCreator = new FilterImporter(factory.Object,null);
-        
+        var filterCreator = new FilterImporter(factory.Object, null);
+
         //The method we are testing
-        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(),master,null);
+        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, null);
 
         //Did the factory mock get ordered to create a filter called "Space Odyssey"?
-        factory.Verify(f=>f.CreateNewFilter(It.IsAny<string>()),Times.Once);
+        factory.Verify(f => f.CreateNewFilter(It.IsAny<string>()), Times.Once);
     }
 
     [Test]
     public void FilterCreated_CopyBecauseExistsAlready()
     {
         //The thing we will be importing
-        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         master.Name = "Space Odyssey";
 
         //An existing IFilter that is in the scope that is being imported into (e.g. a data extract configuration)
-        var existing = Mock.Of<IFilter>(f=>
+        var existing = Mock.Of<IFilter>(f =>
             f.Name == "Space Odyssey" &&
-            f.GetAllParameters()==Array.Empty<ISqlParameter>());// has no parameters
+            f.GetAllParameters() == Array.Empty<ISqlParameter>()); // has no parameters
 
         //The factory will return this value
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
 
         //The factory Mock
         var factory = new Mock<IFilterFactory>();
@@ -68,7 +67,7 @@ public void FilterCreated_CopyBecauseExistsAlready()
         var filterCreator = new FilterImporter(factory.Object, null);
 
         //The method we are testing
-        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master,new []{existing});
+        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, new[] { existing });
 
         //Did the factory mock get ordered to create a filter called "Copy of Space Odyssey" (because there was already one called "Space Odyssey" in the same scope)
         factory.Verify();
@@ -77,69 +76,73 @@ public void FilterCreated_CopyBecauseExistsAlready()
     [Test]
     public void FilterCreated_Parameters()
     {
-        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         master.Name = "Space Odyssey";
         master.WhereSQL = "@hall = 'active'";
 
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         var constructedParameter = Mock.Of<ISqlParameter>();
 
         var factory = new Mock<IFilterFactory>();
         factory.Setup(m => m.CreateNewFilter("Space Odyssey")).Returns(constructed);
-        factory.Setup(m => m.CreateNewParameter(constructed, "DECLARE @hall AS varchar(50);")).Returns(constructedParameter);
+        factory.Setup(m => m.CreateNewParameter(constructed, "DECLARE @hall AS varchar(50);"))
+            .Returns(constructedParameter);
 
         var filterCreator = new FilterImporter(factory.Object, null);
         //Returns constructed
         filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, null);
-            
-        factory.Verify(m => m.CreateNewFilter("Space Odyssey"),Times.Once);
-        factory.Verify(m=>m.CreateNewParameter(constructed, "DECLARE @hall AS varchar(50);"), Times.Once);
+
+        factory.Verify(m => m.CreateNewFilter("Space Odyssey"), Times.Once);
+        factory.Verify(m => m.CreateNewParameter(constructed, "DECLARE @hall AS varchar(50);"), Times.Once);
     }
+
     [Test]
     public void FilterCreated_ParametersWithMasterExplicitTyping()
     {
         //The filter we are cloning
         var master = Mock.Of<IFilter>(x =>
-            x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance && 
-            x.Name == "Space Odyssey" && 
+            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
+            x.Name == "Space Odyssey" &&
             x.WhereSQL == "@hall = 'active'");
 
         //The existing parameter declared on the filter we are cloning
         var masterParameter = Mock.Of<ISqlParameter>(
             x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
-                 x.ParameterName=="@hall" && 
+                 x.ParameterName == "@hall" &&
                  x.Comment == "SomeComment" &&
                  x.Value == "500" &&
                  x.ParameterSQL == "DECLARE @hall AS int"
         );
 
-        Mock.Get(master).Setup(m=> m.GetAllParameters()).Returns(new[] {masterParameter});
+        Mock.Get(master).Setup(m => m.GetAllParameters()).Returns(new[] { masterParameter });
         //We expect that the filter we are cloning will be asked what its parameters are once (and we tell them the param above)
 
 
         //The return values for our Mock factory
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         var constructedParameter = Mock.Of<ISqlParameter>();
         constructedParameter.ParameterSQL = "DECLARE @hall AS int";
 
         //The mock factory will return the above instances for the new cloned objects
-        var factory = Mock.Of<IFilterFactory>( m=>
-            m.CreateNewFilter("Space Odyssey")==constructed &&
-            m.CreateNewParameter(constructed, "DECLARE @hall AS int")==constructedParameter                );
+        var factory = Mock.Of<IFilterFactory>(m =>
+            m.CreateNewFilter("Space Odyssey") == constructed &&
+            m.CreateNewParameter(constructed, "DECLARE @hall AS int") == constructedParameter);
 
         //The thing we are actually testing
         var filterCreator = new FilterImporter(factory, null);
-        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, null);//Import it brah
-            
+        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, null); //Import it brah
+
         //Master filter should have been asked what its parameters are
         Mock.Get(master).Verify();
 
         //factory should have been asked to create a new filter called "Space Odyssey" and a parameter with a declaration that matches the master filter SQL (i.e. 'AS int')
-        Mock.Get(factory).Verify(m=>m.CreateNewFilter("Space Odyssey"),Times.Once);
+        Mock.Get(factory).Verify(m => m.CreateNewFilter("Space Odyssey"), Times.Once);
 
         //The master filter parameters should have been copied to the child
         Assert.AreEqual(constructedParameter.Comment, masterParameter.Comment);
-        Assert.AreEqual(constructedParameter.ParameterSQL, masterParameter.ParameterSQL); //We actually manually set this above because that's the contract with "CreateNewParameter"
+        Assert.AreEqual(constructedParameter.ParameterSQL,
+            masterParameter
+                .ParameterSQL); //We actually manually set this above because that's the contract with "CreateNewParameter"
         Assert.AreEqual(constructedParameter.Value, masterParameter.Value);
     }
 
@@ -147,49 +150,51 @@ public void FilterCreated_ParametersWithMasterExplicitTyping()
     public void FilterCreated_ParametersRenamingDueToExistingParameterInScopeWithSameName()
     {
         //The filter we are cloning
-        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         master.Name = "Space Odyssey";
         master.WhereSQL = "@hall = 'active'";
 
         //An existing parameter that is in the scope that is being imported into
-        var existingParameter = Mock.Of<ISqlParameter>(x => x.ParameterName=="@hall");
+        var existingParameter = Mock.Of<ISqlParameter>(x => x.ParameterName == "@hall");
 
         //The filter to which the above existing parameter belongs
-        var existing = Mock.Of<IFilter>(x => 
-            x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance&&
-            x.GetAllParameters()==new[] { existingParameter });
+        var existing = Mock.Of<IFilter>(x =>
+            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
+            x.GetAllParameters() == new[] { existingParameter });
         existing.Name = "Space Odyssey";
 
         //The return value for our Mock factory
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         var constructedParameter = Mock.Of<ISqlParameter>();
 
         //The mocked factory
         var factory = new Mock<IFilterFactory>();
         factory.Setup(m => m.CreateNewFilter("Copy of Space Odyssey")).Returns(constructed);
-        factory.Setup(m => m.CreateNewParameter(constructed,"DECLARE @hall2 AS varchar(50);")).Returns(constructedParameter);
+        factory.Setup(m => m.CreateNewParameter(constructed, "DECLARE @hall2 AS varchar(50);"))
+            .Returns(constructedParameter);
 
         //The thing we are testing
         var filterCreator = new FilterImporter(factory.Object, null);
-        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, new []{existing});
+        filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, new[] { existing });
 
         //Existing filter in the scope should have been asked what its parameters are
-        Mock.Get(existing).Verify(x=>x.GetAllParameters(),Times.Once);
+        Mock.Get(existing).Verify(x => x.GetAllParameters(), Times.Once);
 
         //The factory should have been asked to create a filter called "Copy of Space Odyssey" and a parameter "@hall2" (because @hall already exists in the import into scope)
         factory.Verify();
     }
 
     [Test]
-    public void FilterCreated_ParametersRenamingDueToExistingParameterInScopeWithSameName_MasterContainsMasterParameter()
+    public void
+        FilterCreated_ParametersRenamingDueToExistingParameterInScopeWithSameName_MasterContainsMasterParameter()
     {
         //The filter we are cloning
-        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var master = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         master.Name = "Space Odyssey";
         master.WhereSQL = "@hall = 'active'";
 
         //The existing parameter declared on the filter we are cloning
-        var masterParameter = Mock.Of<ISqlParameter>(p => p.ParameterName=="@hall");
+        var masterParameter = Mock.Of<ISqlParameter>(p => p.ParameterName == "@hall");
         masterParameter.Comment = "SomeComment";
         masterParameter.Value = "500";
         masterParameter.ParameterSQL = "DECLARE @hall AS int";
@@ -198,16 +203,16 @@ public void FilterCreated_ParametersRenamingDueToExistingParameterInScopeWithSam
         Mock.Get(master).Setup(m => m.GetAllParameters()).Returns(new[] { masterParameter });
 
         //An existing parameter that is in the scope that is being imported into
-        var existingParameter = Mock.Of<ISqlParameter>(x => x.ParameterName=="@hall");
+        var existingParameter = Mock.Of<ISqlParameter>(x => x.ParameterName == "@hall");
 
         //The filter to which the above existing parameter belongs
-        var existing = Mock.Of<IFilter>(x => 
-            x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance &&
-            x.GetAllParameters()==new[] { existingParameter });
+        var existing = Mock.Of<IFilter>(x =>
+            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
+            x.GetAllParameters() == new[] { existingParameter });
         existing.Name = "Space Odyssey";
 
         //The return value for our Mock factory
-        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var constructed = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         var constructedParameter = Mock.Of<ISqlParameter>();
 
         //The mocked factory
@@ -219,10 +224,10 @@ public void FilterCreated_ParametersRenamingDueToExistingParameterInScopeWithSam
         var filterCreator = new FilterImporter(factory.Object, null);
         filterCreator.ImportFilter(WhenIHaveA<AggregateFilterContainer>(), master, new[] { existing });
 
-        Assert.AreEqual("@hall2 = 'active'",constructed.WhereSQL);
+        Assert.AreEqual("@hall2 = 'active'", constructed.WhereSQL);
 
         //Master filter should have been asked what its parameters are
-        Mock.Get(master).Verify(m => m.GetAllParameters(),Times.Once);
+        Mock.Get(master).Verify(m => m.GetAllParameters(), Times.Once);
 
         //Existing filter in the scope should have been asked what its parameters are
         Mock.Get(existing).Verify();
diff --git a/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/ParameterCreatorTests.cs b/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/ParameterCreatorTests.cs
index d45d718c96..73162db477 100644
--- a/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/ParameterCreatorTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/FilterImportingTests/ParameterCreatorTests.cs
@@ -20,86 +20,89 @@ public class ParameterCreatorTests
     [Test]
     public void NoParametersTest_CreateNotCalled()
     {
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
 
         var factory = new Mock<IFilterFactory>();
-        factory.Verify(m => m.CreateNewParameter(It.IsAny<IFilter>(), It.IsAny<string>()),Times.Never);
+        factory.Verify(m => m.CreateNewParameter(It.IsAny<IFilter>(), It.IsAny<string>()), Times.Never);
 
         var creator = new ParameterCreator(factory.Object, Array.Empty<ISqlParameter>(), null);
-        creator.CreateAll(f,null);
+        creator.CreateAll(f, null);
 
         factory.Verify();
     }
-        
+
 
     [Test]
     public void SingleParameterTest_NullReturnFromConstruct_Throws()
     {
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         f.WhereSQL = "@bob = 'bob'";
 
-        var factory = Mock.Of<IFilterFactory>(m => m.CreateNewParameter(f,"DECLARE @bob AS varchar(50);")==null);
+        var factory = Mock.Of<IFilterFactory>(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);") == null);
 
         var creator = new ParameterCreator(factory, null, null);
 
-        var ex = Assert.Throws<NullReferenceException>(()=>creator.CreateAll(f,null));
+        var ex = Assert.Throws<NullReferenceException>(() => creator.CreateAll(f, null));
 
         Assert.IsTrue(ex.Message.StartsWith("Parameter construction method returned null"));
     }
-       
+
     [Test]
     public void SingleParameterTest_OneParameter_CreateCalled()
     {
-        var p = new Mock<ISqlParameter>();//save should be called because there is no VAlue on the parameter
+        var p = new Mock<ISqlParameter>(); //save should be called because there is no VAlue on the parameter
         p.Setup(m => m.SaveToDatabase());
 
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         f.WhereSQL = "@bob = 'bob'";
 
         var factory = new Mock<IFilterFactory>();
-        factory.Setup(m => m.CreateNewParameter(f,"DECLARE @bob AS varchar(50);")).Returns(p.Object);
+        factory.Setup(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);")).Returns(p.Object);
 
         var creator = new ParameterCreator(factory.Object, null, null);
-        creator.CreateAll(f,null);
+        creator.CreateAll(f, null);
 
-        p.Verify(m => m.SaveToDatabase(),Times.Once);
+        p.Verify(m => m.SaveToDatabase(), Times.Once);
         p.Verify();
-        factory.Verify(m => m.CreateNewParameter(f,"DECLARE @bob AS varchar(50);"),Times.Once);
+        factory.Verify(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);"), Times.Once);
     }
+
     [Test]
     public void SingleParameterTest_ParameterAlreadyExists_CreateNotCalled()
     {
-        var p = new Mock<ISqlParameter>();//save should be called because there is no VAlue on the parameter
+        var p = new Mock<ISqlParameter>(); //save should be called because there is no VAlue on the parameter
         p.Setup(m => m.SaveToDatabase());
 
-        var existingParameter = Mock.Of<ISqlParameter>(x => 
-            x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance &&
-            x.ParameterName=="@bob"
+        var existingParameter = Mock.Of<ISqlParameter>(x =>
+            x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
+            x.ParameterName == "@bob"
         );
 
         var f = Mock.Of<IFilter>(x =>
             x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance &&
-            x.WhereSQL == "@bob = 'bob'" && 
-            x.GetAllParameters() == new[] {existingParameter});
+            x.WhereSQL == "@bob = 'bob'" &&
+            x.GetAllParameters() == new[] { existingParameter });
 
         var factory = new Mock<IFilterFactory>();
 
         var creator = new ParameterCreator(factory.Object, null, null);
-        creator.CreateAll(f,null);
         creator.CreateAll(f, null);
-        creator.CreateAll(f, null);//no matter how many times we call create it shouldn't make more because there is already one
+        creator.CreateAll(f, null);
+        creator.CreateAll(f,
+            null); //no matter how many times we call create it shouldn't make more because there is already one
 
-        p.Verify(m=> m.SaveToDatabase(),Times.Never);
-        factory.Verify(m=> m.CreateNewParameter(f, It.IsAny<string>()),Times.Never); //should never be called because the filter already has 
+        p.Verify(m => m.SaveToDatabase(), Times.Never);
+        factory.Verify(m => m.CreateNewParameter(f, It.IsAny<string>()),
+            Times.Never); //should never be called because the filter already has 
     }
-        
+
     [Test]
     public void SingleParameterTest_GlobalOverrides_CreateNotCalled()
     {
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         f.WhereSQL = "@bob = 'bob'";
 
-        var global = Mock.Of<ISqlParameter>(x=>x.ParameterName=="@bob");
+        var global = Mock.Of<ISqlParameter>(x => x.ParameterName == "@bob");
 
         var factory = new Mock<IFilterFactory>();
         factory
@@ -107,7 +110,7 @@ public void SingleParameterTest_GlobalOverrides_CreateNotCalled()
             .Throws<InvalidOperationException>();
 
         var creator = new ParameterCreator(factory.Object, new[] { global }, null);
-        creator.CreateAll(f,null);
+        creator.CreateAll(f, null);
 
         factory.Verify();
     }
@@ -115,19 +118,19 @@ public void SingleParameterTest_GlobalOverrides_CreateNotCalled()
     [Test]
     public void SingleParameterTest_GlobalButNotSameName_CreateCalled()
     {
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         f.WhereSQL = "@bob = 'bob'";
 
-        var global = Mock.Of<ISqlParameter>(x => x.ParameterName=="@bob");
+        var global = Mock.Of<ISqlParameter>(x => x.ParameterName == "@bob");
 
         var factory = new Mock<IFilterFactory>();
-        factory.Setup<ISqlParameter>(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);")).Returns(Mock.Of<ISqlParameter>);
+        factory.Setup<ISqlParameter>(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);"))
+            .Returns(Mock.Of<ISqlParameter>);
 
         var creator = new ParameterCreator(factory.Object, null, null);
-        creator.CreateAll(f,null);
-
-        factory.Verify<ISqlParameter>(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);"),Times.Once);
+        creator.CreateAll(f, null);
 
+        factory.Verify<ISqlParameter>(m => m.CreateNewParameter(f, "DECLARE @bob AS varchar(50);"), Times.Once);
     }
 
 
@@ -138,12 +141,12 @@ public void SingleParameterTest_Template_TemplateValuesUsed()
         var pstub = Mock.Of<ISqlParameter>();
 
         //The filter that requires that the parameters be created
-        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper()==MicrosoftQuerySyntaxHelper.Instance);
+        var f = Mock.Of<IFilter>(x => x.GetQuerySyntaxHelper() == MicrosoftQuerySyntaxHelper.Instance);
         f.WhereSQL = "@bob = 'bob'";
 
         //The template which is an existing known about parameter from the master filter that is being duplicated.  This template will be spotted and used to make the new parameter match the cloned filter's one
-        var template = Mock.Of<ISqlParameter>(x => x.ParameterName=="@bob");
-            
+        var template = Mock.Of<ISqlParameter>(x => x.ParameterName == "@bob");
+
         template.ParameterSQL = "DECLARE @bob AS int";
         template.Value = "5";
         template.Comment = "fish";
@@ -151,21 +154,23 @@ public void SingleParameterTest_Template_TemplateValuesUsed()
         var factory = new Mock<IFilterFactory>();
         factory.Setup(m => m.CreateNewParameter(f, "DECLARE @bob AS int")).Returns(pstub);
 
-        var creator = new ParameterCreator(factory.Object, null, new []{template});
-        creator.CreateAll(f,null);
+        var creator = new ParameterCreator(factory.Object, null, new[] { template });
+        creator.CreateAll(f, null);
 
         Assert.AreEqual("5", pstub.Value);
-        Assert.AreEqual("fish", pstub.Comment); 
+        Assert.AreEqual("fish", pstub.Comment);
 
-        factory.Verify(m => m.CreateNewParameter(f, "DECLARE @bob AS int"),Times.Once);
+        factory.Verify(m => m.CreateNewParameter(f, "DECLARE @bob AS int"), Times.Once);
     }
 
     [TestCase("[MyTable].[MyCol] = @name", "@name", "@name2", "[MyTable].[MyCol] = @name2")]
     [TestCase("[Col]=@name OR [Col]=@name2", "@name", "@chtulhu", "[Col]=@chtulhu OR [Col]=@name2")]
     [TestCase("([MyTable].[MyCol] = @name) OR ...", "@name", "@name2", "([MyTable].[MyCol] = @name2) OR ...")]
-    [TestCase("[MyTable].[MyCol] = @name2", "@name", "@cthulhu", "[MyTable].[MyCol] = @name2")]//No match since it is a substring
+    [TestCase("[MyTable].[MyCol] = @name2", "@name", "@cthulhu",
+        "[MyTable].[MyCol] = @name2")] //No match since it is a substring
     [TestCase("[MyTable].[MyCol] = @name_2", "@name", "@cthulhu", "[MyTable].[MyCol] = @name_2")]
-    [TestCase("[MyTable].[MyCol] = @name@@coconuts", "@name", "@cthulhu", "[MyTable].[MyCol] = @name@@coconuts")]//No match since @ is a legit word to use in a parameter name making @name@coconuts legal name for a 
+    [TestCase("[MyTable].[MyCol] = @name@@coconuts", "@name", "@cthulhu",
+        "[MyTable].[MyCol] = @name@@coconuts")] //No match since @ is a legit word to use in a parameter name making @name@coconuts legal name for a 
     [TestCase("@a=a", "@a", "@b", "@b=a")]
     [TestCase(@"a=@a
     OR
@@ -175,7 +180,7 @@ public void SingleParameterTest_Template_TemplateValuesUsed()
     public void ReplaceParametersSQL(string haystack, string needle, string replacement, string expectedOutput)
     {
         var output = ParameterCreator.RenameParameterInSQL(haystack, needle, replacement);
-        Assert.AreEqual(expectedOutput,output);
+        Assert.AreEqual(expectedOutput, output);
     }
 
     [Test]
@@ -208,6 +213,6 @@ [test]..[prescribing].[approved_name] LIKE @drugName2_2
 [test]..[prescribing].[approved_name] LIKE @drugName3_2";
 
 
-        Assert.AreEqual(expectedoutput,newString);
+        Assert.AreEqual(expectedoutput, newString);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ForwardEngineerANOCatalogueTests.cs b/Rdmp.Core.Tests/Curation/Integration/ForwardEngineerANOCatalogueTests.cs
index bee7e326af..6d441b3610 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ForwardEngineerANOCatalogueTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ForwardEngineerANOCatalogueTests.cs
@@ -34,7 +34,7 @@ protected override void SetUp()
 
         BlitzMainDataTables();
 
-        if(ANOStore_Database.Exists())
+        if (ANOStore_Database.Exists())
             DeleteTables(ANOStore_Database);
     }
 
@@ -52,9 +52,9 @@ public void PlanManagementTest()
         bulk.ImportAsCatalogue();
 
         var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, bulk.catalogue)
- {
-     TargetDatabase = db
- };
+        {
+            TargetDatabase = db
+        };
 
         //no operations are as yet configured
         Assert.DoesNotThrow(() => planManager.Check(new ThrowImmediatelyCheckNotifier()));
@@ -62,7 +62,7 @@ public void PlanManagementTest()
         //create a table with the same name in the endpoint database to confirm that that's a problem
         db.CreateTable(bulk.tableInfo.GetRuntimeName(), new DatabaseColumnRequest[]
         {
-            new DatabaseColumnRequest("fish", "varchar(100)")
+            new("fish", "varchar(100)")
         });
 
         //throws because table already exists
@@ -84,10 +84,8 @@ public void PlanManagementTest()
             {
                 planManager.GetPlanForColumnInfo(chi).Plan = Plan.Drop;
                 planManager.GetPlanForColumnInfo(chi).Check(new ThrowImmediatelyCheckNotifier());
-
             }
-
-            ,"Should not be able to drop primary key column");
+            , "Should not be able to drop primary key column");
 
         db.Drop();
     }
@@ -106,10 +104,10 @@ public void CreateANOVersionTest()
         bulk.SetupTestData();
         bulk.ImportAsCatalogue();
 
-        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator,bulk.catalogue)
- {
-     TargetDatabase = db
- };
+        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, bulk.catalogue)
+        {
+            TargetDatabase = db
+        };
 
         //setup test rules for migrator
         CreateMigrationRules(planManager, bulk);
@@ -145,11 +143,11 @@ public void CreateANOVersionTest_IntIdentity()
         //Create this table in the scratch database
         var tbl = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer).CreateTable("MyTable", new[]
         {
-            new DatabaseColumnRequest("id", "int identity(1,1)", false) {IsPrimaryKey = true},
-            new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 10), false)
+            new DatabaseColumnRequest("id", "int identity(1,1)", false) { IsPrimaryKey = true },
+            new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 10), false)
         });
 
-        var cata = Import(tbl,out var ti, out var cols);
+        var cata = Import(tbl, out var ti, out var cols);
 
         var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, cata)
         {
@@ -171,10 +169,10 @@ public void CreateANOVersionTest_IntIdentity()
         Assert.IsTrue(anoCatalogue.Exists());
 
         //should only be one (the id column
-        Assert.AreEqual(1,anoCatalogue.CatalogueItems.Length);
+        Assert.AreEqual(1, anoCatalogue.CatalogueItems.Length);
         var idColInAnoDatabase = anoCatalogue.CatalogueItems[0].ColumnInfo;
         Assert.AreEqual("int", idColInAnoDatabase.Data_type);
-            
+
         db.Drop();
 
         var exports = CatalogueRepository.GetAllObjects<ObjectExport>().Length;
@@ -185,13 +183,13 @@ public void CreateANOVersionTest_IntIdentity()
     }
 
 
-
     [Test]
-    [TestCase(false,false)]
+    [TestCase(false, false)]
     [TestCase(false, true)]
-    [TestCase(true,false)]
-    [TestCase(true,true)]
-    public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSkippedTable,bool putPlanThroughSerialization)
+    [TestCase(true, false)]
+    [TestCase(true, true)]
+    public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSkippedTable,
+        bool putPlanThroughSerialization)
     {
         var dbFrom = From;
         var dbTo = To;
@@ -211,7 +209,7 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
             new DatabaseColumnRequest("Vertebrae", "varchar(25)")
         };
 
-        var tblFromNeck = dbFrom.CreateTable("Necks",cols);
+        var tblFromNeck = dbFrom.CreateTable("Necks", cols);
 
         //Necks table already exists in the destination so will be skipped for migration but still needs to be imported
         var tblToNeck = dbTo.CreateTable("Necks", cols);
@@ -221,9 +219,9 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
 
         var i2 = new TableInfoImporter(CatalogueRepository, tblFromNeck);
         i2.DoImport(out var fromNeckTableInfo, out var fromNeckColumnInfo);
-            
+
         //Table already exists but does the in Catalogue reference exist?
-        if(tableInfoAlreadyExistsForSkippedTable)
+        if (tableInfoAlreadyExistsForSkippedTable)
         {
             var i3 = new TableInfoImporter(CatalogueRepository, tblToNeck);
             i3.DoImport(out var toNecksTableInfo, out var toNecksColumnInfo);
@@ -246,17 +244,19 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
 
         //setup ANOTable on head
         var anoTable = new ANOTable(CatalogueRepository, ANOStore_ExternalDatabaseServer, "ANOSkullColor", "C")
-            {
-                NumberOfCharactersToUseInAnonymousRepresentation = 10
-            };
+        {
+            NumberOfCharactersToUseInAnonymousRepresentation = 10
+        };
         anoTable.SaveToDatabase();
-        anoTable.PushToANOServerAsNewTable("varchar(10)",new ThrowImmediatelyCheckNotifier());
+        anoTable.PushToANOServerAsNewTable("varchar(10)", new ThrowImmediatelyCheckNotifier());
 
         //////////////////The actual test!/////////////////
-        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator,cata);
+        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, cata);
 
         //ano the table SkullColor
-        var scPlan = planManager.GetPlanForColumnInfo(fromHeadsColumnInfo.Single(col => col.GetRuntimeName().Equals("SkullColor")));
+        var scPlan =
+            planManager.GetPlanForColumnInfo(
+                fromHeadsColumnInfo.Single(col => col.GetRuntimeName().Equals("SkullColor")));
         scPlan.ANOTable = anoTable;
         scPlan.Plan = Plan.ANO;
 
@@ -264,14 +264,16 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
         {
             var asString = JsonConvertExtensions.SerializeObject(planManager, RepositoryLocator);
 
-            planManager = (ForwardEngineerANOCataloguePlanManager)JsonConvertExtensions.DeserializeObject( asString, typeof(ForwardEngineerANOCataloguePlanManager), RepositoryLocator);
+            planManager = (ForwardEngineerANOCataloguePlanManager)JsonConvertExtensions.DeserializeObject(asString,
+                typeof(ForwardEngineerANOCataloguePlanManager), RepositoryLocator);
         }
-            
+
         //not part of serialization
         planManager.TargetDatabase = dbTo;
-        planManager.SkippedTables.Add(fromNeckTableInfo);//skip the necks table because it already exists (ColumnInfos may or may not exist but physical table definetly does)
+        planManager.SkippedTables
+            .Add(fromNeckTableInfo); //skip the necks table because it already exists (ColumnInfos may or may not exist but physical table definetly does)
 
-        var engine =  new ForwardEngineerANOCatalogueEngine(RepositoryLocator, planManager);
+        var engine = new ForwardEngineerANOCatalogueEngine(RepositoryLocator, planManager);
 
         if (!tableInfoAlreadyExistsForSkippedTable)
         {
@@ -297,7 +299,9 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
         //these columns should all exist
         Assert.IsTrue(newCataItems.Any(ci => ci.ExtractionInformation.SelectSQL.Contains("SkullColor")));
         Assert.IsTrue(newCataItems.Any(ci => ci.ExtractionInformation.SelectSQL.Contains("SpineColor")));
-        Assert.IsTrue(newCataItems.Any(ci => ci.ExtractionInformation.SelectSQL.Contains("Vertebrae"))); //actually there will be 2 copies of this one from Necks one from Heads
+        Assert.IsTrue(newCataItems.Any(ci =>
+            ci.ExtractionInformation.SelectSQL
+                .Contains("Vertebrae"))); //actually there will be 2 copies of this one from Necks one from Heads
 
         //new ColumnInfo should have a reference to the anotable
         Assert.IsTrue(newCataItems.Single(ci => ci.Name.Equals("ANOSkullColor")).ColumnInfo.ANOTable_ID == anoTable.ID);
@@ -306,7 +310,7 @@ public void CreateANOVersion_TestSkippingTables(bool tableInfoAlreadyExistsForSk
         var newSpineColorColumnInfo = newCataItems.Single(ci => ci.Name.Equals("ANOSkullColor")).ColumnInfo;
 
         //table info already existed, make sure the new CatalogueItems point to the same columninfos / table infos
-        Assert.IsTrue(newCataItems.Select(ci=>ci.ColumnInfo).Contains(newSpineColorColumnInfo));
+        Assert.IsTrue(newCataItems.Select(ci => ci.ColumnInfo).Contains(newSpineColorColumnInfo));
     }
 
     [Test]
@@ -325,13 +329,13 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
         //Create a lookup table on the server
         var lookupTbl = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer).CreateTable("z_sexLookup", new[]
         {
-            new DatabaseColumnRequest("Code", "varchar(1)"){IsPrimaryKey = true},
-            new DatabaseColumnRequest("hb_Code", "varchar(1)"){IsPrimaryKey = true},
+            new DatabaseColumnRequest("Code", "varchar(1)") { IsPrimaryKey = true },
+            new DatabaseColumnRequest("hb_Code", "varchar(1)") { IsPrimaryKey = true },
             new DatabaseColumnRequest("Description", "varchar(100)")
         });
 
         //import a reference to the table
-        var importer = new TableInfoImporter(CatalogueRepository,lookupTbl);
+        var importer = new TableInfoImporter(CatalogueRepository, lookupTbl);
         importer.DoImport(out var lookupTableInfo, out var lookupColumnInfos);
 
         //Create a Lookup reference
@@ -358,7 +362,7 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
         var ciComboCol = new CatalogueItem(CatalogueRepository, bulk.catalogue, "ComboColumn");
 
         var colForename = bulk.columnInfos.Single(c => c.GetRuntimeName() == "forename");
-        var colSurname =  bulk.columnInfos.Single(c => c.GetRuntimeName() == "surname");
+        var colSurname = bulk.columnInfos.Single(c => c.GetRuntimeName() == "surname");
 
         var eiComboCol = new ExtractionInformation(CatalogueRepository, ciComboCol, colForename,
             $"{colForename} + ' ' + {colSurname}")
@@ -367,58 +371,63 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
         };
         eiComboCol.SaveToDatabase();
 
-        var eiDataLoadRunId = bulk.extractionInformations.Single(ei => ei.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID));
+        var eiDataLoadRunId =
+            bulk.extractionInformations.Single(ei => ei.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID));
         eiDataLoadRunId.DeleteInDatabase();
 
 
-        var lookup = new Lookup(CatalogueRepository, lookupColumnInfos[2], ciSex.ColumnInfo, lookupColumnInfos[0],ExtractionJoinType.Left, null);
+        var lookup = new Lookup(CatalogueRepository, lookupColumnInfos[2], ciSex.ColumnInfo, lookupColumnInfos[0],
+            ExtractionJoinType.Left, null);
 
         //now let's make it worse, let's assume the sex code changes per healthboard therefore the join to the lookup requires both fields sex and hb_extract
-        var compositeLookup = new LookupCompositeJoinInfo(CatalogueRepository, lookup, ciHb.ColumnInfo, lookupColumnInfos[1]);
+        var compositeLookup =
+            new LookupCompositeJoinInfo(CatalogueRepository, lookup, ciHb.ColumnInfo, lookupColumnInfos[1]);
 
         //now let's make the _Desc field in the original Catalogue
         var orderToInsertDescriptionFieldAt = ciSex.ExtractionInformation.Order;
 
         //bump everyone down 1
-        foreach (var toBumpDown in bulk.catalogue.CatalogueItems.Select(ci=>ci.ExtractionInformation).Where(e =>e != null && e.Order > orderToInsertDescriptionFieldAt))
+        foreach (var toBumpDown in bulk.catalogue.CatalogueItems.Select(ci => ci.ExtractionInformation)
+                     .Where(e => e != null && e.Order > orderToInsertDescriptionFieldAt))
         {
             toBumpDown.Order++;
             toBumpDown.SaveToDatabase();
         }
 
         var ciDescription = new CatalogueItem(CatalogueRepository, bulk.catalogue, "Sex_Desc");
-        var eiDescription = new ExtractionInformation(CatalogueRepository, ciDescription, lookupColumnInfos[2],lookupColumnInfos[2].Name)
-            {
-                Alias = "Sex_Desc",
-                Order = orderToInsertDescriptionFieldAt +1,
-                ExtractionCategory = ExtractionCategory.Supplemental
-            };
+        var eiDescription = new ExtractionInformation(CatalogueRepository, ciDescription, lookupColumnInfos[2],
+            lookupColumnInfos[2].Name)
+        {
+            Alias = "Sex_Desc",
+            Order = orderToInsertDescriptionFieldAt + 1,
+            ExtractionCategory = ExtractionCategory.Supplemental
+        };
         eiDescription.SaveToDatabase();
 
         bulk.catalogue.ClearAllInjections();
 
         //check it worked
-        var qb = new QueryBuilder(null,null);
+        var qb = new QueryBuilder(null, null);
         qb.AddColumnRange(bulk.catalogue.GetAllExtractionInformation(ExtractionCategory.Any));
-            
+
         //The query builder should be able to succesfully create SQL
         Console.WriteLine(qb.SQL);
-            
+
         //there should be 2 tables involved in the query [z_sexLookup] and [BulkData]
-        Assert.AreEqual(2,qb.TablesUsedInQuery.Count);
+        Assert.AreEqual(2, qb.TablesUsedInQuery.Count);
 
         //the query builder should have identified the lookup
-        Assert.AreEqual(lookup,qb.GetDistinctRequiredLookups().Single());
+        Assert.AreEqual(lookup, qb.GetDistinctRequiredLookups().Single());
 
         //////////////////////////////////////////////////////////////////////////////////////The Actual Bit Being Tested////////////////////////////////////////////////////
-        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator,bulk.catalogue)
- {
-     TargetDatabase = db
- };
+        var planManager = new ForwardEngineerANOCataloguePlanManager(RepositoryLocator, bulk.catalogue)
+        {
+            TargetDatabase = db
+        };
 
         //setup test rules for migrator
         CreateMigrationRules(planManager, bulk);
-            
+
         //rules should pass checks
         Assert.DoesNotThrow(() => planManager.Check(new ThrowImmediatelyCheckNotifier()));
 
@@ -430,22 +439,31 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
         Assert.IsTrue(anoCatalogue.Exists());
 
         //The new Catalogue should have the same number of ExtractionInformations
-        var eiSource = bulk.catalogue.GetAllExtractionInformation(ExtractionCategory.Any).OrderBy(ei=>ei.Order).ToArray();
-        var eiDestination = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any).OrderBy(ei=>ei.Order).ToArray();
-            
-        Assert.AreEqual(eiSource.Length,eiDestination.Length,"Both the new and the ANO catalogue should have the same number of ExtractionInformations (extractable columns)");
+        var eiSource = bulk.catalogue.GetAllExtractionInformation(ExtractionCategory.Any).OrderBy(ei => ei.Order)
+            .ToArray();
+        var eiDestination = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any).OrderBy(ei => ei.Order)
+            .ToArray();
+
+        Assert.AreEqual(eiSource.Length, eiDestination.Length,
+            "Both the new and the ANO catalogue should have the same number of ExtractionInformations (extractable columns)");
 
         for (var i = 0; i < eiSource.Length; i++)
         {
-            Assert.AreEqual(eiSource[i].Order , eiDestination[i].Order,"ExtractionInformations in the source and destination Catalogue should have the same order");
+            Assert.AreEqual(eiSource[i].Order, eiDestination[i].Order,
+                "ExtractionInformations in the source and destination Catalogue should have the same order");
 
             Assert.AreEqual(eiSource[i].GetRuntimeName(),
-                eiDestination[i].GetRuntimeName().Replace("ANO",""), "ExtractionInformations in the source and destination Catalogue should have the same names (excluding ANO prefix)");
-
-            Assert.AreEqual(eiSource[i].ExtractionCategory, eiDestination[i].ExtractionCategory, "Old / New ANO ExtractionInformations did not match on ExtractionCategory");
-            Assert.AreEqual(eiSource[i].IsExtractionIdentifier, eiDestination[i].IsExtractionIdentifier, "Old / New ANO ExtractionInformations did not match on IsExtractionIdentifier");
-            Assert.AreEqual(eiSource[i].HashOnDataRelease, eiDestination[i].HashOnDataRelease, "Old / New ANO ExtractionInformations did not match on HashOnDataRelease");
-            Assert.AreEqual(eiSource[i].IsPrimaryKey, eiDestination[i].IsPrimaryKey, "Old / New ANO ExtractionInformations did not match on IsPrimaryKey");
+                eiDestination[i].GetRuntimeName().Replace("ANO", ""),
+                "ExtractionInformations in the source and destination Catalogue should have the same names (excluding ANO prefix)");
+
+            Assert.AreEqual(eiSource[i].ExtractionCategory, eiDestination[i].ExtractionCategory,
+                "Old / New ANO ExtractionInformations did not match on ExtractionCategory");
+            Assert.AreEqual(eiSource[i].IsExtractionIdentifier, eiDestination[i].IsExtractionIdentifier,
+                "Old / New ANO ExtractionInformations did not match on IsExtractionIdentifier");
+            Assert.AreEqual(eiSource[i].HashOnDataRelease, eiDestination[i].HashOnDataRelease,
+                "Old / New ANO ExtractionInformations did not match on HashOnDataRelease");
+            Assert.AreEqual(eiSource[i].IsPrimaryKey, eiDestination[i].IsPrimaryKey,
+                "Old / New ANO ExtractionInformations did not match on IsPrimaryKey");
         }
 
         //check it worked
@@ -455,25 +473,34 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
         //The query builder should be able to succesfully create SQL
         Console.WriteLine(qbdestination.SQL);
 
-        var anoEiPostcode = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(ei => ei.GetRuntimeName().Equals("MyMutilatedColumn"));
-            
+        var anoEiPostcode = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(ei => ei.GetRuntimeName().Equals("MyMutilatedColumn"));
+
         //The transform on postcode should have been refactored to the new table name and preserve the scalar function LEFT...
-        Assert.AreEqual($"LEFT(10,{anoEiPostcode.ColumnInfo.TableInfo.GetFullyQualifiedName()}.[current_postcode])",anoEiPostcode.SelectSQL);
+        Assert.AreEqual($"LEFT(10,{anoEiPostcode.ColumnInfo.TableInfo.GetFullyQualifiedName()}.[current_postcode])",
+            anoEiPostcode.SelectSQL);
 
-        var anoEiComboCol = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(ei => ei.GetRuntimeName().Equals("ComboColumn"));
+        var anoEiComboCol = anoCatalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(ei => ei.GetRuntimeName().Equals("ComboColumn"));
 
         //The transform on postcode should have been refactored to the new table name and preserve the scalar function LEFT...
-        Assert.AreEqual(string.Format("{0}.[forename] + ' ' + {0}.[surname]", anoEiPostcode.ColumnInfo.TableInfo.GetFullyQualifiedName()), anoEiComboCol.SelectSQL);
+        Assert.AreEqual(
+            string.Format("{0}.[forename] + ' ' + {0}.[surname]",
+                anoEiPostcode.ColumnInfo.TableInfo.GetFullyQualifiedName()), anoEiComboCol.SelectSQL);
 
         //there should be 2 tables involved in the query [z_sexLookup] and [BulkData]
         Assert.AreEqual(2, qbdestination.TablesUsedInQuery.Count);
 
         //the query builder should have identified the lookup but it should be the new one not the old one
-        Assert.AreEqual(1, qbdestination.GetDistinctRequiredLookups().Count(), "New query builder for ano catalogue did not correctly identify that there was a Lookup");
-        Assert.AreNotEqual(lookup, qbdestination.GetDistinctRequiredLookups().Single(), "New query builder for ano catalogue identified the OLD Lookup!");
-            
-        Assert.AreEqual(1, qbdestination.GetDistinctRequiredLookups().Single().GetSupplementalJoins().Count(),"The new Lookup did not have the composite join key (sex/hb_extract)");
-        Assert.AreNotEqual(compositeLookup, qbdestination.GetDistinctRequiredLookups().Single().GetSupplementalJoins(), "New query builder for ano catalogue identified the OLD LookupCompositeJoinInfo!");
+        Assert.AreEqual(1, qbdestination.GetDistinctRequiredLookups().Count(),
+            "New query builder for ano catalogue did not correctly identify that there was a Lookup");
+        Assert.AreNotEqual(lookup, qbdestination.GetDistinctRequiredLookups().Single(),
+            "New query builder for ano catalogue identified the OLD Lookup!");
+
+        Assert.AreEqual(1, qbdestination.GetDistinctRequiredLookups().Single().GetSupplementalJoins().Count(),
+            "The new Lookup did not have the composite join key (sex/hb_extract)");
+        Assert.AreNotEqual(compositeLookup, qbdestination.GetDistinctRequiredLookups().Single().GetSupplementalJoins(),
+            "New query builder for ano catalogue identified the OLD LookupCompositeJoinInfo!");
 
         db.Drop();
 
@@ -482,8 +509,6 @@ public void CreateANOVersionTest_LookupsAndExtractionInformations()
 
         Assert.AreEqual(exports, imports);
         Assert.IsTrue(exports > 0);
-
-            
     }
 
 
@@ -492,12 +517,12 @@ private void CreateMigrationRules(ForwardEngineerANOCataloguePlanManager planMan
         var chi = bulk.GetColumnInfo("chi");
 
         var anoChi = new ANOTable(CatalogueRepository, ANOStore_ExternalDatabaseServer, "ANOCHI", "C")
-            {
-                NumberOfIntegersToUseInAnonymousRepresentation = 9,
-                NumberOfCharactersToUseInAnonymousRepresentation = 1
-            };
+        {
+            NumberOfIntegersToUseInAnonymousRepresentation = 9,
+            NumberOfCharactersToUseInAnonymousRepresentation = 1
+        };
         anoChi.SaveToDatabase();
-        anoChi.PushToANOServerAsNewTable(chi.Data_type,new ThrowImmediatelyCheckNotifier());
+        anoChi.PushToANOServerAsNewTable(chi.Data_type, new ThrowImmediatelyCheckNotifier());
 
         planManager.GetPlanForColumnInfo(chi).Plan = Plan.ANO;
         planManager.GetPlanForColumnInfo(chi).ANOTable = anoChi;
diff --git a/Rdmp.Core.Tests/Curation/Integration/GetDatabaseDiagramBinaryTest.cs b/Rdmp.Core.Tests/Curation/Integration/GetDatabaseDiagramBinaryTest.cs
index 11093b8ffb..059496d0ef 100644
--- a/Rdmp.Core.Tests/Curation/Integration/GetDatabaseDiagramBinaryTest.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/GetDatabaseDiagramBinaryTest.cs
@@ -12,26 +12,26 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class GetDatabaseDiagramBinaryTest:DatabaseTests
+public class GetDatabaseDiagramBinaryTest : DatabaseTests
 {
     [Test]
     public void GetBinaryText()
     {
         using (var con = CatalogueTableRepository.GetConnection())
         {
-            using(var cmd = DatabaseCommandHelper.GetCommand(
-                      "SELECT definition  FROM sysdiagrams where name = 'Catalogue_Data_Diagram' ",
-                      con.Connection, con.Transaction))
+            using (var cmd = DatabaseCommandHelper.GetCommand(
+                       "SELECT definition  FROM sysdiagrams where name = 'Catalogue_Data_Diagram' ",
+                       con.Connection, con.Transaction))
             using (var reader = cmd.ExecuteReader())
             {
                 //The system diagram exists
                 Assert.IsTrue(reader.Read());
 
-                var bytes = (byte[]) reader[0];
+                var bytes = (byte[])reader[0];
                 var bytesAsString = ByteArrayToString(bytes);
-                    
+
                 Console.WriteLine(bytesAsString);
-                Assert.Greater(bytesAsString.Length,100000);
+                Assert.Greater(bytesAsString.Length, 100000);
             }
         }
     }
diff --git a/Rdmp.Core.Tests/Curation/Integration/GovernanceTests.cs b/Rdmp.Core.Tests/Curation/Integration/GovernanceTests.cs
index 8347bcc0b9..ed483ef02d 100644
--- a/Rdmp.Core.Tests/Curation/Integration/GovernanceTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/GovernanceTests.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class GovernanceTests:DatabaseTests
+public class GovernanceTests : DatabaseTests
 {
     [OneTimeTearDown]
     protected void OneTimeTearDown()
@@ -41,8 +41,9 @@ public void TestCreatingGovernance_StartsAtToday()
         var gov = GetGov();
 
         Assert.NotNull(gov);
-        Assert.AreEqual(gov.StartDate,DateTime.Now.Date);
+        Assert.AreEqual(gov.StartDate, DateTime.Now.Date);
     }
+
     [Test]
     public void TestCreatingGovernance_ChangeName()
     {
@@ -52,20 +53,19 @@ public void TestCreatingGovernance_ChangeName()
         var gov = GetGov();
         gov.Name = "Fish";
         var freshCopy = CatalogueRepository.GetObjectByID<GovernancePeriod>(gov.ID);
-            
+
         //local change not applied yet
-        Assert.AreNotEqual(gov.Name,freshCopy.Name);
-            
+        Assert.AreNotEqual(gov.Name, freshCopy.Name);
+
         //comitted change to database
         gov.SaveToDatabase();
-            
+
         //notice that this fresh copy is still desynced
-        Assert.AreNotEqual(gov.Name,freshCopy.Name);
-            
+        Assert.AreNotEqual(gov.Name, freshCopy.Name);
+
         //sync it
         freshCopy = CatalogueRepository.GetObjectByID<GovernancePeriod>(gov.ID);
-        Assert.AreEqual(gov.Name ,freshCopy.Name);
-
+        Assert.AreEqual(gov.Name, freshCopy.Name);
     }
 
     [Test]
@@ -79,12 +79,13 @@ public void TestCreatingGovernance_CannotHaveSameNames()
 
         gov2.Name = "HiDuplicate";
 
-        if(CatalogueRepository is TableRepository)
+        if (CatalogueRepository is TableRepository)
         {
             var ex = Assert.Throws<SqlException>(gov2.SaveToDatabase);
-            StringAssert.StartsWith("Cannot insert duplicate key row in object 'dbo.GovernancePeriod' with unique index 'idxGovernancePeriodNameMustBeUnique'. The duplicate key value is (HiDuplicate)", ex.Message);
+            StringAssert.StartsWith(
+                "Cannot insert duplicate key row in object 'dbo.GovernancePeriod' with unique index 'idxGovernancePeriodNameMustBeUnique'. The duplicate key value is (HiDuplicate)",
+                ex.Message);
         }
-
     }
 
     [Test]
@@ -97,7 +98,9 @@ public void Checkability_ExpiresBeforeStarts()
         gov.Check(new ThrowImmediatelyCheckNotifier());
 
         gov.EndDate = DateTime.MinValue;
-        var ex = Assert.Throws<Exception>(()=>gov.Check(new ThrowImmediatelyCheckNotifier()));//no longer valid - notice there is no SaveToDatabase because we can shouldnt be going back to db anyway
+        var ex = Assert.Throws<Exception>(() =>
+            gov.Check(
+                new ThrowImmediatelyCheckNotifier())); //no longer valid - notice there is no SaveToDatabase because we can shouldnt be going back to db anyway
         Assert.AreEqual("GovernancePeriod TestExpiryBeforeStarting expires before it begins!", ex.Message);
     }
 
@@ -108,16 +111,15 @@ public void Checkability_NoExpiryDateWarning()
         gov.Name = "NeverExpires";
 
         //valid to start with 
-        var ex = Assert.Throws<Exception>(()=>gov.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true}));
-        Assert.AreEqual("There is no end date for GovernancePeriod NeverExpires",ex.Message);
-
+        var ex = Assert.Throws<Exception>(() => gov.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        Assert.AreEqual("There is no end date for GovernancePeriod NeverExpires", ex.Message);
     }
 
     [TestCase(true)]
     [TestCase(false)]
     public void GovernsCatalogue(bool memoryRepository)
     {
-        var repo = memoryRepository ? (ICatalogueRepository) new MemoryCatalogueRepository() : CatalogueRepository;
+        var repo = memoryRepository ? (ICatalogueRepository)new MemoryCatalogueRepository() : CatalogueRepository;
 
         var gov = GetGov(repo);
         var c = new Catalogue(repo, "GovernedCatalogue");
@@ -132,7 +134,7 @@ public void GovernsCatalogue(bool memoryRepository)
             var governedCatalogue = allCatalogues[0];
             Assert.AreEqual(governedCatalogue, c); //we now govern C
         }
-        finally 
+        finally
         {
             gov.DeleteGovernanceRelationshipTo(c);
             Assert.AreEqual(gov.GovernedCatalogues.Count(), 0); //we govern c nevermore!
@@ -147,16 +149,18 @@ public void GovernsSameCatalogueTwice()
         var c = new Catalogue(CatalogueRepository, "GovernedCatalogue");
 
         var gov = GetGov();
-        Assert.AreEqual(gov.GovernedCatalogues.Count(), 0);//should be no governanced catalogues for this governancer yet
+        Assert.AreEqual(gov.GovernedCatalogues.Count(),
+            0); //should be no governanced catalogues for this governancer yet
 
         gov.CreateGovernanceRelationshipTo(c);
-        gov.CreateGovernanceRelationshipTo(c);            
+        gov.CreateGovernanceRelationshipTo(c);
     }
 
     private List<GovernancePeriod> toCleanup = new();
+
     private GovernancePeriod GetGov(ICatalogueRepository repo = null)
     {
-        var gov = new GovernancePeriod(repo??CatalogueRepository);
+        var gov = new GovernancePeriod(repo ?? CatalogueRepository);
         toCleanup.Add(gov);
 
         return gov;
diff --git a/Rdmp.Core.Tests/Curation/Integration/HangingConnectionTest.cs b/Rdmp.Core.Tests/Curation/Integration/HangingConnectionTest.cs
index c6d65c9a3c..f473c42e75 100644
--- a/Rdmp.Core.Tests/Curation/Integration/HangingConnectionTest.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/HangingConnectionTest.cs
@@ -13,7 +13,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class HangingConnectionTest:DatabaseTests
+public class HangingConnectionTest : DatabaseTests
 {
     private string testDbName = "HangingConnectionTest";
 
@@ -26,7 +26,7 @@ public void TestConnection(bool explicitClose)
         //drop it if it existed
         if (DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(testDbName).Exists())
             DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(testDbName).Drop();
-            
+
         DiscoveredServerICanCreateRandomDatabasesAndTablesOn.CreateDatabase(testDbName);
         Thread.Sleep(500);
 
@@ -42,27 +42,31 @@ public void TestConnection(bool explicitClose)
 
             //we are currently connected so this should throw
             Assert.Throws<Exception>(ThrowIfDatabaseLock);
-
         }
+
         Thread.Sleep(500);
 
         if (explicitClose)
         {
             SqlConnection.ClearAllPools();
             Thread.Sleep(500);
-            Assert.DoesNotThrow(ThrowIfDatabaseLock);//in this case we told .net to clear the pools which leaves the server free of locks/hanging connections
+            Assert.DoesNotThrow(
+                ThrowIfDatabaseLock); //in this case we told .net to clear the pools which leaves the server free of locks/hanging connections
         }
         else
         {
-            Assert.Throws<Exception>(ThrowIfDatabaseLock);//despite us closing the connection and using the 'using' block .net still keeps a connection in sleep state to the server ><
+            Assert.Throws<Exception>(
+                ThrowIfDatabaseLock); //despite us closing the connection and using the 'using' block .net still keeps a connection in sleep state to the server ><
         }
-            
+
         db.Drop();
     }
 
     private void ThrowIfDatabaseLock()
     {
-        var serverCopy = new DiscoveredServer(new SqlConnectionStringBuilder(DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder.ConnectionString));
+        var serverCopy =
+            new DiscoveredServer(new SqlConnectionStringBuilder(DiscoveredServerICanCreateRandomDatabasesAndTablesOn
+                .Builder.ConnectionString));
         serverCopy.ChangeDatabase("master");
         using (var con = serverCopy.GetConnection())
         {
@@ -75,9 +79,7 @@ private void ThrowIfDatabaseLock()
                     r.GetValues(vals);
                     throw new Exception(
                         $"Someone is locking {testDbName}:{Environment.NewLine}{string.Join(",", vals)}");
-                        
                 }
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/LinkerTests.cs b/Rdmp.Core.Tests/Curation/Integration/LinkerTests.cs
index fe94a01571..3d2ad7e441 100644
--- a/Rdmp.Core.Tests/Curation/Integration/LinkerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/LinkerTests.cs
@@ -29,25 +29,21 @@ public void AddSameLinkTwice()
 
             //now you can add as many links as you want, it just skips them
             lazor.SetColumnInfo(velocityColumn);
-            Assert.AreEqual(lazor.ColumnInfo,velocityColumn);
-                
+            Assert.AreEqual(lazor.ColumnInfo, velocityColumn);
         }
         finally
         {
             lazor.DeleteInDatabase(); //delete child
             predator.DeleteInDatabase(); //delete parent
-                
-            velocityColumn.DeleteInDatabase();//delete child
-            highEnergyTable.DeleteInDatabase();//delete parent
+
+            velocityColumn.DeleteInDatabase(); //delete child
+            highEnergyTable.DeleteInDatabase(); //delete parent
         }
-          
-         
     }
 
     [Test]
     public void AddLinkBetween_createNewLink_pass()
     {
-
         ///////////////Create the things that we are going to create relationships between /////////////////
         var predator = new Catalogue(CatalogueRepository, "Predator");
         var lazor = new CatalogueItem(CatalogueRepository, predator, "QuadlzorVelocity");
@@ -66,13 +62,14 @@ public void AddLinkBetween_createNewLink_pass()
         //create a link between catalogue item lazor and velocity column
         lazor.SetColumnInfo(velocityColumn);
         Assert.IsTrue(lazor.ColumnInfo.ID == velocityColumn.ID);
-            
+
         ////////////////cleanup ---- Delete everything that we created -------- ////////////// 
-        velocityColumn.DeleteInDatabase(); //delete causes CASCADE: CatalogueItem no longer associated with ColumnInfo because ColumnInfo died
-            
+        velocityColumn
+            .DeleteInDatabase(); //delete causes CASCADE: CatalogueItem no longer associated with ColumnInfo because ColumnInfo died
+
         lazor.RevertToDatabaseState();
 
-        Assert.IsNull(lazor.ColumnInfo);//involves a database query so won't actually invalidate the below
+        Assert.IsNull(lazor.ColumnInfo); //involves a database query so won't actually invalidate the below
 
         predator.DeleteInDatabase();
 
diff --git a/Rdmp.Core.Tests/Curation/Integration/LoadMetadataTests.cs b/Rdmp.Core.Tests/Curation/Integration/LoadMetadataTests.cs
index 579b9b2859..0170ad4a4c 100644
--- a/Rdmp.Core.Tests/Curation/Integration/LoadMetadataTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/LoadMetadataTests.cs
@@ -24,7 +24,6 @@ public void CreateNewAndGetBackFromDatabase()
 
         try
         {
-                
             loadMetadata.LocationOfFlatFiles = TestContext.CurrentContext.TestDirectory;
             loadMetadata.SaveToDatabase();
 
@@ -49,13 +48,13 @@ public void Test_IgnoreTrigger_GetSet()
             loadMetadata.SaveToDatabase();
             Assert.IsFalse(loadMetadata.IgnoreTrigger);
             loadMetadata.SaveToDatabase();
-                
+
             loadMetadata.IgnoreTrigger = true;
             Assert.IsTrue(loadMetadata.IgnoreTrigger);
             loadMetadata.RevertToDatabaseState();
             Assert.IsFalse(loadMetadata.IgnoreTrigger);
 
-                
+
             loadMetadata.IgnoreTrigger = true;
             Assert.IsTrue(loadMetadata.IgnoreTrigger);
             loadMetadata.SaveToDatabase();
@@ -78,16 +77,17 @@ public void TestPreExecutionChecker_TablesDontExist()
 
         var lmd = RdmpMockFactory.Mock_LoadMetadataLoadingTable(tbl);
         var checker = new PreExecutionChecker(lmd, new HICDatabaseConfiguration(db.Server));
-        var ex = Assert.Throws<Exception>(()=>checker.Check(new ThrowImmediatelyCheckNotifier()));
+        var ex = Assert.Throws<Exception>(() => checker.Check(new ThrowImmediatelyCheckNotifier()));
 
         StringAssert.IsMatch("Table '.*Imaginary.*' does not exist", ex.Message);
     }
+
     [Test]
     public void TestPreExecutionChecker_TableIsTableValuedFunction()
     {
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
         var f = new TestableTableValuedFunction();
-        f.Create(db,CatalogueRepository);
+        f.Create(db, CatalogueRepository);
 
         var tbl = f.TableInfoCreated.Discover(DataAccessContext.DataLoad);
         Assert.IsTrue(tbl.Exists());
diff --git a/Rdmp.Core.Tests/Curation/Integration/LoadProgressTest.cs b/Rdmp.Core.Tests/Curation/Integration/LoadProgressTest.cs
index ec82e0dc53..90a810658f 100644
--- a/Rdmp.Core.Tests/Curation/Integration/LoadProgressTest.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/LoadProgressTest.cs
@@ -42,10 +42,10 @@ public void LoadProgress_Equals()
 
         var progress = new LoadProgress(CatalogueRepository, loadMetadata);
         var progressCopy = CatalogueRepository.GetObjectByID<LoadProgress>(progress.ID);
-            
+
         progressCopy.Name = "fish";
-        progressCopy.OriginDate = new DateTime(2001,01,01);
-            
+        progressCopy.OriginDate = new DateTime(2001, 01, 01);
+
         try
         {
             //values are different
@@ -57,7 +57,6 @@ public void LoadProgress_Equals()
 
             //therefore objects are the same
             Assert.IsTrue(progressCopy.Equals(progress));
-
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/Curation/Integration/LoadProgressUnitTests.cs b/Rdmp.Core.Tests/Curation/Integration/LoadProgressUnitTests.cs
index c1952914a6..5bb5b1c398 100644
--- a/Rdmp.Core.Tests/Curation/Integration/LoadProgressUnitTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/LoadProgressUnitTests.cs
@@ -28,7 +28,7 @@ public void LoadProgress_Checks_BadDates()
 
         //Bad Origin Date
         lp.OriginDate = DateTime.Now.AddDays(1);
-        Assert.Throws<Exception>(()=>lp.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.Throws<Exception>(() => lp.Check(new ThrowImmediatelyCheckNotifier()));
 
         //Back to normal
         lp.RevertToDatabaseState();
@@ -36,15 +36,15 @@ public void LoadProgress_Checks_BadDates()
 
         //Bad ProgressDate
         lp.DataLoadProgress = DateTime.Now.AddDays(1);
-        Assert.Throws<Exception>(()=>lp.Check(new ThrowImmediatelyCheckNotifier()));
-                        
+        Assert.Throws<Exception>(() => lp.Check(new ThrowImmediatelyCheckNotifier()));
+
         //Back to normal
         lp.RevertToDatabaseState();
         lp.Check(new ThrowImmediatelyCheckNotifier());
 
         // valid progress (1 year)
-        lp.OriginDate = new DateTime(2001,1,1);
-        lp.DataLoadProgress = new DateTime(2002,1,1);
+        lp.OriginDate = new DateTime(2001, 1, 1);
+        lp.DataLoadProgress = new DateTime(2002, 1, 1);
         lp.Check(new ThrowImmediatelyCheckNotifier());
     }
 
@@ -53,32 +53,33 @@ public void LoadProgress_JobFactory_NoDates()
     {
         var lp = WhenIHaveA<LoadProgress>();
 
-            
 
-        lp.OriginDate = new DateTime(2001,1,1);
-            
+        lp.OriginDate = new DateTime(2001, 1, 1);
+
         // We are fully up-to-date
         lp.DataLoadProgress = DateTime.Now;
-            
+
         lp.Check(new ThrowImmediatelyCheckNotifier());
 
-        var stratFactory = new JobDateGenerationStrategyFactory(new AnyAvailableLoadProgressSelectionStrategy(lp.LoadMetadata));
-        var strat = stratFactory.Create(lp,new ThrowImmediatelyDataLoadEventListener());
+        var stratFactory =
+            new JobDateGenerationStrategyFactory(new AnyAvailableLoadProgressSelectionStrategy(lp.LoadMetadata));
+        var strat = stratFactory.Create(lp, new ThrowImmediatelyDataLoadEventListener());
 
-        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.WorkDirectory),"LoadProgress_JobFactory_NoDates",true);
+        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.WorkDirectory),
+            "LoadProgress_JobFactory_NoDates", true);
 
         var lmd = lp.LoadMetadata;
         lmd.LocationOfFlatFiles = dir.RootPath.FullName;
-            
-        foreach(var cata in lmd.GetAllCatalogues())
+
+        foreach (var cata in lmd.GetAllCatalogues())
         {
             cata.LoggingDataTask = "ff";
             cata.SaveToDatabase();
         }
-            
+
         lmd.SaveToDatabase();
 
-        var jobFactory = new SingleScheduledJobFactory(lp,strat,999,lp.LoadMetadata,null);
+        var jobFactory = new SingleScheduledJobFactory(lp, strat, 999, lp.LoadMetadata, null);
         var job = jobFactory.Create(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), null);
 
         Assert.IsNull(job);
@@ -86,11 +87,11 @@ public void LoadProgress_JobFactory_NoDates()
         // We have 1 day to load (date is the last fully loaded date)
         lp.DataLoadProgress = DateTime.Now.AddDays(-2);
         lp.SaveToDatabase();
-             
-        strat = stratFactory.Create(lp,new ThrowImmediatelyDataLoadEventListener());
-        jobFactory =  new SingleScheduledJobFactory(lp,strat,999,lp.LoadMetadata,null);
 
-        job = jobFactory.Create(RepositoryLocator,new ThrowImmediatelyDataLoadEventListener(),null);
-        Assert.AreEqual(1,((ScheduledDataLoadJob)job).DatesToRetrieve.Count);
+        strat = stratFactory.Create(lp, new ThrowImmediatelyDataLoadEventListener());
+        jobFactory = new SingleScheduledJobFactory(lp, strat, 999, lp.LoadMetadata, null);
+
+        job = jobFactory.Create(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), null);
+        Assert.AreEqual(1, ((ScheduledDataLoadJob)job).DatesToRetrieve.Count);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/LookupTest.cs b/Rdmp.Core.Tests/Curation/Integration/LookupTest.cs
index 4bdc626bcf..2bf4f24330 100644
--- a/Rdmp.Core.Tests/Curation/Integration/LookupTest.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/LookupTest.cs
@@ -23,46 +23,45 @@ namespace Rdmp.Core.Tests.Curation.Integration;
 
 public class LookupTest : DatabaseTests
 {
-
     [Test]
     public void Test_MultipleLookupReferences()
     {
         BlitzMainDataTables();
 
-        var tiHeader = new TableInfo(CatalogueRepository,"Head");
-        var tiHeader_Code = new ColumnInfo(CatalogueRepository,"code","",tiHeader);
+        var tiHeader = new TableInfo(CatalogueRepository, "Head");
+        var tiHeader_Code = new ColumnInfo(CatalogueRepository, "code", "", tiHeader);
+
+        var tiLookup = new TableInfo(CatalogueRepository, "z_HeadLookup");
+        var tiLookup_Code = new ColumnInfo(CatalogueRepository, "code", "", tiLookup);
+        var tiLookup_Desc = new ColumnInfo(CatalogueRepository, "desc", "", tiLookup);
 
-        var tiLookup = new TableInfo(CatalogueRepository,"z_HeadLookup");
-        var tiLookup_Code = new ColumnInfo(CatalogueRepository,"code","",tiLookup);
-        var tiLookup_Desc = new ColumnInfo(CatalogueRepository,"desc","",tiLookup);
+        var lookup = new Lookup(CatalogueRepository, tiLookup_Desc, tiHeader_Code, tiLookup_Code,
+            ExtractionJoinType.Left, null);
 
-        var lookup = new Lookup(CatalogueRepository,tiLookup_Desc,tiHeader_Code,tiLookup_Code,ExtractionJoinType.Left,null);
+        var cata1 = new Catalogue(CatalogueRepository, "Catalogue1");
+        var cata2 = new Catalogue(CatalogueRepository, "Catalogue2");
 
-        var cata1 = new Catalogue(CatalogueRepository,"Catalogue1");
-        var cata2 = new Catalogue(CatalogueRepository,"Catalogue2");
+        var cata1_code = new CatalogueItem(CatalogueRepository, cata1, "code");
+        var cata1_desc = new CatalogueItem(CatalogueRepository, cata1, "desc");
+        new ExtractionInformation(CatalogueRepository, cata1_code, tiHeader_Code, "[tbl]..[code]");
+        new ExtractionInformation(CatalogueRepository, cata1_desc, tiLookup_Desc, "[lookup]..[desc]");
 
-        var cata1_code = new CatalogueItem(CatalogueRepository,cata1,"code");
-        var cata1_desc = new CatalogueItem(CatalogueRepository,cata1,"desc");
-        new ExtractionInformation(CatalogueRepository,cata1_code,tiHeader_Code,"[tbl]..[code]");
-        new ExtractionInformation(CatalogueRepository,cata1_desc,tiLookup_Desc,"[lookup]..[desc]");
+        var cata2_code = new CatalogueItem(CatalogueRepository, cata2, "code");
+        var cata2_desc = new CatalogueItem(CatalogueRepository, cata2, "desc");
+        new ExtractionInformation(CatalogueRepository, cata2_code, tiHeader_Code, "[tbl]..[code]");
+        new ExtractionInformation(CatalogueRepository, cata2_desc, tiLookup_Desc, "[lookup]..[desc]");
 
-        var cata2_code = new CatalogueItem(CatalogueRepository,cata2,"code");
-        var cata2_desc = new CatalogueItem(CatalogueRepository,cata2,"desc");
-        new ExtractionInformation(CatalogueRepository,cata2_code,tiHeader_Code,"[tbl]..[code]");
-        new ExtractionInformation(CatalogueRepository,cata2_desc,tiLookup_Desc,"[lookup]..[desc]");
-            
-        new CatalogueChildProvider(CatalogueRepository,null, new ThrowImmediatelyCheckNotifier {ThrowOnWarning=true},null);
-            
+        new CatalogueChildProvider(CatalogueRepository, null,
+            new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }, null);
     }
 
     [Test]
     public void CreateLookup_linkWithSelfThrowsException()
     {
-
-        TableInfo parent=null;
-        ColumnInfo child=null;
-        ColumnInfo child2=null;
-        ColumnInfo child3=null;
+        TableInfo parent = null;
+        ColumnInfo child = null;
+        ColumnInfo child2 = null;
+        ColumnInfo child3 = null;
 
         try
         {
@@ -71,16 +70,43 @@ public void CreateLookup_linkWithSelfThrowsException()
             child2 = new ColumnInfo(CatalogueRepository, "unit_test_CreateLookup", "int", parent);
             child3 = new ColumnInfo(CatalogueRepository, "unit_test_CreateLookup", "int", parent);
 
-            Assert.Throws<ArgumentException>(()=>new Lookup(CatalogueRepository, child, child2, child3, ExtractionJoinType.Left, null));
+            Assert.Throws<ArgumentException>(() =>
+                new Lookup(CatalogueRepository, child, child2, child3, ExtractionJoinType.Left, null));
         }
-        finally 
+        finally
         {
             //cleanup
-            try{child.DeleteInDatabase();}catch (Exception){}
-            try{child2.DeleteInDatabase();}catch (Exception){}
-            try{child3.DeleteInDatabase();}catch (Exception){}
-            try{parent.DeleteInDatabase();}catch (Exception){}
-                
+            try
+            {
+                child.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                child2.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                child3.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                parent.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
         }
     }
 
@@ -88,7 +114,7 @@ public void CreateLookup_linkWithSelfThrowsException()
     [TestCase(false)]
     public void CreateLookup_linkWithOtherTable(bool memoryRepo)
     {
-        var repo = memoryRepo? (ICatalogueRepository)new MemoryCatalogueRepository():CatalogueRepository;
+        var repo = memoryRepo ? (ICatalogueRepository)new MemoryCatalogueRepository() : CatalogueRepository;
 
         TableInfo parent = null;
         TableInfo parent2 = null;
@@ -120,20 +146,51 @@ public void CreateLookup_linkWithOtherTable(bool memoryRepo)
         finally
         {
             //cleanup
-            try { child.DeleteInDatabase(); }catch (Exception) { }
-            try { child2.DeleteInDatabase(); }catch (Exception) { }
-            try { child3.DeleteInDatabase(); }catch (Exception) { }
-            try { parent.DeleteInDatabase(); }catch (Exception) { }
-            try { parent2.DeleteInDatabase(); }catch (Exception) { }
-
+            try
+            {
+                child.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                child2.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                child3.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                parent.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
+
+            try
+            {
+                parent2.DeleteInDatabase();
+            }
+            catch (Exception)
+            {
+            }
         }
     }
 
     [Test]
     public void CompositeLookupTest()
     {
-           
-
         TableInfo fkTable = null;
         TableInfo pkTable = null;
         ColumnInfo desc = null;
@@ -144,11 +201,10 @@ public void CompositeLookupTest()
         ColumnInfo pk2 = null;
 
         Lookup lookup = null;
-        LookupCompositeJoinInfo composite=null;
+        LookupCompositeJoinInfo composite = null;
 
         try
         {
-
             //table 1 - the dataset table, it has 2 foreign keys e.g. TestCode, Healthboard
             fkTable = new TableInfo(CatalogueRepository, "UnitTest_Biochemistry");
             fk = new ColumnInfo(CatalogueRepository, "UnitTest_BCTestCode", "int", fkTable);
@@ -174,7 +230,7 @@ public void CompositeLookupTest()
             composite = new LookupCompositeJoinInfo(CatalogueRepository, lookup, fk2, pk2);
 
             Assert.AreEqual(composite.OriginalLookup_ID, lookup.ID);
-                    
+
             Assert.AreEqual(composite.PrimaryKey.ID, pk2.ID);
             Assert.AreEqual(composite.PrimaryKey_ID, pk2.ID);
             Assert.AreEqual(composite.PrimaryKey.Name, pk2.Name);
@@ -184,7 +240,7 @@ public void CompositeLookupTest()
             Assert.AreEqual(composite.ForeignKey.Name, fk2.Name);
 
             //get a fresh copy out of memory now that we have created the Lookup composite key, confirm the integrity of that relationship
-            Assert.AreEqual(lookup.GetSupplementalJoins().Count() , 1);
+            Assert.AreEqual(lookup.GetSupplementalJoins().Count(), 1);
             Assert.AreEqual(lookup.GetSupplementalJoins().Cast<LookupCompositeJoinInfo>().First().ID, composite.ID);
 
             composite.DeleteInDatabase();
@@ -207,9 +263,9 @@ public void CompositeLookupTest()
             desc?.DeleteInDatabase();
             fk?.DeleteInDatabase();
             pk?.DeleteInDatabase();
-            fk2?.DeleteInDatabase(); 
+            fk2?.DeleteInDatabase();
             pk2?.DeleteInDatabase();
-            fkTable?.DeleteInDatabase(); 
+            fkTable?.DeleteInDatabase();
             pkTable?.DeleteInDatabase();
         }
     }
@@ -218,7 +274,6 @@ public void CompositeLookupTest()
     [Test]
     public void CompositeLookupTest_SQL()
     {
-             
         //this only works for MSSQL Servers
         if (CatalogueTableRepository.DiscoveredServer.DatabaseType != DatabaseType.MicrosoftSQLServer)
             Assert.Ignore("This test only targets Microsft SQL Servers");
@@ -237,7 +292,6 @@ public void CompositeLookupTest_SQL()
 
         try
         {
-
             //table 1 - the dataset table, it has 2 foreign keys e.g. TestCode, Healthboard
             fkTable = new TableInfo(CatalogueRepository, "UnitTest_Biochemistry");
             fk = new ColumnInfo(CatalogueRepository, "UnitTest_BCTestCode", "int", fkTable);
@@ -252,14 +306,16 @@ public void CompositeLookupTest_SQL()
 
             var joinSQL = JoinHelper.GetJoinSQL(lookup);
 
-            Assert.AreEqual(joinSQL,"UnitTest_Biochemistry Left JOIN UnitTest_BiochemistryLookup ON UnitTest_BCTestCode = UnitTest_TestCode");
+            Assert.AreEqual(joinSQL,
+                "UnitTest_Biochemistry Left JOIN UnitTest_BiochemistryLookup ON UnitTest_BCTestCode = UnitTest_TestCode");
 
             //Create the composite lookup
             composite = new LookupCompositeJoinInfo(CatalogueRepository, lookup, fk2, pk2);
 
             var joinSQL_AfterAddingCompositeKey = JoinHelper.GetJoinSQL(lookup);
 
-            Assert.AreEqual(joinSQL_AfterAddingCompositeKey, "UnitTest_Biochemistry Left JOIN UnitTest_BiochemistryLookup ON UnitTest_BCTestCode = UnitTest_TestCode AND UnitTest_BCHealthBoard = UnitTest_Healthboard");
+            Assert.AreEqual(joinSQL_AfterAddingCompositeKey,
+                "UnitTest_Biochemistry Left JOIN UnitTest_BiochemistryLookup ON UnitTest_BCTestCode = UnitTest_TestCode AND UnitTest_BCHealthBoard = UnitTest_Healthboard");
         }
         catch (Exception ex)
         {
@@ -287,7 +343,6 @@ public void CompositeLookupTest_SQL()
     [Test]
     public void LookupTest_CustomSql()
     {
-
         //this only works for MSSQL Servers
         if (CatalogueTableRepository.DiscoveredServer.DatabaseType != DatabaseType.MicrosoftSQLServer)
             Assert.Ignore("This test only targets Microsft SQL Servers");
@@ -305,7 +360,6 @@ public void LookupTest_CustomSql()
 
         try
         {
-
             //table 1 - the dataset table, it has 2 foreign keys e.g. TestCode, Healthboard
             fkTable = new TableInfo(CatalogueRepository, "UnitTest_Biochemistry");
             fk = new ColumnInfo(CatalogueRepository, "One", "int", fkTable);
@@ -384,12 +438,17 @@ public void TestLookupCommand(LookupTestCase testCase)
 
         var lookupCata = Import(lookuptbl);
 
-        var fkEi = mainCata.GetAllExtractionInformation(ExtractionCategory.Any).Single(n => n.GetRuntimeName() == "SendingLocation");
-        var fk = mainCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "SendingLocation");
-        var pk = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "LocationCode");
+        var fkEi = mainCata.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(n => n.GetRuntimeName() == "SendingLocation");
+        var fk = mainCata.GetTableInfoList(false).Single().ColumnInfos
+            .Single(n => n.GetRuntimeName() == "SendingLocation");
+        var pk = lookupCata.GetTableInfoList(false).Single().ColumnInfos
+            .Single(n => n.GetRuntimeName() == "LocationCode");
 
-        var descLine1 = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "Line1");
-        var descLine2 = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "Line2");
+        var descLine1 = lookupCata.GetTableInfoList(false).Single().ColumnInfos
+            .Single(n => n.GetRuntimeName() == "Line1");
+        var descLine2 = lookupCata.GetTableInfoList(false).Single().ColumnInfos
+            .Single(n => n.GetRuntimeName() == "Line2");
 
         ExecuteCommandCreateLookup cmd = null;
 
@@ -398,14 +457,14 @@ public void TestLookupCommand(LookupTestCase testCase)
         switch (testCase)
         {
             case LookupTestCase.SingleKeySingleDescriptionNoVirtualColumn:
-                cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk,null, false);
+                cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk, null, false);
                 cmd.Execute();
 
                 //sql should not have changed because we didn't create an new ExtractionInformation virtual column
                 Assert.AreEqual(sqlBefore, GetSql(mainCata));
                 break;
             case LookupTestCase.SingleKeySingleDescription:
-                cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk,null, true);
+                cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk, null, true);
                 cmd.Execute();
 
                 //should have the lookup join and the virtual column _Desc
@@ -416,7 +475,7 @@ public void TestLookupCommand(LookupTestCase testCase)
             default:
                 throw new ArgumentOutOfRangeException(nameof(testCase));
         }
-            
+
         foreach (var d in CatalogueRepository.GetAllObjects<Lookup>())
             d.DeleteInDatabase();
         foreach (var d in CatalogueRepository.GetAllObjects<LookupCompositeJoinInfo>())
diff --git a/Rdmp.Core.Tests/Curation/Integration/MEFCheckerTests.cs b/Rdmp.Core.Tests/Curation/Integration/MEFCheckerTests.cs
index 949da262d4..a05cb7eb90 100644
--- a/Rdmp.Core.Tests/Curation/Integration/MEFCheckerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/MEFCheckerTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class MEFCheckerTests:UnitTests
+public class MEFCheckerTests : UnitTests
 {
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
@@ -27,21 +27,24 @@ protected override void OneTimeSetUp()
     [Test]
     public void FindClass_WrongCase_FoundAnyway()
     {
-        Assert.AreEqual(typeof(Catalogue),Repository.MEF.GetType("catalogue"));
+        Assert.AreEqual(typeof(Catalogue), Repository.MEF.GetType("catalogue"));
     }
 
     [Test]
     public void FindClass_EmptyString()
     {
         var m = new MEFChecker(Repository.MEF, "", s => Assert.Fail());
-        var ex =  Assert.Throws<Exception>(()=>m.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("MEFChecker was asked to check for the existence of an Export class but the _classToFind string was empty",ex.Message);
+        var ex = Assert.Throws<Exception>(() => m.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(
+            "MEFChecker was asked to check for the existence of an Export class but the _classToFind string was empty",
+            ex.Message);
     }
 
     [Test]
     public void FindClass_CorrectNamespace()
     {
-        var m = new MEFChecker(Repository.MEF, "Rdmp.Core.DataLoad.Modules.Attachers.AnySeparatorFileAttacher", s => Assert.Fail());
+        var m = new MEFChecker(Repository.MEF, "Rdmp.Core.DataLoad.Modules.Attachers.AnySeparatorFileAttacher",
+            s => Assert.Fail());
         m.Check(new ThrowImmediatelyCheckNotifier());
     }
 
@@ -58,20 +61,22 @@ public void FindClass_WrongNamespace()
     public void FindClass_NonExistant()
     {
         var m = new MEFChecker(Repository.MEF, "CatalogueLibrary.UncleSam", s => Assert.Fail());
-        var ex = Assert.Throws<Exception>(()=>m.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("Could not find MEF class called CatalogueLibrary.UncleSam in LoadModuleAssembly.GetAllTypes() and couldn't even find any with the same basic name",ex.Message);
+        var ex = Assert.Throws<Exception>(() => m.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains(
+            "Could not find MEF class called CatalogueLibrary.UncleSam in LoadModuleAssembly.GetAllTypes() and couldn't even find any with the same basic name",
+            ex.Message);
     }
 
     [Test]
     public void DllFileDuplication_Ignored()
     {
         // Setup 2 directories that will contain duplicate copies of the same dll
-        var badDir1 = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"Bad1"));
+        var badDir1 = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Bad1"));
         var badDir2 = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Bad2"));
-            
+
         if (badDir1.Exists)
             badDir1.Delete(true);
-            
+
         badDir1.Create();
 
         if (badDir2.Exists)
@@ -79,23 +84,19 @@ public void DllFileDuplication_Ignored()
 
         badDir2.Create();
 
-        var dllToCopy = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"Rdmp.Core.dll"));
+        var dllToCopy = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Rdmp.Core.dll"));
 
         // copy the dll to both folders
-        File.Copy(dllToCopy.FullName, Path.Combine(badDir1.FullName,"Rdmp.Core.dll"));
+        File.Copy(dllToCopy.FullName, Path.Combine(badDir1.FullName, "Rdmp.Core.dll"));
         File.Copy(dllToCopy.FullName, Path.Combine(badDir2.FullName, "Rdmp.Core.dll"));
 
         var tomem = new ToMemoryCheckNotifier();
 
-        var sdc = new SafeDirectoryCatalog(tomem, badDir1.FullName,badDir2.FullName);
+        var sdc = new SafeDirectoryCatalog(tomem, badDir1.FullName, badDir2.FullName);
+
+        Assert.AreEqual(sdc.DuplicateDllsIgnored, 1);
 
-        Assert.AreEqual(sdc .DuplicateDllsIgnored, 1);
-            
         badDir1.Delete(true);
         badDir2.Delete(true);
-
     }
-
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/MementoTests.cs b/Rdmp.Core.Tests/Curation/Integration/MementoTests.cs
index 8f15ae29de..7998386c7d 100644
--- a/Rdmp.Core.Tests/Curation/Integration/MementoTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/MementoTests.cs
@@ -16,12 +16,12 @@ public class MementoTests : DatabaseTests
     [Test]
     public void FakeMemento_Catalogue_Modify()
     {
-        var c = new Catalogue(CatalogueRepository,"Hey");
+        var c = new Catalogue(CatalogueRepository, "Hey");
 
         var g = Guid.NewGuid();
         var commit = new Commit(CatalogueRepository, g, "Breaking stuff!");
 
-        var mem = new Memento(CatalogueRepository,commit,MementoType.Modify,c,"yar","blerg");
+        var mem = new Memento(CatalogueRepository, commit, MementoType.Modify, c, "yar", "blerg");
         mem.SaveToDatabase();
 
         mem.BeforeYaml = "haha";
@@ -36,7 +36,7 @@ public void FakeMemento_Catalogue_Modify()
         Assert.AreEqual("yar", mem2.BeforeYaml);
         Assert.AreEqual(MementoType.Modify, mem2.Type);
         Assert.AreEqual(Environment.UserName, mem2.Commit.Username);
-        Assert.AreEqual(c, mem2.GetReferencedObject(RepositoryLocator)); 
+        Assert.AreEqual(c, mem2.GetReferencedObject(RepositoryLocator));
     }
 
 
@@ -51,7 +51,7 @@ public void FakeMemento_Catalogue_Add()
         var mem = new Memento(CatalogueRepository, commit, MementoType.Add, c, null, "blerg");
         mem.SaveToDatabase();
 
-        foreach(var check in new[] { mem, CatalogueRepository.GetObjectByID<Memento>(mem.ID) })
+        foreach (var check in new[] { mem, CatalogueRepository.GetObjectByID<Memento>(mem.ID) })
         {
             Assert.IsNull(check.BeforeYaml);
             Assert.AreEqual(g, new Guid(check.Commit.Transaction));
diff --git a/Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs b/Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs
index d0ae1ca227..e5ecbfce88 100644
--- a/Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/MetadataLoggingConfigurationChecksTests.cs
@@ -25,13 +25,14 @@ public void Test_NoLoggingTask()
         var cata2 = WhenIHaveA<Catalogue>();
         cata2.LoadMetadata_ID = lmd.ID;
 
-        Assert.AreEqual(2,lmd.GetAllCatalogues().Count());
+        Assert.AreEqual(2, lmd.GetAllCatalogues().Count());
 
         var checks = new MetadataLoggingConfigurationChecks(lmd);
         var toMem = new ToMemoryCheckNotifier();
         checks.Check(toMem);
 
-        AssertFailWithFix("Catalogues Mycata,Mycata do not have a logging task specified","Create a new Logging Task called 'MyLoad'?",toMem);   
+        AssertFailWithFix("Catalogues Mycata,Mycata do not have a logging task specified",
+            "Create a new Logging Task called 'MyLoad'?", toMem);
     }
 
     [Test]
@@ -41,16 +42,16 @@ public void Test_MismatchedLoggingTask()
         var cata1 = lmd.GetAllCatalogues().Single();
         var cata2 = WhenIHaveA<Catalogue>();
         cata2.LoadMetadata_ID = lmd.ID;
-            
+
         cata1.LoggingDataTask = "OMG YEAGH";
 
-        Assert.AreEqual(2,lmd.GetAllCatalogues().Count());
+        Assert.AreEqual(2, lmd.GetAllCatalogues().Count());
 
         var checks = new MetadataLoggingConfigurationChecks(lmd);
         var toMem = new ToMemoryCheckNotifier();
         checks.Check(toMem);
 
-        AssertFailWithFix("Some catalogues have NULL LoggingDataTasks","Set task to OMG YEAGH",toMem);   
+        AssertFailWithFix("Some catalogues have NULL LoggingDataTasks", "Set task to OMG YEAGH", toMem);
     }
 
     [Test]
@@ -60,20 +61,21 @@ public void Test_MissingLoggingServer()
         var cata1 = lmd.GetAllCatalogues().Single();
         var cata2 = WhenIHaveA<Catalogue>();
         cata2.LoadMetadata_ID = lmd.ID;
-            
+
         cata1.LoggingDataTask = "OMG YEAGH";
         cata1.LiveLoggingServer_ID = 2;
         cata2.LoggingDataTask = "OMG YEAGH";
         cata2.LiveLoggingServer_ID = null;
 
-        Assert.AreEqual(2,lmd.GetAllCatalogues().Count());
+        Assert.AreEqual(2, lmd.GetAllCatalogues().Count());
 
         var checks = new MetadataLoggingConfigurationChecks(lmd);
         var toMem = new ToMemoryCheckNotifier();
         checks.Check(toMem);
 
-        AssertFailWithFix("Some catalogues have NULL LiveLoggingServer_ID","Set LiveLoggingServer_ID to 2",toMem);   
+        AssertFailWithFix("Some catalogues have NULL LiveLoggingServer_ID", "Set LiveLoggingServer_ID to 2", toMem);
     }
+
     [Test]
     public void Test_MissingLoggingServer_UseDefault()
     {
@@ -86,28 +88,30 @@ public void Test_MissingLoggingServer_UseDefault()
         eds.SaveToDatabase();
 
         cata2.LoadMetadata_ID = lmd.ID;
-            
+
         cata1.LoggingDataTask = "OMG YEAGH";
         cata1.LiveLoggingServer_ID = null;
         cata2.LoggingDataTask = "OMG YEAGH";
         cata2.LiveLoggingServer_ID = null;
 
         var defaults = RepositoryLocator.CatalogueRepository;
-        defaults.SetDefault(PermissableDefaults.LiveLoggingServer_ID,eds);
+        defaults.SetDefault(PermissableDefaults.LiveLoggingServer_ID, eds);
 
-        Assert.AreEqual(2,lmd.GetAllCatalogues().Count());
+        Assert.AreEqual(2, lmd.GetAllCatalogues().Count());
 
         var checks = new MetadataLoggingConfigurationChecks(lmd);
         var toMem = new ToMemoryCheckNotifier();
         checks.Check(toMem);
 
-        AssertFailWithFix("Some catalogues have NULL LiveLoggingServer_ID",$"Set LiveLoggingServer_ID to 'My Logging Server' (the default)",toMem);   
+        AssertFailWithFix("Some catalogues have NULL LiveLoggingServer_ID",
+            $"Set LiveLoggingServer_ID to 'My Logging Server' (the default)", toMem);
     }
+
     private static void AssertFailWithFix(string expectedMessage, string expectedFix, ToMemoryCheckNotifier toMem)
     {
         var msg = toMem.Messages.First(m => m.Result == CheckResult.Fail);
 
-        Assert.AreEqual(expectedMessage,msg.Message,"Expected error message was wrong");
-        Assert.AreEqual(expectedFix,msg.ProposedFix,"Expected proposed fix was wrong");
+        Assert.AreEqual(expectedMessage, msg.Message, "Expected error message was wrong");
+        Assert.AreEqual(expectedFix, msg.ProposedFix, "Expected proposed fix was wrong");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/MySqlTriggerImplementerTests.cs b/Rdmp.Core.Tests/Curation/Integration/MySqlTriggerImplementerTests.cs
index 03fef8bf2b..5163722df7 100644
--- a/Rdmp.Core.Tests/Curation/Integration/MySqlTriggerImplementerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/MySqlTriggerImplementerTests.cs
@@ -11,13 +11,13 @@ namespace Rdmp.Core.Tests.Curation.Integration;
 
 public class MySqlTriggerImplementerTests
 {
-    [TestCase("4.0",true)]
-    [TestCase("5.1",true)]
-    [TestCase("8.5",false)]
-    [TestCase("5.5.64-MariaDB",true)]
-    [TestCase("10.5.64-MariaDB",false)]
+    [TestCase("4.0", true)]
+    [TestCase("5.1", true)]
+    [TestCase("8.5", false)]
+    [TestCase("5.5.64-MariaDB", true)]
+    [TestCase("10.5.64-MariaDB", false)]
     public void TestOldNew(string versionString, bool expectToUseOldMethod)
     {
-        Assert.AreEqual(expectToUseOldMethod,MySqlTriggerImplementer.UseOldDateTimeDefaultMethod(versionString));
+        Assert.AreEqual(expectToUseOldMethod, MySqlTriggerImplementer.UseOldDateTimeDefaultMethod(versionString));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/BetweenCatalogueAndDataExportObscureDependencyFinderTests.cs b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/BetweenCatalogueAndDataExportObscureDependencyFinderTests.cs
index e38821a51f..95ed91b40c 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/BetweenCatalogueAndDataExportObscureDependencyFinderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/BetweenCatalogueAndDataExportObscureDependencyFinderTests.cs
@@ -24,25 +24,27 @@ public void PreventDeletingCatalogueBecauseOfLinkedDatasetTest()
         var cata = new Catalogue(CatalogueRepository, "MyCata");
 
         //catalogue exists in isolation so is deletable
-        Assert.DoesNotThrow(()=>obscura.ThrowIfDeleteDisallowed(cata));
+        Assert.DoesNotThrow(() => obscura.ThrowIfDeleteDisallowed(cata));
 
         //there is a new dataset which is linked to Catalogue
-        var dataset = new ExtractableDataSet(DataExportRepository,cata);
+        var dataset = new ExtractableDataSet(DataExportRepository, cata);
 
         //and suddenly we cannot delete the catalogue
         var ex = Assert.Throws<Exception>(() => obscura.ThrowIfDeleteDisallowed(cata));
-        Assert.IsTrue(ex.Message.Contains("Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
+        Assert.IsTrue(ex.Message.Contains(
+            "Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
 
         //also if we try to force through a delete it should behave in identical manner
         var ex2 = Assert.Throws<Exception>(cata.DeleteInDatabase);
-        Assert.IsTrue(ex2.Message.Contains("Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
+        Assert.IsTrue(ex2.Message.Contains(
+            "Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
 
         //now we delete the linked dataset
         dataset.DeleteInDatabase();
 
         //and because there is now no longer a dataset dependency on the catalogue we can delete it
         Assert.DoesNotThrow(() => obscura.ThrowIfDeleteDisallowed(cata));
-            
+
         //and the delete works too
         cata.DeleteInDatabase();
 
@@ -54,17 +56,18 @@ public void PreventDeletingCatalogueBecauseOfLinkedDatasetTest()
     [Test]
     public void AllowDeletingWhenDataExportManagerIsNotSet()
     {
-        var noDataExportManagerExists = new LinkedRepositoryProvider(CatalogueTableRepository.ConnectionString,null);
+        var noDataExportManagerExists = new LinkedRepositoryProvider(CatalogueTableRepository.ConnectionString, null);
 
         var obscura1 = new BetweenCatalogueAndDataExportObscureDependencyFinder(RepositoryLocator);
         var obscura2 = new BetweenCatalogueAndDataExportObscureDependencyFinder(noDataExportManagerExists);
 
         var cata = new Catalogue(CatalogueRepository, "MyCata");
-        var dataset = new ExtractableDataSet(DataExportRepository,cata);
+        var dataset = new ExtractableDataSet(DataExportRepository, cata);
 
         //we cannot delete it because there is a dependency
         var ex = Assert.Throws<Exception>(() => obscura1.ThrowIfDeleteDisallowed(cata));
-        Assert.IsTrue(ex.Message.Contains("Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
+        Assert.IsTrue(ex.Message.Contains(
+            "Cannot delete Catalogue MyCata because there are ExtractableDataSets which depend on them "));
 
         //the second finder simulates when the repository locator doesn't have a record of the data export repository so it is unable to check it so it will let you delete it just fine
         Assert.DoesNotThrow(() => obscura2.ThrowIfDeleteDisallowed(cata));
@@ -72,6 +75,5 @@ public void AllowDeletingWhenDataExportManagerIsNotSet()
         //now delete them in the correct order
         dataset.DeleteInDatabase();
         cata.DeleteInDatabase();
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ObjectSharingObscureDependencyFinderTests.cs b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ObjectSharingObscureDependencyFinderTests.cs
index a7d38a5810..483fe2d7d9 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ObjectSharingObscureDependencyFinderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ObjectSharingObscureDependencyFinderTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.ObscureDependencyTests;
 
-public class ObjectSharingObscureDependencyFinderTests: DatabaseTests
+public class ObjectSharingObscureDependencyFinderTests : DatabaseTests
 {
     private ShareManager _share;
 
@@ -28,10 +28,10 @@ protected override void SetUp()
     [Test]
     public void TestPruning()
     {
-        var c = new Catalogue(CatalogueRepository,"Catapault");
+        var c = new Catalogue(CatalogueRepository, "Catapault");
         var ci = new CatalogueItem(CatalogueRepository, c, "string");
 
-        var c2 = new Catalogue(CatalogueRepository,"Catapault (Import)");
+        var c2 = new Catalogue(CatalogueRepository, "Catapault (Import)");
         var ci2 = new CatalogueItem(CatalogueRepository, c2, "string (Import)");
 
         Assert.AreEqual(CatalogueRepository.GetAllObjects<ObjectExport>().Length, 0);
@@ -40,10 +40,12 @@ public void TestPruning()
 
         _share.GetImportAs(ec.SharingUID, c2);
         _share.GetImportAs(eci.SharingUID, ci2);
-            
+
         Assert.AreEqual(2, CatalogueRepository.GetAllObjects<ObjectExport>().Length);
         Assert.AreEqual(2, CatalogueRepository.GetAllObjects<ObjectImport>().Length);
-        Assert.AreEqual(2, CatalogueRepository.GetAllObjects<ObjectImport>().Length);//successive calls shouldhn't generate extra entries since they are same obj
+        Assert.AreEqual(2,
+            CatalogueRepository.GetAllObjects<ObjectImport>()
+                .Length); //successive calls shouldhn't generate extra entries since they are same obj
         Assert.AreEqual(2, CatalogueRepository.GetAllObjects<ObjectImport>().Length);
 
         //cannot delete the shared object
@@ -62,7 +64,7 @@ public void TestPruning()
     public void CannotDeleteSharedObjectTest()
     {
         //create a test catalogue
-        var c = new Catalogue(CatalogueRepository,"blah");
+        var c = new Catalogue(CatalogueRepository, "blah");
 
         Assert.IsFalse(_share.IsExportedObject(c));
 
diff --git a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ValidationXMLObscureDependencyFinderTests.cs b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ValidationXMLObscureDependencyFinderTests.cs
index 041ddfbdf1..5adad9d0a1 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ValidationXMLObscureDependencyFinderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ObscureDependencyTests/ValidationXMLObscureDependencyFinderTests.cs
@@ -21,20 +21,20 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.ObscureDependencyTests;
 
-public class ValidationXMLObscureDependencyFinderTests: DatabaseTests
+public class ValidationXMLObscureDependencyFinderTests : DatabaseTests
 {
     [Test]
     public void TestGettingTheUsualSuspects()
     {
-        var finder = new ValidationXMLObscureDependencyFinder( RepositoryLocator);
-            
+        var finder = new ValidationXMLObscureDependencyFinder(RepositoryLocator);
+
         //forces call to initialize
         finder.ThrowIfDeleteDisallowed(null);
 
         //this guy should be a usual suspect!
         Assert.IsTrue(finder.TheUsualSuspects.Any(s => s.Type == typeof(ReferentialIntegrityConstraint)));
 
-        var testXML = 
+        var testXML =
             @"<?xml version=""1.0"" encoding=""utf-16""?>
 <Validator xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">
   <ItemValidators>
@@ -56,12 +56,12 @@ public void TestGettingTheUsualSuspects()
         {
             var pattern = string.Format(suspect.Pattern, 10029);
 
-            kaizerSoze = Regex.IsMatch(testXML, pattern,RegexOptions.Singleline);
+            kaizerSoze = Regex.IsMatch(testXML, pattern, RegexOptions.Singleline);
 
             if (kaizerSoze)
                 break;
         }
-            
+
         Assert.IsTrue(kaizerSoze);
     }
 
@@ -84,14 +84,15 @@ public void DeleteAReferencedValidationXML()
 
             //we expect the validation XML to find the reference
             var finder = new ValidationXMLObscureDependencyFinder(RepositoryLocator);
-                
+
             //and explode
             Assert.Throws<ValidationXmlDependencyException>(() => finder.ThrowIfDeleteDisallowed(l2ColumnInfo));
-                
-            Assert.AreEqual(0,finder.CataloguesWithBrokenValidationXml.Count);
+
+            Assert.AreEqual(0, finder.CataloguesWithBrokenValidationXml.Count);
 
             //now clear the validation XML
-            testData.catalogue.ValidatorXML = testData.catalogue.ValidatorXML.Insert(100,"I've got a lovely bunch of coconuts!");
+            testData.catalogue.ValidatorXML =
+                testData.catalogue.ValidatorXML.Insert(100, "I've got a lovely bunch of coconuts!");
             testData.catalogue.SaveToDatabase();
 
             //column info should be deleteable but only because we got ourselves onto the forbidlist
@@ -109,11 +110,11 @@ public void DeleteAReferencedValidationXML()
             testData.DeleteCatalogue();
         }
     }
-        
+
     [Test]
     public void Test_DeleteAColumnInfoThatIsReferenced()
     {
-        var startup = new Startup.Startup(new EnvironmentInfo(),RepositoryLocator);
+        var startup = new Startup.Startup(new EnvironmentInfo(), RepositoryLocator);
         startup.DoStartup(new IgnoreAllErrorsCheckNotifier());
 
         var testData = SetupTestData(out var l2ColumnInfo);
@@ -121,7 +122,7 @@ public void Test_DeleteAColumnInfoThatIsReferenced()
         try
         {
             //should fail because of the validation constraint being dependent on it
-            Assert.Throws<ValidationXmlDependencyException>(()=>l2ColumnInfo.DeleteInDatabase());
+            Assert.Throws<ValidationXmlDependencyException>(() => l2ColumnInfo.DeleteInDatabase());
         }
         finally
         {
@@ -135,19 +136,19 @@ public void Test_DeleteAColumnInfoThatIsReferenced()
     [Test]
     public void TestRunningSetupMultipleTimes()
     {
-
-        var startup = new Startup.Startup(new EnvironmentInfo(),RepositoryLocator);
+        var startup = new Startup.Startup(new EnvironmentInfo(), RepositoryLocator);
         try
         {
             startup.DoStartup(new IgnoreAllErrorsCheckNotifier());
         }
         catch (InvalidPatchException patchException)
         {
-            throw new Exception($"Problem in patch {patchException.ScriptName}",patchException);
+            throw new Exception($"Problem in patch {patchException.ScriptName}", patchException);
         }
+
         //there should be all the obscure dependencies we need done with only the first call to this function
         var numberAfterFirstRun =
-            ((CatalogueObscureDependencyFinder) CatalogueRepository.ObscureDependencyFinder)
+            ((CatalogueObscureDependencyFinder)CatalogueRepository.ObscureDependencyFinder)
             .OtherDependencyFinders.Count;
 
         startup.DoStartup(new IgnoreAllErrorsCheckNotifier());
@@ -156,10 +157,8 @@ public void TestRunningSetupMultipleTimes()
 
         //there should not be any replication! and doubling SetUp!
         Assert.AreEqual(numberAfterFirstRun,
-            ((CatalogueObscureDependencyFinder) CatalogueRepository.ObscureDependencyFinder)
+            ((CatalogueObscureDependencyFinder)CatalogueRepository.ObscureDependencyFinder)
             .OtherDependencyFinders.Count);
-            
-            
     }
 
     #region setup test data with some validation rule
@@ -196,5 +195,6 @@ private BulkTestsData SetupTestData(out ColumnInfo l2ColumnInfo)
 
         return testData;
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/PasswordEncryptionKeyLocationTests.cs b/Rdmp.Core.Tests/Curation/Integration/PasswordEncryptionKeyLocationTests.cs
index 0f7a08ea73..d1b1f1559b 100644
--- a/Rdmp.Core.Tests/Curation/Integration/PasswordEncryptionKeyLocationTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/PasswordEncryptionKeyLocationTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class PasswordEncryptionKeyLocationTests:DatabaseTests
+public class PasswordEncryptionKeyLocationTests : DatabaseTests
 {
     [SetUp]
     protected override void SetUp()
@@ -23,7 +23,7 @@ protected override void SetUp()
 
         var keyLocation = new PasswordEncryptionKeyLocation(CatalogueRepository);
 
-        if(keyLocation.GetKeyFileLocation() != null)
+        if (keyLocation.GetKeyFileLocation() != null)
             Assert.Inconclusive();
     }
 
@@ -37,14 +37,13 @@ public void NoKeyFileToStartWith()
 
         var e = Assert.Throws<NotSupportedException>(keyLocation.DeleteKey);
         Assert.AreEqual("Cannot delete key because there is no key file configured", e.Message);
-
     }
 
     [Test]
     public void CreateKeyFile()
     {
         var keyLocation = new PasswordEncryptionKeyLocation(CatalogueRepository);
-        var file = keyLocation.CreateNewKeyFile(Path.Combine(TestContext.CurrentContext.TestDirectory,"my.key"));
+        var file = keyLocation.CreateNewKeyFile(Path.Combine(TestContext.CurrentContext.TestDirectory, "my.key"));
 
         Console.WriteLine($"Key file location is:{file.FullName}");
         Console.WriteLine($"Text put into file is:{Environment.NewLine}{File.ReadAllText(file.FullName)}");
@@ -69,8 +68,8 @@ public void Encrypt()
 
         //should do pass through encryption
         encrypter.Value = value;
-        Assert.AreNotEqual(value,encrypter.Value);
-        Assert.AreEqual(value,encrypter.GetDecryptedValue());
+        Assert.AreNotEqual(value, encrypter.Value);
+        Assert.AreEqual(value, encrypter.GetDecryptedValue());
 
         Console.WriteLine($"Encrypted (stock) is:{encrypter.Value}");
         Console.WriteLine($"Decrypted (stock) is:{encrypter.GetDecryptedValue()}");
@@ -82,8 +81,9 @@ public void Encrypt()
         CatalogueRepository.EncryptionManager.ClearAllInjections();
 
         var s = CatalogueRepository.EncryptionManager.GetEncrypter();
-        var exception = Assert.Throws<CryptographicException>(()=>s.Decrypt(encrypter.Value));
-        Assert.IsTrue(exception.Message.StartsWith("Could not decrypt an encrypted string, possibly you are trying to decrypt it after having changed the PrivateKey "));
+        var exception = Assert.Throws<CryptographicException>(() => s.Decrypt(encrypter.Value));
+        Assert.IsTrue(exception.Message.StartsWith(
+            "Could not decrypt an encrypted string, possibly you are trying to decrypt it after having changed the PrivateKey "));
 
         var encrypted = s.Encrypt(value);
         Console.WriteLine($"Encrypted (with key) is:{encrypted}");
@@ -93,5 +93,4 @@ public void Encrypt()
 
         keyLocation.DeleteKey();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/PipelineTests.cs b/Rdmp.Core.Tests/Curation/Integration/PipelineTests.cs
index 74e5a1fb1d..a2904766d2 100644
--- a/Rdmp.Core.Tests/Curation/Integration/PipelineTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/PipelineTests.cs
@@ -25,15 +25,16 @@ public void SetupAndSaveAPipeline()
 
         try
         {
-            Assert.AreEqual(pipeline.Name,"Bob");
+            Assert.AreEqual(pipeline.Name, "Bob");
+
+            var pipelineComponent =
+                new PipelineComponent(CatalogueRepository, pipeline, typeof(BasicAnonymisationEngine), 0);
 
-            var pipelineComponent = new PipelineComponent(CatalogueRepository, pipeline, typeof (BasicAnonymisationEngine), 0);
-                
             try
             {
-                Assert.AreEqual(pipelineComponent.Class,typeof(BasicAnonymisationEngine).FullName);
+                Assert.AreEqual(pipelineComponent.Class, typeof(BasicAnonymisationEngine).FullName);
 
-                var argument1 = (PipelineComponentArgument) pipelineComponent.CreateNewArgument();
+                var argument1 = (PipelineComponentArgument)pipelineComponent.CreateNewArgument();
                 var argument2 = new PipelineComponentArgument(CatalogueRepository, pipelineComponent);
 
                 try
@@ -42,19 +43,19 @@ public void SetupAndSaveAPipeline()
                     argument1.SetValue("bob");
                     argument1.SaveToDatabase();
 
-                    var dt = DateTime.Now ;
-                    dt = new DateTime(dt.Ticks - dt.Ticks % TimeSpan.TicksPerSecond,dt.Kind);//get rid of the milliseconds
+                    var dt = DateTime.Now;
+                    dt = new DateTime(dt.Ticks - dt.Ticks % TimeSpan.TicksPerSecond,
+                        dt.Kind); //get rid of the milliseconds
 
                     argument2.SetType(typeof(DateTime));
                     argument2.SetValue(dt);
                     argument2.SaveToDatabase();
 
                     var argument2Copy = CatalogueRepository.GetObjectByID<PipelineComponentArgument>(argument2.ID);
-                    Assert.AreEqual(dt,argument2Copy.GetValueAsSystemType());
+                    Assert.AreEqual(dt, argument2Copy.GetValueAsSystemType());
                 }
-                finally 
+                finally
                 {
-                        
                     argument1.DeleteInDatabase();
                     argument2.DeleteInDatabase();
                 }
@@ -63,9 +64,8 @@ public void SetupAndSaveAPipeline()
             {
                 pipelineComponent.DeleteInDatabase();
             }
-
         }
-        finally 
+        finally
         {
             pipeline.DeleteInDatabase();
         }
@@ -84,15 +84,15 @@ public void ClonePipelineNaming()
         var clone2 = p.Clone();
         var clone3 = p.Clone();
 
-        Assert.AreEqual("My Pipe (Clone)",clone1.Name);
-        Assert.AreEqual("My Pipe (Clone2)",clone2.Name);
-        Assert.AreEqual("My Pipe (Clone3)",clone3.Name);
+        Assert.AreEqual("My Pipe (Clone)", clone1.Name);
+        Assert.AreEqual("My Pipe (Clone2)", clone2.Name);
+        Assert.AreEqual("My Pipe (Clone3)", clone3.Name);
 
         var cloneOfClone1 = clone3.Clone();
         var cloneOfClone2 = clone3.Clone();
-            
-        Assert.AreEqual("My Pipe (Clone3) (Clone)",cloneOfClone1.Name);
-        Assert.AreEqual("My Pipe (Clone3) (Clone2)",cloneOfClone2.Name);
+
+        Assert.AreEqual("My Pipe (Clone3) (Clone)", cloneOfClone1.Name);
+        Assert.AreEqual("My Pipe (Clone3) (Clone2)", cloneOfClone2.Name);
     }
 
 
@@ -106,18 +106,18 @@ public void CloneAPipeline()
     {
         var p = new Pipeline(CatalogueRepository);
 
-        var source = new PipelineComponent(CatalogueRepository, p, typeof (DelimitedFlatFileAttacher), 0);
+        var source = new PipelineComponent(CatalogueRepository, p, typeof(DelimitedFlatFileAttacher), 0);
         source.CreateArgumentsForClassIfNotExists<DelimitedFlatFileAttacher>();
 
-        var middle = new PipelineComponent(CatalogueRepository, p, typeof (ColumnRenamer), 1);
+        var middle = new PipelineComponent(CatalogueRepository, p, typeof(ColumnRenamer), 1);
         middle.CreateArgumentsForClassIfNotExists<ColumnRenamer>();
 
         var middle2 = new PipelineComponent(CatalogueRepository, p, typeof(ColumnForbidder), 1);
         middle2.CreateArgumentsForClassIfNotExists<ColumnForbidder>();
 
-        var destination = new PipelineComponent(CatalogueRepository, p, typeof (DataTableUploadDestination), 2);
+        var destination = new PipelineComponent(CatalogueRepository, p, typeof(DataTableUploadDestination), 2);
         destination.CreateArgumentsForClassIfNotExists<DataTableUploadDestination>();
-            
+
         p.SourcePipelineComponent_ID = source.ID;
         p.DestinationPipelineComponent_ID = destination.ID;
         p.SaveToDatabase();
@@ -125,7 +125,8 @@ public void CloneAPipeline()
         var componentsBefore = RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponent>().Length;
         var argumentsBefore = RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponentArgument>().Length;
 
-        var arg = p.PipelineComponents.Single(c => c.Class == typeof (ColumnRenamer).ToString()).PipelineComponentArguments.Single(a => a.Name == "ColumnNameToFind");
+        var arg = p.PipelineComponents.Single(c => c.Class == typeof(ColumnRenamer).ToString())
+            .PipelineComponentArguments.Single(a => a.Name == "ColumnNameToFind");
         arg.SetValue("MyMostCoolestColumnEver");
         arg.SaveToDatabase();
 
@@ -133,25 +134,29 @@ public void CloneAPipeline()
         var p2 = p.Clone();
 
         Assert.AreNotEqual(p2, p);
-        Assert.AreNotEqual(p2.ID,p.ID);
+        Assert.AreNotEqual(p2.ID, p.ID);
 
         Assert.AreEqual(p2.Name, $"{p.Name} (Clone)");
 
-        Assert.AreEqual(componentsBefore *2, RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponent>().Length);
-        Assert.AreEqual(argumentsBefore *2, RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponentArgument>().Length);
+        Assert.AreEqual(componentsBefore * 2,
+            RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponent>().Length);
+        Assert.AreEqual(argumentsBefore * 2,
+            RepositoryLocator.CatalogueRepository.GetAllObjects<PipelineComponentArgument>().Length);
 
         //p the original should have a pipeline component that has the value we set earlier
         Assert.AreEqual(
-            p.PipelineComponents.Single(c => c.Class == typeof(ColumnRenamer).ToString()).PipelineComponentArguments.Single(a => a.Name == "ColumnNameToFind").Value,
+            p.PipelineComponents.Single(c => c.Class == typeof(ColumnRenamer).ToString()).PipelineComponentArguments
+                .Single(a => a.Name == "ColumnNameToFind").Value,
             "MyMostCoolestColumnEver"
         );
-            
+
         //p2 the clone should have a pipeline component too since it's a clone
         Assert.AreEqual(
-            p2.PipelineComponents.Single(c => c.Class == typeof(ColumnRenamer).ToString()).PipelineComponentArguments.Single(a => a.Name == "ColumnNameToFind").Value,
+            p2.PipelineComponents.Single(c => c.Class == typeof(ColumnRenamer).ToString()).PipelineComponentArguments
+                .Single(a => a.Name == "ColumnNameToFind").Value,
             "MyMostCoolestColumnEver"
         );
-            
+
         //both should have source and destination components
         Assert.NotNull(p2.DestinationPipelineComponent_ID);
         Assert.NotNull(p2.SourcePipelineComponent_ID);
@@ -170,33 +175,32 @@ public void CloneAPipeline_BrokenPipes()
         var p = new Pipeline(CatalogueRepository);
 
         //Setup a pipeline with a source component type that doesn't exist
-        var source = new PipelineComponent(CatalogueRepository, p, typeof (DelimitedFlatFileAttacher), 0)
- {
-     Class = "Trollololol"
- };
+        var source = new PipelineComponent(CatalogueRepository, p, typeof(DelimitedFlatFileAttacher), 0)
+        {
+            Class = "Trollololol"
+        };
         source.SaveToDatabase();
 
         var arg = source.CreateNewArgument();
 
         //Also give the source component a non existent argument
-        arg.GetType().GetProperty("Type").SetValue(arg,"fffffzololz");
+        arg.GetType().GetProperty("Type").SetValue(arg, "fffffzololz");
         arg.SaveToDatabase();
 
         p.SourcePipelineComponent_ID = source.ID;
         p.SaveToDatabase();
-            
-        Assert.AreEqual("fffffzololz",p.Source.GetAllArguments().Single().Type);
+
+        Assert.AreEqual("fffffzololz", p.Source.GetAllArguments().Single().Type);
 
         var clone = p.Clone();
 
-        Assert.AreEqual(clone.Source.Class,p.Source.Class);
-        Assert.AreEqual("fffffzololz",clone.Source.GetAllArguments().Single().Type);
+        Assert.AreEqual(clone.Source.Class, p.Source.Class);
+        Assert.AreEqual("fffffzololz", clone.Source.GetAllArguments().Single().Type);
 
         p.DeleteInDatabase();
         clone.DeleteInDatabase();
-
-
     }
+
     [Test]
     public void DeletePipelineSource_ClearsReference()
     {
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateBuilderTestsBase.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateBuilderTestsBase.cs
index 2242c444a3..bdb6dab974 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateBuilderTestsBase.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateBuilderTestsBase.cs
@@ -51,5 +51,4 @@ protected override void SetUp()
         _dimension2.Order = 2;
         _dimension2.SaveToDatabase();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs
index 747257b8ea..fdb0024482 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/AggregateDataBasedTests.cs
@@ -26,7 +26,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.QueryBuildingTests.AggregateBuilderTests;
 
-public class AggregateDataBasedTests:DatabaseTests
+public class AggregateDataBasedTests : DatabaseTests
 {
     private static DataTable GetTestDataTable()
     {
@@ -47,14 +47,15 @@ private static DataTable GetTestDataTable()
         dt.Rows.Add("2002-03-02", "T", "17");
         dt.Rows.Add("2003-01-01", "T", "19");
         dt.Rows.Add("2003-04-02", "T", "23");
-            
+
 
         dt.Rows.Add("2002-01-01", "F", "29");
         dt.Rows.Add("2002-01-01", "F", "31");
 
         dt.Rows.Add("2001-01-01", "E&, %a' mp;E", "37");
         dt.Rows.Add("2002-01-01", "E&, %a' mp;E", "41");
-        dt.Rows.Add("2005-01-01", "E&, %a' mp;E", "59");  //note there are no records in 2004 it is important for axis tests (axis involves you having to build a calendar table)
+        dt.Rows.Add("2005-01-01", "E&, %a' mp;E",
+            "59"); //note there are no records in 2004 it is important for axis tests (axis involves you having to build a calendar table)
 
         dt.Rows.Add(null, "G", "47");
         dt.Rows.Add("2001-01-01", "G", "53");
@@ -64,7 +65,8 @@ private static DataTable GetTestDataTable()
 
     #region Helper methods
 
-    private DiscoveredTable UploadTestDataAsTableToServer(DatabaseType type, out ICatalogue catalogue, out ExtractionInformation[] extractionInformations, out ITableInfo tableinfo)
+    private DiscoveredTable UploadTestDataAsTableToServer(DatabaseType type, out ICatalogue catalogue,
+        out ExtractionInformation[] extractionInformations, out ITableInfo tableinfo)
     {
         var listener = new ThrowImmediatelyDataLoadEventListener();
 
@@ -80,10 +82,11 @@ private DiscoveredTable UploadTestDataAsTableToServer(DatabaseType type, out ICa
 
         Assert.IsTrue(tbl.Exists());
 
-        catalogue = Import(tbl,out tableinfo,out _,out _, out extractionInformations);
+        catalogue = Import(tbl, out tableinfo, out _, out _, out extractionInformations);
 
         return tbl;
     }
+
     private static void Destroy(DiscoveredTable tbl, params IDeleteable[] deletablesInOrderOfDeletion)
     {
         tbl.Drop();
@@ -114,13 +117,14 @@ private static void AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(Aggregate
 
         var repo = new MemoryCatalogueRepository();
 
-        var ORContainer = new SpontaneouslyInventedFilterContainer(repo,null, null, FilterContainerOperation.OR);
+        var ORContainer = new SpontaneouslyInventedFilterContainer(repo, null, null, FilterContainerOperation.OR);
         var constParam = new ConstantParameter(declaration, "'T'", "T Category Only", syntaxHelper);
 
         //this is deliberately duplication, it tests that the parameter compiles as well as that any dynamic sql doesn't get thrown by quotes
-        var filter1 = new SpontaneouslyInventedFilter(repo,ORContainer, "(Category=@category OR Category = 'T')", "Category Is @category",
+        var filter1 = new SpontaneouslyInventedFilter(repo, ORContainer, "(Category=@category OR Category = 'T')",
+            "Category Is @category",
             "ensures the records belong to the category @category", new ISqlParameter[] { constParam });
-        var filter2 = new SpontaneouslyInventedFilter(repo,ORContainer, "NumberInTrouble > 42",
+        var filter2 = new SpontaneouslyInventedFilter(repo, ORContainer, "NumberInTrouble > 42",
             "number in trouble greater than 42", "See above", null);
 
         ORContainer.AddChild(filter1);
@@ -129,7 +133,8 @@ private static void AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(Aggregate
         builder.RootFilterContainer = ORContainer;
     }
 
-    private AggregateConfiguration SetupAggregateWithAxis(DatabaseType type, ExtractionInformation[] extractionInformations,
+    private AggregateConfiguration SetupAggregateWithAxis(DatabaseType type,
+        ExtractionInformation[] extractionInformations,
         ICatalogue catalogue, out AggregateDimension axisDimension)
     {
         var dateDimension =
@@ -147,7 +152,8 @@ private AggregateConfiguration SetupAggregateWithAxis(DatabaseType type, Extract
         return configuration;
     }
 
-    private AggregateConfiguration SetupAggregateWithPivot(DatabaseType type, ExtractionInformation[] extractionInformations,
+    private AggregateConfiguration SetupAggregateWithPivot(DatabaseType type,
+        ExtractionInformation[] extractionInformations,
         ICatalogue catalogue, out AggregateDimension axisDimension, out AggregateDimension pivotDimension)
     {
         var axisCol =
@@ -179,9 +185,10 @@ private AggregateConfiguration SetupAggregateWithPivot(DatabaseType type, Extrac
     //[TestCase(DatabaseType.Oracle)]// doesn't quite work yet :) needs full implementation of database abstraction layer for Oracle to work
     public void Count_CorrectNumberOfRowsCalculated(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type,out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
-        var builder = new AggregateBuilder(null, "count(*)", null,new []{tableInfo});
+        var builder = new AggregateBuilder(null, "count(*)", null, new[] { tableInfo });
         var resultTable = GetResultForBuilder(builder, tbl);
         try
         {
@@ -199,11 +206,13 @@ public void Count_CorrectNumberOfRowsCalculated(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_CategoryWithCount_Correct(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate
-        var categoryDimension = extractionInformations.Single(e => e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
-        var configuration  = new AggregateConfiguration(CatalogueRepository,catalogue,"GroupBy_Category");
+        var categoryDimension = extractionInformations.Single(e =>
+            e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
+        var configuration = new AggregateConfiguration(CatalogueRepository, catalogue, "GroupBy_Category");
         var dimension = new AggregateDimension(CatalogueRepository, categoryDimension, configuration);
 
         try
@@ -229,10 +238,12 @@ public void GroupBy_CategoryWithCount_Correct(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_CategoryWithSum_Correct(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate
-        var categoryDimension = extractionInformations.Single(e => e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
+        var categoryDimension = extractionInformations.Single(e =>
+            e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
         var configuration = new AggregateConfiguration(CatalogueRepository, catalogue, "GroupBy_Category");
         var dimension = new AggregateDimension(CatalogueRepository, categoryDimension, configuration);
 
@@ -249,7 +260,7 @@ public void GroupBy_CategoryWithSum_Correct(DatabaseType type)
             VerifyRowExist(resultTable, "F", 60);
             VerifyRowExist(resultTable, "E&, %a' mp;E", 137);
             VerifyRowExist(resultTable, "G", 100);
-            Assert.AreEqual(4,resultTable.Rows.Count);
+            Assert.AreEqual(4, resultTable.Rows.Count);
         }
         finally
         {
@@ -262,10 +273,12 @@ public void GroupBy_CategoryWithSum_Correct(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_CategoryWithSum_WHEREStatement(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate
-        var categoryDimension = extractionInformations.Single(e => e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
+        var categoryDimension = extractionInformations.Single(e =>
+            e.GetRuntimeName().Equals("Category", StringComparison.CurrentCultureIgnoreCase));
         var configuration = new AggregateConfiguration(CatalogueRepository, catalogue, "GroupBy_Category");
         var dimension = new AggregateDimension(CatalogueRepository, categoryDimension, configuration);
 
@@ -278,7 +291,7 @@ public void GroupBy_CategoryWithSum_WHEREStatement(DatabaseType type)
             var builder = new AggregateBuilder(null, configuration.CountSQL, configuration);
             builder.AddColumn(dimension);
 
-            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder,type);
+            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder, type);
 
             var resultTable = GetResultForBuilder(builder, tbl);
 
@@ -294,12 +307,14 @@ public void GroupBy_CategoryWithSum_WHEREStatement(DatabaseType type)
             Destroy(tbl, configuration, catalogue, tableInfo);
         }
     }
+
     [Test]
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_AxisWithSum_Correct(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate with axis
         var configuration = SetupAggregateWithAxis(type, extractionInformations, catalogue, out var dimension);
@@ -316,9 +331,10 @@ public void GroupBy_AxisWithSum_Correct(DatabaseType type)
             var resultTable = GetResultForBuilder(builder, tbl);
 
             //axis is ordered ascending by date starting in 2000 so that row should come first
-            Assert.IsTrue(AreBasicallyEquals( "2000",resultTable.Rows[0][0]));
+            Assert.IsTrue(AreBasicallyEquals("2000", resultTable.Rows[0][0]));
 
-            VerifyRowExist(resultTable, "2000", null); //because it is a SUM the ANSI return should be null not 0 since it is a sum of no records
+            VerifyRowExist(resultTable, "2000",
+                null); //because it is a SUM the ANSI return should be null not 0 since it is a sum of no records
             VerifyRowExist(resultTable, "2001", 157);
             VerifyRowExist(resultTable, "2002", 131);
             VerifyRowExist(resultTable, "2003", 42);
@@ -331,14 +347,15 @@ public void GroupBy_AxisWithSum_Correct(DatabaseType type)
         {
             Destroy(tbl, configuration, catalogue, tableInfo);
         }
-            
     }
+
     [Test]
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_AxisWithCount_HAVING(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate with axis
         var configuration = SetupAggregateWithAxis(type, extractionInformations, catalogue, out var dimension);
@@ -358,7 +375,8 @@ public void GroupBy_AxisWithCount_HAVING(DatabaseType type)
             //axis is ordered ascending by date starting in 2000 so that row should come first
             Assert.IsTrue(AreBasicallyEquals("2000", resultTable.Rows[0][0]));
 
-            VerifyRowExist(resultTable, "2000", null); //records only showing where there are more than 3 records (HAVING refers to the year since there's no pivot)
+            VerifyRowExist(resultTable, "2000",
+                null); //records only showing where there are more than 3 records (HAVING refers to the year since there's no pivot)
             VerifyRowExist(resultTable, "2001", 5);
             VerifyRowExist(resultTable, "2002", 5);
             VerifyRowExist(resultTable, "2003", null);
@@ -371,7 +389,6 @@ public void GroupBy_AxisWithCount_HAVING(DatabaseType type)
         {
             Destroy(tbl, configuration, catalogue, tableInfo);
         }
-
     }
 
 
@@ -380,7 +397,8 @@ public void GroupBy_AxisWithCount_HAVING(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_AxisWithCount_WHERECorrect(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate with axis
         var configuration = SetupAggregateWithAxis(type, extractionInformations, catalogue, out var dimension);
@@ -393,7 +411,7 @@ public void GroupBy_AxisWithCount_WHERECorrect(DatabaseType type)
             var builder = new AggregateBuilder(null, configuration.CountSQL, configuration);
             builder.AddColumn(dimension);
 
-            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder,type);
+            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder, type);
 
             var resultTable = GetResultForBuilder(builder, tbl);
 
@@ -416,10 +434,12 @@ public void GroupBy_AxisWithCount_WHERECorrect(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_PivotWithSum_Correct(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate pivot (and axis)
-        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension, out var pivotDimension);
+        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension,
+            out var pivotDimension);
 
         configuration.CountSQL = "sum(NumberInTrouble)";
         configuration.PivotOnDimensionID = pivotDimension.ID; //pivot on the Category
@@ -438,18 +458,19 @@ public void GroupBy_PivotWithSum_Correct(DatabaseType type)
             //axis is ordered ascending by date starting in 2000 so that row should come first
             Assert.IsTrue(AreBasicallyEquals("2000", resultTable.Rows[0][0]));
 
-            Assert.AreEqual("T",resultTable.Columns[1].ColumnName);
+            Assert.AreEqual("T", resultTable.Columns[1].ColumnName);
             Assert.AreEqual("E&, %a' mp;E", resultTable.Columns[2].ColumnName);
             Assert.AreEqual("F", resultTable.Columns[3].ColumnName);
             Assert.AreEqual("G", resultTable.Columns[4].ColumnName);
 
             //T,E,F,G
-            VerifyRowExist(resultTable, "2000", null, null, null, null);//no records in 2000 but it is important it appears still because that is what the axis says
+            VerifyRowExist(resultTable, "2000", null, null, null,
+                null); //no records in 2000 but it is important it appears still because that is what the axis says
             VerifyRowExist(resultTable, "2001", 67, 37, null, 53);
             VerifyRowExist(resultTable, "2002", 30, 41, 60, null);
             VerifyRowExist(resultTable, "2003", 42, null, null, null);
             VerifyRowExist(resultTable, "2004", null, null, null, null);
-            VerifyRowExist(resultTable, "2005", null, 59,null , null);
+            VerifyRowExist(resultTable, "2005", null, 59, null, null);
             VerifyRowExist(resultTable, "2006", null, null, null, null);
             VerifyRowExist(resultTable, "2007", null, null, null, null);
         }
@@ -457,7 +478,6 @@ public void GroupBy_PivotWithSum_Correct(DatabaseType type)
         {
             Destroy(tbl, configuration, catalogue, tableInfo);
         }
-            
     }
 
 
@@ -466,10 +486,12 @@ public void GroupBy_PivotWithSum_Correct(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_PivotWithSum_WHEREStatement(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate pivot (and axis)
-        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension, out var pivotDimension);
+        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension,
+            out var pivotDimension);
 
         configuration.CountSQL = "sum(NumberInTrouble)";
         configuration.PivotOnDimensionID = pivotDimension.ID; //pivot on the Category
@@ -483,7 +505,7 @@ public void GroupBy_PivotWithSum_WHEREStatement(DatabaseType type)
             builder.AddColumn(pivotDimension);
             builder.SetPivotToDimensionID(pivotDimension);
 
-            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder,type);
+            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder, type);
 
             var resultTable = GetResultForBuilder(builder, tbl);
 
@@ -495,14 +517,15 @@ public void GroupBy_PivotWithSum_WHEREStatement(DatabaseType type)
             Assert.AreEqual("G", resultTable.Columns[3].ColumnName);
 
             //T,E,G - F does not appear because WHERE throws it out (both counts are below 42)
-            VerifyRowExist(resultTable, "2000", null, null, null); //no records in 2000 but it is important it appears still because that is what the axis says
+            VerifyRowExist(resultTable, "2000", null, null,
+                null); //no records in 2000 but it is important it appears still because that is what the axis says
             VerifyRowExist(resultTable, "2001", 67, null, 53);
             VerifyRowExist(resultTable, "2002", 30, null, null);
             VerifyRowExist(resultTable, "2003", 42, null, null);
             VerifyRowExist(resultTable, "2004", null, null, null);
-            VerifyRowExist(resultTable, "2005", null, 59,  null);
+            VerifyRowExist(resultTable, "2005", null, 59, null);
             VerifyRowExist(resultTable, "2006", null, null, null);
-            VerifyRowExist(resultTable, "2007", null, null,  null);
+            VerifyRowExist(resultTable, "2007", null, null, null);
         }
         finally
         {
@@ -521,10 +544,12 @@ public void GroupBy_PivotWithSum_WHEREStatement(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_PivotWithSum_Top2BasedonCountColumnDesc(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate pivot (and axis)
-        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension, out var pivotDimension);
+        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension,
+            out var pivotDimension);
 
         configuration.CountSQL = "sum(NumberInTrouble)";
         configuration.PivotOnDimensionID = pivotDimension.ID; //pivot on the Category
@@ -554,7 +579,8 @@ public void GroupBy_PivotWithSum_Top2BasedonCountColumnDesc(DatabaseType type)
             Assert.AreEqual("E&, %a' mp;E", resultTable.Columns[2].ColumnName);
 
             //T,E,G - F does not appear because WHERE throws it out (both counts are below 42)
-            VerifyRowExist(resultTable, "2000", null, null); //no records in 2000 but it is important it appears still because that is what the axis says
+            VerifyRowExist(resultTable, "2000", null,
+                null); //no records in 2000 but it is important it appears still because that is what the axis says
             VerifyRowExist(resultTable, "2001", 67, 37);
             VerifyRowExist(resultTable, "2002", 30, 41);
             VerifyRowExist(resultTable, "2003", 42, null);
@@ -579,10 +605,12 @@ public void GroupBy_PivotWithSum_Top2BasedonCountColumnDesc(DatabaseType type)
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_PivotWithSum_Top2AlphabeticalAsc_WHEREStatement(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate pivot (and axis)
-        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension, out var pivotDimension);
+        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension,
+            out var pivotDimension);
 
         configuration.CountSQL = "sum(NumberInTrouble)";
         configuration.PivotOnDimensionID = pivotDimension.ID; //pivot on the Category
@@ -604,7 +632,7 @@ public void GroupBy_PivotWithSum_Top2AlphabeticalAsc_WHEREStatement(DatabaseType
             builder.AddColumn(pivotDimension);
             builder.SetPivotToDimensionID(pivotDimension);
 
-            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder,type);
+            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder, type);
 
             var resultTable = GetResultForBuilder(builder, tbl);
 
@@ -616,7 +644,8 @@ public void GroupBy_PivotWithSum_Top2AlphabeticalAsc_WHEREStatement(DatabaseType
             Assert.AreEqual("G", resultTable.Columns[2].ColumnName);
 
             //E,G (note that only 1 value appears for E because WHERE throws out rest).  Also note the two columns are E and G because that is Top 2 when alphabetically sorted of the pivot values (E,F,G,T) that match the filter (F doesn't)
-            VerifyRowExist(resultTable, "2000", null, null); //no records in 2000 but it is important it appears still because that is what the axis says
+            VerifyRowExist(resultTable, "2000", null,
+                null); //no records in 2000 but it is important it appears still because that is what the axis says
             VerifyRowExist(resultTable, "2001", null, 53);
             VerifyRowExist(resultTable, "2002", null, null);
             VerifyRowExist(resultTable, "2003", null, null);
@@ -640,10 +669,12 @@ public void GroupBy_PivotWithSum_Top2AlphabeticalAsc_WHEREStatement(DatabaseType
     [TestCase(DatabaseType.MySql)]
     public void GroupBy_PivotWithSum_HAVING_Top1_WHERE(DatabaseType type)
     {
-        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations, out var tableInfo);
+        var tbl = UploadTestDataAsTableToServer(type, out var catalogue, out var extractionInformations,
+            out var tableInfo);
 
         //setup the aggregate pivot (and axis)
-        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension, out var pivotDimension);
+        var configuration = SetupAggregateWithPivot(type, extractionInformations, catalogue, out var axisDimension,
+            out var pivotDimension);
 
         configuration.CountSQL = "sum(NumberInTrouble)";
         configuration.PivotOnDimensionID = pivotDimension.ID; //pivot on the Category
@@ -666,7 +697,7 @@ public void GroupBy_PivotWithSum_HAVING_Top1_WHERE(DatabaseType type)
             builder.AddColumn(pivotDimension);
             builder.SetPivotToDimensionID(pivotDimension);
 
-            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder,type);
+            AddWHEREToBuilder_CategoryIsTOrNumberGreaterThan42(builder, type);
 
             var resultTable = GetResultForBuilder(builder, tbl);
 
@@ -677,7 +708,8 @@ public void GroupBy_PivotWithSum_HAVING_Top1_WHERE(DatabaseType type)
             Assert.AreEqual("E&, %a' mp;E", resultTable.Columns[1].ColumnName);
 
             //Only E appears because of Top 1 pivot statement
-            VerifyRowExist(resultTable, "2000", null); //all E records are discarded except 59 because that is the WHERE logic
+            VerifyRowExist(resultTable, "2000",
+                null); //all E records are discarded except 59 because that is the WHERE logic
             VerifyRowExist(resultTable, "2001", null);
             VerifyRowExist(resultTable, "2002", null);
             VerifyRowExist(resultTable, "2003", null);
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MicrosoftAggregateBuilderTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MicrosoftAggregateBuilderTests.cs
index e1452f6726..1933221130 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MicrosoftAggregateBuilderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MicrosoftAggregateBuilderTests.cs
@@ -11,10 +11,8 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.QueryBuildingTests.AggregateBuilderTests;
 
-public class MicrosoftAggregateBuilderTests:AggregateBuilderTestsBase
+public class MicrosoftAggregateBuilderTests : AggregateBuilderTestsBase
 {
-       
-        
     [Test]
     public void TestAggregateBuilding_NoConfigurationOneDimension()
     {
@@ -32,7 +30,7 @@ group by
 order by 
 Col1"), CollapseWhitespace(builder.SQL));
     }
-        
+
     /// <summary>
     /// Tests the systems ability to figure out the alias of the count column when it has " AS " (e.g. in a cast scalar function)
     /// </summary>
@@ -104,15 +102,15 @@ public void TwoTopXObjects()
         var topX1 = new AggregateTopX(CatalogueRepository, _configuration, 10);
         var ex = Assert.Throws<Exception>(() => new AggregateTopX(CatalogueRepository, _configuration, 10));
 
-        Assert.AreEqual("AggregateConfiguration MyConfig already has a TopX",ex.Message);
+        Assert.AreEqual("AggregateConfiguration MyConfig already has a TopX", ex.Message);
         topX1.DeleteInDatabase();
     }
 
-    [TestCase("count(*)",true)]
+    [TestCase("count(*)", true)]
     [TestCase("count(*)", false)]
-    [TestCase("max(Col1)",true)]
+    [TestCase("max(Col1)", true)]
     [TestCase("max(Col2)", false)]
-    public void TestAggregateBuilding_NoConfigurationTwoDimension_Top10(string countColField,bool asc)
+    public void TestAggregateBuilding_NoConfigurationTwoDimension_Top10(string countColField, bool asc)
     {
         var topX = new AggregateTopX(CatalogueRepository, _configuration, 10)
         {
@@ -126,7 +124,7 @@ public void TestAggregateBuilding_NoConfigurationTwoDimension_Top10(string count
         _configuration.CountSQL = countColField;
 
         var builder = _configuration.GetQueryBuilder();
-            
+
         Assert.AreEqual(CollapseWhitespace($@"/*MyConfig*/
 SELECT 
 TOP 10
@@ -174,20 +172,19 @@ group by
 Col2
 order by 
 Col1 {(asc ? "asc" : "desc")}"), CollapseWhitespace(builder.SQL));
-            
+
         topX.DeleteInDatabase();
     }
 
     [Test]
     public void TestAggregateBuilding_NoConfigurationNoDimensions()
     {
-        var builder = new AggregateBuilder(null, "count(*)", null,new []{_ti});
-            
+        var builder = new AggregateBuilder(null, "count(*)", null, new[] { _ti });
+
         Assert.AreEqual(CollapseWhitespace(@"/**/
 SELECT 
 count(*) AS MyCount
 FROM 
 T1"), CollapseWhitespace(builder.SQL));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MySqlAggregateBuilderTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MySqlAggregateBuilderTests.cs
index 7898cf4e32..ff628881a7 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MySqlAggregateBuilderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/AggregateBuilderTests/MySqlAggregateBuilderTests.cs
@@ -30,8 +30,8 @@ public void Test_AggregateBuilder_MySql_Top32()
         topx.SaveToDatabase();
 
         builder.AggregateTopX = topx;
-            
-            
+
+
         Assert.AreEqual(CollapseWhitespace(@"/**/
 SELECT 
 Col1,
@@ -47,6 +47,7 @@ Col1 desc
 
         topx.DeleteInDatabase();
     }
+
     [TestCase(true)]
     [TestCase(false)]
     public void Test_AggregateBuilder_MySql_Top31OrderByCountAsc(bool useAliasForGroupBy)
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MicrosoftQueryBuilderTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MicrosoftQueryBuilderTests.cs
index 105159a88a..04be62e17b 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MicrosoftQueryBuilderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MicrosoftQueryBuilderTests.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.QueryBuildingTests.QueryBuilderTests;
 
-internal class MicrosoftQueryBuilderTests:DatabaseTests
+internal class MicrosoftQueryBuilderTests : DatabaseTests
 {
     [Test]
     public void TestQueryBuilder_MicrosoftSQLServer_Top35()
@@ -55,6 +55,5 @@ TOP 50
 FROM 
 [db]..[tbl]")
             , CollapseWhitespace(qb.SQL));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MySqlQueryBuilderTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MySqlQueryBuilderTests.cs
index 23173d5fe7..ffba53ee6b 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MySqlQueryBuilderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/MySqlQueryBuilderTests.cs
@@ -23,10 +23,10 @@ public void TestQueryBuilder_MySql_Normal()
         };
         t.SaveToDatabase();
 
-        var col = new ColumnInfo(CatalogueRepository, "`db`.`tbl`.`col`","varchar(10)",t);
-        Assert.AreEqual("col",col.GetRuntimeName());
+        var col = new ColumnInfo(CatalogueRepository, "`db`.`tbl`.`col`", "varchar(10)", t);
+        Assert.AreEqual("col", col.GetRuntimeName());
 
-        var cata = new Catalogue(CatalogueRepository,"cata");
+        var cata = new Catalogue(CatalogueRepository, "cata");
         var catalogueItem = new CatalogueItem(CatalogueRepository, cata, "col");
         var extractionInfo = new ExtractionInformation(CatalogueRepository, catalogueItem, col, col.Name);
 
@@ -38,8 +38,8 @@ public void TestQueryBuilder_MySql_Normal()
 FROM 
 `db`.`tbl`"
         ), CollapseWhitespace(qb.SQL));
-
     }
+
     [Test]
     public void TestQueryBuilder_MySql_Top35()
     {
@@ -81,6 +81,5 @@ public void TestQueryBuilder_MySql_Top35()
 `db`.`tbl`
 LIMIT 50")
             , CollapseWhitespace(qb.SQL));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/QueryBuilderUnitTests.cs b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/QueryBuilderUnitTests.cs
index 6023257862..4db76ed05f 100644
--- a/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/QueryBuilderUnitTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/QueryBuildingTests/QueryBuilderTests/QueryBuilderUnitTests.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.QueryBuildingTests.QueryBuilderTests;
 
-internal class QueryBuilderUnitTests:UnitTests
+internal class QueryBuilderUnitTests : UnitTests
 {
     [Test]
     public void Test_IsPrimaryExtractionTable_TwoTables()
@@ -27,12 +27,15 @@ public void Test_IsPrimaryExtractionTable_TwoTables()
         c2.TableInfo.SaveToDatabase();
 
         var builder = new QueryBuilder(null, null);
-        builder.AddColumn(new ColumnInfoToIColumn(Repository,c1));
+        builder.AddColumn(new ColumnInfoToIColumn(Repository, c1));
         builder.AddColumn(new ColumnInfoToIColumn(Repository, c2));
 
-        var ex = Assert.Throws<QueryBuildingException>(()=>{ var s = builder.SQL;});
+        var ex = Assert.Throws<QueryBuildingException>(() =>
+        {
+            var s = builder.SQL;
+        });
 
-        StringAssert.Contains("There are multiple tables marked as IsPrimaryExtractionTable",ex.Message);
+        StringAssert.Contains("There are multiple tables marked as IsPrimaryExtractionTable", ex.Message);
     }
 
     [Test]
@@ -67,7 +70,7 @@ public void Test_FourTables_MultipleRoutes()
         c1.Name = "c1";
         c1.SaveToDatabase();
         c1.TableInfo.Name = "t1";
-        c1.TableInfo.IsPrimaryExtractionTable = true;  //t1 is primary
+        c1.TableInfo.IsPrimaryExtractionTable = true; //t1 is primary
         c1.TableInfo.SaveToDatabase();
 
         var c2 = WhenIHaveA<ColumnInfo>();
@@ -93,11 +96,11 @@ public void Test_FourTables_MultipleRoutes()
          *     /    \
          *   c1      c4
          *     \   /
-         *       c3 
-         * 
+         *       c3
+         *
          * */
 
-        var j1 = new JoinInfo(Repository,c2,c1,ExtractionJoinType.Inner,null);
+        var j1 = new JoinInfo(Repository, c2, c1, ExtractionJoinType.Inner, null);
         var j2 = new JoinInfo(Repository, c3, c1, ExtractionJoinType.Inner, null);
         var j3 = new JoinInfo(Repository, c4, c2, ExtractionJoinType.Inner, null);
         var j4 = new JoinInfo(Repository, c4, c3, ExtractionJoinType.Inner, null);
@@ -105,7 +108,7 @@ public void Test_FourTables_MultipleRoutes()
 
         var builder = new QueryBuilder(null, null);
         builder.AddColumn(new ColumnInfoToIColumn(Repository, c1));
-        builder.AddColumn(new ColumnInfoToIColumn(Repository, c2)); 
+        builder.AddColumn(new ColumnInfoToIColumn(Repository, c2));
         builder.AddColumn(new ColumnInfoToIColumn(Repository, c3));
         builder.AddColumn(new ColumnInfoToIColumn(Repository, c4));
 
@@ -113,7 +116,7 @@ public void Test_FourTables_MultipleRoutes()
 
         //should be using only 3 of the 4 joins because we already have a route to c4 without a fourth join
         Assert.AreEqual(3, builder.JoinsUsedInQuery.Count);
-        Assert.Contains(j1,builder.JoinsUsedInQuery);
+        Assert.Contains(j1, builder.JoinsUsedInQuery);
         Assert.Contains(j2, builder.JoinsUsedInQuery);
         Assert.Contains(j3, builder.JoinsUsedInQuery);
     }
diff --git a/Rdmp.Core.Tests/Curation/Integration/ServerDefaultsTests.cs b/Rdmp.Core.Tests/Curation/Integration/ServerDefaultsTests.cs
index 6a4f427123..68ac9c50b6 100644
--- a/Rdmp.Core.Tests/Curation/Integration/ServerDefaultsTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/ServerDefaultsTests.cs
@@ -27,23 +27,25 @@ public void TestClearSameDefaultTwice()
     [Test]
     public void CreateNewExternalServerAndConfigureItAsDefault()
     {
-        var databaseServer = new ExternalDatabaseServer(CatalogueRepository, "Deleteme",null);
+        var databaseServer = new ExternalDatabaseServer(CatalogueRepository, "Deleteme", null);
 
         try
         {
-            Assert.AreEqual("Deleteme",databaseServer.Name);
+            Assert.AreEqual("Deleteme", databaseServer.Name);
             databaseServer.Password = "nothing"; //automatically encrypts password
 
-            Assert.AreNotEqual("nothing",databaseServer.Password);//should not match what we just set it to
-            Assert.AreEqual("nothing", databaseServer.GetDecryptedPassword());//should match what we set it to because of explicit call to decrypt
+            Assert.AreNotEqual("nothing", databaseServer.Password); //should not match what we just set it to
+            Assert.AreEqual("nothing",
+                databaseServer
+                    .GetDecryptedPassword()); //should match what we set it to because of explicit call to decrypt
 
             databaseServer.Server = "Bob";
             databaseServer.Database = "TEST";
             databaseServer.SaveToDatabase();
 
-            var cata = new Catalogue(CatalogueRepository, "TestCatalogueFor_CreateNewExternalServerAndConfigureItAsDefault");
+            var cata = new Catalogue(CatalogueRepository,
+                "TestCatalogueFor_CreateNewExternalServerAndConfigureItAsDefault");
             cata.DeleteInDatabase();
-
         }
         finally
         {
@@ -60,7 +62,7 @@ public void TestDeletingClearsDefault()
         try
         {
             //make the new server the default for logging
-            CatalogueRepository.SetDefault(PermissableDefaults.LiveLoggingServer_ID,eds);
+            CatalogueRepository.SetDefault(PermissableDefaults.LiveLoggingServer_ID, eds);
 
             //now we deleted it!
             eds.DeleteInDatabase();
@@ -69,8 +71,7 @@ public void TestDeletingClearsDefault()
         }
         finally
         {
-
             CatalogueRepository.SetDefault(PermissableDefaults.LiveLoggingServer_ID, old);
-        }            
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/SupportingDocumentTests.cs b/Rdmp.Core.Tests/Curation/Integration/SupportingDocumentTests.cs
index c24eb0dbbb..1d9cc9cf09 100644
--- a/Rdmp.Core.Tests/Curation/Integration/SupportingDocumentTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/SupportingDocumentTests.cs
@@ -16,9 +16,9 @@ public class SupportingDocumentTests : DatabaseTests
     public void test_SupportingDocument_CreateAndDestroy()
     {
         var cata = new Catalogue(CatalogueRepository, "deleteme");
-        var doc = new SupportingDocument(CatalogueRepository, cata,"davesFile");
+        var doc = new SupportingDocument(CatalogueRepository, cata, "davesFile");
 
-        Assert.AreEqual(doc.Name ,"davesFile");
+        Assert.AreEqual(doc.Name, "davesFile");
 
         doc.DeleteInDatabase();
         cata.DeleteInDatabase();
@@ -39,7 +39,7 @@ public void test_SupportingDocument_CreateChangeSaveDestroy()
 
         var docAfterCommit = CatalogueRepository.GetObjectByID<SupportingDocument>(doc.ID);
 
-        Assert.AreEqual(docAfterCommit.Description,doc.Description);
+        Assert.AreEqual(docAfterCommit.Description, doc.Description);
 
         doc.DeleteInDatabase();
         cata.DeleteInDatabase();
diff --git a/Rdmp.Core.Tests/Curation/Integration/TableInfoSynchronizerTests.cs b/Rdmp.Core.Tests/Curation/Integration/TableInfoSynchronizerTests.cs
index dd54715de8..8590cce446 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TableInfoSynchronizerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TableInfoSynchronizerTests.cs
@@ -16,7 +16,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class TableInfoSynchronizerTests:DatabaseTests
+public class TableInfoSynchronizerTests : DatabaseTests
 {
     private DiscoveredServer _server;
     private ITableInfo tableInfoCreated;
@@ -36,22 +36,23 @@ protected override void SetUp()
         using (var con = _server.GetConnection())
         {
             con.Open();
-            _server.GetCommand($"CREATE TABLE {TABLE_NAME}(Name varchar(10), Address varchar(500))",con).ExecuteNonQuery();
+            _server.GetCommand($"CREATE TABLE {TABLE_NAME}(Name varchar(10), Address varchar(500))", con)
+                .ExecuteNonQuery();
         }
 
         var tbl = _database.ExpectTable("TableInfoSynchronizerTests");
 
-        var importer = new TableInfoImporter(CatalogueRepository,tbl);
-        importer.DoImport(out tableInfoCreated,out columnInfosCreated);
+        var importer = new TableInfoImporter(CatalogueRepository, tbl);
+        importer.DoImport(out tableInfoCreated, out columnInfosCreated);
     }
 
     [Test]
     public void SynchronizationTests_NoChanges()
     {
-        Assert.AreEqual(TABLE_NAME , tableInfoCreated.GetRuntimeName());
+        Assert.AreEqual(TABLE_NAME, tableInfoCreated.GetRuntimeName());
 
         var synchronizer = new TableInfoSynchronizer(tableInfoCreated);
-        Assert.AreEqual(true,synchronizer.Synchronize(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(true, synchronizer.Synchronize(new ThrowImmediatelyCheckNotifier()));
     }
 
     [Test]
@@ -70,15 +71,14 @@ public void SynchronizationTests_ColumnDropped(bool acceptChanges)
         if (acceptChanges)
         {
             //accept changes should result in a synchronized table
-            Assert.AreEqual(true,synchronizer.Synchronize(new AcceptAllCheckNotifier()));
-            Assert.AreEqual(1,tableInfoCreated.ColumnInfos.Length);//should only be 1 remaining 
+            Assert.AreEqual(true, synchronizer.Synchronize(new AcceptAllCheckNotifier()));
+            Assert.AreEqual(1, tableInfoCreated.ColumnInfos.Length); //should only be 1 remaining 
         }
         else
         {
             var ex = Assert.Throws<Exception>(() => synchronizer.Synchronize(new ThrowImmediatelyCheckNotifier()));
-            Assert.AreEqual("The ColumnInfo Address no longer appears in the live table.", ex.Message);    
+            Assert.AreEqual("The ColumnInfo Address no longer appears in the live table.", ex.Message);
         }
-            
     }
 
     [Test]
@@ -86,7 +86,6 @@ public void SynchronizationTests_ColumnDropped(bool acceptChanges)
     [TestCase(false)]
     public void SynchronizationTests_ColumnAdded(bool acceptChanges)
     {
-            
         using (var con = _database.Server.GetConnection())
         {
             con.Open();
@@ -100,7 +99,7 @@ public void SynchronizationTests_ColumnAdded(bool acceptChanges)
         {
             //accept changes should result in a synchronized table
             Assert.AreEqual(true, synchronizer.Synchronize(new AcceptAllCheckNotifier()));
-            Assert.AreEqual(3, tableInfoCreated.ColumnInfos.Length);//should 3 now
+            Assert.AreEqual(3, tableInfoCreated.ColumnInfos.Length); //should 3 now
         }
         else
         {
@@ -119,10 +118,10 @@ public void SynchronizationTests_ColumnAddedWithCatalogue(bool acceptChanges)
 
         try
         {
-            Assert.AreEqual(TABLE_NAME,cata.Name);
+            Assert.AreEqual(TABLE_NAME, cata.Name);
             Assert.AreEqual(2, cataItems.Length);
             Assert.AreEqual(2, extractionInformations.Length);
-            
+
             using (var con = _server.GetConnection())
             {
                 con.Open();
@@ -135,12 +134,14 @@ public void SynchronizationTests_ColumnAddedWithCatalogue(bool acceptChanges)
             {
                 //accept changes should result in a synchronized table
                 Assert.AreEqual(true, synchronizer.Synchronize(new AcceptAllCheckNotifier()));
-                Assert.AreEqual(3, tableInfoCreated.ColumnInfos.Length);//should 3 now
-                Assert.AreEqual(3, cata.CatalogueItems.Length);//should 3 now
-                Assert.AreEqual(3, cata.GetAllExtractionInformation(ExtractionCategory.Any).Length);//should 3 now
-
-                Assert.AreEqual(1,cata.GetAllExtractionInformation(ExtractionCategory.Any).Count(e=>e.SelectSQL.Contains("Birthday")));
-                Assert.AreEqual(1,cata.CatalogueItems.Count(ci => ci.Name.Contains("Birthday")));
+                Assert.AreEqual(3, tableInfoCreated.ColumnInfos.Length); //should 3 now
+                Assert.AreEqual(3, cata.CatalogueItems.Length); //should 3 now
+                Assert.AreEqual(3, cata.GetAllExtractionInformation(ExtractionCategory.Any).Length); //should 3 now
+
+                Assert.AreEqual(1,
+                    cata.GetAllExtractionInformation(ExtractionCategory.Any)
+                        .Count(e => e.SelectSQL.Contains("Birthday")));
+                Assert.AreEqual(1, cata.CatalogueItems.Count(ci => ci.Name.Contains("Birthday")));
             }
             else
             {
@@ -165,20 +166,20 @@ public void Test_SynchronizeTable_BracketsInTableName()
         var db = _database;
 
         //FAnsi doesn't let you create tables with brackets in the names so we have to do it manually
-        using(var con = db.Server.GetConnection())
+        using (var con = db.Server.GetConnection())
         {
             con.Open();
-            var cmd = db.Server.GetCommand("CREATE TABLE [BB (ff)] (A int not null)",con);
+            var cmd = db.Server.GetCommand("CREATE TABLE [BB (ff)] (A int not null)", con);
             cmd.ExecuteNonQuery();
         }
 
         var tbl = db.CreateTable("FF",
             new DatabaseColumnRequest[]
             {
-                new DatabaseColumnRequest("F",new DatabaseTypeRequest(typeof(int)))
+                new("F", new DatabaseTypeRequest(typeof(int)))
             });
 
-        Import(tbl,out var ti,out _);
+        Import(tbl, out var ti, out _);
 
         var s = new TableInfoSynchronizer(ti);
         s.Synchronize(new ThrowImmediatelyCheckNotifier());
diff --git a/Rdmp.Core.Tests/Curation/Integration/TableInfoTests.cs b/Rdmp.Core.Tests/Curation/Integration/TableInfoTests.cs
index b4ad89fe19..55af18df2d 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TableInfoTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TableInfoTests.cs
@@ -69,7 +69,6 @@ public void update_changeAllProperties_pass()
     }
 
 
-
     [Test]
     [TestCase("[TestDB]..[TestTableName]", "[TestDB]..[TestTableName].[ANOMyCol]")]
     [TestCase("TestDB..TestTableName", "TestDB..TestTableName.ANOMyCol")]
@@ -88,7 +87,7 @@ public void CreateNewTableInfoInDatabase_Naming(string tableName, string columnN
 
         try
         {
-            Assert.AreEqual("ANOMyCol",c.GetRuntimeName());
+            Assert.AreEqual("ANOMyCol", c.GetRuntimeName());
             Assert.AreEqual("MyCol", c.GetRuntimeName(LoadStage.AdjustRaw));
             Assert.AreEqual("ANOMyCol", c.GetRuntimeName(LoadStage.PostLoad));
 
@@ -97,12 +96,12 @@ public void CreateNewTableInfoInDatabase_Naming(string tableName, string columnN
             Assert.AreEqual("TestDB_TestTableName_STAGING", table.GetRuntimeName(LoadBubble.Staging));
 
             Assert.AreEqual("TestTableName_STAGING", table.GetRuntimeName(LoadBubble.Staging, new SuffixBasedNamer()));
-            Assert.AreEqual("TestDB_TestTableName_STAGING", table.GetRuntimeName(LoadBubble.Staging, new FixedStagingDatabaseNamer("TestDB")));
+            Assert.AreEqual("TestDB_TestTableName_STAGING",
+                table.GetRuntimeName(LoadBubble.Staging, new FixedStagingDatabaseNamer("TestDB")));
 
             Assert.AreEqual("TestTableName", table.GetRuntimeName(LoadBubble.Live));
-
         }
-        finally 
+        finally
         {
             c.DeleteInDatabase();
             table.DeleteInDatabase();
@@ -120,19 +119,20 @@ public void TestCreateTableInSchemaAndImportAsTableInfo()
 
             db.Server.GetCommand("CREATE SCHEMA Omg", con).ExecuteNonQuery();
 
-            var tbl = db.CreateTable("Fish", new [] {new DatabaseColumnRequest("MyCol", "int"){IsPrimaryKey = true}},schema: "Omg");
+            var tbl = db.CreateTable("Fish",
+                new[] { new DatabaseColumnRequest("MyCol", "int") { IsPrimaryKey = true } }, "Omg");
 
             Assert.AreEqual("Fish", tbl.GetRuntimeName());
-            Assert.AreEqual( "Omg", tbl.Schema);
+            Assert.AreEqual("Omg", tbl.Schema);
             Assert.IsTrue(tbl.GetFullyQualifiedName().EndsWith("[Omg].[Fish]"));
 
             Assert.IsTrue(tbl.Exists());
 
-            Import(tbl,out var ti, out var cols);
+            Import(tbl, out var ti, out var cols);
 
-            Assert.AreEqual("Omg",ti.Schema);
+            Assert.AreEqual("Omg", ti.Schema);
             var tbl2 = ti.Discover(DataAccessContext.InternalDataProcessing);
-            Assert.AreEqual("Omg",tbl2.Schema);
+            Assert.AreEqual("Omg", tbl2.Schema);
             Assert.IsTrue(tbl2.Exists());
 
             Assert.IsTrue(ti.Name.EndsWith("[Omg].[Fish]"));
@@ -141,44 +141,45 @@ public void TestCreateTableInSchemaAndImportAsTableInfo()
 
             var c = cols.Single();
 
-            Assert.AreEqual("MyCol",c.GetRuntimeName());
-            StringAssert.Contains("[Omg].[Fish]",c.GetFullyQualifiedName());
+            Assert.AreEqual("MyCol", c.GetRuntimeName());
+            StringAssert.Contains("[Omg].[Fish]", c.GetFullyQualifiedName());
 
             //should be primary key
             Assert.IsTrue(c.IsPrimaryKey);
 
             var triggerFactory = new TriggerImplementerFactory(DatabaseType.MicrosoftSQLServer);
             var impl = triggerFactory.Create(tbl);
-                
-            Assert.AreEqual(TriggerStatus.Missing,impl.GetTriggerStatus());
+
+            Assert.AreEqual(TriggerStatus.Missing, impl.GetTriggerStatus());
 
             impl.CreateTrigger(new ThrowImmediatelyCheckNotifier());
 
             Assert.AreEqual(TriggerStatus.Enabled, impl.GetTriggerStatus());
 
-            Assert.IsTrue( impl.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
+            Assert.IsTrue(impl.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
 
             //should be synced
             var sync = new TableInfoSynchronizer(ti);
             sync.Synchronize(new AcceptAllCheckNotifier());
 
             //Test importing the _Legacy table valued function that should be created in the Omg schema and test synching that too.
-            var tvf = ti.Discover(DataAccessContext.InternalDataProcessing).Database.ExpectTableValuedFunction("Fish_Legacy", "Omg");
+            var tvf = ti.Discover(DataAccessContext.InternalDataProcessing).Database
+                .ExpectTableValuedFunction("Fish_Legacy", "Omg");
             Assert.IsTrue(tvf.Exists());
 
             var importerTvf = new TableValuedFunctionImporter(CatalogueRepository, tvf);
             importerTvf.DoImport(out var tvfTi, out var tvfCols);
 
-            Assert.AreEqual("Omg",tvfTi.Schema);
+            Assert.AreEqual("Omg", tvfTi.Schema);
 
             var syncTvf = new TableInfoSynchronizer(tvfTi);
             syncTvf.Synchronize(new ThrowImmediatelyCheckNotifier());
 
-            StringAssert.EndsWith("[Omg].Fish_Legacy(@index) AS Fish_Legacy",tvfTi.Name);
+            StringAssert.EndsWith("[Omg].Fish_Legacy(@index) AS Fish_Legacy", tvfTi.Name);
         }
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestView(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -187,18 +188,18 @@ public void TestView(DatabaseType dbType)
         var dt = new DataTable();
         dt.Columns.Add("FF");
 
-        var tbl = db.CreateTable("MyTable",dt);
-        Import(tbl,out var tblInfo,out _);
-            
+        var tbl = db.CreateTable("MyTable", dt);
+        Import(tbl, out var tblInfo, out _);
+
         Assert.IsTrue(tblInfo.Discover(DataAccessContext.InternalDataProcessing).Exists());
-        Assert.AreEqual(TableType.Table,tblInfo.Discover(DataAccessContext.InternalDataProcessing).TableType);
+        Assert.AreEqual(TableType.Table, tblInfo.Discover(DataAccessContext.InternalDataProcessing).TableType);
 
         var viewName = "MyView";
 
         //oracle likes to create stuff under your user account not the database your actually using!
-        if(dbType == DatabaseType.Oracle)
+        if (dbType == DatabaseType.Oracle)
             viewName = syntax.EnsureFullyQualified(tbl.Database.GetRuntimeName(), null, "MyView");
-            
+
         //postgres hates upper case tables (unless they are wrapped)
         if (dbType == DatabaseType.PostgreSql)
             viewName = syntax.EnsureWrapped(viewName);
@@ -210,25 +211,24 @@ public void TestView(DatabaseType dbType)
             tbl.GetFullyQualifiedName(),
             syntax.EnsureWrapped("FF"));
 
-        using(var con = tbl.Database.Server.GetConnection())
+        using (var con = tbl.Database.Server.GetConnection())
         {
             con.Open();
 
-            var cmd = tbl.GetCommand(sql,con);
+            var cmd = tbl.GetCommand(sql, con);
             cmd.ExecuteNonQuery();
         }
 
-        var view = tbl.Database.ExpectTable("MyView",null,TableType.View);
-        Import(view,out var viewInfo,out _);
+        var view = tbl.Database.ExpectTable("MyView", null, TableType.View);
+        Import(view, out var viewInfo, out _);
 
         var sync = new TableInfoSynchronizer(viewInfo);
         sync.Synchronize(new ThrowImmediatelyCheckNotifier());
-            
+
         Assert.IsTrue(viewInfo.Discover(DataAccessContext.InternalDataProcessing).Exists());
-        Assert.AreEqual(TableType.View,viewInfo.Discover(DataAccessContext.InternalDataProcessing).TableType);
+        Assert.AreEqual(TableType.View, viewInfo.Discover(DataAccessContext.InternalDataProcessing).TableType);
 
         view.Drop();
         Assert.IsFalse(view.Exists());
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/TableNamingConventionTests.cs b/Rdmp.Core.Tests/Curation/Integration/TableNamingConventionTests.cs
index 997d6d1c46..7f1cf105f4 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TableNamingConventionTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TableNamingConventionTests.cs
@@ -45,7 +45,6 @@ public void update_changeAllProperties_pass()
         Assert.IsTrue(tableInfoAfter.DatabaseType == DatabaseType.Oracle);
 
         tableInfoAfter.DeleteInDatabase();
-            
     }
 
     [Test]
@@ -60,5 +59,4 @@ public void SuffixBasedTableNamingConventionHelper()
         var newLookupTable = namingScheme.GetName(baseTableName, LoadBubble.Live);
         Assert.AreEqual("MyTable", newLookupTable);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/AggregationTests.cs b/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/AggregationTests.cs
index 48562f3b4e..ae934e8e1c 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/AggregationTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/AggregationTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.TableValuedFunctionTests;
 
-public class AggregationTests :DatabaseTests
+public class AggregationTests : DatabaseTests
 {
     private TestableTableValuedFunction _function;
 
@@ -30,7 +30,7 @@ public void GenerateAggregateManuallyTest()
         CreateFunction(CatalogueRepository);
 
         //do a count * on the query builder
-        var queryBuilder = new AggregateBuilder("", "count(*)", null,new[] { _function.TableInfoCreated });
+        var queryBuilder = new AggregateBuilder("", "count(*)", null, new[] { _function.TableInfoCreated });
 
         Assert.IsTrue(queryBuilder.SQL.Contains(@"SELECT"));
         Assert.IsTrue(queryBuilder.SQL.Contains(@"count(*)"));
@@ -38,20 +38,21 @@ public void GenerateAggregateManuallyTest()
         Assert.IsTrue(queryBuilder.SQL.Contains(@"DECLARE @name AS varchar(50);"));
         Assert.IsTrue(queryBuilder.SQL.Contains(@"SET @name='fish';"));
 
-        Assert.IsTrue(queryBuilder.SQL.Contains("..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction"));
+        Assert.IsTrue(
+            queryBuilder.SQL.Contains("..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction"));
 
         Console.WriteLine(queryBuilder.SQL);
     }
-        
+
     [TestCase(false)]
     [TestCase(true)]
     public void GenerateAggregateViaAggregateConfigurationTest(bool memoryRepo)
     {
-        var repo = memoryRepo ? (ICatalogueRepository) new MemoryCatalogueRepository() : CatalogueRepository;
+        var repo = memoryRepo ? (ICatalogueRepository)new MemoryCatalogueRepository() : CatalogueRepository;
         CreateFunction(repo);
 
         var agg = new AggregateConfiguration(repo, _function.Cata, "MyExcitingAggregate");
-            
+
         try
         {
             agg.HavingSQL = "count(*)>1";
@@ -61,7 +62,7 @@ public void GenerateAggregateViaAggregateConfigurationTest(bool memoryRepo)
             aggregateForcedJoin.CreateLinkBetween(agg, _function.TableInfoCreated);
 
             var queryBuilder = agg.GetQueryBuilder();
-                
+
             Assert.AreEqual(
                 $@"DECLARE @startNumber AS int;
 SET @startNumber=5;
@@ -76,7 +77,6 @@ public void GenerateAggregateViaAggregateConfigurationTest(bool memoryRepo)
 [{TestDatabaseNames.Prefix}ScratchArea]..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction
 HAVING
 count(*)>1", queryBuilder.SQL);
-                
         }
         finally
         {
@@ -94,9 +94,9 @@ public void GenerateAggregateUsingOverridenParametersTest()
         try
         {
             var param = new AnyTableSqlParameter(CatalogueRepository, agg, "DECLARE @name AS varchar(50);")
- {
-     Value = "'lobster'"
- };
+            {
+                Value = "'lobster'"
+            };
             param.SaveToDatabase();
 
             var aggregateForcedJoin = new AggregateForcedJoin(CatalogueTableRepository);
@@ -115,7 +115,8 @@ public void GenerateAggregateUsingOverridenParametersTest()
             //isntead of this verison of things
             Assert.IsFalse(queryBuilder.SQL.Contains(@"SET @name='fish';"));
 
-            Assert.IsTrue(queryBuilder.SQL.Contains("..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction"));
+            Assert.IsTrue(
+                queryBuilder.SQL.Contains("..MyAwesomeFunction(@startNumber,@stopNumber,@name) AS MyAwesomeFunction"));
 
             Console.WriteLine(queryBuilder.SQL);
         }
diff --git a/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/ImportAndTestTests.cs b/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/ImportAndTestTests.cs
index 30ad0396a5..8afed19794 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/ImportAndTestTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TableValuedFunctionTests/ImportAndTestTests.cs
@@ -38,7 +38,7 @@ public void FunctionWorks()
         using (var con = server.GetConnection())
         {
             con.Open();
-            var r = server.GetCommand("Select * from dbo.MyAwesomeFunction(5,10,'Fish')",con).ExecuteReader();
+            var r = server.GetCommand("Select * from dbo.MyAwesomeFunction(5,10,'Fish')", con).ExecuteReader();
 
             r.Read();
             Assert.AreEqual(5, r["Number"]);
@@ -69,7 +69,7 @@ public void FunctionWorks()
         }
     }
 
-        
+
     [Test]
     public void ImportFunctionIntoCatalogue()
     {
@@ -81,18 +81,19 @@ public void ImportFunctionIntoCatalogue()
     public void TestDiscovery()
     {
         var db = _database;
-            
+
         using (var con = db.Server.BeginNewTransactedConnection())
         {
-                
             //drop function - outside of transaction
             db.Server.GetCommand("drop function MyAwesomeFunction", con).ExecuteNonQuery();
 
             //create it within the scope of the transaction
-            var cmd = db.Server.GetCommand(_function.CreateFunctionSQL[(_function.CreateFunctionSQL.IndexOf("GO") + 3)..], con);
+            var cmd = db.Server.GetCommand(
+                _function.CreateFunctionSQL[(_function.CreateFunctionSQL.IndexOf("GO") + 3)..], con);
             cmd.ExecuteNonQuery();
 
-            Assert.IsTrue(db.DiscoverTableValuedFunctions(con.ManagedTransaction).Any(tbv => tbv.GetRuntimeName().Equals("MyAwesomeFunction")));
+            Assert.IsTrue(db.DiscoverTableValuedFunctions(con.ManagedTransaction)
+                .Any(tbv => tbv.GetRuntimeName().Equals("MyAwesomeFunction")));
             Assert.IsTrue(db.ExpectTableValuedFunction("MyAwesomeFunction").Exists(con.ManagedTransaction));
 
             var cols = db.ExpectTableValuedFunction("MyAwesomeFunction").DiscoverColumns(con.ManagedTransaction);
@@ -114,17 +115,18 @@ public void Synchronization_ExtraParameter()
         var expectedMessage =
             "MyAwesomeFunction is a Table Valued Function, in the Catalogue it has a parameter called @fish but this parameter no longer appears in the underlying database";
 
-        var excessParameter = new AnyTableSqlParameter(CatalogueRepository, _function.TableInfoCreated, "DECLARE @fish as int");
+        var excessParameter =
+            new AnyTableSqlParameter(CatalogueRepository, _function.TableInfoCreated, "DECLARE @fish as int");
         var checker = new ToMemoryCheckNotifier();
         _function.TableInfoCreated.Check(checker);
-            
-        Assert.IsTrue(checker.Messages.Any(m=>m.Result == CheckResult.Fail 
-                                              &&
-                                              m.Message.Contains(expectedMessage)));
+
+        Assert.IsTrue(checker.Messages.Any(m => m.Result == CheckResult.Fail
+                                                &&
+                                                m.Message.Contains(expectedMessage)));
 
         var syncer = new TableInfoSynchronizer(_function.TableInfoCreated);
 
-        var ex = Assert.Throws<Exception>(()=>syncer.Synchronize(new ThrowImmediatelyCheckNotifier()));
+        var ex = Assert.Throws<Exception>(() => syncer.Synchronize(new ThrowImmediatelyCheckNotifier()));
         Assert.IsTrue(ex.Message.Contains(expectedMessage));
 
         //no changes yet
@@ -135,15 +137,16 @@ public void Synchronization_ExtraParameter()
 
         //now parameter shouldnt be there
         Assert.IsTrue(excessParameter.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyWasDeleted);
-
     }
 
     [Test]
     public void Synchronization_MissingParameter()
     {
-        var expectedMessage = "MyAwesomeFunction is a Table Valued Function but it does not have a record of the parameter @startNumber which appears in the underlying database";
+        var expectedMessage =
+            "MyAwesomeFunction is a Table Valued Function but it does not have a record of the parameter @startNumber which appears in the underlying database";
 
-        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters().Single(p => p.ParameterName.Equals("@startNumber"));
+        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters()
+            .Single(p => p.ParameterName.Equals("@startNumber"));
         parameter.DeleteInDatabase();
 
         var syncer = new TableInfoSynchronizer(_function.TableInfoCreated);
@@ -159,7 +162,6 @@ public void Synchronization_MissingParameter()
 
         //now parameter should have reappeared due to accepthing change
         Assert.IsTrue(_function.TableInfoCreated.GetAllParameters().Any(p => p.ParameterName.Equals("@startNumber")));
-            
     }
 
     [Test]
@@ -168,14 +170,15 @@ public void Synchronization_ParameterDefinitionChanged()
         var expectedMessage =
             "Parameter @startNumber is declared as 'DECLARE @startNumber AS int;' but in the Catalogue it appears as 'DECLARE @startNumber AS datetime;'";
 
-        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters().Single(p => p.ParameterName.Equals("@startNumber"));
+        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters()
+            .Single(p => p.ParameterName.Equals("@startNumber"));
         parameter.ParameterSQL = "DECLARE @startNumber AS datetime;";
         parameter.SaveToDatabase();
 
         var syncer = new TableInfoSynchronizer(_function.TableInfoCreated);
 
         var ex = Assert.Throws<Exception>(() => syncer.Synchronize(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains(expectedMessage,ex.Message);
+        StringAssert.Contains(expectedMessage, ex.Message);
 
         //no changes should yet have taken place since we didn't accept it yet
         Assert.IsTrue(parameter.HasLocalChanges().Evaluation == ChangeDescription.NoChanges);
@@ -183,26 +186,24 @@ public void Synchronization_ParameterDefinitionChanged()
         //sync should have proposed to adjusting the datatype
         Assert.IsTrue(syncer.Synchronize(new AcceptAllCheckNotifier()));
 
-        if(CatalogueRepository is not TableRepository)
-        {
+        if (CatalogueRepository is not TableRepository)
             // with a Yaml repository there is only one copy of the object so no need
             // to check for differences in db
             return;
-        }
 
         //now parameter should have the correct datatype
         Assert.IsTrue(parameter.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent);
         var diff = parameter.HasLocalChanges().Differences.Single();
 
-        Assert.AreEqual("DECLARE @startNumber AS datetime;",diff.LocalValue);
+        Assert.AreEqual("DECLARE @startNumber AS datetime;", diff.LocalValue);
         Assert.AreEqual("DECLARE @startNumber AS int;", diff.DatabaseValue);
-
     }
 
     [Test]
     public void Synchronization_ParameterRenamed()
     {
-        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters().Single(p => p.ParameterName.Equals("@startNumber"));
+        var parameter = (AnyTableSqlParameter)_function.TableInfoCreated.GetAllParameters()
+            .Single(p => p.ParameterName.Equals("@startNumber"));
         parameter.ParameterSQL = "DECLARE @startNum AS int";
         parameter.SaveToDatabase();
 
@@ -217,8 +218,7 @@ public void Synchronization_ParameterRenamed()
         Assert.IsTrue(after.Any(p => p.ParameterName.Equals("@startNumber")));
 
         //still there should only be 3 parameters
-        Assert.AreEqual(3,after.Length);
-
+        Assert.AreEqual(3, after.Length);
     }
 
 
@@ -227,7 +227,7 @@ public void TableInfoCheckingWorks()
     {
         _function.TableInfoCreated.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
     }
-        
+
     [Test]
     public void CatalogueCheckingWorks()
     {
diff --git a/Rdmp.Core.Tests/Curation/Integration/TriggerTests.cs b/Rdmp.Core.Tests/Curation/Integration/TriggerTests.cs
index 4aa57d6f24..447be16734 100644
--- a/Rdmp.Core.Tests/Curation/Integration/TriggerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/TriggerTests.cs
@@ -22,30 +22,30 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration;
 
-public class TriggerTests :DatabaseTests
+public class TriggerTests : DatabaseTests
 {
     private DiscoveredTable _table;
     private DiscoveredTable _archiveTable;
     private DiscoveredDatabase _database;
-        
+
 
     public void CreateTable(DatabaseType dbType)
     {
         _database = GetCleanedServer(dbType);
 
-        _table =_database.CreateTable("TriggerTests",new DatabaseColumnRequest[]{ 
-            new DatabaseColumnRequest("name",new DatabaseTypeRequest(typeof(string),30)){AllowNulls = false },
-            new DatabaseColumnRequest("bubbles",new DatabaseTypeRequest(typeof(int)))
+        _table = _database.CreateTable("TriggerTests", new DatabaseColumnRequest[]
+        {
+            new("name", new DatabaseTypeRequest(typeof(string), 30)) { AllowNulls = false },
+            new("bubbles", new DatabaseTypeRequest(typeof(int)))
         });
 
         _archiveTable = _database.ExpectTable("TriggerTests_Archive");
     }
 
-    private ITriggerImplementer GetImplementer()
-    {
-        return new TriggerImplementerFactory(_database.Server.DatabaseType).Create(_table);
-    }
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    private ITriggerImplementer GetImplementer() =>
+        new TriggerImplementerFactory(_database.Server.DatabaseType).Create(_table);
+
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void NoTriggerExists(DatabaseType dbType)
     {
         CreateTable(dbType);
@@ -58,36 +58,39 @@ public void NoTriggerExists(DatabaseType dbType)
         Assert.AreEqual(TriggerStatus.Missing, implementer.GetTriggerStatus());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void CreateWithNoPks_Complain(DatabaseType dbType)
     {
         CreateTable(dbType);
 
-        var ex = Assert.Throws<TriggerException>(() => GetImplementer().CreateTrigger(new ThrowImmediatelyCheckNotifier()));
+        var ex = Assert.Throws<TriggerException>(() =>
+            GetImplementer().CreateTrigger(new ThrowImmediatelyCheckNotifier()));
         Assert.AreEqual("There must be at least 1 primary key", ex.Message);
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void CreateWithPks_Valid(DatabaseType dbType)
     {
         CreateTable(dbType);
 
-        _table.CreatePrimaryKey(new []{_table.DiscoverColumn("name")});
+        _table.CreatePrimaryKey(new[] { _table.DiscoverColumn("name") });
         GetImplementer().CreateTrigger(new ThrowImmediatelyCheckNotifier());
 
         Assert.AreEqual(TriggerStatus.Enabled, GetImplementer().GetTriggerStatus());
         Assert.AreEqual(true, GetImplementer().CheckUpdateTriggerIsEnabledAndHasExpectedBody());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Create_WithDodgyColumnNames(DatabaseType dbType)
     {
         _database = GetCleanedServer(dbType);
 
-        _table =_database.CreateTable("Trol lol My Table Select * from Group by fish",new DatabaseColumnRequest[]{ 
-            new DatabaseColumnRequest("My Lovely Column Select * From Lolz",new DatabaseTypeRequest(typeof(string),30)){AllowNulls = false,IsPrimaryKey = true},
-            new DatabaseColumnRequest("ANormalColumnName",new DatabaseTypeRequest(typeof(int))),
-            new DatabaseColumnRequest("Group By Meeee Colll trollolol",new DatabaseTypeRequest(typeof(int)))
+        _table = _database.CreateTable("Trol lol My Table Select * from Group by fish", new DatabaseColumnRequest[]
+        {
+            new("My Lovely Column Select * From Lolz", new DatabaseTypeRequest(typeof(string), 30))
+                { AllowNulls = false, IsPrimaryKey = true },
+            new("ANormalColumnName", new DatabaseTypeRequest(typeof(int))),
+            new("Group By Meeee Colll trollolol", new DatabaseTypeRequest(typeof(int)))
         });
 
         GetImplementer().CreateTrigger(new ThrowImmediatelyCheckNotifier());
@@ -96,16 +99,17 @@ public void Create_WithDodgyColumnNames(DatabaseType dbType)
         Assert.AreEqual(true, GetImplementer().CheckUpdateTriggerIsEnabledAndHasExpectedBody());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void AlterTest_InvalidThenRecreateItAndItsValidAgain(DatabaseType dbType)
     {
         CreateWithPks_Valid(dbType);
 
-        _table.AddColumn("fish",new DatabaseTypeRequest(typeof(int)),true,500);
-        _archiveTable.AddColumn("fish",new DatabaseTypeRequest(typeof(int)),true,500);
+        _table.AddColumn("fish", new DatabaseTypeRequest(typeof(int)), true, 500);
+        _archiveTable.AddColumn("fish", new DatabaseTypeRequest(typeof(int)), true, 500);
 
         //still not valid because trigger SQL is missing it in the column list
-        var ex = Assert.Throws<ExpectedIdenticalStringsException>(() => GetImplementer().CheckUpdateTriggerIsEnabledAndHasExpectedBody());
+        var ex = Assert.Throws<ExpectedIdenticalStringsException>(() =>
+            GetImplementer().CheckUpdateTriggerIsEnabledAndHasExpectedBody());
         Assert.IsNotNull(ex.Message);
 
         var implementer = GetImplementer();
@@ -117,94 +121,99 @@ public void AlterTest_InvalidThenRecreateItAndItsValidAgain(DatabaseType dbType)
         Assert.AreEqual(true, implementer.CheckUpdateTriggerIsEnabledAndHasExpectedBody());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void NowTestDataInsertion(DatabaseType dbType)
     {
         AlterTest_InvalidThenRecreateItAndItsValidAgain(dbType);
-            
+
         _table.Insert(new Dictionary<string, object>
-        { 
-            {"name","Franky" } ,
-            {"bubbles",3 } ,
-            {"hic_validFrom",new DateTime(2001,1,2)} ,
-            {"hic_dataLoadRunID",7 } 
+        {
+            { "name", "Franky" },
+            { "bubbles", 3 },
+            { "hic_validFrom", new DateTime(2001, 1, 2) },
+            { "hic_dataLoadRunID", 7 }
         });
 
-        var liveOldRow = _table.GetDataTable().Rows.Cast<DataRow>().Single(r=>r["bubbles"] as int? ==3);
-        Assert.AreEqual(new DateTime(2001,1,2),(DateTime)liveOldRow[SpecialFieldNames.ValidFrom]);
+        var liveOldRow = _table.GetDataTable().Rows.Cast<DataRow>().Single(r => r["bubbles"] as int? == 3);
+        Assert.AreEqual(new DateTime(2001, 1, 2), (DateTime)liveOldRow[SpecialFieldNames.ValidFrom]);
 
-        RunSQL("UPDATE {0} set bubbles =99",_table.GetFullyQualifiedName());
+        RunSQL("UPDATE {0} set bubbles =99", _table.GetFullyQualifiedName());
 
         //new value is 99
-        Assert.AreEqual(99,ExecuteScalar("Select bubbles FROM {0} where name = 'Franky'",_table.GetFullyQualifiedName()));
+        Assert.AreEqual(99,
+            ExecuteScalar("Select bubbles FROM {0} where name = 'Franky'", _table.GetFullyQualifiedName()));
         //archived value is 3
-        Assert.AreEqual(3, ExecuteScalar("Select bubbles FROM {0} where name = 'Franky'", _archiveTable.GetFullyQualifiedName()));
+        Assert.AreEqual(3,
+            ExecuteScalar("Select bubbles FROM {0} where name = 'Franky'", _archiveTable.GetFullyQualifiedName()));
 
         //Legacy table valued function only works for MicrosoftSQLServer
-        if(dbType == DatabaseType.MicrosoftSQLServer)
+        if (dbType == DatabaseType.MicrosoftSQLServer)
         {
             //legacy in 2001-01-01 it didn't exist
-            Assert.IsNull( ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-01') where name = 'Franky'"));
+            Assert.IsNull(ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-01') where name = 'Franky'"));
             //legacy in 2001-01-03 it did exist and was 3
-            Assert.AreEqual(3, ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-03') where name = 'Franky'"));
+            Assert.AreEqual(3,
+                ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-03') where name = 'Franky'"));
             //legacy boundary case?
-            Assert.AreEqual(3, ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-02') where name = 'Franky'"));
-            
+            Assert.AreEqual(3,
+                ExecuteScalar("Select bubbles FROM TriggerTests_Legacy('2001-01-02') where name = 'Franky'"));
+
             //legacy today it is 99
-            Assert.AreEqual(99, ExecuteScalar("Select bubbles FROM TriggerTests_Legacy(GETDATE()) where name = 'Franky'"));
+            Assert.AreEqual(99,
+                ExecuteScalar("Select bubbles FROM TriggerTests_Legacy(GETDATE()) where name = 'Franky'"));
         }
 
         // Live row should now reflect that it is validFrom today
-        var liveNewRow = _table.GetDataTable().Rows.Cast<DataRow>().Single(r=>r["bubbles"] as int? ==99);
-        Assert.AreEqual(DateTime.Now.Date,((DateTime)liveNewRow[SpecialFieldNames.ValidFrom]).Date);
+        var liveNewRow = _table.GetDataTable().Rows.Cast<DataRow>().Single(r => r["bubbles"] as int? == 99);
+        Assert.AreEqual(DateTime.Now.Date, ((DateTime)liveNewRow[SpecialFieldNames.ValidFrom]).Date);
 
         // Archived row should not have had its validFrom field broken
-        var archivedRow = _archiveTable.GetDataTable().Rows.Cast<DataRow>().Single(r=>r["bubbles"] as int? ==3);
-        Assert.AreEqual(new DateTime(2001,1,2),(DateTime)archivedRow[SpecialFieldNames.ValidFrom]);
+        var archivedRow = _archiveTable.GetDataTable().Rows.Cast<DataRow>().Single(r => r["bubbles"] as int? == 3);
+        Assert.AreEqual(new DateTime(2001, 1, 2), (DateTime)archivedRow[SpecialFieldNames.ValidFrom]);
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void DiffDatabaseDataFetcherTest(DatabaseType dbType)
     {
         CreateTable(dbType);
-            
+
         _table.CreatePrimaryKey(_table.DiscoverColumn("name"));
-            
+
         GetImplementer().CreateTrigger(new ThrowImmediatelyCheckNotifier());
-            
+
         _table.Insert(new Dictionary<string, object>
-        { 
-            {"name","Franky" } ,
-            {"bubbles",3 } ,
-            {"hic_validFrom",new DateTime(2001,1,2)} ,
-            {"hic_dataLoadRunID",7 } 
+        {
+            { "name", "Franky" },
+            { "bubbles", 3 },
+            { "hic_validFrom", new DateTime(2001, 1, 2) },
+            { "hic_dataLoadRunID", 7 }
         });
-            
+
         Thread.Sleep(1000);
-        RunSQL("UPDATE {0} SET bubbles=1",_table.GetFullyQualifiedName());
-            
+        RunSQL("UPDATE {0} SET bubbles=1", _table.GetFullyQualifiedName());
+
         Thread.Sleep(1000);
-        RunSQL("UPDATE {0} SET bubbles=2",_table.GetFullyQualifiedName());
-            
+        RunSQL("UPDATE {0} SET bubbles=2", _table.GetFullyQualifiedName());
+
         Thread.Sleep(1000);
-        RunSQL("UPDATE {0} SET bubbles=3",_table.GetFullyQualifiedName());
-            
+        RunSQL("UPDATE {0} SET bubbles=3", _table.GetFullyQualifiedName());
+
         Thread.Sleep(1000);
-        RunSQL("UPDATE {0} SET bubbles=4",_table.GetFullyQualifiedName());
+        RunSQL("UPDATE {0} SET bubbles=4", _table.GetFullyQualifiedName());
 
         Thread.Sleep(1000);
 
-        Assert.AreEqual(1,_table.GetRowCount());
-        Assert.AreEqual(4,_archiveTable.GetRowCount());
+        Assert.AreEqual(1, _table.GetRowCount());
+        Assert.AreEqual(4, _archiveTable.GetRowCount());
+
+        Import(_table, out var ti, out var cols);
+        var fetcher = new DiffDatabaseDataFetcher(1, ti, 7, 100);
 
-        Import(_table,out var ti, out var cols);
-        var fetcher = new DiffDatabaseDataFetcher(1,ti,7,100);
-            
         fetcher.FetchData(new AcceptAllCheckNotifier());
-        Assert.AreEqual(4,fetcher.Updates_New.Rows[0]["bubbles"]);
+        Assert.AreEqual(4, fetcher.Updates_New.Rows[0]["bubbles"]);
         Assert.AreEqual(3, fetcher.Updates_Replaced.Rows[0]["bubbles"]);
 
-        Assert.AreEqual(1,fetcher.Updates_New.Rows.Count);
+        Assert.AreEqual(1, fetcher.Updates_New.Rows.Count);
         Assert.AreEqual(1, fetcher.Updates_Replaced.Rows.Count);
     }
 
@@ -213,7 +222,7 @@ public void DiffDatabaseDataFetcherTest(DatabaseType dbType)
     public void IdentityTest()
     {
         CreateTable(DatabaseType.MicrosoftSQLServer);
-            
+
         RunSQL("Alter TABLE TriggerTests ADD myident int identity(1,1) PRIMARY KEY");
 
         var implementer = new MicrosoftSQLTriggerImplementer(_table);
@@ -224,8 +233,8 @@ public void IdentityTest()
 
     private object ExecuteScalar(string sql, params string[] args)
     {
-        if(args.Length != 0)
-            sql = string.Format(sql,args);
+        if (args.Length != 0)
+            sql = string.Format(sql, args);
 
         var svr = _database.Server;
         using (var con = svr.GetConnection())
@@ -237,8 +246,8 @@ private object ExecuteScalar(string sql, params string[] args)
 
     private void RunSQL(string sql, params string[] args)
     {
-        if(args.Length != 0)
-            sql = string.Format(sql,args);
+        if (args.Length != 0)
+            sql = string.Format(sql, args);
         if (_database == null)
             throw new Exception("You must call CreateTable first");
 
diff --git a/Rdmp.Core.Tests/Curation/Integration/Validation/ReferentialIntegrityConstraintTests.cs b/Rdmp.Core.Tests/Curation/Integration/Validation/ReferentialIntegrityConstraintTests.cs
index 11b053c3df..0736fb0b00 100644
--- a/Rdmp.Core.Tests/Curation/Integration/Validation/ReferentialIntegrityConstraintTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/Validation/ReferentialIntegrityConstraintTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.Validation;
 
-public class ReferentialIntegrityConstraintTests :DatabaseTests
+public class ReferentialIntegrityConstraintTests : DatabaseTests
 {
     private ITableInfo _tableInfo;
     private ColumnInfo[] _columnInfo;
@@ -25,23 +25,25 @@ protected override void OneTimeSetUp()
     {
         base.OneTimeSetUp();
 
-        var tbl = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer).ExpectTable("ReferentialIntegrityConstraintTests");
+        var tbl = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)
+            .ExpectTable("ReferentialIntegrityConstraintTests");
 
-        if(tbl.Exists())
+        if (tbl.Exists())
             tbl.Drop();
 
         var server = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer).Server;
-            
+
         using (var con = server.GetConnection())
         {
             con.Open();
 
             server.GetCommand("CREATE TABLE ReferentialIntegrityConstraintTests(MyValue int)", con).ExecuteNonQuery();
-            server.GetCommand("INSERT INTO ReferentialIntegrityConstraintTests (MyValue) VALUES (5)", con).ExecuteNonQuery();
+            server.GetCommand("INSERT INTO ReferentialIntegrityConstraintTests (MyValue) VALUES (5)", con)
+                .ExecuteNonQuery();
         }
 
         var importer = new TableInfoImporter(CatalogueRepository, tbl);
-        importer.DoImport(out _tableInfo,out _columnInfo);
+        importer.DoImport(out _tableInfo, out _columnInfo);
 
         _constraint = new ReferentialIntegrityConstraint(CatalogueRepository)
         {
@@ -61,11 +63,11 @@ public void NormalLogic(object value, bool expectFailure)
         var failure = _constraint.Validate(value, null, null);
 
         //if it did not fail validation and we expected failure
-        if(failure == null && expectFailure)
+        if (failure == null && expectFailure)
             Assert.Fail();
 
         //or it did fail validation and we did not expect failure
-        if(failure != null && !expectFailure)
+        if (failure != null && !expectFailure)
             Assert.Fail();
 
         Assert.Pass();
diff --git a/Rdmp.Core.Tests/Curation/Integration/Validation/StandardRegexTests.cs b/Rdmp.Core.Tests/Curation/Integration/Validation/StandardRegexTests.cs
index 84d88fa562..3f71fb2c43 100644
--- a/Rdmp.Core.Tests/Curation/Integration/Validation/StandardRegexTests.cs
+++ b/Rdmp.Core.Tests/Curation/Integration/Validation/StandardRegexTests.cs
@@ -13,13 +13,14 @@
 
 namespace Rdmp.Core.Tests.Curation.Integration.Validation;
 
-public class StandardRegexTests:DatabaseTests
+public class StandardRegexTests : DatabaseTests
 {
     [Test]
     public void CreateNew_UseConstraint()
     {
         // Clean SetUp any existing regexes
-        CatalogueRepository.GetAllObjects<StandardRegex>().Where(r=>r.ConceptName == "Fish").ToList().ForEach(r => r.DeleteInDatabase());
+        CatalogueRepository.GetAllObjects<StandardRegex>().Where(r => r.ConceptName == "Fish").ToList()
+            .ForEach(r => r.DeleteInDatabase());
 
         var regex = new StandardRegex(CatalogueRepository);
         try
@@ -36,7 +37,7 @@ public void CreateNew_UseConstraint()
                 CatalogueStandardRegex = regex
             };
 
-            Assert.IsNull(constraint.Validate("Fish",null,null));
+            Assert.IsNull(constraint.Validate("Fish", null, null));
             var failure = constraint.Validate("FishFingers", null, null);
             Assert.IsNotNull(failure);
         }
diff --git a/Rdmp.Core.Tests/Curation/JsonSerializationTests/JsonSerializationTests.cs b/Rdmp.Core.Tests/Curation/JsonSerializationTests/JsonSerializationTests.cs
index 619100cbee..7793b3f28c 100644
--- a/Rdmp.Core.Tests/Curation/JsonSerializationTests/JsonSerializationTests.cs
+++ b/Rdmp.Core.Tests/Curation/JsonSerializationTests/JsonSerializationTests.cs
@@ -15,7 +15,7 @@
 
 namespace Rdmp.Core.Tests.Curation.JsonSerializationTests;
 
-public class JsonSerializationTests:DatabaseTests
+public class JsonSerializationTests : DatabaseTests
 {
     [Test]
     public void TestSerialization_Catalogue()
@@ -23,20 +23,21 @@ public void TestSerialization_Catalogue()
         if (CatalogueRepository is not TableRepository)
             Assert.Inconclusive("This test does not apply for non db repos");
 
-        var c = new Catalogue(RepositoryLocator.CatalogueRepository,"Fish");
+        var c = new Catalogue(RepositoryLocator.CatalogueRepository, "Fish");
 
         var mySerializeable = new MySerializeableTestClass(new ShareManager(RepositoryLocator))
- {
-     SelectedCatalogue = c,
-     Title = "War and Pieces"
- };
+        {
+            SelectedCatalogue = c,
+            Title = "War and Pieces"
+        };
 
         var dbConverter = new DatabaseEntityJsonConverter(RepositoryLocator);
         var lazyConverter = new PickAnyConstructorJsonConverter(RepositoryLocator);
 
 
-        var asString = JsonConvert.SerializeObject(mySerializeable, dbConverter,lazyConverter);
-        var mySerializeableAfter = (MySerializeableTestClass)JsonConvert.DeserializeObject(asString, typeof(MySerializeableTestClass), new JsonConverter[] { dbConverter, lazyConverter });
+        var asString = JsonConvert.SerializeObject(mySerializeable, dbConverter, lazyConverter);
+        var mySerializeableAfter = (MySerializeableTestClass)JsonConvert.DeserializeObject(asString,
+            typeof(MySerializeableTestClass), new JsonConverter[] { dbConverter, lazyConverter });
 
         Assert.AreNotEqual(mySerializeable, mySerializeableAfter);
         Assert.AreEqual(mySerializeable.SelectedCatalogue, mySerializeableAfter.SelectedCatalogue);
@@ -44,14 +45,13 @@ public void TestSerialization_Catalogue()
         Assert.AreEqual("War and Pieces", mySerializeableAfter.Title);
         mySerializeableAfter.SelectedCatalogue.Name = "Cannon balls";
         mySerializeableAfter.SelectedCatalogue.SaveToDatabase();
-            
+
         Assert.AreNotEqual(mySerializeable.SelectedCatalogue.Name, mySerializeableAfter.SelectedCatalogue.Name);
     }
 
     //todo null Catalogue test case
 }
-    
-    
+
 public class MySerializeableTestClass
 {
     public string Title { get; set; }
@@ -64,7 +64,7 @@ public MySerializeableTestClass(IRDMPPlatformRepositoryServiceLocator locator)
     {
         _sm = new ShareManager(locator);
     }
-        
+
     public MySerializeableTestClass(ShareManager sm)
     {
         _sm = sm;
diff --git a/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryTests.cs b/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryTests.cs
index ce20e37f96..038dd4d822 100644
--- a/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryTests.cs
+++ b/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryTests.cs
@@ -43,7 +43,7 @@ public void TestMemoryRepository_QueryBuilder()
     {
         var memCatalogue = new Catalogue(_repo, "My New Catalogue");
 
-        var myCol = new CatalogueItem(_repo,memCatalogue,"MyCol1");
+        var myCol = new CatalogueItem(_repo, memCatalogue, "MyCol1");
 
         var ti = new TableInfo(_repo, "My table");
         var col = new ColumnInfo(_repo, "Mycol", "varchar(10)", ti);
@@ -52,7 +52,7 @@ public void TestMemoryRepository_QueryBuilder()
 
         Assert.AreEqual(memCatalogue, _repo.GetObjectByID<Catalogue>(memCatalogue.ID));
 
-        var qb = new QueryBuilder(null,null);
+        var qb = new QueryBuilder(null, null);
         qb.AddColumnRange(memCatalogue.GetAllExtractionInformation(ExtractionCategory.Any));
 
         Assert.AreEqual(@"
diff --git a/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryVsDatabaseRepository.cs b/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryVsDatabaseRepository.cs
index 490763a898..623cd20528 100644
--- a/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryVsDatabaseRepository.cs
+++ b/Rdmp.Core.Tests/Curation/MemoryRepositoryTests/MemoryRepositoryVsDatabaseRepository.cs
@@ -19,7 +19,7 @@
 
 namespace Rdmp.Core.Tests.Curation.MemoryRepositoryTests;
 
-internal class MemoryRepositoryVsDatabaseRepository:DatabaseTests
+internal class MemoryRepositoryVsDatabaseRepository : DatabaseTests
 {
     [Test]
     public void TestMemoryVsDatabaseRepository_CatalogueConstructor()
@@ -27,9 +27,9 @@ public void TestMemoryVsDatabaseRepository_CatalogueConstructor()
         var memoryRepository = new MemoryCatalogueRepository(CatalogueRepository);
 
         var memCatalogue = new Catalogue(memoryRepository, "My New Catalogue");
-        var dbCatalogue = new Catalogue(CatalogueRepository,"My New Catalogue");
-            
-        UnitTests.AssertAreEqual(memCatalogue,dbCatalogue);
+        var dbCatalogue = new Catalogue(CatalogueRepository, "My New Catalogue");
+
+        UnitTests.AssertAreEqual(memCatalogue, dbCatalogue);
     }
 
     [Test]
@@ -44,7 +44,7 @@ public void TestMemoryVsDatabaseRepository_ProcessTaskConstructor()
 
         var memPt = new ProcessTask(memoryRepository, memLmd, LoadStage.AdjustRaw) { Name = "MyPt" };
         var dbPt = new ProcessTask(CatalogueRepository, dbLmd, LoadStage.AdjustRaw) { Name = "MyPt" };
-            
+
         UnitTests.AssertAreEqual(memPt, dbPt);
     }
 
@@ -62,17 +62,17 @@ public void TestMemoryRepository_AggregateConfigurationConstructor()
 
         UnitTests.AssertAreEqual(memAggregate, dbAggregate);
     }
-        
+
     [Test]
     public void TestMemoryRepository_LiveLogging()
     {
         var memoryRepository = new MemoryCatalogueRepository();
 
-        var loggingServer = new ExternalDatabaseServer(memoryRepository, "My Logging Server",null);
+        var loggingServer = new ExternalDatabaseServer(memoryRepository, "My Logging Server", null);
         memoryRepository.SetDefault(PermissableDefaults.LiveLoggingServer_ID, loggingServer);
 
         var memCatalogue = new Catalogue(memoryRepository, "My New Catalogue");
-        Assert.AreEqual(memCatalogue.LiveLoggingServer_ID,loggingServer.ID);
+        Assert.AreEqual(memCatalogue.LiveLoggingServer_ID, loggingServer.ID);
     }
 
     [TestCase(DatabaseType.MicrosoftSQLServer)]
@@ -87,7 +87,7 @@ public void TestImportingATable(DatabaseType dbType)
         dt.Columns.Add("So");
 
         var db = GetCleanedServer(dbType);
-        var tbl = db.CreateTable("OmgTables",dt);
+        var tbl = db.CreateTable("OmgTables", dt);
 
         var memoryRepository = new MemoryCatalogueRepository(CatalogueRepository);
 
@@ -95,26 +95,25 @@ public void TestImportingATable(DatabaseType dbType)
 
         importer1.DoImport(out var memTableInfo, out var memColumnInfos);
         var forwardEngineer1 = new ForwardEngineerCatalogue(memTableInfo, memColumnInfos);
-        forwardEngineer1.ExecuteForwardEngineering(out var memCatalogue, out var memCatalogueItems, out var memExtractionInformations);
+        forwardEngineer1.ExecuteForwardEngineering(out var memCatalogue, out var memCatalogueItems,
+            out var memExtractionInformations);
 
 
         var importerdb = new TableInfoImporter(CatalogueRepository, tbl, DataAccessContext.Any);
         importerdb.DoImport(out var dbTableInfo, out var dbColumnInfos);
         var forwardEngineer2 = new ForwardEngineerCatalogue(dbTableInfo, dbColumnInfos);
-        forwardEngineer2.ExecuteForwardEngineering(out var dbCatalogue, out var dbCatalogueItems, out var dbExtractionInformations);
+        forwardEngineer2.ExecuteForwardEngineering(out var dbCatalogue, out var dbCatalogueItems,
+            out var dbExtractionInformations);
 
 
-        UnitTests.AssertAreEqual(memCatalogue,dbCatalogue);
-        UnitTests.AssertAreEqual(memTableInfo,dbTableInfo);
+        UnitTests.AssertAreEqual(memCatalogue, dbCatalogue);
+        UnitTests.AssertAreEqual(memTableInfo, dbTableInfo);
 
-        UnitTests.AssertAreEqual(memCatalogue.CatalogueItems,dbCatalogue.CatalogueItems);
-        UnitTests.AssertAreEqual(memCatalogue.GetAllExtractionInformation(ExtractionCategory.Any), dbCatalogue.GetAllExtractionInformation(ExtractionCategory.Any));
-
-        UnitTests.AssertAreEqual(memCatalogue.CatalogueItems.Select(ci => ci.ColumnInfo), dbCatalogue.CatalogueItems.Select(ci => ci.ColumnInfo));
+        UnitTests.AssertAreEqual(memCatalogue.CatalogueItems, dbCatalogue.CatalogueItems);
+        UnitTests.AssertAreEqual(memCatalogue.GetAllExtractionInformation(ExtractionCategory.Any),
+            dbCatalogue.GetAllExtractionInformation(ExtractionCategory.Any));
 
+        UnitTests.AssertAreEqual(memCatalogue.CatalogueItems.Select(ci => ci.ColumnInfo),
+            dbCatalogue.CatalogueItems.Select(ci => ci.ColumnInfo));
     }
-
-        
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/RefactoringTests/SelectSQLRefactorerTests.cs b/Rdmp.Core.Tests/Curation/RefactoringTests/SelectSQLRefactorerTests.cs
index 8b85f69aad..d3fcc6575a 100644
--- a/Rdmp.Core.Tests/Curation/RefactoringTests/SelectSQLRefactorerTests.cs
+++ b/Rdmp.Core.Tests/Curation/RefactoringTests/SelectSQLRefactorerTests.cs
@@ -13,7 +13,7 @@
 
 namespace Rdmp.Core.Tests.Curation.RefactoringTests;
 
-public class SelectSQLRefactorerTests:UnitTests
+public class SelectSQLRefactorerTests : UnitTests
 {
     [Test]
     public void RefactorTableName_TestValidReplacement_ColumnInfo()
@@ -26,7 +26,7 @@ public void RefactorTableName_TestValidReplacement_ColumnInfo()
         tableInfo.Name = "[database]..[table]";
 
         var refactorer = new SelectSQLRefactorer();
-        SelectSQLRefactorer.RefactorTableName(columnInfo,tableInfo,"[database]..[table2]");
+        SelectSQLRefactorer.RefactorTableName(columnInfo, tableInfo, "[database]..[table2]");
 
         Assert.AreEqual("[database]..[table2].[column]", columnInfo.Name);
     }
@@ -54,12 +54,17 @@ public void RefactorTableName_TestValidReplacement_ExtractionInformation()
     }
 
     [Test]
-    [TestCase("UPPER([database]..[table].[column])",true)]
-    [TestCase("dbo.MyScalarFunction([database]..[table].[column]) in Select(distinct [database]..[table].[column] from bob)", true)]
+    [TestCase("UPPER([database]..[table].[column])", true)]
+    [TestCase(
+        "dbo.MyScalarFunction([database]..[table].[column]) in Select(distinct [database]..[table].[column] from bob)",
+        true)]
     [TestCase("dbo.MyNewRand()", false)]
-    [TestCase("[dbo].MyScalarFunction([database]..[table].[column]) in Select(distinct [database]..[table].[column] from bob)", true)]
+    [TestCase(
+        "[dbo].MyScalarFunction([database]..[table].[column]) in Select(distinct [database]..[table].[column] from bob)",
+        true)]
     [TestCase("[dbo].MyNewRand()", false)]
-    public void RefactorTableName_IsRefactorable_ExtractionInformation(string transformSql,bool expectedToBeRefactorable)
+    public void RefactorTableName_IsRefactorable_ExtractionInformation(string transformSql,
+        bool expectedToBeRefactorable)
     {
         var ei = WhenIHaveA<ExtractionInformation>();
         ei.SelectSQL = transformSql;
@@ -76,16 +81,17 @@ public void RefactorTableName_IsRefactorable_ExtractionInformation(string transf
         tableInfo.SaveToDatabase();
 
         var refactorer = new SelectSQLRefactorer();
-            
+
         Assert.AreEqual(expectedToBeRefactorable, SelectSQLRefactorer.IsRefactorable(ei));
 
         if (expectedToBeRefactorable)
             SelectSQLRefactorer.RefactorTableName(ei, tableInfo, "[database]..[table2]");
         else
-            Assert.Throws<RefactoringException>(() => SelectSQLRefactorer.RefactorTableName(ei, tableInfo, "[database]..[table2]"));
+            Assert.Throws<RefactoringException>(() =>
+                SelectSQLRefactorer.RefactorTableName(ei, tableInfo, "[database]..[table2]"));
     }
 
-    [TestCase("[Fish]..[MyTbl]","[Fish]..[MyTbl2]")]
+    [TestCase("[Fish]..[MyTbl]", "[Fish]..[MyTbl2]")]
     public void RefactorTableName_IsRefactorable_TableInfoWithNoColumnInfos(string oldName, string newName)
     {
         var ti = WhenIHaveA<TableInfo>();
@@ -93,32 +99,33 @@ public void RefactorTableName_IsRefactorable_TableInfoWithNoColumnInfos(string o
         ti.Database = "Fish";
         ti.SaveToDatabase();
 
-        foreach(IDeleteable d in ti.ColumnInfos)
+        foreach (IDeleteable d in ti.ColumnInfos)
             d.DeleteInDatabase();
 
         var refactorer = new SelectSQLRefactorer();
         Assert.IsTrue(SelectSQLRefactorer.IsRefactorable(ti));
 
-        Assert.AreEqual(1,SelectSQLRefactorer.RefactorTableName(ti,newName));
-        Assert.AreEqual(newName,ti.Name);
+        Assert.AreEqual(1, SelectSQLRefactorer.RefactorTableName(ti, newName));
+        Assert.AreEqual(newName, ti.Name);
     }
 
-    [TestCase("[Donkey]..[MyTbl]","[Fish]..[MyTbl2]","'[Donkey]..[MyTbl]' has incorrect database propery 'Fish'")]
-    public void RefactorTableName_IsNotRefactorable_TableInfoWithNoColumnInfos(string oldName, string newName,string expectedReason)
+    [TestCase("[Donkey]..[MyTbl]", "[Fish]..[MyTbl2]", "'[Donkey]..[MyTbl]' has incorrect database propery 'Fish'")]
+    public void RefactorTableName_IsNotRefactorable_TableInfoWithNoColumnInfos(string oldName, string newName,
+        string expectedReason)
     {
         var ti = WhenIHaveA<TableInfo>();
         ti.Name = oldName;
         ti.Database = "Fish";
         ti.SaveToDatabase();
 
-        foreach(IDeleteable d in ti.ColumnInfos)
+        foreach (IDeleteable d in ti.ColumnInfos)
             d.DeleteInDatabase();
 
         var refactorer = new SelectSQLRefactorer();
         Assert.IsFalse(SelectSQLRefactorer.IsRefactorable(ti));
 
-        var ex = Assert.Throws<RefactoringException>(()=>SelectSQLRefactorer.RefactorTableName(ti,newName));
-        StringAssert.Contains(expectedReason,ex.Message);
+        var ex = Assert.Throws<RefactoringException>(() => SelectSQLRefactorer.RefactorTableName(ti, newName));
+        StringAssert.Contains(expectedReason, ex.Message);
     }
 
 
@@ -132,14 +139,14 @@ public void RefactorTableName_IsNotRefactorable_TableInfoWithNoColumnInfos(strin
     /// </example>
     /// <param name="columnName">A column that belongs to <paramref name="findTableName"/> which should be refactored even if its name isn't an exact match to the table name</param>
     /// <param name="findTableName">The table being renamed, will be renamed MyTbl to MyNewTbl</param>
-    [TestCase("[Fish]..[MyTbl].[A]",     "[Fish]..[MyTbl]")]
-    [TestCase("[Fish].[dbo].[MyTbl].[A]","[Fish]..[MyTbl]")]
-    [TestCase("[Fish]..[MyTbl].[A]",     "[Fish].[dbo].[MyTbl]")]
-    [TestCase("[Fish].[dbo].[MyTbl].[A]","[Fish].[dbo].[MyTbl]")]
-    [TestCase("[Fish].dbo.[MyTbl].[A]",  "[Fish]..[MyTbl]")]
-    [TestCase("[Fish]..[MyTbl].[A]",     "[Fish].dbo.[MyTbl]")]
-    [TestCase("[Fish].dbo.[MyTbl].[A]",  "[Fish].dbo.[MyTbl]")]
-    public void RefactorTableName_IsRefactorable_ColumnInfo(string columnName,string findTableName)
+    [TestCase("[Fish]..[MyTbl].[A]", "[Fish]..[MyTbl]")]
+    [TestCase("[Fish].[dbo].[MyTbl].[A]", "[Fish]..[MyTbl]")]
+    [TestCase("[Fish]..[MyTbl].[A]", "[Fish].[dbo].[MyTbl]")]
+    [TestCase("[Fish].[dbo].[MyTbl].[A]", "[Fish].[dbo].[MyTbl]")]
+    [TestCase("[Fish].dbo.[MyTbl].[A]", "[Fish]..[MyTbl]")]
+    [TestCase("[Fish]..[MyTbl].[A]", "[Fish].dbo.[MyTbl]")]
+    [TestCase("[Fish].dbo.[MyTbl].[A]", "[Fish].dbo.[MyTbl]")]
+    public void RefactorTableName_IsRefactorable_ColumnInfo(string columnName, string findTableName)
     {
         var col = WhenIHaveA<ColumnInfo>();
         col.Name = columnName;
@@ -148,10 +155,10 @@ public void RefactorTableName_IsRefactorable_ColumnInfo(string columnName,string
         var refactorer = new SelectSQLRefactorer();
 
         var oldName = findTableName;
-        var newName = oldName.Replace("MyTbl","MyNewTbl");
+        var newName = oldName.Replace("MyTbl", "MyNewTbl");
 
-        Assert.AreEqual(1, SelectSQLRefactorer.RefactorTableName(col,oldName,newName));
+        Assert.AreEqual(1, SelectSQLRefactorer.RefactorTableName(col, oldName, newName));
 
-        Assert.AreEqual($"{newName}.[A]",col.Name);
+        Assert.AreEqual($"{newName}.[A]", col.Name);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/SimpleExampleTests.cs b/Rdmp.Core.Tests/Curation/SimpleExampleTests.cs
index 5bbc89f0fc..23b62713f2 100644
--- a/Rdmp.Core.Tests/Curation/SimpleExampleTests.cs
+++ b/Rdmp.Core.Tests/Curation/SimpleExampleTests.cs
@@ -23,7 +23,7 @@ public void Test1()
         Assert.IsTrue(cata.Exists());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Test2(DatabaseType type)
     {
         var database = GetCleanedServer(type);
@@ -33,7 +33,7 @@ public void Test2(DatabaseType type)
         Assert.IsNotNull(database.GetRuntimeName());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestReadDataLowPrivileges(DatabaseType type)
     {
         var database = GetCleanedServer(type);
@@ -42,7 +42,7 @@ public void TestReadDataLowPrivileges(DatabaseType type)
         var dt = new DataTable();
         dt.Columns.Add("MyCol");
         dt.Rows.Add("Hi");
-        dt.PrimaryKey = new[] {dt.Columns[0]};
+        dt.PrimaryKey = new[] { dt.Columns[0] };
 
         var tbl = database.CreateTable("MyTable", dt);
 
@@ -55,7 +55,7 @@ public void TestReadDataLowPrivileges(DatabaseType type)
         Import(tbl, out var tableInfo, out var columnInfos);
 
         //setup credentials for the table in RDMP (this will be Inconclusive if you have not enabled it in TestDatabases.txt
-        SetupLowPrivilegeUserRightsFor(tableInfo,TestLowPrivilegePermissions.Reader);
+        SetupLowPrivilegeUserRightsFor(tableInfo, TestLowPrivilegePermissions.Reader);
 
         //request access to the database using DataLoad context
         var newDatabase = DataAccessPortal.ExpectDatabase(tableInfo, DataAccessContext.DataLoad);
@@ -65,14 +65,14 @@ public void TestReadDataLowPrivileges(DatabaseType type)
 
         //the credentials should be different
         Assert.AreNotEqual(tbl.Database.Server.ExplicitUsernameIfAny, newTbl.Database.Server.ExplicitUsernameIfAny);
-            
+
         //try re-reading the data 
         Assert.AreEqual(1, newTbl.GetRowCount());
         Assert.AreEqual(1, newTbl.DiscoverColumns().Length);
         Assert.IsTrue(newTbl.DiscoverColumn("MyCol").IsPrimaryKey);
 
         //low priority user shouldn't be able to drop tables
-        Assert.That(newTbl.Drop,Throws.Exception);
+        Assert.That(newTbl.Drop, Throws.Exception);
 
         //normal testing user should be able to
         tbl.Drop();
diff --git a/Rdmp.Core.Tests/Curation/Unit/AggregateConfigurationTests.cs b/Rdmp.Core.Tests/Curation/Unit/AggregateConfigurationTests.cs
index 3ca439816d..aae025d9a3 100644
--- a/Rdmp.Core.Tests/Curation/Unit/AggregateConfigurationTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/AggregateConfigurationTests.cs
@@ -39,16 +39,16 @@ public void TestStripZeroSeries_Nulls(bool includeZeroSeries)
         dt.Columns.Add("col1");
         dt.Columns.Add("col2");
 
-        dt.Rows.Add("2001",0, 12);
-        dt.Rows.Add("2002",null, 333);
+        dt.Rows.Add("2001", 0, 12);
+        dt.Rows.Add("2002", null, 333);
 
         UserSettings.IncludeZeroSeriesInGraphs = includeZeroSeries;
 
         AggregateConfiguration.AdjustGraphDataTable(dt);
 
-        if(includeZeroSeries)
+        if (includeZeroSeries)
         {
-            Assert.AreEqual(3,dt.Columns.Count);
+            Assert.AreEqual(3, dt.Columns.Count);
         }
         else
         {
diff --git a/Rdmp.Core.Tests/Curation/Unit/CacheFetchRequestProviderTests.cs b/Rdmp.Core.Tests/Curation/Unit/CacheFetchRequestProviderTests.cs
index 85c3560f67..455a6073a5 100644
--- a/Rdmp.Core.Tests/Curation/Unit/CacheFetchRequestProviderTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/CacheFetchRequestProviderTests.cs
@@ -92,7 +92,7 @@ public void FailedCacheFetchRequest_SavesPreviousFailure()
     {
         var previousFailure = GetFailureMock();
 
-        var cacheProgress = Mock.Of<ICacheProgress>(c => c.PermissionWindow==Mock.Of<IPermissionWindow>());
+        var cacheProgress = Mock.Of<ICacheProgress>(c => c.PermissionWindow == Mock.Of<IPermissionWindow>());
 
         var request = new CacheFetchRequest(previousFailure.Object, cacheProgress);
         request.RequestFailed(new Exception());
@@ -108,7 +108,7 @@ public void FailedCacheFetchRequest_ResolveCalled()
     {
         var previousFailure = GetFailureMock();
 
-        var cacheProgress = Mock.Of<ICacheProgress>(c => c.PermissionWindow==Mock.Of<IPermissionWindow>());
+        var cacheProgress = Mock.Of<ICacheProgress>(c => c.PermissionWindow == Mock.Of<IPermissionWindow>());
 
         var request = new CacheFetchRequest(previousFailure.Object, cacheProgress);
         request.RequestSucceeded();
@@ -118,10 +118,10 @@ public void FailedCacheFetchRequest_ResolveCalled()
 
     private static Mock<ICacheFetchFailure> GetFailureMock()
     {
-        var failure = Mock.Of<ICacheFetchFailure>(f=>
+        var failure = Mock.Of<ICacheFetchFailure>(f =>
             f.FetchRequestEnd == DateTime.Now &&
             f.FetchRequestStart == DateTime.Now.Subtract(new TimeSpan(1, 0, 0)));
-            
+
         return Mock.Get(failure);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/CatalogueNamingTests.cs b/Rdmp.Core.Tests/Curation/Unit/CatalogueNamingTests.cs
index 9a3cc85c43..4771256035 100644
--- a/Rdmp.Core.Tests/Curation/Unit/CatalogueNamingTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/CatalogueNamingTests.cs
@@ -12,7 +12,6 @@ namespace Rdmp.Core.Tests.Curation.Unit;
 [Category("Unit")]
 public class CatalogueNamingTests
 {
-
     [Test]
     [TestCase("###")]
     [TestCase("Bob\\bob")]
@@ -22,6 +21,7 @@ public void StupidCatalogueNames(string name)
     {
         Assert.IsFalse(Catalogue.IsAcceptableName(name));
     }
+
     [Test]
     [TestCase("Hi")]
     [TestCase("MyhExchiting dAtaset")]
diff --git a/Rdmp.Core.Tests/Curation/Unit/CommitAssemblyTest.cs b/Rdmp.Core.Tests/Curation/Unit/CommitAssemblyTest.cs
index 3f5ed549b7..27e6c4aa70 100644
--- a/Rdmp.Core.Tests/Curation/Unit/CommitAssemblyTest.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/CommitAssemblyTest.cs
@@ -19,9 +19,10 @@ public void TestGetTypeByName()
         Console.Write(s.GetType().FullName);
 
         var t = Type.GetType(s.GetType().AssemblyQualifiedName);
-            
-        Assert.AreEqual(s.GetType(),t);
+
+        Assert.AreEqual(s.GetType(), t);
     }
+
     public enum ScheduleStrategy
     {
         NotSet,
diff --git a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestBiochemistryCreation.cs b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestBiochemistryCreation.cs
index e8ec4fae84..c5e48e64e4 100644
--- a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestBiochemistryCreation.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestBiochemistryCreation.cs
@@ -23,9 +23,9 @@ public void CreateCSV(int numberOfRecords)
     {
         var r = new Random(500);
         var people = new PersonCollection();
-        people.GeneratePeople(100,r);
+        people.GeneratePeople(100, r);
 
-        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"DeleteMeTestBiochemistry.csv"));
+        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "DeleteMeTestBiochemistry.csv"));
 
         var finished = false;
         var finishedWithRecords = -1;
@@ -43,7 +43,8 @@ public void CreateCSV(int numberOfRecords)
         Assert.IsTrue(finished);
         Assert.AreEqual(numberOfRecords, finishedWithRecords);
 
-        Assert.GreaterOrEqual(File.ReadAllLines(f.FullName).Length, numberOfRecords);//can be newlines in middle of file
+        Assert.GreaterOrEqual(File.ReadAllLines(f.FullName).Length,
+            numberOfRecords); //can be newlines in middle of file
 
         Console.WriteLine($"Created file: {f.FullName}");
         f.Delete();
diff --git a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestDemographyCreation.cs b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestDemographyCreation.cs
index 31dda1346e..e1efc2deea 100644
--- a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestDemographyCreation.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestDemographyCreation.cs
@@ -24,9 +24,9 @@ public void CreateCSV(int numberOfRecords)
         var r = new Random(500);
 
         var people = new PersonCollection();
-        people.GeneratePeople(100,r);
+        people.GeneratePeople(100, r);
 
-        var f =new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"DeleteMeTestPeople.csv"));
+        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "DeleteMeTestPeople.csv"));
 
         var finished = false;
         var finishedWithRecords = -1;
@@ -46,9 +46,9 @@ public void CreateCSV(int numberOfRecords)
         Assert.IsTrue(finished);
         Assert.AreEqual(numberOfRecords, finishedWithRecords);
 
-        Assert.GreaterOrEqual(File.ReadAllLines(f.FullName).Length, numberOfRecords);//can be newlines in middle of file
+        Assert.GreaterOrEqual(File.ReadAllLines(f.FullName).Length,
+            numberOfRecords); //can be newlines in middle of file
 
         f.Delete();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestPrescribingCreation.cs b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestPrescribingCreation.cs
index 6edfa1c68a..061fc37c31 100644
--- a/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestPrescribingCreation.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/ExerciseData/TestPrescribingCreation.cs
@@ -25,9 +25,9 @@ public void CreateCSV(int numberOfRecords)
         var r = new Random(500);
 
         var people = new PersonCollection();
-        people.GeneratePeople(100,r);
+        people.GeneratePeople(100, r);
 
-        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"DeleteMeTestPrescribing.csv"));
+        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "DeleteMeTestPrescribing.csv"));
 
         var finished = false;
         var finishedWithRecords = -1;
@@ -45,9 +45,7 @@ public void CreateCSV(int numberOfRecords)
         Assert.IsTrue(finished);
         Assert.AreEqual(numberOfRecords, finishedWithRecords);
 
-        Assert.GreaterOrEqual(File.ReadLines(f.FullName).Count(), numberOfRecords);//can be newlines in middle of file
+        Assert.GreaterOrEqual(File.ReadLines(f.FullName).Count(), numberOfRecords); //can be newlines in middle of file
         f.Delete();
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/IColumnTests.cs b/Rdmp.Core.Tests/Curation/Unit/IColumnTests.cs
index f766ce0799..e1bcd87b02 100644
--- a/Rdmp.Core.Tests/Curation/Unit/IColumnTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/IColumnTests.cs
@@ -21,16 +21,15 @@ namespace Rdmp.Core.Tests.Curation.Unit;
 [Category("Unit")]
 internal class IColumnTests
 {
-
     /// <summary>
     /// For tests
     /// </summary>
-    private class TestColumn:SpontaneousObject,IColumn
+    private class TestColumn : SpontaneousObject, IColumn
     {
-        public TestColumn():base(new MemoryRepository())
+        public TestColumn() : base(new MemoryRepository())
         {
-                
         }
+
         public string GetRuntimeName()
         {
             var helper = MicrosoftQuerySyntaxHelper.Instance;
@@ -41,12 +40,12 @@ public string GetRuntimeName()
         public ColumnInfo ColumnInfo { get; private set; }
         public int Order { get; set; }
 
-        [Sql]
-        public string SelectSQL { get; set; }
+        [Sql] public string SelectSQL { get; set; }
         public string Alias { get; set; }
         public bool HashOnDataRelease { get; private set; }
         public bool IsExtractionIdentifier { get; private set; }
         public bool IsPrimaryKey { get; private set; }
+
         public void Check(ICheckNotifier notifier)
         {
             new ColumnSyntaxChecker(this).Check(notifier);
@@ -75,15 +74,14 @@ public void GetRuntimeName_IColumns_Pass()
             Alias = "test"
         };
 
-        Assert.AreEqual(tc.GetRuntimeName(),"test");
+        Assert.AreEqual(tc.GetRuntimeName(), "test");
 
         tc.SelectSQL = "MangleQuery([mydb]..[myExcitingField])"; //still has Alias
-        Assert.AreEqual(tc.GetRuntimeName(),"test");
+        Assert.AreEqual(tc.GetRuntimeName(), "test");
 
         tc.Alias = null;
-        tc.SelectSQL = "[mydb]..[myExcitingField]"; 
+        tc.SelectSQL = "[mydb]..[myExcitingField]";
         Assert.AreEqual(tc.GetRuntimeName(), "myExcitingField");
-            
     }
 
     [Test]
@@ -94,7 +92,7 @@ public void GetRuntimeName_IColumns_ThrowBecauseMissingAliasOnScalarValueFunctio
             SelectSQL = "MangleQuery([mydb]..[myExcitingField])"
         };
 
-        var ex = Assert.Throws<RuntimeNameException>(()=> tc.GetRuntimeName());
+        var ex = Assert.Throws<RuntimeNameException>(() => tc.GetRuntimeName());
     }
 
 
@@ -111,7 +109,6 @@ public void CheckSyntax_IColumn_Valid()
         tc.Check(new ThrowImmediatelyCheckNotifier());
         tc.Alias = "`[bob smith]`";
         tc.Check(new ThrowImmediatelyCheckNotifier());
-
     }
 
 
@@ -122,9 +119,8 @@ public void CheckSyntax_IColumn_ThrowBecauseInvalidAlias1()
         {
             Alias = "bob smith"
         };
-        var ex = Assert.Throws<SyntaxErrorException>(()=>tc.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Whitespace found in unwrapped Alias \"bob smith\"",ex.Message);
-
+        var ex = Assert.Throws<SyntaxErrorException>(() => tc.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual("Whitespace found in unwrapped Alias \"bob smith\"", ex.Message);
     }
 
     [Test]
@@ -136,9 +132,9 @@ public void CheckSyntax_IColumn_ThrowBecauseInvalidAlias2()
         };
 
         var ex = Assert.Throws<SyntaxErrorException>(() => tc.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Invalid characters found in Alias \"`bob\"",ex.Message);
-           
+        Assert.AreEqual("Invalid characters found in Alias \"`bob\"", ex.Message);
     }
+
     [Test]
     public void CheckSyntax_IColumn_ThrowBecauseInvalidAlias3()
     {
@@ -147,12 +143,10 @@ public void CheckSyntax_IColumn_ThrowBecauseInvalidAlias3()
             Alias = "bob]"
         };
         var ex = Assert.Throws<SyntaxErrorException>(() => tc.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Invalid characters found in Alias \"bob]\"",ex.Message);
-            
+        Assert.AreEqual("Invalid characters found in Alias \"bob]\"", ex.Message);
     }
 
-    [Test] 
-        
+    [Test]
     public void CheckSyntax_IColumn_ThrowBecauseInvalidSelectSQL()
     {
         var tc = new TestColumn
@@ -161,6 +155,6 @@ public void CheckSyntax_IColumn_ThrowBecauseInvalidSelectSQL()
             SelectSQL = "GetSomething('here'"
         };
         var ex = Assert.Throws<SyntaxErrorException>(() => tc.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Mismatch in the number of opening '(' and closing ')'",ex.Message);
+        Assert.AreEqual("Mismatch in the number of opening '(' and closing ')'", ex.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/IMightBeReadOnlyTests.cs b/Rdmp.Core.Tests/Curation/Unit/IMightBeReadOnlyTests.cs
index e51262f3a4..a42e97f7b3 100644
--- a/Rdmp.Core.Tests/Curation/Unit/IMightBeReadOnlyTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/IMightBeReadOnlyTests.cs
@@ -28,16 +28,16 @@ public void IsReadonly_AggregateFilterContainer()
         var cic = WhenIHaveA<CohortIdentificationConfiguration>();
         cic.Name = "fff";
         cic.CreateRootContainerIfNotExists();
-        cic.RootCohortAggregateContainer.AddChild(c.GetAggregate(),0);
-            
+        cic.RootCohortAggregateContainer.AddChild(c.GetAggregate(), 0);
+
         Assert.IsFalse(c.ShouldBeReadOnly(out _));
 
         cic.Frozen = true;
         Assert.IsTrue(c.ShouldBeReadOnly(out var reason));
-            
-        Assert.AreEqual("fff is Frozen",reason);
+
+        Assert.AreEqual("fff is Frozen", reason);
     }
-        
+
     [Test]
     public void IsReadonly_ExtractionFilterContainer()
     {
@@ -45,26 +45,26 @@ public void IsReadonly_ExtractionFilterContainer()
         Assert.IsFalse(c.ShouldBeReadOnly(out _));
 
         var ec = c.GetSelectedDataSetIfAny().ExtractionConfiguration;
-            
+
         Assert.IsFalse(c.ShouldBeReadOnly(out _));
 
         ec.Name = "lll";
         ec.IsReleased = true;
         Assert.IsTrue(c.ShouldBeReadOnly(out var reason));
-            
-        Assert.AreEqual("lll has already been released",reason);
+
+        Assert.AreEqual("lll has already been released", reason);
     }
 
     [Test]
     public void IsReadonly_SpontaneousContainer()
     {
         var memoryrepo = new MemoryCatalogueRepository();
-        var c = new SpontaneouslyInventedFilterContainer(memoryrepo,null,null,FilterContainerOperation.AND);
-        Assert.IsFalse(c.ShouldBeReadOnly(out _),"Spont containers should never be in UI but let's not tell the programmer they shouldn't be edited");
+        var c = new SpontaneouslyInventedFilterContainer(memoryrepo, null, null, FilterContainerOperation.AND);
+        Assert.IsFalse(c.ShouldBeReadOnly(out _),
+            "Spont containers should never be in UI but let's not tell the programmer they shouldn't be edited");
     }
 
 
-        
     [Test]
     public void IsReadonly_AggregateFilter()
     {
@@ -76,27 +76,27 @@ public void IsReadonly_AggregateFilter()
         var cic = WhenIHaveA<CohortIdentificationConfiguration>();
         cic.Name = "fff";
         cic.CreateRootContainerIfNotExists();
-        cic.RootCohortAggregateContainer.AddChild(f.GetAggregate(),0);
-            
+        cic.RootCohortAggregateContainer.AddChild(f.GetAggregate(), 0);
+
         Assert.IsFalse(f.ShouldBeReadOnly(out _));
 
         cic.Frozen = true;
         Assert.IsTrue(f.ShouldBeReadOnly(out var reason));
-            
-        Assert.AreEqual("fff is Frozen",reason);
+
+        Assert.AreEqual("fff is Frozen", reason);
     }
-        
+
     [Test]
     public void IsReadonly_DeployedExtractionFilter()
     {
         var f = WhenIHaveA<DeployedExtractionFilter>();
         Assert.IsFalse(f.ShouldBeReadOnly(out _));
 
-        var ec = ((FilterContainer) f.FilterContainer).GetSelectedDataSetIfAny().ExtractionConfiguration;
+        var ec = ((FilterContainer)f.FilterContainer).GetSelectedDataSetIfAny().ExtractionConfiguration;
         ec.Name = "lll";
         ec.IsReleased = true;
         Assert.IsTrue(f.ShouldBeReadOnly(out var reason));
-            
-        Assert.AreEqual("lll has already been released",reason);
+
+        Assert.AreEqual("lll has already been released", reason);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/ObjectConstructorTests.cs b/Rdmp.Core.Tests/Curation/Unit/ObjectConstructorTests.cs
index 23b923ecfb..6c478e6dab 100644
--- a/Rdmp.Core.Tests/Curation/Unit/ObjectConstructorTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/ObjectConstructorTests.cs
@@ -20,12 +20,12 @@ public class ObjectConstructorTests : UnitTests
     [Test]
     public void ConstructValidTests()
     {
-        var constructor =new ObjectConstructor();
-        var testarg = new TestArg {Text = "amagad"};
+        var constructor = new ObjectConstructor();
+        var testarg = new TestArg { Text = "amagad" };
         var testarg2 = new TestArg2 { Text = "amagad" };
 
         //anyone can construct on object!
-        ObjectConstructor.Construct(typeof(TestClass1),testarg);
+        ObjectConstructor.Construct(typeof(TestClass1), testarg);
         ObjectConstructor.Construct(typeof(TestClass1), testarg2);
 
         //basic case - identical Type parameter
@@ -35,7 +35,8 @@ public void ConstructValidTests()
         ObjectConstructor.Construct(typeof(TestClass2), testarg2);
 
         //not allowed because class 3 explicitly requires a TestArg2 
-        Assert.Throws<ObjectLacksCompatibleConstructorException>(()=> ObjectConstructor.Construct(typeof(TestClass3), testarg));
+        Assert.Throws<ObjectLacksCompatibleConstructorException>(() =>
+            ObjectConstructor.Construct(typeof(TestClass3), testarg));
 
         //allowed
         ObjectConstructor.Construct(typeof(TestClass3), testarg2);
@@ -46,23 +47,24 @@ public void ConstructValidTests()
         var testarg3 = new TestArg3();
 
         //not valid because there are 2 constructors that are both base classes of TestArg3 so ObjectConstructor doesn't know which to invoke
-        var ex = Assert.Throws<ObjectLacksCompatibleConstructorException>(()=> ObjectConstructor.Construct(typeof (TestClass4), testarg3));
+        var ex = Assert.Throws<ObjectLacksCompatibleConstructorException>(() =>
+            ObjectConstructor.Construct(typeof(TestClass4), testarg3));
         Assert.IsTrue(ex.Message.Contains("Could not pick the correct constructor between"));
 
         //exactly the same as the above case but one constructor has been decorated with [UseWithObjectConstructor] attribute
-        ObjectConstructor.Construct(typeof (TestClass5), testarg3);
+        ObjectConstructor.Construct(typeof(TestClass5), testarg3);
     }
 
     [Test]
     public void ConstructIfPossibleTests_BlankConstructors()
     {
         var constructor = new ObjectConstructor();
-            
+
         //blank constructors are only used if no params are specified
         Assert.IsNotNull(ObjectConstructor.ConstructIfPossible(typeof(TestClassDefaultConstructor)));
-            
+
         //no constructor taking an int
-        Assert.IsNull(ObjectConstructor.ConstructIfPossible(typeof(TestClassDefaultConstructor),8));
+        Assert.IsNull(ObjectConstructor.ConstructIfPossible(typeof(TestClassDefaultConstructor), 8));
     }
 
     [Test]
@@ -72,9 +74,8 @@ public void GetRepositoryConstructor_AllDatabaseEntities_OneWinningConstructor()
 
         var countCompatible = 0;
 
-        var badTypes = new Dictionary<Type,Exception>();
+        var badTypes = new Dictionary<Type, Exception>();
         foreach (var t in MEF.GetAllTypes().Where(typeof(DatabaseEntity).IsAssignableFrom))
-        {
             try
             {
                 var oc = new ObjectConstructor();
@@ -83,25 +84,22 @@ public void GetRepositoryConstructor_AllDatabaseEntities_OneWinningConstructor()
             }
             catch (Exception e)
             {
-                badTypes.Add(t,e);
+                badTypes.Add(t, e);
             }
-        }
 
         Assert.IsEmpty(badTypes);
-        Assert.GreaterOrEqual(countCompatible,10);
+        Assert.GreaterOrEqual(countCompatible, 10);
         Console.WriteLine($"Found compatible constructors on {countCompatible} objects");
     }
 
     private class TestClassDefaultConstructor
     {
-            
     }
 
     private class TestClass1
     {
         public TestClass1(object o)
         {
-                
         }
     }
 
@@ -148,6 +146,7 @@ public TestClass5(TestArg a)
         {
             A = a;
         }
+
         [UseWithObjectConstructor]
         public TestClass5(TestArg2 a)
         {
@@ -160,13 +159,11 @@ private class TestArg
         public string Text { get; set; }
     }
 
-    private class TestArg2:TestArg
+    private class TestArg2 : TestArg
     {
-             
     }
 
     private class TestArg3 : TestArg2
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/ParameterManagerTests.cs b/Rdmp.Core.Tests/Curation/Unit/ParameterManagerTests.cs
index 8d4ce9899a..9544eae61a 100644
--- a/Rdmp.Core.Tests/Curation/Unit/ParameterManagerTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/ParameterManagerTests.cs
@@ -19,13 +19,15 @@ public class ParameterManagerTests
     [Test]
     public void Test_ParameterManager_SimpleRename()
     {
-        var p1 = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",MicrosoftQuerySyntaxHelper.Instance);
-        var p2 = new ConstantParameter("DECLARE @fish as int", "2", "fishes be here",MicrosoftQuerySyntaxHelper.Instance);
+        var p1 = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
+        var p2 = new ConstantParameter("DECLARE @fish as int", "2", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
 
         var pm1 = new ParameterManager();
         var pm2 = new ParameterManager();
         var pm3 = new ParameterManager();
-            
+
         pm1.ParametersFoundSoFarInQueryGeneration[ParameterLevel.QueryLevel].Add(p1);
         pm2.ParametersFoundSoFarInQueryGeneration[ParameterLevel.QueryLevel].Add(p2);
 
@@ -35,24 +37,26 @@ public void Test_ParameterManager_SimpleRename()
         var final = pm3.GetFinalResolvedParametersList().ToArray();
 
         //the final composite parameters should have a rename in them
-        Assert.AreEqual("@fish",final[0].ParameterName);
-        Assert.AreEqual("@fish_2",final[1].ParameterName);
+        Assert.AreEqual("@fish", final[0].ParameterName);
+        Assert.AreEqual("@fish_2", final[1].ParameterName);
 
         Assert.IsEmpty(renames1);
 
-        Assert.AreEqual("@fish",renames2.Single().Key);
-        Assert.AreEqual("@fish_2",renames2.Single().Value);
+        Assert.AreEqual("@fish", renames2.Single().Key);
+        Assert.AreEqual("@fish_2", renames2.Single().Value);
     }
 
     [Test]
-    [TestCase(ParameterLevel.TableInfo,ParameterLevel.Global)]
+    [TestCase(ParameterLevel.TableInfo, ParameterLevel.Global)]
     [TestCase(ParameterLevel.QueryLevel, ParameterLevel.Global)]
-    [TestCase(ParameterLevel.TableInfo,ParameterLevel.CompositeQueryLevel)]
-    [TestCase(ParameterLevel.TableInfo,ParameterLevel.QueryLevel)]
+    [TestCase(ParameterLevel.TableInfo, ParameterLevel.CompositeQueryLevel)]
+    [TestCase(ParameterLevel.TableInfo, ParameterLevel.QueryLevel)]
     public void FindOverridenParameters_OneOnlyTest(ParameterLevel addAt, ParameterLevel overridingLevel)
     {
-        var myParameter = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",MicrosoftQuerySyntaxHelper.Instance);
-        var overridingParameter = new ConstantParameter("DECLARE @fish as int", "999", "overriding value",MicrosoftQuerySyntaxHelper.Instance);
+        var myParameter = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
+        var overridingParameter = new ConstantParameter("DECLARE @fish as int", "999", "overriding value",
+            MicrosoftQuerySyntaxHelper.Instance);
 
         var pm = new ParameterManager();
         pm.ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo].Add(myParameter);
@@ -63,19 +67,21 @@ public void FindOverridenParameters_OneOnlyTest(ParameterLevel addAt, ParameterL
         Assert.IsNull(pm.GetOverrideIfAnyFor(overridingParameter));
         Assert.AreEqual(pm.GetOverrideIfAnyFor(myParameter), overridingParameter);
 
-        Assert.AreEqual(1,overrides.Length);
+        Assert.AreEqual(1, overrides.Length);
         Assert.AreEqual(myParameter, overrides[0]);
         var final = pm.GetFinalResolvedParametersList().ToArray();
 
         Assert.AreEqual(1, final.Length);
         Assert.AreEqual(overridingParameter, final[0]);
     }
-        
+
     [Test]
     public void FindOverridenParameters_CaseSensitivityTest()
     {
-        var baseParameter = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here", MicrosoftQuerySyntaxHelper.Instance);
-        var overridingParameter = new ConstantParameter("DECLARE @Fish as int", "3", "overriding value", MicrosoftQuerySyntaxHelper.Instance);
+        var baseParameter = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
+        var overridingParameter = new ConstantParameter("DECLARE @Fish as int", "3", "overriding value",
+            MicrosoftQuerySyntaxHelper.Instance);
 
         var pm = new ParameterManager();
         pm.ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo].Add(baseParameter);
@@ -86,17 +92,20 @@ public void FindOverridenParameters_CaseSensitivityTest()
         Assert.AreEqual(1, parameters.Length);
 
         var final = parameters.Single();
-        Assert.AreEqual("@Fish",final.ParameterName);
+        Assert.AreEqual("@Fish", final.ParameterName);
         Assert.AreEqual("3", final.Value);
     }
 
     [Test]
     public void FindOverridenParameters_TwoTest()
     {
-        var myParameter1 = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",MicrosoftQuerySyntaxHelper.Instance);
-        var myParameter2 = new ConstantParameter("DECLARE @fish as int", "2", "fishes be here",MicrosoftQuerySyntaxHelper.Instance);
+        var myParameter1 = new ConstantParameter("DECLARE @fish as int", "1", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
+        var myParameter2 = new ConstantParameter("DECLARE @fish as int", "2", "fishes be here",
+            MicrosoftQuerySyntaxHelper.Instance);
 
-        var overridingParameter = new ConstantParameter("DECLARE @fish as int", "3", "overriding value",MicrosoftQuerySyntaxHelper.Instance);
+        var overridingParameter = new ConstantParameter("DECLARE @fish as int", "3", "overriding value",
+            MicrosoftQuerySyntaxHelper.Instance);
 
         var pm = new ParameterManager();
         pm.ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo].Add(myParameter1);
@@ -114,14 +123,15 @@ public void FindOverridenParameters_TwoTest()
         Assert.AreEqual(myParameter2, overrides[1]);
 
         var final = pm.GetFinalResolvedParametersList().ToArray();
-        Assert.AreEqual(1,final.Length);
+        Assert.AreEqual(1, final.Length);
         Assert.AreEqual(overridingParameter, final[0]);
     }
 
     [Test]
     public void ParameterDeclarationAndDeconstruction()
     {
-        var param = new ConstantParameter("DECLARE @Fish as int;","3","I've got a lovely bunch of coconuts",MicrosoftQuerySyntaxHelper.Instance);
+        var param = new ConstantParameter("DECLARE @Fish as int;", "3", "I've got a lovely bunch of coconuts",
+            MicrosoftQuerySyntaxHelper.Instance);
         var sql = QueryBuilder.GetParameterDeclarationSQL(param);
 
         Assert.AreEqual(@"/*I've got a lovely bunch of coconuts*/
@@ -131,9 +141,8 @@ public void ParameterDeclarationAndDeconstruction()
 
         var after = ConstantParameter.Parse(sql, MicrosoftQuerySyntaxHelper.Instance);
 
-        Assert.AreEqual(param.ParameterSQL,after.ParameterSQL);
+        Assert.AreEqual(param.ParameterSQL, after.ParameterSQL);
         Assert.AreEqual(param.Value, after.Value);
         Assert.AreEqual(param.Comment, after.Comment);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/PermissionWindowTests.cs b/Rdmp.Core.Tests/Curation/Unit/PermissionWindowTests.cs
index 7965abcc88..7681a46a28 100644
--- a/Rdmp.Core.Tests/Curation/Unit/PermissionWindowTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/PermissionWindowTests.cs
@@ -12,14 +12,14 @@
 
 namespace Rdmp.Core.Tests.Curation.Unit;
 
-public class PermissionWindowTests:DatabaseTests
+public class PermissionWindowTests : DatabaseTests
 {
-
     [Test]
     public void TestSerialisation()
     {
-        var period1 = new PermissionWindowPeriod((int) DayOfWeek.Monday, new TimeSpan(0, 0, 0), new TimeSpan(6, 0, 0));
-        var period2 = new PermissionWindowPeriod((int) DayOfWeek.Monday, new TimeSpan(17, 0, 0), new TimeSpan(23, 59, 59));
+        var period1 = new PermissionWindowPeriod((int)DayOfWeek.Monday, new TimeSpan(0, 0, 0), new TimeSpan(6, 0, 0));
+        var period2 =
+            new PermissionWindowPeriod((int)DayOfWeek.Monday, new TimeSpan(17, 0, 0), new TimeSpan(23, 59, 59));
 
         var permissionWindow = new PermissionWindow(CatalogueRepository);
         permissionWindow.SetPermissionWindowPeriods(new List<PermissionWindowPeriod>
@@ -39,14 +39,14 @@ public void TestSerialisation()
         Assert.AreEqual(2, periods.Count);
 
         var newPeriod1 = periods[0];
-        Assert.AreEqual((int) DayOfWeek.Monday, newPeriod1.DayOfWeek);
+        Assert.AreEqual((int)DayOfWeek.Monday, newPeriod1.DayOfWeek);
 
         Assert.AreEqual(6, newPeriod1.End.Hours);
 
         var newPeriod2 = periods[1];
         Assert.AreEqual(17, newPeriod2.Start.Hours);
     }
-        
+
     [Test]
     public void TestCurrentlyWithinPermissionPeriod()
     {
@@ -58,9 +58,10 @@ public void TestCurrentlyWithinPermissionPeriod()
         var fiveMinutes = new TimeSpan(0, 5, 0);
 
         var utcTime = new TimeSpan(dtNow.Hour, dtNow.Minute, dtNow.Second);
-        var period1 = new PermissionWindowPeriod((int)DateTime.UtcNow.DayOfWeek, utcTime.Subtract(fiveMinutes), utcTime.Add(fiveMinutes));
+        var period1 = new PermissionWindowPeriod((int)DateTime.UtcNow.DayOfWeek, utcTime.Subtract(fiveMinutes),
+            utcTime.Add(fiveMinutes));
 
-        var permissionWindow = new PermissionWindow(CatalogueRepository); 
+        var permissionWindow = new PermissionWindow(CatalogueRepository);
         permissionWindow.SetPermissionWindowPeriods(new List<PermissionWindowPeriod> { period1 });
         Assert.IsTrue(permissionWindow.WithinPermissionWindow());
     }
@@ -75,7 +76,8 @@ public void TestCurrentlyOutsidePermissionPeriod()
 
         var oneMinute = new TimeSpan(0, 1, 0);
         var utcTime = new TimeSpan(dtNow.Hour, dtNow.Minute, dtNow.Second);
-        var period1 = new PermissionWindowPeriod((int)DateTime.Now.DayOfWeek, utcTime.Add(oneMinute), utcTime.Add(oneMinute));
+        var period1 =
+            new PermissionWindowPeriod((int)DateTime.Now.DayOfWeek, utcTime.Add(oneMinute), utcTime.Add(oneMinute));
 
         var permissionWindow = new PermissionWindow(CatalogueRepository);
         permissionWindow.SetPermissionWindowPeriods(new List<PermissionWindowPeriod> { period1 });
diff --git a/Rdmp.Core.Tests/Curation/Unit/PreInitializeTests.cs b/Rdmp.Core.Tests/Curation/Unit/PreInitializeTests.cs
index 743316d845..3ce90f2832 100644
--- a/Rdmp.Core.Tests/Curation/Unit/PreInitializeTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/PreInitializeTests.cs
@@ -22,35 +22,33 @@ public class PreInitializeTests
     [Test]
     public void TestNormal()
     {
-
         var fishUser = new FishUser();
 
         Assert.AreNotEqual(fishUser.IFish, fish);
-        context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(),fishUser, fish);
+        context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, fish);
         Assert.AreEqual(fishUser.IFish, fish);
     }
 
     [Test]
     public void TestOneOFMany()
     {
-
         var fishUser = new FishUser();
-            
+
         Assert.AreNotEqual(fishUser.IFish, fish);
-        context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser,new object(), fish);
+        context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, new object(), fish);
         Assert.AreEqual(fishUser.IFish, fish);
     }
+
     [Test]
     public void TestCasting()
     {
-
         var fishUser = new FishUser();
 
         Assert.AreNotEqual(fishUser.IFish, fish);
         context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, (IFish)fish);
         Assert.AreEqual(fishUser.IFish, fish);
     }
-           
+
     [Test]
     public void TestDownCasting()
     {
@@ -61,11 +59,13 @@ public void TestDownCasting()
         context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, f);
         Assert.AreEqual(fishUser.IFish, fish);
     }
+
     [Test]
     public void TestNoObjects()
     {
         var fishUser = new SpecificFishUser();
-        var ex = Assert.Throws<Exception>(()=>context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, Array.Empty<object>()));
+        var ex = Assert.Throws<Exception>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, Array.Empty<object>()));
         Assert.IsTrue(ex.Message.Contains("The following expected types were not passed to PreInitialize:Fish"));
     }
 
@@ -73,30 +73,28 @@ public void TestNoObjects()
     public void TestWrongObjects()
     {
         var fishUser = new SpecificFishUser();
-        var ex = Assert.Throws<Exception>(() => context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, new Penguin()));
+        var ex = Assert.Throws<Exception>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), fishUser, new Penguin()));
         Assert.IsTrue(ex.Message.Contains("The following expected types were not passed to PreInitialize:Fish"));
         Assert.IsTrue(ex.Message.Contains("The object types passed were:"));
         Assert.IsTrue(ex.Message.Contains("Penguin"));
     }
 
 
-
-
-    private class FishUser:IPipelineRequirement<IFish>, IDataFlowComponent<DataTable>
+    private class FishUser : IPipelineRequirement<IFish>, IDataFlowComponent<DataTable>
     {
         public IFish IFish;
 
         public void PreInitialize(IFish value, IDataLoadEventListener listener)
         {
             IFish = value;
-
         }
+
         #region boiler plate
+
         public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
-            GracefulCancellationToken cancellationToken)
-        {
+            GracefulCancellationToken cancellationToken) =>
             throw new NotImplementedException();
-        }
 
         public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
         {
@@ -107,8 +105,10 @@ public void Abort(IDataLoadEventListener listener)
         {
             throw new NotImplementedException();
         }
+
         #endregion
     }
+
     private class SpecificFishUser : IPipelineRequirement<Fish>, IDataFlowComponent<DataTable>
     {
         public IFish IFish;
@@ -116,14 +116,13 @@ private class SpecificFishUser : IPipelineRequirement<Fish>, IDataFlowComponent<
         public void PreInitialize(Fish value, IDataLoadEventListener listener)
         {
             IFish = value;
-
         }
+
         #region boiler plate
+
         public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
-            GracefulCancellationToken cancellationToken)
-        {
+            GracefulCancellationToken cancellationToken) =>
             throw new NotImplementedException();
-        }
 
         public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
         {
@@ -134,25 +133,22 @@ public void Abort(IDataLoadEventListener listener)
         {
             throw new NotImplementedException();
         }
+
         #endregion
     }
+
     private interface IFish
     {
         string GetFish();
     }
 
-    private class Fish:IFish
+    private class Fish : IFish
     {
-        public string GetFish()
-        {
-            return "fish";
-        }
+        public string GetFish() => "fish";
     }
+
     private class Penguin
     {
-        public static string GetPenguin()
-        {
-            return "Penguin";
-        }
+        public static string GetPenguin() => "Penguin";
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/Unit/SimpleColumnInfoTests.cs b/Rdmp.Core.Tests/Curation/Unit/SimpleColumnInfoTests.cs
index 720a9e9ab0..15064a041d 100644
--- a/Rdmp.Core.Tests/Curation/Unit/SimpleColumnInfoTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/SimpleColumnInfoTests.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Tests.Curation.Unit;
 public class SimpleColumnInfoTests : DatabaseTests
 {
     [Test]
-    [TestCase("varchar(5)",5)]
+    [TestCase("varchar(5)", 5)]
     [TestCase("int", -1)]
     [TestCase("datetime2", -1)]
     [TestCase("nchar(100)", 100)]
@@ -32,8 +32,9 @@ public void GetColumnLength(string type, int? expectedLength)
         });
 
         Import(t, out var ti, out var cis);
-            
-        Assert.AreEqual(expectedLength,cis.Single().Discover(DataAccessContext.InternalDataProcessing).DataType.GetLengthIfString());
+
+        Assert.AreEqual(expectedLength,
+            cis.Single().Discover(DataAccessContext.InternalDataProcessing).DataType.GetLengthIfString());
 
         ti.DeleteInDatabase();
     }
diff --git a/Rdmp.Core.Tests/Curation/Unit/SqlSyntaxHelperTests.cs b/Rdmp.Core.Tests/Curation/Unit/SqlSyntaxHelperTests.cs
index a6f50ac719..a313225bcd 100644
--- a/Rdmp.Core.Tests/Curation/Unit/SqlSyntaxHelperTests.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/SqlSyntaxHelperTests.cs
@@ -18,17 +18,24 @@ public class SqlSyntaxHelperTests
     [Test]
     public void GetNullSubstituteTests()
     {
-        Assert.AreEqual("-999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3)", true));
-        Assert.AreEqual("-9999999999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(10)", true));
-        Assert.AreEqual("-99.9", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3,1)", true));
-        Assert.AreEqual("-.9999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(4,4)", true));
-
-
-        Assert.AreEqual("999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3)", false));
-        Assert.AreEqual("9999999999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(10)", false));
-        Assert.AreEqual("99.9", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3,1)", false));
-        Assert.AreEqual(".9999", PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(4,4)", false));
-
+        Assert.AreEqual("-999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3)", true));
+        Assert.AreEqual("-9999999999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(10)", true));
+        Assert.AreEqual("-99.9",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3,1)", true));
+        Assert.AreEqual("-.9999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(4,4)", true));
+
+
+        Assert.AreEqual("999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3)", false));
+        Assert.AreEqual("9999999999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(10)", false));
+        Assert.AreEqual("99.9",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(3,1)", false));
+        Assert.AreEqual(".9999",
+            PrimaryKeyCollisionResolver.GetNullSubstituteForComparisonsWithDataType("decimal(4,4)", false));
     }
 
     [Test]
@@ -36,10 +43,10 @@ public void SplitMethod()
     {
         var syntaxHelper = MicrosoftQuerySyntaxHelper.Instance;
 
-        syntaxHelper.SplitLineIntoOuterMostMethodAndContents("count(*)",out var method, out var contents);
-            
-        Assert.AreEqual("count",method);
-        Assert.AreEqual("*",contents);
+        syntaxHelper.SplitLineIntoOuterMostMethodAndContents("count(*)", out var method, out var contents);
+
+        Assert.AreEqual("count", method);
+        Assert.AreEqual("*", contents);
 
         syntaxHelper.SplitLineIntoOuterMostMethodAndContents("count()", out method, out contents);
 
diff --git a/Rdmp.Core.Tests/Curation/Unit/TestAcronymGeneration.cs b/Rdmp.Core.Tests/Curation/Unit/TestAcronymGeneration.cs
index 010c442fd5..26b988e34a 100644
--- a/Rdmp.Core.Tests/Curation/Unit/TestAcronymGeneration.cs
+++ b/Rdmp.Core.Tests/Curation/Unit/TestAcronymGeneration.cs
@@ -12,9 +12,8 @@ namespace Rdmp.Core.Tests.Curation.Unit;
 
 public class TestAcronymGeneration : DatabaseTests
 {
-
     [Test]
-    [TestCase("bob","bob")]
+    [TestCase("bob", "bob")]
     [TestCase("Demography", "Demog")]
     [TestCase("DMPCatalogue", "DMPC")]
     [TestCase("Datasheet1", "D1")]
@@ -26,6 +25,6 @@ public void Predict(string name, string predictedAcronym)
 
         var suggestion = DitaCatalogueExtractor.GetAcronymSuggestionFromCatalogueName(name);
 
-        Assert.AreEqual(predictedAcronym,suggestion);
+        Assert.AreEqual(predictedAcronym, suggestion);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Curation/UnitTestsAllObjectsSupported.cs b/Rdmp.Core.Tests/Curation/UnitTestsAllObjectsSupported.cs
index e2e94b5e09..185b6391b7 100644
--- a/Rdmp.Core.Tests/Curation/UnitTestsAllObjectsSupported.cs
+++ b/Rdmp.Core.Tests/Curation/UnitTestsAllObjectsSupported.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.Curation;
 
-internal class UnitTestsAllObjectsSupported:UnitTests
+internal class UnitTestsAllObjectsSupported : UnitTests
 {
     /// <summary>
     /// Who tests the tester? this method does! It makes sure that <see cref="UnitTests.WhenIHaveA{T}()"/> supports all <see cref="DatabaseEntity"/> classes (except
@@ -29,20 +29,22 @@ public void TestAllSupported()
     {
         //load all DatabaseEntity types
         var mef = new MEF();
-        mef.Setup(new SafeDirectoryCatalog(new IgnoreAllErrorsCheckNotifier(), TestContext.CurrentContext.TestDirectory));
+        mef.Setup(
+            new SafeDirectoryCatalog(new IgnoreAllErrorsCheckNotifier(), TestContext.CurrentContext.TestDirectory));
 
         var types = mef.GetAllTypes()
-            .Where(t => typeof (DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
+            .Where(t => typeof(DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
 
         var methods = typeof(UnitTests).GetMethods(BindingFlags.NonPublic | BindingFlags.Instance);
         var method = methods.Single(m => m.Name.Equals("WhenIHaveA") && !m.GetParameters().Any());
 
         var notSupported = new List<Type>();
-            
+
         foreach (var t in types)
         {
             //ignore these types too
-            if (SkipTheseTypes.Contains(t.Name) || t.Name.StartsWith("Spontaneous") || typeof(SpontaneousObject).IsAssignableFrom(t))
+            if (SkipTheseTypes.Contains(t.Name) || t.Name.StartsWith("Spontaneous") ||
+                typeof(SpontaneousObject).IsAssignableFrom(t))
                 continue;
 
             DatabaseEntity instance = null;
@@ -63,20 +65,18 @@ public void TestAllSupported()
 
             //if the instance returned by MakeGenericMethod does not pass checks that's a dealbreaker!
             if (instance != null)
-            {
                 try
                 {
                     //and that it returns an instance
                     Assert.IsNotNull(instance);
                     Assert.IsTrue(instance.Exists());
-                    Assert.AreEqual(ChangeDescription.NoChanges, instance.HasLocalChanges().Evaluation,"Type was '" + t.Name+"'");
+                    Assert.AreEqual(ChangeDescription.NoChanges, instance.HasLocalChanges().Evaluation,
+                        "Type was '" + t.Name + "'");
                 }
                 catch (Exception e)
                 {
-                    throw new Exception($"Implementation of WhenIHaveA<{t.Name}> is flawed",e);
+                    throw new Exception($"Implementation of WhenIHaveA<{t.Name}> is flawed", e);
                 }
-            }
-
         }
 
         Assert.IsEmpty(notSupported,
diff --git a/Rdmp.Core.Tests/Curation/YamlRepositoryTests.cs b/Rdmp.Core.Tests/Curation/YamlRepositoryTests.cs
index 93eceeec8c..87c7964f99 100644
--- a/Rdmp.Core.Tests/Curation/YamlRepositoryTests.cs
+++ b/Rdmp.Core.Tests/Curation/YamlRepositoryTests.cs
@@ -30,7 +30,7 @@ public void BlankConstructorsForEveryone()
     {
         var sb = new StringBuilder();
 
-        foreach(var t in new YamlRepository(GetUniqueDirectory()).GetCompatibleTypes())
+        foreach (var t in new YamlRepository(GetUniqueDirectory()).GetCompatibleTypes())
         {
             var blankConstructor = t.GetConstructor(Type.EmptyTypes);
 
@@ -38,10 +38,9 @@ public void BlankConstructorsForEveryone()
                 sb.AppendLine(t.Name);
         }
 
-        if(sb.Length > 0)
-        {
-            Assert.Fail($"All data classes must have a blank constructor.  The following did not:{Environment.NewLine}{sb}");
-        }
+        if (sb.Length > 0)
+            Assert.Fail(
+                $"All data classes must have a blank constructor.  The following did not:{Environment.NewLine}{sb}");
     }
 
     [Test]
@@ -50,7 +49,7 @@ public void PersistDefaults()
         var dir = GetUniqueDirectory();
 
         var repo1 = new YamlRepository(dir);
-        var eds = new ExternalDatabaseServer(repo1,"myServer",null);
+        var eds = new ExternalDatabaseServer(repo1, "myServer", null);
         repo1.SetDefault(PermissableDefaults.LiveLoggingServer_ID, eds);
 
         var repo2 = new YamlRepository(dir);
@@ -83,7 +82,7 @@ public void PersistDataExportPropertyManagerValues()
         var dir = GetUniqueDirectory();
 
         var repo1 = new YamlRepository(dir);
-        repo1.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern,"yarg");
+        repo1.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern, "yarg");
 
         // A fresh repo loaded from the same directory should have persisted object relationships
         var repo2 = new YamlRepository(dir);
@@ -122,7 +121,7 @@ public void PersistForcedJoins()
 
         Assert.IsEmpty(ac.ForcedJoins);
         Assert.IsEmpty(repo1.AggregateForcedJoinManager.GetAllForcedJoinsFor(ac));
-        repo1.AggregateForcedJoinManager.CreateLinkBetween(ac,t);
+        repo1.AggregateForcedJoinManager.CreateLinkBetween(ac, t);
         Assert.IsNotEmpty(ac.ForcedJoins);
         Assert.IsNotEmpty(repo1.AggregateForcedJoinManager.GetAllForcedJoinsFor(ac));
 
@@ -141,17 +140,17 @@ public void PersistCohortSubcontainers()
         var repo1 = new YamlRepository(dir);
 
         var root = UnitTests.WhenIHaveA<CohortAggregateContainer>(repo1);
-        var sub1 = new CohortAggregateContainer(repo1,SetOperation.INTERSECT);
+        var sub1 = new CohortAggregateContainer(repo1, SetOperation.INTERSECT);
         var ac = UnitTests.WhenIHaveA<AggregateConfiguration>(repo1);
-            
+
         sub1.Order = 2;
         sub1.SaveToDatabase();
 
-        root.AddChild(sub1); 
+        root.AddChild(sub1);
         root.AddChild(ac, 0);
 
         Assert.IsNotEmpty(root.GetOrderedContents());
-        Assert.AreEqual(ac,root.GetOrderedContents().ToArray()[0]);
+        Assert.AreEqual(ac, root.GetOrderedContents().ToArray()[0]);
         Assert.AreEqual(sub1, root.GetOrderedContents().ToArray()[1]);
 
         // A fresh repo loaded from the same directory should have persisted object relationships
@@ -175,10 +174,10 @@ public void PersistFilterContainers()
 
         var f = new AggregateFilter(repo1, "my filter");
         ac.RootFilterContainer.AddChild(f);
-        var sub = new AggregateFilterContainer(repo1,FilterContainerOperation.AND);
+        var sub = new AggregateFilterContainer(repo1, FilterContainerOperation.AND);
         ac.RootFilterContainer.AddChild(sub);
 
-        Assert.AreEqual(sub,ac.RootFilterContainer.GetSubContainers().Single());
+        Assert.AreEqual(sub, ac.RootFilterContainer.GetSubContainers().Single());
         Assert.AreEqual(f, ac.RootFilterContainer.GetFilters().Single());
 
         // A fresh repo loaded from the same directory should have persisted object relationships
@@ -202,10 +201,10 @@ public void PersistFilterContainers_Orphans()
 
         var f = new AggregateFilter(repo1, "my filter");
         ac.RootFilterContainer.AddChild(f);
-        var sub = new AggregateFilterContainer(repo1,FilterContainerOperation.AND);
+        var sub = new AggregateFilterContainer(repo1, FilterContainerOperation.AND);
         ac.RootFilterContainer.AddChild(sub);
 
-        Assert.AreEqual(sub,ac.RootFilterContainer.GetSubContainers().Single());
+        Assert.AreEqual(sub, ac.RootFilterContainer.GetSubContainers().Single());
         Assert.AreEqual(f, ac.RootFilterContainer.GetFilters().Single());
 
         // A fresh repo loaded from the same directory should have persisted object relationships
@@ -218,7 +217,8 @@ public void PersistFilterContainers_Orphans()
         // Make an orphan container by deleting the root
 
         // don't check before deleting stuff
-        ((CatalogueObscureDependencyFinder)ac.CatalogueRepository.ObscureDependencyFinder).OtherDependencyFinders.Clear();
+        ((CatalogueObscureDependencyFinder)ac.CatalogueRepository.ObscureDependencyFinder).OtherDependencyFinders
+            .Clear();
 
         // delete the root filter
         ac.RootFilterContainer.DeleteInDatabase();
@@ -230,7 +230,6 @@ public void PersistFilterContainers_Orphans()
         Assert.IsFalse(repo3.StillExists(sub));
         Assert.IsFalse(repo3.StillExists(root));
         Assert.IsFalse(repo3.StillExists(f));
-
     }
 
     [Test]
@@ -243,15 +242,18 @@ public void PersistCredentials()
         var creds = UnitTests.WhenIHaveA<DataAccessCredentials>(repo1);
         var t = UnitTests.WhenIHaveA<TableInfo>(repo1);
 
-        Assert.IsEmpty(creds.GetAllTableInfosThatUseThis().SelectMany(v=>v.Value));
+        Assert.IsEmpty(creds.GetAllTableInfosThatUseThis().SelectMany(v => v.Value));
         Assert.IsNull(t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad));
-        Assert.IsNull(t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
+        Assert.IsNull(
+            t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
 
-        repo1.TableInfoCredentialsManager.CreateLinkBetween(creds,t, ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad);
+        repo1.TableInfoCredentialsManager.CreateLinkBetween(creds, t,
+            ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad);
 
-        Assert.AreEqual(t,creds.GetAllTableInfosThatUseThis().SelectMany(v => v.Value).Single());
-        Assert.AreEqual(creds,t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad));
-        Assert.IsNull(t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
+        Assert.AreEqual(t, creds.GetAllTableInfosThatUseThis().SelectMany(v => v.Value).Single());
+        Assert.AreEqual(creds, t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad));
+        Assert.IsNull(
+            t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
 
 
         // A fresh repo loaded from the same directory should have persisted object relationships
@@ -260,13 +262,11 @@ public void PersistCredentials()
 
         Assert.AreEqual(t, creds.GetAllTableInfosThatUseThis().SelectMany(v => v.Value).Single());
         Assert.AreEqual(creds, t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.DataLoad));
-        Assert.IsNull(t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
-
-
+        Assert.IsNull(
+            t.GetCredentialsIfExists(ReusableLibraryCode.DataAccess.DataAccessContext.InternalDataProcessing));
     }
 
 
-
     [Test]
     public void YamlRepository_LoadSavePluginClass()
     {
@@ -289,8 +289,8 @@ public void YamlRepository_LoadSavePluginClass()
         lma1.SaveToDatabase();
 
         lma2.Plugin.Name = "MyPlugin1.1.1.2.nupkg";
-        lma2.Plugin.RdmpVersion = new Version(version);//the version of Rdmp.Core targetted (same as above)
-        lma2.Plugin.PluginVersion = new Version(1, 1, 1, 2);//the version of the plugin (higher)
+        lma2.Plugin.RdmpVersion = new Version(version); //the version of Rdmp.Core targetted (same as above)
+        lma2.Plugin.PluginVersion = new Version(1, 1, 1, 2); //the version of the plugin (higher)
         lma2.Plugin.SaveToDatabase();
         lma2.SaveToDatabase();
 
@@ -339,13 +339,8 @@ public void TestYamlRepository_Save()
         Assert.AreEqual("ffff", repo2.AllObjects.OfType<Catalogue>().Single().Name);
     }
 
-    private static string GetUniqueDirectoryName()
-    {
-        return Path.Combine(TestContext.CurrentContext.WorkDirectory, Guid.NewGuid().ToString().Replace("-", ""));
-    }
+    private static string GetUniqueDirectoryName() => Path.Combine(TestContext.CurrentContext.WorkDirectory,
+        Guid.NewGuid().ToString().Replace("-", ""));
 
-    private static DirectoryInfo GetUniqueDirectory()
-    {
-        return new DirectoryInfo(GetUniqueDirectoryName());
-    }
+    private static DirectoryInfo GetUniqueDirectory() => new(GetUniqueDirectoryName());
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/Cloning/CloneExtractionConfigurationTests.cs b/Rdmp.Core.Tests/DataExport/Cloning/CloneExtractionConfigurationTests.cs
index a103204171..b7d777e376 100644
--- a/Rdmp.Core.Tests/DataExport/Cloning/CloneExtractionConfigurationTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Cloning/CloneExtractionConfigurationTests.cs
@@ -18,9 +18,8 @@
 
 namespace Rdmp.Core.Tests.DataExport.Cloning;
 
-public class CloneExtractionConfigurationTests:TestsRequiringAnExtractionConfiguration
+public class CloneExtractionConfigurationTests : TestsRequiringAnExtractionConfiguration
 {
-
     [Test]
     [TestCase(false)]
     [TestCase(true)]
@@ -37,13 +36,14 @@ public void CloneWithFilters(bool introduceOrphanExtractionInformation)
             //setup a filter with a parameter
             filter.WhereSQL = "Fish = @fish";
 
-            new ParameterCreator(new ExtractionFilterFactory(_extractionInformations[0]), null, null).CreateAll(filter,null);
+            new ParameterCreator(new ExtractionFilterFactory(_extractionInformations[0]), null, null).CreateAll(filter,
+                null);
             filter.SaveToDatabase();
 
-            Assert.IsTrue(filter.ExtractionFilterParameters.Count()==1);
+            Assert.IsTrue(filter.ExtractionFilterParameters.Count() == 1);
 
             //create a root container
-            var container =  new FilterContainer(DataExportRepository);
+            var container = new FilterContainer(DataExportRepository);
             _selectedDataSet.RootFilterContainer_ID = container.ID;
             _selectedDataSet.SaveToDatabase();
 
@@ -58,7 +58,7 @@ public void CloneWithFilters(bool introduceOrphanExtractionInformation)
             param.Value = "'jormungander'";
             param.SaveToDatabase();
 
-            var request = new ExtractDatasetCommand(_configuration,new ExtractableDatasetBundle(_extractableDataSet));
+            var request = new ExtractDatasetCommand(_configuration, new ExtractableDatasetBundle(_extractableDataSet));
             request.GenerateQueryBuilder();
             Assert.AreEqual(
                 CollapseWhitespace(
@@ -91,24 +91,22 @@ SELECT DISTINCT
                 , CollapseWhitespace(request.QueryBuilder.SQL));
 
             var deepClone = _configuration.DeepCloneWithNewIDs();
-            Assert.AreEqual(deepClone.Cohort_ID,_configuration.Cohort_ID);
-            Assert.AreNotEqual(deepClone.ID,_configuration.ID);
+            Assert.AreEqual(deepClone.Cohort_ID, _configuration.Cohort_ID);
+            Assert.AreNotEqual(deepClone.ID, _configuration.ID);
             try
             {
                 var request2 = new ExtractDatasetCommand(deepClone, new ExtractableDatasetBundle(_extractableDataSet));
                 request2.GenerateQueryBuilder();
-                
-                Assert.AreEqual(request.QueryBuilder.SQL,request2.QueryBuilder.SQL);
 
+                Assert.AreEqual(request.QueryBuilder.SQL, request2.QueryBuilder.SQL);
             }
             finally
             {
                 deepClone.DeleteInDatabase();
             }
         }
-        finally 
+        finally
         {
-                
             filter.DeleteInDatabase();
         }
     }
@@ -120,9 +118,9 @@ public void CloneWithExtractionProgress()
         var sds = _configuration.SelectedDataSets[0];
         var ci = sds.GetCatalogue().CatalogueItems.First();
         var origProgress = new ExtractionProgress(DataExportRepository, sds, null, DateTime.Now, 10, "fff drrr", ci.ID)
-            {
-                ProgressDate = new DateTime(2001, 01, 01)
-            };
+        {
+            ProgressDate = new DateTime(2001, 01, 01)
+        };
         origProgress.SaveToDatabase();
 
         var deepClone = _configuration.DeepCloneWithNewIDs();
@@ -135,8 +133,9 @@ public void CloneWithExtractionProgress()
 
         Assert.IsNotNull(clonedProgress);
         Assert.IsNull(clonedProgress.StartDate);
-        Assert.IsNull(clonedProgress.ProgressDate, "Cloning a ExtractionProgress should reset its ProgressDate back to null in anticipation of it being extracted again");
-            
+        Assert.IsNull(clonedProgress.ProgressDate,
+            "Cloning a ExtractionProgress should reset its ProgressDate back to null in anticipation of it being extracted again");
+
         Assert.AreEqual(clonedProgress.EndDate, origProgress.EndDate);
         Assert.AreEqual(clonedProgress.NumberOfDaysPerBatch, origProgress.NumberOfDaysPerBatch);
         Assert.AreEqual(clonedProgress.Name, origProgress.Name);
@@ -159,8 +158,8 @@ public void IntroduceOrphan()
         using (var con = DataExportTableRepository.GetConnection())
         {
             DataExportTableRepository.DiscoveredServer.GetCommand(
-                $"UPDATE ExtractableColumn set CatalogueExtractionInformation_ID = {int.MaxValue} where ID = {name.ID}", con).ExecuteNonQuery();
+                $"UPDATE ExtractableColumn set CatalogueExtractionInformation_ID = {int.MaxValue} where ID = {name.ID}",
+                con).ExecuteNonQuery();
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/Cohort/CohortTests.cs b/Rdmp.Core.Tests/DataExport/Cohort/CohortTests.cs
index d210acd62c..4f32a96364 100644
--- a/Rdmp.Core.Tests/DataExport/Cohort/CohortTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Cohort/CohortTests.cs
@@ -23,11 +23,11 @@ public void TestOverridingReleaseIdentifier()
 
         //should match global release identifier (from its source because there is no override)
         Assert.AreEqual("ReleaseID", _extractableCohort.GetReleaseIdentifier(true));
-            
+
         //appy override
         _extractableCohort.OverrideReleaseIdentifierSQL = "Fish";
         _extractableCohort.SaveToDatabase();
-            
+
         //should now match override
         Assert.AreEqual("Fish", _extractableCohort.GetReleaseIdentifier());
 
@@ -37,9 +37,8 @@ public void TestOverridingReleaseIdentifier()
 
         //now check that we are back to the original release identifier
         Assert.AreEqual("ReleaseID", _extractableCohort.GetReleaseIdentifier(true));
-            
     }
-        
+
     [Test]
     public void TestSelf_RecordAllFailures()
     {
@@ -47,15 +46,14 @@ public void TestSelf_RecordAllFailures()
         failures.FailureMessages.Add("Hi there Thomas, How's it going?");
 
         Assert.IsFalse(failures.AnyFailMessageLike("Carmageddon"));
-            
+
         Assert.IsTrue(failures.AnyFailMessageLike("Thomas"));
 
-        Assert.IsTrue(failures.AnyFailMessageLike("Thomas","going"));
+        Assert.IsTrue(failures.AnyFailMessageLike("Thomas", "going"));
         Assert.IsTrue(failures.AnyFailMessageLike("Thomas", "going", "Hi"));
         Assert.IsTrue(failures.AnyFailMessageLike("thomas", "gOIng", "hi"));
 
-        Assert.IsFalse(failures.AnyFailMessageLike("Thomas", "going", "Hi","Fear the babadook"));
-
+        Assert.IsFalse(failures.AnyFailMessageLike("Thomas", "going", "Hi", "Fear the babadook"));
     }
 
     private class RecordAllFailures : ICheckNotifier
@@ -64,6 +62,7 @@ public RecordAllFailures()
         {
             FailureMessages = new List<string>();
         }
+
         public List<string> FailureMessages { get; set; }
 
         public bool AnyFailMessageLike(params string[] bitsTofind)
@@ -72,8 +71,8 @@ public bool AnyFailMessageLike(params string[] bitsTofind)
                 {
                     var found = bitsTofind.Any();
 
-                    foreach(var s in bitsTofind) 
-                        if(!m.ToLower().Contains(s.ToLower()))
+                    foreach (var s in bitsTofind)
+                        if (!m.ToLower().Contains(s.ToLower()))
                             found = false;
 
                     return found;
@@ -84,12 +83,11 @@ public bool AnyFailMessageLike(params string[] bitsTofind)
 
         public bool OnCheckPerformed(CheckEventArgs args)
         {
-            if(args.Result == CheckResult.Fail)
+            if (args.Result == CheckResult.Fail)
                 FailureMessages.Add(args.Message);
 
             //accept all proposed changes
             return true;
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/Cohort/CommittingNewCohortsTests.cs b/Rdmp.Core.Tests/DataExport/Cohort/CommittingNewCohortsTests.cs
index ad5f2567e1..42bda521c5 100644
--- a/Rdmp.Core.Tests/DataExport/Cohort/CommittingNewCohortsTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Cohort/CommittingNewCohortsTests.cs
@@ -35,7 +35,7 @@ protected override void SetUp()
 
         filename = Path.Combine(TestContext.CurrentContext.TestDirectory, "CommittingNewCohorts.csv");
 
-        var sw = new StreamWriter(filename);    
+        var sw = new StreamWriter(filename);
         sw.WriteLine("PrivateID,ReleaseID,SomeHeader");
         sw.WriteLine("Priv_1111,Pub_1111,Smile buddy");
         sw.WriteLine("Priv_2222,Pub_2222,Your on tv");
@@ -49,9 +49,13 @@ public void CommittingNewCohortFile_IDPopulated_Throws()
     {
         var proj = new Project(DataExportRepository, projName);
 
-        var request = new CohortCreationRequest(proj, new CohortDefinition(511, "CommittingNewCohorts",1,999,_externalCohortTable), DataExportRepository, "fish");
-        var ex = Assert.Throws<Exception>(()=>request.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Expected the cohort definition CommittingNewCohorts(Version 1, ID=511) to have a null ID - we are trying to create this, why would it already exist?",ex.Message);
+        var request = new CohortCreationRequest(proj,
+            new CohortDefinition(511, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository,
+            "fish");
+        var ex = Assert.Throws<Exception>(() => request.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(
+            "Expected the cohort definition CommittingNewCohorts(Version 1, ID=511) to have a null ID - we are trying to create this, why would it already exist?",
+            ex.Message);
     }
 
     [Test]
@@ -59,20 +63,27 @@ public void CommittingNewCohortFile_ProjectNumberNumberMissing()
     {
         var proj = new Project(DataExportRepository, projName);
 
-        var request = new CohortCreationRequest(proj, new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository, "fish");
-        var ex = Assert.Throws<Exception>(()=>request.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Project MyProj does not have a ProjectNumber specified, it should have the same number as the CohortCreationRequest (999)",ex.Message);
+        var request = new CohortCreationRequest(proj,
+            new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository,
+            "fish");
+        var ex = Assert.Throws<Exception>(() => request.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(
+            "Project MyProj does not have a ProjectNumber specified, it should have the same number as the CohortCreationRequest (999)",
+            ex.Message);
     }
 
     [Test]
     public void CommittingNewCohortFile_ProjectNumberMismatch()
     {
-        var proj = new Project(DataExportRepository, projName) {ProjectNumber = 321};
+        var proj = new Project(DataExportRepository, projName) { ProjectNumber = 321 };
         proj.SaveToDatabase();
 
-        var request = new CohortCreationRequest(proj, new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository, "fish");
-        var ex = Assert.Throws<Exception>(()=>request.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Project MyProj has ProjectNumber=321 but the CohortCreationRequest.ProjectNumber is 999",ex.Message);
+        var request = new CohortCreationRequest(proj,
+            new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository,
+            "fish");
+        var ex = Assert.Throws<Exception>(() => request.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual("Project MyProj has ProjectNumber=321 but the CohortCreationRequest.ProjectNumber is 999",
+            ex.Message);
     }
 
     [Test]
@@ -86,26 +97,30 @@ public void CommittingNewCohortFile_CallPipeline()
         };
         proj.SaveToDatabase();
 
-        var request = new CohortCreationRequest(proj, new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository, "fish");
+        var request = new CohortCreationRequest(proj,
+            new CohortDefinition(null, "CommittingNewCohorts", 1, 999, _externalCohortTable), DataExportRepository,
+            "fish");
         request.Check(new ThrowImmediatelyCheckNotifier());
 
         var source = new DelimitedFlatFileDataFlowSource();
         var destination = new BasicCohortDestination();
-            
+
         source.Separator = ",";
         source.StronglyTypeInput = true;
 
-        var pipeline = new DataFlowPipelineEngine<DataTable>((DataFlowPipelineContext<DataTable>) request.GetContext(),source,destination,listener);
-        pipeline.Initialize(new FlatFileToLoad(new FileInfo(filename)),request);
+        var pipeline = new DataFlowPipelineEngine<DataTable>((DataFlowPipelineContext<DataTable>)request.GetContext(),
+            source, destination, listener);
+        pipeline.Initialize(new FlatFileToLoad(new FileInfo(filename)), request);
         pipeline.ExecutePipeline(new GracefulCancellationToken());
 
         //there should be a new ExtractableCohort now
         Assert.NotNull(request.NewCohortDefinition.ID);
 
-        var ec = DataExportRepository.GetAllObjects<ExtractableCohort>().Single(c => c.OriginID == request.NewCohortDefinition.ID);
+        var ec = DataExportRepository.GetAllObjects<ExtractableCohort>()
+            .Single(c => c.OriginID == request.NewCohortDefinition.ID);
 
         //with the data in it from the test file
-        Assert.AreEqual(ec.Count,3);
+        Assert.AreEqual(ec.Count, 3);
     }
 
     [TestCase(true)]
@@ -187,7 +202,7 @@ public void MigrateUsages(bool migrate)
         ec1.SaveToDatabase();
 
         // legit user 2
-        var ec2 = new ExtractionConfiguration(DataExportRepository,proj)
+        var ec2 = new ExtractionConfiguration(DataExportRepository, proj)
         {
             IsReleased = false,
             Cohort_ID = cohort998.ID
@@ -195,10 +210,10 @@ public void MigrateUsages(bool migrate)
         ec2.SaveToDatabase();
 
         // has no cohort yet defined so should not be migrated
-        var ec3 = new ExtractionConfiguration(DataExportRepository,proj);
+        var ec3 = new ExtractionConfiguration(DataExportRepository, proj);
 
         // is frozen so should not be migrated
-        var ec4 = new ExtractionConfiguration(DataExportRepository,proj)
+        var ec4 = new ExtractionConfiguration(DataExportRepository, proj)
         {
             IsReleased = true,
             Cohort_ID = cohort998.ID
@@ -225,7 +240,7 @@ public void MigrateUsages(bool migrate)
 
         // should have been updated to use the new cohort
         Assert.AreEqual(ec1.Cohort_ID, migrate ? cohort999.ID : cohort998.ID);
-        Assert.AreEqual(ec2.Cohort_ID, migrate ? cohort999.ID: cohort998.ID);
+        Assert.AreEqual(ec2.Cohort_ID, migrate ? cohort999.ID : cohort998.ID);
 
         // should not have magically gotten a cohort
         Assert.IsNull(ec3.Cohort_ID);
diff --git a/Rdmp.Core.Tests/DataExport/Cohort/ProjectConsistentGuidReleaseIdentifierAllocatorTests.cs b/Rdmp.Core.Tests/DataExport/Cohort/ProjectConsistentGuidReleaseIdentifierAllocatorTests.cs
index 475f4d169e..7b6f2c1f39 100644
--- a/Rdmp.Core.Tests/DataExport/Cohort/ProjectConsistentGuidReleaseIdentifierAllocatorTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Cohort/ProjectConsistentGuidReleaseIdentifierAllocatorTests.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.DataExport.Cohort;
 
-internal class ProjectConsistentGuidReleaseIdentifierAllocatorTests:DatabaseTests
+internal class ProjectConsistentGuidReleaseIdentifierAllocatorTests : DatabaseTests
 {
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
@@ -26,21 +26,24 @@ public void TestPreserveHistoricalReleaseIdentifiers(DatabaseType databaseType)
     {
         var db = GetCleanedServer(databaseType);
 
-        var privateIdentifierDataType = db.Server.GetQuerySyntaxHelper().TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string),10));
+        var privateIdentifierDataType = db.Server.GetQuerySyntaxHelper().TypeTranslater
+            .GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string), 10));
 
-        var wizard = new CreateNewCohortDatabaseWizard(db,CatalogueRepository,DataExportRepository,false);
-        var ect = wizard.CreateDatabase(new PrivateIdentifierPrototype("chi", privateIdentifierDataType),new AcceptAllCheckNotifier());
+        var wizard = new CreateNewCohortDatabaseWizard(db, CatalogueRepository, DataExportRepository, false);
+        var ect = wizard.CreateDatabase(new PrivateIdentifierPrototype("chi", privateIdentifierDataType),
+            new AcceptAllCheckNotifier());
 
         var defTable = ect.DiscoverDefinitionTable();
         var cohortTable = ect.DiscoverCohortTable();
 
-        var p = new Project(DataExportRepository,"MyProject")
+        var p = new Project(DataExportRepository, "MyProject")
         {
             ProjectNumber = 10
         };
         p.SaveToDatabase();
 
-        var req = new CohortCreationRequest(p,new CohortDefinition(null,"TestCohort1",1,p.ProjectNumber.Value,ect),DataExportRepository,"Ignoreme");
+        var req = new CohortCreationRequest(p, new CohortDefinition(null, "TestCohort1", 1, p.ProjectNumber.Value, ect),
+            DataExportRepository, "Ignoreme");
 
         var allocator = new ProjectConsistentGuidReleaseIdentifierAllocator();
         allocator.Initialize(req);
@@ -48,50 +51,50 @@ public void TestPreserveHistoricalReleaseIdentifiers(DatabaseType databaseType)
         //allocator is being asked to allocate when there are no cohorts at all defined
         Assert.AreEqual(0, defTable.GetRowCount());
         Assert.IsNotNull(allocator.AllocateReleaseIdentifier("0101010101"));
-            
+
         //Now let's define a cohort identifier for someone (0202020202) who is not in our project
         defTable.Insert(new Dictionary<string, object>
         {
-            {"projectNumber", 11}, //project is not our project
-            {"version", 1},
-            {"description","flibble"}
+            { "projectNumber", 11 }, //project is not our project
+            { "version", 1 },
+            { "description", "flibble" }
         });
 
-        Assert.AreEqual(1,defTable.GetRowCount());
+        Assert.AreEqual(1, defTable.GetRowCount());
 
         cohortTable.Insert(new Dictionary<string, object>
         {
-            {ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 1},
-            {"chi", "0202020202"},
-            {"ReleaseId", "0x0123"}
+            { ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 1 },
+            { "chi", "0202020202" },
+            { "ReleaseId", "0x0123" }
         });
-            
+
         //recreate allocator to clear map
         allocator = new ProjectConsistentGuidReleaseIdentifierAllocator();
         allocator.Initialize(req);
 
         //allocator is being asked to allocate when there are cohorts defined including one with our person 02020202 but that person was in a different project
         Assert.AreEqual(1, defTable.GetRowCount());
-        Assert.AreEqual(1,cohortTable.GetRowCount());
+        Assert.AreEqual(1, cohortTable.GetRowCount());
         Assert.IsNotNull(allocator.AllocateReleaseIdentifier("0202020202"));
-        Assert.AreNotEqual("0x0123",allocator.AllocateReleaseIdentifier("0202020202"));
+        Assert.AreNotEqual("0x0123", allocator.AllocateReleaseIdentifier("0202020202"));
 
 
         //Now let's define a cohort identifier for someone (0202020202) who IS in our project
         defTable.Insert(new Dictionary<string, object>
         {
-            {"projectNumber", 10}, //this is our project number!
-            {"version", 1},
-            {"description","flibble"}
+            { "projectNumber", 10 }, //this is our project number!
+            { "version", 1 },
+            { "description", "flibble" }
         });
 
         Assert.AreEqual(2, defTable.GetRowCount());
 
         cohortTable.Insert(new Dictionary<string, object>
         {
-            {ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 2},
-            {"chi", "0202020202"},
-            {"ReleaseId", "0x0127"}
+            { ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 2 },
+            { "chi", "0202020202" },
+            { "ReleaseId", "0x0127" }
         });
 
         //recreate allocator to clear map
@@ -109,18 +112,18 @@ public void TestPreserveHistoricalReleaseIdentifiers(DatabaseType databaseType)
         //let's pretend that previously we had already got 2 historical batches for the project, batch 1 released 0202020202 as 0x0127 (see above) and batch 2 released 0202020202 as 0x0128
         defTable.Insert(new Dictionary<string, object>
         {
-            {"projectNumber", 10}, //this is our project number!
-            {"version", 2},
-            {"description","flibble"}
+            { "projectNumber", 10 }, //this is our project number!
+            { "version", 2 },
+            { "description", "flibble" }
         });
 
         Assert.AreEqual(3, defTable.GetRowCount());
 
         cohortTable.Insert(new Dictionary<string, object>
         {
-            {ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 3},
-            {"chi", "0202020202"},
-            {"ReleaseId", "0x0128"}
+            { ect.GetQuerySyntaxHelper().GetRuntimeName(ect.DefinitionTableForeignKeyField), 3 },
+            { "chi", "0202020202" },
+            { "ReleaseId", "0x0128" }
         });
 
         //recreate allocator to clear map
@@ -134,14 +137,15 @@ public void TestPreserveHistoricalReleaseIdentifiers(DatabaseType databaseType)
         var ex = Assert.Throws<Exception>(() => allocator.AllocateReleaseIdentifier("0202020202"));
 
         //should be complaining about both of these conflicting release identifiers existing
-        StringAssert.Contains("0x0127",ex.Message);
+        StringAssert.Contains("0x0127", ex.Message);
         StringAssert.Contains("0x0128", ex.Message);
 
         //fix the problem
         using (var con = db.Server.GetConnection())
         {
             con.Open();
-            db.Server.GetCommand($"UPDATE {cohortTable} SET ReleaseId='0x0127' WHERE ReleaseId='0x0128'", con).ExecuteScalar();
+            db.Server.GetCommand($"UPDATE {cohortTable} SET ReleaseId='0x0127' WHERE ReleaseId='0x0128'", con)
+                .ExecuteScalar();
         }
 
         //should be happy now again
@@ -149,7 +153,5 @@ public void TestPreserveHistoricalReleaseIdentifiers(DatabaseType databaseType)
         Assert.AreEqual(3, cohortTable.GetRowCount());
         Assert.IsNotNull(allocator.AllocateReleaseIdentifier("0202020202"));
         Assert.AreEqual("0x0127", allocator.AllocateReleaseIdentifier("0202020202"));
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/ConfigurationPropertiesTests.cs b/Rdmp.Core.Tests/DataExport/ConfigurationPropertiesTests.cs
index feac45748e..b22e9e50e9 100644
--- a/Rdmp.Core.Tests/DataExport/ConfigurationPropertiesTests.cs
+++ b/Rdmp.Core.Tests/DataExport/ConfigurationPropertiesTests.cs
@@ -14,12 +14,14 @@ public class ConfigurationPropertiesTests : DatabaseTests
 {
     [Test]
     public void CreateNewArgumentAndGetValue()
-    {            
+    {
         DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern, "hi");
-        Assert.AreEqual(DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern), "hi");
+        Assert.AreEqual(
+            DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern), "hi");
 
         //make sure delete
         DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern, null);
-        Assert.AreEqual(DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern), null);
+        Assert.AreEqual(
+            DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern), null);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/CustomData/CustomDataImportingTests.cs b/Rdmp.Core.Tests/DataExport/CustomData/CustomDataImportingTests.cs
index 08e176abbd..6edcdcc971 100644
--- a/Rdmp.Core.Tests/DataExport/CustomData/CustomDataImportingTests.cs
+++ b/Rdmp.Core.Tests/DataExport/CustomData/CustomDataImportingTests.cs
@@ -35,8 +35,9 @@ public void Extract_ProjectSpecificCatalogue_WholeDataset()
 
         try
         {
-            _request = new ExtractDatasetCommand(_configuration,new ExtractableDatasetBundle(CustomExtractableDataSet));
-            Execute(out ExtractionPipelineUseCase useCase, out var results);
+            _request = new ExtractDatasetCommand(_configuration,
+                new ExtractableDatasetBundle(CustomExtractableDataSet));
+            Execute(out var useCase, out var results);
 
             var customDataCsv = results.DirectoryPopulated.GetFiles().Single(f => f.Name.Equals("custTable99.csv"));
 
@@ -44,10 +45,9 @@ public void Extract_ProjectSpecificCatalogue_WholeDataset()
 
             var lines = File.ReadAllLines(customDataCsv.FullName);
 
-            Assert.AreEqual("SuperSecretThing,ReleaseID",lines[0]);
-            Assert.AreEqual("monkeys can all secretly fly,Pub_54321",lines[1]);
-            Assert.AreEqual("the wizard of OZ was a man behind a machine,Pub_11ftw",lines[2]);
-
+            Assert.AreEqual("SuperSecretThing,ReleaseID", lines[0]);
+            Assert.AreEqual("monkeys can all secretly fly,Pub_54321", lines[1]);
+            Assert.AreEqual("the wizard of OZ was a man behind a machine,Pub_11ftw", lines[2]);
         }
         finally
         {
@@ -70,37 +70,41 @@ public void Extract_ProjectSpecificCatalogue_AppendedColumn()
         pipe.Name = "Extract_ProjectSpecificCatalogue_AppendedColumn Pipe";
         pipe.SaveToDatabase();
 
-        var extraColumn = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific).Single(e => e.GetRuntimeName().Equals("SuperSecretThing"));
-        var asExtractable = new ExtractableColumn(DataExportRepository, _extractableDataSet, _configuration, extraColumn, 10,extraColumn.SelectSQL);
+        var extraColumn = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific)
+            .Single(e => e.GetRuntimeName().Equals("SuperSecretThing"));
+        var asExtractable = new ExtractableColumn(DataExportRepository, _extractableDataSet, _configuration,
+            extraColumn, 10, extraColumn.SelectSQL);
 
         //get rid of any lingering joins
         foreach (var j in CatalogueRepository.GetAllObjects<JoinInfo>())
             j.DeleteInDatabase();
 
         //add the ability to join the two tables in the query
-        var idCol = _extractableDataSet.Catalogue.GetAllExtractionInformation(ExtractionCategory.Core).Single(c => c.IsExtractionIdentifier).ColumnInfo;
-        var otherIdCol = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific).Single(e => e.GetRuntimeName().Equals("PrivateID")).ColumnInfo;
-        new JoinInfo(CatalogueRepository,idCol, otherIdCol,ExtractionJoinType.Left,null);
+        var idCol = _extractableDataSet.Catalogue.GetAllExtractionInformation(ExtractionCategory.Core)
+            .Single(c => c.IsExtractionIdentifier).ColumnInfo;
+        var otherIdCol = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific)
+            .Single(e => e.GetRuntimeName().Equals("PrivateID")).ColumnInfo;
+        new JoinInfo(CatalogueRepository, idCol, otherIdCol, ExtractionJoinType.Left, null);
 
         //generate a new request (this will include the newly created column)
-        _request = new ExtractDatasetCommand( _configuration, new ExtractableDatasetBundle(_extractableDataSet));
+        _request = new ExtractDatasetCommand(_configuration, new ExtractableDatasetBundle(_extractableDataSet));
 
         var tbl = Database.ExpectTable("TestTable");
         tbl.Truncate();
 
-        using(var blk = tbl.BeginBulkInsert())
+        using (var blk = tbl.BeginBulkInsert())
         {
             var dt = new DataTable();
             dt.Columns.Add("PrivateID");
             dt.Columns.Add("Name");
             dt.Columns.Add("DateOfBirth");
 
-            dt.Rows.Add(new object[] {"Priv_12345", "Bob","2001-01-01"});
-            dt.Rows.Add(new object[] {"Priv_wtf11", "Frank","2001-10-29"});
+            dt.Rows.Add(new object[] { "Priv_12345", "Bob", "2001-01-01" });
+            dt.Rows.Add(new object[] { "Priv_wtf11", "Frank", "2001-10-29" });
             blk.Upload(dt);
         }
 
-        Execute(out ExtractionPipelineUseCase useCase, out var results);
+        Execute(out var useCase, out var results);
 
         var mainDataTableCsv = results.DirectoryPopulated.GetFiles().Single(f => f.Name.Equals("TestTable.csv"));
 
@@ -139,9 +143,9 @@ public void Extract_ProjectSpecificCatalogue_FilterReference()
         _selectedDataSet.SaveToDatabase();
 
         var filter = new DeployedExtractionFilter(DataExportRepository, "monkeys only", rootContainer)
- {
-     WhereSQL = "SuperSecretThing = 'monkeys can all secretly fly'"
- };
+        {
+            WhereSQL = "SuperSecretThing = 'monkeys can all secretly fly'"
+        };
         filter.SaveToDatabase();
         rootContainer.AddChild(filter);
 
@@ -150,14 +154,16 @@ public void Extract_ProjectSpecificCatalogue_FilterReference()
             j.DeleteInDatabase();
 
         //add the ability to join the two tables in the query
-        var idCol = _extractableDataSet.Catalogue.GetAllExtractionInformation(ExtractionCategory.Core).Single(c => c.IsExtractionIdentifier).ColumnInfo;
-        var otherIdCol = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific).Single(e => e.GetRuntimeName().Equals("PrivateID")).ColumnInfo;
-        new JoinInfo(CatalogueRepository,idCol, otherIdCol, ExtractionJoinType.Left, null);
+        var idCol = _extractableDataSet.Catalogue.GetAllExtractionInformation(ExtractionCategory.Core)
+            .Single(c => c.IsExtractionIdentifier).ColumnInfo;
+        var otherIdCol = CustomCatalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific)
+            .Single(e => e.GetRuntimeName().Equals("PrivateID")).ColumnInfo;
+        new JoinInfo(CatalogueRepository, idCol, otherIdCol, ExtractionJoinType.Left, null);
 
         new SelectedDataSetsForcedJoin(DataExportRepository, _selectedDataSet, CustomTableInfo);
 
         //generate a new request (this will include the newly created column)
-        _request = new ExtractDatasetCommand( _configuration, new ExtractableDatasetBundle(_extractableDataSet));
+        _request = new ExtractDatasetCommand(_configuration, new ExtractableDatasetBundle(_extractableDataSet));
 
         var tbl = Database.ExpectTable("TestTable");
         tbl.Truncate();
@@ -174,7 +180,7 @@ public void Extract_ProjectSpecificCatalogue_FilterReference()
             blk.Upload(dt);
         }
 
-        Execute(out ExtractionPipelineUseCase useCase, out var results);
+        Execute(out var useCase, out var results);
 
         var mainDataTableCsv = results.DirectoryPopulated.GetFiles().Single(f => f.Name.Equals("TestTable.csv"));
 
@@ -184,16 +190,13 @@ public void Extract_ProjectSpecificCatalogue_FilterReference()
 
         Assert.AreEqual("ReleaseID,Name,DateOfBirth", lines[0]);
         Assert.AreEqual("Pub_54321,Bob,2001-01-01", lines[1]);
-        Assert.AreEqual(2,lines.Length);
-
-            
+        Assert.AreEqual(2, lines.Length);
     }
 
 
-
     /*
     private List<string> _customTablesToCleanup = new List<string>();
-        
+
     [Test]
     public void CSVImportPipeline()
     {
@@ -205,7 +208,7 @@ public void CSVImportPipeline()
         engine.ExecutePipeline(new GracefulCancellationToken());
 
         var customTableNames = _extractableCohort.GetCustomTableNames().ToArray();
-        
+
         Console.WriteLine("Found the following custom tables:");
         foreach (string tableName in customTableNames)
             Console.WriteLine(tableName);
@@ -234,7 +237,7 @@ public void IterativeBatchLoadingTest(int numberOfBatches)
         var engine = GetEnginePointedAtFile("fish.txt");
 
         ToMemoryDataLoadEventListener listener = new ToMemoryDataLoadEventListener(true);
-        
+
         Random r = new Random();
         var token = new GracefulCancellationTokenSource();
 
@@ -255,9 +258,9 @@ public void IterativeBatchLoadingTest(int numberOfBatches)
         engine.Source.Dispose(new ThrowImmediatelyDataLoadEventListener(),null );
         engine.Destination.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
 
-        //batches are 1 record each so 
+        //batches are 1 record each so
         Assert.AreEqual(numberOfBatches, listener.LastProgressRecieivedByTaskName["Comitting rows to cohort 99_unitTestDataForCohort_V1fish"].Progress.Value);
-        
+
         var customTableNames = _extractableCohort.GetCustomTableNames().ToArray();
         Console.WriteLine("Found the following custom tables:");
         foreach (string tableName in customTableNames)
diff --git a/Rdmp.Core.Tests/DataExport/Data/ExternalCohortTableTests.cs b/Rdmp.Core.Tests/DataExport/Data/ExternalCohortTableTests.cs
index d1b643e69c..b2e956db2e 100644
--- a/Rdmp.Core.Tests/DataExport/Data/ExternalCohortTableTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Data/ExternalCohortTableTests.cs
@@ -15,7 +15,7 @@
 
 namespace Rdmp.Core.Tests.DataExport.Data;
 
-internal class ExternalCohortTableTests:UnitTests
+internal class ExternalCohortTableTests : UnitTests
 {
     /// <summary>
     /// Demonstrates the minimum properties required to create a <see cref="ExternalCohortTable"/>.  See <see cref="CreateNewCohortDatabaseWizard"/>
@@ -26,19 +26,19 @@ public void Create_ExternalCohortTable_Manually()
     {
         var repository = new MemoryDataExportRepository();
         var table = new ExternalCohortTable(repository, "My Cohort Database", DatabaseType.MicrosoftSQLServer)
-            {
-                Database = "mydb",
-                PrivateIdentifierField = "chi",
-                ReleaseIdentifierField = "release",
-                DefinitionTableForeignKeyField = "c_id",
-                TableName = "Cohorts",
-                DefinitionTableName = "InventoryTable",
-                Server = "superfastdatabaseserver\\sqlexpress"
-            };
+        {
+            Database = "mydb",
+            PrivateIdentifierField = "chi",
+            ReleaseIdentifierField = "release",
+            DefinitionTableForeignKeyField = "c_id",
+            TableName = "Cohorts",
+            DefinitionTableName = "InventoryTable",
+            Server = "superfastdatabaseserver\\sqlexpress"
+        };
         table.SaveToDatabase();
 
-        var ex = Assert.Throws<Exception>(()=>table.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Could not connect to Cohort database called 'My Cohort Database'",ex.Message);
+        var ex = Assert.Throws<Exception>(() => table.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual("Could not connect to Cohort database called 'My Cohort Database'", ex.Message);
     }
 
     /// <summary>
@@ -48,7 +48,7 @@ public void Create_ExternalCohortTable_Manually()
     public void Create_ExternalCohortTable_InTests()
     {
         var tbl = WhenIHaveA<ExternalCohortTable>();
-            
+
         Assert.IsNotNull(tbl);
         Assert.IsNotNull(tbl.PrivateIdentifierField);
         Assert.IsNotNull(tbl.ReleaseIdentifierField);
@@ -57,7 +57,8 @@ public void Create_ExternalCohortTable_InTests()
     [Test]
     public void TestExternalCohortTableProperties_BasicValues()
     {
-        var table = new ExternalCohortTable(RepositoryLocator.DataExportRepository,"ffff",DatabaseType.MicrosoftSQLServer);
+        var table = new ExternalCohortTable(RepositoryLocator.DataExportRepository, "ffff",
+            DatabaseType.MicrosoftSQLServer);
 
         Assert.IsNull(table.Database);
         Assert.IsNull(table.Server);
@@ -73,19 +74,21 @@ public void TestExternalCohortTableProperties_BasicValues()
         table.ReleaseIdentifierField = "rel";
         table.DefinitionTableForeignKeyField = "fk";
 
-        Assert.AreEqual("mydb",table.Database);
-        Assert.AreEqual("myserver",table.Server);
-        Assert.AreEqual("[mydb]..[mytbl]",table.TableName);
+        Assert.AreEqual("mydb", table.Database);
+        Assert.AreEqual("myserver", table.Server);
+        Assert.AreEqual("[mydb]..[mytbl]", table.TableName);
         Assert.IsNull(table.DefinitionTableName);
 
-        Assert.AreEqual("[mydb]..[mytbl].[priv]",table.PrivateIdentifierField);
-        Assert.AreEqual("[mydb]..[mytbl].[rel]",table.ReleaseIdentifierField);
-        Assert.AreEqual("[mydb]..[mytbl].[fk]",table.DefinitionTableForeignKeyField);
+        Assert.AreEqual("[mydb]..[mytbl].[priv]", table.PrivateIdentifierField);
+        Assert.AreEqual("[mydb]..[mytbl].[rel]", table.ReleaseIdentifierField);
+        Assert.AreEqual("[mydb]..[mytbl].[fk]", table.DefinitionTableForeignKeyField);
     }
+
     [Test]
     public void TestExternalCohortTableProperties_SetFullValues()
     {
-        var table = new ExternalCohortTable(RepositoryLocator.DataExportRepository,"ffff",DatabaseType.MicrosoftSQLServer);
+        var table = new ExternalCohortTable(RepositoryLocator.DataExportRepository, "ffff",
+            DatabaseType.MicrosoftSQLServer);
 
         Assert.IsNull(table.Database);
         Assert.IsNull(table.Server);
@@ -101,13 +104,13 @@ public void TestExternalCohortTableProperties_SetFullValues()
         table.Server = "myserver";
         table.TableName = "[mydb]..[mytbl]";
 
-        Assert.AreEqual("mydb",table.Database);
-        Assert.AreEqual("myserver",table.Server);
-        Assert.AreEqual("[mydb]..[mytbl]",table.TableName);
+        Assert.AreEqual("mydb", table.Database);
+        Assert.AreEqual("myserver", table.Server);
+        Assert.AreEqual("[mydb]..[mytbl]", table.TableName);
         Assert.IsNull(table.DefinitionTableName);
 
-        Assert.AreEqual("[mydb]..[mytbl].[priv]",table.PrivateIdentifierField);
-        Assert.AreEqual("[mydb]..[mytbl].[rel]",table.ReleaseIdentifierField);
-        Assert.AreEqual("[mydb]..[mytbl].[fk]",table.DefinitionTableForeignKeyField);
+        Assert.AreEqual("[mydb]..[mytbl].[priv]", table.PrivateIdentifierField);
+        Assert.AreEqual("[mydb]..[mytbl].[rel]", table.ReleaseIdentifierField);
+        Assert.AreEqual("[mydb]..[mytbl].[fk]", table.DefinitionTableForeignKeyField);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortAuditLogBuilderTests.cs b/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortAuditLogBuilderTests.cs
index 9654625ccd..0bda53fcf7 100644
--- a/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortAuditLogBuilderTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortAuditLogBuilderTests.cs
@@ -46,7 +46,7 @@ public void AuditLogReFetch_CohortIdentificationConfiguration()
 
         Assert.IsNotNull(cic2);
         Assert.IsInstanceOf<CohortIdentificationConfiguration>(cic2);
-        Assert.AreEqual(cic,cic2);
+        Assert.AreEqual(cic, cic2);
     }
 
     [Test]
@@ -72,6 +72,7 @@ public void AuditLogReFetch_WhenAuditLogIsNull()
         var moqCohort = Mock.Of<IExtractableCohort>(e => e.AuditLog == null);
         Assert.IsNull(builder.GetObjectIfAny(moqCohort, RepositoryLocator));
     }
+
     [Test]
     public void AuditLogReFetch_WhenAuditLogIsRubbish()
     {
@@ -89,10 +90,10 @@ public void AuditLogReFetch_WhenSourceIsDeleted()
         var desc = ExtractableCohortAuditLogBuilder.GetDescription(ei);
 
         var moqCohort = Mock.Of<IExtractableCohort>(e => e.AuditLog == desc);
-            
+
         // delete the source
         ei.DeleteInDatabase();
-            
+
         // should now return null
         Assert.IsNull(builder.GetObjectIfAny(moqCohort, RepositoryLocator));
     }
diff --git a/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortTests.cs b/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortTests.cs
index cca51e956f..6839416933 100644
--- a/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Data/ExtractableCohortTests.cs
@@ -20,7 +20,7 @@ public void TestExtractableCohort_Identifiable()
         var cohort = _extractableCohort;
 
         Assert.IsNotNull(cohort.GetPrivateIdentifier());
-        Assert.AreNotEqual(cohort.GetReleaseIdentifier(),cohort.GetPrivateIdentifier());
+        Assert.AreNotEqual(cohort.GetReleaseIdentifier(), cohort.GetPrivateIdentifier());
 
         var ect = cohort.ExternalCohortTable;
         ect.ReleaseIdentifierField = ect.PrivateIdentifierField;
@@ -28,13 +28,15 @@ public void TestExtractableCohort_Identifiable()
 
         UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Fail);
 
-        var ex = Assert.Throws<Exception>(()=>cohort.GetReleaseIdentifier());
+        var ex = Assert.Throws<Exception>(() => cohort.GetReleaseIdentifier());
 
-        Assert.AreEqual("R004 PrivateIdentifierField and ReleaseIdentifierField are the same, this means your cohort will extract identifiable data (no cohort identifier substitution takes place)", ex.Message);
+        Assert.AreEqual(
+            "R004 PrivateIdentifierField and ReleaseIdentifierField are the same, this means your cohort will extract identifiable data (no cohort identifier substitution takes place)",
+            ex.Message);
 
         UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Warning);
 
-        Assert.AreEqual(cohort.GetReleaseIdentifier(),cohort.GetPrivateIdentifier());
+        Assert.AreEqual(cohort.GetReleaseIdentifier(), cohort.GetPrivateIdentifier());
 
         UserSettings.SetErrorReportingLevelFor(ErrorCodes.ExtractionIsIdentifiable, CheckResult.Fail);
     }
diff --git a/Rdmp.Core.Tests/DataExport/Data/ExtractionProgressTests.cs b/Rdmp.Core.Tests/DataExport/Data/ExtractionProgressTests.cs
index 21f41fb587..2388273b6b 100644
--- a/Rdmp.Core.Tests/DataExport/Data/ExtractionProgressTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Data/ExtractionProgressTests.cs
@@ -17,7 +17,6 @@ namespace Rdmp.Core.Tests.DataExport.Data;
 
 internal class ExtractionProgressTests : TestsRequiringAnExtractionConfiguration
 {
-
     [Test]
     public void ExtractionProgressConstructor_NoTimePeriodicity()
     {
@@ -25,18 +24,19 @@ public void ExtractionProgressConstructor_NoTimePeriodicity()
         var eds = new ExtractableDataSet(DataExportRepository, cata);
         var project = new Project(DataExportRepository, "My Proj");
         var config = new ExtractionConfiguration(DataExportRepository, project);
-        var sds = new SelectedDataSets(DataExportRepository, config,eds,null);
-
-        var ex = Assert.Throws<ArgumentException>(()=> new ExtractionProgress(DataExportRepository, sds));
-        Assert.AreEqual("Cannot create ExtractionProgress because Catalogue MyCata does not have a time coverage column", ex.Message);
+        var sds = new SelectedDataSets(DataExportRepository, config, eds, null);
 
+        var ex = Assert.Throws<ArgumentException>(() => new ExtractionProgress(DataExportRepository, sds));
+        Assert.AreEqual(
+            "Cannot create ExtractionProgress because Catalogue MyCata does not have a time coverage column",
+            ex.Message);
     }
 
     [Test]
     public void ExtractionProgressConstructor_Normal()
     {
         ExtractionProgress progress = null;
-        Assert.DoesNotThrow(()=> progress = CreateAnExtractionProgress());
+        Assert.DoesNotThrow(() => progress = CreateAnExtractionProgress());
         progress?.DeleteInDatabase();
     }
 
@@ -86,14 +86,15 @@ public void ExtractionProgress_RetrySave()
         Assert.AreEqual(freshCopy.Retry, RetryStrategy.IterativeBackoff1Hour);
 
         progress.DeleteInDatabase();
-
     }
+
     [Test]
     public void TestQueryGeneration_FirstBatch()
     {
         Reset();
 
-        _catalogue.TimeCoverage_ExtractionInformation_ID = _extractionInformations.Single(e => e.GetRuntimeName().Equals("DateOfBirth")).ID;
+        _catalogue.TimeCoverage_ExtractionInformation_ID =
+            _extractionInformations.Single(e => e.GetRuntimeName().Equals("DateOfBirth")).ID;
         _catalogue.SaveToDatabase();
 
         var progress = new ExtractionProgress(DataExportRepository, _request.SelectedDataSets)
@@ -112,7 +113,9 @@ public void TestQueryGeneration_FirstBatch()
         var fileContents = File.ReadAllText(result.OutputFile);
 
         // Headers should be in file because it is a first batch
-        Assert.AreEqual($"ReleaseID,Name,DateOfBirth{Environment.NewLine}Pub_54321,Dave,2001-01-01{Environment.NewLine}", fileContents);
+        Assert.AreEqual(
+            $"ReleaseID,Name,DateOfBirth{Environment.NewLine}Pub_54321,Dave,2001-01-01{Environment.NewLine}",
+            fileContents);
 
         File.Delete(result.OutputFile);
         progress.DeleteInDatabase();
@@ -142,15 +145,13 @@ public void TestCloneResetsProgress()
         // should be different instances
         Assert.AreNotSame(origProgress, cloneProgress);
 
-        Assert.AreEqual(cloneProgress.StartDate , new DateTime(2001, 01, 01));
-        Assert.IsNull(cloneProgress.ProgressDate,"Expected progress to be reset on clone");
-        Assert.AreEqual(cloneProgress.EndDate , new DateTime(2020, 01, 01));
+        Assert.AreEqual(cloneProgress.StartDate, new DateTime(2001, 01, 01));
+        Assert.IsNull(cloneProgress.ProgressDate, "Expected progress to be reset on clone");
+        Assert.AreEqual(cloneProgress.EndDate, new DateTime(2020, 01, 01));
     }
 
-    private ExtractionProgress CreateAnExtractionProgress()
-    {
-        return CreateAnExtractionProgress(out _);
-    }
+    private ExtractionProgress CreateAnExtractionProgress() => CreateAnExtractionProgress(out _);
+
     private ExtractionProgress CreateAnExtractionProgress(out ExtractionConfiguration config)
     {
         var cata = new Catalogue(CatalogueRepository, "MyCata");
@@ -166,7 +167,7 @@ private ExtractionProgress CreateAnExtractionProgress(out ExtractionConfiguratio
         var project = new Project(DataExportRepository, "My Proj");
         config = new ExtractionConfiguration(DataExportRepository, project);
         var sds = new SelectedDataSets(DataExportRepository, config, eds, null);
-            
+
         return new ExtractionProgress(DataExportRepository, sds);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/Data/SelectedDataSetsCheckerTests.cs b/Rdmp.Core.Tests/DataExport/Data/SelectedDataSetsCheckerTests.cs
index 9e0a382e7d..f28422ff1f 100644
--- a/Rdmp.Core.Tests/DataExport/Data/SelectedDataSetsCheckerTests.cs
+++ b/Rdmp.Core.Tests/DataExport/Data/SelectedDataSetsCheckerTests.cs
@@ -18,7 +18,6 @@ namespace Rdmp.Core.Tests.DataExport.Data;
 
 public class SelectedDataSetsCheckerTests : TestsRequiringAnExtractionConfiguration
 {
-
     [Test]
     public void NormalUseCasePasses()
     {
@@ -33,7 +32,8 @@ public void TestExtractionProgress_MidwayWithNoAuditRecord()
         // normal checks pass
         var checker = new SelectedDataSetsChecker(new ThrowImmediatelyActivator(RepositoryLocator), _selectedDataSet);
 
-        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1), new DateTime(2001, 1, 1),100,"mybatch",
+        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1),
+            new DateTime(2001, 1, 1), 100, "mybatch",
             _extractionInformations[0].ID)
         {
             ProgressDate = new DateTime(1995, 1, 1) // we are half way through
@@ -41,8 +41,10 @@ public void TestExtractionProgress_MidwayWithNoAuditRecord()
 
         ep.SaveToDatabase();
 
-        var ex = Assert.Throws<Exception>(()=>checker.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("R0016 ExtractionProgress 'mybatch' is 'in progress' (ProgressDate is not null) but there is no audit of previously extracted SQL (needed for checking cohort changes)", ex.Message);
+        var ex = Assert.Throws<Exception>(() => checker.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual(
+            "R0016 ExtractionProgress 'mybatch' is 'in progress' (ProgressDate is not null) but there is no audit of previously extracted SQL (needed for checking cohort changes)",
+            ex.Message);
     }
 
     [Test]
@@ -51,12 +53,10 @@ public void TestExtractionProgress_AuditRecordHasDifferentCohort()
         // normal checks pass
         var checker = new SelectedDataSetsChecker(new ThrowImmediatelyActivator(RepositoryLocator), _selectedDataSet);
 
-        foreach (var r in DataExportRepository.GetAllObjects<CumulativeExtractionResults>())
-        {
-            r.DeleteInDatabase();
-        }
+        foreach (var r in DataExportRepository.GetAllObjects<CumulativeExtractionResults>()) r.DeleteInDatabase();
 
-        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1), new DateTime(2001, 1, 1), 100, "mybatch",
+        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1),
+            new DateTime(2001, 1, 1), 100, "mybatch",
             _extractionInformations[0].ID)
         {
             ProgressDate = new DateTime(1995, 1, 1) // we are half way through
@@ -65,13 +65,16 @@ public void TestExtractionProgress_AuditRecordHasDifferentCohort()
         ep.SaveToDatabase();
 
         // audit has SQL that does not contain the cohort ID
-        var audit = new CumulativeExtractionResults(DataExportRepository, _configuration, _selectedDataSet.ExtractableDataSet, "select * from [yohoho and a bottle of rum]");
-        audit.CompleteAudit(typeof(ExecuteFullExtractionToDatabaseMSSql), "[over the hills and far away]", 333, true, false);
+        var audit = new CumulativeExtractionResults(DataExportRepository, _configuration,
+            _selectedDataSet.ExtractableDataSet, "select * from [yohoho and a bottle of rum]");
+        audit.CompleteAudit(typeof(ExecuteFullExtractionToDatabaseMSSql), "[over the hills and far away]", 333, true,
+            false);
         audit.SaveToDatabase();
 
         var ex = Assert.Throws<Exception>(() => checker.Check(new ThrowImmediatelyCheckNotifier()));
         Assert.AreEqual(
-            $"R0017 ExtractionProgress 'mybatch' is 'in progress' (ProgressDate is not null) but we did not find the expected Cohort WHERE Sql in the audit of SQL extracted with the last batch.  Did you change the cohort without resetting the ProgressDate? The SQL we expected to find was '[{TestDatabaseNames.Prefix}CohortDatabase]..[Cohort].[cohortDefinition_id]=-599'",ex.Message);
+            $"R0017 ExtractionProgress 'mybatch' is 'in progress' (ProgressDate is not null) but we did not find the expected Cohort WHERE Sql in the audit of SQL extracted with the last batch.  Did you change the cohort without resetting the ProgressDate? The SQL we expected to find was '[{TestDatabaseNames.Prefix}CohortDatabase]..[Cohort].[cohortDefinition_id]=-599'",
+            ex.Message);
 
         // tidy up
         ep.DeleteInDatabase();
@@ -83,7 +86,8 @@ public void TestExtractionProgress_AuditRecordIsGood_NoProblems()
         // normal checks pass
         var checker = new SelectedDataSetsChecker(new ThrowImmediatelyActivator(RepositoryLocator), _selectedDataSet);
 
-        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1), new DateTime(2001, 1, 1), 100, "mybatch",
+        var ep = new ExtractionProgress(DataExportRepository, _selectedDataSet, new DateTime(1990, 1, 1),
+            new DateTime(2001, 1, 1), 100, "mybatch",
             _extractionInformations[0].ID)
         {
             ProgressDate = new DateTime(1995, 1, 1) // we are half way through
@@ -91,17 +95,16 @@ public void TestExtractionProgress_AuditRecordIsGood_NoProblems()
 
         ep.SaveToDatabase();
 
-        foreach (var r in DataExportRepository.GetAllObjects<CumulativeExtractionResults>())
-        {
-            r.DeleteInDatabase();
-        }
+        foreach (var r in DataExportRepository.GetAllObjects<CumulativeExtractionResults>()) r.DeleteInDatabase();
 
 
         // audit has SQL is good, it contains the correct cohort
-        var audit = new CumulativeExtractionResults(DataExportRepository, _configuration, _selectedDataSet.ExtractableDataSet,
+        var audit = new CumulativeExtractionResults(DataExportRepository, _configuration,
+            _selectedDataSet.ExtractableDataSet,
             $"select * from [yohoho and a bottle of rum] WHERE [{TestDatabaseNames.Prefix}CohortDatabase]..[Cohort].[cohortDefinition_id]=-599'");
 
-        audit.CompleteAudit(typeof(ExecuteFullExtractionToDatabaseMSSql), "[over the hills and far away]", 333, true, false);
+        audit.CompleteAudit(typeof(ExecuteFullExtractionToDatabaseMSSql), "[over the hills and far away]", 333, true,
+            false);
         audit.SaveToDatabase();
 
         Assert.DoesNotThrow(() => checker.Check(new ThrowImmediatelyCheckNotifier()));
diff --git a/Rdmp.Core.Tests/DataExport/DataAccess/PackageContentsTests.cs b/Rdmp.Core.Tests/DataExport/DataAccess/PackageContentsTests.cs
index ccc13ca979..0c3cdf0382 100644
--- a/Rdmp.Core.Tests/DataExport/DataAccess/PackageContentsTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataAccess/PackageContentsTests.cs
@@ -12,19 +12,19 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataAccess;
 
-public class PackageContentsTests:DatabaseTests
+public class PackageContentsTests : DatabaseTests
 {
     [Test]
     public void AddAndRemove()
     {
         var cata = new Catalogue(CatalogueRepository, "PackageContentsTests");
 
-        var ds = new ExtractableDataSet(DataExportRepository,cata);
+        var ds = new ExtractableDataSet(DataExportRepository, cata);
 
         var package = new ExtractableDataSetPackage(DataExportRepository, "My Cool Package");
         try
         {
-            Assert.AreEqual("My Cool Package",package.Name);
+            Assert.AreEqual("My Cool Package", package.Name);
             package.Name = "FishPackage";
             package.SaveToDatabase();
 
@@ -32,15 +32,15 @@ public void AddAndRemove()
             var packageContents = DataExportRepository;
 
             var results = packageContents.GetAllDataSets(package, null);
-            Assert.AreEqual(0,results.Length);
+            Assert.AreEqual(0, results.Length);
 
-            packageContents.AddDataSetToPackage(package,ds);
+            packageContents.AddDataSetToPackage(package, ds);
 
             results = packageContents.GetAllDataSets(package, DataExportRepository.GetAllObjects<ExtractableDataSet>());
             Assert.AreEqual(1, results.Length);
-            Assert.AreEqual(ds,results[0]);
+            Assert.AreEqual(ds, results[0]);
 
-            packageContents.RemoveDataSetFromPackage(package,ds);
+            packageContents.RemoveDataSetFromPackage(package, ds);
 
             //cannot delete the relationship twice
             Assert.Throws<ArgumentException>(() => packageContents.RemoveDataSetFromPackage(package, ds));
diff --git a/Rdmp.Core.Tests/DataExport/DataAccess/SelectedColumnsTests.cs b/Rdmp.Core.Tests/DataExport/DataAccess/SelectedColumnsTests.cs
index fee0109010..6ae4116960 100644
--- a/Rdmp.Core.Tests/DataExport/DataAccess/SelectedColumnsTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataAccess/SelectedColumnsTests.cs
@@ -12,31 +12,30 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataAccess;
 
-public class SelectedColumnsTests:DatabaseTests
+public class SelectedColumnsTests : DatabaseTests
 {
     //Simple test SelectedColumns in which an extraction configuration is built for a test dataset with a single column configured for extraction
     [Test]
     public void CreateAndAssociateColumns()
     {
         var cata = new Catalogue(CatalogueRepository, "MyCat");
-        var cataItem = new CatalogueItem(CatalogueRepository, cata,"MyCataItem");
+        var cataItem = new CatalogueItem(CatalogueRepository, cata, "MyCataItem");
         var TableInfo = new TableInfo(CatalogueRepository, "Cata");
-        var ColumnInfo = new ColumnInfo(CatalogueRepository, "Col","varchar(10)",TableInfo);
+        var ColumnInfo = new ColumnInfo(CatalogueRepository, "Col", "varchar(10)", TableInfo);
         var ExtractionInfo = new ExtractionInformation(CatalogueRepository, cataItem, ColumnInfo, "fish");
 
-        var ds = new ExtractableDataSet(DataExportRepository,cata);
+        var ds = new ExtractableDataSet(DataExportRepository, cata);
 
         var proj = new Project(DataExportRepository, "MyProj");
         var config = new ExtractionConfiguration(DataExportRepository, proj);
-            
+
         SelectedDataSets selectedDataSets;
 
         var extractableColumn = new ExtractableColumn(DataExportRepository, ds, config, ExtractionInfo, 1, "fish");
 
         try
         {
-                
-            selectedDataSets = new SelectedDataSets(DataExportRepository,config, ds,null);
+            selectedDataSets = new SelectedDataSets(DataExportRepository, config, ds, null);
 
             var cols = config.GetAllExtractableColumnsFor(ds);
 
@@ -58,8 +57,6 @@ public void CreateAndAssociateColumns()
 
             TableInfo.DeleteInDatabase();
             cata.DeleteInDatabase();
-
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExportRepositoryTests.cs b/Rdmp.Core.Tests/DataExport/DataExportRepositoryTests.cs
index a444c3ec2a..b7727ecb7e 100644
--- a/Rdmp.Core.Tests/DataExport/DataExportRepositoryTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExportRepositoryTests.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.Tests.DataExport;
 
-internal class DataExportRepositoryTests:DatabaseTests
+internal class DataExportRepositoryTests : DatabaseTests
 {
     [Test]
     public void TestNoIsExtractionIdentifierFinding()
@@ -29,14 +29,14 @@ public void TestNoIsExtractionIdentifierFinding()
         //only one selected dataset
         var dodgy = DataExportRepository.GetSelectedDatasetsWithNoExtractionIdentifiers().ToArray();
         Assert.AreEqual(1, dodgy.Length);
-        Assert.AreEqual(sds,dodgy[0]);
+        Assert.AreEqual(sds, dodgy[0]);
 
         //make an extarctable column on that dataset
-        var col = new ColumnInfo(CatalogueRepository,"ff","varchar(1)",new TableInfo(CatalogueRepository, "fff"));
+        var col = new ColumnInfo(CatalogueRepository, "ff", "varchar(1)", new TableInfo(CatalogueRepository, "fff"));
         var ci = new CatalogueItem(CatalogueRepository, cata, "A");
-        var ei = new ExtractionInformation(CatalogueRepository, ci, col,col.Name);
+        var ei = new ExtractionInformation(CatalogueRepository, ci, col, col.Name);
         var ec = new ExtractableColumn(DataExportRepository, ds, config, ei, 0, col.Name);
-            
+
         //still shouldn't be dodgy
         dodgy = DataExportRepository.GetSelectedDatasetsWithNoExtractionIdentifiers().ToArray();
         Assert.AreEqual(1, dodgy.Length);
@@ -49,6 +49,5 @@ public void TestNoIsExtractionIdentifierFinding()
         //no longer dodgy because there is an extraction identifier
         dodgy = DataExportRepository.GetSelectedDatasetsWithNoExtractionIdentifiers().ToArray();
         Assert.AreEqual(0, dodgy.Length);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/EmptyDataExtractionTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/EmptyDataExtractionTests.cs
index 6a586cfb31..3123e94e63 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/EmptyDataExtractionTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/EmptyDataExtractionTests.cs
@@ -20,9 +20,8 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
-public class EmptyDataExtractionTests:TestsRequiringAnExtractionConfiguration
+public class EmptyDataExtractionTests : TestsRequiringAnExtractionConfiguration
 {
-
     private void TruncateDataTable()
     {
         var server = Database.Server;
@@ -30,12 +29,11 @@ private void TruncateDataTable()
         {
             con.Open();
 
-            var cmdTruncate = server.GetCommand("TRUNCATE TABLE TestTable",con);
+            var cmdTruncate = server.GetCommand("TRUNCATE TABLE TestTable", con);
             cmdTruncate.ExecuteNonQuery();
 
             con.Close();
         }
-
     }
 
     [Test]
@@ -44,28 +42,29 @@ private void TruncateDataTable()
     public void TestAllowingEmptyDatasets(bool allowEmptyDatasetExtractions)
     {
         var p = SetupPipeline();
-            
+
         TruncateDataTable();
 
-        var host = new ExtractionPipelineUseCase(new ThrowImmediatelyActivator(RepositoryLocator),_request.Configuration.Project, _request, p, DataLoadInfo.Empty);
+        var host = new ExtractionPipelineUseCase(new ThrowImmediatelyActivator(RepositoryLocator),
+            _request.Configuration.Project, _request, p, DataLoadInfo.Empty);
 
         var engine = host.GetEngine(p, new ThrowImmediatelyDataLoadEventListener());
         host.Source.AllowEmptyExtractions = allowEmptyDatasetExtractions;
 
         var token = new GracefulCancellationToken();
-            
-        if(allowEmptyDatasetExtractions)
-        {
 
+        if (allowEmptyDatasetExtractions)
+        {
             var dt = host.Source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), token);
             Assert.IsNull(host.Source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), token));
 
-            Assert.AreEqual(0,dt.Rows.Count);
+            Assert.AreEqual(0, dt.Rows.Count);
             Assert.AreEqual(3, dt.Columns.Count);
         }
         else
         {
-            var exception = Assert.Throws<Exception>(() => host.Source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), token));
+            var exception = Assert.Throws<Exception>(() =>
+                host.Source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), token));
 
             Assert.IsTrue(exception.Message.StartsWith("There is no data to load, query returned no rows, query was"));
         }
@@ -82,7 +81,7 @@ public void ProducesEmptyCSV()
 
         Assert.AreEqual(1, _request.ColumnsToExtract.Count(c => c.IsExtractionIdentifier));
 
-        Execute(out ExtractionPipelineUseCase execute, out var result);
+        Execute(out var execute, out var result);
 
         var r = (ExecuteDatasetExtractionFlatFileDestination)result;
 
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteCrossServerDatasetExtractionSourceTest.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteCrossServerDatasetExtractionSourceTest.cs
index 95c3fd4dbc..8b255768c5 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteCrossServerDatasetExtractionSourceTest.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteCrossServerDatasetExtractionSourceTest.cs
@@ -24,8 +24,7 @@ public class ExecuteCrossServerDatasetExtractionSourceTest : TestsRequiringAnExt
     [Test]
     public void CrossServerExtraction()
     {
-
-        Execute(out ExtractionPipelineUseCase execute, out var result);
+        Execute(out var execute, out var result);
 
         var r = (ExecuteDatasetExtractionFlatFileDestination)result;
 
@@ -39,26 +38,33 @@ public void CrossServerExtraction()
     protected override Pipeline SetupPipeline()
     {
         var pipeline = new Pipeline(CatalogueRepository, "Empty extraction pipeline");
-        var component = new PipelineComponent(CatalogueRepository, pipeline, typeof(ExecuteDatasetExtractionFlatFileDestination), 0, "Destination");
-        var arguments = component.CreateArgumentsForClassIfNotExists<ExecuteDatasetExtractionFlatFileDestination>().ToArray();
+        var component = new PipelineComponent(CatalogueRepository, pipeline,
+            typeof(ExecuteDatasetExtractionFlatFileDestination), 0, "Destination");
+        var arguments = component.CreateArgumentsForClassIfNotExists<ExecuteDatasetExtractionFlatFileDestination>()
+            .ToArray();
 
         if (arguments.Length < 3)
-            throw new Exception("Expected only 2 arguments for type ExecuteDatasetExtractionFlatFileDestination, did somebody add another [DemandsInitialization]? if so handle it below");
+            throw new Exception(
+                "Expected only 2 arguments for type ExecuteDatasetExtractionFlatFileDestination, did somebody add another [DemandsInitialization]? if so handle it below");
 
         arguments.Single(a => a.Name.Equals("DateFormat")).SetValue("yyyy-MM-dd");
         arguments.Single(a => a.Name.Equals("DateFormat")).SaveToDatabase();
 
-        arguments.Single(a=>a.Name.Equals("FlatFileType")).SetValue(ExecuteExtractionToFlatFileType.CSV);
-        arguments.Single(a=>a.Name.Equals("FlatFileType")).SaveToDatabase();
-            
+        arguments.Single(a => a.Name.Equals("FlatFileType")).SetValue(ExecuteExtractionToFlatFileType.CSV);
+        arguments.Single(a => a.Name.Equals("FlatFileType")).SaveToDatabase();
+
         AdjustPipelineComponentDelegate?.Invoke(component);
 
-        var component2 = new PipelineComponent(CatalogueRepository, pipeline, typeof(ExecuteCrossServerDatasetExtractionSource), -1, "Source");
-        var arguments2 = component2.CreateArgumentsForClassIfNotExists<ExecuteCrossServerDatasetExtractionSource>().ToArray();
-        arguments2.Single(a=>a.Name.Equals("AllowEmptyExtractions")).SetValue(false);
-        arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SaveToDatabase(); 
-        arguments2.Single(a => a.Name.Equals(nameof(ExecuteCrossServerDatasetExtractionSource.TemporaryTableName))).SetValue("");
-        arguments2.Single(a => a.Name.Equals(nameof(ExecuteCrossServerDatasetExtractionSource.TemporaryTableName))).SaveToDatabase();
+        var component2 = new PipelineComponent(CatalogueRepository, pipeline,
+            typeof(ExecuteCrossServerDatasetExtractionSource), -1, "Source");
+        var arguments2 = component2.CreateArgumentsForClassIfNotExists<ExecuteCrossServerDatasetExtractionSource>()
+            .ToArray();
+        arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SetValue(false);
+        arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SaveToDatabase();
+        arguments2.Single(a => a.Name.Equals(nameof(ExecuteCrossServerDatasetExtractionSource.TemporaryTableName)))
+            .SetValue("");
+        arguments2.Single(a => a.Name.Equals(nameof(ExecuteCrossServerDatasetExtractionSource.TemporaryTableName)))
+            .SaveToDatabase();
         AdjustPipelineComponentDelegate?.Invoke(component2);
 
 
@@ -100,7 +106,8 @@ SELECT DISTINCT
         var ect = (ExternalCohortTable)_request.ExtractableCohort.ExternalCohortTable;
         ect.Server = "bob";
 
-        var e = DataExportRepository.GetObjectByID<ExternalCohortTable>(_request.ExtractableCohort.ExternalCohortTable_ID);
+        var e = DataExportRepository.GetObjectByID<ExternalCohortTable>(_request.ExtractableCohort
+            .ExternalCohortTable_ID);
         var origValue = e.Database;
 
         e.Database = CohortDatabaseName;
@@ -112,9 +119,10 @@ SELECT DISTINCT
                 TemporaryDatabaseName = "tempdb"
             };
             s.PreInitialize(_request, new ThrowImmediatelyDataLoadEventListener());
-            var hacked = s.HackExtractionSQL(_request.QueryBuilder.SQL, new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true });
+            var hacked = s.HackExtractionSQL(_request.QueryBuilder.SQL,
+                new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true });
 
-            Assert.AreEqual(expectedOutput.Trim(),hacked.Trim());
+            Assert.AreEqual(expectedOutput.Trim(), hacked.Trim());
         }
         finally
         {
@@ -122,9 +130,4 @@ SELECT DISTINCT
             e.SaveToDatabase();
         }
     }
-
-
-
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteDatasetExtractionFlatFileDestinationTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteDatasetExtractionFlatFileDestinationTests.cs
index c59140f949..64f09b78e8 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteDatasetExtractionFlatFileDestinationTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteDatasetExtractionFlatFileDestinationTests.cs
@@ -33,12 +33,10 @@ public void ExtractionDestination_FloatRounding(bool lotsOfDecimalPlaces)
         var lm = new LogManager(new DiscoveredServer(UnitTestLoggingConnectionString));
         lm.CreateNewLoggingTaskIfNotExists("ExtractionDestination_FloatRounding");
 
-        var dli = lm.CreateDataLoadInfo("ExtractionDestination_FloatRounding", nameof(ExecuteDatasetExtractionFlatFileDestinationTests), "test", "", true);
+        var dli = lm.CreateDataLoadInfo("ExtractionDestination_FloatRounding",
+            nameof(ExecuteDatasetExtractionFlatFileDestinationTests), "test", "", true);
 
-        if(_request.QueryBuilder == null)
-        {
-            _request.GenerateQueryBuilder();
-        }
+        if (_request.QueryBuilder == null) _request.GenerateQueryBuilder();
         dest.RoundFloatsTo = lotsOfDecimalPlaces ? 10 : 2;
 
         dest.PreInitialize(_request, new ThrowImmediatelyDataLoadEventListener());
@@ -46,7 +44,7 @@ public void ExtractionDestination_FloatRounding(bool lotsOfDecimalPlaces)
         dest.PreInitialize((DataLoadInfo)dli, new ThrowImmediatelyDataLoadEventListener());
 
         dest.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-        dest.Dispose(new ThrowImmediatelyDataLoadEventListener(),null);
+        dest.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
 
         Assert.IsNotNull(dest.OutputFile);
         FileAssert.Exists(dest.OutputFile);
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlChecksTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlChecksTests.cs
index 9d63d97028..3147028ceb 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlChecksTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlChecksTests.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
-public class ExecuteFullExtractionToDatabaseMSSqlChecksTests:DatabaseTests
+public class ExecuteFullExtractionToDatabaseMSSqlChecksTests : DatabaseTests
 {
     private IProject _projectStub;
     private IExtractCommand _commandStub;
@@ -34,15 +34,13 @@ protected override void SetUp()
         _projectStub.ProjectNumber = -123;
 
         var cfg = Mock.Of<IExtractionConfiguration>();
-            
-        _commandStub = Mock.Of<IExtractCommand>(cmd => cmd.Configuration==cfg);
+
+        _commandStub = Mock.Of<IExtractCommand>(cmd => cmd.Configuration == cfg);
 
         Database = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
     }
 
 
-
-
     [Test]
     public void NoServer()
     {
@@ -51,13 +49,14 @@ public void NoServer()
         var tomemory = new ToMemoryCheckNotifier();
         destination.Check(tomemory);
 
-        Assert.AreEqual(CheckResult.Fail,tomemory.Messages[0].Result);
+        Assert.AreEqual(CheckResult.Fail, tomemory.Messages[0].Result);
         Assert.IsTrue(tomemory.Messages[0].Message.StartsWith("Target database server property has not been set"));
     }
+
     [Test]
     public void ServerMissingServerName()
     {
-        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction",null);
+        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction", null);
         try
         {
             var destination = new ExecuteFullExtractionToDatabaseMSSql
@@ -69,7 +68,8 @@ public void ServerMissingServerName()
             destination.Check(tomemory);
 
             Assert.AreEqual(CheckResult.Fail, tomemory.Messages[0].Result);
-            Assert.IsTrue(tomemory.Messages[0].Message.StartsWith("TargetDatabaseServer does not have a .Server specified"));
+            Assert.IsTrue(tomemory.Messages[0].Message
+                .StartsWith("TargetDatabaseServer does not have a .Server specified"));
         }
         finally
         {
@@ -81,7 +81,7 @@ public void ServerMissingServerName()
     [TestCase(true)]
     public void ServerDatabaseIsPresentAndCorrect(bool alreadyExists)
     {
-        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction",null)
+        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction", null)
         {
             Server = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Name,
             Username = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExplicitUsernameIfAny,
@@ -89,10 +89,9 @@ public void ServerDatabaseIsPresentAndCorrect(bool alreadyExists)
         };
 
         //server.Database = "FictionalDatabase"; Ignored by the extractor!
-            
+
         try
         {
-
             var destination = new ExecuteFullExtractionToDatabaseMSSql();
             destination.PreInitialize(_projectStub, new ThrowImmediatelyDataLoadEventListener());
             destination.PreInitialize(_commandStub, new ThrowImmediatelyDataLoadEventListener());
@@ -100,14 +99,15 @@ public void ServerDatabaseIsPresentAndCorrect(bool alreadyExists)
             destination.TargetDatabaseServer = server;
             destination.TableNamingPattern = "$d";
 
-            destination.DatabaseNamingPattern = alreadyExists ? Database.GetRuntimeName() : //database that exists
+            destination.DatabaseNamingPattern = alreadyExists
+                ? Database.GetRuntimeName()
+                : //database that exists
                 "Fictional$nDatabase"; //database does not exist (but server does)
 
             var tomemory = new ToMemoryCheckNotifier(new ThrowImmediatelyCheckNotifier());
             destination.Check(tomemory);
 
-            Assert.AreEqual(alreadyExists? CheckResult.Warning: CheckResult.Success, tomemory.GetWorst());
-
+            Assert.AreEqual(alreadyExists ? CheckResult.Warning : CheckResult.Success, tomemory.GetWorst());
         }
         finally
         {
@@ -118,21 +118,21 @@ public void ServerDatabaseIsPresentAndCorrect(bool alreadyExists)
     [Test]
     public void ServerDatabaseIsPresentAndCorrectButHasTablesInIt()
     {
-        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction",null)
+        var server = new ExternalDatabaseServer(CatalogueRepository, "Fiction", null)
         {
             Server = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Name,
             Username = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExplicitUsernameIfAny,
             Password = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExplicitPasswordIfAny
         };
         //server.Database = "FictionalDatabase"; Ignored by the extractor!
-            
+
         using (var con = Database.Server.GetConnection())
         {
             con.Open();
 
             Database.Server.GetCommand("CREATE TABLE Bob(name varchar(10))", con).ExecuteNonQuery();
         }
-            
+
         try
         {
             var destination = new ExecuteFullExtractionToDatabaseMSSql();
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlDestinationTest.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlDestinationTest.cs
index d34d066435..e9399f7a20 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlDestinationTest.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecuteFullExtractionToDatabaseMSSqlDestinationTest.cs
@@ -22,10 +22,10 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
-public class ExecuteFullExtractionToDatabaseMSSqlDestinationTest :TestsRequiringAnExtractionConfiguration
+public class ExecuteFullExtractionToDatabaseMSSqlDestinationTest : TestsRequiringAnExtractionConfiguration
 {
     private ExternalDatabaseServer _extractionServer;
-        
+
     private readonly string _expectedTableName = "ExecuteFullExtractionToDatabaseMSSqlDestinationTest_TestTable";
     private ColumnInfo _columnToTransform;
     private Pipeline _pipeline;
@@ -36,12 +36,14 @@ public void SQLServerDestination()
         DiscoveredDatabase dbToExtractTo = null;
 
         var ci = new CatalogueItem(CatalogueRepository, _catalogue, "YearOfBirth");
-        _columnToTransform = _columnInfos.Single(c=>c.GetRuntimeName().Equals("DateOfBirth",StringComparison.CurrentCultureIgnoreCase));
+        _columnToTransform = _columnInfos.Single(c =>
+            c.GetRuntimeName().Equals("DateOfBirth", StringComparison.CurrentCultureIgnoreCase));
 
         var transform = $"YEAR({_columnToTransform.Name})";
 
 
-        if (_catalogue.GetAllExtractionInformation(ExtractionCategory.Any).All(ei => ei.GetRuntimeName() != "YearOfBirth"))
+        if (_catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .All(ei => ei.GetRuntimeName() != "YearOfBirth"))
         {
             var ei = new ExtractionInformation(CatalogueRepository, ci, _columnToTransform, transform)
             {
@@ -51,15 +53,16 @@ public void SQLServerDestination()
             ei.SaveToDatabase();
 
             //make it part of the ExtractionConfiguration
-            var newColumn = new ExtractableColumn(DataExportRepository, _selectedDataSet.ExtractableDataSet, (ExtractionConfiguration)_selectedDataSet.ExtractionConfiguration, ei, 0, ei.SelectSQL)
-                {
-                    Alias = ei.Alias
-                };
+            var newColumn = new ExtractableColumn(DataExportRepository, _selectedDataSet.ExtractableDataSet,
+                (ExtractionConfiguration)_selectedDataSet.ExtractionConfiguration, ei, 0, ei.SelectSQL)
+            {
+                Alias = ei.Alias
+            };
             newColumn.SaveToDatabase();
 
             _extractableColumns.Add(newColumn);
         }
-            
+
         CreateLookupsEtc();
 
         try
@@ -80,18 +83,19 @@ public void SQLServerDestination()
             var dt = destinationTable.GetDataTable();
 
             Assert.AreEqual(1, dt.Rows.Count);
-            Assert.AreEqual(_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()].Trim(),dt.Rows[0]["ReleaseID"]);
-            Assert.AreEqual(new DateTime(2001,1,1), dt.Rows[0]["DateOfBirth"]);
+            Assert.AreEqual(_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()].Trim(), dt.Rows[0]["ReleaseID"]);
+            Assert.AreEqual(new DateTime(2001, 1, 1), dt.Rows[0]["DateOfBirth"]);
             Assert.AreEqual(2001, dt.Rows[0]["YearOfBirth"]);
 
-            Assert.AreEqual(_columnToTransform.Data_type, destinationTable.DiscoverColumn("DateOfBirth").DataType.SQLType);
-            Assert.AreEqual("int",destinationTable.DiscoverColumn("YearOfBirth").DataType.SQLType);
+            Assert.AreEqual(_columnToTransform.Data_type,
+                destinationTable.DiscoverColumn("DateOfBirth").DataType.SQLType);
+            Assert.AreEqual("int", destinationTable.DiscoverColumn("YearOfBirth").DataType.SQLType);
 
             AssertLookupsEtcExist(dbToExtractTo);
         }
         finally
         {
-            if(dbToExtractTo != null && dbToExtractTo.Exists())
+            if (dbToExtractTo != null && dbToExtractTo.Exists())
                 dbToExtractTo.Drop();
 
             _pipeline?.DeleteInDatabase();
@@ -100,9 +104,12 @@ public void SQLServerDestination()
 
     private static void AssertLookupsEtcExist(DiscoveredDatabase dbToExtractTo)
     {
-        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_TestTable_Biochem").Exists());
-        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_Globals_Hosp").Exists());
-        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_TestTable_z_fff").Exists());
+        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_TestTable_Biochem")
+            .Exists());
+        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_Globals_Hosp")
+            .Exists());
+        Assert.IsTrue(dbToExtractTo.ExpectTable("ExecuteFullExtractionToDatabaseMSSqlDestinationTest_TestTable_z_fff")
+            .Exists());
     }
 
     private void CreateLookupsEtc()
@@ -110,7 +117,7 @@ private void CreateLookupsEtc()
         //an extractable file
         var filename = Path.Combine(TestContext.CurrentContext.WorkDirectory, "bob.txt");
 
-        File.WriteAllText(filename,"fishfishfish");
+        File.WriteAllText(filename, "fishfishfish");
         var doc = new SupportingDocument(CatalogueRepository, _catalogue, "bob")
         {
             URL = new Uri($"file://{filename}"),
@@ -121,7 +128,7 @@ private void CreateLookupsEtc()
         //an extractable global file (comes out regardless of datasets)
         var filename2 = Path.Combine(TestContext.CurrentContext.WorkDirectory, "bob2.txt");
 
-        File.WriteAllText(filename2,"fishfishfish2");
+        File.WriteAllText(filename2, "fishfishfish2");
         var doc2 = new SupportingDocument(CatalogueRepository, _catalogue, "bob2")
         {
             URL = new Uri($"file://{filename2}"),
@@ -131,7 +138,7 @@ private void CreateLookupsEtc()
         doc2.SaveToDatabase();
 
         //an supplemental table in the database (not linked against cohort)
-        var tbl = CreateDataset<Biochemistry>(Database,500, 1000, new Random(50));
+        var tbl = CreateDataset<Biochemistry>(Database, 500, 1000, new Random(50));
 
         var sql = new SupportingSQLTable(CatalogueRepository, _catalogue, "Biochem");
         var server = new ExternalDatabaseServer(CatalogueRepository, "myserver", null);
@@ -143,7 +150,7 @@ private void CreateLookupsEtc()
 
 
         //an supplemental (global) table in the database (not linked against cohort)
-        var tbl2 = CreateDataset<HospitalAdmissions>(Database,500, 1000, new Random(50));
+        var tbl2 = CreateDataset<HospitalAdmissions>(Database, 500, 1000, new Random(50));
 
         var sql2 = new SupportingSQLTable(CatalogueRepository, _catalogue, "Hosp")
         {
@@ -167,10 +174,10 @@ private void CreateLookupsEtc()
 
         Import(lookupTbl, out var ti, out var columnInfos);
 
-        var lookup =  new Lookup(CatalogueRepository, columnInfos[0], 
+        var lookup = new Lookup(CatalogueRepository, columnInfos[0],
             _columnToTransform,
             columnInfos[1],
-            ExtractionJoinType.Left,null);
+            ExtractionJoinType.Left, null);
 
         //we need a CatalogueItem for the description in order to pick SetUp the Lookup as associated with the Catalogue
         var ci = new CatalogueItem(CatalogueRepository, _catalogue, "SomeDesc")
@@ -184,7 +191,7 @@ private void CreateLookupsEtc()
     protected override Pipeline SetupPipeline()
     {
         //create a target server pointer
-        _extractionServer = new ExternalDatabaseServer(CatalogueRepository, "myserver",null)
+        _extractionServer = new ExternalDatabaseServer(CatalogueRepository, "myserver", null)
         {
             Server = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Name,
             Username = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExplicitUsernameIfAny,
@@ -196,8 +203,10 @@ protected override Pipeline SetupPipeline()
         _pipeline = new Pipeline(CatalogueRepository, "Empty extraction pipeline");
 
         //set the destination pipeline
-        var component = new PipelineComponent(CatalogueRepository, _pipeline, typeof(ExecuteFullExtractionToDatabaseMSSql), 0, "MS SQL Destination");
-        var destinationArguments = component.CreateArgumentsForClassIfNotExists<ExecuteFullExtractionToDatabaseMSSql>().ToList();
+        var component = new PipelineComponent(CatalogueRepository, _pipeline,
+            typeof(ExecuteFullExtractionToDatabaseMSSql), 0, "MS SQL Destination");
+        var destinationArguments = component.CreateArgumentsForClassIfNotExists<ExecuteFullExtractionToDatabaseMSSql>()
+            .ToList();
         var argumentServer = destinationArguments.Single(a => a.Name == "TargetDatabaseServer");
         var argumentDbNamePattern = destinationArguments.Single(a => a.Name == "DatabaseNamingPattern");
         var argumentTblNamePattern = destinationArguments.Single(a => a.Name == "TableNamingPattern");
@@ -211,9 +220,11 @@ protected override Pipeline SetupPipeline()
         argumentTblNamePattern.SaveToDatabase();
         AdjustPipelineComponentDelegate?.Invoke(component);
 
-        var component2 = new PipelineComponent(CatalogueRepository, _pipeline, typeof(ExecuteCrossServerDatasetExtractionSource), -1, "Source");
-        var arguments2 = component2.CreateArgumentsForClassIfNotExists<ExecuteCrossServerDatasetExtractionSource>().ToArray();
-        arguments2.Single(a=>a.Name.Equals("AllowEmptyExtractions")).SetValue(false);
+        var component2 = new PipelineComponent(CatalogueRepository, _pipeline,
+            typeof(ExecuteCrossServerDatasetExtractionSource), -1, "Source");
+        var arguments2 = component2.CreateArgumentsForClassIfNotExists<ExecuteCrossServerDatasetExtractionSource>()
+            .ToArray();
+        arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SetValue(false);
         arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SaveToDatabase();
         AdjustPipelineComponentDelegate?.Invoke(component2);
 
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecutePkSynthesizerDatasetExtractionSourceTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecutePkSynthesizerDatasetExtractionSourceTests.cs
index 439657dc32..e2388c6991 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExecutePkSynthesizerDatasetExtractionSourceTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExecutePkSynthesizerDatasetExtractionSourceTests.cs
@@ -34,20 +34,23 @@ protected override void SetUp()
     {
         base.SetUp();
 
-        DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern, "CONCAT('HASHED: ',{0})");
+        DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern,
+            "CONCAT('HASHED: ',{0})");
     }
 
     [Test]
     public void Test_CatalogueItems_ExtractionInformationPrimaryKey_IsRespected()
     {
-        var request = SetupExtractDatasetCommand("ExtractionInformationPrimaryKey_IsRespected", new[] { "DateOfBirth" });
+        var request =
+            SetupExtractDatasetCommand("ExtractionInformationPrimaryKey_IsRespected", new[] { "DateOfBirth" });
 
         var source = new ExecutePkSynthesizerDatasetExtractionSource();
         source.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         Assert.That(chunk.PrimaryKey, Is.Not.Null);
-        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(), Has.Count.EqualTo(_columnInfos.Length)); // NO new column added
+        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(),
+            Has.Count.EqualTo(_columnInfos.Length)); // NO new column added
         Assert.That(chunk.PrimaryKey, Has.Length.EqualTo(1));
         Assert.That(chunk.PrimaryKey.First().ColumnName, Is.EqualTo("DateOfBirth"));
     }
@@ -55,7 +58,8 @@ public void Test_CatalogueItems_ExtractionInformationPrimaryKey_IsRespected()
     [Test]
     public void Test_CatalogueItems_ExtractionInformationMultiPrimaryKey_IsRespected()
     {
-        var request = SetupExtractDatasetCommand("ExtractionInformationMultiPrimaryKey_IsRespected", new[] { "PrivateID", "DateOfBirth" });
+        var request = SetupExtractDatasetCommand("ExtractionInformationMultiPrimaryKey_IsRespected",
+            new[] { "PrivateID", "DateOfBirth" });
 
         var source = new ExecutePkSynthesizerDatasetExtractionSource();
         source.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
@@ -70,14 +74,16 @@ public void Test_CatalogueItems_ExtractionInformationMultiPrimaryKey_IsRespected
     [Test]
     public void Test_CatalogueItems_NonExtractedPrimaryKey_AreRespected()
     {
-        var request = SetupExtractDatasetCommand("NonExtractedPrimaryKey_AreRespected", System.Array.Empty<string>(), pkColumnInfos: new [] { "DateOfBirth" });
+        var request = SetupExtractDatasetCommand("NonExtractedPrimaryKey_AreRespected", System.Array.Empty<string>(),
+            new[] { "DateOfBirth" });
 
         var source = new ExecutePkSynthesizerDatasetExtractionSource();
         source.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         Assert.That(chunk.PrimaryKey, Is.Not.Null);
-        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(), Has.Count.EqualTo(_columnInfos.Length + 1)); // synth PK is added
+        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(),
+            Has.Count.EqualTo(_columnInfos.Length + 1)); // synth PK is added
         Assert.That(chunk.PrimaryKey, Has.Length.EqualTo(1));
         Assert.That(chunk.PrimaryKey.First().ColumnName, Is.EqualTo("SynthesizedPk"));
 
@@ -88,14 +94,16 @@ public void Test_CatalogueItems_NonExtractedPrimaryKey_AreRespected()
     [Test]
     public void Test_CatalogueItems_NonExtractedPrimaryKey_MultiTable_PksAreMerged()
     {
-        var request = SetupExtractDatasetCommand("MultiTable_PksAreMerged", System.Array.Empty<string>(), new[] { "DateOfBirth" }, true, true);
+        var request = SetupExtractDatasetCommand("MultiTable_PksAreMerged", System.Array.Empty<string>(),
+            new[] { "DateOfBirth" }, true, true);
 
         var source = new ExecutePkSynthesizerDatasetExtractionSource();
         source.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         Assert.That(chunk.PrimaryKey, Is.Not.Null);
-        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(), Has.Count.EqualTo(_columnInfos.Length + 3)); // the "desc" column is added to the existing ones
+        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(),
+            Has.Count.EqualTo(_columnInfos.Length + 3)); // the "desc" column is added to the existing ones
         Assert.That(chunk.PrimaryKey, Has.Length.EqualTo(1));
         Assert.That(chunk.PrimaryKey.First().ColumnName, Is.EqualTo("SynthesizedPk"));
 
@@ -109,14 +117,17 @@ public void Test_CatalogueItems_NonExtractedPrimaryKey_MultiTable_PksAreMerged()
     [Test]
     public void Test_CatalogueItems_NonExtractedPrimaryKey_LookupsOnly_IsRespected()
     {
-        var request = SetupExtractDatasetCommand("LookupsOnly_IsRespected", System.Array.Empty<string>(), pkColumnInfos: new[] { "DateOfBirth" }, withLookup: true);
+        var request = SetupExtractDatasetCommand("LookupsOnly_IsRespected", System.Array.Empty<string>(),
+            new[] { "DateOfBirth" }, true);
 
         var source = new ExecutePkSynthesizerDatasetExtractionSource();
         source.PreInitialize(request, new ThrowImmediatelyDataLoadEventListener());
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         Assert.That(chunk.PrimaryKey, Is.Not.Null);
-        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(), Has.Count.EqualTo(_columnInfos.Length + 2)); // the "desc" column is added to the existing ones + the SynthPk
+        Assert.That(chunk.Columns.Cast<DataColumn>().ToList(),
+            Has.Count.EqualTo(_columnInfos.Length +
+                              2)); // the "desc" column is added to the existing ones + the SynthPk
         Assert.That(chunk.PrimaryKey, Has.Length.EqualTo(1));
         Assert.That(chunk.PrimaryKey.First().ColumnName, Is.EqualTo("SynthesizedPk"));
 
@@ -132,17 +143,22 @@ private void SetupJoin()
 
         dt.Columns.Add("Name");
         dt.Columns.Add("Description");
-            
+
         dt.Rows.Add(new object[] { "Dave", "Is a maniac" });
 
-        var tbl = Database.CreateTable("SimpleJoin", dt, new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) { IsPrimaryKey = true } });
+        var tbl = Database.CreateTable("SimpleJoin", dt,
+            new[]
+            {
+                new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) { IsPrimaryKey = true }
+            });
 
         var lookupCata = Import(tbl);
 
-        var fkEi = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(n => n.GetRuntimeName() == "Name");
+        var fkEi = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(n => n.GetRuntimeName() == "Name");
         var pk = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "Name");
-            
-        new JoinInfo(CatalogueRepository,fkEi.ColumnInfo, pk, ExtractionJoinType.Left, null);
+
+        new JoinInfo(CatalogueRepository, fkEi.ColumnInfo, pk, ExtractionJoinType.Left, null);
 
         var ci = new CatalogueItem(CatalogueRepository, _catalogue, "Name_2");
         var ei = new ExtractionInformation(CatalogueRepository, ci, pk, pk.Name)
@@ -161,20 +177,24 @@ private void SetupLookupTable()
 
         dt.Rows.Add(new object[] { "Dave", "Is a maniac" });
 
-        var tbl = Database.CreateTable("SimpleLookup", dt, new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) });
+        var tbl = Database.CreateTable("SimpleLookup", dt,
+            new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) });
 
         var lookupCata = Import(tbl);
 
-        var fkEi = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(n => n.GetRuntimeName() == "Name");
+        var fkEi = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(n => n.GetRuntimeName() == "Name");
         var pk = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "Name");
 
-        var descLine1 = lookupCata.GetTableInfoList(false).Single().ColumnInfos.Single(n => n.GetRuntimeName() == "Description");
+        var descLine1 = lookupCata.GetTableInfoList(false).Single().ColumnInfos
+            .Single(n => n.GetRuntimeName() == "Description");
 
-        var cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk, null, true); 
+        var cmd = new ExecuteCommandCreateLookup(CatalogueRepository, fkEi, descLine1, pk, null, true);
         cmd.Execute();
     }
 
-    private ExtractDatasetCommand SetupExtractDatasetCommand(string testTableName, string[] pkExtractionColumns, string[] pkColumnInfos = null, bool withLookup = false, bool withJoin = false)
+    private ExtractDatasetCommand SetupExtractDatasetCommand(string testTableName, string[] pkExtractionColumns,
+        string[] pkColumnInfos = null, bool withLookup = false, bool withJoin = false)
     {
         var dt = new DataTable();
 
@@ -190,9 +210,10 @@ private ExtractDatasetCommand SetupExtractDatasetCommand(string testTableName, s
 
         var tbl = Database.CreateTable(testTableName,
             dt,
-            new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50))});
+            new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) });
 
-        _catalogue = Import(tbl, out var tableInfo, out var columnInfos, out var cataItems, out var extractionInformations);
+        _catalogue = Import(tbl, out var tableInfo, out var columnInfos, out var cataItems,
+            out var extractionInformations);
 
         var privateID = extractionInformations.First(e => e.GetRuntimeName().Equals("PrivateID"));
         privateID.IsExtractionIdentifier = true;
@@ -220,10 +241,12 @@ private ExtractDatasetCommand SetupExtractDatasetCommand(string testTableName, s
         configuration.Cohort_ID = _extractableCohort.ID;
         configuration.SaveToDatabase();
 
-        return new ExtractDatasetCommand( configuration, new ExtractableDatasetBundle(extractableDataSet));
+        return new ExtractDatasetCommand(configuration, new ExtractableDatasetBundle(extractableDataSet));
     }
 
-    private void SetupDataExport(string testDbName, ICatalogue catalogue, out ExtractionConfiguration extractionConfiguration, out IExtractableDataSet extractableDataSet, out IProject project)
+    private void SetupDataExport(string testDbName, ICatalogue catalogue,
+        out ExtractionConfiguration extractionConfiguration, out IExtractableDataSet extractableDataSet,
+        out IProject project)
     {
         extractableDataSet = new ExtractableDataSet(DataExportRepository, catalogue);
 
@@ -241,8 +264,6 @@ private void SetupDataExport(string testDbName, ICatalogue catalogue, out Extrac
         extractionConfiguration.AddDatasetToConfiguration(extractableDataSet);
 
         foreach (var ei in _catalogue.GetAllExtractionInformation(ExtractionCategory.Supplemental))
-        {
             extractionConfiguration.AddColumnToExtraction(extractableDataSet, ei);
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/ExtractionSubdirectoryPatternTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/ExtractionSubdirectoryPatternTests.cs
index d39e6c3d75..b25d70af15 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/ExtractionSubdirectoryPatternTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/ExtractionSubdirectoryPatternTests.cs
@@ -17,7 +17,6 @@ namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
 internal class ExtractionSubdirectoryPatternTests : UnitTests
 {
-
     [Test]
     public void Test_NoRelativePaths()
     {
@@ -26,8 +25,8 @@ public void Test_NoRelativePaths()
             ExtractionSubdirectoryPattern = "../../troll"
         };
 
-        var ex = Assert.Throws<Exception>(()=>dest.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("ExtractionSubdirectoryPattern cannot contain dots",ex.Message);
+        var ex = Assert.Throws<Exception>(() => dest.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("ExtractionSubdirectoryPattern cannot contain dots", ex.Message);
     }
 
     [TestCase("bad")]
@@ -42,8 +41,8 @@ public void Test_NoConfigToken(string badString)
             ExtractionSubdirectoryPattern = badString
         };
 
-        var ex = Assert.Throws<Exception>(()=>dest.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("ExtractionSubdirectoryPattern must contain a Configuration element",ex.Message);
+        var ex = Assert.Throws<Exception>(() => dest.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("ExtractionSubdirectoryPattern must contain a Configuration element", ex.Message);
     }
 
     [TestCase("$c/fff")]
@@ -55,8 +54,8 @@ public void Test_NoDatasetToken(string badString)
             ExtractionSubdirectoryPattern = badString
         };
 
-        var ex = Assert.Throws<Exception>(()=>dest.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("ExtractionSubdirectoryPattern must contain a Dataset element",ex.Message);
+        var ex = Assert.Throws<Exception>(() => dest.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("ExtractionSubdirectoryPattern must contain a Dataset element", ex.Message);
     }
 
     /*
@@ -78,7 +77,6 @@ public void Test_ValidPaths(string goodString, string pattern)
     {
         var sds = WhenIHaveA<SelectedDataSets>();
 
-            
 
         sds.ExtractionConfiguration.Project.ExtractionDirectory = TestContext.CurrentContext.WorkDirectory;
         sds.ExtractionConfiguration.Name = "AAA";
@@ -86,15 +84,16 @@ public void Test_ValidPaths(string goodString, string pattern)
         sds.ExtractableDataSet.Catalogue.Acronym = "C";
 
 
-        var cmd = new ExtractDatasetCommand(sds.ExtractionConfiguration, new ExtractableDatasetBundle(sds.ExtractableDataSet));
+        var cmd = new ExtractDatasetCommand(sds.ExtractionConfiguration,
+            new ExtractableDatasetBundle(sds.ExtractableDataSet));
         var dest = new ExecuteDatasetExtractionFlatFileDestination
         {
             ExtractionSubdirectoryPattern = goodString
         };
 
-        Assert.DoesNotThrow(()=>dest.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.DoesNotThrow(() => dest.Check(new ThrowImmediatelyCheckNotifier()));
 
         var answer = dest.GetDirectoryFor(cmd);
-        StringAssert.IsMatch(pattern,answer.FullName.Replace('\\','/'));
+        StringAssert.IsMatch(pattern, answer.FullName.Replace('\\', '/'));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/HashedDataExtractionTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/HashedDataExtractionTests.cs
index 8268d394d8..b24cf8582a 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/HashedDataExtractionTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/HashedDataExtractionTests.cs
@@ -38,21 +38,23 @@ public void ExtractNormally()
         Assert.AreEqual(1, _request.ColumnsToExtract.Count(c => c.IsExtractionIdentifier));
         var listener = new ToMemoryDataLoadEventListener(true);
 
-        Execute(out ExtractionPipelineUseCase execute,out var result,listener);
+        Execute(out var execute, out var result, listener);
 
         var messages =
             listener.EventsReceivedBySender.SelectMany(m => m.Value)
-                .Where(m=>m.ProgressEventType == ProgressEventType.Information && m.Message.Contains("/*Decided on extraction SQL:*/"))
+                .Where(m => m.ProgressEventType == ProgressEventType.Information &&
+                            m.Message.Contains("/*Decided on extraction SQL:*/"))
                 .ToArray();
 
-        Assert.AreEqual(1,messages.Length,"Expected a message about what the final extraction SQL was");
-        Assert.IsTrue(messages[0].Message.Contains(" HASH JOIN "), "expected use of hash matching was not reported by ExecuteDatasetExtractionSource in the SQL actually executed");
+        Assert.AreEqual(1, messages.Length, "Expected a message about what the final extraction SQL was");
+        Assert.IsTrue(messages[0].Message.Contains(" HASH JOIN "),
+            "expected use of hash matching was not reported by ExecuteDatasetExtractionSource in the SQL actually executed");
 
         var r = (ExecuteDatasetExtractionFlatFileDestination)result;
 
         //this should be what is in the file, the private identifier and the 1 that was put into the table in the first place (see parent class for the test data setup)
         Assert.AreEqual($@"ReleaseID,Name,DateOfBirth
-{_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()]},Dave,2001-01-01", File.ReadAllText(r.OutputFile).Trim()); 
+{_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()]},Dave,2001-01-01", File.ReadAllText(r.OutputFile).Trim());
 
         Assert.AreEqual(1, _request.QueryBuilder.SelectColumns.Count(c => c.IColumn is ReleaseIdentifierSubstitution));
         File.Delete(r.OutputFile);
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/NormalDataExtractionTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/NormalDataExtractionTests.cs
index a7c802a6ae..27675db426 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/NormalDataExtractionTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/NormalDataExtractionTests.cs
@@ -17,25 +17,24 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
-public class NormalDataExtractionTests:TestsRequiringAnExtractionConfiguration
+public class NormalDataExtractionTests : TestsRequiringAnExtractionConfiguration
 {
     [Test]
     public void ExtractNormally()
     {
-
         _catalogue.Name = "TestTable";
         _catalogue.SaveToDatabase();
         _request.DatasetBundle.DataSet.RevertToDatabaseState();
 
         Assert.AreEqual(1, _request.ColumnsToExtract.Count(c => c.IsExtractionIdentifier));
-            
-        Execute(out ExtractionPipelineUseCase execute,out var result);
+
+        Execute(out var execute, out var result);
 
         var r = (ExecuteDatasetExtractionFlatFileDestination)result;
 
         //this should be what is in the file, the private identifier and the 1 that was put into the table in the first place (see parent class for the test data setup)
         Assert.AreEqual($@"ReleaseID,Name,DateOfBirth
-{_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()]},Dave,2001-01-01", File.ReadAllText(r.OutputFile).Trim()); 
+{_cohortKeysGenerated[_cohortKeysGenerated.Keys.First()]},Dave,2001-01-01", File.ReadAllText(r.OutputFile).Trim());
 
         Assert.AreEqual(1, _request.QueryBuilder.SelectColumns.Count(c => c.IColumn is ReleaseIdentifierSubstitution));
         File.Delete(r.OutputFile);
@@ -57,9 +56,14 @@ public void DodgyCharactersInCatalogueName()
             var extractionDirectory = new ExtractionDirectory(TestContext.CurrentContext.WorkDirectory, _configuration);
 
 
-            var ex = Assert.Throws<NotSupportedException>(() => { var dir = extractionDirectory.GetDirectoryForDataset(_extractableDataSet); });
+            var ex = Assert.Throws<NotSupportedException>(() =>
+            {
+                var dir = extractionDirectory.GetDirectoryForDataset(_extractableDataSet);
+            });
 
-            Assert.AreEqual("Cannot extract dataset Fish;#:::FishFish because it points at Catalogue with an invalid name, name is invalid because:The following invalid characters were found:'#'", ex.Message);
+            Assert.AreEqual(
+                "Cannot extract dataset Fish;#:::FishFish because it points at Catalogue with an invalid name, name is invalid because:The following invalid characters were found:'#'",
+                ex.Message);
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/RowPeekerTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/RowPeekerTests.cs
index 3f7244f43e..c3e6cb604f 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/RowPeekerTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/RowPeekerTests.cs
@@ -26,55 +26,53 @@ public void Peeker()
         dt.Rows.Add("splish");
 
         var mock = new Mock<IDbDataCommandDataFlowSource>();
-        mock.SetupSequence(m=>m.ReadOneRow())
+        mock.SetupSequence(m => m.ReadOneRow())
             .Returns(dt.Rows[0])
             .Returns(dt.Rows[1])
             .Returns(dt.Rows[2])
-            .Returns(()=>{return null;});
+            .Returns(() => { return null; });
 
         var p = new RowPeeker();
         var dt2 = new DataTable();
         dt2.Columns.Add("MyCol");
 
         //Reads fish and peeks dish
-        p.AddWhile(mock.Object,r=>(string) r["MyCol"] == "fish",dt2);
+        p.AddWhile(mock.Object, r => (string)r["MyCol"] == "fish", dt2);
 
         //read one row
-        Assert.AreEqual(1,dt2.Rows.Count);
-        Assert.AreEqual("fish",dt2.Rows[0]["MyCol"]);
+        Assert.AreEqual(1, dt2.Rows.Count);
+        Assert.AreEqual("fish", dt2.Rows[0]["MyCol"]);
 
         var dt3 = new DataTable();
         dt3.Columns.Add("MyCol");
-            
+
         //cannot add while there is a peek stored
-        Assert.Throws<Exception>(() => p.AddWhile(mock.Object, r => (string) r["MyCol"] == "fish", dt2));
+        Assert.Throws<Exception>(() => p.AddWhile(mock.Object, r => (string)r["MyCol"] == "fish", dt2));
 
         //clear the peek
         //unpeeks dish
         p.AddPeekedRowsIfAny(dt3);
-        Assert.AreEqual(1,dt3.Rows.Count);
-        Assert.AreEqual("dish",dt3.Rows[0]["MyCol"]);
+        Assert.AreEqual(1, dt3.Rows.Count);
+        Assert.AreEqual("dish", dt3.Rows[0]["MyCol"]);
 
         //now we can read into dt4 but the condition is false
         //Reads nothing but peeks splish
         var dt4 = new DataTable();
         dt4.Columns.Add("MyCol");
-        p.AddWhile(mock.Object, r => (string) r["MyCol"] == "fish", dt4);
+        p.AddWhile(mock.Object, r => (string)r["MyCol"] == "fish", dt4);
 
-        Assert.AreEqual(0,dt4.Rows.Count);
+        Assert.AreEqual(0, dt4.Rows.Count);
 
         //we passed a null chunk and that pulls back the legit data table
         var dt5 = p.AddPeekedRowsIfAny(null);
-            
+
         Assert.IsNotNull(dt5);
-        Assert.AreEqual("splish",dt5.Rows[0]["MyCol"]);
+        Assert.AreEqual("splish", dt5.Rows[0]["MyCol"]);
 
         var dt6 = new DataTable();
         dt6.Columns.Add("MyCol");
-        p.AddWhile(mock.Object, r => (string) r["MyCol"] == "fish", dt6);
+        p.AddWhile(mock.Object, r => (string)r["MyCol"] == "fish", dt6);
 
-        Assert.AreEqual(0,dt6.Rows.Count);
+        Assert.AreEqual(0, dt6.Rows.Count);
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/SimpleFileExtractorTests.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/SimpleFileExtractorTests.cs
index 8280b791e2..0faa71c142 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/SimpleFileExtractorTests.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/SimpleFileExtractorTests.cs
@@ -26,15 +26,14 @@ internal class SimpleFileExtractorTests
     [SetUp]
     public void SetUp()
     {
-            
         _extractor = new SimpleFileExtractor();
 
-        _inDir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory,"In"));
-        _outDir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory,"Out"));
+        _inDir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory, "In"));
+        _outDir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory, "Out"));
 
-        if(_inDir.Exists)
+        if (_inDir.Exists)
             _inDir.Delete(true);
-        if(_outDir.Exists)
+        if (_outDir.Exists)
             _outDir.Delete(true);
 
         _inDir.Create();
@@ -42,15 +41,15 @@ public void SetUp()
 
         _extractor.LocationOfFiles = _inDir;
 
-        File.WriteAllText(Path.Combine(_inDir.FullName,"blah.txt"),"fff");
-        File.WriteAllText(Path.Combine(_inDir.FullName,"blah2.txt"),"fff");
-        File.WriteAllText(Path.Combine(_inDir.FullName,"Pat1.txt"),"fff");
+        File.WriteAllText(Path.Combine(_inDir.FullName, "blah.txt"), "fff");
+        File.WriteAllText(Path.Combine(_inDir.FullName, "blah2.txt"), "fff");
+        File.WriteAllText(Path.Combine(_inDir.FullName, "Pat1.txt"), "fff");
 
         _inDirSub1 = _inDir.CreateSubdirectory("Sub1");
         _inDirSub2 = _inDir.CreateSubdirectory("Sub2");
 
-        File.WriteAllText(Path.Combine(_inDirSub1.FullName,"subBlah.txt"),"fff");
-        File.WriteAllText(Path.Combine(_inDirSub2.FullName,"subBlah2.txt"),"fff");
+        File.WriteAllText(Path.Combine(_inDirSub1.FullName, "subBlah.txt"), "fff");
+        File.WriteAllText(Path.Combine(_inDirSub2.FullName, "subBlah2.txt"), "fff");
     }
 
     [Test]
@@ -61,14 +60,15 @@ public void AllFiles()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MoveAll(_outDir,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        _extractor.MoveAll(_outDir, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-        FileAssert.Exists(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.Exists(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.Exists(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.Exists(Path.Combine(_outDir.FullName, "blah2.txt"));
     }
+
     [Test]
     public void OneFile()
     {
@@ -77,16 +77,17 @@ public void OneFile()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MoveAll(_outDir,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        _extractor.MoveAll(_outDir, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-        FileAssert.Exists(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub1"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub2"));
+        FileAssert.Exists(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub1"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub2"));
     }
+
     [Test]
     public void AllDirs()
     {
@@ -95,16 +96,17 @@ public void AllDirs()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MoveAll(_outDir,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        _extractor.MoveAll(_outDir, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Sub1"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Sub2"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Sub1"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Sub2"));
     }
+
     [Test]
     public void OneDir()
     {
@@ -113,16 +115,17 @@ public void OneDir()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MoveAll(_outDir,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        _extractor.MoveAll(_outDir, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Sub1"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub2"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Sub1"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub2"));
     }
+
     [Test]
     public void PatientFiles()
     {
@@ -132,15 +135,17 @@ public void PatientFiles()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MovePatient("Pat1","Rel1",_outDir,new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning=true},new GracefulCancellationToken());
-            
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        FileAssert.Exists(Path.Combine(_outDir.FullName,"Rel1.txt"));
+        _extractor.MovePatient("Pat1", "Rel1", _outDir,
+            new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken());
+
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        FileAssert.Exists(Path.Combine(_outDir.FullName, "Rel1.txt"));
     }
+
     [Test]
     public void PatientFileMissingOne()
     {
@@ -150,22 +155,24 @@ public void PatientFileMissingOne()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
         var mem = new ToMemoryDataLoadEventListener(true);
-            
-        _extractor.MovePatient("Pat1","Rel1",_outDir,mem,new GracefulCancellationToken());
-        _extractor.MovePatient("Pat2","Rel2",_outDir,mem,new GracefulCancellationToken());
-            
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        FileAssert.Exists(Path.Combine(_outDir.FullName,"Rel1.txt"));
-
-        Assert.AreEqual(ProgressEventType.Warning,mem.GetWorst());
-            
-        StringAssert.StartsWith("No Files were found matching Pattern Pat2.txt in ",mem.GetAllMessagesByProgressEventType()[ProgressEventType.Warning].Single().Message);
+
+        _extractor.MovePatient("Pat1", "Rel1", _outDir, mem, new GracefulCancellationToken());
+        _extractor.MovePatient("Pat2", "Rel2", _outDir, mem, new GracefulCancellationToken());
+
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        FileAssert.Exists(Path.Combine(_outDir.FullName, "Rel1.txt"));
+
+        Assert.AreEqual(ProgressEventType.Warning, mem.GetWorst());
+
+        StringAssert.StartsWith("No Files were found matching Pattern Pat2.txt in ",
+            mem.GetAllMessagesByProgressEventType()[ProgressEventType.Warning].Single().Message);
     }
+
     [Test]
     public void PatientDirs()
     {
@@ -175,18 +182,20 @@ public void PatientDirs()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-
-        _extractor.MovePatient("Sub1","Rel1",_outDir,new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning=true},new GracefulCancellationToken());
-            
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Rel1"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Rel2"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub1"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub2"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+
+        _extractor.MovePatient("Sub1", "Rel1", _outDir,
+            new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken());
+
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Rel1"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Rel2"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub1"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub2"));
     }
+
     [Test]
     public void PatientBothDirs()
     {
@@ -196,24 +205,30 @@ public void PatientBothDirs()
         _extractor.OutputDirectoryName = _outDir.FullName;
         _extractor.Check(new ThrowImmediatelyCheckNotifier());
 
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
 
-        _extractor.MovePatient("Sub1","Rel1",_outDir,new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning=true},new GracefulCancellationToken());
-        _extractor.MovePatient("Sub2","Rel2",_outDir,new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning=true},new GracefulCancellationToken());
+        _extractor.MovePatient("Sub1", "Rel1", _outDir,
+            new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken());
+        _extractor.MovePatient("Sub2", "Rel2", _outDir,
+            new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken());
 
         // does not exist
-        var ex = Assert.Throws<Exception>(()=>_extractor.MovePatient("Sub3", "Rel3", _outDir, new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken()));
-        Assert.AreEqual($"No Directories were found matching Pattern Sub3 in {_inDir.FullName}.  For private identifier 'Sub3'", ex.Message);
-            
+        var ex = Assert.Throws<Exception>(() => _extractor.MovePatient("Sub3", "Rel3", _outDir,
+            new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true }, new GracefulCancellationToken()));
+        Assert.AreEqual(
+            $"No Directories were found matching Pattern Sub3 in {_inDir.FullName}.  For private identifier 'Sub3'",
+            ex.Message);
+
         // if not throwing on warnings then a missing sub just passes through and is ignored
-        _extractor.MovePatient("Sub3", "Rel3", _outDir, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah.txt"));
-        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName,"blah2.txt"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Rel1"));
-        DirectoryAssert.Exists(Path.Combine(_outDir.FullName,"Rel2"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub1"));
-        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName,"Sub2"));
+        _extractor.MovePatient("Sub3", "Rel3", _outDir, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
+
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah.txt"));
+        FileAssert.DoesNotExist(Path.Combine(_outDir.FullName, "blah2.txt"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Rel1"));
+        DirectoryAssert.Exists(Path.Combine(_outDir.FullName, "Rel2"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub1"));
+        DirectoryAssert.DoesNotExist(Path.Combine(_outDir.FullName, "Sub2"));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/SupplementalExtractionResultsTest.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/SupplementalExtractionResultsTest.cs
index 4f61a1c23c..c45b91d115 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/SupplementalExtractionResultsTest.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/SupplementalExtractionResultsTest.cs
@@ -11,7 +11,7 @@
 
 namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
-internal class SupplementalExtractionResultsTest:DatabaseTests
+internal class SupplementalExtractionResultsTest : DatabaseTests
 {
     [Test]
     public void TestCreating()
@@ -21,15 +21,14 @@ public void TestCreating()
         var ec = new ExtractionConfiguration(DataExportRepository, p);
 
         var cata = new Catalogue(CatalogueRepository, "MyCata");
-        var tbl = new SupportingSQLTable(CatalogueRepository,cata,"Some global data");
+        var tbl = new SupportingSQLTable(CatalogueRepository, cata, "Some global data");
 
         var othertbl = new SupportingSQLTable(CatalogueRepository, cata, "Some global data");
 
-        var result = new SupplementalExtractionResults(DataExportRepository,ec,"select * from Globalsglba",tbl);
+        var result = new SupplementalExtractionResults(DataExportRepository, ec, "select * from Globalsglba", tbl);
 
         Assert.IsTrue(result.IsReferenceTo(typeof(SupportingSQLTable)));
         Assert.IsTrue(result.IsReferenceTo(tbl));
         Assert.IsFalse(result.IsReferenceTo(othertbl));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/DataExtraction/TestCohortRefreshing.cs b/Rdmp.Core.Tests/DataExport/DataExtraction/TestCohortRefreshing.cs
index f0fcbd941c..37fe0de4e1 100644
--- a/Rdmp.Core.Tests/DataExport/DataExtraction/TestCohortRefreshing.cs
+++ b/Rdmp.Core.Tests/DataExport/DataExtraction/TestCohortRefreshing.cs
@@ -27,26 +27,25 @@ namespace Rdmp.Core.Tests.DataExport.DataExtraction;
 
 public class TestCohortRefreshing : TestsRequiringAnExtractionConfiguration
 {
-
     [Test]
     public void RefreshCohort()
     {
-
         var pipe = SetupPipeline();
         pipe.Name = "RefreshPipe";
         pipe.SaveToDatabase();
 
-        Execute(out ExtractionPipelineUseCase useCase, out IExecuteDatasetExtractionDestination results);
+        Execute(out var useCase, out var results);
 
         var oldcohort = _configuration.Cohort;
 
 
-        _configuration.CohortIdentificationConfiguration_ID =new CohortIdentificationConfiguration(RepositoryLocator.CatalogueRepository, "RefreshCohort.cs").ID;
+        _configuration.CohortIdentificationConfiguration_ID =
+            new CohortIdentificationConfiguration(RepositoryLocator.CatalogueRepository, "RefreshCohort.cs").ID;
         _configuration.CohortRefreshPipeline_ID = pipe.ID;
         _configuration.SaveToDatabase();
 
         var engine = new CohortRefreshEngine(new ThrowImmediatelyDataLoadEventListener(), _configuration);
-            
+
         Assert.NotNull(engine.Request.NewCohortDefinition);
 
         var oldData = oldcohort.GetExternalData();
@@ -75,16 +74,16 @@ public void RefreshCohort()
     [Test]
     public void RefreshCohort_WithCaching()
     {
-
         var pipe = new Pipeline(CatalogueRepository, "RefreshPipeWithCaching");
 
-        var source = new PipelineComponent(CatalogueRepository, pipe, typeof (CohortIdentificationConfigurationSource), 0);
+        var source =
+            new PipelineComponent(CatalogueRepository, pipe, typeof(CohortIdentificationConfigurationSource), 0);
         var args = source.CreateArgumentsForClassIfNotExists<CohortIdentificationConfigurationSource>();
         var freezeArg = args.Single(a => a.Name.Equals("FreezeAfterSuccessfulImport"));
         freezeArg.SetValue(false);
         freezeArg.SaveToDatabase();
 
-        var dest = new PipelineComponent(CatalogueRepository, pipe, typeof (BasicCohortDestination), 0);
+        var dest = new PipelineComponent(CatalogueRepository, pipe, typeof(BasicCohortDestination), 0);
         var argsDest = dest.CreateArgumentsForClassIfNotExists<BasicCohortDestination>();
         var allocatorArg = argsDest.Single(a => a.Name.Equals("ReleaseIdentifierAllocator"));
         allocatorArg.SetValue(null);
@@ -94,7 +93,7 @@ public void RefreshCohort_WithCaching()
         pipe.DestinationPipelineComponent_ID = dest.ID;
         pipe.SaveToDatabase();
 
-        Execute(out ExtractionPipelineUseCase useCase, out IExecuteDatasetExtractionDestination results);
+        Execute(out var useCase, out var results);
 
         var oldcohort = _configuration.Cohort;
 
@@ -102,7 +101,8 @@ public void RefreshCohort_WithCaching()
         var p = new QueryCachingPatcher();
         var queryCacheServer = new ExternalDatabaseServer(CatalogueRepository, "TestCohortRefreshing_CacheTest", p);
 
-        var cachedb = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase("TestCohortRefreshing_CacheTest");
+        var cachedb =
+            DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase("TestCohortRefreshing_CacheTest");
         if (cachedb.Exists())
             cachedb.Drop();
 
@@ -123,7 +123,7 @@ public void RefreshCohort_WithCaching()
 
             //add the sub query as the only entry in the cic (in the root container)
             cic.CreateRootContainerIfNotExists();
-            cic.RootCohortAggregateContainer.AddChild(agg,1);
+            cic.RootCohortAggregateContainer.AddChild(agg, 1);
 
             //make the ExtractionConfiguration refresh cohort query be the cic
             _configuration.CohortIdentificationConfiguration_ID = cic.ID;
@@ -141,10 +141,11 @@ public void RefreshCohort_WithCaching()
             Assert.AreEqual(oldData.ExternalDescription, engine.Request.NewCohortDefinition.Description);
             Assert.AreEqual(oldData.ExternalVersion + 1, engine.Request.NewCohortDefinition.Version);
 
-            Assert.AreNotEqual(oldcohort.CountDistinct,engine.Request.CohortCreatedIfAny.CountDistinct);
+            Assert.AreNotEqual(oldcohort.CountDistinct, engine.Request.CohortCreatedIfAny.CountDistinct);
 
             //now nuke all data in the catalogue so the cic returns nobody (except that the identifiers are cached eh?)
-            DataAccessPortal.ExpectDatabase(_tableInfo,DataAccessContext.InternalDataProcessing).ExpectTable(_tableInfo.GetRuntimeName()).Truncate();
+            DataAccessPortal.ExpectDatabase(_tableInfo, DataAccessContext.InternalDataProcessing)
+                .ExpectTable(_tableInfo.GetRuntimeName()).Truncate();
 
             var toMem = new ToMemoryDataLoadEventListener(false);
 
@@ -152,15 +153,17 @@ public void RefreshCohort_WithCaching()
             engine = new CohortRefreshEngine(toMem, _configuration);
 
             //execute it
-            var ex = Assert.Throws<PipelineCrashedException>(()=>engine.Execute());
+            var ex = Assert.Throws<PipelineCrashedException>(() => engine.Execute());
 
-            Assert.IsTrue(ex.InnerException.InnerException.Message.Contains("CohortIdentificationCriteria execution resulted in an empty dataset"));
+            Assert.IsTrue(
+                ex.InnerException.InnerException.Message.Contains(
+                    "CohortIdentificationCriteria execution resulted in an empty dataset"));
 
             //expected this message to happen
             //that it did clear the cache
-            Assert.AreEqual(1,toMem.EventsReceivedBySender.SelectMany(kvp=>kvp.Value).Count(msg=>msg.Message.Equals("Clearing Cohort Identifier Cache")));
-
-
+            Assert.AreEqual(1,
+                toMem.EventsReceivedBySender.SelectMany(kvp => kvp.Value)
+                    .Count(msg => msg.Message.Equals("Clearing Cohort Identifier Cache")));
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataExport/ExtractionConfigurationTest.cs b/Rdmp.Core.Tests/DataExport/ExtractionConfigurationTest.cs
index 0fd15d604b..42eac27cdc 100644
--- a/Rdmp.Core.Tests/DataExport/ExtractionConfigurationTest.cs
+++ b/Rdmp.Core.Tests/DataExport/ExtractionConfigurationTest.cs
@@ -17,7 +17,7 @@ public class ExtractionConfigurationTest : DatabaseTests
     [Test]
     public void ExtractableColumnTest()
     {
-        ExtractableDataSet dataSet =null;
+        ExtractableDataSet dataSet = null;
         ExtractionConfiguration configuration = null;
         Project project = null;
 
@@ -26,11 +26,11 @@ public void ExtractableColumnTest()
         ColumnInfo column = null;
         TableInfo table = null;
 
-        ExtractionInformation extractionInformation=null;
-        ExtractableColumn extractableColumn=null;
-            
+        ExtractionInformation extractionInformation = null;
+        ExtractableColumn extractableColumn = null;
+
         try
-        {             
+        {
             //setup catalogue side of things
             cata = new Catalogue(CatalogueRepository, "unit_test_ExtractableColumnTest_Cata");
             cataItem = new CatalogueItem(CatalogueRepository, cata, "unit_test_ExtractableColumnTest_CataItem");
@@ -46,10 +46,11 @@ public void ExtractableColumnTest()
 
             configuration = new ExtractionConfiguration(DataExportRepository, project);
 
-            extractableColumn = new ExtractableColumn(DataExportRepository, dataSet, configuration, extractionInformation, 0, "Hashme2(Name)");
+            extractableColumn = new ExtractableColumn(DataExportRepository, dataSet, configuration,
+                extractionInformation, 0, "Hashme2(Name)");
             Assert.AreEqual(configuration.GetAllExtractableColumnsFor(dataSet).Length, 1);
         }
-        finally 
+        finally
         {
             extractionInformation?.DeleteInDatabase();
 
@@ -66,9 +67,6 @@ public void ExtractableColumnTest()
             dataSet?.DeleteInDatabase();
 
             cata?.DeleteInDatabase();
-
-
-
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/ImportFileTests.cs b/Rdmp.Core.Tests/DataExport/ImportFileTests.cs
index 15e7085ffd..8ad343e438 100644
--- a/Rdmp.Core.Tests/DataExport/ImportFileTests.cs
+++ b/Rdmp.Core.Tests/DataExport/ImportFileTests.cs
@@ -18,14 +18,14 @@
 
 namespace Rdmp.Core.Tests.DataExport;
 
-public class ImportFileTests:DatabaseTests
+public class ImportFileTests : DatabaseTests
 {
     [Test]
     public void ImportFile()
     {
         var file = Path.GetTempFileName();
         var databaseName = TestDatabaseNames.GetConsistentName(GetType().Name);
-            
+
         try
         {
             using (var sw = new StreamWriter(file))
@@ -48,7 +48,8 @@ public void ImportFile()
                 StronglyTypeInput = true
             };
 
-            source.PreInitialize(new FlatFileToLoad(new FileInfo(file)), new ThrowImmediatelyDataLoadEventListener());//this is the file we want to load
+            source.PreInitialize(new FlatFileToLoad(new FileInfo(file)),
+                new ThrowImmediatelyDataLoadEventListener()); //this is the file we want to load
             source.Check(new ThrowImmediatelyCheckNotifier());
 
             var server = DiscoveredServerICanCreateRandomDatabasesAndTablesOn;
@@ -56,7 +57,7 @@ public void ImportFile()
 
             //recreate it
             database.Create(true);
-                
+
             server.ChangeDatabase(databaseName);
 
             var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
@@ -80,7 +81,7 @@ public void ImportFile()
             Assert.AreEqual("decimal(3,2)", GetColumnType(database, tableName, "Healthiness"));
             Assert.AreEqual("datetime2", GetColumnType(database, tableName, "DateOfImagining"));
 
-            using (var con = (SqlConnection) server.GetConnection())
+            using (var con = (SqlConnection)server.GetConnection())
             {
                 con.Open();
 
@@ -107,7 +108,7 @@ public void ImportFile()
             server.ExpectDatabase(databaseName).Drop();
             Assert.IsFalse(server.ExpectDatabase(databaseName).Exists());
         }
-        finally 
+        finally
         {
             try
             {
@@ -117,14 +118,9 @@ public void ImportFile()
             {
                 //Couldn't delete temporary file... oh well
             }
-                
         }
-
     }
 
-    private static string GetColumnType(DiscoveredDatabase database, string tableName, string colName)
-    {
-        return
-            database.ExpectTable(tableName).DiscoverColumn(colName).DataType.SQLType;
-    }
+    private static string GetColumnType(DiscoveredDatabase database, string tableName, string colName) =>
+        database.ExpectTable(tableName).DiscoverColumn(colName).DataType.SQLType;
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/ProjectChecksTestsComplex.cs b/Rdmp.Core.Tests/DataExport/ProjectChecksTestsComplex.cs
index b719a538da..2aecf68e18 100644
--- a/Rdmp.Core.Tests/DataExport/ProjectChecksTestsComplex.cs
+++ b/Rdmp.Core.Tests/DataExport/ProjectChecksTestsComplex.cs
@@ -16,12 +16,13 @@
 
 namespace Rdmp.Core.Tests.DataExport;
 
-public class ProjectChecksTestsComplex:TestsRequiringAnExtractionConfiguration
+public class ProjectChecksTestsComplex : TestsRequiringAnExtractionConfiguration
 {
     [Test]
     public void CheckBasicConfiguration()
     {
-        new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator),_project).Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
+        new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), _project).Check(
+            new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
     }
 
     [Test]
@@ -31,13 +32,18 @@ public void DatasetIsDisabled()
         _extractableDataSet.SaveToDatabase();
 
         //checking should fail
-        var exception = Assert.Throws<Exception>(() => new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), _project).Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
-        Assert.AreEqual("Dataset TestTable is set to DisableExtraction=true, probably someone doesn't want you extracting this dataset at the moment", exception.Message);
+        var exception = Assert.Throws<Exception>(() =>
+            new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), _project).Check(
+                new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        Assert.AreEqual(
+            "Dataset TestTable is set to DisableExtraction=true, probably someone doesn't want you extracting this dataset at the moment",
+            exception.Message);
 
         //but if the user goes ahead and executes the extraction that should fail too
         var source = new ExecuteDatasetExtractionSource();
         source.PreInitialize(_request, new ThrowImmediatelyDataLoadEventListener());
-        var exception2 = Assert.Throws<Exception>(() => source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var exception2 = Assert.Throws<Exception>(() =>
+            source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
 
         Assert.AreEqual("Cannot extract TestTable because DisableExtraction is set to true", exception2.Message);
     }
diff --git a/Rdmp.Core.Tests/DataExport/ProjectChecksTestsSimple.cs b/Rdmp.Core.Tests/DataExport/ProjectChecksTestsSimple.cs
index b2fcf18c73..cf2f20960e 100644
--- a/Rdmp.Core.Tests/DataExport/ProjectChecksTestsSimple.cs
+++ b/Rdmp.Core.Tests/DataExport/ProjectChecksTestsSimple.cs
@@ -17,7 +17,7 @@
 
 namespace Rdmp.Core.Tests.DataExport;
 
-public class ProjectChecksTestsSimple:DatabaseTests
+public class ProjectChecksTestsSimple : DatabaseTests
 {
     [Test]
     public void Project_NoConfigurations()
@@ -26,9 +26,10 @@ public void Project_NoConfigurations()
 
         try
         {
-            var ex = Assert.Throws<Exception>(()=>new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator),p).Check(new ThrowImmediatelyCheckNotifier()));
-            Assert.AreEqual("Project does not have any ExtractionConfigurations yet",ex.Message);
-
+            var ex = Assert.Throws<Exception>(() =>
+                new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), p).Check(
+                    new ThrowImmediatelyCheckNotifier()));
+            Assert.AreEqual("Project does not have any ExtractionConfigurations yet", ex.Message);
         }
         finally
         {
@@ -40,9 +41,8 @@ public void Project_NoConfigurations()
     public void Project_NoDirectory()
     {
         var p = GetProjectWithConfig(out var config);
-        var ex = Assert.Throws<Exception>(()=>RunTestWithCleanup(p, config));
+        var ex = Assert.Throws<Exception>(() => RunTestWithCleanup(p, config));
         Assert.AreEqual("Project does not have an ExtractionDirectory", ex.Message);
-            
     }
 
     [Test]
@@ -52,11 +52,10 @@ public void Project_NoDirectory()
     public void Project_NonExistentDirectory(string dir)
     {
         var p = GetProjectWithConfig(out var config);
-           
-        p.ExtractionDirectory = dir;
-        var ex = Assert.Throws<Exception>(()=>RunTestWithCleanup(p, config));
-        Assert.IsTrue(Regex.IsMatch(ex.Message,@"Project ExtractionDirectory .* Does Not Exist"));
 
+        p.ExtractionDirectory = dir;
+        var ex = Assert.Throws<Exception>(() => RunTestWithCleanup(p, config));
+        Assert.IsTrue(Regex.IsMatch(ex.Message, @"Project ExtractionDirectory .* Does Not Exist"));
     }
 
     [Test]
@@ -65,7 +64,7 @@ public void Project_DodgyCharactersInExtractionDirectoryName()
         var p = GetProjectWithConfig(out var config);
         p.ExtractionDirectory = @"C:\|||";
 
-        var ex = Assert.Throws<Exception>(()=>RunTestWithCleanup(p,config));
+        var ex = Assert.Throws<Exception>(() => RunTestWithCleanup(p, config));
         Assert.AreEqual(@"Project ExtractionDirectory ('C:\|||') Does Not Exist", ex.Message);
     }
 
@@ -76,11 +75,11 @@ public void ConfigurationFrozen_Remnants()
 
         //create remnant directory (empty)
         var remnantDir = dir.CreateSubdirectory($"Extr_{config.ID}20011225");
-                
+
         //with empty subdirectories
         remnantDir.CreateSubdirectory("DMPTestCatalogue").CreateSubdirectory("Lookups");
 
-        config.IsReleased = true;//make environment think config is released
+        config.IsReleased = true; //make environment think config is released
         config.SaveToDatabase();
 
         try
@@ -90,12 +89,11 @@ public void ConfigurationFrozen_Remnants()
             Assert.IsTrue(remnantDir.Exists);
 
             //resolve accepting deletion
-            new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator),p).Check(new AcceptAllCheckNotifier());
+            new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), p).Check(new AcceptAllCheckNotifier());
 
             //boom remnant doesnt exist anymore (but parent does obviously)
             Assert.IsTrue(dir.Exists);
-            Assert.IsFalse(Directory.Exists(remnantDir.FullName));//cant use .Exists for some reason, c# caches answer?
-
+            Assert.IsFalse(Directory.Exists(remnantDir.FullName)); //cant use .Exists for some reason, c# caches answer?
         }
         finally
         {
@@ -117,18 +115,19 @@ public void ConfigurationFrozen_RemnantsWithFiles()
         var lookupDir = remnantDir.CreateSubdirectory("DMPTestCatalogue").CreateSubdirectory("Lookups");
 
         //this time put a file in
-        File.AppendAllLines(Path.Combine(lookupDir.FullName,"Text.txt"),new string[]{"Amagad"});
+        File.AppendAllLines(Path.Combine(lookupDir.FullName, "Text.txt"), new string[] { "Amagad" });
 
-        config.IsReleased = true;//make environment think config is released
+        config.IsReleased = true; //make environment think config is released
         config.SaveToDatabase();
         try
         {
             var notifier = new ToMemoryCheckNotifier();
-            RunTestWithCleanup(p,config,notifier);
+            RunTestWithCleanup(p, config, notifier);
 
             Assert.IsTrue(notifier.Messages.Any(
-                m=>m.Result == CheckResult.Fail &&
-                   Regex.IsMatch(m.Message,@"Found non-empty folder .* which is left over extracted folder after data release \(First file found was '.*[/\\]DMPTestCatalogue[/\\]Lookups[/\\]Text.txt' but there may be others\)")));
+                m => m.Result == CheckResult.Fail &&
+                     Regex.IsMatch(m.Message,
+                         @"Found non-empty folder .* which is left over extracted folder after data release \(First file found was '.*[/\\]DMPTestCatalogue[/\\]Lookups[/\\]Text.txt' but there may be others\)")));
         }
         finally
         {
@@ -139,27 +138,30 @@ public void ConfigurationFrozen_RemnantsWithFiles()
     [Test]
     public void Configuration_NoDatasets()
     {
-        var p = GetProjectWithConfigDirectory(out var config, out DirectoryInfo dir);
-        var ex = Assert.Throws<Exception>(()=>RunTestWithCleanup(p,config));
-        StringAssert.StartsWith("There are no datasets selected for open configuration 'New ExtractionConfiguration",ex.Message);
-
+        var p = GetProjectWithConfigDirectory(out var config, out var dir);
+        var ex = Assert.Throws<Exception>(() => RunTestWithCleanup(p, config));
+        StringAssert.StartsWith("There are no datasets selected for open configuration 'New ExtractionConfiguration",
+            ex.Message);
     }
 
 
     [Test]
     public void Configuration_NoProjectNumber()
     {
-        var p = GetProjectWithConfigDirectory(out var config, out DirectoryInfo dir);
+        var p = GetProjectWithConfigDirectory(out var config, out var dir);
         p.ProjectNumber = null;
-        var ex = Assert.Throws<Exception>(()=>RunTestWithCleanup(p, config));
-        StringAssert.Contains("Project does not have a Project Number, this is a number which is meaningful to you (as opposed to ID which is the ",ex.Message);
+        var ex = Assert.Throws<Exception>(() => RunTestWithCleanup(p, config));
+        StringAssert.Contains(
+            "Project does not have a Project Number, this is a number which is meaningful to you (as opposed to ID which is the ",
+            ex.Message);
     }
 
-    private void RunTestWithCleanup(Project p,ExtractionConfiguration config, ICheckNotifier notifier = null)
+    private void RunTestWithCleanup(Project p, ExtractionConfiguration config, ICheckNotifier notifier = null)
     {
         try
         {
-            new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator),p).Check(notifier??new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
+            new ProjectChecker(new ThrowImmediatelyActivator(RepositoryLocator), p).Check(notifier ??
+                new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
         }
         finally
         {
@@ -174,18 +176,18 @@ private Project GetProjectWithConfig(out ExtractionConfiguration config)
         {
             ProjectNumber = -5000
         };
-        config = new ExtractionConfiguration(DataExportRepository,p);
+        config = new ExtractionConfiguration(DataExportRepository, p);
         return p;
     }
 
-    private Project GetProjectWithConfigDirectory(out ExtractionConfiguration config,out DirectoryInfo dir)
+    private Project GetProjectWithConfigDirectory(out ExtractionConfiguration config, out DirectoryInfo dir)
     {
         var p = new Project(DataExportRepository, "Fish");
         config = new ExtractionConfiguration(DataExportRepository, p);
 
         var projectFolder = Path.Combine(TestContext.CurrentContext.WorkDirectory, "ProjectCheckerTestDir");
 
-        dir = new DirectoryInfo(projectFolder );
+        dir = new DirectoryInfo(projectFolder);
         dir.Create();
 
         p.ExtractionDirectory = projectFolder;
diff --git a/Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs b/Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs
index 92400a188a..c6329b2fd2 100644
--- a/Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs
+++ b/Rdmp.Core.Tests/DataExport/ProjectCohortIdentificationConfigurationAssociationTests.cs
@@ -20,21 +20,20 @@ namespace Rdmp.Core.Tests.DataExport;
 [Category("Unit")]
 public class ProjectCohortIdentificationConfigurationAssociationTests
 {
-    
     [Test]
     public void TestOrphanCic()
     {
         var memory = new MemoryDataExportRepository();
         var cic = new CohortIdentificationConfiguration(memory, "Mycic");
-        var p = new Project(memory,"my proj");
+        var p = new Project(memory, "my proj");
         p.AssociateWithCohortIdentification(cic);
 
         //fetch the instance
         var cicAssoc = memory.GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>().Single();
-            
+
         //relationship from p should resolve to the association link
-        Assert.AreEqual(cicAssoc,p.ProjectCohortIdentificationConfigurationAssociations[0]);
-            
+        Assert.AreEqual(cicAssoc, p.ProjectCohortIdentificationConfigurationAssociations[0]);
+
         //relationship from p should resolve to the cic
         Assert.AreEqual(cic, p.GetAssociatedCohortIdentificationConfigurations()[0]);
 
@@ -45,25 +44,31 @@ public void TestOrphanCic()
         //make the assoc an orphan
         cic.DeleteInDatabase();
         cicAssoc.ClearAllInjections();
-            
+
         //assoc should still exist
         Assert.AreEqual(cicAssoc, p.ProjectCohortIdentificationConfigurationAssociations[0]);
         Assert.IsNull(p.ProjectCohortIdentificationConfigurationAssociations[0].CohortIdentificationConfiguration);
-            
+
         //relationship from p should resolve to the cic
-        Assert.IsEmpty( p.GetAssociatedCohortIdentificationConfigurations());
+        Assert.IsEmpty(p.GetAssociatedCohortIdentificationConfigurations());
 
         //error should be reported in top right of program
-        var ex = Assert.Throws<Exception>(()=>new DataExportChildProvider(new RepositoryProvider(memory), null, new ThrowImmediatelyCheckNotifier(),null));
-        StringAssert.IsMatch(@"Failed to find Associated Cohort Identification Configuration with ID \d+ which was supposed to be associated with my proj", ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            new DataExportChildProvider(new RepositoryProvider(memory), null, new ThrowImmediatelyCheckNotifier(),
+                null));
+        StringAssert.IsMatch(
+            @"Failed to find Associated Cohort Identification Configuration with ID \d+ which was supposed to be associated with my proj",
+            ex.Message);
 
         //but UI should still respond
-        var childProvider = new DataExportChildProvider(new RepositoryProvider(memory), null, new IgnoreAllErrorsCheckNotifier(),null);
+        var childProvider = new DataExportChildProvider(new RepositoryProvider(memory), null,
+            new IgnoreAllErrorsCheckNotifier(), null);
 
         //the orphan cic should not appear in the tree view under Project=>Cohorts=>Associated Cics
         var cohorts = childProvider.GetChildren(p).OfType<ProjectCohortsNode>().Single();
-        var cics =  childProvider.GetChildren(cohorts).OfType<ProjectCohortIdentificationConfigurationAssociationsNode>().First();
-            
+        var cics = childProvider.GetChildren(cohorts).OfType<ProjectCohortIdentificationConfigurationAssociationsNode>()
+            .First();
+
         Assert.IsEmpty(childProvider.GetChildren(cics));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/TableValuedFunctionTests/EndToEndTableValuedFunction.cs b/Rdmp.Core.Tests/DataExport/TableValuedFunctionTests/EndToEndTableValuedFunction.cs
index 9668b33401..eeed618fd0 100644
--- a/Rdmp.Core.Tests/DataExport/TableValuedFunctionTests/EndToEndTableValuedFunction.cs
+++ b/Rdmp.Core.Tests/DataExport/TableValuedFunctionTests/EndToEndTableValuedFunction.cs
@@ -31,7 +31,7 @@
 
 namespace Rdmp.Core.Tests.DataExport.TableValuedFunctionTests;
 
-public class EndToEndTableValuedFunction:DatabaseTests
+public class EndToEndTableValuedFunction : DatabaseTests
 {
     private ExtractionInformation _nonTvfExtractionIdentifier;
     private ICatalogue _nonTvfCatalogue;
@@ -42,6 +42,7 @@ public class EndToEndTableValuedFunction:DatabaseTests
 
     //the cohort database
     private DiscoveredDatabase _discoveredCohortDatabase;
+
     //the data database (with the tvf in it)
     private DiscoveredDatabase _database;
 
@@ -63,21 +64,23 @@ protected override void SetUp()
     public void EndToEndTest()
     {
         var cohortDatabaseNameWillBe = TestDatabaseNames.GetConsistentName("TbvCohort");
-        _discoveredCohortDatabase = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(cohortDatabaseNameWillBe);
+        _discoveredCohortDatabase =
+            DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(cohortDatabaseNameWillBe);
 
         //cleanup
-        if(_discoveredCohortDatabase.Exists())
+        if (_discoveredCohortDatabase.Exists())
             _discoveredCohortDatabase.Drop();
 
         //create a normal catalogue
         CreateANormalCatalogue();
 
         //create a cohort database using wizard
-        var cohortDatabaseWizard = new CreateNewCohortDatabaseWizard(_discoveredCohortDatabase,CatalogueRepository,DataExportRepository,false);
+        var cohortDatabaseWizard = new CreateNewCohortDatabaseWizard(_discoveredCohortDatabase, CatalogueRepository,
+            DataExportRepository, false);
 
         _externalCohortTable = cohortDatabaseWizard.CreateDatabase(
             new PrivateIdentifierPrototype(_nonTvfExtractionIdentifier)
-            ,new ThrowImmediatelyCheckNotifier());
+            , new ThrowImmediatelyCheckNotifier());
 
         //create a table valued function
         CreateTvfCatalogue(cohortDatabaseNameWillBe);
@@ -137,15 +140,17 @@ private void PopulateCohortDatabaseWithRecordsFromNonTvfCatalogue()
         _cic.CreateRootContainerIfNotExists();
 
         //turn the catalogue _nonTvfCatalogue into a cohort set and add it to the root container
-        var newAggregate = _cic.CreateNewEmptyConfigurationForCatalogue(_nonTvfCatalogue,(s,e)=> { throw new Exception("Did not expect there to be more than 1!"); });
+        var newAggregate = _cic.CreateNewEmptyConfigurationForCatalogue(_nonTvfCatalogue,
+            (s, e) => { throw new Exception("Did not expect there to be more than 1!"); });
 
         var root = _cic.RootCohortAggregateContainer;
-        root.AddChild(newAggregate,0);
+        root.AddChild(newAggregate, 0);
 
         //create a pipeline for executing this CIC and turning it into a cohort
         _pipe = new Pipeline(CatalogueRepository, "CREATE COHORT:By Executing CIC");
 
-        var source = new PipelineComponent(CatalogueRepository, _pipe,typeof (CohortIdentificationConfigurationSource), 0, "CIC Source");
+        var source = new PipelineComponent(CatalogueRepository, _pipe, typeof(CohortIdentificationConfigurationSource),
+            0, "CIC Source");
 
         _project = new Project(DataExportRepository, "TvfProject")
         {
@@ -154,7 +159,8 @@ private void PopulateCohortDatabaseWithRecordsFromNonTvfCatalogue()
         };
         _project.SaveToDatabase();
 
-        var destination = new PipelineComponent(CatalogueRepository, _pipe, typeof(BasicCohortDestination), 1, "Destination");
+        var destination =
+            new PipelineComponent(CatalogueRepository, _pipe, typeof(BasicCohortDestination), 1, "Destination");
 
         _pipe.SourcePipelineComponent_ID = source.ID;
         _pipe.DestinationPipelineComponent_ID = destination.ID;
@@ -165,11 +171,13 @@ private void PopulateCohortDatabaseWithRecordsFromNonTvfCatalogue()
         destination.CreateArgumentsForClassIfNotExists<BasicCohortDestination>();
 
         //create pipeline initialization objects
-        var request = new CohortCreationRequest(_project, new CohortDefinition(null, "MyFirstCohortForTvfTest", 1, 12, _externalCohortTable), DataExportRepository, "Here goes nothing")
-            {
-                CohortIdentificationConfiguration = _cic
-            };
-        var engine = request.GetEngine(_pipe,new ThrowImmediatelyDataLoadEventListener());
+        var request = new CohortCreationRequest(_project,
+            new CohortDefinition(null, "MyFirstCohortForTvfTest", 1, 12, _externalCohortTable), DataExportRepository,
+            "Here goes nothing")
+        {
+            CohortIdentificationConfiguration = _cic
+        };
+        var engine = request.GetEngine(_pipe, new ThrowImmediatelyDataLoadEventListener());
         engine.ExecutePipeline(new GracefulCancellationToken());
     }
 
@@ -215,11 +223,9 @@ definitionID int
         Assert.AreEqual("chi", eis[0].GetRuntimeName());
         eis[0].IsExtractionIdentifier = true;
         eis[0].SaveToDatabase();
-            
+
         _tvfCatalogue = cata;
         _tvfTableInfo = tbl;
-
-
     }
 
     private void CreateANormalCatalogue()
@@ -228,7 +234,7 @@ private void CreateANormalCatalogue()
         using (var con = svr.GetConnection())
         {
             con.Open();
-            svr.GetCommand("CREATE TABLE NonTVFTable ( chi varchar(10))",con).ExecuteNonQuery();
+            svr.GetCommand("CREATE TABLE NonTVFTable ( chi varchar(10))", con).ExecuteNonQuery();
             svr.GetCommand("INSERT INTO NonTVFTable VALUES ('0101010101')", con).ExecuteNonQuery();
             svr.GetCommand("INSERT INTO NonTVFTable VALUES ('0202020202')", con).ExecuteNonQuery();
             svr.GetCommand("INSERT INTO NonTVFTable VALUES ('0303030303')", con).ExecuteNonQuery();
@@ -236,17 +242,18 @@ private void CreateANormalCatalogue()
 
         var importer = new TableInfoImporter(CatalogueRepository, svr.Name,
             _database.GetRuntimeName(), "NonTVFTable",
-            DatabaseType.MicrosoftSQLServer,_database.Server.ExplicitUsernameIfAny,_database.Server.ExplicitPasswordIfAny);
+            DatabaseType.MicrosoftSQLServer, _database.Server.ExplicitUsernameIfAny,
+            _database.Server.ExplicitPasswordIfAny);
 
         importer.DoImport(out var tbl, out var cols);
 
         var engineer = new ForwardEngineerCatalogue(tbl, cols);
         engineer.ExecuteForwardEngineering(out var cata, out var cis, out var eis);
-            
-        _nonTvfExtractionIdentifier  = eis.Single();
+
+        _nonTvfExtractionIdentifier = eis.Single();
         _nonTvfExtractionIdentifier.IsExtractionIdentifier = true;
         _nonTvfExtractionIdentifier.SaveToDatabase();
-            
+
         _nonTvfCatalogue = cata;
         _nonTvfTableInfo = tbl;
     }
@@ -291,17 +298,16 @@ private void TestWithParameterValueThatRowsAreReturned()
                 Assert.NotNull(r["definitionID"]);
             }
 
-            Assert.AreEqual(rowsReturned,5);
+            Assert.AreEqual(rowsReturned, 5);
         }
     }
 
     private void TestUsingTvfForAggregates()
     {
+        _aggregate = new AggregateConfiguration(CatalogueRepository, _tvfCatalogue, "tvfAggregate");
 
-
-        _aggregate = new AggregateConfiguration(CatalogueRepository, _tvfCatalogue,"tvfAggregate");
-
-        var ei = _tvfCatalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => !e.IsExtractionIdentifier);
+        var ei = _tvfCatalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => !e.IsExtractionIdentifier);
         _aggregate.AddDimension(ei);
 
         //change the parameter to 10
@@ -316,18 +322,18 @@ private void TestUsingTvfForAggregates()
          * DECLARE @numberOfRecords AS int;
          * SET @numberOfRecords=10;
          * tvfAggregate
-         * SELECT 
+         * SELECT
          * GetTopXRandom.[definitionID],
          * count(*)
-         * FROM 
+         * FROM
          * [TestDbName_ScratchArea]..GetTopXRandom(@numberOfRecords) AS GetTopXRandom
-         * group by 
+         * group by
+         * GetTopXRandom.[definitionID]
+         * order by
          * GetTopXRandom.[definitionID]
-         * order by 
-         * GetTopXRandom.[definitionID] 
-         * 
-         * --Since we only imported 1 cohort we should have 1 row and the count should be the number we requested 
-         * 
+         *
+         * --Since we only imported 1 cohort we should have 1 row and the count should be the number we requested
+         *
          * */
 
         var sql = qb.SQL;
@@ -340,16 +346,16 @@ private void TestUsingTvfForAggregates()
 
             Assert.IsTrue(r.Read());
 
-            Assert.AreEqual(r[1],10);
+            Assert.AreEqual(r[1], 10);
 
             Assert.IsFalse(r.Read());
         }
 
         //create a global overriding parameter on the aggregate
         var global = new AnyTableSqlParameter(CatalogueRepository, _aggregate, "DECLARE @numberOfRecords AS int;")
-            {
-                Value = "1"
-            };
+        {
+            Value = "1"
+        };
         global.SaveToDatabase();
 
 
@@ -363,7 +369,7 @@ private void TestUsingTvfForAggregates()
 
             Assert.IsTrue(r.Read());
 
-            Assert.AreEqual(r[1], 1);//should now only have 1 record being retrned and counted when executing
+            Assert.AreEqual(r[1], 1); //should now only have 1 record being retrned and counted when executing
 
             Assert.IsFalse(r.Read());
         }
@@ -382,7 +388,7 @@ private void TestAddingTvfToCIC()
         Assert.AreEqual(1, _cicAggregate.GetAllParameters().Length);
 
         //add the new cic to the container
-        root.AddChild(_cicAggregate,2);
+        root.AddChild(_cicAggregate, 2);
 
         //So container is:
         // EXCEPT
@@ -390,7 +396,7 @@ private void TestAddingTvfToCIC()
         //People in _tvfCatalogue (with @numberOfRecords = 1) (1)
 
         //result should be 2
-        var qb = new CohortQueryBuilder(_cic,null);
+        var qb = new CohortQueryBuilder(_cic, null);
 
         var sql = qb.SQL;
 
@@ -423,12 +429,13 @@ private void TestDataExportOfTvf()
         //make all columns part of the extraction
         foreach (var e in _tvfCatalogue.GetAllExtractionInformation(ExtractionCategory.Any))
             config.AddColumnToExtraction(tvfExtractable, e);
-            
+
         //the default value should be 10
-        Assert.AreEqual("10",_tvfTableInfo.GetAllParameters().Single().Value);
+        Assert.AreEqual("10", _tvfTableInfo.GetAllParameters().Single().Value);
 
         //configure an extraction specific global of 1 so that only 1 chi number is fetched (which will be in the cohort)
-        var globalP = new GlobalExtractionFilterParameter(DataExportRepository, config, "DECLARE @numberOfRecords AS int;")
+        var globalP =
+            new GlobalExtractionFilterParameter(DataExportRepository, config, "DECLARE @numberOfRecords AS int;")
             {
                 Value = "1"
             };
@@ -441,13 +448,13 @@ private void TestDataExportOfTvf()
         source.PreInitialize(extractionCommand, new ThrowImmediatelyDataLoadEventListener());
 
         var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-            
-        Assert.AreEqual(1,dt.Rows.Count);
 
-        Assert.AreEqual("ReleaseId",dt.Columns[0].ColumnName);
+        Assert.AreEqual(1, dt.Rows.Count);
+
+        Assert.AreEqual("ReleaseId", dt.Columns[0].ColumnName);
 
         //should be a guid
-        Assert.IsTrue(dt.Rows[0][0].ToString().Length>10);
+        Assert.IsTrue(dt.Rows[0][0].ToString().Length > 10);
         Assert.IsTrue(dt.Rows[0][0].ToString().Contains('-'));
 
         selected.DeleteInDatabase();
@@ -455,6 +462,5 @@ private void TestDataExportOfTvf()
         config.DeleteInDatabase();
 
         tvfExtractable.DeleteInDatabase();
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataExport/TestExtractableTables.cs b/Rdmp.Core.Tests/DataExport/TestExtractableTables.cs
index a2f38e7602..3c35d94b7e 100644
--- a/Rdmp.Core.Tests/DataExport/TestExtractableTables.cs
+++ b/Rdmp.Core.Tests/DataExport/TestExtractableTables.cs
@@ -23,23 +23,22 @@ public class TestExtractableTables : TestsRequiringACohort
     [Test]
     public void DodgyID_CreateCohortDatabaseTable_Fails()
     {
-        var ex = Assert.Throws<Exception>(() => new ExtractableCohort(DataExportRepository, _externalCohortTable,-899));
+        var ex = Assert.Throws<Exception>(() =>
+            new ExtractableCohort(DataExportRepository, _externalCohortTable, -899));
         Assert.IsTrue(ex.Message.StartsWith("ID -899 does not exist in Cohort Definitions"));
     }
 
 
     [Test]
     public void CreateExtractableDataSet()
-    {  
-            
+    {
         ExtractableDataSet eds = null;
-        var cata = new Catalogue(CatalogueRepository,"TestExtractableTables Cata");
+        var cata = new Catalogue(CatalogueRepository, "TestExtractableTables Cata");
         try
         {
             //creates with a Null Catalogue until it is associated with a catalogue and saved
             eds = new ExtractableDataSet(DataExportRepository, cata);
-            Assert.AreEqual(cata.ID,eds.Catalogue_ID);
-
+            Assert.AreEqual(cata.ID, eds.Catalogue_ID);
         }
         finally
         {
@@ -69,7 +68,6 @@ public void UpdateProjectDatabaseTable()
         {
             table.DeleteInDatabase();
         }
-
     }
 
     [Test]
@@ -85,17 +83,18 @@ public void CreateExtractionConfiguration()
         }
         finally
         {
-            table.DeleteInDatabase();//must delete child before parent to preserve referential integrity
+            table.DeleteInDatabase(); //must delete child before parent to preserve referential integrity
             parent.DeleteInDatabase();
         }
     }
 
 
     #region helper methods
+
     public static void PropertyValuesAreEquals(object actual, object expected)
     {
         var properties = expected.GetType().GetProperties()
-            .Where(info => !Attribute.IsDefined(info, typeof (DoNotExtractProperty))).ToArray();
+            .Where(info => !Attribute.IsDefined(info, typeof(DoNotExtractProperty))).ToArray();
 
         foreach (var property in properties)
         {
@@ -106,24 +105,31 @@ public static void PropertyValuesAreEquals(object actual, object expected)
             var expectedValue = property.GetValue(expected, null);
             var actualValue = property.GetValue(actual, null);
 
-            if(expectedValue is SqlCommand && actualValue is SqlCommand) //don't compare sql commands they will be subtly different or just refer to different objects iwth the exact same values
+            if (expectedValue is SqlCommand &&
+                actualValue is SqlCommand) //don't compare sql commands they will be subtly different or just refer to different objects iwth the exact same values
                 continue;
 
             if (actualValue is IList list)
                 AssertListsAreEquals(property, list, (IList)expectedValue);
             else if (!Equals(expectedValue, actualValue))
-                Assert.Fail("Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType?.Name, property.Name, expectedValue, actualValue);
+                Assert.Fail("Property {0}.{1} does not match. Expected: {2} but was: {3}", property.DeclaringType?.Name,
+                    property.Name, expectedValue, actualValue);
         }
     }
 
     private static void AssertListsAreEquals(PropertyInfo property, IList actualList, IList expectedList)
     {
         if (actualList.Count != expectedList.Count)
-            Assert.Fail("Property {0}.{1} does not match. Expected IList containing {2} elements but was IList containing {3} elements", property.PropertyType.Name, property.Name, expectedList.Count, actualList.Count);
+            Assert.Fail(
+                "Property {0}.{1} does not match. Expected IList containing {2} elements but was IList containing {3} elements",
+                property.PropertyType.Name, property.Name, expectedList.Count, actualList.Count);
 
         for (var i = 0; i < actualList.Count; i++)
             if (!Equals(actualList[i], expectedList[i]))
-                Assert.Fail("Property {0}.{1} does not match. Expected IList with element {1} equals to {2} but was IList with element {1} equals to {3}", property.PropertyType.Name, property.Name, expectedList[i], actualList[i]);
+                Assert.Fail(
+                    "Property {0}.{1} does not match. Expected IList with element {1} equals to {2} but was IList with element {1} equals to {3}",
+                    property.PropertyType.Name, property.Name, expectedList[i], actualList[i]);
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfigurationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfigurationTests.cs
index 2a06496752..07d9dc77d5 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfigurationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfigurationTests.cs
@@ -18,9 +18,8 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.DatabaseManagement.EntityNaming;
 
-internal class HICDatabaseConfigurationTests: UnitTests
+internal class HICDatabaseConfigurationTests : UnitTests
 {
-
     /// <summary>
     /// Tests the ability of <see cref="HICDatabaseConfiguration"/> to predict where tables will exist
     /// during a load at various stages (RAW, STAGING etc).  This is largely controlled by what tables the
@@ -41,31 +40,31 @@ public void TestHICDatabaseConfiguration_ExpectTables(bool testLookup)
         lookup.Database = "LookupsDb";
         lookup.SaveToDatabase();
 
-        var job = Mock.Of<IDataLoadJob>(m=>
-            m.RegularTablesToLoad == new List<ITableInfo>(new []{ti}) &&
-            m.LookupTablesToLoad == new List<ITableInfo>(new []{lookup}));
+        var job = Mock.Of<IDataLoadJob>(m =>
+            m.RegularTablesToLoad == new List<ITableInfo>(new[] { ti }) &&
+            m.LookupTablesToLoad == new List<ITableInfo>(new[] { lookup }));
 
         var result = conf.ExpectTables(job, LoadBubble.Raw, testLookup).ToArray();
 
-        Assert.AreEqual(testLookup ? 2 : 1,result.Length);
-        StringAssert.AreEqualIgnoringCase("mydb_RAW",result[0].Database.GetRuntimeName());
-        StringAssert.AreEqualIgnoringCase("My_Table",result[0].GetRuntimeName());
+        Assert.AreEqual(testLookup ? 2 : 1, result.Length);
+        StringAssert.AreEqualIgnoringCase("mydb_RAW", result[0].Database.GetRuntimeName());
+        StringAssert.AreEqualIgnoringCase("My_Table", result[0].GetRuntimeName());
 
         if (testLookup)
         {
-            StringAssert.AreEqualIgnoringCase("mydb_RAW",result[1].Database.GetRuntimeName());
-            StringAssert.AreEqualIgnoringCase("MyHeartyLookup",result[1].GetRuntimeName());
+            StringAssert.AreEqualIgnoringCase("mydb_RAW", result[1].Database.GetRuntimeName());
+            StringAssert.AreEqualIgnoringCase("MyHeartyLookup", result[1].GetRuntimeName());
         }
 
         result = conf.ExpectTables(job, LoadBubble.Staging, testLookup).ToArray();
-        Assert.AreEqual(testLookup ? 2 : 1,result.Length);
-        StringAssert.AreEqualIgnoringCase("DLE_STAGING",result[0].Database.GetRuntimeName());
-        StringAssert.AreEqualIgnoringCase("mydb_My_Table_STAGING",result[0].GetRuntimeName());
+        Assert.AreEqual(testLookup ? 2 : 1, result.Length);
+        StringAssert.AreEqualIgnoringCase("DLE_STAGING", result[0].Database.GetRuntimeName());
+        StringAssert.AreEqualIgnoringCase("mydb_My_Table_STAGING", result[0].GetRuntimeName());
 
         if (testLookup)
         {
-            StringAssert.AreEqualIgnoringCase("DLE_STAGING",result[1].Database.GetRuntimeName());
-            StringAssert.AreEqualIgnoringCase("mydb_MyHeartyLookup_STAGING",result[1].GetRuntimeName());
+            StringAssert.AreEqualIgnoringCase("DLE_STAGING", result[1].Database.GetRuntimeName());
+            StringAssert.AreEqualIgnoringCase("mydb_MyHeartyLookup_STAGING", result[1].GetRuntimeName());
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/TableInfoCloneOperationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/TableInfoCloneOperationTests.cs
index 0d74158d9f..e6bcc11974 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/TableInfoCloneOperationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/DatabaseManagement/TableInfoCloneOperationTests.cs
@@ -23,15 +23,17 @@ public void Test_CloneTable()
         dt.Columns.Add("FF");
 
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
-        var tbl = db.CreateTable("MyTable",dt);
+        var tbl = db.CreateTable("MyTable", dt);
 
-        Import(tbl,out var ti, out _);
+        Import(tbl, out var ti, out _);
 
         var config = new HICDatabaseConfiguration(tbl.Database.Server);
 
         //create a RAW table schema called TableName_Isolation
-        var cloner = new TableInfoCloneOperation(config,(TableInfo)ti,LoadBubble.Live,new ThrowImmediatelyDataLoadEventListener());
-        cloner.CloneTable(tbl.Database, tbl.Database,tbl, $"{tbl.GetRuntimeName()}_copy", true, true, true, ti.PreLoadDiscardedColumns);
+        var cloner = new TableInfoCloneOperation(config, (TableInfo)ti, LoadBubble.Live,
+            new ThrowImmediatelyDataLoadEventListener());
+        cloner.CloneTable(tbl.Database, tbl.Database, tbl, $"{tbl.GetRuntimeName()}_copy", true, true, true,
+            ti.PreLoadDiscardedColumns);
 
         var tbl2 = tbl.Database.ExpectTable($"{tbl.GetRuntimeName()}_copy");
 
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillSqlHelperTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillSqlHelperTests.cs
index 818616112b..0d287188f5 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillSqlHelperTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillSqlHelperTests.cs
@@ -40,12 +40,17 @@ public void TestGenerateSqlForThreeLevelJoinPath_TimePeriodIsGrandparent()
     {
         ThreeTableSetupWhereTimePeriodIsGrandparent();
 
-        var ciTimePeriodicity = CatalogueRepository.GetAllObjects<ColumnInfo>().SingleOrDefault(c => c.GetRuntimeName().Equals("HeaderDate")) ?? throw new InvalidOperationException("Could not find TimePeriodicity column");
+        var ciTimePeriodicity =
+            CatalogueRepository.GetAllObjects<ColumnInfo>()
+                .SingleOrDefault(c => c.GetRuntimeName().Equals("HeaderDate")) ??
+            throw new InvalidOperationException("Could not find TimePeriodicity column");
         var sqlHelper = new BackfillSqlHelper(ciTimePeriodicity, From, To);
 
-        var tiHeader = CatalogueRepository.GetAllObjects<TableInfo>().Single(t=>t.GetRuntimeName().Equals("Headers"));
-        var tiSamples = CatalogueRepository.GetAllObjects<TableInfo>().Single(t => t.GetRuntimeName().Equals("Samples"));
-        var tiResults = CatalogueRepository.GetAllObjects<TableInfo>().Single(t => t.GetRuntimeName().Equals("Results"));
+        var tiHeader = CatalogueRepository.GetAllObjects<TableInfo>().Single(t => t.GetRuntimeName().Equals("Headers"));
+        var tiSamples = CatalogueRepository.GetAllObjects<TableInfo>()
+            .Single(t => t.GetRuntimeName().Equals("Samples"));
+        var tiResults = CatalogueRepository.GetAllObjects<TableInfo>()
+            .Single(t => t.GetRuntimeName().Equals("Results"));
 
         var joinInfos = CatalogueRepository.GetAllObjects<JoinInfo>();
         var joinPath = new List<JoinInfo>
@@ -54,8 +59,8 @@ public void TestGenerateSqlForThreeLevelJoinPath_TimePeriodIsGrandparent()
             joinInfos.Single(info => info.PrimaryKey.TableInfo_ID == tiSamples.ID)
         };
 
-        var sql = sqlHelper.CreateSqlForJoinToTimePeriodicityTable("CurrentTable", tiResults, "TimePeriodicityTable", From, joinPath);
-
+        var sql = sqlHelper.CreateSqlForJoinToTimePeriodicityTable("CurrentTable", tiResults, "TimePeriodicityTable",
+            From, joinPath);
 
 
         Assert.AreEqual(string.Format(@"SELECT CurrentTable.*, TimePeriodicityTable.HeaderDate AS TimePeriodicityField 
@@ -68,8 +73,10 @@ FROM [{0}]..[Results] CurrentTable
     private void ThreeTableSetupWhereTimePeriodIsGrandparent()
     {
         CreateTables("Headers", "ID int NOT NULL, HeaderDate DATETIME, Discipline varchar(32)", "ID");
-        CreateTables("Samples", "ID int NOT NULL, HeaderID int NOT NULL, SampleType varchar(32)", "ID", "CONSTRAINT [FK_Headers_Samples] FOREIGN KEY (HeaderID) REFERENCES Headers (ID)");
-        CreateTables("Results", "ID int NOT NULL, SampleID int NOT NULL, Result int", "ID", "CONSTRAINT [FK_Samples_Results] FOREIGN KEY (SampleID) REFERENCES Samples (ID)");
+        CreateTables("Samples", "ID int NOT NULL, HeaderID int NOT NULL, SampleType varchar(32)", "ID",
+            "CONSTRAINT [FK_Headers_Samples] FOREIGN KEY (HeaderID) REFERENCES Headers (ID)");
+        CreateTables("Results", "ID int NOT NULL, SampleID int NOT NULL, Result int", "ID",
+            "CONSTRAINT [FK_Samples_Results] FOREIGN KEY (SampleID) REFERENCES Samples (ID)");
 
         // Set SetUp catalogue entities
 
@@ -86,17 +93,18 @@ private void ThreeTableSetupWhereTimePeriodIsGrandparent()
         Assert.AreEqual(15, _catalogue.CatalogueItems.Length, "Unexpected number of items in catalogue");
 
         // Headers (1:M) Samples join
-        new JoinInfo(CatalogueRepository,ciSamples.Single(ci => ci.GetRuntimeName().Equals("HeaderID")),
+        new JoinInfo(CatalogueRepository, ciSamples.Single(ci => ci.GetRuntimeName().Equals("HeaderID")),
             ciHeaders.Single(ci => ci.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
 
         // Samples (1:M) Results join
-        new JoinInfo(CatalogueRepository,ciResults.Single(info => info.GetRuntimeName().Equals("SampleID")),
+        new JoinInfo(CatalogueRepository, ciResults.Single(info => info.GetRuntimeName().Equals("SampleID")),
             ciSamples.Single(info => info.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
     }
 
-    private void CreateTables(string tableName, string columnDefinitions, string pkColumn, string fkConstraintString = null)
+    private void CreateTables(string tableName, string columnDefinitions, string pkColumn,
+        string fkConstraintString = null)
     {
         // todo: doesn't do combo primary keys yet
 
@@ -105,7 +113,9 @@ private void CreateTables(string tableName, string columnDefinitions, string pkC
 
         var pkConstraint = $"CONSTRAINT PK_{tableName} PRIMARY KEY ({pkColumn})";
         var stagingTableDefinition = $"{columnDefinitions}, {pkConstraint}";
-        var liveTableDefinition = columnDefinitions + string.Format(", "+SpecialFieldNames.ValidFrom+" DATETIME, "+SpecialFieldNames.DataLoadRunID+" int, " + pkConstraint);
+        var liveTableDefinition = columnDefinitions + string.Format(", " + SpecialFieldNames.ValidFrom + " DATETIME, " +
+                                                                    SpecialFieldNames.DataLoadRunID + " int, " +
+                                                                    pkConstraint);
 
         if (fkConstraintString != null)
         {
@@ -113,13 +123,15 @@ private void CreateTables(string tableName, string columnDefinitions, string pkC
             liveTableDefinition += $", {fkConstraintString}";
         }
 
-        CreateTableWithColumnDefinitions(From,tableName, stagingTableDefinition);
-        CreateTableWithColumnDefinitions(To,tableName, liveTableDefinition);
+        CreateTableWithColumnDefinitions(From, tableName, stagingTableDefinition);
+        CreateTableWithColumnDefinitions(To, tableName, liveTableDefinition);
     }
 
-    private ITableInfo AddTableToCatalogue(string databaseName, string tableName, string pkName, out ColumnInfo[] ciList, bool createCatalogue = false)
+    private ITableInfo AddTableToCatalogue(string databaseName, string tableName, string pkName,
+        out ColumnInfo[] ciList, bool createCatalogue = false)
     {
-        var expectedTable = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(databaseName).ExpectTable(tableName);
+        var expectedTable = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(databaseName)
+            .ExpectTable(tableName);
 
         var resultsImporter = new TableInfoImporter(CatalogueRepository, expectedTable);
 
@@ -131,26 +143,26 @@ private ITableInfo AddTableToCatalogue(string databaseName, string tableName, st
 
         var forwardEngineer = new ForwardEngineerCatalogue(ti, ciList);
         if (createCatalogue)
-        {
-
-            forwardEngineer.ExecuteForwardEngineering(out _catalogue, out CatalogueItem[] cataItems, out ExtractionInformation[] extractionInformations);
-        }
+            forwardEngineer.ExecuteForwardEngineering(out _catalogue, out var cataItems,
+                out var extractionInformations);
         else
             forwardEngineer.ExecuteForwardEngineering(_catalogue);
 
         return ti;
     }
 
-    public static void CreateTableWithColumnDefinitions(DiscoveredDatabase db, string tableName, string columnDefinitions)
+    public static void CreateTableWithColumnDefinitions(DiscoveredDatabase db, string tableName,
+        string columnDefinitions)
     {
         using (var conn = db.Server.GetConnection())
         {
             conn.Open();
-            CreateTableWithColumnDefinitions(db,tableName, columnDefinitions, conn);
+            CreateTableWithColumnDefinitions(db, tableName, columnDefinitions, conn);
         }
     }
 
-    public static void CreateTableWithColumnDefinitions(DiscoveredDatabase db, string tableName, string columnDefinitions, DbConnection conn)
+    public static void CreateTableWithColumnDefinitions(DiscoveredDatabase db, string tableName,
+        string columnDefinitions, DbConnection conn)
     {
         var sql = $"CREATE TABLE {tableName} ({columnDefinitions})";
         db.Server.GetCommand(sql, conn).ExecuteNonQuery();
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillTests.cs
index f76fe557e4..020c971a60 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/BackfillTests.cs
@@ -22,7 +22,6 @@ namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
 public class BackfillTests : FromToDatabaseTests
 {
-
     private ICatalogue _catalogue;
 
 
@@ -44,13 +43,15 @@ public void Backfill_SingleTable_LoadContainsNewerUpdate()
         SingleTableSetup();
 
         #region Insert test data
+
         // add To data
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
             connection.Open();
 
             var cmd = new SqlCommand(
-                $"INSERT INTO [Samples] (ID, SampleDate, Description, {SpecialFieldNames.ValidFrom}, {SpecialFieldNames.DataLoadRunID}) VALUES (10, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1)", connection);
+                $"INSERT INTO [Samples] (ID, SampleDate, Description, {SpecialFieldNames.ValidFrom}, {SpecialFieldNames.DataLoadRunID}) VALUES (10, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1)",
+                connection);
             cmd.ExecuteNonQuery();
         }
 
@@ -64,6 +65,7 @@ public void Backfill_SingleTable_LoadContainsNewerUpdate()
                                      "(10, '2016-01-11T12:00:00', 'Newer than in To, should update To')", connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         // databases are now represent state after push to From and before migration
@@ -80,7 +82,8 @@ public void Backfill_SingleTable_LoadContainsNewerUpdate()
 
             cmd = new SqlCommand(@"SELECT Description FROM Samples", connection);
             var description = cmd.ExecuteScalar().ToString();
-            Assert.AreEqual(description, "Newer than in To, should update To", "Description has been altered but is a valid update to To so should not have been touched.");
+            Assert.AreEqual(description, "Newer than in To, should update To",
+                "Description has been altered but is a valid update to To so should not have been touched.");
         }
     }
 
@@ -89,7 +92,7 @@ private void SingleTableSetup()
         CreateTables("Samples", "ID int NOT NULL, SampleDate DATETIME, Description varchar(1024)", "ID");
 
         // Set SetUp catalogue entities
-        AddTableToCatalogue(DatabaseName, "Samples", "ID", out ColumnInfo[] ciSamples, true);
+        AddTableToCatalogue(DatabaseName, "Samples", "ID", out var ciSamples, true);
 
         Assert.AreEqual(5, _catalogue.CatalogueItems.Length, "Unexpected number of items in catalogue");
     }
@@ -98,7 +101,8 @@ private void Mutilate(string timeColumnName)
     {
         var mutilator = new StagingBackfillMutilator
         {
-            TimePeriodicityField = CatalogueRepository.GetAllObjects<ColumnInfo>().Single(c=>c.Name.Equals(timeColumnName)),
+            TimePeriodicityField = CatalogueRepository.GetAllObjects<ColumnInfo>()
+                .Single(c => c.Name.Equals(timeColumnName)),
             TestContext = true,
             TableNamingScheme = new IdentityTableNamingScheme()
         };
@@ -114,13 +118,15 @@ public void Backfill_SingleTable_LoadContainsOlderUpdate()
         SingleTableSetup();
 
         #region Insert test data
+
         // add To data
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
             connection.Open();
 
             var cmd = new SqlCommand(
-                $"INSERT INTO [Samples] (ID, SampleDate, Description, {SpecialFieldNames.ValidFrom}, {SpecialFieldNames.DataLoadRunID}) VALUES (1, '2016-01-10T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-10T12:00:00', 1)", connection);
+                $"INSERT INTO [Samples] (ID, SampleDate, Description, {SpecialFieldNames.ValidFrom}, {SpecialFieldNames.DataLoadRunID}) VALUES (1, '2016-01-10T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-10T12:00:00', 1)",
+                connection);
             cmd.ExecuteNonQuery();
         }
 
@@ -131,9 +137,11 @@ public void Backfill_SingleTable_LoadContainsOlderUpdate()
 
             // newer update
             var cmd = new SqlCommand("INSERT INTO [Samples] (ID, SampleDate, Description) VALUES " +
-                                     "(1, '2016-01-09T12:00:00', 'Older than in To, should be deleted by the mutilator')", connection);
+                                     "(1, '2016-01-09T12:00:00', 'Older than in To, should be deleted by the mutilator')",
+                connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         // databases are now represent state after push to From and before migration
@@ -146,7 +154,8 @@ public void Backfill_SingleTable_LoadContainsOlderUpdate()
 
             var cmd = new SqlCommand(@"SELECT COUNT(*) FROM Samples", connection);
             var numRows = cmd.ExecuteScalar();
-            Assert.AreEqual(0, numRows, "The record to be loaded is older than the corresponding record in To, should have been deleted");
+            Assert.AreEqual(0, numRows,
+                "The record to be loaded is older than the corresponding record in To, should have been deleted");
         }
     }
 
@@ -156,13 +165,16 @@ public void Backfill_SingleTable_LoadContainsInsert()
         SingleTableSetup();
 
         #region Insert test data
+
         // add To data
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
             connection.Open();
 
-            var cmd = new SqlCommand("INSERT INTO [Samples] (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                     "(1, '2016-01-10T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-10T12:00:00', 1)", connection);
+            var cmd = new SqlCommand(
+                "INSERT INTO [Samples] (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+                "(1, '2016-01-10T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-10T12:00:00', 1)",
+                connection);
             cmd.ExecuteNonQuery();
         }
 
@@ -173,9 +185,11 @@ public void Backfill_SingleTable_LoadContainsInsert()
 
             // newer update
             var cmd = new SqlCommand("INSERT INTO [Samples] (ID, SampleDate, Description) VALUES " +
-                                     "(2, '2016-01-09T12:00:00', 'Does not exist in To, should remain in From after mutilation.')", connection);
+                                     "(2, '2016-01-09T12:00:00', 'Does not exist in To, should remain in From after mutilation.')",
+                connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         // databases are now represent state after push to From and before migration
@@ -192,8 +206,8 @@ public void Backfill_SingleTable_LoadContainsInsert()
 
             cmd = new SqlCommand(@"SELECT Description FROM Samples", connection);
             var description = cmd.ExecuteScalar().ToString();
-            Assert.AreEqual(description, "Does not exist in To, should remain in From after mutilation.", "Description has been altered but is a valid update to To so should not have been touched.");
-
+            Assert.AreEqual(description, "Does not exist in To, should remain in From after mutilation.",
+                "Description has been altered but is a valid update to To so should not have been touched.");
         }
     }
 
@@ -203,14 +217,17 @@ public void Backfill_SingleTable_Combined()
         SingleTableSetup();
 
         #region Insert test data
+
         // add To data
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
             connection.Open();
 
-            var cmd = new SqlCommand("INSERT INTO [Samples] (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                     "(1, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1)," +
-                                     "(2, '2016-01-15T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-15T12:00:00', 2)", connection);
+            var cmd = new SqlCommand(
+                "INSERT INTO [Samples] (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+                "(1, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1)," +
+                "(2, '2016-01-15T12:00:00', 'Later than corresponding new data, should not be updated', '2016-01-15T12:00:00', 2)",
+                connection);
             cmd.ExecuteNonQuery();
         }
 
@@ -225,6 +242,7 @@ public void Backfill_SingleTable_Combined()
                                      "(3, '2016-01-12T12:00:00', 'New data')", connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         Mutilate($"[{DatabaseName}].[dbo].[Samples].[SampleDate]");
@@ -236,15 +254,16 @@ public void Backfill_SingleTable_Combined()
 
             var cmd = new SqlCommand(@"SELECT COUNT(*) FROM Samples", connection);
             var numRows = cmd.ExecuteScalar();
-            Assert.AreEqual(2, numRows, "Record 2 should have been deleted as it is an update to a record for which we have a later version.");
+            Assert.AreEqual(2, numRows,
+                "Record 2 should have been deleted as it is an update to a record for which we have a later version.");
         }
-
     }
 
     private void TwoTableSetupWhereTimePeriodIsParent()
     {
         CreateTables("Samples", "ID int NOT NULL, SampleDate DATETIME, Description varchar(1024)", "ID");
-        CreateTables("Results", "ID int NOT NULL, SampleID int NOT NULL, Result int", "ID", "CONSTRAINT [FK_Samples_Results] FOREIGN KEY (SampleID) REFERENCES Samples (ID)");
+        CreateTables("Results", "ID int NOT NULL, SampleID int NOT NULL, Result int", "ID",
+            "CONSTRAINT [FK_Samples_Results] FOREIGN KEY (SampleID) REFERENCES Samples (ID)");
 
         // Set SetUp catalogue entities
 
@@ -260,7 +279,7 @@ private void TwoTableSetupWhereTimePeriodIsParent()
         Assert.AreEqual(10, _catalogue.CatalogueItems.Length, "Unexpected number of items in catalogue");
 
         // Samples (1:M) Results join
-        new JoinInfo(CatalogueRepository,ciResults.Single(info => info.GetRuntimeName().Equals("SampleID")),
+        new JoinInfo(CatalogueRepository, ciResults.Single(info => info.GetRuntimeName().Equals("SampleID")),
             ciSamples.Single(info => info.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
     }
@@ -271,12 +290,15 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsNewerUpdate()
         TwoTableSetupWhereTimePeriodIsParent();
 
         #region Insert To test data
-        const string liveSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
 
-        const string liveResultsSql = "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
-                                      "(11, 1, 234, '2016-01-10T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
+
+        const string liveResultsSql =
+            "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
+            "(11, 1, 234, '2016-01-10T12:00:00', 1)";
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
@@ -288,9 +310,11 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsNewerUpdate()
             cmd = new SqlCommand(liveResultsSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description) VALUES " +
                                          "(1, '2016-01-15T12:00:00', 'Sample is later than corresponding record in To, contains a child update (ID=11), child insert (ID=12) and this updated description')";
@@ -311,7 +335,6 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsNewerUpdate()
             cmd.ExecuteNonQuery();
         }
 
-
         #endregion
 
         Mutilate($"[{DatabaseName}].[dbo].[Samples].[SampleDate]");
@@ -337,12 +360,15 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsOlderUpdate()
         TwoTableSetupWhereTimePeriodIsParent();
 
         #region Insert To test data
-        const string liveSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
 
-        const string liveResultsSql = "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
-                                      "(11, 1, 234, '2016-01-10T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
+
+        const string liveResultsSql =
+            "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
+            "(11, 1, 234, '2016-01-10T12:00:00', 1)";
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
@@ -354,9 +380,11 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsOlderUpdate()
             cmd = new SqlCommand(liveResultsSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description) VALUES " +
                                          "(1, '2016-01-09T12:00:00', 'Sample is earlier than corresponding record in To (also contains an item which has apparently been deleted in the set used for a later load)')";
@@ -377,7 +405,6 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsOlderUpdate()
             cmd.ExecuteNonQuery();
         }
 
-
         #endregion
 
         Mutilate($"[{DatabaseName}].[dbo].[Samples].[SampleDate]");
@@ -409,7 +436,8 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainsOlderUpdate()
                 Assert.IsTrue(reader.HasRows);
 
                 reader.Read();
-                Assert.AreEqual("", reader["Description"].ToString(), "The To sample had a blank description which should have been copied in to the earlier From record.");
+                Assert.AreEqual("", reader["Description"].ToString(),
+                    "The To sample had a blank description which should have been copied in to the earlier From record.");
 
                 var hasMoreResults = reader.Read();
                 Assert.IsFalse(hasMoreResults, "Should only be one Samples row in From");
@@ -423,12 +451,15 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainInsert()
         TwoTableSetupWhereTimePeriodIsParent();
 
         #region Insert To test data
-        const string liveSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
 
-        const string liveResultsSql = "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
-                                      "(11, 1, 234, '2016-01-10T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
+
+        const string liveResultsSql =
+            "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, 123, '2016-01-10T12:00:00', 1), " +
+            "(11, 1, 234, '2016-01-10T12:00:00', 1)";
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
         {
@@ -440,9 +471,11 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainInsert()
             cmd = new SqlCommand(liveResultsSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingSamplesSql = "INSERT INTO Samples (ID, SampleDate, Description) VALUES " +
                                          "(2, '2016-01-15T12:00:00', 'New sample')";
@@ -463,7 +496,6 @@ public void Backfill_TwoTables_TimePeriodParent_LoadContainInsert()
             cmd.ExecuteNonQuery();
         }
 
-
         #endregion
 
         Mutilate($"[{DatabaseName}].[dbo].[Samples].[SampleDate]");
@@ -504,7 +536,7 @@ private void TwoTableSetupWhereTimePeriodIsChild()
         Assert.AreEqual(10, _catalogue.CatalogueItems.Length, "Unexpected number of items in catalogue");
 
         // Headers (1:M) Samples join
-        new JoinInfo(CatalogueRepository,ciSamples.Single(info => info.GetRuntimeName().Equals("HeaderID")),
+        new JoinInfo(CatalogueRepository, ciSamples.Single(info => info.GetRuntimeName().Equals("HeaderID")),
             ciHeaders.Single(info => info.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
     }
@@ -515,11 +547,13 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOlderUpdate()
         TwoTableSetupWhereTimePeriodIsChild();
 
         #region Insert To test data
+
         const string liveHeaderSql = "INSERT INTO Headers (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
                                      "(1, 'Biochemistry', '2016-01-10T12:00:00', 1)";
 
-        const string liveSamplesSql = "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(10, 1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, '2016-01-10T12:00:00', '', '2016-01-10T12:00:00', 1)";
 
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
@@ -532,9 +566,11 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOlderUpdate()
             cmd = new SqlCommand(liveSamplesSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingHeadersSql = "INSERT INTO Headers (ID, Discipline) VALUES " +
                                          "(1, 'Biochemistry')";
@@ -553,7 +589,6 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOlderUpdate()
             cmd.ExecuteNonQuery();
         }
 
-
         #endregion
 
         Mutilate($"[{DatabaseName}].[dbo].[Samples].[SampleDate]");
@@ -584,11 +619,13 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOldInsert_WithOldPare
         TwoTableSetupWhereTimePeriodIsChild();
 
         #region Insert To test data
+
         const string liveHeaderSql = "INSERT INTO Headers (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
                                      "(1, 'Biochemistry', '2016-01-15T12:00:00', 1)";
 
-        const string liveSamplesSql = "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(11, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(11, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 1)";
 
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
@@ -601,9 +638,11 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOldInsert_WithOldPare
             cmd = new SqlCommand(liveSamplesSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingHeadersSql = "INSERT INTO Headers (ID, Discipline) VALUES " +
                                          "(1, 'Haematology')"; // old and incorrect Discipline value
@@ -637,11 +676,13 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsOldInsert_WithOldPare
 
             cmd = new SqlCommand(@"SELECT COUNT(*) FROM Headers", connection);
             numRows = cmd.ExecuteScalar();
-            Assert.AreEqual(1, numRows, "Header should still be there (shouldn't be able to delete it as there should be a FK constraint with Samples)");
+            Assert.AreEqual(1, numRows,
+                "Header should still be there (shouldn't be able to delete it as there should be a FK constraint with Samples)");
 
             cmd = new SqlCommand(@"SELECT Discipline FROM Headers WHERE ID=1", connection);
             var discipline = cmd.ExecuteScalar().ToString();
-            Assert.AreEqual("Biochemistry", discipline, "Header record in From be updated to reflect what is in To: the To record is authoritative as it contains at least one child from a later date.");
+            Assert.AreEqual("Biochemistry", discipline,
+                "Header record in From be updated to reflect what is in To: the To record is authoritative as it contains at least one child from a later date.");
         }
     }
 
@@ -651,12 +692,14 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsNewInsert_WithNewPare
         TwoTableSetupWhereTimePeriodIsChild();
 
         #region Insert To test data
+
         const string liveHeaderSql = "INSERT INTO Headers (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
                                      "(1, 'Biochemistry', '2016-01-15T12:00:00', 1)";
 
-        const string liveSamplesSql = "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(10, 1, '2016-01-15T10:00:00', '', '2016-01-15T12:00:00', 1), " +
-                                      "(11, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 1)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, '2016-01-15T10:00:00', '', '2016-01-15T12:00:00', 1), " +
+            "(11, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 1)";
 
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
@@ -669,9 +712,11 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsNewInsert_WithNewPare
             cmd = new SqlCommand(liveSamplesSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingHeadersSql = "INSERT INTO Headers (ID, Discipline) VALUES " +
                                          "(1, 'Haematology')"; // old and incorrect Discipline value
@@ -705,11 +750,13 @@ public void Backfill_TwoTables_TimePeriodChild_LoadContainsNewInsert_WithNewPare
 
             cmd = new SqlCommand(@"SELECT COUNT(*) FROM Headers", connection);
             numRows = cmd.ExecuteScalar();
-            Assert.AreEqual(1, numRows, "Header should still be there (shouldn't be able to delete it as there should be a FK constraint with Samples)");
+            Assert.AreEqual(1, numRows,
+                "Header should still be there (shouldn't be able to delete it as there should be a FK constraint with Samples)");
 
             cmd = new SqlCommand(@"SELECT Discipline FROM Headers WHERE ID=1", connection);
             var discipline = cmd.ExecuteScalar().ToString();
-            Assert.AreEqual("Haematology", discipline, "Header record in From should not be updated as it is 'correct'.");
+            Assert.AreEqual("Haematology", discipline,
+                "Header record in From should not be updated as it is 'correct'.");
         }
     }
 
@@ -719,18 +766,20 @@ public void Backfill_TwoTables_TimePeriodChild_Combined()
         TwoTableSetupWhereTimePeriodIsChild();
 
         #region Insert To test data
+
         const string liveHeaderSql = "INSERT INTO Headers (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
                                      "(1, 'Haematology', '2016-01-15T12:00:00', 2), " +
                                      "(2, 'Haematology', '2016-01-05T12:00:00', 1), " +
                                      "(3, 'Biochemistry', '2016-01-15T12:00:00', 2), " +
                                      "(4, 'Haematology', '2016-01-15T12:00:00', 2)";
 
-        const string liveSamplesSql = "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                      "(12, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
-                                      "(13, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
-                                      "(14, 2, '2016-01-05T12:00:00', '', '2016-01-05T12:00:00', 1), " +
-                                      "(15, 3, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
-                                      "(16, 4, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2)";
+        const string liveSamplesSql =
+            "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(12, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
+            "(13, 1, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
+            "(14, 2, '2016-01-05T12:00:00', '', '2016-01-05T12:00:00', 1), " +
+            "(15, 3, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2), " +
+            "(16, 4, '2016-01-15T12:00:00', '', '2016-01-15T12:00:00', 2)";
 
 
         using (var connection = (SqlConnection)To.Server.GetConnection())
@@ -743,9 +792,11 @@ public void Backfill_TwoTables_TimePeriodChild_Combined()
             cmd = new SqlCommand(liveSamplesSql, connection);
             cmd.ExecuteNonQuery();
         }
+
         #endregion
 
         #region Add From test data
+
         // add From data
         const string stagingHeadersSql = "INSERT INTO Headers (ID, Discipline) VALUES " +
                                          "(1, 'Biochemistry'), " +
@@ -819,7 +870,8 @@ public void Backfill_TwoTables_TimePeriodChild_Combined()
         }
     }
 
-    private void CreateTables(string tableName, string columnDefinitions, string pkColumn, string fkConstraintString = null)
+    private void CreateTables(string tableName, string columnDefinitions, string pkColumn,
+        string fkConstraintString = null)
     {
         // todo: doesn't do combo primary keys yet
 
@@ -828,7 +880,8 @@ private void CreateTables(string tableName, string columnDefinitions, string pkC
 
         var pkConstraint = $"CONSTRAINT PK_{tableName} PRIMARY KEY ({pkColumn})";
         var stagingTableDefinition = $"{columnDefinitions}, {pkConstraint}";
-        var liveTableDefinition = columnDefinitions + string.Format(", hic_validFrom DATETIME, hic_dataLoadRunID int, " + pkConstraint);
+        var liveTableDefinition = columnDefinitions +
+                                  string.Format(", hic_validFrom DATETIME, hic_dataLoadRunID int, " + pkConstraint);
 
         if (fkConstraintString != null)
         {
@@ -837,23 +890,25 @@ private void CreateTables(string tableName, string columnDefinitions, string pkC
         }
 
 
-        using (var con = (SqlConnection) From.Server.GetConnection())
+        using (var con = (SqlConnection)From.Server.GetConnection())
         {
             con.Open();
-            new SqlCommand($"CREATE TABLE {tableName} ({stagingTableDefinition})",con).ExecuteNonQuery();
+            new SqlCommand($"CREATE TABLE {tableName} ({stagingTableDefinition})", con).ExecuteNonQuery();
         }
 
-        using(var con = (SqlConnection)To.Server.GetConnection())
+        using (var con = (SqlConnection)To.Server.GetConnection())
         {
             con.Open();
-            new SqlCommand($"CREATE TABLE {tableName} ({liveTableDefinition})",con).ExecuteNonQuery();
+            new SqlCommand($"CREATE TABLE {tableName} ({liveTableDefinition})", con).ExecuteNonQuery();
         }
     }
 
-    [Test, Ignore("Restructuring tests")]
+    [Test]
+    [Ignore("Restructuring tests")]
     public void DeleteNewerCollisionsFromTable()
     {
         #region Set SetUp databases
+
         CreateTables("Header", "ID int NOT NULL, Discipline varchar(32) NOT NULL", "ID");
 
         CreateTables("Samples",
@@ -873,32 +928,38 @@ public void DeleteNewerCollisionsFromTable()
 
         // should be all entities set SetUp now
         Assert.AreEqual(15, _catalogue.CatalogueItems.Length, "Unexpected number of items in catalogue");
+
         #endregion
 
         // add data
+
         #region Populate Tables
+
         var connection = (SqlConnection)To.Server.GetConnection();
         connection.Open();
 
-        const string liveHeaderDataSql = "INSERT INTO Header (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                         "(1, 'Biochemistry', '2016-01-15T15:00:00', 4), " +
-                                         "(3, 'Haematology', '2016-01-15T12:00:00', 3)";
+        const string liveHeaderDataSql =
+            "INSERT INTO Header (ID, Discipline, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(1, 'Biochemistry', '2016-01-15T15:00:00', 4), " +
+            "(3, 'Haematology', '2016-01-15T12:00:00', 3)";
         var liveHeaderDataSqlCommand = new SqlCommand(liveHeaderDataSql, connection);
         liveHeaderDataSqlCommand.ExecuteNonQuery();
 
-        const string liveSampleDataSql = "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                         "(10, 1, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1), " +
-                                         "(11, 1, '2016-01-15T15:00:00', 'Later than corresponding new data, should not be touched', '2016-01-15T15:00:00', 4), " +
-                                         "(14, 3, '2016-01-15T12:00:00', 'Header data of newly loaded (but older) sample should *not* update this rows parent header', '2016-01-15T12:00:00', 3)";
+        const string liveSampleDataSql =
+            "INSERT INTO Samples (ID, HeaderID, SampleDate, Description, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(10, 1, '2016-01-10T12:00:00', 'Earlier than corresponding new data, should be updated', '2016-01-10T12:00:00', 1), " +
+            "(11, 1, '2016-01-15T15:00:00', 'Later than corresponding new data, should not be touched', '2016-01-15T15:00:00', 4), " +
+            "(14, 3, '2016-01-15T12:00:00', 'Header data of newly loaded (but older) sample should *not* update this rows parent header', '2016-01-15T12:00:00', 3)";
         var liveSampleDataSqlCommand = new SqlCommand(liveSampleDataSql, connection);
         liveSampleDataSqlCommand.ExecuteNonQuery();
 
-        const string liveResultDataSql = "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
-                                         "(100, 10, 999, '2016-01-10T12:00:00', 1), " +
-                                         "(101, 10, 888, '2016-01-10T12:00:00', 1), " +
-                                         "(102, 11, 456, '2016-01-15T15:00:00', 4), " +
-                                         "(103, 11, 654, '2016-01-15T15:00:00', 4), " +
-                                         "(107, 14, 111, '2016-01-15T12:00:00', 3)";
+        const string liveResultDataSql =
+            "INSERT INTO Results (ID, SampleID, Result, hic_validFrom, hic_dataLoadRunID) VALUES " +
+            "(100, 10, 999, '2016-01-10T12:00:00', 1), " +
+            "(101, 10, 888, '2016-01-10T12:00:00', 1), " +
+            "(102, 11, 456, '2016-01-15T15:00:00', 4), " +
+            "(103, 11, 654, '2016-01-15T15:00:00', 4), " +
+            "(107, 14, 111, '2016-01-15T12:00:00', 3)";
         var liveResultDataSqlCommand = new SqlCommand(liveResultDataSql, connection);
         liveResultDataSqlCommand.ExecuteNonQuery();
         connection.Close();
@@ -928,18 +989,19 @@ public void DeleteNewerCollisionsFromTable()
                                             "(104, 10, 666), " + // added this
                                             "(102, 11, 400), " + // earlier data (which is also wrong, 456 in To), To data is newer and corrected
                                             "(103, 11, 654), " +
-                                            "(105, 12, 123), " +  // new result (from new sample)
+                                            "(105, 12, 123), " + // new result (from new sample)
                                             "(106, 13, 123)"; // new result (from new sample)
         var stagingResultDataSqlCommand = new SqlCommand(stagingResultDataSql, connection);
         stagingResultDataSqlCommand.ExecuteNonQuery();
 
         connection.Close();
+
         #endregion
 
         // databases are now represent state after push to From and before migration
         var mutilator = new StagingBackfillMutilator
         {
-            TimePeriodicityField = CatalogueRepository.GetAllObjects<ColumnInfo>().Single(ci=>ci.Name ==
+            TimePeriodicityField = CatalogueRepository.GetAllObjects<ColumnInfo>().Single(ci => ci.Name ==
                 $"[{DatabaseName}]..[Samples].[SampleDate]"),
             TestContext = true,
             TableNamingScheme = new IdentityTableNamingScheme()
@@ -950,6 +1012,7 @@ public void DeleteNewerCollisionsFromTable()
         mutilator.Mutilate(new ThrowImmediatelyDataLoadJob());
 
         #region Assert
+
         // check that From contains the correct data
         // Sample ID=2 should have been deleted, along with corresponding results 102 and 103
         connection = (SqlConnection)From.Server.GetConnection();
@@ -961,7 +1024,8 @@ public void DeleteNewerCollisionsFromTable()
 
         cmd = new SqlCommand(@"SELECT Discipline FROM Header WHERE ID=1", connection);
         var discipline = cmd.ExecuteScalar();
-        Assert.AreEqual("Biochemistry", discipline, "The mutilator should **NOT** have updated record 1 from Biochemistry to Haematology. Although the load updates one of the To samples, the most recent To sample is later than the most recent loaded sample so the parent data in To takes precedence over the parent data in From.");
+        Assert.AreEqual("Biochemistry", discipline,
+            "The mutilator should **NOT** have updated record 1 from Biochemistry to Haematology. Although the load updates one of the To samples, the most recent To sample is later than the most recent loaded sample so the parent data in To takes precedence over the parent data in From.");
 
         // Not convinced about this test case
         //cmd = new SqlCommand(@"SELECT Discipline FROM Header WHERE ID=3", connection);
@@ -974,7 +1038,8 @@ public void DeleteNewerCollisionsFromTable()
 
         cmd = new SqlCommand(@"SELECT COUNT(*) FROM Samples", connection);
         numRows = cmd.ExecuteScalar();
-        Assert.AreEqual(2, numRows, "Sample ID = 2 has been deleted but something has happened to the other samples (should be untouched)");
+        Assert.AreEqual(2, numRows,
+            "Sample ID = 2 has been deleted but something has happened to the other samples (should be untouched)");
 
         cmd = new SqlCommand(@"SELECT COUNT(*) FROM Results WHERE SampleID = 2", connection);
         numRows = cmd.ExecuteScalar();
@@ -982,9 +1047,11 @@ public void DeleteNewerCollisionsFromTable()
 
         cmd = new SqlCommand(@"SELECT COUNT(*) FROM Results", connection);
         numRows = cmd.ExecuteScalar();
-        Assert.AreEqual(4, numRows, "Results belonging to Sample ID = 2 have been deleted but something has happeded to the other results (should be untouched)");
+        Assert.AreEqual(4, numRows,
+            "Results belonging to Sample ID = 2 have been deleted but something has happeded to the other results (should be untouched)");
 
         connection.Close();
+
         #endregion
 
         tiSamples.DeleteInDatabase();
@@ -1008,7 +1075,7 @@ private ITableInfo AddResultsTableToCatalogue(string databaseName, ColumnInfo[]
         var ti = AddTableToCatalogue(databaseName, "Results", "ID", out var ciList);
 
         // setup join infos
-        new JoinInfo(CatalogueRepository,ciList.Single(info => info.GetRuntimeName().Equals("SampleID")),
+        new JoinInfo(CatalogueRepository, ciList.Single(info => info.GetRuntimeName().Equals("SampleID")),
             ciSamples.Single(info => info.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
         return ti;
@@ -1019,7 +1086,7 @@ private ITableInfo AddHeaderTableToCatalogue(string databaseName, ColumnInfo[] c
         var ti = AddTableToCatalogue(databaseName, "Header", "ID", out var ciList);
 
         // setup join infos
-        new JoinInfo(CatalogueRepository,ciSamples.Single(info => info.GetRuntimeName().Equals("HeaderID")),
+        new JoinInfo(CatalogueRepository, ciSamples.Single(info => info.GetRuntimeName().Equals("HeaderID")),
             ciList.Single(info => info.GetRuntimeName().Equals("ID")),
             ExtractionJoinType.Left, "");
 
@@ -1029,9 +1096,11 @@ private ITableInfo AddHeaderTableToCatalogue(string databaseName, ColumnInfo[] c
         return ti;
     }
 
-    private ITableInfo AddTableToCatalogue(string databaseName, string tableName, string pkName, out ColumnInfo[] ciList, bool createCatalogue = false)
+    private ITableInfo AddTableToCatalogue(string databaseName, string tableName, string pkName,
+        out ColumnInfo[] ciList, bool createCatalogue = false)
     {
-        var table = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(databaseName).ExpectTable(tableName);
+        var table = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(databaseName)
+            .ExpectTable(tableName);
         var resultsImporter = new TableInfoImporter(CatalogueRepository, table);
 
         resultsImporter.DoImport(out var ti, out ciList);
@@ -1042,33 +1111,20 @@ private ITableInfo AddTableToCatalogue(string databaseName, string tableName, st
 
         var forwardEngineer = new ForwardEngineerCatalogue(ti, ciList);
         if (createCatalogue)
-        {
-
-            forwardEngineer.ExecuteForwardEngineering(out _catalogue, out CatalogueItem[] cataItems, out ExtractionInformation[] extractionInformations);
-        }
+            forwardEngineer.ExecuteForwardEngineering(out _catalogue, out var cataItems,
+                out var extractionInformations);
         else
             forwardEngineer.ExecuteForwardEngineering(_catalogue);
 
         return ti;
     }
-
-
 }
 
 internal class IdentityTableNamingScheme : INameDatabasesAndTablesDuringLoads
 {
-    public string GetDatabaseName(string rootDatabaseName, LoadBubble convention)
-    {
-        return rootDatabaseName;
-    }
+    public string GetDatabaseName(string rootDatabaseName, LoadBubble convention) => rootDatabaseName;
 
-    public string GetName(string tableName, LoadBubble convention)
-    {
-        return tableName;
-    }
+    public string GetName(string tableName, LoadBubble convention) => tableName;
 
-    public static bool IsNamedCorrectly(string tableName, LoadBubble convention)
-    {
-        return true;
-    }
+    public static bool IsNamedCorrectly(string tableName, LoadBubble convention) => true;
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CachedFileRetrieverTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CachedFileRetrieverTests.cs
index 814dc66f29..c2567088f7 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CachedFileRetrieverTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CachedFileRetrieverTests.cs
@@ -34,10 +34,11 @@ public class CachedFileRetrieverTests : DatabaseTests
     public CachedFileRetrieverTests()
     {
         _cpMock = Mock.Of<ICacheProgress>();
-        _lpMock = Mock.Of<ILoadProgress>(l=>l.CacheProgress == _cpMock);
+        _lpMock = Mock.Of<ILoadProgress>(l => l.CacheProgress == _cpMock);
     }
-               
-    [Test(Description = "RDMPDEV-185: Tests the scenario where the files in ForLoading do not match the files that are expected given the job specification. In this case the load process should not continue, otherwise the wrong data will be loaded.")]
+
+    [Test(Description =
+        "RDMPDEV-185: Tests the scenario where the files in ForLoading do not match the files that are expected given the job specification. In this case the load process should not continue, otherwise the wrong data will be loaded.")]
     public void AttemptToLoadDataWithFilesInForLoading_DisagreementBetweenCacheAndForLoading()
     {
         var tempDirPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
@@ -62,15 +63,19 @@ public void AttemptToLoadDataWithFilesInForLoading_DisagreementBetweenCacheAndFo
             };
 
             // Set SetUp job
-            var job = CreateTestJob(loadDirectory); 
+            var job = CreateTestJob(loadDirectory);
             job.DatesToRetrieve = new List<DateTime>
             {
-                new DateTime(2016, 01, 02)
+                new(2016, 01, 02)
             };
 
             // Should fail after determining that the files in ForLoading do not match the job specification
-            var ex = Assert.Throws<InvalidOperationException>(() => retriever.Fetch(job, new GracefulCancellationToken()));
-            Assert.IsTrue(ex.Message.StartsWith("The files in ForLoading do not match what this job expects to be loading from the cache."), ex.Message + Environment.NewLine + Environment.NewLine + ex.StackTrace);
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                retriever.Fetch(job, new GracefulCancellationToken()));
+            Assert.IsTrue(
+                ex.Message.StartsWith(
+                    "The files in ForLoading do not match what this job expects to be loading from the cache."),
+                ex.Message + Environment.NewLine + Environment.NewLine + ex.StackTrace);
         }
         finally
         {
@@ -78,7 +83,8 @@ public void AttemptToLoadDataWithFilesInForLoading_DisagreementBetweenCacheAndFo
         }
     }
 
-    [Test(Description = "RDMPDEV-185: Tests the scenario where the files in ForLoading match the files that are expected given the job specification, e.g. a load has after the cache has been populated and a subsequent load with *exactly the same parameters* has been triggered. In this case the load can proceed.")]
+    [Test(Description =
+        "RDMPDEV-185: Tests the scenario where the files in ForLoading match the files that are expected given the job specification, e.g. a load has after the cache has been populated and a subsequent load with *exactly the same parameters* has been triggered. In this case the load can proceed.")]
     public void AttemptToLoadDataWithFilesInForLoading_AgreementBetweenForLoadingAndCache()
     {
         var tempDirPath = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
@@ -100,15 +106,14 @@ public void AttemptToLoadDataWithFilesInForLoading_AgreementBetweenForLoadingAnd
             {
                 ExtractFilesFromArchive = false,
                 LoadProgress = _lpMock,
-                Layout =  cacheLayout
-                    
+                Layout = cacheLayout
             };
 
             // Set SetUp job
-            var job = CreateTestJob(loadDirectory); 
+            var job = CreateTestJob(loadDirectory);
             job.DatesToRetrieve = new List<DateTime>
             {
-                new DateTime(2016, 01, 01)
+                new(2016, 01, 01)
             };
 
             // Should complete successfully, the file in ForLoading matches the job specification
@@ -145,14 +150,13 @@ public void AttemptToLoadDataWithoutFilesInForLoading()
                 ExtractFilesFromArchive = false,
                 LoadProgress = _lpMock,
                 Layout = cacheLayout
-
             };
 
             // Set SetUp job
             var job = CreateTestJob(loadDirectory);
             job.DatesToRetrieve = new List<DateTime>
             {
-                new DateTime(2016, 01, 01)
+                new(2016, 01, 01)
             };
 
             // Should complete successfully, there are no files in ForLoading to worry about
@@ -169,19 +173,20 @@ public void AttemptToLoadDataWithoutFilesInForLoading()
 
     private ScheduledDataLoadJob CreateTestJob(ILoadDirectory directory)
     {
-        var catalogue = Mock.Of<ICatalogue>(c => 
+        var catalogue = Mock.Of<ICatalogue>(c =>
             c.GetTableInfoList(false) == Array.Empty<TableInfo>() &&
-            c.GetLookupTableInfoList()==Array.Empty<TableInfo>() &&
+            c.GetLookupTableInfoList() == Array.Empty<TableInfo>() &&
             c.LoggingDataTask == "TestLogging"
         );
 
         var logManager = Mock.Of<ILogManager>();
-        var loadMetadata = Mock.Of<ILoadMetadata>(lm => lm.GetAllCatalogues()==new[] { catalogue });
+        var loadMetadata = Mock.Of<ILoadMetadata>(lm => lm.GetAllCatalogues() == new[] { catalogue });
 
-        var j = new ScheduledDataLoadJob(RepositoryLocator, "Test job", logManager, loadMetadata, directory, new ThrowImmediatelyDataLoadEventListener(), null)
-            {
-                LoadProgress = _lpMock
-            };
+        var j = new ScheduledDataLoadJob(RepositoryLocator, "Test job", logManager, loadMetadata, directory,
+            new ThrowImmediatelyDataLoadEventListener(), null)
+        {
+            LoadProgress = _lpMock
+        };
         return j;
     }
 }
@@ -192,7 +197,6 @@ internal class TestCachedFileRetriever : CachedFileRetriever
 
     public override void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public override ExitCodeType Fetch(IDataLoadJob dataLoadJob, GracefulCancellationToken cancellationToken)
@@ -200,12 +204,10 @@ public override ExitCodeType Fetch(IDataLoadJob dataLoadJob, GracefulCancellatio
         var scheduledJob = ConvertToScheduledJob(dataLoadJob);
         GetDataLoadWorkload(scheduledJob);
         ExtractJobs(scheduledJob);
-            
+
         return ExitCodeType.Success;
     }
 
-    protected override ICacheLayout CreateCacheLayout(ICacheProgress cacheProgress, IDataLoadEventListener listener)
-    {
-        return Layout;
-    }
+    protected override ICacheLayout CreateCacheLayout(ICacheProgress cacheProgress, IDataLoadEventListener listener) =>
+        Layout;
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs
index 7c26e7e5b5..fe52c02f6c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CheckingTests/ProcessTaskCheckingTests.cs
@@ -20,7 +20,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.CheckingTests;
 
-public class ProcessTaskCheckingTests:DatabaseTests
+public class ProcessTaskCheckingTests : DatabaseTests
 {
     private LoadMetadata _lmd;
     private ProcessTask _task;
@@ -32,49 +32,49 @@ public void CreateTask()
     {
         _lmd = new LoadMetadata(CatalogueRepository);
 
-        _dir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"ProcessTaskCheckingTests"));
+        _dir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "ProcessTaskCheckingTests"));
         _dir.Create();
 
         var hicdir = LoadDirectory.CreateDirectoryStructure(_dir, "ProjDir", true);
         _lmd.LocationOfFlatFiles = hicdir.RootPath.FullName;
         _lmd.SaveToDatabase();
 
-        var c = new Catalogue(CatalogueRepository,"c");
-        var ci = new CatalogueItem(CatalogueRepository,c,"ci");
-        var t = new TableInfo(CatalogueRepository,"t")
+        var c = new Catalogue(CatalogueRepository, "c");
+        var ci = new CatalogueItem(CatalogueRepository, c, "ci");
+        var t = new TableInfo(CatalogueRepository, "t")
         {
             Server = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Name,
             Database = "mydb"
         };
         t.SaveToDatabase();
-        var col = new ColumnInfo(CatalogueRepository,"col","bit",t);
+        var col = new ColumnInfo(CatalogueRepository, "col", "bit", t);
         ci.SetColumnInfo(col);
         c.LoadMetadata_ID = _lmd.ID;
         c.SaveToDatabase();
-            
+
         _task = new ProcessTask(CatalogueRepository, _lmd, LoadStage.GetFiles);
         _checker = new ProcessTaskChecks(_lmd);
     }
-                
+
 
     [Test]
-    [TestCase(null,ProcessTaskType.Executable)]
-    [TestCase("",ProcessTaskType.Executable)]
-    [TestCase("     ",ProcessTaskType.Executable)]
-    [TestCase(null,ProcessTaskType.SQLFile)]
-    [TestCase("",ProcessTaskType.SQLFile)]
-    [TestCase("     ",ProcessTaskType.SQLFile)]
+    [TestCase(null, ProcessTaskType.Executable)]
+    [TestCase("", ProcessTaskType.Executable)]
+    [TestCase("     ", ProcessTaskType.Executable)]
+    [TestCase(null, ProcessTaskType.SQLFile)]
+    [TestCase("", ProcessTaskType.SQLFile)]
+    [TestCase("     ", ProcessTaskType.SQLFile)]
     public void EmptyFilePath(string path, ProcessTaskType typeThatRequiresFiles)
     {
         _task.ProcessTaskType = typeThatRequiresFiles;
         _task.Path = path;
         _task.SaveToDatabase();
-        var ex = Assert.Throws<Exception>(()=>_checker.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("does not have a path specified",ex.Message);
+        var ex = Assert.Throws<Exception>(() => _checker.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("does not have a path specified", ex.Message);
     }
 
     [Test]
-    [TestCase(null, ProcessTaskType.MutilateDataTable,LoadStage.AdjustStaging)]
+    [TestCase(null, ProcessTaskType.MutilateDataTable, LoadStage.AdjustStaging)]
     [TestCase("", ProcessTaskType.MutilateDataTable, LoadStage.AdjustStaging)]
     [TestCase("     ", ProcessTaskType.MutilateDataTable, LoadStage.AdjustRaw)]
     [TestCase(null, ProcessTaskType.Attacher, LoadStage.Mounting)]
@@ -85,8 +85,9 @@ public void EmptyClassPath(string path, ProcessTaskType typeThatRequiresMEF, Loa
         _task.Path = path;
         _task.LoadStage = stage;
         _task.SaveToDatabase();
-        var ex = Assert.Throws<ArgumentException>(()=>_checker.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.IsTrue(Regex.IsMatch(ex.Message,"Path is blank for ProcessTask 'New Process.*' - it should be a class name of type"));
+        var ex = Assert.Throws<ArgumentException>(() => _checker.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.IsTrue(Regex.IsMatch(ex.Message,
+            "Path is blank for ProcessTask 'New Process.*' - it should be a class name of type"));
     }
 
     [Test]
@@ -97,8 +98,11 @@ public void MEFIncompatibleType()
         _task.Path = typeof(object).ToString();
         _task.SaveToDatabase();
         var ex = Assert.Throws<Exception>(() => _checker.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Requested typeToCreate 'System.Object' was not assignable to the required Type 'IMutilateDataTables'", ex.Message);
+        Assert.AreEqual(
+            "Requested typeToCreate 'System.Object' was not assignable to the required Type 'IMutilateDataTables'",
+            ex.Message);
     }
+
     [Test]
     public void MEFCompatibleType_NoProjectDirectory()
     {
@@ -111,15 +115,18 @@ public void MEFCompatibleType_NoProjectDirectory()
         _task.SaveToDatabase();
         _task.CreateArgumentsForClassIfNotExists<AnySeparatorFileAttacher>();
 
-        var ex = Assert.Throws<Exception>(()=>_checker.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true}));
-        Assert.AreEqual($@"No Project Directory (LocationOfFlatFiles) has been configured on LoadMetadata {_lmd.Name}", ex.InnerException.Message);
-            
+        var ex = Assert.Throws<Exception>(() =>
+            _checker.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        Assert.AreEqual($@"No Project Directory (LocationOfFlatFiles) has been configured on LoadMetadata {_lmd.Name}",
+            ex.InnerException.Message);
     }
+
     [Test]
     public void MEFCompatibleType_NoArgs()
     {
-
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "DelMeProjDir", true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                "DelMeProjDir", true);
         try
         {
             _lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
@@ -129,11 +136,12 @@ public void MEFCompatibleType_NoArgs()
             _task.SaveToDatabase();
 
 
-            var ex = Assert.Throws<ArgumentException>(() => _checker.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
-
-            Assert.AreEqual(@"Class AnySeparatorFileAttacher has a Mandatory property 'Separator' marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection",ex.Message);
-                
+            var ex = Assert.Throws<ArgumentException>(() =>
+                _checker.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
 
+            Assert.AreEqual(
+                @"Class AnySeparatorFileAttacher has a Mandatory property 'Separator' marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection",
+                ex.Message);
         }
         finally
         {
@@ -145,7 +153,9 @@ public void MEFCompatibleType_NoArgs()
     [Test]
     public void MEFCompatibleType_Passes()
     {
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "DelMeProjDir", true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                "DelMeProjDir", true);
         try
         {
             _lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
@@ -180,7 +190,7 @@ public void MEFCompatibleType_Passes()
                     Console.WriteLine(ExceptionHelper.ExceptionToListOfInnerMessages(msg.Ex));
             }
 
-            Assert.AreEqual( CheckResult.Success,results.GetWorst());
+            Assert.AreEqual(CheckResult.Success, results.GetWorst());
         }
         finally
         {
@@ -198,8 +208,8 @@ public void ImaginaryFile(string path)
         _task.ProcessTaskType = ProcessTaskType.Executable;
         _task.Path = path;
         _task.SaveToDatabase();
-        var ex = Assert.Throws<Exception>(()=>_checker.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning=true}));
-        StringAssert.Contains("bob.exe which does not exist at this time.",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            _checker.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        StringAssert.Contains("bob.exe which does not exist at this time.", ex.Message);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CoalescerTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CoalescerTests.cs
index e3e77c8224..fb2b5edf1d 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CoalescerTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CoalescerTests.cs
@@ -20,13 +20,13 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class CoalescerTests:DatabaseTests
+public class CoalescerTests : DatabaseTests
 {
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.MicrosoftSQLServer, false)]
-    [TestCase(DatabaseType.MySql,true)]
+    [TestCase(DatabaseType.MySql, true)]
     [TestCase(DatabaseType.MySql, false)]
-    public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
+    public void TestCoalescer_RampantNullness(DatabaseType type, bool useCustomNamer)
     {
         var db = GetCleanedServer(type, "TestCoalescer");
 
@@ -51,15 +51,15 @@ public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
             dt.Rows.Add(new object[] { randInt, DBNull.Value, DBNull.Value, randInt, DBNull.Value });
             dt.Rows.Add(new object[] { randInt, DBNull.Value, DBNull.Value, randInt, randInt });
 
-            if (randCompleteness >=1)
+            if (randCompleteness >= 1)
             {
                 dt.Rows.Add(new object[] { randInt, DBNull.Value, randInt, DBNull.Value, DBNull.Value });
                 dt.Rows.Add(new object[] { randInt, DBNull.Value, randInt, DBNull.Value, randInt });
                 dt.Rows.Add(new object[] { randInt, DBNull.Value, randInt, randInt, DBNull.Value });
                 dt.Rows.Add(new object[] { randInt, DBNull.Value, randInt, randInt, randInt });
             }
-                 
-            if(randCompleteness >=2)
+
+            if (randCompleteness >= 2)
             {
                 dt.Rows.Add(new object[] { randInt, randInt, DBNull.Value, DBNull.Value, DBNull.Value });
                 dt.Rows.Add(new object[] { randInt, randInt, DBNull.Value, DBNull.Value, randInt });
@@ -68,7 +68,7 @@ public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
             }
 
 
-            if(randCompleteness >= 3)
+            if (randCompleteness >= 3)
             {
                 dt.Rows.Add(new object[] { randInt, randInt, randInt, DBNull.Value, DBNull.Value });
                 dt.Rows.Add(new object[] { randInt, randInt, randInt, DBNull.Value, randInt });
@@ -95,14 +95,14 @@ public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
             namer = RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "AAAA");
         }
 
-        var configuration = new HICDatabaseConfiguration(db.Server,namer);
+        var configuration = new HICDatabaseConfiguration(db.Server, namer);
 
         var coalescer = new Coalescer
         {
             TableRegexPattern = new Regex(".*"),
             CreateIndex = true
         };
-        coalescer.Initialize(db,LoadStage.AdjustRaw);
+        coalescer.Initialize(db, LoadStage.AdjustRaw);
 
 
         var job = new ThrowImmediatelyDataLoadJob(configuration, tableInfo);
@@ -112,7 +112,7 @@ public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
 
         foreach (DataRow row in dt2.Rows)
         {
-            Assert.AreNotEqual(DBNull.Value,row["f1"]);
+            Assert.AreNotEqual(DBNull.Value, row["f1"]);
             Assert.AreNotEqual(DBNull.Value, row["f2"]);
             Assert.AreNotEqual(DBNull.Value, row["f3"]);
             Assert.AreNotEqual(DBNull.Value, row["f4"]);
@@ -120,5 +120,4 @@ public void TestCoalescer_RampantNullness(DatabaseType type,bool useCustomNamer)
 
         db.Drop();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseDataLoadTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseDataLoadTests.cs
index 8e70280098..9c52d69c76 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseDataLoadTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseDataLoadTests.cs
@@ -37,7 +37,7 @@ namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.CrossDatabaseTypeTests;
 /*
  Test currently requires for LowPrivilegeLoaderAccount (e.g. minion)
  ---------------------------------------------------
- 
+
     create database DLE_STAGING
 
     use DLE_STAGING
@@ -60,21 +60,21 @@ public enum TestCase
         AllPrimaryKeys,
         NoTrigger,
         WithNonPrimaryKeyIdentityColumn,
-            
+
         WithCustomTableNamer,
 
         WithDiffColumnIgnoreRegex //tests ability of the system to skip a given column when doing the DLE diff section
     }
 
-    [TestCase(DatabaseType.Oracle,TestCase.Normal)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,TestCase.Normal)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,TestCase.NoTrigger)]
+    [TestCase(DatabaseType.Oracle, TestCase.Normal)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.Normal)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.NoTrigger)]
     [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.WithCustomTableNamer)]
     [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.WithNonPrimaryKeyIdentityColumn)]
     [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.DodgyCollation)]
     [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.LowPrivilegeLoaderAccount)]
     [TestCase(DatabaseType.MicrosoftSQLServer, TestCase.AllPrimaryKeys)]
-    [TestCase(DatabaseType.MySql,TestCase.Normal)]
+    [TestCase(DatabaseType.MySql, TestCase.Normal)]
     //[TestCase(DatabaseType.MySql, TestCase.WithNonPrimaryKeyIdentityColumn)] //Not supported by MySql:Incorrect table definition; there can be only one auto column and it must be defined as a key
     [TestCase(DatabaseType.MySql, TestCase.DodgyCollation)]
     [TestCase(DatabaseType.MySql, TestCase.WithCustomTableNamer)]
@@ -90,17 +90,18 @@ public void Load(DatabaseType databaseType, TestCase testCase)
         var db = GetCleanedServer(databaseType);
 
         var raw = db.Server.ExpectDatabase($"{db.GetRuntimeName()}_RAW");
-        if(raw.Exists())
+        if (raw.Exists())
             raw.Drop();
-            
+
         using var dt = new DataTable("MyTable");
         dt.Columns.Add("Name");
         dt.Columns.Add("DateOfBirth");
         dt.Columns.Add("FavouriteColour");
-        dt.Rows.Add("Bob", "2001-01-01","Pink");
-        dt.Rows.Add("Frank", "2001-01-01","Orange");
+        dt.Rows.Add("Bob", "2001-01-01", "Pink");
+        dt.Rows.Add("Frank", "2001-01-01", "Orange");
 
-        var nameCol = new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof (string), 20), false){IsPrimaryKey = true};
+        var nameCol = new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 20), false)
+            { IsPrimaryKey = true };
 
         if (testCase == TestCase.DodgyCollation)
             nameCol.Collation = databaseType switch
@@ -115,30 +116,38 @@ public void Load(DatabaseType databaseType, TestCase testCase)
         {
             case TestCase.WithNonPrimaryKeyIdentityColumn:
             {
-                tbl = db.CreateTable("MyTable",new []
+                tbl = db.CreateTable("MyTable", new[]
                 {
-                    new DatabaseColumnRequest("ID",new DatabaseTypeRequest(typeof(int)),false){IsPrimaryKey = false,IsAutoIncrement = true}, 
-                    nameCol, 
-                    new DatabaseColumnRequest("DateOfBirth",new DatabaseTypeRequest(typeof(DateTime)),false){IsPrimaryKey = true}, 
-                    new DatabaseColumnRequest("FavouriteColour",new DatabaseTypeRequest(typeof(string)))
+                    new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int)), false)
+                        { IsPrimaryKey = false, IsAutoIncrement = true },
+                    nameCol,
+                    new DatabaseColumnRequest("DateOfBirth", new DatabaseTypeRequest(typeof(DateTime)), false)
+                        { IsPrimaryKey = true },
+                    new DatabaseColumnRequest("FavouriteColour", new DatabaseTypeRequest(typeof(string)))
                 });
-                
+
                 using (var blk = tbl.BeginBulkInsert())
+                {
                     blk.Upload(dt);
+                }
 
-                Assert.AreEqual(1,tbl.DiscoverColumns().Count(c=>c.GetRuntimeName().Equals("ID",StringComparison.CurrentCultureIgnoreCase)),"Table created did not contain ID column");
+                Assert.AreEqual(1,
+                    tbl.DiscoverColumns().Count(c =>
+                        c.GetRuntimeName().Equals("ID", StringComparison.CurrentCultureIgnoreCase)),
+                    "Table created did not contain ID column");
                 break;
             }
             case TestCase.AllPrimaryKeys:
                 dt.PrimaryKey = dt.Columns.Cast<DataColumn>().ToArray();
-                tbl = db.CreateTable("MyTable",dt,new []{nameCol}); //upload the column as is 
+                tbl = db.CreateTable("MyTable", dt, new[] { nameCol }); //upload the column as is 
                 Assert.IsTrue(tbl.DiscoverColumns().All(c => c.IsPrimaryKey));
                 break;
             default:
                 tbl = db.CreateTable("MyTable", dt, new[]
                 {
                     nameCol,
-                    new DatabaseColumnRequest("DateOfBirth",new DatabaseTypeRequest(typeof(DateTime)),false){IsPrimaryKey = true}
+                    new DatabaseColumnRequest("DateOfBirth", new DatabaseTypeRequest(typeof(DateTime)), false)
+                        { IsPrimaryKey = true }
                 });
                 break;
         }
@@ -148,18 +157,18 @@ public void Load(DatabaseType databaseType, TestCase testCase)
         //define a new load configuration
         var lmd = new LoadMetadata(CatalogueRepository, "MyLoad");
 
-        if(testCase == TestCase.NoTrigger)
+        if (testCase == TestCase.NoTrigger)
         {
             lmd.IgnoreTrigger = true;
             lmd.SaveToDatabase();
         }
 
-        var ti = Import(tbl, lmd,logManager);
+        var ti = Import(tbl, lmd, logManager);
 
         var projectDirectory = SetupLoadDirectory(lmd);
 
-        CreateCSVProcessTask(lmd,ti,"*.csv");
-            
+        CreateCSVProcessTask(lmd, ti, "*.csv");
+
         //create a text file to load where we update Frank's favourite colour (it's a pk field) and we insert a new record (MrMurder)
         File.WriteAllText(
             Path.Combine(projectDirectory.ForLoading.FullName, "LoadMe.csv"),
@@ -171,23 +180,30 @@ public void Load(DatabaseType databaseType, TestCase testCase)
         //the checks will probably need to be run as ddl admin because it involves creating _Archive table and trigger the first time
 
         //clean SetUp RAW / STAGING etc and generally accept proposed cleanup operations
-        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd), new HICLoadConfigurationFlags(),CatalogueRepository.MEF);
+        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd),
+            new HICLoadConfigurationFlags(), CatalogueRepository.MEF);
         checker.Check(new AcceptAllCheckNotifier());
 
         //create a reader
         if (testCase == TestCase.LowPrivilegeLoaderAccount)
         {
-            SetupLowPrivilegeUserRightsFor(ti, TestLowPrivilegePermissions.Reader|TestLowPrivilegePermissions.Writer);
-            SetupLowPrivilegeUserRightsFor(db.Server.ExpectDatabase("DLE_STAGING"),TestLowPrivilegePermissions.All);
+            SetupLowPrivilegeUserRightsFor(ti, TestLowPrivilegePermissions.Reader | TestLowPrivilegePermissions.Writer);
+            SetupLowPrivilegeUserRightsFor(db.Server.ExpectDatabase("DLE_STAGING"), TestLowPrivilegePermissions.All);
         }
 
-        Assert.AreEqual(testCase != TestCase.NoTrigger, tbl.DiscoverColumns().Select(c=>c.GetRuntimeName()).Contains(SpecialFieldNames.DataLoadRunID), $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
-        Assert.AreEqual(testCase != TestCase.NoTrigger, tbl.DiscoverColumns().Select(c=>c.GetRuntimeName()).Contains(SpecialFieldNames.ValidFrom), $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
+        Assert.AreEqual(testCase != TestCase.NoTrigger,
+            tbl.DiscoverColumns().Select(c => c.GetRuntimeName()).Contains(SpecialFieldNames.DataLoadRunID),
+            $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
+        Assert.AreEqual(testCase != TestCase.NoTrigger,
+            tbl.DiscoverColumns().Select(c => c.GetRuntimeName()).Contains(SpecialFieldNames.ValidFrom),
+            $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
 
-        var dbConfig = new HICDatabaseConfiguration(lmd,testCase == TestCase.WithCustomTableNamer? new CustomINameDatabasesAndTablesDuringLoads():null);
+        var dbConfig = new HICDatabaseConfiguration(lmd,
+            testCase == TestCase.WithCustomTableNamer ? new CustomINameDatabasesAndTablesDuringLoads() : null);
 
-        if(testCase == TestCase.WithCustomTableNamer)
-            new PreExecutionChecker(lmd, dbConfig).Check(new AcceptAllCheckNotifier()); //handles staging database creation etc
+        if (testCase == TestCase.WithCustomTableNamer)
+            new PreExecutionChecker(lmd, dbConfig).Check(
+                new AcceptAllCheckNotifier()); //handles staging database creation etc
 
         if (testCase == TestCase.WithDiffColumnIgnoreRegex)
             dbConfig.UpdateButDoNotDiff = new Regex("^FavouriteColour"); //do not diff FavouriteColour
@@ -206,60 +222,66 @@ public void Load(DatabaseType databaseType, TestCase testCase)
             var exe = loadFactory.Create(new ThrowImmediatelyDataLoadEventListener());
 
             var exitCode = exe.Run(
-                new DataLoadJob(RepositoryLocator,"Go go go!", logManager, lmd, projectDirectory,new ThrowImmediatelyDataLoadEventListener(),dbConfig),
+                new DataLoadJob(RepositoryLocator, "Go go go!", logManager, lmd, projectDirectory,
+                    new ThrowImmediatelyDataLoadEventListener(), dbConfig),
                 new GracefulCancellationToken());
 
-            Assert.AreEqual(ExitCodeType.Success,exitCode);
+            Assert.AreEqual(ExitCodeType.Success, exitCode);
 
             if (testCase == TestCase.AllPrimaryKeys)
             {
                 Assert.AreEqual(4, tbl.GetRowCount()); //Bob, Frank, Frank (with also pk Neon) & MrMurder
                 Assert.Pass();
             }
+
             if (testCase == TestCase.WithDiffColumnIgnoreRegex)
             {
                 Assert.AreEqual(3, tbl.GetRowCount()); //Bob, Frank (original since the diff was skipped), & MrMurder
 
                 //frank should be updated to like Neon instead of Orange
                 Assert.AreEqual(3, tbl.GetRowCount());
-                var frankOld =  tbl.GetDataTable().Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "Frank");
+                var frankOld = tbl.GetDataTable().Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "Frank");
                 Assert.AreEqual("Orange", frankOld["FavouriteColour"]);
                 Assert.Pass();
             }
 
             //frank should be updated to like Neon instead of Orange
-            Assert.AreEqual(3,tbl.GetRowCount());
+            Assert.AreEqual(3, tbl.GetRowCount());
             var result = tbl.GetDataTable();
-            var frank = result.Rows.Cast<DataRow>().Single(r => (string) r["Name"] == "Frank");
-            Assert.AreEqual("Neon",frank["FavouriteColour"]);
-                
-            if(testCase != TestCase.NoTrigger)
+            var frank = result.Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "Frank");
+            Assert.AreEqual("Neon", frank["FavouriteColour"]);
+
+            if (testCase != TestCase.NoTrigger)
                 AssertHasDataLoadRunId(frank);
 
             //MrMurder is a new person who likes Yella
             var mrmurder = result.Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "MrMurder");
             Assert.AreEqual("Yella", mrmurder["FavouriteColour"]);
-            Assert.AreEqual(new DateTime(2001,01,01), mrmurder["DateOfBirth"]);
-                
-            if(testCase != TestCase.NoTrigger)
+            Assert.AreEqual(new DateTime(2001, 01, 01), mrmurder["DateOfBirth"]);
+
+            if (testCase != TestCase.NoTrigger)
                 AssertHasDataLoadRunId(mrmurder);
 
             //bob should be untouched (same values as before and no dataloadrunID)
             var bob = result.Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "Bob");
             Assert.AreEqual("Pink", bob["FavouriteColour"]);
             Assert.AreEqual(new DateTime(2001, 01, 01), bob["DateOfBirth"]);
-                
-            if(testCase != TestCase.NoTrigger)
+
+            if (testCase != TestCase.NoTrigger)
             {
-                Assert.AreEqual(DBNull.Value,bob[SpecialFieldNames.DataLoadRunID]);
+                Assert.AreEqual(DBNull.Value, bob[SpecialFieldNames.DataLoadRunID]);
 
                 //MySql add default of now() on a table will auto populate all the column values with the the now() date while Sql Server will leave them as nulls
-                if(databaseType == DatabaseType.MicrosoftSQLServer)
+                if (databaseType == DatabaseType.MicrosoftSQLServer)
                     Assert.AreEqual(DBNull.Value, bob[SpecialFieldNames.ValidFrom]);
             }
-                    
-            Assert.AreEqual(testCase != TestCase.NoTrigger, tbl.DiscoverColumns().Select(c=>c.GetRuntimeName()).Contains(SpecialFieldNames.DataLoadRunID), $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
-            Assert.AreEqual(testCase != TestCase.NoTrigger, tbl.DiscoverColumns().Select(c=>c.GetRuntimeName()).Contains(SpecialFieldNames.ValidFrom), $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
+
+            Assert.AreEqual(testCase != TestCase.NoTrigger,
+                tbl.DiscoverColumns().Select(c => c.GetRuntimeName()).Contains(SpecialFieldNames.DataLoadRunID),
+                $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
+            Assert.AreEqual(testCase != TestCase.NoTrigger,
+                tbl.DiscoverColumns().Select(c => c.GetRuntimeName()).Contains(SpecialFieldNames.ValidFrom),
+                $"When running with NoTrigger there shouldn't be any additional columns added to table. Test case was {testCase}");
         }
         finally
         {
@@ -275,10 +297,10 @@ public void Load(DatabaseType databaseType, TestCase testCase)
                 l.DeleteInDatabase();
         }
 
-        if(testCase == TestCase.WithCustomTableNamer)
+        if (testCase == TestCase.WithCustomTableNamer)
         {
             var db2 = db.Server.ExpectDatabase("BB_STAGING");
-            if(db.Exists())
+            if (db.Exists())
                 db2.Drop();
         }
     }
@@ -294,10 +316,10 @@ public void DLELoadTwoTables(DatabaseType databaseType)
         var db = GetCleanedServer(databaseType);
 
         var dtParent = new DataTable();
-        dtParent.Columns.Add("ID",typeof(int));
+        dtParent.Columns.Add("ID", typeof(int));
         dtParent.Columns.Add("Name");
         dtParent.Columns.Add("Height");
-        dtParent.PrimaryKey = new[] {dtParent.Columns[0]};
+        dtParent.PrimaryKey = new[] { dtParent.Columns[0] };
 
         dtParent.Rows.Add("1", "Dave", "3.5");
 
@@ -309,19 +331,19 @@ public void DLELoadTwoTables(DatabaseType databaseType)
         dtChild.Columns.Add("Age");
         dtChild.Columns.Add("Height");
 
-        dtChild.Rows.Add("1","1","Child1","2001-01-01","20","3.5");
-        dtChild.Rows.Add("1","2","Child2","2002-01-01","19","3.4");
-            
-        dtChild.PrimaryKey = new[] {dtChild.Columns[0], dtChild.Columns[1]};
+        dtChild.Rows.Add("1", "1", "Child1", "2001-01-01", "20", "3.5");
+        dtChild.Rows.Add("1", "2", "Child2", "2002-01-01", "19", "3.4");
+
+        dtChild.PrimaryKey = new[] { dtChild.Columns[0], dtChild.Columns[1] };
 
         //create the parent table based on the DataTable
-        var parentTbl = db.CreateTable("Parent",dtParent);
+        var parentTbl = db.CreateTable("Parent", dtParent);
 
         //go find the primary key column created
         var pkParentID = parentTbl.DiscoverColumn("ID");
 
         //forward declare this column as part of pk (will be used to specify foreign key
-        var fkParentID = new DatabaseColumnRequest("Parent_ID", "int"){IsPrimaryKey = true};
+        var fkParentID = new DatabaseColumnRequest("Parent_ID", "int") { IsPrimaryKey = true };
 
         var args = new CreateTableArgs(
             db,
@@ -331,7 +353,7 @@ public void DLELoadTwoTables(DatabaseType databaseType)
             false,
             new Dictionary<DatabaseColumnRequest, DiscoveredColumn>
             {
-                {fkParentID, pkParentID}
+                { fkParentID, pkParentID }
             },
             true)
         {
@@ -350,11 +372,11 @@ public void DLELoadTwoTables(DatabaseType databaseType)
         var lmd = new LoadMetadata(CatalogueRepository, "MyLoading2");
 
         var childTableInfo = Import(childTbl, lmd, logManager);
-        var parentTableInfo = Import(parentTbl,lmd,logManager);
+        var parentTableInfo = Import(parentTbl, lmd, logManager);
 
         var projectDirectory = SetupLoadDirectory(lmd);
 
-        CreateCSVProcessTask(lmd,parentTableInfo,"parent.csv");
+        CreateCSVProcessTask(lmd, parentTableInfo, "parent.csv");
         CreateCSVProcessTask(lmd, childTableInfo, "child.csv");
 
         //create a text file to load where we update Frank's favourite colour (it's a pk field) and we insert a new record (MrMurder)
@@ -372,7 +394,8 @@ public void DLELoadTwoTables(DatabaseType databaseType)
 
 
         //clean SetUp RAW / STAGING etc and generally accept proposed cleanup operations
-        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd), new HICLoadConfigurationFlags(), CatalogueRepository.MEF);
+        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd),
+            new HICLoadConfigurationFlags(), CatalogueRepository.MEF);
         checker.Check(new AcceptAllCheckNotifier());
 
         var config = new HICDatabaseConfiguration(lmd);
@@ -389,7 +412,8 @@ public void DLELoadTwoTables(DatabaseType databaseType)
             var exe = loadFactory.Create(new ThrowImmediatelyDataLoadEventListener());
 
             var exitCode = exe.Run(
-                new DataLoadJob(RepositoryLocator,"Go go go!", logManager, lmd, projectDirectory, new ThrowImmediatelyDataLoadEventListener(),config),
+                new DataLoadJob(RepositoryLocator, "Go go go!", logManager, lmd, projectDirectory,
+                    new ThrowImmediatelyDataLoadEventListener(), config),
                 new GracefulCancellationToken());
 
             Assert.AreEqual(ExitCodeType.Success, exitCode);
@@ -413,13 +437,13 @@ public void DLELoadTwoTables(DatabaseType databaseType)
             var newC1 = result.Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "NewC1");
             Assert.AreEqual(2, newC1["Parent_ID"]);
             Assert.AreEqual(1, newC1["ChildNumber"]);
-            Assert.AreEqual(DBNull.Value, newC1["Height"]); //the "null" in the input file should be DBNull.Value in the final database
+            Assert.AreEqual(DBNull.Value,
+                newC1["Height"]); //the "null" in the input file should be DBNull.Value in the final database
             AssertHasDataLoadRunId(newC1);
-
         }
         finally
         {
-            Directory.Delete(lmd.LocationOfFlatFiles,true);
+            Directory.Delete(lmd.LocationOfFlatFiles, true);
 
             foreach (var c in RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>())
                 c.DeleteInDatabase();
@@ -431,10 +455,9 @@ public void DLELoadTwoTables(DatabaseType databaseType)
                 l.DeleteInDatabase();
         }
     }
-
 }
 
-internal class CustomINameDatabasesAndTablesDuringLoads:INameDatabasesAndTablesDuringLoads
+internal class CustomINameDatabasesAndTablesDuringLoads : INameDatabasesAndTablesDuringLoads
 {
     public string GetDatabaseName(string rootDatabaseName, LoadBubble convention)
     {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseMergeCommandTest.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseMergeCommandTest.cs
index c7a1817564..02e8e39dfa 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseMergeCommandTest.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/CrossDatabaseMergeCommandTest.cs
@@ -26,7 +26,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.CrossDatabaseTypeTests;
 
-public class CrossDatabaseMergeCommandTest:FromToDatabaseTests
+public class CrossDatabaseMergeCommandTest : FromToDatabaseTests
 {
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
@@ -37,20 +37,20 @@ public void TestMerge(DatabaseType databaseType)
             SetupFromTo(databaseType);
 
         var dt = new DataTable();
-        var colName = new DataColumn("Name",typeof(string));
-        var colAge = new DataColumn("Age",typeof(int));
+        var colName = new DataColumn("Name", typeof(string));
+        var colAge = new DataColumn("Age", typeof(int));
         dt.Columns.Add(colName);
         dt.Columns.Add(colAge);
-        dt.Columns.Add("Postcode",typeof(string));
+        dt.Columns.Add("Postcode", typeof(string));
 
         //Data in live awaiting toTbl be updated
-        dt.Rows.Add(new object[]{"Dave",18,"DD3 1AB"});
-        dt.Rows.Add(new object[] {"Dave", 25, "DD1 1XS" });
-        dt.Rows.Add(new object[] {"Mango", 32, DBNull.Value});
-        dt.Rows.Add(new object[] { "Filli", 32,"DD3 78L" });
+        dt.Rows.Add(new object[] { "Dave", 18, "DD3 1AB" });
+        dt.Rows.Add(new object[] { "Dave", 25, "DD1 1XS" });
+        dt.Rows.Add(new object[] { "Mango", 32, DBNull.Value });
+        dt.Rows.Add(new object[] { "Filli", 32, "DD3 78L" });
         dt.Rows.Add(new object[] { "Mandrake", 32, DBNull.Value });
 
-        dt.PrimaryKey = new[]{colName,colAge};
+        dt.PrimaryKey = new[] { colName, colAge };
 
         var toTbl = To.CreateTable("ToTable", dt);
 
@@ -59,7 +59,7 @@ public void TestMerge(DatabaseType databaseType)
         Assert.IsFalse(toTbl.DiscoverColumn("Postcode").IsPrimaryKey);
 
         dt.Rows.Clear();
-            
+
         //new data being loaded
         dt.Rows.Add(new object[] { "Dave", 25, "DD1 1PS" }); //update toTbl change postcode toTbl "DD1 1PS"
         dt.Rows.Add(new object[] { "Chutney", 32, DBNull.Value }); //new insert Chutney
@@ -71,7 +71,7 @@ public void TestMerge(DatabaseType databaseType)
         var fromTbl = From.CreateTable($"{DatabaseName}_ToTable_STAGING", dt);
 
         //import the toTbl table as a TableInfo
-        var cata = Import(toTbl,out var ti, out var cis);
+        var cata = Import(toTbl, out var ti, out var cis);
 
         //put the backup trigger on the live table (this will also create the needed hic_ columns etc)
         var triggerImplementer = new TriggerImplementerFactory(databaseType).Create(toTbl);
@@ -96,19 +96,19 @@ public void TestMerge(DatabaseType databaseType)
         {
             LoadMetadata = lmd,
             DataLoadInfo = dli,
-            RegularTablesToLoad = new List<ITableInfo>(new[]{ti})
+            RegularTablesToLoad = new List<ITableInfo>(new[] { ti })
         };
 
         migrationHost.Migrate(job, new GracefulCancellationToken());
 
         var resultantDt = toTbl.GetDataTable();
-        Assert.AreEqual(7,resultantDt.Rows.Count);
+        Assert.AreEqual(7, resultantDt.Rows.Count);
 
         AssertRowEquals(resultantDt, "Dave", 25, "DD1 1PS");
         AssertRowEquals(resultantDt, "Chutney", 32, DBNull.Value);
         AssertRowEquals(resultantDt, "Mango", 32, DBNull.Value);
 
-        AssertRowEquals(resultantDt,"Filli",32,DBNull.Value);
+        AssertRowEquals(resultantDt, "Filli", 32, DBNull.Value);
         AssertRowEquals(resultantDt, "Mandrake", 32, "DD1 1PS");
         AssertRowEquals(resultantDt, "Mandrake", 31, "DD1 1PS");
 
@@ -119,15 +119,17 @@ public void TestMerge(DatabaseType databaseType)
         var log = archival.First();
 
 
-        Assert.AreEqual(dli.ID,log.ID);
-        Assert.AreEqual(2,log.TableLoadInfos.Single().Inserts);
+        Assert.AreEqual(dli.ID, log.ID);
+        Assert.AreEqual(2, log.TableLoadInfos.Single().Inserts);
         Assert.AreEqual(3, log.TableLoadInfos.Single().Updates);
     }
 
-    private static void AssertRowEquals(DataTable resultantDt,string name,int age, object postcode)
+    private static void AssertRowEquals(DataTable resultantDt, string name, int age, object postcode)
     {
         Assert.AreEqual(
-            1, resultantDt.Rows.Cast<DataRow>().Count(r => Equals(r["Name"], name) && Equals(r["Age"], age) && Equals(r["Postcode"], postcode)),
-            "Did not find expected record:" + string.Join(",",name,age,postcode));
+            1,
+            resultantDt.Rows.Cast<DataRow>().Count(r =>
+                Equals(r["Name"], name) && Equals(r["Age"], age) && Equals(r["Postcode"], postcode)),
+            "Did not find expected record:" + string.Join(",", name, age, postcode));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/HowDoWeAchieveMd5Test.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/HowDoWeAchieveMd5Test.cs
index 8afe6660e5..d1b42209ed 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/HowDoWeAchieveMd5Test.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/CrossDatabaseTypeTests/HowDoWeAchieveMd5Test.cs
@@ -12,16 +12,15 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.CrossDatabaseTypeTests;
 
-internal class HowDoWeAchieveMd5Test:DatabaseTests
+internal class HowDoWeAchieveMd5Test : DatabaseTests
 {
-
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
     public void TestMd5String(DatabaseType type)
     {
         var dt = new DataTable();
         dt.Columns.Add("F");
-        dt.Rows.Add(new[] {"Fish"});
+        dt.Rows.Add(new[] { "Fish" });
 
         var db = GetCleanedServer(type);
         var tbl = db.CreateTable("MD5Test", dt);
@@ -42,9 +41,8 @@ public void TestMd5String(DatabaseType type)
             Console.WriteLine($"Value was:{value}");
 
             Assert.IsNotNull(value);
-            Assert.AreNotEqual("Fish",value);
-            Assert.GreaterOrEqual(value.ToString().Length,32);
-                
+            Assert.AreNotEqual("Fish", value);
+            Assert.GreaterOrEqual(value.ToString().Length, 32);
         }
     }
 
@@ -61,8 +59,9 @@ public void TestMd5Date(DatabaseType type)
 
         var col = tbl.DiscoverColumn("F");
 
-            
-        Assert.AreEqual(typeof(DateTime),tbl.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(col.DataType.SQLType));
+
+        Assert.AreEqual(typeof(DateTime),
+            tbl.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(col.DataType.SQLType));
 
 
         var sql =
@@ -80,8 +79,6 @@ public void TestMd5Date(DatabaseType type)
 
             Assert.IsNotNull(value);
             Assert.GreaterOrEqual(value.ToString().Length, 32);
-
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadEngineTestsBase.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadEngineTestsBase.cs
index 1ae6bd2deb..1629279e4e 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadEngineTestsBase.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadEngineTestsBase.cs
@@ -30,16 +30,17 @@ protected static void AssertHasDataLoadRunId(DataRow row)
         var o = row[SpecialFieldNames.DataLoadRunID];
 
         Assert.IsNotNull(o, "A row which was expected to have a hic_dataLoadRunID had null instead");
-        Assert.AreNotEqual(DBNull.Value, o, "A row which was expected to have a hic_dataLoadRunID had DBNull.Value instead");
+        Assert.AreNotEqual(DBNull.Value, o,
+            "A row which was expected to have a hic_dataLoadRunID had DBNull.Value instead");
         Assert.GreaterOrEqual((int)o, 0);
 
         var d = row[SpecialFieldNames.ValidFrom];
         Assert.IsNotNull(d, "A row which was expected to have a hic_validFrom had null instead");
-        Assert.AreNotEqual(DBNull.Value, d, "A row which was expected to have a hic_validFrom had DBNull.Value instead");
+        Assert.AreNotEqual(DBNull.Value, d,
+            "A row which was expected to have a hic_validFrom had DBNull.Value instead");
 
         //expect validFrom to be after 2 hours ago (to handle UTC / BST nonsense)
         Assert.GreaterOrEqual((DateTime)d, DateTime.Now.Subtract(new TimeSpan(2, 0, 0)));
-
     }
 
     protected void CreateCSVProcessTask(LoadMetadata lmd, ITableInfo ti, string regex)
@@ -62,7 +63,9 @@ protected void CreateCSVProcessTask(LoadMetadata lmd, ITableInfo ti, string rege
 
     protected static LoadDirectory SetupLoadDirectory(LoadMetadata lmd)
     {
-        var projectDirectory = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "MyLoadDir", true);
+        var projectDirectory =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                "MyLoadDir", true);
         lmd.LocationOfFlatFiles = projectDirectory.RootPath.FullName;
         lmd.SaveToDatabase();
 
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadProgressUpdateInfoTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadProgressUpdateInfoTests.cs
index 185c4147f3..4578053588 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadProgressUpdateInfoTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataLoadProgressUpdateInfoTests.cs
@@ -19,29 +19,32 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class DataLoadProgressUpdateInfoTests :DatabaseTests
+public class DataLoadProgressUpdateInfoTests : DatabaseTests
 {
     private ScheduledDataLoadJob _job;
 
     #region Setup Methods
+
     public DataLoadProgressUpdateInfoTests()
     {
         var cata = Mock.Of<ICatalogue>(
-            c=> c.LoggingDataTask == "NothingTask" &&
-                c.GetTableInfoList(false) == Array.Empty<TableInfo>() &&
-                c.GetLookupTableInfoList() == Array.Empty<TableInfo>());
+            c => c.LoggingDataTask == "NothingTask" &&
+                 c.GetTableInfoList(false) == Array.Empty<TableInfo>() &&
+                 c.GetLookupTableInfoList() == Array.Empty<TableInfo>());
 
         var lmd = Mock.Of<ILoadMetadata>(m => m.GetAllCatalogues() == new[] { cata });
 
-        _job = new ScheduledDataLoadJob(null,"fish", Mock.Of<ILogManager>(), lmd, null, new ThrowImmediatelyDataLoadJob(),null);
+        _job = new ScheduledDataLoadJob(null, "fish", Mock.Of<ILogManager>(), lmd, null,
+            new ThrowImmediatelyDataLoadJob(), null);
     }
+
     #endregion
 
     [Test]
     public void AddBasicNormalStrategy_NoDates()
     {
         var updateInfo = new DataLoadProgressUpdateInfo();
-        var ex = Assert.Throws<DataLoadProgressUpdateException>(()=>updateInfo.AddAppropriateDisposeStep(_job,null));
+        var ex = Assert.Throws<DataLoadProgressUpdateException>(() => updateInfo.AddAppropriateDisposeStep(_job, null));
         Assert.IsTrue(ex.Message.StartsWith("Job does not have any DatesToRetrieve"));
     }
 
@@ -49,13 +52,13 @@ public void AddBasicNormalStrategy_NoDates()
     public void AddBasicNormalStrategy_MaxDate()
     {
         var updateInfo = new DataLoadProgressUpdateInfo();
-        Assert.AreEqual(DataLoadProgressUpdateStrategy.UseMaxRequestedDay,updateInfo.Strategy);
+        Assert.AreEqual(DataLoadProgressUpdateStrategy.UseMaxRequestedDay, updateInfo.Strategy);
 
         _job.DatesToRetrieve = new List<DateTime>
         {
-            new DateTime(2001, 1, 1),
-            new DateTime(2001, 1, 2),
-            new DateTime(2001, 1, 3)
+            new(2001, 1, 1),
+            new(2001, 1, 2),
+            new(2001, 1, 3)
         };
         try
         {
@@ -68,7 +71,6 @@ public void AddBasicNormalStrategy_MaxDate()
         {
             _job.DatesToRetrieve.Clear();
         }
-            
     }
 
     [Test]
@@ -79,7 +81,8 @@ public void AddRAWSQLStrategy_NoSQL()
             Strategy = DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW
         };
 
-        var ex = Assert.Throws<Exception>(()=>updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
+        var ex = Assert.Throws<Exception>(() =>
+            updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
 
         Assert.IsTrue(ex.Message.StartsWith("Strategy is ExecuteScalarSQLInRAW but there is no ExecuteScalarSQL"));
     }
@@ -93,7 +96,8 @@ public void AddRAWSQLStrategy_SQLDodgy_SqlCrashes()
             ExecuteScalarSQL = "SELECT Top 1 BarrelORum from CaptainMorgansSpicedRumBarrel"
         };
 
-        var ex = Assert.Throws<DataLoadProgressUpdateException>(() => updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
+        var ex = Assert.Throws<DataLoadProgressUpdateException>(() =>
+            updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
 
         Assert.IsTrue(ex.Message.StartsWith("Failed to execute the following SQL in the RAW database"));
         Assert.IsInstanceOf<SqlException>(ex.InnerException);
@@ -108,7 +112,8 @@ public void AddRAWSQLStrategy_SQLDodgy_SqlReturnsNull()
             ExecuteScalarSQL = "SELECT null"
         };
 
-        var ex = Assert.Throws<DataLoadProgressUpdateException>(() => updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
+        var ex = Assert.Throws<DataLoadProgressUpdateException>(() =>
+            updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
 
         Assert.IsTrue(ex.Message.Contains("ExecuteScalarSQL"));
         Assert.IsTrue(ex.Message.Contains("returned null"));
@@ -123,9 +128,12 @@ public void AddRAWSQLStrategy_SQLDodgy_SqlReturnsNonDate()
             ExecuteScalarSQL = "SELECT 'fishfish'"
         };
 
-        var ex = Assert.Throws<DataLoadProgressUpdateException>(() => updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
+        var ex = Assert.Throws<DataLoadProgressUpdateException>(() =>
+            updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer)));
 
-        Assert.AreEqual("ExecuteScalarSQL specified for determining the maximum date of data loaded returned a value that was not a Date:fishfish",ex.Message);
+        Assert.AreEqual(
+            "ExecuteScalarSQL specified for determining the maximum date of data loaded returned a value that was not a Date:fishfish",
+            ex.Message);
         Assert.IsInstanceOf<FormatException>(ex.InnerException);
     }
 
@@ -134,9 +142,9 @@ public void AddRAWSQLStrategy_SQLCorrect()
     {
         _job.DatesToRetrieve = new List<DateTime>
         {
-            new DateTime(2001, 1, 6),
-            new DateTime(2001, 1, 7),
-            new DateTime(2001, 1, 8)
+            new(2001, 1, 6),
+            new(2001, 1, 7),
+            new(2001, 1, 8)
         };
 
         var updateInfo = new DataLoadProgressUpdateInfo
@@ -145,8 +153,9 @@ public void AddRAWSQLStrategy_SQLCorrect()
             ExecuteScalarSQL = "SELECT '2001-01-07'"
         };
 
-        var added = (UpdateProgressIfLoadsuccessful)updateInfo.AddAppropriateDisposeStep(_job, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
-            
+        var added = (UpdateProgressIfLoadsuccessful)updateInfo.AddAppropriateDisposeStep(_job,
+            GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
+
         Assert.AreEqual(new DateTime(2001, 1, 7), added.DateToSetProgressTo);
 
         _job.DatesToRetrieve.Clear();
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs
index 58e385b7c4..973df406cf 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs
@@ -21,7 +21,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class DataTableUploadDestinationTests:DatabaseTests
+public class DataTableUploadDestinationTests : DatabaseTests
 {
     [Test]
     public void DataTableChangesLengths_NoReAlter()
@@ -34,32 +34,32 @@ public void DataTableChangesLengths_NoReAlter()
         destination.PreInitialize(db, toConsole);
 
         var dt1 = new DataTable();
-        dt1.Columns.Add("name", typeof (string));
-        dt1.Rows.Add(new []{"Fish"});
+        dt1.Columns.Add("name", typeof(string));
+        dt1.Rows.Add(new[] { "Fish" });
         dt1.TableName = "DataTableUploadDestinationTests";
 
         var dt2 = new DataTable();
-        dt2.Columns.Add("name", typeof (string));
-        dt2.Rows.Add(new []{"BigFish"});
+        dt2.Columns.Add("name", typeof(string));
+        dt2.Rows.Add(new[] { "BigFish" });
         dt2.TableName = "DataTableUploadDestinationTests";
 
-        destination.ProcessPipelineData( dt1, toConsole,token);
-        var ex = Assert.Throws<Exception>(()=>destination.ProcessPipelineData( dt2, toConsole,token));
+        destination.ProcessPipelineData(dt1, toConsole, token);
+        var ex = Assert.Throws<Exception>(() => destination.ProcessPipelineData(dt2, toConsole, token));
 
         var expectedText =
             "BulkInsert failed on data row 1 the complaint was about source column <<name>> which had value <<BigFish>> destination data type was <<varchar(4)>>";
 
         Assert.IsNotNull(ex.InnerException);
-        StringAssert.Contains(expectedText,ex.InnerException.Message);
+        StringAssert.Contains(expectedText, ex.InnerException.Message);
 
         destination.Dispose(new ThrowImmediatelyDataLoadEventListener(), ex);
     }
 
     //RDMPDEV-653
     [Test]
-    [TestCase(true,10)]
-    [TestCase(false,10)]
-    public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int numberOfRandomisations)
+    [TestCase(true, 10)]
+    [TestCase(false, 10)]
+    public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity, int numberOfRandomisations)
     {
         var token = new GracefulCancellationToken();
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
@@ -67,7 +67,7 @@ public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int nu
         var tbl = db.ExpectTable("RandomOrderTable");
         var random = new Random();
 
-        for (var i =0;i<numberOfRandomisations;i++)
+        for (var i = 0; i < numberOfRandomisations; i++)
         {
             if (tbl.Exists())
                 tbl.Drop();
@@ -109,10 +109,12 @@ public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int nu
                 }
 
                 else
+                {
                     sql += colSql;
+                }
             }
 
-            if(invalid)
+            if (invalid)
                 continue;
 
             sql = $"{sql.TrimEnd(',')})";
@@ -133,9 +135,9 @@ public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int nu
 
             //order is inverted where name comes out at the end column (index 2)
             var dt1 = new DataTable();
-            dt1.Columns.Add("age", typeof (string));
-            dt1.Columns.Add("color", typeof (string));
-            dt1.Columns.Add("name", typeof (string));
+            dt1.Columns.Add("age", typeof(string));
+            dt1.Columns.Add("color", typeof(string));
+            dt1.Columns.Add("name", typeof(string));
 
             dt1.Rows.Add("30", "blue", "Fish");
             dt1.TableName = "RandomOrderTable";
@@ -147,7 +149,7 @@ public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int nu
 
             var expectedErrorMessage =
                 $"<<{errorColumn}>> which had value <<{dt1.Rows[0][errorColumn]}>> destination data type was <<varchar(1)>>";
-            StringAssert.Contains(expectedErrorMessage,interestingBit);
+            StringAssert.Contains(expectedErrorMessage, interestingBit);
 
             destination.Dispose(new ThrowImmediatelyDataLoadEventListener(), ex);
             tbl.Drop();
@@ -155,7 +157,6 @@ public void DataTableChangesLengths_RandomColumnOrder(bool createIdentity,int nu
     }
 
 
-
     //RDMPDEV-653
     [Test]
     public void DataTableChangesLengths_DropColumns()
@@ -164,7 +165,7 @@ public void DataTableChangesLengths_DropColumns()
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
         var tbl = db.ExpectTable("DroppedColumnsTable");
-        if(tbl.Exists())
+        if (tbl.Exists())
             tbl.Drop();
 
         var sql = @"CREATE TABLE DroppedColumnsTable (
@@ -199,7 +200,8 @@ ALTER TABLE DroppedColumnsTable add color varchar(1)
         dt1.Rows.Add("30", "blue", "Fish");
         dt1.TableName = "DroppedColumnsTable";
 
-        var ex = Assert.Throws<Exception>(() => destination.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(), token));
+        var ex = Assert.Throws<Exception>(() =>
+            destination.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(), token));
 
         var exceptionMessage = ex.InnerException.Message;
         var interestingBit = exceptionMessage[(exceptionMessage.IndexOf(": <<") + ": ".Length)..];
@@ -209,7 +211,7 @@ ALTER TABLE DroppedColumnsTable add color varchar(1)
 
         destination.Dispose(new ThrowImmediatelyDataLoadEventListener(), ex);
 
-        if(tbl.Exists())
+        if (tbl.Exists())
             tbl.Drop();
     }
 
@@ -233,6 +235,7 @@ public void DataTableEmpty_ThrowHelpfulException()
 
         Assert.AreEqual("DataTable 'MyEmptyTable' had no Columns!", ex.Message);
     }
+
     [Test]
     public void DataTableNoRows_ThrowHelpfulException()
     {
@@ -252,6 +255,7 @@ public void DataTableNoRows_ThrowHelpfulException()
 
         Assert.AreEqual("DataTable 'MyEmptyTable' had no Rows!", ex.Message);
     }
+
     [Test]
     public void DataTableChangesLengths_AllowAlter()
     {
@@ -274,16 +278,14 @@ public void DataTableChangesLengths_AllowAlter()
         dt2.Rows.Add(new[] { "BigFish" });
         dt2.TableName = "DataTableUploadDestinationTests";
 
-        destination.ProcessPipelineData( dt1, toConsole, token);
-        Assert.DoesNotThrow(() => destination.ProcessPipelineData( dt2, toMemory, token));
+        destination.ProcessPipelineData(dt1, toConsole, token);
+        Assert.DoesNotThrow(() => destination.ProcessPipelineData(dt2, toMemory, token));
 
         Assert.IsTrue(toMemory.EventsReceivedBySender[destination].Any(msg => msg.Message.Contains("Resizing column")));
 
         destination.Dispose(toConsole, null);
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
-        Assert.AreEqual(2,db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
-
-
+        Assert.AreEqual(2, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
     }
 
     [Test]
@@ -299,7 +301,7 @@ public void DoubleResizingBetweenIntAndDouble()
 
         var dt1 = new DataTable();
         dt1.Columns.Add("mynum", typeof(double));
-        dt1.Rows.Add(new object[] {1});
+        dt1.Rows.Add(new object[] { 1 });
         dt1.Rows.Add(new object[] { 5 });
         dt1.Rows.Add(new object[] { 15 });
         dt1.Rows.Add(new object[] { 2.5 });
@@ -312,13 +314,14 @@ public void DoubleResizingBetweenIntAndDouble()
 
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
         Assert.AreEqual(5, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
-        Assert.AreEqual("decimal(3,1)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
+        Assert.AreEqual("decimal(3,1)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
     }
 
 
-    [TestCase("varchar(3)", 1.5, "x")]//RDMPDEV-932
+    [TestCase("varchar(3)", 1.5, "x")] //RDMPDEV-932
     [TestCase("varchar(27)", "2001-01-01", "x")] //see Guesser.MinimumLengthRequiredForDateStringRepresentation
-    public void BatchResizing(string expectedDatatypeInDatabase,object batch1Value,object batch2Value)
+    public void BatchResizing(string expectedDatatypeInDatabase, object batch1Value, object batch2Value)
     {
         var token = new GracefulCancellationToken();
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
@@ -330,7 +333,7 @@ public void BatchResizing(string expectedDatatypeInDatabase,object batch1Value,o
 
         var dt1 = new DataTable();
         dt1.Columns.Add("mycol");
-        dt1.Rows.Add(new[] {batch1Value});
+        dt1.Rows.Add(new[] { batch1Value });
 
         dt1.TableName = "DataTableUploadDestinationTests";
         try
@@ -350,11 +353,13 @@ public void BatchResizing(string expectedDatatypeInDatabase,object batch1Value,o
             throw;
         }
 
-        Assert.AreEqual(expectedDatatypeInDatabase, db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mycol").DataType.SQLType);
+        Assert.AreEqual(expectedDatatypeInDatabase,
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mycol").DataType.SQLType);
     }
 
     [TestCase("varchar(24)", "2", "987styb4ih0r9h4322938476", "tinyint")]
-    public void BatchResizing_WithExplicitWriteTypes(string expectedDatatypeInDatabase, object batch1Value, object batch2Value, string batch1SqlType)
+    public void BatchResizing_WithExplicitWriteTypes(string expectedDatatypeInDatabase, object batch1Value,
+        object batch2Value, string batch1SqlType)
     {
         var token = new GracefulCancellationToken();
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
@@ -387,7 +392,8 @@ public void BatchResizing_WithExplicitWriteTypes(string expectedDatatypeInDataba
             throw;
         }
 
-        Assert.AreEqual(expectedDatatypeInDatabase, db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mycol").DataType.SQLType);
+        Assert.AreEqual(expectedDatatypeInDatabase,
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mycol").DataType.SQLType);
     }
 
     [Test]
@@ -419,7 +425,8 @@ public void VeryLongStringIsVarcharMax()
 
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
         Assert.AreEqual(1, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
-        Assert.AreEqual("varchar(max)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("myText").DataType.SQLType);
+        Assert.AreEqual("varchar(max)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("myText").DataType.SQLType);
     }
 
     [Test]
@@ -447,39 +454,51 @@ public void DecimalResizing(bool negative)
         dt2.Rows.Add(new[] { "00000.00000" });
         dt2.Rows.Add(new[] { "0" });
         dt2.Rows.Add(new string[] { null });
-        dt2.Rows.Add(new [] { "" });
+        dt2.Rows.Add(new[] { "" });
         dt2.Rows.Add(new[] { DBNull.Value });
         dt2.TableName = "DataTableUploadDestinationTests";
 
-        destination.ProcessPipelineData( dt1, toConsole, token);
-        destination.ProcessPipelineData( dt2, toMemory, token);
+        destination.ProcessPipelineData(dt1, toConsole, token);
+        destination.ProcessPipelineData(dt2, toMemory, token);
 
-        Assert.IsTrue(toMemory.EventsReceivedBySender[destination].Any(msg => msg.Message.Contains("Resizing column ")));
+        Assert.IsTrue(toMemory.EventsReceivedBySender[destination]
+            .Any(msg => msg.Message.Contains("Resizing column ")));
 
         destination.Dispose(toConsole, null);
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
         Assert.AreEqual(7, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
-        Assert.AreEqual("decimal(5,2)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
+        Assert.AreEqual("decimal(5,2)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
     }
 
-    private static object[] _sourceLists = {
-        new object[] {"decimal(3,3)",new object[]{"0.001"}, new object[]{0.001}},  //case 1
-        new object[] {"decimal(6,3)",new object[]{"19","0.001","123.001",32.0f}, new object[]{19,0.001,123.001,32.0f}},  //case 2
+    private static object[] _sourceLists =
+    {
+        new object[] { "decimal(3,3)", new object[] { "0.001" }, new object[] { 0.001 } }, //case 1
+        new object[]
+        {
+            "decimal(6,3)", new object[] { "19", "0.001", "123.001", 32.0f }, new object[] { 19, 0.001, 123.001, 32.0f }
+        }, //case 2
 
         //Time tests
-        new object[] {"time",new object[]{"12:01"}, new object[]{new TimeSpan(12,1,0)}},
-        new object[] {"time",new object[]{"13:00:00"}, new object[]{new TimeSpan(13,0,0)}},
+        new object[] { "time", new object[] { "12:01" }, new object[] { new TimeSpan(12, 1, 0) } },
+        new object[] { "time", new object[] { "13:00:00" }, new object[] { new TimeSpan(13, 0, 0) } },
 
         //Send two dates expect datetime in database and resultant data to be legit dates
-        new object[] {"datetime2",new object[]{"2001-01-01 12:01","2010-01-01"}, new object[]{new DateTime(2001,01,01,12,1,0),new DateTime(2010,01,01,0,0,0)}},
+        new object[]
+        {
+            "datetime2", new object[] { "2001-01-01 12:01", "2010-01-01" },
+            new object[] { new DateTime(2001, 01, 01, 12, 1, 0), new DateTime(2010, 01, 01, 0, 0, 0) }
+        },
 
         //Mixed data types going from time to date results in us falling back to string
-        new object[] {"varchar(10)",new object[]{"12:01","2001-01-01"}, new object[]{"12:01","2001-01-01"}}
+        new object[] { "varchar(10)", new object[] { "12:01", "2001-01-01" }, new object[] { "12:01", "2001-01-01" } }
     };
 
 
-    [Test, TestCaseSource(nameof(_sourceLists))]
-    public void DataTypeEstimation(string expectedDatatypeInDatabase, object[] rowValues, object[] expectedValuesReadFromDatabase)
+    [Test]
+    [TestCaseSource(nameof(_sourceLists))]
+    public void DataTypeEstimation(string expectedDatatypeInDatabase, object[] rowValues,
+        object[] expectedValuesReadFromDatabase)
     {
         var token = new GracefulCancellationToken();
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
@@ -492,7 +511,7 @@ public void DataTypeEstimation(string expectedDatatypeInDatabase, object[] rowVa
         dt1.Columns.Add("myCol", typeof(string));
 
         foreach (var rowValue in rowValues)
-            dt1.Rows.Add(new[] {rowValue});
+            dt1.Rows.Add(new[] { rowValue });
 
         dt1.TableName = "DataTableUploadDestinationTests";
 
@@ -500,23 +519,25 @@ public void DataTypeEstimation(string expectedDatatypeInDatabase, object[] rowVa
 
         destination.Dispose(toConsole, null);
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
-        Assert.AreEqual(expectedDatatypeInDatabase, db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("myCol").DataType.SQLType);
+        Assert.AreEqual(expectedDatatypeInDatabase,
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("myCol").DataType.SQLType);
 
         using (var con = db.Server.GetConnection())
         {
             con.Open();
-            using(var cmd = DatabaseCommandHelper.GetCommand("Select * from DataTableUploadDestinationTests", con))
-            using(var r = cmd.ExecuteReader())
+            using (var cmd = DatabaseCommandHelper.GetCommand("Select * from DataTableUploadDestinationTests", con))
+            using (var r = cmd.ExecuteReader())
+            {
                 foreach (var e in expectedValuesReadFromDatabase)
                 {
                     Assert.IsTrue(r.Read());
                     Assert.AreEqual(e, r["myCol"]);
                 }
+            }
         }
     }
 
 
-
     [Test]
     [TestCase(true)]
     [TestCase(false)]
@@ -539,21 +560,22 @@ public void DecimalZeros(bool sendTheZero)
 
         dt1.TableName = "DataTableUploadDestinationTests";
 
-        destination.ProcessPipelineData( dt1, toConsole, token);
+        destination.ProcessPipelineData(dt1, toConsole, token);
         destination.Dispose(toConsole, null);
 
         //table should exist
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
 
         //should have 2 rows
-        Assert.AreEqual(sendTheZero?2:1, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
+        Assert.AreEqual(sendTheZero ? 2 : 1, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
 
         //should be decimal
 
-        Assert.AreEqual(sendTheZero ?"decimal(19,18)":"decimal(18,18)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
+        Assert.AreEqual(sendTheZero ? "decimal(19,18)" : "decimal(18,18)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestResizing(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -562,12 +584,12 @@ public void TestResizing(DatabaseType dbType)
         var table = db.CreateTable("TestResizing",
             new DatabaseColumnRequest[]
             {
-                new DatabaseColumnRequest("MyInteger",new DatabaseTypeRequest(typeof(int))),
-                new DatabaseColumnRequest("MyMaxString",new DatabaseTypeRequest(typeof(string),int.MaxValue)),
-                new DatabaseColumnRequest("Description",new DatabaseTypeRequest(typeof(string),int.MaxValue)),
-                new DatabaseColumnRequest("StringNotNull",new DatabaseTypeRequest(typeof(string),100),false),
-                new DatabaseColumnRequest("StringAllowNull",new DatabaseTypeRequest(typeof(string),100),true),
-                new DatabaseColumnRequest("StringPk",new DatabaseTypeRequest(typeof(string),50),true){IsPrimaryKey = true }
+                new("MyInteger", new DatabaseTypeRequest(typeof(int))),
+                new("MyMaxString", new DatabaseTypeRequest(typeof(string), int.MaxValue)),
+                new("Description", new DatabaseTypeRequest(typeof(string), int.MaxValue)),
+                new("StringNotNull", new DatabaseTypeRequest(typeof(string), 100), false),
+                new("StringAllowNull", new DatabaseTypeRequest(typeof(string), 100), true),
+                new("StringPk", new DatabaseTypeRequest(typeof(string), 50), true) { IsPrimaryKey = true }
             });
 
         using (var con = server.GetConnection())
@@ -595,7 +617,7 @@ public void TestResizing(DatabaseType dbType)
             Assert.AreEqual(true, table.DiscoverColumn("StringAllowNull").AllowNulls);
 
             //we should have correct understanding prior to resize
-            AssertIsStringWithLength(table.DiscoverColumn("StringPk"),50);
+            AssertIsStringWithLength(table.DiscoverColumn("StringPk"), 50);
             Assert.AreEqual(true, table.DiscoverColumn("StringPk").IsPrimaryKey);
             Assert.AreEqual(false, table.DiscoverColumn("StringPk").AllowNulls);
 
@@ -617,21 +639,21 @@ private static void AssertIsStringWithLength(DiscoveredColumn col, int expectedL
         {
             case DatabaseType.MicrosoftSQLServer:
             case DatabaseType.MySql:
-                Assert.AreEqual($"varchar({expectedLength})",col.DataType.SQLType);
+                Assert.AreEqual($"varchar({expectedLength})", col.DataType.SQLType);
                 break;
             case DatabaseType.Oracle:
-                Assert.AreEqual($"varchar2({expectedLength})",col.DataType.SQLType);
+                Assert.AreEqual($"varchar2({expectedLength})", col.DataType.SQLType);
                 break;
             case DatabaseType.PostgreSql:
-                Assert.AreEqual($"character varying({expectedLength})",col.DataType.SQLType);
+                Assert.AreEqual($"character varying({expectedLength})", col.DataType.SQLType);
                 break;
             default:
-                throw new ArgumentOutOfRangeException(nameof(col.Table.Database.Server.DatabaseType), col.Table.Database.Server.DatabaseType, null);
+                throw new ArgumentOutOfRangeException(nameof(col.Table.Database.Server.DatabaseType),
+                    col.Table.Database.Server.DatabaseType, null);
         }
-
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestResizing_WithDetection(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -639,12 +661,12 @@ public void TestResizing_WithDetection(DatabaseType dbType)
         var table = db.CreateTable("TestResizing",
             new DatabaseColumnRequest[]
             {
-                new DatabaseColumnRequest("MyInteger",new DatabaseTypeRequest(typeof(int))),
-                new DatabaseColumnRequest("MyMaxString",new DatabaseTypeRequest(typeof(string),int.MaxValue)),
-                new DatabaseColumnRequest("Description",new DatabaseTypeRequest(typeof(string),int.MaxValue)),
-                new DatabaseColumnRequest("StringNotNull",new DatabaseTypeRequest(typeof(string),10),false),
-                new DatabaseColumnRequest("StringAllowNull",new DatabaseTypeRequest(typeof(string),100),true),
-                new DatabaseColumnRequest("StringPk",new DatabaseTypeRequest(typeof(string),50),true){IsPrimaryKey = true }
+                new("MyInteger", new DatabaseTypeRequest(typeof(int))),
+                new("MyMaxString", new DatabaseTypeRequest(typeof(string), int.MaxValue)),
+                new("Description", new DatabaseTypeRequest(typeof(string), int.MaxValue)),
+                new("StringNotNull", new DatabaseTypeRequest(typeof(string), 10), false),
+                new("StringAllowNull", new DatabaseTypeRequest(typeof(string), 100), true),
+                new("StringPk", new DatabaseTypeRequest(typeof(string), 50), true) { IsPrimaryKey = true }
             });
 
         Assert.AreEqual(10, table.DiscoverColumn("StringNotNull").DataType.GetLengthIfString());
@@ -657,45 +679,45 @@ public void TestResizing_WithDetection(DatabaseType dbType)
         dt.Columns.Add("StringAllowNull");
         dt.Columns.Add("StringPk");
 
-        dt.Rows.Add("1",    //MyInteger
-            "fff",          //MyMaxString
-            "fff2",         //Description
-            "1234567891011",//StringNotNull - too long for the column, so it should resize
-            DBNull.Value,   //StringAllowNull
-            "f"             //StringPk
+        dt.Rows.Add("1", //MyInteger
+            "fff", //MyMaxString
+            "fff2", //Description
+            "1234567891011", //StringNotNull - too long for the column, so it should resize
+            DBNull.Value, //StringAllowNull
+            "f" //StringPk
         );
 
         var dt2 = dt.Clone();
         dt2.Rows.Clear();
-        dt2.Rows.Add("1",    //MyInteger
-            "fff",          //MyMaxString
-            "fff2",         //Description
-            "12345678910112",//StringNotNull - too long for the column, so it should resize
-            DBNull.Value,   //StringAllowNull
-            "f2"             //StringPk
+        dt2.Rows.Add("1", //MyInteger
+            "fff", //MyMaxString
+            "fff2", //Description
+            "12345678910112", //StringNotNull - too long for the column, so it should resize
+            DBNull.Value, //StringAllowNull
+            "f2" //StringPk
         );
 
         var dest = new DataTableUploadDestination
         {
             AllowResizingColumnsAtUploadTime = true
         };
-        dest.PreInitialize(db,new ThrowImmediatelyDataLoadEventListener());
+        dest.PreInitialize(db, new ThrowImmediatelyDataLoadEventListener());
 
-        dest.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        dest.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         dest.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-        dest.Dispose(new ThrowImmediatelyDataLoadEventListener(),null);
+        dest.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
 
         //it should have resized us.
         Assert.AreEqual(14, table.DiscoverColumn("StringNotNull").DataType.GetLengthIfString());
-
     }
+
     [TestCase(DatabaseType.MicrosoftSQLServer, "didn�t")]
     [TestCase(DatabaseType.MySql, "didn�t")]
     [TestCase(DatabaseType.Oracle, "didn�t")]
     [TestCase(DatabaseType.MicrosoftSQLServer, "didn't")]
     [TestCase(DatabaseType.MySql, "didn't")]
     [TestCase(DatabaseType.Oracle, "didn't")]
-    public void Test_SingleQuote_InText(DatabaseType dbType,string testValue)
+    public void Test_SingleQuote_InText(DatabaseType dbType, string testValue)
     {
         var db = GetCleanedServer(dbType);
 
@@ -713,7 +735,7 @@ public void Test_SingleQuote_InText(DatabaseType dbType,string testValue)
 
         var tbl = db.ExpectTable("TestFreeText");
         Assert.IsTrue(tbl.Exists());
-        Assert.AreEqual(1,tbl.GetRowCount());
+        Assert.AreEqual(1, tbl.GetRowCount());
     }
 
     [Test]
@@ -734,7 +756,7 @@ public void DodgyTypes()
         dt1.Columns.Add("col4", typeof(byte));
         dt1.Columns.Add("col5", typeof(byte[]));
 
-        dt1.Rows.Add(new object[] { 0.425,0.451,true,(byte)2,new byte[]{0x5,0xA}});
+        dt1.Rows.Add(new object[] { 0.425, 0.451, true, (byte)2, new byte[] { 0x5, 0xA } });
 
 
         dt1.TableName = "DataTableUploadDestinationTests";
@@ -749,12 +771,17 @@ public void DodgyTypes()
         Assert.AreEqual(1, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
 
         //should be decimal
-        Assert.AreEqual("decimal(3,3)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col1").DataType.SQLType);
-        Assert.AreEqual("decimal(3,3)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col2").DataType.SQLType);
-        Assert.AreEqual("bit", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col3").DataType.SQLType);
-        Assert.AreEqual("tinyint", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col4").DataType.SQLType);
-
-        Assert.AreEqual("varbinary(max)", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col5").DataType.SQLType);
+        Assert.AreEqual("decimal(3,3)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col1").DataType.SQLType);
+        Assert.AreEqual("decimal(3,3)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col2").DataType.SQLType);
+        Assert.AreEqual("bit",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col3").DataType.SQLType);
+        Assert.AreEqual("tinyint",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col4").DataType.SQLType);
+
+        Assert.AreEqual("varbinary(max)",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("col5").DataType.SQLType);
     }
 
 
@@ -783,12 +810,14 @@ public void TypeAlteringlResizing()
         destination.ProcessPipelineData(dt1, toConsole, token);
         destination.ProcessPipelineData(dt2, toMemory, token);
 
-        Assert.IsTrue(toMemory.EventsReceivedBySender[destination].Any(msg => msg.Message.Contains("Resizing column 'mynum' from 'bit' to 'int'")));
+        Assert.IsTrue(toMemory.EventsReceivedBySender[destination]
+            .Any(msg => msg.Message.Contains("Resizing column 'mynum' from 'bit' to 'int'")));
 
         destination.Dispose(toConsole, null);
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
         Assert.AreEqual(2, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
-        Assert.AreEqual("int", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
+        Assert.AreEqual("int",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("mynum").DataType.SQLType);
     }
 
     [Test]
@@ -807,16 +836,16 @@ public void MySqlTest_Simple()
         var dt = new DataTable();
         dt.Columns.Add("mystringcol", typeof(string));
         dt.Columns.Add("mynum", typeof(string));
-        dt.Columns.Add("mydate", typeof (string));
+        dt.Columns.Add("mydate", typeof(string));
         dt.Columns.Add("myLegitDateTime", typeof(DateTime));
         dt.Columns.Add("mynullcol", typeof(string));
 
 
         //drop the millisecond part
         var now = DateTime.Now;
-        now = new DateTime(now.Year,now.Month,now.Day,now.Hour,now.Minute,now.Second);
+        now = new DateTime(now.Year, now.Month, now.Day, now.Hour, now.Minute, now.Second);
 
-        dt.Rows.Add(new object[] { "Anhoy there \"mates\"", "999", "2001-01-01", now,null});
+        dt.Rows.Add(new object[] { "Anhoy there \"mates\"", "999", "2001-01-01", now, null });
         dt.TableName = "DataTableUploadDestinationTests";
 
         destination.ProcessPipelineData(dt, toConsole, token);
@@ -834,8 +863,8 @@ public void MySqlTest_Simple()
 
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Anhoy there \"mates\"", (string)r["mystringcol"]);
-            Assert.AreEqual(999,(int)r["mynum"]);
-            Assert.AreEqual(new DateTime(2001,1,1),(DateTime)r["mydate"]);
+            Assert.AreEqual(999, (int)r["mynum"]);
+            Assert.AreEqual(new DateTime(2001, 1, 1), (DateTime)r["mydate"]);
             Assert.AreEqual(now, (DateTime)r["myLegitDateTime"]);
             Assert.AreEqual(DBNull.Value, r["mynullcol"]);
         }
@@ -884,7 +913,7 @@ public void MySqlTest_Resize()
             //technically these can come out in a random order
             var numbersRead = new List<int>();
             Assert.IsTrue(r.Read());
-            numbersRead.Add((int) r["mynum"]);
+            numbersRead.Add((int)r["mynum"]);
             Assert.IsTrue(r.Read());
             numbersRead.Add((int)r["mynum"]);
 
@@ -900,18 +929,21 @@ public void TestDestinationAlreadyExistingIsOk(bool targetTableIsEmpty)
     {
         //create a table in the scratch database with a single column Name
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
-        var tbl = db.CreateTable("TestDestinationAlreadyExistingIsOk",new[]{new DatabaseColumnRequest("Name","varchar(10)",false)});
+        var tbl = db.CreateTable("TestDestinationAlreadyExistingIsOk",
+            new[] { new DatabaseColumnRequest("Name", "varchar(10)", false) });
         try
         {
-            if(!targetTableIsEmpty)
+            if (!targetTableIsEmpty)
             {
                 //upload a single row
                 var dtAlreadyThereData = new DataTable();
                 dtAlreadyThereData.Columns.Add("Name");
-                dtAlreadyThereData.Rows.Add(new[] {"Bob"});
+                dtAlreadyThereData.Rows.Add(new[] { "Bob" });
 
-                using(var bulk = tbl.BeginBulkInsert())
+                using (var bulk = tbl.BeginBulkInsert())
+                {
                     bulk.Upload(dtAlreadyThereData);
+                }
             }
 
             //create the destination component (what we want to test)
@@ -924,20 +956,20 @@ public void TestDestinationAlreadyExistingIsOk(bool targetTableIsEmpty)
             //create the simulated chunk that will be dispatched
             var dt = new DataTable("TestDestinationAlreadyExistingIsOk");
             dt.Columns.Add("Name");
-            dt.Rows.Add(new[] {"Bob"});
+            dt.Rows.Add(new[] { "Bob" });
             dt.Rows.Add(new[] { "Frank" });
             dt.Rows.Add(new[] { "I've got a lovely bunch of coconuts" });
 
             var listener = new ThrowImmediatelyDataLoadEventListener();
 
             //pre initialzie with the database (which must be part of any pipeline use case involving a DataTableUploadDestination)
-            destinationComponent.PreInitialize(db ,listener);
+            destinationComponent.PreInitialize(db, listener);
 
             //tell the destination component to process the data
-            destinationComponent.ProcessPipelineData(dt, listener,new GracefulCancellationToken());
+            destinationComponent.ProcessPipelineData(dt, listener, new GracefulCancellationToken());
 
-            destinationComponent.Dispose(listener,null);
-            Assert.AreEqual(targetTableIsEmpty?3:4, tbl.GetRowCount());
+            destinationComponent.Dispose(listener, null);
+            Assert.AreEqual(targetTableIsEmpty ? 3 : 4, tbl.GetRowCount());
         }
         finally
         {
@@ -956,7 +988,7 @@ public void DataTableUploadDestinationTests_PrimaryKeyDataTableWithAlterSizeLate
             AllowResizingColumnsAtUploadTime = true
         };
 
-        destination.PreInitialize(db,new ThrowImmediatelyDataLoadEventListener());
+        destination.PreInitialize(db, new ThrowImmediatelyDataLoadEventListener());
 
         var dt1 = new DataTable
         {
@@ -967,7 +999,8 @@ public void DataTableUploadDestinationTests_PrimaryKeyDataTableWithAlterSizeLate
 
         dt1.PrimaryKey = dt1.Columns.Cast<DataColumn>().ToArray();
 
-        destination.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        destination.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         var dt2 = new DataTable
         {
@@ -978,17 +1011,16 @@ public void DataTableUploadDestinationTests_PrimaryKeyDataTableWithAlterSizeLate
 
         dt2.PrimaryKey = dt2.Columns.Cast<DataColumn>().ToArray();
 
-        destination.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        destination.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
 
-        destination.Dispose(new ThrowImmediatelyDataLoadEventListener(),null);
+        destination.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
 
         var tbl = db.ExpectTable("MyTable");
 
-        Assert.AreEqual(2,tbl.GetRowCount());
+        Assert.AreEqual(2, tbl.GetRowCount());
         Assert.IsTrue(tbl.DiscoverColumns().Single().IsPrimaryKey);
-
-
     }
 
     [Test]
@@ -999,22 +1031,22 @@ public void TestDestinationAlreadyExisting_ColumnSubset()
         var tbl = db.CreateTable("TestDestinationAlreadyExisting_ColumnSubset", new[]
         {
             new DatabaseColumnRequest("Name", "varchar(10)", false),
-            new DatabaseColumnRequest("Age","int"),
-            new DatabaseColumnRequest("Address","varchar(1000)")
-
+            new DatabaseColumnRequest("Age", "int"),
+            new DatabaseColumnRequest("Address", "varchar(1000)")
         });
 
         try
         {
-
             //upload a single row of already existing data
             var dtAlreadyThereData = new DataTable();
             dtAlreadyThereData.Columns.Add("Name");
             dtAlreadyThereData.Columns.Add("Age");
-            dtAlreadyThereData.Rows.Add(new object[] { "Bob",5});
+            dtAlreadyThereData.Rows.Add(new object[] { "Bob", 5 });
 
             using (var bulk = tbl.BeginBulkInsert())
+            {
                 bulk.Upload(dtAlreadyThereData);
+            }
 
             //create the destination component (what we want to test)
             var destinationComponent = new DataTableUploadDestination
@@ -1047,7 +1079,7 @@ public void TestDestinationAlreadyExisting_ColumnSubset()
         }
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Test_DataTableUploadDestination_ScientificNotation(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -1057,26 +1089,25 @@ public void Test_DataTableUploadDestination_ScientificNotation(DatabaseType dbTy
         dt.Rows.Add("-4.10235746055587E-05"); //this string is untyped
 
         var dest = new DataTableUploadDestination();
-        dest.PreInitialize(db,new ThrowImmediatelyDataLoadEventListener());
+        dest.PreInitialize(db, new ThrowImmediatelyDataLoadEventListener());
 
         try
         {
-            dest.ProcessPipelineData(dt,new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+            dest.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
             dest.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            dest.Dispose(new ThrowImmediatelyDataLoadEventListener(),ex);
+            dest.Dispose(new ThrowImmediatelyDataLoadEventListener(), ex);
             throw;
         }
 
         //in the database it should be typed
-        Assert.AreEqual(typeof(decimal),db.ExpectTable("ff").DiscoverColumn("mycol").DataType.GetCSharpDataType());
+        Assert.AreEqual(typeof(decimal), db.ExpectTable("ff").DiscoverColumn("mycol").DataType.GetCSharpDataType());
 
         var dt2 = db.ExpectTable("ff").GetDataTable();
 
-        Assert.IsTrue((decimal)dt2.Rows[0][0]  == (decimal)-0.0000410235746055587);
-
+        Assert.IsTrue((decimal)dt2.Rows[0][0] == (decimal)-0.0000410235746055587);
     }
 
     private class AdjustColumnDelegater : IDatabaseColumnRequestAdjuster
@@ -1094,7 +1125,7 @@ public void AdjustColumns(List<DatabaseColumnRequest> columns)
     /// as boolean instead
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Test_DataTableUploadDestination_ForceBool(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -1140,8 +1171,8 @@ public void Test_DataTableUploadDestination_ForceBool(DatabaseType dbType)
             Assert.AreEqual(typeof(string), tbl.DiscoverColumn("hb_extract").DataType.GetCSharpDataType());
 
             var dt2 = tbl.GetDataTable();
-            Assert.Contains("T",dt2.Rows.Cast<DataRow>().Select(r=>r[0]).ToArray());
-            Assert.Contains("F",dt2.Rows.Cast<DataRow>().Select(r =>r[0]).ToArray());
+            Assert.Contains("T", dt2.Rows.Cast<DataRow>().Select(r => r[0]).ToArray());
+            Assert.Contains("F", dt2.Rows.Cast<DataRow>().Select(r => r[0]).ToArray());
         }
         else
         {
@@ -1149,12 +1180,13 @@ public void Test_DataTableUploadDestination_ForceBool(DatabaseType dbType)
             Assert.AreEqual(typeof(bool), tbl.DiscoverColumn("hb_extract").DataType.GetCSharpDataType());
 
             var dt2 = tbl.GetDataTable();
-            Assert.Contains(true,dt2.Rows.Cast<DataRow>().Select(r=>r[0]).ToArray());
-            Assert.Contains(false,dt2.Rows.Cast<DataRow>().Select(r =>r[0]).ToArray());
+            Assert.Contains(true, dt2.Rows.Cast<DataRow>().Select(r => r[0]).ToArray());
+            Assert.Contains(false, dt2.Rows.Cast<DataRow>().Select(r => r[0]).ToArray());
         }
     }
 
     #region Two Batch Tests
+
     [TestCase(DatabaseType.MySql, true)]
     [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, true)]
@@ -1187,11 +1219,13 @@ public void TwoBatch_BooleanResizingTest(DatabaseType dbType, bool giveNullValue
 
         destination.ProcessPipelineData(dt1, toConsole, token);
 
-        Assert.AreEqual("bit", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol").DataType.SQLType);
+        Assert.AreEqual("bit",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol").DataType.SQLType);
 
         destination.ProcessPipelineData(dt2, toMemory, token);
 
-        Assert.IsTrue(toMemory.EventsReceivedBySender[destination].Any(msg => msg.Message.Contains("Resizing column ")));
+        Assert.IsTrue(toMemory.EventsReceivedBySender[destination]
+            .Any(msg => msg.Message.Contains("Resizing column ")));
 
         destination.Dispose(toConsole, null);
         Assert.IsTrue(db.ExpectTable("DataTableUploadDestinationTests").Exists());
@@ -1200,11 +1234,10 @@ public void TwoBatch_BooleanResizingTest(DatabaseType dbType, bool giveNullValue
         var tt = db.Server.GetQuerySyntaxHelper().TypeTranslater;
 
         Assert.AreEqual(
-
             //if all we got are nulls we should have a DateTime otherwise we had 1/true so the only usable data type is string
             giveNullValuesOnly ? typeof(DateTime) : typeof(string),
-
-            tt.GetCSharpTypeForSQLDBType(db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol").DataType.SQLType));
+            tt.GetCSharpTypeForSQLDBType(db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol")
+                .DataType.SQLType));
     }
 
     /// <summary>
@@ -1218,16 +1251,18 @@ public void TwoBatch_BooleanResizingTest(DatabaseType dbType, bool giveNullValue
     /// <param name="v2">The row value to send in batch 2 (after table creation)</param>
     /// <param name="expectedTypeForBatch1">The Type you expect to be used to store the v1</param>
     /// <param name="expectedTypeForBatch2">The Type you expect after ALTER to support all values seen SetUp till now (i.e. v1) AND v2</param>
-    [TestCase(DatabaseType.MySql,null,"235", typeof(bool),typeof(int))]
-    [TestCase(DatabaseType.MySql, "123", "2001-01-01 12:00:00" ,typeof(int), typeof(string))] //123 cannot be converted to date so it becomes string
-    [TestCase(DatabaseType.MySql, "2001-01-01", "2001-01-01 12:00:00" ,  typeof(DateTime), typeof(DateTime) )]
+    [TestCase(DatabaseType.MySql, null, "235", typeof(bool), typeof(int))]
+    [TestCase(DatabaseType.MySql, "123", "2001-01-01 12:00:00", typeof(int),
+        typeof(string))] //123 cannot be converted to date so it becomes string
+    [TestCase(DatabaseType.MySql, "2001-01-01", "2001-01-01 12:00:00", typeof(DateTime), typeof(DateTime))]
     [TestCase(DatabaseType.MySql, "2001-01-01", "omg", typeof(DateTime), typeof(string))]
-
     [TestCase(DatabaseType.MicrosoftSQLServer, null, "235", typeof(bool), typeof(int))]
-    [TestCase(DatabaseType.MicrosoftSQLServer, "123", "2001-01-01 12:00:00", typeof(int), typeof(string))] //123 cannot be converted to date so it becomes string
+    [TestCase(DatabaseType.MicrosoftSQLServer, "123", "2001-01-01 12:00:00", typeof(int),
+        typeof(string))] //123 cannot be converted to date so it becomes string
     [TestCase(DatabaseType.MicrosoftSQLServer, "2001-01-01", "2001-01-01 12:00:00", typeof(DateTime), typeof(DateTime))]
     [TestCase(DatabaseType.MicrosoftSQLServer, "2001-01-01", "omg", typeof(DateTime), typeof(string))]
-    public void TwoBatch_MiscellaneousTest(DatabaseType dbType, string v1,string v2,Type expectedTypeForBatch1,Type expectedTypeForBatch2)
+    public void TwoBatch_MiscellaneousTest(DatabaseType dbType, string v1, string v2, Type expectedTypeForBatch1,
+        Type expectedTypeForBatch2)
     {
         var token = new GracefulCancellationToken();
         var db = GetCleanedServer(dbType);
@@ -1265,7 +1300,7 @@ public void TwoBatch_MiscellaneousTest(DatabaseType dbType, string v1,string v2,
             destination.ProcessPipelineData(dt2, toMemory, token);
             destination.Dispose(toConsole, null);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             destination.Dispose(toConsole, ex);
             throw;
@@ -1276,7 +1311,7 @@ public void TwoBatch_MiscellaneousTest(DatabaseType dbType, string v1,string v2,
 
         var colAfter = tbl.DiscoverColumn("TestedCol");
 
-        Assert.AreEqual(v1 != null && v2 != null,colAfter.IsPrimaryKey);
+        Assert.AreEqual(v1 != null && v2 != null, colAfter.IsPrimaryKey);
 
         Assert.AreEqual(expectedTypeForBatch2, tt.GetCSharpTypeForSQLDBType(colAfter.DataType.SQLType));
     }
@@ -1293,7 +1328,7 @@ public void TwoBatch_ExplicitRealDataType()
         var destination = new DataTableUploadDestination();
         destination.PreInitialize(db, toConsole);
         destination.AllowResizingColumnsAtUploadTime = true;
-        destination.AddExplicitWriteType("FloatCol","real");
+        destination.AddExplicitWriteType("FloatCol", "real");
 
         var dt1 = new DataTable();
         dt1.Columns.Add("FloatCol", typeof(string));
@@ -1309,7 +1344,8 @@ public void TwoBatch_ExplicitRealDataType()
 
         destination.ProcessPipelineData(dt1, toConsole, token);
 
-        Assert.AreEqual("real", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("FloatCol").DataType.SQLType);
+        Assert.AreEqual("real",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("FloatCol").DataType.SQLType);
 
         destination.ProcessPipelineData(dt2, toMemory, token);
 
@@ -1319,8 +1355,9 @@ public void TwoBatch_ExplicitRealDataType()
         Assert.AreEqual(2, db.ExpectTable("DataTableUploadDestinationTests").GetRowCount());
 
         // should still be real
-        Assert.AreEqual("real", db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("FloatCol").DataType.SQLType);
-
+        Assert.AreEqual("real",
+            db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("FloatCol").DataType.SQLType);
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DatabaseOperationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DatabaseOperationTests.cs
index 31c352f7b7..06f850de31 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DatabaseOperationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DatabaseOperationTests.cs
@@ -35,7 +35,7 @@ public void CloneDatabaseAndTable()
         var testDb = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(testLiveDatabaseName);
         var raw = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase($"{testLiveDatabaseName}_RAW");
 
-        foreach (var db in new[] { raw ,testDb})
+        foreach (var db in new[] { raw, testDb })
             if (db.Exists())
             {
                 foreach (var table in db.DiscoverTables(true))
@@ -43,20 +43,22 @@ public void CloneDatabaseAndTable()
 
                 db.Drop();
             }
-        
+
         DiscoveredServerICanCreateRandomDatabasesAndTablesOn.CreateDatabase(testLiveDatabaseName);
         Assert.IsTrue(testDb.Exists());
 
-        testDb.CreateTable("Table_1", new[] {new DatabaseColumnRequest("Id", "int")});
+        testDb.CreateTable("Table_1", new[] { new DatabaseColumnRequest("Id", "int") });
 
 
         //clone the builder
-        var builder = new SqlConnectionStringBuilder(DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder.ConnectionString)
-        {
-            InitialCatalog = testLiveDatabaseName
-        };
+        var builder =
+            new SqlConnectionStringBuilder(
+                DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder.ConnectionString)
+            {
+                InitialCatalog = testLiveDatabaseName
+            };
 
-        var dbConfiguration = new HICDatabaseConfiguration(new DiscoveredServer(builder),null,CatalogueRepository);
+        var dbConfiguration = new HICDatabaseConfiguration(new DiscoveredServer(builder), null, CatalogueRepository);
 
         var cloner = new DatabaseCloner(dbConfiguration);
         try
@@ -68,15 +70,15 @@ public void CloneDatabaseAndTable()
                 $"{testLiveDatabaseName}_RAW").Exists());
 
             //now create a catalogue and wire it SetUp to the table TEST on the test database server 
-            var cata = SetupATestCatalogue(builder, testLiveDatabaseName, "Table_1"); 
+            var cata = SetupATestCatalogue(builder, testLiveDatabaseName, "Table_1");
 
             //now clone the catalogue data structures to MachineName
             foreach (TableInfo tableInfo in cata.GetTableInfoList(false))
-                cloner.CreateTablesInDatabaseFromCatalogueInfo(new ThrowImmediatelyDataLoadEventListener(), tableInfo, LoadBubble.Raw);
-                
+                cloner.CreateTablesInDatabaseFromCatalogueInfo(new ThrowImmediatelyDataLoadEventListener(), tableInfo,
+                    LoadBubble.Raw);
+
             Assert.IsTrue(raw.Exists());
             Assert.IsTrue(raw.ExpectTable("Table_1").Exists());
-
         }
         finally
         {
@@ -99,7 +101,8 @@ private Catalogue SetupATestCatalogue(SqlConnectionStringBuilder builder, string
     {
         //create a new catalogue for test data (in the test data catalogue)
         var cat = new Catalogue(CatalogueRepository, "DeleteMe");
-        var importer = new TableInfoImporter(CatalogueRepository, builder.DataSource, database, table, DatabaseType.MicrosoftSQLServer, builder.UserID, builder.Password);
+        var importer = new TableInfoImporter(CatalogueRepository, builder.DataSource, database, table,
+            DatabaseType.MicrosoftSQLServer, builder.UserID, builder.Password);
         importer.DoImport(out var tableInfo, out var columnInfos);
 
         toCleanUp.Push(cat);
@@ -108,15 +111,16 @@ private Catalogue SetupATestCatalogue(SqlConnectionStringBuilder builder, string
         var creds = (DataAccessCredentials)tableInfo.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
         if (creds != null)
             toCleanUp.Push(creds);
-            
+
         //and the TableInfo
         toCleanUp.Push(tableInfo);
-            
+
         //for each column we will add a new one to the 
         foreach (var col in columnInfos)
         {
             //create it with the same name
-            var cataItem = new CatalogueItem(CatalogueRepository, cat, col.Name[(col.Name.LastIndexOf(".") + 1)..].Trim('[', ']', '`'));
+            var cataItem = new CatalogueItem(CatalogueRepository, cat,
+                col.Name[(col.Name.LastIndexOf(".") + 1)..].Trim('[', ']', '`'));
             toCleanUp.Push(cataItem);
 
             cataItem.SetColumnInfo(col);
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionCheckTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionCheckTests.cs
index 166f489305..d55cacbff6 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionCheckTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionCheckTests.cs
@@ -43,7 +43,7 @@ public void TestChecking_RoundDateToMiddleOfQuarter_WrongDataType(string incompa
     [TestCase("datetime")]
     public void TestChecking_RoundDateToMiddleOfQuarter_CompatibleDataType(string incompatibleType)
     {
-        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.SqlDataType==incompatibleType);
+        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.SqlDataType == incompatibleType);
 
         var dil = new RoundDateToMiddleOfQuarter
         {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationFactoryTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationFactoryTests.cs
index 224a56585b..91a12f03af 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationFactoryTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationFactoryTests.cs
@@ -27,25 +27,25 @@ public void NullColumn_Throws()
     [Test]
     public void NullOperation_Throws()
     {
-        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository==CatalogueRepository);
+        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository == CatalogueRepository);
 
         var factory = new DilutionOperationFactory(col);
-        Assert.Throws<ArgumentNullException>(()=>factory.Create(null));
+        Assert.Throws<ArgumentNullException>(() => factory.Create(null));
     }
 
     [Test]
     public void UnexpectedType_Throws()
     {
-        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository==CatalogueRepository);
+        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository == CatalogueRepository);
 
         var factory = new DilutionOperationFactory(col);
-        Assert.Throws<ArgumentException>(()=>factory.Create(typeof(Catalogue)));
+        Assert.Throws<ArgumentException>(() => factory.Create(typeof(Catalogue)));
     }
 
     [Test]
     public void ExpectedType_Created()
     {
-        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository==CatalogueRepository);
+        var col = Mock.Of<IPreLoadDiscardedColumn>(p => p.Repository == CatalogueRepository);
 
         var factory = new DilutionOperationFactory(col);
         var i = factory.Create(typeof(ExcludeRight3OfUKPostcodes));
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationTests.cs
index f30333ac7b..fed562622c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DilutionTests/DilutionOperationTests.cs
@@ -21,7 +21,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.DilutionTests;
 
-public class DilutionOperationTests:DatabaseTests
+public class DilutionOperationTests : DatabaseTests
 {
     [TestCase("2001-01-03", "2001-02-15")]
     [TestCase("2001-03-31", "2001-02-15")]
@@ -31,10 +31,8 @@ public class DilutionOperationTests:DatabaseTests
     [TestCase(null, null)]
     public void TestRoundDateToMiddleOfQuarter(string input, string expectedDilute)
     {
-
-
-        var tbl = Mock.Of<ITableInfo>(m => m.GetRuntimeName(LoadStage.AdjustStaging,null) == "DateRoundingTests");
-        var col = Mock.Of<IPreLoadDiscardedColumn>(c=>
+        var tbl = Mock.Of<ITableInfo>(m => m.GetRuntimeName(LoadStage.AdjustStaging, null) == "DateRoundingTests");
+        var col = Mock.Of<IPreLoadDiscardedColumn>(c =>
             c.TableInfo == tbl &&
             c.GetRuntimeName() == "TestField");
 
@@ -63,7 +61,7 @@ public void TestRoundDateToMiddleOfQuarter(string input, string expectedDilute)
                 else
                     Assert.AreEqual(DateTime.Parse(expectedDilute), result);
             }
-            finally  
+            finally
             {
                 con.ManagedTransaction.AbandonAndCloseConnection();
             }
@@ -81,17 +79,23 @@ public void TestRoundDateToMiddleOfQuarter(string input, string expectedDilute)
     [TestCase("!D!D!3!9TA!", "DD3")] //Random garbage
     [TestCase("EC4V_2AU", "EC4V")] //underscore instead of space
     [TestCase("EC4V2AU   ", "EC4V")] //Trailing whitespace
-    [TestCase("??", "??")] //It's short and it's complete garbage but this is the kind of thing research datasets have :)
-    [TestCase("???????", "????")] //Return type is varchar(4) so while we reject the original value we still end SetUp truncating it
+    [TestCase("??",
+        "??")] //It's short and it's complete garbage but this is the kind of thing research datasets have :)
+    [TestCase("???????",
+        "????")] //Return type is varchar(4) so while we reject the original value we still end SetUp truncating it
     [TestCase("I<3Coffee Yay", "I3Co")] //What can you do?!, got to return varchar(4)
-    [TestCase("D3 9T", "D39T")]//39T isn't a valid suffix and the remainder (D) wouldn't be enough for a postcode prefix anyway so just return the original input minus dodgy characters
-    [TestCase("G    9TA", "G")]//9TA is the correct suffix pattern (Numeric Alpha Alpha) so can be chopped off and the remainder returned (G)
-    [TestCase("DD3 9T", "DD")] //Expected to get it wrong because the suffix check sees 39T but the remainder is long enough to make a legit postcode (2).  We are currently deciding not to evaluate spaces/other dodgy characters when attempting to resolve postcodes
-    [TestCase(null,null)]
+    [TestCase("D3 9T",
+        "D39T")] //39T isn't a valid suffix and the remainder (D) wouldn't be enough for a postcode prefix anyway so just return the original input minus dodgy characters
+    [TestCase("G    9TA",
+        "G")] //9TA is the correct suffix pattern (Numeric Alpha Alpha) so can be chopped off and the remainder returned (G)
+    [TestCase("DD3 9T",
+        "DD")] //Expected to get it wrong because the suffix check sees 39T but the remainder is long enough to make a legit postcode (2).  We are currently deciding not to evaluate spaces/other dodgy characters when attempting to resolve postcodes
+    [TestCase(null, null)]
     public void TestExcludeRight3OfUKPostcodes(string input, string expectedDilute)
     {
-        var tbl = Mock.Of<ITableInfo>(t=>t.GetRuntimeName(LoadStage.AdjustStaging,null) == "ExcludeRight3OfPostcodes");
-        var col = Mock.Of<IPreLoadDiscardedColumn>(c=>c.TableInfo == tbl && c.GetRuntimeName() == "TestField");
+        var tbl = Mock.Of<ITableInfo>(
+            t => t.GetRuntimeName(LoadStage.AdjustStaging, null) == "ExcludeRight3OfPostcodes");
+        var col = Mock.Of<IPreLoadDiscardedColumn>(c => c.TableInfo == tbl && c.GetRuntimeName() == "TestField");
 
         var o = new ExcludeRight3OfUKPostcodes
         {
@@ -112,8 +116,8 @@ public void TestExcludeRight3OfUKPostcodes(string input, string expectedDilute)
                 UsefulStuff.ExecuteBatchNonQuery(sql, con.Connection, con.Transaction);
 
                 var result = server.GetCommand("SELECT * from ExcludeRight3OfPostcodes", con).ExecuteScalar();
-             
-                if(expectedDilute == null)
+
+                if (expectedDilute == null)
                     Assert.AreEqual(DBNull.Value, result);
                 else
                     Assert.AreEqual(expectedDilute, result);
@@ -122,23 +126,22 @@ public void TestExcludeRight3OfUKPostcodes(string input, string expectedDilute)
             {
                 con.ManagedTransaction.AbandonAndCloseConnection();
             }
-                
         }
     }
 
-    [TestCase("2001-01-03","datetime", true)]
+    [TestCase("2001-01-03", "datetime", true)]
     [TestCase("2001-01-03", "varchar(50)", true)]
-    [TestCase(null,"varchar(50)", false)]
+    [TestCase(null, "varchar(50)", false)]
     [TestCase(null, "bit", false)]
     [TestCase("1", "bit", true)]
     [TestCase("0", "bit", true)]
-    [TestCase("","varchar(1)", true)]//This data exists regardless of if it is blank so it still gets the 1
-    public void DiluteToBitFlag(string input,string inputDataType, bool expectedDilute)
+    [TestCase("", "varchar(1)", true)] //This data exists regardless of if it is blank so it still gets the 1
+    public void DiluteToBitFlag(string input, string inputDataType, bool expectedDilute)
     {
-        var tbl = Mock.Of<ITableInfo>(m => m.GetRuntimeName(LoadStage.AdjustStaging,null) == "DiluteToBitFlagTests");
-        var col = Mock.Of<IPreLoadDiscardedColumn>(c=>
-            c.TableInfo == tbl && 
-            c.GetRuntimeName() =="TestField");
+        var tbl = Mock.Of<ITableInfo>(m => m.GetRuntimeName(LoadStage.AdjustStaging, null) == "DiluteToBitFlagTests");
+        var col = Mock.Of<IPreLoadDiscardedColumn>(c =>
+            c.TableInfo == tbl &&
+            c.GetRuntimeName() == "TestField");
 
         var o = new CrushToBitFlag
         {
@@ -159,7 +162,7 @@ public void DiluteToBitFlag(string input,string inputDataType, bool expectedDilu
                 UsefulStuff.ExecuteBatchNonQuery(sql, con.Connection, con.Transaction);
 
                 var result = server.GetCommand("SELECT * from DiluteToBitFlagTests", con).ExecuteScalar();
-                    
+
                 Assert.AreEqual(expectedDilute, Convert.ToBoolean(result));
             }
             finally
@@ -168,7 +171,7 @@ public void DiluteToBitFlag(string input,string inputDataType, bool expectedDilu
             }
         }
     }
-        
+
     [Test]
     public void Dilution_WithNamer_Test()
     {
@@ -176,10 +179,10 @@ public void Dilution_WithNamer_Test()
 
         var dt = new DataTable();
         dt.Columns.Add("Bob");
-        dt.Rows.Add(new[] {"Fish"});
+        dt.Rows.Add(new[] { "Fish" });
 
         var tbl = db.CreateTable("DilutionNamerTest", dt);
-        Import(tbl,out var ti, out var cols);
+        Import(tbl, out var ti, out var cols);
 
         tbl.Rename("AAAA");
         var namer = RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "AAAA");
@@ -195,14 +198,14 @@ public void Dilution_WithNamer_Test()
         var dilution = new Dilution
         {
             ColumnToDilute = discarded,
-            Operation = typeof (CrushToBitFlag)
+            Operation = typeof(CrushToBitFlag)
         };
 
-        dilution.Initialize(db,LoadStage.AdjustStaging);
+        dilution.Initialize(db, LoadStage.AdjustStaging);
         dilution.Check(new ThrowImmediatelyCheckNotifier());
 
-        var job = new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(db.Server,namer),ti);
-            
+        var job = new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(db.Server, namer), ti);
+
         dilution.Mutilate(job);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DistincterTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DistincterTests.cs
index 2698f3bb90..4e08a6f4bb 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DistincterTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DistincterTests.cs
@@ -45,7 +45,7 @@ public void TestDistincter_Duplicates(DatabaseType type)
         for (var i = 0; i < batchCount; i++)
         {
             var randInt = r.Next(int.MaxValue);
-                
+
             dt.Rows.Add(new object[] { randInt, randInt, randInt, randInt, randInt });
             dt.Rows.Add(new object[] { randInt, randInt, randInt, randInt, randInt });
         }
@@ -68,13 +68,15 @@ public void TestDistincter_Duplicates(DatabaseType type)
         };
         distincter.Initialize(db, LoadStage.AdjustRaw);
 
-        var job = Mock.Of<IDataLoadJob>(p => p.RegularTablesToLoad==new List<ITableInfo>(new[] { tableInfo })&& p.Configuration==new HICDatabaseConfiguration(db.Server,null,null,null));
+        var job = Mock.Of<IDataLoadJob>(p =>
+            p.RegularTablesToLoad == new List<ITableInfo>(new[] { tableInfo }) &&
+            p.Configuration == new HICDatabaseConfiguration(db.Server, null, null, null));
 
         distincter.Mutilate(job);
 
         var rowsAfter = tbl.GetRowCount();
 
-        Assert.AreEqual(rowsBefore/2,rowsAfter);
+        Assert.AreEqual(rowsBefore / 2, rowsAfter);
 
         db.Drop();
     }
@@ -102,7 +104,7 @@ public void TestDistincter_NoDuplicates(DatabaseType type)
             var randInt = r.Next(int.MaxValue);
 
             dt.Rows.Add(new object[] { randInt, randInt, randInt, randInt, randInt });
-            dt.Rows.Add(new object[] { randInt, randInt, randInt, randInt, randInt+1 });
+            dt.Rows.Add(new object[] { randInt, randInt, randInt, randInt, randInt + 1 });
         }
 
         var tbl = db.CreateTable(dt.TableName, dt);
@@ -123,7 +125,9 @@ public void TestDistincter_NoDuplicates(DatabaseType type)
         };
         distincter.Initialize(db, LoadStage.AdjustRaw);
 
-        var job = Mock.Of<IDataLoadJob>(p => p.RegularTablesToLoad==new List<ITableInfo>(new[] { tableInfo }) && p.Configuration==new HICDatabaseConfiguration(db.Server,null,null,null));
+        var job = Mock.Of<IDataLoadJob>(p =>
+            p.RegularTablesToLoad == new List<ITableInfo>(new[] { tableInfo }) &&
+            p.Configuration == new HICDatabaseConfiguration(db.Server, null, null, null));
 
         distincter.Mutilate(job);
 
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelConversionTest.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelConversionTest.cs
index 912737f52f..09e8eb34bb 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelConversionTest.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelConversionTest.cs
@@ -22,7 +22,7 @@ public class ExcelConversionTest
 {
     private readonly Stack<DirectoryInfo> _dirsToCleanUp = new();
     private DirectoryInfo _parentDir;
-        
+
     [OneTimeSetUp]
     protected virtual void OneTimeSetUp()
     {
@@ -41,10 +41,10 @@ protected virtual void OneTimeTearDown()
                 dir.Delete(true);
         }
     }
-        
+
     private LoadDirectory CreateLoadDirectoryForTest(string directoryName)
     {
-        var loadDirectory = LoadDirectory.CreateDirectoryStructure(_parentDir, directoryName,true);
+        var loadDirectory = LoadDirectory.CreateDirectoryStructure(_parentDir, directoryName, true);
         _dirsToCleanUp.Push(loadDirectory.RootPath);
         return loadDirectory;
     }
@@ -87,12 +87,13 @@ public void TestExcelFunctionality_DodgyFileExtension()
 
         fi.CopyTo(targetFile, true);
 
-        var ex = Assert.Throws<Exception>(()=> TestConversionFor(targetFile, "*.fish", 1, LoadDirectory));
+        var ex = Assert.Throws<Exception>(() => TestConversionFor(targetFile, "*.fish", 1, LoadDirectory));
 
         Assert.IsTrue(ex.Message.StartsWith("Did not find any files matching Pattern '*.fish' in directory"));
     }
-        
-    private static void TestConversionFor(string targetFile, string fileExtensionToConvert, int expectedNumberOfSheets, LoadDirectory directory)
+
+    private static void TestConversionFor(string targetFile, string fileExtensionToConvert, int expectedNumberOfSheets,
+        LoadDirectory directory)
     {
         var f = new FileInfo(targetFile);
 
@@ -103,17 +104,18 @@ private static void TestConversionFor(string targetFile, string fileExtensionToC
 
             var converter = new ExcelToCSVFilesConverter();
 
-            var job = new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning =  true, WriteToConsole =  true})
-                {
-                    LoadDirectory = directory
-                };
+            var job = new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener
+                { ThrowOnWarning = true, WriteToConsole = true })
+            {
+                LoadDirectory = directory
+            };
 
             converter.ExcelFilePattern = fileExtensionToConvert;
             converter.Fetch(job, new GracefulCancellationToken());
 
             var filesCreated = directory.ForLoading.GetFiles("*.csv");
 
-            Assert.AreEqual(expectedNumberOfSheets,filesCreated.Length);
+            Assert.AreEqual(expectedNumberOfSheets, filesCreated.Length);
 
             foreach (var fileCreated in filesCreated)
             {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelDatabaseTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelDatabaseTests.cs
index c509233633..1374b12b07 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelDatabaseTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExcelDatabaseTests.cs
@@ -28,10 +28,11 @@ public void TestLoadingFileWithTrailingDotsInHeader()
         // Create the 'out of the box' RDMP pipelines (which includes an excel bulk importer pipeline)
         var creator = new CataloguePipelinesAndReferencesCreation(
             RepositoryLocator, UnitTestLoggingConnectionString, DataQualityEngineConnectionString);
-        creator.CreatePipelines();
+        creator.CreatePipelines(new PlatformDatabaseCreationOptions {});
 
         // find the excel loading pipeline
-        var pipe = CatalogueRepository.GetAllObjects<Pipeline>().OrderByDescending(p => p.ID).FirstOrDefault(p => p.Name.Contains("BULK INSERT: Excel File"));
+        var pipe = CatalogueRepository.GetAllObjects<Pipeline>().OrderByDescending(p => p.ID)
+            .FirstOrDefault(p => p.Name.Contains("BULK INSERT: Excel File"));
 
         // run an import of the file using the pipeline
         var cmd = new ExecuteCommandCreateNewCatalogueByImportingFile(
@@ -46,9 +47,9 @@ public void TestLoadingFileWithTrailingDotsInHeader()
 
         var cols = tbl.DiscoverColumns();
         Assert.AreEqual(2, cols.Length);
-        Assert.AreEqual("Field1",cols[0].GetRuntimeName());
+        Assert.AreEqual("Field1", cols[0].GetRuntimeName());
         Assert.AreEqual("Field2", cols[1].GetRuntimeName());
-                        
+
         Assert.AreEqual(2, tbl.GetRowCount());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecutableProcessTaskTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecutableProcessTaskTests.cs
index b510be4483..e402a338fb 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecutableProcessTaskTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecutableProcessTaskTests.cs
@@ -42,10 +42,11 @@ public void TestConstructionFromProcessTaskUsingDatabase()
 
             var runtimeTask = new ExecutableRuntimeTask(processTask, args);
             Assert.AreEqual(expectedPath, runtimeTask.ExeFilepath);
-                
+
             Assert.AreEqual(1, runtimeTask.RuntimeArguments.GetAllArgumentsOfType<string>().Count());
 
-            var dictionaryOfStringArguments = runtimeTask.RuntimeArguments.GetAllArgumentsOfType<string>().ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+            var dictionaryOfStringArguments = runtimeTask.RuntimeArguments.GetAllArgumentsOfType<string>()
+                .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
             Assert.IsNotNull(dictionaryOfStringArguments["DatabaseName"]);
             Assert.AreEqual("Foo_STAGING", dictionaryOfStringArguments["DatabaseName"]);
         }
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecuteSqlFileRuntimeTaskTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecuteSqlFileRuntimeTaskTests.cs
index 6c90857cdb..9d09b90263 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecuteSqlFileRuntimeTaskTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ExecuteSqlFileRuntimeTaskTests.cs
@@ -27,7 +27,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-internal class ExecuteSqlFileRuntimeTaskTests:DatabaseTests
+internal class ExecuteSqlFileRuntimeTaskTests : DatabaseTests
 {
     [TestCase(DatabaseType.MySql)]
     [TestCase(DatabaseType.MicrosoftSQLServer)]
@@ -35,21 +35,23 @@ public void ExecuteSqlFileRuntimeTask_BasicScript(DatabaseType dbType)
     {
         var dt = new DataTable();
         dt.Columns.Add("Lawl");
-        dt.Rows.Add(new object []{2});
+        dt.Rows.Add(new object[] { 2 });
 
         var db = GetCleanedServer(dbType);
 
-        var tbl = db.CreateTable("Fish",dt);
+        var tbl = db.CreateTable("Fish", dt);
 
-        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"Bob.sql"));
+        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Bob.sql"));
 
-        File.WriteAllText(f.FullName,@"UPDATE Fish Set Lawl = 1");
+        File.WriteAllText(f.FullName, @"UPDATE Fish Set Lawl = 1");
 
-        var pt = Mock.Of<IProcessTask>(x => x.Path==f.FullName);
+        var pt = Mock.Of<IProcessTask>(x => x.Path == f.FullName);
 
-        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"ExecuteSqlFileRuntimeTaskTests", true);
+        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+            "ExecuteSqlFileRuntimeTaskTests", true);
 
-        var task = new ExecuteSqlFileRuntimeTask(pt, new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
+        var task = new ExecuteSqlFileRuntimeTask(pt,
+            new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
 
         task.Check(new ThrowImmediatelyCheckNotifier());
 
@@ -57,7 +59,7 @@ public void ExecuteSqlFileRuntimeTask_BasicScript(DatabaseType dbType)
 
         task.Run(job, new GracefulCancellationToken());
 
-        Assert.AreEqual(1,tbl.GetDataTable().Rows[0][0]);
+        Assert.AreEqual(1, tbl.GetDataTable().Rows[0][0]);
 
         tbl.Drop();
     }
@@ -74,32 +76,34 @@ public void ExecuteSqlFileRuntimeTask_InvalidID(DatabaseType dbType)
 
         var tbl = db.CreateTable("Fish", dt);
 
-        Import(tbl,out var ti, out var cols);
+        Import(tbl, out var ti, out var cols);
 
         var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Bob.sql"));
-            
-        File.WriteAllText(f.FullName, @"UPDATE {T:0} Set {C:0} = 1");
 
-        var pt = Mock.Of<IProcessTask>(x => x.Path==f.FullName);
+        File.WriteAllText(f.FullName, @"UPDATE {T:0} Set {C:0} = 1");
 
-        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"ExecuteSqlFileRuntimeTaskTests", true);
+        var pt = Mock.Of<IProcessTask>(x => x.Path == f.FullName);
 
+        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+            "ExecuteSqlFileRuntimeTaskTests", true);
 
 
-        var task = new ExecuteSqlFileRuntimeTask(pt, new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
+        var task = new ExecuteSqlFileRuntimeTask(pt,
+            new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
 
         task.Check(new ThrowImmediatelyCheckNotifier());
         var configuration = new HICDatabaseConfiguration(db.Server);
 
         var job = Mock.Of<IDataLoadJob>(x =>
-            x.RegularTablesToLoad == new List<ITableInfo> {ti} &&
+            x.RegularTablesToLoad == new List<ITableInfo> { ti } &&
             x.LookupTablesToLoad == new List<ITableInfo>() &&
             x.Configuration == configuration);
 
-        var ex = Assert.Throws<ExecuteSqlFileRuntimeTaskException>(()=>task.Run(job, new GracefulCancellationToken()));
-        StringAssert.Contains("Failed to find a TableInfo in the load with ID 0",ex.Message);
+        var ex = Assert.Throws<ExecuteSqlFileRuntimeTaskException>(() =>
+            task.Run(job, new GracefulCancellationToken()));
+        StringAssert.Contains("Failed to find a TableInfo in the load with ID 0", ex.Message);
 
-        task.LoadCompletedSoDispose(Core.DataLoad.ExitCodeType.Success,new ThrowImmediatelyDataLoadEventListener());
+        task.LoadCompletedSoDispose(Core.DataLoad.ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
     }
 
     [TestCase(DatabaseType.MySql)]
@@ -114,17 +118,21 @@ public void ExecuteSqlRuntimeTask_InvalidID(DatabaseType dbType)
 
         var tbl = db.CreateTable("Fish", dt);
 
-        Import(tbl,out var ti, out var cols);
+        Import(tbl, out var ti, out var cols);
 
         var sql = @"UPDATE {T:0} Set {C:0} = 1";
 
-        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"ExecuteSqlFileRuntimeTaskTests", true);
+        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+            "ExecuteSqlFileRuntimeTaskTests", true);
 
 #pragma warning disable CS0252, CS0253 // Spurious warning 'Possible unintended reference comparison; left hand side needs cast' since VS doesn't grok Moq fully
-        var sqlArg = new IArgument[]{Mock.Of<IArgument>(x =>
-            x.Name == "Sql" &&
-            x.Value == sql &&
-            x.GetValueAsSystemType() == sql) };
+        var sqlArg = new IArgument[]
+        {
+            Mock.Of<IArgument>(x =>
+                x.Name == "Sql" &&
+                x.Value == sql &&
+                x.GetValueAsSystemType() == sql)
+        };
 #pragma warning restore CS0252, CS0253
 
         var args = new RuntimeArgumentCollection(sqlArg, new StageArgs(LoadStage.AdjustRaw, db, dir));
@@ -134,24 +142,24 @@ public void ExecuteSqlRuntimeTask_InvalidID(DatabaseType dbType)
             x.GetAllArguments() == sqlArg
         );
 
-        IRuntimeTask task = new MutilateDataTablesRuntimeTask(pt,args,CatalogueRepository.MEF);
+        IRuntimeTask task = new MutilateDataTablesRuntimeTask(pt, args, CatalogueRepository.MEF);
 
         task.Check(new ThrowImmediatelyCheckNotifier());
         var configuration = new HICDatabaseConfiguration(db.Server);
 
         var job = new ThrowImmediatelyDataLoadJob
         {
-            RegularTablesToLoad = new List<ITableInfo> {ti},
+            RegularTablesToLoad = new List<ITableInfo> { ti },
             LookupTablesToLoad = new List<ITableInfo>(),
             Configuration = configuration
         };
 
-        var ex = Assert.Throws<Exception>(()=>task.Run(job, new GracefulCancellationToken()));
+        var ex = Assert.Throws<Exception>(() => task.Run(job, new GracefulCancellationToken()));
 
-        StringAssert.Contains("Mutilate failed",ex.Message);
-        StringAssert.Contains("Failed to find a TableInfo in the load with ID 0",ex.InnerException.Message);
+        StringAssert.Contains("Mutilate failed", ex.Message);
+        StringAssert.Contains("Failed to find a TableInfo in the load with ID 0", ex.InnerException.Message);
 
-        task.LoadCompletedSoDispose(Core.DataLoad.ExitCodeType.Success,new ThrowImmediatelyDataLoadEventListener());
+        task.LoadCompletedSoDispose(Core.DataLoad.ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
     }
 
     [TestCase(DatabaseType.MySql)]
@@ -179,21 +187,23 @@ public void ExecuteSqlFileRuntimeTask_ValidID_CustomNamer(DatabaseType dbType)
         //we renamed the table to simulate RAW, confirm TableInfo doesn't think it exists
         Assert.IsFalse(ti.Discover(DataAccessContext.InternalDataProcessing).Exists());
 
-        var pt = Mock.Of<IProcessTask>(x => x.Path==f.FullName);
+        var pt = Mock.Of<IProcessTask>(x => x.Path == f.FullName);
 
-        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"ExecuteSqlFileRuntimeTaskTests", true);
+        var dir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+            "ExecuteSqlFileRuntimeTaskTests", true);
 
-        var task = new ExecuteSqlFileRuntimeTask(pt, new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
+        var task = new ExecuteSqlFileRuntimeTask(pt,
+            new RuntimeArgumentCollection(Array.Empty<IArgument>(), new StageArgs(LoadStage.AdjustRaw, db, dir)));
 
         task.Check(new ThrowImmediatelyCheckNotifier());
 
 
         //create a namer that tells the user
         var namer = RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, tableName);
-        var configuration = new HICDatabaseConfiguration(db.Server,namer);
+        var configuration = new HICDatabaseConfiguration(db.Server, namer);
 
         var job = Mock.Of<IDataLoadJob>(x =>
-            x.RegularTablesToLoad == new List<ITableInfo> { ti }&&
+            x.RegularTablesToLoad == new List<ITableInfo> { ti } &&
             x.LookupTablesToLoad == new List<ITableInfo>() &&
             x.Configuration == configuration);
 
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/FixedWidthTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/FixedWidthTests.cs
index 917208f1e3..d5948b72ae 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/FixedWidthTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/FixedWidthTests.cs
@@ -19,14 +19,14 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class FixedWidthTests :DatabaseTests
+public class FixedWidthTests : DatabaseTests
 {
     private static FixedWidthFormatFile CreateFormatFile()
     {
-        var fileInfo = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,@"FixedWidthFormat.csv"));
+        var fileInfo = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, @"FixedWidthFormat.csv"));
 
         File.WriteAllText(fileInfo.FullName, LoadDirectory.ExampleFixedWidthFormatFileContents);
-            
+
         Assert.IsTrue(fileInfo.Exists);
 
         return new FixedWidthFormatFile(fileInfo);
@@ -37,55 +37,63 @@ public void TestLoadingFormat()
     {
         var formatFile = CreateFormatFile();
 
-        Assert.AreEqual(8,formatFile.FormatColumns.Length);
+        Assert.AreEqual(8, formatFile.FormatColumns.Length);
 
-        Assert.AreEqual("gmc",formatFile.FormatColumns[0].Field);
+        Assert.AreEqual("gmc", formatFile.FormatColumns[0].Field);
         Assert.AreEqual(1, formatFile.FormatColumns[0].From);
         Assert.AreEqual(7, formatFile.FormatColumns[0].To);
-        Assert.AreEqual(1+ formatFile.FormatColumns[0].To - formatFile.FormatColumns[0].From, formatFile.FormatColumns[0].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[0].To - formatFile.FormatColumns[0].From,
+            formatFile.FormatColumns[0].Size);
         Assert.AreEqual(7, formatFile.FormatColumns[0].Size);
 
         Assert.AreEqual("gp_code", formatFile.FormatColumns[1].Field);
         Assert.AreEqual(8, formatFile.FormatColumns[1].From);
         Assert.AreEqual(12, formatFile.FormatColumns[1].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[1].To - formatFile.FormatColumns[1].From, formatFile.FormatColumns[1].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[1].To - formatFile.FormatColumns[1].From,
+            formatFile.FormatColumns[1].Size);
         Assert.AreEqual(5, formatFile.FormatColumns[1].Size);
 
         Assert.AreEqual("surname", formatFile.FormatColumns[2].Field);
         Assert.AreEqual(13, formatFile.FormatColumns[2].From);
         Assert.AreEqual(32, formatFile.FormatColumns[2].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[2].To - formatFile.FormatColumns[2].From, formatFile.FormatColumns[2].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[2].To - formatFile.FormatColumns[2].From,
+            formatFile.FormatColumns[2].Size);
         Assert.AreEqual(20, formatFile.FormatColumns[2].Size);
 
         Assert.AreEqual("forename", formatFile.FormatColumns[3].Field);
         Assert.AreEqual(33, formatFile.FormatColumns[3].From);
         Assert.AreEqual(52, formatFile.FormatColumns[3].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[3].To - formatFile.FormatColumns[3].From, formatFile.FormatColumns[3].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[3].To - formatFile.FormatColumns[3].From,
+            formatFile.FormatColumns[3].Size);
         Assert.AreEqual(20, formatFile.FormatColumns[3].Size);
 
         Assert.AreEqual("initials", formatFile.FormatColumns[4].Field);
         Assert.AreEqual(53, formatFile.FormatColumns[4].From);
         Assert.AreEqual(55, formatFile.FormatColumns[4].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[4].To - formatFile.FormatColumns[4].From, formatFile.FormatColumns[4].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[4].To - formatFile.FormatColumns[4].From,
+            formatFile.FormatColumns[4].Size);
         Assert.AreEqual(3, formatFile.FormatColumns[4].Size);
 
         Assert.AreEqual("practice_code", formatFile.FormatColumns[5].Field);
         Assert.AreEqual(56, formatFile.FormatColumns[5].From);
         Assert.AreEqual(60, formatFile.FormatColumns[5].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[5].To - formatFile.FormatColumns[5].From, formatFile.FormatColumns[5].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[5].To - formatFile.FormatColumns[5].From,
+            formatFile.FormatColumns[5].Size);
         Assert.AreEqual(5, formatFile.FormatColumns[5].Size);
-            
+
         Assert.AreEqual("date_into_practice", formatFile.FormatColumns[6].Field);
         Assert.AreEqual(61, formatFile.FormatColumns[6].From);
         Assert.AreEqual(68, formatFile.FormatColumns[6].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[6].To - formatFile.FormatColumns[6].From, formatFile.FormatColumns[6].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[6].To - formatFile.FormatColumns[6].From,
+            formatFile.FormatColumns[6].Size);
         Assert.AreEqual(8, formatFile.FormatColumns[6].Size);
         Assert.AreEqual("yyyyMMdd", formatFile.FormatColumns[6].DateFormat);
 
         Assert.AreEqual("date_out_of_practice", formatFile.FormatColumns[7].Field);
         Assert.AreEqual(69, formatFile.FormatColumns[7].From);
         Assert.AreEqual(76, formatFile.FormatColumns[7].To);
-        Assert.AreEqual(1 + formatFile.FormatColumns[7].To - formatFile.FormatColumns[7].From, formatFile.FormatColumns[7].Size);
+        Assert.AreEqual(1 + formatFile.FormatColumns[7].To - formatFile.FormatColumns[7].From,
+            formatFile.FormatColumns[7].Size);
         Assert.AreEqual(8, formatFile.FormatColumns[7].Size);
         Assert.AreEqual("yyyyMMdd", formatFile.FormatColumns[7].DateFormat);
     }
@@ -95,7 +103,7 @@ public void TestLoadingFormatThenFile()
     {
         var formatFile = CreateFormatFile();
 
-        var tempFileToCreate = Path.Combine(TestContext.CurrentContext.TestDirectory,"unitTestFixedWidthFile.txt");
+        var tempFileToCreate = Path.Combine(TestContext.CurrentContext.TestDirectory, "unitTestFixedWidthFile.txt");
 
         var streamWriter = File.CreateText(tempFileToCreate);
         try
@@ -106,7 +114,7 @@ public void TestLoadingFormatThenFile()
             streamWriter.Close();
 
             var dataTable = formatFile.GetDataTableFromFlatFile(new FileInfo(tempFileToCreate));
-            Assert.AreEqual(dataTable.Rows.Count,2);
+            Assert.AreEqual(dataTable.Rows.Count, 2);
             Assert.AreEqual("0026440", dataTable.Rows[0]["gmc"]);
             Assert.AreEqual("99999", dataTable.Rows[0]["gp_code"]);
             Assert.AreEqual("Akerman", dataTable.Rows[0]["surname"]);
@@ -114,9 +122,7 @@ public void TestLoadingFormatThenFile()
             Assert.AreEqual("FM", dataTable.Rows[0]["initials"]);
             Assert.AreEqual("38051", dataTable.Rows[0]["practice_code"]);
             Assert.AreEqual(new DateTime(2004, 4, 1), dataTable.Rows[0]["date_into_practice"]);
-            Assert.AreEqual(new DateTime(2009,5,1), dataTable.Rows[0]["date_out_of_practice"]);
-
-
+            Assert.AreEqual(new DateTime(2009, 5, 1), dataTable.Rows[0]["date_out_of_practice"]);
         }
         finally
         {
@@ -143,7 +149,7 @@ public void TestHeaderMatching(FixedWidthTestCase testCase)
         if (testCase == FixedWidthTestCase.MisnamedHeaders)
             flatFileColumn = "chickenDippers";
 
-        var formatFile = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"Format.csv"));
+        var formatFile = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "Format.csv"));
 
         File.WriteAllText(formatFile.FullName, $@"From,To,Field,Size,DateFormat
 1,5,{flatFileColumn},5");
@@ -181,7 +187,7 @@ public void TestHeaderMatching(FixedWidthTestCase testCase)
         }
 
         var table = db.ExpectTable("TestHeaderMatching_Compatible");
-            
+
         Assert.IsTrue(table.Exists());
         Assert.AreEqual(0, table.GetRowCount());
         try
@@ -195,19 +201,21 @@ public void TestHeaderMatching(FixedWidthTestCase testCase)
                 case FixedWidthTestCase.CompatibleHeaders:
                     attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
                     Assert.AreEqual(2, table.GetRowCount());
-                    return;//Return
+                    return; //Return
 
 
                 //Error cases, set the expected error result
                 case FixedWidthTestCase.MisnamedHeaders:
                     errorRegex = new Regex(
                         @"Format file \(.*Format.csv\) indicated there would be a header called 'chickenDippers' but the column did not appear in the RAW database table \(Columns in RAW were myNumber\)");
-                    ex = Assert.Throws<Exception>(() => attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+                    ex = Assert.Throws<Exception>(() =>
+                        attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
                     break;
                 case FixedWidthTestCase.InsufficientLengthOfCharactersInFileToLoad:
                     errorRegex = new Regex(
                         @"Error on line 2 of file file.txt, the format file \(.*Format.csv\) specified that a column myNumber would be found between character positions 1 and 5 but the current line is only 2 characters long");
-                    ex = Assert.Throws<FlatFileLoadException>(() => attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+                    ex = Assert.Throws<FlatFileLoadException>(() =>
+                        attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(testCase));
@@ -215,8 +223,6 @@ public void TestHeaderMatching(FixedWidthTestCase testCase)
 
             //Assert the expected error result is the real one
             Assert.IsTrue(errorRegex.IsMatch(ex.Message));
-
-
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs
index 0b04d910f8..5c4ce326d4 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/FlatFileAttacherTests.cs
@@ -46,30 +46,28 @@ protected override void SetUp()
         toCleanup?.Delete(true);
 
         LoadDirectory = LoadDirectory.CreateDirectoryStructure(parentDir, "Test_CSV_Attachment");
-            
+
         // create a separate builder for setting an initial catalog on (need to figure out how best to stop child classes changing ServerICan... as this then causes TearDown to fail)
         _database = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
-            
+
         using (var con = _database.Server.GetConnection())
         {
             con.Open();
 
             var cmdCreateTable = _database.Server.GetCommand(
-                $"CREATE Table {_database.GetRuntimeName()}..Bob([name] [varchar](500),[name2] [varchar](500))",con);
+                $"CREATE Table {_database.GetRuntimeName()}..Bob([name] [varchar](500),[name2] [varchar](500))", con);
             cmdCreateTable.ExecuteNonQuery();
         }
 
         _table = _database.ExpectTable("Bob");
-
     }
 
     [Test]
-    [TestCase(",",false)]
-    [TestCase("|",false)]//wrong separator
-    [TestCase(",",true)]
+    [TestCase(",", false)]
+    [TestCase("|", false)] //wrong separator
+    [TestCase(",", true)]
     public void Test_CSV_Attachment(string separator, bool overrideHeaders)
     {
-
         var filename = Path.Combine(LoadDirectory.ForLoading.FullName, "bob.csv");
         var sw = new StreamWriter(filename);
 
@@ -105,13 +103,15 @@ public void Test_CSV_Attachment(string separator, bool overrideHeaders)
         }
 
         //Case when you are using the wrong separator
-        if(separator == "|")
+        if (separator == "|")
         {
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
 
-            var ex = Assert.Throws<FlatFileLoadException>(()=>attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
-                
             Assert.IsNotNull(ex.InnerException);
-            StringAssert.StartsWith("Your separator does not appear in the headers line of your file (bob.csv) but the separator ',' does", ex.InnerException.Message);
+            StringAssert.StartsWith(
+                "Your separator does not appear in the headers line of your file (bob.csv) but the separator ',' does",
+                ex.InnerException.Message);
             return;
         }
 
@@ -126,29 +126,27 @@ public void Test_CSV_Attachment(string separator, bool overrideHeaders)
 
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
             var r = _database.Server.GetCommand("Select * from Bob", con).ExecuteReader();
             Assert.IsTrue(r.Read());
-            Assert.AreEqual("Bob",r["name"]);
+            Assert.AreEqual("Bob", r["name"]);
             Assert.AreEqual("Munchousain", r["name2"]);
-                    
+
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Franky", r["name"]);
             Assert.AreEqual("Hollyw9ood", r["name2"]);
-                
+
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Manny2", r["name"]);
             Assert.AreEqual("Ok", r["name2"]);
         }
-            
-        attacher.LoadCompletedSoDispose(ExitCodeType.Success,new ThrowImmediatelyDataLoadEventListener());
+
+        attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
     }
 
 
-        
     [Test]
     public void Test_ExplicitDateTimeFormat_Attachment()
     {
@@ -184,19 +182,18 @@ public void Test_ExplicitDateTimeFormat_Attachment()
 
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
             var r = _database.Server.GetCommand("Select * from Bob", con).ExecuteReader();
             Assert.IsTrue(r.Read());
-            Assert.AreEqual("Bob",r["name"]);
-            Assert.AreEqual(new DateTime(2001,01,13), r["name2"]);
-                    
+            Assert.AreEqual("Bob", r["name"]);
+            Assert.AreEqual(new DateTime(2001, 01, 13), r["name2"]);
+
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Franky", r["name"]);
-            Assert.AreEqual(new DateTime(2002,01,13), r["name2"]);
+            Assert.AreEqual(new DateTime(2002, 01, 13), r["name2"]);
         }
-            
-        attacher.LoadCompletedSoDispose(ExitCodeType.Success,new ThrowImmediatelyDataLoadEventListener());
+
+        attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
     }
@@ -222,11 +219,10 @@ public void TabTestWithOverrideHeaders()
         attacher.ForceHeaders = "name\tname2";
 
         var exitCode = attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
-        Assert.AreEqual(ExitCodeType.Success,exitCode);
+        Assert.AreEqual(ExitCodeType.Success, exitCode);
 
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
             var r = _database.Server.GetCommand("Select name,name2 from Bob", con).ExecuteReader();
             Assert.IsTrue(r.Read());
@@ -241,8 +237,6 @@ public void TabTestWithOverrideHeaders()
         attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
-
-
     }
 
     [TestCase(true)]
@@ -260,7 +254,7 @@ public void TabTestWithOverrideHeaders_IncludePath(bool columnExistsInRaw)
         sw.Dispose();
 
         if (columnExistsInRaw)
-            _table.AddColumn("FilePath",new DatabaseTypeRequest(typeof(string),500),true,30);
+            _table.AddColumn("FilePath", new DatabaseTypeRequest(typeof(string), 500), true, 30);
 
         var attacher = new AnySeparatorFileAttacher();
         attacher.Initialize(LoadDirectory, _database);
@@ -272,8 +266,10 @@ public void TabTestWithOverrideHeaders_IncludePath(bool columnExistsInRaw)
 
         if (!columnExistsInRaw)
         {
-            var ex = Assert.Throws<FlatFileLoadException>(()=>attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
-            Assert.AreEqual("AddFilenameColumnNamed is set to 'FilePath' but the column did not exist in RAW",ex.InnerException.Message);
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+            Assert.AreEqual("AddFilenameColumnNamed is set to 'FilePath' but the column did not exist in RAW",
+                ex.InnerException.Message);
             return;
         }
 
@@ -283,7 +279,6 @@ public void TabTestWithOverrideHeaders_IncludePath(bool columnExistsInRaw)
 
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
             var r = _database.Server.GetCommand("Select name,name2,FilePath from Bob", con).ExecuteReader();
             Assert.IsTrue(r.Read());
@@ -299,8 +294,6 @@ public void TabTestWithOverrideHeaders_IncludePath(bool columnExistsInRaw)
         attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
-
-
     }
 
 
@@ -339,12 +332,12 @@ public void TestTableInfo(bool usenamer)
 
         var exitCode = attacher.Attach(job, new GracefulCancellationToken());
         Assert.AreEqual(ExitCodeType.Success, exitCode);
-            
+
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
-            var r = _database.Server.GetCommand($"Select name,name2 from {_table.GetRuntimeName()}", con).ExecuteReader();
+            var r = _database.Server.GetCommand($"Select name,name2 from {_table.GetRuntimeName()}", con)
+                .ExecuteReader();
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Bob", r["name"]);
             Assert.AreEqual("Munchousain", r["name2"]);
@@ -357,7 +350,6 @@ public void TestTableInfo(bool usenamer)
         attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
-
     }
 
 
@@ -391,9 +383,9 @@ public void Test_FlatFileAttacher_IgnoreColumns()
 
         using (var con = _database.Server.GetConnection())
         {
-
             con.Open();
-            var r = _database.Server.GetCommand($"Select name,name2 from {_table.GetRuntimeName()}", con).ExecuteReader();
+            var r = _database.Server.GetCommand($"Select name,name2 from {_table.GetRuntimeName()}", con)
+                .ExecuteReader();
             Assert.IsTrue(r.Read());
             Assert.AreEqual("Bob", r["name"]);
             Assert.AreEqual("Munchousain", r["name2"]);
@@ -406,26 +398,23 @@ public void Test_FlatFileAttacher_IgnoreColumns()
         attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
         File.Delete(filename);
-
     }
-        
-    [TestCase(DatabaseType.MySql,"27/01/2001","en-GB","en-GB")]
-    [TestCase(DatabaseType.MySql,"27/01/2001","en-GB","en-us")]
-    [TestCase(DatabaseType.MySql,"01/27/2001","en-us", "en-us")]
-    [TestCase(DatabaseType.MySql,"01/27/2001","en-us", "en-GB")]
-
-    [TestCase(DatabaseType.MicrosoftSQLServer,"27/01/2001","en-GB","en-GB")]
-    [TestCase(DatabaseType.MicrosoftSQLServer,"27/01/2001","en-GB","en-us")]
-    [TestCase(DatabaseType.MicrosoftSQLServer,"01/27/2001","en-us","en-us")]
-    [TestCase(DatabaseType.MicrosoftSQLServer,"01/27/2001","en-us","en-GB")]
-                
-    [TestCase(DatabaseType.Oracle,"27/01/2001","en-GB","en-GB")]
-    [TestCase(DatabaseType.Oracle,"27/01/2001","en-GB","en-us")]
-    [TestCase(DatabaseType.Oracle,"01/27/2001","en-us","en-us")]
-    [TestCase(DatabaseType.Oracle,"01/27/2001","en-us","en-GB")]
-
-    public void Test_FlatFileAttacher_AmbiguousDates(DatabaseType type,string val,string attacherCulture, string threadCulture)
-    { 
+
+    [TestCase(DatabaseType.MySql, "27/01/2001", "en-GB", "en-GB")]
+    [TestCase(DatabaseType.MySql, "27/01/2001", "en-GB", "en-us")]
+    [TestCase(DatabaseType.MySql, "01/27/2001", "en-us", "en-us")]
+    [TestCase(DatabaseType.MySql, "01/27/2001", "en-us", "en-GB")]
+    [TestCase(DatabaseType.MicrosoftSQLServer, "27/01/2001", "en-GB", "en-GB")]
+    [TestCase(DatabaseType.MicrosoftSQLServer, "27/01/2001", "en-GB", "en-us")]
+    [TestCase(DatabaseType.MicrosoftSQLServer, "01/27/2001", "en-us", "en-us")]
+    [TestCase(DatabaseType.MicrosoftSQLServer, "01/27/2001", "en-us", "en-GB")]
+    [TestCase(DatabaseType.Oracle, "27/01/2001", "en-GB", "en-GB")]
+    [TestCase(DatabaseType.Oracle, "27/01/2001", "en-GB", "en-us")]
+    [TestCase(DatabaseType.Oracle, "01/27/2001", "en-us", "en-us")]
+    [TestCase(DatabaseType.Oracle, "01/27/2001", "en-us", "en-GB")]
+    public void Test_FlatFileAttacher_AmbiguousDates(DatabaseType type, string val, string attacherCulture,
+        string threadCulture)
+    {
         Thread.CurrentThread.CurrentCulture = new CultureInfo(threadCulture);
 
         var filename = Path.Combine(LoadDirectory.ForLoading.FullName, "bob.csv");
@@ -440,13 +429,13 @@ public void Test_FlatFileAttacher_AmbiguousDates(DatabaseType type,string val,st
 
         var db = GetCleanedServer(type);
 
-        var tbl = 
+        var tbl =
             db.CreateTable("AmbiguousDatesTestTable",
-                new []{new DatabaseColumnRequest("dob",new DatabaseTypeRequest(typeof(DateTime)))}
+                new[] { new DatabaseColumnRequest("dob", new DatabaseTypeRequest(typeof(DateTime))) }
             );
 
 
-        Import(tbl,out var ti,out _);
+        Import(tbl, out var ti, out _);
         var attacher = new AnySeparatorFileAttacher
         {
             Separator = ",",
@@ -456,14 +445,14 @@ public void Test_FlatFileAttacher_AmbiguousDates(DatabaseType type,string val,st
         };
         attacher.Initialize(LoadDirectory, db);
 
-        var job = new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(_database.Server, null),ti);
+        var job = new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(_database.Server, null), ti);
 
         var exitCode = attacher.Attach(job, new GracefulCancellationToken());
         Assert.AreEqual(ExitCodeType.Success, exitCode);
-            
+
         attacher.LoadCompletedSoDispose(ExitCodeType.Success, new ThrowImmediatelyDataLoadEventListener());
 
-        Assert.AreEqual(new DateTime(2001,1,27),tbl.GetDataTable().Rows[0][0]);
+        Assert.AreEqual(new DateTime(2001, 1, 27), tbl.GetDataTable().Rows[0][0]);
 
         File.Delete(filename);
         tbl.Drop();
@@ -474,19 +463,21 @@ public void Test_TableToLoad_IDNotInLoadMetadata()
     {
         var source = new AnySeparatorFileAttacher();
 
-        var tiInLoad = new TableInfo(CatalogueRepository,"TableInLoad");
+        var tiInLoad = new TableInfo(CatalogueRepository, "TableInLoad");
         var tiNotInLoad = new TableInfo(CatalogueRepository, "TableNotInLoad");
 
         source.TableToLoad = tiNotInLoad;
 
-        var job = new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true})
-            {
-                RegularTablesToLoad = new System.Collections.Generic.List<ITableInfo>(new []{tiInLoad })
-            };
+        var job = new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true })
+        {
+            RegularTablesToLoad = new System.Collections.Generic.List<ITableInfo>(new[] { tiInLoad })
+        };
 
 
-        var ex = Assert.Throws<Exception>(()=>source.Attach(job,new GracefulCancellationToken()));
+        var ex = Assert.Throws<Exception>(() => source.Attach(job, new GracefulCancellationToken()));
 
-        StringAssert.IsMatch("FlatFileAttacher TableToLoad was 'TableNotInLoad' \\(ID=\\d+\\) but that table was not one of the tables in the load:'TableInLoad'", ex.Message);
+        StringAssert.IsMatch(
+            "FlatFileAttacher TableToLoad was 'TableNotInLoad' \\(ID=\\d+\\) but that table was not one of the tables in the load:'TableInLoad'",
+            ex.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/HICPipelineTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/HICPipelineTests.cs
index 7e08777b85..faf8560bf5 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/HICPipelineTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/HICPipelineTests.cs
@@ -118,25 +118,25 @@ private void SetupLoadProcessTasks(ICatalogueRepository catalogueRepository)
             // Not assigned to a variable as they will be magically available through the repository
             var processTaskArgs = new List<Tuple<string, string, Type>>
             {
-                new Tuple<string, string, Type>("FilePattern", "1.csv", typeof (string)),
-                new Tuple<string, string, Type>("TableName", "TestData", typeof (string)),
-                new Tuple<string, string, Type>("ForceHeaders", null, typeof (string)),
-                new Tuple<string, string, Type>("IgnoreQuotes", null, typeof (bool)),
-                new Tuple<string, string, Type>("IgnoreBlankLines", null, typeof (bool)),
-                new Tuple<string, string, Type>("ForceHeadersReplacesFirstLineInFile", null, typeof (bool)),
-                new Tuple<string, string, Type>("SendLoadNotRequiredIfFileNotFound", "false", typeof (bool)),
-                new Tuple<string, string, Type>("Separator", ",", typeof (string)),
-                new Tuple<string, string, Type>("TableToLoad", null, typeof (TableInfo)),
-                new Tuple<string, string, Type>("BadDataHandlingStrategy", BadDataHandlingStrategy.ThrowException.ToString(), typeof (BadDataHandlingStrategy)),
-                new Tuple<string, string, Type>("ThrowOnEmptyFiles", "true", typeof (bool)),
-                new Tuple<string, string, Type>("AttemptToResolveNewLinesInRecords", "true", typeof (bool)),
-                new Tuple<string, string, Type>("MaximumErrorsToReport", "0", typeof (int)),
-                new Tuple<string, string, Type>("IgnoreColumns", null, typeof (string)),
-                new Tuple<string, string, Type>("IgnoreBadReads", "false", typeof (bool)),
-                new Tuple<string, string, Type>("AddFilenameColumnNamed", null, typeof (string))
-
+                new("FilePattern", "1.csv", typeof(string)),
+                new("TableName", "TestData", typeof(string)),
+                new("ForceHeaders", null, typeof(string)),
+                new("IgnoreQuotes", null, typeof(bool)),
+                new("IgnoreBlankLines", null, typeof(bool)),
+                new("ForceHeadersReplacesFirstLineInFile", null, typeof(bool)),
+                new("SendLoadNotRequiredIfFileNotFound", "false", typeof(bool)),
+                new("Separator", ",", typeof(string)),
+                new("TableToLoad", null, typeof(TableInfo)),
+                new("BadDataHandlingStrategy", BadDataHandlingStrategy.ThrowException.ToString(),
+                    typeof(BadDataHandlingStrategy)),
+                new("ThrowOnEmptyFiles", "true", typeof(bool)),
+                new("AttemptToResolveNewLinesInRecords", "true", typeof(bool)),
+                new("MaximumErrorsToReport", "0", typeof(int)),
+                new("IgnoreColumns", null, typeof(string)),
+                new("IgnoreBadReads", "false", typeof(bool)),
+                new("AddFilenameColumnNamed", null, typeof(string))
             };
-                
+
 
             foreach (var tuple in processTaskArgs)
             {
@@ -157,12 +157,13 @@ internal class DatabaseHelper : IDisposable
 
 
         public DiscoveredDatabase DatabaseToLoad { get; private set; }
+
         public void SetUp(DiscoveredServer server)
         {
             _server = server;
 
             var databaseToLoadName = "HICPipelineTests";
-                
+
             // Create the databases
             server.ExpectDatabase(databaseToLoadName).Create(true);
             server.ChangeDatabase(databaseToLoadName);
@@ -176,11 +177,15 @@ public void SetUp(DiscoveredServer server)
                     "CREATE TABLE TestData ([Col1] [int], [hic_dataLoadRunID] [int] NULL, [hic_validFrom] [datetime] NULL, CONSTRAINT [PK_TestData] PRIMARY KEY CLUSTERED ([Col1] ASC))";
                 const string addValidFromDefault =
                     "ALTER TABLE TestData ADD CONSTRAINT [DF_TestData__hic_validFrom]  DEFAULT (getdate()) FOR [hic_validFrom]";
-                using(var cmd = DatabaseCommandHelper.GetCommand(createDatasetTableQuery, con))
+                using (var cmd = DatabaseCommandHelper.GetCommand(createDatasetTableQuery, con))
+                {
                     cmd.ExecuteNonQuery();
+                }
 
-                using(var cmd = DatabaseCommandHelper.GetCommand(addValidFromDefault, con))
+                using (var cmd = DatabaseCommandHelper.GetCommand(addValidFromDefault, con))
+                {
                     cmd.ExecuteNonQuery();
+                }
             }
 
             // Ensure the dataset table has been created
@@ -192,7 +197,7 @@ public void Dispose()
         {
             if (DatabaseToLoad == null)
                 return;
-                
+
             if (DatabaseToLoad.Exists())
                 DatabaseToLoad.Drop();
 
@@ -237,7 +242,7 @@ public void TestSingleJob(bool overrideRAW, bool sendDodgyCredentials)
 
             if (overrideRAW)
             {
-                external = new ExternalDatabaseServer(CatalogueRepository, "RAW Server",null);
+                external = new ExternalDatabaseServer(CatalogueRepository, "RAW Server", null);
                 external.SetProperties(DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase("master"));
 
                 if (sendDodgyCredentials)
@@ -245,6 +250,7 @@ public void TestSingleJob(bool overrideRAW, bool sendDodgyCredentials)
                     external.Username = "IveGotaLovely";
                     external.Password = "BunchOfCoconuts";
                 }
+
                 external.SaveToDatabase();
 
                 defaults.SetDefault(PermissableDefaults.RAWDataLoadServer, external);
@@ -257,29 +263,36 @@ public void TestSingleJob(bool overrideRAW, bool sendDodgyCredentials)
             };
 
             //run checks (with ignore errors if we are sending dodgy credentials)
-            RunnerFactory.CreateRunner(new ThrowImmediatelyActivator(RepositoryLocator),options).Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),
-                sendDodgyCredentials?
-                    (ICheckNotifier) new IgnoreAllErrorsCheckNotifier(): new AcceptAllCheckNotifier(), new GracefulCancellationToken());
+            RunnerFactory.CreateRunner(new ThrowImmediatelyActivator(RepositoryLocator), options).Run(RepositoryLocator,
+                new ThrowImmediatelyDataLoadEventListener(),
+                sendDodgyCredentials
+                    ? (ICheckNotifier)new IgnoreAllErrorsCheckNotifier()
+                    : new AcceptAllCheckNotifier(), new GracefulCancellationToken());
 
             //run load
             options.Command = CommandLineActivity.run;
-            var runner = RunnerFactory.CreateRunner(new ThrowImmediatelyActivator(RepositoryLocator),options);
+            var runner = RunnerFactory.CreateRunner(new ThrowImmediatelyActivator(RepositoryLocator), options);
 
 
             if (sendDodgyCredentials)
             {
-                var ex = Assert.Throws<Exception>(()=>runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(), new GracefulCancellationToken()));
-                Assert.IsTrue(ex.InnerException.Message.Contains("Login failed for user 'IveGotaLovely'"),"Error message did not contain expected text");
+                var ex = Assert.Throws<Exception>(() => runner.Run(RepositoryLocator,
+                    new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(),
+                    new GracefulCancellationToken()));
+                Assert.IsTrue(ex.InnerException.Message.Contains("Login failed for user 'IveGotaLovely'"),
+                    "Error message did not contain expected text");
                 return;
             }
             else
-                runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(), new GracefulCancellationToken());
+            {
+                runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(),
+                    new GracefulCancellationToken());
+            }
 
 
-            var archiveFile = loadDirectory.ForArchiving.EnumerateFiles("*.zip").MaxBy(f=>f.FullName);
-            Assert.NotNull(archiveFile,"Archive file has not been created by the load.");
+            var archiveFile = loadDirectory.ForArchiving.EnumerateFiles("*.zip").MaxBy(f => f.FullName);
+            Assert.NotNull(archiveFile, "Archive file has not been created by the load.");
             Assert.IsFalse(loadDirectory.ForLoading.EnumerateFileSystemInfos().Any());
-
         }
         finally
         {
@@ -300,7 +313,6 @@ public class TestCacheFileRetriever : CachedFileRetriever
 {
     public override void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public override ExitCodeType Fetch(IDataLoadJob dataLoadJob, GracefulCancellationToken cancellationToken)
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/HousekeepingTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/HousekeepingTests.cs
index 39749ae5ed..17fc0322df 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/HousekeepingTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/HousekeepingTests.cs
@@ -18,20 +18,20 @@ internal class HousekeepingTests : DatabaseTests
     [Test]
     public void TestCheckUpdateTrigger()
     {
-            
         // set SetUp a test database
         const string tableName = "TestTable";
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
 
         var databaseName = db.GetRuntimeName();
-        var table = db.CreateTable(tableName,new[] {new DatabaseColumnRequest("Id", "int") });
+        var table = db.CreateTable(tableName, new[] { new DatabaseColumnRequest("Id", "int") });
 
         var server = db.Server;
         using (var con = server.GetConnection())
         {
             con.Open();
             var cmd = server.GetCommand(
-                $"CREATE TRIGGER dbo.[TestTable_OnUpdate] ON [dbo].[{tableName}] AFTER DELETE AS RAISERROR('MESSAGE',16,10)", con);
+                $"CREATE TRIGGER dbo.[TestTable_OnUpdate] ON [dbo].[{tableName}] AFTER DELETE AS RAISERROR('MESSAGE',16,10)",
+                con);
 
             cmd.ExecuteNonQuery();
         }
@@ -44,14 +44,15 @@ public void TestCheckUpdateTrigger()
         var isEnabled = triggerImplementer.GetTriggerStatus();
         Assert.AreEqual(TriggerStatus.Enabled, isEnabled);
 
-            
+
         // disable the trigger and test correct reporting
         using (var con = new SqlConnection(dbInfo.Server.Builder.ConnectionString))
         {
             con.Open();
             var cmd =
                 new SqlCommand(
-                    $"USE [{databaseName}]; DISABLE TRIGGER TestTable_OnUpdate ON [{databaseName}]..[{tableName}]", con);
+                    $"USE [{databaseName}]; DISABLE TRIGGER TestTable_OnUpdate ON [{databaseName}]..[{tableName}]",
+                    con);
             cmd.ExecuteNonQuery();
         }
 
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ImportFilesDataProviderTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ImportFilesDataProviderTests.cs
index 750871ef3a..97c95bdedb 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ImportFilesDataProviderTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ImportFilesDataProviderTests.cs
@@ -20,21 +20,21 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class ImportFilesDataProviderTests:DatabaseTests
+public class ImportFilesDataProviderTests : DatabaseTests
 {
     [Test]
     public void CopyFiles()
     {
         var sourceDir = new DirectoryInfo(TestContext.CurrentContext.TestDirectory).CreateSubdirectory("subdir");
         var targetDir = new DirectoryInfo(TestContext.CurrentContext.TestDirectory).CreateSubdirectory("loaddir");
-            
+
         //make sure target is empty
         foreach (var f in targetDir.GetFiles())
             f.Delete();
 
         var originpath = Path.Combine(sourceDir.FullName, "myFile.txt");
 
-        File.WriteAllText(originpath,"fish");
+        File.WriteAllText(originpath, "fish");
 
         var job = new ThrowImmediatelyDataLoadJob();
         var mockProjectDirectory = Mock.Of<ILoadDirectory>(p => p.ForLoading == targetDir);
@@ -46,7 +46,7 @@ public void CopyFiles()
 
         //it doesn't know what to load yet
         Assert.Throws<Exception>(() => provider.Check(new ThrowImmediatelyCheckNotifier()));
-            
+
         //now it does
         provider.DirectoryPath = sourceDir.FullName;
 
@@ -105,7 +105,5 @@ public void CopyFiles()
         //only forLoading file should exist (in real life that one would be handled by archivng already)
         Assert.AreEqual(1, targetDir.GetFiles().Length);
         Assert.AreEqual(0, sourceDir.GetFiles().Length);
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/JobDateGenerationStrategyFactoryTestsIntegration.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/JobDateGenerationStrategyFactoryTestsIntegration.cs
index 46cb08ba38..1d2878aa76 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/JobDateGenerationStrategyFactoryTestsIntegration.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/JobDateGenerationStrategyFactoryTestsIntegration.cs
@@ -24,7 +24,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class JobDateGenerationStrategyFactoryTestsIntegration:DatabaseTests
+public class JobDateGenerationStrategyFactoryTestsIntegration : DatabaseTests
 {
     private CacheProgress _cp;
     private LoadProgress _lp;
@@ -58,8 +58,10 @@ protected override void SetUp()
     [Test]
     public void CacheProvider_None()
     {
-        var ex = Assert.Throws<CacheDataProviderFindingException>(() => _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener()));
-        Assert.IsTrue(ex.Message.StartsWith("LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration does not have ANY process tasks of type ProcessTaskType.DataProvider"));
+        var ex = Assert.Throws<CacheDataProviderFindingException>(() =>
+            _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener()));
+        Assert.IsTrue(ex.Message.StartsWith(
+            "LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration does not have ANY process tasks of type ProcessTaskType.DataProvider"));
     }
 
 
@@ -68,14 +70,16 @@ public void CacheProvider_NonCachingOne()
     {
         var pt = new ProcessTask(CatalogueRepository, _lmd, LoadStage.GetFiles)
         {
-            Path = typeof (DoNothingDataProvider).FullName,
+            Path = typeof(DoNothingDataProvider).FullName,
             ProcessTaskType = ProcessTaskType.DataProvider,
             Name = "DoNothing"
         };
         pt.SaveToDatabase();
 
-        var ex = Assert.Throws<CacheDataProviderFindingException>(() => _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener()));
-        Assert.IsTrue(ex.Message.StartsWith("LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration has some DataProviders tasks but none of them wrap classes that implement ICachedDataProvider"));
+        var ex = Assert.Throws<CacheDataProviderFindingException>(() =>
+            _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener()));
+        Assert.IsTrue(ex.Message.StartsWith(
+            "LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration has some DataProviders tasks but none of them wrap classes that implement ICachedDataProvider"));
     }
 
 
@@ -98,8 +102,11 @@ public void CacheProvider_TwoCachingOnes()
         };
         pt2.SaveToDatabase();
 
-        var ex = Assert.Throws<CacheDataProviderFindingException>(() => _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener()));
-        Assert.AreEqual("LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration has multiple cache DataProviders tasks (Cache1,Cache2), you are only allowed 1",ex.Message);
+        var ex = Assert.Throws<CacheDataProviderFindingException>(() =>
+            _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener()));
+        Assert.AreEqual(
+            "LoadMetadata JobDateGenerationStrategyFactoryTestsIntegration has multiple cache DataProviders tasks (Cache1,Cache2), you are only allowed 1",
+            ex.Message);
     }
 
     [Test]
@@ -119,12 +126,14 @@ public void CacheProvider_NoPipeline()
 
         pt1.CreateArgumentsForClassIfNotExists<TestCachedFileRetriever>();
 
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"delme", true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme",
+                true);
         _lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
         _lmd.SaveToDatabase();
         try
         {
-            var ex = Assert.Throws<Exception>(() => _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener()));
+            var ex = Assert.Throws<Exception>(() => _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener()));
             Assert.AreEqual("CacheProgress MyTestCp does not have a Pipeline configured on it", ex.Message);
         }
         finally
@@ -144,7 +153,9 @@ public void CacheProvider_NoCacheProgress()
         };
         pt1.SaveToDatabase();
 
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme", true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme",
+                true);
         _lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
         _lmd.SaveToDatabase();
 
@@ -153,9 +164,11 @@ public void CacheProvider_NoCacheProgress()
 
         try
         {
-            var ex = Assert.Throws<InvalidOperationException>(()=>_factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener()));
+            var ex = Assert.Throws<InvalidOperationException>(() =>
+                _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener()));
             Assert.AreEqual(
-                $"Caching has not begun for this CacheProgress ({_cp.ID}), so there is nothing to load and this strategy should not be used.",ex.Message);
+                $"Caching has not begun for this CacheProgress ({_cp.ID}), so there is nothing to load and this strategy should not be used.",
+                ex.Message);
         }
         finally
         {
@@ -164,6 +177,7 @@ public void CacheProvider_NoCacheProgress()
             projDir.RootPath.Delete(true);
         }
     }
+
     [Test]
     public void CacheProvider_Normal()
     {
@@ -178,7 +192,9 @@ public void CacheProvider_Normal()
         _cp.CacheFillProgress = new DateTime(2010, 1, 1);
         _cp.SaveToDatabase();
 
-        var projDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme", true);
+        var projDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme",
+                true);
         _lmd.LocationOfFlatFiles = projDir.RootPath.FullName;
         _lmd.SaveToDatabase();
 
@@ -187,22 +203,23 @@ public void CacheProvider_Normal()
 
         try
         {
-            var strategy = _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener());
+            var strategy = _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener());
             Assert.AreEqual(typeof(SingleScheduleCacheDateTrackingStrategy), strategy.GetType());
 
             var dates = strategy.GetDates(10, false);
-            Assert.AreEqual(0,dates.Count); //zero dates to load because no files in cache
+            Assert.AreEqual(0, dates.Count); //zero dates to load because no files in cache
+
+            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-02.zip"),
+                "bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
+            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-03.zip"),
+                "bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
+            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-05.zip"),
+                "bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
 
-            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-02.zip"),"bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
-            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-03.zip"), "bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
-            File.WriteAllText(Path.Combine(projDir.Cache.FullName, "2001-01-05.zip"), "bobbobbobyobyobyobbzzztproprietarybitztreamzippy");
-                
-            strategy = _factory.Create(_lp,new ThrowImmediatelyDataLoadEventListener());
+            strategy = _factory.Create(_lp, new ThrowImmediatelyDataLoadEventListener());
             Assert.AreEqual(typeof(SingleScheduleCacheDateTrackingStrategy), strategy.GetType());
             dates = strategy.GetDates(10, false);
             Assert.AreEqual(3, dates.Count); //zero dates to load because no files in cache
-
-
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/KVPAttacherTest.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/KVPAttacherTest.cs
index 439aaf3a0b..d362597475 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/KVPAttacherTest.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/KVPAttacherTest.cs
@@ -21,9 +21,8 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class KVPAttacherTest:DatabaseTests
+public class KVPAttacherTest : DatabaseTests
 {
-
     public enum KVPAttacherTestCase
     {
         OneFileWithPrimaryKey,
@@ -50,7 +49,8 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
         var filepk2 = "kvpTestFilePK2.csv";
         var fileNoPk = "kvpTestFile_NoPK.csv";
 
-        if (testCase == KVPAttacherTestCase.OneFileWithPrimaryKey || testCase == KVPAttacherTestCase.TwoFilesWithPrimaryKey)
+        if (testCase == KVPAttacherTestCase.OneFileWithPrimaryKey ||
+            testCase == KVPAttacherTestCase.TwoFilesWithPrimaryKey)
             CopyToBin(projectDir, filepk);
 
         if (testCase == KVPAttacherTestCase.TwoFilesWithPrimaryKey)
@@ -58,12 +58,12 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
 
         if (testCase == KVPAttacherTestCase.OneFileWithoutPrimaryKey)
             CopyToBin(projectDir, fileNoPk);
-            
+
         if (tbl.Exists())
             tbl.Drop();
-            
+
         //Create destination data table on server (where the data will ultimately end SetUp)
-        using (var con = (SqlConnection) tbl.Database.Server.GetConnection())
+        using (var con = (SqlConnection)tbl.Database.Server.GetConnection())
         {
             con.Open();
             var sql = hasPk
@@ -74,7 +74,8 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
         }
 
         var remnantPipeline =
-            CatalogueRepository.GetAllObjects<Pipeline>().SingleOrDefault(p=>p.Name.Equals("KVPAttacherTestPipeline"));
+            CatalogueRepository.GetAllObjects<Pipeline>()
+                .SingleOrDefault(p => p.Name.Equals("KVPAttacherTestPipeline"));
 
         remnantPipeline?.DeleteInDatabase();
 
@@ -82,12 +83,14 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
         var p = new Pipeline(CatalogueRepository, "KVPAttacherTestPipeline");
 
         //With a CSV source
-        var flatFileLoad = new PipelineComponent(CatalogueRepository, p, typeof (DelimitedFlatFileDataFlowSource), 0,"Data Flow Source");
+        var flatFileLoad = new PipelineComponent(CatalogueRepository, p, typeof(DelimitedFlatFileDataFlowSource), 0,
+            "Data Flow Source");
 
         //followed by a Transpose that turns columns to rows (see how the test file grows right with new records instead of down, this is common in KVP input files but not always)
-        var transpose = new PipelineComponent(CatalogueRepository, p, typeof (Transposer), 1, "Transposer");
+        var transpose = new PipelineComponent(CatalogueRepository, p, typeof(Transposer), 1, "Transposer");
 
-        var saneHeaders = transpose.CreateArgumentsForClassIfNotExists(typeof (Transposer)).Single(a => a.Name.Equals("MakeHeaderNamesSane"));
+        var saneHeaders = transpose.CreateArgumentsForClassIfNotExists(typeof(Transposer))
+            .Single(a => a.Name.Equals("MakeHeaderNamesSane"));
         saneHeaders.SetValue(false);
         saneHeaders.SaveToDatabase();
 
@@ -103,7 +106,7 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
 
         p.SourcePipelineComponent_ID = flatFileLoad.ID;
         p.SaveToDatabase();
-            
+
         try
         {
             attacher.PipelineForReadingFromFlatFile = p;
@@ -122,8 +125,8 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
 
             attacher.TargetDataTableKeyColumnName = "Test";
             attacher.TargetDataTableValueColumnName = "Result";
-                
-            attacher.Initialize(projectDir,db);
+
+            attacher.Initialize(projectDir, db);
 
             attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
 
@@ -135,7 +138,6 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
                 expectedRows += 54;
 
             Assert.AreEqual(expectedRows, tbl.GetRowCount());
-
         }
         finally
         {
@@ -149,7 +151,9 @@ public void KVPAttacherTest_Attach(KVPAttacherTestCase testCase)
     public void KVPAttacherCheckTest_TableNameMissing()
     {
         var ex = Assert.Throws<Exception>(() => new KVPAttacher().Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Either argument TableName or TableToLoad must be set Rdmp.Core.DataLoad.Modules.Attachers.KVPAttacher, you should specify this value.",ex.Message);
+        Assert.AreEqual(
+            "Either argument TableName or TableToLoad must be set Rdmp.Core.DataLoad.Modules.Attachers.KVPAttacher, you should specify this value.",
+            ex.Message);
     }
 
     [Test]
@@ -160,12 +164,11 @@ public void KVPAttacherCheckTest_FilePathMissing()
             TableName = "MyTable"
         };
 
-        var ex = Assert.Throws<Exception>(()=>kvp.Check(new ThrowImmediatelyCheckNotifier()));
+        var ex = Assert.Throws<Exception>(() => kvp.Check(new ThrowImmediatelyCheckNotifier()));
         Assert.IsTrue(ex.Message.StartsWith("Argument FilePattern has not been set"));
     }
 
 
-
     [Test]
     [TestCase("PrimaryKeyColumns")]
     [TestCase("TargetDataTableKeyColumnName")]
@@ -201,12 +204,14 @@ public void KVPAttacherCheckTest_Crossover(bool isKeyColumnDuplicate)
             TableName = "MyTable",
             FilePattern = "*.csv",
             PrimaryKeyColumns = "dave,bob",
-            TargetDataTableKeyColumnName = isKeyColumnDuplicate ?"dave":"Fish",
+            TargetDataTableKeyColumnName = isKeyColumnDuplicate ? "dave" : "Fish",
             TargetDataTableValueColumnName = isKeyColumnDuplicate ? "tron" : "dave"
         };
 
         var ex = Assert.Throws<Exception>(() => kvp.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Field 'dave' is both a PrimaryKeyColumn and a TargetDataTable column, this is not allowed.  Your fields Pk1,Pk2,Pketc,Key,Value must all be mutually exclusive", ex.Message);
+        Assert.AreEqual(
+            "Field 'dave' is both a PrimaryKeyColumn and a TargetDataTable column, this is not allowed.  Your fields Pk1,Pk2,Pketc,Key,Value must all be mutually exclusive",
+            ex.Message);
     }
 
     [Test]
@@ -222,13 +227,14 @@ public void KVPAttacherCheckTest_CrossoverKeyAndValue()
         };
 
         var ex = Assert.Throws<Exception>(() => kvp.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("TargetDataTableKeyColumnName cannot be the same as TargetDataTableValueColumnName", ex.Message);
+        Assert.AreEqual("TargetDataTableKeyColumnName cannot be the same as TargetDataTableValueColumnName",
+            ex.Message);
     }
 
     private static void CopyToBin(LoadDirectory projDir, string file)
     {
-
-        var testFileLocation = Path.Combine(TestContext.CurrentContext.TestDirectory,"DataLoad","Engine","Resources" , file);
+        var testFileLocation = Path.Combine(TestContext.CurrentContext.TestDirectory, "DataLoad", "Engine", "Resources",
+            file);
         Assert.IsTrue(File.Exists(testFileLocation));
 
         File.Copy(testFileLocation, projDir.ForLoading.FullName + Path.DirectorySeparatorChar + file, true);
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/MigrationStrategyTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/MigrationStrategyTests.cs
index 83ecde4e57..4ae4040c78 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/MigrationStrategyTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/MigrationStrategyTests.cs
@@ -23,7 +23,7 @@ public void OverwriteMigrationStrategy_NoPrimaryKey()
     {
         var db = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
 
-        var from = db.CreateTable("Bob",new[] {new DatabaseColumnRequest("Field", "int")});
+        var from = db.CreateTable("Bob", new[] { new DatabaseColumnRequest("Field", "int") });
         var to = db.CreateTable("Frank", new[] { new DatabaseColumnRequest("Field", "int") });
 
         var connection = Mock.Of<IManagedConnection>();
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PayloadTest.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PayloadTest.cs
index 9743176df1..42eb8f0a60 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PayloadTest.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PayloadTest.cs
@@ -24,7 +24,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class PayloadTest:DatabaseTests
+public class PayloadTest : DatabaseTests
 {
     public static object payload = new();
     public static bool Success = false;
@@ -32,13 +32,15 @@ public class PayloadTest:DatabaseTests
     [Test]
     public void TestPayloadInjection()
     {
-        var b = new BulkTestsData(CatalogueRepository,GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer),10);
+        var b = new BulkTestsData(CatalogueRepository, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer), 10);
         b.SetupTestData();
         b.ImportAsCatalogue();
 
         var lmd = new LoadMetadata(CatalogueRepository, "Loading")
         {
-            LocationOfFlatFiles = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"delme", true).RootPath.FullName
+            LocationOfFlatFiles = LoadDirectory
+                .CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), "delme", true)
+                .RootPath.FullName
         };
         lmd.SaveToDatabase();
 
@@ -53,7 +55,7 @@ public void TestPayloadInjection()
 
         var pt = new ProcessTask(CatalogueRepository, lmd, LoadStage.Mounting)
         {
-            Path = typeof (TestPayloadAttacher).FullName,
+            Path = typeof(TestPayloadAttacher).FullName,
             ProcessTaskType = ProcessTaskType.Attacher
         };
         pt.SaveToDatabase();
@@ -62,7 +64,8 @@ public void TestPayloadInjection()
         var factory = new HICDataLoadFactory(lmd, config, new HICLoadConfigurationFlags(), CatalogueRepository, lm);
         var execution = factory.Create(new ThrowImmediatelyDataLoadEventListener());
 
-        var proceedure = new DataLoadProcess(RepositoryLocator, lmd, null, lm, new ThrowImmediatelyDataLoadEventListener(), execution, config);
+        var proceedure = new DataLoadProcess(RepositoryLocator, lmd, null, lm,
+            new ThrowImmediatelyDataLoadEventListener(), execution, config);
 
         proceedure.Run(new GracefulCancellationToken(), payload);
 
@@ -70,7 +73,7 @@ public void TestPayloadInjection()
     }
 
 
-    public class TestPayloadAttacher : Attacher,IPluginAttacher
+    public class TestPayloadAttacher : Attacher, IPluginAttacher
     {
         public TestPayloadAttacher() : base(false)
         {
@@ -78,7 +81,7 @@ public TestPayloadAttacher() : base(false)
 
         public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, $"Found Payload:{job.Payload}"));
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Found Payload:{job.Payload}"));
             Success = ReferenceEquals(payload, job.Payload);
 
             return ExitCodeType.OperationNotRequired;
@@ -86,12 +89,10 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
         public override void Check(ICheckNotifier notifier)
         {
-                
         }
 
         public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
         {
-                
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ArchiveFilesTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ArchiveFilesTests.cs
index fa8496b233..58bf658353 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ArchiveFilesTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ArchiveFilesTests.cs
@@ -40,11 +40,11 @@ public void TestAllFilesAreArchived()
 
         var archiveComponent = new ArchiveFiles(new HICLoadConfigurationFlags());
 
-        var dataLoadInfo = Mock.Of<IDataLoadInfo>(info => info.ID==1);
+        var dataLoadInfo = Mock.Of<IDataLoadInfo>(info => info.ID == 1);
 
-        var LoadDirectory = Mock.Of<ILoadDirectory>(d => d.ForArchiving==forArchiving && d.ForLoading==forLoading);
+        var LoadDirectory = Mock.Of<ILoadDirectory>(d => d.ForArchiving == forArchiving && d.ForLoading == forLoading);
 
-        var job = Mock.Of<IDataLoadJob>(j => j.DataLoadInfo==dataLoadInfo);
+        var job = Mock.Of<IDataLoadJob>(j => j.DataLoadInfo == dataLoadInfo);
         job.LoadDirectory = LoadDirectory;
 
         try
@@ -58,7 +58,8 @@ public void TestAllFilesAreArchived()
             // there should be two entries
             using (var archive = ZipFile.Open(zipFilename, ZipArchiveMode.Read))
             {
-                Assert.AreEqual(2, archive.Entries.Count, "There should be two entries in this archive: one from the root and one from the subdirectory");
+                Assert.AreEqual(2, archive.Entries.Count,
+                    "There should be two entries in this archive: one from the root and one from the subdirectory");
                 Assert.IsTrue(archive.Entries.Any(entry => entry.FullName.Equals(@"subdir/subdir.txt")));
                 Assert.IsTrue(archive.Entries.Any(entry => entry.FullName.Equals(@"test.txt")));
             }
@@ -68,7 +69,7 @@ public void TestAllFilesAreArchived()
             directoryHelper.TearDown();
         }
     }
-        
+
     [Test]
     public void CreateArchiveWithNoFiles_ShouldThrow()
     {
@@ -80,7 +81,7 @@ public void CreateArchiveWithNoFiles_ShouldThrow()
         var archiveFiles = new ArchiveFiles(new HICLoadConfigurationFlags());
         var loadDirectory = LoadDirectory.CreateDirectoryStructure(testDir, "dataset");
 
-        var job = Mock.Of<IDataLoadJob>(j => j.DataLoadInfo==Mock.Of<IDataLoadInfo>());
+        var job = Mock.Of<IDataLoadJob>(j => j.DataLoadInfo == Mock.Of<IDataLoadInfo>());
         job.LoadDirectory = loadDirectory;
 
         try
@@ -90,12 +91,12 @@ public void CreateArchiveWithNoFiles_ShouldThrow()
             foreach (var fileInfo in loadDirectory.ForArchiving.GetFiles("*.zip"))
                 Console.WriteLine($"About to throw SetUp because of zip file:{fileInfo.FullName}");
 
-            Assert.IsFalse(loadDirectory.ForArchiving.GetFiles("*.zip").Any(),"There should not be any zip files in the archive directory!");
+            Assert.IsFalse(loadDirectory.ForArchiving.GetFiles("*.zip").Any(),
+                "There should not be any zip files in the archive directory!");
         }
         finally
         {
             directoryHelper.TearDown();
         }
     }
-      
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ComponentCompatibilityTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ComponentCompatibilityTests.cs
index d3b5c171b8..10c4d62979 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ComponentCompatibilityTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/ComponentCompatibilityTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests;
 
-public class ComponentCompatibilityTests :UnitTests
+public class ComponentCompatibilityTests : UnitTests
 {
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/AliasHandlerTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/AliasHandlerTests.cs
index 704e98cc98..9ed89e57e6 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/AliasHandlerTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/AliasHandlerTests.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests.Components;
 
-public class AliasHandlerTests  : DatabaseTests
+public class AliasHandlerTests : DatabaseTests
 {
     private ExternalDatabaseServer _server;
     private AliasHandler _handler;
@@ -29,8 +29,8 @@ public class AliasHandlerTests  : DatabaseTests
     protected override void SetUp()
     {
         base.SetUp();
-            
-        _server = new ExternalDatabaseServer(CatalogueRepository, "AliasHandlerTestsServer",null);
+
+        _server = new ExternalDatabaseServer(CatalogueRepository, "AliasHandlerTestsServer", null);
         _server.SetProperties(GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
 
         _database = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
@@ -39,7 +39,8 @@ protected override void SetUp()
         {
             con.Open();
 
-            s.GetCommand("CREATE TABLE AliasHandlerTests (input varchar(50), alias varchar(50))", con).ExecuteNonQuery();
+            s.GetCommand("CREATE TABLE AliasHandlerTests (input varchar(50), alias varchar(50))", con)
+                .ExecuteNonQuery();
 
             //Two names which are aliases of the same person
             s.GetCommand("INSERT INTO  AliasHandlerTests VALUES ('freddie','craig')", con).ExecuteNonQuery();
@@ -65,18 +66,20 @@ protected override void SetUp()
         };
     }
 
-        
 
     [Test]
     public void ThrowBecause_ColumnNotInInputDataTable()
     {
         var dt = new DataTable();
-        dt.Columns.Add("cannonballer");//not the same as the expected input column name
-        dt.Rows.Add(new object[] { "yes"});
+        dt.Columns.Add("cannonballer"); //not the same as the expected input column name
+        dt.Rows.Add(new object[] { "yes" });
 
-        var ex = Assert.Throws<KeyNotFoundException>(()=>_handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<KeyNotFoundException>(() =>
+            _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
 
-        Assert.AreEqual("You asked to resolve aliases on a column called 'input' but no column by that name appeared in the DataTable being processed.  Columns in that table were:cannonballer",
+        Assert.AreEqual(
+            "You asked to resolve aliases on a column called 'input' but no column by that name appeared in the DataTable being processed.  Columns in that table were:cannonballer",
             ex.Message);
     }
 
@@ -94,9 +97,10 @@ public void ThrowBecause_NameAndAliasSameValue()
         dt.Columns.Add("input");
         dt.Rows.Add(new object[] { "candle" });
 
-        var ex =  Assert.Throws<AliasTableFetchException>(()=>_handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<AliasTableFetchException>(() =>
+            _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
         Assert.IsTrue(ex.Message.StartsWith("Alias table SQL should only return aliases not exact matches"));
-
     }
 
     [Test]
@@ -116,7 +120,9 @@ public void ThrowBecause_ThreeColumnAliasTable()
         dt.Rows.Add(new object[] { "dave", 100 });
         dt.Rows.Add(new object[] { "frank", 100 });
 
-        var ex = Assert.Throws<AliasTableFetchException>(() => _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<AliasTableFetchException>(() =>
+            _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
 
         Assert.IsTrue(ex.Message.Contains("Alias table SQL resulted in 3 fields being returned"));
     }
@@ -128,12 +134,13 @@ public void NoAliases()
         dt.Columns.Add("input");
         dt.Columns.Add("value");
 
-        dt.Rows.Add(new object[] {"dave", 100});
-        dt.Rows.Add(new object[] {"frank", 100});
+        dt.Rows.Add(new object[] { "dave", 100 });
+        dt.Rows.Add(new object[] { "frank", 100 });
 
-        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
-        Assert.AreEqual(2,result.Rows.Count);
+        Assert.AreEqual(2, result.Rows.Count);
     }
 
 
@@ -143,8 +150,10 @@ public void CrashStrategy()
         var dt = new DataTable();
         dt.Columns.Add("input");
 
-        dt.Rows.Add(new object[] { "paul"});
-        Assert.Throws<AliasException>(()=> _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        dt.Rows.Add(new object[] { "paul" });
+        Assert.Throws<AliasException>(() =>
+            _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
     }
 
 
@@ -154,25 +163,27 @@ public void ResolveTwoNameAlias()
         _handler.ResolutionStrategy = AliasResolutionStrategy.MultiplyInputDataRowsByAliases;
 
         var dt = new DataTable();
-        dt.Columns.Add("value1",typeof(int));
+        dt.Columns.Add("value1", typeof(int));
         dt.Columns.Add("input");
         dt.Columns.Add("value2", typeof(int));
 
-        dt.Rows.Add(new object[] { 99,"dave", 100 });
-        dt.Rows.Add(new object[] { 199,"frank", 200 });
-        dt.Rows.Add(new object[] { 299,"freddie", 300 }); //has a two name alias
+        dt.Rows.Add(new object[] { 99, "dave", 100 });
+        dt.Rows.Add(new object[] { 199, "frank", 200 });
+        dt.Rows.Add(new object[] { 299, "freddie", 300 }); //has a two name alias
 
-        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(4, result.Rows.Count);
-            
+
         Assert.AreEqual(299, result.Rows[2][0]);
-        Assert.AreEqual("freddie", result.Rows[2][1]);//the original input row which had an alias on it
+        Assert.AreEqual("freddie", result.Rows[2][1]); //the original input row which had an alias on it
         Assert.AreEqual(300, result.Rows[2][2]);
 
         Assert.AreEqual(299, result.Rows[3][0]);
-        Assert.AreEqual("craig", result.Rows[3][1]);//The new row that should have appeared to resolve the freddie=craig alias
-        Assert.AreEqual(300, result.Rows[3][2]);//value should match the input array
+        Assert.AreEqual("craig",
+            result.Rows[3][1]); //The new row that should have appeared to resolve the freddie=craig alias
+        Assert.AreEqual(300, result.Rows[3][2]); //value should match the input array
     }
 
     [Test]
@@ -185,27 +196,29 @@ public void ResolveThreeNameAlias()
         dt.Columns.Add("input");
         dt.Columns.Add("value2", typeof(int));
 
-        dt.Rows.Add(new object[] { 99, "pepey", 100 });//has a three name alias
+        dt.Rows.Add(new object[] { 99, "pepey", 100 }); //has a three name alias
         dt.Rows.Add(new object[] { 199, "frank", 200 });
         dt.Rows.Add(new object[] { 299, "anderson", 300 });
 
-        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result = _handler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(5, result.Rows.Count);
 
         Assert.AreEqual(99, result.Rows[0][0]);
-        Assert.AreEqual("pepey", result.Rows[0][1]);//the original input row which had an alias on it
+        Assert.AreEqual("pepey", result.Rows[0][1]); //the original input row which had an alias on it
         Assert.AreEqual(100, result.Rows[0][2]);
 
 
         //new rows are added at the end of the DataTable
         Assert.AreEqual(99, result.Rows[3][0]);
-        Assert.AreEqual("paul", result.Rows[3][1]);//The new row that should have appeared to resolve the pepey=paul=peter alias
-        Assert.AreEqual(100, result.Rows[3][2]);//value should match the input array
+        Assert.AreEqual("paul",
+            result.Rows[3][1]); //The new row that should have appeared to resolve the pepey=paul=peter alias
+        Assert.AreEqual(100, result.Rows[3][2]); //value should match the input array
 
         Assert.AreEqual(99, result.Rows[4][0]);
-        Assert.AreEqual("peter", result.Rows[4][1]);//The new row that should have appeared to resolve the  pepey=paul=peter alias
-        Assert.AreEqual(100, result.Rows[4][2]);//value should match the input array
+        Assert.AreEqual("peter",
+            result.Rows[4][1]); //The new row that should have appeared to resolve the  pepey=paul=peter alias
+        Assert.AreEqual(100, result.Rows[4][2]); //value should match the input array
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/ColumnSwapperTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/ColumnSwapperTests.cs
index 491517ac7c..040787e6f6 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/ColumnSwapperTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/ColumnSwapperTests.cs
@@ -25,7 +25,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests.Components;
 
-internal class ColumnSwapperTests:DatabaseTests
+internal class ColumnSwapperTests : DatabaseTests
 {
     [TestCase(true)]
     [TestCase(false)]
@@ -39,11 +39,12 @@ public void TestColumnSwapper_NormalUseCase(bool keepInputColumnToo)
         dt.Rows.Add("B", 2);
         dt.Rows.Add("C", 3);
         dt.Rows.Add("D", 4);
-        dt.Rows.Add("D", 5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
+        dt.Rows.Add("D",
+            5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
-            
-        Import(db.CreateTable("Map", dt),out var map, out var mapCols);
+
+        Import(db.CreateTable("Map", dt), out var map, out var mapCols);
 
         var swapper = new ColumnSwapper
         {
@@ -64,7 +65,8 @@ public void TestColumnSwapper_NormalUseCase(bool keepInputColumnToo)
         dtToSwap.Rows.Add("A", "Dave", 30);
         dtToSwap.Rows.Add("B", "Frank", 50);
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         //in should be there or not depending on the setting KeepInputColumnToo
         Assert.AreEqual(keepInputColumnToo, resultDt.Columns.Contains("In"));
@@ -98,7 +100,8 @@ public void TestColumnSwapper_AlternateColumnNames(bool keepInputColumnToo)
         dtMap.Rows.Add("B", 2);
         dtMap.Rows.Add("C", 3);
         dtMap.Rows.Add("D", 4);
-        dtMap.Rows.Add("D", 5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
+        dtMap.Rows.Add("D",
+            5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
@@ -124,14 +127,16 @@ public void TestColumnSwapper_AlternateColumnNames(bool keepInputColumnToo)
         dtToSwap.Rows.Add("B", "Frank", 50);
 
         // Our pipeline data does not have a column called In but instead it is called In2
-        var ex = Assert.Throws<Exception>(() => swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<Exception>(() => swapper.ProcessPipelineData(dtToSwap,
+            new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
         Assert.AreEqual("DataTable did not contain a field called 'In'", ex.Message);
-            
+
         // Tell the swapper about the new name
         swapper.InputFromColumn = "In2";
         swapper.OutputToColumn = "Out2";
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         //in should be there or not depending on the setting KeepInputColumnToo
         Assert.AreEqual(keepInputColumnToo, resultDt.Columns.Contains("In2"));
@@ -166,7 +171,8 @@ public void TestColumnSwapper_InPlaceSwapNoNewCols(bool keepInputColumnToo)
         dtMap.Rows.Add("B", 2);
         dtMap.Rows.Add("C", 3);
         dtMap.Rows.Add("D", 4);
-        dtMap.Rows.Add("D", 5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
+        dtMap.Rows.Add("D",
+            5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
@@ -195,7 +201,8 @@ public void TestColumnSwapper_InPlaceSwapNoNewCols(bool keepInputColumnToo)
         swapper.InputFromColumn = "In2";
         swapper.OutputToColumn = "In2";
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         // in ALWAYS be there, because it is an in place update - ignore KeepInputColumnToo
         Assert.True(resultDt.Columns.Contains("In2"));
@@ -222,7 +229,8 @@ public void TestColumnSwapper_Aliases(AliasResolutionStrategy strategy)
         dt.Rows.Add("B", 2);
         dt.Rows.Add("C", 3);
         dt.Rows.Add("D", 4);
-        dt.Rows.Add("D", 5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
+        dt.Rows.Add("D",
+            5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
@@ -249,15 +257,17 @@ public void TestColumnSwapper_Aliases(AliasResolutionStrategy strategy)
         switch (strategy)
         {
             case AliasResolutionStrategy.CrashIfAliasesFound:
-                Assert.Throws<AliasException>(()=>swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+                Assert.Throws<AliasException>(() => swapper.ProcessPipelineData(dtToSwap,
+                    new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
                 break;
             case AliasResolutionStrategy.MultiplyInputDataRowsByAliases:
 
-                var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+                    new GracefulCancellationToken());
 
                 AreBasicallyEquals(1, resultDt.Rows[0]["Out"]);
                 Assert.AreEqual("Dave", resultDt.Rows[0]["Name"]);
-                    
+
                 //we get the first alias (4)
                 AreBasicallyEquals(4, resultDt.Rows[1]["Out"]);
                 Assert.AreEqual("Dandy", resultDt.Rows[1]["Name"]);
@@ -271,7 +281,6 @@ public void TestColumnSwapper_Aliases(AliasResolutionStrategy strategy)
             default:
                 throw new ArgumentOutOfRangeException(nameof(strategy));
         }
-            
     }
 
     [TestCase(true)]
@@ -286,7 +295,8 @@ public void TestColumnSwapper_MissingMappings(bool crashIfNoMappingsFound)
         dt.Rows.Add("B", 2);
         dt.Rows.Add("C", 3);
         dt.Rows.Add("D", 4);
-        dt.Rows.Add("D", 5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
+        dt.Rows.Add("D",
+            5); //oh dear D maps to 2 out values that's a violation! but if we don't see a D it doesn't matter
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
@@ -311,11 +321,15 @@ public void TestColumnSwapper_MissingMappings(bool crashIfNoMappingsFound)
         dtToSwap.Rows.Add("A", "Dave", 30);
         dtToSwap.Rows.Add("B", "Frank", 50);
 
-        if(crashIfNoMappingsFound)
-            Assert.Throws<KeyNotFoundException>(() => swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), null));
+        if (crashIfNoMappingsFound)
+        {
+            Assert.Throws<KeyNotFoundException>(() =>
+                swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), null));
+        }
         else
         {
-            var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+            var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken());
 
             Assert.AreEqual(1, resultDt.Rows.Count);
             AreBasicallyEquals(1, resultDt.Rows[0]["Out"]);
@@ -332,10 +346,10 @@ public void TestColumnSwapper_ProjectSpecificMappings()
         dt.Columns.Add("Proj");
 
         //Anonymise A and B differently depending on ProjectNumber (valid project numbers are 1 and 2)
-        dt.Rows.Add("A", 1,1);
-        dt.Rows.Add("A", 2,2);
-        dt.Rows.Add("B", 3,1);
-        dt.Rows.Add("B", 4,2);
+        dt.Rows.Add("A", 1, 1);
+        dt.Rows.Add("A", 2, 2);
+        dt.Rows.Add("B", 3, 1);
+        dt.Rows.Add("B", 4, 2);
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
@@ -362,7 +376,8 @@ public void TestColumnSwapper_ProjectSpecificMappings()
         dtToSwap.Rows.Add("A", "Dave", 30);
         dtToSwap.Rows.Add("B", "Frank", 50);
 
-        using var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        using var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(2, resultDt.Rows.Count);
 
@@ -387,7 +402,7 @@ public void TestColumnSwapper_InputTableNulls()
         dt.Rows.Add(2, 2);
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
-            
+
         Import(db.CreateTable("Map", dt), out var map, out var mapCols);
 
         var swapper = new ColumnSwapper
@@ -400,24 +415,24 @@ public void TestColumnSwapper_InputTableNulls()
 
         using var dtToSwap = new DataTable();
 
-        dtToSwap.Columns.Add("In",typeof(int));
+        dtToSwap.Columns.Add("In", typeof(int));
         dtToSwap.Columns.Add("Name");
         dtToSwap.Columns.Add("Age");
 
         dtToSwap.Rows.Add(1, "Dave", 30);
         dtToSwap.Rows.Add(null, "Bob", 30);
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(2, resultDt.Rows.Count);
         AreBasicallyEquals(1, resultDt.Rows[0]["Out"]);
         Assert.AreEqual("Dave", resultDt.Rows[0]["Name"]);
-            
+
         AreBasicallyEquals(DBNull.Value, resultDt.Rows[1]["Out"]);
         Assert.AreEqual("Bob", resultDt.Rows[1]["Name"]);
-            
-
     }
+
     /// <summary>
     /// Tests ColumnSwapper when there are null values in the database mapping table
     /// </summary>
@@ -446,7 +461,7 @@ public void TestColumnSwapper_MappingTableNulls()
 
         using var dtToSwap = new DataTable();
 
-        dtToSwap.Columns.Add("In",typeof(int));
+        dtToSwap.Columns.Add("In", typeof(int));
         dtToSwap.Columns.Add("Name");
         dtToSwap.Columns.Add("Age");
 
@@ -455,18 +470,20 @@ public void TestColumnSwapper_MappingTableNulls()
 
         var toMem = new ToMemoryDataLoadEventListener(true);
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap,toMem , new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, toMem, new GracefulCancellationToken());
 
         //this is the primary thing we are testing here
-        Assert.Contains("Discarded 1 Null key values read from mapping table",toMem.GetAllMessagesByProgressEventType()[ProgressEventType.Warning].Select(m=>m.Message).ToArray());
+        Assert.Contains("Discarded 1 Null key values read from mapping table",
+            toMem.GetAllMessagesByProgressEventType()[ProgressEventType.Warning].Select(m => m.Message).ToArray());
 
         Assert.AreEqual(2, resultDt.Rows.Count);
         AreBasicallyEquals(1, resultDt.Rows[0]["Out"]);
         Assert.AreEqual("Dave", resultDt.Rows[0]["Name"]);
-            
+
         AreBasicallyEquals(DBNull.Value, resultDt.Rows[1]["Out"]);
         Assert.AreEqual("Bob", resultDt.Rows[1]["Name"]);
     }
+
     /// <summary>
     /// Tests the systems ability to compare an integer in the input data table with a string in the database
     /// </summary>
@@ -488,7 +505,8 @@ public void TestColumnSwapper_MixedDatatypes_StringInDatabase()
 
         Import(mapTbl = db.CreateTable("Map", dt), out var map, out var mapCols);
 
-        Assert.AreEqual(typeof(string),mapTbl.DiscoverColumn("In").DataType.GetCSharpDataType(), "Expected map to be of string datatype");
+        Assert.AreEqual(typeof(string), mapTbl.DiscoverColumn("In").DataType.GetCSharpDataType(),
+            "Expected map to be of string datatype");
 
         var swapper = new ColumnSwapper
         {
@@ -504,14 +522,15 @@ public void TestColumnSwapper_MixedDatatypes_StringInDatabase()
         dtToSwap.Columns.Add("Name");
         dtToSwap.Rows.Add(1 /*int*/, "Dave");
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(1, resultDt.Rows.Count);
         AreBasicallyEquals(2, resultDt.Rows[0]["Out"]);
         Assert.AreEqual("Dave", resultDt.Rows[0]["Name"]);
     }
 
-        
+
     /// <summary>
     /// Tests the systems ability to compare a string input data table with an integer in the database
     /// </summary>
@@ -527,12 +546,13 @@ public void TestColumnSwapper_MixedDatatypes_IntegerInDatabase()
         dt.Rows.Add(3, 4);
 
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
-            
+
         DiscoveredTable mapTbl;
 
         Import(mapTbl = db.CreateTable("Map", dt), out var map, out var mapCols);
 
-        Assert.AreEqual(typeof(int),mapTbl.DiscoverColumn("In").DataType.GetCSharpDataType(), "Expected map to be of int datatype");
+        Assert.AreEqual(typeof(int), mapTbl.DiscoverColumn("In").DataType.GetCSharpDataType(),
+            "Expected map to be of int datatype");
 
         var swapper = new ColumnSwapper
         {
@@ -548,7 +568,8 @@ public void TestColumnSwapper_MixedDatatypes_IntegerInDatabase()
         dtToSwap.Columns.Add("Name");
         dtToSwap.Rows.Add("1" /*string*/, "Dave");
 
-        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var resultDt = swapper.ProcessPipelineData(dtToSwap, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(1, resultDt.Rows.Count);
         AreBasicallyEquals(2, resultDt.Rows[0]["Out"]);
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/RemoveDuplicatesTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/RemoveDuplicatesTests.cs
index 84fe664247..9a13e8b637 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/RemoveDuplicatesTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/RemoveDuplicatesTests.cs
@@ -20,15 +20,15 @@ public void TestRemovingDuplicatesFromDataTable()
     {
         var dt = new DataTable();
         dt.Columns.Add("Col1");
-        dt.Columns.Add("Col2",typeof(int));
+        dt.Columns.Add("Col2", typeof(int));
 
         dt.Rows.Add("Fish", 123);
         dt.Rows.Add("Fish", 123);
         dt.Rows.Add("Fish", 123);
 
-        Assert.AreEqual(3,dt.Rows.Count);
-            
-            
+        Assert.AreEqual(3, dt.Rows.Count);
+
+
         Assert.AreEqual(123, dt.Rows[0]["Col2"]);
 
         var receiver = new ToMemoryDataLoadEventListener(true);
@@ -36,7 +36,7 @@ public void TestRemovingDuplicatesFromDataTable()
         var result = new RemoveDuplicates().ProcessPipelineData(dt, receiver, new GracefulCancellationToken());
 
         //should have told us that it processed 3 rows
-        Assert.AreEqual(3,receiver.LastProgressRecieivedByTaskName["Evaluating For Duplicates"].Progress.Value);
+        Assert.AreEqual(3, receiver.LastProgressRecieivedByTaskName["Evaluating For Duplicates"].Progress.Value);
 
         //and discarded 2 of them as duplicates
         Assert.AreEqual(2, receiver.LastProgressRecieivedByTaskName["Discarding Duplicates"].Progress.Value);
@@ -49,7 +49,9 @@ public void TestRemovingDuplicatesFromDataTable()
     [Test]
     public void TestEmptyDataTable()
     {
-        Assert.AreEqual(0,new RemoveDuplicates().ProcessPipelineData(new DataTable(),new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken()).Rows.Count);
+        Assert.AreEqual(0,
+            new RemoveDuplicates().ProcessPipelineData(new DataTable(), new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()).Rows.Count);
     }
 
     [Test]
@@ -71,13 +73,17 @@ public void TestMultipleBatches()
         dt2.Rows.Add("Haddock", 123);
 
 
-        var remover = new RemoveDuplicates(); 
+        var remover = new RemoveDuplicates();
 
         //send it the batch with the duplication it will return 1 row
-        Assert.AreEqual(1,remover.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()).Rows.Count);
+        Assert.AreEqual(1,
+            remover.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()).Rows.Count);
 
         //now send it the second batch which contains 2 records, one duplication against first batch and one new one, expect only 1 row to come back
-        Assert.AreEqual(1, remover.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()).Rows.Count);
+        Assert.AreEqual(1,
+            remover.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()).Rows.Count);
     }
 
     [Test]
@@ -96,11 +102,11 @@ public void TestNulls()
 
         var remover = new RemoveDuplicates();
 
-        Assert.AreEqual(6,dt.Rows.Count);
+        Assert.AreEqual(6, dt.Rows.Count);
 
         //send it the batch with the duplication it will return 5 rows (the only duplicate is the double null)
-        Assert.AreEqual(5, remover.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()).Rows.Count);
-
-
+        Assert.AreEqual(5,
+            remover.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()).Rows.Count);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/TransposerTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/TransposerTests.cs
index ecd41bc70e..c310515340 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/TransposerTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Components/TransposerTests.cs
@@ -37,15 +37,20 @@ public void TransposerTest_ThrowOnDualBatches()
     {
         var transposer = new Transposer();
         transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
-        var ex = Assert.Throws<NotSupportedException>(()=>transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
-        Assert.AreEqual("Error, we received multiple batches, Transposer only works when all the data arrives in a single DataTable",ex.Message);
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+        Assert.AreEqual(
+            "Error, we received multiple batches, Transposer only works when all the data arrives in a single DataTable",
+            ex.Message);
     }
 
     [Test]
     public void TransposerTest_ThrowOnEmptyDataTable()
     {
         var transposer = new Transposer();
-        var ex = Assert.Throws<NotSupportedException>(()=>transposer.ProcessPipelineData(new DataTable(), new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            transposer.ProcessPipelineData(new DataTable(), new ThrowImmediatelyDataLoadJob(),
+                new GracefulCancellationToken()));
         Assert.AreEqual("DataTable toProcess had 0 rows and 0 columns, thus it cannot be transposed", ex.Message);
     }
 
@@ -54,7 +59,8 @@ public void TransposerTest_ThrowOnEmptyDataTable()
     public void TransposerTest_TableTransposed()
     {
         var transposer = new Transposer();
-        var actual = transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
+        var actual =
+            transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
 
         var expectedResult = new DataTable();
 
@@ -73,24 +79,22 @@ public void TransposerTest_TableTransposed()
         for (var i = 0; i < expectedResult.Rows.Count; i++)
         for (var j = 0; j < actual.Columns.Count; j++)
             Assert.AreEqual(expectedResult.Rows[i][j], actual.Rows[i][j]);
-
     }
 
     [Test]
     public void TestTransposerDodgyHeaders()
     {
-
         var dr = dt.Rows.Add("32 GramMax", "55", "0", "5");
 
         var transposer = new Transposer
         {
             MakeHeaderNamesSane = true
         };
-        var actual = transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
-            
+        var actual =
+            transposer.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken());
+
         Assert.IsTrue(actual.Columns.Contains("_32GramMax"));
 
         dt.Rows.Remove(dr);
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineArgumentTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineArgumentTests.cs
index 7352259a32..11fee3a17c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineArgumentTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineArgumentTests.cs
@@ -11,41 +11,38 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests;
 
-public class PipelineArgumentTests:DatabaseTests
+public class PipelineArgumentTests : DatabaseTests
 {
     [Test]
-    [TestCase(typeof(int?),null)]
+    [TestCase(typeof(int?), null)]
     [TestCase(typeof(float?), null)]
     [TestCase(typeof(double?), null)]
     [TestCase(typeof(char?), null)]
     [TestCase(typeof(DateTime?), null)]
-        
-
     [TestCase(typeof(int?), 3)]
     [TestCase(typeof(float?), 10.01f)]
     [TestCase(typeof(double?), 10.999)]
     [TestCase(typeof(char?), 'K')]
     [TestCase(typeof(DateTime?), "now")] //sadly can't pass DateTime.Now
-
-    public void TestIArgumentsForNullableTypes(Type nullableType,object value)
+    public void TestIArgumentsForNullableTypes(Type nullableType, object value)
     {
         if (string.Equals(value as string, "now")) //sadly can't pass DateTime.Now 
-            value = new DateTime(2001, 01, 01, 3, 20, 11); //hey btw when you put in milliseconds into DateTime IArgument it drops them... due to DateTime.Parse? or DateTime.ToString()?
+            value = new DateTime(2001, 01, 01, 3, 20,
+                11); //hey btw when you put in milliseconds into DateTime IArgument it drops them... due to DateTime.Parse? or DateTime.ToString()?
 
         var p = new Pipeline(CatalogueRepository);
-        var pc = new PipelineComponent(CatalogueRepository,p,
+        var pc = new PipelineComponent(CatalogueRepository, p,
             GetType() //Normally this would be the PipelineComponent hosted class which would be a proper class declared as a MEF export with DemandsInitialization etc but we don't need all that
-            ,0
-            ,"My imaginary Pipe Component");
-        var arg = new PipelineComponentArgument(CatalogueRepository,pc);
+            , 0
+            , "My imaginary Pipe Component");
+        var arg = new PipelineComponentArgument(CatalogueRepository, pc);
         try
         {
             arg.SetType(nullableType);
             arg.SetValue(value);
 
-            Assert.AreEqual(nullableType,arg.GetSystemType());
-            Assert.AreEqual(value,arg.GetValueAsSystemType());
-
+            Assert.AreEqual(nullableType, arg.GetSystemType());
+            Assert.AreEqual(value, arg.GetValueAsSystemType());
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineReadPerformanceTest.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineReadPerformanceTest.cs
index b8c9744f9e..492eab2387 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineReadPerformanceTest.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/PipelineReadPerformanceTest.cs
@@ -12,10 +12,10 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests;
 
-public class PipelineReadPerformanceTest:DatabaseTests
+public class PipelineReadPerformanceTest : DatabaseTests
 {
     private BulkTestsData _bulkTestData;
-        
+
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
     {
@@ -23,9 +23,8 @@ protected override void OneTimeSetUp()
 
         _bulkTestData = new BulkTestsData(CatalogueRepository, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
         _bulkTestData.SetupTestData();
-
     }
-        
+
     [Test]
     public void BulkTestDataContainsExpectedNumberOfRows()
     {
@@ -38,7 +37,7 @@ public void BulkTestDataContainsExpectedNumberOfRows()
             var manualCount = Convert.ToInt32(cmd.ExecuteScalar());
 
             //manual count matches expected
-            Assert.AreEqual(_bulkTestData.ExpectedNumberOfRowsInTestData,manualCount);
+            Assert.AreEqual(_bulkTestData.ExpectedNumberOfRowsInTestData, manualCount);
 
             //now get the fast approximate rowcount
             var fastRowcount = _bulkTestData.BulkDataDatabase
@@ -46,7 +45,7 @@ public void BulkTestDataContainsExpectedNumberOfRows()
                 .GetRowCount();
 
             //it should also match
-            Assert.AreEqual(_bulkTestData.ExpectedNumberOfRowsInTestData,fastRowcount);
+            Assert.AreEqual(_bulkTestData.ExpectedNumberOfRowsInTestData, fastRowcount);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests.cs
index a7e5945661..f7b50a6bcd 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests.cs
@@ -30,7 +30,7 @@ public void SetUp()
     {
         filename = Path.Combine(TestContext.CurrentContext.TestDirectory, "DelimitedFileSourceTests.txt");
 
-        if(File.Exists(filename))
+        if (File.Exists(filename))
             File.Delete(filename);
 
         var sb = new StringBuilder();
@@ -45,18 +45,22 @@ public void SetUp()
     public void FileToLoadNotSet_Throws()
     {
         var source = new DelimitedFlatFileDataFlowSource();
-        var ex = Assert.Throws<Exception>(()=>source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
-        StringAssert.Contains("_fileToLoad was not set",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        StringAssert.Contains("_fileToLoad was not set", ex.Message);
     }
+
     [Test]
     public void SeparatorNotSet_Throws()
     {
         var testFile = new FileInfo(filename);
         var source = new DelimitedFlatFileDataFlowSource();
-        source.PreInitialize(new FlatFileToLoad(testFile),new ThrowImmediatelyDataLoadEventListener() );
-        var ex = Assert.Throws<Exception>(()=>source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        source.PreInitialize(new FlatFileToLoad(testFile), new ThrowImmediatelyDataLoadEventListener());
+        var ex = Assert.Throws<Exception>(() =>
+            source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
         StringAssert.Contains("Separator has not been set", ex.Message);
     }
+
     [Test]
     public void LoadCSVWithCorrectDatatypes_ForceHeadersWhitespace()
     {
@@ -67,7 +71,7 @@ public void LoadCSVWithCorrectDatatypes_ForceHeadersWhitespace()
         source.Separator = ",";
         source.ForceHeaders = "chi  ,Study ID\t ,Date";
         source.ForceHeadersReplacesFirstLineInFile = true;
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
 
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
@@ -75,26 +79,28 @@ public void LoadCSVWithCorrectDatatypes_ForceHeadersWhitespace()
             $"Resulting columns were:{string.Join(",", chunk.Columns.Cast<DataColumn>().Select(c => c.ColumnName))}");
 
         Assert.IsTrue(chunk.Columns.Contains("chi")); //notice the lack of whitespace!
-        Assert.IsTrue(chunk.Columns.Contains("study ID")); //whitespace is allowed in the middle though... because we like a challenge!
+        Assert.IsTrue(
+            chunk.Columns
+                .Contains("study ID")); //whitespace is allowed in the middle though... because we like a challenge!
 
-        Assert.AreEqual(3,chunk.Columns.Count);
+        Assert.AreEqual(3, chunk.Columns.Count);
         Assert.AreEqual(1, chunk.Rows.Count);
         Assert.AreEqual("0101010101", chunk.Rows[0][0]);
         Assert.AreEqual(5, chunk.Rows[0][1]);
-        Assert.AreEqual(new DateTime(2001 , 1 , 5), chunk.Rows[0][2]);//notice the strong typing (we are not looking for strings here)
-            
+        Assert.AreEqual(new DateTime(2001, 1, 5),
+            chunk.Rows[0][2]); //notice the strong typing (we are not looking for strings here)
+
         source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
     }
 
     [Test]
     public void LoadCSVWithCorrectDatatypes_DatatypesAreCorrect()
     {
-
         var testFile = new FileInfo(filename);
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(testFile), new ThrowImmediatelyDataLoadEventListener());
         source.Separator = ",";
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
 
         var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
@@ -102,22 +108,23 @@ public void LoadCSVWithCorrectDatatypes_DatatypesAreCorrect()
         Assert.AreEqual(1, chunk.Rows.Count);
         Assert.AreEqual("0101010101", chunk.Rows[0][0]);
         Assert.AreEqual(5, chunk.Rows[0][1]);
-        Assert.AreEqual(new DateTime(2001, 1, 5), chunk.Rows[0][2]);//notice the strong typing (we are not looking for strings here)
+        Assert.AreEqual(new DateTime(2001, 1, 5),
+            chunk.Rows[0][2]); //notice the strong typing (we are not looking for strings here)
 
         source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
     }
+
     [Test]
     public void OverrideDatatypes_ForcedFreakyTypesCorrect()
     {
-
         var testFile = new FileInfo(filename);
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(testFile), new ThrowImmediatelyDataLoadEventListener());
         source.Separator = ",";
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
-            
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
+
         source.ExplicitlyTypedColumns = new ExplicitTypingCollection();
-        source.ExplicitlyTypedColumns.ExplicitTypesCSharp.Add("StudyID",typeof(string));
+        source.ExplicitlyTypedColumns.ExplicitTypesCSharp.Add("StudyID", typeof(string));
 
         //preview should be correct
         var preview = source.TryGetPreview();
@@ -154,14 +161,14 @@ public void TestIgnoreQuotes()
         source.Separator = ",";
         source.IgnoreQuotes = true;
         source.MaxBatchSize = 10000;
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
         var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual("\"Sick\" headaches", dt.Rows[0][1]);
         Assert.AreEqual("2\" length of wood", dt.Rows[1][1]);
         Assert.AreEqual("\"\"The bends\"\"", dt.Rows[2][1]);
 
-        source.Dispose(new ThrowImmediatelyDataLoadEventListener(),null);
+        source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
     }
 
 
@@ -191,29 +198,33 @@ public void BadDataTestExtraColumns(BadDataHandlingStrategy strategy)
 
         source.MaxBatchSize = 10000;
 
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
         source.BadDataHandlingStrategy = strategy;
         try
         {
             switch (strategy)
             {
                 case BadDataHandlingStrategy.ThrowException:
-                    var ex = Assert.Throws<FlatFileLoadException>(() => source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
-                    StringAssert.Contains("line 4",ex.Message);
+                    var ex = Assert.Throws<FlatFileLoadException>(() =>
+                        source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+                    StringAssert.Contains("line 4", ex.Message);
                     break;
                 case BadDataHandlingStrategy.IgnoreRows:
-                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.IsNotNull(dt);
 
-                    Assert.AreEqual(4,dt.Rows.Count);
+                    Assert.AreEqual(4, dt.Rows.Count);
                     break;
                 case BadDataHandlingStrategy.DivertRows:
-                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.AreEqual(4, dt2.Rows.Count);
 
                     Assert.IsNotNull(source.EventHandlers.DivertErrorsFile);
 
-                    Assert.AreEqual($"0101010101,5,2001-01-05,fish,watafak{Environment.NewLine}", File.ReadAllText(source.EventHandlers.DivertErrorsFile.FullName));
+                    Assert.AreEqual($"0101010101,5,2001-01-05,fish,watafak{Environment.NewLine}",
+                        File.ReadAllText(source.EventHandlers.DivertErrorsFile.FullName));
 
                     break;
                 default:
@@ -222,9 +233,8 @@ public void BadDataTestExtraColumns(BadDataHandlingStrategy strategy)
         }
         finally
         {
-            source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);    
+            source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
         }
-            
     }
 
     [Test]
@@ -236,7 +246,8 @@ public void DelimitedFlatFileDataFlowSource_ProperQuoteEscaping()
         var sb = new StringBuilder();
         sb.AppendLine("CHI,Name,SomeInterestingFacts,Date");
         sb.AppendLine("0101010101,Dave,Dave is over 1000 years old,2001-01-05");
-        sb.AppendLine("0101010101,Dave,\"Dave is \"\"over\"\" 1000 years old\",2001-01-05"); //https://tools.ietf.org/html/rfc4180 (to properly include quotes in escaped text you need to use "")
+        sb.AppendLine(
+            "0101010101,Dave,\"Dave is \"\"over\"\" 1000 years old\",2001-01-05"); //https://tools.ietf.org/html/rfc4180 (to properly include quotes in escaped text you need to use "")
 
         File.WriteAllText(filename, sb.ToString());
 
@@ -300,10 +311,11 @@ public void DelimitedFlatFileDataFlowSource_LoadDataWithQuotesInMiddle_IgnoreBad
         try
         {
             var chunk = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-            Assert.AreEqual(5,chunk.Rows.Count);
+            Assert.AreEqual(5, chunk.Rows.Count);
             Assert.AreEqual("Dave is \"over\" 1000 years old", chunk.Rows[1][2]);
             Assert.AreEqual($"Dave is {Environment.NewLine}over 1000 years old", chunk.Rows[2][2]);
-            Assert.AreEqual("Dave is over\" 1000 years old\"", chunk.Rows[3][2]); //notice this line drops some of the quotes, we just have to live with that
+            Assert.AreEqual("Dave is over\" 1000 years old\"",
+                chunk.Rows[3][2]); //notice this line drops some of the quotes, we just have to live with that
         }
         finally
         {
@@ -343,9 +355,9 @@ public void DelimitedFlatFileDataFlowSource_TrashFile_IgnoreBadReads()
 
         try
         {
-            var ex = Assert.Throws<FlatFileLoadException>(()=>source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
             Assert.AreEqual("Bad data found on line 3", ex.Message);
-
         }
         finally
         {
@@ -382,7 +394,8 @@ public void DelimitedFlatFileDataFlowSource_LoadDataWithQuotesInMiddle_WithMulti
         source.BadDataHandlingStrategy = BadDataHandlingStrategy.ThrowException;
         try
         {
-            var ex = Assert.Throws<FlatFileLoadException>(() => source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
             Assert.AreEqual("Bad data found on line 3", ex.Message);
         }
         finally
@@ -419,29 +432,33 @@ public void BadDataTestExtraColumns_ErrorIsOnLastLine(BadDataHandlingStrategy st
 
         source.MaxBatchSize = 10000;
 
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
         source.BadDataHandlingStrategy = strategy;
         try
         {
             switch (strategy)
             {
                 case BadDataHandlingStrategy.ThrowException:
-                    var ex = Assert.Throws<FlatFileLoadException>(() => source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+                    var ex = Assert.Throws<FlatFileLoadException>(() =>
+                        source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
                     StringAssert.Contains("line 6", ex.Message);
                     break;
                 case BadDataHandlingStrategy.IgnoreRows:
-                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.IsNotNull(dt);
 
                     Assert.AreEqual(4, dt.Rows.Count);
                     break;
                 case BadDataHandlingStrategy.DivertRows:
-                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.AreEqual(4, dt2.Rows.Count);
 
                     Assert.IsNotNull(source.EventHandlers.DivertErrorsFile);
 
-                    Assert.AreEqual($"0101010101,5,2001-01-05,fish,watafak{Environment.NewLine}", File.ReadAllText(source.EventHandlers.DivertErrorsFile.FullName));
+                    Assert.AreEqual($"0101010101,5,2001-01-05,fish,watafak{Environment.NewLine}",
+                        File.ReadAllText(source.EventHandlers.DivertErrorsFile.FullName));
 
                     break;
                 default:
@@ -451,7 +468,7 @@ public void BadDataTestExtraColumns_ErrorIsOnLastLine(BadDataHandlingStrategy st
         finally
         {
             source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
-        }   
+        }
     }
 
     [Test]
@@ -478,16 +495,15 @@ public void NewLinesInConstantString_EscapedCorrectly()
         source.Separator = ",";
 
         source.MaxBatchSize = 10000;
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
-            
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
+
         try
         {
             var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
             Assert.IsNotNull(dt);
             Assert.AreEqual(5, dt.Rows.Count);
             Assert.AreEqual(@"5
-    The first",dt.Rows[0][1]);
-                      
+    The first", dt.Rows[0][1]);
         }
         finally
         {
@@ -521,24 +537,27 @@ public void NewLinesInConstantString_NotEscaped(BadDataHandlingStrategy strategy
         source.Separator = ",";
 
         source.MaxBatchSize = 10000;
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
         source.BadDataHandlingStrategy = strategy;
         try
         {
             switch (strategy)
             {
                 case BadDataHandlingStrategy.ThrowException:
-                    var ex = Assert.Throws<FlatFileLoadException>(() => source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+                    var ex = Assert.Throws<FlatFileLoadException>(() =>
+                        source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
                     StringAssert.Contains("line 2", ex.Message);
                     break;
                 case BadDataHandlingStrategy.IgnoreRows:
-                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                    var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.IsNotNull(dt);
 
                     Assert.AreEqual(4, dt.Rows.Count);
                     break;
                 case BadDataHandlingStrategy.DivertRows:
-                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+                    var dt2 = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),
+                        new GracefulCancellationToken());
                     Assert.AreEqual(4, dt2.Rows.Count);
 
                     Assert.IsNotNull(source.EventHandlers.DivertErrorsFile);
@@ -555,9 +574,9 @@ public void NewLinesInConstantString_NotEscaped(BadDataHandlingStrategy strategy
         finally
         {
             source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
-        }   
+        }
     }
-        
+
 
     [Test]
     public void OverrideHeadersAndTab()
@@ -568,14 +587,15 @@ public void OverrideHeadersAndTab()
         var sb = new StringBuilder();
         sb.AppendLine("0101010101\t5\t2001-01-05");
         sb.AppendLine("0101010101\t5\t2001-01-05");
-        File.WriteAllText(filename,sb.ToString());
+        File.WriteAllText(filename, sb.ToString());
 
 
         var testFile = new FileInfo(filename);
 
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(testFile), new ThrowImmediatelyDataLoadEventListener());
-        source.Separator = "\\t"; //<-- Important this is the string value SLASH T not an actual escaped tab as C# understands it.  This reflects the user pressing slash and t on his keyboard for the Separator argument in the UI
+        source.Separator =
+            "\\t"; //<-- Important this is the string value SLASH T not an actual escaped tab as C# understands it.  This reflects the user pressing slash and t on his keyboard for the Separator argument in the UI
         source.ForceHeaders = "CHI\tStudyID\tDate";
         source.MaxBatchSize = 10000;
 
@@ -583,13 +603,13 @@ public void OverrideHeadersAndTab()
 
         Assert.NotNull(dt);
 
-        Assert.AreEqual(3,dt.Columns.Count);
+        Assert.AreEqual(3, dt.Columns.Count);
 
         Assert.AreEqual("CHI", dt.Columns[0].ColumnName);
         Assert.AreEqual("StudyID", dt.Columns[1].ColumnName);
         Assert.AreEqual("Date", dt.Columns[2].ColumnName);
 
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
 
         source.Dispose(new ThrowImmediatelyDataLoadJob(), null);
 
@@ -611,7 +631,8 @@ public void Test_IgnoreColumns()
 
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(testFile), new ThrowImmediatelyDataLoadEventListener());
-        source.Separator = "\\t"; //<-- Important this is the string value SLASH T not an actual escaped tab as C# understands it.  This reflects the user pressing slash and t on his keyboard for the Separator argument in the UI
+        source.Separator =
+            "\\t"; //<-- Important this is the string value SLASH T not an actual escaped tab as C# understands it.  This reflects the user pressing slash and t on his keyboard for the Separator argument in the UI
         source.ForceHeaders = "CHI\tStudyID\tDate\tSomeText";
         source.MaxBatchSize = 10000;
         source.IgnoreColumns = "StudyID\tDate\t";
@@ -630,25 +651,28 @@ public void Test_IgnoreColumns()
         source.Dispose(new ThrowImmediatelyDataLoadJob(), null);
 
         File.Delete(filename);
-            
     }
 
     [TestCase("Fish In Barrel", "FishInBarrel")]
-    [TestCase("32 Fish In Barrel","_32FishInBarrel")]//Column names can't start with numbers so underscore prefix applies
-    [TestCase("once upon a time","onceUponATime")]//where spaces are removed cammel case the next symbol if it's a character
-    [TestCase("once _  upon a time", "once_UponATime")]//where spaces are removed cammel case the next symbol if it's a character
+    [TestCase("32 Fish In Barrel",
+        "_32FishInBarrel")] //Column names can't start with numbers so underscore prefix applies
+    [TestCase("once upon a time",
+        "onceUponATime")] //where spaces are removed cammel case the next symbol if it's a character
+    [TestCase("once _  upon a time",
+        "once_UponATime")] //where spaces are removed cammel case the next symbol if it's a character
     [TestCase("once#upon a", "onceuponA")]
-    [TestCase("once #upon", "onceUpon")] //Dodgy characters are stripped before cammel casing after spaces so 'u' gets cammeled even though it has a symbol before it.
+    [TestCase("once #upon",
+        "onceUpon")] //Dodgy characters are stripped before cammel casing after spaces so 'u' gets cammeled even though it has a symbol before it.
     public void TestMakingHeaderNamesSane(string bad, string expectedGood)
     {
-        Assert.AreEqual(expectedGood,QuerySyntaxHelper.MakeHeaderNameSensible(bad));
+        Assert.AreEqual(expectedGood, QuerySyntaxHelper.MakeHeaderNameSensible(bad));
     }
 
 
     [Test]
     public void Test_ScientificNotation_StronglyTyped()
     {
-        var f = Path.Combine(TestContext.CurrentContext.WorkDirectory,"meee.csv");
+        var f = Path.Combine(TestContext.CurrentContext.WorkDirectory, "meee.csv");
 
         var sb = new StringBuilder();
 
@@ -658,13 +682,13 @@ public void Test_ScientificNotation_StronglyTyped()
         sb.AppendLine("-4.10235746055587E-05");
 
         //500 lines of random stuff to force 2 batches
-        for (var i =0;i< DelimitedFlatFileDataFlowSource.MinimumStronglyTypeInputBatchSize; i++)
+        for (var i = 0; i < DelimitedFlatFileDataFlowSource.MinimumStronglyTypeInputBatchSize; i++)
             sb.AppendLine("5");
 
         //a scientific notation in batch 2
         sb.AppendLine("-4.10235746055587E-05");
 
-        File.WriteAllText(f,sb.ToString());
+        File.WriteAllText(f, sb.ToString());
 
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(new FileInfo(f)), new ThrowImmediatelyDataLoadEventListener());
@@ -673,14 +697,14 @@ public void Test_ScientificNotation_StronglyTyped()
         source.StronglyTypeInputBatchSize = DelimitedFlatFileDataFlowSource.MinimumStronglyTypeInputBatchSize;
         source.StronglyTypeInput = true;
 
-        var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(),new GracefulCancellationToken());
+        var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         Assert.AreEqual(typeof(decimal), dt.Columns.Cast<DataColumn>().Single().DataType);
         Assert.AreEqual(DelimitedFlatFileDataFlowSource.MinimumStronglyTypeInputBatchSize, dt.Rows.Count);
-            
+
         dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         Assert.AreEqual(typeof(decimal), dt.Columns.Cast<DataColumn>().Single().DataType);
         Assert.AreEqual(2, dt.Rows.Count);
-            
+
 
         dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
         Assert.IsNull(dt);
@@ -692,9 +716,9 @@ public void Test_ScientificNotation_StronglyTyped()
     [Test]
     public void Test_IgnoreQuotes()
     {
-        var f = Path.Combine(TestContext.CurrentContext.WorkDirectory,"talk.csv");
-            
-        File.WriteAllText(f,@"Field1,Field2
+        var f = Path.Combine(TestContext.CurrentContext.WorkDirectory, "talk.csv");
+
+        File.WriteAllText(f, @"Field1,Field2
 1,Watch out guys its Billie ""The Killer"" Cole
 2,""The Killer""? I've heard of him hes a bad un");
 
@@ -706,8 +730,8 @@ public void Test_IgnoreQuotes()
         source.StronglyTypeInput = true;
 
         var toMem = new ToMemoryDataLoadEventListener(true);
-        var ex = Assert.Throws<FlatFileLoadException>(()=>source.GetChunk(toMem,new GracefulCancellationToken()));
+        var ex = Assert.Throws<FlatFileLoadException>(() => source.GetChunk(toMem, new GracefulCancellationToken()));
         Assert.AreEqual("Bad data found on line 2", ex.Message);
-        source.Dispose(new ThrowImmediatelyDataLoadEventListener(),null);
+        source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTestsBase.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTestsBase.cs
index 8a0d2944fc..4950a59439 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTestsBase.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTestsBase.cs
@@ -34,7 +34,7 @@ protected static void AssertDivertFileIsExactly(string expectedContents)
     {
         var filename = Path.Combine(TestContext.CurrentContext.TestDirectory, "DelimitedFileSourceTests_Errors.txt");
 
-        if(!File.Exists(filename))
+        if (!File.Exists(filename))
             Assert.Fail($"No Divert file was generated at expected path {filename}");
 
         var contents = File.ReadAllText(filename);
@@ -42,7 +42,7 @@ protected static void AssertDivertFileIsExactly(string expectedContents)
     }
 
 
-    protected static DataTable RunGetChunk(FlatFileToLoad file,BadDataHandlingStrategy strategy, bool throwOnEmpty)
+    protected static DataTable RunGetChunk(FlatFileToLoad file, BadDataHandlingStrategy strategy, bool throwOnEmpty)
     {
         return RunGetChunk(file, s =>
         {
@@ -56,7 +56,7 @@ protected static DataTable RunGetChunk(FlatFileToLoad file, Action<DelimitedFlat
         var source = new DelimitedFlatFileDataFlowSource();
         source.PreInitialize(file, new ThrowImmediatelyDataLoadEventListener());
         source.Separator = ",";
-        source.StronglyTypeInput = true;//makes the source interpret the file types properly
+        source.StronglyTypeInput = true; //makes the source interpret the file types properly
         source.StronglyTypeInputBatchSize = 100;
         source.AttemptToResolveNewLinesInRecords = true; //maximise potential for conflicts
         adjust?.Invoke(source);
@@ -69,6 +69,5 @@ protected static DataTable RunGetChunk(FlatFileToLoad file, Action<DelimitedFlat
         {
             source.Dispose(new ThrowImmediatelyDataLoadEventListener(), null);
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_AutomaticallyResolved.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_AutomaticallyResolved.cs
index f46ac52380..9a997c7db9 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_AutomaticallyResolved.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_AutomaticallyResolved.cs
@@ -15,7 +15,6 @@ public class DelimitedFileSourceTests_AutomaticallyResolved : DelimitedFileSourc
     [Test]
     public void Test_ValuesSpradAcrossMultipleRows()
     {
-
         var file = CreateTestFile(
             "A,B,C,D",
             "1,17,Beginning of a long,37.00",
@@ -24,7 +23,7 @@ public void Test_ValuesSpradAcrossMultipleRows()
         );
 
         var dt = RunGetChunk(file);
-        Assert.AreEqual(3,dt.Rows.Count);
+        Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual(true, dt.Rows[0]["A"]);
         Assert.AreEqual(17, dt.Rows[0]["B"]);
         Assert.AreEqual("Beginning of a long", dt.Rows[0]["C"]);
@@ -54,7 +53,7 @@ public void NewLineInFile_Ignored()
         );
 
         var dt = RunGetChunk(file);
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
         Assert.AreEqual("Frank", dt.Rows[0]["Name"]);
         Assert.AreEqual("Herbert", dt.Rows[1]["Name"]);
     }
@@ -71,13 +70,12 @@ the best ever""
         );
 
         var dt = RunGetChunk(file);
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
         Assert.AreEqual("Frank", dt.Rows[0]["Name"]);
         Assert.AreEqual(@"Frank is
 
 the best ever", dt.Rows[0]["Description"]);
         Assert.AreEqual("Herbert", dt.Rows[1]["Name"]);
-        
     }
 
     [TestCase("")]
@@ -119,6 +117,7 @@ public void TrailingNulls_InRows(string nullSuffix)
         Assert.AreEqual(4, dt.Rows.Count);
         Assert.AreEqual(3, dt.Columns.Count);
     }
+
     [Test]
     public void TrailingNulls_InHeader()
     {
@@ -146,16 +145,17 @@ public void NullHeader_InMiddleOfColumns(bool forceHeaders)
         var file = CreateTestFile(
             "CHI ,,StudyID,Date,,",
             //Row has trailing null headers, these get ignored but the one in the middle must be maintained to prevent cell read errors/mismatch
-
             "0101010101,,5,2001-01-05",
             "0101010101,,5,2001-01-05",
             "0101010101,,5,2001-01-05",
             "0101010101,,5,2001-01-05"); //note that if you put any values in these empty column it is BadData
 
-            
+
         DataTable dt;
         if (forceHeaders)
-            dt = RunGetChunk(file,s=> { s.ForceHeaders = "CHI ,,StudyID,Date,,";
+            dt = RunGetChunk(file, s =>
+            {
+                s.ForceHeaders = "CHI ,,StudyID,Date,,";
                 s.ForceHeadersReplacesFirstLineInFile = true;
             });
         else
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_ResolvedAccordingToStrategy.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_ResolvedAccordingToStrategy.cs
index a1fdae2bc4..b6ae6cabcb 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_ResolvedAccordingToStrategy.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_ResolvedAccordingToStrategy.cs
@@ -21,7 +21,8 @@ public void EmptyFile_TotallyEmpty(bool throwOnEmpty)
 
         if (throwOnEmpty)
         {
-            var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file, BadDataHandlingStrategy.ThrowException, throwOnEmpty));
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                RunGetChunk(file, BadDataHandlingStrategy.ThrowException, throwOnEmpty));
             Assert.AreEqual("File DelimitedFileSourceTests.txt is empty", ex.Message);
         }
         else
@@ -38,14 +39,15 @@ public void EmptyFile_AllWhitespace(bool throwOnEmpty)
      
     ");
 
-        if(throwOnEmpty)
+        if (throwOnEmpty)
         {
-            var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file, BadDataHandlingStrategy.ThrowException, throwOnEmpty));
+            var ex = Assert.Throws<FlatFileLoadException>(() =>
+                RunGetChunk(file, BadDataHandlingStrategy.ThrowException, throwOnEmpty));
             StringAssert.StartsWith("File DelimitedFileSourceTests.txt is empty", ex.Message);
         }
         else
         {
-            Assert.IsNull(RunGetChunk(file, BadDataHandlingStrategy.ThrowException,throwOnEmpty));
+            Assert.IsNull(RunGetChunk(file, BadDataHandlingStrategy.ThrowException, throwOnEmpty));
         }
     }
 
@@ -62,12 +64,12 @@ public void EmptyFile_HeaderOnly(bool throwOnEmpty)
 
         if (throwOnEmpty)
         {
-            var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file, s=>s.ThrowOnEmptyFiles = true));
+            var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file, s => s.ThrowOnEmptyFiles = true));
             Assert.AreEqual("File DelimitedFileSourceTests.txt is empty", ex.Message);
         }
         else
         {
-            Assert.IsNull(RunGetChunk(file,s => s.ThrowOnEmptyFiles = false));
+            Assert.IsNull(RunGetChunk(file, s => s.ThrowOnEmptyFiles = false));
         }
     }
 
@@ -80,17 +82,27 @@ public void EmptyFile_ForceHeader(bool throwOnEmpty)
  
      
     ");
-            
+
         if (throwOnEmpty)
         {
             var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file,
-                s =>{ s.ThrowOnEmptyFiles = true; s.ForceHeaders="Name,Address"; s.ForceHeadersReplacesFirstLineInFile = true;}));
+                s =>
+                {
+                    s.ThrowOnEmptyFiles = true;
+                    s.ForceHeaders = "Name,Address";
+                    s.ForceHeadersReplacesFirstLineInFile = true;
+                }));
             Assert.AreEqual("File DelimitedFileSourceTests.txt is empty", ex.Message);
         }
         else
         {
             Assert.IsNull(RunGetChunk(file,
-                s =>{ s.ThrowOnEmptyFiles = false; s.ForceHeaders="Name,Address"; s.ForceHeadersReplacesFirstLineInFile = true;}));
+                s =>
+                {
+                    s.ThrowOnEmptyFiles = false;
+                    s.ForceHeaders = "Name,Address";
+                    s.ForceHeadersReplacesFirstLineInFile = true;
+                }));
         }
     }
 
@@ -113,11 +125,11 @@ public void BadCSV_TooManyCellsInRow(BadDataHandlingStrategy strategy)
                 break;
             case BadDataHandlingStrategy.IgnoreRows:
                 var dt = RunGetChunk(file, strategy, true);
-                Assert.AreEqual(2,dt.Rows.Count);
+                Assert.AreEqual(2, dt.Rows.Count);
                 break;
             case BadDataHandlingStrategy.DivertRows:
                 var dt2 = RunGetChunk(file, strategy, true);
-                Assert.AreEqual(2,dt2.Rows.Count);
+                Assert.AreEqual(2, dt2.Rows.Count);
 
                 AssertDivertFileIsExactly(
                     $"Bob,He's also dynamite, seen him do a lot of good work,30{Environment.NewLine}");
@@ -149,11 +161,11 @@ public void BadCSV_TooManyCellsInRow_TwoBadRows(BadDataHandlingStrategy strategy
                 break;
             case BadDataHandlingStrategy.IgnoreRows:
                 var dt = RunGetChunk(file, strategy, true);
-                Assert.AreEqual(2,dt.Rows.Count);
+                Assert.AreEqual(2, dt.Rows.Count);
                 break;
             case BadDataHandlingStrategy.DivertRows:
                 var dt2 = RunGetChunk(file, strategy, true);
-                Assert.AreEqual(2,dt2.Rows.Count);
+                Assert.AreEqual(2, dt2.Rows.Count);
 
                 AssertDivertFileIsExactly(
                     $"Frank,Is the greatest,100,Frank,Is the greatest,100{Environment.NewLine}Bob,He's also dynamite, seen him do a lot of good work,30{Environment.NewLine}Bob2,He's also dynamite2, seen him do a lot of good work2,30{Environment.NewLine}");
@@ -164,11 +176,11 @@ public void BadCSV_TooManyCellsInRow_TwoBadRows(BadDataHandlingStrategy strategy
         }
     }
 
-    [TestCase(BadDataHandlingStrategy.DivertRows,true)]
-    [TestCase(BadDataHandlingStrategy.ThrowException,false)]
-    [TestCase(BadDataHandlingStrategy.ThrowException,true)]
-    [TestCase(BadDataHandlingStrategy.IgnoreRows,false)]
-    public void BadCSV_TooFewCellsInRow(BadDataHandlingStrategy strategy,bool tryToResolve)
+    [TestCase(BadDataHandlingStrategy.DivertRows, true)]
+    [TestCase(BadDataHandlingStrategy.ThrowException, false)]
+    [TestCase(BadDataHandlingStrategy.ThrowException, true)]
+    [TestCase(BadDataHandlingStrategy.IgnoreRows, false)]
+    public void BadCSV_TooFewCellsInRow(BadDataHandlingStrategy strategy, bool tryToResolve)
     {
         var file = CreateTestFile(
             "Name,Description,Age",
@@ -258,7 +270,7 @@ not too bad
 to be honest,20",
             "Dennis,Hes ok,35");
 
-        var dt = RunGetChunk(file,s=> { s.AttemptToResolveNewLinesInRecords = true; });
+        var dt = RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; });
         Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual($"He's{Environment.NewLine}not too bad{Environment.NewLine}to be honest", dt.Rows[1][1]);
     }
@@ -274,11 +286,16 @@ not too bad
 to be honest,Bob,20",
             "Hes ok,Dennis,35");
 
-        var ex = Assert.Throws<FlatFileLoadException>(()=> RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; }));
-        Assert.AreEqual("Bad data found on line 3",ex.Message);
+        var ex = Assert.Throws<FlatFileLoadException>(() =>
+            RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; }));
+        Assert.AreEqual("Bad data found on line 3", ex.Message);
 
         //looks like a good record followed by 2 bad records
-        var dt = RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; s.BadDataHandlingStrategy = BadDataHandlingStrategy.IgnoreRows; });
+        var dt = RunGetChunk(file, s =>
+        {
+            s.AttemptToResolveNewLinesInRecords = true;
+            s.BadDataHandlingStrategy = BadDataHandlingStrategy.IgnoreRows;
+        });
         Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual("to be honest", dt.Rows[1][0]);
         Assert.AreEqual("Bob", dt.Rows[1][1]);
@@ -296,15 +313,18 @@ not too bad
 to be honest",
             "Dennis,35,Hes ok");
 
-        var ex = Assert.Throws<FlatFileLoadException>(()=> RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; }));
-        Assert.AreEqual("Bad data found on line 4",ex.Message);
+        var ex = Assert.Throws<FlatFileLoadException>(() =>
+            RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true; }));
+        Assert.AreEqual("Bad data found on line 4", ex.Message);
 
         //looks like a good record followed by 2 bad records
-        var dt = RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = true;s.BadDataHandlingStrategy = BadDataHandlingStrategy.IgnoreRows; });
-        Assert.AreEqual(3,dt.Rows.Count);
+        var dt = RunGetChunk(file, s =>
+        {
+            s.AttemptToResolveNewLinesInRecords = true;
+            s.BadDataHandlingStrategy = BadDataHandlingStrategy.IgnoreRows;
+        });
+        Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual("He's", dt.Rows[1][2]);
-
-
     }
 
     [Test]
@@ -315,7 +335,8 @@ public void BadCSV_ForceHeaders()
             "Thomas,100",
             "Frank,300");
 
-        var ex = Assert.Throws<FlatFileLoadException>(() => RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = false; }));
+        var ex = Assert.Throws<FlatFileLoadException>(() =>
+            RunGetChunk(file, s => { s.AttemptToResolveNewLinesInRecords = false; }));
         Assert.AreEqual("Bad data found on line 2", ex.Message);
 
 
@@ -326,11 +347,10 @@ public void BadCSV_ForceHeaders()
             s.ForceHeadersReplacesFirstLineInFile = true;
         });
 
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
         Assert.AreEqual(2, dt.Columns.Count);
         Assert.AreEqual("Thomas", dt.Rows[0]["Name"]);
         Assert.AreEqual(100, dt.Rows[0]["BloodGlucose"]);
-
     }
 
     [Test]
@@ -346,11 +366,9 @@ public void BadCSV_ForceHeaders_NoReplace()
             s.ForceHeaders = "Name,BloodGlucose";
         });
 
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
         Assert.AreEqual(2, dt.Columns.Count);
         Assert.AreEqual("Thomas", dt.Rows[0]["Name"]);
         Assert.AreEqual(100, dt.Rows[0]["BloodGlucose"]);
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_Unresolveable.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_Unresolveable.cs
index 2c64f9de09..18b3ac826c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_Unresolveable.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/DelimitedFileSourceTests_Unresolveable.cs
@@ -11,9 +11,8 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests.Sources;
 
-internal class DelimitedFileSourceTests_Unresolveable: DelimitedFileSourceTestsBase
+internal class DelimitedFileSourceTests_Unresolveable : DelimitedFileSourceTestsBase
 {
-
     [TestCase(BadDataHandlingStrategy.DivertRows)]
     [TestCase(BadDataHandlingStrategy.ThrowException)]
     [TestCase(BadDataHandlingStrategy.IgnoreRows)]
@@ -44,14 +43,15 @@ void adjust(DelimitedFlatFileDataFlowSource a)
                 break;
             case BadDataHandlingStrategy.IgnoreRows:
                 var dt = RunGetChunk(file, adjust);
-                Assert.AreEqual(2, dt.Rows.Count);  //reads first 2 rows and chucks the rest!
+                Assert.AreEqual(2, dt.Rows.Count); //reads first 2 rows and chucks the rest!
                 break;
             case BadDataHandlingStrategy.DivertRows:
 
                 //read 2 rows and rejected the rest
                 var dt2 = RunGetChunk(file, adjust);
                 Assert.AreEqual(2, dt2.Rows.Count);
-                AssertDivertFileIsExactly($"Frank,\"Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}");
+                AssertDivertFileIsExactly(
+                    $"Frank,\"Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}Frank,Is the greatest,100{Environment.NewLine}");
 
                 break;
             default:
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/SourceTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/SourceTests.cs
index 36ab7a84c7..303c16ea03 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/SourceTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PipelineTests/Sources/SourceTests.cs
@@ -20,15 +20,17 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration.PipelineTests.Sources;
 
-public class SourceTests:DatabaseTests
+public class SourceTests : DatabaseTests
 {
     private ICatalogueRepository mockRepo = new MemoryCatalogueRepository();
 
     [Test]
     public void RetrieveChunks()
     {
-        var source = new DbDataCommandDataFlowSource("Select top 3 * from master.sys.tables", "Query Sys tables", DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder, 30);
-        Assert.AreEqual(3, source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()).Rows.Count);
+        var source = new DbDataCommandDataFlowSource("Select top 3 * from master.sys.tables", "Query Sys tables",
+            DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder, 30);
+        Assert.AreEqual(3,
+            source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()).Rows.Count);
     }
 
 
@@ -36,12 +38,12 @@ public void RetrieveChunks()
     public void TestPipelineContextInitialization()
     {
         var contextFactory = new DataFlowPipelineContextFactory<DataTable>();
-        var context = contextFactory.Create(PipelineUsage.FixedDestination |PipelineUsage.LoadsSingleTableInfo);
+        var context = contextFactory.Create(PipelineUsage.FixedDestination | PipelineUsage.LoadsSingleTableInfo);
 
         var component = new TestObject_RequiresTableInfo();
         var ti = new TableInfo(CatalogueRepository, "TestTableInfo");
         context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, ti);
-            
+
         Assert.AreEqual(component.PreInitToThis, ti);
         ti.DeleteInDatabase();
     }
@@ -69,8 +71,9 @@ public void TestPipelineContextInitialization_UnexpectedType()
             Name = "ColumnInfo" // because we passed a stubbed repository, the name won't be set
         };
 
-        var ex = Assert.Throws<Exception>(()=>context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, ci));
-        StringAssert.Contains("The following expected types were not passed to PreInitialize:TableInfo",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, ci));
+        StringAssert.Contains("The following expected types were not passed to PreInitialize:TableInfo", ex.Message);
     }
 
     [Test]
@@ -81,8 +84,11 @@ public void TestPipelineContextInitialization_ForbiddenType()
 
         var component = new TestObject_RequiresTableInfo();
         var ti = new TableInfo(new MemoryCatalogueRepository(), "Foo");
-        var ex = Assert.Throws<Exception>(()=>context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, ti));
-        StringAssert.Contains("Type TableInfo is not an allowable PreInitialize parameters type under the current DataFlowPipelineContext (check which flags you passed to the DataFlowPipelineContextFactory and the interfaces IPipelineRequirement<> that your components implement) ",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, ti));
+        StringAssert.Contains(
+            "Type TableInfo is not an allowable PreInitialize parameters type under the current DataFlowPipelineContext (check which flags you passed to the DataFlowPipelineContextFactory and the interfaces IPipelineRequirement<> that your components implement) ",
+            ex.Message);
     }
 
     [Test]
@@ -99,15 +105,19 @@ public void TestPipelineContextInitialization_UninitializedInterface()
             Name = "Test Table Info"
         };
 
-        var ex = Assert.Throws<Exception>(()=>context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, testTableInfo));
-        StringAssert.Contains($"The following expected types were not passed to PreInitialize:LoadModuleAssembly{Environment.NewLine}The object types passed were:{Environment.NewLine}Rdmp.Core.Curation.Data.TableInfo:Test Table Info",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadEventListener(), component, testTableInfo));
+        StringAssert.Contains(
+            $"The following expected types were not passed to PreInitialize:LoadModuleAssembly{Environment.NewLine}The object types passed were:{Environment.NewLine}Rdmp.Core.Curation.Data.TableInfo:Test Table Info",
+            ex.Message);
     }
 
     [Test]
     public void TestPipelineContextIsAllowable()
     {
         var contextFactory = new DataFlowPipelineContextFactory<DataTable>();
-        var context = contextFactory.Create(PipelineUsage.FixedSource | PipelineUsage.FixedDestination | PipelineUsage.LoadsSingleTableInfo);
+        var context = contextFactory.Create(PipelineUsage.FixedSource | PipelineUsage.FixedDestination |
+                                            PipelineUsage.LoadsSingleTableInfo);
 
         var pipeline = new Pipeline(CatalogueRepository, "DeleteMePipeline");
         var component = new PipelineComponent(CatalogueRepository, pipeline, typeof(TestObject_RequiresTableInfo), 0);
@@ -126,18 +136,20 @@ public void TestPipelineContextIsNOTAllowable()
 
         var pipeline = new Pipeline(CatalogueRepository, "DeleteMePipeline");
         var component = new PipelineComponent(CatalogueRepository, pipeline, typeof(TestObject_RequiresTableInfo), 0)
-            {
-                Name = "TestPipeComponent"
-            };
+        {
+            Name = "TestPipeComponent"
+        };
         component.SaveToDatabase();
 
         var rejection = context.IsAllowable(pipeline, out var reason);
 
         Console.WriteLine(reason);
 
-        Assert.IsFalse(rejection,reason);
+        Assert.IsFalse(rejection, reason);
 
-        Assert.AreEqual("Component TestPipeComponent implements a forbidden type (IPipelineRequirement<TableInfo>) under the pipeline usage context",reason);
+        Assert.AreEqual(
+            "Component TestPipeComponent implements a forbidden type (IPipelineRequirement<TableInfo>) under the pipeline usage context",
+            reason);
 
         pipeline.DeleteInDatabase();
     }
@@ -149,10 +161,12 @@ public void TestSuspiciousPipelineRequirements()
         var context = contextFactory.Create(PipelineUsage.FixedDestination);
 
         var suspiciousComponent = new TestObject_Suspicious();
-        var ex = Assert.Throws<MultipleMatchingImplmentationException>(() => context.PreInitialize(new ThrowImmediatelyDataLoadJob(), suspiciousComponent, 5, "fish"));
+        var ex = Assert.Throws<MultipleMatchingImplmentationException>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadJob(), suspiciousComponent, 5, "fish"));
 
         Console.WriteLine($"Exception was:{ex.Message}");
     }
+
     [Test]
     public void TestExtraSuspiciousPipelineRequirements()
     {
@@ -160,7 +174,8 @@ public void TestExtraSuspiciousPipelineRequirements()
         var context = contextFactory.Create(PipelineUsage.FixedDestination);
 
         var suspiciousComponent = new TestObject_ExtraSuspicious();
-        Assert.Throws<OverlappingImplementationsException>(() => context.PreInitialize(new ThrowImmediatelyDataLoadJob(), suspiciousComponent, "5"));
+        Assert.Throws<OverlappingImplementationsException>(() =>
+            context.PreInitialize(new ThrowImmediatelyDataLoadJob(), suspiciousComponent, "5"));
     }
 
     #region Test objects that have an assortment of IPipelineRequirement<T>s
@@ -168,10 +183,9 @@ public void TestExtraSuspiciousPipelineRequirements()
     public class TestObject_RequiresTableInfo : IDataFlowComponent<DataTable>, IPipelineRequirement<TableInfo>
     {
         public TableInfo PreInitToThis { get; private set; }
-        public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+
+        public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+            GracefulCancellationToken cancellationToken) => throw new NotImplementedException();
 
         public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
         {
@@ -187,16 +201,16 @@ public void PreInitialize(TableInfo value, IDataLoadEventListener listener)
         {
             PreInitToThis = value;
         }
-
     }
-    public class TestObject_RequiresTableInfoAndFreakyObject : IDataFlowComponent<DataTable>, IPipelineRequirement<TableInfo>, IPipelineRequirement<LoadModuleAssembly>
+
+    public class TestObject_RequiresTableInfoAndFreakyObject : IDataFlowComponent<DataTable>,
+        IPipelineRequirement<TableInfo>, IPipelineRequirement<LoadModuleAssembly>
     {
         public TableInfo PreInitToThis { get; private set; }
-        public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-            
+
+        public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+            GracefulCancellationToken cancellationToken) => throw new NotImplementedException();
+
         public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
         {
             throw new NotImplementedException();
@@ -222,10 +236,8 @@ public void PreInitialize(LoadModuleAssembly value, IDataLoadEventListener liste
 
 public class TestObjectNoRequirements : IDataFlowComponent<DataTable>
 {
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-    {
-        throw new NotImplementedException();
-    }
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken) => throw new NotImplementedException();
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -241,11 +253,10 @@ public void Abort(IDataLoadEventListener listener)
 public class TestObject_Suspicious : IDataFlowComponent<DataTable>, IPipelineRequirement<object>
 {
     public object Object { get; set; }
+
     public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
-        GracefulCancellationToken cancellationToken)
-    {
+        GracefulCancellationToken cancellationToken) =>
         throw new NotImplementedException();
-    }
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -263,14 +274,14 @@ public void PreInitialize(object value, IDataLoadEventListener listener)
     }
 }
 
-public class TestObject_ExtraSuspicious : IDataFlowComponent<DataTable>, IPipelineRequirement<object>, IPipelineRequirement<string>
+public class TestObject_ExtraSuspicious : IDataFlowComponent<DataTable>, IPipelineRequirement<object>,
+    IPipelineRequirement<string>
 {
     public object Object { get; set; }
+
     public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
-        GracefulCancellationToken cancellationToken)
-    {
+        GracefulCancellationToken cancellationToken) =>
         throw new NotImplementedException();
-    }
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -292,4 +303,5 @@ public void PreInitialize(string value, IDataLoadEventListener listener)
         Object = value;
     }
 }
+
 #endregion
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrematureLoadEnderTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrematureLoadEnderTests.cs
index 6c13f56ae8..949a189e31 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrematureLoadEnderTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrematureLoadEnderTests.cs
@@ -15,15 +15,15 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-internal class PrematureLoadEnderTests:DatabaseTests
+internal class PrematureLoadEnderTests : DatabaseTests
 {
     [TestCase(DatabaseType.MySql)]
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     public void TestEndLoadBecause_NoTables(DatabaseType type)
     {
         var database = GetCleanedServer(type);
-            
-        Assert.AreEqual(0,database.DiscoverTables(false).Length);
+
+        Assert.AreEqual(0, database.DiscoverTables(false).Length);
 
         var ender = new PrematureLoadEnder
         {
@@ -31,9 +31,9 @@ public void TestEndLoadBecause_NoTables(DatabaseType type)
             ExitCodeToReturnIfConditionMet = ExitCodeType.OperationNotRequired
         };
 
-        ender.Initialize(database,LoadStage.AdjustRaw);
+        ender.Initialize(database, LoadStage.AdjustRaw);
 
-        Assert.AreEqual(ExitCodeType.OperationNotRequired ,ender.Mutilate(new ThrowImmediatelyDataLoadJob()));
+        Assert.AreEqual(ExitCodeType.OperationNotRequired, ender.Mutilate(new ThrowImmediatelyDataLoadJob()));
     }
 
     [TestCase(DatabaseType.MySql)]
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrimaryKeyCollisionResolverTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrimaryKeyCollisionResolverTests.cs
index b2e53fc3fc..92817dc79d 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrimaryKeyCollisionResolverTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/PrimaryKeyCollisionResolverTests.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
 public class PrimaryKeyCollisionResolverTests : DatabaseTests
 {
-
     [Test]
     public void PrimaryKeyCollisionResolverMultilation_Check_Passes()
     {
@@ -40,7 +39,6 @@ public void PrimaryKeyCollisionResolverMultilation_Check_Passes()
             c3.SaveToDatabase();
 
             Assert.DoesNotThrow(() => mutilation.Check(new ThrowImmediatelyCheckNotifier()));
-
         }
         finally
         {
@@ -52,7 +50,7 @@ public void PrimaryKeyCollisionResolverMultilation_Check_Passes()
     [Test]
     public void PrimaryKeyCollisionResolverMultilation_Check_ThrowsBecauseNoColumnOrderConfigured()
     {
-        SetupTableInfos(out var t, out ColumnInfo c1, out ColumnInfo c2, out ColumnInfo c3);
+        SetupTableInfos(out var t, out var c1, out var c2, out var c3);
         try
         {
             var mutilation = new PrimaryKeyCollisionResolverMutilation
@@ -61,14 +59,16 @@ public void PrimaryKeyCollisionResolverMultilation_Check_ThrowsBecauseNoColumnOr
             };
             try
             {
-
                 mutilation.Check(new ThrowImmediatelyCheckNotifier());
                 Assert.Fail("Should have crashed before here");
             }
             catch (Exception e)
             {
-                Assert.AreEqual("Failed to check PrimaryKeyCollisionResolver on PrimaryKeyCollisionResolverTests", e.Message);
-                Assert.AreEqual("TableInfo PrimaryKeyCollisionResolverTests does not have any primary keys defined so cannot resolve primary key collisions",e.InnerException.Message);
+                Assert.AreEqual("Failed to check PrimaryKeyCollisionResolver on PrimaryKeyCollisionResolverTests",
+                    e.Message);
+                Assert.AreEqual(
+                    "TableInfo PrimaryKeyCollisionResolverTests does not have any primary keys defined so cannot resolve primary key collisions",
+                    e.InnerException.Message);
             }
         }
         finally
@@ -82,8 +82,10 @@ public void PrimaryKeyCollisionResolverMultilation_Check_ThrowsBecauseNotInitial
     {
         var mutilation = new PrimaryKeyCollisionResolverMutilation();
 
-        var ex = Assert.Throws<Exception>(()=>mutilation.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("Target table is null, a table must be specified upon which to resolve primary key duplication (that TableInfo must have a primary key collision resolution order)",ex.Message);
+        var ex = Assert.Throws<Exception>(() => mutilation.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains(
+            "Target table is null, a table must be specified upon which to resolve primary key duplication (that TableInfo must have a primary key collision resolution order)",
+            ex.Message);
     }
 
     [Test]
@@ -126,15 +128,17 @@ public void GenerateSQL_OrderCorrect()
     [Test]
     public void NoColumnOrdersConfigured_ThrowsException()
     {
-        SetupTableInfos(out var t, out var c1, out ColumnInfo c2, out ColumnInfo c3);
+        SetupTableInfos(out var t, out var c1, out var c2, out var c3);
         try
         {
             c1.IsPrimaryKey = true;
             c1.SaveToDatabase();
 
             var resolver = new PrimaryKeyCollisionResolver(t);
-            var ex = Assert.Throws<Exception>(()=>Console.WriteLine(resolver.GenerateSQL()));
-            StringAssert.Contains("The ColumnInfos of TableInfo PrimaryKeyCollisionResolverTests do not have primary key resolution orders configured (do not know which order to use non primary key column values in to resolve collisions).  Fix this by right clicking a TableInfo in CatalogueManager and selecting 'Configure Primary Key Collision Resolution'.",ex.Message);
+            var ex = Assert.Throws<Exception>(() => Console.WriteLine(resolver.GenerateSQL()));
+            StringAssert.Contains(
+                "The ColumnInfos of TableInfo PrimaryKeyCollisionResolverTests do not have primary key resolution orders configured (do not know which order to use non primary key column values in to resolve collisions).  Fix this by right clicking a TableInfo in CatalogueManager and selecting 'Configure Primary Key Collision Resolution'.",
+                ex.Message);
         }
         finally
         {
@@ -145,13 +149,14 @@ public void NoColumnOrdersConfigured_ThrowsException()
     [Test]
     public void NoPrimaryKeys_ThrowsException()
     {
-        SetupTableInfos(out var t, out ColumnInfo c1, out ColumnInfo c2, out ColumnInfo c3);
+        SetupTableInfos(out var t, out var c1, out var c2, out var c3);
 
         try
         {
             var resolver = new PrimaryKeyCollisionResolver(t);
-            var ex = Assert.Throws<Exception>(()=>Console.WriteLine(resolver.GenerateSQL()));
-            StringAssert.Contains("does not have any primary keys defined so cannot resolve primary key collisions",ex.Message);
+            var ex = Assert.Throws<Exception>(() => Console.WriteLine(resolver.GenerateSQL()));
+            StringAssert.Contains("does not have any primary keys defined so cannot resolve primary key collisions",
+                ex.Message);
         }
         finally
         {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/RemoteDatabaseAttacherTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/RemoteDatabaseAttacherTests.cs
index ae9dbdeff7..78ba28f66c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/RemoteDatabaseAttacherTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/RemoteDatabaseAttacherTests.cs
@@ -23,7 +23,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class RemoteDatabaseAttacherTests:DatabaseTests
+public class RemoteDatabaseAttacherTests : DatabaseTests
 {
     [TestCase(DatabaseType.MicrosoftSQLServer, Scenario.AllRawColumns)]
     [TestCase(DatabaseType.MySql, Scenario.AllRawColumns)]
@@ -41,32 +41,34 @@ public void TestRemoteDatabaseAttach(DatabaseType dbType, Scenario scenario)
 
         dt.Rows.Add("123", 11);
 
-        var tbl = db.CreateTable("MyTable",dt);
+        var tbl = db.CreateTable("MyTable", dt);
 
         Assert.AreEqual(1, tbl.GetRowCount());
         Import(tbl, out var ti, out var cols);
 
         //Create a virtual RAW column
-        if (scenario == Scenario.MissingPreLoadDiscardedColumn || scenario == Scenario.MissingPreLoadDiscardedColumnButSelectStar)
+        if (scenario == Scenario.MissingPreLoadDiscardedColumn ||
+            scenario == Scenario.MissingPreLoadDiscardedColumnButSelectStar)
             new PreLoadDiscardedColumn(CatalogueRepository, ti, "MyMissingCol");
 
-        var externalServer = new ExternalDatabaseServer(CatalogueRepository, "MyFictionalRemote",null);
+        var externalServer = new ExternalDatabaseServer(CatalogueRepository, "MyFictionalRemote", null);
         externalServer.SetProperties(db);
 
         var attacher = new RemoteDatabaseAttacher();
-        attacher.Initialize(null,db);
+        attacher.Initialize(null, db);
 
-        attacher.LoadRawColumnsOnly = scenario == Scenario.AllRawColumns || scenario == Scenario.MissingPreLoadDiscardedColumn;
+        attacher.LoadRawColumnsOnly =
+            scenario == Scenario.AllRawColumns || scenario == Scenario.MissingPreLoadDiscardedColumn;
         attacher.RemoteSource = externalServer;
 
         var lm = new LogManager(CatalogueRepository.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID));
         lm.CreateNewLoggingTaskIfNotExists("amagad");
         var dli = lm.CreateDataLoadInfo("amagad", "p", "a", "", true);
 
-        var job = Mock.Of<IDataLoadJob>(p => 
-            p.RegularTablesToLoad==new List<ITableInfo> {ti} && 
-            p.LookupTablesToLoad==new List<ITableInfo>() && p.DataLoadInfo==dli);
-            
+        var job = Mock.Of<IDataLoadJob>(p =>
+            p.RegularTablesToLoad == new List<ITableInfo> { ti } &&
+            p.LookupTablesToLoad == new List<ITableInfo>() && p.DataLoadInfo == dli);
+
         switch (scenario)
         {
             case Scenario.AllRawColumns:
@@ -74,22 +76,25 @@ public void TestRemoteDatabaseAttach(DatabaseType dbType, Scenario scenario)
             case Scenario.AllColumns:
                 break;
             case Scenario.MissingPreLoadDiscardedColumn:
-                var ex = Assert.Throws<PipelineCrashedException>(() => attacher.Attach(job, new GracefulCancellationToken()));
+                var ex = Assert.Throws<PipelineCrashedException>(() =>
+                    attacher.Attach(job, new GracefulCancellationToken()));
 
-                Assert.AreEqual("Invalid column name 'MyMissingCol'.", ex.InnerException.InnerException.InnerException.Message);
+                Assert.AreEqual("Invalid column name 'MyMissingCol'.",
+                    ex.InnerException.InnerException.InnerException.Message);
                 return;
             case Scenario.MissingPreLoadDiscardedColumnButSelectStar:
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(scenario));
         }
+
         attacher.Attach(job, new GracefulCancellationToken());
 
-        Assert.AreEqual(2,tbl.GetRowCount());
+        Assert.AreEqual(2, tbl.GetRowCount());
 
         dt = tbl.GetDataTable();
 
-        VerifyRowExist(dt,123,11);
+        VerifyRowExist(dt, 123, 11);
 
         if (scenario == Scenario.AllRawColumns)
             VerifyRowExist(dt, 123, DBNull.Value);
@@ -98,7 +103,7 @@ public void TestRemoteDatabaseAttach(DatabaseType dbType, Scenario scenario)
 
         externalServer.DeleteInDatabase();
     }
-        
+
     public enum Scenario
     {
         /// <summary>
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/RuntimeTaskFactoryTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/RuntimeTaskFactoryTests.cs
index 6ab988aa8e..c7ca311acf 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/RuntimeTaskFactoryTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/RuntimeTaskFactoryTests.cs
@@ -22,27 +22,27 @@ public class RuntimeTaskFactoryTests : DatabaseTests
     [TestCase("Rdmp.Core.DataLoad.Modules.DataProvider.FlatFileManipulation.ExcelToCSVFilesConverter")]
     public void RuntimeTaskFactoryTest(string className)
     {
-
         var lmd = new LoadMetadata(CatalogueRepository);
-        var task = new ProcessTask(CatalogueRepository, lmd,LoadStage.GetFiles);
+        var task = new ProcessTask(CatalogueRepository, lmd, LoadStage.GetFiles);
 
         var f = new RuntimeTaskFactory(CatalogueRepository);
 
         task.Path = className;
         task.ProcessTaskType = ProcessTaskType.DataProvider;
         task.SaveToDatabase();
-            
+
         try
         {
-            var ex = Assert.Throws<Exception>(() => f.Create(task, new StageArgs(LoadStage.AdjustRaw, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer), Mock.Of<ILoadDirectory>())));
-            Assert.IsTrue(ex.InnerException.Message.Contains("marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection"));
+            var ex = Assert.Throws<Exception>(() => f.Create(task,
+                new StageArgs(LoadStage.AdjustRaw, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer),
+                    Mock.Of<ILoadDirectory>())));
+            Assert.IsTrue(ex.InnerException.Message.Contains(
+                "marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection"));
         }
-        finally 
+        finally
         {
             task.DeleteInDatabase();
             lmd.DeleteInDatabase();
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/SafePrimaryKeyCollisionResolverMutilationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/SafePrimaryKeyCollisionResolverMutilationTests.cs
index ad7ee2fa66..2d642558ef 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/SafePrimaryKeyCollisionResolverMutilationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/SafePrimaryKeyCollisionResolverMutilationTests.cs
@@ -17,13 +17,14 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class SafePrimaryKeyCollisionResolverMutilationTests:DatabaseTests
+public class SafePrimaryKeyCollisionResolverMutilationTests : DatabaseTests
 {
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
-    [TestCase(DatabaseType.MySql,true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
+    [TestCase(DatabaseType.MySql, true)]
     [TestCase(DatabaseType.MicrosoftSQLServer, false)]
     [TestCase(DatabaseType.MySql, false)]
-    public void SafePrimaryKeyCollisionResolverMutilationTests_NoDifference_NoRecordsDeleted(DatabaseType dbType,bool bothNull)
+    public void SafePrimaryKeyCollisionResolverMutilationTests_NoDifference_NoRecordsDeleted(DatabaseType dbType,
+        bool bothNull)
     {
         var db = GetCleanedServer(dbType);
 
@@ -31,15 +32,15 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_NoDifference_NoRecord
         dt.Columns.Add("PK");
         dt.Columns.Add("ResolveOn");
         dt.Columns.Add("AnotherCol");
-            
-        dt.Rows.Add(1, bothNull?null:"fish", "cat");
+
+        dt.Rows.Add(1, bothNull ? null : "fish", "cat");
         dt.Rows.Add(1, bothNull ? null : "fish", "flop");
         dt.Rows.Add(2, "fish", "flop");
         dt.Rows.Add(3, "dave", "franl");
 
         var tbl = db.CreateTable("MyTable", dt);
 
-        Import(tbl,out var ti, out var cis);
+        Import(tbl, out var ti, out var cis);
 
         var pk = cis.Single(c => c.GetRuntimeName().Equals("PK"));
         pk.IsPrimaryKey = true;
@@ -57,13 +58,15 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_NoDifference_NoRecord
         mutilation.Initialize(db, LoadStage.AdjustRaw);
         mutilation.Mutilate(new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(db.Server)));
 
-        Assert.AreEqual(4,tbl.GetRowCount());
+        Assert.AreEqual(4, tbl.GetRowCount());
     }
-    [TestCase(DatabaseType.MicrosoftSQLServer,false)]
-    [TestCase(DatabaseType.MySql,false)]
+
+    [TestCase(DatabaseType.MicrosoftSQLServer, false)]
+    [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.MySql, true)]
-    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferNull_RecordsDeleted(DatabaseType dbType,bool preferNulls)
+    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferNull_RecordsDeleted(DatabaseType dbType,
+        bool preferNulls)
     {
         var db = GetCleanedServer(dbType);
 
@@ -99,13 +102,18 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferNull_RecordsDel
 
         Assert.AreEqual(3, tbl.GetRowCount());
         var result = tbl.GetDataTable();
-            
+
         //if you prefer nulls you shouldn't want this one
-        Assert.AreEqual(preferNulls? 0:1 ,result.Rows.Cast<DataRow>().Count(r=>(int)r["PK"] == 1 && r["ResolveOn"] as string == "fish" && r["AnotherCol"] as string == "flop" ));
+        Assert.AreEqual(preferNulls ? 0 : 1,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] as string == "fish" && r["AnotherCol"] as string == "flop"));
 
         //if you prefer nulls you should have this one
-        Assert.AreEqual(preferNulls ? 1 : 0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
+        Assert.AreEqual(preferNulls ? 1 : 0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
     }
+
     [TestCase(DatabaseType.MicrosoftSQLServer)]
     [TestCase(DatabaseType.MySql)]
     public void SafePrimaryKeyCollisionResolverMutilationTests_WithDatabaseNamer_RecordsDeleted(DatabaseType dbType)
@@ -127,7 +135,7 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_WithDatabaseNamer_Rec
         Import(tbl, out var ti, out var cis);
 
         tbl.Rename("AAAA");
-        var namer = RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db,"AAAA");
+        var namer = RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "AAAA");
 
         var pk = cis.Single(c => c.GetRuntimeName().Equals("PK"));
         pk.IsPrimaryKey = true;
@@ -143,16 +151,20 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_WithDatabaseNamer_Rec
         };
 
         mutilation.Initialize(db, LoadStage.AdjustRaw);
-        mutilation.Mutilate(new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(db.Server,namer), ti));
+        mutilation.Mutilate(new ThrowImmediatelyDataLoadJob(new HICDatabaseConfiguration(db.Server, namer), ti));
 
         Assert.AreEqual(3, tbl.GetRowCount());
         var result = tbl.GetDataTable();
 
         //if you prefer nulls you shouldn't want this one
-        Assert.AreEqual( 0 , result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] as string == "fish" && r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] as string == "fish" && r["AnotherCol"] as string == "flop"));
 
         //if you prefer nulls you should have this one
-        Assert.AreEqual(1, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
+        Assert.AreEqual(1,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
     }
 
 
@@ -160,7 +172,8 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_WithDatabaseNamer_Rec
     [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.MySql, true)]
-    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_RecordsDeleted(DatabaseType dbType, bool preferLarger)
+    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_RecordsDeleted(DatabaseType dbType,
+        bool preferLarger)
     {
         var db = GetCleanedServer(dbType);
 
@@ -199,20 +212,26 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_RecordsD
         var result = tbl.GetDataTable();
 
         //if you like larger values (alphabetically) then you want the 'b'
-        Assert.AreEqual(preferLarger ? 1 : 0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] as string == "b" && r["AnotherCol"] as string == "flop"));
-        Assert.AreEqual(preferLarger ? 0 : 1, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] as string == "a" && r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 1 : 0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] as string == "b" && r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 0 : 1,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] as string == "a" && r["AnotherCol"] as string == "flop"));
 
         //either way you shouldn't have the null one
-        Assert.AreEqual(0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
+        Assert.AreEqual(0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
     }
 
 
-
     [TestCase(DatabaseType.MicrosoftSQLServer, false)]
     [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.MySql, true)]
-    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_Dates_RecordsDeleted(DatabaseType dbType, bool preferLarger)
+    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_Dates_RecordsDeleted(DatabaseType dbType,
+        bool preferLarger)
     {
         var db = GetCleanedServer(dbType);
 
@@ -222,7 +241,7 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_Dates_Re
         dt.Columns.Add("AnotherCol");
 
         dt.Rows.Add(1, null, "cat");
-        dt.Rows.Add(1, new DateTime(2001,01,01), "flop");
+        dt.Rows.Add(1, new DateTime(2001, 01, 01), "flop");
         dt.Rows.Add(1, new DateTime(2002, 01, 01), "flop");
         dt.Rows.Add(2, null, "flop");
         dt.Rows.Add(3, null, "franl");
@@ -251,18 +270,27 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_Dates_Re
         var result = tbl.GetDataTable();
 
         //if you like larger values then you want 2002 thats larger than 2001
-        Assert.AreEqual(preferLarger ? 1 : 0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && Equals(r["ResolveOn"], new DateTime(2002,01,01)) && r["AnotherCol"] as string == "flop"));
-        Assert.AreEqual(preferLarger ? 0 : 1, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && Equals(r["ResolveOn"], new DateTime(2001,01,01))  && r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 1 : 0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && Equals(r["ResolveOn"], new DateTime(2002, 01, 01)) &&
+                r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 0 : 1,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && Equals(r["ResolveOn"], new DateTime(2001, 01, 01)) &&
+                r["AnotherCol"] as string == "flop"));
 
         //either way you shouldn't have the null one
-        Assert.AreEqual(0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
+        Assert.AreEqual(0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
     }
 
     [TestCase(DatabaseType.MicrosoftSQLServer, false)]
     [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.MySql, true)]
-    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_ComboKey_RecordsDeleted(DatabaseType dbType, bool preferLarger)
+    public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_ComboKey_RecordsDeleted(DatabaseType dbType,
+        bool preferLarger)
     {
         var db = GetCleanedServer(dbType);
 
@@ -272,17 +300,17 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_ComboKey
         dt.Columns.Add("ResolveOn");
         dt.Columns.Add("AnotherCol");
 
-        dt.Rows.Add(1,1, null, "cat");
-        dt.Rows.Add(1,1, new DateTime(2001, 01, 01), "flop");
-        dt.Rows.Add(1,1, new DateTime(2002, 01, 01), "flop");
+        dt.Rows.Add(1, 1, null, "cat");
+        dt.Rows.Add(1, 1, new DateTime(2001, 01, 01), "flop");
+        dt.Rows.Add(1, 1, new DateTime(2002, 01, 01), "flop");
 
         dt.Rows.Add(1, 2, null, "cat");
         dt.Rows.Add(1, 2, null, "cat");
         dt.Rows.Add(1, 3, new DateTime(2001, 01, 01), "flop");
         dt.Rows.Add(1, 4, new DateTime(2002, 01, 01), "flop");
 
-        dt.Rows.Add(2,1, null, "flop");
-        dt.Rows.Add(3,1, null, "franl");
+        dt.Rows.Add(2, 1, null, "flop");
+        dt.Rows.Add(3, 1, null, "franl");
 
         var tbl = db.CreateTable("MyTable", dt);
 
@@ -312,10 +340,19 @@ public void SafePrimaryKeyCollisionResolverMutilationTests_PreferLarger_ComboKey
         var result = tbl.GetDataTable();
 
         //if you like larger values then you want 2002 thats larger than 2001
-        Assert.AreEqual(preferLarger ? 1 : 0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && Equals(r["ResolveOn"], new DateTime(2002, 01, 01)) && r["AnotherCol"] as string == "flop"));
-        Assert.AreEqual(preferLarger ? 0 : 1, result.Rows.Cast<DataRow>().Count(r => (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && Equals(r["ResolveOn"], new DateTime(2001, 01, 01)) && r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 1 : 0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && Equals(r["ResolveOn"], new DateTime(2002, 01, 01)) &&
+                r["AnotherCol"] as string == "flop"));
+        Assert.AreEqual(preferLarger ? 0 : 1,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && Equals(r["ResolveOn"], new DateTime(2001, 01, 01)) &&
+                r["AnotherCol"] as string == "flop"));
 
         //either way you shouldn't have the null one
-        Assert.AreEqual(0, result.Rows.Cast<DataRow>().Count(r => (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && r["ResolveOn"] == DBNull.Value && r["AnotherCol"] as string == "cat"));
+        Assert.AreEqual(0,
+            result.Rows.Cast<DataRow>().Count(r =>
+                (int)r["PK1"] == 1 && (int)r["PK2"] == 1 && r["ResolveOn"] == DBNull.Value &&
+                r["AnotherCol"] as string == "cat"));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/SingleJobPipelineTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/SingleJobPipelineTests.cs
index 2f29f8e0d3..2920f88e5c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/SingleJobPipelineTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/SingleJobPipelineTests.cs
@@ -22,7 +22,7 @@ public static void LoadNotRequiredStopsPipelineGracefully()
     {
         var component = new NotRequiredComponent();
 
-        var pipeline = new SingleJobExecution(new List<IDataLoadComponent> {component});
+        var pipeline = new SingleJobExecution(new List<IDataLoadComponent> { component });
 
         var job = Mock.Of<IDataLoadJob>();
         var jobTokenSource = new GracefulCancellationTokenSource();
@@ -32,10 +32,8 @@ public static void LoadNotRequiredStopsPipelineGracefully()
 
 internal class NotRequiredComponent : DataLoadComponent
 {
-    public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
-    {
-        return ExitCodeType.OperationNotRequired;
-    }
+    public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken) =>
+        ExitCodeType.OperationNotRequired;
 
     public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postDataLoadEventListener)
     {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableInfoJoiningQueryBuilderTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableInfoJoiningQueryBuilderTests.cs
index 006ed1b3a5..e553e344c9 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableInfoJoiningQueryBuilderTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableInfoJoiningQueryBuilderTests.cs
@@ -15,7 +15,7 @@
 
 namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
-public class TableInfoJoiningQueryBuilderTests:DatabaseTests
+public class TableInfoJoiningQueryBuilderTests : DatabaseTests
 {
     [Test]
     public void OpportunisticJoinRequired()
@@ -23,8 +23,8 @@ public void OpportunisticJoinRequired()
         var memory = new MemoryRepository();
 
         //tables and columns
-        var head = new TableInfo(CatalogueRepository,"Head");
-        var col1 = new ColumnInfo(CatalogueRepository,"TestResultSetNumber","int",head);
+        var head = new TableInfo(CatalogueRepository, "Head");
+        var col1 = new ColumnInfo(CatalogueRepository, "TestResultSetNumber", "int", head);
         var col2 = new ColumnInfo(CatalogueRepository, "PK", "int", head);
 
         var result = new TableInfo(CatalogueRepository, "[biochemistry]..[Result]");
@@ -33,33 +33,33 @@ public void OpportunisticJoinRequired()
         var col5 = new ColumnInfo(CatalogueRepository, "[biochemistry]..[Result].[OmgBob]", "varchar(10)", result);
 
         //we can join on col2 = col3
-        new JoinInfo(CatalogueRepository,col3, col2, ExtractionJoinType.Right, "");
+        new JoinInfo(CatalogueRepository, col3, col2, ExtractionJoinType.Right, "");
 
         //CASE 1 : Only 1 column used so no join needed
         var queryBuilder = new QueryBuilder(null, null);
-        var icol1 = new ColumnInfoToIColumn(memory,col1)
+        var icol1 = new ColumnInfoToIColumn(memory, col1)
         {
             Order = 1
         };
         queryBuilder.AddColumn(icol1);
 
-        var tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out var primary,null);
-            
-        Assert.AreEqual(1,tablesUsed.Count);
-        Assert.AreEqual(head,tablesUsed[0]);
+        var tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out var primary, null);
+
+        Assert.AreEqual(1, tablesUsed.Count);
+        Assert.AreEqual(head, tablesUsed[0]);
 
         //CASE 2 : 2 columns used one from each table so join is needed
         queryBuilder = new QueryBuilder(null, null);
-        queryBuilder.AddColumn(new ColumnInfoToIColumn(memory,col1));
+        queryBuilder.AddColumn(new ColumnInfoToIColumn(memory, col1));
 
-        var icol4 = new ColumnInfoToIColumn(memory,col4)
+        var icol4 = new ColumnInfoToIColumn(memory, col4)
         {
             Order = 2
         };
         queryBuilder.AddColumn(icol4);
 
         tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out primary, null);
-            
+
         Assert.AreEqual(2, tablesUsed.Count);
         Assert.AreEqual(head, tablesUsed[0]);
         Assert.AreEqual(result, tablesUsed[1]);
@@ -72,21 +72,23 @@ public void OpportunisticJoinRequired()
 
         var memoryRepository = new MemoryCatalogueRepository();
 
-        var spontContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,null, null, FilterContainerOperation.AND);
+        var spontContainer =
+            new SpontaneouslyInventedFilterContainer(memoryRepository, null, null, FilterContainerOperation.AND);
 
-        var spontFilter = new SpontaneouslyInventedFilter(memoryRepository,spontContainer, "[biochemistry]..[Result].[OmgBob] = 'T'",
+        var spontFilter = new SpontaneouslyInventedFilter(memoryRepository, spontContainer,
+            "[biochemistry]..[Result].[OmgBob] = 'T'",
             "My Filter", "Causes spontaneous requirement for joining compeltely", null);
         spontContainer.AddChild(spontFilter);
 
 
         //CASE 3 : Only 1 column from Head but filter contains a reference to Result column
         queryBuilder = new QueryBuilder(null, null);
-        queryBuilder.AddColumn(new ColumnInfoToIColumn(memory,col1));
+        queryBuilder.AddColumn(new ColumnInfoToIColumn(memory, col1));
 
         //without the filter
         tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out primary, null);
         Assert.AreEqual(1, tablesUsed.Count);
-            
+
         //set the filter
         queryBuilder.RootFilterContainer = spontContainer;
 
@@ -95,11 +97,7 @@ public void OpportunisticJoinRequired()
         queryBuilder.ParameterManager.ClearNonGlobals();
 
         //with the filter
-        tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out primary,null);
+        tablesUsed = SqlQueryBuilderHelper.GetTablesUsedInQuery(queryBuilder, out primary, null);
         Assert.AreEqual(2, tablesUsed.Count);
-
-            
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableVarcharMaxerTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableVarcharMaxerTests.cs
index 7b8f9478bc..535e4f7b56 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableVarcharMaxerTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TableVarcharMaxerTests.cs
@@ -24,18 +24,18 @@ namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 
 public class TableVarcharMaxerTests : DatabaseTests
 {
-    [TestCase(DatabaseType.MySql,true)]
+    [TestCase(DatabaseType.MySql, true)]
     [TestCase(DatabaseType.MySql, false)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,false)]
-    public void TestTableVarcharMaxer(DatabaseType dbType,bool allDataTypes)
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, false)]
+    public void TestTableVarcharMaxer(DatabaseType dbType, bool allDataTypes)
     {
         var db = GetCleanedServer(dbType);
 
-        var tbl = db.CreateTable("Fish",new[]
+        var tbl = db.CreateTable("Fish", new[]
         {
-            new DatabaseColumnRequest("Dave",new DatabaseTypeRequest(typeof(string),100)), 
-            new DatabaseColumnRequest("Frank",new DatabaseTypeRequest(typeof(int))) 
+            new DatabaseColumnRequest("Dave", new DatabaseTypeRequest(typeof(string), 100)),
+            new DatabaseColumnRequest("Frank", new DatabaseTypeRequest(typeof(int)))
         });
 
         Import(tbl, out var ti, out var cols);
@@ -44,30 +44,31 @@ public void TestTableVarcharMaxer(DatabaseType dbType,bool allDataTypes)
         {
             AllDataTypes = allDataTypes,
             TableRegexPattern = new Regex(".*"),
-            DestinationType = db.Server.GetQuerySyntaxHelper().TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string),int.MaxValue))
+            DestinationType = db.Server.GetQuerySyntaxHelper().TypeTranslater
+                .GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string), int.MaxValue))
         };
 
-        maxer.Initialize(db,LoadStage.AdjustRaw);
-        maxer.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true});
+        maxer.Initialize(db, LoadStage.AdjustRaw);
+        maxer.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
 
-        var job = Mock.Of<IDataLoadJob>(x => 
-            x.RegularTablesToLoad==new List<ITableInfo> {ti} &&
-            x.Configuration==new HICDatabaseConfiguration(db.Server,null,null,null));
+        var job = Mock.Of<IDataLoadJob>(x =>
+            x.RegularTablesToLoad == new List<ITableInfo> { ti } &&
+            x.Configuration == new HICDatabaseConfiguration(db.Server, null, null, null));
 
         maxer.Mutilate(job);
 
         switch (dbType)
         {
             case DatabaseType.MicrosoftSQLServer:
-                Assert.AreEqual("varchar(max)",tbl.DiscoverColumn("Dave").DataType.SQLType);
+                Assert.AreEqual("varchar(max)", tbl.DiscoverColumn("Dave").DataType.SQLType);
                 Assert.AreEqual(allDataTypes ? "varchar(max)" : "int", tbl.DiscoverColumn("Frank").DataType.SQLType);
                 break;
             case DatabaseType.MySql:
-                Assert.AreEqual("text",tbl.DiscoverColumn("Dave").DataType.SQLType);
+                Assert.AreEqual("text", tbl.DiscoverColumn("Dave").DataType.SQLType);
                 Assert.AreEqual(allDataTypes ? "text" : "int", tbl.DiscoverColumn("Frank").DataType.SQLType);
                 break;
             case DatabaseType.Oracle:
-                Assert.AreEqual("varchar(max)",tbl.DiscoverColumn("Dave").DataType.SQLType);
+                Assert.AreEqual("varchar(max)", tbl.DiscoverColumn("Dave").DataType.SQLType);
                 Assert.AreEqual(allDataTypes ? "varchar(max)" : "int", tbl.DiscoverColumn("Frank").DataType.SQLType);
                 break;
             default:
@@ -81,10 +82,10 @@ public void VarcharMaxer_BadTableNames(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
 
-        var tbl = db.CreateTable("Fi ; '`sh",new[]
+        var tbl = db.CreateTable("Fi ; '`sh", new[]
         {
-            new DatabaseColumnRequest("Da'   ,,;ve",new DatabaseTypeRequest(typeof(string),100)), 
-            new DatabaseColumnRequest("Frrrrr ##' ank",new DatabaseTypeRequest(typeof(int))) 
+            new DatabaseColumnRequest("Da'   ,,;ve", new DatabaseTypeRequest(typeof(string), 100)),
+            new DatabaseColumnRequest("Frrrrr ##' ank", new DatabaseTypeRequest(typeof(int)))
         });
 
         Import(tbl, out var ti, out var cols);
@@ -92,16 +93,17 @@ public void VarcharMaxer_BadTableNames(DatabaseType dbType)
         var maxer = new TableVarcharMaxer
         {
             TableRegexPattern = new Regex(".*"),
-            DestinationType = db.Server.GetQuerySyntaxHelper().TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string),int.MaxValue))
+            DestinationType = db.Server.GetQuerySyntaxHelper().TypeTranslater
+                .GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string), int.MaxValue))
         };
 
-        maxer.Initialize(db,LoadStage.AdjustRaw);
-        maxer.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true});
+        maxer.Initialize(db, LoadStage.AdjustRaw);
+        maxer.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
 
         var job = new ThrowImmediatelyDataLoadJob
         {
-            RegularTablesToLoad = new List<ITableInfo> {ti},
-            Configuration = new HICDatabaseConfiguration(db.Server,null,null,null)
+            RegularTablesToLoad = new List<ITableInfo> { ti },
+            Configuration = new HICDatabaseConfiguration(db.Server, null, null, null)
         };
 
         maxer.Mutilate(job);
@@ -109,13 +111,13 @@ public void VarcharMaxer_BadTableNames(DatabaseType dbType)
         switch (dbType)
         {
             case DatabaseType.MicrosoftSQLServer:
-                Assert.AreEqual("varchar(max)",tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
+                Assert.AreEqual("varchar(max)", tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
                 break;
             case DatabaseType.MySql:
-                Assert.AreEqual("text",tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
+                Assert.AreEqual("text", tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
                 break;
             case DatabaseType.Oracle:
-                Assert.AreEqual("varchar(max)",tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
+                Assert.AreEqual("varchar(max)", tbl.DiscoverColumn("Da'   ,,;ve").DataType.SQLType);
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(dbType));
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TestTemporalTables.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TestTemporalTables.cs
index 08aef55bc4..2a555beaaa 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/TestTemporalTables.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/TestTemporalTables.cs
@@ -50,10 +50,10 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         var dbtype = FAnsi.DatabaseType.MicrosoftSQLServer;
         var db = GetCleanedServer(dbtype);
 
-        using(var con = db.Server.GetConnection())
+        using (var con = db.Server.GetConnection())
         {
             con.Open();
-            db.Server.GetCommand(sql,con).ExecuteNonQuery();
+            db.Server.GetCommand(sql, con).ExecuteNonQuery();
         }
 
         var tbl = db.ExpectTable("Employee");
@@ -63,7 +63,7 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         var logManager = new LogManager(logServer);
 
         var raw = db.Server.ExpectDatabase($"{db.GetRuntimeName()}_RAW");
-        if(raw.Exists())
+        if (raw.Exists())
             raw.Drop();
 
         //define a new load configuration
@@ -73,12 +73,12 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         };
         lmd.SaveToDatabase();
 
-        var ti = Import(tbl, lmd,logManager);
+        var ti = Import(tbl, lmd, logManager);
 
         var projectDirectory = SetupLoadDirectory(lmd);
 
-        CreateCSVProcessTask(lmd,ti,"*.csv");
-            
+        CreateCSVProcessTask(lmd, ti, "*.csv");
+
         //create a text file to load where we update Frank's favourite colour (it's a pk field) and we insert a new record (MrMurder)
         File.WriteAllText(
             Path.Combine(projectDirectory.ForLoading.FullName, "LoadMe.csv"),
@@ -90,10 +90,11 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         //the checks will probably need to be run as ddl admin because it involves creating _Archive table and trigger the first time
 
         //clean SetUp RAW / STAGING etc and generally accept proposed cleanup operations
-        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd), new HICLoadConfigurationFlags(),CatalogueRepository.MEF);
+        var checker = new CheckEntireDataLoadProcess(lmd, new HICDatabaseConfiguration(lmd),
+            new HICLoadConfigurationFlags(), CatalogueRepository.MEF);
         checker.Check(new AcceptAllCheckNotifier());
 
-        if(ignoreWithGlobalPattern)
+        if (ignoreWithGlobalPattern)
         {
             var regex = new StandardRegex(RepositoryLocator.CatalogueRepository)
             {
@@ -105,16 +106,16 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         }
         else
         {
-            var col = ti.ColumnInfos.Single(c=>c.GetRuntimeName().Equals("ValidFrom"));
+            var col = ti.ColumnInfos.Single(c => c.GetRuntimeName().Equals("ValidFrom"));
             col.IgnoreInLoads = true;
             col.SaveToDatabase();
 
-            col = ti.ColumnInfos.Single(c=>c.GetRuntimeName().Equals("ValidTo"));
+            col = ti.ColumnInfos.Single(c => c.GetRuntimeName().Equals("ValidTo"));
             col.IgnoreInLoads = true;
             col.SaveToDatabase();
         }
 
-        var dbConfig = new HICDatabaseConfiguration(lmd,null);
+        var dbConfig = new HICDatabaseConfiguration(lmd, null);
 
         var loadFactory = new HICDataLoadFactory(
             lmd,
@@ -127,17 +128,18 @@ public void TestTemporalTable(bool ignoreWithGlobalPattern)
         var exe = loadFactory.Create(new ThrowImmediatelyDataLoadEventListener());
 
         var exitCode = exe.Run(
-            new DataLoadJob(RepositoryLocator,"Go go go!", logManager, lmd, projectDirectory,new ThrowImmediatelyDataLoadEventListener(),dbConfig),
+            new DataLoadJob(RepositoryLocator, "Go go go!", logManager, lmd, projectDirectory,
+                new ThrowImmediatelyDataLoadEventListener(), dbConfig),
             new GracefulCancellationToken());
 
-        Assert.AreEqual(ExitCodeType.Success,exitCode);
+        Assert.AreEqual(ExitCodeType.Success, exitCode);
 
         //frank should be updated to his new departement and role
-        Assert.AreEqual(2,tbl.GetRowCount());
+        Assert.AreEqual(2, tbl.GetRowCount());
         var result = tbl.GetDataTable();
-        var frank = result.Rows.Cast<DataRow>().Single(r => (string) r["Name"] == "Frank");
-        Assert.AreEqual("Department of F'Tang",frank["Department"]);
-        Assert.AreEqual("Boss",frank["Position"]);
+        var frank = result.Rows.Cast<DataRow>().Single(r => (string)r["Name"] == "Frank");
+        Assert.AreEqual("Department of F'Tang", frank["Department"]);
+        Assert.AreEqual("Boss", frank["Position"]);
 
         //post test cleanup
         foreach (var regex in RepositoryLocator.CatalogueRepository.GetAllObjects<StandardRegex>())
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ToMemoryDataLoadJob.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ToMemoryDataLoadJob.cs
index cfd83d79fc..b47269a44c 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/ToMemoryDataLoadJob.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/ToMemoryDataLoadJob.cs
@@ -23,10 +23,11 @@ namespace Rdmp.Core.Tests.DataLoad.Engine.Integration;
 public class ToMemoryDataLoadJob : ToMemoryDataLoadEventListener, IDataLoadJob
 {
     private List<NotifyEventArgs> _crashAtEnd = new();
+
     /// <inheritdoc/>
     public IReadOnlyCollection<NotifyEventArgs> CrashAtEndMessages => _crashAtEnd.AsReadOnly();
 
-    public ToMemoryDataLoadJob(bool throwOnErrorEvents = true): base(throwOnErrorEvents)
+    public ToMemoryDataLoadJob(bool throwOnErrorEvents = true) : base(throwOnErrorEvents)
     {
     }
 
@@ -37,8 +38,8 @@ public ToMemoryDataLoadJob(bool throwOnErrorEvents = true): base(throwOnErrorEve
     public ILoadMetadata LoadMetadata { get; private set; }
     public bool DisposeImmediately { get; private set; }
     public string ArchiveFilepath { get; private set; }
-    public List<ITableInfo> RegularTablesToLoad { get; private set; } = new List<ITableInfo>();
-    public List<ITableInfo> LookupTablesToLoad { get; private set; } = new List<ITableInfo>();
+    public List<ITableInfo> RegularTablesToLoad { get; private set; } = new();
+    public List<ITableInfo> LookupTablesToLoad { get; private set; } = new();
     public IRDMPPlatformRepositoryServiceLocator RepositoryLocator => null;
 
     public void StartLogging()
@@ -65,10 +66,13 @@ public void PushForDisposal(IDisposeAfterDataLoad disposeable)
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
     }
+
     public ColumnInfo[] GetAllColumns()
     {
-        return RegularTablesToLoad.SelectMany(t=>t.ColumnInfos).Union(LookupTablesToLoad.SelectMany(t=>t.ColumnInfos)).Distinct().ToArray();
+        return RegularTablesToLoad.SelectMany(t => t.ColumnInfos)
+            .Union(LookupTablesToLoad.SelectMany(t => t.ColumnInfos)).Distinct().ToArray();
     }
+
     /// <inheritdoc/>
     public void CrashAtEnd(NotifyEventArgs because)
     {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/WebServiceConfigurationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/WebServiceConfigurationTests.cs
index 18dbde6bff..cb817aa26d 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/WebServiceConfigurationTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/WebServiceConfigurationTests.cs
@@ -15,7 +15,7 @@ public class WebServiceConfigurationTests : DatabaseTests
     [Test]
     public void TestXmlSerialization()
     {
-        var config = new WebServiceConfiguration(CatalogueRepository) {Username = "foo", Password = "bar"};
+        var config = new WebServiceConfiguration(CatalogueRepository) { Username = "foo", Password = "bar" };
         var state = config.SaveStateToString();
         config.RestoreStateFrom(state);
     }
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Resources/XmlTestForExcel.xml b/Rdmp.Core.Tests/DataLoad/Engine/Resources/XmlTestForExcel.xml
index ed0027ebbb..b9e416f6c7 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Resources/XmlTestForExcel.xml
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Resources/XmlTestForExcel.xml
@@ -1,145 +1,210 @@
 <?xml version="1.0"?>
 <?mso-application progid="Excel.Sheet"?>
+
 <Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
- xmlns:o="urn:schemas-microsoft-com:office:office"
- xmlns:x="urn:schemas-microsoft-com:office:excel"
- xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
- xmlns:html="http://www.w3.org/TR/REC-html40">
- <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-  <Author>Marie Pitkethly</Author>
-  <LastAuthor>Thomas Nind</LastAuthor>
-  <Created>2014-10-15T13:59:26Z</Created>
-  <LastSaved>2014-10-15T13:56:39Z</LastSaved>
-  <Version>14.00</Version>
- </DocumentProperties>
- <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
-  <AllowPNG/>
- </OfficeDocumentSettings>
- <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
-  <WindowHeight>10005</WindowHeight>
-  <WindowWidth>10005</WindowWidth>
-  <WindowTopX>120</WindowTopX>
-  <WindowTopY>135</WindowTopY>
-  <ProtectStructure>False</ProtectStructure>
-  <ProtectWindows>False</ProtectWindows>
- </ExcelWorkbook>
- <Styles>
-  <Style ss:ID="Default" ss:Name="Normal">
-   <Alignment ss:Vertical="Bottom"/>
-   <Borders/>
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
-   <Interior/>
-   <NumberFormat/>
-   <Protection/>
-  </Style>
-  <Style ss:ID="s62" ss:Name="Hyperlink">
-   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#0000FF"
-    ss:Underline="Single"/>
-  </Style>
-  <Style ss:ID="s63">
-   <Alignment ss:Vertical="Bottom"/>
-   <Font ss:FontName="Tahoma" ss:Color="#000000"/>
-  </Style>
-  <Style ss:ID="s64">
-   <Alignment ss:Vertical="Bottom"/>
-   <Font ss:FontName="Tahoma" ss:Color="#000000" ss:Bold="1"/>
-  </Style>
-  <Style ss:ID="s67">
-   <Alignment ss:Vertical="Bottom"/>
-   <Font ss:FontName="Tahoma" x:Family="Swiss" ss:Color="#000000"/>
-  </Style>
-  <Style ss:ID="s68" ss:Parent="s62">
-   <Alignment ss:Vertical="Bottom"/>
-  </Style>
- </Styles>
- <Worksheet ss:Name="Sheet1">
-  <Table ss:ExpandedColumnCount="12" ss:ExpandedRowCount="55" x:FullColumns="1"
-   x:FullRows="1" ss:StyleID="s63" ss:FullColumns="1" ss:FullRows="1">
-   <Column ss:Index="11" ss:StyleID="s63" ss:AutoFitWidth="0" ss:Width="125.25"/>
-   <Row>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Node</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">HealthBoard Area</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Organisation Name</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">PracticeCode</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Address1</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Address2</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Address3</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Address4</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">PostCode</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Practice Managers</Data></Cell>
-    <Cell ss:StyleID="s64"><Data ss:Type="String">Practice Manager Emails</Data></Cell>
-   </Row>
-   <Row>
-    <Cell><Data ss:Type="String">East</Data></Cell>
-    <Cell><Data ss:Type="String">Fife</Data></Cell>
-    <Cell><Data ss:Type="String">Airlie Medical Practice</Data></Cell>
-    <Cell><Data ss:Type="String">11111</Data></Cell>
-    <Cell><Data ss:Type="String">The Health Centre</Data></Cell>
-    <Cell><Data ss:Type="String">Victoria Road</Data></Cell>
-    <Cell><Data ss:Type="String">Leven</Data></Cell>
-    <Cell><Data ss:Type="String">Fife</Data></Cell>
-    <Cell><Data ss:Type="String">KY8 4ET</Data></Cell>
-    <Cell><Data ss:Type="String"> Captain Morgan</Data></Cell>
-    <Cell><Data ss:Type="String"> fishsticks@nhs.net</Data></Cell>
-   </Row>
-   <Row>
-    <Cell><Data ss:Type="String">East</Data></Cell>
-    <Cell><Data ss:Type="String">Fife</Data></Cell>
-    <Cell><Data ss:Type="String">Anstruther Medical Practice</Data></Cell>
-    <Cell><Data ss:Type="String">22222</Data></Cell>
-    <Cell><Data ss:Type="String">Skeith Health Centre</Data></Cell>
-    <Cell><Data ss:Type="String">Crail Road, Cellardyke</Data></Cell>
-    <Cell><Data ss:Type="String">Anstruther</Data></Cell>
-    <Cell ss:Index="9"><Data ss:Type="String">KY10 3FF</Data></Cell>
-    <Cell><Data ss:Type="String"> Thomas Nind</Data></Cell>
-    <Cell><Data ss:Type="String"> t.z.nind@nhs.net</Data></Cell>
-   </Row>
-   <Row ss:Index="5" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s62"/>
-   </Row>
-   <Row ss:Index="15" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s62"/>
-    <Cell ss:StyleID="s67"/>
-   </Row>
-   <Row ss:Index="19" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s62"/>
-    <Cell ss:StyleID="s67"/>
-   </Row>
-   <Row ss:Index="38" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s68"/>
-    <Cell ss:StyleID="s67"/>
-   </Row>
-   <Row ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s68"/>
-   </Row>
-   <Row ss:Index="53" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s62"/>
-    <Cell ss:StyleID="s67"/>
-   </Row>
-   <Row ss:Index="55" ss:AutoFitHeight="0" ss:Height="15">
-    <Cell ss:Index="11" ss:StyleID="s68"/>
-   </Row>
-  </Table>
-  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
-   <PageSetup>
-    <Header x:Margin="0.3"/>
-    <Footer x:Margin="0.3"/>
-    <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75"/>
-   </PageSetup>
-   <Print>
-    <ValidPrinterInfo/>
-    <HorizontalResolution>600</HorizontalResolution>
-    <VerticalResolution>600</VerticalResolution>
-   </Print>
-   <Selected/>
-   <Panes>
-    <Pane>
-     <Number>3</Number>
-     <ActiveCol>1</ActiveCol>
-    </Pane>
-   </Panes>
-   <ProtectObjects>False</ProtectObjects>
-   <ProtectScenarios>False</ProtectScenarios>
-  </WorksheetOptions>
- </Worksheet>
-</Workbook>
+          xmlns:o="urn:schemas-microsoft-com:office:office"
+          xmlns:x="urn:schemas-microsoft-com:office:excel"
+          xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+          xmlns:html="http://www.w3.org/TR/REC-html40">
+  <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+    <Author>Marie Pitkethly</Author>
+    <LastAuthor>Thomas Nind</LastAuthor>
+    <Created>2014-10-15T13:59:26Z</Created>
+    <LastSaved>2014-10-15T13:56:39Z</LastSaved>
+    <Version>14.00</Version>
+  </DocumentProperties>
+  <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+    <AllowPNG />
+  </OfficeDocumentSettings>
+  <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+    <WindowHeight>10005</WindowHeight>
+    <WindowWidth>10005</WindowWidth>
+    <WindowTopX>120</WindowTopX>
+    <WindowTopY>135</WindowTopY>
+    <ProtectStructure>False</ProtectStructure>
+    <ProtectWindows>False</ProtectWindows>
+  </ExcelWorkbook>
+  <Styles>
+    <Style ss:ID="Default" ss:Name="Normal">
+      <Alignment ss:Vertical="Bottom" />
+      <Borders />
+      <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000" />
+      <Interior />
+      <NumberFormat />
+      <Protection />
+    </Style>
+    <Style ss:ID="s62" ss:Name="Hyperlink">
+      <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#0000FF"
+            ss:Underline="Single" />
+    </Style>
+    <Style ss:ID="s63">
+      <Alignment ss:Vertical="Bottom" />
+      <Font ss:FontName="Tahoma" ss:Color="#000000" />
+    </Style>
+    <Style ss:ID="s64">
+      <Alignment ss:Vertical="Bottom" />
+      <Font ss:FontName="Tahoma" ss:Color="#000000" ss:Bold="1" />
+    </Style>
+    <Style ss:ID="s67">
+      <Alignment ss:Vertical="Bottom" />
+      <Font ss:FontName="Tahoma" x:Family="Swiss" ss:Color="#000000" />
+    </Style>
+    <Style ss:ID="s68" ss:Parent="s62">
+      <Alignment ss:Vertical="Bottom" />
+    </Style>
+  </Styles>
+  <Worksheet ss:Name="Sheet1">
+    <Table ss:ExpandedColumnCount="12" ss:ExpandedRowCount="55" x:FullColumns="1"
+           x:FullRows="1" ss:StyleID="s63" ss:FullColumns="1" ss:FullRows="1">
+      <Column ss:Index="11" ss:StyleID="s63" ss:AutoFitWidth="0" ss:Width="125.25" />
+      <Row>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Node</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">HealthBoard Area</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Organisation Name</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">PracticeCode</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Address1</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Address2</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Address3</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Address4</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">PostCode</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Practice Managers</Data>
+        </Cell>
+        <Cell ss:StyleID="s64">
+          <Data ss:Type="String">Practice Manager Emails</Data>
+        </Cell>
+      </Row>
+      <Row>
+        <Cell>
+          <Data ss:Type="String">East</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Fife</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Airlie Medical Practice</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">11111</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">The Health Centre</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Victoria Road</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Leven</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Fife</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">KY8 4ET</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"> Captain Morgan</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"> fishsticks@nhs.net</Data>
+        </Cell>
+      </Row>
+      <Row>
+        <Cell>
+          <Data ss:Type="String">East</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Fife</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Anstruther Medical Practice</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">22222</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Skeith Health Centre</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Crail Road, Cellardyke</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String">Anstruther</Data>
+        </Cell>
+        <Cell ss:Index="9">
+          <Data ss:Type="String">KY10 3FF</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"> Thomas Nind</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"> t.z.nind@nhs.net</Data>
+        </Cell>
+      </Row>
+      <Row ss:Index="5" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s62" />
+      </Row>
+      <Row ss:Index="15" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s62" />
+        <Cell ss:StyleID="s67" />
+      </Row>
+      <Row ss:Index="19" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s62" />
+        <Cell ss:StyleID="s67" />
+      </Row>
+      <Row ss:Index="38" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s68" />
+        <Cell ss:StyleID="s67" />
+      </Row>
+      <Row ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s68" />
+      </Row>
+      <Row ss:Index="53" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s62" />
+        <Cell ss:StyleID="s67" />
+      </Row>
+      <Row ss:Index="55" ss:AutoFitHeight="0" ss:Height="15">
+        <Cell ss:Index="11" ss:StyleID="s68" />
+      </Row>
+    </Table>
+    <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+      <PageSetup>
+        <Header x:Margin="0.3" />
+        <Footer x:Margin="0.3" />
+        <PageMargins x:Bottom="0.75" x:Left="0.7" x:Right="0.7" x:Top="0.75" />
+      </PageSetup>
+      <Print>
+        <ValidPrinterInfo />
+        <HorizontalResolution>600</HorizontalResolution>
+        <VerticalResolution>600</VerticalResolution>
+      </Print>
+      <Selected />
+      <Panes>
+        <Pane>
+          <Number>3</Number>
+          <ActiveCol>1</ActiveCol>
+        </Pane>
+      </Panes>
+      <ProtectObjects>False</ProtectObjects>
+      <ProtectScenarios>False</ProtectScenarios>
+    </WorksheetOptions>
+  </Worksheet>
+</Workbook>
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/CohortSamplerTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/CohortSamplerTests.cs
index d2800e3ddd..6be4e6019e 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/CohortSamplerTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/CohortSamplerTests.cs
@@ -29,8 +29,12 @@ public void TestCohortSampler_NoColumnFound()
         dt.Columns.Add("ff");
         dt.Rows.Add("1");
 
-        var ex = Assert.Throws<Exception>(()=>sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
-        Assert.AreEqual("CohortSampler was unable to find a column called 'priv' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.", ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
+        Assert.AreEqual(
+            "CohortSampler was unable to find a column called 'priv' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.",
+            ex.Message);
     }
 
     [Test]
@@ -43,9 +47,14 @@ public void TestCohortSampler_NoColumnFoundExplicit()
         dt.Columns.Add("ff");
         dt.Rows.Add("1");
 
-        var ex = Assert.Throws<Exception>(() => sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
-        Assert.AreEqual("CohortSampler was unable to find a column called 'ddd' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.", ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
+        Assert.AreEqual(
+            "CohortSampler was unable to find a column called 'ddd' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.",
+            ex.Message);
     }
+
     [Test]
     public void TestCohortSampler_NotEnoughIdentifiersInBatch()
     {
@@ -56,9 +65,14 @@ public void TestCohortSampler_NotEnoughIdentifiersInBatch()
         dt.Columns.Add("priv");
         dt.Rows.Add("1");
 
-        var ex = Assert.Throws<Exception>(() => sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
-        Assert.AreEqual("Cohort only contains 1 unique identifiers.  This is less than the requested sample size of 100 and FailIfNotEnoughIdentifiers is true", ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+                new GracefulCancellationToken()));
+        Assert.AreEqual(
+            "Cohort only contains 1 unique identifiers.  This is less than the requested sample size of 100 and FailIfNotEnoughIdentifiers is true",
+            ex.Message);
     }
+
     [Test]
     public void TestCohortSampler_NotEnoughIdentifiersInBatch_ButThatsOk()
     {
@@ -71,7 +85,8 @@ public void TestCohortSampler_NotEnoughIdentifiersInBatch_ButThatsOk()
         dt.Columns.Add("priv");
         dt.Rows.Add("1");
 
-        var result = sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result = sampler.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
         Assert.AreEqual(1, result.Rows.Count);
     }
 
@@ -101,12 +116,14 @@ public void TestCohortSampler_Repeatability()
         dt.Rows.Add("62323616");
         dt.Rows.Add("2362361");
 
-        var result1 = sampler1.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
-            
+        var result1 = sampler1.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
+
         // just to be sure
         Thread.Sleep(100);
 
-        var result2 = sampler2.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result2 = sampler2.ProcessPipelineData(dt, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(5, result1.Rows.Count);
         Assert.AreEqual(5, result2.Rows.Count);
@@ -143,12 +160,14 @@ public void TestCohortSampler_Repeatability_OrderIrrelevant()
         dt2.Rows.Add("32213");
         dt2.Rows.Add("2123");
 
-        var result1 = sampler1.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result1 = sampler1.ProcessPipelineData(dt1, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         // just to be sure
         Thread.Sleep(100);
 
-        var result2 = sampler2.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
+        var result2 = sampler2.ProcessPipelineData(dt2, new ThrowImmediatelyDataLoadEventListener(),
+            new GracefulCancellationToken());
 
         Assert.AreEqual(2, result1.Rows.Count);
         Assert.AreEqual(2, result2.Rows.Count);
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/CommandLineHelperTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/CommandLineHelperTests.cs
index 6478d6cedb..17cfbeb96e 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/CommandLineHelperTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/CommandLineHelperTests.cs
@@ -34,15 +34,17 @@ public void TestGetValueString()
         ImplementationManager.Load<MicrosoftSQLImplementation>();
 
         //notice how server and db don't actually exist, thats cool they implement IMightNotExist
-        var dbInfo = new DiscoveredServer(new SqlConnectionStringBuilder {DataSource = "server"}).ExpectDatabase("db");
-        Assert.AreEqual("--database-name=db --database-server=server", CommandLineHelper.CreateArgString("DbInfo", dbInfo));
+        var dbInfo =
+            new DiscoveredServer(new SqlConnectionStringBuilder { DataSource = "server" }).ExpectDatabase("db");
+        Assert.AreEqual("--database-name=db --database-server=server",
+            CommandLineHelper.CreateArgString("DbInfo", dbInfo));
     }
 
     [Test]
     public void TestGetValueStringError()
     {
         var obj = new CommandLineHelperTests();
-        Assert.Throws<ArgumentException>(()=>CommandLineHelper.GetValueString(obj));
+        Assert.Throws<ArgumentException>(() => CommandLineHelper.GetValueString(obj));
     }
 
     [Test]
@@ -64,18 +66,18 @@ public void TestDateTimeCreateArgString()
     [Test]
     public void TestEmptyArgumentName()
     {
-        Assert.Throws<ArgumentException>(()=>CommandLineHelper.CreateArgString("", "value"));
+        Assert.Throws<ArgumentException>(() => CommandLineHelper.CreateArgString("", "value"));
     }
 
     [Test]
     public void TestNameWithoutLeadingUppercaseCharacter()
     {
-        Assert.Throws<ArgumentException>(()=>CommandLineHelper.CreateArgString("dateFrom", "2014-01-01"));
+        Assert.Throws<ArgumentException>(() => CommandLineHelper.CreateArgString("dateFrom", "2014-01-01"));
     }
 
     [Test]
     public void TestNullValue()
     {
-        Assert.Throws<ArgumentException>(()=>CommandLineHelper.CreateArgString("DateFrom", null));
+        Assert.Throws<ArgumentException>(() => CommandLineHelper.CreateArgString("DateFrom", null));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/DataFlowComponentTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/DataFlowComponentTests.cs
index a9d2addde7..e147d35582 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/DataFlowComponentTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/DataFlowComponentTests.cs
@@ -31,7 +31,8 @@ public void ColumnRenamer_NoMatchingColumnAtRuntime()
         var toProcess = new DataTable();
         toProcess.Columns.Add("Column1");
 
-        var ex = Assert.Throws<InvalidOperationException>(() => renamer.ProcessPipelineData( toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token));
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+            renamer.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token));
         Assert.IsTrue(ex.Message.Contains("does not exist in the supplied data table"));
     }
 
@@ -48,7 +49,7 @@ public void ColumnRenamer_Successful()
         var toProcess = new DataTable();
         toProcess.Columns.Add("ToFind");
 
-        var processed = renamer.ProcessPipelineData( toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token);
+        var processed = renamer.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token);
 
         Assert.AreEqual(1, processed.Columns.Count);
         Assert.AreEqual("ReplacementName", processed.Columns[0].ColumnName);
@@ -66,7 +67,8 @@ public void ColumnDropper_NoMatchingColumnAtRuntime()
         var toProcess = new DataTable();
         toProcess.Columns.Add("Column1");
 
-        var ex = Assert.Throws<InvalidOperationException>(() => dropper.ProcessPipelineData( toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token));
+        var ex = Assert.Throws<InvalidOperationException>(() =>
+            dropper.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token));
         Assert.IsTrue(ex.Message.Contains("does not exist in the supplied data table"));
     }
 
@@ -82,7 +84,7 @@ public void ColumnDropper_Successful()
         var toProcess = new DataTable();
         toProcess.Columns.Add("ToDrop");
 
-        var processed = dropper.ProcessPipelineData( toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token);
+        var processed = dropper.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadEventListener(), cts.Token);
 
         Assert.AreEqual(0, processed.Columns.Count);
         Assert.AreEqual(false, processed.Columns.Contains("ToDrop"));
@@ -106,12 +108,12 @@ public void ColumnForbidderTest_MatchingColumn()
         Assert.DoesNotThrow(() => forbidlister.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadJob(), null));
         toProcess.Columns.Add("fish");
 
-        Assert.Throws<Exception>(()=>forbidlister.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadJob(), null));
+        Assert.Throws<Exception>(() =>
+            forbidlister.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadJob(), null));
 
         forbidlister.Rationale = "kaleidoscope engage";
-        var ex = Assert.Throws<Exception>(() => forbidlister.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadJob(), null));
+        var ex = Assert.Throws<Exception>(() =>
+            forbidlister.ProcessPipelineData(toProcess, new ThrowImmediatelyDataLoadJob(), null));
         Assert.IsTrue(ex.Message.Contains("kaleidoscope engage"));
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExcelTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExcelTests.cs
index e9f57e03f9..cc8543025a 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExcelTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExcelTests.cs
@@ -41,12 +41,14 @@ public class ExcelTests
     public void SprayToDisk()
     {
         _fileLocations.Add(TestFile, UsefulStuff.SprayFile(typeof(ExcelTests).Assembly,
-            $"{typeof(ExcelTests).Namespace}.TestFile.{TestFile}",TestFile,TestContext.CurrentContext.TestDirectory));
+            $"{typeof(ExcelTests).Namespace}.TestFile.{TestFile}", TestFile, TestContext.CurrentContext.TestDirectory));
         _fileLocations.Add(FreakyTestFile, UsefulStuff.SprayFile(typeof(ExcelTests).Assembly,
-            $"{typeof(ExcelTests).Namespace}.TestFile.{FreakyTestFile}", FreakyTestFile, TestContext.CurrentContext.TestDirectory));
+            $"{typeof(ExcelTests).Namespace}.TestFile.{FreakyTestFile}", FreakyTestFile,
+            TestContext.CurrentContext.TestDirectory));
 
         _fileLocations.Add(OddFormatsFile, UsefulStuff.SprayFile(typeof(ExcelTests).Assembly,
-            $"{typeof(ExcelTests).Namespace}.TestFile.{OddFormatsFile}", OddFormatsFile, TestContext.CurrentContext.TestDirectory));
+            $"{typeof(ExcelTests).Namespace}.TestFile.{OddFormatsFile}", OddFormatsFile,
+            TestContext.CurrentContext.TestDirectory));
     }
 
 
@@ -65,8 +67,8 @@ public void DontTryToOpenWithDelimited_ThrowsInvalidFileExtension()
             Separator = ","
         };
         invalid.PreInitialize(new FlatFileToLoad(new FileInfo(TestFile)), new ThrowImmediatelyDataLoadEventListener());
-        var ex = Assert.Throws<Exception>(()=>invalid.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("File Book1.xlsx has a prohibitted file extension .xlsx",ex.Message);
+        var ex = Assert.Throws<Exception>(() => invalid.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("File Book1.xlsx has a prohibitted file extension .xlsx", ex.Message);
     }
 
     [Test]
@@ -76,10 +78,11 @@ public void NormalBook_FirstRowCorrect(string versionOfTestFile)
     {
         var source = new ExcelDataFlowSource();
 
-        source.PreInitialize(new FlatFileToLoad(_fileLocations[versionOfTestFile]), new ThrowImmediatelyDataLoadEventListener());
+        source.PreInitialize(new FlatFileToLoad(_fileLocations[versionOfTestFile]),
+            new ThrowImmediatelyDataLoadEventListener());
         var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-        Assert.AreEqual(6,dt.Columns.Count);
+        Assert.AreEqual(6, dt.Columns.Count);
         Assert.AreEqual("Participant", dt.Columns[0].ColumnName);
         Assert.AreEqual("Score", dt.Columns[1].ColumnName);
         Assert.AreEqual("IsEvil", dt.Columns[2].ColumnName);
@@ -88,7 +91,7 @@ public void NormalBook_FirstRowCorrect(string versionOfTestFile)
         Assert.AreEqual("DoubleField", dt.Columns[4].ColumnName);
         Assert.AreEqual("MixedField", dt.Columns[5].ColumnName);
 
-        Assert.AreEqual("Bob",dt.Rows[0][0]);
+        Assert.AreEqual("Bob", dt.Rows[0][0]);
         Assert.AreEqual("3", dt.Rows[0][1]);
         Assert.AreEqual("yes", dt.Rows[0][2]);
     }
@@ -104,7 +107,8 @@ public void NormalBook_FirstRowCorrect_AddFilenameColumnNamed(string versionOfTe
             AddFilenameColumnNamed = "Path"
         };
 
-        source.PreInitialize(new FlatFileToLoad(_fileLocations[versionOfTestFile]), new ThrowImmediatelyDataLoadEventListener());
+        source.PreInitialize(new FlatFileToLoad(_fileLocations[versionOfTestFile]),
+            new ThrowImmediatelyDataLoadEventListener());
         var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
         Assert.AreEqual(7, dt.Columns.Count);
@@ -143,7 +147,7 @@ public void ExcelDateTimeDeciphering(string versionOfTestFile)
         source.PreInitialize(new FlatFileToLoad(_fileLocations[versionOfTestFile]), listener);
         var dt = source.GetChunk(listener, new GracefulCancellationToken());
 
-        Assert.AreEqual(5,dt.Rows.Count);
+        Assert.AreEqual(5, dt.Rows.Count);
 
         Assert.AreEqual("2001-01-01", dt.Rows[0][3]);
         Assert.AreEqual("0.1", dt.Rows[0][4]);
@@ -179,22 +183,23 @@ public void TestOddFormats()
         source.PreInitialize(new FlatFileToLoad(_fileLocations[OddFormatsFile]), listener);
         var dt = source.GetChunk(listener, new GracefulCancellationToken());
 
-        Assert.AreEqual(2,dt.Rows.Count);
+        Assert.AreEqual(2, dt.Rows.Count);
         Assert.AreEqual(5, dt.Columns.Count);
-            
+
         Assert.AreEqual("Name", dt.Columns[0].ColumnName);
         Assert.AreEqual("Category", dt.Columns[1].ColumnName);
         Assert.AreEqual("Age", dt.Columns[2].ColumnName);
         Assert.AreEqual("Wage", dt.Columns[3].ColumnName);
-        Assert.AreEqual("Invisibre", dt.Columns[4].ColumnName); //this column is hidden in the spreadsheet but we still load it
+        Assert.AreEqual("Invisibre",
+            dt.Columns[4].ColumnName); //this column is hidden in the spreadsheet but we still load it
 
         Assert.AreEqual("Frank", dt.Rows[0][0]);
         Assert.AreEqual("Upper, Left", dt.Rows[0][1]);
         Assert.AreEqual("30", dt.Rows[0][2]);
-            
+
         //its a pound symbol alright! but since there is 2 encodings for pound symbol let's just make everyones life easier
         StringAssert.IsMatch(@"^\W11.00$", dt.Rows[0][3].ToString());
-            
+
         Assert.AreEqual("0.1", dt.Rows[0][4]);
 
         Assert.AreEqual("Castello", dt.Rows[1][0]);
@@ -214,7 +219,7 @@ public void NormalBook_NoEmptyRowsRead()
 
         source.PreInitialize(new FlatFileToLoad(_fileLocations[TestFile]), listener);
         var dt = source.GetChunk(listener, new GracefulCancellationToken());
-            
+
         Assert.AreEqual(5, dt.Rows.Count);
     }
 
@@ -225,14 +230,17 @@ public void FreakyTestFile_WarningsCorrect()
 
         var source = new ExcelDataFlowSource();
 
-        source.PreInitialize(new FlatFileToLoad(_fileLocations[FreakyTestFile]), new ThrowImmediatelyDataLoadEventListener());
+        source.PreInitialize(new FlatFileToLoad(_fileLocations[FreakyTestFile]),
+            new ThrowImmediatelyDataLoadEventListener());
         var dt = source.GetChunk(messages, new GracefulCancellationToken());
 
         var args = messages.EventsReceivedBySender[source];
 
         Console.Write(messages.ToString());
 
-        Assert.IsTrue(args.Any(a => a.Message.Contains("Discarded the following data (that was found in unamed columns):RowCount:5") && a.ProgressEventType == ProgressEventType.Warning));
+        Assert.IsTrue(args.Any(a =>
+            a.Message.Contains("Discarded the following data (that was found in unamed columns):RowCount:5") &&
+            a.ProgressEventType == ProgressEventType.Warning));
     }
 
     [Test]
@@ -241,7 +249,7 @@ public void BlankFirstLineFile()
         var source = new ExcelDataFlowSource();
 
         var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,
-            "DataLoad","Engine","Resources","BlankLineBook.xlsx"));
+            "DataLoad", "Engine", "Resources", "BlankLineBook.xlsx"));
         Assert.IsTrue(fi.Exists);
 
         source.PreInitialize(new FlatFileToLoad(fi), new ThrowImmediatelyDataLoadEventListener());
@@ -249,8 +257,8 @@ public void BlankFirstLineFile()
 
         var dt = source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
 
-            
-        Assert.AreEqual(3,dt.Rows.Count);
+
+        Assert.AreEqual(3, dt.Rows.Count);
         Assert.AreEqual(2, dt.Columns.Count);
         Assert.AreEqual("Name", dt.Columns[0].ColumnName);
         Assert.AreEqual("Age", dt.Columns[1].ColumnName);
@@ -263,30 +271,35 @@ public void BlankWorkbook()
         var source = new ExcelDataFlowSource();
 
 
-        var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,"DataLoad","Engine","Resources","BlankBook.xlsx"));
+        var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "DataLoad", "Engine", "Resources",
+            "BlankBook.xlsx"));
         Assert.IsTrue(fi.Exists);
 
         source.PreInitialize(new FlatFileToLoad(fi), new ThrowImmediatelyDataLoadEventListener());
 
 
-        var ex = Assert.Throws<FlatFileLoadException>(()=>source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
+        var ex = Assert.Throws<FlatFileLoadException>(() =>
+            source.GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken()));
         Assert.AreEqual("The Excel sheet 'Sheet1' in workbook 'BlankBook.xlsx' is empty", ex.Message);
-
     }
+
     [Test]
     public void Checks_ValidFileExtension_Pass()
     {
         var source = new ExcelDataFlowSource();
-        source.PreInitialize(new FlatFileToLoad(new FileInfo("bob.xlsx")),new ThrowImmediatelyDataLoadEventListener() );
-        source.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true});
+        source.PreInitialize(new FlatFileToLoad(new FileInfo("bob.xlsx")), new ThrowImmediatelyDataLoadEventListener());
+        source.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
     }
+
     [Test]
     public void Checks_ValidFileExtension_InvalidExtensionPass()
     {
         var source = new ExcelDataFlowSource();
         source.PreInitialize(new FlatFileToLoad(new FileInfo("bob.csv")), new ThrowImmediatelyDataLoadEventListener());
-        var ex = Assert.Throws<Exception>(()=>source.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
-        Assert.AreEqual("File extension bob.csv has an invalid extension:.csv (this class only accepts:.xlsx,.xls)",ex.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            source.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        Assert.AreEqual("File extension bob.csv has an invalid extension:.csv (this class only accepts:.xlsx,.xls)",
+            ex.Message);
     }
 
     [TestCase(true)]
@@ -301,7 +314,7 @@ public void TestToCSVConverter(bool prefixWithWorkbookName)
             PrefixWithWorkbookName = prefixWithWorkbookName
         };
 
-        var mockProjDir = Mock.Of<ILoadDirectory>(p => p.ForLoading==loc.Directory);
+        var mockProjDir = Mock.Of<ILoadDirectory>(p => p.ForLoading == loc.Directory);
 
         var j = new ThrowImmediatelyDataLoadJob
         {
@@ -310,7 +323,9 @@ public void TestToCSVConverter(bool prefixWithWorkbookName)
 
         converter.Fetch(j, new GracefulCancellationToken());
 
-        var file = prefixWithWorkbookName ?  loc.Directory.GetFiles("Book1_Sheet1.csv").Single(): loc.Directory.GetFiles("Sheet1.csv").Single();
+        var file = prefixWithWorkbookName
+            ? loc.Directory.GetFiles("Book1_Sheet1.csv").Single()
+            : loc.Directory.GetFiles("Sheet1.csv").Single();
 
         Assert.IsTrue(file.Exists);
 
@@ -325,6 +340,5 @@ public void TestToCSVConverter(bool prefixWithWorkbookName)
 Bobboy,2,maybe,2015-09-18,15:09:00,00:03:56", contents.Trim(new[] { ',', '\r', '\n', ' ', '\t' }));
 
         file.Delete();
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExecutableProcessTaskTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExecutableProcessTaskTests.cs
index 3295e9ecea..66686519a5 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExecutableProcessTaskTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/ExecutableProcessTaskTests.cs
@@ -25,7 +25,7 @@ public void TestCreateArgString()
 
         var customArgs = new List<SpontaneouslyInventedArgument>
         {
-            new SpontaneouslyInventedArgument(new MemoryRepository(), "DatabaseName", db)
+            new(new MemoryRepository(), "DatabaseName", db)
         };
 
         var processTask = Mock.Of<IProcessTask>();
@@ -40,7 +40,7 @@ public void TestCreateArgString()
     [Test]
     public void TestConstructionFromProcessTask()
     {
-        var processTask = Mock.Of<IProcessTask>(pt => pt.Path=="path");
+        var processTask = Mock.Of<IProcessTask>(pt => pt.Path == "path");
 
         var runtimeTask = new ExecutableRuntimeTask(processTask, null);
         Assert.AreEqual("path", runtimeTask.ExeFilepath);
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/IAttacherCompositionTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/IAttacherCompositionTests.cs
index 0ca2efbfb9..fb003c64f3 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/IAttacherCompositionTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/IAttacherCompositionTests.cs
@@ -14,6 +14,5 @@ public class IAttacherCompositionTests
     [Test]
     public void AllIAttachersMustHaveTwoArgumentConstructors()
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyFactoryTestsUnit.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyFactoryTestsUnit.cs
index 66bb4ae955..b48a307f58 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyFactoryTestsUnit.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyFactoryTestsUnit.cs
@@ -25,18 +25,21 @@ public void NoDates()
 
         var factory = new JobDateGenerationStrategyFactory(new SingleLoadProgressSelectionStrategy(lp));
 
-        var ex = Assert.Throws<LoadOrCacheProgressUnclearException>(() => factory.Create(lp,new ThrowImmediatelyDataLoadEventListener()));
+        var ex = Assert.Throws<LoadOrCacheProgressUnclearException>(() =>
+            factory.Create(lp, new ThrowImmediatelyDataLoadEventListener()));
 
-        Assert.AreEqual("Don't know when to start the data load, both DataLoadProgress and OriginDate are null", ex.Message);
+        Assert.AreEqual("Don't know when to start the data load, both DataLoadProgress and OriginDate are null",
+            ex.Message);
     }
 
     [Test]
     public void DateKnown_NoCache_SuggestSingleScheduleConsecutiveDateStrategy()
     {
-        var lp = Mock.Of<ILoadProgress>(p => p.DataLoadProgress==new DateTime(2001, 01, 01));
+        var lp = Mock.Of<ILoadProgress>(p => p.DataLoadProgress == new DateTime(2001, 01, 01));
 
         var factory = new JobDateGenerationStrategyFactory(new SingleLoadProgressSelectionStrategy(lp));
 
-        Assert.AreEqual(typeof(SingleScheduleConsecutiveDateStrategy), factory.Create(lp,new ThrowImmediatelyDataLoadEventListener()).GetType());
+        Assert.AreEqual(typeof(SingleScheduleConsecutiveDateStrategy),
+            factory.Create(lp, new ThrowImmediatelyDataLoadEventListener()).GetType());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyTests.cs
index 081f3f4444..1ff78d2672 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/JobDateGenerationStrategyTests.cs
@@ -18,16 +18,17 @@ public class JobDateGenerationStrategyTests
     [Test]
     public void TestSingleScheduleConsecutiveDateStrategy()
     {
-        var schedule = Mock.Of<ILoadProgress>(loadProgress => loadProgress.DataLoadProgress == new DateTime(2015, 1, 1));
+        var schedule =
+            Mock.Of<ILoadProgress>(loadProgress => loadProgress.DataLoadProgress == new DateTime(2015, 1, 1));
 
         var strategy = new SingleScheduleConsecutiveDateStrategy(schedule);
 
-        var dates = strategy.GetDates(2,false);
+        var dates = strategy.GetDates(2, false);
         Assert.AreEqual(2, dates.Count);
         Assert.AreEqual(new DateTime(2015, 1, 2), dates[0]);
         Assert.AreEqual(new DateTime(2015, 1, 3), dates[1]);
 
-        dates = strategy.GetDates(2,false);
+        dates = strategy.GetDates(2, false);
         Assert.AreEqual(2, dates.Count);
         Assert.AreEqual(new DateTime(2015, 1, 4), dates[0]);
         Assert.AreEqual(new DateTime(2015, 1, 5), dates[1]);
@@ -37,27 +38,32 @@ public void TestSingleScheduleConsecutiveDateStrategy()
     public void TestSingleScheduleConsecutiveDateStrategy_FutureDates_AreForbidden()
     {
         //we have loaded SetUp to day before yesterday
-        var schedule = Mock.Of<ILoadProgress>(loadProgress => loadProgress.DataLoadProgress == DateTime.Now.Date.AddDays(-2));
+        var schedule =
+            Mock.Of<ILoadProgress>(loadProgress => loadProgress.DataLoadProgress == DateTime.Now.Date.AddDays(-2));
 
         var strategy = new SingleScheduleConsecutiveDateStrategy(schedule);
 
         var dates = strategy.GetDates(100, false);
         Assert.AreEqual(dates.Count, 1);
-        Assert.AreEqual(dates[0], DateTime.Now.Date.AddDays(-1));//it should try to load yesterday
+        Assert.AreEqual(dates[0], DateTime.Now.Date.AddDays(-1)); //it should try to load yesterday
     }
 
     [Test]
     public void TestSingleScheduleConsecutiveDateStrategy_FutureDates_AreAllowed()
     {
-        var schedule = Mock.Of<ILoadProgress>(loadProgress => loadProgress.DataLoadProgress == DateTime.Now.Date.AddDays(-2));//we have loaded SetUp to day before yesterday
+        var schedule =
+            Mock.Of<ILoadProgress>(loadProgress =>
+                loadProgress.DataLoadProgress ==
+                DateTime.Now.Date.AddDays(-2)); //we have loaded SetUp to day before yesterday
 
         var strategy = new SingleScheduleConsecutiveDateStrategy(schedule);
 
         var dates = strategy.GetDates(100, true);
         Assert.AreEqual(dates.Count, 100);
-        Assert.AreEqual(dates[0], DateTime.Now.Date.AddDays(-1));//it should try to load yesterday
-        Assert.AreEqual(dates[99], DateTime.Now.Date.AddDays(98));//it should try to load yesterday
+        Assert.AreEqual(dates[0], DateTime.Now.Date.AddDays(-1)); //it should try to load yesterday
+        Assert.AreEqual(dates[99], DateTime.Now.Date.AddDays(98)); //it should try to load yesterday
     }
+
     [Test]
     public void TestListOfScheduleDatesFromCacheDirectory()
     {
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/MDFAttacherTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/MDFAttacherTests.cs
index fa57aaddf2..7ce68079a9 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/MDFAttacherTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/MDFAttacherTests.cs
@@ -31,13 +31,14 @@ public void TestNoMDFFileFoundException()
     {
         var workingDir = new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
         var testDir = workingDir.CreateSubdirectory("MDFAttacherTests");
-        var loadDirectory = LoadDirectory.CreateDirectoryStructure(testDir, "TestNoMDFFileFoundException",true);
+        var loadDirectory = LoadDirectory.CreateDirectoryStructure(testDir, "TestNoMDFFileFoundException", true);
 
         try
         {
             var attacher = new MDFAttacher();
             attacher.Initialize(loadDirectory, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
-            Assert.Throws<FileNotFoundException>(() => attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
+            Assert.Throws<FileNotFoundException>(() =>
+                attacher.Attach(new ThrowImmediatelyDataLoadJob(), new GracefulCancellationToken()));
         }
         finally
         {
@@ -65,7 +66,7 @@ public void Test_MDFFile_AlreadyExists()
 
         var testDir = workingDir.CreateSubdirectory("MDFAttacherTests");
         var loadDirectory = LoadDirectory.CreateDirectoryStructure(testDir, "TestNoMDFFileFoundException", true);
-            
+
         try
         {
             // create mdf and ldf files (in ForLoading
@@ -84,13 +85,13 @@ public void Test_MDFFile_AlreadyExists()
             attacher.Initialize(loadDirectory, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
 
             //should be a warning since overwriting is default behaviour
-            var ex = Assert.Throws<Exception>(()=>
+            var ex = Assert.Throws<Exception>(() =>
                 attacher.Attach(
-                    new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener {ThrowOnWarning=true})
+                    new ThrowImmediatelyDataLoadJob(new ThrowImmediatelyDataLoadEventListener { ThrowOnWarning = true })
                     , new GracefulCancellationToken())
             );
 
-            StringAssert.Contains("Overwriting",ex?.Message);
+            StringAssert.Contains("Overwriting", ex?.Message);
         }
         finally
         {
@@ -124,16 +125,20 @@ public void TestLocations_NoNetworkPath()
             File.WriteAllText(ldf, "fish");
 
             var serverDatabasePath = @"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/";
-            var locations = new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), serverDatabasePath, null);
+            var locations = new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                serverDatabasePath, null);
 
 
             Assert.AreEqual(new FileInfo(mdf).FullName, locations.OriginLocationMdf);
             Assert.AreEqual(new FileInfo(ldf).FullName, locations.OriginLocationLdf);
 
-            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile_log.ldf", locations.CopyToLdf);
-            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf", locations.CopyToMdf);
+            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile_log.ldf",
+                locations.CopyToLdf);
+            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf",
+                locations.CopyToMdf);
 
-            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf", locations.AttachMdfPath);
+            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf",
+                locations.AttachMdfPath);
         }
         finally
         {
@@ -164,8 +169,9 @@ public void TestTwoFiles()
             File.WriteAllText(ldf2, "fish");
 
             var serverDatabasePath = TestContext.CurrentContext.WorkDirectory;
-            Assert.Throws<MultipleMatchingFilesException>(()=>new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), serverDatabasePath, null));
-
+            Assert.Throws<MultipleMatchingFilesException>(() =>
+                new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                    serverDatabasePath, null));
         }
         finally
         {
@@ -179,7 +185,9 @@ public void TestTwoFiles()
     [Test]
     public void ConnectToServer()
     {
-        var hicProjDir = LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),"MDFAttacherTest", true);
+        var hicProjDir =
+            LoadDirectory.CreateDirectoryStructure(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                "MDFAttacherTest", true);
 
         var db = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase("MyImaginaryDB_RAW");
         Assert.IsFalse(db.Exists());
@@ -190,11 +198,13 @@ public void ConnectToServer()
         {
             var memory = new ToMemoryCheckNotifier(new ThrowImmediatelyCheckNotifier());
             mdf.Check(memory);
-            Assert.IsTrue(memory.Messages.Any(m=>m.Message.Contains("Found server DATA folder") && m.Result == CheckResult.Success));
+            Assert.IsTrue(memory.Messages.Any(m =>
+                m.Message.Contains("Found server DATA folder") && m.Result == CheckResult.Success));
         }
         catch (Exception e)
         {
-            if (!e.Message.Contains("Proposed server DATA folder (that we will copy mdf/ldf files to) was not found"))//this message is allowed too if the SQL server is remote and not localhost then it is quite likely that the DATA path is inaccessible from the unit test server
+            if (!e.Message.Contains(
+                    "Proposed server DATA folder (that we will copy mdf/ldf files to) was not found")) //this message is allowed too if the SQL server is remote and not localhost then it is quite likely that the DATA path is inaccessible from the unit test server
                 throw;
         }
 
@@ -202,10 +212,10 @@ public void ConnectToServer()
         mdf.OverrideMDFFileCopyDestination = TestContext.CurrentContext.WorkDirectory;
         mdf.Check(memory2);
         Assert.IsTrue(memory2.Messages.Any(m => Regex.IsMatch(m.Message,
-            $@"Found server DATA folder .*{Regex.Escape(TestContext.CurrentContext.WorkDirectory)}") && m.Result == CheckResult.Success));
+                                                    $@"Found server DATA folder .*{Regex.Escape(TestContext.CurrentContext.WorkDirectory)}") &&
+                                                m.Result == CheckResult.Success));
 
         hicProjDir.RootPath.Delete(true);
-
     }
 
     [Test]
@@ -226,7 +236,8 @@ public void TestLocations_NetworkPath()
             File.WriteAllText(ldf, "fish");
 
             var serverDatabasePath = @"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/";
-            var locations = new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory), serverDatabasePath, @"//MyDbServer1/Share/Database");
+            var locations = new MdfFileAttachLocations(new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
+                serverDatabasePath, @"//MyDbServer1/Share/Database");
 
 
             Assert.AreEqual(new FileInfo(mdf).FullName, locations.OriginLocationMdf);
@@ -235,7 +246,8 @@ public void TestLocations_NetworkPath()
             StringAssert.IsMatch(@"//MyDbServer1/Share/Database[/\\]MyFile_log.ldf", locations.CopyToLdf);
             StringAssert.IsMatch(@"//MyDbServer1/Share/Database[/\\]MyFile.mdf", locations.CopyToMdf);
 
-            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf", locations.AttachMdfPath);
+            Assert.AreEqual(@"H:/Program Files/Microsoft SQL Server/MSSQL13.SQLEXPRESS/MSSQL/DATA/MyFile.mdf",
+                locations.AttachMdfPath);
         }
         finally
         {
@@ -244,13 +256,10 @@ public void TestLocations_NetworkPath()
         }
     }
 
-    public class MyClass:IAttacher,ICheckable
+    public class MyClass : IAttacher, ICheckable
     {
-        public ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
-        {
+        public ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken) =>
             throw new NotImplementedException();
-        }
-
 
 
         public void Check(ICheckNotifier notifier)
@@ -263,21 +272,16 @@ public void Check(ICheckNotifier notifier)
         public string DatabaseServer { get; private set; }
         public string DatabaseName { get; private set; }
         public bool RequestsExternalDatabaseCreation { get; private set; }
-        public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
-        {
-                
-        }
 
-        public static string GetDescription()
+        public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
         {
-            return "Test class that does nothing";
         }
 
+        public static string GetDescription() => "Test class that does nothing";
 
 
-        public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+        public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
         {
-                
         }
     }
 
@@ -292,17 +296,17 @@ public void TestConstructors()
         var type = Type.GetType(actualName, true, false);
 
         //ensure that the Type implements IAttacher
-        if(!typeof(IAttacher).IsAssignableFrom(type))
+        if (!typeof(IAttacher).IsAssignableFrom(type))
             throw new TypeLoadException($"Type {type} does not implement IAttacher");
 
         //find the blank constructor
-        var constructorInfo = type.GetConstructor(Array.Empty<Type>()) ?? throw new TypeLoadException($"Type {type} does not have a blank constructor");
+        var constructorInfo = type.GetConstructor(Array.Empty<Type>()) ??
+                              throw new TypeLoadException($"Type {type} does not have a blank constructor");
 
         //call the blank constructor and return the reuslts
-        var bob = (IAttacher) constructorInfo.Invoke(Array.Empty<Type>());
-
-        
+        var bob = (IAttacher)constructorInfo.Invoke(Array.Empty<Type>());
     }
+
     [Test]
     public void TestFactory()
     {
@@ -312,7 +316,6 @@ public void TestFactory()
 
         try
         {
-
             var attacher = CatalogueRepository.MEF.CreateA<IAttacher>(typeof(MDFAttacher).FullName);
             attacher.Initialize(loadDirectory, GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer));
 
@@ -331,5 +334,4 @@ public void TestFactory()
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Unit/SchedulingTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Unit/SchedulingTests.cs
index 34c511ad72..240d1cc5f9 100644
--- a/Rdmp.Core.Tests/DataLoad/Engine/Unit/SchedulingTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Engine/Unit/SchedulingTests.cs
@@ -21,7 +21,8 @@ public void TestLoadDateCalculation_DayGranularity()
         var cacheFillProgress = new DateTime(2015, 12, 11, 15, 0, 0);
 
         // We should be loading SetUp to and including 10/12/15, not touching 11/12/15
-        var lastLoadDate = SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Day, cacheFillProgress);
+        var lastLoadDate =
+            SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Day, cacheFillProgress);
 
         Assert.AreEqual(new DateTime(2015, 12, 10, 0, 0, 0).Ticks, lastLoadDate.Ticks);
     }
@@ -33,7 +34,8 @@ public void TestLoadDateCalculation_DayGranularityAtMonthBoundary()
         var cacheFillProgress = new DateTime(2015, 12, 1, 15, 0, 0);
 
         // We should be loading SetUp to and including 30/11/15, not touching 1/12/15
-        var lastLoadDate = SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Day, cacheFillProgress);
+        var lastLoadDate =
+            SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Day, cacheFillProgress);
 
         Assert.AreEqual(new DateTime(2015, 11, 30, 0, 0, 0).Ticks, lastLoadDate.Ticks);
     }
@@ -45,7 +47,8 @@ public void TestLoadDateCalculation_HourGranularity()
         var cacheFillProgress = new DateTime(2015, 12, 11, 15, 30, 0);
 
         // We should be loading SetUp to and including 11/12/15 14:00, not touching 11/12/15 15:00
-        var lastLoadDate = SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Hour, cacheFillProgress);
+        var lastLoadDate =
+            SingleScheduleCacheDateTrackingStrategy.CalculateLastLoadDate(CacheFileGranularity.Hour, cacheFillProgress);
 
         Assert.AreEqual(new DateTime(2015, 12, 11, 14, 0, 0).Ticks, lastLoadDate.Ticks);
     }
diff --git a/Rdmp.Core.Tests/DataLoad/Modules/Attachers/RemoteTableAttacherTests.cs b/Rdmp.Core.Tests/DataLoad/Modules/Attachers/RemoteTableAttacherTests.cs
index fefe6a919c..d768d361d5 100644
--- a/Rdmp.Core.Tests/DataLoad/Modules/Attachers/RemoteTableAttacherTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Modules/Attachers/RemoteTableAttacherTests.cs
@@ -29,7 +29,7 @@ namespace Rdmp.Core.Tests.DataLoad.Modules.Attachers;
 
 internal class RemoteTableAttacherTests : DatabaseTests
 {
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestRemoteTableAttacher_Normal(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -53,11 +53,11 @@ public void TestRemoteTableAttacher_Normal(DatabaseType dbType)
             attacher.RemoteTableAccessCredentials = creds;
         }
 
-        RunAttachStageWithNormalJob(attacher,db);
+        RunAttachStageWithNormalJob(attacher, db);
     }
 
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void TestRemoteTableAttacher_AsReference(DatabaseType dbType)
     {
         var db = GetCleanedServer(dbType);
@@ -69,11 +69,11 @@ public void TestRemoteTableAttacher_AsReference(DatabaseType dbType)
         eds.SaveToDatabase();
 
         attacher.RemoteServerReference = eds;
-            
-        RunAttachStageWithNormalJob(attacher,db);
+
+        RunAttachStageWithNormalJob(attacher, db);
     }
-        
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypesWithBoolFlags))]
+
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypesWithBoolFlags))]
     public void TestRemoteTableAttacher_WithLoadProgress(DatabaseType dbType, bool mismatchProgress)
     {
         var db = GetCleanedServer(dbType);
@@ -86,7 +86,7 @@ public void TestRemoteTableAttacher_WithLoadProgress(DatabaseType dbType, bool m
 
         attacher.RemoteServerReference = eds;
 
-        RunAttachStageWithLoadProgressJob(attacher,db,mismatchProgress);
+        RunAttachStageWithLoadProgressJob(attacher, db, mismatchProgress);
     }
 
     private void RunAttachStageWithNormalJob(RemoteTableAttacher attacher, DiscoveredDatabase db)
@@ -97,33 +97,36 @@ private void RunAttachStageWithNormalJob(RemoteTableAttacher attacher, Discovere
 
         attacher.Check(new ThrowImmediatelyCheckNotifier());
 
-        attacher.Initialize(null,db);
+        attacher.Initialize(null, db);
 
-        using(var dt = new DataTable())
+        using (var dt = new DataTable())
         {
             dt.Columns.Add("Col1");
             dt.Rows.Add("fff");
 
             var tbl1 = db.CreateTable("table1", dt);
-            var tbl2 = db.CreateTable("table2", new []{new DatabaseColumnRequest("Col1",new DatabaseTypeRequest(typeof(string),5))});
+            var tbl2 = db.CreateTable("table2",
+                new[] { new DatabaseColumnRequest("Col1", new DatabaseTypeRequest(typeof(string), 5)) });
 
-            Assert.AreEqual(1,tbl1.GetRowCount());
-            Assert.AreEqual(0,tbl2.GetRowCount());
+            Assert.AreEqual(1, tbl1.GetRowCount());
+            Assert.AreEqual(0, tbl2.GetRowCount());
 
             var logManager = new LogManager(new DiscoveredServer(UnitTestLoggingConnectionString));
 
             var lmd = RdmpMockFactory.Mock_LoadMetadataLoadingTable(tbl2);
-            Mock.Get(lmd).Setup(p=>p.CatalogueRepository).Returns(CatalogueRepository);
+            Mock.Get(lmd).Setup(p => p.CatalogueRepository).Returns(CatalogueRepository);
             logManager.CreateNewLoggingTaskIfNotExists(lmd.GetDistinctLoggingTask());
 
-            var dbConfiguration = new HICDatabaseConfiguration(lmd, RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "table2"));
+            var dbConfiguration = new HICDatabaseConfiguration(lmd,
+                RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "table2"));
 
-            var job = new DataLoadJob(RepositoryLocator,"test job",logManager,lmd,new TestLoadDirectory(),new ThrowImmediatelyDataLoadEventListener(),dbConfiguration);
+            var job = new DataLoadJob(RepositoryLocator, "test job", logManager, lmd, new TestLoadDirectory(),
+                new ThrowImmediatelyDataLoadEventListener(), dbConfiguration);
             job.StartLogging();
             attacher.Attach(job, new GracefulCancellationToken());
 
-            Assert.AreEqual(1,tbl1.GetRowCount());
-            Assert.AreEqual(1,tbl2.GetRowCount());
+            Assert.AreEqual(1, tbl1.GetRowCount());
+            Assert.AreEqual(1, tbl2.GetRowCount());
         }
     }
 
@@ -133,61 +136,65 @@ private void RunAttachStageWithLoadProgressJob(RemoteTableAttacher attacher, Dis
         var syntax = db.Server.GetQuerySyntaxHelper();
 
         //the table to get data from
-        attacher.RemoteSelectSQL = $"SELECT * FROM table1 WHERE {syntax.EnsureWrapped("DateCol")} >= @startDate AND {syntax.EnsureWrapped("DateCol")} <= @endDate";
+        attacher.RemoteSelectSQL =
+            $"SELECT * FROM table1 WHERE {syntax.EnsureWrapped("DateCol")} >= @startDate AND {syntax.EnsureWrapped("DateCol")} <= @endDate";
         attacher.RAWTableName = "table2";
 
         attacher.Check(new ThrowImmediatelyCheckNotifier());
 
-        attacher.Initialize(null,db);
+        attacher.Initialize(null, db);
 
-        using(var dt = new DataTable())
+        using (var dt = new DataTable())
         {
             dt.Columns.Add("Col1");
             dt.Columns.Add("DateCol");
 
-            dt.Rows.Add("fff",new DateTime(2000,1,1));
-            dt.Rows.Add("fff",new DateTime(2001,1,1));
-            dt.Rows.Add("fff",new DateTime(2002,1,1));
+            dt.Rows.Add("fff", new DateTime(2000, 1, 1));
+            dt.Rows.Add("fff", new DateTime(2001, 1, 1));
+            dt.Rows.Add("fff", new DateTime(2002, 1, 1));
 
 
             var tbl1 = db.CreateTable("table1", dt);
-            var tbl2 = db.CreateTable("table2", new []
+            var tbl2 = db.CreateTable("table2", new[]
             {
-                new DatabaseColumnRequest("Col1",new DatabaseTypeRequest(typeof(string),5)),
-                new DatabaseColumnRequest("DateCol",new DatabaseTypeRequest(typeof(DateTime)))
+                new DatabaseColumnRequest("Col1", new DatabaseTypeRequest(typeof(string), 5)),
+                new DatabaseColumnRequest("DateCol", new DatabaseTypeRequest(typeof(DateTime)))
             });
 
-            Assert.AreEqual(3,tbl1.GetRowCount());
-            Assert.AreEqual(0,tbl2.GetRowCount());
+            Assert.AreEqual(3, tbl1.GetRowCount());
+            Assert.AreEqual(0, tbl2.GetRowCount());
 
             var logManager = new LogManager(new DiscoveredServer(UnitTestLoggingConnectionString));
 
             var lmd = RdmpMockFactory.Mock_LoadMetadataLoadingTable(tbl2);
-            Mock.Get(lmd).Setup(p=>p.CatalogueRepository).Returns(CatalogueRepository);
+            Mock.Get(lmd).Setup(p => p.CatalogueRepository).Returns(CatalogueRepository);
             logManager.CreateNewLoggingTaskIfNotExists(lmd.GetDistinctLoggingTask());
 
             var lp = new LoadProgress(CatalogueRepository, new LoadMetadata(CatalogueRepository, "ffffff"))
- {
-     OriginDate = new DateTime(2001,1,1)
- };
+            {
+                OriginDate = new DateTime(2001, 1, 1)
+            };
             attacher.Progress = lp;
-            attacher.ProgressUpdateStrategy = new DataLoadProgressUpdateInfo {Strategy = DataLoadProgressUpdateStrategy.DoNothing};
+            attacher.ProgressUpdateStrategy = new DataLoadProgressUpdateInfo
+                { Strategy = DataLoadProgressUpdateStrategy.DoNothing };
 
-            var dbConfiguration = new HICDatabaseConfiguration(lmd, RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "table2"));
+            var dbConfiguration = new HICDatabaseConfiguration(lmd,
+                RdmpMockFactory.Mock_INameDatabasesAndTablesDuringLoads(db, "table2"));
 
-            var job = new ScheduledDataLoadJob(RepositoryLocator,"test job",logManager,lmd,new TestLoadDirectory(),new ThrowImmediatelyDataLoadEventListener(),dbConfiguration)
-                {
-                    LoadProgress = mismatchProgress
-                        ? new LoadProgress(CatalogueRepository, new LoadMetadata(CatalogueRepository, "ffsdf"))
-                        : lp,
-                    DatesToRetrieve = new List<DateTime>{new DateTime(2001,01,01)}
-                };
+            var job = new ScheduledDataLoadJob(RepositoryLocator, "test job", logManager, lmd, new TestLoadDirectory(),
+                new ThrowImmediatelyDataLoadEventListener(), dbConfiguration)
+            {
+                LoadProgress = mismatchProgress
+                    ? new LoadProgress(CatalogueRepository, new LoadMetadata(CatalogueRepository, "ffsdf"))
+                    : lp,
+                DatesToRetrieve = new List<DateTime> { new(2001, 01, 01) }
+            };
 
             job.StartLogging();
             attacher.Attach(job, new GracefulCancellationToken());
 
-            Assert.AreEqual(3,tbl1.GetRowCount());
-            Assert.AreEqual(mismatchProgress ? 0 : 1,tbl2.GetRowCount());
+            Assert.AreEqual(3, tbl1.GetRowCount());
+            Assert.AreEqual(mismatchProgress ? 0 : 1, tbl2.GetRowCount());
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/RowDeleterTests.cs b/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/RowDeleterTests.cs
index 2d9f72c4ea..4c4fccb222 100644
--- a/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/RowDeleterTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/RowDeleterTests.cs
@@ -36,22 +36,22 @@ public void TestRowDeleter_OneCell()
 
             var listener = new ToMemoryDataLoadEventListener(true);
 
-            var result = operation.ProcessPipelineData(dt,listener , new GracefulCancellationToken());
+            var result = operation.ProcessPipelineData(dt, listener, new GracefulCancellationToken());
 
-            Assert.AreEqual(2,result.Rows.Count);
+            Assert.AreEqual(2, result.Rows.Count);
 
-            Assert.AreEqual("dog",result.Rows[0]["a"]);
-            Assert.AreEqual("dog",result.Rows[0]["b"]);
+            Assert.AreEqual("dog", result.Rows[0]["a"]);
+            Assert.AreEqual("dog", result.Rows[0]["b"]);
 
-            Assert.AreEqual("cat",result.Rows[1]["a"]);
-            Assert.AreEqual("dog",result.Rows[1]["b"]);
+            Assert.AreEqual("cat", result.Rows[1]["a"]);
+            Assert.AreEqual("dog", result.Rows[1]["b"]);
 
-            operation.Dispose(listener,null);
+            operation.Dispose(listener, null);
 
             var msg = listener.EventsReceivedBySender[operation].Single();
 
-            Assert.AreEqual(ProgressEventType.Warning,msg.ProgressEventType);
-            Assert.AreEqual("Total RowDeleted operations for ColumnNameToFind 'b' was 1",msg.Message);
+            Assert.AreEqual(ProgressEventType.Warning, msg.ProgressEventType);
+            Assert.AreEqual("Total RowDeleted operations for ColumnNameToFind 'b' was 1", msg.Message);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/SetNullTests.cs b/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/SetNullTests.cs
index 335e959373..75003c6d47 100644
--- a/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/SetNullTests.cs
+++ b/Rdmp.Core.Tests/DataLoad/Modules/DataFlowOperations/SetNullTests.cs
@@ -37,25 +37,25 @@ public void TestSetNull_OneCell()
 
             var listener = new ToMemoryDataLoadEventListener(true);
 
-            var result = operation.ProcessPipelineData(dt,listener , new GracefulCancellationToken());
+            var result = operation.ProcessPipelineData(dt, listener, new GracefulCancellationToken());
 
-            Assert.AreEqual(3,result.Rows.Count);
+            Assert.AreEqual(3, result.Rows.Count);
 
-            Assert.AreEqual("cat",result.Rows[0]["a"]);
-            Assert.AreEqual(DBNull.Value,result.Rows[0]["b"]);
+            Assert.AreEqual("cat", result.Rows[0]["a"]);
+            Assert.AreEqual(DBNull.Value, result.Rows[0]["b"]);
 
-            Assert.AreEqual("dog",result.Rows[1]["a"]);
-            Assert.AreEqual("dog",result.Rows[1]["b"]);
+            Assert.AreEqual("dog", result.Rows[1]["a"]);
+            Assert.AreEqual("dog", result.Rows[1]["b"]);
 
-            Assert.AreEqual("cat",result.Rows[2]["a"]);
-            Assert.AreEqual("dog",result.Rows[2]["b"]);
+            Assert.AreEqual("cat", result.Rows[2]["a"]);
+            Assert.AreEqual("dog", result.Rows[2]["b"]);
 
-            operation.Dispose(listener,null);
+            operation.Dispose(listener, null);
 
             var msg = listener.EventsReceivedBySender[operation].Single();
 
-            Assert.AreEqual(ProgressEventType.Warning,msg.ProgressEventType);
-            Assert.AreEqual("Total SetNull operations for ColumnNameToFind 'b' was 1",msg.Message);
+            Assert.AreEqual(ProgressEventType.Warning, msg.ProgressEventType);
+            Assert.AreEqual("Total SetNull operations for ColumnNameToFind 'b' was 1", msg.Message);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataQualityEngine/CatalogueConstraintReportTests.cs b/Rdmp.Core.Tests/DataQualityEngine/CatalogueConstraintReportTests.cs
index 5b8b7f701e..6080789efb 100644
--- a/Rdmp.Core.Tests/DataQualityEngine/CatalogueConstraintReportTests.cs
+++ b/Rdmp.Core.Tests/DataQualityEngine/CatalogueConstraintReportTests.cs
@@ -28,13 +28,13 @@ public class CatalogueConstraintReportTests : TestsRequiringAnExtractionConfigur
 {
     private DQERepository GetDqeRepository(DatabaseType dbType)
     {
-        var db = GetCleanedServer(dbType,"DQETempTestDb");
+        var db = GetCleanedServer(dbType, "DQETempTestDb");
         var patcher = new DataQualityEnginePatcher();
 
         var mds = new MasterDatabaseScriptExecutor(db);
         mds.CreateAndPatchDatabase(patcher, new AcceptAllCheckNotifier());
 
-        return new DQERepository(CatalogueRepository,db);
+        return new DQERepository(CatalogueRepository, db);
     }
 
     [TestCaseSource(typeof(All), nameof(All.DatabaseTypesWithBoolFlags))]
@@ -43,7 +43,8 @@ public void ValidateBulkTestData(DatabaseType dbType, bool testCancellingValidat
         var numberOfRecordsToGenerate = 10000;
         var startTime = DateTime.Now;
 
-        var testData = new BulkTestsData(CatalogueRepository,GetCleanedServer(DatabaseType.MicrosoftSQLServer),numberOfRecordsToGenerate); 
+        var testData = new BulkTestsData(CatalogueRepository, GetCleanedServer(DatabaseType.MicrosoftSQLServer),
+            numberOfRecordsToGenerate);
         testData.SetupTestData();
         testData.ImportAsCatalogue();
 
@@ -56,7 +57,8 @@ public void ValidateBulkTestData(DatabaseType dbType, bool testCancellingValidat
         testData.catalogue.ValidatorXML = bulkTestDataValidation;
 
         //set the time periodicity field
-        var toBeTimePeriodicityCol = testData.catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => e.GetRuntimeName().Equals("dtCreated"));
+        var toBeTimePeriodicityCol = testData.catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => e.GetRuntimeName().Equals("dtCreated"));
         testData.catalogue.TimeCoverage_ExtractionInformation_ID = toBeTimePeriodicityCol.ID;
 
         //do the validation
@@ -75,16 +77,18 @@ public void ValidateBulkTestData(DatabaseType dbType, bool testCancellingValidat
         var listener = new ToMemoryDataLoadEventListener(false);
         report.GenerateReport(testData.catalogue, listener, source.Token);
 
-        if(testCancellingValidationEarly)
+        if (testCancellingValidationEarly)
         {
-            Assert.IsTrue(listener.EventsReceivedBySender[report].Count(m=>m.Exception is OperationCanceledException) == 1);
+            Assert.IsTrue(
+                listener.EventsReceivedBySender[report].Count(m => m.Exception is OperationCanceledException) == 1);
             testData.DeleteCatalogue();
             return;
         }
-            
+
         Assert.IsTrue(listener.EventsReceivedBySender[report].All(m => m.Exception == null),
             string.Join(Environment.NewLine,
-                listener.EventsReceivedBySender[report].Where(m => m.Exception != null).Select(m=>m.Exception)));//all messages must have null exceptions
+                listener.EventsReceivedBySender[report].Where(m => m.Exception != null)
+                    .Select(m => m.Exception))); //all messages must have null exceptions
 
 
         //get the results now
@@ -93,31 +97,28 @@ public void ValidateBulkTestData(DatabaseType dbType, bool testCancellingValidat
         Assert.IsNotNull(results);
 
         //the sum of all consequences across all data load run ids should be the record count
-        Assert.AreEqual(10000,results.RowStates.Sum(r=>r.Missing + r.Invalid + r.Wrong + r.Correct));
+        Assert.AreEqual(10000, results.RowStates.Sum(r => r.Missing + r.Invalid + r.Wrong + r.Correct));
 
         //there should be at least 5 data load run ids (should be around 12 actually - see BulkTestData but theoretically everyone could magically - all 10,000 into 5 decades - or even less but those statistics must be astronomical)
-        Assert.GreaterOrEqual(results.RowStates.Length,5);
+        Assert.GreaterOrEqual(results.RowStates.Length, 5);
 
         //there should be lots of column results too
-        Assert.GreaterOrEqual(results.ColumnStates.Length,5);
+        Assert.GreaterOrEqual(results.ColumnStates.Length, 5);
 
         //Did it log?
         var logManager = new LogManager(CatalogueRepository.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID));
         var log = logManager.GetArchivalDataLoadInfos("DQE").FirstOrDefault();
         Assert.IsNotNull(log);
         Assert.GreaterOrEqual(log.StartTime, startTime);
-        Assert.AreEqual(0,log.Errors.Count);
-        Assert.AreEqual(numberOfRecordsToGenerate,log.TableLoadInfos.Single().Inserts);
-                        
-        testData.DeleteCatalogue();
+        Assert.AreEqual(0, log.Errors.Count);
+        Assert.AreEqual(numberOfRecordsToGenerate, log.TableLoadInfos.Single().Inserts);
 
+        testData.DeleteCatalogue();
     }
 
 
-
     #region Checkability
 
-
     [Test]
     public void SupportsValidation_NoLoggingServer()
     {
@@ -157,12 +158,12 @@ public void SupportsValidation_NoDQE()
 
         //clear the default value
         defaults.ClearDefault(PermissableDefaults.DQE);
-            
+
         try
         {
             var report = new CatalogueConstraintReport(_catalogue, SpecialFieldNames.DataLoadRunID);
 
-            var e = Assert.Throws<Exception>(()=> report.Check(new ThrowImmediatelyCheckNotifier()));
+            var e = Assert.Throws<Exception>(() => report.Check(new ThrowImmediatelyCheckNotifier()));
             Assert.IsTrue(
                 e.Message.StartsWith(
                     "Failed to create DQE Repository, possibly there is no DataQualityEngine Reporting Server (ExternalDatabaseServer).  You will need to create/set one in CatalogueManager")
@@ -178,15 +179,14 @@ public void SupportsValidation_NoDQE()
     [Test]
     public void SupportsValidation_NoValidatorXML()
     {
-
         var report = new CatalogueConstraintReport(_catalogue, SpecialFieldNames.DataLoadRunID);
         _catalogue.ValidatorXML = null;
 
         //it has no validator XML currently 
         Assert.IsFalse(report.CatalogueSupportsReport(_catalogue));
 
-        var ex = Assert.Throws<Exception>(()=>report.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("There is no ValidatorXML specified for the Catalogue TestTable",ex.Message);
+        var ex = Assert.Throws<Exception>(() => report.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("There is no ValidatorXML specified for the Catalogue TestTable", ex.Message);
     }
 
     [Test]
@@ -198,22 +198,23 @@ public void SupportsValidation_BadXML()
         //it has no validator XML currently 
         Assert.IsFalse(report.CatalogueSupportsReport(_catalogue));
 
-        var ex = Assert.Throws<Exception>(()=>report.Check(new ThrowImmediatelyCheckNotifier()));
-        StringAssert.Contains("ValidatorXML for Catalogue TestTable could not be deserialized into a Validator",ex.Message);
+        var ex = Assert.Throws<Exception>(() => report.Check(new ThrowImmediatelyCheckNotifier()));
+        StringAssert.Contains("ValidatorXML for Catalogue TestTable could not be deserialized into a Validator",
+            ex.Message);
     }
 
     [Test]
     public void SupportsValidation_MadeUpColumnName()
     {
-
         var report = new CatalogueConstraintReport(_catalogue, SpecialFieldNames.DataLoadRunID);
 
         _catalogue.ValidatorXML = dodgyColumnXML;
         //it has no validator XML currently 
         Assert.IsFalse(report.CatalogueSupportsReport(_catalogue));
 
-        var ex = Assert.Throws<Exception>(()=>report.Check(new ThrowImmediatelyCheckNotifier()));
-        Assert.AreEqual("Could not find a column in the extraction SQL that would match TargetProperty chi",ex.Message);
+        var ex = Assert.Throws<Exception>(() => report.Check(new ThrowImmediatelyCheckNotifier()));
+        Assert.AreEqual("Could not find a column in the extraction SQL that would match TargetProperty chi",
+            ex.Message);
     }
 
     [Test]
@@ -224,20 +225,25 @@ public void SupportsValidation_GoodButNoDataLoadRunID()
         _catalogue.ValidatorXML = validColumnXML;
 
         //set the time periodicity field
-        var toBeTimePeriodicityCol = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Single(e => e.GetRuntimeName().Equals("PrivateID"));
+        var toBeTimePeriodicityCol = _catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Single(e => e.GetRuntimeName().Equals("PrivateID"));
         _catalogue.TimeCoverage_ExtractionInformation_ID = toBeTimePeriodicityCol.ID;
 
         var notifier = new ToMemoryCheckNotifier();
         report.Check(notifier);
 
         Assert.AreEqual(CheckResult.Warning, notifier.GetWorst());
-        Assert.Contains("Found column in query builder columns which matches TargetProperty Name",notifier.Messages.Select(m=>m.Message).ToArray());
-            
+        Assert.Contains("Found column in query builder columns which matches TargetProperty Name",
+            notifier.Messages.Select(m => m.Message).ToArray());
+
         Assert.IsTrue(report.CatalogueSupportsReport(_catalogue));
 
-        var ex = Assert.Throws<Exception>(() => report.Check(new ThrowImmediatelyCheckNotifier {ThrowOnWarning = true}));
-        Assert.IsTrue(ex.Message == "Did not find ExtractionInformation for a column called hic_dataLoadRunID, this will prevent you from viewing the resulting report subdivided by data load batch (make sure you have this column and that it is marked as extractable)");
+        var ex = Assert.Throws<Exception>(() =>
+            report.Check(new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true }));
+        Assert.IsTrue(ex.Message ==
+                      "Did not find ExtractionInformation for a column called hic_dataLoadRunID, this will prevent you from viewing the resulting report subdivided by data load batch (make sure you have this column and that it is marked as extractable)");
     }
+
     #endregion
 
 
diff --git a/Rdmp.Core.Tests/DataQualityEngine/DQEGraphAnnotationTests.cs b/Rdmp.Core.Tests/DataQualityEngine/DQEGraphAnnotationTests.cs
index d88a3af57a..b79db929e3 100644
--- a/Rdmp.Core.Tests/DataQualityEngine/DQEGraphAnnotationTests.cs
+++ b/Rdmp.Core.Tests/DataQualityEngine/DQEGraphAnnotationTests.cs
@@ -13,27 +13,27 @@
 
 namespace Rdmp.Core.Tests.DataQualityEngine;
 
-public class DQEGraphAnnotationTests:DatabaseTests
+public class DQEGraphAnnotationTests : DatabaseTests
 {
     [Test]
     public void TestCreatingOne()
     {
-        var c = new Catalogue(CatalogueRepository,"FrankyMicky");
+        var c = new Catalogue(CatalogueRepository, "FrankyMicky");
+
 
-            
         try
         {
-
             var dqeRepo = new DQERepository(CatalogueRepository);
             var evaluation = new Evaluation(dqeRepo, c);
 
-            var annotation = new DQEGraphAnnotation(dqeRepo,1, 2, 3, 4, "Fishesfly", evaluation,DQEGraphType.TimePeriodicityGraph,"ALL");
-                
-            Assert.AreEqual(annotation.StartX,1);
+            var annotation = new DQEGraphAnnotation(dqeRepo, 1, 2, 3, 4, "Fishesfly", evaluation,
+                DQEGraphType.TimePeriodicityGraph, "ALL");
+
+            Assert.AreEqual(annotation.StartX, 1);
             Assert.AreEqual(annotation.StartY, 2);
             Assert.AreEqual(annotation.EndX, 3);
             Assert.AreEqual(annotation.EndY, 4);
-            Assert.AreEqual(annotation.AnnotationIsForGraph,DQEGraphType.TimePeriodicityGraph);
+            Assert.AreEqual(annotation.AnnotationIsForGraph, DQEGraphType.TimePeriodicityGraph);
 
             //should be about 2 milliseconds ago
             Assert.IsTrue(annotation.CreationDate <= DateTime.Now.AddSeconds(3));
@@ -47,9 +47,9 @@ public void TestCreatingOne()
             annotation.SaveToDatabase();
 
             annotation.Text = "";
-                
+
             //new copy is flibble
-            Assert.AreEqual("flibble", dqeRepo.GetObjectByID<DQEGraphAnnotation>(annotation.ID).Text); 
+            Assert.AreEqual("flibble", dqeRepo.GetObjectByID<DQEGraphAnnotation>(annotation.ID).Text);
 
             annotation.DeleteInDatabase();
         }
@@ -57,7 +57,5 @@ public void TestCreatingOne()
         {
             c.DeleteInDatabase();
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DataQualityEngine/PeriodicityStateTests.cs b/Rdmp.Core.Tests/DataQualityEngine/PeriodicityStateTests.cs
index b599b3e3b4..24cac6f8b8 100644
--- a/Rdmp.Core.Tests/DataQualityEngine/PeriodicityStateTests.cs
+++ b/Rdmp.Core.Tests/DataQualityEngine/PeriodicityStateTests.cs
@@ -42,7 +42,5 @@ public void GetPeriodicityCountsForEvaluation_EmptyEvaluation()
 
         Assert.IsNotNull(dict);
         Assert.IsEmpty(dict);
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Databases/MasterDatabaseScriptExecutorTests.cs b/Rdmp.Core.Tests/Databases/MasterDatabaseScriptExecutorTests.cs
index 00b0afa159..ac3ec7e23b 100644
--- a/Rdmp.Core.Tests/Databases/MasterDatabaseScriptExecutorTests.cs
+++ b/Rdmp.Core.Tests/Databases/MasterDatabaseScriptExecutorTests.cs
@@ -26,9 +26,11 @@ public void TestCreatingSchemaTwice()
         mds.CreateAndPatchDatabase(new DataQualityEnginePatcher(), new AcceptAllCheckNotifier());
 
         //now try to setup same db as Logging
-        var ex = Assert.Throws<Exception>(()=>mds.CreateAndPatchDatabase(new LoggingDatabasePatcher(), new AcceptAllCheckNotifier()));
-
-        StringAssert.Contains("is already set up as a platform database for another schema (it has the 'ScriptsRun' table)", ex.InnerException.Message);
+        var ex = Assert.Throws<Exception>(() =>
+            mds.CreateAndPatchDatabase(new LoggingDatabasePatcher(), new AcceptAllCheckNotifier()));
 
+        StringAssert.Contains(
+            "is already set up as a platform database for another schema (it has the 'ScriptsRun' table)",
+            ex.InnerException.Message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Databases/Patch68FixNamespacesTest.cs b/Rdmp.Core.Tests/Databases/Patch68FixNamespacesTest.cs
index b008fcb2a9..e0aecba46a 100644
--- a/Rdmp.Core.Tests/Databases/Patch68FixNamespacesTest.cs
+++ b/Rdmp.Core.Tests/Databases/Patch68FixNamespacesTest.cs
@@ -14,9 +14,8 @@
 
 namespace Rdmp.Core.Tests.Databases;
 
-internal class Patch68FixNamespacesTest:UnitTests
+internal class Patch68FixNamespacesTest : UnitTests
 {
-
     /// <summary>
     /// Tests the systems ability to migrate old class paths in deployed databases to the new namespaces as they exist in
     /// the refactored (modern) RDMP sln layout (before there were buckets of projects!)
@@ -26,7 +25,7 @@ public void TestClassNameRefactoring()
     {
         var p = new CataloguePatcher();
 
-        var patch = p.GetAllPatchesInAssembly(null).Single(kvp=>kvp.Key == "068_FixNamespaces.sql").Value;
+        var patch = p.GetAllPatchesInAssembly(null).Single(kvp => kvp.Key == "068_FixNamespaces.sql").Value;
 
         var findSubsRegex = new Regex(@"REPLACE\(.*,'(.*)','(.*)'\)");
 
@@ -34,12 +33,12 @@ public void TestClassNameRefactoring()
 
         foreach (Match match in findSubsRegex.Matches(patch.EntireScript))
         {
-            if(substitutions.ContainsKey(match.Groups[1].Value))
+            if (substitutions.ContainsKey(match.Groups[1].Value))
                 continue;
 
-            substitutions.Add(match.Groups[1].Value,match.Groups[2].Value);
+            substitutions.Add(match.Groups[1].Value, match.Groups[2].Value);
         }
-            
+
         SetupMEF();
 
         MEF.SafeDirectoryCatalog.AddType(typeof(FAnsi.DatabaseType));
@@ -53,14 +52,15 @@ public void TestClassNameRefactoring()
 
             var foundNow = MEF.GetType(newClass);
 
-            Assert.IsNotNull(foundNow,"Patch did not work correctly for Type '" + oldClass +"' which after renaming became '" + newClass +"'");
-
+            Assert.IsNotNull(foundNow,
+                "Patch did not work correctly for Type '" + oldClass + "' which after renaming became '" + newClass +
+                "'");
         }
-                
-
     }
+
     private string[] ExpectedClasses
-        = {
+        =
+        {
             "CachingEngine.PipelineExecution.Destinations.CacheFileGranularity",
             "CatalogueLibrary.Data.ColumnInfo",
             "CatalogueLibrary.Data.DataAccessCredentials",
@@ -121,5 +121,4 @@ private string[] ExpectedClasses
             "LoadModules.Generic.Mutilators.TableVarcharMaxer",
             "LoadModules.Generic.Web.WebFileDownloader"
         };
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/DesignPatternTests/DatabaseEntityConventionTests.cs b/Rdmp.Core.Tests/DesignPatternTests/DatabaseEntityConventionTests.cs
index 644bf33da0..eda8b96416 100644
--- a/Rdmp.Core.Tests/DesignPatternTests/DatabaseEntityConventionTests.cs
+++ b/Rdmp.Core.Tests/DesignPatternTests/DatabaseEntityConventionTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.DesignPatternTests;
 
-public class DatabaseEntityConventionTests:UnitTests
+public class DatabaseEntityConventionTests : UnitTests
 {
     /// <summary>
     /// This test checks that constructors of <see cref="DatabaseEntity"/> classes know what repo they are supposed to be written into
@@ -29,16 +29,13 @@ public void AllDatabaseEntitiesHaveTypedIRepository()
         var problems = new List<string>();
 
         foreach (var type in MEF.GetAllTypes().Where(t => typeof(DatabaseEntity).IsAssignableFrom(t)))
+        foreach (var constructorInfo in type.GetConstructors())
         {
-            foreach (var constructorInfo in type.GetConstructors())
-            {
-                var parameters = constructorInfo.GetParameters();
-                    
-                if (parameters.Any(p=>p.ParameterType == typeof(IRepository)))
-                {
-                    problems.Add($"Constructor found on Type {type} that takes {nameof(IRepository)}, it should take either {nameof(IDataExportRepository)} or {nameof(ICatalogueRepository)}");
-                }
-            }
+            var parameters = constructorInfo.GetParameters();
+
+            if (parameters.Any(p => p.ParameterType == typeof(IRepository)))
+                problems.Add(
+                    $"Constructor found on Type {type} that takes {nameof(IRepository)}, it should take either {nameof(IDataExportRepository)} or {nameof(ICatalogueRepository)}");
         }
 
         foreach (var problem in problems)
diff --git a/Rdmp.Core.Tests/IHasSummaryTests.cs b/Rdmp.Core.Tests/IHasSummaryTests.cs
index a769fc0b1b..44b3d9cfd7 100644
--- a/Rdmp.Core.Tests/IHasSummaryTests.cs
+++ b/Rdmp.Core.Tests/IHasSummaryTests.cs
@@ -17,17 +17,14 @@ internal class IHasSummaryTests : UnitTests
     public void AllObjects_SupportSummary()
     {
         foreach (var obj in WhenIHaveAll())
-        {
             try
             {
                 var text = obj.GetSummary(true, true);
                 Assert.IsNotNull(text);
-
             }
             catch (Exception ex)
             {
                 throw new Exception($"GetSummary is broken for {obj.GetType().Name}", ex);
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Logging/ArchivalDataLoadInfoTests.cs b/Rdmp.Core.Tests/Logging/ArchivalDataLoadInfoTests.cs
index 61434dfe87..ae9ee5eb4e 100644
--- a/Rdmp.Core.Tests/Logging/ArchivalDataLoadInfoTests.cs
+++ b/Rdmp.Core.Tests/Logging/ArchivalDataLoadInfoTests.cs
@@ -17,8 +17,8 @@ public void ArchivalDataLoadInfo_ToString()
     {
         var adi = new ArchivalDataLoadInfo
         {
-            StartTime = new DateTime(2010, 1, 1,12,0,0),
-            EndTime = new DateTime(2010, 1, 3,13,20,23)
+            StartTime = new DateTime(2010, 1, 1, 12, 0, 0),
+            EndTime = new DateTime(2010, 1, 3, 13, 20, 23)
         };
 
         // This dle took 2 days, 1 hour, 20 mins and 23 seconds
diff --git a/Rdmp.Core.Tests/Logging/DataLoadTaskHelper.cs b/Rdmp.Core.Tests/Logging/DataLoadTaskHelper.cs
index 31a862d725..d45a81fe3e 100644
--- a/Rdmp.Core.Tests/Logging/DataLoadTaskHelper.cs
+++ b/Rdmp.Core.Tests/Logging/DataLoadTaskHelper.cs
@@ -31,12 +31,13 @@ public void SetUp()
 
     public void CreateDataLoadTask(string taskName)
     {
-        using (var con =_loggingServer.GetConnection())
+        using (var con = _loggingServer.GetConnection())
         {
             con.Open();
 
             var datasetName = $"Test_{taskName}";
-            var datasetCmd = _loggingServer.GetCommand($"INSERT INTO DataSet (dataSetID) VALUES ('{datasetName}')", con);
+            var datasetCmd =
+                _loggingServer.GetCommand($"INSERT INTO DataSet (dataSetID) VALUES ('{datasetName}')", con);
             datasetCmd.ExecuteNonQuery();
             _sqlToCleanUp.Push($"DELETE FROM DataSet WHERE dataSetID = '{datasetName}'");
 
@@ -61,6 +62,5 @@ public void TearDown()
             while (_sqlToCleanUp.Any())
                 _loggingServer.GetCommand(_sqlToCleanUp.Pop(), con).ExecuteNonQuery();
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Logging/FatalErrorLoggingTest.cs b/Rdmp.Core.Tests/Logging/FatalErrorLoggingTest.cs
index 9fe8b4a29c..d864b5ab5b 100644
--- a/Rdmp.Core.Tests/Logging/FatalErrorLoggingTest.cs
+++ b/Rdmp.Core.Tests/Logging/FatalErrorLoggingTest.cs
@@ -19,13 +19,12 @@ internal class FatalErrorLoggingTest : DatabaseTests
     [TestCase]
     public void CreateNewDataLoadTask()
     {
-
         var lm = new LogManager(new DiscoveredServer(UnitTestLoggingConnectionString));
-            
+
         lm.CreateNewLoggingTaskIfNotExists("Fish");
 
-        Assert.Contains("Fish",lm.ListDataTasks());
-        Assert.Contains("Fish",lm.ListDataSets());
+        Assert.Contains("Fish", lm.ListDataTasks());
+        Assert.Contains("Fish", lm.ListDataSets());
 
         lm.CreateNewLoggingTaskIfNotExists("Fish");
         lm.CreateNewLoggingTaskIfNotExists("Fish");
@@ -40,14 +39,13 @@ public void FataErrorLoggingTest()
             "No rollback is possible/required as no database rows are actually inserted",
             true, new DiscoveredServer(UnitTestLoggingConnectionString));
 
-        var ds = new DataSource[]{ new DataSource("nothing",DateTime.Now)};
-
+        var ds = new DataSource[] { new("nothing", DateTime.Now) };
 
 
         var t = new TableLoadInfo(d, "Unit test only", "Unit test only", ds, 5);
         t.Inserts += 3; //simulate that it crashed after 3
 
-        d.LogFatalError("HICSSISLibraryTests.FataErrorLoggingTest","Some terrible event happened");
+        d.LogFatalError("HICSSISLibraryTests.FataErrorLoggingTest", "Some terrible event happened");
 
         Assert.IsTrue(d.IsClosed);
     }
@@ -66,10 +64,10 @@ public void MD5Test()
 
         using (var md5 = MD5.Create())
         {
-            hashAsBytes = md5.ComputeHash(memory);    
+            hashAsBytes = md5.ComputeHash(memory);
         }
 
-        var ds = new DataSource[] { new DataSource("nothing", DateTime.Now) };
+        var ds = new DataSource[] { new("nothing", DateTime.Now) };
 
         ds[0].MD5 = hashAsBytes; //MD5 is a property so confirm write and read are the same - and don't bomb
 
@@ -87,6 +85,4 @@ public void MD5Test()
 
         d.CloseAndMarkComplete();
     }
-    
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Logging/LogManagerTest.cs b/Rdmp.Core.Tests/Logging/LogManagerTest.cs
index b11514a63f..24f38b7500 100644
--- a/Rdmp.Core.Tests/Logging/LogManagerTest.cs
+++ b/Rdmp.Core.Tests/Logging/LogManagerTest.cs
@@ -31,7 +31,7 @@ public class LogManagerTest : DatabaseTests
     private string _dataLoadTaskName;
     private LogManager _logManager;
 
-        
+
     /// <summary>
     /// Add a bunch of data load runs for the tests in this fixture
     /// </summary>
@@ -45,7 +45,7 @@ protected override void OneTimeSetUp()
             var lds = new DiscoveredServer(UnitTestLoggingConnectionString);
 
             var manager = new LogManager(lds);
-                
+
             _dataLoadTaskName = "LogTest";
 
             _dataLoadTaskHelper = new DataLoadTaskHelper(lds);
@@ -56,17 +56,19 @@ protected override void OneTimeSetUp()
             // Insert some data load runs that are used by all the tests
             _logManager = new LogManager(lds);
 
-            _failedLoad = _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
+            _failedLoad =
+                _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
             _failedLoad.LogFatalError("", "");
             _failedLoad.CloseAndMarkComplete();
 
-            _successfulLoad = _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
+            _successfulLoad =
+                _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
             _successfulLoad.LogProgress(DataLoadInfo.ProgressEventType.OnProgress, "", "");
             _successfulLoad.CloseAndMarkComplete();
 
             var tableLoadInfo = _successfulLoad.CreateTableLoadInfo("ignoreme", "Nowhereland",
                 new DataSource[]
-                    {new DataSource("Firehouse", DateTime.Now.AddDays(-1)), new DataSource("WaterHaus")}, 100);
+                    { new("Firehouse", DateTime.Now.AddDays(-1)), new("WaterHaus") }, 100);
 
             tableLoadInfo.Inserts = 500;
             tableLoadInfo.Updates = 100;
@@ -74,7 +76,8 @@ protected override void OneTimeSetUp()
 
             Task.Delay(1000).Wait();
 
-            _anotherSuccessfulLoad = _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
+            _anotherSuccessfulLoad =
+                _logManager.CreateDataLoadInfo(_dataLoadTaskName, _dataLoadTaskName, _dataLoadTaskName, "", true);
             _anotherSuccessfulLoad.LogProgress(DataLoadInfo.ProgressEventType.OnProgress, "", "");
             _anotherSuccessfulLoad.CloseAndMarkComplete();
         }
@@ -90,10 +93,10 @@ protected override void SetUp()
         base.SetUp();
 
         if (_setupException != null)
-            Console.WriteLine(ExceptionHelper.ExceptionToListOfInnerMessages(_setupException,true));
+            Console.WriteLine(ExceptionHelper.ExceptionToListOfInnerMessages(_setupException, true));
     }
 
-        
+
     [Test]
     public void TestLastLoadStatusassemblage()
     {
@@ -101,19 +104,19 @@ public void TestLastLoadStatusassemblage()
 
         var loadHistoryForTask = lm.GetArchivalDataLoadInfos(_dataLoadTaskName).ToArray();
 
-        Assert.Greater(loadHistoryForTask.Length , 0);//some records
+        Assert.Greater(loadHistoryForTask.Length, 0); //some records
+
+        Assert.Greater(loadHistoryForTask.Count(load => load.Errors.Count > 0), 0); //some with some errors
+        Assert.Greater(loadHistoryForTask.Count(load => load.Progress.Count > 0), 0); //some with some progress
 
-        Assert.Greater(loadHistoryForTask.Count(load => load.Errors.Count > 0), 0);//some with some errors
-        Assert.Greater(loadHistoryForTask.Count(load => load.Progress.Count > 0), 0);//some with some progress
+
+        Assert.Greater(loadHistoryForTask.Count(load => load.TableLoadInfos.Count == 1),
+            0); //some with some table loads
 
 
-        Assert.Greater(loadHistoryForTask.Count(load => load.TableLoadInfos.Count == 1), 0);//some with some table loads
-            
-            
         Console.WriteLine($"Records fetched:{loadHistoryForTask.Length}");
         Console.WriteLine($"Errors fetched:{loadHistoryForTask.Aggregate(0, (p, c) => p + c.Errors.Count)}");
         Console.WriteLine($"Progress fetched:{loadHistoryForTask.Aggregate(0, (p, c) => p + c.Progress.Count)}");
-
     }
 
     [Test]
@@ -123,16 +126,14 @@ public void TestLoggingVsDynamicSQLHacker()
 
         Assert.AreEqual(0, _logManager.ListDataTasks().Count(t => t.Equals("','') Truncate Table Fishes")));
         _logManager.CreateNewLoggingTaskIfNotExists("','') Truncate Table Fishes");
-        Assert.AreEqual(1,_logManager.ListDataTasks().Count(t => t.Equals("','') Truncate Table Fishes")));
-             
+        Assert.AreEqual(1, _logManager.ListDataTasks().Count(t => t.Equals("','') Truncate Table Fishes")));
+
         CleanupTruncateCommand();
         Assert.AreEqual(0, _logManager.ListDataTasks().Count(t => t.Equals("','') Truncate Table Fishes")));
-
     }
 
     private void CleanupTruncateCommand()
     {
-
         var lds = new DiscoveredServer(UnitTestLoggingConnectionString);
         using (var con = lds.GetConnection())
         {
@@ -150,8 +151,8 @@ public void TestLastLoadStatusassemblage_Top1()
 
         var loadHistoryForTask = lm.GetArchivalDataLoadInfos(_dataLoadTaskName).First();
 
-        Assert.Greater(loadHistoryForTask.Progress.Count,0);//some with some progress
-            
+        Assert.Greater(loadHistoryForTask.Progress.Count, 0); //some with some progress
+
         Console.WriteLine($"Errors fetched:{loadHistoryForTask.Errors.Count}");
         Console.WriteLine($"Progress fetched:{loadHistoryForTask.Progress.Count}");
 
@@ -185,20 +186,20 @@ public void TestLogging_CreateTasks_MixedCases()
         var server = new DiscoveredServer(UnitTestLoggingConnectionString);
         var lm = new LogManager(server);
 
-            
+
         lm.CreateNewLoggingTaskIfNotExists("ff");
-            
-        Assert.AreEqual(1,lm.ListDataSets().Count(s => s.Equals("ff",StringComparison.CurrentCultureIgnoreCase)));
+
+        Assert.AreEqual(1, lm.ListDataSets().Count(s => s.Equals("ff", StringComparison.CurrentCultureIgnoreCase)));
 
         //don't create another one just because it's changed case
         lm.CreateNewLoggingTaskIfNotExists("FF");
-            
-        Assert.AreEqual(1,lm.ListDataSets().Count(s=>s.Equals("ff",StringComparison.CurrentCultureIgnoreCase)));
 
-        var dli1 = lm.CreateDataLoadInfo("ff","tests","hi there",null,true);
-        var dli2 = lm.CreateDataLoadInfo("FF","tests","hi there",null,true);
+        Assert.AreEqual(1, lm.ListDataSets().Count(s => s.Equals("ff", StringComparison.CurrentCultureIgnoreCase)));
+
+        var dli1 = lm.CreateDataLoadInfo("ff", "tests", "hi there", null, true);
+        var dli2 = lm.CreateDataLoadInfo("FF", "tests", "hi there", null, true);
 
-        Assert.AreEqual(1,lm.ListDataSets().Count(s=>s.Equals("ff",StringComparison.CurrentCultureIgnoreCase)));
+        Assert.AreEqual(1, lm.ListDataSets().Count(s => s.Equals("ff", StringComparison.CurrentCultureIgnoreCase)));
     }
 
     [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
@@ -214,7 +215,8 @@ public void LoggingDatabase_TestActuallyCreatingIt(DatabaseType type)
         lm.CreateNewLoggingTaskIfNotExists("blarg");
 
         var dli = lm.CreateDataLoadInfo("blarg", "tests", "doing nothing interesting", null, true);
-        var tli = dli.CreateTableLoadInfo("", "mytbl", new[] { new DataSource("ff.csv"), new DataSource("bb.csv", new DateTime(2001, 1, 1)) }, 40);
+        var tli = dli.CreateTableLoadInfo("", "mytbl",
+            new[] { new DataSource("ff.csv"), new DataSource("bb.csv", new DateTime(2001, 1, 1)) }, 40);
 
         tli.Inserts = 500;
         tli.CloseAndArchive();
@@ -239,6 +241,7 @@ public void LoggingDatabase_TestActuallyCreatingIt(DatabaseType type)
         Assert.AreEqual("Wrote some records", archival.Progress.Single().Description);
 
         var fatal = archival.Errors.Single();
-        lm.ResolveFatalErrors(new[] { fatal.ID }, DataLoadInfo.FatalErrorStates.Resolved, "problem resolved by building more towers");
+        lm.ResolveFatalErrors(new[] { fatal.ID }, DataLoadInfo.FatalErrorStates.Resolved,
+            "problem resolved by building more towers");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Properties/AssemblyInfo.cs b/Rdmp.Core.Tests/Properties/AssemblyInfo.cs
index aeb3cdb249..913daf92e3 100644
--- a/Rdmp.Core.Tests/Properties/AssemblyInfo.cs
+++ b/Rdmp.Core.Tests/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("13825638-5252-413c-98bc-1aef3b1cb9e4")]
+[assembly: Guid("13825638-5252-413c-98bc-1aef3b1cb9e4")]
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Providers/CatalogueProblemProviderTests.cs b/Rdmp.Core.Tests/Providers/CatalogueProblemProviderTests.cs
index d91739c2bc..eb58b7bbcd 100644
--- a/Rdmp.Core.Tests/Providers/CatalogueProblemProviderTests.cs
+++ b/Rdmp.Core.Tests/Providers/CatalogueProblemProviderTests.cs
@@ -19,13 +19,14 @@ namespace Rdmp.Core.Tests.Providers;
 internal class CatalogueProblemProviderTests : UnitTests
 {
     #region ROOT CONTAINERS
+
     [Test]
     public void TestRootOrderCohortContainer_IsProblem()
     {
         var container = WhenIHaveA<CohortAggregateContainer>();
         var childAggregateConfiguration = WhenIHaveA<AggregateConfiguration>();
         var childAggregateConfiguration2 = WhenIHaveA<AggregateConfiguration>();
-            
+
         container.Operation = SetOperation.UNION;
         container.AddChild(childAggregateConfiguration, 1);
         container.AddChild(childAggregateConfiguration2, 1);
@@ -65,7 +66,9 @@ public void TestEmptyRootEXCEPTCohortContainer_IsProblem()
         var problem = pp.DescribeProblem(container);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -80,7 +83,9 @@ public void TestEmptyRootINTERSECTCohortContainer_IsProblem()
         var problem = pp.DescribeProblem(container);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -131,7 +136,9 @@ public void Test1ChildRootEXCEPTCohortContainer_IsProblem()
         var problem = pp.DescribeProblem(container);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -166,7 +173,9 @@ public void Test1ChildRootINTERSECTCohortContainer_IsProblem()
         var problem = pp.DescribeProblem(container);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -186,9 +195,11 @@ public void Test2ChildRootINTERSECTCohortContainer_IsOk()
 
         Assert.IsNull(problem);
     }
+
     #endregion
 
     #region SET containers
+
     [Test]
     public void TestSetContainerUNION_IsProblem()
     {
@@ -202,7 +213,9 @@ public void TestSetContainerUNION_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -220,7 +233,9 @@ public void TestSetContainer1ChildUNION_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -255,7 +270,9 @@ public void TestSetContainerEXCEPT_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -273,7 +290,9 @@ public void TestSetContainer1ChildEXCEPT_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -308,7 +327,9 @@ public void TestSetContainerINTERSECT_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -326,7 +347,9 @@ public void TestSetContainer1ChildINTERSECT_IsProblem()
         var problem = pp.DescribeProblem(childContainer);
 
         Assert.IsNotNull(problem);
-        Assert.AreEqual("SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required", problem);
+        Assert.AreEqual(
+            "SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required",
+            problem);
     }
 
     [Test]
@@ -348,7 +371,6 @@ public void TestSetContainer2ChildINTERSECT_IsOk()
         Assert.IsNull(problem);
     }
 
-
     #endregion
 
 
@@ -360,7 +382,7 @@ public void MixedCollationIsAProblemForJoinInfos_WhenNoExplicitCollation(string
 
         var ci2 = WhenIHaveA<ExtractionInformation>().CatalogueItem;
 
-        _=new JoinInfo((ICatalogueRepository)ci1.Repository,
+        _ = new JoinInfo((ICatalogueRepository)ci1.Repository,
             ci2.ColumnInfo,
             ci1.ColumnInfo,
             ExtractionJoinType.Right,
@@ -369,7 +391,7 @@ public void MixedCollationIsAProblemForJoinInfos_WhenNoExplicitCollation(string
         var pp = new CatalogueProblemProvider();
         var childProvider = GetActivator().CoreChildProvider;
 
-        Assert.IsFalse(pp.HasProblem(ci1),"Should not be problem because no collations are declared");
+        Assert.IsFalse(pp.HasProblem(ci1), "Should not be problem because no collations are declared");
         pp.RefreshProblems(childProvider);
 
         Assert.IsFalse(pp.HasProblem(ci1), "Should not be problem because no collations are declared");
@@ -386,7 +408,8 @@ public void MixedCollationIsAProblemForJoinInfos_WhenNoExplicitCollation(string
         pp.RefreshProblems(childProvider);
 
         Assert.IsTrue(pp.HasProblem(ci1));
-        Assert.AreEqual("Columns in joins declared on this column have mismatched collations ( My_Col = My_Col)", pp.DescribeProblem(ci1));
+        Assert.AreEqual("Columns in joins declared on this column have mismatched collations ( My_Col = My_Col)",
+            pp.DescribeProblem(ci1));
     }
 
     [Test]
@@ -414,13 +437,15 @@ public void MixedCollationIsAProblemForJoinInfos_ExplicitCollation()
         ci2.ColumnInfo.Collation = "splishy";
         pp.RefreshProblems(childProvider);
 
-        Assert.IsFalse(pp.HasProblem(ci1), "Should not be problem because JoinInfo explicitly states a resolution collation");
-
+        Assert.IsFalse(pp.HasProblem(ci1),
+            "Should not be problem because JoinInfo explicitly states a resolution collation");
     }
+
     #region Parameters
 
     [TestCase("2001/01/01", true)]
-    [TestCase("'2001/01/01", false)] // This is currently fine, we are only detecting bad dates.  SQL syntax will pick this up for them anyway
+    [TestCase("'2001/01/01",
+        false)] // This is currently fine, we are only detecting bad dates.  SQL syntax will pick this up for them anyway
     [TestCase("'2001/01/01'", false)]
     [TestCase("\"2001/01/01\"", false)]
     public void TestParameterIsDate(string val, bool expectProblem)
@@ -433,15 +458,10 @@ public void TestParameterIsDate(string val, bool expectProblem)
         pp.RefreshProblems(new CatalogueChildProvider(Repository, null, new ThrowImmediatelyCheckNotifier(), null));
         var problem = pp.DescribeProblem(param);
 
-        if(expectProblem)
-        {
+        if (expectProblem)
             Assert.AreEqual("Parameter value looks like a date but is not surrounded by quotes", problem);
-        }
         else
-        {
             Assert.IsNull(problem);
-        }
-
     }
 
     #endregion
diff --git a/Rdmp.Core.Tests/Providers/RowVerTest.cs b/Rdmp.Core.Tests/Providers/RowVerTest.cs
index 794e8f1ec1..28d57f5bc0 100644
--- a/Rdmp.Core.Tests/Providers/RowVerTest.cs
+++ b/Rdmp.Core.Tests/Providers/RowVerTest.cs
@@ -24,22 +24,22 @@ public void Test_RowVer()
         var cata = new Catalogue(CatalogueRepository, "FFFF");
 
         //When we get all the Catalogues we should include cata
-        Assert.Contains(cata,CatalogueRepository.GetAllObjects<Catalogue>());
-        Assert.AreEqual(cata,CatalogueRepository.GetAllObjects<Catalogue>()[0]);
-        Assert.AreNotSame(cata,CatalogueRepository.GetAllObjects<Catalogue>()[0]);
+        Assert.Contains(cata, CatalogueRepository.GetAllObjects<Catalogue>());
+        Assert.AreEqual(cata, CatalogueRepository.GetAllObjects<Catalogue>()[0]);
+        Assert.AreNotSame(cata, CatalogueRepository.GetAllObjects<Catalogue>()[0]);
 
         //create a cache
         var rowVerCache = new RowVerCache<Catalogue>(CatalogueTableRepository);
 
         //should fill the cache
         cata = rowVerCache.GetAllObjects()[0];
-            
+
         //should return the same instance
         Assert.AreSame(cata, rowVerCache.GetAllObjects()[0]);
 
         cata.DeleteInDatabase();
         Assert.IsEmpty(rowVerCache.GetAllObjects());
-            
+
         //create some catalogues
         new Catalogue(CatalogueRepository, "1");
         new Catalogue(CatalogueRepository, "2");
@@ -50,26 +50,26 @@ public void Test_RowVer()
 
         //give it a fresh object
         var cata2 = new Catalogue(CatalogueRepository, "dddd");
-            
+
         //fresh fetch for this
-        Assert.Contains(cata2,rowVerCache.GetAllObjects());
+        Assert.Contains(cata2, rowVerCache.GetAllObjects());
         Assert.IsFalse(rowVerCache.GetAllObjects().Contains(cata));
-            
+
         //change a value in the background but first make sure that what the cache has is a Equal but not reference to cata2
-        Assert.IsFalse(rowVerCache.GetAllObjects().Any(o=>ReferenceEquals(o,cata2)));
-        Assert.IsTrue(rowVerCache.GetAllObjects().Any(o=>Equals(o,cata2)));
+        Assert.IsFalse(rowVerCache.GetAllObjects().Any(o => ReferenceEquals(o, cata2)));
+        Assert.IsTrue(rowVerCache.GetAllObjects().Any(o => Equals(o, cata2)));
 
         cata2.Name = "boom";
         cata2.SaveToDatabase();
-            
-        Assert.AreEqual(1,rowVerCache.GetAllObjects().Count(c=>c.Name.Equals("boom")));
-            
+
+        Assert.AreEqual(1, rowVerCache.GetAllObjects().Count(c => c.Name.Equals("boom")));
+
         cata2.Name = "vroom";
         cata2.SaveToDatabase();
-            
-        Assert.AreEqual(1,rowVerCache.GetAllObjects().Count(c=>c.Name.Equals("vroom")));
 
-        Assert.AreEqual(1,rowVerCache.GetAllObjects().Count(c=>c.Name.Equals("vroom")));
+        Assert.AreEqual(1, rowVerCache.GetAllObjects().Count(c => c.Name.Equals("vroom")));
+
+        Assert.AreEqual(1, rowVerCache.GetAllObjects().Count(c => c.Name.Equals("vroom")));
 
         Assert.IsFalse(rowVerCache.Broken);
     }
diff --git a/Rdmp.Core.Tests/Providers/SearchablesMatchScorerTests.cs b/Rdmp.Core.Tests/Providers/SearchablesMatchScorerTests.cs
index 859861db74..32a5b176de 100644
--- a/Rdmp.Core.Tests/Providers/SearchablesMatchScorerTests.cs
+++ b/Rdmp.Core.Tests/Providers/SearchablesMatchScorerTests.cs
@@ -31,8 +31,10 @@ public void Find_ExactMatch_ScoresHigher()
 
         var scorer = new SearchablesMatchScorer();
 
-        var childProvider = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
-        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "FF", CancellationToken.None, new List<Type>());
+        var childProvider =
+            new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
+        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "FF", CancellationToken.None,
+            new List<Type>());
 
         var cataScore = scores.Single(d => Equals(d.Key.Key, cata));
         var projScore = scores.Single(d => Equals(d.Key.Key, proj));
@@ -62,9 +64,11 @@ public void Find_CohortAggregateContainer_ByTypeName(bool userSetting)
         var scorer = new SearchablesMatchScorer();
         scorer.TypeNames.Add("CohortAggregateContainer");
 
-        var childProvider = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
+        var childProvider =
+            new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
 
-        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(),"", CancellationToken.None, new List<Type> { typeof(CohortAggregateContainer)});
+        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "", CancellationToken.None,
+            new List<Type> { typeof(CohortAggregateContainer) });
 
         var score = scores.Single(d => Equals(d.Key.Key, container));
         Assert.Greater(score.Value, 0);
@@ -87,37 +91,34 @@ public void Find_CohortAggregateContainer_ByFreeText(bool userSetting)
         var scorer = new SearchablesMatchScorer();
         scorer.TypeNames.Add("CohortAggregateContainer");
 
-        var childProvider = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
+        var childProvider =
+            new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
 
         // user is searching for the text 'troll'
-        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "troll", CancellationToken.None, new List<Type>());
+        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "troll", CancellationToken.None,
+            new List<Type>());
 
         var score = scores.Single(d => Equals(d.Key.Key, container));
 
-        if(userSetting)
-        {
+        if (userSetting)
             // although the text appears in the search they are not doing it by exact type name and their settings
             // mean they don't want to see these objects by default.
             Assert.AreEqual(0, score.Value);
-        }
         else
-        {
             Assert.Greater(score.Value, 0);
-        }
-            
     }
 
-    [TestCase(true,true,true)]
+    [TestCase(true, true, true)]
     [TestCase(true, false, false)]
     [TestCase(false, true, true)]
     [TestCase(false, false, true)]
     public void TestScoringCatalogueFlag_IsDeprecated(bool hasFlag, bool shouldShow, bool expectedResult)
     {
-        TestScoringFlag((c,eds)=>
+        TestScoringFlag((c, eds) =>
         {
             c.IsDeprecated = hasFlag;
             UserSettings.ShowDeprecatedCatalogues = shouldShow;
-        },expectedResult);
+        }, expectedResult);
     }
 
     [TestCase(true, true, true)]
@@ -139,7 +140,7 @@ public void TestScoringCatalogueFlag_IsColdStorage(bool hasFlag, bool shouldShow
     [TestCase(false, false, true)]
     public void TestScoringCatalogueFlag_IsInternalDataset(bool hasFlag, bool shouldShow, bool expectedResult)
     {
-        TestScoringFlag((c,eds) =>
+        TestScoringFlag((c, eds) =>
         {
             c.IsInternalDataset = hasFlag;
             UserSettings.ShowInternalCatalogues = shouldShow;
@@ -152,12 +153,9 @@ public void TestScoringCatalogueFlag_IsInternalDataset(bool hasFlag, bool should
     [TestCase(false, false, true)]
     public void TestScoringCatalogueFlag_IsExtractable(bool notExtractable, bool shouldShow, bool expectedResult)
     {
-        TestScoringFlag((c,eds) =>
+        TestScoringFlag((c, eds) =>
         {
-            if(notExtractable)
-            {
-                eds.DeleteInDatabase();
-            }
+            if (notExtractable) eds.DeleteInDatabase();
 
             UserSettings.ShowNonExtractableCatalogues = shouldShow;
         }, expectedResult);
@@ -169,7 +167,7 @@ public void TestScoringCatalogueFlag_IsExtractable(bool notExtractable, bool sho
     [TestCase(false, false, true)]
     public void TestScoringCatalogueFlag_IsProjectSpecific(bool projectSpecific, bool shouldShow, bool expectedResult)
     {
-        TestScoringFlag((c,eds) =>
+        TestScoringFlag((c, eds) =>
         {
             if (projectSpecific)
             {
@@ -177,9 +175,11 @@ public void TestScoringCatalogueFlag_IsProjectSpecific(bool projectSpecific, boo
                 eds.Project_ID = 5135;
                 eds.SaveToDatabase();
             }
+
             UserSettings.ShowProjectSpecificCatalogues = shouldShow;
         }, expectedResult);
     }
+
     private void TestScoringFlag(Action<Catalogue, ExtractableDataSet> setter, bool expectedResult)
     {
         // Filter is hungry and eager to please.  If you want to see ProjectSpecific Catalogues then
@@ -201,7 +201,7 @@ private void TestScoringFlag(Action<Catalogue, ExtractableDataSet> setter, bool
         var eds = new ExtractableDataSet(Repository, c);
         eds.SaveToDatabase();
 
-        setter(c,eds);
+        setter(c, eds);
         c.SaveToDatabase();
 
 
@@ -210,31 +210,23 @@ private void TestScoringFlag(Action<Catalogue, ExtractableDataSet> setter, bool
             RespectUserSettings = true
         };
 
-        var childProvider = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
+        var childProvider =
+            new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
 
         // user is searching for the text 'troll'
-        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "Bunny", CancellationToken.None, new List<Type>());
+        var scores = scorer.ScoreMatches(childProvider.GetAllSearchables(), "Bunny", CancellationToken.None,
+            new List<Type>());
 
         var score = scores.Single(d => Equals(d.Key.Key, c));
 
         if (expectedResult)
-        {
-            Assert.Greater(score.Value,0);
-        }
+            Assert.Greater(score.Value, 0);
         else
-        {
             // score 0 and don't be included in results
-            Assert.AreEqual(0,score.Value);
-        }
+            Assert.AreEqual(0, score.Value);
 
         // Cleanup test
-        foreach(var d in Repository.GetAllObjects<ExtractableDataSet>())
-        {
-            d.DeleteInDatabase();
-        }
-        foreach (var cat in Repository.GetAllObjects<Catalogue>())
-        {
-            cat.DeleteInDatabase();
-        }
+        foreach (var d in Repository.GetAllObjects<ExtractableDataSet>()) d.DeleteInDatabase();
+        foreach (var cat in Repository.GetAllObjects<Catalogue>()) cat.DeleteInDatabase();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/QueryCaching/CachedAggregateConfigurationResultsManagerTests.cs b/Rdmp.Core.Tests/QueryCaching/CachedAggregateConfigurationResultsManagerTests.cs
index 0ec81d78a5..67e82b1c96 100644
--- a/Rdmp.Core.Tests/QueryCaching/CachedAggregateConfigurationResultsManagerTests.cs
+++ b/Rdmp.Core.Tests/QueryCaching/CachedAggregateConfigurationResultsManagerTests.cs
@@ -23,7 +23,7 @@ public class CachedAggregateConfigurationResultsManagerTests : QueryCachingDatab
     private Catalogue _cata;
     private AggregateConfiguration _config;
     private CachedAggregateConfigurationResultsManager _manager;
-    private DatabaseColumnRequest _myColSpecification = new("MyCol","varchar(10)");
+    private DatabaseColumnRequest _myColSpecification = new("MyCol", "varchar(10)");
 
 
     [SetUp]
@@ -32,17 +32,16 @@ protected override void SetUp()
         base.SetUp();
 
         _cata =
-            new Catalogue(CatalogueRepository,"CachedAggregateConfigurationResultsManagerTests");
+            new Catalogue(CatalogueRepository, "CachedAggregateConfigurationResultsManagerTests");
 
         _config
             =
-            new AggregateConfiguration(CatalogueRepository,_cata, "CachedAggregateConfigurationResultsManagerTests");
+            new AggregateConfiguration(CatalogueRepository, _cata, "CachedAggregateConfigurationResultsManagerTests");
 
         _manager = new CachedAggregateConfigurationResultsManager(QueryCachingDatabaseServer);
-
     }
 
-        
+
     [Test]
     public void CommitResults_CreatesTablessuccessfully()
     {
@@ -54,14 +53,19 @@ public void CommitResults_CreatesTablessuccessfully()
         dt.Rows.Add("0101310101");
 
         //commit it 3 times, should just overwrite
-        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification, 30));
-        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification, 30));
-        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification, 30));
+        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification,
+            30));
+        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification,
+            30));
+        _manager.CommitResults(new CacheCommitIdentifierList(_config, SomeComplexBitOfSqlCode, dt, _myColSpecification,
+            30));
 
-        var resultsTableName = _manager.GetLatestResultsTableUnsafe(_config, AggregateOperation.IndexedExtractionIdentifierList);
+        var resultsTableName =
+            _manager.GetLatestResultsTableUnsafe(_config, AggregateOperation.IndexedExtractionIdentifierList);
 
 
-        Assert.AreEqual($"IndexedExtractionIdentifierList_AggregateConfiguration{_config.ID}", resultsTableName.GetRuntimeName());
+        Assert.AreEqual($"IndexedExtractionIdentifierList_AggregateConfiguration{_config.ID}",
+            resultsTableName.GetRuntimeName());
 
         var table = DataAccessPortal
             .ExpectDatabase(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing)
@@ -71,25 +75,29 @@ public void CommitResults_CreatesTablessuccessfully()
         var col = table.DiscoverColumn("MyCol");
 
         Assert.IsNotNull(col);
-        Assert.AreEqual("varchar(10)",col.DataType.SQLType);
+        Assert.AreEqual("varchar(10)", col.DataType.SQLType);
 
-        using (var con = DataAccessPortal.ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
+        using (var con = DataAccessPortal
+                   .ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
         {
             con.Open();
 
             var dt2 = new DataTable();
-            var da = new SqlDataAdapter($"Select * from {resultsTableName.GetFullyQualifiedName()}",(SqlConnection)con);
+            var da = new SqlDataAdapter($"Select * from {resultsTableName.GetFullyQualifiedName()}",
+                (SqlConnection)con);
             da.Fill(dt2);
 
-            Assert.AreEqual(dt.Rows.Count,dt2.Rows.Count);
+            Assert.AreEqual(dt.Rows.Count, dt2.Rows.Count);
 
             con.Close();
         }
 
-        Assert.IsNotNull(_manager.GetLatestResultsTable(_config, AggregateOperation.IndexedExtractionIdentifierList, SomeComplexBitOfSqlCode));
-        Assert.IsNull(_manager.GetLatestResultsTable(_config, AggregateOperation.IndexedExtractionIdentifierList, "select name,height,scalecount from fish"));
+        Assert.IsNotNull(_manager.GetLatestResultsTable(_config, AggregateOperation.IndexedExtractionIdentifierList,
+            SomeComplexBitOfSqlCode));
+        Assert.IsNull(_manager.GetLatestResultsTable(_config, AggregateOperation.IndexedExtractionIdentifierList,
+            "select name,height,scalecount from fish"));
     }
-        
+
 
     [Test]
     public void Throws_BecauseItHasDuplicates()
@@ -99,7 +107,9 @@ public void Throws_BecauseItHasDuplicates()
         dt.Rows.Add("0101010101");
         dt.Rows.Add("0101010101");
 
-        var ex = Assert.Throws<Exception>(() => _manager.CommitResults(new CacheCommitIdentifierList(_config, "select * from fish", dt, _myColSpecification, 30)));
+        var ex = Assert.Throws<Exception>(() =>
+            _manager.CommitResults(new CacheCommitIdentifierList(_config, "select * from fish", dt, _myColSpecification,
+                30)));
         Assert.IsTrue(ex.Message.Contains("primary key"));
     }
 
@@ -117,10 +127,9 @@ public void Throws_BecauseInceptionCaching()
         var sql = @"/*Cached:cic_65_People in DMPTestCatalogue*/
 	select * from [cache]..[IndexedExtractionIdentifierList_AggregateConfiguration217]";
 
-        var ex = Assert.Throws<NotSupportedException>(() => _manager.CommitResults(new CacheCommitIdentifierList(_config, sql, dt, _myColSpecification, 30)));
+        var ex = Assert.Throws<NotSupportedException>(() =>
+            _manager.CommitResults(new CacheCommitIdentifierList(_config, sql, dt, _myColSpecification, 30)));
         Assert.IsTrue(ex.Message.Contains("This is referred to as Inception Caching and isn't allowed"));
-
-            
     }
 
     [Test]
@@ -132,27 +141,29 @@ public void NullsAreDropped()
         dt.Rows.Add(DBNull.Value);
         dt.Rows.Add("0101010102");
 
-        _manager.CommitResults(new CacheCommitIdentifierList(_config, "select * from fish", dt, _myColSpecification, 30));
+        _manager.CommitResults(
+            new CacheCommitIdentifierList(_config, "select * from fish", dt, _myColSpecification, 30));
 
-        var resultTable =_manager.GetLatestResultsTable(_config,AggregateOperation.IndexedExtractionIdentifierList, "select * from fish");
+        var resultTable = _manager.GetLatestResultsTable(_config, AggregateOperation.IndexedExtractionIdentifierList,
+            "select * from fish");
 
         var dt2 = new DataTable();
 
-        using (var con = DataAccessPortal.ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
+        using (var con = DataAccessPortal
+                   .ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
         {
             con.Open();
 
             var da = new SqlDataAdapter($"Select * from {resultTable.GetFullyQualifiedName()}",
-                (SqlConnection) con);
+                (SqlConnection)con);
             da.Fill(dt2);
         }
 
-        Assert.AreEqual(2,dt2.Rows.Count);
+        Assert.AreEqual(2, dt2.Rows.Count);
         Assert.IsTrue(dt2.Rows.Cast<DataRow>().Any(r => (string)r[0] == "0101010101"));
         Assert.IsTrue(dt2.Rows.Cast<DataRow>().Any(r => (string)r[0] == "0101010102"));
-
     }
-        
+
     private const string SomeComplexBitOfSqlCode =
         @"USE [QueryCachingDatabase]
 GO
diff --git a/Rdmp.Core.Tests/QueryCaching/DataAccessPortalCollectionTests.cs b/Rdmp.Core.Tests/QueryCaching/DataAccessPortalCollectionTests.cs
index 5d18a72efc..57616d1264 100644
--- a/Rdmp.Core.Tests/QueryCaching/DataAccessPortalCollectionTests.cs
+++ b/Rdmp.Core.Tests/QueryCaching/DataAccessPortalCollectionTests.cs
@@ -34,10 +34,10 @@ public void LoadImplementation()
     public void TestOneServer_CountCorrect(bool singleServer)
     {
         var collection = new DataAccessPointCollection(singleServer);
-        collection.Add(Mock.Of<IDataAccessPoint>(m=>
+        collection.Add(Mock.Of<IDataAccessPoint>(m =>
             m.Server == "loco" &&
             m.DatabaseType == DatabaseType.Oracle));
-        Assert.AreEqual(1,collection.Points.Count);
+        Assert.AreEqual(1, collection.Points.Count);
     }
 
     [Test]
@@ -48,20 +48,20 @@ public void TestTwo_SameServer_PersistDatabase()
         collection.Add(Mock.Of<IDataAccessPoint>(m =>
             m.Server == "loco" &&
             m.Database == "B" &&
-            m.DatabaseType == DatabaseType.Oracle && 
+            m.DatabaseType == DatabaseType.Oracle &&
             m.GetQuerySyntaxHelper() == OracleQuerySyntaxHelper.Instance));
 
         collection.Add(Mock.Of<IDataAccessPoint>(m =>
             m.Server == "loco" &&
             m.Database == "B" &&
-            m.DatabaseType == DatabaseType.Oracle && 
+            m.DatabaseType == DatabaseType.Oracle &&
             m.GetQuerySyntaxHelper() == OracleQuerySyntaxHelper.Instance));
 
         Assert.AreEqual(2, collection.Points.Count);
 
         //they both go to B so the single server should specify B
         var db = collection.GetDistinctServer().GetCurrentDatabase();
-        Assert.AreEqual("B",db.GetRuntimeName());
+        Assert.AreEqual("B", db.GetRuntimeName());
     }
 
     [Test]
@@ -95,9 +95,9 @@ public void TestTwo_SameServer_SameCredentials()
             m.Server == "loco" &&
             m.Database == "B" &&
             m.DatabaseType == DatabaseType.Oracle &&
-            m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(u=>
-                u.Username == "ff"&&
-                u.GetDecryptedPassword() == "pwd")));  
+            m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(u =>
+                u.Username == "ff" &&
+                u.GetDecryptedPassword() == "pwd")));
 
         collection.Add(Mock.Of<IDataAccessPoint>(m =>
             m.Server == "loco" &&
@@ -132,7 +132,8 @@ public void TestTwo_SameServer_OnlyOneUsesCredentials()
         );
 
         //should be relevant error and it shouldn't have been added
-        StringAssert.Contains("collection could not agree whether to use Credentials or not", ex.InnerException.Message);
+        StringAssert.Contains("collection could not agree whether to use Credentials or not",
+            ex.InnerException.Message);
         Assert.AreEqual(1, collection.Points.Count);
     }
 
@@ -155,13 +156,15 @@ public void TestTwo_SameServer_DifferentUsernames()
                 m.Server == "loco" &&
                 m.Database == "A" &&
                 m.DatabaseType == DatabaseType.Oracle &&
-                m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(u =>
-                    u.Username == "user2" &&
-                    u.GetDecryptedPassword() == "pwd")))
+                m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(
+                    u =>
+                        u.Username == "user2" &&
+                        u.GetDecryptedPassword() == "pwd")))
         );
 
         //should be relevant error and it shouldn't have been added
-        StringAssert.Contains("could not agree on a single Username to use to access the data under", ex.InnerException.Message);
+        StringAssert.Contains("could not agree on a single Username to use to access the data under",
+            ex.InnerException.Message);
         Assert.AreEqual(1, collection.Points.Count);
     }
 
@@ -184,13 +187,15 @@ public void TestTwo_SameServer_DifferentPasswords()
                 m.Server == "loco" &&
                 m.Database == "A" &&
                 m.DatabaseType == DatabaseType.Oracle &&
-                m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(u =>
-                    u.Username == "user1" &&
-                    u.GetDecryptedPassword() == "pwd2")))
+                m.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing) == Mock.Of<IDataAccessCredentials>(
+                    u =>
+                        u.Username == "user1" &&
+                        u.GetDecryptedPassword() == "pwd2")))
         );
 
         //should be relevant error and it shouldn't have been added
-        StringAssert.Contains("collection could not agree on a single Password to use to access the data under", ex.InnerException.Message);
+        StringAssert.Contains("collection could not agree on a single Password to use to access the data under",
+            ex.InnerException.Message);
         Assert.AreEqual(1, collection.Points.Count);
     }
 
diff --git a/Rdmp.Core.Tests/QueryCaching/ExtractableAggregateCachingTests.cs b/Rdmp.Core.Tests/QueryCaching/ExtractableAggregateCachingTests.cs
index fa4ee3ac52..57f7f0f13f 100644
--- a/Rdmp.Core.Tests/QueryCaching/ExtractableAggregateCachingTests.cs
+++ b/Rdmp.Core.Tests/QueryCaching/ExtractableAggregateCachingTests.cs
@@ -17,9 +17,8 @@
 
 namespace Rdmp.Core.Tests.QueryCaching;
 
-public class ExtractableAggregateCachingTests:QueryCachingDatabaseTests
+public class ExtractableAggregateCachingTests : QueryCachingDatabaseTests
 {
-
     private Catalogue _cata;
     private AggregateConfiguration _config;
     private CachedAggregateConfigurationResultsManager _manager;
@@ -34,12 +33,12 @@ protected override void SetUp()
         base.SetUp();
 
         _cata =
-            new Catalogue(CatalogueRepository,"ExtractableAggregateCachingTests");
+            new Catalogue(CatalogueRepository, "ExtractableAggregateCachingTests");
+
+        _table = new TableInfo(CatalogueRepository, "ExtractableAggregateCachingTests");
+        _columnInfo = new ColumnInfo(CatalogueRepository, "Col1", "varchar(1000)", _table);
 
-        _table = new TableInfo(CatalogueRepository,"ExtractableAggregateCachingTests");
-        _columnInfo = new ColumnInfo(CatalogueRepository,"Col1", "varchar(1000)", _table);
-            
-        _catalogueItem = new CatalogueItem(CatalogueRepository,_cata, "Col1");
+        _catalogueItem = new CatalogueItem(CatalogueRepository, _cata, "Col1");
 
 
         _extractionInformation = new ExtractionInformation(CatalogueRepository, _catalogueItem, _columnInfo, "Col1");
@@ -50,29 +49,32 @@ protected override void SetUp()
             new AggregateConfiguration(CatalogueRepository, _cata, "ExtractableAggregateCachingTests");
 
         _manager = new CachedAggregateConfigurationResultsManager(QueryCachingDatabaseServer);
-
     }
 
-        
+
     [Test]
     public void BasicCase()
     {
-        var ex = Assert.Throws<ArgumentException>(()=>_manager.CommitResults(new CacheCommitExtractableAggregate(_config,"I've got a lovely bunch of coconuts",new DataTable(),30 )));
+        var ex = Assert.Throws<ArgumentException>(() =>
+            _manager.CommitResults(new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts",
+                new DataTable(), 30)));
 
-                
-        Assert.IsTrue(ex.Message.StartsWith("The DataTable that you claimed was an ExtractableAggregateResults had zero columns and therefore cannot be cached"));
+
+        Assert.IsTrue(ex.Message.StartsWith(
+            "The DataTable that you claimed was an ExtractableAggregateResults had zero columns and therefore cannot be cached"));
 
         var dt = new DataTable();
         dt.Columns.Add("Col1");
         dt.Rows.Add("fishy!");
 
-        var ex2 = Assert.Throws<NotSupportedException>(() => _manager.CommitResults(new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
+        var ex2 = Assert.Throws<NotSupportedException>(() =>
+            _manager.CommitResults(
+                new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
 
         Assert.IsTrue(
             ex2.Message.StartsWith(
                 "Aggregate ExtractableAggregateCachingTests is not marked as IsExtractable therefore cannot be cached"));
 
-            
 
         _config.IsExtractable = true;
         _config.SaveToDatabase();
@@ -85,7 +87,9 @@ public void BasicCase()
         var dim = new AggregateDimension(CatalogueRepository, _extractionInformation, _config);
         _config.ClearAllInjections();
 
-        var ex3 = Assert.Throws<NotSupportedException>(() => _manager.CommitResults(new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
+        var ex3 = Assert.Throws<NotSupportedException>(() =>
+            _manager.CommitResults(
+                new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
 
         Assert.IsTrue(
             ex3.Message.StartsWith(
@@ -95,22 +99,24 @@ public void BasicCase()
         _extractionInformation.SaveToDatabase();
         _config.ClearAllInjections();
 
-        Assert.DoesNotThrow(() => _manager.CommitResults(new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
+        Assert.DoesNotThrow(() =>
+            _manager.CommitResults(
+                new CacheCommitExtractableAggregate(_config, "I've got a lovely bunch of coconuts", dt, 30)));
 
         dim.DeleteInDatabase();
 
 
-        using (var con = DataAccessPortal.ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
+        using (var con = DataAccessPortal
+                   .ExpectServer(QueryCachingDatabaseServer, DataAccessContext.InternalDataProcessing).GetConnection())
         {
-
             var table = _manager.GetLatestResultsTableUnsafe(_config, AggregateOperation.ExtractableAggregateResults);
-    
+
             con.Open();
-            using(var cmd = DatabaseCommandHelper.GetCommand($"Select * from {table.GetFullyQualifiedName()}", con))
+            using (var cmd = DatabaseCommandHelper.GetCommand($"Select * from {table.GetFullyQualifiedName()}", con))
             using (var r = cmd.ExecuteReader())
             {
                 Assert.IsTrue(r.Read());
-                Assert.AreEqual("fishy!",r["Col1"]);
+                Assert.AreEqual("fishy!", r["Col1"]);
             }
         }
     }
diff --git a/Rdmp.Core.Tests/QueryCaching/QueryCachingCrossServerTests.cs b/Rdmp.Core.Tests/QueryCaching/QueryCachingCrossServerTests.cs
index 7d09b6452a..bb36ef57ae 100644
--- a/Rdmp.Core.Tests/QueryCaching/QueryCachingCrossServerTests.cs
+++ b/Rdmp.Core.Tests/QueryCaching/QueryCachingCrossServerTests.cs
@@ -26,14 +26,14 @@
 
 namespace Rdmp.Core.Tests.QueryCaching;
 
-internal class QueryCachingCrossServerTests: TestsRequiringA
+internal class QueryCachingCrossServerTests : TestsRequiringA
 {
-    [TestCase(DatabaseType.MicrosoftSQLServer,typeof(QueryCachingPatcher))]
+    [TestCase(DatabaseType.MicrosoftSQLServer, typeof(QueryCachingPatcher))]
     [TestCase(DatabaseType.MySql, typeof(QueryCachingPatcher))]
     [TestCase(DatabaseType.Oracle, typeof(QueryCachingPatcher))]
     [TestCase(DatabaseType.PostgreSql, typeof(QueryCachingPatcher))]
     [TestCase(DatabaseType.MicrosoftSQLServer, typeof(DataQualityEnginePatcher))]
-    public void Create_QueryCache(DatabaseType dbType,Type patcherType)
+    public void Create_QueryCache(DatabaseType dbType, Type patcherType)
     {
         var db = GetCleanedServer(dbType);
 
@@ -49,15 +49,14 @@ public void Create_QueryCache(DatabaseType dbType,Type patcherType)
     /// second server is the cache server
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCase(DatabaseType.MySql,true)]
-    [TestCase(DatabaseType.MySql,false)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,false)]
+    [TestCase(DatabaseType.MySql, true)]
+    [TestCase(DatabaseType.MySql, false)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, false)]
     //[TestCase(DatabaseType.Oracle,true)] //Oracle FAnsi doesn't currently support parameters
     //[TestCase(DatabaseType.Oracle,false)]
     public void Test_SingleServer_WithOneParameter(DatabaseType dbType, bool useParameter)
     {
-
         /*
          *           Server1                        Server2
          *       _____________________         _____________________
@@ -76,22 +75,25 @@ public void Test_SingleServer_WithOneParameter(DatabaseType dbType, bool usePara
         people.GeneratePeople(5000, r);
 
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "cic");
-        var ac1 = SetupAggregateConfigurationWithFilter(server1, people, r, cic,useParameter,"@date_of_max","'2001-01-01'");
+        var ac1 = SetupAggregateConfigurationWithFilter(server1, people, r, cic, useParameter, "@date_of_max",
+            "'2001-01-01'");
 
         cic.CreateRootContainerIfNotExists();
         cic.QueryCachingServer_ID = cache.ID;
         cic.SaveToDatabase();
 
         var root = cic.RootCohortAggregateContainer;
-        root.AddChild(ac1,0);
+        root.AddChild(ac1, 0);
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
         runner.Run(new CancellationToken());
 
         AssertNoErrors(compiler);
-            
-        Assert.IsTrue(compiler.Tasks.Where(t=>t.Key is AggregationContainerTask).Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")), "Expected UNION container to use the cache");
+
+        Assert.IsTrue(
+            compiler.Tasks.Where(t => t.Key is AggregationContainerTask)
+                .Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")), "Expected UNION container to use the cache");
     }
 
     /// <summary>
@@ -100,21 +102,20 @@ public void Test_SingleServer_WithOneParameter(DatabaseType dbType, bool usePara
     /// overwrite one another.
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCase(DatabaseType.MySql,true)]
+    [TestCase(DatabaseType.MySql, true)]
     //[TestCase(DatabaseType.MySql,false)] //only works with cache because container operations (UNION) are not supported on MySql
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,false)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, false)]
     //[TestCase(DatabaseType.Oracle)] //Oracle FAnsi doesn't currently support parameters
-    public void Test_SingleServer_WithTwoParameters(DatabaseType dbType,bool useCache)
+    public void Test_SingleServer_WithTwoParameters(DatabaseType dbType, bool useCache)
     {
-
         /*
          *           Server1                        Server2
          *        ____________________         _____________________
          *        |HospitalAdmissions |   →    |      Cache         |
          *           @date_of_max
-         *        ____________________     ↗   
-         *        |HospitalAdmissions |      
+         *        ____________________     ↗
+         *        |HospitalAdmissions |
          *           @date_of_max
          *
          *   (has different value so rename operations come into effect)
@@ -123,7 +124,7 @@ public void Test_SingleServer_WithTwoParameters(DatabaseType dbType,bool useCach
         var server1 = GetCleanedServer(dbType);
         var server2 = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
 
-        var cache = useCache ? CreateCache(server2): null;
+        var cache = useCache ? CreateCache(server2) : null;
 
         var r = new Random(500);
         var people = new PersonCollection();
@@ -131,16 +132,16 @@ public void Test_SingleServer_WithTwoParameters(DatabaseType dbType,bool useCach
 
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "cic");
 
-        var ac1 = SetupAggregateConfigurationWithFilter(server1, people, r, cic,true,"@date_of_max","'2001-01-01'");
-        var ac2 = SetupAggregateConfigurationWithFilter(server1, people, r, cic,true,"@date_of_max","'2005-01-01'");
+        var ac1 = SetupAggregateConfigurationWithFilter(server1, people, r, cic, true, "@date_of_max", "'2001-01-01'");
+        var ac2 = SetupAggregateConfigurationWithFilter(server1, people, r, cic, true, "@date_of_max", "'2005-01-01'");
 
         cic.CreateRootContainerIfNotExists();
         cic.QueryCachingServer_ID = cache?.ID;
         cic.SaveToDatabase();
 
         var root = cic.RootCohortAggregateContainer;
-        root.AddChild(ac1,0);
-        root.AddChild(ac2,1);
+        root.AddChild(ac1, 0);
+        root.AddChild(ac2, 1);
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
@@ -149,47 +150,48 @@ public void Test_SingleServer_WithTwoParameters(DatabaseType dbType,bool useCach
         AssertNoErrors(compiler);
 
         //each container on its own ran with the normal SQL
-        AssertNoErrors(compiler,ac1,"@date_of_max='2001-01-01'");
-        AssertNoErrors(compiler,ac2,"@date_of_max='2005-01-01'");
+        AssertNoErrors(compiler, ac1, "@date_of_max='2001-01-01'");
+        AssertNoErrors(compiler, ac2, "@date_of_max='2005-01-01'");
 
 
         if (useCache)
         {
             //the root container run with dual cache fetch and no parameters
-            AssertNoErrors(compiler,root,"IndexedExtractionIdentifierList");
-            AssertCacheUsed(compiler,root,"2/2");
+            AssertNoErrors(compiler, root, "IndexedExtractionIdentifierList");
+            AssertCacheUsed(compiler, root, "2/2");
         }
         else
         {
             //the root container ran with a rename operations (no cache available)
-            AssertNoErrors(compiler,root,"@date_of_max='2001-01-01'","@date_of_max_2='2005-01-01'");
-            AssertCacheUsed(compiler,root,"0/2");
+            AssertNoErrors(compiler, root, "@date_of_max='2001-01-01'", "@date_of_max_2='2005-01-01'");
+            AssertCacheUsed(compiler, root, "0/2");
         }
     }
+
     /// <summary>
     /// Tests running a simple cic a cohort that has a parameter and a patient index table which also has a parameter.
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCase(DatabaseType.MySql,true,true)]
-    [TestCase(DatabaseType.MySql,true,false)]
-    [TestCase(DatabaseType.MySql,false,true)]
-    [TestCase(DatabaseType.MySql,false,false)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,true,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,true,false)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,false,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,false,false)]
-    public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType dbType,bool useSameName,bool useCache)
+    [TestCase(DatabaseType.MySql, true, true)]
+    [TestCase(DatabaseType.MySql, true, false)]
+    [TestCase(DatabaseType.MySql, false, true)]
+    [TestCase(DatabaseType.MySql, false, false)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true, false)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, false, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, false, false)]
+    public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType dbType, bool useSameName,
+        bool useCache)
     {
-
         /*
          *           Server1                                  (Also Server1 - if useCache is true)
          *        ______________________________            __________________________
          *        |   Patient Index Table       |     →    |         Cache           |
-         *        |  (NA by date )              |         ↗ 
+         *        |  (NA by date )              |         ↗
          *           @date_of_max '2001-01-01'
-         *                                              ↗  
+         *                                              ↗
          *            JOIN (should use cache)
-         *         ___________________________       ↗   
+         *         ___________________________       ↗
          *        | Hospitalised after NA (ac) |
          *          @date_of_max (or @maximum) '2005-01-01'
          *
@@ -198,7 +200,7 @@ public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType db
 
         var server1 = GetCleanedServer(dbType);
 
-        var cache = useCache? CreateCache(server1): null;
+        var cache = useCache ? CreateCache(server1) : null;
 
         var r = new Random(500);
         var people = new PersonCollection();
@@ -206,16 +208,17 @@ public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType db
 
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "cic");
 
-        var patientIndexTable = SetupPatientIndexTableWithFilter(server1, people, r, cic,true,"@date_of_max","'2001-01-01'");
-        var ac = SetupPatientIndexTableUserWithFilter(server1, people, r, cic,patientIndexTable,true,
-            useSameName ? "@date_of_max": "@maximum","'2005-01-01'");
+        var patientIndexTable =
+            SetupPatientIndexTableWithFilter(server1, people, r, cic, true, "@date_of_max", "'2001-01-01'");
+        var ac = SetupPatientIndexTableUserWithFilter(server1, people, r, cic, patientIndexTable, true,
+            useSameName ? "@date_of_max" : "@maximum", "'2005-01-01'");
 
         cic.CreateRootContainerIfNotExists();
         cic.QueryCachingServer_ID = cache?.ID;
         cic.SaveToDatabase();
 
         var root = cic.RootCohortAggregateContainer;
-        root.AddChild(ac,0);
+        root.AddChild(ac, 0);
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
@@ -223,24 +226,27 @@ public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType db
 
         if (useSameName)
         {
-            AssertCrashed(compiler, ac, "PatientIndexTables cannot have parameters with the same name as their users.  Offending parameter(s) were @date_of_max");
+            AssertCrashed(compiler, ac,
+                "PatientIndexTables cannot have parameters with the same name as their users.  Offending parameter(s) were @date_of_max");
         }
         else
         {
             if (useCache)
             {
                 //we should hit up the cache for the interior of the query and therefore not need the parameter
-                AssertNoErrors(compiler,ac,"@maximum='2005-01-01'","JoinableInceptionQuery_AggregateConfiguration","AdmissionDate. < @maximum");
+                AssertNoErrors(compiler, ac, "@maximum='2005-01-01'", "JoinableInceptionQuery_AggregateConfiguration",
+                    "AdmissionDate. < @maximum");
 
                 AssertCacheUsed(compiler, root, "1/1");
             }
             else
-                AssertNoErrors(compiler,ac,"@date_of_max='2001-01-01'","@maximum='2005-01-01'","SampleDate. < @date_of_max","AdmissionDate. < @maximum");
+            {
+                AssertNoErrors(compiler, ac, "@date_of_max='2001-01-01'", "@maximum='2005-01-01'",
+                    "SampleDate. < @date_of_max", "AdmissionDate. < @maximum");
+            }
 
             AssertNoErrors(compiler);
         }
-                
-            
     }
 
 
@@ -249,10 +255,9 @@ public void Test_SingleServerPatientIndexTable_WithTwoParameters(DatabaseType db
     /// patients
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Test_EXCEPT_TwoAggregates(DatabaseType dbType)
     {
-
         /*
          *           Server1
          *       _____________________
@@ -288,8 +293,8 @@ public void Test_EXCEPT_TwoAggregates(DatabaseType dbType)
         root.Operation = SetOperation.EXCEPT;
         root.Name = "EXCEPT";
         root.SaveToDatabase();
-        root.AddChild(ac1,0);
-        root.AddChild(ac2,1);
+        root.AddChild(ac1, 0);
+        root.AddChild(ac2, 1);
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
@@ -299,18 +304,25 @@ public void Test_EXCEPT_TwoAggregates(DatabaseType dbType)
         if (dbType == DatabaseType.MySql)
         {
             var crashed = compiler.Tasks.Single(t => t.Key.State == CompilationState.Crashed);
-            StringAssert.Contains("INTERSECT / UNION / EXCEPT are not supported by MySql", crashed.Key.CrashMessage.Message);
+            StringAssert.Contains("INTERSECT / UNION / EXCEPT are not supported by MySql",
+                crashed.Key.CrashMessage.Message);
             return;
         }
 
         AssertNoErrors(compiler);
 
 
-        Assert.AreEqual(compiler.Tasks.Single(t=> t.Value!=null && t.Value.IsResultsForRootContainer).Key.FinalRowCount,0);
-        Assert.Greater(compiler.Tasks.Single(t=>t.Key is AggregationTask at && at.Aggregate.Equals(ac1)).Key.FinalRowCount, 0); //both ac should have the same total
-        Assert.Greater(compiler.Tasks.Single(t => t.Key is AggregationTask at && at.Aggregate.Equals(ac2)).Key.FinalRowCount, 0); // that is not 0
-            
-        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("2/2")), "Expected EXCEPT container to use the cache");
+        Assert.AreEqual(
+            compiler.Tasks.Single(t => t.Value != null && t.Value.IsResultsForRootContainer).Key.FinalRowCount, 0);
+        Assert.Greater(
+            compiler.Tasks.Single(t => t.Key is AggregationTask at && at.Aggregate.Equals(ac1)).Key.FinalRowCount,
+            0); //both ac should have the same total
+        Assert.Greater(
+            compiler.Tasks.Single(t => t.Key is AggregationTask at && at.Aggregate.Equals(ac2)).Key.FinalRowCount,
+            0); // that is not 0
+
+        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("2/2")),
+            "Expected EXCEPT container to use the cache");
     }
 
     /// <summary>
@@ -321,13 +333,13 @@ public void Test_EXCEPT_TwoAggregates(DatabaseType dbType)
     /// </summary>
     /// <param name="dbType"></param>
     /// <param name="createQueryCache"></param>
-    [TestCase(DatabaseType.Oracle,true)]
-    [TestCase(DatabaseType.MySql,true)]
-    [TestCase(DatabaseType.MicrosoftSQLServer,true)]
+    [TestCase(DatabaseType.Oracle, true)]
+    [TestCase(DatabaseType.MySql, true)]
+    [TestCase(DatabaseType.MicrosoftSQLServer, true)]
     [TestCase(DatabaseType.Oracle, false)]
     [TestCase(DatabaseType.MySql, false)]
     [TestCase(DatabaseType.MicrosoftSQLServer, false)]
-    public void Join_PatientIndexTable_OptionalCacheOnSameServer(DatabaseType dbType,bool createQueryCache)
+    public void Join_PatientIndexTable_OptionalCacheOnSameServer(DatabaseType dbType, bool createQueryCache)
     {
         /*
          *           Server1
@@ -350,18 +362,18 @@ public void Join_PatientIndexTable_OptionalCacheOnSameServer(DatabaseType dbType
 
         var r = new Random(500);
         var people = new PersonCollection();
-        people.GeneratePeople(5000,r);
+        people.GeneratePeople(5000, r);
 
         var cic = new CohortIdentificationConfiguration(CatalogueRepository, "cic");
 
-        var joinable = SetupPatientIndexTable(db,people,r,cic);
-            
+        var joinable = SetupPatientIndexTable(db, people, r, cic);
+
         cic.CreateRootContainerIfNotExists();
         cic.QueryCachingServer_ID = cache?.ID;
         cic.SaveToDatabase();
 
         var hospitalAdmissions = SetupPatientIndexTableUser(db, people, r, cic, joinable);
-        cic.RootCohortAggregateContainer.AddChild(hospitalAdmissions,0);
+        cic.RootCohortAggregateContainer.AddChild(hospitalAdmissions, 0);
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
@@ -370,11 +382,14 @@ public void Join_PatientIndexTable_OptionalCacheOnSameServer(DatabaseType dbType
 
         AssertNoErrors(compiler);
 
-        if(createQueryCache)
-            Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")), "Expected cache to be used for the joinable");
+        if (createQueryCache)
+            Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")),
+                "Expected cache to be used for the joinable");
         else
-            Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("0/1")), "Did not create cache so expected cache usage to be 0");
+            Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("0/1")),
+                "Did not create cache so expected cache usage to be 0");
     }
+
     /// <summary>
     /// Tests the ability to run a cic in which there are 2 tables, one patient index table with the dates of biochemistry test codes
     /// and another which joins and filters on the results of that table to produce a count of patients hospitalised after an NA test.
@@ -382,14 +397,14 @@ public void Join_PatientIndexTable_OptionalCacheOnSameServer(DatabaseType dbType
     /// <para>In this case the cache is on another server so we cannot use the cached result for a join and should not try</para>
     /// </summary>
     /// <param name="dbType"></param>
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Join_PatientIndexTable_DoNotUseCacheOnDifferentServer(DatabaseType dbType)
     {
         /*
          *           Server1                    Server 2
          *         _____________                _________
          *        |Biochemistry|    →          | Cache  | (cache is still populated but not used in the resulting join).
-         *               
+         *
          *            ↓ join ↓    (do not use cache)
          *    _____________________
          *    | Hospital Admissions|
@@ -422,12 +437,13 @@ public void Join_PatientIndexTable_DoNotUseCacheOnDifferentServer(DatabaseType d
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
-            
+
         runner.Run(new CancellationToken());
 
         AssertNoErrors(compiler);
-            
-        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")),"Expected cache to be used only for the final UNION");
+
+        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")),
+            "Expected cache to be used only for the final UNION");
     }
 
     /// <summary>
@@ -444,7 +460,7 @@ public void Join_PatientIndexTable_NotOnCacheServer()
          *           Server1                    Server 2
          *         _____________                _________
          *        |Biochemistry|    →          | Cache  |  (cache must first be populated)
-         *               
+         *
          *                        ↘ join   ↘ (must use cache)
          *                                  _____________________
          *                                  | Hospital Admissions|
@@ -473,12 +489,13 @@ public void Join_PatientIndexTable_NotOnCacheServer()
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
-            
+
         runner.Run(new CancellationToken());
 
         AssertNoErrors(compiler);
-            
-        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")),"Expected cache to be used only for the final UNION");
+
+        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("1/1")),
+            "Expected cache to be used only for the final UNION");
     }
 
 
@@ -497,8 +514,8 @@ public void Join_PatientIndexTable_ThreeServers()
         /*
          *           Server1                    Server 2                                Server 3
          *         _____________                                                       _________
-         *        |Biochemistry|    →          (successfully caches joinable bit)      | Cache  |  
-         *               
+         *        |Biochemistry|    →          (successfully caches joinable bit)      | Cache  |
+         *
          *                        ↘ join   ↘ (should crash)
          *                                  _____________________
          *                                  | Hospital Admissions|
@@ -528,33 +545,35 @@ public void Join_PatientIndexTable_ThreeServers()
 
         var compiler = new CohortCompiler(cic);
         var runner = new CohortCompilerRunner(compiler, 50000);
-            
+
         runner.Run(new CancellationToken());
 
-        var hospitalAdmissionsTask = compiler.Tasks.Keys.OfType<AggregationTask>().Single(t => t.Aggregate.Equals(hospitalAdmissions));
+        var hospitalAdmissionsTask = compiler.Tasks.Keys.OfType<AggregationTask>()
+            .Single(t => t.Aggregate.Equals(hospitalAdmissions));
 
-        Assert.AreEqual(CompilationState.Crashed,hospitalAdmissionsTask.State);
+        Assert.AreEqual(CompilationState.Crashed, hospitalAdmissionsTask.State);
 
-        StringAssert.Contains("is not fully cached and CacheUsageDecision is MustUse",hospitalAdmissionsTask.CrashMessage.ToString());
+        StringAssert.Contains("is not fully cached and CacheUsageDecision is MustUse",
+            hospitalAdmissionsTask.CrashMessage.ToString());
     }
 
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     public void Join_PatientIndexTable_ThenShipToCacheForSets(DatabaseType dbType)
     {
         /*
-        *           Server1                    Server 2
-        *         _____________                _________
-        *        |Biochemistry|    →          | Cache  | (cache is still populated but not used in the resulting join).
-        *               
-        *            ↓ join ↓    (do not use cache)
-        *    _______________________
-        *    | Hospital Admissions 1|        →       results1
-        *
-        *            EXCEPT
-        *    _______________________
-        *    | Hospital Admissions 2|        →        results 2
+         *           Server1                    Server 2
+         *         _____________                _________
+         *        |Biochemistry|    →          | Cache  | (cache is still populated but not used in the resulting join).
+         *
+         *            ↓ join ↓    (do not use cache)
+         *    _______________________
+         *    | Hospital Admissions 1|        →       results1
+         *
+         *            EXCEPT
+         *    _______________________
+         *    | Hospital Admissions 2|        →        results 2
          *                                          ↓ result = 0 records
-        */
+         */
 
         //get the data database
         var db = GetCleanedServer(dbType);
@@ -562,7 +581,7 @@ public void Join_PatientIndexTable_ThenShipToCacheForSets(DatabaseType dbType)
         //create the cache on the other server type (either Sql Server or Oracle) since  MySql can't do EXCEPT or UNION etc)
         var dbCache =
             GetCleanedServer(Enum.GetValues(typeof(DatabaseType)).Cast<DatabaseType>().First(t =>
-                t != dbType && t!= DatabaseType.MySql));
+                t != dbType && t != DatabaseType.MySql));
 
         var cache = CreateCache(dbCache);
 
@@ -579,7 +598,7 @@ public void Join_PatientIndexTable_ThenShipToCacheForSets(DatabaseType dbType)
         cic.SaveToDatabase();
 
         var hospitalAdmissions = SetupPatientIndexTableUser(db, people, r, cic, joinable);
-        var hospitalAdmissions2 = SetupAggregateConfiguration(db, people,r, cic);
+        var hospitalAdmissions2 = SetupAggregateConfiguration(db, people, r, cic);
 
         var root = cic.RootCohortAggregateContainer;
         root.AddChild(hospitalAdmissions, 0);
@@ -596,7 +615,8 @@ public void Join_PatientIndexTable_ThenShipToCacheForSets(DatabaseType dbType)
 
         AssertNoErrors(compiler);
 
-        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("2/2")), "Expected cache to be used for both top level operations in the EXCEPT");
+        Assert.IsTrue(compiler.Tasks.Any(t => t.Key.GetCachedQueryUseCount().Equals("2/2")),
+            "Expected cache to be used for both top level operations in the EXCEPT");
     }
 
 
@@ -623,16 +643,18 @@ private ExternalDatabaseServer CreateCache(DiscoveredDatabase db)
     /// <param name="r"></param>
     /// <param name="cic"></param>
     /// <returns></returns>
-    private JoinableCohortAggregateConfiguration SetupPatientIndexTable(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic)
+    private JoinableCohortAggregateConfiguration SetupPatientIndexTable(DiscoveredDatabase db, PersonCollection people,
+        Random r, CohortIdentificationConfiguration cic)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
 
         var tbl = CreateDataset<Biochemistry>(db, people, 10000, r);
-        var cata = Import(tbl,out _, out _, out _,out var eis);
+        var cata = Import(tbl, out _, out _, out _, out var eis);
 
         var chi = eis.Single(ei => ei.GetRuntimeName().Equals("chi", StringComparison.CurrentCultureIgnoreCase));
         var code = eis.Single(ei => ei.GetRuntimeName().Equals("TestCode", StringComparison.CurrentCultureIgnoreCase));
-        var date = eis.Single(ei => ei.GetRuntimeName().Equals("SampleDate", StringComparison.CurrentCultureIgnoreCase));
+        var date = eis.Single(ei =>
+            ei.GetRuntimeName().Equals("SampleDate", StringComparison.CurrentCultureIgnoreCase));
 
         chi.IsExtractionIdentifier = true;
         chi.SaveToDatabase();
@@ -642,11 +664,11 @@ private JoinableCohortAggregateConfiguration SetupPatientIndexTable(DiscoveredDa
         ac.AddDimension(code);
         ac.AddDimension(date);
         ac.CountSQL = null;
-            
+
         cic.EnsureNamingConvention(ac);
 
         var and = new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND);
-        var filter = new AggregateFilter(CatalogueRepository,"TestCode is NA",and)
+        var filter = new AggregateFilter(CatalogueRepository, "TestCode is NA", and)
         {
             WhereSQL = $"{syntax.EnsureWrapped("TestCode")} = 'NA'"
         };
@@ -658,12 +680,15 @@ private JoinableCohortAggregateConfiguration SetupPatientIndexTable(DiscoveredDa
         return new JoinableCohortAggregateConfiguration(CatalogueRepository, cic, ac);
     }
 
-    private JoinableCohortAggregateConfiguration SetupPatientIndexTableWithFilter(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic, bool useParameter, string paramName, string paramValue)
+    private JoinableCohortAggregateConfiguration SetupPatientIndexTableWithFilter(DiscoveredDatabase db,
+        PersonCollection people, Random r, CohortIdentificationConfiguration cic, bool useParameter, string paramName,
+        string paramValue)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
 
         var joinable = SetupPatientIndexTable(db, people, r, cic);
-        AddFilter(db,"Test After", $"{syntax.EnsureWrapped("SampleDate")} < ",joinable.AggregateConfiguration,useParameter,paramName,paramValue);
+        AddFilter(db, "Test After", $"{syntax.EnsureWrapped("SampleDate")} < ", joinable.AggregateConfiguration,
+            useParameter, paramName, paramValue);
         return joinable;
     }
 
@@ -676,11 +701,12 @@ private JoinableCohortAggregateConfiguration SetupPatientIndexTableWithFilter(Di
     /// <param name="r"></param>
     /// <param name="cic"></param>
     /// <param name="joinable"></param>
-    private AggregateConfiguration SetupPatientIndexTableUser(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic, JoinableCohortAggregateConfiguration joinable)
+    private AggregateConfiguration SetupPatientIndexTableUser(DiscoveredDatabase db, PersonCollection people, Random r,
+        CohortIdentificationConfiguration cic, JoinableCohortAggregateConfiguration joinable)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
 
-        var ac = SetupAggregateConfiguration(db,people,r,cic);
+        var ac = SetupAggregateConfiguration(db, people, r, cic);
 
         var and = new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND);
         var filter = new AggregateFilter(CatalogueRepository, "Hospitalised after an NA", and)
@@ -698,25 +724,29 @@ private AggregateConfiguration SetupPatientIndexTableUser(DiscoveredDatabase db,
         return ac;
     }
 
-    private AggregateConfiguration SetupPatientIndexTableUserWithFilter(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic, JoinableCohortAggregateConfiguration joinable, bool useParameter, string paramName, string paramValue)
+    private AggregateConfiguration SetupPatientIndexTableUserWithFilter(DiscoveredDatabase db, PersonCollection people,
+        Random r, CohortIdentificationConfiguration cic, JoinableCohortAggregateConfiguration joinable,
+        bool useParameter, string paramName, string paramValue)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
 
-        var ac1 = SetupPatientIndexTableUser(db, people, r, cic,joinable);
+        var ac1 = SetupPatientIndexTableUser(db, people, r, cic, joinable);
 
-        AddFilter(db,"My Filter", $"{syntax.EnsureWrapped("AdmissionDate")} < ", ac1, useParameter, paramName, paramValue);
+        AddFilter(db, "My Filter", $"{syntax.EnsureWrapped("AdmissionDate")} < ", ac1, useParameter, paramName,
+            paramValue);
 
         return ac1;
     }
 
-    private void AddFilter(DiscoveredDatabase db,string filterName, string whereSqlFirstHalf, AggregateConfiguration ac, bool useParameter, string paramName, string paramValue)
+    private void AddFilter(DiscoveredDatabase db, string filterName, string whereSqlFirstHalf,
+        AggregateConfiguration ac, bool useParameter, string paramName, string paramValue)
     {
         var container = new AggregateFilterContainer(CatalogueRepository, FilterContainerOperation.AND);
         ac.RootFilterContainer_ID = container.ID;
         ac.SaveToDatabase();
 
         //create a filter
-        var filter = new AggregateFilter(CatalogueRepository,filterName,container);
+        var filter = new AggregateFilter(CatalogueRepository, filterName, container);
 
         if (useParameter)
         {
@@ -728,10 +758,11 @@ private void AddFilter(DiscoveredDatabase db,string filterName, string whereSqlF
             var parameter = filter.GetFilterFactory().CreateNewParameter(filter, parameterSql);
             parameter.Value = paramValue;
             parameter.SaveToDatabase();
-
         }
         else
+        {
             filter.WhereSQL = whereSqlFirstHalf + paramValue;
+        }
 
         filter.SaveToDatabase();
     }
@@ -744,7 +775,8 @@ private void AddFilter(DiscoveredDatabase db,string filterName, string whereSqlF
     /// <param name="r"></param>
     /// <param name="cic"></param>
     /// <returns></returns>
-    private AggregateConfiguration SetupAggregateConfiguration(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic)
+    private AggregateConfiguration SetupAggregateConfiguration(DiscoveredDatabase db, PersonCollection people, Random r,
+        CohortIdentificationConfiguration cic)
     {
         var existingTbl = db.ExpectTable("HospitalAdmissions");
         var tbl = existingTbl.Exists() ? existingTbl : CreateDataset<HospitalAdmissions>(db, people, 10000, r);
@@ -774,11 +806,13 @@ private AggregateConfiguration SetupAggregateConfiguration(DiscoveredDatabase db
     /// <param name="paramName"></param>
     /// <param name="paramValue"></param>
     /// <returns></returns>
-    private AggregateConfiguration SetupAggregateConfigurationWithFilter(DiscoveredDatabase db, PersonCollection people, Random r, CohortIdentificationConfiguration cic, bool useParameter, string paramName, string paramValue)
+    private AggregateConfiguration SetupAggregateConfigurationWithFilter(DiscoveredDatabase db, PersonCollection people,
+        Random r, CohortIdentificationConfiguration cic, bool useParameter, string paramName, string paramValue)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
         var ac1 = SetupAggregateConfiguration(db, people, r, cic);
-        AddFilter(db, "My Filter", $"{syntax.EnsureWrapped("AdmissionDate")} < ", ac1, useParameter, paramName, paramValue);
+        AddFilter(db, "My Filter", $"{syntax.EnsureWrapped("AdmissionDate")} < ", ac1, useParameter, paramName,
+            paramValue);
         return ac1;
     }
 
@@ -795,20 +829,23 @@ private static void AssertNoErrors(CohortCompiler compiler)
 
         var i = 0;
         foreach (var kvp in compiler.Tasks.Keys)
-            TestContext.WriteLine($"{i++} - {kvp.ToString()} | {kvp.GetType()} | {kvp.State} | {kvp.CrashMessage} | {kvp.FinalRowCount} | {kvp.GetCachedQueryUseCount()}");
-            
-        Assert.IsTrue(compiler.Tasks.All(static t => t.Key.State == CompilationState.Finished), "Expected all tasks to finish without error");
+            TestContext.WriteLine(
+                $"{i++} - {kvp.ToString()} | {kvp.GetType()} | {kvp.State} | {kvp.CrashMessage} | {kvp.FinalRowCount} | {kvp.GetCachedQueryUseCount()}");
+
+        Assert.IsTrue(compiler.Tasks.All(static t => t.Key.State == CompilationState.Finished),
+            "Expected all tasks to finish without error");
     }
 
     /// <summary>
     /// Asserts that the given <paramref name="task"/> (when run on its own) crashed with the given
     /// <see cref="expectedErrorMessageToContain"/>
     /// </summary>
-    private static void AssertCrashed(CohortCompiler compiler, AggregateConfiguration task, string expectedErrorMessageToContain)
+    private static void AssertCrashed(CohortCompiler compiler, AggregateConfiguration task,
+        string expectedErrorMessageToContain)
     {
         var acResult = compiler.Tasks.Single(t => t.Key is AggregationTask a && a.Aggregate.Equals(task));
-        Assert.AreEqual(CompilationState.Crashed,acResult.Key.State);
-        StringAssert.Contains(expectedErrorMessageToContain,acResult.Key.CrashMessage.Message);
+        Assert.AreEqual(CompilationState.Crashed, acResult.Key.State);
+        StringAssert.Contains(expectedErrorMessageToContain, acResult.Key.CrashMessage.Message);
     }
 
     /// <summary>
@@ -826,10 +863,10 @@ private static void AssertNoErrors(CohortCompiler compiler, AggregateConfigurati
         Console.WriteLine($"Build Log For '{task}':");
         Console.WriteLine(acResult.Key.Log);
 
-        Assert.AreEqual(CompilationState.Finished,acResult.Key.State);
+        Assert.AreEqual(CompilationState.Finished, acResult.Key.State);
 
         foreach (var s in expectedSqlBits)
-            StringAssert.IsMatch(s,acResult.Value.CountSQL);
+            StringAssert.IsMatch(s, acResult.Value.CountSQL);
     }
 
     /// <summary>
@@ -843,10 +880,10 @@ private static void AssertNoErrors(CohortCompiler compiler, CohortAggregateConta
         params string[] expectedSqlBits)
     {
         var acResult = compiler.Tasks.Single(t => t.Key is AggregationContainerTask a && a.Container.Equals(task));
-        Assert.AreEqual(CompilationState.Finished,acResult.Key.State);
+        Assert.AreEqual(CompilationState.Finished, acResult.Key.State);
 
         foreach (var s in expectedSqlBits)
-            StringAssert.Contains(s,acResult.Value.CountSQL);
+            StringAssert.Contains(s, acResult.Value.CountSQL);
     }
 
     /// <summary>
@@ -856,13 +893,16 @@ private static void AssertNoErrors(CohortCompiler compiler, CohortAggregateConta
     /// <param name="compiler"></param>
     /// <param name="container"></param>
     /// <param name="expectedCacheUsageCount">The amount you expect to be used of the cache e.g. "2/2" </param>
-    private static void AssertCacheUsed(CohortCompiler compiler, CohortAggregateContainer container, string expectedCacheUsageCount)
+    private static void AssertCacheUsed(CohortCompiler compiler, CohortAggregateContainer container,
+        string expectedCacheUsageCount)
     {
         //cache should have been used
-        var containerResult = compiler.Tasks.Single(t => t.Key is AggregationContainerTask c && c.Container.Equals(container));
-            
-        Assert.AreEqual(CompilationState.Finished,containerResult.Key.State);
-        Assert.AreEqual(expectedCacheUsageCount,containerResult.Key.GetCachedQueryUseCount());
+        var containerResult =
+            compiler.Tasks.Single(t => t.Key is AggregationContainerTask c && c.Container.Equals(container));
+
+        Assert.AreEqual(CompilationState.Finished, containerResult.Key.State);
+        Assert.AreEqual(expectedCacheUsageCount, containerResult.Key.GetCachedQueryUseCount());
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/QueryCaching/QueryCachingDatabaseTests.cs b/Rdmp.Core.Tests/QueryCaching/QueryCachingDatabaseTests.cs
index 2c420294ba..83335daaef 100644
--- a/Rdmp.Core.Tests/QueryCaching/QueryCachingDatabaseTests.cs
+++ b/Rdmp.Core.Tests/QueryCaching/QueryCachingDatabaseTests.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.Tests.QueryCaching;
 
-public class QueryCachingDatabaseTests:DatabaseTests
+public class QueryCachingDatabaseTests : DatabaseTests
 {
     protected string QueryCachingDatabaseName = TestDatabaseNames.GetConsistentName("QueryCaching");
     public DiscoveredDatabase DiscoveredQueryCachingDatabase { get; set; }
@@ -25,17 +25,17 @@ protected override void OneTimeSetUp()
     {
         base.OneTimeSetUp();
 
-        DiscoveredQueryCachingDatabase = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(QueryCachingDatabaseName);
+        DiscoveredQueryCachingDatabase =
+            DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(QueryCachingDatabaseName);
 
-        if(DiscoveredQueryCachingDatabase.Exists())
+        if (DiscoveredQueryCachingDatabase.Exists())
             DiscoveredQueryCachingDatabase.Drop();
 
         var scripter = new MasterDatabaseScriptExecutor(DiscoveredQueryCachingDatabase);
         var p = new QueryCachingPatcher();
         scripter.CreateAndPatchDatabase(p, new ThrowImmediatelyCheckNotifier());
 
-        QueryCachingDatabaseServer = new ExternalDatabaseServer(CatalogueRepository,QueryCachingDatabaseName,p);
+        QueryCachingDatabaseServer = new ExternalDatabaseServer(CatalogueRepository, QueryCachingDatabaseName, p);
         QueryCachingDatabaseServer.SetProperties(DiscoveredQueryCachingDatabase);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
index 7fc669cc83..01ba48e0cf 100644
--- a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
+++ b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
@@ -69,7 +69,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Rdmp.Core.Tests/Reports/CustomMetadataReportTests.cs b/Rdmp.Core.Tests/Reports/CustomMetadataReportTests.cs
index 875b3b5b04..614c68a2e9 100644
--- a/Rdmp.Core.Tests/Reports/CustomMetadataReportTests.cs
+++ b/Rdmp.Core.Tests/Reports/CustomMetadataReportTests.cs
@@ -88,7 +88,8 @@ public void TestCustomMetadataReport_SingleCatalogue(bool oneFile)
             @"| Name | Desc|
 | $Name | $Description |");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", oneFile, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", oneFile, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -120,7 +121,8 @@ public void TestCustomMetadataReport_SingleCatalogueWithNoDQEResults()
             @"| Name | Desc| Range |
 | $Name | $Description | $DQE_StartDate$DQE_EndDate$DQE_DateRange |");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -180,7 +182,8 @@ public void TestCustomMetadataReport_SingleCatalogue_DQEMetrics()
         FileAssert.Exists(outFile);
         var resultText = File.ReadAllText(outFile);
 
-        StringAssert.AreEqualIgnoringCase(@"| Name | Desc| StartYear | EndYear | StartMonth | EndMonth | StartDay | EndDay | Range | TimeField |
+        StringAssert.AreEqualIgnoringCase(
+            @"| Name | Desc| StartYear | EndYear | StartMonth | EndMonth | StartDay | EndDay | Range | TimeField |
 | ffff |  | 2001 | 2002 | 02 | 04 | 01 | 03 | 2001-2002 | mydate |", resultText.TrimEnd());
     }
 
@@ -214,7 +217,8 @@ public void TestCustomMetadataReport_TwoCatalogues(bool oneFile)
 </DataSet>");
 
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata, cata2 }, outDir, template,
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator),
+            new[] { cata, cata2 }, outDir, template,
             oneFile ? "results.xml" : "$Name.xml", oneFile, null);
         cmd.Execute();
 
@@ -261,9 +265,7 @@ public void TestCustomMetadataReport_TwoCatalogues(bool oneFile)
 <Desc>trollolol</Desc>
 <Email></Email>
 </DataSet>".Trim(), resultText2.Trim());
-
         }
-
     }
 
     [TestCase(true)]
@@ -304,8 +306,8 @@ public void TestCustomMetadataReport_CatalogueItems(bool oneFile)
 $end");
 
 
-
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", oneFile, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", oneFile, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -342,7 +344,8 @@ public void TestCustomMetadataReport_TwoCataloguesWithItems()
 | $Name | $Description |
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -388,7 +391,8 @@ public void TestCustomMetadataReport_CatalogueItems_NoEndBlock()
 $foreach CatalogueItem
 | $Name | $Description |");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, null);
         var ex = Assert.Throws<CustomMetadataReportException>(cmd.Execute);
 
         Assert.AreEqual(4, ex.LineNumber);
@@ -422,7 +426,8 @@ public void TestCustomMetadataReport_CatalogueItems_TooManyForeachBlocks()
 $end
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, null);
         var ex = Assert.Throws<CustomMetadataReportException>(cmd.Execute);
 
         Assert.AreEqual(6, ex.LineNumber);
@@ -446,7 +451,6 @@ public void TestNewlineSubstitution()
 
         Assert.AreEqual("aa<br/>bb", report.ReplaceNewlines("aa\r\nbb"));
         Assert.AreEqual("aa<br/>bb", report.ReplaceNewlines("aa\nbb"));
-
     }
 
     [Test]
@@ -487,7 +491,8 @@ about column 2"
 | $Name | $Description |
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, "<br/>");
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, "<br/>");
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -524,7 +529,8 @@ public void TestTableInfoProperties_NoTableInfo()
 Server: $Server
 Description: $Description");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -564,7 +570,8 @@ public void TestTableInfoProperties_OneTableInfo()
 Server: $Server
 Description: $Description");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata }, outDir, template, "$Name.md", false, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { cata },
+            outDir, template, "$Name.md", false, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "ffff.md");
@@ -605,7 +612,8 @@ public void TestCustomMetadataReport_LoopCataloguesPrefix()
 $end
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -668,7 +676,9 @@ public void TestCustomMetadataReport_ColumnInfoDatatype()
 $end
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { ei1.CatalogueItem.Catalogue, ei2.CatalogueItem.Catalogue }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator),
+            new[] { ei1.CatalogueItem.Catalogue, ei2.CatalogueItem.Catalogue }, outDir, template, "Datasets.md", true,
+            null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -693,8 +703,6 @@ public void TestCustomMetadataReport_ColumnInfoDatatype()
     }
 
 
-
-
     [Test]
     public void TestCustomMetadataReport_Nullability_NoDQERun()
     {
@@ -731,7 +739,9 @@ public void TestCustomMetadataReport_Nullability_NoDQERun()
 $end
 $end");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { ei1.CatalogueItem.Catalogue, ei2.CatalogueItem.Catalogue }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator),
+            new[] { ei1.CatalogueItem.Catalogue, ei2.CatalogueItem.Catalogue }, outDir, template, "Datasets.md", true,
+            null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -805,14 +815,15 @@ public void TestCustomMetadataReport_Nullability_WithDQERun()
         var eval1_col1 = Mock.Of<ColumnState>();
         eval1_col1.TargetProperty = "Cata1Col1";
         eval1_col1.CountCorrect = 9;
-        eval1_col1.CountDBNull = 3; // note that this is seperate from the other counts.  A value can be both null and correct.
+        eval1_col1.CountDBNull =
+            3; // note that this is seperate from the other counts.  A value can be both null and correct.
         eval1.ColumnStates = new ColumnState[] { eval1_col1 };
 
         var eval2 = Mock.Of<Evaluation>();
         var eval2_col1 = Mock.Of<ColumnState>();
         eval2_col1.TargetProperty = "Cata2Col1";
         eval2_col1.CountCorrect = 1;
-        eval2_col1.CountMissing= 2;
+        eval2_col1.CountMissing = 2;
         eval2_col1.CountWrong = 3;
         eval2_col1.CountInvalidatesRow = 4;
         eval2_col1.CountDBNull = 5;
@@ -821,7 +832,7 @@ public void TestCustomMetadataReport_Nullability_WithDQERun()
         reporter.EvaluationCache.Add(cata1, eval1);
         reporter.EvaluationCache.Add(cata2, eval2);
 
-        reporter.GenerateReport(new[] {cata1,cata2}, outDir, template, "Datasets.md", true);
+        reporter.GenerateReport(new[] { cata1, cata2 }, outDir, template, "Datasets.md", true);
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
 
@@ -875,7 +886,8 @@ public void TestCustomMetadataReport_LoopCataloguesSuffix()
 
 Get in touch with us at noreply@nobody.com");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -899,6 +911,7 @@ A cool dataset with interesting stuff
 
 Get in touch with us at noreply@nobody.com", resultText.TrimEnd());
     }
+
     [Test]
     public void TestCustomMetadataReport_LoopCataloguesPrefixAndSuffix()
     {
@@ -929,7 +942,8 @@ public void TestCustomMetadataReport_LoopCataloguesPrefixAndSuffix()
 
 Get in touch with us at noreply@nobody.com");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -998,7 +1012,8 @@ public void TestCustomMetadataReport_LoopCataloguesTableOfContents()
 
 Get in touch with us at noreply@nobody.com");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -1057,12 +1072,14 @@ public void TestCustomMetadataReport_ErrorCondition_ExtraStartBlock()
 some more text
 ");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         var ex = Assert.Throws<CustomMetadataReportException>(() => cmd.Execute());
 
         Assert.AreEqual("Unexpected '$foreach Catalogue' before the end of the last one on line 4", ex.Message);
         Assert.AreEqual(4, ex.LineNumber);
     }
+
     [Test]
     public void TestCustomMetadataReport_ErrorCondition_UnexpectedEndBlock()
     {
@@ -1085,7 +1102,8 @@ public void TestCustomMetadataReport_ErrorCondition_UnexpectedEndBlock()
 some more text
 ");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         var ex = Assert.Throws<CustomMetadataReportException>(() => cmd.Execute());
 
         Assert.AreEqual("Error, encountered '$end' on line 3 while not in a $foreach Catalogue block", ex.Message);
@@ -1116,12 +1134,14 @@ public void TestCustomMetadataReport_ErrorCondition_TooManyEndBlocks()
 some more text
 ");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         var ex = Assert.Throws<CustomMetadataReportException>(() => cmd.Execute());
 
         Assert.AreEqual("Error, encountered '$end' on line 5 while not in a $foreach Catalogue block", ex.Message);
         Assert.AreEqual(5, ex.LineNumber);
     }
+
     [Test]
     public void TestCustomMetadataReport_ErrorCondition_MixingTopLevelBlocks()
     {
@@ -1146,12 +1166,16 @@ public void TestCustomMetadataReport_ErrorCondition_MixingTopLevelBlocks()
 some more text
 ");
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         var ex = Assert.Throws<CustomMetadataReportException>(() => cmd.Execute());
 
-        Assert.AreEqual("Error, Unexpected '$foreach CatalogueItem' on line 3.  Current section is plain text, '$foreach CatalogueItem' can only appear within a '$foreach Catalogue' block (you cannot mix and match top level loop elements)", ex.Message);
+        Assert.AreEqual(
+            "Error, Unexpected '$foreach CatalogueItem' on line 3.  Current section is plain text, '$foreach CatalogueItem' can only appear within a '$foreach Catalogue' block (you cannot mix and match top level loop elements)",
+            ex.Message);
         Assert.AreEqual(3, ex.LineNumber);
     }
+
     [Test]
     public void Test_CustomMetadataElementSeperator_ThrowsWhenNotInForEach()
     {
@@ -1170,7 +1194,8 @@ public void Test_CustomMetadataElementSeperator_ThrowsWhenNotInForEach()
 
         File.WriteAllText(template.FullName, templateCode);
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         var ex = Assert.Throws<CustomMetadataReportException>(() => cmd.Execute());
 
         Assert.AreEqual("Unexpected use of $Comma outside of an iteration ($foreach) block", ex.Message);
@@ -1206,7 +1231,8 @@ public void Test_CustomMetadataElementSeperator_JsonExample()
 
         File.WriteAllText(template.FullName, templateCode);
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -1273,7 +1299,8 @@ public void Test_CustomMetadataElementSeperator_JsonExample_SemicolonSub()
 
         File.WriteAllText(template.FullName, templateCode);
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null,";");
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null, ";");
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -1372,7 +1399,7 @@ public void TestAllSubs_Catalogue()
 $DQE_StartDay          
 $DQE_StartMonth        
 $DQE_StartYear";
-            
+
 
         Setup2Catalogues(out var c1, out var c2);
 
@@ -1386,7 +1413,8 @@ public void TestAllSubs_Catalogue()
 
         File.WriteAllText(template.FullName, templateCode);
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
@@ -1448,7 +1476,8 @@ public void TestAllSubs_CatalogueItem()
 
         File.WriteAllText(template.FullName, templateCode);
 
-        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 }, outDir, template, "Datasets.md", true, null);
+        var cmd = new ExecuteCommandExtractMetadata(new ThrowImmediatelyActivator(RepositoryLocator), new[] { c1, c2 },
+            outDir, template, "Datasets.md", true, null);
         cmd.Execute();
 
         var outFile = Path.Combine(outDir.FullName, "Datasets.md");
diff --git a/Rdmp.Core.Tests/Reports/DocumentationReportDatabaseEntitiesTests.cs b/Rdmp.Core.Tests/Reports/DocumentationReportDatabaseEntitiesTests.cs
index dfcf6b89f8..36e6f4bbf7 100644
--- a/Rdmp.Core.Tests/Reports/DocumentationReportDatabaseEntitiesTests.cs
+++ b/Rdmp.Core.Tests/Reports/DocumentationReportDatabaseEntitiesTests.cs
@@ -19,7 +19,7 @@
 
 namespace Rdmp.Core.Tests.Reports;
 
-internal class DocumentationReportDatabaseEntitiesTests:UnitTests
+internal class DocumentationReportDatabaseEntitiesTests : UnitTests
 {
     [Test]
     public void Test_DocumentationReportDatabaseEntities_Normal()
@@ -32,12 +32,10 @@ public void Test_DocumentationReportDatabaseEntities_Normal()
         var reporter = new DocumentationReportDatabaseEntities();
 
         Image img = new Image<Rgba32>(19, 19);
-        img.Mutate(x=>x.Fill(Color.DarkMagenta));
-
-        var iconProvider = Mock.Of<IIconProvider>(m=>m.GetImage(It.IsAny<object>(),It.IsAny<OverlayKind>()) == img);
-
-        reporter.GenerateReport(store, new ThrowImmediatelyCheckNotifier(), iconProvider, MEF,false);
+        img.Mutate(x => x.Fill(Color.DarkMagenta));
 
+        var iconProvider = Mock.Of<IIconProvider>(m => m.GetImage(It.IsAny<object>(), It.IsAny<OverlayKind>()) == img);
 
+        reporter.GenerateReport(store, new ThrowImmediatelyCheckNotifier(), iconProvider, MEF, false);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Reports/ExtractionTime/WordDataReleaseFileGeneratorTests.cs b/Rdmp.Core.Tests/Reports/ExtractionTime/WordDataReleaseFileGeneratorTests.cs
index 816e897854..6faa07f36d 100644
--- a/Rdmp.Core.Tests/Reports/ExtractionTime/WordDataReleaseFileGeneratorTests.cs
+++ b/Rdmp.Core.Tests/Reports/ExtractionTime/WordDataReleaseFileGeneratorTests.cs
@@ -11,14 +11,14 @@
 
 namespace Rdmp.Core.Tests.Reports.ExtractionTime;
 
-internal class WordDataReleaseFileGeneratorTests:TestsRequiringAnExtractionConfiguration
+internal class WordDataReleaseFileGeneratorTests : TestsRequiringAnExtractionConfiguration
 {
     [Test]
     public void Test_WordDataReleaseFileGenerator_Normal()
     {
-        var report = new WordDataReleaseFileGenerator(_configuration,_configuration.DataExportRepository);
+        var report = new WordDataReleaseFileGenerator(_configuration, _configuration.DataExportRepository);
 
-        var filename = Path.Combine(TestContext.CurrentContext.WorkDirectory,"release.doc");
+        var filename = Path.Combine(TestContext.CurrentContext.WorkDirectory, "release.doc");
         report.GenerateWordFile(filename);
 
         Assert.IsTrue(File.Exists(filename));
diff --git a/Rdmp.Core.Tests/Reports/MetadataReportTests.cs b/Rdmp.Core.Tests/Reports/MetadataReportTests.cs
index 96b90223e4..1fbcb4cb6b 100644
--- a/Rdmp.Core.Tests/Reports/MetadataReportTests.cs
+++ b/Rdmp.Core.Tests/Reports/MetadataReportTests.cs
@@ -17,28 +17,31 @@
 
 namespace Rdmp.Core.Tests.Reports;
 
-internal class MetadataReportTests:UnitTests
+internal class MetadataReportTests : UnitTests
 {
     [Test]
     public void Test_MetadataReport_Basic()
     {
         var cata = WhenIHaveA<Catalogue>();
-        var reporter = new MetadataReport(Repository, new MetadataReportArgs(new[] {cata}));
+        var reporter = new MetadataReport(Repository, new MetadataReportArgs(new[] { cata }));
         cata.Description = "The Quick Brown Fox Was Quicker Than The slow tortoise";
 
         //setup delegate for returning images
         var bmp = new Image<Rgba32>(200, 200);
-        bmp.Mutate(x=>x.Fill(Color.Black,new RectangleF(10.0f,10.0f,50.0f,50.0f)));
-            
-        reporter.RequestCatalogueImages += s => { return new BitmapWithDescription[] {new BitmapWithDescription(bmp,"MyPicture","Something interesting about it") }; };
+        bmp.Mutate(x => x.Fill(Color.Black, new RectangleF(10.0f, 10.0f, 50.0f, 50.0f)));
+
+        reporter.RequestCatalogueImages += s =>
+        {
+            return new BitmapWithDescription[] { new(bmp, "MyPicture", "Something interesting about it") };
+        };
 
         var file = reporter.GenerateWordFile(new ThrowImmediatelyDataLoadEventListener(), false);
-            
+
         Assert.IsNotNull(file);
         Assert.IsTrue(File.Exists(file.FullName));
-            
+
         //refreshes the file stream status
-        Assert.Greater(new FileInfo(file.FullName).Length,0);
+        Assert.Greater(new FileInfo(file.FullName).Length, 0);
     }
 
     [Test]
@@ -53,8 +56,8 @@ public void Test_OrphanExtractionInformation()
         ei.CatalogueItem.ClearAllInjections();
         ei.ClearAllInjections();
 
-        var reporter = new MetadataReport(Repository, 
-            new MetadataReportArgs(new[] {ei.CatalogueItem.Catalogue})
+        var reporter = new MetadataReport(Repository,
+            new MetadataReportArgs(new[] { ei.CatalogueItem.Catalogue })
         );
         var file = reporter.GenerateWordFile(new ThrowImmediatelyDataLoadEventListener(), false);
 
diff --git a/Rdmp.Core.Tests/Repositories/CatalogueRepositoryTests.cs b/Rdmp.Core.Tests/Repositories/CatalogueRepositoryTests.cs
index c804aac47b..4984bf2870 100644
--- a/Rdmp.Core.Tests/Repositories/CatalogueRepositoryTests.cs
+++ b/Rdmp.Core.Tests/Repositories/CatalogueRepositoryTests.cs
@@ -32,13 +32,13 @@ public void TestConnection_NoServer_DoNotShowPassword()
             ConnectTimeout = 2
         });
 
-        var msg = Assert.Throws<Exception>(()=>repo.TestConnection());
+        var msg = Assert.Throws<Exception>(() => repo.TestConnection());
 
-        StringAssert.StartsWith("Testing connection failed",msg.Message);
-        StringAssert.DoesNotContain("omg",msg.Message);
-        StringAssert.Contains("****",msg.Message);
-        StringAssert.Contains("Timeout",msg.Message);
-        StringAssert.Contains("2",msg.Message);
+        StringAssert.StartsWith("Testing connection failed", msg.Message);
+        StringAssert.DoesNotContain("omg", msg.Message);
+        StringAssert.Contains("****", msg.Message);
+        StringAssert.Contains("Timeout", msg.Message);
+        StringAssert.Contains("2", msg.Message);
     }
 
     [Test]
@@ -46,8 +46,9 @@ public void TestConnection_NoServer_IntegratedSecurity()
     {
         ImplementationManager.Load<FAnsi.Implementations.MicrosoftSQL.MicrosoftSQLImplementation>();
 
-        if(EnvironmentInfo.IsLinux)
-            Assert.Inconclusive("Linux doesn't really support IntegratedSecurity and in fact can bomb just setting it on a builder");
+        if (EnvironmentInfo.IsLinux)
+            Assert.Inconclusive(
+                "Linux doesn't really support IntegratedSecurity and in fact can bomb just setting it on a builder");
 
         var repo = new CatalogueRepository(new SqlConnectionStringBuilder
         {
@@ -56,12 +57,11 @@ public void TestConnection_NoServer_IntegratedSecurity()
             ConnectTimeout = 2
         });
 
-        var msg = Assert.Throws<Exception>(()=>repo.TestConnection());
+        var msg = Assert.Throws<Exception>(() => repo.TestConnection());
 
-        StringAssert.StartsWith("Testing connection failed",msg.Message);
-        StringAssert.Contains("Integrated Security=",msg.Message);
-        StringAssert.Contains("Timeout",msg.Message);
-        StringAssert.Contains("2",msg.Message);
+        StringAssert.StartsWith("Testing connection failed", msg.Message);
+        StringAssert.Contains("Integrated Security=", msg.Message);
+        StringAssert.Contains("Timeout", msg.Message);
+        StringAssert.Contains("2", msg.Message);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/ChangeLogIsCorrectTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/ChangeLogIsCorrectTests.cs
index edd24610a4..93df08a5e1 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/ChangeLogIsCorrectTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/ChangeLogIsCorrectTests.cs
@@ -24,7 +24,8 @@ public void TestChangeLogContents()
             dir = dir.Parent;
             log = dir.GetFiles("changelog.md", opts).SingleOrDefault();
         }
-        Assert.IsNotNull(log,"CHANGELOG.md not found");
+
+        Assert.IsNotNull(log, "CHANGELOG.md not found");
 
         var assemblyInfo = Path.Combine(log.Directory.FullName, "SharedAssemblyInfo.cs");
 
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/DataTableExtensionsTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/DataTableExtensionsTests.cs
index 719ba81082..bb2f5457bc 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/DataTableExtensionsTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/DataTableExtensionsTests.cs
@@ -33,19 +33,18 @@ public void TestEscaping_CommaInCell()
             @"Phrase,Car
 ""omg,why me!"",Ferrari
 ");
-
     }
 
     [Test]
     public void TestEscaping_CommaAndQuotesInCell()
     {
-        var path = Path.Combine(TestContext.CurrentContext.TestDirectory,"out.csv");
+        var path = Path.Combine(TestContext.CurrentContext.TestDirectory, "out.csv");
 
         using var dt = new DataTable();
         dt.Columns.Add("Phrase");
         dt.Columns.Add("Car");
 
-        dt.Rows.Add("omg,\"why\" me!","Ferrari");
+        dt.Rows.Add("omg,\"why\" me!", "Ferrari");
 
         dt.SaveAsCsv(path);
 
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/ExpectedIdenticalStringsExceptionTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/ExpectedIdenticalStringsExceptionTests.cs
index b97dad344f..30b3df96e0 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/ExpectedIdenticalStringsExceptionTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/ExpectedIdenticalStringsExceptionTests.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.Tests.ReusableCodeTests;
 public class ExpectedIdenticalStringsExceptionTests
 {
     // Escaped newline for string checks:
-    private static readonly string eol = Environment.NewLine.Replace("\r","\\r").Replace("\n","\\n");
+    private static readonly string eol = Environment.NewLine.Replace("\r", "\\r").Replace("\n", "\\n");
 
     [Test]
     public void CompletelyDifferentCase()
@@ -97,11 +97,11 @@ public void VeryLongStringsWithWhitespace()
             @" For what could be the
 meaning 
 of the queer clay bas-relief and the disjointed jottings, ramblings, and cuttings which I found? Had
-my uncle, in his latter years become credulous of the most superficial impostures? ".Replace("\r",""),
+my uncle, in his latter years become credulous of the most superficial impostures? ".Replace("\r", ""),
             @" For what could be the
 meaning 
 if the queer clay bas-relief and the disjointed jottings, ramblings, and cuttings which I found? Had
-my uncle, in his latter years become credulous of the most superficial impostures? ".Replace("\r",""));
+my uncle, in his latter years become credulous of the most superficial impostures? ".Replace("\r", ""));
 
         // .Replace above forces Unix-style strings for test consistency
         Assert.AreEqual($@"These are different
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
index 80aea3463d..a4dcd24dbc 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
@@ -20,7 +20,8 @@ namespace Rdmp.Core.Tests.ReusableCodeTests;
 /// </summary>
 public class PackageListIsCorrectTests
 {
-    private static readonly EnumerationOptions EnumerationOptions = new() { RecurseSubdirectories = true,MatchCasing = MatchCasing.CaseInsensitive,IgnoreInaccessible = true};
+    private static readonly EnumerationOptions EnumerationOptions = new()
+        { RecurseSubdirectories = true, MatchCasing = MatchCasing.CaseInsensitive, IgnoreInaccessible = true };
 
     //<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
     private static readonly Regex RPackageRef =
@@ -38,7 +39,7 @@ public class PackageListIsCorrectTests
     /// </summary>
     /// <param name="rootPath"></param>
     [TestCase]
-    public void TestPackagesDocumentCorrect(string rootPath=null)
+    public void TestPackagesDocumentCorrect(string rootPath = null)
     {
         var root = FindRoot(rootPath);
         var undocumented = new StringBuilder();
@@ -46,8 +47,8 @@ public void TestPackagesDocumentCorrect(string rootPath=null)
         // Extract the named packages from PACKAGES.md
         var packagesMarkdown = File.ReadAllLines(GetPackagesMarkdown(root))
             .Select(line => RMarkdownEntry.Match(line))
-            .Where(m=>m.Success)
-            .Skip(2)    // Jump over the header
+            .Where(m => m.Success)
+            .Skip(2) // Jump over the header
             .Select(m => m.Groups[1].Value)
             .ToHashSet(StringComparer.InvariantCultureIgnoreCase);
 
@@ -71,7 +72,8 @@ public void TestPackagesDocumentCorrect(string rootPath=null)
     /// </summary>
     /// <param name="package"></param>
     /// <returns></returns>
-    private static object BuildRecommendedMarkdownLine(string package) => $"| {package} | [GitHub]() | LICENCE GOES HERE | |";
+    private static object BuildRecommendedMarkdownLine(string package) =>
+        $"| {package} | [GitHub]() | LICENCE GOES HERE | |";
 
     /// <summary>
     /// Find the root of this repo, which is usually the directory containing the .sln file
@@ -86,6 +88,7 @@ private static DirectoryInfo FindRoot(string path = null)
             if (!Path.IsPathRooted(path)) path = Path.Combine(TestContext.CurrentContext.TestDirectory, path);
             return new DirectoryInfo(path);
         }
+
         var root = new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
         while (!root.EnumerateFiles("*.sln", SearchOption.TopDirectoryOnly).Any() && root.Parent != null)
             root = root.Parent;
@@ -100,7 +103,8 @@ private static DirectoryInfo FindRoot(string path = null)
     /// <returns></returns>
     private static IEnumerable<string> GetCsprojFiles(DirectoryInfo root)
     {
-        return root.EnumerateFiles("*.csproj", EnumerationOptions).Select(f => f.FullName).Where(f => !f.Contains("tests", StringComparison.InvariantCultureIgnoreCase));
+        return root.EnumerateFiles("*.csproj", EnumerationOptions).Select(f => f.FullName)
+            .Where(f => !f.Contains("tests", StringComparison.InvariantCultureIgnoreCase));
     }
 
     /// <summary>
@@ -114,5 +118,4 @@ private static string GetPackagesMarkdown(DirectoryInfo root)
         Assert.IsNotNull(path, "Could not find packages.md");
         return path;
     }
-
-}
+}
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffTests.cs
index da7e613fa7..5faf717c3d 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffTests.cs
@@ -11,15 +11,14 @@
 
 namespace Rdmp.Core.Tests.ReusableCodeTests;
 
-public class UsefulStuffTests:DatabaseTests
+public class UsefulStuffTests : DatabaseTests
 {
-        
     [Test]
     public void GetRowCountWhenNoIndexes()
     {
         var db = GetCleanedServer(DatabaseType.MicrosoftSQLServer);
         var table = db.ExpectTable("GetRowCountWhenNoIndexes");
-        Assert.AreEqual("GetRowCountWhenNoIndexes",table.GetRuntimeName());
+        Assert.AreEqual("GetRowCountWhenNoIndexes", table.GetRuntimeName());
         var server = table.Database.Server;
 
         using var con = server.GetConnection();
@@ -29,9 +28,9 @@ public void GetRowCountWhenNoIndexes()
         cmd.ExecuteNonQuery();
 
         var cmdInsert = server.GetCommand($"INSERT INTO {table.GetRuntimeName()} VALUES (1,'Fish')", con);
-        Assert.AreEqual(1,cmdInsert.ExecuteNonQuery());
+        Assert.AreEqual(1, cmdInsert.ExecuteNonQuery());
 
-        Assert.AreEqual(1,table.GetRowCount());
+        Assert.AreEqual(1, table.GetRowCount());
     }
 
     [Test]
diff --git a/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffUnitTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffUnitTests.cs
index fd17108219..72c21b9a91 100644
--- a/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffUnitTests.cs
+++ b/Rdmp.Core.Tests/ReusableCodeTests/UsefulStuffUnitTests.cs
@@ -18,7 +18,7 @@ public class UsefulStuffUnitTests
     [TestCase("1203567855", true)]
     public void ChiValidationTests(string chi, bool valid)
     {
-        Assert.AreEqual(valid,UsefulStuff.CHIisOK(chi),"Validation gave incorrect answer for CHI '{0}'",chi);
+        Assert.AreEqual(valid, UsefulStuff.CHIisOK(chi), "Validation gave incorrect answer for CHI '{0}'", chi);
     }
 
     [TestCase("[ff ff]", "ff ff")]
@@ -32,7 +32,7 @@ public void ChiValidationTests(string chi, bool valid)
     [TestCase("[c d]..[we ef],", "we ef")]
     public void TestGetArrayOfColumnNamesFromStringPastedInByUser(string input, string expectedOutput)
     {
-        foreach(var suffix in new[] { "","\n", "\r","\r\n",",\r\n"})
+        foreach (var suffix in new[] { "", "\n", "\r", "\r\n", ",\r\n" })
         {
             var output = UsefulStuff.GetArrayOfColumnNamesFromStringPastedInByUser($"{input}{suffix}");
             Assert.AreEqual(expectedOutput, output.Single());
@@ -46,5 +46,4 @@ public void ClipboardHtmlTest()
         const string test = "Version:1.0\r\nStartHTML:000051\r\nEndHTML:0000000055\r\nTest";
         Assert.AreEqual(test, UsefulStuff.GetClipboardFormattedHtmlStringFromHtmlString("Test"));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaNumericTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaNumericTest.cs
index 6e2f32be86..b5e947f9ac 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaNumericTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaNumericTest.cs
@@ -50,10 +50,8 @@ public void Validate_Valid_Success(string code)
     public void Validate_Invalid_ExceptionContainsRequiredInfo()
     {
         var result = _alphanum.Validate(" ");
-            
+
         Assert.NotNull(result.SourceConstraint);
         Assert.AreEqual(typeof(AlphaNumeric), result.SourceConstraint.GetType());
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaTest.cs
index 444b5444d4..561113fe3d 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/AlphaTest.cs
@@ -49,12 +49,9 @@ public void Validate_Valid_Success(string code)
     [Test]
     public void Validate_Invalid_ExceptionContainsRequiredInfo()
     {
-
         var result = _alpha.Validate("9");
-            
+
         Assert.NotNull(result.SourceConstraint);
         Assert.AreEqual(typeof(Alpha), result.SourceConstraint.GetType());
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationDateTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationDateTest.cs
index e046f7c618..acb825b649 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationDateTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationDateTest.cs
@@ -14,7 +14,7 @@
 namespace Rdmp.Core.Tests.Validation.Constraints.Primary;
 
 [Category("Unit")]
-internal class BoundsValidationDateTest: ValidationTests
+internal class BoundsValidationDateTest : ValidationTests
 {
     private Dictionary<string, object> _d;
 
@@ -23,7 +23,7 @@ protected override void SetUp()
     {
         base.SetUp();
 
-        _d = new Dictionary<string, object> {{"somedate", new DateTime(2013, 06, 13)}};
+        _d = new Dictionary<string, object> { { "somedate", new DateTime(2013, 06, 13) } };
     }
 
     #region Literal Dates
@@ -31,7 +31,7 @@ protected override void SetUp()
     [Test]
     public void must_occur_between_two_literal_dates_VALID()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.Upper = DateTime.MaxValue;
         var v = CreateLiteralDateValidator(b);
@@ -42,7 +42,7 @@ public void must_occur_between_two_literal_dates_VALID()
     [Test]
     public void must_occur_between_two_literal_dates_INVALID_after()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.Upper = DateTime.MinValue.AddYears(1);
         var v = CreateLiteralDateValidator(b);
@@ -53,7 +53,7 @@ public void must_occur_between_two_literal_dates_INVALID_after()
     [Test]
     public void must_occur_between_two_literal_dates_INVALID_before()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MaxValue.AddYears(-1);
         b.Upper = DateTime.MaxValue;
         var v = CreateLiteralDateValidator(b);
@@ -64,7 +64,7 @@ public void must_occur_between_two_literal_dates_INVALID_before()
     [Test]
     public void must_occur_between_two_literal_dates_INVALID_onlower()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = new DateTime(2013, 06, 13);
         b.Upper = DateTime.MaxValue;
         b.Inclusive = false;
@@ -77,7 +77,7 @@ public void must_occur_between_two_literal_dates_INVALID_onlower()
     [Test]
     public void must_occur_between_two_literal_dates_INVALID_onupper()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.Upper = new DateTime(2013, 06, 13);
         b.Inclusive = false;
@@ -89,7 +89,7 @@ public void must_occur_between_two_literal_dates_INVALID_onupper()
     [Test]
     public void must_occur_inclusively_between_two_literal_dates_VALID_onlower()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = new DateTime(2013, 06, 13);
         b.Upper = DateTime.MaxValue;
         b.Inclusive = true;
@@ -101,7 +101,7 @@ public void must_occur_inclusively_between_two_literal_dates_VALID_onlower()
     [Test]
     public void must_occur_inclusively_between_two_literal_dates_VALID_onupper()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.Upper = new DateTime(2013, 06, 13);
         b.Inclusive = true;
@@ -117,7 +117,7 @@ public void must_occur_inclusively_between_two_literal_dates_VALID_onupper()
     [Test]
     public void must_occur_after_field_VALID()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
 
@@ -130,7 +130,7 @@ public void must_occur_after_field_VALID()
     [Test]
     public void must_occur_after_field_INVALID_before()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
 
@@ -142,7 +142,7 @@ public void must_occur_after_field_INVALID_before()
     [Test]
     public void must_occur_after_field_INVALID_same()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
         b.Inclusive = false;
@@ -154,28 +154,27 @@ public void must_occur_after_field_INVALID_same()
     [Test]
     public void must_occur_after_field_INVALID_violation_report()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
 
         var v = CreateAdmissionDateValidator(b);
 
         var result = v.Validate(TestConstants.AdmissionDateOccursBeforeDob);
-            
-        if(result == null)
+
+        if (result == null)
             Assert.Fail();
 
         var l = result.GetExceptionList();
 
         StringAssert.EndsWith($"Expected a date greater than [{b.LowerFieldName}].", l[0].Message);
         Console.WriteLine(result.Message);
-            
     }
 
     [Test]
     public void must_occur_before_field_VALID()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.UpperFieldName = "dob";
 
@@ -187,7 +186,7 @@ public void must_occur_before_field_VALID()
     [Test]
     public void must_occur_before_field_INVALID_same()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.UpperFieldName = "dob";
 
@@ -199,7 +198,7 @@ public void must_occur_before_field_INVALID_same()
     [Test]
     public void must_occur_before_field_INVALID_after()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.UpperFieldName = "dob";
 
@@ -211,28 +210,27 @@ public void must_occur_before_field_INVALID_after()
     [Test]
     public void must_occur_before_field_INVALID_violation_report()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.UpperFieldName = "dob";
 
         var v = CreateParentDobValidator(b);
 
-        var result = v.Validate(TestConstants.ParentDobOccursAfterDob); 
-            
-        if(result == null)
+        var result = v.Validate(TestConstants.ParentDobOccursAfterDob);
+
+        if (result == null)
             Assert.Fail();
 
         var l = result.GetExceptionList();
 
         StringAssert.EndsWith($"Expected a date less than [{b.UpperFieldName}].", l[0].Message);
         Console.WriteLine(result.Message);
-            
     }
 
     [Test]
     public void must_occur_between_fields_VALID()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
 
@@ -244,7 +242,7 @@ public void must_occur_between_fields_VALID()
     [Test]
     public void must_occur_inclusively_between_fields_VALID_onstart()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
         b.Inclusive = true;
@@ -257,7 +255,7 @@ public void must_occur_inclusively_between_fields_VALID_onstart()
     [Test]
     public void must_occur_inclusively_between_fields_VALID_onend()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
         b.Inclusive = true;
@@ -270,7 +268,7 @@ public void must_occur_inclusively_between_fields_VALID_onend()
     [Test]
     public void must_occur_between_fields_INVALID_onstart()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
         b.Inclusive = false;
@@ -282,7 +280,7 @@ public void must_occur_between_fields_INVALID_onstart()
     [Test]
     public void must_occur_between_fields_INVALID_onend()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
         b.Inclusive = false;
@@ -294,7 +292,7 @@ public void must_occur_between_fields_INVALID_onend()
     [Test]
     public void must_occur_between_fields_INVALID_before()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
 
@@ -306,7 +304,7 @@ public void must_occur_between_fields_INVALID_before()
     [Test]
     public void must_occur_between_fields_INVALID_after()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.LowerFieldName = "admission_date";
         b.UpperFieldName = "discharge_date";
 
@@ -325,7 +323,7 @@ public void f_invalid_target_field_evokes_exception()
         var v = new Validator();
         v.EnsureThatValue("INVALID").OccursAfter("dob");
 
-        Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.AdmissionDateOccursAfterDob));
+        Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.AdmissionDateOccursAfterDob));
     }
 
     [Test]
@@ -334,7 +332,7 @@ public void f_invalid_comparator_field_evokes_exception()
         var v = new Validator();
         v.EnsureThatValue("admission_date").OccursAfter("INVALID");
 
-        Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.AdmissionDateOccursAfterDob));
+        Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.AdmissionDateOccursAfterDob));
     }
 
     [Test]
@@ -387,13 +385,14 @@ public void f_must_occur_before_field_INVALID_same()
     {
         var v = new Validator();
         v.EnsureThatValue("parent_dob").OccursBefore("dob");
-            
+
         Assert.NotNull(v.Validate(TestConstants.ParentDobOccursOnDob));
     }
 
     #endregion
 
     #region Helper Methods
+
     private static Validator CreateLiteralDateValidator(BoundDate b)
     {
         var v = new Validator();
@@ -410,7 +409,7 @@ private static Validator CreateAdmissionDateValidator(BoundDate b)
         var i = new ItemValidator();
         i.AddSecondaryConstraint(b);
         v.AddItemValidator(i, "admission_date", typeof(DateTime));
-            
+
         return v;
     }
 
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationIntegerTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationIntegerTest.cs
index 717f7947c3..08ba967cfb 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationIntegerTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/BoundsValidationIntegerTest.cs
@@ -15,13 +15,12 @@ namespace Rdmp.Core.Tests.Validation.Constraints.Primary;
 [Category("Unit")]
 internal class BoundsValidationIntegerTest : ValidationTests
 {
-
     [Test]
     public void simple_integer_bounds()
     {
         var v = new Validator();
 
-        var b = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var b = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         b.Lower = 5;
         b.Upper = 120;
 
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiTest.cs
index ec4762bea9..8c49152e8a 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiTest.cs
@@ -21,7 +21,7 @@ protected override void SetUp()
     {
         base.SetUp();
 
-        _chi = (IPrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong);
+        _chi = (IPrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong);
     }
 
     [TestCase("")]
@@ -47,10 +47,8 @@ public void Validate_ValidChi_Success(string code)
     public void Validate_InvalidChi_ExceptionContainsRequiredInfo()
     {
         var result = _chi.Validate("banana");
-            
+
         Assert.NotNull(result.SourceConstraint);
         Assert.AreEqual(typeof(Chi), result.SourceConstraint.GetType());
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiValidationTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiValidationTest.cs
index afe61390d6..0cf9e51950 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiValidationTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/ChiValidationTest.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.Tests.Validation.Constraints.Primary;
 [Category("Unit")]
 internal class ChiValidationTest : ValidationTests
 {
-
     [Test]
     public void validation_scenario_CHI()
     {
@@ -55,7 +54,7 @@ public void validation_scenario_CHI_and_age()
         {
             // 3. Set the ItemValidator's PrimaryConstraint (must be valid CHI)
             // (using Validator's CreateConstraint() method to create a Primary Constraint (CHI))
-            PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong)
+            PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong)
         };
 
         // 4. Add the ItemValidator to our Validator, specifying the item it should validate against
@@ -65,10 +64,10 @@ public void validation_scenario_CHI_and_age()
         var age = new ItemValidator();
 
         // 6. No PrimaryConstraint. In this case we ADD a SecondaryConstraint (age)
-        var ageConstraint = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var ageConstraint = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         ageConstraint.Lower = 0;
         ageConstraint.Upper = 30;
-            
+
         age.AddSecondaryConstraint(ageConstraint);
 
         // 7. Add the ItemValidator to our Validator, specifying the item it should validate against
@@ -84,5 +83,4 @@ public void validation_scenario_CHI_and_age()
         // 9. Validate, passing in the target object to be validated against
         Assert.IsNull(validator.Validate(domainObject));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/DateEuTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/DateEuTest.cs
index f36cfdc509..263fcf6d5c 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/DateEuTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/DateEuTest.cs
@@ -57,18 +57,14 @@ public void Validate_ValidDate_Success(string code)
     [Test]
     public void Validate_InvalidDate_ExceptionContainsRequiredInfo()
     {
-        var result =_date.Validate("banana");
-            
+        var result = _date.Validate("banana");
+
         Assert.NotNull(result.SourceConstraint);
         Assert.AreEqual(typeof(Date), result.SourceConstraint.GetType());
-            
     }
 
     // utility methods
 
-    private static IPrimaryConstraint constraint_date()
-    {
-        return (IPrimaryConstraint)Validator.CreateConstraint("date",Consequence.Wrong);
-    }
-
+    private static IPrimaryConstraint constraint_date() =>
+        (IPrimaryConstraint)Validator.CreateConstraint("date", Consequence.Wrong);
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Primary/ValidationTests.cs b/Rdmp.Core.Tests/Validation/Constraints/Primary/ValidationTests.cs
index 7332a192a3..5e4554e911 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Primary/ValidationTests.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Primary/ValidationTests.cs
@@ -16,5 +16,4 @@ public void SetupMEFForValidator()
     {
         SetupMEF();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Secondary/BoundDateTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Secondary/BoundDateTest.cs
index 21af12f18c..4c85b2e35c 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Secondary/BoundDateTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Secondary/BoundDateTest.cs
@@ -19,7 +19,7 @@ internal class BoundDateTest
     [Test]
     public void Validate_IsValid_Succeeds()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
 
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
@@ -32,22 +32,22 @@ public void Validate_IsValid_Succeeds()
     [Test]
     public void Validate_DateIsSame_Succeeds()
     {
-        var b = (BoundDate) Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
 
         Assert.IsTrue(b.Inclusive);
 
 
         var cols = new object[] { DateTime.Parse("2007-10-09 00:00:00.0000000") };
-        var names = new string[]{"dob2"};
+        var names = new string[] { "dob2" };
         b.LowerFieldName = "dob2";
 
-        Assert.IsNull(b.Validate(DateTime.Parse("2007-10-09 00:00:00.0000000"),cols,names));
+        Assert.IsNull(b.Validate(DateTime.Parse("2007-10-09 00:00:00.0000000"), cols, names));
     }
 
     [Test]
     public void Validate_IsInvalid_ThrowsException()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
 
         b.LowerFieldName = "dob";
         b.Upper = DateTime.MaxValue;
@@ -59,7 +59,7 @@ public void Validate_IsInvalid_ThrowsException()
     [Test]
     public void Validate_IsInvalid_ThrowsExceptionWithConsequence()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Consequence = Consequence.InvalidatesRow;
 
         b.LowerFieldName = "dob";
@@ -67,29 +67,27 @@ public void Validate_IsInvalid_ThrowsExceptionWithConsequence()
 
         var result = CallValidateOnInvalidData("admission_date", b);
 
-        if(result == null)
+        if (result == null)
             Assert.Fail("Expected validation exception, but none came");
 
 
         Assert.NotNull(result.SourceConstraint);
         Assert.AreEqual(result.SourceConstraint.Consequence, Consequence.InvalidatesRow);
-            
-            
     }
 
 
     [Test]
     public void Validate_IsValidButNull_Succeeds()
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
 
         b.UpperFieldName = "appointmentDate";
 
-        var cols = new object[] { DBNull.Value};
+        var cols = new object[] { DBNull.Value };
 
-        var names = new string[]{"appointmentDate"};
+        var names = new string[] { "appointmentDate" };
 
-        b.Validate(null,cols,names);
+        b.Validate(null, cols, names);
     }
 
 
@@ -106,7 +104,6 @@ private static ValidationFailure CallValidateOnInvalidData(string targetProperty
     }
 
 
-
     private static ValidationFailure CallValidate(string targetProperty, BoundDate b, Dictionary<string, object> d)
     {
         var keys = new string[d.Keys.Count];
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionChiSexTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionChiSexTest.cs
index 16910fa170..ea7ca6ae00 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionChiSexTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionChiSexTest.cs
@@ -14,35 +14,36 @@ namespace Rdmp.Core.Tests.Validation.Constraints.Secondary;
 internal class PredictionChiSexTest
 {
     private readonly DateTime _wrongType = DateTime.Now;
-        
+
     [Test]
     public void Validate_IncompatibleChiType_ThrowsException()
     {
-        var p = new Prediction(new ChiSexPredictor(),"gender");
-        Assert.Throws<ArgumentException>(()=>p.Validate(_wrongType, new[] { "M" }, new[] { "gender" }));
+        var p = new Prediction(new ChiSexPredictor(), "gender");
+        Assert.Throws<ArgumentException>(() => p.Validate(_wrongType, new[] { "M" }, new[] { "gender" }));
     }
 
     [Test]
     public void Validate_IncompatibleGenderType_ThrowsException()
     {
         var p = new Prediction(new ChiSexPredictor(), "gender");
-        Assert.Throws<ArgumentException>(()=>p.Validate(TestConstants._VALID_CHI, new object[] { _wrongType }, new string[] { "gender" }));
+        Assert.Throws<ArgumentException>(() =>
+            p.Validate(TestConstants._VALID_CHI, new object[] { _wrongType }, new string[] { "gender" }));
     }
 
     [Test]
     public void Validate_NullChiAndGender_IsIgnored()
     {
         var p = new Prediction(new ChiSexPredictor(), "gender");
-        Assert.Throws<ArgumentException>(()=>p.Validate(TestConstants._VALID_CHI, null, null));
+        Assert.Throws<ArgumentException>(() => p.Validate(TestConstants._VALID_CHI, null, null));
     }
 
     [Test]
     public void Validate_TargetFieldNotPresent_ThrowsException()
     {
         var p = new Prediction(new ChiSexPredictor(), "gender");
-        var otherCols = new object[] {"M"};
-        var otherColsNames = new string[] {"amagad"};
-        Assert.Throws<MissingFieldException>(()=>p.Validate(TestConstants._VALID_CHI, otherCols, otherColsNames));
+        var otherCols = new object[] { "M" };
+        var otherColsNames = new string[] { "amagad" };
+        Assert.Throws<MissingFieldException>(() => p.Validate(TestConstants._VALID_CHI, otherCols, otherColsNames));
     }
 
     [Test]
@@ -53,6 +54,7 @@ public void Validate_ConsistentChiAndSex_String_Succeeds()
         var otherColsNames = new string[] { "gender" };
         p.Validate(TestConstants._VALID_CHI, otherCols, otherColsNames);
     }
+
     [Test]
     public void Validate_ConsistentChiAndSex_Char_Succeeds()
     {
diff --git a/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionNotNullTest.cs b/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionNotNullTest.cs
index dc6a865c15..4a350d1830 100644
--- a/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionNotNullTest.cs
+++ b/Rdmp.Core.Tests/Validation/Constraints/Secondary/PredictionNotNullTest.cs
@@ -12,11 +12,9 @@ namespace Rdmp.Core.Tests.Validation.Constraints.Secondary;
 [Category("Unit")]
 internal class PredictionNotNullTest
 {
-
     [Test]
     public void Validate_ValueNotNullAndRelatedValueNotNull_Succeeds()
     {
-
         var p = new Prediction(new ValuePredictsOtherValueNullness(), "someColumn");
         var otherCols = new object[] { "not null" };
         var otherColsNames = new string[] { "someColumn" };
@@ -38,7 +36,8 @@ public void Validate_ValueIsNullAndRelatedValueNotNull_Succeeds()
         var p = new Prediction(new ValuePredictsOtherValueNullness(), "someColumn");
         var otherCols = new object[] { "not null" };
         var otherColsNames = new string[] { "someColumn" };
-        StringAssert.StartsWith("Nullness did not match, when one value is null, the other mus", p.Validate(null, otherCols, otherColsNames)?.Message);
+        StringAssert.StartsWith("Nullness did not match, when one value is null, the other mus",
+            p.Validate(null, otherCols, otherColsNames)?.Message);
     }
 
     [Test]
@@ -49,5 +48,4 @@ public void Validate_ValueIsNullAndRelatedValueIsNull_Succeeds()
         var otherColsNames = new string[] { "someColumn" };
         Assert.IsNull(p.Validate(null, otherCols, otherColsNames));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/ExceptionHandlingTests.cs b/Rdmp.Core.Tests/Validation/ExceptionHandlingTests.cs
index 671e965414..17ac5fb7ad 100644
--- a/Rdmp.Core.Tests/Validation/ExceptionHandlingTests.cs
+++ b/Rdmp.Core.Tests/Validation/ExceptionHandlingTests.cs
@@ -17,7 +17,6 @@ namespace Rdmp.Core.Tests.Validation;
 [Category("Unit")]
 internal class ExceptionHandlingTests
 {
-
     [Test]
     public void Validate_WhenMultipleErrors_ReturnsAllErrors()
     {
@@ -25,14 +24,14 @@ public void Validate_WhenMultipleErrors_ReturnsAllErrors()
 
         var chi = new ItemValidator
         {
-            PrimaryConstraint = (PrimaryConstraint) Validator.CreateConstraint("chi",Consequence.Wrong)
+            PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong)
         };
         var prediction = new Prediction(new ChiSexPredictor(), "gender");
         chi.AddSecondaryConstraint(prediction);
         validator.AddItemValidator(chi, "chi", typeof(string));
 
         var age = new ItemValidator();
-        var ageConstraint = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var ageConstraint = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         ageConstraint.Lower = 0;
         ageConstraint.Upper = 30;
         age.AddSecondaryConstraint(ageConstraint);
@@ -45,10 +44,8 @@ public void Validate_WhenMultipleErrors_ReturnsAllErrors()
             { "gender", "F" }
         };
 
-        var result =  validator.Validate(row);
+        var result = validator.Validate(row);
 
         Assert.AreEqual(2, result.GetExceptionList().Count);
-            
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/ItemValidatorTest.cs b/Rdmp.Core.Tests/Validation/ItemValidatorTest.cs
index 830a0aa867..30ea0305c4 100644
--- a/Rdmp.Core.Tests/Validation/ItemValidatorTest.cs
+++ b/Rdmp.Core.Tests/Validation/ItemValidatorTest.cs
@@ -14,10 +14,10 @@ namespace Rdmp.Core.Tests.Validation;
 /*
  * Unit-tests for the ItemValidator.
  * Using CHI in this case.
- * 
+ *
  * Note: Normally the Host Validator instance would set the TargetProprty of its ItemValidator(s).
  * Here, we do it explicitly in the SetUp() method.
- * 
+ *
  */
 
 [Category("Unit")]
@@ -37,16 +37,16 @@ public void SetUp()
     [Test]
     public void ValidateAll_IsTypeIncompatible_ThrowsException()
     {
-        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong);
+        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong);
         _v.ExpectedType = typeof(int);
 
-        Assert.NotNull(_v.ValidateAll(DateTime.Now,  Array.Empty<object>(), Array.Empty<string>()));
+        Assert.NotNull(_v.ValidateAll(DateTime.Now, Array.Empty<object>(), Array.Empty<string>()));
     }
 
     [Test]
     public void ValidateAll_IsTypeIncompatible_GivesReason()
     {
-        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong);
+        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong);
         _v.ExpectedType = typeof(DateTime);
 
         var result = _v.ValidateAll(DateTime.Now, Array.Empty<object>(), Array.Empty<string>());
@@ -54,7 +54,6 @@ public void ValidateAll_IsTypeIncompatible_GivesReason()
         Assert.IsNotNull(result);
         Assert.IsTrue(result.Message.StartsWith("Incompatible type"));
         Assert.IsTrue(result.Message.Contains(nameof(DateTime)));
-
     }
 
     [Test]
@@ -68,22 +67,19 @@ public void ValidateAll_ValidData_Succeeds()
     [Test]
     public void ValidateAll_InvalidData_ThrowsException()
     {
-        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong);
+        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong);
 
-        Assert.NotNull(_v.ValidateAll(TestConstants._INVALID_CHI_CHECKSUM, Array.Empty<object>(), Array.Empty<string>()));
+        Assert.NotNull(
+            _v.ValidateAll(TestConstants._INVALID_CHI_CHECKSUM, Array.Empty<object>(), Array.Empty<string>()));
     }
 
     [Test]
     public void ValidateAll_InvalidData_GivesReason()
     {
-        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong);
+        _v.PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong);
 
         var result = _v.ValidateAll(TestConstants._INVALID_CHI_CHECKSUM, Array.Empty<object>(), Array.Empty<string>());
 
         Assert.AreEqual("CHI check digit did not match", result.Message);
-
     }
-
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/PredictionValidationTest.cs b/Rdmp.Core.Tests/Validation/PredictionValidationTest.cs
index eb9a5937a6..cc9aada06d 100644
--- a/Rdmp.Core.Tests/Validation/PredictionValidationTest.cs
+++ b/Rdmp.Core.Tests/Validation/PredictionValidationTest.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.Tests.Validation;
 [Category("Unit")]
 internal class PredictionValidationTest
 {
-
     #region Test arguments
 
     [TestCase("UNKNOWN")]
@@ -26,15 +25,15 @@ public void Validate_NullTargetField_GeneratesException(string targetField)
         var prediction = new Prediction(new ChiSexPredictor(), targetField);
         var v = CreateInitialisedValidator(prediction);
 
-        var ex = Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.ValidChiAndInconsistentSex));
+        var ex = Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.ValidChiAndInconsistentSex));
         Assert.IsInstanceOf<MissingFieldException>(ex?.InnerException);
     }
 
     [Test]
     public void Validate_NullRule_GeneratesException()
     {
-        var ex = Assert.Throws<ArgumentException>(()=>_=new Prediction(null, "gender"));
-        StringAssert.Contains("You must specify a PredictionRule to follow",ex?.Message);
+        var ex = Assert.Throws<ArgumentException>(() => _ = new Prediction(null, "gender"));
+        StringAssert.Contains("You must specify a PredictionRule to follow", ex?.Message);
     }
 
     [Test]
@@ -43,7 +42,7 @@ public void Validate_Uninitialized_GeneratesException()
         var prediction = new Prediction();
         var v = CreateInitialisedValidator(prediction);
 
-        var ex = Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.ValidChiAndInconsistentSex));
+        var ex = Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.ValidChiAndInconsistentSex));
     }
 
     [Test]
@@ -54,7 +53,7 @@ public void Validate_UninitializedTarget_GeneratesException()
             Rule = new ChiSexPredictor()
         };
         var v = CreateInitialisedValidator(prediction);
-        var ex = Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.ValidChiAndInconsistentSex));
+        var ex = Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.ValidChiAndInconsistentSex));
         Assert.IsInstanceOf<InvalidOperationException>(ex?.InnerException);
     }
 
@@ -66,8 +65,9 @@ public void Validate_UninitializedRule_GeneratesException()
             TargetColumn = "chi"
         };
         var v = CreateInitialisedValidator(prediction);
-        var ex = Assert.Throws<InvalidOperationException>(()=>v.Validate(TestConstants.ValidChiAndInconsistentSex));
+        var ex = Assert.Throws<InvalidOperationException>(() => v.Validate(TestConstants.ValidChiAndInconsistentSex));
     }
+
     #endregion
 
     #region Test CHI - with primary constraint & secondary constraint
@@ -80,7 +80,7 @@ public void Validate_ChiHasConsistentSexIndicator_Valid()
 
         Assert.IsNull(v.Validate(TestConstants.ValidChiAndConsistentSex));
     }
-        
+
     [Test]
     public void Validate_ChiIsNull_Valid()
     {
@@ -149,7 +149,8 @@ public void Validate_NoPrimaryConstraintCHIHasInconsistentSexIndicator_Invalid()
     }
 
     [Test]
-    public void Validate_NoPrimaryConstraintChiIsInvalid_ValidBecauseWhoCaresIfChiIsInvalid_IfYouDoCareUseAChiPrimaryConstraintInstead()
+    public void
+        Validate_NoPrimaryConstraintChiIsInvalid_ValidBecauseWhoCaresIfChiIsInvalid_IfYouDoCareUseAChiPrimaryConstraintInstead()
     {
         var prediction = new Prediction(new ChiSexPredictor(), "gender");
         var v = CreateInitialisedValidatorWithNoPrimaryConstraint(prediction);
@@ -158,7 +159,7 @@ public void Validate_NoPrimaryConstraintChiIsInvalid_ValidBecauseWhoCaresIfChiIs
     }
 
     #endregion
-        
+
     private static Validator CreateInitialisedValidator(SecondaryConstraint prediction)
     {
         var i = new ItemValidator
diff --git a/Rdmp.Core.Tests/Validation/TestConstants.cs b/Rdmp.Core.Tests/Validation/TestConstants.cs
index 6a705755f4..5ee8cc353d 100644
--- a/Rdmp.Core.Tests/Validation/TestConstants.cs
+++ b/Rdmp.Core.Tests/Validation/TestConstants.cs
@@ -17,117 +17,118 @@ public class TestConstants
 
     public static readonly Dictionary<string, object> ValidChiAndConsistentSex = new()
     {
-        {"chi", _VALID_CHI},
-        {"gender", "M"}
+        { "chi", _VALID_CHI },
+        { "gender", "M" }
     };
 
     public static readonly Dictionary<string, object> ValidChiAndInconsistentSex = new()
     {
-        {"chi", _VALID_CHI},
-        {"gender", "F"}
+        { "chi", _VALID_CHI },
+        { "gender", "F" }
     };
 
     public static readonly Dictionary<string, object> ValidChiAndNullSex = new()
     {
-        {"chi", _VALID_CHI},
-        {"gender", null}
+        { "chi", _VALID_CHI },
+        { "gender", null }
     };
 
     public static readonly Dictionary<string, object> InvalidChiAndNullSex = new()
     {
-        {"chi", _INVALID_CHI_CHECKSUM},
-        {"gender", null}
+        { "chi", _INVALID_CHI_CHECKSUM },
+        { "gender", null }
     };
 
     public static readonly Dictionary<string, object> InvalidChiAndValidSex = new()
     {
-        {"chi", _INVALID_CHI_CHECKSUM},
-        {"gender", "F"}
+        { "chi", _INVALID_CHI_CHECKSUM },
+        { "gender", "F" }
     };
 
     public static readonly Dictionary<string, object> NullChiAndValidSex = new()
     {
-        {"chi", null},
-        {"gender", "F"}
+        { "chi", null },
+        { "gender", "F" }
     };
 
     public static readonly Dictionary<string, object> NullChiAndNullSex = new()
     {
-        {"chi", null},
-        {"gender", null}
+        { "chi", null },
+        { "gender", null }
     };
 
     #region For testing date bounds
+
     public static readonly Dictionary<string, object> AdmissionDateOccursAfterDob = new()
     {
-        {"dob", new DateTime(1977, 3, 3)},
-        {"admission_date", new DateTime(1987, 3, 3)}
+        { "dob", new DateTime(1977, 3, 3) },
+        { "admission_date", new DateTime(1987, 3, 3) }
     };
 
     public static readonly Dictionary<string, object> AdmissionDateOccursBeforeDob = new()
     {
-        {"dob", new DateTime(1977, 3, 3)},
-        {"admission_date", new DateTime(1947, 3, 3)}
+        { "dob", new DateTime(1977, 3, 3) },
+        { "admission_date", new DateTime(1947, 3, 3) }
     };
 
     public static readonly Dictionary<string, object> AdmissionDateOccursOnDob = new()
     {
-        {"dob", new DateTime(1977, 3, 3)},
-        {"admission_date", new DateTime(1977, 3, 3)}
+        { "dob", new DateTime(1977, 3, 3) },
+        { "admission_date", new DateTime(1977, 3, 3) }
     };
 
     public static readonly Dictionary<string, object> ParentDobOccursBeforeDob = new()
     {
-        {"parent_dob", new DateTime(1917, 3, 3)},
-        {"dob", new DateTime(1947, 3, 3)}
+        { "parent_dob", new DateTime(1917, 3, 3) },
+        { "dob", new DateTime(1947, 3, 3) }
     };
 
     public static readonly Dictionary<string, object> ParentDobOccursAfterDob = new()
     {
-        {"parent_dob", new DateTime(2000, 3, 3)},
-        {"dob", new DateTime(1947, 3, 3)}
+        { "parent_dob", new DateTime(2000, 3, 3) },
+        { "dob", new DateTime(1947, 3, 3) }
     };
 
     public static readonly Dictionary<string, object> ParentDobOccursOnDob = new()
     {
-        {"parent_dob", new DateTime(2000, 3, 3)},
-        {"dob", new DateTime(2000, 3, 2)}
+        { "parent_dob", new DateTime(2000, 3, 3) },
+        { "dob", new DateTime(2000, 3, 2) }
     };
 
     public static readonly Dictionary<string, object> OperationOccursDuringStay = new()
     {
-        {"admission_date", new DateTime(2012, 1, 1)},
-        {"discharge_date", new DateTime(2012, 1, 5)},
-        {"operation_date", new DateTime(2012, 1, 3)}
+        { "admission_date", new DateTime(2012, 1, 1) },
+        { "discharge_date", new DateTime(2012, 1, 5) },
+        { "operation_date", new DateTime(2012, 1, 3) }
     };
 
     public static readonly Dictionary<string, object> OperationOccursBeforeStay = new()
     {
-        {"admission_date", new DateTime(2012, 1, 1)},
-        {"discharge_date", new DateTime(2012, 1, 5)},
-        {"operation_date", new DateTime(2011, 1, 3)}
+        { "admission_date", new DateTime(2012, 1, 1) },
+        { "discharge_date", new DateTime(2012, 1, 5) },
+        { "operation_date", new DateTime(2011, 1, 3) }
     };
 
     public static readonly Dictionary<string, object> OperationOccursAfterStay = new()
     {
-        {"admission_date", new DateTime(2012, 1, 1)},
-        {"discharge_date", new DateTime(2012, 1, 5)},
-        {"operation_date", new DateTime(2013, 1, 3)}
+        { "admission_date", new DateTime(2012, 1, 1) },
+        { "discharge_date", new DateTime(2012, 1, 5) },
+        { "operation_date", new DateTime(2013, 1, 3) }
     };
 
     public static readonly Dictionary<string, object> OperationOccursOnStartOfStay = new()
     {
-        {"admission_date", new DateTime(2012, 1, 1)},
-        {"discharge_date", new DateTime(2012, 1, 5)},
-        {"operation_date", new DateTime(2012, 1, 1)}
+        { "admission_date", new DateTime(2012, 1, 1) },
+        { "discharge_date", new DateTime(2012, 1, 5) },
+        { "operation_date", new DateTime(2012, 1, 1) }
     };
 
     public static readonly Dictionary<string, object> OperationOccursOnEndOfStay = new()
     {
-        {"admission_date", new DateTime(2012, 1, 1)},
-        {"discharge_date", new DateTime(2012, 1, 5)},
-        {"operation_date", new DateTime(2012, 1, 5)}
+        { "admission_date", new DateTime(2012, 1, 1) },
+        { "discharge_date", new DateTime(2012, 1, 5) },
+        { "operation_date", new DateTime(2012, 1, 5) }
     };
-    #endregion
 
+    #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/TestData/ChiAgeDomainObject.cs b/Rdmp.Core.Tests/Validation/TestData/ChiAgeDomainObject.cs
index 4287bae21e..1434ca110f 100644
--- a/Rdmp.Core.Tests/Validation/TestData/ChiAgeDomainObject.cs
+++ b/Rdmp.Core.Tests/Validation/TestData/ChiAgeDomainObject.cs
@@ -16,5 +16,4 @@ public ChiAgeDomainObject(string chi, int age)
         this.chi = chi;
         this.age = age;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/TestData/ChiDomainObject.cs b/Rdmp.Core.Tests/Validation/TestData/ChiDomainObject.cs
index fc5d94dca4..1f4561b73f 100644
--- a/Rdmp.Core.Tests/Validation/TestData/ChiDomainObject.cs
+++ b/Rdmp.Core.Tests/Validation/TestData/ChiDomainObject.cs
@@ -14,5 +14,4 @@ public ChiDomainObject(string chi)
     {
         this.chi = chi;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/ValidationDeserializationMemoryTest.cs b/Rdmp.Core.Tests/Validation/ValidationDeserializationMemoryTest.cs
index 1088fe4a80..047df65165 100644
--- a/Rdmp.Core.Tests/Validation/ValidationDeserializationMemoryTest.cs
+++ b/Rdmp.Core.Tests/Validation/ValidationDeserializationMemoryTest.cs
@@ -19,7 +19,7 @@ public class ValidationDeserializationMemoryTest
     public void TestMemoryLeak()
     {
         var v = new Validator();
-        v.ItemValidators.Add(new ItemValidator("CHI"){PrimaryConstraint = new Chi()});
+        v.ItemValidators.Add(new ItemValidator("CHI") { PrimaryConstraint = new Chi() });
         var xml = v.SaveToXml();
 
         var bytesAtStart = Process.GetCurrentProcess().WorkingSet64;
@@ -27,8 +27,8 @@ public void TestMemoryLeak()
         for (var i = 0; i < 1000; i++)
         {
             var deser = Validator.LoadFromXml(xml);
-                
-            if(i%500==0)
+
+            if (i % 500 == 0)
             {
                 GC.Collect();
                 Console.WriteLine($"Committed Bytes:{Process.GetCurrentProcess().WorkingSet64}");
@@ -37,8 +37,9 @@ public void TestMemoryLeak()
 
         var bytesAtEnd = Process.GetCurrentProcess().WorkingSet64;
 
-        Assert.Less(bytesAtEnd,bytesAtStart * 2 , "Should not be using double the working memory as many bytes by the end, at start we were using " + bytesAtStart + " at end we were using " + bytesAtEnd + " (Increase of " +(float)bytesAtEnd/bytesAtStart + " times)");
-
+        Assert.Less(bytesAtEnd, bytesAtStart * 2,
+            "Should not be using double the working memory as many bytes by the end, at start we were using " +
+            bytesAtStart + " at end we were using " + bytesAtEnd + " (Increase of " + (float)bytesAtEnd / bytesAtStart +
+            " times)");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/ValidationPluginTests/LegacySerializationTest.cs b/Rdmp.Core.Tests/Validation/ValidationPluginTests/LegacySerializationTest.cs
index 0ada16347d..0664d23ac1 100644
--- a/Rdmp.Core.Tests/Validation/ValidationPluginTests/LegacySerializationTest.cs
+++ b/Rdmp.Core.Tests/Validation/ValidationPluginTests/LegacySerializationTest.cs
@@ -10,7 +10,7 @@
 
 namespace Rdmp.Core.Tests.Validation.ValidationPluginTests;
 
-public class LegacySerializationTest:DatabaseTests
+public class LegacySerializationTest : DatabaseTests
 {
     [Test]
     public void TestLegacyDeserialization()
diff --git a/Rdmp.Core.Tests/Validation/ValidationPluginTests/PluginValidationSerializationTest.cs b/Rdmp.Core.Tests/Validation/ValidationPluginTests/PluginValidationSerializationTest.cs
index 6b25e82c1f..ddc27fa885 100644
--- a/Rdmp.Core.Tests/Validation/ValidationPluginTests/PluginValidationSerializationTest.cs
+++ b/Rdmp.Core.Tests/Validation/ValidationPluginTests/PluginValidationSerializationTest.cs
@@ -36,9 +36,8 @@ public void TestSerialization()
 
         var newV = Validator.LoadFromXml(xml);
 
-        Assert.AreEqual(1,newV.ItemValidators.Count);
+        Assert.AreEqual(1, newV.ItemValidators.Count);
         Assert.AreEqual(typeof(FishConstraint), newV.ItemValidators[0].PrimaryConstraint.GetType());
-
     }
 }
 
@@ -46,13 +45,9 @@ public class FishConstraint : PluginPrimaryConstraint
 {
     public override void RenameColumn(string originalName, string newName)
     {
-            
     }
 
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return "Fish Constraint For Testing";
-    }
+    public override string GetHumanReadableDescriptionOfValidation() => "Fish Constraint For Testing";
 
     public override ValidationFailure Validate(object value)
     {
@@ -64,6 +59,6 @@ public override ValidationFailure Validate(object value)
         if (result.Equals("Fish"))
             return null;
 
-        return new ValidationFailure($"Value '{value}' was not 'Fish'!",this);
+        return new ValidationFailure($"Value '{value}' was not 'Fish'!", this);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core.Tests/Validation/ValidatorTest.cs b/Rdmp.Core.Tests/Validation/ValidatorTest.cs
index 79b5dec1c3..76e0335b5f 100644
--- a/Rdmp.Core.Tests/Validation/ValidatorTest.cs
+++ b/Rdmp.Core.Tests/Validation/ValidatorTest.cs
@@ -44,7 +44,7 @@ public void GetItemValidator_InitialisedState_ReturnsNullItemValidator()
     public void PassValidatorArray_Passes()
     {
         var v = new Validator();
-        v.AddItemValidator(new ItemValidator(), "chi",null);
+        v.AddItemValidator(new ItemValidator(), "chi", null);
         v.ItemValidators[0].PrimaryConstraint = new Chi();
 
         var dt = new DataTable();
@@ -63,14 +63,15 @@ public void AddItemValidator_DuplicateCalls_ThrowsException()
         var validator = new Validator();
         validator.AddItemValidator(new ItemValidator(), "foo", typeof(string));
 
-        Assert.Throws <ArgumentException>(()=>validator.AddItemValidator(new ItemValidator(), "foo", typeof(string)));
+        Assert.Throws<ArgumentException>(() => validator.AddItemValidator(new ItemValidator(), "foo", typeof(string)));
     }
 
     [Test]
     public void RemoveItemValidator_InitialisedState_BehavesAcceptably()
     {
         var validator = new Validator();
-        Assert.False(validator.RemoveItemValidator("non-existent"), "Expected removal of a non-existent ItemValidator to return false.");
+        Assert.False(validator.RemoveItemValidator("non-existent"),
+            "Expected removal of a non-existent ItemValidator to return false.");
     }
 
     [Test]
@@ -78,8 +79,8 @@ public void Validate_NonExistentTargetProperty_ThrowsException()
     {
         var validator = CreateValidatorForNonExistentProperty();
 
-        var ex = Assert.Throws<MissingFieldException>(()=>validator.Validate(_domainObjectWithValidChi));
-        Assert.AreEqual("Validation failed: Target field [non-existent] not found in domain object.",ex.Message);
+        var ex = Assert.Throws<MissingFieldException>(() => validator.Validate(_domainObjectWithValidChi));
+        Assert.AreEqual("Validation failed: Target field [non-existent] not found in domain object.", ex.Message);
     }
 
 
@@ -94,7 +95,6 @@ public void Validate_NonExistentTargetProperty_EmitsMessage()
         }
         catch (MissingFieldException exception)
         {
-
             Assert.True(exception.Message.StartsWith("Validation failed"));
         }
     }
@@ -121,11 +121,11 @@ public void ValidateVerbose_InvalidChi_CountOfWrongIncreases()
     {
         var validator = CreateSimpleChiValidator();
         //run once
-        var results = validator.ValidateVerboseAdditive(_domainObjectWithInvalidChi, null, out Consequence? lastRowConsequence);
+        var results = validator.ValidateVerboseAdditive(_domainObjectWithInvalidChi, null, out var lastRowConsequence);
 
         Assert.IsNotNull(results);
 
-        Assert.AreEqual(results.DictionaryOfFailure["chi"][Consequence.Wrong] , 1);
+        Assert.AreEqual(results.DictionaryOfFailure["chi"][Consequence.Wrong], 1);
 
         //additive --give it same row again, expect the count of wrong ones to go SetUp by 1
         results = validator.ValidateVerboseAdditive(_domainObjectWithInvalidChi, results, out lastRowConsequence);
@@ -153,7 +153,7 @@ public void Test_XML_Generation()
 
         var answer2 = v2.SaveToXml(false);
 
-        Assert.AreEqual(answer,answer2);
+        Assert.AreEqual(answer, answer2);
     }
 
 
@@ -169,7 +169,7 @@ public void Validate_ValidChiAndAge_Successful()
     [TestCase("date", typeof(Date))]
     public void CreatePrimaryConstraint_All_IsOfExpectedType(string name, Type expected)
     {
-        var constraint = Validator.CreateConstraint(name,Consequence.Wrong);
+        var constraint = Validator.CreateConstraint(name, Consequence.Wrong);
 
         Assert.IsInstanceOf(typeof(IPrimaryConstraint), constraint);
         Assert.IsInstanceOf(expected, constraint);
@@ -181,7 +181,7 @@ public void CreatePrimaryConstraint_All_IsOfExpectedType(string name, Type expec
     [TestCase("regularexpression", typeof(RegularExpression))]
     public void CreateSecondaryConstraint_All_IsOfExpectedType(string name, Type expected)
     {
-        var constraint = Validator.CreateConstraint(name,Consequence.Wrong);
+        var constraint = Validator.CreateConstraint(name, Consequence.Wrong);
 
         Assert.IsInstanceOf(typeof(ISecondaryConstraint), constraint);
         Assert.IsInstanceOf(expected, constraint);
@@ -191,7 +191,7 @@ public void CreateSecondaryConstraint_All_IsOfExpectedType(string name, Type exp
     public void RenameColumn_ThreeColumns_HasCorrectName()
     {
         var v = new Validator();
-        v.AddItemValidator(new ItemValidator(),"OldCol2",typeof(string));
+        v.AddItemValidator(new ItemValidator(), "OldCol2", typeof(string));
 
 
         //this constraint ensures that OldCol2 is between OldCol1 and OldcCol3
@@ -216,7 +216,7 @@ public void RenameColumn_ThreeColumns_HasCorrectName()
         Assert.AreEqual(((BoundDate)v.ItemValidators[0].SecondaryConstraints[0]).UpperFieldName, "OldCol3");
 
         //now rename col 1
-        dictionary.Add("OldCol1","NewCol1");
+        dictionary.Add("OldCol1", "NewCol1");
         v.RenameColumns(dictionary);
         Assert.AreEqual(v.ItemValidators[0].TargetProperty, "NewCol2");
         Assert.AreEqual(((BoundDate)v.ItemValidators[0].SecondaryConstraints[0]).LowerFieldName, "NewCol1");
@@ -224,7 +224,8 @@ public void RenameColumn_ThreeColumns_HasCorrectName()
 
         //finally rename col 3
         dictionary.Add("OldCol3", "NewCol3");
-        v.RenameColumns(dictionary); //not strict because we will get not found otherwise since we already renamed the first one
+        v.RenameColumns(
+            dictionary); //not strict because we will get not found otherwise since we already renamed the first one
         Assert.AreEqual(v.ItemValidators[0].TargetProperty, "NewCol2");
         Assert.AreEqual(((BoundDate)v.ItemValidators[0].SecondaryConstraints[0]).LowerFieldName, "NewCol1");
         Assert.AreEqual(((BoundDate)v.ItemValidators[0].SecondaryConstraints[0]).UpperFieldName, "NewCol3");
@@ -242,7 +243,8 @@ private static Validator CreateSimpleChiValidator()
         // 1. Create a new Validator, passing in the domain object to be validated (and its type)
         var validator = new Validator();
         // 2. Create a new ItemValidator (in this case, must be valid CHI)
-        var itemValidator = new ItemValidator { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong) };
+        var itemValidator = new ItemValidator
+            { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong) };
         itemValidator.PrimaryConstraint.Consequence = Consequence.Wrong;
 
         // 3. Add the ItemValidator, specifying the value in the domain object it should validate against
@@ -254,10 +256,11 @@ private static Validator CreateSimpleChiValidator()
     private static Validator CreateChiAndAgeValidators()
     {
         var validator = new Validator();
-        var vChi = new ItemValidator { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong) };
+        var vChi = new ItemValidator
+            { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong) };
         var vAge = new ItemValidator();
-        var age = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
-        age.Lower=0;
+        var age = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
+        age.Lower = 0;
         age.Upper = 120;
         vAge.AddSecondaryConstraint(age);
 
@@ -270,9 +273,10 @@ private static Validator CreateChiAndAgeValidators()
     private static Validator CreateValidatorForNonExistentProperty()
     {
         var validator = new Validator();
-        var itemValidator = new ItemValidator { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi",Consequence.Wrong) };
+        var itemValidator = new ItemValidator
+            { PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint("chi", Consequence.Wrong) };
         validator.AddItemValidator(itemValidator, "non-existent", typeof(string));
-            
+
         return validator;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/AmbiguousDatabaseTypeException.cs b/Rdmp.Core/AmbiguousDatabaseTypeException.cs
index a1d931f401..8c8be951ba 100644
--- a/Rdmp.Core/AmbiguousDatabaseTypeException.cs
+++ b/Rdmp.Core/AmbiguousDatabaseTypeException.cs
@@ -20,8 +20,7 @@ public class AmbiguousDatabaseTypeException : Exception
     /// Creates a new Exception with the given message
     /// </summary>
     /// <param name="s"></param>
-    public AmbiguousDatabaseTypeException(string s):base(s)
+    public AmbiguousDatabaseTypeException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/AssemblyInfo.cs b/Rdmp.Core/AssemblyInfo.cs
index 4e1361bdf6..447e07f4b0 100644
--- a/Rdmp.Core/AssemblyInfo.cs
+++ b/Rdmp.Core/AssemblyInfo.cs
@@ -25,4 +25,4 @@
 //      Revision
 //
 
-[assembly:InternalsVisibleTo("Rdmp.Core.Tests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("Rdmp.Core.Tests")]
\ No newline at end of file
diff --git a/Rdmp.Core/Autocomplete/AutoCompleteProvider.cs b/Rdmp.Core/Autocomplete/AutoCompleteProvider.cs
index 83afe1e33d..f2bc7865eb 100644
--- a/Rdmp.Core/Autocomplete/AutoCompleteProvider.cs
+++ b/Rdmp.Core/Autocomplete/AutoCompleteProvider.cs
@@ -25,14 +25,15 @@ namespace Rdmp.Core.Autocomplete;
 /// </summary>
 public class AutoCompleteProvider : IAutoCompleteProvider
 {
-    public HashSet<string> Items { get; set; }  = new HashSet<string>();
+    public HashSet<string> Items { get; set; } = new();
 
     /// <summary>
     /// Array of images that items can be depicted with.  Use <see cref="ItemsWithImages"/> to index into
     /// this array to get the image out
     /// </summary>
     public Image<Rgba32>[] Images;
-    public Dictionary<string,int> ItemsWithImages { get; set; } = new Dictionary<string, int> ();
+
+    public Dictionary<string, int> ItemsWithImages { get; set; } = new();
 
     private const int TABLE_INFO_IDX = 0;
     private const int COLUMN_INFO_IDX = 1;
@@ -48,12 +49,10 @@ public AutoCompleteProvider()
         Images[SQL_IDX] = Image.Load<Rgba32>(CatalogueIcons.SQL);
         Images[PARAMETER_IDX] = Image.Load<Rgba32>(CatalogueIcons.ParametersNode);
     }
-    public AutoCompleteProvider(IQuerySyntaxHelper helper) :this()
+
+    public AutoCompleteProvider(IQuerySyntaxHelper helper) : this()
     {
-        if(helper != null)
-        {
-            AddSQLKeywords(helper);
-        }
+        if (helper != null) AddSQLKeywords(helper);
     }
 
     /// <summary>
@@ -75,7 +74,8 @@ public void Add(ITableInfo tableInfo)
     }
 
 
-    public void Add(ColumnInfo columnInfo, ITableInfo tableInfo, string databaseName, LoadStage stage, IQuerySyntaxHelper syntaxHelper)
+    public void Add(ColumnInfo columnInfo, ITableInfo tableInfo, string databaseName, LoadStage stage,
+        IQuerySyntaxHelper syntaxHelper)
     {
         var col = columnInfo.GetRuntimeName(stage);
         var table = tableInfo.GetRuntimeName(stage);
@@ -96,7 +96,8 @@ public void Add(ColumnInfo columnInfo)
     private void Add(PreLoadDiscardedColumn discardedColumn, ITableInfo tableInfo, string rawDbName)
     {
         var colName = discardedColumn.GetRuntimeName();
-        var representation = tableInfo.GetQuerySyntaxHelper().EnsureFullyQualified(rawDbName, null, tableInfo.GetRuntimeName(), colName);
+        var representation = tableInfo.GetQuerySyntaxHelper()
+            .EnsureFullyQualified(rawDbName, null, tableInfo.GetRuntimeName(), colName);
         AddUnlessDuplicate(representation);
         AddUnlessDuplicateImage(representation, COLUMN_INFO_IDX);
     }
@@ -126,6 +127,7 @@ private void AddUnlessDuplicateImage(string fullySpecified, int idx)
     {
         ItemsWithImages.TryAdd(fullySpecified, idx);
     }
+
     public void AddSQLKeywords(IQuerySyntaxHelper syntaxHelper)
     {
         if (syntaxHelper == null)
@@ -141,7 +143,7 @@ public void AddSQLKeywords(IQuerySyntaxHelper syntaxHelper)
     public void Add(ISqlParameter parameter)
     {
         AddUnlessDuplicate(parameter.ParameterName);
-        AddUnlessDuplicateImage(parameter.ParameterName,PARAMETER_IDX);
+        AddUnlessDuplicateImage(parameter.ParameterName, PARAMETER_IDX);
     }
 
     public void Add(ITableInfo tableInfo, LoadStage loadStage)
@@ -158,7 +160,6 @@ public void Add(ITableInfo tableInfo, LoadStage loadStage)
 
 
         foreach (var o in tableInfo.GetColumnsAtStage(loadStage))
-        {
             switch (o)
             {
                 case PreLoadDiscardedColumn preDiscarded:
@@ -171,10 +172,9 @@ public void Add(ITableInfo tableInfo, LoadStage loadStage)
                     throw new Exception(
                         $"Expected IHasStageSpecificRuntimeName returned by TableInfo.GetColumnsAtStage to return only ColumnInfos and PreLoadDiscardedColumns.  It returned a '{o.GetType().Name}'");
             }
-        }
 
         AddUnlessDuplicate(fullSql);
-        AddUnlessDuplicateImage(fullSql,TABLE_INFO_IDX);
+        AddUnlessDuplicateImage(fullSql, TABLE_INFO_IDX);
     }
 
     public void Add(DiscoveredTable discoveredTable)
diff --git a/Rdmp.Core/Caching/CachingHost.cs b/Rdmp.Core/Caching/CachingHost.cs
index 721008cd69..cf0edfb0f7 100644
--- a/Rdmp.Core/Caching/CachingHost.cs
+++ b/Rdmp.Core/Caching/CachingHost.cs
@@ -27,17 +27,17 @@ public class CachingHost
     /// The cacheable tasks that the host will be running
     /// </summary>
     public ICacheProgress CacheProgress { get; set; }
-        
+
     /// <summary>
     /// True if the host is attempting to back fill the cache with failed date ranges from the past
     /// </summary>
     public bool RetryMode { get; set; }
-        
+
     private readonly ICatalogueRepository _repository;
-        
+
     // this is more because we can't retrieve CacheWindows from LoadProgresss (yet) 
     private List<PermissionWindowCacheDownloader> _downloaders;
-        
+
     /// <summary>
     /// True to shut down once the <see cref="PermissionWindow"/> for the <see cref="CacheProgress"/> is exceeded.  False
     /// to sleep until it becomes permissible again.
@@ -64,18 +64,20 @@ public void Start(IDataLoadEventListener listener, GracefulCancellationToken can
         if (CacheProgress == null)
             throw new InvalidOperationException("No CacheProgress has been set");
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"CachingHost started for {CacheProgress} (CacheFillProgress={CacheProgress.CacheFillProgress}, CacheLagPeriod={CacheProgress.CacheLagPeriod}, ChunkPeriod={CacheProgress.ChunkPeriod}, Pipeline={CacheProgress.Pipeline})"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                $"CachingHost started for {CacheProgress} (CacheFillProgress={CacheProgress.CacheFillProgress}, CacheLagPeriod={CacheProgress.CacheLagPeriod}, ChunkPeriod={CacheProgress.ChunkPeriod}, Pipeline={CacheProgress.Pipeline})"));
 
         var permissionWindow = CacheProgress.PermissionWindow;
 
         _downloaders = new List<PermissionWindowCacheDownloader>
         {
-            new PermissionWindowCacheDownloader(permissionWindow, new List<ICacheProgress>(new []{ CacheProgress}), new RoundRobinPipelineExecution())
+            new(permissionWindow, new List<ICacheProgress>(new[] { CacheProgress }), new RoundRobinPipelineExecution())
         };
 
         RetrieveNewDataForCache(listener, cancellationToken);
     }
-        
+
     private void RetrieveNewDataForCache(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
     {
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Retrieving new data"));
@@ -97,16 +99,21 @@ private void RetrieveNewDataForCache(IDataLoadEventListener listener, GracefulCa
         {
             var operationCanceledException = e.GetExceptionIfExists<OperationCanceledException>();
             if (operationCanceledException != null)
+            {
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Operation cancelled", e));
+            }
             else
             {
-                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Exception in downloader task whilst caching data", e));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Error, "Exception in downloader task whilst caching data",
+                        e));
                 throw;
             }
         }
     }
 
-    private void DownloadUntilFinished(PermissionWindowCacheDownloader downloader, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    private void DownloadUntilFinished(PermissionWindowCacheDownloader downloader, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         try
         {
@@ -114,15 +121,15 @@ private void DownloadUntilFinished(PermissionWindowCacheDownloader downloader, I
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
-                var result = RetryMode ? 
-                    downloader.RetryDownload(listener, cancellationToken) :
-                    downloader.Download(listener, cancellationToken);
+                var result = RetryMode
+                    ? downloader.RetryDownload(listener, cancellationToken)
+                    : downloader.Download(listener, cancellationToken);
 
                 switch (result)
                 {
                     case RetrievalResult.NotPermitted:
 
-                        if(TerminateIfOutsidePermissionWindow)
+                        if (TerminateIfOutsidePermissionWindow)
                         {
                             listener.OnNotify(this,
                                 new NotifyEventArgs(ProgressEventType.Information,
@@ -145,9 +152,11 @@ private void DownloadUntilFinished(PermissionWindowCacheDownloader downloader, I
                             cancellationToken.ThrowIfCancellationRequested();
                             elapsedTime += cancellationCheckInterval;
                         }
+
                         break;
                     case RetrievalResult.Complete:
-                        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Download completed successfully."));
+                        listener.OnNotify(this,
+                            new NotifyEventArgs(ProgressEventType.Information, "Download completed successfully."));
                         return;
                     default:
                         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
diff --git a/Rdmp.Core/Caching/CachingPreExecutionChecker.cs b/Rdmp.Core/Caching/CachingPreExecutionChecker.cs
index 3ae93f1154..eefedc0f5a 100644
--- a/Rdmp.Core/Caching/CachingPreExecutionChecker.cs
+++ b/Rdmp.Core/Caching/CachingPreExecutionChecker.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.Caching;
 public class CachingPreExecutionChecker : ICheckable
 {
     private readonly ICacheProgress _cacheProgress;
-        
+
     public CachingPreExecutionChecker(ICacheProgress cacheProgress)
     {
         _cacheProgress = cacheProgress;
@@ -42,17 +42,21 @@ public void Check(ICheckNotifier notifier)
             catch (Exception e)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Error when trying to load Pipeline ID = {_cacheProgress.Pipeline_ID.Value}", CheckResult.Fail, e));
+                    $"Error when trying to load Pipeline ID = {_cacheProgress.Pipeline_ID.Value}", CheckResult.Fail,
+                    e));
             }
 
             if (pipeline == null)
-                notifier.OnCheckPerformed(new CheckEventArgs("Could not run Pipeline checks due to previous errors", CheckResult.Fail));
+            {
+                notifier.OnCheckPerformed(new CheckEventArgs("Could not run Pipeline checks due to previous errors",
+                    CheckResult.Fail));
+            }
             else
             {
                 var checker = new PipelineChecker(pipeline);
                 checker.Check(notifier);
             }
-                
+
             if (_cacheProgress.CacheFillProgress == null && _cacheProgress.LoadProgress.OriginDate == null)
                 //if we don't know what dates to request
                 notifier.OnCheckPerformed(
@@ -60,28 +64,25 @@ public void Check(ICheckNotifier notifier)
                         "Both the CacheFillProgress and the LoadProgress.OriginDate are null, this means we don't know where the cache has filled up to and we don't know when the dataset is supposed to start.  This means it is impossible to know what dates to fetch",
                         CheckResult.Fail));
 
-            if (_cacheProgress.PermissionWindow_ID != null && !_cacheProgress.PermissionWindow.WithinPermissionWindow(DateTime.UtcNow))
-            {
+            if (_cacheProgress.PermissionWindow_ID != null &&
+                !_cacheProgress.PermissionWindow.WithinPermissionWindow(DateTime.UtcNow))
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"Current time is {DateTime.UtcNow} which is not a permitted time according to the configured PermissionWindow {_cacheProgress.PermissionWindow.Description} of the CacheProgress {_cacheProgress}",
                     CheckResult.Warning));
-            }
 
             var shortfall = _cacheProgress.GetShortfall();
-                
+
             if (shortfall <= TimeSpan.Zero)
                 if (_cacheProgress.CacheLagPeriod == null)
-                {
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"CacheProgress reports that it has loaded up till {_cacheProgress.CacheFillProgress} which is in the future.  So we don't need to load this cache.", CheckResult.Warning));
-                }
+                            $"CacheProgress reports that it has loaded up till {_cacheProgress.CacheFillProgress} which is in the future.  So we don't need to load this cache.",
+                            CheckResult.Warning));
                 else
-                {
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"CacheProgress reports that it has loaded up till {_cacheProgress.CacheFillProgress} but there is a lag period of {_cacheProgress.CacheLagPeriod} which means we are not due to load any cached data yet.", CheckResult.Warning));
-                }
+                            $"CacheProgress reports that it has loaded up till {_cacheProgress.CacheFillProgress} but there is a lag period of {_cacheProgress.CacheLagPeriod} which means we are not due to load any cached data yet.",
+                            CheckResult.Warning));
 
             var factory = new CachingPipelineUseCase(_cacheProgress);
             IDataFlowPipelineEngine engine = null;
@@ -91,7 +92,8 @@ public void Check(ICheckNotifier notifier)
             }
             catch (Exception e)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Could not create IDataFlowPipelineEngine", CheckResult.Fail, e));
+                notifier.OnCheckPerformed(new CheckEventArgs("Could not create IDataFlowPipelineEngine",
+                    CheckResult.Fail, e));
             }
 
             engine?.Check(notifier);
@@ -100,7 +102,8 @@ public void Check(ICheckNotifier notifier)
         {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Entire checking process for cache progress {_cacheProgress} crashed, see Exception for details", CheckResult.Fail, e));
+                    $"Entire checking process for cache progress {_cacheProgress} crashed, see Exception for details",
+                    CheckResult.Fail, e));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/CustomDateCaching.cs b/Rdmp.Core/Caching/CustomDateCaching.cs
index 9e4f5c7c1c..581b304ac7 100644
--- a/Rdmp.Core/Caching/CustomDateCaching.cs
+++ b/Rdmp.Core/Caching/CustomDateCaching.cs
@@ -33,7 +33,8 @@ public CustomDateCaching(ICacheProgress cacheProgress, ICatalogueRepository cata
         _catalogueRepository = catalogueRepository;
     }
 
-    public Task Fetch(DateTime startDate, DateTime endDate, GracefulCancellationToken token, IDataLoadEventListener listener, bool ignorePermissionWindow = false)
+    public Task Fetch(DateTime startDate, DateTime endDate, GracefulCancellationToken token,
+        IDataLoadEventListener listener, bool ignorePermissionWindow = false)
     {
         var dateToRetrieve = new DateTime(startDate.Year, startDate.Month, startDate.Day);
         var initialFetchRequest = new BackfillCacheFetchRequest(_catalogueRepository, dateToRetrieve)
@@ -43,13 +44,13 @@ public Task Fetch(DateTime startDate, DateTime endDate, GracefulCancellationToke
         };
 
         var requestProvider = startDate == endDate
-            ? (ICacheFetchRequestProvider) new SingleDayCacheFetchRequestProvider(initialFetchRequest)
+            ? (ICacheFetchRequestProvider)new SingleDayCacheFetchRequestProvider(initialFetchRequest)
             : new MultiDayCacheFetchRequestProvider(initialFetchRequest, endDate);
 
         var factory = new CachingPipelineUseCase(_cacheProgress, ignorePermissionWindow, requestProvider);
 
         var engine = factory.GetEngine(listener);
-            
+
         return Task.Factory.StartNew(() => engine.ExecutePipeline(token));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/BasicCacheLayout.cs b/Rdmp.Core/Caching/Layouts/BasicCacheLayout.cs
index c2910da864..d1a33433f3 100644
--- a/Rdmp.Core/Caching/Layouts/BasicCacheLayout.cs
+++ b/Rdmp.Core/Caching/Layouts/BasicCacheLayout.cs
@@ -14,11 +14,11 @@ namespace Rdmp.Core.Caching.Layouts;
 /// Specifies how files are laid out by date.  This is the default implementation in which the cache root directory (usually .\Data\Cache) is populated with folders
 /// yyyy-MM-dd which contains unzipped lists of files for that day.
 /// </summary>
-public class BasicCacheLayout:CacheLayout
+public class BasicCacheLayout : CacheLayout
 {
     public BasicCacheLayout(DirectoryInfo rootCacheDirectory)
-        : base(rootCacheDirectory, "yyyy-MM-dd", CacheArchiveType.None, CacheFileGranularity.Day, new NoSubdirectoriesCachePathResolver())
+        : base(rootCacheDirectory, "yyyy-MM-dd", CacheArchiveType.None, CacheFileGranularity.Day,
+            new NoSubdirectoriesCachePathResolver())
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/CacheLayout.cs b/Rdmp.Core/Caching/Layouts/CacheLayout.cs
index 23052dc04e..21ed53eb05 100644
--- a/Rdmp.Core/Caching/Layouts/CacheLayout.cs
+++ b/Rdmp.Core/Caching/Layouts/CacheLayout.cs
@@ -22,17 +22,18 @@ namespace Rdmp.Core.Caching.Layouts;
 public abstract class CacheLayout : ICacheLayout
 {
     public string DateFormat { get; private set; }
-    public CacheArchiveType ArchiveType { get;private set; }
-    public CacheFileGranularity CacheFileGranularity { get;private set; }
-    public ILoadCachePathResolver Resolver {  get; private set;}
+    public CacheArchiveType ArchiveType { get; private set; }
+    public CacheFileGranularity CacheFileGranularity { get; private set; }
+    public ILoadCachePathResolver Resolver { get; private set; }
     public DirectoryInfo RootDirectory { get; private set; }
 
     /// <summary>
     /// When archiving files what compression level should be used to add/update new files (only applies if <see cref="ArchiveType"/> is zip).  Defaults to Optimal
     /// </summary>
-    public CompressionLevel Compression {get;set; } = CompressionLevel.Optimal;
+    public CompressionLevel Compression { get; set; } = CompressionLevel.Optimal;
 
-    public CacheLayout(DirectoryInfo rootDirectory, string dateFormat, CacheArchiveType cacheArchiveType, CacheFileGranularity granularity, ILoadCachePathResolver resolver)
+    public CacheLayout(DirectoryInfo rootDirectory, string dateFormat, CacheArchiveType cacheArchiveType,
+        CacheFileGranularity granularity, ILoadCachePathResolver resolver)
     {
         DateFormat = dateFormat;
         ArchiveType = cacheArchiveType;
@@ -48,21 +49,21 @@ public virtual void CreateIfNotExists(IDataLoadEventListener listener)
             downloadDirectory.Create();
     }
 
-    public virtual bool CheckExists(DateTime archiveDate,IDataLoadEventListener listener)
+    public virtual bool CheckExists(DateTime archiveDate, IDataLoadEventListener listener)
     {
-        var fi = GetArchiveFileInfoForDate(archiveDate,listener);
+        var fi = GetArchiveFileInfoForDate(archiveDate, listener);
         return fi != null && fi.Exists;
     }
 
     public virtual FileInfo GetArchiveFileInfoForDate(DateTime archiveDate, IDataLoadEventListener listener)
     {
         var loadCacheDirectory = GetLoadCacheDirectory(listener);
-            
-        if(ArchiveType == CacheArchiveType.None)
+
+        if (ArchiveType == CacheArchiveType.None)
         {
             var matching = loadCacheDirectory.GetFiles($"{archiveDate.ToString(DateFormat)}.*").ToArray();
 
-            if(matching.Length > 1)
+            if (matching.Length > 1)
                 throw new Exception(
                     $"Mulitple files found in Cache that share the date {archiveDate}, matching files were:{string.Join(",", matching.Select(m => m.Name))}.  Cache directory is:{loadCacheDirectory}");
 
@@ -75,7 +76,7 @@ public virtual FileInfo GetArchiveFileInfoForDate(DateTime archiveDate, IDataLoa
 
         var filename = $"{archiveDate.ToString(DateFormat)}.{ArchiveType.ToString().ToLower()}";
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Looking for a file called '{filename}' in '{loadCacheDirectory.FullName}'"));
 
         return new FileInfo(Path.Combine(loadCacheDirectory.FullName, filename));
@@ -88,29 +89,32 @@ public virtual FileInfo GetArchiveFileInfoForDate(DateTime archiveDate, IDataLoa
     /// <returns></returns>
     public virtual DirectoryInfo GetLoadCacheDirectory(IDataLoadEventListener listener)
     {
-        if(Resolver == null)
+        if (Resolver == null)
             throw new Exception(
                 $"No ILoadCachePathResolver has been set on CacheLayout {this}, this tells the system whether there are subdirectories and which one to use for a given ICacheLayout, if you don't have one use a new NoSubdirectoriesCachePathResolver() in your ICacheLayout constructor");
 
-        if(RootDirectory == null)
+        if (RootDirectory == null)
             throw new NullReferenceException("RootDirectory has not been set yet");
 
         var downloadDirectory = Resolver.GetLoadCacheDirectory(RootDirectory) ?? throw new Exception(
-                $"Resolver {Resolver} of type {Resolver.GetType().FullName} returned null from GetLoadCacheDirectory");
+            $"Resolver {Resolver} of type {Resolver.GetType().FullName} returned null from GetLoadCacheDirectory");
         if (downloadDirectory.Exists)
+        {
             listener.OnNotify(this,
                 new NotifyEventArgs(ProgressEventType.Trace,
                     $"Download Directory Is:{downloadDirectory.FullName}"));
+        }
         else
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Download Directory Did Not Exist:{downloadDirectory.FullName}"));
 
             downloadDirectory.Create();
 
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Created Download Directory:{downloadDirectory.FullName}"));
         }
+
         return downloadDirectory;
     }
 
@@ -139,10 +143,8 @@ public virtual Queue<DateTime> GetSortedDateQueue(IDataLoadEventListener listene
         return new Queue<DateTime>(dateList);
     }
 
-    public bool CheckCacheFilesAvailability(IDataLoadEventListener listener)
-    {
-        return GetArchiveFilesInLoadCacheDirectory(listener).Any();
-    }
+    public bool CheckCacheFilesAvailability(IDataLoadEventListener listener) =>
+        GetArchiveFilesInLoadCacheDirectory(listener).Any();
 
     public DateTime? GetMostRecentDateToLoadAccordingToFilesystem(IDataLoadEventListener listener)
     {
@@ -166,15 +168,17 @@ public bool CheckCacheFilesAvailability(IDataLoadEventListener listener)
         return dateList[0];
     }
 
-    protected void ArchiveFiles(FileInfo[] files, DateTime archiveDate,IDataLoadEventListener listener)
+    protected void ArchiveFiles(FileInfo[] files, DateTime archiveDate, IDataLoadEventListener listener)
     {
         if (!files.Any()) return;
 
         if (ArchiveType == CacheArchiveType.None)
-            throw new ArgumentException("When using CacheArchiveType.None you should not use ArchiveFiles, instead just copy them into the relevant Cache directory yourself.  Remember that you must have 1 file per day and the filename must be the date according to the DateFormat e.g. 2001-01-01.csv or 2001-01-01.txt or whatever");
+            throw new ArgumentException(
+                "When using CacheArchiveType.None you should not use ArchiveFiles, instead just copy them into the relevant Cache directory yourself.  Remember that you must have 1 file per day and the filename must be the date according to the DateFormat e.g. 2001-01-01.csv or 2001-01-01.txt or whatever");
 
-        var archiveFilepath = GetArchiveFileInfoForDate(archiveDate,listener);
-        var archiveDirectory = archiveFilepath.DirectoryName ?? throw new Exception("The directory for the archive within the cache is being reported as null, which should not be possible.");
+        var archiveFilepath = GetArchiveFileInfoForDate(archiveDate, listener);
+        var archiveDirectory = archiveFilepath.DirectoryName ?? throw new Exception(
+            "The directory for the archive within the cache is being reported as null, which should not be possible.");
         if (!Directory.Exists(archiveDirectory))
             Directory.CreateDirectory(archiveDirectory);
 
@@ -193,26 +197,26 @@ protected void ArchiveFiles(FileInfo[] files, DateTime archiveDate,IDataLoadEven
                 zipArchiveMode = ZipArchiveMode.Create;
                 File.Delete(ziptmp);
             }
+
             using (var zipArchive = ZipFile.Open(ziptmp, zipArchiveMode))
             {
-                var existing =new HashSet<string>();
+                var existing = new HashSet<string>();
                 // Entries can't be inspected if the zip archive has been opened in create mode
-                if (zipArchiveMode==ZipArchiveMode.Update)
+                if (zipArchiveMode == ZipArchiveMode.Update)
                     foreach (var zipArchiveEntry in zipArchive.Entries)
                         existing.Add(zipArchiveEntry.Name);
 
                 foreach (var dataFile in files)
-                {
                     if (!existing.Contains(dataFile.Name))
                         zipArchive.CreateEntryFromFile(dataFile.FullName, dataFile.Name, Compression);
-                }
             }
+
             // TODO: On .Net Core 3.0 and later, we can use the 3-argument variant of .Move to do this atomically
             // Until then, File.Replace will have to do
             if (File.Exists(archiveFilepath.FullName))
-                File.Replace(ziptmp,archiveFilepath.FullName,null,true);
+                File.Replace(ziptmp, archiveFilepath.FullName, null, true);
             else
-                File.Move(ziptmp,archiveFilepath.FullName);
+                File.Move(ziptmp, archiveFilepath.FullName);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/CacheLayoutFactory.cs b/Rdmp.Core/Caching/Layouts/CacheLayoutFactory.cs
index 6d6981ae77..53a83a6b6b 100644
--- a/Rdmp.Core/Caching/Layouts/CacheLayoutFactory.cs
+++ b/Rdmp.Core/Caching/Layouts/CacheLayoutFactory.cs
@@ -24,7 +24,7 @@ public class CacheLayoutFactory
 {
     public static ICacheLayout CreateCacheLayout(ILoadProgress loadProgress, ILoadMetadata metadata)
     {
-        AssertThatThereIsACacheDataProvider(metadata, metadata.ProcessTasks.Where(p=>!p.IsDisabled));
+        AssertThatThereIsACacheDataProvider(metadata, metadata.ProcessTasks.Where(p => !p.IsDisabled));
 
         var cp = loadProgress.CacheProgress;
 
@@ -34,9 +34,11 @@ public static ICacheLayout CreateCacheLayout(ILoadProgress loadProgress, ILoadMe
         return destination.CreateCacheLayout();
     }
 
-    private static void AssertThatThereIsACacheDataProvider(ILoadMetadata metadata, IEnumerable<IProcessTask> processTasks)
+    private static void AssertThatThereIsACacheDataProvider(ILoadMetadata metadata,
+        IEnumerable<IProcessTask> processTasks)
     {
-        const string whatWeExpected = @"(we expected one that was a MEF class implementing ICachedDataProvider since you are trying to execute a cache based data load)";
+        const string whatWeExpected =
+            @"(we expected one that was a MEF class implementing ICachedDataProvider since you are trying to execute a cache based data load)";
 
         var incompatibleProviders = new List<ProcessTask>();
         var compatibleProviders = new List<ProcessTask>();
@@ -68,6 +70,5 @@ private static void AssertThatThereIsACacheDataProvider(ILoadMetadata metadata,
         if (compatibleProviders.Count > 1)
             throw new CacheDataProviderFindingException(
                 $"LoadMetadata {metadata} has multiple cache DataProviders tasks ({string.Join(",", compatibleProviders.Select(p => p.ToString()))}), you are only allowed 1");
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/ICacheLayout.cs b/Rdmp.Core/Caching/Layouts/ICacheLayout.cs
index 3218ed6e5e..016453a956 100644
--- a/Rdmp.Core/Caching/Layouts/ICacheLayout.cs
+++ b/Rdmp.Core/Caching/Layouts/ICacheLayout.cs
@@ -23,13 +23,13 @@ public interface ICacheLayout
     string DateFormat { get; }
     CacheArchiveType ArchiveType { get; }
     CacheFileGranularity CacheFileGranularity { get; }
-        
+
     //Consider taking these as parameters to your constructor - see CacheLayout abstract class for how you should probably implement this interface
-    ILoadCachePathResolver Resolver {  get; }
+    ILoadCachePathResolver Resolver { get; }
     DirectoryInfo RootDirectory { get; }
-        
+
     // some interface for looking up filename
-    DateTime? GetEarliestDateToLoadAccordingToFilesystem(IDataLoadEventListener listener); 
+    DateTime? GetEarliestDateToLoadAccordingToFilesystem(IDataLoadEventListener listener);
     DateTime? GetMostRecentDateToLoadAccordingToFilesystem(IDataLoadEventListener listener);
     void CreateIfNotExists(IDataLoadEventListener listener);
     bool CheckExists(DateTime archiveDate, IDataLoadEventListener listener);
@@ -39,5 +39,4 @@ public interface ICacheLayout
     // requested by DLE
     Queue<DateTime> GetSortedDateQueue(IDataLoadEventListener listener);
     bool CheckCacheFilesAvailability(IDataLoadEventListener listener);
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/NoSubdirectoriesCachePathResolver.cs b/Rdmp.Core/Caching/Layouts/NoSubdirectoriesCachePathResolver.cs
index ad341d7264..3df8912d24 100644
--- a/Rdmp.Core/Caching/Layouts/NoSubdirectoriesCachePathResolver.cs
+++ b/Rdmp.Core/Caching/Layouts/NoSubdirectoriesCachePathResolver.cs
@@ -13,8 +13,5 @@ namespace Rdmp.Core.Caching.Layouts;
 /// </summary>
 public class NoSubdirectoriesCachePathResolver : ILoadCachePathResolver
 {
-    public DirectoryInfo GetLoadCacheDirectory(DirectoryInfo cacheRootDirectory)
-    {
-        return cacheRootDirectory;
-    }
+    public DirectoryInfo GetLoadCacheDirectory(DirectoryInfo cacheRootDirectory) => cacheRootDirectory;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Layouts/ZipCacheLayoutOnePerDay.cs b/Rdmp.Core/Caching/Layouts/ZipCacheLayoutOnePerDay.cs
index 796f2808cb..369d8f1ee9 100644
--- a/Rdmp.Core/Caching/Layouts/ZipCacheLayoutOnePerDay.cs
+++ b/Rdmp.Core/Caching/Layouts/ZipCacheLayoutOnePerDay.cs
@@ -15,10 +15,8 @@ namespace Rdmp.Core.Caching.Layouts;
 /// </summary>
 public class ZipCacheLayoutOnePerDay : CacheLayout
 {
-    public ZipCacheLayoutOnePerDay(DirectoryInfo rootCacheDirectory,ILoadCachePathResolver resolver)
-        : base(rootCacheDirectory, "yyyy-MM-dd", CacheArchiveType.Zip, CacheFileGranularity.Day,resolver)
+    public ZipCacheLayoutOnePerDay(DirectoryInfo rootCacheDirectory, ILoadCachePathResolver resolver)
+        : base(rootCacheDirectory, "yyyy-MM-dd", CacheArchiveType.Zip, CacheFileGranularity.Day, resolver)
     {
-            
     }
-            
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/PermissionWindowCacheDownloader.cs b/Rdmp.Core/Caching/PermissionWindowCacheDownloader.cs
index 215a822957..cb549aeb89 100644
--- a/Rdmp.Core/Caching/PermissionWindowCacheDownloader.cs
+++ b/Rdmp.Core/Caching/PermissionWindowCacheDownloader.cs
@@ -30,14 +30,15 @@ public class PermissionWindowCacheDownloader
     private readonly IMultiPipelineEngineExecutionStrategy _pipelineEngineExecutionStrategy;
     private IDataLoadEventListener _listener;
     private RetrievalResult _retrievalResult;
-        
+
     /// <summary>
     /// Overload with specific cache items to download for this permission window
     /// </summary>
     /// <param name="permissionWindow"></param>
     /// <param name="cacheProgressItems"></param>
     /// <param name="pipelineEngineExecutionStrategy"></param>
-    public PermissionWindowCacheDownloader(IPermissionWindow permissionWindow, List<ICacheProgress> cacheProgressItems, IMultiPipelineEngineExecutionStrategy pipelineEngineExecutionStrategy)
+    public PermissionWindowCacheDownloader(IPermissionWindow permissionWindow, List<ICacheProgress> cacheProgressItems,
+        IMultiPipelineEngineExecutionStrategy pipelineEngineExecutionStrategy)
     {
         _permissionWindow = permissionWindow;
 
@@ -54,7 +55,7 @@ private bool IsDownloadPermitted()
             return true;
 
         //return true only if the permission window is not locked and the time is currently within the window
-        return  _permissionWindow.WithinPermissionWindow();
+        return _permissionWindow.WithinPermissionWindow();
     }
 
     /// <summary>
@@ -69,10 +70,10 @@ private bool IsDownloadPermitted()
     public RetrievalResult Download(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
     {
         _listener = listener;
-            
-        return IsDownloadRequired(listener) ?
-            RunPipelineExecutionTask(cancellationToken, CreateCachingEngine) :
-            _retrievalResult;
+
+        return IsDownloadRequired(listener)
+            ? RunPipelineExecutionTask(cancellationToken, CreateCachingEngine)
+            : _retrievalResult;
     }
 
     public RetrievalResult RetryDownload(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
@@ -81,9 +82,9 @@ public RetrievalResult RetryDownload(IDataLoadEventListener listener, GracefulCa
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Retrying download: {(_permissionWindow == null ? "No permission window" : _permissionWindow.Name)}"));
 
-        return IsDownloadRequired(listener) ? 
-            RunPipelineExecutionTask(cancellationToken, CreateRetryCachingEngine) :
-            _retrievalResult;
+        return IsDownloadRequired(listener)
+            ? RunPipelineExecutionTask(cancellationToken, CreateRetryCachingEngine)
+            : _retrievalResult;
     }
 
     private bool IsDownloadRequired(IDataLoadEventListener listener)
@@ -96,19 +97,22 @@ private bool IsDownloadRequired(IDataLoadEventListener listener)
 
         if (_cacheProgressItems == null)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, "No cache progress provided so nothing to download."));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "No cache progress provided so nothing to download."));
             _retrievalResult = RetrievalResult.Complete;
             return false;
         }
-            
+
         return true;
     }
 
-    private RetrievalResult RunPipelineExecutionTask(GracefulCancellationToken cancellationToken, Func<ICacheProgress, IDataFlowPipelineEngine> createEngineFunc)
+    private RetrievalResult RunPipelineExecutionTask(GracefulCancellationToken cancellationToken,
+        Func<ICacheProgress, IDataFlowPipelineEngine> createEngineFunc)
     {
         // CreateCachingEngine also populates the engineMap as it knows about both the load schedule and pipeline engine at the same time
         var cachingEngines = _cacheProgressItems.Select(createEngineFunc).ToList();
-            
+
         return RunOnce(cancellationToken, cachingEngines);
     }
 
@@ -119,16 +123,17 @@ private RetrievalResult RunPipelineExecutionTask(GracefulCancellationToken cance
     /// <param name="cancellationToken"></param>
     /// <param name="cachingEngines"></param>
     /// <returns></returns>
-    private RetrievalResult RunOnce(GracefulCancellationToken cancellationToken, List<IDataFlowPipelineEngine> cachingEngines)
+    private RetrievalResult RunOnce(GracefulCancellationToken cancellationToken,
+        List<IDataFlowPipelineEngine> cachingEngines)
     {
-
         // We will be spawning our own task which we want separate control of (to kill if we pass outside the permission window), so need our own cancellation token
         var executionCancellationTokenSource = new GracefulCancellationTokenSource();
 
         // We want to be able to stop the engine if we pass outside the permission window, however the execution strategy objects should not know about PermissionWindows
-        var executionTask = new Task(() => 
-            _pipelineEngineExecutionStrategy.Execute(cachingEngines, executionCancellationTokenSource.Token, _listener));
-            
+        var executionTask = new Task(() =>
+            _pipelineEngineExecutionStrategy.Execute(cachingEngines, executionCancellationTokenSource.Token,
+                _listener));
+
         // Block waiting on task completion or signalling of the cancellation token
         while (!executionTask.IsCompleted)
         {
@@ -143,15 +148,17 @@ private RetrievalResult RunOnce(GracefulCancellationToken cancellationToken, Lis
             {
                 // Wait nicely until the child task signals its abort token (by throwing?)
                 executionCancellationTokenSource.Abort();
-                _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Have issued Abort request to the Pipeline Execution Task. Waiting for the task to exit..."));
+                _listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        "Have issued Abort request to the Pipeline Execution Task. Waiting for the task to exit..."));
                 try
                 {
                     executionTask.Wait();
                 }
                 catch (AggregateException)
                 {
-                        
                 }
+
                 return RetrievalResult.Aborted;
             }
 
@@ -181,8 +188,11 @@ private RetrievalResult RunOnce(GracefulCancellationToken cancellationToken, Lis
 
         if (executionTask.IsFaulted)
         {
-            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Task faulted, information is in the attached exception.", executionTask.Exception));
-            throw new InvalidOperationException("Task faulted, see inner exception for details.", executionTask.Exception);
+            _listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Task faulted, information is in the attached exception.",
+                    executionTask.Exception));
+            throw new InvalidOperationException("Task faulted, see inner exception for details.",
+                executionTask.Exception);
         }
 
         return RetrievalResult.Complete;
@@ -197,14 +207,14 @@ private IDataFlowPipelineEngine CreateCachingEngine(ICacheProgress cacheProgress
 
     private IDataFlowPipelineEngine CreateRetryCachingEngine(ICacheProgress cacheProgress)
     {
-        var cachingPipelineEngineFactory = new CachingPipelineUseCase(cacheProgress, true,new FailedCacheFetchRequestProvider(cacheProgress));
+        var cachingPipelineEngineFactory =
+            new CachingPipelineUseCase(cacheProgress, true, new FailedCacheFetchRequestProvider(cacheProgress));
         return cachingPipelineEngineFactory.GetEngine(_listener);
     }
 
     private void CheckCacheProgressesUseCorrectPermissionWindow(IEnumerable<ICacheProgress> cacheProgressList)
     {
         foreach (var cacheProgress in cacheProgressList)
-        {
             if (_permissionWindow == null)
             {
                 if (cacheProgress.PermissionWindow_ID != null)
@@ -217,13 +227,11 @@ private void CheckCacheProgressesUseCorrectPermissionWindow(IEnumerable<ICachePr
                 throw new Exception(
                     $"Configuration error, CacheProgress with ID={cacheProgress.ID} does not have its permissions specified by Permission Window '{_permissionWindow.Name}' (ID={_permissionWindow.ID}). It uses Permission Window '{progressPermissionWindow.Name}' (ID={progressPermissionWindow.ID})");
             }
-
-        }
     }
 
     public override string ToString()
     {
-        if(_permissionWindow == null)
+        if (_permissionWindow == null)
             return "Downloader (Any Time)";
 
 
diff --git a/Rdmp.Core/Caching/Pipeline/CachingPipelineUseCase.cs b/Rdmp.Core/Caching/Pipeline/CachingPipelineUseCase.cs
index 06dd35ec62..90586504ab 100644
--- a/Rdmp.Core/Caching/Pipeline/CachingPipelineUseCase.cs
+++ b/Rdmp.Core/Caching/Pipeline/CachingPipelineUseCase.cs
@@ -27,7 +27,7 @@ namespace Rdmp.Core.Caching.Pipeline;
 /// not have a configured caching pipeline e.g. to facilitate the user selecting/creating an appropriate pipeline in the first place (set throwIfNoPipeline
 /// to false under such circumstances).
 /// </summary>
-public sealed class CachingPipelineUseCase:PipelineUseCase
+public sealed class CachingPipelineUseCase : PipelineUseCase
 {
     private readonly ICacheProgress _cacheProgress;
     private readonly ICacheFetchRequestProvider _providerIfAny;
@@ -41,7 +41,8 @@ public sealed class CachingPipelineUseCase:PipelineUseCase
     /// <param name="ignorePermissionWindow">Set to true to ignore the CacheProgress.PermissionWindow (if any)</param>
     /// <param name="providerIfAny">The strategy for figuring out what dates to load the cache with e.g. failed cache fetches or new jobs from head of que?</param>
     /// <param name="throwIfNoPipeline"></param>
-    public CachingPipelineUseCase(ICacheProgress cacheProgress,bool ignorePermissionWindow=false,ICacheFetchRequestProvider providerIfAny = null,bool throwIfNoPipeline = true)
+    public CachingPipelineUseCase(ICacheProgress cacheProgress, bool ignorePermissionWindow = false,
+        ICacheFetchRequestProvider providerIfAny = null, bool throwIfNoPipeline = true)
     {
         _cacheProgress = cacheProgress;
         _providerIfAny = providerIfAny;
@@ -51,11 +52,11 @@ public CachingPipelineUseCase(ICacheProgress cacheProgress,bool ignorePermission
             _permissionWindow = new SpontaneouslyInventedPermissionWindow(_cacheProgress);
         else
             _permissionWindow = cacheProgress.PermissionWindow;
-            
+
         _providerIfAny ??= new CacheFetchRequestProvider(_cacheProgress)
-            {
-                PermissionWindow = _permissionWindow
-            };
+        {
+            PermissionWindow = _permissionWindow
+        };
 
         _pipeline = _cacheProgress.Pipeline;
 
@@ -74,7 +75,9 @@ public CachingPipelineUseCase(ICacheProgress cacheProgress,bool ignorePermission
                     $"LoadMetadata '{lmd}' does not have a Load Directory specified, cannot create ProcessingPipelineUseCase without one");
         }
         else
+        {
             AddInitializationObject(new LoadDirectory(lmd.LocationOfFlatFiles));
+        }
 
         AddInitializationObject(_providerIfAny);
         AddInitializationObject(_permissionWindow);
@@ -89,34 +92,32 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
         var context = contextFactory.Create(PipelineUsage.None);
 
         //adjust context: we want a destination requirement of ICacheFileSystemDestination so that we can load from the cache using the pipeline endpoint as the source of the data load
-        context.MustHaveDestination = typeof(ICacheFileSystemDestination);//we want this freaky destination type
+        context.MustHaveDestination = typeof(ICacheFileSystemDestination); //we want this freaky destination type
         context.MustHaveSource = typeof(ICacheSource);
 
         return context;
     }
 
 
-    public ICacheFileSystemDestination CreateDestinationOnly( IDataLoadEventListener listener)
+    public ICacheFileSystemDestination CreateDestinationOnly(IDataLoadEventListener listener)
     {
         // get the current destination
-        var destination = GetEngine(_pipeline, listener).DestinationObject ?? throw new Exception($"{_cacheProgress} does not have a DestinationComponent in its Pipeline");
+        var destination = GetEngine(_pipeline, listener).DestinationObject ??
+                          throw new Exception($"{_cacheProgress} does not have a DestinationComponent in its Pipeline");
         if (destination is not ICacheFileSystemDestination systemDestination)
             throw new NotSupportedException(
                 $"{_cacheProgress} pipeline destination is not an ICacheFileSystemDestination, it was {_cacheProgress.GetType().FullName}");
-            
+
         return systemDestination;
     }
 
-    public IDataFlowPipelineEngine GetEngine(IDataLoadEventListener listener)
-    {
-        return GetEngine(_pipeline, listener);
-    }
+    public IDataFlowPipelineEngine GetEngine(IDataLoadEventListener listener) => GetEngine(_pipeline, listener);
 
 
     /// <summary>
     /// Design time types
     /// </summary>
-    private CachingPipelineUseCase():base(new Type[]
+    private CachingPipelineUseCase() : base(new Type[]
     {
         typeof(ICacheFetchRequestProvider),
         typeof(IPermissionWindow),
@@ -127,8 +128,5 @@ private CachingPipelineUseCase():base(new Type[]
         GenerateContext();
     }
 
-    public static CachingPipelineUseCase DesignTime()
-    {
-        return new CachingPipelineUseCase();
-    }
+    public static CachingPipelineUseCase DesignTime() => new();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Pipeline/Destinations/CacheFilesystemDestination.cs b/Rdmp.Core/Caching/Pipeline/Destinations/CacheFilesystemDestination.cs
index 6dacaf52a2..667bf4dcb5 100644
--- a/Rdmp.Core/Caching/Pipeline/Destinations/CacheFilesystemDestination.cs
+++ b/Rdmp.Core/Caching/Pipeline/Destinations/CacheFilesystemDestination.cs
@@ -30,12 +30,16 @@ public enum CacheFileGranularity
 /// this class you should implement an ICacheLayout (or use an existing one) and then use ProcessPipelineData to populate the CacheDirectory with data according to the
 /// ICacheLayout
 /// </summary>
-public abstract class CacheFilesystemDestination : ICacheFileSystemDestination, IPluginDataFlowComponent<ICacheChunk>, IDataFlowDestination<ICacheChunk>
+public abstract class CacheFilesystemDestination : ICacheFileSystemDestination, IPluginDataFlowComponent<ICacheChunk>,
+    IDataFlowDestination<ICacheChunk>
 {
-    [DemandsInitialization("Root directory for the cache. This overrides the default LoadDirectory cache location. This might be needed if you are caching a very large data set which needs its own dedicated storage resource, for example.",DemandType.Unspecified,null)]
+    [DemandsInitialization(
+        "Root directory for the cache. This overrides the default LoadDirectory cache location. This might be needed if you are caching a very large data set which needs its own dedicated storage resource, for example.",
+        DemandType.Unspecified, null)]
     public DirectoryInfo CacheDirectory { get; set; }
 
-    public abstract ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken);
+    public abstract ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken);
 
     public void PreInitialize(ILoadDirectory value, IDataLoadEventListener listener)
     {
@@ -43,7 +47,8 @@ public void PreInitialize(ILoadDirectory value, IDataLoadEventListener listener)
         if (CacheDirectory == null)
         {
             if (value.Cache == null)
-                throw new Exception("For some reason the LoadDirectory does not have a Cache specified and the FilesystemDestination component does not have an override CacheDirectory specified");
+                throw new Exception(
+                    "For some reason the LoadDirectory does not have a Cache specified and the FilesystemDestination component does not have an override CacheDirectory specified");
 
             CacheDirectory = value.Cache;
         }
@@ -70,14 +75,15 @@ public static void Abort()
     }
 
     public bool SilentRunning { get; set; }
+
     public virtual void Check(ICheckNotifier notifier)
     {
         if (CacheDirectory == null)
-            throw new InvalidOperationException("CacheDirectory is null, ensure that pre-initialize has been called with a valid object before checking.");
+            throw new InvalidOperationException(
+                "CacheDirectory is null, ensure that pre-initialize has been called with a valid object before checking.");
 
         // If we have an overridden cache directory, ensure we can reach it and write to it
         if (CacheDirectory != null)
-        {
             try
             {
                 var tempFilename = Path.Combine(CacheDirectory.FullName, ".test.txt");
@@ -86,14 +92,15 @@ public virtual void Check(ICheckNotifier notifier)
                 sw.Dispose();
                 File.Delete(tempFilename);
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Confirmed could write to/delete from the overridden CacheDirectory: {CacheDirectory.FullName}", CheckResult.Success));
+                    $"Confirmed could write to/delete from the overridden CacheDirectory: {CacheDirectory.FullName}",
+                    CheckResult.Success));
             }
             catch (Exception e)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Could not write to the overridden CacheDirectory: {CacheDirectory.FullName}", CheckResult.Fail, e));
+                    $"Could not write to the overridden CacheDirectory: {CacheDirectory.FullName}", CheckResult.Fail,
+                    e));
             }
-        }
 
         // Check CacheLayout creation
         var cacheLayout = CreateCacheLayout();
diff --git a/Rdmp.Core/Caching/Pipeline/IMultiPipelineEngineExecutionStrategy.cs b/Rdmp.Core/Caching/Pipeline/IMultiPipelineEngineExecutionStrategy.cs
index 1a3294bdbc..8ec661d2a1 100644
--- a/Rdmp.Core/Caching/Pipeline/IMultiPipelineEngineExecutionStrategy.cs
+++ b/Rdmp.Core/Caching/Pipeline/IMultiPipelineEngineExecutionStrategy.cs
@@ -16,5 +16,6 @@ namespace Rdmp.Core.Caching.Pipeline;
 /// </summary>
 public interface IMultiPipelineEngineExecutionStrategy
 {
-    void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken, IDataLoadEventListener listener);
+    void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken,
+        IDataLoadEventListener listener);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Pipeline/RoundRobinPipelineExecution.cs b/Rdmp.Core/Caching/Pipeline/RoundRobinPipelineExecution.cs
index 5dbdef88d3..ba2a3eb86b 100644
--- a/Rdmp.Core/Caching/Pipeline/RoundRobinPipelineExecution.cs
+++ b/Rdmp.Core/Caching/Pipeline/RoundRobinPipelineExecution.cs
@@ -19,7 +19,8 @@ namespace Rdmp.Core.Caching.Pipeline;
 /// </summary>
 public class RoundRobinPipelineExecution : IMultiPipelineEngineExecutionStrategy
 {
-    public void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken, IDataLoadEventListener listener)
+    public void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken,
+        IDataLoadEventListener listener)
     {
         // Execute one pass through a pipeline before moving to the next. Continue until completion.
         var engineList = engines.ToList();
@@ -40,6 +41,8 @@ public void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancel
             }
         }
 
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Round robin executor is finished, all pipelines have run to completion."));
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                "Round robin executor is finished, all pipelines have run to completion."));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Pipeline/SerialPipelineExecution.cs b/Rdmp.Core/Caching/Pipeline/SerialPipelineExecution.cs
index 2f17cd9e83..632a66bc11 100644
--- a/Rdmp.Core/Caching/Pipeline/SerialPipelineExecution.cs
+++ b/Rdmp.Core/Caching/Pipeline/SerialPipelineExecution.cs
@@ -17,13 +17,14 @@ namespace Rdmp.Core.Caching.Pipeline;
 /// </summary>
 public class SerialPipelineExecution : IMultiPipelineEngineExecutionStrategy
 {
-    public void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken, IDataLoadEventListener listener)
+    public void Execute(IEnumerable<IDataFlowPipelineEngine> engines, GracefulCancellationToken cancellationToken,
+        IDataLoadEventListener listener)
     {
         // Execute each pipeline to completion before starting the next
         foreach (var engine in engines)
         {
             engine.ExecutePipeline(cancellationToken);
-                
+
             if (cancellationToken.IsCancellationRequested)
                 break;
         }
diff --git a/Rdmp.Core/Caching/Pipeline/Sources/CacheSource.cs b/Rdmp.Core/Caching/Pipeline/Sources/CacheSource.cs
index e64a5764b1..91d9a0ce0e 100644
--- a/Rdmp.Core/Caching/Pipeline/Sources/CacheSource.cs
+++ b/Rdmp.Core/Caching/Pipeline/Sources/CacheSource.cs
@@ -21,7 +21,8 @@ namespace Rdmp.Core.Caching.Pipeline.Sources;
 /// and stored further down the caching pipeline.  Use the Request property to determine which dates/times you are supposed to handle within DoGetChunk.
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public abstract class CacheSource<T> : ICacheSource, IPluginDataFlowSource<T>,IPipelineRequirement<ICatalogueRepository> where T : class,ICacheChunk
+public abstract class CacheSource<T> : ICacheSource, IPluginDataFlowSource<T>,
+    IPipelineRequirement<ICatalogueRepository> where T : class, ICacheChunk
 {
     public ICacheFetchRequestProvider RequestProvider { get; set; }
     public IPermissionWindow PermissionWindow { get; set; }
@@ -47,22 +48,27 @@ public virtual T GetChunk(IDataLoadEventListener listener, GracefulCancellationT
         // If GetNext returns null, there are no further failures to process and we're done
         if (Request == null)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "The RequestProvider has no more requests to provide (RequestProvider.GetNext returned null)"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "The RequestProvider has no more requests to provide (RequestProvider.GetNext returned null)"));
             return null;
         }
 
         if (Request.CacheProgress == null)
-            throw new InvalidOperationException("The request has no CacheProgress item (in this case to determine when the lag period begins)");
+            throw new InvalidOperationException(
+                "The request has no CacheProgress item (in this case to determine when the lag period begins)");
 
         // Check if we will stray into the lag period with this fetch and if so signal we are finished
         var cacheLagPeriod = Request.CacheProgress.GetCacheLagPeriod();
         if (cacheLagPeriod != null && cacheLagPeriod.TimeIsWithinPeriod(Request.End))
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "The Request is for a time within the Cache Lag Period. This means we are up-to-date and can stop now."));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "The Request is for a time within the Cache Lag Period. This means we are up-to-date and can stop now."));
             return null;
         }
 
-        Chunk = DoGetChunk(Request,listener, cancellationToken);
+        Chunk = DoGetChunk(Request, listener, cancellationToken);
 
         if (Chunk != null && Chunk.Request == null && Request != null)
             listener.OnNotify(this,
@@ -78,7 +84,8 @@ public virtual T GetChunk(IDataLoadEventListener listener, GracefulCancellationT
     /// <param name="request">The period of time we want to fetch</param>
     /// <param name="listener">For auditing progress during the fetch</param>
     /// <param name="cancellationToken">Indicates if user is trying to cancel the process</param>
-    public abstract T DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken);
+    public abstract T DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken);
 
     public void PreInitialize(ICacheFetchRequestProvider value, IDataLoadEventListener listener)
     {
@@ -94,11 +101,10 @@ public void PreInitialize(IPermissionWindow value, IDataLoadEventListener listen
     public abstract void Abort(IDataLoadEventListener listener);
     public abstract T TryGetPreview();
     public abstract void Check(ICheckNotifier notifier);
+
     public void PreInitialize(ICatalogueRepository value, IDataLoadEventListener listener)
     {
         CatalogueRepository = value;
         MEF = value.MEF;
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Pipeline/Sources/ICacheSource.cs b/Rdmp.Core/Caching/Pipeline/Sources/ICacheSource.cs
index 0c8a3c9a62..cc64accbde 100644
--- a/Rdmp.Core/Caching/Pipeline/Sources/ICacheSource.cs
+++ b/Rdmp.Core/Caching/Pipeline/Sources/ICacheSource.cs
@@ -15,6 +15,7 @@ namespace Rdmp.Core.Caching.Pipeline.Sources;
 /// (which tells you what date/time you are supposed to be fetching) and IPermissionWindow (which tells you what real time window you can make requests during e.g. only
 /// attempt to cache data between 9am and 5pm at night)
 /// </summary>
-public interface ICacheSource : IPipelineRequirement<ICacheFetchRequestProvider>, IPipelineRequirement<IPermissionWindow>
+public interface ICacheSource : IPipelineRequirement<ICacheFetchRequestProvider>,
+    IPipelineRequirement<IPermissionWindow>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Caching/Requests/BackfillCacheFetchRequest.cs b/Rdmp.Core/Caching/Requests/BackfillCacheFetchRequest.cs
index 4551e89fd0..2e8a0c1c46 100644
--- a/Rdmp.Core/Caching/Requests/BackfillCacheFetchRequest.cs
+++ b/Rdmp.Core/Caching/Requests/BackfillCacheFetchRequest.cs
@@ -17,8 +17,7 @@ namespace Rdmp.Core.Caching.Requests;
 /// </summary>
 public class BackfillCacheFetchRequest : ICacheFetchRequest
 {
-    [NoMappingToDatabase]
-    public IRepository Repository { get; set; }
+    [NoMappingToDatabase] public IRepository Repository { get; set; }
 
     public DateTime Start { get; set; }
     public TimeSpan ChunkPeriod { get; set; }
@@ -28,13 +27,13 @@ public class BackfillCacheFetchRequest : ICacheFetchRequest
 
     public DateTime End => Start.Add(ChunkPeriod);
 
-    public BackfillCacheFetchRequest(IRepository repository,DateTime start)
+    public BackfillCacheFetchRequest(IRepository repository, DateTime start)
     {
         Repository = repository;
         Start = start;
         IsRetry = false;
     }
-        
+
     public void SaveCacheFillProgress(DateTime cacheFillProgress)
     {
         // do nothing, backfill should not affect the cache
diff --git a/Rdmp.Core/Caching/Requests/CacheFetchRequest.cs b/Rdmp.Core/Caching/Requests/CacheFetchRequest.cs
index 1d252113e8..9732d35586 100644
--- a/Rdmp.Core/Caching/Requests/CacheFetchRequest.cs
+++ b/Rdmp.Core/Caching/Requests/CacheFetchRequest.cs
@@ -18,8 +18,7 @@ namespace Rdmp.Core.Caching.Requests;
 /// </summary>
 public class CacheFetchRequest : ICacheFetchRequest
 {
-    [NoMappingToDatabase]
-    public IRepository Repository { get; set; }
+    [NoMappingToDatabase] public IRepository Repository { get; set; }
 
     public DateTime Start { get; set; }
     public DateTime End => Start.Add(ChunkPeriod);
@@ -41,7 +40,7 @@ public CacheFetchRequest(IRepository repository, DateTime start)
         PreviousFailure = null;
     }
 
-    public CacheFetchRequest(IRepository repository): this(repository,DateTime.MinValue)
+    public CacheFetchRequest(IRepository repository) : this(repository, DateTime.MinValue)
     {
     }
 
@@ -74,7 +73,7 @@ public void RequestFailed(Exception e)
         }
         else
         {
-            new CacheFetchFailure((ICatalogueRepository) Repository, CacheProgress,Start,End, e);
+            new CacheFetchFailure((ICatalogueRepository)Repository, CacheProgress, Start, End, e);
         }
     }
 
diff --git a/Rdmp.Core/Caching/Requests/FetchRequestProvider/CacheFetchRequestProvider.cs b/Rdmp.Core/Caching/Requests/FetchRequestProvider/CacheFetchRequestProvider.cs
index 1b721bd522..1cba29c715 100644
--- a/Rdmp.Core/Caching/Requests/FetchRequestProvider/CacheFetchRequestProvider.cs
+++ b/Rdmp.Core/Caching/Requests/FetchRequestProvider/CacheFetchRequestProvider.cs
@@ -18,7 +18,7 @@ public class CacheFetchRequestProvider : ICacheFetchRequestProvider
 
     private ICacheFetchRequest _initialRequest;
     public ICacheFetchRequest Current { get; private set; }
-        
+
     /// <summary>
     /// Sets up the class to generate <see cref="ICacheFetchRequest"/> for the given <see cref="ICacheProgress"/>
     /// </summary>
@@ -37,7 +37,7 @@ public CacheFetchRequestProvider(ICacheProgress cacheProgress)
     public virtual ICacheFetchRequest CreateInitialRequest()
     {
         var lp = CacheProgress.LoadProgress;
-            
+
         // Figure out when to start loading from
         DateTime startDate;
         if (CacheProgress.CacheFillProgress.HasValue)
@@ -45,7 +45,8 @@ public virtual ICacheFetchRequest CreateInitialRequest()
         else if (lp.OriginDate.HasValue)
             startDate = lp.OriginDate.Value;
         else
-            throw new Exception("Don't know when to begin loading the cache from. Neither CacheProgress or LoadProgress has a relevant date.");
+            throw new Exception(
+                "Don't know when to begin loading the cache from. Neither CacheProgress or LoadProgress has a relevant date.");
 
         var initialFetchRequest = new CacheFetchRequest(CacheProgress.Repository)
         {
@@ -74,7 +75,7 @@ public ICacheFetchRequest GetNext(IDataLoadEventListener listener)
     private ICacheFetchRequest CreateNext()
     {
         var nextStart = Current.Start.Add(Current.ChunkPeriod);
-        return new CacheFetchRequest(CacheProgress.Repository,nextStart)
+        return new CacheFetchRequest(CacheProgress.Repository, nextStart)
         {
             CacheProgress = Current.CacheProgress,
             PermissionWindow = Current.PermissionWindow,
diff --git a/Rdmp.Core/Caching/Requests/FetchRequestProvider/FailedCacheFetchRequestProvider.cs b/Rdmp.Core/Caching/Requests/FetchRequestProvider/FailedCacheFetchRequestProvider.cs
index b4497ce119..56cf2df68b 100644
--- a/Rdmp.Core/Caching/Requests/FetchRequestProvider/FailedCacheFetchRequestProvider.cs
+++ b/Rdmp.Core/Caching/Requests/FetchRequestProvider/FailedCacheFetchRequestProvider.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.Caching.Requests.FetchRequestProvider;
 public class FailedCacheFetchRequestProvider : ICacheFetchRequestProvider
 {
     public ICacheFetchRequest Current { get; private set; }
-        
+
     private readonly ICacheProgress _cacheProgress;
     private readonly int _batchSize;
 
@@ -29,7 +29,7 @@ public FailedCacheFetchRequestProvider(ICacheProgress cacheProgress, int batchSi
     {
         _cacheProgress = cacheProgress;
         _batchSize = batchSize;
-            
+
         Current = null;
     }
 
@@ -41,7 +41,9 @@ public ICacheFetchRequest GetNext(IDataLoadEventListener listener)
     {
         if (!_failuresToProvide.Any())
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Getting next batch of request failures from database."));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "Getting next batch of request failures from database."));
             GetNextBatchFromDatabase();
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Fetched {_failuresToProvide.Count} failures from database."));
diff --git a/Rdmp.Core/Caching/Requests/FetchRequestProvider/MultiDayCacheFetchRequestProvider.cs b/Rdmp.Core/Caching/Requests/FetchRequestProvider/MultiDayCacheFetchRequestProvider.cs
index 677eef5902..34e80e01f5 100644
--- a/Rdmp.Core/Caching/Requests/FetchRequestProvider/MultiDayCacheFetchRequestProvider.cs
+++ b/Rdmp.Core/Caching/Requests/FetchRequestProvider/MultiDayCacheFetchRequestProvider.cs
@@ -35,7 +35,7 @@ public ICacheFetchRequest GetNext(IDataLoadEventListener listener)
         else
         {
             Current = Current.GetNext();
-                
+
             // We have provided requests for the whole time period
             if (Current.Start > _endDateInclusive)
                 return null;
diff --git a/Rdmp.Core/Caching/Requests/ICacheFetchRequest.cs b/Rdmp.Core/Caching/Requests/ICacheFetchRequest.cs
index c1eb6276c4..9fcd146d67 100644
--- a/Rdmp.Core/Caching/Requests/ICacheFetchRequest.cs
+++ b/Rdmp.Core/Caching/Requests/ICacheFetchRequest.cs
@@ -21,7 +21,7 @@ public interface ICacheFetchRequest
     IRepository Repository { get; set; }
 
     void SaveCacheFillProgress(DateTime cacheFillProgress);
-        
+
     DateTime Start { get; set; }
     DateTime End { get; }
     TimeSpan ChunkPeriod { get; set; }
diff --git a/Rdmp.Core/CohortCommitting/CreateNewCohortDatabaseWizard.cs b/Rdmp.Core/CohortCommitting/CreateNewCohortDatabaseWizard.cs
index 8990425051..888a53dc4f 100644
--- a/Rdmp.Core/CohortCommitting/CreateNewCohortDatabaseWizard.cs
+++ b/Rdmp.Core/CohortCommitting/CreateNewCohortDatabaseWizard.cs
@@ -38,20 +38,22 @@ public class CreateNewCohortDatabaseWizard
 
     private string _releaseIdentifierFieldName = "ReleaseId";
     private string _definitionTableForeignKeyField = "cohortDefinition_id";
-        
 
-    public CreateNewCohortDatabaseWizard(DiscoveredDatabase targetDatabase,ICatalogueRepository catalogueRepository, IDataExportRepository dataExportRepository,bool allowNullReleaseIdentifiers)
+
+    public CreateNewCohortDatabaseWizard(DiscoveredDatabase targetDatabase, ICatalogueRepository catalogueRepository,
+        IDataExportRepository dataExportRepository, bool allowNullReleaseIdentifiers)
     {
         AllowNullReleaseIdentifiers = allowNullReleaseIdentifiers;
         _catalogueRepository = catalogueRepository;
         _dataExportRepository = dataExportRepository;
         _targetDatabase = targetDatabase;
     }
-        
+
     public PrivateIdentifierPrototype[] GetPrivateIdentifierCandidates()
     {
         //get the extraction identifiers
-        var extractionInformations = _catalogueRepository.GetAllObjects<ExtractionInformation>().Where(ei => ei.IsExtractionIdentifier);
+        var extractionInformations = _catalogueRepository.GetAllObjects<ExtractionInformation>()
+            .Where(ei => ei.IsExtractionIdentifier);
 
         //name + datatype, ideally we want to find 30 fields called 'PatientIndex' in 30 datasets all as char(10) fields but more likely we will get a slew of different spellings and dodgy datatypes (varchar(max) etc)
         var toReturn = new List<PrivateIdentifierPrototype>();
@@ -60,51 +62,56 @@ public PrivateIdentifierPrototype[] GetPrivateIdentifierCandidates()
         foreach (var extractionInformation in extractionInformations)
         {
             //do not process ExtractionInformations when the ColumnInfo is COLUMNINFO_MISSING
-            if(extractionInformation.ColumnInfo == null || !extractionInformation.ColumnInfo.Exists())
+            if (extractionInformation.ColumnInfo == null || !extractionInformation.ColumnInfo.Exists())
                 continue;
 
             var match = toReturn.SingleOrDefault(prototype => prototype.IsCompatible(extractionInformation));
 
-            if(match != null)
+            if (match != null)
                 match.MatchingExtractionInformations.Add(extractionInformation);
             else
                 toReturn.Add(new PrivateIdentifierPrototype(extractionInformation));
         }
-                
+
         return toReturn.ToArray();
     }
 
-    public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIdentifierPrototype, ICheckNotifier notifier)
+    public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIdentifierPrototype,
+        ICheckNotifier notifier)
     {
         var tt = _targetDatabase.Server.GetQuerySyntaxHelper().TypeTranslater;
-            
 
-        if(tt.GetLengthIfString(privateIdentifierPrototype.DataType) == int.MaxValue)
-        {
-            throw new Exception("Private identifier datatype cannot be varchar(max) style as this prevents Primary Key creation on the table");
-        }
+
+        if (tt.GetLengthIfString(privateIdentifierPrototype.DataType) == int.MaxValue)
+            throw new Exception(
+                "Private identifier datatype cannot be varchar(max) style as this prevents Primary Key creation on the table");
 
         if (!_targetDatabase.Exists())
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Did not find database {_targetDatabase} on server so creating it",CheckResult.Success));
+                $"Did not find database {_targetDatabase} on server so creating it", CheckResult.Success));
             _targetDatabase.Create();
         }
-            
+
         try
         {
             var definitionTable = _targetDatabase.CreateTable("CohortDefinition", new[]
             {
-                new DatabaseColumnRequest("id",new DatabaseTypeRequest(typeof(int))){AllowNulls = false,IsAutoIncrement = true,IsPrimaryKey = true}, 
-                new DatabaseColumnRequest("projectNumber",new DatabaseTypeRequest(typeof(int))){AllowNulls =  false}, 
-                new DatabaseColumnRequest("version",new DatabaseTypeRequest(typeof(int))){AllowNulls =  false}, 
-                new DatabaseColumnRequest("description",new DatabaseTypeRequest(typeof(string),3000)){AllowNulls =  false},
-                new DatabaseColumnRequest("dtCreated",new DatabaseTypeRequest(typeof(DateTime))){AllowNulls =  false,Default=MandatoryScalarFunctions.GetTodaysDate}
+                new DatabaseColumnRequest("id", new DatabaseTypeRequest(typeof(int)))
+                    { AllowNulls = false, IsAutoIncrement = true, IsPrimaryKey = true },
+                new DatabaseColumnRequest("projectNumber", new DatabaseTypeRequest(typeof(int))) { AllowNulls = false },
+                new DatabaseColumnRequest("version", new DatabaseTypeRequest(typeof(int))) { AllowNulls = false },
+                new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), 3000))
+                    { AllowNulls = false },
+                new DatabaseColumnRequest("dtCreated", new DatabaseTypeRequest(typeof(DateTime)))
+                    { AllowNulls = false, Default = MandatoryScalarFunctions.GetTodaysDate }
             });
 
 
             var idColumn = definitionTable.DiscoverColumn("id");
-            var foreignKey = new DatabaseColumnRequest(_definitionTableForeignKeyField,new DatabaseTypeRequest(typeof (int)), false) {IsPrimaryKey = true};
+            var foreignKey =
+                new DatabaseColumnRequest(_definitionTableForeignKeyField, new DatabaseTypeRequest(typeof(int)), false)
+                    { IsPrimaryKey = true };
 
             // Look up the collations of all the private identifier columns
             var collations = privateIdentifierPrototype.MatchingExtractionInformations
@@ -115,15 +122,17 @@ public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIden
 
             var cohortTable = _targetDatabase.CreateTable("Cohort", new[]
                 {
-                    new DatabaseColumnRequest(privateIdentifierPrototype.RuntimeName,privateIdentifierPrototype.DataType,false)
+                    new DatabaseColumnRequest(privateIdentifierPrototype.RuntimeName,
+                        privateIdentifierPrototype.DataType, false)
                     {
                         IsPrimaryKey = true,
 
                         // if there is a single collation amongst private identifier prototype references we must use that collation
                         // when creating the private column so that the DBMS can link them no bother
-                        Collation = collations.Length == 1 ? collations[0]:null
+                        Collation = collations.Length == 1 ? collations[0] : null
                     },
-                    new DatabaseColumnRequest(_releaseIdentifierFieldName,new DatabaseTypeRequest(typeof(string),300)){AllowNulls = AllowNullReleaseIdentifiers},
+                    new DatabaseColumnRequest(_releaseIdentifierFieldName, new DatabaseTypeRequest(typeof(string), 300))
+                        { AllowNulls = AllowNullReleaseIdentifiers },
                     foreignKey
                 }
                 ,
@@ -132,7 +141,8 @@ public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIden
 
 
             notifier.OnCheckPerformed(new CheckEventArgs("About to create pointer to the source", CheckResult.Success));
-            var pointer = new ExternalCohortTable(_dataExportRepository, "TestExternalCohort", _targetDatabase.Server.DatabaseType)
+            var pointer = new ExternalCohortTable(_dataExportRepository, "TestExternalCohort",
+                _targetDatabase.Server.DatabaseType)
             {
                 DatabaseType = _targetDatabase.Server.DatabaseType,
                 Server = _targetDatabase.Server.Name,
@@ -149,7 +159,8 @@ public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIden
 
             pointer.SaveToDatabase();
 
-            notifier.OnCheckPerformed(new CheckEventArgs("successfully created reference to cohort source in data export manager", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "successfully created reference to cohort source in data export manager", CheckResult.Success));
 
             notifier.OnCheckPerformed(new CheckEventArgs("About to run post creation checks", CheckResult.Success));
             pointer.Check(notifier);
@@ -157,7 +168,6 @@ public ExternalCohortTable CreateDatabase(PrivateIdentifierPrototype privateIden
             notifier.OnCheckPerformed(new CheckEventArgs("Finished", CheckResult.Success));
 
             return pointer;
-                
         }
         catch (Exception e)
         {
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/CohortCreationRequest.cs b/Rdmp.Core/CohortCommitting/Pipeline/CohortCreationRequest.cs
index ba0d5ef50a..978c4fd2d0 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/CohortCreationRequest.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/CohortCreationRequest.cs
@@ -25,14 +25,14 @@ namespace Rdmp.Core.CohortCommitting.Pipeline;
 /// All metadata details nessesary to create a cohort including which project it goes into, its name, version etc.  There are no identifiers for the cohort.
 /// Also functions as the use case for cohort creation (to which it passes itself as an input object).
 /// </summary>
-public sealed class CohortCreationRequest : PipelineUseCase,ICohortCreationRequest, ICanBeSummarised
+public sealed class CohortCreationRequest : PipelineUseCase, ICohortCreationRequest, ICanBeSummarised
 {
     private readonly IDataExportRepository _repository;
 
     //for pipeline editing initialization when no known cohort is available
 
     #region Things that can be turned into cohorts
-        
+
     private FlatFileToLoad _fileToLoad;
     private ExtractionInformation _extractionIdentifierColumn;
     private CohortIdentificationConfiguration _cohortIdentificationConfiguration;
@@ -46,19 +46,19 @@ public FlatFileToLoad FileToLoad
             Pop(_fileToLoad);
 
             _fileToLoad = value;
-                
+
             //add the new one
             Push(value);
         }
     }
-        
+
     public CohortIdentificationConfiguration CohortIdentificationConfiguration
     {
         get => _cohortIdentificationConfiguration;
         set
         {
             Pop(_cohortIdentificationConfiguration);
-            _cohortIdentificationConfiguration = value; 
+            _cohortIdentificationConfiguration = value;
             Push(value);
         }
     }
@@ -69,11 +69,11 @@ public ExtractionInformation ExtractionIdentifierColumn
         set
         {
             Pop(_extractionIdentifierColumn);
-            _extractionIdentifierColumn = value; 
+            _extractionIdentifierColumn = value;
             Push(_extractionIdentifierColumn);
         }
     }
-        
+
     private void Pop(object oldValue)
     {
         if (oldValue != null && InitializationObjects.Contains(oldValue))
@@ -84,16 +84,18 @@ private void Push(object newValue)
     {
         AddInitializationObject(newValue);
     }
+
     #endregion
 
     public IProject Project { get; private set; }
     public ICohortDefinition NewCohortDefinition { get; set; }
-        
+
     public ExtractableCohort CohortCreatedIfAny { get; set; }
 
     public string DescriptionForAuditLog { get; set; }
 
-    public CohortCreationRequest(IProject project, ICohortDefinition newCohortDefinition, IDataExportRepository repository, string descriptionForAuditLog)
+    public CohortCreationRequest(IProject project, ICohortDefinition newCohortDefinition,
+        IDataExportRepository repository, string descriptionForAuditLog)
     {
         _repository = repository;
         Project = project;
@@ -113,7 +115,7 @@ public CohortCreationRequest(IProject project, ICohortDefinition newCohortDefini
     /// <param name="configuration"></param>
     public CohortCreationRequest(ExtractionConfiguration configuration)
     {
-        _repository = (IDataExportRepository) configuration.Repository;
+        _repository = (IDataExportRepository)configuration.Repository;
 
         if (configuration.CohortIdentificationConfiguration_ID == null)
             throw new NotSupportedException(
@@ -123,14 +125,15 @@ public CohortCreationRequest(ExtractionConfiguration configuration)
         var origCohortData = origCohort.GetExternalData();
         CohortIdentificationConfiguration = configuration.CohortIdentificationConfiguration;
         Project = configuration.Project;
-            
-        if(Project.ProjectNumber == null)
+
+        if (Project.ProjectNumber == null)
             throw new ProjectNumberException($"Project '{Project}' does not have a ProjectNumber");
 
-        var definition = new CohortDefinition(null, origCohortData.ExternalDescription, origCohortData.ExternalVersion + 1,(int) Project.ProjectNumber, origCohort.ExternalCohortTable)
-            {
-                CohortReplacedIfAny = origCohort
-            };
+        var definition = new CohortDefinition(null, origCohortData.ExternalDescription,
+            origCohortData.ExternalVersion + 1, (int)Project.ProjectNumber, origCohort.ExternalCohortTable)
+        {
+            CohortReplacedIfAny = origCohort
+        };
 
         NewCohortDefinition = definition;
         DescriptionForAuditLog = "Cohort Refresh";
@@ -140,25 +143,22 @@ public CohortCreationRequest(ExtractionConfiguration configuration)
         AddInitializationObject(FileToLoad);
         AddInitializationObject(ExtractionIdentifierColumn);
         AddInitializationObject(this);
-            
+
         GenerateContext();
     }
 
-    protected override IDataFlowPipelineContext GenerateContextImpl()
-    {
-        return new DataFlowPipelineContext<DataTable>
+    protected override IDataFlowPipelineContext GenerateContextImpl() =>
+        new DataFlowPipelineContext<DataTable>
         {
             MustHaveDestination = typeof(ICohortPipelineDestination),
             MustHaveSource = typeof(IDataFlowSource<DataTable>)
         };
-    }
-
 
 
     public void Check(ICheckNotifier notifier)
     {
         NewCohortDefinition.LocationOfCohort.Check(notifier);
-            
+
         if (NewCohortDefinition.ID != null)
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
@@ -169,9 +169,9 @@ public void Check(ICheckNotifier notifier)
 
         if (Project.ProjectNumber == null)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Project {Project} does not have a ProjectNumber specified, it should have the same number as the CohortCreationRequest ({NewCohortDefinition.ProjectNumber})", CheckResult.Fail));
-        else
-        if (Project.ProjectNumber != NewCohortDefinition.ProjectNumber)
+                $"Project {Project} does not have a ProjectNumber specified, it should have the same number as the CohortCreationRequest ({NewCohortDefinition.ProjectNumber})",
+                CheckResult.Fail));
+        else if (Project.ProjectNumber != NewCohortDefinition.ProjectNumber)
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     $"Project {Project} has ProjectNumber={Project.ProjectNumber} but the CohortCreationRequest.ProjectNumber is {NewCohortDefinition.ProjectNumber}",
@@ -187,12 +187,14 @@ public void Check(ICheckNotifier notifier)
                 CheckResult.Success));
 
         if (string.IsNullOrWhiteSpace(DescriptionForAuditLog))
-            notifier.OnCheckPerformed(new CheckEventArgs("User did not provide a description of the cohort for the AuditLog",CheckResult.Fail));
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("User did not provide a description of the cohort for the AuditLog",
+                    CheckResult.Fail));
     }
 
     public void PushToServer(IManagedConnection connection)
     {
-        if(!NewCohortDefinition.IsAcceptableAsNewCohort(out var reason))
+        if (!NewCohortDefinition.IsAcceptableAsNewCohort(out var reason))
             throw new Exception(reason);
 
         NewCohortDefinition.LocationOfCohort.PushToServer(NewCohortDefinition, connection);
@@ -200,10 +202,12 @@ public void PushToServer(IManagedConnection connection)
 
     public int ImportAsExtractableCohort(bool deprecateOldCohortOnSuccess, bool migrateUsages)
     {
-        if(NewCohortDefinition.ID == null)
-            throw new NotSupportedException("CohortCreationRequest cannot be imported because its ID is null, it is likely that it has not been pushed to the server yet");
+        if (NewCohortDefinition.ID == null)
+            throw new NotSupportedException(
+                "CohortCreationRequest cannot be imported because its ID is null, it is likely that it has not been pushed to the server yet");
 
-        var cohort = new ExtractableCohort(_repository, (ExternalCohortTable) NewCohortDefinition.LocationOfCohort, (int)NewCohortDefinition.ID);
+        var cohort = new ExtractableCohort(_repository, (ExternalCohortTable)NewCohortDefinition.LocationOfCohort,
+            (int)NewCohortDefinition.ID);
         cohort.AppendToAuditLog(DescriptionForAuditLog);
 
         CohortCreatedIfAny = cohort;
@@ -214,16 +218,16 @@ public int ImportAsExtractableCohort(bool deprecateOldCohortOnSuccess, bool migr
             NewCohortDefinition.CohortReplacedIfAny.SaveToDatabase();
         }
 
-        if(migrateUsages && NewCohortDefinition.CohortReplacedIfAny != null)
+        if (migrateUsages && NewCohortDefinition.CohortReplacedIfAny != null)
         {
             var oldId = NewCohortDefinition.CohortReplacedIfAny.ID;
             var newId = cohort.ID;
 
             // ExtractionConfigurations that use the old (replaced) cohort
             var liveUsers = _repository.GetAllObjects<ExtractionConfiguration>()
-                .Where(ec=>ec.Cohort_ID == oldId && ec.IsReleased == false);
+                .Where(ec => ec.Cohort_ID == oldId && ec.IsReleased == false);
 
-            foreach(var ec in liveUsers)
+            foreach (var ec in liveUsers)
             {
                 ec.Cohort_ID = newId;
                 ec.SaveToDatabase();
@@ -237,7 +241,7 @@ public int ImportAsExtractableCohort(bool deprecateOldCohortOnSuccess, bool migr
     /// <summary>
     /// Design time types
     /// </summary>
-    private CohortCreationRequest():base(new Type[]
+    private CohortCreationRequest() : base(new Type[]
     {
         typeof(FlatFileToLoad),
         typeof(CohortIdentificationConfiguration),
@@ -249,10 +253,7 @@ private CohortCreationRequest():base(new Type[]
         GenerateContext();
     }
 
-    public static PipelineUseCase DesignTime()
-    {
-        return new CohortCreationRequest();
-    }
+    public static PipelineUseCase DesignTime() => new CohortCreationRequest();
 
     public override string ToString()
     {
@@ -262,8 +263,6 @@ public override string ToString()
         return NewCohortDefinition.Description;
     }
 
-    public string GetSummary(bool includeName, bool includeId)
-    {
-        return $"External Cohort Table: {NewCohortDefinition?.LocationOfCohort}";
-    }
+    public string GetSummary(bool includeName, bool includeId) =>
+        $"External Cohort Table: {NewCohortDefinition?.LocationOfCohort}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/CohortRefreshEngine.cs b/Rdmp.Core/CohortCommitting/Pipeline/CohortRefreshEngine.cs
index be22f5b135..770c71e7fd 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/CohortRefreshEngine.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/CohortRefreshEngine.cs
@@ -35,16 +35,14 @@ public CohortRefreshEngine(IDataLoadEventListener listener, ExtractionConfigurat
 
     public void Execute()
     {
-        var engine = Request.GetEngine(_configuration.CohortRefreshPipeline,_listener);
+        var engine = Request.GetEngine(_configuration.CohortRefreshPipeline, _listener);
 
         //if the refresh pipeline is a cic source
         if (engine.SourceObject is CohortIdentificationConfigurationSource cicSource)
-        {
             //a cohort identification configuration is a complex query possibly with many cached subqueries, if we are refreshing the cic we will want to clear (and recache) identifiers
             //from the live tables
             cicSource.ClearCohortIdentificationConfigurationCacheBeforeRunning = true;
-        }
-            
+
         engine.ExecutePipeline(new GracefulCancellationToken());
 
         var newCohort = Request.CohortCreatedIfAny;
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/CreateTableFromAggregateUseCase.cs b/Rdmp.Core/CohortCommitting/Pipeline/CreateTableFromAggregateUseCase.cs
index 98af4be745..343630979d 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/CreateTableFromAggregateUseCase.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/CreateTableFromAggregateUseCase.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.CohortCommitting.Pipeline;
 /// Use case which describes creating a new table in the database containing all rows matched by the <see cref="AggregateConfiguration"/>.
 /// The source is fixed the destination and middle components are open.
 /// </summary>
-public sealed class CreateTableFromAggregateUseCase:PipelineUseCase
+public sealed class CreateTableFromAggregateUseCase : PipelineUseCase
 {
     /// <summary>
     /// Defines a new use case in which the given <see cref="AggregateConfiguration"/> will be turned into an SQL query and used to generate rows
@@ -32,7 +32,8 @@ public sealed class CreateTableFromAggregateUseCase:PipelineUseCase
     /// in which the patient id appears in the cohort</param>
     /// <param name="table">The destination table in which to put the matched records.
     /// <para> (table does not have to exist yet, you can use <see cref="DiscoveredDatabase.ExpectTable"/> to obtain a reference to a non existant table)</para></param>
-    public CreateTableFromAggregateUseCase(AggregateConfiguration aggregateConfiguration, ExtractableCohort constrainByCohort, DiscoveredTable table)
+    public CreateTableFromAggregateUseCase(AggregateConfiguration aggregateConfiguration,
+        ExtractableCohort constrainByCohort, DiscoveredTable table)
     {
         if (constrainByCohort == null)
         {
@@ -51,7 +52,7 @@ public CreateTableFromAggregateUseCase(AggregateConfiguration aggregateConfigura
             src.TableName = table.GetRuntimeName();
             ExplicitSource = src;
         }
-            
+
         AddInitializationObject(aggregateConfiguration);
         AddInitializationObject(aggregateConfiguration.Repository);
         AddInitializationObject(table.Database);
@@ -64,7 +65,7 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
         var contextFactory = new DataFlowPipelineContextFactory<DataTable>();
         var context = contextFactory.Create(PipelineUsage.FixedSource);
         context.MustHaveDestination = typeof(DataTableUploadDestination);
-            
+
         return context;
     }
 
@@ -72,17 +73,18 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
     /// Design time types
     /// </summary>
     private CreateTableFromAggregateUseCase()
-        : base(new[]{typeof(AggregateConfiguration),
+        : base(new[]
+        {
+            typeof(AggregateConfiguration),
             typeof(ExtractableCohort),
             typeof(DiscoveredDatabase),
-            typeof(ICatalogueRepository)})
+            typeof(ICatalogueRepository)
+        })
     {
         ExplicitSource = new AggregateConfigurationTableSource();
         GenerateContext();
     }
 
-    public static PipelineUseCase DesignTime(ICatalogueRepository catalogueRepository)
-    {
-        return new CreateTableFromAggregateUseCase();
-    }
+    public static PipelineUseCase DesignTime(ICatalogueRepository catalogueRepository) =>
+        new CreateTableFromAggregateUseCase();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/BasicCohortDestination.cs b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/BasicCohortDestination.cs
index 066a905b09..52577c9fa3 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/BasicCohortDestination.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/BasicCohortDestination.cs
@@ -25,21 +25,28 @@ public class BasicCohortDestination : IPluginCohortDestination
 {
     private string _privateIdentifier;
     private string _releaseIdentifier;
-        
+
     /// <summary>
     /// The cohort blueprint we are trying to create.
     /// </summary>
     public ICohortCreationRequest Request { get; private set; }
-        
+
     private string _fk;
-        
-    [DemandsInitialization("Set one of these if you plan to upload lists of patients and want RDMP to automatically allocate an anonymous ReleaseIdentifier", TypeOf = typeof(IAllocateReleaseIdentifiers),DefaultValue=typeof(ProjectConsistentGuidReleaseIdentifierAllocator))]
+
+    [DemandsInitialization(
+        "Set one of these if you plan to upload lists of patients and want RDMP to automatically allocate an anonymous ReleaseIdentifier",
+        TypeOf = typeof(IAllocateReleaseIdentifiers),
+        DefaultValue = typeof(ProjectConsistentGuidReleaseIdentifierAllocator))]
     public Type ReleaseIdentifierAllocator { get; set; }
 
-    [DemandsInitialization(@"Determines behaviour when you are creating a new version of an existing cohort.  If true then the old (replaced) cohort will be marked IsDeprecated",DefaultValue=true)]
+    [DemandsInitialization(
+        @"Determines behaviour when you are creating a new version of an existing cohort.  If true then the old (replaced) cohort will be marked IsDeprecated",
+        DefaultValue = true)]
     public bool DeprecateOldCohortOnSuccess { get; set; }
 
-    [DemandsInitialization(@"Determines behaviour when you are creating a new version of an existing cohort.  If true then any ExtractionConfiguration that are not frozen are moved to the new version of the cohort", DefaultValue = false)]
+    [DemandsInitialization(
+        @"Determines behaviour when you are creating a new version of an existing cohort.  If true then any ExtractionConfiguration that are not frozen are moved to the new version of the cohort",
+        DefaultValue = false)]
     public bool MigrateUsages { get; set; }
 
     private IAllocateReleaseIdentifiers _allocator = null;
@@ -55,35 +62,39 @@ public class BasicCohortDestination : IPluginCohortDestination
     /// <param name="listener"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         //if user has picked an allocator get an instance
         if (ReleaseIdentifierAllocator != null && _allocator == null)
         {
-            _allocator = (IAllocateReleaseIdentifiers) ObjectConstructor.Construct(ReleaseIdentifierAllocator);
+            _allocator = (IAllocateReleaseIdentifiers)ObjectConstructor.Construct(ReleaseIdentifierAllocator);
             _allocator.Initialize(Request);
         }
-            
-        if(!toProcess.Columns.Contains(_privateIdentifier))
+
+        if (!toProcess.Columns.Contains(_privateIdentifier))
             throw new Exception(
                 $"Could not find column called {_privateIdentifier} in chunk, columns were:{string.Join(",", toProcess.Columns.OfType<DataColumn>().Select(c => c.ColumnName))}");
-                
+
         //we don't have a release identifier column
         if (!toProcess.Columns.Contains(_releaseIdentifier))
+        {
             foreach (DataRow row in toProcess.Rows)
             {
                 //so we have to allocate all of them with the allocator
 
                 //get the private cohort id
                 var priv = row[_privateIdentifier];
-                        
+
                 //already handled these folks?
-                if (_cohortDictionary.ContainsKey(priv) || IsNull(priv)) 
+                if (_cohortDictionary.ContainsKey(priv) || IsNull(priv))
                     continue;
-                       
+
                 //no, allocate them an ID (or null if there is no allocator)
-                _cohortDictionary.Add(priv, _allocator == null? DBNull.Value : _allocator.AllocateReleaseIdentifier(priv));
+                _cohortDictionary.Add(priv,
+                    _allocator == null ? DBNull.Value : _allocator.AllocateReleaseIdentifier(priv));
             }
+        }
         else
         {
             var foundUserSpecifiedReleaseIds = false;
@@ -92,14 +103,14 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
             {
                 //get the private cohort id
                 var priv = row[_privateIdentifier];
-                        
+
                 //already handled these folks?
                 if (_cohortDictionary.ContainsKey(priv) || IsNull(priv))
                     continue;
 
                 //and the release id specified in the input table
                 var release = row[_releaseIdentifier];
-                        
+
                 //if it was blank
                 if (IsNull(release))
                 {
@@ -113,17 +124,19 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
                     }
                 }
                 else
+                {
                     foundUserSpecifiedReleaseIds = true;
+                }
 
                 //no, allocate them an ID (or null if there is no allocator)
-                _cohortDictionary.Add(priv,release);
+                _cohortDictionary.Add(priv, release);
             }
         }
 
         return null;
     }
 
-        
+
     private static bool IsNull(object o)
     {
         if (o == null || o == DBNull.Value)
@@ -144,9 +157,9 @@ public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineF
             return;
 
         var db = Request.NewCohortDefinition.LocationOfCohort.Discover();
-            
+
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Preparing upload"));
-            
+
         using (var connection = db.Server.BeginNewTransactedConnection())
         {
             try
@@ -154,8 +167,9 @@ public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineF
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Started Transaction"));
                 Request.PushToServer(connection);
 
-                if(Request.NewCohortDefinition.ID == null)
-                    throw new Exception("We pushed the new cohort from the request object to the server (within transaction) but its ID was not populated");
+                if (Request.NewCohortDefinition.ID == null)
+                    throw new Exception(
+                        "We pushed the new cohort from the request object to the server (within transaction) but its ID was not populated");
 
                 var tbl = Request.NewCohortDefinition.LocationOfCohort.DiscoverCohortTable();
 
@@ -167,33 +181,24 @@ public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineF
                     dt.Columns.Add(_privateIdentifier);
 
                     // don't add 2 columns if they are the same column!
-                    if (!isIdentifiable)
-                    {
-                        dt.Columns.Add(_releaseIdentifier);
-                    }
+                    if (!isIdentifiable) dt.Columns.Add(_releaseIdentifier);
 
                     //add the ID as another column 
                     dt.Columns.Add(_fk);
 
                     foreach (var kvp in _cohortDictionary)
-                    {
                         if (isIdentifiable)
-                        {
                             dt.Rows.Add(kvp.Key, Request.NewCohortDefinition.ID);
-                        }
                         else
-                        {
                             dt.Rows.Add(kvp.Key, kvp.Value, Request.NewCohortDefinition.ID);
-                        }
-                    }
-                            
+
 
                     bulkCopy.Upload(dt);
                 }
 
                 connection.ManagedTransaction.CommitAndCloseConnection();
             }
-            catch 
+            catch
             {
                 connection.ManagedTransaction.AbandonAndCloseConnection();
                 throw;
@@ -205,7 +210,7 @@ public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineF
 
         var id = Request.ImportAsExtractableCohort(DeprecateOldCohortOnSuccess, MigrateUsages);
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Cohort successfully comitted to destination and imported as an RDMP ExtractableCohort (ID={id} <- this is the ID of the reference pointer, the cohortDefinitionID of the actual cohort remains as you specified:{Request.NewCohortDefinition.ID})"));
     }
 
@@ -215,7 +220,6 @@ public virtual void Dispose(IDataLoadEventListener listener, Exception pipelineF
     /// <param name="listener"></param>
     public virtual void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     /// <summary>
@@ -235,9 +239,9 @@ public virtual void PreInitialize(ICohortCreationRequest value, IDataLoadEventLi
 
         _fk = syntax.GetRuntimeName(Request.NewCohortDefinition.LocationOfCohort.DefinitionTableForeignKeyField);
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"CohortCreationRequest spotted, we will look for columns {_privateIdentifier} and {_releaseIdentifier} (both of which must be in the pipeline before we will allow the cohort to be submitted)"));
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"id column in table {Request.NewCohortDefinition.LocationOfCohort.TableName} is {Request.NewCohortDefinition.LocationOfCohort.DefinitionTableForeignKeyField}"));
     }
 
@@ -256,11 +260,14 @@ public virtual void Check(ICheckNotifier notifier)
         }
 
         if (ReleaseIdentifierAllocator == null)
-            notifier.OnCheckPerformed(new CheckEventArgs("No ReleaseIdentifierAllocator has been set, this means that Release Identifiers must be provided in the cohort uploaded or populated afer committing manually",CheckResult.Warning));
-            
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "No ReleaseIdentifierAllocator has been set, this means that Release Identifiers must be provided in the cohort uploaded or populated afer committing manually",
+                CheckResult.Warning));
+
         notifier.OnCheckPerformed(new CheckEventArgs(
-            $"Cohort identifier columns are '{_privateIdentifier}' (private) and '{_releaseIdentifier}' (release)", CheckResult.Success));
-            
+            $"Cohort identifier columns are '{_privateIdentifier}' (private) and '{_releaseIdentifier}' (release)",
+            CheckResult.Success));
+
         Request.Check(notifier);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/GuidReleaseIdentifierAllocator.cs b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/GuidReleaseIdentifierAllocator.cs
index eba75ca150..0f4405a09a 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/GuidReleaseIdentifierAllocator.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/GuidReleaseIdentifierAllocator.cs
@@ -18,10 +18,7 @@ public class GuidReleaseIdentifierAllocator : IAllocateReleaseIdentifiers
     /// </summary>
     /// <param name="privateIdentifier"></param>
     /// <returns></returns>
-    public object AllocateReleaseIdentifier(object privateIdentifier)
-    {
-        return Guid.NewGuid().ToString();
-    }
+    public object AllocateReleaseIdentifier(object privateIdentifier) => Guid.NewGuid().ToString();
 
     /// <summary>
     /// Does nothing
@@ -29,6 +26,5 @@ public object AllocateReleaseIdentifier(object privateIdentifier)
     /// <param name="request"></param>
     public void Initialize(ICohortCreationRequest request)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/IAllocateReleaseIdentifiers.cs b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/IAllocateReleaseIdentifiers.cs
index 3a8e60cc18..d5c672b836 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/IAllocateReleaseIdentifiers.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/IAllocateReleaseIdentifiers.cs
@@ -21,7 +21,7 @@ public interface IAllocateReleaseIdentifiers
     /// <param name="privateIdentifier"></param>
     /// <returns></returns>
     object AllocateReleaseIdentifier(object privateIdentifier);
-        
+
     /// <summary>
     /// Called before any allocation, lets you know what <see cref="IProject"/> etc is involved in the cohort creation attempt.
     /// </summary>
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/NullAllocateReleaseIdentifiers.cs b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/NullAllocateReleaseIdentifiers.cs
index 09e3520c6f..b79af406f5 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/NullAllocateReleaseIdentifiers.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/NullAllocateReleaseIdentifiers.cs
@@ -10,13 +10,9 @@ namespace Rdmp.Core.CohortCommitting.Pipeline.Destinations.IdentifierAllocation;
 
 internal class NullAllocateReleaseIdentifiers : IAllocateReleaseIdentifiers
 {
-    public object AllocateReleaseIdentifier(object privateIdentifier)
-    {
-        return DBNull.Value;
-    }
+    public object AllocateReleaseIdentifier(object privateIdentifier) => DBNull.Value;
 
     public void Initialize(ICohortCreationRequest request)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/ProjectConsistentGuidReleaseIdentifierAllocator.cs b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/ProjectConsistentGuidReleaseIdentifierAllocator.cs
index 17286dcf09..31ffd4c00a 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/ProjectConsistentGuidReleaseIdentifierAllocator.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Destinations/IdentifierAllocation/ProjectConsistentGuidReleaseIdentifierAllocator.cs
@@ -44,7 +44,7 @@ public object AllocateReleaseIdentifier(object privateIdentifier)
 
         //otherwise allocate a new guid and let's record it just for prosperity
         var toReturn = Guid.NewGuid().ToString();
-        _releaseMap.Add(privateIdentifier,toReturn);
+        _releaseMap.Add(privateIdentifier, toReturn);
 
         return toReturn;
     }
@@ -83,16 +83,17 @@ private Dictionary<object, object> GetReleaseMap()
 
             con.Open();
 
-            using(var r = cohortDatabase.Server.GetCommand(sql, con).ExecuteReader())
+            using (var r = cohortDatabase.Server.GetCommand(sql, con).ExecuteReader())
+            {
                 while (r.Read())
                 {
-                    if(toReturn.TryGetValue(r[priv],out var value))
+                    if (toReturn.TryGetValue(r[priv], out var value))
                         throw new Exception(
                             $"Private identifier '{r[priv]}' has more than 1 historical release identifier ({string.Join(",", value, r[rel])}");
 
-                    toReturn.Add(r[priv],r[rel]);
+                    toReturn.Add(r[priv], r[rel]);
                 }
-
+            }
         }
 
         return toReturn;
@@ -101,19 +102,18 @@ private Dictionary<object, object> GetReleaseMap()
     /// <inheritdoc/>
     public void Initialize(ICohortCreationRequest request)
     {
-        if(request.Project != null)
+        if (request.Project != null)
         {
             if (!request.Project.ProjectNumber.HasValue)
                 throw new ProjectNumberException($"Project {request.Project} must have a ProjectNumber");
         }
         else
         {
-            if((request.NewCohortDefinition?.ProjectNumber ?? 0) == 0)
-            {
-                throw new ProjectNumberException("No Project was specified and NewCohortDefinition had no explicit project number");
-            }
+            if ((request.NewCohortDefinition?.ProjectNumber ?? 0) == 0)
+                throw new ProjectNumberException(
+                    "No Project was specified and NewCohortDefinition had no explicit project number");
         }
-            
+
         _request = request;
         _projectNumber = request.Project?.ProjectNumber.Value ?? request.NewCohortDefinition?.ProjectNumber ?? 0;
     }
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/ICohortPipelineDestination.cs b/Rdmp.Core/CohortCommitting/Pipeline/ICohortPipelineDestination.cs
index e4d9e7e2f6..7e1918f114 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/ICohortPipelineDestination.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/ICohortPipelineDestination.cs
@@ -14,6 +14,7 @@ namespace Rdmp.Core.CohortCommitting.Pipeline;
 /// Destination component interface for Cohort Creation Pipelines.  Must fulfill the ICohortCreationRequest and populate the Cohort Source with the 
 /// identifiers supplied in the DataTable.
 /// </summary>
-public interface ICohortPipelineDestination : IDataFlowDestination<DataTable>, IPipelineRequirement<ICohortCreationRequest>
+public interface ICohortPipelineDestination : IDataFlowDestination<DataTable>,
+    IPipelineRequirement<ICohortCreationRequest>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/IPluginCohortDestination.cs b/Rdmp.Core/CohortCommitting/Pipeline/IPluginCohortDestination.cs
index c6c4026822..2b546a2f89 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/IPluginCohortDestination.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/IPluginCohortDestination.cs
@@ -15,5 +15,4 @@ namespace Rdmp.Core.CohortCommitting.Pipeline;
 /// </summary>
 public interface IPluginCohortDestination : ICohortPipelineDestination, IPluginDataFlowComponent<DataTable>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Sources/AggregateConfigurationTableSource.cs b/Rdmp.Core/CohortCommitting/Pipeline/Sources/AggregateConfigurationTableSource.cs
index 75400b9081..a92aa106c4 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Sources/AggregateConfigurationTableSource.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Sources/AggregateConfigurationTableSource.cs
@@ -21,14 +21,17 @@ namespace Rdmp.Core.CohortCommitting.Pipeline.Sources;
 /// <summary>
 /// Pipeline source component which executes an AggregateConfiguration query (e.g. Aggregate Graph / Joinable patient index table)
 /// </summary>
-public class AggregateConfigurationTableSource : IPluginDataFlowSource<DataTable>,IPipelineRequirement<AggregateConfiguration>
+public class AggregateConfigurationTableSource : IPluginDataFlowSource<DataTable>,
+    IPipelineRequirement<AggregateConfiguration>
 {
     protected AggregateConfiguration AggregateConfiguration;
     protected CohortIdentificationConfiguration CohortIdentificationConfigurationIfAny;
 
     private bool _haveSentData = false;
 
-    [DemandsInitialization("The length of time (in seconds) to wait before timing out the SQL command to execute the Aggregate.", DemandType.Unspecified, 10000)]
+    [DemandsInitialization(
+        "The length of time (in seconds) to wait before timing out the SQL command to execute the Aggregate.",
+        DemandType.Unspecified, 10000)]
     public int Timeout { get; set; }
 
     /// <summary>
@@ -38,14 +41,16 @@ public class AggregateConfigurationTableSource : IPluginDataFlowSource<DataTable
 
     protected virtual string GetSQL()
     {
-        if(!AggregateConfiguration.IsCohortIdentificationAggregate)
+        if (!AggregateConfiguration.IsCohortIdentificationAggregate)
         {
             var builder = AggregateConfiguration.GetQueryBuilder();
             return builder.SQL;
         }
 
-        var cic = AggregateConfiguration.GetCohortIdentificationConfigurationIfAny() ?? throw new Exception($"There GetCohortIdentificationConfiguration is unknown for '{AggregateConfiguration}'");
-        var cohortBuilder = new CohortQueryBuilder(AggregateConfiguration, cic.GetAllParameters(),null);
+        var cic = AggregateConfiguration.GetCohortIdentificationConfigurationIfAny() ??
+                  throw new Exception(
+                      $"There GetCohortIdentificationConfiguration is unknown for '{AggregateConfiguration}'");
+        var cohortBuilder = new CohortQueryBuilder(AggregateConfiguration, cic.GetAllParameters(), null);
         return cohortBuilder.SQL;
     }
 
@@ -64,7 +69,8 @@ private DataTable GetDataTable(int timeout, IDataLoadEventListener listener)
         listener?.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"About to lookup which server to interrogate for AggregateConfiguration '{AggregateConfiguration}'"));
 
-        var server = AggregateConfiguration.Catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport, false);
+        var server =
+            AggregateConfiguration.Catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport, false);
 
 
         using (var con = server.GetConnection())
@@ -82,8 +88,10 @@ private DataTable GetDataTable(int timeout, IDataLoadEventListener listener)
             {
                 cmd.CommandTimeout = timeout;
 
-                using(var da = server.GetDataAdapter(cmd))
+                using (var da = server.GetDataAdapter(cmd))
+                {
                     da.Fill(dt);
+                }
             }
 
 
@@ -96,21 +104,16 @@ private DataTable GetDataTable(int timeout, IDataLoadEventListener listener)
             return dt;
         }
     }
-    public DataTable TryGetPreview()
-    {
-        return GetDataTable(10, null);
-    }
 
+    public DataTable TryGetPreview() => GetDataTable(10, null);
 
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-
     }
 
     public virtual void Check(ICheckNotifier notifier)
@@ -118,12 +121,14 @@ public virtual void Check(ICheckNotifier notifier)
         try
         {
             var _sql = GetSQL();
-            notifier.OnCheckPerformed(new CheckEventArgs($"successfully built extraction SQL:{_sql}", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"successfully built extraction SQL:{_sql}",
+                CheckResult.Success));
         }
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Could not build extraction SQL for '{AggregateConfiguration}' (ID={AggregateConfiguration.ID})", CheckResult.Fail, e));
+                $"Could not build extraction SQL for '{AggregateConfiguration}' (ID={AggregateConfiguration.ID})",
+                CheckResult.Fail, e));
         }
     }
 
@@ -134,8 +139,5 @@ public virtual void PreInitialize(AggregateConfiguration value, IDataLoadEventLi
         CohortIdentificationConfigurationIfAny = value.GetCohortIdentificationConfigurationIfAny();
     }
 
-    public override string ToString()
-    {
-        return GetType().Name;
-    }
+    public override string ToString() => GetType().Name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Sources/CohortIdentificationConfigurationSource.cs b/Rdmp.Core/CohortCommitting/Pipeline/Sources/CohortIdentificationConfigurationSource.cs
index b5f2fbb04d..42ab66b66b 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Sources/CohortIdentificationConfigurationSource.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Sources/CohortIdentificationConfigurationSource.cs
@@ -26,14 +26,18 @@ namespace Rdmp.Core.CohortCommitting.Pipeline.Sources;
 /// <summary>
 /// Executes a Cohort Identification Configuration query and releases the identifiers read into the pipeline as a single column DataTable.
 /// </summary>
-public class CohortIdentificationConfigurationSource : IPluginDataFlowSource<DataTable>, IPipelineRequirement<CohortIdentificationConfiguration>
+public class CohortIdentificationConfigurationSource : IPluginDataFlowSource<DataTable>,
+    IPipelineRequirement<CohortIdentificationConfiguration>
 {
     private CohortIdentificationConfiguration _cohortIdentificationConfiguration;
 
-    [DemandsInitialization("The length of time (in seconds) to wait before timing out the SQL command to execute the CohortIdentificationConfiguration, if you find it is taking exceptionally long for a CohortIdentificationConfiguration to execute then consider caching some of the subqueries",DemandType.Unspecified,10000)]
+    [DemandsInitialization(
+        "The length of time (in seconds) to wait before timing out the SQL command to execute the CohortIdentificationConfiguration, if you find it is taking exceptionally long for a CohortIdentificationConfiguration to execute then consider caching some of the subqueries",
+        DemandType.Unspecified, 10000)]
     public int Timeout { get; set; }
 
-    [DemandsInitialization("If ticked, will Freeze the CohortIdentificationConfiguration if the import pipeline terminates successfully")]
+    [DemandsInitialization(
+        "If ticked, will Freeze the CohortIdentificationConfiguration if the import pipeline terminates successfully")]
     public bool FreezeAfterSuccessfulImport { get; set; }
 
     private bool haveSentData = false;
@@ -47,8 +51,7 @@ public class CohortIdentificationConfigurationSource : IPluginDataFlowSource<Dat
 
     public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
     {
-
-        if(haveSentData)
+        if (haveSentData)
             return null;
 
         haveSentData = true;
@@ -59,10 +62,11 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
         //if it didn't crash
-        if(pipelineFailureExceptionIfAny == null)
-            if(FreezeAfterSuccessfulImport)
+        if (pipelineFailureExceptionIfAny == null)
+            if (FreezeAfterSuccessfulImport)
             {
-                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Freezing CohortIdentificationConfiguration"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information, "Freezing CohortIdentificationConfiguration"));
                 _cohortIdentificationConfiguration.Freeze();
             }
     }
@@ -73,10 +77,7 @@ public void Abort(IDataLoadEventListener listener)
         _cancelGlobalOperations.Cancel();
     }
 
-    public DataTable TryGetPreview()
-    {
-        return GetDataTable(new ThrowImmediatelyDataLoadEventListener());
-    }
+    public DataTable TryGetPreview() => GetDataTable(new ThrowImmediatelyDataLoadEventListener());
 
     private DataTable GetDataTable(IDataLoadEventListener listener)
     {
@@ -85,7 +86,7 @@ private DataTable GetDataTable(IDataLoadEventListener listener)
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"About to lookup which server to interrogate for CohortIdentificationConfiguration {_cohortIdentificationConfiguration}"));
 
-        if(_cohortIdentificationConfiguration.RootCohortAggregateContainer_ID == null)
+        if (_cohortIdentificationConfiguration.RootCohortAggregateContainer_ID == null)
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                 $"CohortIdentificationConfiguration '{_cohortIdentificationConfiguration}' has no RootCohortAggregateContainer_ID, is it empty?"));
 
@@ -94,31 +95,35 @@ private DataTable GetDataTable(IDataLoadEventListener listener)
         var rootContainerTask =
             //no caching set up so no point in running CohortCompilerRunner
             _cohortIdentificationConfiguration.QueryCachingServer_ID == null
-            ? RunRootContainerOnlyNoCaching(cohortCompiler)
-            : RunAllTasksWithRunner(cohortCompiler, listener);
+                ? RunRootContainerOnlyNoCaching(cohortCompiler)
+                : RunAllTasksWithRunner(cohortCompiler, listener);
 
-        if(rootContainerTask.State == CompilationState.Executing)
+        if (rootContainerTask.State == CompilationState.Executing)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,"Root container task was unexpectedly still executing... let's give it a little longer to run"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    "Root container task was unexpectedly still executing... let's give it a little longer to run"));
 
-            var countdown = Math.Max(5000,Timeout*1000);
-            while(rootContainerTask.State == CompilationState.Executing && countdown>0)
+            var countdown = Math.Max(5000, Timeout * 1000);
+            while (rootContainerTask.State == CompilationState.Executing && countdown > 0)
             {
                 Thread.Sleep(100);
-                countdown -=100;
+                countdown -= 100;
             }
         }
 
         if (rootContainerTask.State != CompilationState.Finished)
-            throw new Exception($"CohortIdentificationCriteria execution resulted in state '{rootContainerTask.State}'", rootContainerTask.CrashMessage);
+            throw new Exception($"CohortIdentificationCriteria execution resulted in state '{rootContainerTask.State}'",
+                rootContainerTask.CrashMessage);
 
-        if(rootContainerTask == null)
+        if (rootContainerTask == null)
             throw new Exception("Root container task was null, was the execution cancelled? / crashed");
 
         var execution = cohortCompiler.Tasks[rootContainerTask];
 
         if (execution.Identifiers == null || execution.Identifiers.Rows.Count == 0)
-            throw new Exception("CohortIdentificationCriteria execution resulted in an empty dataset (there were no cohorts matched by the query?)");
+            throw new Exception(
+                "CohortIdentificationCriteria execution resulted in an empty dataset (there were no cohorts matched by the query?)");
 
         var dt = execution.Identifiers;
 
@@ -132,19 +137,21 @@ private DataTable GetDataTable(IDataLoadEventListener listener)
     private ICompileable RunRootContainerOnlyNoCaching(CohortCompiler cohortCompiler)
     {
         //add root container task
-        var task = cohortCompiler.AddTask(_cohortIdentificationConfiguration.RootCohortAggregateContainer, _cohortIdentificationConfiguration.GetAllParameters());
+        var task = cohortCompiler.AddTask(_cohortIdentificationConfiguration.RootCohortAggregateContainer,
+            _cohortIdentificationConfiguration.GetAllParameters());
 
-        cohortCompiler.LaunchSingleTask(task, Timeout,false);
+        cohortCompiler.LaunchSingleTask(task, Timeout, false);
 
         //timeout is in seconds
-        var countDown = Math.Max(5000,Timeout * 1000);
+        var countDown = Math.Max(5000, Timeout * 1000);
 
         while (
             //hasn't timed out
             countDown > 0 &&
             (
                 //state isn't a final state
-                task.State == CompilationState.Executing || task.State == CompilationState.NotScheduled || task.State == CompilationState.Scheduled)
+                task.State == CompilationState.Executing || task.State == CompilationState.NotScheduled ||
+                task.State == CompilationState.Scheduled)
         )
         {
             Task.Delay(100).Wait();
@@ -170,9 +177,11 @@ private ICompileable RunAllTasksWithRunner(CohortCompiler cohortCompiler, IDataL
     {
         if (ClearCohortIdentificationConfigurationCacheBeforeRunning)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, "Clearing Cohort Identifier Cache"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, "Clearing Cohort Identifier Cache"));
 
-            var cacheManager = new CachedAggregateConfigurationResultsManager(_cohortIdentificationConfiguration.QueryCachingServer);
+            var cacheManager =
+                new CachedAggregateConfigurationResultsManager(_cohortIdentificationConfiguration.QueryCachingServer);
 
             cohortCompiler.AddAllTasks(false);
             foreach (var cacheable in cohortCompiler.Tasks.Keys.OfType<ICacheableTask>())
@@ -183,7 +192,7 @@ private ICompileable RunAllTasksWithRunner(CohortCompiler cohortCompiler, IDataL
         {
             RunSubcontainers = false
         };
-        runner.PhaseChanged += (s,e)=> listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
+        runner.PhaseChanged += (s, e) => listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"CohortCompilerRunner entered Phase '{runner.ExecutionPhase}'"));
         return runner.Run(_cancelGlobalOperations.Token);
     }
@@ -198,13 +207,14 @@ public void Check(ICheckNotifier notifier)
 
             foreach (var sub in container.GetAllSubContainersRecursively())
             {
-                if(sub.IsDisabled)
-                    notifier.OnCheckPerformed(new CheckEventArgs($"Query includes disabled container '{sub}'",CheckResult.Warning));
+                if (sub.IsDisabled)
+                    notifier.OnCheckPerformed(new CheckEventArgs($"Query includes disabled container '{sub}'",
+                        CheckResult.Warning));
 
                 foreach (var configuration in sub.GetAggregateConfigurations())
-                    if(configuration.IsDisabled)
+                    if (configuration.IsDisabled)
                         notifier.OnCheckPerformed(new CheckEventArgs(
-                            $"Query includes disabled aggregate '{configuration}'",CheckResult.Warning));
+                            $"Query includes disabled aggregate '{configuration}'", CheckResult.Warning));
             }
         }
 
@@ -213,7 +223,8 @@ public void Check(ICheckNotifier notifier)
             if (_cohortIdentificationConfiguration.Frozen)
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"CohortIdentificationConfiguration {_cohortIdentificationConfiguration} is Frozen (By {_cohortIdentificationConfiguration.FrozenBy} on {_cohortIdentificationConfiguration.FrozenDate}).  It might have already been imported once before.", CheckResult.Warning));
+                        $"CohortIdentificationConfiguration {_cohortIdentificationConfiguration} is Frozen (By {_cohortIdentificationConfiguration.FrozenBy} on {_cohortIdentificationConfiguration.FrozenDate}).  It might have already been imported once before.",
+                        CheckResult.Warning));
 
             if (!UserSettings.SkipCohortBuilderValidationOnCommit)
             {
@@ -226,9 +237,8 @@ public void Check(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Could not build extraction SQL for {_cohortIdentificationConfiguration}", CheckResult.Fail,e));
+                $"Could not build extraction SQL for {_cohortIdentificationConfiguration}", CheckResult.Fail, e));
         }
-
     }
 
 
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIdentifierColumnSource.cs b/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIdentifierColumnSource.cs
index 42780ded89..3dfa4ad159 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIdentifierColumnSource.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIdentifierColumnSource.cs
@@ -20,39 +20,43 @@ namespace Rdmp.Core.CohortCommitting.Pipeline.Sources;
 /// Pipeline source component that generates a DataTable containing all the unique patient identifiers in the column referenced by the <see cref="IPipelineRequirement{T}"/> 
 /// <see cref="ExtractionInformation"/>.
 /// </summary>
-public class PatientIdentifierColumnSource:IPluginDataFlowSource<DataTable>, IPipelineRequirement<ExtractionInformation>
+public class PatientIdentifierColumnSource : IPluginDataFlowSource<DataTable>,
+    IPipelineRequirement<ExtractionInformation>
 {
     private ExtractionInformation _extractionInformation;
 
     private bool _haveSentData = false;
 
-    [DemandsInitialization("How long to wait for the select query to run before giving up in seconds",DemandType.Unspecified,60)]
+    [DemandsInitialization("How long to wait for the select query to run before giving up in seconds",
+        DemandType.Unspecified, 60)]
     public int Timeout { get; set; }
-        
+
     public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
     {
         if (_haveSentData)
             return null;
-            
+
         _haveSentData = true;
 
-        return GetDataTable(Timeout,null);
+        return GetDataTable(Timeout, null);
     }
 
     private DataTable GetDataTable(int timeout, int? topX)
     {
         var qb = new QueryBuilder("distinct", null);
-        if(topX != null)
+        if (topX != null)
             qb.TopX = topX.Value;
         qb.AddColumn(_extractionInformation);
 
-        var server = _extractionInformation.CatalogueItem.Catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport, true);
+        var server =
+            _extractionInformation.CatalogueItem.Catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport,
+                true);
 
         var colName = _extractionInformation.GetRuntimeName();
 
         var dt = new DataTable();
         dt.Columns.Add(colName);
-            
+
         using (var con = server.GetConnection())
         {
             con.Open();
@@ -61,9 +65,11 @@ private DataTable GetDataTable(int timeout, int? topX)
             {
                 cmd.CommandTimeout = timeout;
 
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     while (r.Read())
                         dt.Rows.Add(new[] { r[colName] });
+                }
             }
         }
 
@@ -72,28 +78,24 @@ private DataTable GetDataTable(int timeout, int? topX)
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
-    public DataTable TryGetPreview()
-    {
-        return GetDataTable(10,1000);
-    }
+    public DataTable TryGetPreview() => GetDataTable(10, 1000);
 
     public void Check(ICheckNotifier notifier)
     {
-        if(!_extractionInformation.IsExtractionIdentifier)
+        if (!_extractionInformation.IsExtractionIdentifier)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Column '{_extractionInformation}' is not marked IsExtractionIdentifier, are you sure it contains patient identifiers?",CheckResult.Fail));
+                $"Column '{_extractionInformation}' is not marked IsExtractionIdentifier, are you sure it contains patient identifiers?",
+                CheckResult.Fail));
 
         try
         {
-            var dt = GetDataTable(5,1000);
+            var dt = GetDataTable(5, 1000);
 
             if (dt.Rows.Count == 0)
                 notifier.OnCheckPerformed(new CheckEventArgs("The table is empty!", CheckResult.Fail));
@@ -102,7 +104,6 @@ public void Check(ICheckNotifier notifier)
         {
             notifier.OnCheckPerformed(new CheckEventArgs("Failed to get DataTable/build query", CheckResult.Fail, ex));
         }
-            
     }
 
     public void PreInitialize(ExtractionInformation value, IDataLoadEventListener listener)
diff --git a/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIndexTableSource.cs b/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIndexTableSource.cs
index 0203269c68..d598714e1f 100644
--- a/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIndexTableSource.cs
+++ b/Rdmp.Core/CohortCommitting/Pipeline/Sources/PatientIndexTableSource.cs
@@ -32,10 +32,11 @@ namespace Rdmp.Core.CohortCommitting.Pipeline.Sources;
 public class PatientIndexTableSource : AggregateConfigurationTableSource, IPipelineRequirement<ExtractableCohort>
 {
     private ExtractableCohort _extractableCohort;
-        
-    protected override  string GetSQL()
+
+    protected override string GetSQL()
     {
-        var builder = new CohortQueryBuilder(AggregateConfiguration,CohortIdentificationConfigurationIfAny.GetAllParameters(),null);
+        var builder = new CohortQueryBuilder(AggregateConfiguration,
+            CohortIdentificationConfigurationIfAny.GetAllParameters(), null);
 
         var sql = builder.SQL;
 
@@ -55,11 +56,12 @@ protected override  string GetSQL()
         //if there isn't a group by
         if (insertionPoint == -1)
             return sql + Environment.NewLine + impromptuSql;
-            
+
         //there is a group by
-        return sql[..insertionPoint] + Environment.NewLine + impromptuSql + Environment.NewLine + sql.Substring(insertionPoint, sql.Length - insertionPoint);
+        return sql[..insertionPoint] + Environment.NewLine + impromptuSql + Environment.NewLine +
+               sql.Substring(insertionPoint, sql.Length - insertionPoint);
     }
-        
+
     public void PreInitialize(ExtractableCohort value, IDataLoadEventListener listener)
     {
         _extractableCohort = value;
diff --git a/Rdmp.Core/CohortCommitting/PrivateIdentifierPrototype.cs b/Rdmp.Core/CohortCommitting/PrivateIdentifierPrototype.cs
index 6bfaea4de0..9011ea64ce 100644
--- a/Rdmp.Core/CohortCommitting/PrivateIdentifierPrototype.cs
+++ b/Rdmp.Core/CohortCommitting/PrivateIdentifierPrototype.cs
@@ -22,10 +22,10 @@ public PrivateIdentifierPrototype(ExtractionInformation extractionInformation)
     {
         RuntimeName = extractionInformation.GetRuntimeName();
         DataType = extractionInformation.ColumnInfo.Data_type;
-        MatchingExtractionInformations = new List<ExtractionInformation>(new []{extractionInformation});
+        MatchingExtractionInformations = new List<ExtractionInformation>(new[] { extractionInformation });
     }
 
-    public PrivateIdentifierPrototype(string runtimeName,string datatype)
+    public PrivateIdentifierPrototype(string runtimeName, string datatype)
     {
         RuntimeName = runtimeName;
         DataType = datatype;
@@ -36,19 +36,10 @@ public PrivateIdentifierPrototype(string runtimeName,string datatype)
     public string DataType { get; internal set; }
     public List<ExtractionInformation> MatchingExtractionInformations { get; internal set; }
 
-    public bool IsCompatible(ExtractionInformation extractionInformation)
-    {
-        return extractionInformation.GetRuntimeName() == RuntimeName && extractionInformation.ColumnInfo.Data_type == DataType;
-    }
+    public bool IsCompatible(ExtractionInformation extractionInformation) =>
+        extractionInformation.GetRuntimeName() == RuntimeName && extractionInformation.ColumnInfo.Data_type == DataType;
 
-    public int CountOfTimesSeen()
-    {
-        return  MatchingExtractionInformations.Count;
-    }
+    public int CountOfTimesSeen() => MatchingExtractionInformations.Count;
 
-    public string GetDeclarationSql()
-    {
-        return $"{RuntimeName} {DataType}";
-
-    }
+    public string GetDeclarationSql() => $"{RuntimeName} {DataType}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/CohortIdentificationConfigurationUICommon.cs b/Rdmp.Core/CohortCreation/CohortIdentificationConfigurationUICommon.cs
index 00ab3533c3..2e950a8ccd 100644
--- a/Rdmp.Core/CohortCreation/CohortIdentificationConfigurationUICommon.cs
+++ b/Rdmp.Core/CohortCreation/CohortIdentificationConfigurationUICommon.cs
@@ -46,24 +46,18 @@ public class CohortIdentificationConfigurationUICommon
     public int Timeout = 3000;
 
     public CohortCompiler Compiler { get; }
+
     public CohortIdentificationConfigurationUICommon()
     {
         Compiler = new CohortCompiler(null);
     }
-    public object Working_AspectGetter(object rowobject)
-    {
-        return GetKey(rowobject)?.State;
-    }
 
-    public object Time_AspectGetter(object rowobject)
-    {
-        return GetKey(rowobject)?.ElapsedTime?.ToString(@"hh\:mm\:ss");
-    }
+    public object Working_AspectGetter(object rowobject) => GetKey(rowobject)?.State;
 
-    public object CumulativeTotal_AspectGetter(object rowobject)
-    {
-        return GetKey(rowobject)?.CumulativeRowCount?.ToString("N0");
-    }
+    public object Time_AspectGetter(object rowobject) => GetKey(rowobject)?.ElapsedTime?.ToString(@"hh\:mm\:ss");
+
+    public object CumulativeTotal_AspectGetter(object rowobject) =>
+        GetKey(rowobject)?.CumulativeRowCount?.ToString("N0");
 
     public ICompileable GetKey(object rowobject)
     {
@@ -71,7 +65,6 @@ public ICompileable GetKey(object rowobject)
         {
             return
                 Compiler?.Tasks?.Keys.FirstOrDefault(k =>
-
                     (rowobject is AggregateConfiguration ac && k.Child is JoinableCohortAggregateConfiguration j
                                                             && j.AggregateConfiguration_ID == ac.ID)
                     || k.Child.Equals(rowobject));
@@ -97,11 +90,9 @@ public object Count_AspectGetter(object rowobject)
 
         return null;
     }
-    public static object Catalogue_AspectGetter(object rowobject)
-    {
-        return
-            rowobject is AggregateConfiguration ac ? ac.Catalogue.Name : null;
-    }
+
+    public static object Catalogue_AspectGetter(object rowobject) =>
+        rowobject is AggregateConfiguration ac ? ac.Catalogue.Name : null;
 
     public object ExecuteAspectGetter(object rowObject)
     {
@@ -134,10 +125,11 @@ private CompilationState GetState(IMapsDirectlyToDatabaseTable o)
             return task.State;
         }
     }
-    public bool IsExecutingGlobalOperations()
-    {
-        return Runner != null && Runner.ExecutionPhase != CohortCompilerRunner.Phase.None && Runner.ExecutionPhase != CohortCompilerRunner.Phase.Finished;
-    }
+
+    public bool IsExecutingGlobalOperations() => Runner != null &&
+                                                 Runner.ExecutionPhase != CohortCompilerRunner.Phase.None &&
+                                                 Runner.ExecutionPhase != CohortCompilerRunner.Phase.Finished;
+
     private static Operation GetNextOperation(CompilationState currentState)
     {
         return currentState switch
@@ -169,7 +161,6 @@ public void RecreateAllTasks(bool cancelTasks = true)
         //Could have configured/unconfigured a joinable state
         foreach (var j in Compiler.Tasks.Keys.OfType<JoinableTask>())
             j.RefreshIsUsedState();
-
     }
 
     public void SetShowCumulativeTotals(bool show)
@@ -206,6 +197,7 @@ private void StartThisTaskOnly(IMapsDirectlyToDatabaseTable configOrContainer)
             Activator.ShowException("Task failed to build", task.CrashMessage);
             return;
         }
+
         //Cancel the task and remove it from the Compilers task list - so it no longer knows about it
         Compiler.CancelTask(task, true);
 
@@ -239,15 +231,9 @@ public ICompileable GetTaskIfExists(IMapsDirectlyToDatabaseTable o)
         {
             var kvps = Compiler.Tasks.Where(t => t.Key.Child.Equals(o)).ToArray();
 
-            if (kvps.Length == 0)
-            {
-                return null;
-            }
+            if (kvps.Length == 0) return null;
 
-            if (kvps.Length == 1)
-            {
-                return kvps[0].Key;
-            }
+            if (kvps.Length == 1) return kvps[0].Key;
 
             var running = kvps.FirstOrDefault(k => k.Value != null).Key;
 
@@ -298,6 +284,7 @@ public void ClearCacheFor(ICacheableTask[] tasks)
 
 
     #region Job control
+
     public enum Operation
     {
         Execute,
@@ -311,18 +298,18 @@ public Operation PlanGlobalOperation()
         var allTasks = GetAllTasks();
 
         //if any are still executing or scheduled for execution
-        if (allTasks.Any(t => t.State == CompilationState.Executing || t.State == CompilationState.Building || t.State == CompilationState.Scheduled))
+        if (allTasks.Any(t =>
+                t.State == CompilationState.Executing || t.State == CompilationState.Building ||
+                t.State == CompilationState.Scheduled))
             return Operation.Cancel;
 
         //if all are complete
         return Operation.Execute;
     }
+
     #endregion
 
-    public ICompileable[] GetAllTasks()
-    {
-        return Compiler.Tasks.Keys.ToArray();
-    }
+    public ICompileable[] GetAllTasks() => Compiler.Tasks.Keys.ToArray();
 
     /// <summary>
     /// Considers the state of <see cref="Compiler"/> to check for still running
@@ -339,7 +326,7 @@ public bool ConsultAboutClosing()
             {
                 Activator.Show("Confirm Close",
                     $"There are {aliveCount} Tasks currently executing, you must cancel them before closing");
-                
+
                 return true;
             }
 
@@ -368,16 +355,14 @@ public void ExecuteOrCancel(object o)
                 else
                     OrderActivity(GetNextOperation(GetState(aggregate)), aggregate);
             }
+
             if (o is CohortAggregateContainer container)
-            {
                 OrderActivity(GetNextOperation(GetState(container)), container);
-            }
         });
     }
 
-    public void StartAll(Action afterDelegate,EventHandler onRunnerPhaseChanged)
+    public void StartAll(Action afterDelegate, EventHandler onRunnerPhaseChanged)
     {
-
         //only allow starting all if we are not mid execution already
         if (IsExecutingGlobalOperations())
             return;
@@ -395,11 +380,8 @@ public void StartAll(Action afterDelegate,EventHandler onRunnerPhaseChanged)
             }
             catch (Exception e)
             {
-                Activator.ShowException("Runer crashed",e);
+                Activator.ShowException("Runer crashed", e);
             }
-
-        }).ContinueWith((s, e) => {
-            afterDelegate();
-        }, TaskScheduler.FromCurrentSynchronizationContext());
+        }).ContinueWith((s, e) => { afterDelegate(); }, TaskScheduler.FromCurrentSynchronizationContext());
     }
-}
+}
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Compileable.cs b/Rdmp.Core/CohortCreation/Compileable.cs
index 0de353cfc3..660a318577 100644
--- a/Rdmp.Core/CohortCreation/Compileable.cs
+++ b/Rdmp.Core/CohortCreation/Compileable.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.CohortCreation;
 
-public abstract class Compileable:ICompileable
+public abstract class Compileable : ICompileable
 {
     protected readonly CohortCompiler _compiler;
     private CompilationState _state;
@@ -29,15 +29,9 @@ protected Compileable(CohortCompiler compiler)
         _compiler = compiler;
     }
 
-    public override string ToString()
-    {
-        return Child.ToString();
-    }
+    public override string ToString() => Child.ToString();
 
-    public string GetStateDescription()
-    {
-        return State.ToString();
-    }
+    public string GetStateDescription() => State.ToString();
 
     public abstract string GetCatalogueName();
 
@@ -50,15 +44,15 @@ public CompilationState State
         {
             _state = value;
             var h = StateChanged;
-            h?.Invoke(this,EventArgs.Empty);
+            h?.Invoke(this, EventArgs.Empty);
         }
         get => _state;
     }
 
     public virtual int Order
     {
-        get => ((IOrderable) Child).Order;
-        set => ((IOrderable) Child).Order = value;
+        get => ((IOrderable)Child).Order;
+        set => ((IOrderable)Child).Order = value;
     }
 
     public event EventHandler StateChanged;
@@ -75,24 +69,14 @@ public virtual int Order
 
     public Stopwatch Stopwatch { get; set; }
 
-    public TimeSpan? ElapsedTime {
-        get
-        {
-            return Stopwatch?.Elapsed;
-        }
-    }
+    public TimeSpan? ElapsedTime => Stopwatch?.Elapsed;
 
     public abstract bool IsEnabled();
 
-    public string GetCachedQueryUseCount()
-    {
-        return _compiler.GetCachedQueryUseCount(this);
-    }
+    public string GetCachedQueryUseCount() => _compiler.GetCachedQueryUseCount(this);
+
+    public bool AreaAllQueriesCached() => _compiler.AreaAllQueriesCached(this);
 
-    public bool AreaAllQueriesCached()
-    {
-        return _compiler.AreaAllQueriesCached(this);
-    }
     public void SetKnownContainer(CohortAggregateContainer parent, bool isFirstInContainer)
     {
         ParentContainerIfAny = parent;
diff --git a/Rdmp.Core/CohortCreation/Execution/AggregationContainerTask.cs b/Rdmp.Core/CohortCreation/Execution/AggregationContainerTask.cs
index 6274a0f54d..a2e82cef58 100644
--- a/Rdmp.Core/CohortCreation/Execution/AggregationContainerTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/AggregationContainerTask.cs
@@ -18,29 +18,28 @@ namespace Rdmp.Core.CohortCreation.Execution;
 /// The runtime/compile time wrapper for CohortAggregateContainer. UNION,EXCEPT,INTERSECT containers with 0 or more AggregateConfigurations within
 /// them - also optionally with other sub containers.
 /// </summary>
-public class AggregationContainerTask : Compileable,IOrderable
+public class AggregationContainerTask : Compileable, IOrderable
 {
     private CohortAggregateContainer[] _parentContainers;
     public CohortAggregateContainer Container { get; set; }
-        
+
     public CohortAggregateContainer[] SubContainers { get; set; }
     public AggregateConfiguration[] ContainedConfigurations { get; set; }
 
-    public AggregationContainerTask(CohortAggregateContainer container, CohortCompiler compiler):base(compiler)
+    public AggregationContainerTask(CohortAggregateContainer container, CohortCompiler compiler) : base(compiler)
     {
         Container = container;
-            
+
         SubContainers = compiler.CoreChildProvider.GetChildren(Container).OfType<CohortAggregateContainer>().ToArray();
-        ContainedConfigurations = compiler.CoreChildProvider.GetChildren(Container).OfType<AggregateConfiguration>().ToArray();
+        ContainedConfigurations =
+            compiler.CoreChildProvider.GetChildren(Container).OfType<AggregateConfiguration>().ToArray();
 
         var d = compiler.CoreChildProvider.GetDescendancyListIfAnyFor(Container);
-        _parentContainers = d?.Parents?.OfType<CohortAggregateContainer>()?.ToArray() ?? Array.Empty<CohortAggregateContainer>();
+        _parentContainers = d?.Parents?.OfType<CohortAggregateContainer>()?.ToArray() ??
+                            Array.Empty<CohortAggregateContainer>();
     }
 
-    public override string GetCatalogueName()
-    {
-        return "";
-    }
+    public override string GetCatalogueName() => "";
 
     public override IMapsDirectlyToDatabaseTable Child => Container;
 
@@ -49,15 +48,16 @@ public override IDataAccessPoint[] GetDataAccessPoints()
         var cataIDs = Container.GetAggregateConfigurations().Select(c => c.Catalogue_ID).Distinct().ToList();
 
         //if this container does not have any configurations
-        if (!cataIDs.Any())//try looking at the subcontainers
+        if (!cataIDs.Any()) //try looking at the subcontainers
         {
-            var subcontainers =  Container.GetSubContainers().FirstOrDefault(subcontainer => subcontainer.GetAggregateConfigurations().Any());
-            if(subcontainers != null)
+            var subcontainers = Container.GetSubContainers()
+                .FirstOrDefault(subcontainer => subcontainer.GetAggregateConfigurations().Any());
+            if (subcontainers != null)
                 cataIDs = subcontainers.GetAggregateConfigurations().Select(c => c.Catalogue_ID).Distinct().ToList();
         }
 
         //none of the subcontainers have any catalogues either!
-        if(!cataIDs.Any())
+        if (!cataIDs.Any())
             throw new Exception(
                 $"Aggregate Container {Container.ID} does not have any datasets in it and neither does an of its direct subcontainers have any, how far down the tree do you expect me to look!");
 
@@ -68,16 +68,15 @@ public override IDataAccessPoint[] GetDataAccessPoints()
 
     public override bool IsEnabled()
     {
-        return !Container.IsDisabled && !_parentContainers.Any(c=>c.IsDisabled);
+        return !Container.IsDisabled && !_parentContainers.Any(c => c.IsDisabled);
     }
 
     public string DescribeOperation()
     {
-
         switch (((CohortAggregateContainer)Child).Operation)
         {
             case SetOperation.UNION:
-                return 
+                return
                     @"Includes ALL patients which appear in any of the sets in this container.  If there are subcontainers
 (i.e. other UNION/INTERSECT/EXCEPT blocks under this one) then the UNION operation will be applied to the
 result of the subcontainer.";
@@ -90,10 +89,9 @@ public string DescribeOperation()
                     @"Includes ALL patients in the FIRST set (or subcontainer) under this container but ONLY if they DO NOT
 APPEAR in any of the sets that come after the FIRST.  This means that you get everyone in the first set
 EXCEPT anyone appearing in any of the other sets that follow the FIRST.";
-            default : throw new ArgumentOutOfRangeException(
-                $"Did not know what tool tip to return for set operation {ToString()}");
-
+            default:
+                throw new ArgumentOutOfRangeException(
+                    $"Did not know what tool tip to return for set operation {ToString()}");
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/AggregationTask.cs b/Rdmp.Core/CohortCreation/Execution/AggregationTask.cs
index 0ab873b65c..74fae83689 100644
--- a/Rdmp.Core/CohortCreation/Execution/AggregationTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/AggregationTask.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.CohortCreation.Execution;
 /// A single AggregateConfiguration being executed by a CohortCompiler.  The AggregateConfiguration will be a query like 'select distinct patientId from 
 /// TableX where ...'.  The  query result table can/will be committed as a CacheCommitIdentifierList to  the CachedAggregateConfigurationResultsManager.
 /// </summary>
-public class AggregationTask:CacheableTask
+public class AggregationTask : CacheableTask
 {
     public AggregateConfiguration Aggregate { get; private set; }
 
@@ -29,7 +29,7 @@ public class AggregationTask:CacheableTask
     private CohortIdentificationConfiguration _cohortIdentificationConfiguration;
     private List<CohortAggregateContainer> _allParentContainers;
 
-    public AggregationTask(AggregateConfiguration aggregate, CohortCompiler compiler): base(compiler)
+    public AggregationTask(AggregateConfiguration aggregate, CohortCompiler compiler) : base(compiler)
     {
         Aggregate = aggregate;
         _catalogueName = aggregate.Catalogue.Name;
@@ -37,7 +37,7 @@ public AggregationTask(AggregateConfiguration aggregate, CohortCompiler compiler
 
         var container = aggregate.GetCohortAggregateContainerIfAny();
 
-        if(container != null)
+        if (container != null)
         {
             _allParentContainers = container.GetAllParentContainers().ToList();
             _allParentContainers.Add(container);
@@ -45,10 +45,7 @@ public AggregationTask(AggregateConfiguration aggregate, CohortCompiler compiler
     }
 
 
-    public override string GetCatalogueName()
-    {
-        return _catalogueName;
-    }
+    public override string GetCatalogueName() => _catalogueName;
 
     public override IMapsDirectlyToDatabaseTable Child => Aggregate;
 
@@ -65,26 +62,19 @@ public override string ToString()
         return name;
     }
 
-    public override IDataAccessPoint[] GetDataAccessPoints()
-    {
-        return Aggregate.Catalogue.GetTableInfoList(false);
-    }
+    public override IDataAccessPoint[] GetDataAccessPoints() => Aggregate.Catalogue.GetTableInfoList(false);
 
     public override bool IsEnabled()
     {
         //aggregate is not disabled and none of the parent containers are disabled either
-        return !Aggregate.IsDisabled && !_allParentContainers.Any(c=>c.IsDisabled);
+        return !Aggregate.IsDisabled && !_allParentContainers.Any(c => c.IsDisabled);
     }
 
-    public override AggregateConfiguration GetAggregateConfiguration()
-    {
-        return Aggregate;
-    }
+    public override AggregateConfiguration GetAggregateConfiguration() => Aggregate;
 
-    public override CacheCommitArguments GetCacheArguments(string sql, DataTable results, DatabaseColumnRequest[] explicitTypes)
-    {
-        return new CacheCommitIdentifierList(Aggregate, sql, results, explicitTypes.Single(), Timeout);
-    }
+    public override CacheCommitArguments GetCacheArguments(string sql, DataTable results,
+        DatabaseColumnRequest[] explicitTypes) =>
+        new CacheCommitIdentifierList(Aggregate, sql, results, explicitTypes.Single(), Timeout);
 
     public override void ClearYourselfFromCache(CachedAggregateConfigurationResultsManager manager)
     {
diff --git a/Rdmp.Core/CohortCreation/Execution/CachableTask.cs b/Rdmp.Core/CohortCreation/Execution/CachableTask.cs
index f9364340d9..209dbe4ec0 100644
--- a/Rdmp.Core/CohortCreation/Execution/CachableTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/CachableTask.cs
@@ -19,26 +19,22 @@ protected CacheableTask(CohortCompiler compiler) : base(compiler)
     }
 
     public abstract AggregateConfiguration GetAggregateConfiguration();
-    public abstract CacheCommitArguments GetCacheArguments(string sql, DataTable results, DatabaseColumnRequest[] explicitTypes);
+
+    public abstract CacheCommitArguments GetCacheArguments(string sql, DataTable results,
+        DatabaseColumnRequest[] explicitTypes);
+
     public abstract void ClearYourselfFromCache(CachedAggregateConfigurationResultsManager manager);
-        
+
     public bool IsCacheableWhenFinished()
     {
         if (!_compiler.Tasks.ContainsKey(this))
             return false;
 
         var execution = _compiler.Tasks[this];
-        if(execution == null)
-        {
-            return false;
-        }
+        if (execution == null) return false;
 
         return execution.SubQueries > execution.SubqueriesCached;
     }
 
-    public bool CanDeleteCache()
-    {
-        return _compiler.Tasks[this].SubqueriesCached > 0;
-    }
-
+    public bool CanDeleteCache() => _compiler.Tasks[this].SubqueriesCached > 0;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/CohortCompiler.cs b/Rdmp.Core/CohortCreation/Execution/CohortCompiler.cs
index 4feefad956..d408d9b99f 100644
--- a/Rdmp.Core/CohortCreation/Execution/CohortCompiler.cs
+++ b/Rdmp.Core/CohortCreation/Execution/CohortCompiler.cs
@@ -37,13 +37,17 @@ namespace Rdmp.Core.CohortCreation.Execution;
 public class CohortCompiler
 {
     private CohortIdentificationConfiguration _cic;
-    public CohortIdentificationConfiguration CohortIdentificationConfiguration {
+
+    public CohortIdentificationConfiguration CohortIdentificationConfiguration
+    {
         get => _cic;
-        set {
+        set
+        {
             _cic = value;
             BuildPluginCohortCompilerList();
         }
     }
+
     public bool IncludeCumulativeTotals { get; set; }
 
 
@@ -57,7 +61,8 @@ public CohortIdentificationConfiguration CohortIdentificationConfiguration {
     /// </summary>
     public ICoreChildProvider CoreChildProvider
     {
-        get => _coreChildProvider ??= new CatalogueChildProvider(CohortIdentificationConfiguration.CatalogueRepository,null,new IgnoreAllErrorsCheckNotifier(),null);
+        get => _coreChildProvider ??= new CatalogueChildProvider(CohortIdentificationConfiguration.CatalogueRepository,
+            null, new IgnoreAllErrorsCheckNotifier(), null);
         set => _coreChildProvider = value;
     }
 
@@ -78,16 +83,10 @@ public CohortCompiler(CohortIdentificationConfiguration cohortIdentificationConf
     private void BuildPluginCohortCompilerList()
     {
         // we already have them (or crashed out trying to create them
-        if(PluginCohortCompilers != null)
-        {
-            return;
-        }
+        if (PluginCohortCompilers != null) return;
 
         // we don't know what we are building yet!
-        if(CohortIdentificationConfiguration == null)
-        {
-            return;
-        }
+        if (CohortIdentificationConfiguration == null) return;
 
         try
         {
@@ -100,7 +99,8 @@ private void BuildPluginCohortCompilerList()
         }
     }
 
-    private void DoTaskAsync(ICompileable task, CohortIdentificationTaskExecution execution, int timeout,bool cacheOnCompletion = false)
+    private void DoTaskAsync(ICompileable task, CohortIdentificationTaskExecution execution, int timeout,
+        bool cacheOnCompletion = false)
     {
         try
         {
@@ -109,7 +109,7 @@ private void DoTaskAsync(ICompileable task, CohortIdentificationTaskExecution ex
             task.Timeout = timeout;
             task.State = CompilationState.Executing;
 
-            execution.GetCohortAsync( timeout);
+            execution.GetCohortAsync(timeout);
 
             task.FinalRowCount = execution.Identifiers.Rows.Count;
 
@@ -125,7 +125,7 @@ private void DoTaskAsync(ICompileable task, CohortIdentificationTaskExecution ex
         catch (Exception ex)
         {
             task.Stopwatch.Stop();
-            task.State= CompilationState.Crashed;
+            task.State = CompilationState.Crashed;
             task.CrashMessage = ex;
         }
     }
@@ -145,12 +145,14 @@ public List<ICompileable> AddAllTasks(bool addSubcontainerTasks = true)
         foreach (var joinable in CohortIdentificationConfiguration.GetAllJoinables())
             toReturn.Add(AddTask(joinable, globals));
 
-        toReturn.AddRange( AddTasksRecursively(globals,CohortIdentificationConfiguration.RootCohortAggregateContainer,addSubcontainerTasks));
+        toReturn.AddRange(AddTasksRecursively(globals, CohortIdentificationConfiguration.RootCohortAggregateContainer,
+            addSubcontainerTasks));
 
         return toReturn;
     }
 
-    public List<ICompileable> AddTasksRecursively(ISqlParameter[] globals, CohortAggregateContainer container, bool addSubcontainerTasks = true)
+    public List<ICompileable> AddTasksRecursively(ISqlParameter[] globals, CohortAggregateContainer container,
+        bool addSubcontainerTasks = true)
     {
         var tasks = AddTasksRecursivelyAsync(globals, container, addSubcontainerTasks);
 
@@ -170,33 +172,27 @@ public List<ICompileable> AddTasksRecursively(ISqlParameter[] globals, CohortAgg
     /// <param name="addSubcontainerTasks">The root container is always added to the task list but you could skip subcontainer totals if all you care about is the final total for the cohort
     /// and you don't have a dependant UI etc.  Passing false will add all joinables, subqueries etc and the root container (final answer for who is in cohort) only.</param>
     /// <returns></returns>
-    public List<Task<ICompileable>> AddTasksRecursivelyAsync(ISqlParameter[] globals, CohortAggregateContainer container, bool addSubcontainerTasks = true)
+    public List<Task<ICompileable>> AddTasksRecursivelyAsync(ISqlParameter[] globals,
+        CohortAggregateContainer container, bool addSubcontainerTasks = true)
     {
         var toReturn = new List<Task<ICompileable>>();
 
-        if(CohortIdentificationConfiguration.RootCohortAggregateContainer_ID == null)
-            throw new QueryBuildingException($"CohortIdentificationConfiguration '{CohortIdentificationConfiguration}' had not root SET container (UNION / INERSECT / EXCEPT)");
+        if (CohortIdentificationConfiguration.RootCohortAggregateContainer_ID == null)
+            throw new QueryBuildingException(
+                $"CohortIdentificationConfiguration '{CohortIdentificationConfiguration}' had not root SET container (UNION / INERSECT / EXCEPT)");
 
         //if it is the root container or we are adding tasks for all containers including subcontainers
         if (CohortIdentificationConfiguration.RootCohortAggregateContainer_ID == container.ID || addSubcontainerTasks)
-        {
             if (!container.IsDisabled)
-            {
-                toReturn.Add(Task.Run(()=> { return AddTask(container, globals); }));
-            }
-        }
+                toReturn.Add(Task.Run(() => { return AddTask(container, globals); }));
 
 
         foreach (var c in container.GetOrderedContents())
         {
-            if(c is CohortAggregateContainer aggregateContainer && !aggregateContainer.IsDisabled)
-            {
+            if (c is CohortAggregateContainer aggregateContainer && !aggregateContainer.IsDisabled)
                 toReturn.AddRange(AddTasksRecursivelyAsync(globals, aggregateContainer, addSubcontainerTasks));
-            }
-            if(c is AggregateConfiguration aggregate && !aggregate.IsDisabled)
-            {
+            if (c is AggregateConfiguration aggregate && !aggregate.IsDisabled)
                 toReturn.Add(Task.Run(() => { return AddTask(aggregate, globals); }));
-            }
         }
 
         return toReturn;
@@ -215,7 +211,7 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
         var container = runnable as CohortAggregateContainer;
         var joinable = runnable as JoinableCohortAggregateConfiguration;
         var obj = (aggregate ?? container ?? (IMapsDirectlyToDatabaseTable)joinable) ?? throw new NotSupportedException(
-                $"Expected c to be either AggregateConfiguration or CohortAggregateContainer but it was {runnable.GetType().Name}");
+            $"Expected c to be either AggregateConfiguration or CohortAggregateContainer but it was {runnable.GetType().Name}");
         var source = new CancellationTokenSource();
         ICompileable task;
 
@@ -230,27 +226,28 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
             // is this a custom aggregate type that gets handled differently e.g. by queriying an API?
             var plugin = PluginCohortCompilers.FirstOrDefault(c => c.ShouldRun(aggregate));
 
-            task = plugin != null ?
+            task = plugin != null
+                ?
                 // yes
-                new PluginCohortCompilerTask(aggregate,this,plugin)
+                new PluginCohortCompilerTask(aggregate, this, plugin)
                 // no
                 : new AggregationTask(aggregate, this);
 
-            queryBuilder = new CohortQueryBuilder(aggregate, globals,CoreChildProvider);
+            queryBuilder = new CohortQueryBuilder(aggregate, globals, CoreChildProvider);
 
             //which has a parent
             parent = aggregate.GetCohortAggregateContainerIfAny();
         }
         else if (joinable != null)
         {
-            task = new JoinableTask(joinable,this);
-            queryBuilder = new CohortQueryBuilder(joinable.AggregateConfiguration,globals,CoreChildProvider);
+            task = new JoinableTask(joinable, this);
+            queryBuilder = new CohortQueryBuilder(joinable.AggregateConfiguration, globals, CoreChildProvider);
             parent = null;
         }
         else
         {
             task = new AggregationContainerTask(container, this);
-            queryBuilder = new CohortQueryBuilder(container, globals,CoreChildProvider);
+            queryBuilder = new CohortQueryBuilder(container, globals, CoreChildProvider);
             parent = container.GetParentContainerIfAny();
         }
 
@@ -264,19 +261,16 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
             //but...
             //if the container/aggregate being processed isn't the first component in the container
             if (!isFirstInContainer && IncludeCumulativeTotals) //and we want cumulative totals
-            {
-                cumulativeQueryBuilder = new CohortQueryBuilder(parent, globals,CoreChildProvider)
-                    {
-                        StopContainerWhenYouReach = (IOrderable) runnable
-                    };
-            }
-
+                cumulativeQueryBuilder = new CohortQueryBuilder(parent, globals, CoreChildProvider)
+                {
+                    StopContainerWhenYouReach = (IOrderable)runnable
+                };
         }
+
         ExternalDatabaseServer cacheServer = null;
         //if the overall owner has a cache configured
         if (CohortIdentificationConfiguration.QueryCachingServer_ID != null)
         {
-
             cacheServer = CohortIdentificationConfiguration.QueryCachingServer;
             queryBuilder.CacheServer = cacheServer;
 
@@ -292,14 +286,12 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
         lock (Tasks)
         {
             //we have seen this entity before (by ID & entity type)
-            foreach (var c in Tasks.Keys.Where(k =>k.Child.Equals(obj) && k != task).ToArray())
+            foreach (var c in Tasks.Keys.Where(k => k.Child.Equals(obj) && k != task).ToArray())
             {
                 // the task is already setup ready to go somehow
-                if(c.CancellationTokenSource == source)
-                {
+                if (c.CancellationTokenSource == source)
                     // it's already added, no worries just return the already existing one
                     return c;
-                }
 
                 CancelTask(c, true);
             }
@@ -331,20 +323,19 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
         task.Log = queryBuilder?.Results?.Log;
 
 
-        var isResultsForRootContainer = container != null && container.ID == CohortIdentificationConfiguration.RootCohortAggregateContainer_ID;
+        var isResultsForRootContainer = container != null &&
+                                        container.ID == CohortIdentificationConfiguration
+                                            .RootCohortAggregateContainer_ID;
 
 
         var taskExecution = new CohortIdentificationTaskExecution(cacheServer, newsql, cumulativeSql, source,
             queryBuilder?.Results?.CountOfSubQueries ?? -1,
-            queryBuilder?.Results?.CountOfCachedSubQueries ??-1,
+            queryBuilder?.Results?.CountOfCachedSubQueries ?? -1,
             isResultsForRootContainer,
             queryBuilder?.Results?.TargetServer);
 
         // task is now built but not yet
-        if(task.State != CompilationState.Crashed)
-        {
-            task.State = CompilationState.NotScheduled;
-        }
+        if (task.State != CompilationState.Crashed) task.State = CompilationState.NotScheduled;
 
         lock (Tasks)
         {
@@ -355,25 +346,27 @@ public ICompileable AddTask(IMapsDirectlyToDatabaseTable runnable, IEnumerable<I
         return task;
     }
 
-    public void LaunchSingleTask(ICompileable compileable,int timeout,bool cacheOnCompletion)
+    public void LaunchSingleTask(ICompileable compileable, int timeout, bool cacheOnCompletion)
     {
-        if(!Tasks.ContainsKey(compileable))
+        if (!Tasks.ContainsKey(compileable))
             throw new KeyNotFoundException("Cannot launch task because it is not in the list of current Tasks");
 
-        if(compileable.State != CompilationState.NotScheduled)
-            throw new ArgumentException($"Task must be in state NotScheduled but was {compileable.State}.  Crash message is:{compileable.CrashMessage?.ToString() ?? "null"}");
+        if (compileable.State != CompilationState.NotScheduled)
+            throw new ArgumentException(
+                $"Task must be in state NotScheduled but was {compileable.State}.  Crash message is:{compileable.CrashMessage?.ToString() ?? "null"}");
 
         KickOff(compileable, Tasks[compileable], timeout, cacheOnCompletion);
     }
 
-    public void LaunchScheduledTasksAsync(int timeout,bool cacheOnCompletion)
+    public void LaunchScheduledTasksAsync(int timeout, bool cacheOnCompletion)
     {
         foreach (var kvp in Tasks)
             if (kvp.Key.State == CompilationState.NotScheduled)
                 KickOff(kvp.Key, kvp.Value, timeout, cacheOnCompletion);
     }
 
-    private void KickOff(ICompileable task, CohortIdentificationTaskExecution execution, int timeout,bool cacheOnCompletion)
+    private void KickOff(ICompileable task, CohortIdentificationTaskExecution execution, int timeout,
+        bool cacheOnCompletion)
     {
         task.State = CompilationState.Scheduled;
         task.Stopwatch = new Stopwatch();
@@ -420,27 +413,27 @@ public void CacheSingleTask(ICacheableTask cacheableTask, ExternalDatabaseServer
 
                 var identifierDimension = identifiers[0];
                 var identifierColumnInfo = identifierDimension.ColumnInfo;
-                var destinationDataType = GetDestinationType(identifierColumnInfo.Data_type,cacheableTask,queryCachingServer);
+                var destinationDataType =
+                    GetDestinationType(identifierColumnInfo.Data_type, cacheableTask, queryCachingServer);
 
                 explicitTypes.Add(new DatabaseColumnRequest(identifierDimension.GetRuntimeName(), destinationDataType));
 
                 //make other non transform Types have explicit values
-                foreach(var d in configuration.AggregateDimensions)
-                {
-                    if(d != identifierDimension)
-                    {
+                foreach (var d in configuration.AggregateDimensions)
+                    if (d != identifierDimension)
                         //if the user has not changed the SelectSQL and the SelectSQL of the original column is not a transform
-                        if(d.ExtractionInformation.SelectSQL.Equals(d.SelectSQL) && !d.ExtractionInformation.IsProperTransform())
-                        {
+                        if (d.ExtractionInformation.SelectSQL.Equals(d.SelectSQL) &&
+                            !d.ExtractionInformation.IsProperTransform())
                             //then use the origin datatype
-                            explicitTypes.Add(new DatabaseColumnRequest(d.GetRuntimeName(), GetDestinationType(d.ExtractionInformation.ColumnInfo.Data_type, cacheableTask, queryCachingServer)));
-                        }
-                    }
-                }
+                            explicitTypes.Add(new DatabaseColumnRequest(d.GetRuntimeName(),
+                                GetDestinationType(d.ExtractionInformation.ColumnInfo.Data_type, cacheableTask,
+                                    queryCachingServer)));
             }
             catch (Exception e)
             {
-                throw new Exception("Error occurred trying to find the data type of the identifier column when attempting to submit the result data table to the cache", e);
+                throw new Exception(
+                    "Error occurred trying to find the data type of the identifier column when attempting to submit the result data table to the cache",
+                    e);
             }
 
             var args = cacheableTask.GetCacheArguments(sql, Tasks[cacheableTask].Identifiers, explicitTypes.ToArray());
@@ -450,7 +443,7 @@ public void CacheSingleTask(ICacheableTask cacheableTask, ExternalDatabaseServer
         catch (Exception e)
         {
             cacheableTask.State = CompilationState.Crashed;
-            cacheableTask.CrashMessage = new Exception("Failed to cache results",e);
+            cacheableTask.CrashMessage = new Exception("Failed to cache results", e);
         }
     }
 
@@ -462,7 +455,8 @@ public void CacheSingleTask(ICacheableTask cacheableTask, ExternalDatabaseServer
     /// <param name="cacheableTask">Where the datatype was read from e.g. Oracle</param>
     /// <param name="queryCachingServer">Where the datatype is going to be stored e.g. Sql Server</param>
     /// <returns></returns>
-    private static string GetDestinationType(string data_type, ICacheableTask cacheableTask, ExternalDatabaseServer queryCachingServer)
+    private static string GetDestinationType(string data_type, ICacheableTask cacheableTask,
+        ExternalDatabaseServer queryCachingServer)
     {
         var accessPoints = cacheableTask.GetDataAccessPoints();
 
@@ -473,9 +467,7 @@ private static string GetDestinationType(string data_type, ICacheableTask cachea
 
         //if we have a change in syntax e.g. read from Oracle write to Sql Server
         if (sourceSyntax.DatabaseType != destinationSyntax.DatabaseType)
-        {
             return sourceSyntax.TypeTranslater.TranslateSQLDBType(data_type, destinationSyntax.TypeTranslater);
-        }
 
         return data_type;
     }
@@ -487,19 +479,12 @@ private static string GetDestinationType(string data_type, ICacheableTask cachea
     /// <param name="alsoClearTaskList">True to also remove all ICompileables, False to leave the Tasks intact (allows you to rerun them or clear etc)</param>
     public void CancelAllTasks(bool alsoClearTaskList)
     {
-        lock(Tasks)
+        lock (Tasks)
         {
-            foreach (var k in Tasks.Keys)
-            {
-                CancelTask(k, alsoClearTaskList);
-            }
+            foreach (var k in Tasks.Keys) CancelTask(k, alsoClearTaskList);
 
-            if (alsoClearTaskList)
-            {
-                Tasks.Clear();
-            }
+            if (alsoClearTaskList) Tasks.Clear();
         }
-
     }
 
     /// <summary>
@@ -510,20 +495,15 @@ public void CancelAllTasks(bool alsoClearTaskList)
     /// <param name="alsoClearFromTaskList">True to remove the ICompileable from the tasks list, False to leave the Tasks intact (allows you to rerun it or clear etc) </param>
     public void CancelTask(ICompileable compileable, bool alsoClearFromTaskList)
     {
-        lock(Tasks)
+        lock (Tasks)
         {
             if (!Tasks.TryGetValue(compileable, out var execution)) return;
-            if (execution is { IsExecuting: true })
-            {
-                execution.Cancel();
-            }
+            if (execution is { IsExecuting: true }) execution.Cancel();
 
             // cancel the source
-            if(
+            if (
                 compileable.State is CompilationState.Building or CompilationState.Executing)
-            {
                 compileable.CancellationTokenSource.Cancel();
-            }
 
             if (alsoClearFromTaskList)
             {
@@ -531,7 +511,6 @@ public void CancelTask(ICompileable compileable, bool alsoClearFromTaskList)
                 Tasks.Remove(compileable);
             }
         }
-
     }
 
     public int GetAliveThreadCount()
@@ -541,17 +520,17 @@ public int GetAliveThreadCount()
 
     public string GetCachedQueryUseCount(ICompileable task)
     {
-        if (!Tasks.TryGetValue(task,out var execution) || execution == null)
+        if (!Tasks.TryGetValue(task, out var execution) || execution == null)
             return "Unknown";
 
         return $"{execution.SubqueriesCached}/{execution.SubQueries}";
     }
 
-    public bool AreaAllQueriesCached(ICompileable task )
+    public bool AreaAllQueriesCached(ICompileable task)
     {
-        if (!Tasks.TryGetValue(task,out var execution) || execution == null)
+        if (!Tasks.TryGetValue(task, out var execution) || execution == null)
             return false;
 
-        return execution.SubqueriesCached == execution.SubQueries && execution.SubQueries >=1;
+        return execution.SubqueriesCached == execution.SubQueries && execution.SubQueries >= 1;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/CohortCompilerRunner.cs b/Rdmp.Core/CohortCreation/Execution/CohortCompilerRunner.cs
index c84d944e9f..19625b25bb 100644
--- a/Rdmp.Core/CohortCreation/Execution/CohortCompilerRunner.cs
+++ b/Rdmp.Core/CohortCreation/Execution/CohortCompilerRunner.cs
@@ -48,8 +48,8 @@ public CohortCompilerRunner(CohortCompiler compiler, int timeout)
     {
         _timeout = timeout;
         Compiler = compiler;
-            
-        if(Compiler.CohortIdentificationConfiguration == null)
+
+        if (Compiler.CohortIdentificationConfiguration == null)
             throw new ArgumentException("CohortCompiler must have a CohortIdentificationConfiguration");
 
         _cic = Compiler.CohortIdentificationConfiguration;
@@ -86,36 +86,42 @@ public ICompileable Run(CancellationToken token)
 
             Compiler.CancelAllTasks(false);
 
-            RunAsync(Compiler.Tasks.Keys.Where(c => c is JoinableTask && c.State == CompilationState.NotScheduled),token);
+            RunAsync(Compiler.Tasks.Keys.Where(c => c is JoinableTask && c.State == CompilationState.NotScheduled),
+                token);
 
             SetPhase(Phase.CachingJoinableTasks);
 
-            CacheAsync(Compiler.Tasks.Keys.OfType<JoinableTask>().Where(c => c.State == CompilationState.Finished && c.IsCacheableWhenFinished()),token);
+            CacheAsync(
+                Compiler.Tasks.Keys.OfType<JoinableTask>().Where(c =>
+                    c.State == CompilationState.Finished && c.IsCacheableWhenFinished()), token);
 
             SetPhase(Phase.RunningAggregateTasks);
 
             // Add all aggregates
-            Parallel.ForEach(_cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively(), c => Compiler.AddTask(c, globals));
+            Parallel.ForEach(_cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively(),
+                c => Compiler.AddTask(c, globals));
 
             Compiler.CancelAllTasks(false);
 
-            RunAsync(Compiler.Tasks.Keys.Where(c => c is AggregationTask && c.IsEnabled() && c.State == CompilationState.NotScheduled), token);
+            RunAsync(
+                Compiler.Tasks.Keys.Where(c =>
+                    c is AggregationTask && c.IsEnabled() && c.State == CompilationState.NotScheduled), token);
 
             SetPhase(Phase.CachingAggregateTasks);
 
-            CacheAsync(Compiler.Tasks.Keys.OfType<AggregationTask>().Where(c => c.State == CompilationState.Finished && c.IsCacheableWhenFinished()), token);
+            CacheAsync(
+                Compiler.Tasks.Keys.OfType<AggregationTask>().Where(c =>
+                    c.State == CompilationState.Finished && c.IsCacheableWhenFinished()), token);
 
             SetPhase(Phase.RunningFinalTotals);
 
             var toReturn = Compiler.AddTask(_cic.RootCohortAggregateContainer, globals);
 
-            if(RunSubcontainers)
-            {
+            if (RunSubcontainers)
                 Parallel.ForEach(
                     _cic.RootCohortAggregateContainer.GetAllSubContainersRecursively().Where(
-                        c=>CohortQueryBuilderResult.IsEnabled(c,Compiler.CoreChildProvider)),
-                    a=>Compiler.AddTask(a, globals));
-            }
+                        c => CohortQueryBuilderResult.IsEnabled(c, Compiler.CoreChildProvider)),
+                    a => Compiler.AddTask(a, globals));
 
 
             Compiler.CancelAllTasks(false);
@@ -140,7 +146,7 @@ private void RunAsync(IEnumerable<ICompileable> toRun, CancellationToken token)
         var tasks = toRun.ToArray();
 
         foreach (var r in tasks)
-            Compiler.LaunchSingleTask(r, _timeout,false);
+            Compiler.LaunchSingleTask(r, _timeout, false);
 
         //while there are executing tasks
         while (tasks.Any(t => t.State == CompilationState.Scheduled || t.State == CompilationState.Executing))
@@ -163,6 +169,6 @@ private void SetPhase(Phase p)
         ExecutionPhase = p;
 
         var h = PhaseChanged;
-        h?.Invoke(this,EventArgs.Empty);
+        h?.Invoke(this, EventArgs.Empty);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/CohortIdentificationTaskExecution.cs b/Rdmp.Core/CohortCreation/Execution/CohortIdentificationTaskExecution.cs
index 90fc77eb0c..f8b1ef3e26 100644
--- a/Rdmp.Core/CohortCreation/Execution/CohortIdentificationTaskExecution.cs
+++ b/Rdmp.Core/CohortCreation/Execution/CohortIdentificationTaskExecution.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.CohortCreation.Execution;
 /// An ongoing async execution of a cohort identification subquery in the CohortCompiler.  Includes the query used to fetch the cohort identifiers, the 
 /// identifiers themselves (once complete), cancellation token etc.
 /// </summary>
-public class CohortIdentificationTaskExecution: IDisposable
+public class CohortIdentificationTaskExecution : IDisposable
 {
     private readonly IDataAccessPoint _cacheServerIfAny;
     public int SubQueries { get; private set; }
@@ -45,7 +45,9 @@ public class CohortIdentificationTaskExecution: IDisposable
     private DbDataReader _rCumulative;
     private DbCommand _cmdCountCumulative;
 
-    public CohortIdentificationTaskExecution(IDataAccessPoint cacheServerIfAny, string countSQL, string cumulativeSQL, CancellationTokenSource cancellationTokenSource, int subQueries, int subqueriesCached, bool isResultsForRootContainer,DiscoveredServer target)
+    public CohortIdentificationTaskExecution(IDataAccessPoint cacheServerIfAny, string countSQL, string cumulativeSQL,
+        CancellationTokenSource cancellationTokenSource, int subQueries, int subqueriesCached,
+        bool isResultsForRootContainer, DiscoveredServer target)
     {
         _cacheServerIfAny = cacheServerIfAny;
         SubQueries = subQueries;
@@ -60,13 +62,9 @@ public CohortIdentificationTaskExecution(IDataAccessPoint cacheServerIfAny, stri
     public void Cancel()
     {
         _cancellationTokenSource.Cancel();
-        if (_cmdCount != null && _cmdCount.Connection.State == ConnectionState.Open)
-        {
-            _cmdCount.Cancel();
-        }
+        if (_cmdCount != null && _cmdCount.Connection.State == ConnectionState.Open) _cmdCount.Cancel();
 
         if (_rIds != null && !_rIds.IsClosed)
-        {
             try
             {
                 _rIds.Close();
@@ -74,10 +72,8 @@ public void Cancel()
             catch (InvalidOperationException)
             {
             }
-        }
 
         if (_rCumulative != null && !_rCumulative.IsClosed)
-        {
             try
             {
                 _rCumulative.Close();
@@ -85,22 +81,20 @@ public void Cancel()
             catch (InvalidOperationException)
             {
             }
-        }
-            
     }
 
-        
+
     public void GetCohortAsync(int commandTimeout)
     {
-        if(Identifiers != null)
+        if (Identifiers != null)
             throw new Exception("GetCohortAsync has already been called for this object");
 
         Identifiers = new DataTable();
-            
+
         IsExecuting = true;
 
         var server = _target;
-            
+
         server.EnableAsync();
 
         using (var con = server.GetConnection())
diff --git a/Rdmp.Core/CohortCreation/Execution/ExamplePluginCohortCompiler.cs b/Rdmp.Core/CohortCreation/Execution/ExamplePluginCohortCompiler.cs
index 79c6b3c0d2..e6a57286cf 100644
--- a/Rdmp.Core/CohortCreation/Execution/ExamplePluginCohortCompiler.cs
+++ b/Rdmp.Core/CohortCreation/Execution/ExamplePluginCohortCompiler.cs
@@ -26,24 +26,22 @@ public class ExamplePluginCohortCompiler : PluginCohortCompiler
 {
     public const string ExampleAPIName = $"{ApiPrefix}GenerateRandomChisExample";
 
-    public override void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,CancellationToken token)
+    public override void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,
+        CancellationToken token)
     {
         token.ThrowIfCancellationRequested();
 
         // The user of RDMP will have configured ac as either patient index table or normal cohort aggregate
         if (ac.IsJoinablePatientIndexTable())
-        {
             // user expects multiple columns from the API
-            RunAsPatientIndexTable(ac, cache,token);
-        }
+            RunAsPatientIndexTable(ac, cache, token);
         else
-        {
             // user expects only a single linkage identifier to be returned by the API
-            RunAsIdentifierList(ac, cache,token);
-        }
+            RunAsIdentifierList(ac, cache, token);
     }
 
-    private void RunAsPatientIndexTable(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache, CancellationToken token)
+    private void RunAsPatientIndexTable(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,
+        CancellationToken token)
     {
         using var dt = new DataTable();
         dt.Columns.Add("chi", typeof(string));
@@ -54,14 +52,13 @@ private void RunAsPatientIndexTable(AggregateConfiguration ac, CachedAggregateCo
         var pc = new PersonCollection();
         pc.GeneratePeople(GetNumberToGenerate(ac), new Random());
 
-        foreach (var p in pc.People)
-        {
-            dt.Rows.Add(p.CHI, p.DateOfBirth,p.DateOfDeath ?? (object)DBNull.Value);
-        }
+        foreach (var p in pc.People) dt.Rows.Add(p.CHI, p.DateOfBirth, p.DateOfDeath ?? (object)DBNull.Value);
 
-        SubmitPatientIndexTable(dt, ac, cache,true);
+        SubmitPatientIndexTable(dt, ac, cache, true);
     }
-    private void RunAsIdentifierList(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache, CancellationToken token)
+
+    private void RunAsIdentifierList(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,
+        CancellationToken token)
     {
         var pc = new PersonCollection();
         var requiredNumber = GetNumberToGenerate(ac);
@@ -71,34 +68,28 @@ private void RunAsIdentifierList(AggregateConfiguration ac, CachedAggregateConfi
         var set = new HashSet<string>(pc.People.Select(p => p.CHI));
 
         // there may be duplicates, if so we need to bump up the number to match the required count
-        while(set.Count < requiredNumber)
+        while (set.Count < requiredNumber)
         {
             pc.GeneratePeople(1, rand);
             set.Add(pc.People[0].CHI);
         }
-                
+
         // generate a list of random chis
         SubmitIdentifierList("chi", set, ac, cache);
     }
 
-    private static int GetNumberToGenerate(AggregateConfiguration ac)
-    {
+    private static int GetNumberToGenerate(AggregateConfiguration ac) =>
         // You can persist configuration info about how to query the API any way
         // you want.  Here we just use the Description field
-        return int.TryParse(ac.Description, out var result) ? result: 5;
-    }
+        int.TryParse(ac.Description, out var result) ? result : 5;
 
-    public override bool ShouldRun(ICatalogue cata)
-    {
+    public override bool ShouldRun(ICatalogue cata) =>
         // we will handle any dataset where the associated Catalogue has this name
         // you can customise how to spot your API calls however you want
-        return cata.Name.Equals(ExampleAPIName);
-    }
+        cata.Name.Equals(ExampleAPIName);
 
-    protected override string GetJoinColumnNameFor(AggregateConfiguration joinedTo)
-    {
+    protected override string GetJoinColumnNameFor(AggregateConfiguration joinedTo) =>
         // when RunAsPatientIndexTable is being used the column that can be linked
         // to other datasets is called "chi"
-        return "chi";
-    }
+        "chi";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/ICacheableTask.cs b/Rdmp.Core/CohortCreation/Execution/ICacheableTask.cs
index 5c4ab921ce..6242d5d578 100644
--- a/Rdmp.Core/CohortCreation/Execution/ICacheableTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/ICacheableTask.cs
@@ -16,10 +16,10 @@ namespace Rdmp.Core.CohortCreation.Execution;
 /// Any ICompileable which can be cached once finished.  Typically any ICompileable in a CohortCompiler can be cached unless it is composed of multiple discrete
 /// sub queries (i.e. an AggregationContainerTask.) 
 /// </summary>
-public interface ICacheableTask:ICompileable
+public interface ICacheableTask : ICompileable
 {
     AggregateConfiguration GetAggregateConfiguration();
-    CacheCommitArguments GetCacheArguments(string sql, DataTable results,DatabaseColumnRequest[] explicitTypes);
+    CacheCommitArguments GetCacheArguments(string sql, DataTable results, DatabaseColumnRequest[] explicitTypes);
     void ClearYourselfFromCache(CachedAggregateConfigurationResultsManager manager);
 
     bool IsCacheableWhenFinished();
diff --git a/Rdmp.Core/CohortCreation/Execution/IPluginCohortCompiler.cs b/Rdmp.Core/CohortCreation/Execution/IPluginCohortCompiler.cs
index e9bc280c9d..0c3bb35a09 100644
--- a/Rdmp.Core/CohortCreation/Execution/IPluginCohortCompiler.cs
+++ b/Rdmp.Core/CohortCreation/Execution/IPluginCohortCompiler.cs
@@ -25,7 +25,7 @@ public interface IPluginCohortCompiler
     /// <param name="ac"></param>
     /// <returns></returns>
     bool ShouldRun(AggregateConfiguration ac);
-        
+
     /// <summary>
     /// Return true if the <paramref name="catalogue"/> is of a type that should be handled by your class
     /// by calling your API.
@@ -42,7 +42,8 @@ public interface IPluginCohortCompiler
     /// <param name="ac"></param>
     /// <param name="cache"></param>
     /// <param name="cancellationToken"></param>
-    void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache, CancellationToken cancellationToken);
+    void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,
+        CancellationToken cancellationToken);
 
     /// <summary>
     /// Return true if the <paramref name="oldDescription"/> does not match the logic currently 
diff --git a/Rdmp.Core/CohortCreation/Execution/Joinables/JoinableTask.cs b/Rdmp.Core/CohortCreation/Execution/Joinables/JoinableTask.cs
index 2e7f691b88..588302fa58 100644
--- a/Rdmp.Core/CohortCreation/Execution/Joinables/JoinableTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/Joinables/JoinableTask.cs
@@ -24,7 +24,7 @@ namespace Rdmp.Core.CohortCreation.Execution.Joinables;
 /// AggregateConfiguration will be a query like 'select distinct patientId, drugName,prescribedDate from  TableX where ...'.  The  query
 /// result table can/will be committed as a CacheCommitJoinableInceptionQuery to  the CachedAggregateConfigurationResultsManager.
 /// </summary>
-public class JoinableTask:CacheableTask
+public class JoinableTask : CacheableTask
 {
     private CohortIdentificationConfiguration _cohortIdentificationConfiguration;
     private AggregateConfiguration _aggregate;
@@ -32,38 +32,28 @@ public class JoinableTask:CacheableTask
 
     public JoinableCohortAggregateConfiguration Joinable { get; private set; }
 
-        
+
     public JoinableTask(JoinableCohortAggregateConfiguration joinable, CohortCompiler compiler) : base(compiler)
     {
-            
         Joinable = joinable;
         _aggregate = Joinable.AggregateConfiguration;
-        _cohortIdentificationConfiguration =_aggregate.GetCohortIdentificationConfigurationIfAny();
-            
+        _cohortIdentificationConfiguration = _aggregate.GetCohortIdentificationConfigurationIfAny();
+
         _catalogueName = Joinable.AggregateConfiguration.Catalogue.Name;
         RefreshIsUsedState();
     }
 
-    public override string GetCatalogueName()
-    {
-        return _catalogueName;
-    }
+    public override string GetCatalogueName() => _catalogueName;
 
     public override IMapsDirectlyToDatabaseTable Child => Joinable;
 
-    public override IDataAccessPoint[] GetDataAccessPoints()
-    {
-        return Joinable.AggregateConfiguration.Catalogue.GetTableInfoList(false);
-    }
+    public override IDataAccessPoint[] GetDataAccessPoints() =>
+        Joinable.AggregateConfiguration.Catalogue.GetTableInfoList(false);
 
-    public override bool IsEnabled()
-    {
-        return !_aggregate.IsDisabled;
-    }
+    public override bool IsEnabled() => !_aggregate.IsDisabled;
 
     public override string ToString()
     {
-
         var name = _aggregate.Name;
 
         var expectedTrimStart = _cohortIdentificationConfiguration.GetNamingConventionPrefixForConfigurations();
@@ -73,23 +63,21 @@ public override string ToString()
 
         return name;
     }
-        
-    public override AggregateConfiguration GetAggregateConfiguration()
-    {
-        return Joinable.AggregateConfiguration;
-    }
 
-    public override CacheCommitArguments GetCacheArguments(string sql, DataTable results, DatabaseColumnRequest[] explicitTypes)
-    {
-        return new CacheCommitJoinableInceptionQuery(Joinable.AggregateConfiguration, sql, results, explicitTypes, Timeout);
-    }
+    public override AggregateConfiguration GetAggregateConfiguration() => Joinable.AggregateConfiguration;
+
+    public override CacheCommitArguments
+        GetCacheArguments(string sql, DataTable results, DatabaseColumnRequest[] explicitTypes) =>
+        new CacheCommitJoinableInceptionQuery(Joinable.AggregateConfiguration, sql, results, explicitTypes, Timeout);
 
     public override void ClearYourselfFromCache(CachedAggregateConfigurationResultsManager manager)
     {
         manager.DeleteCacheEntryIfAny(Joinable.AggregateConfiguration, AggregateOperation.JoinableInceptionQuery);
     }
 
-    public override int Order { get => Joinable.ID;
+    public override int Order
+    {
+        get => Joinable.ID;
         set => throw new NotSupportedException();
     }
 
@@ -100,9 +88,6 @@ public void RefreshIsUsedState()
         IsUnused = !Joinable.Users.Any();
     }
 
-    public string GetUnusedWarningText()
-    {
-        return
-            $"Patient Index Table '{ToString()}' is not used by any of your sets (above).";
-    }
+    public string GetUnusedWarningText() =>
+        $"Patient Index Table '{ToString()}' is not used by any of your sets (above).";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompiler.cs b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompiler.cs
index 089ff05d0a..b04de0b476 100644
--- a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompiler.cs
+++ b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompiler.cs
@@ -42,12 +42,10 @@ public abstract class PluginCohortCompiler : IPluginCohortCompiler
     /// <param name="cache">Where to store results.  Note you can use helper method <see cref="SubmitIdentifierList{T}"/> instead
     /// of using this directly</param>
     /// <param name="token">Check this token for cancellation regularly if your API call takes a while to complete</param>
-    public abstract void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache, CancellationToken token);
-        
-    public virtual bool ShouldRun(AggregateConfiguration ac)
-    {
-        return ShouldRun(ac.Catalogue);
-    }
+    public abstract void Run(AggregateConfiguration ac, CachedAggregateConfigurationResultsManager cache,
+        CancellationToken token);
+
+    public virtual bool ShouldRun(AggregateConfiguration ac) => ShouldRun(ac.Catalogue);
     public abstract bool ShouldRun(ICatalogue catalogue);
 
 
@@ -60,13 +58,14 @@ public virtual bool ShouldRun(AggregateConfiguration ac)
     /// <param name="enumerable"></param>
     /// <param name="aggregate"></param>
     /// <param name="cache"></param>
-    protected void SubmitIdentifierList<T>(string identifierName, IEnumerable<T> enumerable, AggregateConfiguration aggregate, CachedAggregateConfigurationResultsManager cache)
+    protected void SubmitIdentifierList<T>(string identifierName, IEnumerable<T> enumerable,
+        AggregateConfiguration aggregate, CachedAggregateConfigurationResultsManager cache)
     {
         var g = new Guesser(new DatabaseTypeRequest(typeof(T)));
-            
+
         // generate random chi numbers
         using var dt = new DataTable();
-        dt.Columns.Add(identifierName,typeof(T));
+        dt.Columns.Add(identifierName, typeof(T));
         foreach (var p in enumerable)
         {
             dt.Rows.Add(p);
@@ -76,7 +75,7 @@ protected void SubmitIdentifierList<T>(string identifierName, IEnumerable<T> enu
         // this is how you commit the results to the cache
         var args = new CacheCommitIdentifierList(aggregate, GetDescription(aggregate), dt,
             new DatabaseColumnRequest(identifierName, g.Guess, false), 5000);
-            
+
         cache.CommitResults(args);
     }
 
@@ -90,12 +89,13 @@ protected void SubmitIdentifierList<T>(string identifierName, IEnumerable<T> enu
     /// <param name="cache"></param>
     /// <param name="knownTypes">If your DataTable is properly Typed (i.e. columns in <paramref name="results"/> have assigned Types) 
     /// then pass true.  If everything is a string and you want types to be assigned for these for querying later pass false.</param>
-    protected void SubmitPatientIndexTable(DataTable results, AggregateConfiguration aggregate, CachedAggregateConfigurationResultsManager cache, bool knownTypes)
+    protected void SubmitPatientIndexTable(DataTable results, AggregateConfiguration aggregate,
+        CachedAggregateConfigurationResultsManager cache, bool knownTypes)
     {
         // The data table has to go into the database so we need to know max length of strings, decimal precision etc
         var guessers = new Dictionary<string, Guesser>();
 
-        foreach(DataColumn col in results.Columns)
+        foreach (DataColumn col in results.Columns)
         {
             // if the user told us the datatypes were right then assume they are honest otherwise make it up as you go along
             var g = knownTypes ? new Guesser(new DatabaseTypeRequest(col.DataType)) : new Guesser();
@@ -107,8 +107,8 @@ protected void SubmitPatientIndexTable(DataTable results, AggregateConfiguration
         }
 
         // this is how you commit the results to the cache
-        var args = new CacheCommitJoinableInceptionQuery(aggregate, GetDescription(aggregate), results, 
-            guessers.Select(k=>new DatabaseColumnRequest(k.Key,k.Value.Guess)).ToArray()
+        var args = new CacheCommitJoinableInceptionQuery(aggregate, GetDescription(aggregate), results,
+            guessers.Select(k => new DatabaseColumnRequest(k.Key, k.Value.Guess)).ToArray()
             , 5000);
         cache.CommitResults(args);
     }
@@ -120,15 +120,10 @@ protected void SubmitPatientIndexTable(DataTable results, AggregateConfiguration
     /// </summary>
     /// <param name="aggregate"></param>
     /// <returns></returns>
-    protected virtual string GetDescription(AggregateConfiguration aggregate)
-    {
-        return aggregate.Description ?? "none";
-    }
+    protected virtual string GetDescription(AggregateConfiguration aggregate) => aggregate.Description ?? "none";
 
-    public virtual bool IsStale(AggregateConfiguration aggregate, string oldDescription)
-    {
-        return !string.Equals(GetDescription(aggregate), oldDescription, StringComparison.CurrentCultureIgnoreCase);
-    }
+    public virtual bool IsStale(AggregateConfiguration aggregate, string oldDescription) =>
+        !string.Equals(GetDescription(aggregate), oldDescription, StringComparison.CurrentCultureIgnoreCase);
 
     public virtual IHasRuntimeName GetJoinColumnForPatientIndexTable(AggregateConfiguration joinedTo)
     {
diff --git a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerFactory.cs b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerFactory.cs
index 6f3b88c1b1..109e5d1e2d 100644
--- a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerFactory.cs
+++ b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerFactory.cs
@@ -20,11 +20,9 @@ public PluginCohortCompilerFactory(MEF mef)
         _mef = mef;
     }
 
-    internal IReadOnlyCollection<IPluginCohortCompiler> CreateAll()
-    {
-        return _mef
+    internal IReadOnlyCollection<IPluginCohortCompiler> CreateAll() =>
+        _mef
             .GetTypes<IPluginCohortCompiler>()
             .Select(Activator.CreateInstance)
             .Cast<IPluginCohortCompiler>().ToList().AsReadOnly();
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerTask.cs b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerTask.cs
index 7517dd05bb..6ced116be6 100644
--- a/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerTask.cs
+++ b/Rdmp.Core/CohortCreation/Execution/PluginCohortCompilerTask.cs
@@ -13,7 +13,8 @@ internal class PluginCohortCompilerTask : AggregationTask
 {
     public IPluginCohortCompiler PluginCompiler { get; }
 
-    public PluginCohortCompilerTask(AggregateConfiguration ac,CohortCompiler mainCompiler, IPluginCohortCompiler pluginCompiler):base(ac,mainCompiler)
+    public PluginCohortCompilerTask(AggregateConfiguration ac, CohortCompiler mainCompiler,
+        IPluginCohortCompiler pluginCompiler) : base(ac, mainCompiler)
     {
         PluginCompiler = pluginCompiler;
     }
@@ -23,5 +24,4 @@ public override IDataAccessPoint[] GetDataAccessPoints()
         // for this task always go direct to the query cache
         return new[] { Aggregate.GetCohortIdentificationConfigurationIfAny().QueryCachingServer };
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CohortCreation/ICompileable.cs b/Rdmp.Core/CohortCreation/ICompileable.cs
index 6fa4a6eb03..a1ced6544f 100644
--- a/Rdmp.Core/CohortCreation/ICompileable.cs
+++ b/Rdmp.Core/CohortCreation/ICompileable.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.CohortCreation;
 /// A cohort identification container (AggregateContainer) or sub query (AggregateConfiguration) that is running in a CohortCompiler and will be
 /// given the results of the execution (CohortIdentificationTaskExecution).
 /// </summary>
-public interface ICompileable:IOrderable
+public interface ICompileable : IOrderable
 {
     IMapsDirectlyToDatabaseTable Child { get; }
     int Timeout { get; set; }
diff --git a/Rdmp.Core/CommandExecution/AliasAttribute.cs b/Rdmp.Core/CommandExecution/AliasAttribute.cs
index e203af73a3..2eb6358d51 100644
--- a/Rdmp.Core/CommandExecution/AliasAttribute.cs
+++ b/Rdmp.Core/CommandExecution/AliasAttribute.cs
@@ -13,11 +13,11 @@ namespace Rdmp.Core.CommandExecution;
 /// Defines an alternative name for <see cref="IAtomicCommand"/> that can be used
 /// e.g. "ls" instead of "List"
 /// </summary>
-[AttributeUsage(AttributeTargets.Class,AllowMultiple = true)]
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
 public class AliasAttribute : Attribute
 {
-
     public string Name { get; }
+
     public AliasAttribute(string name)
     {
         Name = name;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommandFactory.cs b/Rdmp.Core/CommandExecution/AtomicCommandFactory.cs
index aba833e02c..68aae9631d 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommandFactory.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommandFactory.cs
@@ -78,63 +78,73 @@ public AtomicCommandFactory(IBasicActivateItems activator)
     /// <returns></returns>
     public IEnumerable<IAtomicCommand> CreateCommands(object o)
     {
-        foreach(var cmd in _goto.GetCommands(o))
+        foreach (var cmd in _goto.GetCommands(o))
         {
             cmd.SuggestedCategory = GoTo;
             yield return cmd;
         }
 
-        if(_activator.CanActivate(o))
-            yield return new ExecuteCommandActivate(_activator,o);
+        if (_activator.CanActivate(o))
+            yield return new ExecuteCommandActivate(_activator, o);
 
-        if(Is(o, out ILoggedActivityRootObject root)){
-            yield return new ExecuteCommandViewLogs(_activator,root);
-        }
+        if (Is(o, out ILoggedActivityRootObject root)) yield return new ExecuteCommandViewLogs(_activator, root);
 
         if (Is(o, out IArgument a))
-        {
-            if(!_activator.IsWinForms)
+            if (!_activator.IsWinForms)
                 yield return new ExecuteCommandSetArgument(_activator, a);
-        }
-        if (Is(o,out Catalogue c))
+        if (Is(o, out Catalogue c))
         {
             var isApiCall = c.IsApiCall();
 
             if (!isApiCall)
             {
-                yield return new ExecuteCommandViewData(_activator, c,ViewType.TOP_100)
+                yield return new ExecuteCommandViewData(_activator, c, ViewType.TOP_100)
                 {
                     Weight = -99.2f,
                     OverrideCommandName = "Catalogue SQL/Data",
                     SuggestedCategory = View
                 };
 
-                yield return new ExecuteCommandAddNewCatalogueItem(_activator, c) { Weight = -99.9f, SuggestedCategory = Add, OverrideCommandName = "New Catalogue Item" };
-                yield return new ExecuteCommandAddNewAggregateGraph(_activator, c) { Weight = -98.9f, SuggestedCategory = Add, OverrideCommandName = "New Aggregate Graph" };
+                yield return new ExecuteCommandAddNewCatalogueItem(_activator, c)
+                    { Weight = -99.9f, SuggestedCategory = Add, OverrideCommandName = "New Catalogue Item" };
+                yield return new ExecuteCommandAddNewAggregateGraph(_activator, c)
+                {
+                    Weight = -98.9f, SuggestedCategory = Add, OverrideCommandName = "New Aggregate Graph"
+                };
             }
 
-            yield return new ExecuteCommandAddNewSupportingSqlTable(_activator, c) {Weight = -87.9f, SuggestedCategory = Add, OverrideCommandName = "New Supporting SQL Table" };
-            yield return new ExecuteCommandAddNewSupportingDocument(_activator, c) { Weight = -87.8f, SuggestedCategory = Add, OverrideCommandName = "New Supporting Document"};
+            yield return new ExecuteCommandAddNewSupportingSqlTable(_activator, c)
+            {
+                Weight = -87.9f, SuggestedCategory = Add, OverrideCommandName = "New Supporting SQL Table"
+            };
+            yield return new ExecuteCommandAddNewSupportingDocument(_activator, c)
+            {
+                Weight = -87.8f, SuggestedCategory = Add, OverrideCommandName = "New Supporting Document"
+            };
 
             if (!isApiCall)
             {
-                yield return new ExecuteCommandChangeExtractability(_activator, c) {
+                yield return new ExecuteCommandChangeExtractability(_activator, c)
+                {
                     Weight = -99.0010f,
-                    SuggestedCategory = Extraction };
+                    SuggestedCategory = Extraction
+                };
 
-                if(c.IsProjectSpecific(_activator.RepositoryLocator.DataExportRepository))
-                {
-                    yield return new ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(_activator, c){
-                        Weight = -99.0009f,SuggestedCategory = Extraction };
-                }
+                if (c.IsProjectSpecific(_activator.RepositoryLocator.DataExportRepository))
+                    yield return new ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(_activator, c)
+                    {
+                        Weight = -99.0009f, SuggestedCategory = Extraction
+                    };
                 else
-                {
-                    yield return new ExecuteCommandMakeCatalogueProjectSpecific(_activator, c, null) {
-                        Weight = -99.0009f, SuggestedCategory = Extraction };
-                }
+                    yield return new ExecuteCommandMakeCatalogueProjectSpecific(_activator, c, null)
+                    {
+                        Weight = -99.0009f, SuggestedCategory = Extraction
+                    };
 
-                yield return new ExecuteCommandSetExtractionIdentifier(_activator, c, null, null) {
-                    Weight = -99.0008f, SuggestedCategory = Extraction };
+                yield return new ExecuteCommandSetExtractionIdentifier(_activator, c, null, null)
+                {
+                    Weight = -99.0008f, SuggestedCategory = Extraction
+                };
 
                 yield return new ExecuteCommandSetExtractionPrimaryKeys(_activator, c, null, null)
                 {
@@ -143,33 +153,45 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
                 };
             }
 
-            yield return new ExecuteCommandExportObjectsToFile(_activator, new[] {c}) {
+            yield return new ExecuteCommandExportObjectsToFile(_activator, new[] { c })
+            {
                 Weight = -95.10f,
-                SuggestedCategory = Metadata };
-            yield return new ExecuteCommandExtractMetadata(_activator, new []{ c},null,null,null,false,null) {
+                SuggestedCategory = Metadata
+            };
+            yield return new ExecuteCommandExtractMetadata(_activator, new[] { c }, null, null, null, false, null)
+            {
                 OverrideCommandName = "Generate Metadata Report (with custom template)",
                 Weight = -99.058f,
-                SuggestedCategory = Metadata };
-        }
-        if(Is(o, out IHasFolder folderable))
-        {
-            yield return new ExecuteCommandPutIntoFolder(_activator, new[] { folderable },null);
+                SuggestedCategory = Metadata
+            };
         }
 
-        if(Is(o,out FolderNode<Catalogue> cf))
+        if (Is(o, out IHasFolder folderable))
+            yield return new ExecuteCommandPutIntoFolder(_activator, new[] { folderable }, null);
+
+        if (Is(o, out FolderNode<Catalogue> cf))
         {
-            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator) { 
-                OverrideCommandName = "New Catalogue From File...",TargetFolder = cf.FullName, SuggestedCategory = Add, Weight = -90.9f};
-            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator) {
+            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator)
+            {
+                OverrideCommandName = "New Catalogue From File...", TargetFolder = cf.FullName, SuggestedCategory = Add,
+                Weight = -90.9f
+            };
+            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator)
+            {
                 OverrideCommandName = "New Catalogue From Database...",
-                TargetFolder = cf.FullName, SuggestedCategory = Add, Weight = -90.8f };
-            yield return new ExecuteCommandCreateNewEmptyCatalogue(_activator) {
-                OverrideCommandName = "New Empty Catalogue (Advanced)",TargetFolder = cf.FullName, SuggestedCategory = Add, Weight = -90.7f };
+                TargetFolder = cf.FullName, SuggestedCategory = Add, Weight = -90.8f
+            };
+            yield return new ExecuteCommandCreateNewEmptyCatalogue(_activator)
+            {
+                OverrideCommandName = "New Empty Catalogue (Advanced)", TargetFolder = cf.FullName,
+                SuggestedCategory = Add, Weight = -90.7f
+            };
         }
 
-        if(Is(o, out ExtractionInformation ei))
+        if (Is(o, out ExtractionInformation ei))
         {
-            yield return new ExecuteCommandCreateNewFilter(_activator, new ExtractionFilterFactory(ei)) { OverrideCommandName = "Add New Filter"};
+            yield return new ExecuteCommandCreateNewFilter(_activator, new ExtractionFilterFactory(ei))
+                { OverrideCommandName = "Add New Filter" };
             yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, ei);
             yield return new ExecuteCommandChangeExtractionCategory(_activator, new[] { ei });
 
@@ -178,88 +200,97 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
             yield return new ExecuteCommandViewData(_activator, ViewType.Distribution, ei) { SuggestedCategory = View };
         }
 
-        if(Is(o,out ExtractionFilter cataFilter))
-        {
+        if (Is(o, out ExtractionFilter cataFilter))
             yield return new ExecuteCommandAddNewExtractionFilterParameterSet(_activator, cataFilter);
-        }
 
-        if (Is(o,out ExtractionFilterParameterSet efps))
+        if (Is(o, out ExtractionFilterParameterSet efps))
             yield return new ExecuteCommandAddMissingParameters(_activator, efps);
 
         if (Is(o, out ISqlParameter p) && p is IMapsDirectlyToDatabaseTable m)
         {
             yield return new ExecuteCommandSet(_activator, m, p.GetType().GetProperty(nameof(ISqlParameter.Value)));
 
-            if(p is not ExtractionFilterParameterSetValue)
-                yield return new ExecuteCommandSet(_activator, m, p.GetType().GetProperty(nameof(ISqlParameter.ParameterSQL)));
+            if (p is not ExtractionFilterParameterSetValue)
+                yield return new ExecuteCommandSet(_activator, m,
+                    p.GetType().GetProperty(nameof(ISqlParameter.ParameterSQL)));
         }
 
-        if(Is(o,out  CatalogueItem ci))
+        if (Is(o, out CatalogueItem ci))
         {
             yield return new ExecuteCommandCreateNewFilter(_activator, ci) { OverrideCommandName = "Add New Filter" };
             yield return new ExecuteCommandLinkCatalogueItemToColumnInfo(_activator, ci);
             yield return new ExecuteCommandMakeCatalogueItemExtractable(_activator, ci);
             yield return new ExecuteCommandChangeExtractionCategory(_activator, new[] { ci.ExtractionInformation });
-            yield return new ExecuteCommandImportCatalogueItemDescription(_activator, ci){SuggestedShortcut= "I",Ctrl=true };
+            yield return new ExecuteCommandImportCatalogueItemDescription(_activator, ci)
+                { SuggestedShortcut = "I", Ctrl = true };
 
             var ciExtractionInfo = ci.ExtractionInformation;
-            if(ciExtractionInfo != null)
+            if (ciExtractionInfo != null)
             {
-                yield return new ExecuteCommandViewData(_activator, ViewType.TOP_100, ciExtractionInfo) { SuggestedCategory = View };
-                yield return new ExecuteCommandViewData(_activator, ViewType.Aggregate, ciExtractionInfo) { SuggestedCategory = View };
-                yield return new ExecuteCommandViewData(_activator, ViewType.Distribution, ciExtractionInfo) { SuggestedCategory = View };
+                yield return new ExecuteCommandViewData(_activator, ViewType.TOP_100, ciExtractionInfo)
+                    { SuggestedCategory = View };
+                yield return new ExecuteCommandViewData(_activator, ViewType.Aggregate, ciExtractionInfo)
+                    { SuggestedCategory = View };
+                yield return new ExecuteCommandViewData(_activator, ViewType.Distribution, ciExtractionInfo)
+                    { SuggestedCategory = View };
             }
         }
 
-        if(Is(o, out SupportingSQLTable sqlTable))
-        {
-            yield return new ExecuteCommandRunSupportingSql(_activator,sqlTable,null);
-        }
+        if (Is(o, out SupportingSQLTable sqlTable))
+            yield return new ExecuteCommandRunSupportingSql(_activator, sqlTable, null);
 
-        if(Is(o,out AggregateConfiguration ac) && !ac.Catalogue.IsApiCall())
+        if (Is(o, out AggregateConfiguration ac) && !ac.Catalogue.IsApiCall())
         {
-            yield return new ExecuteCommandSet(_activator, ac, typeof(AggregateConfiguration).GetProperty(nameof(AggregateConfiguration.Description)));
+            yield return new ExecuteCommandSet(_activator, ac,
+                typeof(AggregateConfiguration).GetProperty(nameof(AggregateConfiguration.Description)));
 
-            yield return new ExecuteCommandCreateNewFilter(_activator, ac) { SuggestedCategory = Add, OverrideCommandName = "New Filter" };
-            yield return new ExecuteCommandCreateNewFilter(_activator, ac) { OfferCatalogueFilters=true, SuggestedCategory = Add, OverrideCommandName = "Existing Filter" };
+            yield return new ExecuteCommandCreateNewFilter(_activator, ac)
+                { SuggestedCategory = Add, OverrideCommandName = "New Filter" };
+            yield return new ExecuteCommandCreateNewFilter(_activator, ac)
+            {
+                OfferCatalogueFilters = true, SuggestedCategory = Add, OverrideCommandName = "Existing Filter"
+            };
 
-            yield return new ExecuteCommandAddNewFilterContainer(_activator,ac) { SuggestedCategory = Add, OverrideCommandName = "New Filter Container" };
-            yield return new ExecuteCommandImportFilterContainerTree(_activator, ac) { SuggestedCategory = Add, OverrideCommandName = "Existing Filter Container (copy of)" };
+            yield return new ExecuteCommandAddNewFilterContainer(_activator, ac)
+                { SuggestedCategory = Add, OverrideCommandName = "New Filter Container" };
+            yield return new ExecuteCommandImportFilterContainerTree(_activator, ac)
+                { SuggestedCategory = Add, OverrideCommandName = "Existing Filter Container (copy of)" };
 
-            yield return new ExecuteCommandAddParameter(_activator, ac, null, null, null) { SuggestedCategory = Add, OverrideCommandName = "New Catalogue Filter Parameter" };
+            yield return new ExecuteCommandAddParameter(_activator, ac, null, null, null)
+                { SuggestedCategory = Add, OverrideCommandName = "New Catalogue Filter Parameter" };
 
             yield return new ExecuteCommandViewData(_activator, ac) { OverrideCommandName = "View Sample SQL/Data" };
 
-            if(ac.IsCohortIdentificationAggregate)
+            if (ac.IsCohortIdentificationAggregate)
             {
                 yield return new ExecuteCommandSetAggregateDimension(_activator, ac);
-                    
-                if(_activator.RepositoryLocator.CatalogueRepository.GetExtendedProperties(ExtendedProperty.IsTemplate,ac)
-                   .Any(v=>v.Value.Equals("true")))
-                {
-                    yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { ac }, ExtendedProperty.IsTemplate, null)
+
+                if (_activator.RepositoryLocator.CatalogueRepository
+                    .GetExtendedProperties(ExtendedProperty.IsTemplate, ac)
+                    .Any(v => v.Value.Equals("true")))
+                    yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { ac },
+                        ExtendedProperty.IsTemplate, null)
                     {
                         OverrideCommandName = "Make Non Template"
                     };
-                }
                 else
-                {
-                    yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { ac }, ExtendedProperty.IsTemplate, "true")
+                    yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { ac },
+                        ExtendedProperty.IsTemplate, "true")
                     {
                         OverrideCommandName = "Make Reusable Template"
                     };
-                }
-                    
             }
 
             // graph options
             yield return new ExecuteCommandAddDimension(_activator, ac) { SuggestedCategory = Dimensions };
             yield return new ExecuteCommandSetPivot(_activator, ac) { SuggestedCategory = Dimensions };
-            yield return new ExecuteCommandSetPivot(_activator, ac, null) { OverrideCommandName = "Clear Pivot", SuggestedCategory = Dimensions };
+            yield return new ExecuteCommandSetPivot(_activator, ac, null)
+                { OverrideCommandName = "Clear Pivot", SuggestedCategory = Dimensions };
             yield return new ExecuteCommandSetAxis(_activator, ac) { SuggestedCategory = Dimensions };
-            yield return new ExecuteCommandSetAxis(_activator, ac, null) { OverrideCommandName = "Clear Axis", SuggestedCategory = Dimensions };
+            yield return new ExecuteCommandSetAxis(_activator, ac, null)
+                { OverrideCommandName = "Clear Axis", SuggestedCategory = Dimensions };
+
 
-                
             /*if(ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
             {
                 yield return new ExecuteCommandSetFilterTreeShortcut(_activator, ac, null) { OverrideCommandName = "Clear Filter Tree Shortcut" };
@@ -275,113 +306,121 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
 
             //yield return new ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration(_activator,ac);
         }
-            
-        if(Is(o,out  IContainer container))
+
+        if (Is(o, out IContainer container))
         {
             var targetOperation = container.Operation == FilterContainerOperation.AND ? "OR" : "AND";
-            yield return new ExecuteCommandSet(_activator,container,nameof(IContainer.Operation),targetOperation){OverrideCommandName = $"Set Operation to {targetOperation}" };               
+            yield return new ExecuteCommandSet(_activator, container, nameof(IContainer.Operation), targetOperation)
+                { OverrideCommandName = $"Set Operation to {targetOperation}" };
+
+            yield return new ExecuteCommandCreateNewFilter(_activator, container.GetFilterFactory(), container)
+                { SuggestedCategory = Add, OverrideCommandName = "New Filter" };
+            yield return new ExecuteCommandCreateNewFilter(_activator, container, null)
+            {
+                OfferCatalogueFilters = true, SuggestedCategory = Add, OverrideCommandName = "Existing Filter"
+            };
+            yield return new ExecuteCommandAddNewFilterContainer(_activator, container)
+                { SuggestedCategory = Add, OverrideCommandName = "Sub Container" };
 
-            yield return new ExecuteCommandCreateNewFilter(_activator,container.GetFilterFactory(),container) { SuggestedCategory = Add, OverrideCommandName = "New Filter" };
-            yield return new ExecuteCommandCreateNewFilter(_activator, container,null) {OfferCatalogueFilters = true, SuggestedCategory = Add, OverrideCommandName = "Existing Filter" };
-            yield return new ExecuteCommandAddNewFilterContainer(_activator,container){ SuggestedCategory = Add, OverrideCommandName = "Sub Container" };
-               
             yield return new ExecuteCommandViewFilterMatchData(_activator, container, ViewType.TOP_100);
             yield return new ExecuteCommandViewFilterMatchData(_activator, container, ViewType.Aggregate);
         }
-            
-        if(Is(o,out AggregatesNode an))
+
+        if (Is(o, out AggregatesNode an))
             yield return new ExecuteCommandAddNewAggregateGraph(_activator, an.Catalogue);
 
-        if(Is(o,out AllANOTablesNode _))
+        if (Is(o, out AllANOTablesNode _))
         {
             yield return new ExecuteCommandCreateNewANOTable(_activator);
-            
+
             yield return new ExecuteCommandCreateNewExternalDatabaseServer(_activator,
-                    new ANOStorePatcher(), PermissableDefaults.ANOStore) 
+                    new ANOStorePatcher(), PermissableDefaults.ANOStore)
                 { OverrideCommandName = "Create ANOStore Database" };
 
-            yield return new ExecuteCommandExportObjectsToFile(_activator,_activator.CoreChildProvider.AllANOTables);
+            yield return new ExecuteCommandExportObjectsToFile(_activator, _activator.CoreChildProvider.AllANOTables);
         }
 
-        if(Is(o,out AllCataloguesUsedByLoadMetadataNode aculmd))
-        {
+        if (Is(o, out AllCataloguesUsedByLoadMetadataNode aculmd))
             yield return new ExecuteCommandAssociateCatalogueWithLoadMetadata(_activator, aculmd.LoadMetadata);
-        }
 
-        if(Is(o,out AllDataAccessCredentialsNode _))
-        {
+        if (Is(o, out AllDataAccessCredentialsNode _))
             yield return new ExecuteCommandNewObject(_activator,
-                ()=>new DataAccessCredentials(_activator.RepositoryLocator.CatalogueRepository,
+                () => new DataAccessCredentials(_activator.RepositoryLocator.CatalogueRepository,
                     $"New Blank Credentials {Guid.NewGuid()}"))
             {
-                OverrideCommandName= "Add New Credentials"
+                OverrideCommandName = "Add New Credentials"
             };
-        }
 
-        if(Is(o,out DataAccessCredentialUsageNode usage))
+        if (Is(o, out DataAccessCredentialUsageNode usage))
         {
-            var existingUsages = _activator.RepositoryLocator.CatalogueRepository.TableInfoCredentialsManager.GetCredentialsIfExistsFor(usage.TableInfo);
+            var existingUsages =
+                _activator.RepositoryLocator.CatalogueRepository.TableInfoCredentialsManager.GetCredentialsIfExistsFor(
+                    usage.TableInfo);
 
             foreach (DataAccessContext context in Enum.GetValues(typeof(DataAccessContext)))
-                yield return new ExecuteCommandSetDataAccessContextForCredentials(_activator, usage, context, existingUsages){
-                    SuggestedCategory = SetUsageContext 
+                yield return new ExecuteCommandSetDataAccessContextForCredentials(_activator, usage, context,
+                    existingUsages)
+                {
+                    SuggestedCategory = SetUsageContext
                 };
         }
 
-        if(Is(o,out AllConnectionStringKeywordsNode _))
-        {
+        if (Is(o, out AllConnectionStringKeywordsNode _))
             yield return new ExecuteCommandNewObject(_activator,
-                ()=>new ConnectionStringKeyword(_activator.RepositoryLocator.CatalogueRepository,DatabaseType.MicrosoftSQLServer,"NewKeyword", "v"))
+                () => new ConnectionStringKeyword(_activator.RepositoryLocator.CatalogueRepository,
+                    DatabaseType.MicrosoftSQLServer, "NewKeyword", "v"))
             {
-                OverrideCommandName= "Add New Connection String Keyword"
+                OverrideCommandName = "Add New Connection String Keyword"
             };
-        }
 
-        if(Is(o,out AllExternalServersNode _))
+        if (Is(o, out AllExternalServersNode _))
         {
-            yield return new ExecuteCommandCreateNewExternalDatabaseServer(_activator, null,PermissableDefaults.None);
+            yield return new ExecuteCommandCreateNewExternalDatabaseServer(_activator, null, PermissableDefaults.None);
 
             var assemblyDictionary = new Dictionary<PermissableDefaults, IPatcher>
             {
-                {PermissableDefaults.DQE, new DataQualityEnginePatcher() },
-                {PermissableDefaults.WebServiceQueryCachingServer_ID, new QueryCachingPatcher()},
-                {PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher()},
-                {PermissableDefaults.IdentifierDumpServer_ID, new IdentifierDumpDatabasePatcher()},
-                {PermissableDefaults.ANOStore, new ANOStorePatcher()},
-                {PermissableDefaults.CohortIdentificationQueryCachingServer_ID, new QueryCachingPatcher()}
+                { PermissableDefaults.DQE, new DataQualityEnginePatcher() },
+                { PermissableDefaults.WebServiceQueryCachingServer_ID, new QueryCachingPatcher() },
+                { PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher() },
+                { PermissableDefaults.IdentifierDumpServer_ID, new IdentifierDumpDatabasePatcher() },
+                { PermissableDefaults.ANOStore, new ANOStorePatcher() },
+                { PermissableDefaults.CohortIdentificationQueryCachingServer_ID, new QueryCachingPatcher() }
             };
 
             foreach (var kvp in assemblyDictionary)
                 yield return new ExecuteCommandCreateNewExternalDatabaseServer(_activator, kvp.Value, kvp.Key);
         }
 
-        if(Is(o, out ExternalDatabaseServer eds))
+        if (Is(o, out ExternalDatabaseServer eds))
         {
-            if(eds.WasCreatedBy(new LoggingDatabasePatcher()))
+            if (eds.WasCreatedBy(new LoggingDatabasePatcher()))
             {
-                yield return new ExecuteCommandViewLogs(_activator,eds,new LogViewerFilter(LoggingTables.DataLoadRun));
-                yield return new ExecuteCommandViewLogs(_activator,eds,new LogViewerFilter(LoggingTables.FatalError));
-                yield return new ExecuteCommandViewLogs(_activator,eds,new LogViewerFilter(LoggingTables.ProgressLog));
-                yield return new ExecuteCommandViewLogs(_activator,eds,new LogViewerFilter(LoggingTables.TableLoadRun));
+                yield return new ExecuteCommandViewLogs(_activator, eds,
+                    new LogViewerFilter(LoggingTables.DataLoadRun));
+                yield return new ExecuteCommandViewLogs(_activator, eds, new LogViewerFilter(LoggingTables.FatalError));
+                yield return new ExecuteCommandViewLogs(_activator, eds,
+                    new LogViewerFilter(LoggingTables.ProgressLog));
+                yield return new ExecuteCommandViewLogs(_activator, eds,
+                    new LogViewerFilter(LoggingTables.TableLoadRun));
             }
 
-            yield return new ExecuteCommandQueryPlatformDatabase(_activator, eds) { OverrideCommandName = View};
+            yield return new ExecuteCommandQueryPlatformDatabase(_activator, eds) { OverrideCommandName = View };
         }
 
-        if(Is(o, out QueryCacheUsedByCohortIdentificationNode cicQueryCache))
-        {
+        if (Is(o, out QueryCacheUsedByCohortIdentificationNode cicQueryCache))
             yield return new ExecuteCommandClearQueryCache(_activator, cicQueryCache.User);
-        }
 
-        if(Is(o,out FolderNode<CohortIdentificationConfiguration> cicFolder))
-            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator) {
-                PromptToPickAProject=true,
+        if (Is(o, out FolderNode<CohortIdentificationConfiguration> cicFolder))
+            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
+            {
+                PromptToPickAProject = true,
                 Folder = cicFolder.FullName
             };
 
         if (Is(o, out IJoin j))
         {
-            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { (IMapsDirectlyToDatabaseTable)j }, ExtendedProperty.CustomJoinSql, null)
+            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { (IMapsDirectlyToDatabaseTable)j },
+                ExtendedProperty.CustomJoinSql, null)
             {
                 OverrideCommandName = "Set CustomJoinSql",
                 PromptForValue = true,
@@ -389,7 +428,8 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
                 SuggestedCategory = "Custom Join"
             };
 
-            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { (IMapsDirectlyToDatabaseTable)j }, ExtendedProperty.CustomJoinSql, null)
+            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { (IMapsDirectlyToDatabaseTable)j },
+                ExtendedProperty.CustomJoinSql, null)
             {
                 OverrideCommandName = "Clear CustomJoinSql",
                 SuggestedCategory = "Custom Join"
@@ -397,59 +437,55 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
         }
 
         CohortIdentificationConfiguration cic = null;
-        if (Is(o, out ProjectCohortIdentificationConfigurationAssociation pcic) || Is(o,out cic))
+        if (Is(o, out ProjectCohortIdentificationConfigurationAssociation pcic) || Is(o, out cic))
         {
-            if (pcic != null)
-            {
-                cic = pcic.CohortIdentificationConfiguration;
-            }
+            if (pcic != null) cic = pcic.CohortIdentificationConfiguration;
 
-            var commit = new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
-            {
-                OverrideCommandName = "Commit Cohort",
-                Weight = -99.8f 
-            }.SetTarget(cic);
-            if (pcic != null)
-            {
-                commit.SetTarget((DatabaseEntity)pcic.Project);
-            }
+            var commit =
+                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
+                {
+                    OverrideCommandName = "Commit Cohort",
+                    Weight = -99.8f
+                }.SetTarget(cic);
+            if (pcic != null) commit.SetTarget((DatabaseEntity)pcic.Project);
 
             yield return commit;
 
-            yield return new ExecuteCommandViewData(_activator, cic,ViewType.All,null, true) { Weight = -99.7f};
-            yield return new ExecuteCommandViewData(_activator, cic,ViewType.All,null, false) { Weight = -99.6f };
+            yield return new ExecuteCommandViewData(_activator, cic, ViewType.All, null, true) { Weight = -99.7f };
+            yield return new ExecuteCommandViewData(_activator, cic, ViewType.All, null, false) { Weight = -99.6f };
 
-            yield return new ExecuteCommandFreezeCohortIdentificationConfiguration(_activator, cic, !cic.Frozen) { Weight = -50.5f };
+            yield return new ExecuteCommandFreezeCohortIdentificationConfiguration(_activator, cic, !cic.Frozen)
+                { Weight = -50.5f };
 
-            var clone = new ExecuteCommandCloneCohortIdentificationConfiguration(_activator) { Weight = -50.4f, OverrideCommandName = "Clone" }.SetTarget(cic);
-            if (pcic != null)
-            {
-                clone.SetTarget((DatabaseEntity)pcic.Project);
-            }
+            var clone = new ExecuteCommandCloneCohortIdentificationConfiguration(_activator)
+                { Weight = -50.4f, OverrideCommandName = "Clone" }.SetTarget(cic);
+            if (pcic != null) clone.SetTarget((DatabaseEntity)pcic.Project);
             yield return clone;
             //associate with project
-            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator) { Weight = -50.3f, OverrideCommandName = "Associate with Project" }.SetTarget(cic);
-                
-            yield return new ExecuteCommandSetQueryCachingDatabase(_activator, cic) { Weight = -50.4f, OverrideCommandName = "Change Query Cache" };
+            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator)
+                { Weight = -50.3f, OverrideCommandName = "Associate with Project" }.SetTarget(cic);
 
+            yield return new ExecuteCommandSetQueryCachingDatabase(_activator, cic)
+                { Weight = -50.4f, OverrideCommandName = "Change Query Cache" };
         }
 
-        if(Is(o,out AllGovernanceNode _))
+        if (Is(o, out AllGovernanceNode _))
         {
-            yield return new ExecuteCommandCreateNewGovernancePeriod(_activator) { OverrideCommandName = "Add New Governance Period" };
-            yield return new ExecuteCommandAddNewGovernanceDocument(_activator, null) { OverrideCommandName = "Add New Governance Document" };
+            yield return new ExecuteCommandCreateNewGovernancePeriod(_activator)
+                { OverrideCommandName = "Add New Governance Period" };
+            yield return new ExecuteCommandAddNewGovernanceDocument(_activator, null)
+                { OverrideCommandName = "Add New Governance Document" };
         }
 
-        if (Is(o,out FolderNode<LoadMetadata> lmdFolder))
+        if (Is(o, out FolderNode<LoadMetadata> lmdFolder))
         {
-            yield return new ExecuteCommandCreateNewLoadMetadata(_activator) { Folder = lmdFolder.FullName};
-            yield return new ExecuteCommandImportShareDefinitionList(_activator){OverrideCommandName = "Import Load"};
+            yield return new ExecuteCommandCreateNewLoadMetadata(_activator) { Folder = lmdFolder.FullName };
+            yield return new ExecuteCommandImportShareDefinitionList(_activator)
+                { OverrideCommandName = "Import Load" };
         }
 
-        if(Is(o,out LoadMetadata lmd))
+        if (Is(o, out LoadMetadata lmd))
         {
-
-
             yield return new ExecuteCommandExportObjectsToFile(_activator, new IMapsDirectlyToDatabaseTable[] { lmd });
 
             yield return new ExecuteCommandOverrideRawServer(_activator, lmd);
@@ -458,9 +494,11 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
 
             yield return new ExecuteCommandSetGlobalDleIgnorePattern(_activator) { SuggestedCategory = Advanced };
             yield return new ExecuteCommandSetIgnoredColumns(_activator, lmd) { SuggestedCategory = Advanced };
-            yield return new ExecuteCommandSetIgnoredColumns(_activator, lmd, null) { OverrideCommandName = "Clear Ignored Columns", SuggestedCategory = Advanced };
+            yield return new ExecuteCommandSetIgnoredColumns(_activator, lmd, null)
+                { OverrideCommandName = "Clear Ignored Columns", SuggestedCategory = Advanced };
 
-            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { lmd }, ExtendedProperty.PersistentRaw, null)
+            yield return new ExecuteCommandSetExtendedProperty(_activator, new[] { lmd },
+                ExtendedProperty.PersistentRaw, null)
             {
                 OverrideCommandName = "Persistent RAW",
                 PromptForValue = true,
@@ -468,7 +506,8 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
                 SuggestedCategory = Advanced
             };
 
-            yield return new ExecuteCommandSet(_activator, lmd, typeof(LoadMetadata).GetProperty(nameof(LoadMetadata.IgnoreTrigger)))
+            yield return new ExecuteCommandSet(_activator, lmd,
+                typeof(LoadMetadata).GetProperty(nameof(LoadMetadata.IgnoreTrigger)))
             {
                 OverrideCommandName = $"Ignore Trigger (Current value:{lmd.IgnoreTrigger})",
                 SuggestedCategory = Advanced
@@ -477,74 +516,73 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
 
 
         if (Is(o, out LoadMetadataScheduleNode scheduleNode))
-        {
             yield return new ExecuteCommandCreateNewLoadProgress(_activator, scheduleNode.LoadMetadata);
-        }
 
-        if(Is(o, out LoadProgress loadProgress))
-        {
+        if (Is(o, out LoadProgress loadProgress))
             yield return new ExecuteCommandCreateNewCacheProgress(_activator, loadProgress);
-        }
 
-        if (Is(o,out LoadStageNode lsn))
+        if (Is(o, out LoadStageNode lsn))
         {
-            yield return new ExecuteCommandCreateNewClassBasedProcessTask(_activator,lsn.LoadMetadata,lsn.LoadStage,null);
-            yield return new ExecuteCommandCreateNewFileBasedProcessTask(_activator,ProcessTaskType.SQLFile,lsn.LoadMetadata,lsn.LoadStage);
-            yield return new ExecuteCommandCreateNewFileBasedProcessTask(_activator,ProcessTaskType.Executable,lsn.LoadMetadata,lsn.LoadStage);
+            yield return new ExecuteCommandCreateNewClassBasedProcessTask(_activator, lsn.LoadMetadata, lsn.LoadStage,
+                null);
+            yield return new ExecuteCommandCreateNewFileBasedProcessTask(_activator, ProcessTaskType.SQLFile,
+                lsn.LoadMetadata, lsn.LoadStage);
+            yield return new ExecuteCommandCreateNewFileBasedProcessTask(_activator, ProcessTaskType.Executable,
+                lsn.LoadMetadata, lsn.LoadStage);
         }
 
-        if(Is(o, out LoadDirectoryNode ldn))
+        if (Is(o, out LoadDirectoryNode ldn))
         {
-            yield return new ExecuteCommandSet(_activator,ldn.LoadMetadata,typeof(LoadMetadata).GetProperty(nameof(LoadMetadata.LocationOfFlatFiles)));
+            yield return new ExecuteCommandSet(_activator, ldn.LoadMetadata,
+                typeof(LoadMetadata).GetProperty(nameof(LoadMetadata.LocationOfFlatFiles)));
             yield return new ExecuteCommandCreateNewDataLoadDirectory(_activator, ldn.LoadMetadata, null);
         }
 
-        if(Is(o,out AllObjectImportsNode _))
+        if (Is(o, out AllObjectImportsNode _))
             yield return new ExecuteCommandImportShareDefinitionList(_activator);
 
-        if(Is(o,out AllPermissionWindowsNode _))
+        if (Is(o, out AllPermissionWindowsNode _))
             yield return new ExecuteCommandCreateNewPermissionWindow(_activator);
 
-        if(Is(o,out AllPluginsNode _))
+        if (Is(o, out AllPluginsNode _))
         {
             yield return new ExecuteCommandAddPlugins(_activator);
             yield return new ExecuteCommandPrunePlugin(_activator);
             yield return new ExecuteCommandExportPlugins(_activator);
         }
 
-        if(Is(o,out AllRDMPRemotesNode _))
+        if (Is(o, out AllRDMPRemotesNode _))
             yield return new ExecuteCommandCreateNewRemoteRDMP(_activator);
 
-        if(Is(o,out AllServersNode _))
+        if (Is(o, out AllServersNode _))
         {
-            yield return new ExecuteCommandImportTableInfo(_activator,null,false);
+            yield return new ExecuteCommandImportTableInfo(_activator, null, false);
             yield return new ExecuteCommandBulkImportTableInfos(_activator);
         }
 
-        if(Is(o, out IFilter filter))
+        if (Is(o, out IFilter filter))
         {
-            if(filter.GetAllParameters().Any())
-            {
+            if (filter.GetAllParameters().Any())
                 yield return new ExecuteCommandSet(_activator,
-                        () => _activator.SelectOne("Select Parameter to change Value for...", filter.GetAllParameters().OfType<IMapsDirectlyToDatabaseTable>().ToArray()),
+                        () => _activator.SelectOne("Select Parameter to change Value for...",
+                            filter.GetAllParameters().OfType<IMapsDirectlyToDatabaseTable>().ToArray()),
                         typeof(ISqlParameter).GetProperty(nameof(ISqlParameter.Value))
-                    ) 
+                    )
                     { OverrideCommandName = "Set Parameter Value(s)", Weight = -10 };
-            }
             yield return new ExecuteCommandViewFilterMatchData(_activator, filter, ViewType.TOP_100);
             yield return new ExecuteCommandViewFilterMatchData(_activator, filter, ViewType.Aggregate);
         }
 
 
-        if(Is(o,out TableInfo ti))
+        if (Is(o, out TableInfo ti))
         {
             yield return new ExecuteCommandViewData(_activator, ti);
-                
+
             yield return new ExecuteCommandImportTableInfo(_activator, null, false) { SuggestedCategory = New };
             yield return new ExecuteCommandCreateNewCatalogueFromTableInfo(_activator, ti) { SuggestedCategory = New };
-                                    
-            yield return new ExecuteCommandUseCredentialsToAccessTableInfoData(_activator,null,ti);
-            
+
+            yield return new ExecuteCommandUseCredentialsToAccessTableInfoData(_activator, null, ti);
+
             yield return new ExecuteCommandScriptTable(_activator, ti);
 
             IAtomicCommand[] alterCommands = null;
@@ -552,90 +590,103 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
             {
                 alterCommands = new IAtomicCommand[]
                 {
-                    new ExecuteCommandAlterTableName(_activator,ti){SuggestedCategory = Alter },
-                    new ExecuteCommandAlterTableCreatePrimaryKey(_activator,ti){SuggestedCategory = Alter },
-                    new ExecuteCommandAlterTableAddArchiveTrigger(_activator,ti){SuggestedCategory = Alter },
-                    new ExecuteCommandAlterTableMakeDistinct(_activator,ti){SuggestedCategory = Alter }
+                    new ExecuteCommandAlterTableName(_activator, ti) { SuggestedCategory = Alter },
+                    new ExecuteCommandAlterTableCreatePrimaryKey(_activator, ti) { SuggestedCategory = Alter },
+                    new ExecuteCommandAlterTableAddArchiveTrigger(_activator, ti) { SuggestedCategory = Alter },
+                    new ExecuteCommandAlterTableMakeDistinct(_activator, ti) { SuggestedCategory = Alter }
                 };
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                _activator.GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs("Failed to build Alter commands",CheckResult.Fail,ex));
+                _activator.GlobalErrorCheckNotifier.OnCheckPerformed(
+                    new CheckEventArgs("Failed to build Alter commands", CheckResult.Fail, ex));
             }
-                
-            if(alterCommands  != null)
-                foreach (var item in alterCommands )
+
+            if (alterCommands != null)
+                foreach (var item in alterCommands)
                     yield return item;
-            
-            yield return new ExecuteCommandSyncTableInfo(_activator,ti,false,false);
-            yield return new ExecuteCommandSyncTableInfo(_activator,ti,true,false);
-            yield return new ExecuteCommandNewObject(_activator,()=>new ColumnInfo(_activator.RepositoryLocator.CatalogueRepository, Guid.NewGuid().ToString(), "fish", ti)){OverrideCommandName = "Add New ColumnInfo" };
+
+            yield return new ExecuteCommandSyncTableInfo(_activator, ti, false, false);
+            yield return new ExecuteCommandSyncTableInfo(_activator, ti, true, false);
+            yield return new ExecuteCommandNewObject(_activator,
+                () => new ColumnInfo(_activator.RepositoryLocator.CatalogueRepository, Guid.NewGuid().ToString(),
+                    "fish", ti)) { OverrideCommandName = "Add New ColumnInfo" };
         }
-                
-        if(Is(o,out ColumnInfo colInfo))
+
+        if (Is(o, out ColumnInfo colInfo))
         {
             yield return new ExecuteCommandViewData(_activator, ViewType.TOP_100, colInfo) { SuggestedCategory = View };
-            yield return new ExecuteCommandViewData(_activator, ViewType.Aggregate, colInfo) { SuggestedCategory = View };
-            yield return new ExecuteCommandViewData(_activator, ViewType.Distribution, colInfo) { SuggestedCategory = View };
+            yield return new ExecuteCommandViewData(_activator, ViewType.Aggregate, colInfo)
+                { SuggestedCategory = View };
+            yield return new ExecuteCommandViewData(_activator, ViewType.Distribution, colInfo)
+                { SuggestedCategory = View };
 
             yield return new ExecuteCommandAlterColumnType(_activator, colInfo) { SuggestedCategory = Alter };
 
-            yield return new ExecuteCommandSet(_activator, colInfo, typeof(ColumnInfo).GetProperty(nameof(ColumnInfo.IgnoreInLoads))) { OverrideCommandName = $"Ignore In Loads ({colInfo.IgnoreInLoads})" };
+            yield return new ExecuteCommandSet(_activator, colInfo,
+                    typeof(ColumnInfo).GetProperty(nameof(ColumnInfo.IgnoreInLoads)))
+                { OverrideCommandName = $"Ignore In Loads ({colInfo.IgnoreInLoads})" };
         }
 
-        if(Is(o, out AllStandardRegexesNode _))
+        if (Is(o, out AllStandardRegexesNode _))
             yield return new ExecuteCommandCreateNewStandardRegex(_activator);
 
-        if(Is(o, out ArbitraryFolderNode f))
-            if(f.CommandGetter != null)
-                foreach(var cmd in f.CommandGetter())
+        if (Is(o, out ArbitraryFolderNode f))
+            if (f.CommandGetter != null)
+                foreach (var cmd in f.CommandGetter())
                     yield return cmd;
 
-        if(Is(o, out CacheProgress cp))
-            yield return new ExecuteCommandSetPermissionWindow(_activator,cp);
+        if (Is(o, out CacheProgress cp))
+            yield return new ExecuteCommandSetPermissionWindow(_activator, cp);
 
-        if(Is(o, out SelectedDataSets sds))
+        if (Is(o, out SelectedDataSets sds))
         {
-            yield return new ExecuteCommandSetExtractionIdentifier(_activator, sds.GetCatalogue(), sds.ExtractionConfiguration, null)
-                { Weight = -99.8f};
+            yield return new ExecuteCommandSetExtractionIdentifier(_activator, sds.GetCatalogue(),
+                    sds.ExtractionConfiguration, null)
+                { Weight = -99.8f };
 
             ////////////// Add submenu ///////////////
 
-            yield return new ExecuteCommandCreateNewFilter(_activator,sds)
-                { OverrideCommandName = "New Filter", SuggestedCategory = Add};
             yield return new ExecuteCommandCreateNewFilter(_activator, sds)
-                { OfferCatalogueFilters = true, OverrideCommandName = "Existing Filter (copy of)", SuggestedCategory = Add};
+                { OverrideCommandName = "New Filter", SuggestedCategory = Add };
+            yield return new ExecuteCommandCreateNewFilter(_activator, sds)
+            {
+                OfferCatalogueFilters = true, OverrideCommandName = "Existing Filter (copy of)", SuggestedCategory = Add
+            };
 
-            yield return new ExecuteCommandAddNewFilterContainer(_activator,sds)
-                {OverrideCommandName = "New Filter Container", SuggestedCategory = Add};
-            yield return new ExecuteCommandImportFilterContainerTree(_activator,sds)
-                { OverrideCommandName = "Existing Filter Container (copy of)", SuggestedCategory = Add};
+            yield return new ExecuteCommandAddNewFilterContainer(_activator, sds)
+                { OverrideCommandName = "New Filter Container", SuggestedCategory = Add };
+            yield return new ExecuteCommandImportFilterContainerTree(_activator, sds)
+                { OverrideCommandName = "Existing Filter Container (copy of)", SuggestedCategory = Add };
 
 
-            yield return new ExecuteCommandViewExtractionSql(_activator,sds);                
+            yield return new ExecuteCommandViewExtractionSql(_activator, sds);
             yield return new ExecuteCommandAddExtractionProgress(_activator, sds)
-                {  SuggestedCategory = Batching, Weight = 1.1f };
+                { SuggestedCategory = Batching, Weight = 1.1f };
             yield return new ExecuteCommandResetExtractionProgress(_activator, sds)
                 { SuggestedCategory = Batching, Weight = 1.2f };
         }
 
-        if(Is(o,out ExtractionProgress progress))
-        {
+        if (Is(o, out ExtractionProgress progress))
             yield return new ExecuteCommandResetExtractionProgress(_activator, progress);
-        }
-            
-        if(Is(o, out ExtractionConfiguration ec))
-        {
 
+        if (Is(o, out ExtractionConfiguration ec))
+        {
             ///////////////////Add//////////////
 
-            yield return new ExecuteCommandChooseCohort(_activator, ec) { Weight = -99.8f,SuggestedCategory = Add,OverrideCommandName = "Existing Cohort"};
-            yield return new ExecuteCommandAddDatasetsToConfiguration(_activator, ec) { Weight = -99.7f, SuggestedCategory = Add, OverrideCommandName = "Existing Datasets" };
-            yield return new ExecuteCommandAddPackageToConfiguration(_activator, ec) { Weight = -99.6f, SuggestedCategory = Add, OverrideCommandName = "Existing Package" };
-            yield return new ExecuteCommandAddParameter(_activator, ec, null,null,null) { Weight = -99.5f, SuggestedCategory = Add, OverrideCommandName = "New Extraction Filter Parameter" };
+            yield return new ExecuteCommandChooseCohort(_activator, ec)
+                { Weight = -99.8f, SuggestedCategory = Add, OverrideCommandName = "Existing Cohort" };
+            yield return new ExecuteCommandAddDatasetsToConfiguration(_activator, ec)
+                { Weight = -99.7f, SuggestedCategory = Add, OverrideCommandName = "Existing Datasets" };
+            yield return new ExecuteCommandAddPackageToConfiguration(_activator, ec)
+                { Weight = -99.6f, SuggestedCategory = Add, OverrideCommandName = "Existing Package" };
+            yield return new ExecuteCommandAddParameter(_activator, ec, null, null, null)
+            {
+                Weight = -99.5f, SuggestedCategory = Add, OverrideCommandName = "New Extraction Filter Parameter"
+            };
 
-                
-            yield return new ExecuteCommandGenerateReleaseDocument(_activator, ec) { Weight = -99.4f};
+
+            yield return new ExecuteCommandGenerateReleaseDocument(_activator, ec) { Weight = -99.4f };
 
             if (ec.IsReleased)
                 yield return new ExecuteCommandUnfreezeExtractionConfiguration(_activator, ec) { Weight = 1.2f };
@@ -647,87 +698,140 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
             yield return new ExecuteCommandResetExtractionProgress(_activator, ec, null) { Weight = 1.4f };
         }
 
-        if(Is(o, out Project proj))
+        if (Is(o, out Project proj))
         {
-            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator) { OverrideCommandName = "New Cohort Builder Query",SuggestedCategory = Add, Weight = -5f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null) { OverrideCommandName = "New Cohort From Cohort Builder Query", SuggestedCategory = Add, Weight = -4.9f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null) { OverrideCommandName = "New Cohort From File", SuggestedCategory = Add, Weight = -4.8f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null) { OverrideCommandName = "New Cohort From Catalogue", SuggestedCategory = Add, Weight = -4.7f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewCohortFromTable(_activator,null) { OverrideCommandName = "New Cohort From Table", SuggestedCategory = Add, Weight = -4.6f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewExtractionConfigurationForProject(_activator,proj) { OverrideCommandName = "New Extraction Configuration", SuggestedCategory = Add, Weight = -2f };
-            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator) { OverrideCommandName = "New Project Specific Catalogue From File...", SuggestedCategory = Add, Weight = -1.9f }.SetTarget(proj);
-            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator) { OverrideCommandName = "New Project Specific Catalogue From Database...", SuggestedCategory = Add, Weight = -1.8f }.SetTarget(proj);
+            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
+                    { OverrideCommandName = "New Cohort Builder Query", SuggestedCategory = Add, Weight = -5f }
+                .SetTarget(proj);
+            yield return
+                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
+                {
+                    OverrideCommandName = "New Cohort From Cohort Builder Query", SuggestedCategory = Add,
+                    Weight = -4.9f
+                }.SetTarget(proj);
+            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null)
+                    { OverrideCommandName = "New Cohort From File", SuggestedCategory = Add, Weight = -4.8f }
+                .SetTarget(proj);
+            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null)
+                    { OverrideCommandName = "New Cohort From Catalogue", SuggestedCategory = Add, Weight = -4.7f }
+                .SetTarget(proj);
+            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null)
+                    { OverrideCommandName = "New Cohort From Table", SuggestedCategory = Add, Weight = -4.6f }
+                .SetTarget(proj);
+            yield return new ExecuteCommandCreateNewExtractionConfigurationForProject(_activator, proj)
+            {
+                OverrideCommandName = "New Extraction Configuration", SuggestedCategory = Add, Weight = -2f
+            };
+            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator)
+            {
+                OverrideCommandName = "New Project Specific Catalogue From File...", SuggestedCategory = Add,
+                Weight = -1.9f
+            }.SetTarget(proj);
+            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator)
+            {
+                OverrideCommandName = "New Project Specific Catalogue From Database...", SuggestedCategory = Add,
+                Weight = -1.8f
+            }.SetTarget(proj);
         }
 
         if (Is(o, out ProjectCataloguesNode pcn))
         {
-            yield return new ExecuteCommandMakeCatalogueProjectSpecific(_activator) { OverrideCommandName = "Add Existing Catalogue", Weight = -10}.SetTarget(pcn.Project);
-            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator) { OverrideCommandName = "Add New Catalogue From File", Weight = -9.5f}.SetTarget(pcn.Project);
-            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator) { OverrideCommandName = "Add New Catalogue From Existing Data Table", Weight = -9.4f }.SetTarget(pcn.Project);
+            yield return new ExecuteCommandMakeCatalogueProjectSpecific(_activator)
+                { OverrideCommandName = "Add Existing Catalogue", Weight = -10 }.SetTarget(pcn.Project);
+            yield return new ExecuteCommandCreateNewCatalogueByImportingFile(_activator)
+                { OverrideCommandName = "Add New Catalogue From File", Weight = -9.5f }.SetTarget(pcn.Project);
+            yield return new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(_activator)
+                    { OverrideCommandName = "Add New Catalogue From Existing Data Table", Weight = -9.4f }
+                .SetTarget(pcn.Project);
         }
 
         if (Is(o, out ProjectCohortsNode projCohorts))
         {
-            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator) { OverrideCommandName = "Add New Cohort Builder Query", Weight = -5.1f }.SetTarget(projCohorts.Project);
-            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator) { OverrideCommandName = "Add Existing Cohort Builder Query (link to)", Weight = -5f }.SetTarget(projCohorts.Project);
-            yield return new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null) { OverrideCommandName = "Add New Cohort From Cohort Builder Query", Weight = -4.9f }.SetTarget(projCohorts.Project);
-            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null) { OverrideCommandName = "Add New Cohort From File", Weight = -4.8f }.SetTarget(projCohorts.Project);
-            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null) { OverrideCommandName = "Add New Cohort From Catalogue", Weight = -4.7f }.SetTarget(projCohorts.Project);
-            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null) { OverrideCommandName = "Add New Cohort From Table", Weight = -4.6f }.SetTarget(projCohorts.Project);
+            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
+                { OverrideCommandName = "Add New Cohort Builder Query", Weight = -5.1f }.SetTarget(projCohorts.Project);
+            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator)
+                    { OverrideCommandName = "Add Existing Cohort Builder Query (link to)", Weight = -5f }
+                .SetTarget(projCohorts.Project);
+            yield return
+                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
+                        { OverrideCommandName = "Add New Cohort From Cohort Builder Query", Weight = -4.9f }
+                    .SetTarget(projCohorts.Project);
+            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null)
+                { OverrideCommandName = "Add New Cohort From File", Weight = -4.8f }.SetTarget(projCohorts.Project);
+            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null)
+                    { OverrideCommandName = "Add New Cohort From Catalogue", Weight = -4.7f }
+                .SetTarget(projCohorts.Project);
+            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null)
+                { OverrideCommandName = "Add New Cohort From Table", Weight = -4.6f }.SetTarget(projCohorts.Project);
         }
 
         if (Is(o, out ProjectCohortIdentificationConfigurationAssociationsNode pccan))
         {
-            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator) { OverrideCommandName = "Add New Cohort Builder Query", Weight = -5.1f }.SetTarget(pccan.Project);
-            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator) { OverrideCommandName = "Add Existing Cohort Builder Query (link to)", Weight = -5f }.SetTarget(pccan.Project);
+            yield return new ExecuteCommandCreateNewCohortIdentificationConfiguration(_activator)
+                { OverrideCommandName = "Add New Cohort Builder Query", Weight = -5.1f }.SetTarget(pccan.Project);
+            yield return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(_activator)
+                    { OverrideCommandName = "Add Existing Cohort Builder Query (link to)", Weight = -5f }
+                .SetTarget(pccan.Project);
         }
 
-        if(Is(o, out ProjectSavedCohortsNode savedCohortsNode ))
+        if (Is(o, out ProjectSavedCohortsNode savedCohortsNode))
         {
-            yield return new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null) { OverrideCommandName = "Add New Cohort From Cohort Builder Query", Weight = -4.9f }.SetTarget(savedCohortsNode.Project);
-            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null) { OverrideCommandName = "Add New Cohort From File", Weight = -4.8f }.SetTarget(savedCohortsNode.Project);
-            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null) { OverrideCommandName = "Add New Cohort From Catalogue", Weight = -4.7f }.SetTarget(savedCohortsNode.Project);
-            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null) { OverrideCommandName = "Add New Cohort From Table", Weight = -4.6f }.SetTarget(savedCohortsNode.Project);
-            yield return new ExecuteCommandImportAlreadyExistingCohort(_activator,null,savedCohortsNode.Project);
+            yield return
+                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
+                        { OverrideCommandName = "Add New Cohort From Cohort Builder Query", Weight = -4.9f }
+                    .SetTarget(savedCohortsNode.Project);
+            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null)
+                    { OverrideCommandName = "Add New Cohort From File", Weight = -4.8f }
+                .SetTarget(savedCohortsNode.Project);
+            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null)
+                    { OverrideCommandName = "Add New Cohort From Catalogue", Weight = -4.7f }
+                .SetTarget(savedCohortsNode.Project);
+            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null)
+                    { OverrideCommandName = "Add New Cohort From Table", Weight = -4.6f }
+                .SetTarget(savedCohortsNode.Project);
+            yield return new ExecuteCommandImportAlreadyExistingCohort(_activator, null, savedCohortsNode.Project);
         }
 
-        if(Is(o, out ExtractionConfigurationsNode ecn))
-        {
-            yield return new ExecuteCommandCreateNewExtractionConfigurationForProject(_activator, ecn.Project) { OverrideCommandName = "Add New Extraction Configuration", Weight = -4.7f };
-        }
+        if (Is(o, out ExtractionConfigurationsNode ecn))
+            yield return new ExecuteCommandCreateNewExtractionConfigurationForProject(_activator, ecn.Project)
+                { OverrideCommandName = "Add New Extraction Configuration", Weight = -4.7f };
 
-        if (Is(o,out ExternalCohortTable ect))
+        if (Is(o, out ExternalCohortTable ect))
         {
             var ectProj = o is CohortSourceUsedByProjectNode csbpn ? csbpn.User : null;
 
-            yield return new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator, null)
-                    { OverrideCommandName = "New Cohort From Cohort Builder Query", Weight = -4.9f, SuggestedCategory = "Add" }
+            yield return new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(_activator,
+                    null)
+                {
+                    OverrideCommandName = "New Cohort From Cohort Builder Query", Weight = -4.9f,
+                    SuggestedCategory = "Add"
+                }
                 .SetTarget(ect)
                 .SetTarget(ectProj);
-            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null) 
+            yield return new ExecuteCommandCreateNewCohortFromFile(_activator, null)
                     { OverrideCommandName = "New Cohort From File", Weight = -4.8f, SuggestedCategory = "Add" }
                 .SetTarget(ect)
                 .SetTarget(ectProj);
-            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null) 
+            yield return new ExecuteCommandCreateNewCohortFromCatalogue(_activator, (Catalogue)null)
                     { OverrideCommandName = "New Cohort From Catalogue", Weight = -4.7f, SuggestedCategory = "Add" }
                 .SetTarget(ect)
                 .SetTarget(ectProj);
 
-            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null) 
-                    { OverrideCommandName = "New Cohort From Table", Weight = -4.6f , SuggestedCategory = Add}
+            yield return new ExecuteCommandCreateNewCohortFromTable(_activator, null)
+                    { OverrideCommandName = "New Cohort From Table", Weight = -4.6f, SuggestedCategory = Add }
                 .SetTarget(ect)
                 .SetTarget(ectProj);
 
-            yield return new ExecuteCommandImportAlreadyExistingCohort(_activator, ect, null) 
-                { OverrideCommandName = "Existing Cohort", Weight = -4.6f,SuggestedCategory = "Add" };
+            yield return new ExecuteCommandImportAlreadyExistingCohort(_activator, ect, null)
+                { OverrideCommandName = "Existing Cohort", Weight = -4.6f, SuggestedCategory = "Add" };
 
-            yield return new ExecuteCommandRefreshBrokenCohorts(_activator, ect) { Weight = 1};
+            yield return new ExecuteCommandRefreshBrokenCohorts(_activator, ect) { Weight = 1 };
         }
 
-        if(Is(o,out ExtractableCohort cohort))
+        if (Is(o, out ExtractableCohort cohort))
         {
-            yield return new ExecuteCommandViewData(_activator, cohort,ViewType.TOP_100) { Weight = -99.9f};
-            yield return new ExecuteCommandViewData(_activator, cohort,ViewType.All) 
+            yield return new ExecuteCommandViewData(_activator, cohort, ViewType.TOP_100) { Weight = -99.9f };
+            yield return new ExecuteCommandViewData(_activator, cohort, ViewType.All)
             {
                 AskForFile = true,
                 OverrideCommandName = "Save Cohort To File...",
@@ -760,109 +864,103 @@ public IEnumerable<IAtomicCommand> CreateCommands(object o)
 
         if (Is(o, out CohortAggregateContainer cohortAggregateContainer))
         {
-            yield return new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(_activator, cohortAggregateContainer,null,null) { SuggestedCategory = Add, OverrideCommandName = "Catalogue" };
-            yield return new ExecuteCommandAddCohortSubContainer(_activator, cohortAggregateContainer) { SuggestedCategory = Add,  OverrideCommandName = "Sub Container" };
-            yield return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(_activator, cohortAggregateContainer, true) { SuggestedCategory = Add, OverrideCommandName = "Existing Cohort Set (copy of)" };
-            yield return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(_activator, cohortAggregateContainer, false) { SuggestedCategory = Add, OverrideCommandName = "Aggregate" };
-            yield return new ExecuteCommandImportCohortIdentificationConfiguration(_activator, null, cohortAggregateContainer) { SuggestedCategory = Add, OverrideCommandName = "Existing Cohort Builder Query (copy of)" };
+            yield return new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(_activator,
+                cohortAggregateContainer, null, null) { SuggestedCategory = Add, OverrideCommandName = "Catalogue" };
+            yield return new ExecuteCommandAddCohortSubContainer(_activator, cohortAggregateContainer)
+                { SuggestedCategory = Add, OverrideCommandName = "Sub Container" };
+            yield return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(_activator,
+                    cohortAggregateContainer, true)
+                { SuggestedCategory = Add, OverrideCommandName = "Existing Cohort Set (copy of)" };
+            yield return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(_activator,
+                cohortAggregateContainer, false) { SuggestedCategory = Add, OverrideCommandName = "Aggregate" };
+            yield return new ExecuteCommandImportCohortIdentificationConfiguration(_activator, null,
+                    cohortAggregateContainer)
+                { SuggestedCategory = Add, OverrideCommandName = "Existing Cohort Builder Query (copy of)" };
 
             //Set Operation
-            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer, SetOperation.UNION) { SuggestedCategory = SetContainerOperation, OverrideCommandName = "UNION" };
-            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer, SetOperation.EXCEPT) { SuggestedCategory = SetContainerOperation, OverrideCommandName = "EXCEPT" };
-            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer, SetOperation.INTERSECT) { SuggestedCategory = SetContainerOperation, OverrideCommandName = "INTERSECT" };
-
-            yield return new ExecuteCommandUnMergeCohortIdentificationConfiguration(_activator, cohortAggregateContainer) { OverrideCommandName = "Seperate Cohort Builder Query"};
+            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer,
+                SetOperation.UNION) { SuggestedCategory = SetContainerOperation, OverrideCommandName = "UNION" };
+            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer,
+                SetOperation.EXCEPT) { SuggestedCategory = SetContainerOperation, OverrideCommandName = "EXCEPT" };
+            yield return new ExecuteCommandSetContainerOperation(_activator, cohortAggregateContainer,
+                    SetOperation.INTERSECT)
+                { SuggestedCategory = SetContainerOperation, OverrideCommandName = "INTERSECT" };
 
+            yield return new ExecuteCommandUnMergeCohortIdentificationConfiguration(_activator,
+                cohortAggregateContainer) { OverrideCommandName = "Seperate Cohort Builder Query" };
         }
 
-        if(Is(o,out IDisableable disable))
+        if (Is(o, out IDisableable disable))
             yield return new ExecuteCommandDisableOrEnable(_activator, disable);
 
         // If the root object is deletable offer deleting
-        if(Is(o,out IDeleteable deletable))
-            yield return new ExecuteCommandDelete(_activator,deletable){SuggestedShortcut="Delete" };
-                      
-        if(Is(o, out ReferenceOtherObjectDatabaseEntity reference))
-            yield return new ExecuteCommandShowRelatedObject(_activator,reference);
+        if (Is(o, out IDeleteable deletable))
+            yield return new ExecuteCommandDelete(_activator, deletable) { SuggestedShortcut = "Delete" };
+
+        if (Is(o, out ReferenceOtherObjectDatabaseEntity reference))
+            yield return new ExecuteCommandShowRelatedObject(_activator, reference);
 
-        if(Is(o, out INamed n))
-            yield return new ExecuteCommandRename(_activator, n){SuggestedShortcut = "F2" };
+        if (Is(o, out INamed n))
+            yield return new ExecuteCommandRename(_activator, n) { SuggestedShortcut = "F2" };
 
-        if(Is(o, out PipelineCompatibleWithUseCaseNode pcu))
+        if (Is(o, out PipelineCompatibleWithUseCaseNode pcu))
         {
-            yield return new ExecuteCommandNewObject(_activator,typeof(Pipeline)) { OverrideCommandName = "New Pipeline" };
+            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))
+                { OverrideCommandName = "New Pipeline" };
             yield return new ExecuteCommandClonePipeline(_activator, pcu.Pipeline);
             yield return new ExecuteCommandAddPipelineComponent(_activator, pcu.Pipeline, pcu.UseCase);
         }
-        else
-        if (Is(o, out Pipeline pipeline))
+        else if (Is(o, out Pipeline pipeline))
         {
-            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline)) { OverrideCommandName = "New Pipeline" };
+            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))
+                { OverrideCommandName = "New Pipeline" };
             yield return new ExecuteCommandClonePipeline(_activator, pipeline);
             yield return new ExecuteCommandAddPipelineComponent(_activator, pipeline, null);
         }
 
         if (Is(o, out StandardPipelineUseCaseNode psu))
-        {
-            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline)) { OverrideCommandName = "New Pipeline" };
-        }
+            yield return new ExecuteCommandNewObject(_activator, typeof(Pipeline))
+                { OverrideCommandName = "New Pipeline" };
     }
 
     public IEnumerable<IAtomicCommand> CreateManyObjectCommands(ICollection many)
     {
         if (many.Cast<object>().All(d => d is IDisableable))
-        {
             yield return new ExecuteCommandDisableOrEnable(_activator, many.Cast<IDisableable>().ToArray());
-        }
         if (many.Cast<object>().All(d => d is IHasFolder))
-        {
             yield return new ExecuteCommandPutIntoFolder(_activator, many.Cast<IHasFolder>().ToArray(), null);
-        }
 
-        if (many.Cast<object>().All(t=>t is TableInfo))
-        {
+        if (many.Cast<object>().All(t => t is TableInfo))
             yield return new ExecuteCommandScriptTables(_activator, many.Cast<TableInfo>().ToArray(), null, null, null);
-        }
         if (many.Cast<object>().All(t => t is CatalogueItem))
-        {
-            yield return new ExecuteCommandChangeExtractionCategory(_activator, 
+            yield return new ExecuteCommandChangeExtractionCategory(_activator,
                 many.Cast<CatalogueItem>()
-                    .Select(ci=>ci.ExtractionInformation)
-                    .Where(ei=>ei != null).ToArray(),null);
-        }
+                    .Select(ci => ci.ExtractionInformation)
+                    .Where(ei => ei != null).ToArray(), null);
 
         if (many.Cast<object>().All(d => d is IDeleteable))
-        {
-            yield return new ExecuteCommandDelete(_activator, many.Cast<IDeleteable>().ToArray()){ SuggestedShortcut = "Delete" };
-        }
+            yield return new ExecuteCommandDelete(_activator, many.Cast<IDeleteable>().ToArray())
+                { SuggestedShortcut = "Delete" };
 
         if (many.Cast<object>().All(d => d is ExtractionFilterParameterSet))
-        {
-            yield return new ExecuteCommandAddMissingParameters(_activator, many.Cast<ExtractionFilterParameterSet>().ToArray());
-        }
+            yield return new ExecuteCommandAddMissingParameters(_activator,
+                many.Cast<ExtractionFilterParameterSet>().ToArray());
 
         // Deprecate/UnDeprecate many items at once if all share the same state (all true or all false)
         if (many.Cast<object>().All(d => d is IMightBeDeprecated))
         {
             var dep = many.Cast<IMightBeDeprecated>().ToArray();
 
-            if(dep.All(d=>d.IsDeprecated))
-            {
-                yield return new ExecuteCommandDeprecate(_activator,dep,false )
+            if (dep.All(d => d.IsDeprecated))
+                yield return new ExecuteCommandDeprecate(_activator, dep, false)
                 {
-                    SuggestedShortcut = "UnDeprecate" 
+                    SuggestedShortcut = "UnDeprecate"
                 };
-            }
-            else if (dep.All(d=>!d.IsDeprecated))
-            {
+            else if (dep.All(d => !d.IsDeprecated))
                 yield return new ExecuteCommandDeprecate(_activator, dep, true)
                 {
                     SuggestedShortcut = "Deprecate"
                 };
-                    
-            }
-
-                
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/AlterTableCommandExecution.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/AlterTableCommandExecution.cs
index 3d06cf65bf..6e9f061a33 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/AlterTableCommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/AlterTableCommandExecution.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands.Alter;
 /// <summary>
 /// Abstract base command for all commands which change a tables schema (on the live database)
 /// </summary>
-public abstract class AlterTableCommandExecution :BasicCommandExecution
+public abstract class AlterTableCommandExecution : BasicCommandExecution
 {
     protected ITableInfo TableInfo;
     protected DiscoveredTable Table;
@@ -28,26 +28,26 @@ protected AlterTableCommandExecution(IBasicActivateItems activator, ITableInfo t
         {
             Table = TableInfo.Discover(DataAccessContext.InternalDataProcessing);
         }
-        catch(Exception)
+        catch (Exception)
         {
             SetImpossible("Could not resolve Server/Table connection details");
             return;
         }
-            
-                        
+
+
         if (!Table.Exists())
         {
             SetImpossible("Table does not exist");
             return;
         }
 
-        if(Table.TableType != TableType.Table)
+        if (Table.TableType != TableType.Table)
         {
             SetImpossible($"Table is a {Table.TableType}");
             return;
         }
     }
-        
+
     protected bool Synchronize()
     {
         var sync = new TableInfoSynchronizer(TableInfo);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterColumnType.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterColumnType.cs
index a42cffb5dd..7942620852 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterColumnType.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterColumnType.cs
@@ -18,19 +18,15 @@ public class ExecuteCommandAlterColumnType : BasicCommandExecution
     private ColumnInfo columnInfo;
     private string _datatype;
 
-    public ExecuteCommandAlterColumnType(IBasicActivateItems activator, ColumnInfo columnInfo, string datatype = null) : base(activator)
+    public ExecuteCommandAlterColumnType(IBasicActivateItems activator, ColumnInfo columnInfo, string datatype = null) :
+        base(activator)
     {
         this.columnInfo = columnInfo;
         _datatype = datatype;
 
-        if (columnInfo.TableInfo.IsView)
-        {
-            SetImpossible("Column is part of a view so cannot be altered");
-        }
+        if (columnInfo.TableInfo.IsView) SetImpossible("Column is part of a view so cannot be altered");
         if (columnInfo.TableInfo.IsTableValuedFunction)
-        {
             SetImpossible("Column is part of a table valued function so cannot be altered");
-        }
     }
 
     public override void Execute()
@@ -42,18 +38,11 @@ public override void Execute()
         var oldSqlType = fansiType.SQLType;
         var newSqlType = _datatype;
 
-        if(newSqlType == null)
-        {
+        if (newSqlType == null)
             if (!TypeText("New Data Type", "Type", 50, oldSqlType, out newSqlType, false))
-            {
                 return;
-            }
-        }
 
-        if (string.IsNullOrWhiteSpace(newSqlType))
-        {
-            return;
-        }
+        if (string.IsNullOrWhiteSpace(newSqlType)) return;
 
         try
         {
@@ -71,12 +60,10 @@ public override void Execute()
         var archive = col.Table.Database.ExpectTable($"{col.Table}_Archive");
 
         if (archive.Exists())
-        {
             try
             {
                 var archiveCol = archive.DiscoverColumn(col.GetRuntimeName());
                 if (archiveCol.DataType.SQLType.Equals(oldSqlType))
-                {
                     try
                     {
                         archiveCol.DataType.AlterTypeTo(newSqlType);
@@ -86,17 +73,14 @@ public override void Execute()
                         ShowException($"Failed to Alter Archive Column '{archiveCol.GetFullyQualifiedName()}'", ex);
                         return;
                     }
-                }
             }
             catch (Exception)
             {
                 //maybe the archive is broken? corrupt or someone just happens to have a Table called that?
                 return;
             }
-        }
-            
+
 
         Publish(columnInfo.TableInfo);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableAddArchiveTrigger.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableAddArchiveTrigger.cs
index ef42e103c8..afb9587fc3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableAddArchiveTrigger.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableAddArchiveTrigger.cs
@@ -19,11 +19,12 @@ public class ExecuteCommandAlterTableAddArchiveTrigger : AlterTableCommandExecut
 {
     private readonly ITriggerImplementer _triggerImplementer;
 
-    public ExecuteCommandAlterTableAddArchiveTrigger(IBasicActivateItems activator, TableInfo tableInfo) : base(activator,tableInfo)
+    public ExecuteCommandAlterTableAddArchiveTrigger(IBasicActivateItems activator, TableInfo tableInfo) : base(
+        activator, tableInfo)
     {
-        if(IsImpossible)
+        if (IsImpossible)
             return;
-                
+
         if (!Table.DiscoverColumns().Any(c => c.IsPrimaryKey))
         {
             SetImpossible(GlobalStrings.TableHasNoPrimaryKey);
@@ -35,25 +36,24 @@ public ExecuteCommandAlterTableAddArchiveTrigger(IBasicActivateItems activator,
         var currentStatus = _triggerImplementer.GetTriggerStatus();
 
         if (currentStatus != TriggerStatus.Missing)
-            SetImpossible(GlobalStrings.TriggerStatusIsCurrently , currentStatus.S());
+            SetImpossible(GlobalStrings.TriggerStatusIsCurrently, currentStatus.S());
     }
 
     public override void Execute()
     {
         base.Execute();
-            
+
         if (!Synchronize())
             return;
-           
+
         if (YesNo(GlobalStrings.CreateArchiveTableYesNo, GlobalStrings.CreateArchiveTableCaption))
         {
             _triggerImplementer.CreateTrigger(new ThrowImmediatelyCheckNotifier());
-            Show(GlobalStrings.CreateArchiveTableSuccess , $"{TableInfo.GetRuntimeName()}_Archive ");
+            Show(GlobalStrings.CreateArchiveTableSuccess, $"{TableInfo.GetRuntimeName()}_Archive ");
         }
 
         Synchronize();
 
         Publish(TableInfo);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableCreatePrimaryKey.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableCreatePrimaryKey.cs
index 48fefd08a6..996c811bae 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableCreatePrimaryKey.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableCreatePrimaryKey.cs
@@ -22,7 +22,7 @@ public class ExecuteCommandAlterTableCreatePrimaryKey : AlterTableCommandExecuti
 {
     private ColumnInfo[] _columnInfos;
 
-    [UseWithCommandLine( ParameterHelpList = "<TableInfo> <ColumnInfo1> <ColumnInfo2> etc",
+    [UseWithCommandLine(ParameterHelpList = "<TableInfo> <ColumnInfo1> <ColumnInfo2> etc",
         ParameterHelpBreakdown = @"TableInfo    The table you want to create a primary key on e.g. TableInfo:*Biochem*
 ColumnInfos List of columns that should form the primary key (1 for simple primary key, 2+ for composite primary key)")]
     public ExecuteCommandAlterTableCreatePrimaryKey(IBasicActivateItems activator, CommandLineObjectPicker picker) :
@@ -33,18 +33,18 @@ public ExecuteCommandAlterTableCreatePrimaryKey(IBasicActivateItems activator, C
 
         var pick = new List<ColumnInfo>();
         for (var i = 1; i < picker.Length; i++)
-        {
             pick.Add((ColumnInfo)picker[i].GetValueForParameterOfType(typeof(ColumnInfo)));
-        }
 
         _columnInfos = pick.ToArray();
     }
-    public ExecuteCommandAlterTableCreatePrimaryKey(IBasicActivateItems activator, TableInfo tableInfo):base(activator,tableInfo)
+
+    public ExecuteCommandAlterTableCreatePrimaryKey(IBasicActivateItems activator, TableInfo tableInfo) : base(
+        activator, tableInfo)
     {
-        if(IsImpossible)
+        if (IsImpossible)
             return;
 
-        if(Table.DiscoverColumns().Any(c=>c.IsPrimaryKey))
+        if (Table.DiscoverColumns().Any(c => c.IsPrimaryKey))
         {
             SetImpossible("Table already has a primary key, try synchronizing the TableInfo");
             return;
@@ -69,12 +69,12 @@ public override void Execute()
 
         var task = Task.Run(() =>
             Table.CreatePrimaryKey(cols.Select(c => c.Discover(DataAccessContext.DataLoad)).ToArray()));
-                
-        Wait("Creating Primary Key...",task, cts);
 
-        if(task.IsFaulted)
-            ShowException("Create Primary Key Failed",task.Exception);
-            
+        Wait("Creating Primary Key...", task, cts);
+
+        if (task.IsFaulted)
+            ShowException("Create Primary Key Failed", task.Exception);
+
         Synchronize();
 
         Publish(TableInfo);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableMakeDistinct.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableMakeDistinct.cs
index 8403aa57f1..f488ece65e 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableMakeDistinct.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableMakeDistinct.cs
@@ -23,7 +23,9 @@ public class ExecuteCommandAlterTableMakeDistinct : AlterTableCommandExecution
     public ExecuteCommandAlterTableMakeDistinct(IBasicActivateItems activator,
         [DemandsInitialization("Table to remove exact duplicates from")]
         ITableInfo tableInfo,
-        [DemandsInitialization("The number of seconds to allow for the make distinct command to run.  Defaults to 6000s",DefaultValue = 6000)]
+        [DemandsInitialization(
+            "The number of seconds to allow for the make distinct command to run.  Defaults to 6000s",
+            DefaultValue = 6000)]
         int timeout = 6000,
         [DemandsInitialization("True to carry out the command without warning the user first")]
         bool noWarn = false) : base(activator, tableInfo)
@@ -32,9 +34,7 @@ public ExecuteCommandAlterTableMakeDistinct(IBasicActivateItems activator,
         NoWarn = noWarn;
 
         if (TableInfo.ColumnInfos.Any(c => c.IsPrimaryKey))
-        {
             SetImpossible("Table has primary key so cannot have exact duplication");
-        }
     }
 
     public override void Execute()
@@ -42,17 +42,13 @@ public override void Execute()
         base.Execute();
 
         if (Table.DiscoverColumns().Any(c => c.IsPrimaryKey))
-        {
             throw new Exception($"Table '{Table}' has primary key columns so cannot contain duplication");
-        }
 
         if (!NoWarn)
-        {
-            if(!BasicActivator.YesNo("Make Distinct requires re-creating the table data which may affect indexes or fail if user permissions are missing (e.g. create table).  Do you want to continue?",$"Make distinct '{Table}'"))
-            {
+            if (!BasicActivator.YesNo(
+                    "Make Distinct requires re-creating the table data which may affect indexes or fail if user permissions are missing (e.g. create table).  Do you want to continue?",
+                    $"Make distinct '{Table}'"))
                 return;
-            }
-        }
 
         var cts = new CancellationTokenSource();
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableName.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableName.cs
index 86db1bb0d8..22371c4ad2 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableName.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Alter/ExecuteCommandAlterTableName.cs
@@ -16,11 +16,12 @@ public class ExecuteCommandAlterTableName : AlterTableCommandExecution
 {
     private SelectSQLRefactorer _refactorer;
 
-    public ExecuteCommandAlterTableName(IBasicActivateItems activator, ITableInfo tableInfo) : base(activator,tableInfo)
+    public ExecuteCommandAlterTableName(IBasicActivateItems activator, ITableInfo tableInfo) : base(activator,
+        tableInfo)
     {
-        if(IsImpossible)
+        if (IsImpossible)
             return;
-            
+
         _refactorer = new SelectSQLRefactorer();
 
         if (!SelectSQLRefactorer.IsRefactorable(TableInfo))
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/AutomationCommandExecution.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/AutomationCommandExecution.cs
index 3ec20edeeb..60452472df 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/AutomationCommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/AutomationCommandExecution.cs
@@ -25,7 +25,8 @@ public abstract class AutomationCommandExecution : BasicCommandExecution
     private YamlRepository _yamlRepository;
 
 
-    protected AutomationCommandExecution(IBasicActivateItems activator, Func<RDMPCommandLineOptions> commandGetter) : base(activator)
+    protected AutomationCommandExecution(IBasicActivateItems activator, Func<RDMPCommandLineOptions> commandGetter) :
+        base(activator)
     {
         CommandGetter = commandGetter;
 
@@ -34,10 +35,9 @@ protected AutomationCommandExecution(IBasicActivateItems activator, Func<RDMPCom
         _cataTableRepo = activator.RepositoryLocator.CatalogueRepository as TableRepository;
         _yamlRepository = activator.RepositoryLocator.CatalogueRepository as YamlRepository;
         _dataExportTableRepo = activator.RepositoryLocator.DataExportRepository as TableRepository;
-            
+
         if (_yamlRepository == null && (_cataTableRepo == null || _dataExportTableRepo == null))
             SetImpossible("Current repository is not not TableRepository/YamlRepository");
-            
     }
 
     /// <summary>
@@ -63,13 +63,13 @@ private void PopulateConnectionStringOptions(RDMPCommandLineOptions options)
             return;
 
         // if backing database uses a directory
-        if(_yamlRepository != null)
+        if (_yamlRepository != null)
         {
             // assemble CLI args that also say to use a directory
             options.Dir = _yamlRepository.Directory.FullName;
             return;
         }
-                
+
         // if backing database uses a specific connection string
         // then use the same connection string for CLI args
         if (string.IsNullOrWhiteSpace(options.CatalogueConnectionString))
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandGenerateRunCommand.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandGenerateRunCommand.cs
index ade780a141..057e8dc835 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandGenerateRunCommand.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandGenerateRunCommand.cs
@@ -18,18 +18,11 @@ public class ExecuteCommandGenerateRunCommand : AutomationCommandExecution, IAto
     public ExecuteCommandGenerateRunCommand(IBasicActivateItems activator, Func<RDMPCommandLineOptions> commandGetter)
         : base(activator, commandGetter)
     {
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Generates the execute command line invocation (including arguments)";
-    }
+    public override string GetCommandHelp() => "Generates the execute command line invocation (including arguments)";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Clipboard);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Clipboard);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandRunDetached.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandRunDetached.cs
index 67ceab892f..6a552f0b2b 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandRunDetached.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Automation/ExecuteCommandRunDetached.cs
@@ -23,26 +23,19 @@ public class ExecuteCommandRunDetached : AutomationCommandExecution, IAtomicComm
     public ExecuteCommandRunDetached(IBasicActivateItems activator, Func<RDMPCommandLineOptions> commandGetter)
         : base(activator, commandGetter)
     {
-        _rdmpBinaryPath = Path.Combine(UsefulStuff.GetExecutableDirectory().FullName, "cli", AutomationServiceExecutable);
+        _rdmpBinaryPath =
+            Path.Combine(UsefulStuff.GetExecutableDirectory().FullName, "cli", AutomationServiceExecutable);
 
         if (!File.Exists(_rdmpBinaryPath))
             SetImpossible($"{_rdmpBinaryPath} did not exist");
 
         if (!BasicActivator.IsAbleToLaunchSubprocesses)
-        {
             SetImpossible($"Client does not support launching subprocesses");
-        }
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Generates the execute command line invocation (including arguments)";
-    }
+    public override string GetCommandHelp() => "Generates the execute command line invocation (including arguments)";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.Exe);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.Exe);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/CatalogueCreationCommandExecution.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/CatalogueCreationCommandExecution.cs
index c82ca6481f..d14b3a0491 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/CatalogueCreationCommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/CatalogueCreationCommandExecution.cs
@@ -12,22 +12,26 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands.CatalogueCreationCommands;
 public abstract class CatalogueCreationCommandExecution : BasicCommandExecution, IAtomicCommandWithTarget
 {
     protected IProject ProjectSpecific;
-        
-    public string TargetFolder {get;set; }
 
-    protected const string Desc_ProjectSpecificParameter = "Optionally associate the Catalogue created with a specific Project, otherwise Null";
-    protected const string Desc_TargetFolder = "Optionally create the Catalogue in a virtual subdirectory e.g. /mycatalogues/, otherwise Null";
+    public string TargetFolder { get; set; }
+
+    protected const string Desc_ProjectSpecificParameter =
+        "Optionally associate the Catalogue created with a specific Project, otherwise Null";
+
+    protected const string Desc_TargetFolder =
+        "Optionally create the Catalogue in a virtual subdirectory e.g. /mycatalogues/, otherwise Null";
+
     /// <summary>
     /// Create a project specific Catalogue when command is executed by prompting the user to first pick a project
     /// </summary>
     public bool PromptForProject { get; set; }
 
-    protected CatalogueCreationCommandExecution(IBasicActivateItems activator):this(activator,null,null)
+    protected CatalogueCreationCommandExecution(IBasicActivateItems activator) : this(activator, null, null)
     {
-
     }
 
-    protected CatalogueCreationCommandExecution(IBasicActivateItems activator, IProject projectSpecific, string targetFolder) :base(activator)
+    protected CatalogueCreationCommandExecution(IBasicActivateItems activator, IProject projectSpecific,
+        string targetFolder) : base(activator)
     {
         ProjectSpecific = projectSpecific;
         TargetFolder = targetFolder;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration.cs
index 92ec05160b..a1745d58fa 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration.cs
@@ -26,28 +26,29 @@ public class ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration
     private ExtractableCohort _cohort;
     private DiscoveredTable _table;
 
-    public ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration(IBasicActivateItems activator,AggregateConfiguration ac) : base(activator)
+    public ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration(IBasicActivateItems activator,
+        AggregateConfiguration ac) : base(activator)
     {
         _aggregateConfiguration = ac;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Executes an existing cohort set, patient index table or graph and stores the results in a new table (which is imported as a new dataset)";
-    }
+    public override string GetCommandHelp() =>
+        "Executes an existing cohort set, patient index table or graph and stores the results in a new table (which is imported as a new dataset)";
 
     public override void Execute()
     {
         base.Execute();
 
-        _aggregateConfiguration ??= SelectOne<AggregateConfiguration>(BasicActivator.RepositoryLocator.CatalogueRepository);
+        _aggregateConfiguration ??=
+            SelectOne<AggregateConfiguration>(BasicActivator.RepositoryLocator.CatalogueRepository);
 
         if (_aggregateConfiguration == null)
             return;
 
         if (_aggregateConfiguration.IsJoinablePatientIndexTable())
         {
-            if (!BasicActivator.YesNo("Would you like to constrain the records to only those in a committed cohort?", "Cohort Records Only", out var chosen))
+            if (!BasicActivator.YesNo("Would you like to constrain the records to only those in a committed cohort?",
+                    "Cohort Records Only", out var chosen))
                 return;
 
             if (chosen)
@@ -62,7 +63,8 @@ public override void Execute()
             if (externalData != null)
             {
                 var projNumber = externalData.ExternalProjectNumber;
-                var projs = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>().Where(p => p.ProjectNumber == projNumber).ToArray();
+                var projs = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>()
+                    .Where(p => p.ProjectNumber == projNumber).ToArray();
                 if (projs.Length == 1)
                     ProjectSpecific = projs[0];
             }
@@ -75,11 +77,13 @@ public override void Execute()
 
         var useCase = new CreateTableFromAggregateUseCase(_aggregateConfiguration, _cohort, _table);
 
-        var runner = BasicActivator.GetPipelineRunner(new DialogArgs { 
+        var runner = BasicActivator.GetPipelineRunner(new DialogArgs
+            {
                 WindowTitle = "Create Table from AggregateConfiguration",
-                TaskDescription = "Select a Pipeline compatible with reading data from an AggregateConfiguration.  If the pipeline completes succesfully a new Catalogue will be created referencing the new table created in your database."
+                TaskDescription =
+                    "Select a Pipeline compatible with reading data from an AggregateConfiguration.  If the pipeline completes succesfully a new Catalogue will be created referencing the new table created in your database."
             }
-            ,useCase, null /*TODO inject Pipeline in CLI constructor*/);
+            , useCase, null /*TODO inject Pipeline in CLI constructor*/);
 
         runner.PipelineExecutionFinishedsuccessfully += ui_PipelineExecutionFinishedsuccessfully;
 
@@ -92,17 +96,16 @@ private void ui_PipelineExecutionFinishedsuccessfully(object sender, PipelineEng
             throw new Exception($"Pipeline execute succesfully but the expected table '{_table}' did not exist");
 
         var importer = new TableInfoImporter(BasicActivator.RepositoryLocator.CatalogueRepository, _table);
-        importer.DoImport(out var ti,out _);
+        importer.DoImport(out var ti, out _);
 
-        BasicActivator.CreateAndConfigureCatalogue(ti,null,
-            $"Execution of '{_aggregateConfiguration}' (AggregateConfiguration ID ={_aggregateConfiguration.ID})",ProjectSpecific,TargetFolder);
+        BasicActivator.CreateAndConfigureCatalogue(ti, null,
+            $"Execution of '{_aggregateConfiguration}' (AggregateConfiguration ID ={_aggregateConfiguration.ID})",
+            ProjectSpecific, TargetFolder);
     }
 
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Execute);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Execute);
 
     public override IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingExistingDataTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingExistingDataTable.cs
index 75e20b61b2..4439ad4125 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingExistingDataTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingExistingDataTable.cs
@@ -24,7 +24,8 @@ public class ExecuteCommandCreateNewCatalogueByImportingExistingDataTable : Cata
     private DiscoveredTable _importTable;
 
 
-    public ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(IBasicActivateItems activator) : this(activator,null,null,null)
+    public ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(IBasicActivateItems activator) : this(activator,
+        null, null, null)
     {
         UseTripleDotSuffix = true;
     }
@@ -35,9 +36,8 @@ public ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(IBasicActiva
         DiscoveredTable existingTable,
         [DemandsInitialization(Desc_ProjectSpecificParameter)]
         IProject projectSpecific,
-            
-        [DemandsInitialization(Desc_TargetFolder,DefaultValue = "\\")]
-        string targetFolder = "\\") : base(activator,projectSpecific, targetFolder)
+        [DemandsInitialization(Desc_TargetFolder, DefaultValue = "\\")]
+        string targetFolder = "\\") : base(activator, projectSpecific, targetFolder)
     {
         _importTable = existingTable;
     }
@@ -46,39 +46,30 @@ public override void Execute()
     {
         base.Execute();
 
-        var tbl = _importTable ?? BasicActivator.SelectTable(false,"Table to import");
+        var tbl = _importTable ?? BasicActivator.SelectTable(false, "Table to import");
 
-        if(tbl == null)
+        if (tbl == null)
             return;
 
         var importer = new TableInfoImporter(BasicActivator.RepositoryLocator.CatalogueRepository, tbl);
-        importer.DoImport(out var ti,out _);
+        importer.DoImport(out var ti, out _);
 
-        var c = BasicActivator.CreateAndConfigureCatalogue(ti,null,"Existing table",ProjectSpecific,TargetFolder);
+        var c = BasicActivator.CreateAndConfigureCatalogue(ti, null, "Existing table", ProjectSpecific, TargetFolder);
 
-        if(c == null || !c.Exists())
-        {
-            if(BasicActivator.IsInteractive 
-               && BasicActivator.YesNo("You have cancelled Catalogue creation.  Do you want to delete the TableInfo metadata reference (this will not affect any database tables)?", "Delete TableInfo", out var chosen)
-               && chosen)
-            {
+        if (c == null || !c.Exists())
+            if (BasicActivator.IsInteractive
+                && BasicActivator.YesNo(
+                    "You have cancelled Catalogue creation.  Do you want to delete the TableInfo metadata reference (this will not affect any database tables)?",
+                    "Delete TableInfo", out var chosen)
+                && chosen)
                 ti.DeleteInDatabase();
-            }
-        }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import);
 
-    public override string GetCommandHelp()
-    {
-        return GlobalStrings.CreateNewCatalogueByImportingExistingDataTableHelp;
-    }
+    public override string GetCommandHelp() => GlobalStrings.CreateNewCatalogueByImportingExistingDataTableHelp;
 
-    public override string GetCommandName()
-    {
-        return OverrideCommandName ?? GlobalStrings.CreateNewCatalogueByImportingExistingDataTable;
-    }
+    public override string GetCommandName() =>
+        OverrideCommandName ?? GlobalStrings.CreateNewCatalogueByImportingExistingDataTable;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingFile.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingFile.cs
index d0b1797d5d..63918aa2c5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingFile.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueByImportingFile.cs
@@ -46,7 +46,8 @@ private void CheckFile()
             SetImpossible("File does not exist");
     }
 
-    public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activator, FileInfo file = null) : this(activator, file, null, null, null, null)
+    public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activator, FileInfo file = null) : this(
+        activator, file, null, null, null, null)
     {
     }
 
@@ -54,14 +55,16 @@ public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activ
     public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activator,
         [DemandsInitialization("The file to load into the database")]
         FileInfo file,
-        [DemandsInitialization("Name of a column in the file to be the IsExtractionIdentifier column or Null if it doesn't have one")]
+        [DemandsInitialization(
+            "Name of a column in the file to be the IsExtractionIdentifier column or Null if it doesn't have one")]
         string extractionIdentifier,
         [DemandsInitialization("The database to upload the data into")]
         DiscoveredDatabase targetDatabase,
-        [DemandsInitialization("Pipeline for reading the source file, applying any transforms and writing to the database")]
+        [DemandsInitialization(
+            "Pipeline for reading the source file, applying any transforms and writing to the database")]
         Pipeline pipeline,
         [DemandsInitialization(Desc_ProjectSpecificParameter)]
-        Project projectSpecific) : base(activator,projectSpecific,null)
+        Project projectSpecific) : base(activator, projectSpecific, null)
     {
         File = file;
         _extractionIdentifier = extractionIdentifier;
@@ -72,7 +75,8 @@ public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activ
     }
 
 
-    public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activator, FileCollectionCombineable file) : base(activator)
+    public ExecuteCommandCreateNewCatalogueByImportingFile(IBasicActivateItems activator,
+        FileCollectionCombineable file) : base(activator)
     {
         if (file.Files.Length != 1)
         {
@@ -90,7 +94,7 @@ public override void Execute()
     {
         base.Execute();
 
-        if(_pipeline == null)
+        if (_pipeline == null)
         {
             var pipelines = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>();
 
@@ -102,77 +106,72 @@ public override void Execute()
                 throw new Exception("No pipeline selected for upload");
         }
 
-        var db  = _targetDatabase ?? BasicActivator.SelectDatabase(true,"Target database");
+        var db = _targetDatabase ?? BasicActivator.SelectDatabase(true, "Target database");
 
-        if(db == null)
+        if (db == null)
             return;
 
         File ??= BasicActivator.SelectFile("File to upload");
-            
-        if(File == null)
+
+        if (File == null)
             return;
 
-        var useCase = new UploadFileUseCase(File, db,BasicActivator);
+        var useCase = new UploadFileUseCase(File, db, BasicActivator);
 
         var runner = BasicActivator.GetPipelineRunner(
             GetCreateCatalogueFromFileDialogArgs()
-            ,useCase,_pipeline);
+            , useCase, _pipeline);
         runner.PipelineExecutionFinishedsuccessfully += (s, e) => OnPipelineCompleted(s, e, db);
-        runner.Run(BasicActivator.RepositoryLocator,null,null,null);
+        runner.Run(BasicActivator.RepositoryLocator, null, null, null);
     }
 
-    public static DialogArgs GetCreateCatalogueFromFileDialogArgs()
-    {
-        return new DialogArgs
+    public static DialogArgs GetCreateCatalogueFromFileDialogArgs() =>
+        new()
         {
             WindowTitle = "Create Catalogue from File",
-            TaskDescription = "Select a Pipeline compatible with the file format you are loading and your intended destination.  If the pipeline completes succesfully a new Catalogue will be created referencing the new table created in your database."
+            TaskDescription =
+                "Select a Pipeline compatible with the file format you are loading and your intended destination.  If the pipeline completes succesfully a new Catalogue will be created referencing the new table created in your database."
         };
-    }
 
     private void OnPipelineCompleted(object sender, PipelineEngineEventArgs args, DiscoveredDatabase db)
     {
         var engine = args.PipelineEngine;
 
         //todo figure out what it created
-        if(engine.DestinationObject is not DataTableUploadDestination dest)
-            throw new Exception($"Destination of engine was unexpectedly not a DataTableUploadDestination despite use case {nameof(UploadFileUseCase)}");
-                        
-        if(string.IsNullOrWhiteSpace(dest.TargetTableName))
+        if (engine.DestinationObject is not DataTableUploadDestination dest)
+            throw new Exception(
+                $"Destination of engine was unexpectedly not a DataTableUploadDestination despite use case {nameof(UploadFileUseCase)}");
+
+        if (string.IsNullOrWhiteSpace(dest.TargetTableName))
             throw new Exception($"Destination of engine failed to populate {dest.TargetTableName}");
 
         var tbl = db.ExpectTable(dest.TargetTableName);
 
-        if(!tbl.Exists())
-            throw new Exception($"Destination of engine claimed to have created {tbl.GetFullyQualifiedName()} but it did not exist");
+        if (!tbl.Exists())
+            throw new Exception(
+                $"Destination of engine claimed to have created {tbl.GetFullyQualifiedName()} but it did not exist");
+
+        var importer = new TableInfoImporter(BasicActivator.RepositoryLocator.CatalogueRepository, tbl);
+        importer.DoImport(out var ti, out _);
 
-        var importer = new TableInfoImporter(BasicActivator.RepositoryLocator.CatalogueRepository,tbl);
-        importer.DoImport(out var ti,out _);
+        var cata = BasicActivator.CreateAndConfigureCatalogue(ti, null,
+            $"Import of file '{File.FullName}' by {Environment.UserName} on {DateTime.Now}", ProjectSpecific,
+            TargetFolder);
 
-        var cata = BasicActivator.CreateAndConfigureCatalogue(ti,null,$"Import of file '{File.FullName}' by {Environment.UserName} on {DateTime.Now}",ProjectSpecific,TargetFolder);
-            
-        if(cata != null)
+        if (cata != null)
         {
             Publish(cata);
             Emphasise(cata);
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return ProjectSpecific != null ?
-            iconProvider.GetImage(RDMPConcept.ProjectCatalogue, OverlayKind.Add) :
-            iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        ProjectSpecific != null
+            ? iconProvider.GetImage(RDMPConcept.ProjectCatalogue, OverlayKind.Add)
+            : iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);
 
 
-    public override string GetCommandHelp()
-    {
-        return GlobalStrings.CreateNewCatalogueByImportingFileHelp;
-    }
+    public override string GetCommandHelp() => GlobalStrings.CreateNewCatalogueByImportingFileHelp;
 
-    public override string GetCommandName()
-    {
-        return OverrideCommandName ?? GlobalStrings.CreateNewCatalogueByImportingFile;
-    }
+    public override string GetCommandName() => OverrideCommandName ?? GlobalStrings.CreateNewCatalogueByImportingFile;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueFromTableInfo.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueFromTableInfo.cs
index e1177ad40a..e08f6fe0e5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueFromTableInfo.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CatalogueCreationCommands/ExecuteCommandCreateNewCatalogueFromTableInfo.cs
@@ -17,7 +17,8 @@ public class ExecuteCommandCreateNewCatalogueFromTableInfo : CatalogueCreationCo
 {
     private TableInfo _tableInfo;
 
-    public ExecuteCommandCreateNewCatalogueFromTableInfo(IBasicActivateItems activator, TableInfo tableInfo) : base(activator)
+    public ExecuteCommandCreateNewCatalogueFromTableInfo(IBasicActivateItems activator, TableInfo tableInfo) :
+        base(activator)
     {
         _tableInfo = tableInfo;
 
@@ -30,8 +31,9 @@ public override void Execute()
     {
         base.Execute();
 
-        var cata = BasicActivator.CreateAndConfigureCatalogue(_tableInfo,null,"Existing Table",ProjectSpecific,TargetFolder);
-            
+        var cata = BasicActivator.CreateAndConfigureCatalogue(_tableInfo, null, "Existing Table", ProjectSpecific,
+            TargetFolder);
+
         if (cata is DatabaseEntity de)
         {
             Publish(de);
@@ -39,8 +41,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Shortcut);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Shortcut);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/CohortCreationCommandExecution.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/CohortCreationCommandExecution.cs
index 4436d73a9e..9b13e634be 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/CohortCreationCommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/CohortCreationCommandExecution.cs
@@ -19,8 +19,12 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands.CohortCreationCommands;
 
 public abstract class CohortCreationCommandExecution : BasicCommandExecution, IAtomicCommandWithTarget
 {
-    protected const string Desc_ExternalCohortTableParameter = "Destination cohort database in which to store identifiers";
-    protected const string Desc_CohortNameParameter = "Name for cohort.  If the named cohort already exists then a new Version will be assumed e.g. Version 2";
+    protected const string Desc_ExternalCohortTableParameter =
+        "Destination cohort database in which to store identifiers";
+
+    protected const string Desc_CohortNameParameter =
+        "Name for cohort.  If the named cohort already exists then a new Version will be assumed e.g. Version 2";
+
     protected const string Desc_ProjectParameter = "Project to associate cohort with, must have a ProjectNumber";
 
     protected ExternalCohortTable ExternalCohortTable;
@@ -35,7 +39,6 @@ public abstract class CohortCreationCommandExecution : BasicCommandExecution, IA
     protected CohortCreationCommandExecution(IBasicActivateItems activator)
         : this(activator, null, null, null, null)
     {
-
     }
 
     /// <summary>
@@ -46,7 +49,8 @@ protected CohortCreationCommandExecution(IBasicActivateItems activator)
     /// <param name="cohortName"></param>
     /// <param name="project"></param>
     /// <param name="pipeline"></param>
-    protected CohortCreationCommandExecution(IBasicActivateItems activator, ExternalCohortTable externalCohortTable, string cohortName, Project project, IPipeline pipeline) : base(activator)
+    protected CohortCreationCommandExecution(IBasicActivateItems activator, ExternalCohortTable externalCohortTable,
+        string cohortName, Project project, IPipeline pipeline) : base(activator)
     {
         //May be null
         _explicitCohortName = cohortName;
@@ -63,6 +67,7 @@ protected CohortCreationCommandExecution(IBasicActivateItems activator, External
         if (!dataExport.CohortSources.Any())
             SetImpossible("There are no cohort sources configured, you must create one in the Saved Cohort tabs");
     }
+
     protected ICohortCreationRequest GetCohortCreationRequest(string auditLogDescription)
     {
         //user wants to create a new cohort
@@ -74,16 +79,14 @@ protected ICohortCreationRequest GetCohortCreationRequest(string auditLogDescrip
                     GetChooseCohortDialogArgs(),
                     BasicActivator.RepositoryLocator.DataExportRepository,
                     out ect)) //not yet, get user to pick one
-            {
-                return null;//user didn't select one and cancelled dialog
-            }
-                    
+                return null; //user didn't select one and cancelled dialog
+
 
         //and document the request
 
         // if we have everything we need to create the cohort right here
         if (!string.IsNullOrWhiteSpace(_explicitCohortName) && Project?.ProjectNumber != null)
-            return GenerateCohortCreationRequestFromNameAndProject(_explicitCohortName, auditLogDescription,ect);
+            return GenerateCohortCreationRequestFromNameAndProject(_explicitCohortName, auditLogDescription, ect);
         // otherwise we are going to have to ask the user for it
 
         //Get a new request for the source they are trying to populate
@@ -98,29 +101,29 @@ protected ICohortCreationRequest GetCohortCreationRequest(string auditLogDescrip
     /// Describes in a user friendly way the activity of picking an <see cref="ExternalCohortTable"/>
     /// </summary>
     /// <returns></returns>
-    public static DialogArgs GetChooseCohortDialogArgs()
-    {
-        return new DialogArgs
+    public static DialogArgs GetChooseCohortDialogArgs() =>
+        new()
         {
             WindowTitle = "Choose where to save cohort",
-            TaskDescription = "Select the Cohort Database in which to store the identifiers.  If you have multiple methods of anonymising cohorts or manage different types of identifiers (e.g. CHI lists, ECHI lists and/or BarcodeIDs) then you must pick the Cohort Database that matches your cohort identifier type/anonymisation protocol.",
+            TaskDescription =
+                "Select the Cohort Database in which to store the identifiers.  If you have multiple methods of anonymising cohorts or manage different types of identifiers (e.g. CHI lists, ECHI lists and/or BarcodeIDs) then you must pick the Cohort Database that matches your cohort identifier type/anonymisation protocol.",
             EntryLabel = "Select Cohort Database",
             AllowAutoSelect = true
         };
-    }
 
-    private ICohortCreationRequest GenerateCohortCreationRequestFromNameAndProject(string name, string auditLogDescription,ExternalCohortTable ect)
+    private ICohortCreationRequest GenerateCohortCreationRequestFromNameAndProject(string name,
+        string auditLogDescription, ExternalCohortTable ect)
     {
-        var existing = ExtractableCohort.GetImportableCohortDefinitions(ect).Where(d => d.Description.Equals(_explicitCohortName)).ToArray();
+        var existing = ExtractableCohort.GetImportableCohortDefinitions(ect)
+            .Where(d => d.Description.Equals(_explicitCohortName)).ToArray();
         var version = 1;
 
         // If the user has used this description before then we can just bump the version by 1
-        if (existing != null && existing.Any())
-        {
-            version = existing.Max(v => v.Version) + 1;
-        }
+        if (existing != null && existing.Any()) version = existing.Max(v => v.Version) + 1;
 
-        return new CohortCreationRequest(Project, new CohortDefinition(null, name, version, Project.ProjectNumber.Value, ect), BasicActivator.RepositoryLocator.DataExportRepository, auditLogDescription);
+        return new CohortCreationRequest(Project,
+            new CohortDefinition(null, name, version, Project.ProjectNumber.Value, ect),
+            BasicActivator.RepositoryLocator.DataExportRepository, auditLogDescription);
     }
 
     public virtual IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
@@ -135,16 +138,20 @@ public virtual IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     }
 
 
-    protected IPipelineRunner GetConfigureAndExecuteControl(ICohortCreationRequest request, string description, object cohortIsBeingCreatedFrom)
+    protected IPipelineRunner GetConfigureAndExecuteControl(ICohortCreationRequest request, string description,
+        object cohortIsBeingCreatedFrom)
     {
         var catalogueRepository = BasicActivator.RepositoryLocator.CatalogueRepository;
 
-        var pipelineRunner = BasicActivator.GetPipelineRunner(new DialogArgs {
+        var pipelineRunner = BasicActivator.GetPipelineRunner(new DialogArgs
+        {
             WindowTitle = "Commit Cohort",
-            TaskDescription = $"Select a Pipeline compatible with creating a Cohort from an '{cohortIsBeingCreatedFrom.GetType().Name}'.  If the pipeline completes succesfully a new Saved Cohort will be created and the cohort identifiers stored in '{request?.NewCohortDefinition?.LocationOfCohort?.Name ?? "Unknown"}'."
-        },request, Pipeline);
+            TaskDescription =
+                $"Select a Pipeline compatible with creating a Cohort from an '{cohortIsBeingCreatedFrom.GetType().Name}'.  If the pipeline completes succesfully a new Saved Cohort will be created and the cohort identifiers stored in '{request?.NewCohortDefinition?.LocationOfCohort?.Name ?? "Unknown"}'."
+        }, request, Pipeline);
 
-        pipelineRunner.PipelineExecutionFinishedsuccessfully += (o, args) => OnCohortCreatedSuccessfully(pipelineRunner, request);
+        pipelineRunner.PipelineExecutionFinishedsuccessfully +=
+            (o, args) => OnCohortCreatedSuccessfully(pipelineRunner, request);
 
         //add in the logging server
         var loggingServer = catalogueRepository.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
@@ -155,7 +162,8 @@ protected IPipelineRunner GetConfigureAndExecuteControl(ICohortCreationRequest r
             logManager.CreateNewLoggingTaskIfNotExists(ExtractableCohort.CohortLoggingTask);
 
             //create a db listener
-            var toDbListener = new ToLoggingDatabaseDataLoadEventListener(this, logManager, ExtractableCohort.CohortLoggingTask, description);
+            var toDbListener = new ToLoggingDatabaseDataLoadEventListener(this, logManager,
+                ExtractableCohort.CohortLoggingTask, description);
 
             //make all messages go to both the db and the UI
             pipelineRunner.SetAdditionalProgressListener(toDbListener);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs
index d2e0a8efbe..7c5d265042 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration.cs
@@ -27,13 +27,15 @@ public class ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfig
     private CohortIdentificationConfiguration _cic;
     private readonly CohortIdentificationConfiguration[] _allConfigurations;
 
-    public ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(IBasicActivateItems activator, ExternalCohortTable externalCohortTable) :
+    public ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(IBasicActivateItems activator,
+        ExternalCohortTable externalCohortTable) :
         this(activator, null, externalCohortTable, null, null, null)
     {
         _allConfigurations = activator.CoreChildProvider.AllCohortIdentificationConfigurations;
 
         if (!_allConfigurations.Any())
-            SetImpossible("You do not have any CohortIdentificationConfigurations yet, you can create them through the 'Cohorts Identification Toolbox' accessible through Window=>Cohort Identification");
+            SetImpossible(
+                "You do not have any CohortIdentificationConfigurations yet, you can create them through the 'Cohorts Identification Toolbox' accessible through Window=>Cohort Identification");
 
         UseTripleDotSuffix = true;
     }
@@ -48,34 +50,32 @@ public ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguratio
         string cohortName,
         [DemandsInitialization(Desc_ProjectParameter)]
         Project project,
-        [DemandsInitialization("Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
+        [DemandsInitialization(
+            "Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
         IPipeline pipeline) :
         base(activator, ect, cohortName, project, pipeline)
     {
         _cic = cic;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Run the cohort identification configuration (query) and save the resulting final cohort identifier list into a saved cohort database";
-    }
+    public override string GetCommandHelp() =>
+        "Run the cohort identification configuration (query) and save the resulting final cohort identifier list into a saved cohort database";
 
     public override void Execute()
     {
         base.Execute();
 
-        var cic = _cic ?? (CohortIdentificationConfiguration)BasicActivator.SelectOne("Select Cohort Builder Query", BasicActivator.GetAll<CohortIdentificationConfiguration>().ToArray());
+        var cic = _cic ?? (CohortIdentificationConfiguration)BasicActivator.SelectOne("Select Cohort Builder Query",
+            BasicActivator.GetAll<CohortIdentificationConfiguration>().ToArray());
         if (cic == null)
             return;
 
 
         if (Project == null && BasicActivator.CoreChildProvider is DataExportChildProvider dx)
         {
-            var projAssociations = dx.AllProjectAssociatedCics.Where(c => c.CohortIdentificationConfiguration_ID == cic.ID).ToArray();
-            if (projAssociations.Length == 1)
-            {
-                Project = projAssociations[0].Project;
-            }
+            var projAssociations = dx.AllProjectAssociatedCics
+                .Where(c => c.CohortIdentificationConfiguration_ID == cic.ID).ToArray();
+            if (projAssociations.Length == 1) Project = projAssociations[0].Project;
         }
 
         var auditLogBuilder = new ExtractableCohortAuditLogBuilder();
@@ -87,27 +87,27 @@ public override void Execute()
 
         request.CohortIdentificationConfiguration = cic;
 
-        var configureAndExecute = GetConfigureAndExecuteControl(request, $"Execute CIC {cic} and commmit results",cic);
+        var configureAndExecute = GetConfigureAndExecuteControl(request, $"Execute CIC {cic} and commmit results", cic);
 
-        configureAndExecute.PipelineExecutionFinishedsuccessfully += (s,u)=>OnImportCompletedSuccessfully(s,u,cic);
+        configureAndExecute.PipelineExecutionFinishedsuccessfully += (s, u) => OnImportCompletedSuccessfully(s, u, cic);
 
         configureAndExecute.Run(BasicActivator.RepositoryLocator, null, null, null);
     }
 
-    private void OnImportCompletedSuccessfully(object sender, PipelineEngineEventArgs u, CohortIdentificationConfiguration cic)
+    private void OnImportCompletedSuccessfully(object sender, PipelineEngineEventArgs u,
+        CohortIdentificationConfiguration cic)
     {
         //see if we can associate the cic with the project
-        var cmd = new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(BasicActivator).SetTarget((Project)Project).SetTarget(cic);
+        var cmd = new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(BasicActivator)
+            .SetTarget((Project)Project).SetTarget(cic);
 
         //we can!
         if (!cmd.IsImpossible)
             cmd.Execute();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Import);
 
     public override IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromCatalogue.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromCatalogue.cs
index 9546de02c3..166fbdfd7a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromCatalogue.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromCatalogue.cs
@@ -26,7 +26,8 @@ public class ExecuteCommandCreateNewCohortFromCatalogue : CohortCreationCommandE
     private ExtractionInformation _extractionIdentifierColumn;
 
 
-    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator, ExtractionInformation extractionInformation) : this(activator)
+    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
+        ExtractionInformation extractionInformation) : this(activator)
     {
         if (!extractionInformation.IsExtractionIdentifier)
             SetImpossible("Column is not marked IsExtractionIdentifier");
@@ -37,16 +38,17 @@ public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
     }
 
 
-    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator, Catalogue catalogue) : this(activator)
+    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator, Catalogue catalogue) :
+        this(activator)
     {
-        if(catalogue != null)
+        if (catalogue != null)
             SetExtractionIdentifierColumn(GetExtractionInformationFromCatalogue(catalogue));
     }
 
     [UseWithObjectConstructor]
     public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
-
-        [DemandsInitialization("Either a Catalogue with a single IsExtractionIdentifier column or a specific ExtractionInformation to query")]
+        [DemandsInitialization(
+            "Either a Catalogue with a single IsExtractionIdentifier column or a specific ExtractionInformation to query")]
         IMapsDirectlyToDatabaseTable toQuery,
         [DemandsInitialization(Desc_ExternalCohortTableParameter)]
         ExternalCohortTable ect,
@@ -54,7 +56,8 @@ public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
         string cohortName,
         [DemandsInitialization(Desc_ProjectParameter)]
         Project project,
-        [DemandsInitialization("Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
+        [DemandsInitialization(
+            "Pipeline for executing the query, performing any required transforms on the output list and allocating release identifiers")]
         IPipeline pipeline) : base(activator, ect, cohortName, project, pipeline)
     {
         UseTripleDotSuffix = true;
@@ -63,26 +66,25 @@ public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
         {
             if (toQuery is Catalogue c)
                 SetExtractionIdentifierColumn(GetExtractionInformationFromCatalogue(c));
-            else
-            if (toQuery is ExtractionInformation ei)
+            else if (toQuery is ExtractionInformation ei)
                 SetExtractionIdentifierColumn(ei);
             else
-                throw new ArgumentException($"{nameof(toQuery)} must be a Catalogue or an ExtractionInformation but it was a {toQuery.GetType().Name}", nameof(toQuery));
+                throw new ArgumentException(
+                    $"{nameof(toQuery)} must be a Catalogue or an ExtractionInformation but it was a {toQuery.GetType().Name}",
+                    nameof(toQuery));
         }
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a cohort using ALL of the patient identifiers in the referenced dataset";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a cohort using ALL of the patient identifiers in the referenced dataset";
 
     public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator)
         : this(activator, null, null, null, null, null)
     {
     }
 
-    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator, ExternalCohortTable externalCohortTable) : this(activator)
+    public ExecuteCommandCreateNewCohortFromCatalogue(IBasicActivateItems activator,
+        ExternalCohortTable externalCohortTable) : this(activator)
     {
         ExternalCohortTable = externalCohortTable;
     }
@@ -124,7 +126,8 @@ public override void Execute()
     {
         if (_extractionIdentifierColumn == null)
         {
-            var cata = (ICatalogue)BasicActivator.SelectOne("Select Catalogue to create cohort from", BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>());
+            var cata = (ICatalogue)BasicActivator.SelectOne("Select Catalogue to create cohort from",
+                BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>());
 
             if (cata == null)
                 return;
@@ -134,7 +137,8 @@ public override void Execute()
         base.Execute();
 
         var auditLogBuilder = new ExtractableCohortAuditLogBuilder();
-        var request = GetCohortCreationRequest(ExtractableCohortAuditLogBuilder.GetDescription(_extractionIdentifierColumn));
+        var request =
+            GetCohortCreationRequest(ExtractableCohortAuditLogBuilder.GetDescription(_extractionIdentifierColumn));
 
         //user choose to cancel the cohort creation request dialogue
         if (request == null)
@@ -147,8 +151,6 @@ public override void Execute()
         configureAndExecute.Run(BasicActivator.RepositoryLocator, null, null, null);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromFile.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromFile.cs
index 3a89ef2a8a..f91993630f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromFile.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromFile.cs
@@ -24,32 +24,29 @@ public class ExecuteCommandCreateNewCohortFromFile : CohortCreationCommandExecut
 {
     private FileInfo _file;
 
-    public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator, ExternalCohortTable externalCohortTable) :
+    public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator, ExternalCohortTable externalCohortTable)
+        :
         base(activator, externalCohortTable, null, null, null)
     {
         UseTripleDotSuffix = true;
     }
 
-    public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator, FileInfo file, ExternalCohortTable externalCohortTable)
+    public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator, FileInfo file,
+        ExternalCohortTable externalCohortTable)
         : this(activator, file, externalCohortTable, null, null, null)
     {
     }
 
     [UseWithObjectConstructor]
     public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator,
-
         [DemandsInitialization("A file containing private cohort identifiers")]
         FileInfo file,
-
         [DemandsInitialization(Desc_ExternalCohortTableParameter)]
         ExternalCohortTable externalCohortTable,
-
         [DemandsInitialization(Desc_CohortNameParameter)]
         string cohortName,
-
         [DemandsInitialization(Desc_ProjectParameter)]
         Project project,
-
         [DemandsInitialization("Pipeline for reading from the file and allocating release identifiers")]
         IPipeline pipeline)
         : base(activator, externalCohortTable, cohortName, project, pipeline)
@@ -58,15 +55,10 @@ public ExecuteCommandCreateNewCohortFromFile(IBasicActivateItems activator,
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Create a cohort containing ALL the patient identifiers in the chosen file";
-    }
+    public override string GetCommandHelp() =>
+        "Create a cohort containing ALL the patient identifiers in the chosen file";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.ImportFile);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.ImportFile);
 
     public override void Execute()
     {
@@ -86,7 +78,9 @@ public override void Execute()
             flatFile = new FlatFileToLoad(file);
         }
         else
+        {
             flatFile = new FlatFileToLoad(_file);
+        }
 
         var auditLogBuilder = new ExtractableCohortAuditLogBuilder();
         var request = GetCohortCreationRequest(ExtractableCohortAuditLogBuilder.GetDescription(flatFile.File));
@@ -97,7 +91,8 @@ public override void Execute()
 
         request.FileToLoad = flatFile;
 
-        var configureAndExecuteDialog = GetConfigureAndExecuteControl(request, $"Uploading File {flatFile.File.Name}", flatFile);
+        var configureAndExecuteDialog =
+            GetConfigureAndExecuteControl(request, $"Uploading File {flatFile.File.Name}", flatFile);
 
         //add the flat file to the dialog with an appropriate description of what they are trying to achieve
         configureAndExecuteDialog.Run(BasicActivator.RepositoryLocator, null, null, null);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromTable.cs
index 1d1c798d52..f6001621db 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandCreateNewCohortFromTable.cs
@@ -29,38 +29,34 @@ public class ExecuteCommandCreateNewCohortFromTable : CohortCreationCommandExecu
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="externalCohortTable"></param>
-    public ExecuteCommandCreateNewCohortFromTable(IBasicActivateItems activator, ExternalCohortTable externalCohortTable) : base(activator)
+    public ExecuteCommandCreateNewCohortFromTable(IBasicActivateItems activator,
+        ExternalCohortTable externalCohortTable) : base(activator)
     {
         UseTripleDotSuffix = true;
         ExternalCohortTable = externalCohortTable;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a cohort using ALL of the patient identifiers in the referenced table";
-    }
-        
+    public override string GetCommandHelp() =>
+        "Creates a cohort using ALL of the patient identifiers in the referenced table";
+
 
     public override void Execute()
     {
         var tbl = BasicActivator.SelectTable(false, "Pick a table to import cohorts from");
 
         if (tbl == null)
-        {
             // user cancelled selecting a table
             return;
-        }
 
         if (!BasicActivator.SelectObject(new DialogArgs
             {
                 EntryLabel = "Patient Identifier Column",
-                TaskDescription = $"Select which column in the table '{tbl.GetFullyQualifiedName()}' contains the patient identifiers which you want to import",
+                TaskDescription =
+                    $"Select which column in the table '{tbl.GetFullyQualifiedName()}' contains the patient identifiers which you want to import",
                 AllowAutoSelect = true
             }, tbl.DiscoverColumns(), out var col))
-        {
             // user cancelled selecting a column
             return;
-        }
 
         base.Execute();
 
@@ -94,8 +90,6 @@ public override void Execute()
         configureAndExecute.Run(BasicActivator.RepositoryLocator, null, null, null);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandImportAlreadyExistingCohort.cs b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandImportAlreadyExistingCohort.cs
index 0d215aefff..0092bb0a4f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandImportAlreadyExistingCohort.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/CohortCreationCommands/ExecuteCommandImportAlreadyExistingCohort.cs
@@ -21,20 +21,20 @@ public class ExecuteCommandImportAlreadyExistingCohort : BasicCommandExecution,
     private readonly IProject specificProject;
     private int? _explicitOriginIDToImport;
 
-    public ExecuteCommandImportAlreadyExistingCohort(IBasicActivateItems activator, ExternalCohortTable externalCohortTable, IProject specificProject):base(activator)
+    public ExecuteCommandImportAlreadyExistingCohort(IBasicActivateItems activator,
+        ExternalCohortTable externalCohortTable, IProject specificProject) : base(activator)
     {
         _externalCohortTable = externalCohortTable;
         this.specificProject = specificProject;
 
-        if(specificProject != null && specificProject.ProjectNumber == null)
-        {
+        if (specificProject != null && specificProject.ProjectNumber == null)
             SetImpossible("Project does not have a ProjectNumber yet");
-        }
     }
 
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandImportAlreadyExistingCohort(IBasicActivateItems activator, ExternalCohortTable externalCohortTable, int originIDToImport)  : this(activator,externalCohortTable,null)
+    public ExecuteCommandImportAlreadyExistingCohort(IBasicActivateItems activator,
+        ExternalCohortTable externalCohortTable, int originIDToImport) : this(activator, externalCohortTable, null)
     {
         _explicitOriginIDToImport = originIDToImport;
     }
@@ -48,17 +48,14 @@ public override void Execute()
         if (ect == null)
         {
             var available = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<ExternalCohortTable>();
-            if(!SelectOne(available,out ect,null,true))
-            {
-                return;
-            }   
+            if (!SelectOne(available, out ect, null, true)) return;
         }
 
 
         var newId = _explicitOriginIDToImport ?? GetWhichCohortToImport(ect);
 
-            
-        if(newId.HasValue)
+
+        if (newId.HasValue)
         {
             new ExtractableCohort(BasicActivator.RepositoryLocator.DataExportRepository, ect, newId.Value);
             Publish(ect);
@@ -68,10 +65,11 @@ public override void Execute()
     private int? GetWhichCohortToImport(ExternalCohortTable ect)
     {
         // the cohorts in the database
-        var available = ExtractableCohort.GetImportableCohortDefinitions(ect).Where(c=>c.ID.HasValue).ToArray();
+        var available = ExtractableCohort.GetImportableCohortDefinitions(ect).Where(c => c.ID.HasValue).ToArray();
 
         // the ones we already know about
-        var existing = new HashSet<int>(BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableCohort>().Select(c=>c.OriginID));
+        var existing = new HashSet<int>(BasicActivator.RepositoryLocator.DataExportRepository
+            .GetAllObjects<ExtractableCohort>().Select(c => c.OriginID));
 
         // new ones we don't know about yet
         available = available.Where(c => !existing.Contains(c.ID.Value)).ToArray();
@@ -88,24 +86,20 @@ public override void Execute()
         {
             available = available.Where(a => a.ProjectNumber == specificProject.ProjectNumber).ToArray();
 
-            if(!available.Any())
+            if (!available.Any())
             {
-                BasicActivator.Show($"There are no new cohorts to import for ProjectNumber {specificProject.ProjectNumber}");
+                BasicActivator.Show(
+                    $"There are no new cohorts to import for ProjectNumber {specificProject.ProjectNumber}");
                 return null;
             }
         }
 
         // pick which one to import
-        if(BasicActivator.SelectObject("Import Cohort",available, out var cd))
-        {
-            return cd.ID;
-        }
+        if (BasicActivator.SelectObject("Import Cohort", available, out var cd)) return cd.ID;
 
         return null;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortAggregate, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortAggregate, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandActivate.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandActivate.cs
index 07c1b09230..aa6d9b83de 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandActivate.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandActivate.cs
@@ -45,10 +45,7 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
         return iconProvider.GetImage(_o, OverlayKind.Edit);
     }
 
-    public override string GetCommandName()
-    {
-        return OverrideCommandName ?? GlobalStrings.Activate;
-    }
+    public override string GetCommandName() => OverrideCommandName ?? GlobalStrings.Activate;
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer.cs
index 9d1eabf426..00719c495d 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer :BasicCommandExecution
+public class ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer : BasicCommandExecution
 {
     private readonly AggregateConfigurationCombineable _aggregateConfigurationCombineable;
     private readonly CohortAggregateContainer _targetCohortAggregateContainer;
@@ -39,7 +39,8 @@ private void SetCommandWeight()
     }
 
 
-    private ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator, CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
+    private ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator,
+        CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
     {
         _targetCohortAggregateContainer = targetCohortAggregateContainer;
 
@@ -50,7 +51,9 @@ private ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContaine
         SetCommandWeight();
     }
 
-    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator,AggregateConfigurationCombineable aggregateConfigurationCommand, CohortAggregateContainer targetCohortAggregateContainer) : this(activator,targetCohortAggregateContainer)
+    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator,
+        AggregateConfigurationCombineable aggregateConfigurationCommand,
+        CohortAggregateContainer targetCohortAggregateContainer) : this(activator, targetCohortAggregateContainer)
     {
         _aggregateConfigurationCombineable = aggregateConfigurationCommand;
 
@@ -58,7 +61,8 @@ public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator, AggregateConfiguration aggregateConfiguration, CohortAggregateContainer targetCohortAggregateContainer)
+    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems activator,
+        AggregateConfiguration aggregateConfiguration, CohortAggregateContainer targetCohortAggregateContainer)
         : this(activator, new AggregateConfigurationCombineable(aggregateConfiguration), targetCohortAggregateContainer)
     {
     }
@@ -69,25 +73,24 @@ public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer
     /// <param name="basicActivator"></param>
     /// <param name="targetCohortAggregateContainer"></param>
     /// <param name="offerCohortAggregates"></param>
-    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems basicActivator, CohortAggregateContainer targetCohortAggregateContainer, bool offerCohortAggregates) : this(basicActivator, targetCohortAggregateContainer)
+    public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(IBasicActivateItems basicActivator,
+        CohortAggregateContainer targetCohortAggregateContainer, bool offerCohortAggregates) : this(basicActivator,
+        targetCohortAggregateContainer)
     {
-        if(offerCohortAggregates)
+        if (offerCohortAggregates)
         {
-            _available = BasicActivator.CoreChildProvider.AllAggregateConfigurations.Where(c =>c.IsCohortIdentificationAggregate && !c.IsJoinablePatientIndexTable()).ToArray();
+            _available = BasicActivator.CoreChildProvider.AllAggregateConfigurations
+                .Where(c => c.IsCohortIdentificationAggregate && !c.IsJoinablePatientIndexTable()).ToArray();
 
-            if(_available.Length == 0)
-            {
-                SetImpossible("You do not currently have any cohort sets");
-            }
+            if (_available.Length == 0) SetImpossible("You do not currently have any cohort sets");
         }
         else
         {
-            _available = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<AggregateConfiguration>().Where(c => !c.IsCohortIdentificationAggregate).ToArray();
+            _available = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<AggregateConfiguration>()
+                .Where(c => !c.IsCohortIdentificationAggregate).ToArray();
 
             if (_available.Length == 0)
-            {
                 SetImpossible("You do not currently have any non-cohort AggregateConfigurations");
-            }
         }
 
         _offerCohortAggregates = offerCohortAggregates;
@@ -95,10 +98,9 @@ public ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer
         SetCommandWeight();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return _offerCohortAggregates ? iconProvider.GetImage(RDMPConcept.CohortAggregate,OverlayKind.Add): iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => _offerCohortAggregates
+        ? iconProvider.GetImage(RDMPConcept.CohortAggregate, OverlayKind.Add)
+        : iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add);
 
     public override string GetCommandName()
     {
@@ -108,9 +110,9 @@ public override string GetCommandName()
 
         // if an execute time decision is expected then command name should reflect the kind of available objects the user can add
         if (_available?.Any() ?? false)
-        {
-            return _offerCohortAggregates ? "Import (Copy of) Cohort Set into container" : "Add Aggregate(s) into container";
-        }
+            return _offerCohortAggregates
+                ? "Import (Copy of) Cohort Set into container"
+                : "Add Aggregate(s) into container";
 
         return base.GetCommandName();
     }
@@ -125,10 +127,7 @@ public override void Execute()
         {
             // runtime decision is required
 
-            if(available == null || !available.Any())
-            {
-                throw new Exception("There are no available objects to add");
-            }
+            if (available == null || !available.Any()) throw new Exception("There are no available objects to add");
 
             // Are there templates that we can use instead of showing all?
             var cataRepo = BasicActivator.RepositoryLocator.CatalogueRepository;
@@ -138,33 +137,29 @@ public override void Execute()
                 .ToArray();
 
             // yes
-            if(templates.Any())
+            if (templates.Any())
             {
                 // ask user if they want to use a template
-                if(BasicActivator.YesNo(new DialogArgs
-                   {
-                       WindowTitle = "Use Template?",
-                       TaskDescription = $"You have {templates.Length} AggregateConfiguration templates, do you want to use one of these?"
-                   },out var useTemplate))
-                {
+                if (BasicActivator.YesNo(new DialogArgs
+                    {
+                        WindowTitle = "Use Template?",
+                        TaskDescription =
+                            $"You have {templates.Length} AggregateConfiguration templates, do you want to use one of these?"
+                    }, out var useTemplate))
                     available = useTemplate ? templates : available.Except(templates).ToArray();
-                }
                 else
-                {
                     // cancel clicked?
                     return;
-                }
             }
 
-            if(!BasicActivator.SelectObjects(new DialogArgs
-               {
-                   WindowTitle = "Add Aggregate Configuration(s) to Container",
-                   TaskDescription = $"Choose which AggregateConfiguration(s) to add to the cohort container '{_targetCohortAggregateContainer.Name}'."
-               },available,out var selected))
-            {
+            if (!BasicActivator.SelectObjects(new DialogArgs
+                {
+                    WindowTitle = "Add Aggregate Configuration(s) to Container",
+                    TaskDescription =
+                        $"Choose which AggregateConfiguration(s) to add to the cohort container '{_targetCohortAggregateContainer.Name}'."
+                }, available, out var selected))
                 // user cancelled
                 return;
-            }
 
             foreach (var aggregateConfiguration in selected)
             {
@@ -174,7 +169,7 @@ public override void Execute()
         }
         else
         {
-            Execute(_aggregateConfigurationCombineable,true);
+            Execute(_aggregateConfigurationCombineable, true);
         }
 
         if (AggregateCreatedIfAny != null)
@@ -183,12 +178,12 @@ public override void Execute()
 
     private void Execute(AggregateConfigurationCombineable toAdd, bool publish)
     {
-
         var cic = _targetCohortAggregateContainer.GetCohortIdentificationConfiguration();
 
         var child = DoNotClone
             ? toAdd.Aggregate
-            : cic.ImportAggregateConfigurationAsIdentifierList(toAdd.Aggregate, (a, b) => CohortCombineToCreateCommandHelper.PickOneExtractionIdentifier(BasicActivator, a, b));
+            : cic.ImportAggregateConfigurationAsIdentifierList(toAdd.Aggregate,
+                (a, b) => CohortCombineToCreateCommandHelper.PickOneExtractionIdentifier(BasicActivator, a, b));
 
         //current contents
         var contents = _targetCohortAggregateContainer.GetOrderedContents().ToArray();
@@ -202,7 +197,7 @@ private void Execute(AggregateConfigurationCombineable toAdd, bool publish)
         _targetCohortAggregateContainer.CreateInsertionPointAtOrder(child, minimumOrder, true);
         _targetCohortAggregateContainer.AddChild(child, minimumOrder);
 
-        if(publish)
+        if (publish)
             Publish(_targetCohortAggregateContainer);
 
         AggregateCreatedIfAny = child;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable.cs
index 08dea23fc4..697b9407d4 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable.cs
@@ -14,29 +14,30 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable : BasicCommandExecution, IAtomicCommand
 {
     private readonly CohortIdentificationConfiguration _configuration;
     private CatalogueCombineable _catalogue;
 
-    public ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(IBasicActivateItems activator, CohortIdentificationConfiguration configuration) : base(activator)
+    public ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(IBasicActivateItems activator,
+        CohortIdentificationConfiguration configuration) : base(activator)
     {
         _configuration = configuration;
 
         UseTripleDotSuffix = true;
     }
 
-    public ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(IBasicActivateItems activator,CatalogueCombineable catalogue, CohortIdentificationConfiguration configuration):this(activator,configuration)
+    public ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(IBasicActivateItems activator,
+        CatalogueCombineable catalogue, CohortIdentificationConfiguration configuration) : this(activator,
+        configuration)
     {
         _catalogue = catalogue;
-        if(!_catalogue.Catalogue.IsApiCall() && !_catalogue.ContainsAtLeastOneExtractionIdentifier)
+        if (!_catalogue.Catalogue.IsApiCall() && !_catalogue.ContainsAtLeastOneExtractionIdentifier)
             SetImpossible($"Catalogue {_catalogue.Catalogue} does not contain any IsExtractionIdentifier columns");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a new patient index table query that fetches a subset of data from the chosen dataset.  This query will be used as part of a cohort identification configuration";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a new patient index table query that fetches a subset of data from the chosen dataset.  This query will be used as part of a cohort identification configuration";
 
     public override void Execute()
     {
@@ -44,20 +45,21 @@ public override void Execute()
 
         if (_catalogue == null)
         {
-            if (!SelectOne(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out Catalogue cata))
+            if (!SelectOne(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(),
+                    out var cata))
                 return;
 
             _catalogue = new CatalogueCombineable(cata);
         }
 
-        var aggregateCommand = _catalogue.GenerateAggregateConfigurationFor(BasicActivator,_configuration);
+        var aggregateCommand = _catalogue.GenerateAggregateConfigurationFor(BasicActivator, _configuration);
 
-        var joinableCommandExecution = new ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(BasicActivator, aggregateCommand, _configuration);
+        var joinableCommandExecution =
+            new ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(BasicActivator, aggregateCommand,
+                _configuration);
         joinableCommandExecution.Execute();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationSetContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationSetContainer.cs
index 212ab03ac9..88dad33395 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationSetContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToCohortIdentificationSetContainer.cs
@@ -32,22 +32,16 @@ public class ExecuteCommandAddCatalogueToCohortIdentificationSetContainer : Basi
 
     public bool SkipMandatoryFilterCreation { get; set; }
 
-    public AggregateConfiguration AggregateCreatedIfAny
-    {
-        get
-        {
-            return _postImportCommand?.AggregateCreatedIfAny;
-        }
-    }
-        
+    public AggregateConfiguration AggregateCreatedIfAny => _postImportCommand?.AggregateCreatedIfAny;
+
     [UseWithObjectConstructor]
     public ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(IBasicActivateItems activator,
-
         [DemandsInitialization("The container you want to add the set into")]
         CohortAggregateContainer targetCohortAggregateContainer,
         [DemandsInitialization("The dataset to add, must have an extraction identifier declared on it")]
         Catalogue catalogue,
-        [DemandsInitialization("Typically optional.  But if Catalogue has multiple columns marked IsExtractionIdentifier then you must indicate which to use here.")]
+        [DemandsInitialization(
+            "Typically optional.  But if Catalogue has multiple columns marked IsExtractionIdentifier then you must indicate which to use here.")]
         ExtractionInformation identifierColumn = null
     ) : base(activator)
     {
@@ -58,20 +52,23 @@ public ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(IBasicActiva
         if (targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
 
-        if(catalogue != null)
+        if (catalogue != null)
         {
             _catalogueCombineable = new CatalogueCombineable(catalogue);
 
             if (identifierColumn != null)
             {
-                if(!identifierColumn.IsExtractionIdentifier)
+                if (!identifierColumn.IsExtractionIdentifier)
                 {
-                    SetImpossible($"Column '{identifierColumn}' is not marked {nameof(ConcreteColumn.IsExtractionIdentifier)}");
+                    SetImpossible(
+                        $"Column '{identifierColumn}' is not marked {nameof(ConcreteColumn.IsExtractionIdentifier)}");
                     return;
                 }
-                if(identifierColumn.CatalogueItem_ID != catalogue.ID)
+
+                if (identifierColumn.CatalogueItem_ID != catalogue.ID)
                 {
-                    SetImpossible($"Column '{identifierColumn}'(ID={identifierColumn.ID}) is not from the same Catalogue as '{catalogue}'(ID={catalogue.ID})");
+                    SetImpossible(
+                        $"Column '{identifierColumn}'(ID={identifierColumn.ID}) is not from the same Catalogue as '{catalogue}'(ID={catalogue.ID})");
                     return;
                 }
 
@@ -85,56 +82,52 @@ public ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(IBasicActiva
         UseTripleDotSuffix = true;
     }
 
-    public ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(IBasicActivateItems activator, CatalogueCombineable catalogueCombineable, CohortAggregateContainer targetCohortAggregateContainer) : this(activator, targetCohortAggregateContainer,null)
+    public ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(IBasicActivateItems activator,
+        CatalogueCombineable catalogueCombineable, CohortAggregateContainer targetCohortAggregateContainer) : this(
+        activator, targetCohortAggregateContainer, null)
     {
         _catalogueCombineable = catalogueCombineable;
         _targetCohortAggregateContainer = targetCohortAggregateContainer;
 
         UpdateIsImpossibleFor(catalogueCombineable);
     }
+
     private void UpdateIsImpossibleFor(CatalogueCombineable catalogueCombineable)
     {
-        if(catalogueCombineable.Catalogue.IsApiCall())
-        {
-            return;
-        }
+        if (catalogueCombineable.Catalogue.IsApiCall()) return;
 
         if (!catalogueCombineable.ContainsAtLeastOneExtractionIdentifier)
             SetImpossible(
                 $"Catalogue {catalogueCombineable.Catalogue} does not contain any IsExtractionIdentifier columns");
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);
 
     public override void Execute()
     {
         base.Execute();
 
         // if user hasn't picked a Catalogue yet
-        if(_catalogueCombineable == null)
+        if (_catalogueCombineable == null)
         {
-            if(!BasicActivator.SelectObjects(new DialogArgs
-               {
-                   WindowTitle = "Add Catalogue(s) to Container",
-                   TaskDescription = $"Choose which Catalogues to add to the cohort container '{_targetCohortAggregateContainer.Name}'.  Catalogues must have at least one IsExtractionIdentifier column."
-               },BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
-            {
+            if (!BasicActivator.SelectObjects(new DialogArgs
+                {
+                    WindowTitle = "Add Catalogue(s) to Container",
+                    TaskDescription =
+                        $"Choose which Catalogues to add to the cohort container '{_targetCohortAggregateContainer.Name}'.  Catalogues must have at least one IsExtractionIdentifier column."
+                }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
                 // user didn't pick one
                 return;
-            }
 
             // for each catalogue they picked
             foreach (var catalogue in selected)
             {
-
                 var combineable = new CatalogueCombineable(catalogue);
 
                 UpdateIsImpossibleFor(combineable);
-                    
-                if(IsImpossible)
+
+                if (IsImpossible)
                     throw new ImpossibleCommandException(this, ReasonCommandImpossible);
 
                 // add it to the cic container
@@ -143,18 +136,19 @@ public override void Execute()
         }
         else
         {
-            Execute(_catalogueCombineable,true);
+            Execute(_catalogueCombineable, true);
         }
-
     }
 
     private void Execute(CatalogueCombineable catalogueCombineable, bool publish)
     {
-        var cmd = catalogueCombineable.GenerateAggregateConfigurationFor(BasicActivator, _targetCohortAggregateContainer, !SkipMandatoryFilterCreation);
+        var cmd = catalogueCombineable.GenerateAggregateConfigurationFor(BasicActivator,
+            _targetCohortAggregateContainer, !SkipMandatoryFilterCreation);
         if (cmd != null)
         {
             _postImportCommand =
-                new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(BasicActivator, cmd, _targetCohortAggregateContainer)
+                new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(BasicActivator, cmd,
+                    _targetCohortAggregateContainer)
                 {
                     DoNotClone = true,
                     NoPublish = !publish
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToGovernancePeriod.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToGovernancePeriod.cs
index ea1af4cda6..cb39f542ee 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToGovernancePeriod.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCatalogueToGovernancePeriod.cs
@@ -10,26 +10,29 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddCatalogueToGovernancePeriod:BasicCommandExecution
+public class ExecuteCommandAddCatalogueToGovernancePeriod : BasicCommandExecution
 {
     private GovernancePeriod _governancePeriod;
     private ICatalogue[] _catalogues;
 
-    public ExecuteCommandAddCatalogueToGovernancePeriod(IBasicActivateItems activator, GovernancePeriod governancePeriod, ICatalogue c):base(activator)
+    public ExecuteCommandAddCatalogueToGovernancePeriod(IBasicActivateItems activator,
+        GovernancePeriod governancePeriod, ICatalogue c) : base(activator)
     {
         _governancePeriod = governancePeriod;
-        _catalogues = new []{c};
+        _catalogues = new[] { c };
 
-        if(_governancePeriod.GovernedCatalogues.Contains(c))
+        if (_governancePeriod.GovernedCatalogues.Contains(c))
             SetImpossible("Catalogue is already governed by that period");
     }
-    public ExecuteCommandAddCatalogueToGovernancePeriod(IBasicActivateItems activator, GovernancePeriod governancePeriod, ICatalogue[] catalogues):base(activator)
+
+    public ExecuteCommandAddCatalogueToGovernancePeriod(IBasicActivateItems activator,
+        GovernancePeriod governancePeriod, ICatalogue[] catalogues) : base(activator)
     {
         _governancePeriod = governancePeriod;
         _catalogues = catalogues;
         _catalogues = catalogues.Except(_governancePeriod.GovernedCatalogues).ToArray();
-            
-        if(!_catalogues.Any())
+
+        if (!_catalogues.Any())
             SetImpossible("All Catalogues are already in the Governance Period");
     }
 
@@ -37,8 +40,8 @@ public override void Execute()
     {
         base.Execute();
 
-        foreach(var catalogue in _catalogues)
-            BasicActivator.RepositoryLocator.CatalogueRepository.GovernanceManager.Link(_governancePeriod,catalogue);
+        foreach (var catalogue in _catalogues)
+            BasicActivator.RepositoryLocator.CatalogueRepository.GovernanceManager.Link(_governancePeriod, catalogue);
 
         Publish(_governancePeriod);
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCohortToExtractionConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCohortToExtractionConfiguration.cs
index db87901e22..7be24a643a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCohortToExtractionConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddCohortToExtractionConfiguration.cs
@@ -17,24 +17,26 @@ public class ExecuteCommandAddCohortToExtractionConfiguration : BasicCommandExec
     private readonly ExtractionConfiguration _targetExtractionConfiguration;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator, ExtractableCohort cohort, ExtractionConfiguration targetExtractionConfiguration)
+    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator, ExtractableCohort cohort,
+        ExtractionConfiguration targetExtractionConfiguration)
         : this(activator, new ExtractableCohortCombineable(cohort), targetExtractionConfiguration)
     {
-
     }
 
-    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator, ExtractableCohortCombineable sourceExtractableCohortComand, ExtractionConfiguration targetExtractionConfiguration) : base(activator)
+    public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems activator,
+        ExtractableCohortCombineable sourceExtractableCohortComand,
+        ExtractionConfiguration targetExtractionConfiguration) : base(activator)
     {
         _sourceExtractableCohortComand = sourceExtractableCohortComand;
         _targetExtractionConfiguration = targetExtractionConfiguration;
 
-        if(_sourceExtractableCohortComand.Cohort.IsDeprecated)
+        if (_sourceExtractableCohortComand.Cohort.IsDeprecated)
         {
             SetImpossible("Cohort is deprecated");
             return;
         }
 
-        if(_sourceExtractableCohortComand.ErrorGettingCohortData != null)
+        if (_sourceExtractableCohortComand.ErrorGettingCohortData != null)
         {
             SetImpossible(
                 $"Could not fetch Cohort data:{_sourceExtractableCohortComand.ErrorGettingCohortData.Message}");
@@ -54,7 +56,7 @@ public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems acti
             return;
         }
 
-        if(_targetExtractionConfiguration.Cohort_ID != null)
+        if (_targetExtractionConfiguration.Cohort_ID != null)
         {
             SetImpossible(_targetExtractionConfiguration.Cohort_ID == sourceExtractableCohortComand.Cohort.ID
                 ? "ExtractionConfiguration already uses this cohort"
@@ -62,8 +64,6 @@ public ExecuteCommandAddCohortToExtractionConfiguration(IBasicActivateItems acti
 
             return;
         }
-
-
     }
 
     public override void Execute()
@@ -73,6 +73,5 @@ public override void Execute()
         _targetExtractionConfiguration.Cohort_ID = _sourceExtractableCohortComand.Cohort.ID;
         _targetExtractionConfiguration.SaveToDatabase();
         Publish(_targetExtractionConfiguration);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDatasetsToConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDatasetsToConfiguration.cs
index d948f30f54..9e43503115 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDatasetsToConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDatasetsToConfiguration.cs
@@ -28,20 +28,24 @@ public class ExecuteCommandAddDatasetsToConfiguration : BasicCommandExecution
     /// </summary>
     private bool _userMustPick;
 
-    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems activator,ExtractableDataSetCombineable sourceExtractableDataSetCombineable, ExtractionConfiguration targetExtractionConfiguration) 
-        : this(activator,targetExtractionConfiguration)
+    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems activator,
+        ExtractableDataSetCombineable sourceExtractableDataSetCombineable,
+        ExtractionConfiguration targetExtractionConfiguration)
+        : this(activator, targetExtractionConfiguration)
     {
-        SetExtractableDataSets(false,sourceExtractableDataSetCombineable.ExtractableDataSets);
+        SetExtractableDataSets(false, sourceExtractableDataSetCombineable.ExtractableDataSets);
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator, ExtractableDataSet extractableDataSet, ExtractionConfiguration targetExtractionConfiguration)
-        : this(itemActivator,targetExtractionConfiguration)
+    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
+        ExtractableDataSet extractableDataSet, ExtractionConfiguration targetExtractionConfiguration)
+        : this(itemActivator, targetExtractionConfiguration)
     {
         SetExtractableDataSets(false, extractableDataSet);
     }
 
-    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator, ExtractionConfiguration targetExtractionConfiguration):base(itemActivator)
+    public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivator,
+        ExtractionConfiguration targetExtractionConfiguration) : base(itemActivator)
     {
         _targetExtractionConfiguration = targetExtractionConfiguration;
 
@@ -53,41 +57,44 @@ public ExecuteCommandAddDatasetsToConfiguration(IBasicActivateItems itemActivato
             if (itemActivator.CoreChildProvider is DataExportChildProvider childProvider)
             {
                 //use the ones that are not already in the ExtractionConfiguration
-                var _datasets = childProvider.GetDatasets(targetExtractionConfiguration).Select(n => n.ExtractableDataSet).ToArray();
+                var _datasets = childProvider.GetDatasets(targetExtractionConfiguration)
+                    .Select(n => n.ExtractableDataSet).ToArray();
                 var _importableDataSets = childProvider.ExtractableDataSets.Except(_datasets)
-                        
+
                     //where it can be used in any Project OR this project only
-                    .Where(ds => ds.Project_ID == null || ds.Project_ID == targetExtractionConfiguration.Project_ID).ToArray();
+                    .Where(ds => ds.Project_ID == null || ds.Project_ID == targetExtractionConfiguration.Project_ID)
+                    .ToArray();
 
                 SetExtractableDataSets(true, _importableDataSets);
             }
             else
             {
                 SetImpossible("CoreChildProvider was not DataExportChildProvider");
-            }            
+            }
     }
-        
-    private void SetExtractableDataSets(bool userMustPick,params IExtractableDataSet[] toAdd)
+
+    private void SetExtractableDataSets(bool userMustPick, params IExtractableDataSet[] toAdd)
     {
         _userMustPick = userMustPick;
         var alreadyInConfiguration = _targetExtractionConfiguration.GetAllExtractableDataSets().ToArray();
         _toadd = toAdd.Except(alreadyInConfiguration).ToArray();
 
-        if(!_toadd.Any())
+        if (!_toadd.Any())
             SetImpossible("ExtractionConfiguration already contains this dataset(s)");
     }
 
     public override void Execute()
     {
         base.Execute();
-            
+
         if (_userMustPick)
         {
             if (!SelectMany(new DialogArgs
                 {
                     WindowTitle = "Select Datasets",
-                    TaskDescription = "Select the Datasets you would like to be exported as part of your Extraction Configuration."
-                }, _toadd.Cast<ExtractableDataSet>().ToArray(),out var selected))
+                    TaskDescription =
+                        "Select the Datasets you would like to be exported as part of your Extraction Configuration."
+                }, _toadd.Cast<ExtractableDataSet>().ToArray(), out var selected))
                 return;
 
             foreach (var ds in selected)
@@ -102,8 +109,6 @@ public override void Execute()
         Publish(_targetExtractionConfiguration);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableDataSet,OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableDataSet, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDimension.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDimension.cs
index 2e3af58d2a..78735069a9 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDimension.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddDimension.cs
@@ -23,7 +23,8 @@ public class ExecuteCommandAddDimension : BasicCommandExecution
     private readonly bool askAtRuntime;
     private float DEFAULT_WEIGHT = 2.4f;
 
-    public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateConfiguration aggregate) : base(basicActivator)
+    public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateConfiguration aggregate) : base(
+        basicActivator)
     {
         Weight = DEFAULT_WEIGHT;
         this.aggregate = aggregate;
@@ -32,7 +33,8 @@ public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateC
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateConfiguration aggregate, string column) : base(basicActivator)
+    public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateConfiguration aggregate,
+        string column) : base(basicActivator)
     {
         Weight = DEFAULT_WEIGHT;
         this.aggregate = aggregate;
@@ -43,7 +45,8 @@ public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateC
             // don't let them try to set a pivot on a cohort aggregate configuration but do let them clear it if it somehow ended up with one
             if (aggregate.IsCohortIdentificationAggregate)
             {
-                SetImpossible($"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
+                SetImpossible(
+                    $"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
                 return;
             }
         }
@@ -61,18 +64,12 @@ public ExecuteCommandAddDimension(IBasicActivateItems basicActivator, AggregateC
 
     private void ValidateCanAdd(AggregateConfiguration aggregate)
     {
-        if(aggregate.Catalogue.IsApiCall())
-        {
-            SetImpossible("API calls cannot have AggregateDimensions");
-        }
+        if (aggregate.Catalogue.IsApiCall()) SetImpossible("API calls cannot have AggregateDimensions");
 
         if (aggregate.IsCohortIdentificationAggregate && !aggregate.IsJoinablePatientIndexTable())
-        {
             if (aggregate.AggregateDimensions.Any())
-            {
-                SetImpossible("Cohort aggregates can only have a single dimension. Remove existing dimension to select another.");
-            }
-        }
+                SetImpossible(
+                    "Cohort aggregates can only have a single dimension. Remove existing dimension to select another.");
     }
 
     public override void Execute()
@@ -87,24 +84,19 @@ public override void Execute()
         if (askAtRuntime)
         {
             if (!possible.Any())
-            {
-                throw new Exception($"There are no ExtractionInformation that can be added as new dimensions to {aggregate}");
-            }
+                throw new Exception(
+                    $"There are no ExtractionInformation that can be added as new dimensions to {aggregate}");
 
             match = (ExtractionInformation)BasicActivator.SelectOne("Choose dimension to add", possible);
 
-            if (match == null)
-            {
-                return;
-            }
+            if (match == null) return;
         }
         else
         {
             match = possible.FirstOrDefault(a => string.Equals(column, a.ToString()));
             if (match == null)
-            {
-                throw new Exception($"Could not find ExtractionInformation {column} in as an addable column to {aggregate}");
-            }
+                throw new Exception(
+                    $"Could not find ExtractionInformation {column} in as an addable column to {aggregate}");
         }
 
         var dim = new AggregateDimension(BasicActivator.RepositoryLocator.CatalogueRepository, match, aggregate);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddExtractionProgress.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddExtractionProgress.cs
index a136c1c505..e2c41c2c5d 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddExtractionProgress.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddExtractionProgress.cs
@@ -36,10 +36,8 @@ public ExecuteCommandAddExtractionProgress(IBasicActivateItems activator, ISelec
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionProgress,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionProgress, OverlayKind.Add);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddFavourite.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddFavourite.cs
index 24a1674f17..56710fd9f7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddFavourite.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddFavourite.cs
@@ -49,7 +49,6 @@ public override void Execute()
         }
         else
         {
-                
             BasicActivator.SelectAnythingThen("Add Favourite",
                 a =>
                 {
@@ -59,7 +58,6 @@ public override void Execute()
                         BasicActivator.FavouritesProvider.AddFavourite(this, a);
                 });
         }
-
     }
 
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddMissingParameters.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddMissingParameters.cs
index 8df36c0c0b..6d8b54dbf7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddMissingParameters.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddMissingParameters.cs
@@ -18,36 +18,28 @@ public class ExecuteCommandAddMissingParameters : BasicCommandExecution
 {
     private ExtractionFilterParameterSet[] _sets;
 
-    public ExecuteCommandAddMissingParameters(IBasicActivateItems activator, ExtractionFilterParameterSet set) : this(activator, new[] { set })
+    public ExecuteCommandAddMissingParameters(IBasicActivateItems activator, ExtractionFilterParameterSet set) : this(
+        activator, new[] { set })
     {
-
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddMissingParameters(IBasicActivateItems activator, ExtractionFilterParameterSet[] sets) : base(activator)
+    public ExecuteCommandAddMissingParameters(IBasicActivateItems activator, ExtractionFilterParameterSet[] sets) :
+        base(activator)
     {
         _sets = sets;
 
         // if nobody is missing any entries
-        if (!_sets.Any(s => s.GetMissingEntries().Any()))
-        {
-            SetImpossible("There are no missing parameters");
-        }
+        if (!_sets.Any(s => s.GetMissingEntries().Any())) SetImpossible("There are no missing parameters");
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        if (_sets.Length == 0)
-        {
-            return;
-        }
+        if (_sets.Length == 0) return;
 
-        foreach (var set in _sets)
-        {
-            set.CreateNewValueEntries();
-        }
+        foreach (var set in _sets) set.CreateNewValueEntries();
 
         Publish(_sets.First());
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewAggregateGraph.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewAggregateGraph.cs
index 0dd978c371..c591c64aa7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewAggregateGraph.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewAggregateGraph.cs
@@ -15,23 +15,23 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewAggregateGraph : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewAggregateGraph : BasicCommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogue;
     private readonly string _name;
 
-    public ExecuteCommandAddNewAggregateGraph(IBasicActivateItems activator, Catalogue catalogue, string name = null) : base(activator)
+    public ExecuteCommandAddNewAggregateGraph(IBasicActivateItems activator, Catalogue catalogue, string name = null) :
+        base(activator)
     {
         _catalogue = catalogue;
         _name = name;
-        if (_catalogue != null && _catalogue.GetAllExtractionInformation(ExtractionCategory.Any).All(ei=>ei.ColumnInfo == null))
+        if (_catalogue != null && _catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+                .All(ei => ei.ColumnInfo == null))
             SetImpossible("Catalogue has no extractable columns");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Add a new graph for understanding the data in a dataset e.g. number of records per year";
-    }
+    public override string GetCommandHelp() =>
+        "Add a new graph for understanding the data in a dataset e.g. number of records per year";
 
     public override void Execute()
     {
@@ -46,39 +46,28 @@ public override void Execute()
                 {
                     WindowTitle = "Add Aggregate Graph",
                     TaskDescription = "Select which Catalogue you want to add the graph to."
-
                 }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
-            {
                 c = selected;
-            }
             else
-            {
                 // user cancelled selecting a Catalogue
                 return;
-            }
         }
 
-        if(name == null && BasicActivator.IsInteractive)
-        {
-            if(!BasicActivator.TypeText(new DialogArgs
-               {
-                   WindowTitle = "Graph Name",
-                   EntryLabel = "Name"
-               },255,null,out name,false))
-            {
+        if (name == null && BasicActivator.IsInteractive)
+            if (!BasicActivator.TypeText(new DialogArgs
+                {
+                    WindowTitle = "Graph Name",
+                    EntryLabel = "Name"
+                }, 255, null, out name, false))
                 // user cancelled typing a name for the graph
                 return;
-            }
-        }
 
-        var newAggregate = new AggregateConfiguration(BasicActivator.RepositoryLocator.CatalogueRepository,c, name ??
+        var newAggregate = new AggregateConfiguration(BasicActivator.RepositoryLocator.CatalogueRepository, c, name ??
             $"New Aggregate {Guid.NewGuid()}");
         Publish(_catalogue);
         Activate(newAggregate);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewCatalogueItem.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewCatalogueItem.cs
index d7f59da8e9..195614f0b8 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewCatalogueItem.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewCatalogueItem.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewCatalogueItem : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewCatalogueItem : BasicCommandExecution, IAtomicCommand
 {
     private Catalogue _catalogue;
     private ColumnInfo[] _columnInfos;
@@ -30,13 +30,14 @@ public class ExecuteCommandAddNewCatalogueItem : BasicCommandExecution,IAtomicCo
     /// </summary>
     public ExtractionCategory? Category { get; set; } = ExtractionCategory.Core;
 
-    public ExecuteCommandAddNewCatalogueItem(IBasicActivateItems activator, Catalogue catalogue,ColumnInfoCombineable colInfo) : this(activator,catalogue,colInfo.ColumnInfos)
+    public ExecuteCommandAddNewCatalogueItem(IBasicActivateItems activator, Catalogue catalogue,
+        ColumnInfoCombineable colInfo) : this(activator, catalogue, colInfo.ColumnInfos)
     {
-            
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandAddNewCatalogueItem(IBasicActivateItems activator, Catalogue catalogue,params ColumnInfo[] columnInfos) : base(activator)
+    public ExecuteCommandAddNewCatalogueItem(IBasicActivateItems activator, Catalogue catalogue,
+        params ColumnInfo[] columnInfos) : base(activator)
     {
         _catalogue = catalogue;
 
@@ -44,7 +45,8 @@ public ExecuteCommandAddNewCatalogueItem(IBasicActivateItems activator, Catalogu
 
         _columnInfos = columnInfos;
 
-        if(_existingColumnInfos != null && _columnInfos.Length > 0 && _columnInfos.All(c => AlreadyInCatalogue(c,_existingColumnInfos)))
+        if (_existingColumnInfos != null && _columnInfos.Length > 0 &&
+            _columnInfos.All(c => AlreadyInCatalogue(c, _existingColumnInfos)))
             SetImpossible("ColumnInfo(s) are already in Catalogue");
     }
 
@@ -53,13 +55,12 @@ private static HashSet<int> GetColumnInfos(Catalogue catalogue)
         if (catalogue == null)
             return null;
 
-        return new HashSet<int>(catalogue.CatalogueItems.Select(ci => ci.ColumnInfo_ID).Where(col => col.HasValue).Select(v => v.Value).Distinct().ToArray());
+        return new HashSet<int>(catalogue.CatalogueItems.Select(ci => ci.ColumnInfo_ID).Where(col => col.HasValue)
+            .Select(v => v.Value).Distinct().ToArray());
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a new virtual column in the dataset, this is the first stage to making a new column extractable or defining a new extraction transform";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a new virtual column in the dataset, this is the first stage to making a new column extractable or defining a new extraction transform";
 
     public override void Execute()
     {
@@ -76,7 +77,6 @@ public override void Execute()
                 {
                     WindowTitle = "Add CatalogueItem",
                     TaskDescription = "Select which Catalogue you want to add the CatalogueItem to."
-
                 }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
             {
                 c = selected;
@@ -88,6 +88,7 @@ public override void Execute()
                 return;
             }
         }
+
         //if we have not got an explicit one to import let the user pick one
         if (_columnInfos.Length == 0)
         {
@@ -96,15 +97,13 @@ public override void Execute()
             {
                 TaskDescription = "Select which column the new CatalogueItem will describe/extract",
                 WindowTitle = "Choose underlying Column"
-            },BasicActivator.CoreChildProvider.AllColumnInfos);
+            }, BasicActivator.CoreChildProvider.AllColumnInfos);
+
+            if (columnInfo == null) return;
 
-            if (columnInfo == null)
-            {
-                return;
-            }   
-                
             //get them to type a name for it (based on the ColumnInfo if picked)
-            if(TypeText("Name", "Type a name for the new CatalogueItem", 500,columnInfo?.GetRuntimeName(),out var text))
+            if (TypeText("Name", "Type a name for the new CatalogueItem", 500, columnInfo?.GetRuntimeName(),
+                    out var text))
             {
                 var ci = new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository, c,
                     $"New CatalogueItem {Guid.NewGuid()}")
@@ -113,23 +112,23 @@ public override void Execute()
                 };
 
                 //set the associated column if they did pick it
-                if(columnInfo != null)
+                if (columnInfo != null)
                 {
                     ci.SetColumnInfo(columnInfo);
-                    CreateExtractionInformation(repo,ci,columnInfo);                        
+                    CreateExtractionInformation(repo, ci, columnInfo);
                 }
 
                 ci.SaveToDatabase();
 
                 Publish(c);
-                Emphasise(ci,int.MaxValue);
+                Emphasise(ci, int.MaxValue);
             }
         }
         else
         {
             foreach (var columnInfo in _columnInfos)
             {
-                if(AlreadyInCatalogue(columnInfo, existingColumnInfos))
+                if (AlreadyInCatalogue(columnInfo, existingColumnInfos))
                     continue;
 
                 var ci = new CatalogueItem(repo, c, columnInfo.GetRuntimeName());
@@ -159,13 +158,9 @@ private void CreateExtractionInformation(ICatalogueRepository repo, CatalogueIte
         }
     }
 
-    private static bool AlreadyInCatalogue(ColumnInfo candidate, HashSet<int> existingColumnInfos)
-    {
-        return existingColumnInfos.Contains(candidate.ID);
-    }
+    private static bool AlreadyInCatalogue(ColumnInfo candidate, HashSet<int> existingColumnInfos) =>
+        existingColumnInfos.Contains(candidate.ID);
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CatalogueItem, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CatalogueItem, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewExtractionFilterParameterSet.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewExtractionFilterParameterSet.cs
index 6b309c828f..fc36361a71 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewExtractionFilterParameterSet.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewExtractionFilterParameterSet.cs
@@ -22,27 +22,25 @@ public class ExecuteCommandAddNewExtractionFilterParameterSet : BasicCommandExec
 {
     private ExtractionFilter _filter;
 
-    public ExecuteCommandAddNewExtractionFilterParameterSet(IBasicActivateItems activator, ExtractionFilter filter):base(activator)
+    public ExecuteCommandAddNewExtractionFilterParameterSet(IBasicActivateItems activator, ExtractionFilter filter) :
+        base(activator)
     {
         _filter = filter;
 
-        if(!_filter.GetAllParameters().Any())
-        {
-            SetImpossible("Filter has no parameters");
-        }
+        if (!_filter.GetAllParameters().Any()) SetImpossible("Filter has no parameters");
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        var parameterSet = new ExtractionFilterParameterSet(BasicActivator.RepositoryLocator.CatalogueRepository, _filter);
+        var parameterSet =
+            new ExtractionFilterParameterSet(BasicActivator.RepositoryLocator.CatalogueRepository, _filter);
         parameterSet.CreateNewValueEntries();
         Publish(_filter);
-        Activate(parameterSet);            
-    }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionFilterParameterSet, OverlayKind.Add);
+        Activate(parameterSet);
     }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionFilterParameterSet, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewFilterContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewFilterContainer.cs
index 1f4bbfdce1..ddda8a298b 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewFilterContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewFilterContainer.cs
@@ -23,16 +23,17 @@ public class ExecuteCommandAddNewFilterContainer : BasicCommandExecution
     public const string FiltersCannotBeAddedToApiCalls = "Filters cannot be added to API calls";
     private const float DEFAULT_WEIGHT = 1.1f;
 
-    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IRootFilterContainerHost host):base(activator)
+    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IRootFilterContainerHost host) :
+        base(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
-        if(host.RootFilterContainer_ID != null)
+        if (host.RootFilterContainer_ID != null)
             SetImpossible("There is already a root filter container on this object");
 
         if (host is AggregateConfiguration ac)
         {
-            if(ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
+            if (ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
                 SetImpossible("Aggregate is set to use another's filter container tree");
 
             if (ac.Catalogue.IsApiCall())
@@ -48,9 +49,10 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
         Weight = DEFAULT_WEIGHT;
 
-        return iconProvider.GetImage(RDMPConcept.FilterContainer,OverlayKind.Add);
+        return iconProvider.GetImage(RDMPConcept.FilterContainer, OverlayKind.Add);
     }
-    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IContainer container):base(activator)
+
+    public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IContainer container) : base(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
@@ -58,26 +60,28 @@ public ExecuteCommandAddNewFilterContainer(IBasicActivateItems activator, IConta
 
         SetImpossibleIfReadonly(container);
     }
+
     public override void Execute()
     {
         base.Execute();
 
-        var factory = (_container?.GetFilterFactory() ?? _host?.GetFilterFactory()) ?? throw new Exception("Unable to determine FilterFactory, is host and container null?");
+        var factory = (_container?.GetFilterFactory() ?? _host?.GetFilterFactory()) ??
+                      throw new Exception("Unable to determine FilterFactory, is host and container null?");
         var newContainer = factory.CreateNewContainer();
-            
-        if(_host != null)
+
+        if (_host != null)
         {
-            _host.RootFilterContainer_ID = newContainer .ID;
+            _host.RootFilterContainer_ID = newContainer.ID;
             _host.SaveToDatabase();
         }
         else
         {
-            if(_container == null)
+            if (_container == null)
                 throw new Exception("Command should take container or host but both were null");
 
             _container.AddChild(newContainer);
         }
-            
+
 
         Publish(_host ?? (IMapsDirectlyToDatabaseTable)newContainer);
         Emphasise(newContainer);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewGovernanceDocument.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewGovernanceDocument.cs
index 9434d4248b..9e82bd57ec 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewGovernanceDocument.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewGovernanceDocument.cs
@@ -13,17 +13,19 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewGovernanceDocument : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewGovernanceDocument : BasicCommandExecution, IAtomicCommand
 {
     private readonly GovernancePeriod _period;
     private FileInfo _file;
 
-    public ExecuteCommandAddNewGovernanceDocument(IBasicActivateItems activator,GovernancePeriod period) : base(activator)
+    public ExecuteCommandAddNewGovernanceDocument(IBasicActivateItems activator, GovernancePeriod period) :
+        base(activator)
     {
         _period = period;
     }
 
-    public ExecuteCommandAddNewGovernanceDocument(IBasicActivateItems activator, GovernancePeriod period,FileInfo file): base(activator)
+    public ExecuteCommandAddNewGovernanceDocument(IBasicActivateItems activator, GovernancePeriod period, FileInfo file)
+        : base(activator)
     {
         _period = period;
         _file = file;
@@ -36,27 +38,23 @@ public override void Execute()
         var p = _period;
         var f = _file;
 
-        if(p == null)
+        if (p == null)
         {
             if (BasicActivator.SelectObject(new DialogArgs
-                {
-                    WindowTitle = "Add Governance Document",
-                    TaskDescription = "Select which GovernancePeriod you want to attach the document to."
-
-                }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<GovernancePeriod>(), out var selected))
-            {
+                    {
+                        WindowTitle = "Add Governance Document",
+                        TaskDescription = "Select which GovernancePeriod you want to attach the document to."
+                    }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<GovernancePeriod>(),
+                    out var selected))
                 p = selected;
-            }
             else
-            {
                 // user cancelled selecting a Catalogue
                 return;
-            }
         }
 
         f ??= BasicActivator.SelectFile("Document to add");
 
-        if(f == null)
+        if (f == null)
             return;
 
         var doc = new GovernanceDocument(BasicActivator.RepositoryLocator.CatalogueRepository, p, f);
@@ -65,8 +63,6 @@ public override void Execute()
         Activate(doc);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.GovernanceDocument, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.GovernanceDocument, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingDocument.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingDocument.cs
index 1d147740f8..2a9eb158f0 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingDocument.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingDocument.cs
@@ -19,7 +19,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewSupportingDocument : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewSupportingDocument : BasicCommandExecution, IAtomicCommand
 {
     private readonly FileCollectionCombineable _fileCollectionCombineable;
     private readonly Catalogue _targetCatalogue;
@@ -29,7 +29,9 @@ public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator, Cat
     {
         _targetCatalogue = catalogue;
     }
-    public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator, FileCollectionCombineable fileCollectionCombineable, Catalogue targetCatalogue): base(activator)
+
+    public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator,
+        FileCollectionCombineable fileCollectionCombineable, Catalogue targetCatalogue) : base(activator)
     {
         _fileCollectionCombineable = fileCollectionCombineable;
         _targetCatalogue = targetCatalogue;
@@ -38,21 +40,20 @@ public ExecuteCommandAddNewSupportingDocument(IBasicActivateItems activator, Fil
         foreach (var doc in allExisting)
         {
             var filename = doc.GetFileName();
-                
-            if(filename == null)
+
+            if (filename == null)
                 continue;
 
-            var collisions = _fileCollectionCombineable.Files.FirstOrDefault(f => f.FullName.Equals(filename.FullName,StringComparison.CurrentCultureIgnoreCase));
-                
-            if(collisions != null)
+            var collisions = _fileCollectionCombineable.Files.FirstOrDefault(f =>
+                f.FullName.Equals(filename.FullName, StringComparison.CurrentCultureIgnoreCase));
+
+            if (collisions != null)
                 SetImpossible($"File '{collisions.Name}' is already a SupportingDocument (ID={doc.ID} - '{doc.Name}')");
         }
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Marks a file on disk as useful for understanding the dataset and (optionally) copies into project extractions";
-    }
+    public override string GetCommandHelp() =>
+        "Marks a file on disk as useful for understanding the dataset and (optionally) copies into project extractions";
 
     public override void Execute()
     {
@@ -66,21 +67,18 @@ public override void Execute()
                 {
                     WindowTitle = "Add SupportingDocument",
                     TaskDescription = "Select which Catalogue you want to add the SupportingDocument to."
-
                 }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
-            {
                 c = selected;
-            }
             else
-            {
                 // user cancelled selecting a Catalogue
                 return;
-            }
         }
 
-        var files = _fileCollectionCombineable != null ? _fileCollectionCombineable.Files : new[] {BasicActivator.SelectFile("File to add")};
+        var files = _fileCollectionCombineable != null
+            ? _fileCollectionCombineable.Files
+            : new[] { BasicActivator.SelectFile("File to add") };
 
-        if(files == null || files.All(f=>f == null))
+        if (files == null || files.All(f => f == null))
             return;
 
         var created = new List<SupportingDocument>();
@@ -97,12 +95,11 @@ public override void Execute()
         Publish(c);
 
         Emphasise(created.Last());
-            
+
         foreach (var doc in created)
             Activate(doc);
     }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SupportingDocument, OverlayKind.Add);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.SupportingDocument, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingSqlTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingSqlTable.cs
index b40faa3bc3..c76ab4be7c 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingSqlTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddNewSupportingSqlTable.cs
@@ -14,21 +14,20 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewSupportingSqlTable : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewSupportingSqlTable : BasicCommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogue;
     private readonly string _name;
 
-    public ExecuteCommandAddNewSupportingSqlTable(IBasicActivateItems activator, Catalogue catalogue, string name = null) : base(activator)
+    public ExecuteCommandAddNewSupportingSqlTable(IBasicActivateItems activator, Catalogue catalogue,
+        string name = null) : base(activator)
     {
         _catalogue = catalogue;
         _name = name;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Allows you to specify some freeform SQL that helps understand / interact with a dataset.  Optionally this SQL can be run and the results provided in project extractions.";
-    }
+    public override string GetCommandHelp() =>
+        "Allows you to specify some freeform SQL that helps understand / interact with a dataset.  Optionally this SQL can be run and the results provided in project extractions.";
 
     public override void Execute()
     {
@@ -44,31 +43,23 @@ public override void Execute()
                 {
                     WindowTitle = "Add Supporting SQL Table",
                     TaskDescription = "Select which Catalogue you want to add the Supporting SQL Table to."
-
                 }, BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
-            {
                 c = selected;
-            }
             else
-            {
                 // user cancelled selecting a Catalogue
                 return;
-            }
         }
 
         if (name == null && BasicActivator.IsInteractive)
-        {
             if (!BasicActivator.TypeText(new DialogArgs
                 {
                     WindowTitle = "Supporting SQL Table Name",
-                    TaskDescription = "Enter a name that describes what data the query will show.  This is a human readable name not a table name.",
+                    TaskDescription =
+                        "Enter a name that describes what data the query will show.  This is a human readable name not a table name.",
                     EntryLabel = "Name"
                 }, 255, null, out name, false))
-            {
                 // user cancelled typing a name
                 return;
-            }
-        }
 
         var newSqlTable = new SupportingSQLTable((ICatalogueRepository)c.Repository, c, name ??
             $"New Supporting SQL Table {Guid.NewGuid()}");
@@ -76,9 +67,7 @@ public override void Execute()
         Activate(newSqlTable);
         Publish(c);
     }
-        
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SupportingSQLTable, OverlayKind.Add);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.SupportingSQLTable, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPackageToConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPackageToConfiguration.cs
index 8635e51024..cf85ef7ea3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPackageToConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPackageToConfiguration.cs
@@ -20,14 +20,15 @@ public class ExecuteCommandAddPackageToConfiguration : BasicCommandExecution, IA
     private ExtractionConfiguration _extractionConfiguration;
     private ExtractableDataSetPackage[] _packages;
 
-    public ExecuteCommandAddPackageToConfiguration(IBasicActivateItems activator, ExtractionConfiguration extractionConfiguration):base(activator)
+    public ExecuteCommandAddPackageToConfiguration(IBasicActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
 
-        if(extractionConfiguration.IsReleased)
+        if (extractionConfiguration.IsReleased)
             SetImpossible("Extraction is Frozen because it has been released and is readonly, try cloning it instead");
 
-        if(activator.CoreChildProvider is DataExportChildProvider childProvider)
+        if (activator.CoreChildProvider is DataExportChildProvider childProvider)
         {
             if (childProvider.AllPackages.Any())
                 _packages = childProvider.AllPackages;
@@ -35,19 +36,20 @@ public ExecuteCommandAddPackageToConfiguration(IBasicActivateItems activator, Ex
                 SetImpossible("There are no ExtractableDatasetPackages configured");
         }
         else
+        {
             SetImpossible("CoreChildProvider is not DataExportIconProvider");
+        }
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        if(SelectOne(_packages,out var package))
-            new ExecuteCommandAddDatasetsToConfiguration(BasicActivator, new ExtractableDataSetCombineable(package), _extractionConfiguration).Execute();
+        if (SelectOne(_packages, out var package))
+            new ExecuteCommandAddDatasetsToConfiguration(BasicActivator, new ExtractableDataSetCombineable(package),
+                _extractionConfiguration).Execute();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage,OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddParameter.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddParameter.cs
index 033d80c14e..bdbfe36bb1 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddParameter.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddParameter.cs
@@ -25,7 +25,8 @@ public class ExecuteCommandAddParameter : BasicCommandExecution, IAtomicCommand
     private readonly string _value;
     private const float DEFAULT_WEIGHT = 2.1f;
 
-    public ExecuteCommandAddParameter(IBasicActivateItems activator, ICollectSqlParameters collector, string parameterName, string datatype, string value) : base(activator)
+    public ExecuteCommandAddParameter(IBasicActivateItems activator, ICollectSqlParameters collector,
+        string parameterName, string datatype, string value) : base(activator)
     {
         Weight = DEFAULT_WEIGHT;
         _collector = collector;
@@ -34,16 +35,11 @@ public ExecuteCommandAddParameter(IBasicActivateItems activator, ICollectSqlPara
         _value = value;
         UseTripleDotSuffix = true;
 
-        if (collector is IMightBeReadOnly r)
-        {
-            SetImpossibleIfReadonly(r);
-        }
+        if (collector is IMightBeReadOnly r) SetImpossibleIfReadonly(r);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ParametersNode);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ParametersNode);
 
     public override void Execute()
     {
@@ -60,18 +56,15 @@ public override void Execute()
             if (BasicActivator.TypeText(new DialogArgs
                 {
                     EntryLabel = "Name",
-                    TaskDescription = "A name is required for the paramater.  It must start with '@' e.g. @myparameter.  Do not add spaces or start the name with a number.",
+                    TaskDescription =
+                        "A name is required for the paramater.  It must start with '@' e.g. @myparameter.  Do not add spaces or start the name with a number.",
                     WindowTitle = "Add Paramater"
-                }, 99,"@myVariable", out var name,false))
-            {
+                }, 99, "@myVariable", out var name, false))
                 // user did type a name
                 n = name;
-            }
             else
-            {
                 // user cancelled typing the parameter name
                 return;
-            }
         }
 
 
@@ -84,15 +77,11 @@ public override void Execute()
                     TaskDescription = "What data type are you storing in the parameter (e.g. datetime2)",
                     WindowTitle = "Parameter Data Type"
                 }, 99, "varchar(10)", out var datatype, false))
-            {
                 // user did type
                 d = datatype;
-            }
             else
-            {
                 // user cancelled typing
                 return;
-            }
         }
 
         if (v == null)
@@ -101,28 +90,22 @@ public override void Execute()
             if (BasicActivator.TypeText(new DialogArgs
                 {
                     EntryLabel = "Value",
-                    TaskDescription = "What value should the parameter have.  Ensure if you are using text that it is appropriately quoted",
+                    TaskDescription =
+                        "What value should the parameter have.  Ensure if you are using text that it is appropriately quoted",
                     WindowTitle = "Parameter Value"
                 }, int.MaxValue, AnyTableSqlParameter.DefaultValue, out var value, false))
-            {
                 // user did type
                 v = value;
-            }
             else
-            {
                 // user cancelled typing
                 return;
-            }
         }
+
         var p = options.CreateNewParameter(n);
         p.ParameterSQL = $"DECLARE {p.ParameterName} as {d}";
         p.Value = v;
         p.SaveToDatabase();
 
-        if (_collector is DatabaseEntity de)
-        {
-            Publish(de);
-        }
-
+        if (_collector is DatabaseEntity de) Publish(de);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPipelineComponent.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPipelineComponent.cs
index 55925baffe..27eff11909 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPipelineComponent.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPipelineComponent.cs
@@ -43,16 +43,15 @@ public ExecuteCommandAddPipelineComponent(IBasicActivateItems activator,
         _order = order;
     }
 
-    public ExecuteCommandAddPipelineComponent(IBasicActivateItems activator, IPipeline pipeline, IPipelineUseCase useCaseIfAny) : base(activator)
+    public ExecuteCommandAddPipelineComponent(IBasicActivateItems activator, IPipeline pipeline,
+        IPipelineUseCase useCaseIfAny) : base(activator)
     {
         _pipeline = pipeline;
         _useCaseIfAny = useCaseIfAny;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.PipelineComponent,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.PipelineComponent, OverlayKind.Add);
 
     public override void Execute()
     {
@@ -68,15 +67,15 @@ public override void Execute()
             var offer = new List<Type>();
 
             bool filter(Type t, object o) => t.IsGenericType &&
-                                          (t.GetGenericTypeDefinition() == typeof(IDataFlowComponent<>) ||
-                                           t.GetGenericTypeDefinition() == typeof(IDataFlowSource<>));
+                                             (t.GetGenericTypeDefinition() == typeof(IDataFlowComponent<>) ||
+                                              t.GetGenericTypeDefinition() == typeof(IDataFlowSource<>));
 
             //get any source and flow components compatible with any context
             offer.AddRange(
                 mef.GetAllTypes()
                     .Where(t => !t.IsInterface && !t.IsAbstract)
                     .Where(t => t.FindInterfaces(filter, null).Any())
-                    .Where(t=> context == null || context.IsAllowable(t))
+                    .Where(t => context == null || context.IsAllowable(t))
             );
 
             if (!BasicActivator.SelectObject("Add", offer.ToArray(), out add))
@@ -89,6 +88,7 @@ bool filter(Type t, object o) => t.IsGenericType &&
         // check if it is a source or destination (or if both are false it is a middle component)
         bool sourceFilter(Type t, object o) =>
             t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IDataFlowSource<>);
+
         bool destFilter(Type t, object o) =>
             t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IDataFlowDestination<>);
 
@@ -99,31 +99,23 @@ bool destFilter(Type t, object o) =>
         {
             order = int.MinValue;
             if (_pipeline.SourcePipelineComponent_ID.HasValue)
-            {
                 throw new Exception($"Pipeline '{_pipeline}' already has a source");
-            }
         }
 
         if (isDest)
         {
             order = int.MaxValue;
             if (_pipeline.DestinationPipelineComponent_ID.HasValue)
-            {
                 throw new Exception($"Pipeline '{_pipeline}' already has a destination");
-            }
         }
 
         // if we don't know the order yet and it's important
         if (!order.HasValue && !isDest && !isSource)
         {
             if (BasicActivator.SelectValueType("Order", typeof(int), 0, out var chosen))
-            {
                 order = (int)chosen;
-            }
             else
-            {
                 return;
-            }
         }
 
         var newComponent = new PipelineComponent(BasicActivator.RepositoryLocator.CatalogueRepository, _pipeline,
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPlugins.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPlugins.cs
index 5ab4658fe1..3580314846 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPlugins.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAddPlugins.cs
@@ -21,14 +21,14 @@ public class ExecuteCommandAddPlugins : BasicCommandExecution, IAtomicCommand
 {
     private FileInfo[] _files;
 
-    public ExecuteCommandAddPlugins(IBasicActivateItems itemActivator):base(itemActivator)
+    public ExecuteCommandAddPlugins(IBasicActivateItems itemActivator) : base(itemActivator)
     {
-
     }
 
-    public ExecuteCommandAddPlugins(IBasicActivateItems itemActivator, FileCollectionCombineable fileCombineable):base(itemActivator)
+    public ExecuteCommandAddPlugins(IBasicActivateItems itemActivator, FileCollectionCombineable fileCombineable) :
+        base(itemActivator)
     {
-        if(fileCombineable.Files.Any(f => f.Extension != PackPluginRunner.PluginPackageSuffix))
+        if (fileCombineable.Files.Any(f => f.Extension != PackPluginRunner.PluginPackageSuffix))
         {
             SetImpossible($"Plugins must {PackPluginRunner.PluginPackageSuffix}");
             return;
@@ -38,42 +38,40 @@ public ExecuteCommandAddPlugins(IBasicActivateItems itemActivator, FileCollectio
 
         _files = fileCombineable.Files;
 
-        var collision = existing.FirstOrDefault(p=>_files.Any(f=>f.Name.Equals(p.Name)));
-        if(collision != null)
+        var collision = existing.FirstOrDefault(p => _files.Any(f => f.Name.Equals(p.Name)));
+        if (collision != null)
             SetImpossible($"There is already a plugin called '{collision}'");
-
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        if(_files == null)
+        if (_files == null)
         {
-
             var f = BasicActivator.SelectFile("Plugin to add",
                 $"Plugins (*{PackPluginRunner.PluginPackageSuffix})", $"*{PackPluginRunner.PluginPackageSuffix}");
-            if(f != null)
-                _files = new FileInfo[]{ f };
+            if (f != null)
+                _files = new FileInfo[] { f };
             else return;
         }
 
 
-        foreach(var f in _files)
+        foreach (var f in _files)
         {
-            var runner = new PackPluginRunner(new CommandLine.Options.PackOptions {File = f.FullName});
-            runner.Run(BasicActivator.RepositoryLocator,new ThrowImmediatelyDataLoadEventListener(),new ThrowImmediatelyCheckNotifier(),new DataFlowPipeline.GracefulCancellationToken());
+            var runner = new PackPluginRunner(new CommandLine.Options.PackOptions { File = f.FullName });
+            runner.Run(BasicActivator.RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(),
+                new ThrowImmediatelyCheckNotifier(), new DataFlowPipeline.GracefulCancellationToken());
         }
-                
+
         Show("Changes will take effect on restart");
-        var p = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Rdmp.Core.Curation.Data.Plugin>().FirstOrDefault();
-            
-        if(p!= null)
+        var p = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Rdmp.Core.Curation.Data.Plugin>()
+            .FirstOrDefault();
+
+        if (p != null)
             Publish(p);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Plugin,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Plugin, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.cs
index ea075d5071..d0c4b7d653 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCatalogueWithLoadMetadata.cs
@@ -15,50 +15,50 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAssociateCatalogueWithLoadMetadata:BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAssociateCatalogueWithLoadMetadata : BasicCommandExecution, IAtomicCommand
 {
     private readonly LoadMetadata _loadMetadata;
     private readonly Catalogue[] _availableCatalogues;
     private readonly ICatalogue[] _otherCatalogues;
     private Catalogue[] _chosenCatalogues;
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata, Catalogue[] toAssociate) : this(activator,loadMetadata)
+    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata,
+        Catalogue[] toAssociate) : this(activator, loadMetadata)
     {
         //if command is possible, select those that are available for association
-        if(!IsImpossible)
+        if (!IsImpossible)
         {
             _chosenCatalogues = _availableCatalogues.Intersect(toAssociate).ToArray();
 
-            if(_chosenCatalogues.Length == 0)
-                SetImpossible($"None of the provided Catalogues are available for association with the LoadMetadata '{loadMetadata}'");
+            if (_chosenCatalogues.Length == 0)
+                SetImpossible(
+                    $"None of the provided Catalogues are available for association with the LoadMetadata '{loadMetadata}'");
         }
-                
-
-            
     }
-    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata) : base(activator)
+
+    public ExecuteCommandAssociateCatalogueWithLoadMetadata(IBasicActivateItems activator, LoadMetadata loadMetadata) :
+        base(activator)
     {
         _loadMetadata = loadMetadata;
 
-        _availableCatalogues = BasicActivator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null).ToArray();
+        _availableCatalogues = BasicActivator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null)
+            .ToArray();
         //Ensure logging task is correct
         _otherCatalogues = _loadMetadata.GetAllCatalogues().ToArray();
-            
-        if(!_availableCatalogues.Any())
+
+        if (!_availableCatalogues.Any())
             SetImpossible("There are no Catalogues that are not associated with another Load already");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Specifies that the table(s) underlying the dataset are loaded by the load configuration.  The union of all catalogue(s) table(s) will be used for RAW=>STAGING=>LIVE migration during DLE execution";
-    }
+    public override string GetCommandHelp() =>
+        "Specifies that the table(s) underlying the dataset are loaded by the load configuration.  The union of all catalogue(s) table(s) will be used for RAW=>STAGING=>LIVE migration during DLE execution";
 
     public override void Execute()
     {
         base.Execute();
 
-        if (_chosenCatalogues == null && !SelectMany(_availableCatalogues,out _chosenCatalogues))
+        if (_chosenCatalogues == null && !SelectMany(_availableCatalogues, out _chosenCatalogues))
             return;
 
         foreach (var cata in _chosenCatalogues)
@@ -75,23 +75,22 @@ public override void Execute()
                     //and that logging task is not blank!, and differs from this Catalogue
                     if (!string.IsNullOrWhiteSpace(task) && !task.Equals(cata.LoggingDataTask))
                     {
-                        var liveServers = _otherCatalogues.Where(c => c.LiveLoggingServer_ID != null).Select(c => c.LiveLoggingServer_ID).Distinct().ToArray();
+                        var liveServers = _otherCatalogues.Where(c => c.LiveLoggingServer_ID != null)
+                            .Select(c => c.LiveLoggingServer_ID).Distinct().ToArray();
 
                         //AND if there is agreement on what logging server to use!
                         if (liveServers.Length <= 1)
-                        {
                             //if there is no current logging task for the Catalogue
                             if (string.IsNullOrWhiteSpace(cata.LoggingDataTask)
-
                                 //or if the user wants to switch to the new one
                                 || YesNo(
-                                    $"Do you want to set Catalogue '{cata.Name}' to use shared logging task '{task}' instead of its current Logging Task '{cata.LoggingDataTask}' (All Catalogues in a load must share the same task and logging servers)?", "Synchronise Logging Tasks"))
+                                    $"Do you want to set Catalogue '{cata.Name}' to use shared logging task '{task}' instead of its current Logging Task '{cata.LoggingDataTask}' (All Catalogues in a load must share the same task and logging servers)?",
+                                    "Synchronise Logging Tasks"))
                             {
                                 //switch Catalogue to use that logging task (including servers)
                                 cata.LoggingDataTask = task;
                                 cata.LiveLoggingServer_ID = liveServers.SingleOrDefault();
                             }
-                        }
                     }
                 }
                 else if (tasks.Length == 0)
@@ -104,21 +103,19 @@ public override void Execute()
             cata.LoadMetadata_ID = _loadMetadata.ID;
             cata.SaveToDatabase();
         }
-            
+
         Publish(_loadMetadata);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Add);
 
     public ICommandExecution SetTarget(Catalogue[] catalogues)
     {
         _chosenCatalogues = catalogues;
-        if(_otherCatalogues.Any(catalogues.Contains))
+        if (_otherCatalogues.Any(catalogues.Contains))
             SetImpossible("Catalogue(s) are already part of the LoadMetadata");
-            
+
         return this;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCohortIdentificationConfigurationWithProject.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCohortIdentificationConfigurationWithProject.cs
index e05074b38c..9d3d7ae0d9 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCohortIdentificationConfigurationWithProject.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandAssociateCohortIdentificationConfigurationWithProject.cs
@@ -15,28 +15,29 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAssociateCohortIdentificationConfigurationWithProject:BasicCommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandAssociateCohortIdentificationConfigurationWithProject : BasicCommandExecution,
+    IAtomicCommandWithTarget
 {
     private Project _project;
     private CohortIdentificationConfiguration _cic;
     private ProjectCohortIdentificationConfigurationAssociation[] _existingAssociations;
 
-    public ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(IBasicActivateItems activator) : base(activator)
+    public ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(IBasicActivateItems activator) :
+        base(activator)
     {
-        if(!activator.CoreChildProvider.AllCohortIdentificationConfigurations.Any())
+        if (!activator.CoreChildProvider.AllCohortIdentificationConfigurations.Any())
             SetImpossible("There are no Cohort Identification Configurations yet");
 
-        _existingAssociations = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>();
+        _existingAssociations = BasicActivator.RepositoryLocator.DataExportRepository
+            .GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>();
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Specifies that the Cohort Identification Configuration (query) is only for use generating cohorts for extractions of the specified project";
-    }
+    public override string GetCommandHelp() =>
+        "Specifies that the Cohort Identification Configuration (query) is only for use generating cohorts for extractions of the specified project";
 
     public override void Execute()
     {
-        if(_project == null)
+        if (_project == null)
         {
             //project is not known so get all projects 
             var valid = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>();
@@ -61,7 +62,7 @@ public override void Execute()
             //cic is not known (but project is thanks to above block)
             var valid =
                 BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>();
-                
+
             //allow them to select any cic where it does not already belong to the project
             valid =
                 valid.Where(v =>
@@ -80,8 +81,9 @@ public override void Execute()
         base.Execute();
 
         //create new relationship in database between the cic and project
-        new ProjectCohortIdentificationConfigurationAssociation(BasicActivator.RepositoryLocator.DataExportRepository,_project, _cic);
-            
+        new ProjectCohortIdentificationConfigurationAssociation(BasicActivator.RepositoryLocator.DataExportRepository,
+            _project, _cic);
+
         Publish(_project);
         Publish(_cic);
         Emphasise(_cic);
@@ -90,8 +92,8 @@ public override void Execute()
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
         //if we know the cic the context is 'pick a project'
-        if(_cic != null)
-            return iconProvider.GetImage(RDMPConcept.Project,OverlayKind.Add);
+        if (_cic != null)
+            return iconProvider.GetImage(RDMPConcept.Project, OverlayKind.Add);
 
         //if we know the _project the context is 'pick a cic'  (or if we don't know either then just use this icon too)
         return iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link);
@@ -109,12 +111,10 @@ public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
                 SetImpossibleIfReadonly(_cic);
                 break;
         }
-            
+
         if (_project != null && _cic != null)
-        {
-            if(_project.GetAssociatedCohortIdentificationConfigurations().Contains(_cic))
+            if (_project.GetAssociatedCohortIdentificationConfigurations().Contains(_cic))
                 SetImpossible("Cohort Identification Configuration is already associated with this Project");
-        }
 
         return this;
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandBulkImportTableInfos.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandBulkImportTableInfos.cs
index afb967796f..265dd15eb8 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandBulkImportTableInfos.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandBulkImportTableInfos.cs
@@ -59,9 +59,9 @@ public override void Execute()
 
         if (YesNo("Would you also like to import ShareDefinitions (metadata)?", "Import Metadata From File(s)"))
         {
-            var chosen = BasicActivator.SelectFiles("Share Definition Files","Share Definitions","*.sd");
+            var chosen = BasicActivator.SelectFiles("Share Definition Files", "Share Definitions", "*.sd");
 
-            if(chosen != null)
+            if (chosen != null)
                 foreach (var f in chosen)
                     using (var stream = File.Open(f.FullName, FileMode.Open))
                     {
@@ -70,14 +70,14 @@ public override void Execute()
                         if (newObjects != null)
                             catalogues.AddRange(newObjects.OfType<ICatalogue>());
                     }
-
         }
 
         var generateCatalogues = false;
 
         if (YesNo("Would you like to try to guess non-matching Catalogues by Name?", "Guess by name"))
             catalogues.AddRange(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>());
-        else if (YesNo("Would you like to generate empty Catalogues for non-matching tables instead?", "Generate New Catalogues"))
+        else if (YesNo("Would you like to generate empty Catalogues for non-matching tables instead?",
+                     "Generate New Catalogues"))
             generateCatalogues = true;
 
         var married = new Dictionary<CatalogueItem, ColumnInfo>();
@@ -86,19 +86,13 @@ public override void Execute()
 
         var novel = new List<DiscoveredTable>();
 
-        foreach (var discoveredTable in db.DiscoverTables(includeViews: false))
+        foreach (var discoveredTable in db.DiscoverTables(false))
         {
             var collide = existing.FirstOrDefault(t => t.Is(discoveredTable));
-            if (collide == null)
-            {
-                novel.Add(discoveredTable);
-            }
+            if (collide == null) novel.Add(discoveredTable);
         }
 
-        if(!BasicActivator.SelectObjects("Import", novel.ToArray(), out var selected))
-        {
-            return;
-        }
+        if (!BasicActivator.SelectObjects("Import", novel.ToArray(), out var selected)) return;
 
         foreach (var discoveredTable in selected)
         {
@@ -110,7 +104,8 @@ public override void Execute()
             anyNewTable ??= ti;
 
             //find a Catalogue of the same name (possibly imported from Share Definition)
-            var matchingCatalogues = catalogues.Where(c => c.Name.Equals(ti.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)).ToArray();
+            var matchingCatalogues = catalogues
+                .Where(c => c.Name.Equals(ti.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)).ToArray();
 
             //if there's 1 Catalogue with the same name
             if (matchingCatalogues.Length == 1)
@@ -122,7 +117,7 @@ public override void Execute()
                 foreach (var cataItem in matchingCatalogues[0].CatalogueItems)
                     if (cataItem.ColumnInfo_ID == null)
                     {
-                        var matches = cataItem.GuessAssociatedColumn(cis, allowPartial: false).ToArray();
+                        var matches = cataItem.GuessAssociatedColumn(cis, false).ToArray();
 
                         if (matches.Length == 1)
                         {
@@ -135,28 +130,28 @@ public override void Execute()
                 //is anyone unmarried? i.e. new ColumnInfos that don't have CatalogueItems with the same name
                 foreach (var columnInfo in unmatched)
                 {
-                    var cataItem = new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository, (Catalogue)matchingCatalogues[0], columnInfo.GetRuntimeName())
-                        {
-                            ColumnInfo_ID = columnInfo.ID
-                        };
+                    var cataItem = new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository,
+                        (Catalogue)matchingCatalogues[0], columnInfo.GetRuntimeName())
+                    {
+                        ColumnInfo_ID = columnInfo.ID
+                    };
                     cataItem.SaveToDatabase();
                     married.Add(cataItem, columnInfo);
                 }
             }
             else if (generateCatalogues)
+            {
                 new ForwardEngineerCatalogue(ti, cis).ExecuteForwardEngineering();
+            }
         }
 
         if (married.Any() && YesNo($"Found {married.Count} columns, make them all extractable?", "Make Extractable"))
             foreach (var kvp in married)
-            {
                 // don't mark it extractable twice
-                if(kvp.Key.ExtractionInformation == null)
-                {
+                if (kvp.Key.ExtractionInformation == null)
                     //yup thats how we roll, the database is main memory!
-                    new ExtractionInformation(BasicActivator.RepositoryLocator.CatalogueRepository, kvp.Key, kvp.Value, kvp.Value.Name);
-                }
-            }
+                    new ExtractionInformation(BasicActivator.RepositoryLocator.CatalogueRepository, kvp.Key, kvp.Value,
+                        kvp.Value.Name);
 
         if (anyNewTable != null)
         {
@@ -165,7 +160,8 @@ public override void Execute()
         }
     }
 
-    private int? LocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipattribute, ShareDefinition sharedefinition)
+    private int? LocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipattribute,
+        ShareDefinition sharedefinition)
     {
         if (property.Name.EndsWith("LoggingServer_ID"))
             return _loggingServer.ID;
@@ -175,8 +171,6 @@ public override void Execute()
     }
 
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Database, OverlayKind.Import);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Database, OverlayKind.Import);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractability.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractability.cs
index 5a88cf978f..066f12e5a4 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractability.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractability.cs
@@ -15,24 +15,27 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandChangeExtractability:BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandChangeExtractability : BasicCommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogue;
     private bool _markExtractable;
 
-    public ExecuteCommandChangeExtractability(IBasicActivateItems activator, Catalogue catalogue, bool? explicitExtractability = null) : base(activator)
+    public ExecuteCommandChangeExtractability(IBasicActivateItems activator, Catalogue catalogue,
+        bool? explicitExtractability = null) : base(activator)
     {
         _catalogue = catalogue;
         var status = catalogue.GetExtractabilityStatus(BasicActivator.RepositoryLocator.DataExportRepository);
         if (status == null)
         {
-            SetImpossible("We don't know whether Catalogue is extractable or not (possibly no Data Export database is available)");
+            SetImpossible(
+                "We don't know whether Catalogue is extractable or not (possibly no Data Export database is available)");
             return;
         }
 
-        if(status.IsProjectSpecific)
+        if (status.IsProjectSpecific)
         {
-            SetImpossible("Cannot change the extractability because it is configured as a 'Project Specific Catalogue'");
+            SetImpossible(
+                "Cannot change the extractability because it is configured as a 'Project Specific Catalogue'");
             return;
         }
 
@@ -40,32 +43,30 @@ public ExecuteCommandChangeExtractability(IBasicActivateItems activator, Catalog
         _markExtractable = explicitExtractability ?? !status.IsExtractable;
     }
 
-    public override string GetCommandName()
-    {
-        return _markExtractable ? "Mark Extractable" : "Mark Not Extractable";
-    }
+    public override string GetCommandName() => _markExtractable ? "Mark Extractable" : "Mark Not Extractable";
 
     public override string GetCommandHelp()
     {
-
         if (!_markExtractable)
-            return "Prevent dataset from being released in Project extracts.  This fails if it is already part of any ExtractionConfigurations";
-            
-        return @"Enable dataset linkage\extraction in Project extracts.  This requires that at least one column be marked IsExtractionIdentifier";
-    }
+            return
+                "Prevent dataset from being released in Project extracts.  This fails if it is already part of any ExtractionConfigurations";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableDataSet, _markExtractable?OverlayKind.Add: OverlayKind.Delete);
+        return
+            @"Enable dataset linkage\extraction in Project extracts.  This requires that at least one column be marked IsExtractionIdentifier";
     }
 
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableDataSet, _markExtractable ? OverlayKind.Add : OverlayKind.Delete);
+
     public override void Execute()
     {
         base.Execute();
 
         if (_markExtractable)
         {
-            if (!_catalogue.GetExtractabilityStatus(BasicActivator.RepositoryLocator.DataExportRepository).IsExtractable) {
+            if (!_catalogue.GetExtractabilityStatus(BasicActivator.RepositoryLocator.DataExportRepository)
+                    .IsExtractable)
+            {
                 new ExtractableDataSet(BasicActivator.RepositoryLocator.DataExportRepository, _catalogue);
             }
             else
@@ -73,13 +74,15 @@ public override void Execute()
                 Show($"{_catalogue} is already extractable");
                 return;
             }
-                    
+
             Publish(_catalogue);
         }
         else
         {
-            var extractabilityRecord = ((DataExportChildProvider)BasicActivator.CoreChildProvider).ExtractableDataSets.SingleOrDefault(ds => ds.Catalogue_ID == _catalogue.ID);
-            if(extractabilityRecord != null)
+            var extractabilityRecord =
+                ((DataExportChildProvider)BasicActivator.CoreChildProvider).ExtractableDataSets.SingleOrDefault(ds =>
+                    ds.Catalogue_ID == _catalogue.ID);
+            if (extractabilityRecord != null)
             {
                 extractabilityRecord.DeleteInDatabase();
             }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractionCategory.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractionCategory.cs
index 6cfb4ce79a..59265e0b1a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractionCategory.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeExtractionCategory.cs
@@ -22,9 +22,10 @@ public class ExecuteCommandChangeExtractionCategory : BasicCommandExecution
     private readonly ExtractionCategory? _category;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandChangeExtractionCategory(IBasicActivateItems activator,ExtractionInformation[] eis, ExtractionCategory? category = null) : base(activator)
+    public ExecuteCommandChangeExtractionCategory(IBasicActivateItems activator, ExtractionInformation[] eis,
+        ExtractionCategory? category = null) : base(activator)
     {
-        eis = (eis??Array.Empty<ExtractionInformation>()).Where(e => e != null).ToArray();
+        eis = (eis ?? Array.Empty<ExtractionInformation>()).Where(e => e != null).ToArray();
 
         if (eis.Length == 0)
             SetImpossible("No ExtractionInformations found");
@@ -36,38 +37,30 @@ public ExecuteCommandChangeExtractionCategory(IBasicActivateItems activator,Extr
 
         var cata = _extractionInformations.Select(ei => ei.CatalogueItem.Catalogue).Distinct().ToArray();
         if (cata.Length == 1)
-        {
             _isProjectSpecific = cata[0].IsProjectSpecific(BasicActivator.RepositoryLocator.DataExportRepository);
-        }
 
         // if project specific only let them set to project specific
         if (_category != null && _isProjectSpecific && _category != ExtractionCategory.ProjectSpecific)
         {
             // user is trying to set to Core
             if (_category == ExtractionCategory.Core)
-            {
                 // surely they meant project specific!
                 _category = ExtractionCategory.ProjectSpecific;
-            }
             else
-            {
                 SetImpossible("CatalogueItems can only be ProjectSpecific extraction category");
-            }
         }
     }
 
     public override string GetCommandName()
     {
-        if(_extractionInformations == null || _extractionInformations.Length <= 1)
+        if (_extractionInformations == null || _extractionInformations.Length <= 1)
             return "Set ExtractionCategory";
 
         return "Set ALL to ExtractionCategory";
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionInformation);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionInformation);
 
     public override void Execute()
     {
@@ -75,7 +68,8 @@ public override void Execute()
 
         var c = _category;
 
-        if (c == null && BasicActivator.SelectValueType("New Extraction Category", typeof(ExtractionCategory), ExtractionCategory.Core, out var category))
+        if (c == null && BasicActivator.SelectValueType("New Extraction Category", typeof(ExtractionCategory),
+                ExtractionCategory.Core, out var category))
             c = (ExtractionCategory)category;
 
         if (c == null)
@@ -83,15 +77,12 @@ public override void Execute()
 
         // if project specific only let them set to project specific
         if (_isProjectSpecific && c != ExtractionCategory.ProjectSpecific)
-        {
-            throw new Exception("All CatalogueItems in a ProjectSpecific Catalogues must have ExtractionCategory of 'ProjectSpecific'");
-        }
+            throw new Exception(
+                "All CatalogueItems in a ProjectSpecific Catalogues must have ExtractionCategory of 'ProjectSpecific'");
 
-        if(ExecuteWithCommit(()=>ExecuteImpl(c.Value), $"Set ExtractionCategory to '{c}'", _extractionInformations))
-        {
+        if (ExecuteWithCommit(() => ExecuteImpl(c.Value), $"Set ExtractionCategory to '{c}'", _extractionInformations))
             //publish the root Catalogue
             Publish(_extractionInformations.First());
-        }
     }
 
     private void ExecuteImpl(ExtractionCategory category)
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeLoadStage.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeLoadStage.cs
index be1dfbbef9..1c809ff58d 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeLoadStage.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChangeLoadStage.cs
@@ -15,19 +15,20 @@ public class ExecuteCommandChangeLoadStage : BasicCommandExecution
 {
     private readonly ProcessTask _sourceProcessTask;
     private readonly LoadStageNode _targetStage;
-        
+
     [UseWithObjectConstructor]
     public ExecuteCommandChangeLoadStage(IBasicActivateItems activator, ProcessTask processTask, LoadStage stage) :
-        this(activator, new ProcessTaskCombineable(processTask), new LoadStageNode(processTask.LoadMetadata,stage))
+        this(activator, new ProcessTaskCombineable(processTask), new LoadStageNode(processTask.LoadMetadata, stage))
     {
-
     }
-    public ExecuteCommandChangeLoadStage(IBasicActivateItems activator, ProcessTaskCombineable sourceProcessTaskCombineable, LoadStageNode targetStage) : base(activator)
+
+    public ExecuteCommandChangeLoadStage(IBasicActivateItems activator,
+        ProcessTaskCombineable sourceProcessTaskCombineable, LoadStageNode targetStage) : base(activator)
     {
         _sourceProcessTask = sourceProcessTaskCombineable.ProcessTask;
         _targetStage = targetStage;
 
-        if(sourceProcessTaskCombineable.ProcessTask.LoadMetadata_ID != targetStage.LoadMetadata.ID)
+        if (sourceProcessTaskCombineable.ProcessTask.LoadMetadata_ID != targetStage.LoadMetadata.ID)
             SetImpossible("ProcessTask belongs to a different LoadMetadata");
 
         if (!ProcessTask.IsCompatibleStage(_sourceProcessTask.ProcessTaskType, _targetStage.LoadStage))
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCheck.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCheck.cs
index 061b97bd03..1dd0ec4889 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCheck.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCheck.cs
@@ -20,7 +20,8 @@ public class ExecuteCommandCheck : BasicCommandExecution, IAtomicCommand
     private readonly ICheckable _checkable;
     private ICheckNotifier _notifier;
 
-    public ExecuteCommandCheck(IBasicActivateItems activator, ICheckable checkable, ICheckNotifier notifier) : base(activator)
+    public ExecuteCommandCheck(IBasicActivateItems activator, ICheckable checkable, ICheckNotifier notifier) :
+        base(activator)
     {
         _checkable = checkable;
         _notifier = notifier;
@@ -34,8 +35,5 @@ public override void Execute()
     }
 
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.TinyYellow);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.TinyYellow);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChooseCohort.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChooseCohort.cs
index 2589de6eb2..d74766a607 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChooseCohort.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandChooseCohort.cs
@@ -16,7 +16,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandChooseCohort : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandChooseCohort : BasicCommandExecution, IAtomicCommand
 {
     private readonly ExtractionConfiguration _extractionConfiguration;
     private DataExportChildProvider _childProvider;
@@ -24,12 +24,10 @@ public class ExecuteCommandChooseCohort : BasicCommandExecution,IAtomicCommand
     private ExtractableCohort _pick;
 
     public ExecuteCommandChooseCohort(IBasicActivateItems activator,
-
         [DemandsInitialization("The configuration to change the cohort on")]
         ExtractionConfiguration extractionConfiguration,
-            
         [DemandsInitialization("The cohort to pick")]
-        ExtractableCohort cohort = null):base(activator)
+        ExtractableCohort cohort = null) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
 
@@ -57,28 +55,26 @@ public ExecuteCommandChooseCohort(IBasicActivateItems activator,
 
         //find cohorts that match the project number
         if (_childProvider.ProjectNumberToCohortsDictionary.TryGetValue(project.ProjectNumber.Value, out var value))
-            _compatibleCohorts = value.Where(c=>!c.IsDeprecated).ToList();
+            _compatibleCohorts = value.Where(c => !c.IsDeprecated).ToList();
 
         //if there's only one compatible cohort and that one is already selected
         if (_compatibleCohorts.Count == 1 && _compatibleCohorts.Single().ID == _extractionConfiguration.Cohort_ID)
             SetImpossible("The currently select cohort is the only one available");
 
-        if(!_compatibleCohorts.Any())
-            SetImpossible($"There are no cohorts currently configured with ProjectNumber {project.ProjectNumber.Value}");
+        if (!_compatibleCohorts.Any())
+            SetImpossible(
+                $"There are no cohorts currently configured with ProjectNumber {project.ProjectNumber.Value}");
 
         _pick = cohort;
-            
-        if(_pick != null && !_compatibleCohorts.Contains(_pick))
-        {
-            SetImpossible($"Specified cohort {_pick} was not compatible with Project.  Check the cohorts ProjectNumber matches");
-        }
-    }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Link);
+        if (_pick != null && !_compatibleCohorts.Contains(_pick))
+            SetImpossible(
+                $"Specified cohort {_pick} was not compatible with Project.  Check the cohorts ProjectNumber matches");
     }
 
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Link);
+
     public override void Execute()
     {
         base.Execute();
@@ -86,22 +82,23 @@ public override void Execute()
         var pick = _pick;
 
         if (pick == null)
-            if(SelectOne(new DialogArgs
-               {
-                   WindowTitle = "Select Saved Cohort",
-                   TaskDescription = "Select the existing Cohort you would like to be used for your Extraction Configuration."
-               }, _compatibleCohorts.Where(c => c.ID != _extractionConfiguration.Cohort_ID && !c.IsDeprecated).ToList(), out var selected))
-            {
-                pick = selected;                
-            }
-
-        if(pick != null)
+            if (SelectOne(new DialogArgs
+                    {
+                        WindowTitle = "Select Saved Cohort",
+                        TaskDescription =
+                            "Select the existing Cohort you would like to be used for your Extraction Configuration."
+                    },
+                    _compatibleCohorts.Where(c => c.ID != _extractionConfiguration.Cohort_ID && !c.IsDeprecated)
+                        .ToList(),
+                    out var selected))
+                pick = selected;
+
+        if (pick != null)
         {
             //clear current one
             _extractionConfiguration.Cohort_ID = pick.ID;
             _extractionConfiguration.SaveToDatabase();
             Publish(_extractionConfiguration);
         }
-        
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClearQueryCache.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClearQueryCache.cs
index 381029bb22..50e9e71b8f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClearQueryCache.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClearQueryCache.cs
@@ -29,33 +29,34 @@ public class ExecuteCommandClearQueryCache : BasicCommandExecution
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="cic"></param>
-    public ExecuteCommandClearQueryCache(IBasicActivateItems activator, 
+    public ExecuteCommandClearQueryCache(IBasicActivateItems activator,
         [DemandsInitialization("The Cohort Builder query for which you want to invalidate all cache entries")]
-        CohortIdentificationConfiguration cic) :base(activator)
+        CohortIdentificationConfiguration cic) : base(activator)
     {
         _cic = cic;
 
-        if(cic.QueryCachingServer_ID == null)
+        if (cic.QueryCachingServer_ID == null)
         {
             SetImpossible($"CohortIdentificationConfiguration {cic} does not have a query cache configured");
             return;
         }
-        if(cic.RootCohortAggregateContainer_ID == null)
+
+        if (cic.RootCohortAggregateContainer_ID == null)
         {
             SetImpossible($"CohortIdentificationConfiguration {cic} has no root container");
             return;
         }
 
-        if(GetCacheCount() == 0)
-        {
-            SetImpossible($"There are no cache entries for {cic}");
-        }
+        if (GetCacheCount() == 0) SetImpossible($"There are no cache entries for {cic}");
     }
+
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
         var overlayProvider = new IconOverlayProvider();
-        return overlayProvider.GetOverlayNoCache(Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache), OverlayKind.Delete);
+        return overlayProvider.GetOverlayNoCache(Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache),
+            OverlayKind.Delete);
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -63,19 +64,28 @@ public override void Execute()
         var cacheManager = new CachedAggregateConfigurationResultsManager(_cic.QueryCachingServer);
         var deleted = 0;
 
-        foreach(var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())
+        foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())
         {
             // just incase they changed the role or something wierd we should nuke all its roles
-            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.IndexedExtractionIdentifierList) ? 1 : 0;
-            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.JoinableInceptionQuery) ? 1:0;
+            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.IndexedExtractionIdentifierList)
+                ? 1
+                : 0;
+            deleted += cacheManager.DeleteCacheEntryIfAny(ag, AggregateOperation.JoinableInceptionQuery) ? 1 : 0;
         }
-        foreach(var joinable in _cic.GetAllJoinables())
+
+        foreach (var joinable in _cic.GetAllJoinables())
         {
             // just incase they changed the role or something wierd we should nuke all its roles
-            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration, AggregateOperation.IndexedExtractionIdentifierList) ? 1 : 0;
-            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration, AggregateOperation.JoinableInceptionQuery) ? 1 : 0;
+            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,
+                AggregateOperation.IndexedExtractionIdentifierList)
+                ? 1
+                : 0;
+            deleted += cacheManager.DeleteCacheEntryIfAny(joinable.AggregateConfiguration,
+                AggregateOperation.JoinableInceptionQuery)
+                ? 1
+                : 0;
         }
-            
+
         Show("Cache Entries Cleared", $"Deleted {deleted} cache entries");
     }
 
@@ -88,17 +98,28 @@ private int GetCacheCount()
         foreach (var ag in _cic.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively())
         {
             // just incase they changed the role or something wierd we should nuke all its roles
-            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.IndexedExtractionIdentifierList) != null ? 1 : 0;
-            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.JoinableInceptionQuery) != null ? 1 : 0;
+            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.IndexedExtractionIdentifierList) !=
+                     null
+                ? 1
+                : 0;
+            found += cacheManager.GetLatestResultsTableUnsafe(ag, AggregateOperation.JoinableInceptionQuery) != null
+                ? 1
+                : 0;
         }
+
         foreach (var joinable in _cic.GetAllJoinables())
         {
             // just incase they changed the role or something wierd we should nuke all its roles
-            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration, AggregateOperation.IndexedExtractionIdentifierList) != null ? 1 : 0;
-            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration, AggregateOperation.JoinableInceptionQuery) != null ? 1 : 0;
+            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,
+                AggregateOperation.IndexedExtractionIdentifierList) != null
+                ? 1
+                : 0;
+            found += cacheManager.GetLatestResultsTableUnsafe(joinable.AggregateConfiguration,
+                AggregateOperation.JoinableInceptionQuery) != null
+                ? 1
+                : 0;
         }
 
         return found;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs
index c93fe92f50..05f3f53a57 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneCohortIdentificationConfiguration.cs
@@ -27,25 +27,22 @@ public class ExecuteCommandCloneCohortIdentificationConfiguration : BasicCommand
     public CohortIdentificationConfiguration CloneCreatedIfAny { get; private set; }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandCloneCohortIdentificationConfiguration(IBasicActivateItems activator,CohortIdentificationConfiguration cic)
+    public ExecuteCommandCloneCohortIdentificationConfiguration(IBasicActivateItems activator,
+        CohortIdentificationConfiguration cic)
         : base(activator)
     {
         _cic = cic;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates an exact copy of the Cohort Identification Configuration (query) including all cohort sets, patient index tables, parameters, filter containers, filters etc";
-    }
+    public override string GetCommandHelp() =>
+        "Creates an exact copy of the Cohort Identification Configuration (query) including all cohort sets, patient index tables, parameters, filter containers, filters etc";
 
     public ExecuteCommandCloneCohortIdentificationConfiguration(IBasicActivateItems activator) : base(activator)
     {
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -64,15 +61,15 @@ public override void Execute()
 
         _cic ??= SelectOne<CohortIdentificationConfiguration>(BasicActivator.RepositoryLocator.CatalogueRepository);
 
-        if(_cic == null)
+        if (_cic == null)
             return;
 
         // Confirm creating yes/no (assuming activator is interactive)
-        if (!BasicActivator.IsInteractive || YesNo("This will create a 100% copy of the entire CohortIdentificationConfiguration including all datasets, " +
-                                                   "filters, parameters and set operations. Are you sure this is what you want?",
+        if (!BasicActivator.IsInteractive || YesNo(
+                "This will create a 100% copy of the entire CohortIdentificationConfiguration including all datasets, " +
+                "filters, parameters and set operations. Are you sure this is what you want?",
                 "Confirm Cloning"))
         {
-
             CloneCreatedIfAny = _cic.CreateClone(new ThrowImmediatelyCheckNotifier());
 
             if (_project != null) // clone the association
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneExtractionConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneExtractionConfiguration.cs
index decc67a5d1..9293061aa8 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneExtractionConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCloneExtractionConfiguration.cs
@@ -14,34 +14,31 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCloneExtractionConfiguration : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandCloneExtractionConfiguration : BasicCommandExecution, IAtomicCommand
 {
     private readonly ExtractionConfiguration _extractionConfiguration;
 
-    public ExecuteCommandCloneExtractionConfiguration(IBasicActivateItems activator, ExtractionConfiguration extractionConfiguration) : base(activator)
+    public ExecuteCommandCloneExtractionConfiguration(IBasicActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
 
-        if(!_extractionConfiguration.SelectedDataSets.Any())
+        if (!_extractionConfiguration.SelectedDataSets.Any())
             SetImpossible("ExtractionConfiguration does not have any selected datasets");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates an exact copy of the Extraction Configuration including the cohort selection, all selected datasets, parameters, filter containers, filters etc";
-    }
+    public override string GetCommandHelp() =>
+        "Creates an exact copy of the Extraction Configuration including the cohort selection, all selected datasets, parameters, filter containers, filters etc";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.CloneExtractionConfiguration);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.CloneExtractionConfiguration);
 
     public override void Execute()
     {
         base.Execute();
 
         var clone = _extractionConfiguration.DeepCloneWithNewIDs();
-            
+
         Publish((DatabaseEntity)clone.Project);
         Emphasise(clone);
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClonePipeline.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClonePipeline.cs
index 1bb6810227..e9be199eb3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClonePipeline.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandClonePipeline.cs
@@ -21,7 +21,7 @@ public ExecuteCommandClonePipeline(IBasicActivateItems activator, Pipeline pipel
     {
         _pipeline = pipeline;
         if (_pipeline == null)
-            SetImpossible("You can only clone an existing pipeline"); 
+            SetImpossible("You can only clone an existing pipeline");
     }
 
     public override void Execute()
@@ -32,8 +32,6 @@ public override void Execute()
         Publish(_pipeline);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Pipeline, OverlayKind.Link);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Pipeline, OverlayKind.Link);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConfirmLogs.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConfirmLogs.cs
index 2623589ded..d2439e4cf7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConfirmLogs.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConfirmLogs.cs
@@ -20,8 +20,8 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 /// Checks the RDMP logs for the latest log entry of a given object.  Throws (returns exit code non zero) if
 /// the top log entry is failing or if there are no log entries within the expected time span.
 /// </summary>
-public class ExecuteCommandConfirmLogs : BasicCommandExecution {
-
+public class ExecuteCommandConfirmLogs : BasicCommandExecution
+{
     /// <summary>
     /// Optional time period in which to expect successful logs
     /// </summary>
@@ -48,15 +48,12 @@ public class ExecuteCommandConfirmLogs : BasicCommandExecution {
     /// <param name="withinTime"></param>
     /// <param name="requireLoadedRows"></param>
     public ExecuteCommandConfirmLogs(IBasicActivateItems activator,
-
         [DemandsInitialization("The object you want to confirm passing log entries for")]
         ILoggedActivityRootObject obj,
-
         [DemandsInitialization("Optional time period in which to expect successful logs e.g. 24:00:00 (24 hours)")]
         string withinTime = null,
-
         [DemandsInitialization("Optional.  Pass true to require rows to be loaded if obj is a LoadMetadata")]
-        bool requireLoadedRows=false):base(activator)
+        bool requireLoadedRows = false) : base(activator)
     {
         LogRootObject = obj;
         RequireLoadedRows = requireLoadedRows;
@@ -78,11 +75,9 @@ public override void Execute()
         // e.g. no runs or latest run was a failure etc
         ThrowIfNoEntries(logManager, false);
 
-        if(LogRootObject is ILoadMetadata && RequireLoadedRows)
-        {
+        if (LogRootObject is ILoadMetadata && RequireLoadedRows)
             // run again but only consider loads where rows were loaded
             ThrowIfNoEntries(logManager, true);
-        }
     }
 
     private void ThrowIfNoEntries(LogManager logManager, bool checkInclusionCriteria)
@@ -97,9 +92,7 @@ private void ThrowIfNoEntries(LogManager logManager, bool checkInclusionCriteria
 
         // if no logs
         if (latest == null)
-        {
             throw new LogsNotConfirmedException($"There are no log entries for {LogRootObject}{messageClarification}");
-        }
 
         // we have logs but are they in the time period we are interested in
         if (WithinTime.HasValue)
@@ -109,22 +102,19 @@ private void ThrowIfNoEntries(LogManager logManager, bool checkInclusionCriteria
 
             // if the latest log entry is older than the time period the user indicated
             if (startTime < thresholdDate)
-            {
-                throw new LogsNotConfirmedException($"Latest logged activity for {LogRootObject}{messageClarification} is {startTime}.  This is older than the requested date threshold:{thresholdDate}");
-            }
+                throw new LogsNotConfirmedException(
+                    $"Latest logged activity for {LogRootObject}{messageClarification} is {startTime}.  This is older than the requested date threshold:{thresholdDate}");
         }
 
         // we have an acceptably recent log entry
         if (latest.HasErrors)
-        {
-            throw new LogsNotConfirmedException($"Latest logs for {LogRootObject}{messageClarification} ({latest.StartTime}) indicate that it failed");
-        }
+            throw new LogsNotConfirmedException(
+                $"Latest logs for {LogRootObject}{messageClarification} ({latest.StartTime}) indicate that it failed");
 
         // most recent log entry did not complete
         if (!latest.EndTime.HasValue)
-        {
-            throw new LogsNotConfirmedException($"Latest logs for {LogRootObject}{messageClarification} ({latest.StartTime}) indicate that it did not complete");
-        }
+            throw new LogsNotConfirmedException(
+                $"Latest logs for {LogRootObject}{messageClarification} ({latest.StartTime}) indicate that it did not complete");
         // latest log entry is passing yay!
     }
 
@@ -145,7 +135,7 @@ private bool Include(ArchivalDataLoadInfo arg)
 
         var liveTableNames = lmd.GetAllCatalogues()
             .SelectMany(c => c.GetTableInfoList(true))
-            .Select(t=> new Regex($"\\b{Regex.Escape(t.GetRuntimeName())}\\b"))
+            .Select(t => new Regex($"\\b{Regex.Escape(t.GetRuntimeName())}\\b"))
             .Distinct();
 
         // tables where there was at least 1 insert or update and it wasn't in a RAW or STAGING table
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConvertAggregateConfigurationToPatientIndexTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConvertAggregateConfigurationToPatientIndexTable.cs
index 57b93444e4..ef7edb2cf8 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConvertAggregateConfigurationToPatientIndexTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandConvertAggregateConfigurationToPatientIndexTable.cs
@@ -18,27 +18,29 @@ public class ExecuteCommandConvertAggregateConfigurationToPatientIndexTable : Ba
     private readonly CohortIdentificationConfiguration _cohortIdentificationConfiguration;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(IBasicActivateItems activator, AggregateConfiguration aggregate, CohortIdentificationConfiguration cic) 
-        : this(activator,new AggregateConfigurationCombineable(aggregate),cic)
+    public ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(IBasicActivateItems activator,
+        AggregateConfiguration aggregate, CohortIdentificationConfiguration cic)
+        : this(activator, new AggregateConfigurationCombineable(aggregate), cic)
     {
-
     }
 
-    public ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(IBasicActivateItems activator, AggregateConfigurationCombineable sourceAggregateConfigurationCommand,CohortIdentificationConfiguration cohortIdentificationConfiguration) : base(activator)
+    public ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(IBasicActivateItems activator,
+        AggregateConfigurationCombineable sourceAggregateConfigurationCommand,
+        CohortIdentificationConfiguration cohortIdentificationConfiguration) : base(activator)
     {
         _sourceAggregateConfigurationCombineable = sourceAggregateConfigurationCommand;
         _cohortIdentificationConfiguration = cohortIdentificationConfiguration;
 
-        if(sourceAggregateConfigurationCommand.JoinableDeclarationIfAny != null)
+        if (sourceAggregateConfigurationCommand.JoinableDeclarationIfAny != null)
             SetImpossible("Aggregate is already a Patient Index Table");
 
         var cic = _sourceAggregateConfigurationCombineable.CohortIdentificationConfigurationIfAny;
 
-        if( cic != null && cic.ID != _cohortIdentificationConfiguration.ID)
+        if (cic != null && cic.ID != _cohortIdentificationConfiguration.ID)
             SetImpossible(
                 $"Aggregate '{_sourceAggregateConfigurationCombineable.Aggregate}'  belongs to a different Cohort Identification Configuration");
-            
-        if(cic != null && cic.ShouldBeReadOnly(out var reason))
+
+        if (cic != null && cic.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -53,8 +55,9 @@ public override void Execute()
         parent?.RemoveChild(sourceAggregate);
 
         //create a new patient index table usage allowance for this aggregate
-        new JoinableCohortAggregateConfiguration(BasicActivator.RepositoryLocator.CatalogueRepository, _cohortIdentificationConfiguration, sourceAggregate);
-            
+        new JoinableCohortAggregateConfiguration(BasicActivator.RepositoryLocator.CatalogueRepository,
+            _cohortIdentificationConfiguration, sourceAggregate);
+
         Publish(_cohortIdentificationConfiguration);
         Emphasise(sourceAggregate);
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateLookup.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateLookup.cs
index 524bc45839..eb9f8e08ad 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateLookup.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateLookup.cs
@@ -42,7 +42,9 @@ public class ExecuteCommandCreateLookup : BasicCommandExecution
     /// <param name="collation"></param>
     /// <param name="alsoCreateExtractionInformations">True to create a new virtual column in the main dataset so that the code description appears inline with the rest of
     /// the column(s) in the dataset (when the SELECT query is built)</param>
-    public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository, ExtractionInformation foreignKeyExtractionInformation, ColumnInfo[] lookupDescriptionColumns, List<Tuple<ColumnInfo, ColumnInfo>> fkToPkTuples, string collation, bool alsoCreateExtractionInformations)
+    public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository,
+        ExtractionInformation foreignKeyExtractionInformation, ColumnInfo[] lookupDescriptionColumns,
+        List<Tuple<ColumnInfo, ColumnInfo>> fkToPkTuples, string collation, bool alsoCreateExtractionInformations)
     {
         _catalogueRepository = catalogueRepository;
         _foreignKeyExtractionInformation = foreignKeyExtractionInformation;
@@ -58,7 +60,6 @@ public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository, Extr
 
         if (_fkToPkTuples.Any(t => t.Item1 == null || t.Item2 == null))
             throw new Exception("Tuples list contained null entries");
-
     }
 
     /// <summary>
@@ -72,10 +73,14 @@ public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository, Extr
     /// <param name="alsoCreateExtractionInformations">True to create a new virtual column in the main dataset so that the code description appears inline with the rest of
     /// the columns in the dataset (when the SELECT query is built)</param>
     [UseWithObjectConstructor]
-    public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository, ExtractionInformation foreignKeyExtractionInformation, ColumnInfo lookupDescriptionColumn, ColumnInfo lookupTablePrimaryKey, string collation, bool alsoCreateExtractionInformations)
-        : this(catalogueRepository, foreignKeyExtractionInformation, new[] { lookupDescriptionColumn }, new List<Tuple<ColumnInfo, ColumnInfo>> { Tuple.Create(foreignKeyExtractionInformation.ColumnInfo, lookupTablePrimaryKey) }, collation, alsoCreateExtractionInformations)
+    public ExecuteCommandCreateLookup(ICatalogueRepository catalogueRepository,
+        ExtractionInformation foreignKeyExtractionInformation, ColumnInfo lookupDescriptionColumn,
+        ColumnInfo lookupTablePrimaryKey, string collation, bool alsoCreateExtractionInformations)
+        : this(catalogueRepository, foreignKeyExtractionInformation, new[] { lookupDescriptionColumn },
+            new List<Tuple<ColumnInfo, ColumnInfo>>
+                { Tuple.Create(foreignKeyExtractionInformation.ColumnInfo, lookupTablePrimaryKey) }, collation,
+            alsoCreateExtractionInformations)
     {
-
     }
 
     /// <inheritdoc/>
@@ -85,10 +90,12 @@ public override void Execute()
 
         foreach (var descCol in _lookupDescriptionColumns)
         {
-            var lookup = new Lookup(_catalogueRepository, descCol, _fkToPkTuples.First().Item1, _fkToPkTuples.First().Item2, ExtractionJoinType.Left, _collation);
+            var lookup = new Lookup(_catalogueRepository, descCol, _fkToPkTuples.First().Item1,
+                _fkToPkTuples.First().Item2, ExtractionJoinType.Left, _collation);
 
             foreach (var supplementalKeyPair in _fkToPkTuples.Skip(1))
-                new LookupCompositeJoinInfo(_catalogueRepository, lookup, supplementalKeyPair.Item1, supplementalKeyPair.Item2, _collation);
+                new LookupCompositeJoinInfo(_catalogueRepository, lookup, supplementalKeyPair.Item1,
+                    supplementalKeyPair.Item2, _collation);
 
             if (_alsoCreateExtractionInformations)
             {
@@ -100,13 +107,15 @@ public override void Execute()
                 newCatalogueItem.SetColumnInfo(descCol);
 
                 //bump everyone down 1
-                foreach (var toBumpDown in _allExtractionInformations.Where(e => e.Order > _foreignKeyExtractionInformation.Order))
+                foreach (var toBumpDown in _allExtractionInformations.Where(e =>
+                             e.Order > _foreignKeyExtractionInformation.Order))
                 {
                     toBumpDown.Order++;
                     toBumpDown.SaveToDatabase();
                 }
 
-                var newExtractionInformation = new ExtractionInformation(_catalogueRepository, newCatalogueItem, descCol, descCol.ToString())
+                var newExtractionInformation =
+                    new ExtractionInformation(_catalogueRepository, newCatalogueItem, descCol, descCol.ToString())
                     {
                         ExtractionCategory = ExtractionCategory.Supplemental,
                         Alias = newCatalogueItem.Name,
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewANOTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewANOTable.cs
index 08e198e53d..b5be4cb6e2 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewANOTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewANOTable.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewANOTable : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewANOTable : BasicCommandExecution, IAtomicCommand
 {
     private IExternalDatabaseServer _anoStoreServer;
 
@@ -22,37 +22,32 @@ public ExecuteCommandCreateNewANOTable(IBasicActivateItems activator) : base(act
     {
         _anoStoreServer = BasicActivator.ServerDefaults.GetDefaultFor(PermissableDefaults.ANOStore);
 
-        if(_anoStoreServer == null)
+        if (_anoStoreServer == null)
             SetImpossible("No default ANOStore has been set");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Create a table for storing anonymous identifier mappings for a given type of code e.g. 'PatientId' / 'GP Codes' etc";
-    }
+    public override string GetCommandHelp() =>
+        "Create a table for storing anonymous identifier mappings for a given type of code e.g. 'PatientId' / 'GP Codes' etc";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ANOTable, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ANOTable, OverlayKind.Add);
 
     public override void Execute()
     {
         base.Execute();
 
-        if(TypeText("ANO Concept Name","Name",500,null, out var name))
-        {
-            if(TypeText("Type Concept Suffix", "Suffix", 5, null, out var suffix))
+        if (TypeText("ANO Concept Name", "Name", 500, null, out var name))
+            if (TypeText("Type Concept Suffix", "Suffix", 5, null, out var suffix))
             {
-                if(!name.StartsWith("ANO"))
+                if (!name.StartsWith("ANO"))
                     name = $"ANO{name}";
 
                 var s = suffix.Trim('_');
 
-                var anoTable = new ANOTable(BasicActivator.RepositoryLocator.CatalogueRepository, (ExternalDatabaseServer) _anoStoreServer,name,s);
+                var anoTable = new ANOTable(BasicActivator.RepositoryLocator.CatalogueRepository,
+                    (ExternalDatabaseServer)_anoStoreServer, name, s);
                 Publish(anoTable);
                 Activate(anoTable);
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCacheProgress.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCacheProgress.cs
index 29db12de8a..041af8f765 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCacheProgress.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCacheProgress.cs
@@ -13,22 +13,21 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewCacheProgress : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewCacheProgress : BasicCommandExecution, IAtomicCommand
 {
     private readonly LoadProgress _loadProgress;
 
-    public ExecuteCommandCreateNewCacheProgress(IBasicActivateItems activator, LoadProgress loadProgress) : base(activator)
+    public ExecuteCommandCreateNewCacheProgress(IBasicActivateItems activator, LoadProgress loadProgress) :
+        base(activator)
     {
         _loadProgress = loadProgress;
 
-        if(_loadProgress.CacheProgress != null)
+        if (_loadProgress.CacheProgress != null)
             SetImpossible("LoadProgress already has a CacheProgress associated with it");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Defines that the load requires data that is intensive/expensive to fetch and that this fetching and storing to disk should happen independently of the loading";
-    }
+    public override string GetCommandHelp() =>
+        "Defines that the load requires data that is intensive/expensive to fetch and that this fetching and storing to disk should happen independently of the loading";
 
     public override void Execute()
     {
@@ -36,13 +35,11 @@ public override void Execute()
 
         // If the LoadProgress doesn't have a corresponding CacheProgress, create it
         var cp = new CacheProgress(BasicActivator.RepositoryLocator.CatalogueRepository, _loadProgress);
-            
+
         Publish(_loadProgress);
         Emphasise(cp);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CacheProgress, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CacheProgress, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewClassBasedProcessTask.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewClassBasedProcessTask.cs
index 791726bc4c..f14a9b18a7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewClassBasedProcessTask.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewClassBasedProcessTask.cs
@@ -22,16 +22,17 @@ public class ExecuteCommandCreateNewClassBasedProcessTask : BasicCommandExecutio
     private Type _type;
     private ProcessTaskType _processTaskType;
 
-    public ExecuteCommandCreateNewClassBasedProcessTask(IBasicActivateItems activator, LoadMetadata loadMetadata, LoadStage loadStage, 
-        [DemandsInitialization("Class to execute, must be an attacher, mutilater etc", TypeOf = typeof(IDisposeAfterDataLoad))]
+    public ExecuteCommandCreateNewClassBasedProcessTask(IBasicActivateItems activator, LoadMetadata loadMetadata,
+        LoadStage loadStage,
+        [DemandsInitialization("Class to execute, must be an attacher, mutilater etc",
+            TypeOf = typeof(IDisposeAfterDataLoad))]
         Type type) : base(activator)
     {
         _loadMetadata = loadMetadata;
         _loadStage = loadStage;
 
-        if(type != null)
+        if (type != null)
             SetType(type);
-
     }
 
     private void SetType(Type type)
@@ -40,50 +41,44 @@ private void SetType(Type type)
 
         if (typeof(IAttacher).IsAssignableFrom(_type))
             _processTaskType = ProcessTaskType.Attacher;
-        else
-        if (typeof(IDataProvider).IsAssignableFrom(_type))
+        else if (typeof(IDataProvider).IsAssignableFrom(_type))
             _processTaskType = ProcessTaskType.DataProvider;
-        else
-        if (typeof(IMutilateDataTables).IsAssignableFrom(_type))
+        else if (typeof(IMutilateDataTables).IsAssignableFrom(_type))
             _processTaskType = ProcessTaskType.MutilateDataTable;
         else
-        {
-            SetImpossible($"Type '{_type}' was not a compatible one e.g. IAttacher, IDataProvider or IMutilateDataTables");
-        }
+            SetImpossible(
+                $"Type '{_type}' was not a compatible one e.g. IAttacher, IDataProvider or IMutilateDataTables");
     }
+
     private Type[] GetProcessTaskTypes()
     {
-        return BasicActivator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes().
-            Where(t=>
-                // must not be interface or abstract
-                !(t.IsInterface || t.IsAbstract) &&
-                (
-                    // must implement one of these interfaces
-                    typeof(IAttacher).IsAssignableFrom(t) ||
-                    typeof(IDataProvider).IsAssignableFrom(t) ||
-                    typeof(IMutilateDataTables).IsAssignableFrom(t)
-                )).ToArray();
+        return BasicActivator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes().Where(t =>
+            // must not be interface or abstract
+            !(t.IsInterface || t.IsAbstract) &&
+            (
+                // must implement one of these interfaces
+                typeof(IAttacher).IsAssignableFrom(t) ||
+                typeof(IDataProvider).IsAssignableFrom(t) ||
+                typeof(IMutilateDataTables).IsAssignableFrom(t)
+            )).ToArray();
     }
 
     public override void Execute()
     {
-        if(_type == null)
+        if (_type == null)
         {
-                
-            if(BasicActivator.SelectType("Process Type",GetProcessTaskTypes(),out var chosen))
-            {
+            if (BasicActivator.SelectType("Process Type", GetProcessTaskTypes(), out var chosen))
                 SetType(chosen);
-            }
             else
                 return;
         }
 
-        var newTask = new ProcessTask(BasicActivator.RepositoryLocator.CatalogueRepository,_loadMetadata, _loadStage)
-            {
-                Path = _type.FullName,
-                ProcessTaskType = _processTaskType,
-                Name = _type.Name
-            };
+        var newTask = new ProcessTask(BasicActivator.RepositoryLocator.CatalogueRepository, _loadMetadata, _loadStage)
+        {
+            Path = _type.FullName,
+            ProcessTaskType = _processTaskType,
+            Name = _type.Name
+        };
         newTask.SaveToDatabase();
 
         newTask.CreateArgumentsForClassIfNotExists(_type);
@@ -91,5 +86,4 @@ public override void Execute()
         Publish(_loadMetadata);
         Activate(newTask);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortIdentificationConfiguration.cs
index b5f9ec988e..ed06a68112 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortIdentificationConfiguration.cs
@@ -30,7 +30,7 @@ public class ExecuteCommandCreateNewCohortIdentificationConfiguration : BasicCom
     /// yet on this command.
     /// </summary>
     public bool PromptToPickAProject { get; set; } = false;
-        
+
     /// <summary>
     /// The folder to put the new <see cref="CohortIdentificationConfiguration"/> in.  Defaults to <see cref="FolderHelper.Root"/>
     /// </summary>
@@ -40,6 +40,7 @@ public class ExecuteCommandCreateNewCohortIdentificationConfiguration : BasicCom
     /// Name to give the root component of new cics created by this command (usually an EXCEPT but not always - see Cohort Configuration Wizard)
     /// </summary>
     public static string RootContainerName = "Root Container";
+
     /// <summary>
     /// Name to give the inclusion component of new cics created by this command
     /// </summary>
@@ -59,15 +60,14 @@ public ExecuteCommandCreateNewCohortIdentificationConfiguration(IBasicActivateIt
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandCreateNewCohortIdentificationConfiguration(IBasicActivateItems activator, string name): this(activator)
+    public ExecuteCommandCreateNewCohortIdentificationConfiguration(IBasicActivateItems activator, string name) :
+        this(activator)
     {
         _name = name;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Add);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -81,39 +81,36 @@ public override void Execute()
 
         var proj = _associateWithProject;
 
-        if(proj == null && BasicActivator.IsInteractive && PromptToPickAProject)
+        if (proj == null && BasicActivator.IsInteractive && PromptToPickAProject)
         {
             var projects = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>();
 
-            if(projects.Any())
-            {
+            if (projects.Any())
                 proj = (Project)BasicActivator.SelectOne(new DialogArgs
                 {
                     WindowTitle = "Associate with Project",
-                    TaskDescription = "Do you want to associate this new query with a Project? if not select Null or Cancel.",
+                    TaskDescription =
+                        "Do you want to associate this new query with a Project? if not select Null or Cancel.",
                     AllowSelectingNull = true
                 }, projects);
-            }
         }
 
         CohortIdentificationConfiguration cic;
-            
+
         //if user wants to see the wizard and isn't using the CLI constructor
         if (UserSettings.ShowCohortWizard && string.IsNullOrWhiteSpace(_name))
         {
             //try showing wizard if we can't
-            if(!BasicActivator.ShowCohortWizard( out cic))
-            {
+            if (!BasicActivator.ShowCohortWizard(out cic))
                 // No wizards are available, just generate a basic one
                 cic = GenerateBasicCohortIdentificationConfiguration();
-            }
         }
         else
         {
             // user doesn't want to see the wizard
             cic = GenerateBasicCohortIdentificationConfiguration();
         }
-                
+
         if (cic == null)
             return;
 
@@ -125,7 +122,6 @@ public override void Execute()
             var assoc = proj.AssociateWithCohortIdentification(cic);
             Publish(assoc);
             Emphasise(assoc, int.MaxValue);
-
         }
         else
         {
@@ -136,17 +132,17 @@ public override void Execute()
         Activate(cic);
     }
 
-    private CohortIdentificationConfiguration  GenerateBasicCohortIdentificationConfiguration()
+    private CohortIdentificationConfiguration GenerateBasicCohortIdentificationConfiguration()
     {
         var name = _name;
 
-        if(name == null)
+        if (name == null)
             if (!BasicActivator.TypeText(new DialogArgs
                 {
                     WindowTitle = "New Cohort Builder Query",
                     TaskDescription = "Enter a name for the Cohort Builder Query.",
                     EntryLabel = "Name"
-                },255,null, out name,false))
+                }, 255, null, out name, false))
                 return null;
 
         var cic = new CohortIdentificationConfiguration(BasicActivator.RepositoryLocator.CatalogueRepository, name);
@@ -156,14 +152,16 @@ private CohortIdentificationConfiguration  GenerateBasicCohortIdentificationConf
         root.Operation = SetOperation.EXCEPT;
         root.SaveToDatabase();
 
-        var inclusion = new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION)
+        var inclusion =
+            new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION)
             {
                 Name = InclusionCriteriaName,
                 Order = 0
             };
         inclusion.SaveToDatabase();
 
-        var exclusion = new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION)
+        var exclusion =
+            new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION)
             {
                 Name = ExclusionCriteriaName,
                 Order = 1
@@ -176,9 +174,6 @@ private CohortIdentificationConfiguration  GenerateBasicCohortIdentificationConf
         return cic;
     }
 
-    public override string GetCommandHelp()
-    {
-        return
-            "Creating a cohort identification configuration which includes/excludes patients based on the data in your database tables ";
-    }
+    public override string GetCommandHelp() =>
+        "Creating a cohort identification configuration which includes/excludes patients based on the data in your database tables ";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortStore.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortStore.cs
index 02f9b727e4..1c5e0fc5ab 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortStore.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortStore.cs
@@ -29,17 +29,16 @@ public class ExecuteCommandCreateNewCohortStore : BasicCommandExecution
     public ExternalCohortTable Created;
 
 
-    public ExecuteCommandCreateNewCohortStore(IBasicActivateItems activator, 
-            
+    public ExecuteCommandCreateNewCohortStore(IBasicActivateItems activator,
         [DemandsInitialization("The database to create")]
         DiscoveredDatabase databaseToCreate,
-
-        [DemandsInitialization("True to allow null values in the release identifier field.  Set to true if you want to do your own custom release identifier allocation later e.g. via a stored proc")]
+        [DemandsInitialization(
+            "True to allow null values in the release identifier field.  Set to true if you want to do your own custom release identifier allocation later e.g. via a stored proc")]
         bool allowNullReleaseIdentifiers,
-
         [DemandsInitialization("Name of the private identifier field in your datasets e.g. chi")]
         string privateFieldName,
-        [DemandsInitialization("Sql datatype (of your DBMS) that the private identifier field should have e.g. varchar(10)")]
+        [DemandsInitialization(
+            "Sql datatype (of your DBMS) that the private identifier field should have e.g. varchar(10)")]
         string privateFieldDataType) : base(activator)
     {
         this.activator = activator;
@@ -55,9 +54,12 @@ public override void Execute()
 
 
         //Create cohort store database
-        var wizard = new CreateNewCohortDatabaseWizard(databaseToCreate, activator.RepositoryLocator.CatalogueRepository, activator.RepositoryLocator.DataExportRepository, allowNullReleaseIdentifiers);
-        Created = wizard.CreateDatabase(new PrivateIdentifierPrototype(privateFieldName, privateFieldDataType), new ThrowImmediatelyCheckNotifier { WriteToConsole = false });
-            
+        var wizard = new CreateNewCohortDatabaseWizard(databaseToCreate,
+            activator.RepositoryLocator.CatalogueRepository, activator.RepositoryLocator.DataExportRepository,
+            allowNullReleaseIdentifiers);
+        Created = wizard.CreateDatabase(new PrivateIdentifierPrototype(privateFieldName, privateFieldDataType),
+            new ThrowImmediatelyCheckNotifier { WriteToConsole = false });
+
         Publish(Created);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataLoadDirectory.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataLoadDirectory.cs
index 367a1881a7..b3c0b707e3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataLoadDirectory.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataLoadDirectory.cs
@@ -28,10 +28,11 @@ public class ExecuteCommandCreateNewDataLoadDirectory : BasicCommandExecution
     public DirectoryInfo Dir { get; }
 
     public ExecuteCommandCreateNewDataLoadDirectory(IBasicActivateItems activator,
-        [DemandsInitialization("Optional load for which you are creating the folder structure.  Will have its LocationOfFlatFiles set to the new dir if passed")]
+        [DemandsInitialization(
+            "Optional load for which you are creating the folder structure.  Will have its LocationOfFlatFiles set to the new dir if passed")]
         LoadMetadata load,
         [DemandsInitialization("The directory to create new load folders in.")]
-        DirectoryInfo dir):base(activator)
+        DirectoryInfo dir) : base(activator)
     {
         LoadMetadata = load;
         Dir = dir;
@@ -55,24 +56,20 @@ public override void Execute()
             if (d == null)
                 return;
 
-            if (!BasicActivator.TypeText("New Folder Name","Name",255,null,out newFolderName, false))
-            {
-                return;
-            }
+            if (!BasicActivator.TypeText("New Folder Name", "Name", 255, null, out newFolderName, false)) return;
         }
 
         var loadDir =
-            string.IsNullOrWhiteSpace(newFolderName) ?
-                LoadDirectory.CreateDirectoryStructure(d.Parent, d.Name, true) :
-                LoadDirectory.CreateDirectoryStructure(d, newFolderName, true);
+            string.IsNullOrWhiteSpace(newFolderName)
+                ? LoadDirectory.CreateDirectoryStructure(d.Parent, d.Name, true)
+                : LoadDirectory.CreateDirectoryStructure(d, newFolderName, true);
 
         // if we have a load then update the path to this location we just created
-        if(LoadMetadata != null)
+        if (LoadMetadata != null)
         {
             LoadMetadata.LocationOfFlatFiles = loadDir.RootPath.FullName;
             LoadMetadata.SaveToDatabase();
             Publish(LoadMetadata);
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewEmptyCatalogue.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewEmptyCatalogue.cs
index 58677735e8..97964807d5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewEmptyCatalogue.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewEmptyCatalogue.cs
@@ -19,18 +19,13 @@ public class ExecuteCommandCreateNewEmptyCatalogue : BasicCommandExecution, IAto
 
     public ExecuteCommandCreateNewEmptyCatalogue(IBasicActivateItems activator) : base(activator)
     {
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return @"Create a new dataset not yet linked to any underlying database columns\tables";
-    }
+    public override string GetCommandHelp() =>
+        @"Create a new dataset not yet linked to any underlying database columns\tables";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Problem);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Problem);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs
index 7282c732a7..1ac8262261 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExternalDatabaseServer.cs
@@ -32,13 +32,16 @@ public class ExecuteCommandCreateNewExternalDatabaseServer : BasicCommandExecuti
 
 
     [UseWithObjectConstructor]
-    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator, PermissableDefaults defaultToSet,DiscoveredDatabase toCreate)
-        : this(activator,defaultToSet == PermissableDefaults.None ? null : defaultToSet.ToTier2DatabaseType(),defaultToSet)
+    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator,
+        PermissableDefaults defaultToSet, DiscoveredDatabase toCreate)
+        : this(activator, defaultToSet == PermissableDefaults.None ? null : defaultToSet.ToTier2DatabaseType(),
+            defaultToSet)
     {
         _database = toCreate;
     }
 
-    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator, IPatcher patcher, PermissableDefaults defaultToSet) : base(activator)
+    public ExecuteCommandCreateNewExternalDatabaseServer(IBasicActivateItems activator, IPatcher patcher,
+        PermissableDefaults defaultToSet) : base(activator)
     {
         _patcher = patcher;
         _defaultToSet = defaultToSet;
@@ -70,19 +73,25 @@ public override string GetCommandHelp()
         switch (_defaultToSet)
         {
             case PermissableDefaults.LiveLoggingServer_ID:
-                return "Creates a database for auditing all flows of data (data load, extraction etc) including tables for errors, progress tables/record count loaded etc";
+                return
+                    "Creates a database for auditing all flows of data (data load, extraction etc) including tables for errors, progress tables/record count loaded etc";
             case PermissableDefaults.IdentifierDumpServer_ID:
-                return "Creates a database for storing the values of intercepted columns that are discarded during data load because they contain identifiable data";
+                return
+                    "Creates a database for storing the values of intercepted columns that are discarded during data load because they contain identifiable data";
             case PermissableDefaults.DQE:
-                return "Creates a database for storing the results of data quality engine runs on your datasets over time.";
+                return
+                    "Creates a database for storing the results of data quality engine runs on your datasets over time.";
             case PermissableDefaults.WebServiceQueryCachingServer_ID:
                 break;
             case PermissableDefaults.RAWDataLoadServer:
-                return "Defines which database server should be used for the RAW data in the RAW=>STAGING=>LIVE model of the data load engine";
+                return
+                    "Defines which database server should be used for the RAW data in the RAW=>STAGING=>LIVE model of the data load engine";
             case PermissableDefaults.ANOStore:
-                return "Creates a new anonymisation database which contains mappings of identifiable values to anonymous representations";
+                return
+                    "Creates a new anonymisation database which contains mappings of identifiable values to anonymous representations";
             case PermissableDefaults.CohortIdentificationQueryCachingServer_ID:
-                return "Creates a new Query Cache database which contains the indexed results of executed subqueries in a CohortIdentificationConfiguration";
+                return
+                    "Creates a new Query Cache database which contains the indexed results of executed subqueries in a CohortIdentificationConfiguration";
         }
 
         return "Defines a new server that can be accessed by RDMP";
@@ -97,14 +106,12 @@ public override void Execute()
             ServerCreatedIfAny = new ExternalDatabaseServer(BasicActivator.RepositoryLocator.CatalogueRepository,
                 $"New ExternalDatabaseServer {Guid.NewGuid()}", _patcher);
         else
-        {
             //create the new server
             ServerCreatedIfAny = BasicActivator.CreateNewPlatformDatabase(
                 BasicActivator.RepositoryLocator.CatalogueRepository,
                 _defaultToSet,
                 _patcher,
                 _database);
-        }
 
         //user cancelled creating a server
         if (ServerCreatedIfAny == null)
@@ -119,6 +126,5 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
         if (_patcher == null) return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add);
         var basicIcon = _databaseIconProvider.GetIconForAssembly(_patcher.GetDbAssembly());
         return _overlayProvider.GetOverlay(basicIcon, OverlayKind.Add);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractableDataSetPackage.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractableDataSetPackage.cs
index 80c10d6134..973c4892e7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractableDataSetPackage.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractableDataSetPackage.cs
@@ -12,25 +12,23 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewExtractableDataSetPackage:BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewExtractableDataSetPackage : BasicCommandExecution, IAtomicCommand
 {
     public ExecuteCommandCreateNewExtractableDataSetPackage(IBasicActivateItems activator) : base(activator)
     {
-        if(BasicActivator.RepositoryLocator.DataExportRepository == null)
+        if (BasicActivator.RepositoryLocator.DataExportRepository == null)
             SetImpossible("Data export database is not setup");
 
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a new grouping of dataset which are commonly extracted together e.g. 'Core datasets on offer'";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a new grouping of dataset which are commonly extracted together e.g. 'Core datasets on offer'";
 
     public override void Execute()
     {
         base.Execute();
-            
+
         if (TypeText("Name for package", "Name", 500, null, out var name))
         {
             var p = new ExtractableDataSetPackage(BasicActivator.RepositoryLocator.DataExportRepository, name);
@@ -39,8 +37,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractionConfigurationForProject.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractionConfigurationForProject.cs
index 1c7d8c0e1d..72137cefbc 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractionConfigurationForProject.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewExtractionConfigurationForProject.cs
@@ -40,37 +40,34 @@ public class ExecuteCommandCreateNewExtractionConfigurationForProject : BasicCom
     /// <summary>
     /// An explicit cohort to assign for the <see cref="ExtractionConfiguration"/>
     /// </summary>
-    public ExtractableCohort CohortIfAny { get => cohort; set {
-
+    public ExtractableCohort CohortIfAny
+    {
+        get => cohort;
+        set
+        {
             if (!GetProjects(value).Any())
-            {
                 SetImpossible($"There are no Projects with ProjectNumber {value.ExternalProjectNumber}");
-            }
-            cohort = value; } 
+            cohort = value;
+        }
     }
 
     private IEnumerable<Project> GetProjects(ExtractableCohort cohortIfAny)
     {
-        if(cohortIfAny is null)
-        {
+        if (cohortIfAny is null)
             // no cohort so all Project are valid
             return BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>();
-        }
 
         // we have a cohort so can only create an ExtractionConfiguration for Projects that share
         // the cohorts project number
 
         if (BasicActivator.CoreChildProvider is DataExportChildProvider dx)
-        {
             return dx.Projects.Where(p => p.ProjectNumber == cohortIfAny.ExternalProjectNumber);
-        }
 
         return Enumerable.Empty<Project>();
     }
 
     [UseWithObjectConstructor]
     public ExecuteCommandCreateNewExtractionConfigurationForProject(IBasicActivateItems activator,
-
         [DemandsInitialization("The Project under which to create the new ExtractionConfiguration")]
         Project project,
         [DemandsInitialization("The name for the new ExtractionConfiguration")]
@@ -86,15 +83,11 @@ public ExecuteCommandCreateNewExtractionConfigurationForProject(IBasicActivateIt
             SetImpossible("You do not have any projects yet");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Starts a new extraction for the project containing one or more datasets linked against a given cohort";
-    }
+    public override string GetCommandHelp() =>
+        "Starts a new extraction for the project containing one or more datasets linked against a given cohort";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionConfiguration, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionConfiguration, OverlayKind.Add);
 
     public override void Execute()
     {
@@ -102,16 +95,13 @@ public override void Execute()
 
         var p = _project;
 
-        if(p == null)
-        {
+        if (p == null)
             if (!SelectOne(new DialogArgs
                 {
                     WindowTitle = "Select Project",
                     TaskDescription = GetTaskDescription()
                 }, GetProjects(CohortIfAny).ToList(), out p))
                 return;
-
-        }
         if (p == null)
             return;
 
@@ -119,7 +109,6 @@ public override void Execute()
 
         // if we don't have a name and we are running in interactive mode
         if (string.IsNullOrWhiteSpace(name) && BasicActivator.IsInteractive)
-        {
             if (!BasicActivator.TypeText(new DialogArgs
                 {
                     WindowTitle = "New Extraction Configuration",
@@ -127,12 +116,11 @@ public override void Execute()
                     EntryLabel = "Name"
                 }, 255, $"{p.ProjectNumber} {DateTime.Now:yyyy-MM-dd} Extraction".Trim(), out name, false))
                 return;
-        }
 
         // create the new config
         var newConfig = new ExtractionConfiguration(BasicActivator.RepositoryLocator.DataExportRepository, p, name);
 
-        if(CohortIfAny != null)
+        if (CohortIfAny != null)
         {
             newConfig.Cohort_ID = CohortIfAny.ID;
             newConfig.SaveToDatabase();
@@ -140,21 +128,17 @@ public override void Execute()
         else
         {
             var chooseCohort = new ExecuteCommandChooseCohort(BasicActivator, newConfig) { NoPublish = true };
-            if (PromptForCohort && BasicActivator.IsInteractive && !chooseCohort.IsImpossible)
-            {
-                chooseCohort.Execute();
-            }
+            if (PromptForCohort && BasicActivator.IsInteractive && !chooseCohort.IsImpossible) chooseCohort.Execute();
         }
 
         // user didn't cancel picking a cohort so get them to pick datasets too.
         if (newConfig.Cohort_ID != null)
         {
-            var chooseDatasetsCommand = new ExecuteCommandAddDatasetsToConfiguration(BasicActivator, newConfig) { NoPublish = true};
+            var chooseDatasetsCommand = new ExecuteCommandAddDatasetsToConfiguration(BasicActivator, newConfig)
+                { NoPublish = true };
 
             if (PromptForDatasets && BasicActivator.IsInteractive && !chooseDatasetsCommand.IsImpossible)
-            {
                 chooseDatasetsCommand.Execute();
-            }
         }
 
         //refresh the project
@@ -168,6 +152,7 @@ private string GetTaskDescription()
         if (CohortIfAny == null)
             return "Select which Project to create the ExtractionConfiguration under";
 
-        return $"Select which Project to create the ExtractionConfiguration under.  Only Projects with ProjectNumber {CohortIfAny.ExternalProjectNumber} are shown.  This is because you are using ExtractableCohort '{CohortIfAny}' for this operation.";
+        return
+            $"Select which Project to create the ExtractionConfiguration under.  Only Projects with ProjectNumber {CohortIfAny.ExternalProjectNumber} are shown.  This is because you are using ExtractableCohort '{CohortIfAny}' for this operation.";
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFileBasedProcessTask.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFileBasedProcessTask.cs
index 37d99418ae..269e8ec220 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFileBasedProcessTask.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFileBasedProcessTask.cs
@@ -25,7 +25,8 @@ public class ExecuteCommandCreateNewFileBasedProcessTask : BasicCommandExecution
     private LoadDirectory _LoadDirectory;
     private FileInfo _file;
 
-    public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator, ProcessTaskType taskType, LoadMetadata loadMetadata, LoadStage loadStage, FileInfo file=null) : base(activator)
+    public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator, ProcessTaskType taskType,
+        LoadMetadata loadMetadata, LoadStage loadStage, FileInfo file = null) : base(activator)
     {
         _taskType = taskType;
         _loadMetadata = loadMetadata;
@@ -39,8 +40,8 @@ public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator
         {
             SetImpossible("Could not construct LoadDirectory");
         }
-            
-        if(!(taskType == ProcessTaskType.SQLFile || taskType == ProcessTaskType.Executable))
+
+        if (!(taskType == ProcessTaskType.SQLFile || taskType == ProcessTaskType.Executable))
             SetImpossible("Only SQLFile and Executable task types are supported by this command");
 
         if (!ProcessTask.IsCompatibleStage(taskType, loadStage))
@@ -48,7 +49,7 @@ public ExecuteCommandCreateNewFileBasedProcessTask(IBasicActivateItems activator
 
         _file = file;
     }
-        
+
     public override void Execute()
     {
         base.Execute();
@@ -57,7 +58,8 @@ public override void Execute()
         {
             if (_taskType == ProcessTaskType.SQLFile)
             {
-                if (BasicActivator.TypeText("Enter a name for the SQL file", "File name", 100, "myscript.sql",out var selected,false))
+                if (BasicActivator.TypeText("Enter a name for the SQL file", "File name", 100, "myscript.sql",
+                        out var selected, false))
                 {
                     var target = Path.Combine(_LoadDirectory.ExecutablesPath.FullName, selected);
 
@@ -71,28 +73,32 @@ public override void Execute()
                     _file = new FileInfo(target);
                 }
                 else
+                {
                     return; //user cancelled
+                }
             }
             else if (_taskType == ProcessTaskType.Executable)
             {
                 _file = BasicActivator.SelectFile("Enter executable's path", "Executables", "*.exe");
 
                 // they didn't pick one
-                if(_file == null)
+                if (_file == null)
                     return;
 
-                if(!_file.Exists)
+                if (!_file.Exists)
                     throw new FileNotFoundException("File did not exist");
             }
             else
+            {
                 throw new ArgumentOutOfRangeException($"Unexpected _taskType:{_taskType}");
+            }
         }
 
         var task = new ProcessTask((ICatalogueRepository)_loadMetadata.Repository, _loadMetadata, _loadStage)
-            {
-                ProcessTaskType = _taskType,
-                Path = _file.FullName
-            };
+        {
+            ProcessTaskType = _taskType,
+            Path = _file.FullName
+        };
         SaveAndShow(task);
     }
 
@@ -120,10 +126,10 @@ public override string GetCommandName()
 
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
-        if(_taskType == ProcessTaskType.SQLFile)
+        if (_taskType == ProcessTaskType.SQLFile)
             return iconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Add);
 
-        if(_taskType == ProcessTaskType.Executable)
+        if (_taskType == ProcessTaskType.Executable)
             return new IconOverlayProvider().GetOverlayNoCache(Image.Load<Rgba32>(CatalogueIcons.Exe), OverlayKind.Add);
 
         return null;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFilter.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFilter.cs
index fa83eb32b3..833246db56 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFilter.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewFilter.cs
@@ -34,23 +34,21 @@ public class ExecuteCommandCreateNewFilter : BasicCommandExecution, IAtomicComma
 
     private IFilter[] _offerFilters;
     private bool offerCatalogueFilters;
-        
+
     public bool OfferCatalogueFilters
     {
         get => offerCatalogueFilters;
         set
         {
-            if(value)
+            if (value)
             {
                 var c = GetCatalogue();
                 _offerFilters = c?.GetAllFilters();
 
-                if (_offerFilters ==null || !_offerFilters.Any())
-                    SetImpossible($"There are no Filters declared in Catalogue '{c?.ToString() ?? "NULL" }'");
-
+                if (_offerFilters == null || !_offerFilters.Any())
+                    SetImpossible($"There are no Filters declared in Catalogue '{c?.ToString() ?? "NULL"}'");
             }
 
-            
 
             offerCatalogueFilters = value;
         }
@@ -59,13 +57,13 @@ public bool OfferCatalogueFilters
 
     private ExecuteCommandCreateNewFilter(IBasicActivateItems activator) : base(activator)
     {
-
         Weight = DEFAULT_WEIGHT;
     }
 
     [UseWithCommandLine(
         ParameterHelpList = "<into> <basedOn> <name> <where>",
-        ParameterHelpBreakdown = @"into	A WHERE filter container or IRootFilterContainerHost (e.g. AggregateConfiguration)
+        ParameterHelpBreakdown =
+            @"into	A WHERE filter container or IRootFilterContainerHost (e.g. AggregateConfiguration)
 basedOn    Optional ExtractionFilter to copy or ExtractionFilterParameterSet
 name    Optional name to set for the new filter
 where    Optional SQL to set for the filter.  If <basedOn> is not null this will overwrite it")]
@@ -73,7 +71,8 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator,
         CommandLineObjectPicker picker) : this(activator)
     {
         if (picker.Length == 0)
-            throw new ArgumentException("You must supply at least one argument to this command (where you want to create the filter)");
+            throw new ArgumentException(
+                "You must supply at least one argument to this command (where you want to create the filter)");
 
         if (picker.Length > 0)
         {
@@ -83,23 +82,23 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator,
                 var ei = (ExtractionInformation)picker[0].GetValueForParameterOfType(typeof(ExtractionInformation));
                 _factory = new ExtractionFilterFactory(ei);
             }
-            else
-            if (picker[0].HasValueOfType(typeof(IContainer)))
+            else if (picker[0].HasValueOfType(typeof(IContainer)))
             {
                 // create a filter in this container
                 _container = (IContainer)picker[0].GetValueForParameterOfType(typeof(IContainer));
                 SetImpossibleIfReadonly(_container);
             }
-            else
-            if (picker[0].HasValueOfType(typeof(IRootFilterContainerHost)))
+            else if (picker[0].HasValueOfType(typeof(IRootFilterContainerHost)))
             {
                 // create a container (if none) then add filter to root container of the object
-                _host = (IRootFilterContainerHost)picker[0].GetValueForParameterOfType(typeof(IRootFilterContainerHost));
+                _host = (IRootFilterContainerHost)picker[0]
+                    .GetValueForParameterOfType(typeof(IRootFilterContainerHost));
                 SetImpossibleIfReadonly(_host);
             }
             else
             {
-                throw new ArgumentException($"First argument must be {nameof(IContainer)} or  {nameof(IRootFilterContainerHost)} but it was '{picker[0].RawValue}'");
+                throw new ArgumentException(
+                    $"First argument must be {nameof(IContainer)} or  {nameof(IRootFilterContainerHost)} but it was '{picker[0].RawValue}'");
             }
 
 
@@ -107,7 +106,6 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator,
 
             if (_factory == null)
                 throw new Exception("It was not possible to work out a FilterFactory from the container/host");
-
         }
 
         // the index that string arguments begin at (Name and WhereSql)
@@ -119,34 +117,21 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator,
                 return;
 
             if (picker[1].HasValueOfType(typeof(IFilter)))
-            {
                 BasedOn = (IFilter)picker[1].GetValueForParameterOfType(typeof(IFilter));
-            }
-            else
-            if (picker[1].HasValueOfType(typeof(ExtractionFilterParameterSet)))
-            {
-                ParameterSet = (ExtractionFilterParameterSet)picker[1].GetValueForParameterOfType(typeof(ExtractionFilterParameterSet));
-            }
-            else if (!picker[1].ExplicitNull)
-            {
-                stringArgsStartAt = 1;
-            }
+            else if (picker[1].HasValueOfType(typeof(ExtractionFilterParameterSet)))
+                ParameterSet =
+                    (ExtractionFilterParameterSet)picker[1]
+                        .GetValueForParameterOfType(typeof(ExtractionFilterParameterSet));
+            else if (!picker[1].ExplicitNull) stringArgsStartAt = 1;
         }
 
-        if (picker.Length > stringArgsStartAt)
-        {
-            Name = picker[stringArgsStartAt].RawValue;
-        }
-        if (picker.Length > stringArgsStartAt+1)
-        {
-            WhereSQL = picker[stringArgsStartAt+1].RawValue;
-        }
+        if (picker.Length > stringArgsStartAt) Name = picker[stringArgsStartAt].RawValue;
+        if (picker.Length > stringArgsStartAt + 1) WhereSQL = picker[stringArgsStartAt + 1].RawValue;
     }
 
 
     public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IRootFilterContainerHost host) : this(activator)
     {
-
         _factory = host.GetFilterFactory();
         _container = host.RootFilterContainer;
         _host = host;
@@ -166,25 +151,28 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IRootFilterC
 
     public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, CatalogueItem ci) : this(activator)
     {
-
         if (ci.ExtractionInformation == null)
         {
-            SetImpossible("CatalogueItem is not extractable so cannot have filters. Make this CatalogueItem extractable to add filters.");
+            SetImpossible(
+                "CatalogueItem is not extractable so cannot have filters. Make this CatalogueItem extractable to add filters.");
             return;
         }
 
         _factory = new ExtractionFilterFactory(ci.ExtractionInformation);
     }
-    public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IFilterFactory factory, IContainer container = null)
+
+    public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IFilterFactory factory,
+        IContainer container = null)
         : this(activator)
     {
-
         _factory = factory;
         _container = container;
 
         SetImpossibleIfReadonly(container);
     }
-    public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IContainer container, IFilter basedOn) : this(activator)
+
+    public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IContainer container, IFilter basedOn) :
+        this(activator)
     {
         _container = container;
         BasedOn = basedOn;
@@ -193,17 +181,12 @@ public ExecuteCommandCreateNewFilter(IBasicActivateItems activator, IContainer c
     }
 
 
-    private ICatalogue GetCatalogue()
-    {
-        return _host?.GetCatalogue() ?? _container?.GetCatalogueIfAny();
-    }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-            
-        return OfferCatalogueFilters ?
-            iconProvider.GetImage(RDMPConcept.Filter, OverlayKind.Import):
-            iconProvider.GetImage(RDMPConcept.Filter, OverlayKind.Add);
-    }
+    private ICatalogue GetCatalogue() => _host?.GetCatalogue() ?? _container?.GetCatalogueIfAny();
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        OfferCatalogueFilters
+            ? iconProvider.GetImage(RDMPConcept.Filter, OverlayKind.Import)
+            : iconProvider.GetImage(RDMPConcept.Filter, OverlayKind.Add);
 
     public override void Execute()
     {
@@ -239,14 +222,8 @@ public override void Execute()
 
         container?.AddChild(f);
 
-        if (!string.IsNullOrWhiteSpace(Name))
-        {
-            f.Name = Name;
-        }
-        if (!string.IsNullOrWhiteSpace(WhereSQL))
-        {
-            f.WhereSQL = WhereSQL;
-        }
+        if (!string.IsNullOrWhiteSpace(Name)) f.Name = Name;
+        if (!string.IsNullOrWhiteSpace(WhereSQL)) f.WhereSQL = WhereSQL;
 
         f.SaveToDatabase();
 
@@ -261,15 +238,11 @@ public override void Execute()
 
     private void ImportExistingFilter(IContainer container)
     {
-
         var wizard = new FilterImportWizard(BasicActivator);
 
         var import = wizard.ImportManyFromSelection(container, _offerFilters).ToArray();
 
-        foreach (var f in import)
-        {
-            container.AddChild(f);
-        }
+        foreach (var f in import) container.AddChild(f);
 
         if (import.Length > 0)
         {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewGovernancePeriod.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewGovernancePeriod.cs
index ddd6cd1340..a663678ffb 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewGovernancePeriod.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewGovernancePeriod.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewGovernancePeriod:BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewGovernancePeriod : BasicCommandExecution, IAtomicCommand
 {
     private readonly string _name;
 
@@ -21,10 +21,8 @@ public ExecuteCommandCreateNewGovernancePeriod(IBasicActivateItems activator, st
         _name = name;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.GovernancePeriod, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.GovernancePeriod, OverlayKind.Add);
 
     public override void Execute()
     {
@@ -33,18 +31,14 @@ public override void Execute()
         var name = _name;
 
         if (name == null && BasicActivator.IsInteractive)
-        {
             if (!BasicActivator.TypeText(new DialogArgs
                 {
                     WindowTitle = "Governance Period Name",
                     TaskDescription = "Enter a name that describes the Governance required to hold the Catalogue(s).",
                     EntryLabel = "Name"
                 }, 255, null, out name, false))
-            {
                 // user cancelled typing a name
                 return;
-            }
-        }
 
         var period = new GovernancePeriod(BasicActivator.RepositoryLocator.CatalogueRepository, name);
         Publish(period);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadMetadata.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadMetadata.cs
index cf4f440c09..f3377faa38 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadMetadata.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadMetadata.cs
@@ -25,26 +25,23 @@ public class ExecuteCommandCreateNewLoadMetadata : BasicCommandExecution, IAtomi
     public string Folder { get; set; } = FolderHelper.Root;
 
     public ExecuteCommandCreateNewLoadMetadata(IBasicActivateItems activator,
-        [DemandsInitialization("Which Catalogue does this load.  Catalogues must not be associated with an existing load")]
+        [DemandsInitialization(
+            "Which Catalogue does this load.  Catalogues must not be associated with an existing load")]
         Catalogue catalogue = null) : base(activator)
     {
-        _availableCatalogues = activator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null).ToArray();
+        _availableCatalogues =
+            activator.CoreChildProvider.AllCatalogues.Where(c => c.LoadMetadata_ID == null).ToArray();
 
         if (!_availableCatalogues.Any())
             SetImpossible("There are no Catalogues that are not associated with another Load already");
 
-        if(catalogue != null)
-        {
-            SetTarget(catalogue);
-        }
+        if (catalogue != null) SetTarget(catalogue);
 
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Create a new data load configuration for loading data into a given set of datasets through RAW=>STAGING=>LIVE migration / adjustment";
-    }
+    public override string GetCommandHelp() =>
+        "Create a new data load configuration for loading data into a given set of datasets through RAW=>STAGING=>LIVE migration / adjustment";
 
     public override void Execute()
     {
@@ -72,7 +69,6 @@ public override void Execute()
             Publish(lmd);
 
             Activate(lmd);
-
         }
         finally
         {
@@ -81,15 +77,10 @@ public override void Execute()
     }
 
 
-    public override string GetCommandName()
-    {
-        return "Create New Data Load Configuration...";
-    }
+    public override string GetCommandName() => "Create New Data Load Configuration...";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.LoadMetadata, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.LoadMetadata, OverlayKind.Add);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadProgress.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadProgress.cs
index 2d0fe36a31..d3c92e9f89 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadProgress.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewLoadProgress.cs
@@ -18,15 +18,14 @@ internal class ExecuteCommandCreateNewLoadProgress : BasicCommandExecution, IAto
 {
     private readonly LoadMetadata _loadMetadata;
 
-    public ExecuteCommandCreateNewLoadProgress(IBasicActivateItems activator, LoadMetadata loadMetadata) : base(activator)
+    public ExecuteCommandCreateNewLoadProgress(IBasicActivateItems activator, LoadMetadata loadMetadata) :
+        base(activator)
     {
         _loadMetadata = loadMetadata;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Defines that the data load configuration has too much data to load in one go and that it must be loaded in date based batches (e.g. load 2001-01-01 to 2001-01-31)";
-    }
+    public override string GetCommandHelp() =>
+        "Defines that the data load configuration has too much data to load in one go and that it must be loaded in date based batches (e.g. load 2001-01-01 to 2001-01-31)";
 
     public override void Execute()
     {
@@ -37,8 +36,6 @@ public override void Execute()
         Emphasise(lp);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.LoadProgress, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.LoadProgress, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPermissionWindow.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPermissionWindow.cs
index 286b03b012..57a5ab2698 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPermissionWindow.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPermissionWindow.cs
@@ -20,18 +20,12 @@ public class ExecuteCommandCreateNewPermissionWindow : BasicCommandExecution, IA
 
     public ExecuteCommandCreateNewPermissionWindow(IBasicActivateItems activator) : base(activator)
     {
-
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.PermissionWindow, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.PermissionWindow, OverlayKind.Add);
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a new time window restriction on when loads can occur";
-    }
+    public override string GetCommandHelp() => "Creates a new time window restriction on when loads can occur";
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -43,7 +37,8 @@ public override void Execute()
     {
         base.Execute();
 
-        if (TypeText("Permission Window Name", "Enter name for the PermissionWindow e.g. 'Nightly Loads'", 1000,null,out var name))
+        if (TypeText("Permission Window Name", "Enter name for the PermissionWindow e.g. 'Nightly Loads'", 1000, null,
+                out var name))
         {
             var newWindow = new PermissionWindow(BasicActivator.RepositoryLocator.CatalogueRepository)
             {
@@ -52,7 +47,8 @@ public override void Execute()
             newWindow.SaveToDatabase();
 
             if (_cacheProgressToSetOnIfAny != null)
-                new ExecuteCommandSetPermissionWindow(BasicActivator, _cacheProgressToSetOnIfAny).SetTarget(newWindow).Execute();
+                new ExecuteCommandSetPermissionWindow(BasicActivator, _cacheProgressToSetOnIfAny).SetTarget(newWindow)
+                    .Execute();
 
             Publish(newWindow);
             Activate(newWindow);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewRemoteRDMP.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewRemoteRDMP.cs
index 37e080bd6c..5faa7be768 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewRemoteRDMP.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewRemoteRDMP.cs
@@ -27,13 +27,9 @@ public override void Execute()
         Activate(remote);
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Tell RDMP about another instance of RDMP that is available for communication with via a web service";
-    }
+    public override string GetCommandHelp() =>
+        "Tell RDMP about another instance of RDMP that is available for communication with via a web service";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.RemoteRDMP, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.RemoteRDMP, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewStandardRegex.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewStandardRegex.cs
index ac03112dc2..7e413a13ac 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewStandardRegex.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreateNewStandardRegex.cs
@@ -16,7 +16,6 @@ public class ExecuteCommandCreateNewStandardRegex : BasicCommandExecution, IAtom
 {
     public ExecuteCommandCreateNewStandardRegex(IBasicActivateItems activator) : base(activator)
     {
-
     }
 
     public override void Execute()
@@ -28,13 +27,9 @@ public override void Execute()
         Activate(regex);
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Regular Expressions are patterns that match a given text input.  StandardRegex allow a central declaration of a given pattern rather than copying and pasting it everywhere";
-    }
+    public override string GetCommandHelp() =>
+        "Regular Expressions are patterns that match a given text input.  StandardRegex allow a central declaration of a given pattern rather than copying and pasting it everywhere";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.StandardRegex, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.StandardRegex, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreatePrivateKey.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreatePrivateKey.cs
index 1bea6347ff..372848c509 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreatePrivateKey.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandCreatePrivateKey.cs
@@ -20,7 +20,8 @@ public class ExecuteCommandCreatePrivateKey : BasicCommandExecution
     public ExecuteCommandCreatePrivateKey(IBasicActivateItems activator, FileInfo keyFileToCreate) : base(activator)
     {
         _keyFileToCreate = keyFileToCreate;
-        _encryption = activator.RepositoryLocator.CatalogueRepository.EncryptionManager as PasswordEncryptionKeyLocation;
+        _encryption =
+            activator.RepositoryLocator.CatalogueRepository.EncryptionManager as PasswordEncryptionKeyLocation;
 
         if (_encryption == null)
         {
@@ -29,7 +30,7 @@ public ExecuteCommandCreatePrivateKey(IBasicActivateItems activator, FileInfo ke
         }
 
         var existing = _encryption.GetKeyFileLocation();
-        if (existing != null) 
+        if (existing != null)
             SetImpossible($"There is already a key file at '{existing}'");
     }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDelete.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDelete.cs
index 459364dfde..49fdac29de 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDelete.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDelete.cs
@@ -29,7 +29,7 @@ public class ExecuteCommandDelete : BasicCommandExecution
     private readonly bool _allowDeleteMany;
 
     public ExecuteCommandDelete(IBasicActivateItems activator,
-        IDeleteable deletable) : this(activator,new []{ deletable})
+        IDeleteable deletable) : this(activator, new[] { deletable })
     {
         Weight = 50.4f;
     }
@@ -37,14 +37,16 @@ public ExecuteCommandDelete(IBasicActivateItems activator,
 
     [UseWithObjectConstructor]
     public ExecuteCommandDelete(IBasicActivateItems activator,
-        [DemandsInitialization("The object(s) you want to delete.  If multiple you must set deleteMany to true",Mandatory = true)]
+        [DemandsInitialization("The object(s) you want to delete.  If multiple you must set deleteMany to true",
+            Mandatory = true)]
         IDeleteable[] deletables,
-        [DemandsInitialization("Optional.  Pass \"true\" to allow deleting many objects at once e.g. Catalogue:*bob* (deletes all catalogues with the word bob in)")]
+        [DemandsInitialization(
+            "Optional.  Pass \"true\" to allow deleting many objects at once e.g. Catalogue:*bob* (deletes all catalogues with the word bob in)")]
         bool deleteMany = false) : base(activator)
     {
         _deletables = deletables;
         _allowDeleteMany = deleteMany;
-        if (_deletables.Any( d => d is CohortAggregateContainer c && c.IsRootContainer()))
+        if (_deletables.Any(d => d is CohortAggregateContainer c && c.IsRootContainer()))
             SetImpossible("Cannot delete root containers");
 
         var reason = "";
@@ -65,10 +67,12 @@ public override string GetCommandName()
     private string GetDeleteVerbIfAny()
     {
         // if all objects are IDeletableWithCustomMessage
-        if (OverrideCommandName == null && _deletables.Count > 0 && _deletables.All(static d => d is IDeletableWithCustomMessage))
+        if (OverrideCommandName == null && _deletables.Count > 0 &&
+            _deletables.All(static d => d is IDeletableWithCustomMessage))
         {
             // Get the verbs (e.g. Remove, Disassociate etc)
-            var verbs = _deletables.Cast<IDeletableWithCustomMessage>().Select(static d => d.GetDeleteVerb()).Distinct().ToArray();
+            var verbs = _deletables.Cast<IDeletableWithCustomMessage>().Select(static d => d.GetDeleteVerb()).Distinct()
+                .ToArray();
 
             // if they agree on one specific verb
             if (verbs.Length == 1)
@@ -82,11 +86,12 @@ private string GetDeleteVerbIfAny()
     public override void Execute()
     {
         base.Execute();
-             
+
         // if the thing we are deleting is important and sensitive then we should use a transaction
-        if(_deletables.Count > 1 || ShouldUseTransactionsWhenDeleting(_deletables.FirstOrDefault()))
+        if (_deletables.Count > 1 || ShouldUseTransactionsWhenDeleting(_deletables.FirstOrDefault()))
         {
-            ExecuteWithCommit(ExecuteImpl, GetDescription(), _deletables.OfType<IMapsDirectlyToDatabaseTable>().ToArray());
+            ExecuteWithCommit(ExecuteImpl, GetDescription(),
+                _deletables.OfType<IMapsDirectlyToDatabaseTable>().ToArray());
             PublishNearest();
         }
         else
@@ -95,12 +100,9 @@ public override void Execute()
         }
     }
 
-    private static bool ShouldUseTransactionsWhenDeleting(IDeleteable deleteable)
-    {
-        return
-            deleteable is CatalogueItem ||
-            deleteable is ExtractionInformation;
-    }
+    private static bool ShouldUseTransactionsWhenDeleting(IDeleteable deleteable) =>
+        deleteable is CatalogueItem ||
+        deleteable is ExtractionInformation;
 
     private string GetDescription()
     {
@@ -113,7 +115,6 @@ private string GetDescription()
 
     private void ExecuteImpl()
     {
-
         switch (_deletables.Count)
         {
             case 1:
@@ -127,10 +128,8 @@ private void ExecuteImpl()
         // if the command did not ask to delete many and it is not interactive (e.g. CLI) then
         // we shouldn't just blindly delete them all
         if (!BasicActivator.IsInteractive && !_allowDeleteMany)
-        {
             throw new Exception(
                 $"Allow delete many is false but multiple objects were matched for deletion ({string.Join(",", _deletables)})");
-        }
 
         // if it is interactive, only proceed if the user confirms behaviour
         if (BasicActivator.IsInteractive &&
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDeprecate.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDeprecate.cs
index 6125badf28..9316907887 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDeprecate.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDeprecate.cs
@@ -14,12 +14,12 @@ public class ExecuteCommandDeprecate : BasicCommandExecution
 {
     private readonly IMightBeDeprecated[] _o;
     private readonly bool _desiredState;
-      
+
     [UseWithObjectConstructor]
-    public ExecuteCommandDeprecate(IBasicActivateItems itemActivator, 
+    public ExecuteCommandDeprecate(IBasicActivateItems itemActivator,
         [DemandsInitialization("The object you want to deprecate/undeprecate")]
-        IMightBeDeprecated[] o, 
-        [DemandsInitialization("True to deprecate.  False to undeprecate",DefaultValue = true)]
+        IMightBeDeprecated[] o,
+        [DemandsInitialization("True to deprecate.  False to undeprecate", DefaultValue = true)]
         bool desiredState = true) : base(itemActivator)
     {
         _o = o;
@@ -38,13 +38,10 @@ public override void Execute()
     {
         base.Execute();
 
-        if(_o == null || _o.Length == 0)
+        if (_o == null || _o.Length == 0)
             return;
 
-        if(ExecuteWithCommit(ExecuteImpl, GetDescription(),_o))
-        {
-            Publish((DatabaseEntity)_o[0]);
-        }
+        if (ExecuteWithCommit(ExecuteImpl, GetDescription(), _o)) Publish((DatabaseEntity)_o[0]);
     }
 
     private void ExecuteImpl()
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDescribe.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDescribe.cs
index af060cfad9..904198f45e 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDescribe.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDescribe.cs
@@ -20,7 +20,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandDescribe:BasicCommandExecution
+public class ExecuteCommandDescribe : BasicCommandExecution
 {
     private readonly IMapsDirectlyToDatabaseTable[] _databaseObjectToDescribe;
     private object _nonDatabaseObjectToDescribe;
@@ -31,21 +31,24 @@ public class ExecuteCommandDescribe:BasicCommandExecution
     public string HelpShown { get; private set; }
 
     [UseWithCommandLine(
-        ParameterHelpList = "<command,type or object>", 
-        ParameterHelpBreakdown = @"An object (or array of objects) to describe (e.g. Catalogue:bob) or Type name, or the name of a command")]
-    public ExecuteCommandDescribe(IBasicActivateItems activator,CommandLineObjectPicker picker):base(activator)
+        ParameterHelpList = "<command,type or object>",
+        ParameterHelpBreakdown =
+            @"An object (or array of objects) to describe (e.g. Catalogue:bob) or Type name, or the name of a command")]
+    public ExecuteCommandDescribe(IBasicActivateItems activator, CommandLineObjectPicker picker) : base(activator)
     {
-        if(picker.Length != 1)
+        if (picker.Length != 1)
         {
             SetImpossible($"Expected only a single parameter but there were {picker.Length}");
             return;
         }
-        if(picker[0].HasValueOfType(typeof(IMapsDirectlyToDatabaseTable[])))
+
+        if (picker[0].HasValueOfType(typeof(IMapsDirectlyToDatabaseTable[])))
         {
-            _databaseObjectToDescribe = (IMapsDirectlyToDatabaseTable[])picker[0].GetValueForParameterOfType(typeof(IMapsDirectlyToDatabaseTable[]));
+            _databaseObjectToDescribe =
+                (IMapsDirectlyToDatabaseTable[])picker[0]
+                    .GetValueForParameterOfType(typeof(IMapsDirectlyToDatabaseTable[]));
         }
-        else
-        if (picker[0].HasValueOfType(typeof(Type)))
+        else if (picker[0].HasValueOfType(typeof(Type)))
         {
             _nonDatabaseObjectToDescribe = picker[0].GetValueForParameterOfType(typeof(Type));
         }
@@ -53,17 +56,17 @@ public ExecuteCommandDescribe(IBasicActivateItems activator,CommandLineObjectPic
         {
             // Maybe they typed the alias or name of a command
             _nonDatabaseObjectToDescribe = new CommandInvoker(BasicActivator).GetSupportedCommands()
-                .FirstOrDefault(t=>HasCommandNameOrAlias(t,picker[0].RawValue));
-                
-                    
-            if(_nonDatabaseObjectToDescribe == null)
+                .FirstOrDefault(t => HasCommandNameOrAlias(t, picker[0].RawValue));
+
+
+            if (_nonDatabaseObjectToDescribe == null)
                 SetImpossible("Did not recognise parameter as a valid command");
         }
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandDescribe(IBasicActivateItems activator, 
-        IMapsDirectlyToDatabaseTable[] toDescribe):base(activator)
+    public ExecuteCommandDescribe(IBasicActivateItems activator,
+        IMapsDirectlyToDatabaseTable[] toDescribe) : base(activator)
     {
         _databaseObjectToDescribe = toDescribe;
     }
@@ -80,18 +83,18 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
 
         return base.GetImage(iconProvider);
     }
+
     public override string GetCommandName()
     {
         if (_nonDatabaseObjectToDescribe != null)
-        {
             return _nonDatabaseObjectToDescribe is Type t ? t.Name : _nonDatabaseObjectToDescribe.ToString();
-        }
 
         return base.GetCommandName();
     }
+
     public override string GetCommandHelp()
     {
-        if(_nonDatabaseObjectToDescribe != null)
+        if (_nonDatabaseObjectToDescribe != null)
         {
             var summary = BuildDescribe(_nonDatabaseObjectToDescribe, out var title);
 
@@ -100,6 +103,7 @@ public override string GetCommandHelp()
 
         return base.GetCommandHelp();
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -108,44 +112,35 @@ public override void Execute()
         {
             DisplayCommandHelp(t);
         }
-        else
-        if(_nonDatabaseObjectToDescribe != null)
+        else if (_nonDatabaseObjectToDescribe != null)
         {
-            var description = BuildDescribe(_nonDatabaseObjectToDescribe,out var title);
+            var description = BuildDescribe(_nonDatabaseObjectToDescribe, out var title);
             Show(title, description);
         }
         else
         {
             var sb = new StringBuilder();
 
-            foreach (var o in _databaseObjectToDescribe)
-            {
-                BuildDescribe(o, sb);
-            }
+            foreach (var o in _databaseObjectToDescribe) BuildDescribe(o, sb);
 
             if (sb.Length > 0)
                 Show(HelpShown = sb.ToString());
         }
-
     }
 
     public static string Describe(IMapsDirectlyToDatabaseTable o)
     {
         var sb = new StringBuilder();
-        BuildDescribe(o,sb);
+        BuildDescribe(o, sb);
         return sb.ToString();
     }
 
     private static void BuildDescribe(IMapsDirectlyToDatabaseTable o, StringBuilder sb)
     {
-
         foreach (var p in o.GetType().GetProperties())
         {
             // don't describe helper properties
-            if(p.GetCustomAttributes(typeof(NoMappingToDatabase)).Any())
-            {
-                continue;
-            }
+            if (p.GetCustomAttributes(typeof(NoMappingToDatabase)).Any()) continue;
 
             sb.Append(p.Name);
             sb.Append(':');
@@ -154,7 +149,8 @@ private static void BuildDescribe(IMapsDirectlyToDatabaseTable o, StringBuilder
 
         sb.AppendLine("-----------------------------------------");
     }
-    private string BuildDescribe(object o,out string title)
+
+    private string BuildDescribe(object o, out string title)
     {
         // if its a Type tell them about the Type
         if (o is Type t)
@@ -174,11 +170,12 @@ public void DisplayCommandHelp(Type commandType)
     {
         var invoker = new CommandInvoker(BasicActivator);
 
-        var commandCtor = invoker.GetConstructor(commandType, new CommandLineObjectPicker(Array.Empty<string>(),BasicActivator));
+        var commandCtor = invoker.GetConstructor(commandType,
+            new CommandLineObjectPicker(Array.Empty<string>(), BasicActivator));
 
         var sb = new StringBuilder();
 
-        PopulateBasicCommandInfo(sb,commandType);
+        PopulateBasicCommandInfo(sb, commandType);
 
         var dynamicCtorAttribute = commandCtor?.GetCustomAttribute<UseWithCommandLineAttribute>();
 
@@ -201,14 +198,15 @@ public void DisplayCommandHelp(Type commandType)
             sb.Append(dynamicCtorAttribute.ParameterHelpList);
             sbParameters.Append(dynamicCtorAttribute.ParameterHelpBreakdown);
         }
-        else
-        if (commandCtor == null || invoker.WhyCommandNotSupported(commandCtor) is not null)
+        else if (commandCtor == null || invoker.WhyCommandNotSupported(commandCtor) is not null)
         {
-            sb.AppendLine($"Command '{commandType.Name}' is not supported by the current input type ({BasicActivator.GetType().Name})");
+            sb.AppendLine(
+                $"Command '{commandType.Name}' is not supported by the current input type ({BasicActivator.GetType().Name})");
 
             if (commandCtor != null)
             {
-                var unsupported = commandCtor.GetParameters().Where(p => invoker.WhyCommandNotSupported(p) is not null).ToArray();
+                var unsupported = commandCtor.GetParameters().Where(p => invoker.WhyCommandNotSupported(p) is not null)
+                    .ToArray();
 
                 if (unsupported.Any())
                     sb.AppendLine(
@@ -235,30 +233,32 @@ public void DisplayCommandHelp(Type commandType)
                 sbParameters.AppendLine(FormatParameterDescription(req, commandCtor));
             }
 
-            anySyntaxes = ShowSyntax("Pick Database",sbSyntaxes, parameters ,p => typeof(DiscoveredDatabase).IsAssignableFrom(p.ParameterType), new PickDatabase()) || anySyntaxes;
-            anySyntaxes = ShowSyntax("Pick Table",sbSyntaxes, parameters, p => typeof(DiscoveredTable).IsAssignableFrom(p.ParameterType), new PickTable()) || anySyntaxes;
+            anySyntaxes = ShowSyntax("Pick Database", sbSyntaxes, parameters,
+                p => typeof(DiscoveredDatabase).IsAssignableFrom(p.ParameterType), new PickDatabase()) || anySyntaxes;
+            anySyntaxes = ShowSyntax("Pick Table", sbSyntaxes, parameters,
+                p => typeof(DiscoveredTable).IsAssignableFrom(p.ParameterType), new PickTable()) || anySyntaxes;
 
-            anySyntaxes = ShowSyntax("Pick RDMP Object",sbSyntaxes, parameters, p => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(p.ParameterType) || anySyntaxes,
+            anySyntaxes = ShowSyntax("Pick RDMP Object", sbSyntaxes, parameters,
+                p => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(p.ParameterType) || anySyntaxes,
                 new PickObjectByID(BasicActivator),
                 new PickObjectByName(BasicActivator),
                 new PickObjectByQuery(BasicActivator)) || anySyntaxes;
-
         }
 
 
         sb.AppendLine();
-        sb.AppendLine(sbParameters.ToString());            
+        sb.AppendLine(sbParameters.ToString());
 
-        if(anySyntaxes)
+        if (anySyntaxes)
             sb.AppendLine(sbSyntaxes.ToString());
 
         BasicActivator.Show(HelpShown = sb.ToString());
-
     }
 
-    private static bool ShowSyntax(string title, StringBuilder sbSyntaxes, ParameterInfo[] parameters, Func<ParameterInfo, bool> selector, params PickObjectBase[] pickers)
+    private static bool ShowSyntax(string title, StringBuilder sbSyntaxes, ParameterInfo[] parameters,
+        Func<ParameterInfo, bool> selector, params PickObjectBase[] pickers)
     {
-        if(parameters.Any(selector))
+        if (parameters.Any(selector))
         {
             sbSyntaxes.AppendLine($"{Environment.NewLine}{title}:");
             sbSyntaxes.AppendLine("Formats:");
@@ -267,7 +267,7 @@ private static bool ShowSyntax(string title, StringBuilder sbSyntaxes, Parameter
 
             sbSyntaxes.AppendLine("Examples:");
             foreach (var p in pickers)
-            foreach(var e in p.Examples)
+            foreach (var e in p.Examples)
                 sbSyntaxes.AppendLine(e);
 
             return true;
@@ -276,25 +276,24 @@ private static bool ShowSyntax(string title, StringBuilder sbSyntaxes, Parameter
         return false;
     }
 
-    private string FormatParameterDescription(RequiredArgument req,ConstructorInfo ctor)
+    private string FormatParameterDescription(RequiredArgument req, ConstructorInfo ctor)
     {
-        var nameColWidth = ctor.GetParameters().Max(p=>p.Name.Length);
-        var typeColWidth = ctor.GetParameters().Max(p=>p.ParameterType.Name.Length);
+        var nameColWidth = ctor.GetParameters().Max(p => p.Name.Length);
+        var typeColWidth = ctor.GetParameters().Max(p => p.ParameterType.Name.Length);
 
         try
         {
-            if(BasicActivator is ConsoleInputManager)
+            if (BasicActivator is ConsoleInputManager)
             {
                 var name = req.Name.Length < nameColWidth ? req.Name.PadRight(nameColWidth) : req.Name[..nameColWidth];
-                var type = req.Type.Name.Length < typeColWidth ? req.Type.Name.PadRight(typeColWidth) : req.Type.Name[..typeColWidth];
+                var type = req.Type.Name.Length < typeColWidth
+                    ? req.Type.Name.PadRight(typeColWidth)
+                    : req.Type.Name[..typeColWidth];
 
                 var desc = req.DemandIfAny?.Description;
 
 
-                if (req.Type.IsEnum)
-                {
-                    desc += $"Allowed Values:{string.Join(", ", Enum.GetNames(req.Type))}";
-                }
+                if (req.Type.IsEnum) desc += $"Allowed Values:{string.Join(", ", Enum.GetNames(req.Type))}";
 
                 if (string.IsNullOrWhiteSpace(desc))
                     return $"{name} {type}";
@@ -303,15 +302,13 @@ private string FormatParameterDescription(RequiredArgument req,ConstructorInfo c
 
                 var availableDescriptionWidth = availableWidth - occupied;
 
-                if(availableDescriptionWidth < 0)
+                if (availableDescriptionWidth < 0)
                     return $"{name} {type}";
 
-                var wrappedDesc = Wrap(desc,availableDescriptionWidth,occupied);
+                var wrappedDesc = Wrap(desc, availableDescriptionWidth, occupied);
 
                 return $"{name} {type} {wrappedDesc}";
-
             }
-
         }
         catch (Exception)
         {
@@ -320,7 +317,7 @@ private string FormatParameterDescription(RequiredArgument req,ConstructorInfo c
 
         return $"{req.Name}\t{req.Type.Name}\t{req.DemandIfAny?.Description}";
     }
-        
+
     private static string Wrap(string longString, int width, int indent)
     {
         var words = longString.Split(' ');
@@ -333,7 +330,7 @@ private static string Wrap(string longString, int width, int indent)
             if (line.Length + word.Length >= width)
             {
                 newSentence.AppendLine(line.ToString().TrimEnd());
-                newSentence.Append(new string (' ',indent));
+                newSentence.Append(new string(' ', indent));
                 line.Clear();
             }
 
@@ -344,13 +341,13 @@ private static string Wrap(string longString, int width, int indent)
         if (line.Length > 0)
         {
             newSentence.AppendLine(line.ToString().TrimEnd());
-            newSentence.Append(new string (' ',indent));
+            newSentence.Append(new string(' ', indent));
         }
 
         return newSentence.ToString().Trim();
     }
 
-    private void PopulateBasicCommandInfo(StringBuilder sb,Type commandType)
+    private void PopulateBasicCommandInfo(StringBuilder sb, Type commandType)
     {
         var help = BasicActivator.CommentStore ?? CreateCommentStore();
 
@@ -359,14 +356,11 @@ private void PopulateBasicCommandInfo(StringBuilder sb,Type commandType)
 
 
         var aliases = commandType.GetCustomAttributes(false).OfType<AliasAttribute>().ToArray();
-        if(aliases.Any())
-        {
-            sb.AppendLine($"Aliases:{string.Join(',', aliases.Select(a => a.Name).ToArray())}");
-        }
+        if (aliases.Any()) sb.AppendLine($"Aliases:{string.Join(',', aliases.Select(a => a.Name).ToArray())}");
 
         var helpText = help.GetTypeDocumentationIfExists(commandType);
 
-        if(helpText != null)
+        if (helpText != null)
         {
             sb.AppendLine();
             sb.AppendLine($"Description: {Environment.NewLine}{helpText}");
@@ -374,13 +368,11 @@ private void PopulateBasicCommandInfo(StringBuilder sb,Type commandType)
 
         sb.AppendLine();
         sb.AppendLine("USAGE: ");
-                
+
         sb.Append(EnvironmentInfo.IsLinux ? "./rdmp" : "./rdmp.exe");
         sb.Append(' ');
 
         sb.Append(BasicCommandExecution.GetCommandName(commandType.Name));
         sb.Append(' ');
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDisableOrEnable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDisableOrEnable.cs
index 33222125a3..7d4dc5d363 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDisableOrEnable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandDisableOrEnable.cs
@@ -24,7 +24,7 @@ public ExecuteCommandDisableOrEnable(IBasicActivateItems itemActivator, IDisable
         Weight = 50.1f;
     }
 
-    public ExecuteCommandDisableOrEnable(IBasicActivateItems  activator, IDisableable[] disableables) : base(activator)
+    public ExecuteCommandDisableOrEnable(IBasicActivateItems activator, IDisableable[] disableables) : base(activator)
     {
         _targets = disableables;
 
@@ -35,17 +35,14 @@ public ExecuteCommandDisableOrEnable(IBasicActivateItems  activator, IDisableabl
         }
 
         if (disableables.All(d => d.IsDisabled) || disableables.All(d => !d.IsDisabled))
-        {
             foreach (var d in _targets)
                 UpdateViabilityForTarget(d);
-        }
         else
-        {
             SetImpossible("All objects must be in the same disabled/enabled state");
-        }
 
         Weight = 50.1f;
     }
+
     private void UpdateViabilityForTarget(IDisableable target)
     {
         //don't let them disable the root container
@@ -55,13 +52,11 @@ private void UpdateViabilityForTarget(IDisableable target)
         if (target is AggregateConfiguration aggregateConfiguration)
             if (!aggregateConfiguration.IsCohortIdentificationAggregate)
                 SetImpossible("Only cohort identification aggregates can be disabled");
-            else
-            if (aggregateConfiguration.IsJoinablePatientIndexTable() && !aggregateConfiguration.IsDisabled)
+            else if (aggregateConfiguration.IsJoinablePatientIndexTable() && !aggregateConfiguration.IsDisabled)
                 SetImpossible("Joinable Patient Index Tables cannot be disabled");
 
         if (target is IMightBeReadOnly ro && ro.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
-
     }
 
     public override void Execute()
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExecuteAggregateGraph.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExecuteAggregateGraph.cs
index 8dceb95d79..10f1bf4531 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExecuteAggregateGraph.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExecuteAggregateGraph.cs
@@ -20,7 +20,8 @@ public class ExecuteCommandExecuteAggregateGraph : BasicCommandExecution, IAtomi
     private readonly AggregateConfiguration _aggregate;
     private readonly FileInfo _toFile;
 
-    public ExecuteCommandExecuteAggregateGraph(IBasicActivateItems activator, AggregateConfiguration aggregate, FileInfo toFile=null) : base(activator)
+    public ExecuteCommandExecuteAggregateGraph(IBasicActivateItems activator, AggregateConfiguration aggregate,
+        FileInfo toFile = null) : base(activator)
     {
         _aggregate = aggregate;
         _toFile = toFile;
@@ -32,28 +33,22 @@ public ExecuteCommandExecuteAggregateGraph(IBasicActivateItems activator, Aggreg
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Assembles and runs the graph query and renders the results as a graph";
-    }
+    public override string GetCommandHelp() => "Assembles and runs the graph query and renders the results as a graph";
 
     public override void Execute()
     {
         base.Execute();
 
-        if(_toFile != null)
+        if (_toFile != null)
         {
             var collection = new ViewAggregateExtractUICollection(_aggregate);
-            ExtractTableVerbatim.ExtractDataToFile(collection,_toFile);
+            ExtractTableVerbatim.ExtractDataToFile(collection, _toFile);
         }
         else
         {
             BasicActivator.ShowGraph(_aggregate);
         }
-    }        
-
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.Graph);
     }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.Graph);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportLoggedDataToCsv.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportLoggedDataToCsv.cs
index 7e121e3134..bf7b3ebc78 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportLoggedDataToCsv.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportLoggedDataToCsv.cs
@@ -20,35 +20,31 @@ public class ExecuteCommandExportLoggedDataToCsv : BasicCommandExecution
 {
     private LogViewerFilter _filter;
     private ExternalDatabaseServer[] _loggingServers;
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandExportLoggedDataToCsv(IBasicActivateItems activator,LoggingTables table, int idIfAny)
-        : this(activator,new LogViewerFilter(table,idIfAny <= 0 ? (int?) null:idIfAny))
+    public ExecuteCommandExportLoggedDataToCsv(IBasicActivateItems activator, LoggingTables table, int idIfAny)
+        : this(activator, new LogViewerFilter(table, idIfAny <= 0 ? (int?)null : idIfAny))
     {
-            
     }
 
     public ExecuteCommandExportLoggedDataToCsv(IBasicActivateItems activator, LogViewerFilter filter) : base(activator)
     {
         _filter = filter ?? new LogViewerFilter(LoggingTables.DataLoadTask);
-        _loggingServers = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllDatabases<LoggingDatabasePatcher>();
+        _loggingServers =
+            BasicActivator.RepositoryLocator.CatalogueRepository.GetAllDatabases<LoggingDatabasePatcher>();
 
-        if(!_loggingServers.Any())
+        if (!_loggingServers.Any())
             SetImpossible("There are no logging servers");
     }
 
-    public override string GetCommandName()
-    {
-        return "Export to CSV";
-    }
+    public override string GetCommandName() => "Export to CSV";
 
     public override void Execute()
     {
-        var db = SelectOne(_loggingServers,null,true);
+        var db = SelectOne(_loggingServers, null, true);
         var server = db.Discover(DataAccessContext.Logging).Server;
-            
+
         if (db != null)
-        {
             using (var con = server.GetConnection())
             {
                 con.Open();
@@ -78,9 +74,8 @@ SELECT [dataLoadRunID]
 
                 var extract = new ExtractTableVerbatim(server, sql, output.Name, output.Directory, ",",
                     CultureInfo.CurrentCulture.DateTimeFormat.FullDateTimePattern);
-                    
+
                 extract.DoExtraction();
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportObjectsToFile.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportObjectsToFile.cs
index 5c71dd201c..ff69e3c94a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportObjectsToFile.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportObjectsToFile.cs
@@ -40,12 +40,14 @@ public class ExecuteCommandExportObjectsToFile : BasicCommandExecution
 
     public bool IsSingleObject => _toExport.Length == 1;
 
-    public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable toExport, FileInfo targetFileInfo = null) : this(activator, new[] { toExport })
+    public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable toExport,
+        FileInfo targetFileInfo = null) : this(activator, new[] { toExport })
     {
         TargetFileInfo = targetFileInfo;
     }
 
-    public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable[] toExport, DirectoryInfo targetDirectoryInfo = null) : base(activator)
+    public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable[] toExport,
+        DirectoryInfo targetDirectoryInfo = null) : base(activator)
     {
         _toExport = toExport;
         ShowInExplorer = true;
@@ -62,6 +64,7 @@ public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDir
             SetImpossible("No objects exist to be exported");
             return;
         }
+
         _gatherer = new Gatherer(_repositoryLocator);
 
         var incompatible = toExport.FirstOrDefault(o => !_gatherer.CanGatherDependencies(o));
@@ -70,21 +73,14 @@ public ExecuteCommandExportObjectsToFile(IBasicActivateItems activator, IMapsDir
             SetImpossible($"Object {incompatible.GetType()} is not supported by Gatherer");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a share file with definitions for the supplied objects and all children";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a share file with definitions for the supplied objects and all children";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.page_white_put);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(FamFamFamIcons.page_white_put);
 
 
-    public override string GetCommandName()
-    {
-        return "Export Object(s) to File...";
-    }
+    public override string GetCommandName() => "Export Object(s) to File...";
 
 
     public override void Execute()
@@ -96,7 +92,8 @@ public override void Execute()
             //Extract a single object (to file)
             if (TargetFileInfo == null && BasicActivator.IsInteractive)
             {
-                TargetFileInfo = BasicActivator.SelectFile("Path to output share definition to", "Share Definition", "*.sd");
+                TargetFileInfo =
+                    BasicActivator.SelectFile("Path to output share definition to", "Share Definition", "*.sd");
 
                 if (TargetFileInfo == null)
                     return;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportPlugins.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportPlugins.cs
index be064fc104..d7f05911b4 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportPlugins.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExportPlugins.cs
@@ -19,27 +19,23 @@ public class ExecuteCommandExportPlugins : BasicCommandExecution
     private DirectoryInfo _outDir;
     private Curation.Data.Plugin[] _plugins;
 
-    public ExecuteCommandExportPlugins(IBasicActivateItems activator): this(activator,null)
+    public ExecuteCommandExportPlugins(IBasicActivateItems activator) : this(activator, null)
     {
-            
     }
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandExportPlugins(IBasicActivateItems activator, DirectoryInfo outputDirectory):base(activator)
+    public ExecuteCommandExportPlugins(IBasicActivateItems activator, DirectoryInfo outputDirectory) : base(activator)
     {
         _outDir = outputDirectory;
         _plugins = BasicActivator.RepositoryLocator.CatalogueRepository.PluginManager.GetCompatiblePlugins();
 
-        if(!_plugins.Any())
+        if (!_plugins.Any())
             SetImpossible("There are no compatible plugins (for the version of RDMP you are running)");
-
     }
 
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Plugin, OverlayKind.Shortcut);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Plugin, OverlayKind.Shortcut);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExtractMetadata.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExtractMetadata.cs
index f9ffa15713..21dcf18cac 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExtractMetadata.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandExtractMetadata.cs
@@ -24,21 +24,25 @@ public class ExecuteCommandExtractMetadata : BasicCommandExecution
     private readonly string _newlineSub;
     private readonly string _commaSub;
 
-    public ExecuteCommandExtractMetadata(IBasicActivateItems basicActivator, 
-        Catalogue[] catalogues, 
+    public ExecuteCommandExtractMetadata(IBasicActivateItems basicActivator,
+        Catalogue[] catalogues,
         [DemandsInitialization("Where new files should be generated")]
         DirectoryInfo outputDirectory,
-
-        [DemandsInitialization("Template file in which keys such as $Name will be replaced with the corresponding Catalogue entry")]
-        FileInfo template, 
-        [DemandsInitialization("How output files based on the template should be named.  Uses same replacement strategy as template contents e.g. $Name.xml")]
-        string fileNaming, 
-        [DemandsInitialization("True to append all outputs into a single file.  False to output a new file for every Catalogue")]
-        bool oneFile, 
-        [DemandsInitialization("Optional, specify a replacement for newlines when found in fields e.g. <br/>.  Leave as null to leave newlines intact.")]
+        [DemandsInitialization(
+            "Template file in which keys such as $Name will be replaced with the corresponding Catalogue entry")]
+        FileInfo template,
+        [DemandsInitialization(
+            "How output files based on the template should be named.  Uses same replacement strategy as template contents e.g. $Name.xml")]
+        string fileNaming,
+        [DemandsInitialization(
+            "True to append all outputs into a single file.  False to output a new file for every Catalogue")]
+        bool oneFile,
+        [DemandsInitialization(
+            "Optional, specify a replacement for newlines when found in fields e.g. <br/>.  Leave as null to leave newlines intact.")]
         string newlineSub,
-        [DemandsInitialization("Optional, specify a replacement for the token $Comma (defaults to ',')",DefaultValue = ",")]
-        string commaSub = ","):base(basicActivator)
+        [DemandsInitialization("Optional, specify a replacement for the token $Comma (defaults to ',')",
+            DefaultValue = ",")]
+        string commaSub = ",") : base(basicActivator)
     {
         _catalogues = catalogues;
         _outputDirectory = outputDirectory;
@@ -57,12 +61,12 @@ public override void Execute()
             .SelectMany("Which catalogues do you want to extract metadata for", typeof(Catalogue),
                 BasicActivator.CoreChildProvider.AllCatalogues);
 
-        if(catas == null || !catas.Any())
+        if (catas == null || !catas.Any())
             return;
 
         var outputDir = _outputDirectory ?? BasicActivator.SelectDirectory("Enter output directory");
 
-        if(outputDir == null)
+        if (outputDir == null)
             return;
 
         var template = _template;
@@ -70,18 +74,20 @@ public override void Execute()
         if (template == null)
         {
             BasicActivator.Show("Pick a template");
-            template = BasicActivator.SelectFile("Enter metadata template (should have template values in it e.g. $Name, $Description etc)");
+            template = BasicActivator.SelectFile(
+                "Enter metadata template (should have template values in it e.g. $Name, $Description etc)");
         }
 
         if (template == null)
             return;
 
-        var fileNaming =  _fileNaming;
+        var fileNaming = _fileNaming;
 
         if (fileNaming == null)
-            if(!BasicActivator.TypeText("File naming", "File Naming", 1000, $"$Name{template.Extension}", out fileNaming, false))
+            if (!BasicActivator.TypeText("File naming", "File Naming", 1000, $"$Name{template.Extension}",
+                    out fileNaming, false))
                 return;
-            
+
         if (string.IsNullOrWhiteSpace(fileNaming))
             return;
 
@@ -90,6 +96,7 @@ public override void Execute()
             NewlineSubstitution = _newlineSub,
             CommaSubstitution = _commaSub
         };
-        reporter.GenerateReport(catas.Cast<Catalogue>().OrderBy(c=>c.Name).ToArray(),outputDir,template, fileNaming, _oneFile);
+        reporter.GenerateReport(catas.Cast<Catalogue>().OrderBy(c => c.Name).ToArray(), outputDir, template, fileNaming,
+            _oneFile);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeCohortIdentificationConfiguration.cs
index 2fde7c20ed..1301d5c0fe 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeCohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeCohortIdentificationConfiguration.cs
@@ -17,16 +17,14 @@ public class ExecuteCommandFreezeCohortIdentificationConfiguration : BasicComman
     private readonly CohortIdentificationConfiguration _cic;
     private readonly bool _desiredFreezeState;
 
-    public ExecuteCommandFreezeCohortIdentificationConfiguration(IBasicActivateItems activator, CohortIdentificationConfiguration cic, bool desiredFreezeState):base(activator)
+    public ExecuteCommandFreezeCohortIdentificationConfiguration(IBasicActivateItems activator,
+        CohortIdentificationConfiguration cic, bool desiredFreezeState) : base(activator)
     {
         _cic = cic;
         _desiredFreezeState = desiredFreezeState;
     }
 
-    public override string GetCommandName()
-    {
-        return _desiredFreezeState ? "Freeze Configuration" : "Unfreeze Configuration";
-    }
+    public override string GetCommandName() => _desiredFreezeState ? "Freeze Configuration" : "Unfreeze Configuration";
 
     public override void Execute()
     {
@@ -40,8 +38,6 @@ public override void Execute()
         Publish(_cic);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.FrozenCohortIdentificationConfiguration);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.FrozenCohortIdentificationConfiguration);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeExtractionConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeExtractionConfiguration.cs
index 4ba9c5ff02..28f311aa6c 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeExtractionConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandFreezeExtractionConfiguration.cs
@@ -16,7 +16,8 @@ internal class ExecuteCommandFreezeExtractionConfiguration : BasicCommandExecuti
 {
     private ExtractionConfiguration _extractionConfiguration;
 
-    public ExecuteCommandFreezeExtractionConfiguration(IBasicActivateItems activator, ExtractionConfiguration extractionConfiguration) : base(activator)
+    public ExecuteCommandFreezeExtractionConfiguration(IBasicActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
 
@@ -24,10 +25,9 @@ public ExecuteCommandFreezeExtractionConfiguration(IBasicActivateItems activator
             SetImpossible("ExtractionConfiguration is already released)");
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.FrozenExtractionConfiguration);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.FrozenExtractionConfiguration);
+
     public override void Execute()
     {
         base.Execute();
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateReleaseDocument.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateReleaseDocument.cs
index ca2c5aaf95..5924350eb3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateReleaseDocument.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateReleaseDocument.cs
@@ -22,42 +22,33 @@ internal class ExecuteCommandGenerateReleaseDocument : BasicCommandExecution, IA
 {
     private readonly ExtractionConfiguration _extractionConfiguration;
 
-    public ExecuteCommandGenerateReleaseDocument(IBasicActivateItems activator, ExtractionConfiguration extractionConfiguration) : base(activator)
+    public ExecuteCommandGenerateReleaseDocument(IBasicActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
         /////////////////Other stuff///////////
         if (!extractionConfiguration.CumulativeExtractionResults.Any())
             SetImpossible("No datasets have been extracted");
 
-        if(_extractionConfiguration.Cohort_ID == null)
-        {
+        if (_extractionConfiguration.Cohort_ID == null)
             SetImpossible("ExtractionConfiguration does not have a cohort");
-        }
         else
-        {
             try
             {
                 // try to fetch the cohort (give it 2 seconds maximum). 
                 // we don't want to freeze waiting for context menu to pop up on this
                 var eds = _extractionConfiguration.Cohort.GetExternalData(2);
 
-                if (eds == ExternalCohortDefinitionData.Orphan)
-                {
-                    SetImpossible("Cohort did not exist");
-                }
+                if (eds == ExternalCohortDefinitionData.Orphan) SetImpossible("Cohort did not exist");
             }
             catch (Exception)
             {
                 SetImpossible("Cohort was unreachable");
             }
-        }
-                
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Generate a document describing what has been extracted so far for each dataset in the extraction configuration including number of rows, distinct patient counts etc";
-    }
+    public override string GetCommandHelp() =>
+        "Generate a document describing what has been extracted so far for each dataset in the extraction configuration including number of rows, distinct patient counts etc";
 
     public override void Execute()
     {
@@ -65,7 +56,8 @@ public override void Execute()
 
         try
         {
-            ReleaseRunner.IdentifyAndRemoveOldExtractionResults(BasicActivator.RepositoryLocator, new AcceptAllCheckNotifier(), _extractionConfiguration);
+            ReleaseRunner.IdentifyAndRemoveOldExtractionResults(BasicActivator.RepositoryLocator,
+                new AcceptAllCheckNotifier(), _extractionConfiguration);
         }
         catch (Exception e)
         {
@@ -74,19 +66,18 @@ public override void Execute()
 
         try
         {
-            var generator = new WordDataReleaseFileGenerator(_extractionConfiguration, BasicActivator.RepositoryLocator.DataExportRepository);
+            var generator = new WordDataReleaseFileGenerator(_extractionConfiguration,
+                BasicActivator.RepositoryLocator.DataExportRepository);
 
             //null means leave word file on screen and don't save
             generator.GenerateWordFile(null);
         }
         catch (Exception e)
         {
-            BasicActivator.ShowException("Failed to generate release document",e);
+            BasicActivator.ShowException("Failed to generate release document", e);
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.page_white_word);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(FamFamFamIcons.page_white_word);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestData.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestData.cs
index e90c57c0b6..7cbddc52ff 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestData.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestData.cs
@@ -24,7 +24,8 @@ public class ExecuteCommandGenerateTestData : BasicCommandExecution
     private Random _r;
     private IDataGenerator _generator;
 
-    public ExecuteCommandGenerateTestData(IBasicActivateItems activator, string datasetName, int numberOfPeople, int numberOfRecords, int seed, string toFile):base(activator)
+    public ExecuteCommandGenerateTestData(IBasicActivateItems activator, string datasetName, int numberOfPeople,
+        int numberOfRecords, int seed, string toFile) : base(activator)
     {
         _datasetName = datasetName;
         _numberOfPeople = numberOfPeople;
@@ -32,15 +33,18 @@ public ExecuteCommandGenerateTestData(IBasicActivateItems activator, string data
         _toFile = toFile;
 
         var dataGeneratorFactory = new DataGeneratorFactory();
-        var match = dataGeneratorFactory.GetAvailableGenerators().FirstOrDefault(g=>g.Name.Contains(datasetName,StringComparison.InvariantCultureIgnoreCase));
+        var match = dataGeneratorFactory.GetAvailableGenerators().FirstOrDefault(g =>
+            g.Name.Contains(datasetName, StringComparison.InvariantCultureIgnoreCase));
 
-        if(match == null)
+        if (match == null)
         {
-            SetImpossible($"Unknown dataset '{datasetName}'.  Known datasets are:{Environment.NewLine}{string.Join(Environment.NewLine,dataGeneratorFactory.GetAvailableGenerators().Select(g=>g.Name).ToArray())}");
+            SetImpossible(
+                $"Unknown dataset '{datasetName}'.  Known datasets are:{Environment.NewLine}{string.Join(Environment.NewLine, dataGeneratorFactory.GetAvailableGenerators().Select(g => g.Name).ToArray())}");
             return;
         }
+
         _r = new Random(seed);
-        _generator = dataGeneratorFactory.Create(match,_r);
+        _generator = dataGeneratorFactory.Create(match, _r);
     }
 
     public override void Execute()
@@ -48,13 +52,13 @@ public override void Execute()
         base.Execute();
 
         var people = new PersonCollection();
-        people.GeneratePeople(_numberOfPeople,_r);
+        people.GeneratePeople(_numberOfPeople, _r);
 
         var f = new FileInfo(_toFile);
 
-        if(!f.Directory.Exists)
+        if (!f.Directory.Exists)
             f.Directory.Create();
 
-        _generator.GenerateTestDataFile(people,f,_numberOfRecords);
+        _generator.GenerateTestDataFile(people, f, _numberOfRecords);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGuessAssociatedColumns.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGuessAssociatedColumns.cs
index ef2ac51810..f6ae372d31 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGuessAssociatedColumns.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandGuessAssociatedColumns.cs
@@ -21,12 +21,14 @@ public class ExecuteCommandGuessAssociatedColumns : BasicCommandExecution
     public bool _allowPartial;
     public bool PromptForPartialMatching { get; set; } = false;
 
-    public ExecuteCommandGuessAssociatedColumns(IBasicActivateItems activator,ICatalogue catalogue,ITableInfo tableInfo, bool allowPartial = true):base(activator)
+    public ExecuteCommandGuessAssociatedColumns(IBasicActivateItems activator, ICatalogue catalogue,
+        ITableInfo tableInfo, bool allowPartial = true) : base(activator)
     {
         _catalogue = catalogue;
         _tableInfo = tableInfo;
         _allowPartial = allowPartial;
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -36,9 +38,10 @@ public override void Execute()
         var successCount = 0;
         var failCount = 0;
 
-        var selectedTableInfo = _tableInfo ?? (ITableInfo)BasicActivator.SelectOne("Map to table",BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<TableInfo>());
+        var selectedTableInfo = _tableInfo ?? (ITableInfo)BasicActivator.SelectOne("Map to table",
+            BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<TableInfo>());
 
-        if(selectedTableInfo  == null)
+        if (selectedTableInfo == null)
             return;
 
         //get all columns for the selected parent
@@ -47,10 +50,13 @@ public override void Execute()
         // copy to local variable to keep Command immutable
         var partial = _allowPartial;
 
-        if(BasicActivator.IsInteractive && PromptForPartialMatching)
-        {
-            partial = BasicActivator.YesNo(new DialogArgs { WindowTitle = "Allow Partial Matches", TaskDescription = "Do you want to allow partial matches (contains).  This may result in incorrect mappings." });
-        }
+        if (BasicActivator.IsInteractive && PromptForPartialMatching)
+            partial = BasicActivator.YesNo(new DialogArgs
+            {
+                WindowTitle = "Allow Partial Matches",
+                TaskDescription =
+                    "Do you want to allow partial matches (contains).  This may result in incorrect mappings."
+            });
 
         foreach (var catalogueItem in _catalogue.CatalogueItems)
         {
@@ -75,19 +81,18 @@ public override void Execute()
                 //note that this else branch also deals with case where guesses is empty
 
                 var acceptedOne = false;
-                    
+
                 for (var i = 0; i < guesses.Length; i++)
-                {
                     //ask confirmation 
                     if (!BasicActivator.IsInteractive || BasicActivator.YesNo(
-                            $"Found multiple matches, approve match?:{Environment.NewLine}{catalogueItem.Name}{Environment.NewLine}{guesses[i]}", "Multiple matched guesses"))
+                            $"Found multiple matches, approve match?:{Environment.NewLine}{catalogueItem.Name}{Environment.NewLine}{guesses[i]}",
+                            "Multiple matched guesses"))
                     {
                         catalogueItem.SetColumnInfo(guesses[i]);
                         successCount++;
                         acceptedOne = true;
                         break;
                     }
-                }
 
                 if (!acceptedOne)
                     failCount++;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescription.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescription.cs
index 30a4281b7c..b6e1c3a2f8 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescription.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescription.cs
@@ -20,30 +20,31 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 public class ExecuteCommandImportCatalogueItemDescription : BasicCommandExecution, IAtomicCommand
 {
     private readonly CatalogueItem _toPopulate;
-        
-    public ExecuteCommandImportCatalogueItemDescription(IBasicActivateItems activator, CatalogueItem toPopulate):base(activator)
+
+    public ExecuteCommandImportCatalogueItemDescription(IBasicActivateItems activator, CatalogueItem toPopulate) :
+        base(activator)
     {
         _toPopulate = toPopulate;
     }
 
     public override void Execute()
     {
-        var available = BasicActivator.CoreChildProvider.AllCatalogueItems.Except(new[] {_toPopulate}).ToList();
+        var available = BasicActivator.CoreChildProvider.AllCatalogueItems.Except(new[] { _toPopulate }).ToList();
 
         string initialSearchText = null;
 
         //if we have a CatalogueItem other than us that has same Name maybe that's the one they want
         if (available.Any(a => a.Name.Equals(_toPopulate.Name, StringComparison.CurrentCultureIgnoreCase)))
             initialSearchText = _toPopulate.Name;
-            
-        if(SelectOne(available,out var selected,initialSearchText,false))
+
+        if (SelectOne(available, out var selected, initialSearchText, false))
         {
             CopyNonIDValuesAcross(selected, _toPopulate, true);
             _toPopulate.SaveToDatabase();
-                
+
             Publish(_toPopulate);
         }
-            
+
         base.Execute();
     }
 
@@ -53,7 +54,8 @@ public override void Execute()
     /// <param name="from"></param>
     /// <param name="to"></param>
     /// <param name="skipNameProperty"></param>
-    public static void CopyNonIDValuesAcross(IMapsDirectlyToDatabaseTable from, IMapsDirectlyToDatabaseTable to, bool skipNameProperty = false)
+    public static void CopyNonIDValuesAcross(IMapsDirectlyToDatabaseTable from, IMapsDirectlyToDatabaseTable to,
+        bool skipNameProperty = false)
     {
         var type = from.GetType();
 
@@ -81,5 +83,4 @@ public static void CopyNonIDValuesAcross(IMapsDirectlyToDatabaseTable from, IMap
         var s = to as ISaveable;
         s?.SaveToDatabase();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescriptions.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescriptions.cs
index d9b2c570fa..90b5cfb152 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescriptions.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCatalogueItemDescriptions.cs
@@ -18,7 +18,8 @@ public class ExecuteCommandImportCatalogueItemDescriptions : BasicCommandExecuti
     public Catalogue ToPopulate { get; }
     public Catalogue Other { get; set; }
 
-    public ExecuteCommandImportCatalogueItemDescriptions(IBasicActivateItems activator, Catalogue toPopulate,Catalogue other) :base(activator)
+    public ExecuteCommandImportCatalogueItemDescriptions(IBasicActivateItems activator, Catalogue toPopulate,
+        Catalogue other) : base(activator)
     {
         ToPopulate = toPopulate;
         Other = other;
@@ -30,23 +31,20 @@ public override void Execute()
 
         var other = Other;
 
-        if(other == null)
+        if (other == null)
             if (!SelectOne(BasicActivator.CoreChildProvider.AllCatalogues, out other))
                 return;
 
         foreach (var ci in ToPopulate.CatalogueItems)
         {
-
             var match = other.CatalogueItems.FirstOrDefault(o =>
                 o.Name.Equals(ci.Name, StringComparison.CurrentCultureIgnoreCase) &&
                 !string.IsNullOrWhiteSpace(o.Description));
 
-            if (match != null) 
+            if (match != null)
                 ExecuteCommandImportCatalogueItemDescription.CopyNonIDValuesAcross(match, ci, true);
-
         }
-            
+
         Publish(ToPopulate);
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs
index bed280ff5d..6c932cbbbe 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportCohortIdentificationConfiguration.cs
@@ -20,58 +20,60 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 public class ExecuteCommandImportCohortIdentificationConfiguration : BasicCommandExecution
 {
     public CohortAggregateContainer IntoContainer { get; }
-    public CohortIdentificationConfiguration[] ToImport{get;}
+    public CohortIdentificationConfiguration[] ToImport { get; }
 
-    public ExecuteCommandImportCohortIdentificationConfiguration(IBasicActivateItems activator,CohortIdentificationConfiguration[] toImport, CohortAggregateContainer intoContainer) : base(activator)
+    public ExecuteCommandImportCohortIdentificationConfiguration(IBasicActivateItems activator,
+        CohortIdentificationConfiguration[] toImport, CohortAggregateContainer intoContainer) : base(activator)
     {
         Weight = 0.15f;
 
         ToImport = toImport;
         IntoContainer = intoContainer;
 
-        if(IntoContainer == null)
+        if (IntoContainer == null)
         {
             SetImpossible("You must specify a container");
             return;
         }
 
-        if (intoContainer.ShouldBeReadOnly(out var reason))
-        {
-            SetImpossible(reason);
-        }
+        if (intoContainer.ShouldBeReadOnly(out var reason)) SetImpossible(reason);
 
         // if we don't know what to import yet then we should have the
         // 'more choices to come' suffix
         UseTripleDotSuffix = ToImport == null;
     }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration,OverlayKind.Add);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Add);
+
     public override void Execute()
     {
         base.Execute();
 
         var import = ToImport;
 
-        if(import == null)
-            if(!BasicActivator.SelectObjects(new DialogArgs
-               {
-                   WindowTitle = "Add CohortIdentificationConfiguration(s) to Container",
-                   TaskDescription = $"Choose which CohortIdentificationConfiguration(s) to add to the cohort container '{IntoContainer.Name}'.  For each one selected, the entire query tree will be imported."
-
-               },BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>(),out import))
+        if (import == null)
+            if (!BasicActivator.SelectObjects(new DialogArgs
+                    {
+                        WindowTitle = "Add CohortIdentificationConfiguration(s) to Container",
+                        TaskDescription =
+                            $"Choose which CohortIdentificationConfiguration(s) to add to the cohort container '{IntoContainer.Name}'.  For each one selected, the entire query tree will be imported."
+                    },
+                    BasicActivator.RepositoryLocator.CatalogueRepository
+                        .GetAllObjects<CohortIdentificationConfiguration>(),
+                    out import))
                 return;
 
-        if(import == null || !import.Any())
+        if (import == null || !import.Any())
             return;
 
 
-        var merger = new CohortIdentificationConfigurationMerger((CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
-        merger.Import(import,IntoContainer);
+        var merger =
+            new CohortIdentificationConfigurationMerger(
+                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+        merger.Import(import, IntoContainer);
 
         Publish(IntoContainer);
-        Emphasise(IntoContainer,int.MaxValue);
+        Emphasise(IntoContainer, int.MaxValue);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportFilterContainerTree.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportFilterContainerTree.cs
index fd05d98d40..889aa1582e 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportFilterContainerTree.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportFilterContainerTree.cs
@@ -32,6 +32,7 @@ public class ExecuteCommandImportFilterContainerTree : BasicCommandExecution
     /// ID of the Catalogue that is being extracted by <see cref="_into"/> to ensure that we only import filters from the same table
     /// </summary>
     private readonly ICatalogue _catalogue;
+
     private readonly IRootFilterContainerHost _into;
     private const float DEFAULT_WEIGHT = 1.2f;
 
@@ -45,21 +46,22 @@ public class ExecuteCommandImportFilterContainerTree : BasicCommandExecution
     /// </summary>
     private IContainer _explicitChoice;
 
-    private ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator):base(activator)
+    private ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator) : base(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
-        if(activator.CoreChildProvider is not DataExportChildProvider)
+        if (activator.CoreChildProvider is not DataExportChildProvider)
             SetImpossible("Data export functions unavailable");
     }
 
-    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into):this(activator)
+    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into) :
+        this(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
         _into = into;
 
-        if(into.RootFilterContainer_ID != null)
+        if (into.RootFilterContainer_ID != null)
             SetImpossible("Dataset already has a root container");
 
 
@@ -78,7 +80,8 @@ public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IR
     /// <param name="into"></param>
     /// <param name="from"></param>
     [UseWithObjectConstructor]
-    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into, IRootFilterContainerHost from):this(activator,into)
+    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into,
+        IRootFilterContainerHost from) : this(activator, into)
     {
         Weight = DEFAULT_WEIGHT;
 
@@ -94,130 +97,127 @@ public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IR
     /// <param name="activator"></param>
     /// <param name="into"></param>
     /// <param name="explicitChoice"></param>
-    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into, IContainer explicitChoice):this(activator,into)
+    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IRootFilterContainerHost into,
+        IContainer explicitChoice) : this(activator, into)
     {
         Weight = DEFAULT_WEIGHT;
 
         _explicitChoice = explicitChoice;
     }
+
     /// <summary>
     /// Constructor for importing into a sub container
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="into"></param>
     /// <param name="explicitChoice"></param>
-    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IContainer into, IContainer explicitChoice):this(activator)
+    public ExecuteCommandImportFilterContainerTree(IBasicActivateItems activator, IContainer into,
+        IContainer explicitChoice) : this(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
         _intoSubContainer = into;
         _explicitChoice = explicitChoice;
-
-    }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.FilterContainer, OverlayKind.Import);
     }
 
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.FilterContainer, OverlayKind.Import);
+
     public override void Execute()
     {
         base.Execute();
 
-        if(_explicitChoice != null)
+        if (_explicitChoice != null)
         {
             Import(_explicitChoice);
         }
         else
         {
-
-            if(_into == null)
-                throw new NotSupportedException("Interactive mode is only supported when specifying a root object to import into");
+            if (_into == null)
+                throw new NotSupportedException(
+                    "Interactive mode is only supported when specifying a root object to import into");
 
             //prompt user to pick one
             var childProvider = (DataExportChildProvider)BasicActivator.CoreChildProvider;
 
-            var ecById = childProvider.ExtractionConfigurations.ToDictionary(k=>k.ID);
+            var ecById = childProvider.ExtractionConfigurations.ToDictionary(k => k.ID);
 
             // The root object that makes most sense to the user e.g. they select an extraction 
             var fromConfiguration
                 =
                 childProvider.AllCohortIdentificationConfigurations.Where(IsEligible)
                     .Cast<DatabaseEntity>()
-                    .Union(childProvider.SelectedDataSets.Where(IsEligible).Select(sds=> ecById[sds.ExtractionConfiguration_ID])).ToList();
+                    .Union(childProvider.SelectedDataSets.Where(IsEligible)
+                        .Select(sds => ecById[sds.ExtractionConfiguration_ID])).ToList();
 
-            if(!fromConfiguration.Any())
+            if (!fromConfiguration.Any())
             {
                 Show("There are no extractions or cohort builder configurations of this dataset that use filters");
                 return;
             }
-                
-            if(SelectOne(fromConfiguration,out var selected))
+
+            if (SelectOne(fromConfiguration, out var selected))
             {
-                if(selected is ExtractionConfiguration ec)
-                {
-                    Import(GetEligibleChild(ec).RootFilterContainer);
-                }
-                if(selected is CohortIdentificationConfiguration cic)
+                if (selected is ExtractionConfiguration ec) Import(GetEligibleChild(ec).RootFilterContainer);
+                if (selected is CohortIdentificationConfiguration cic)
                 {
-                    var chosen = SelectOne(GetEligibleChildren(cic).ToList(),null,true);
+                    var chosen = SelectOne(GetEligibleChildren(cic).ToList(), null, true);
 
-                    if(chosen != null)
+                    if (chosen != null)
                         Import(chosen.RootFilterContainer);
                 }
-
             }
         }
-            
+
         Publish((DatabaseEntity)_into ?? (DatabaseEntity)_intoSubContainer);
     }
 
     private void Import(IContainer from)
     {
-        var factory = 
+        var factory =
             _into != null ? _into.GetFilterFactory() : _intoSubContainer.GetFilterFactory();
-            
+
         IContainer intoContainer;
 
-        if(_into != null)
+        if (_into != null)
         {
             var newRoot = factory.CreateNewContainer();
             newRoot.Operation = from.Operation;
             newRoot.SaveToDatabase();
             _into.RootFilterContainer_ID = newRoot.ID;
             _into.SaveToDatabase();
-                
+
             intoContainer = newRoot;
         }
         else
+        {
             intoContainer = _intoSubContainer;
+        }
 
-        DeepClone(intoContainer,from,factory);            
+        DeepClone(intoContainer, from, factory);
     }
 
-    private void DeepClone(IContainer into,IContainer from, IFilterFactory factory)
+    private void DeepClone(IContainer into, IContainer from, IFilterFactory factory)
     {
         //clone the subcontainers
-        foreach(var container in from.GetSubContainers())
+        foreach (var container in from.GetSubContainers())
         {
             var subContainer = factory.CreateNewContainer();
             subContainer.Operation = container.Operation;
             subContainer.SaveToDatabase();
             into.AddChild(subContainer);
 
-            DeepClone(subContainer,container,factory);            
+            DeepClone(subContainer, container, factory);
         }
 
         var wizard = new FilterImportWizard(BasicActivator);
-            
+
         //clone the filters
-        foreach(var filter in from.GetFilters())
-            into.AddChild(wizard.Import(into,filter));
+        foreach (var filter in from.GetFilters())
+            into.AddChild(wizard.Import(into, filter));
     }
 
-    private bool IsEligible(CohortIdentificationConfiguration arg)
-    {
-        return GetEligibleChildren(arg).Any();
-    }
+    private bool IsEligible(CohortIdentificationConfiguration arg) => GetEligibleChildren(arg).Any();
 
 
     /// <summary>
@@ -227,11 +227,11 @@ private bool IsEligible(CohortIdentificationConfiguration arg)
     /// <returns></returns>
     private IEnumerable<AggregateConfiguration> GetEligibleChildren(CohortIdentificationConfiguration arg)
     {
-        if(arg.RootCohortAggregateContainer_ID == null)
+        if (arg.RootCohortAggregateContainer_ID == null)
             return Array.Empty<AggregateConfiguration>();
 
         return arg.RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively()
-            .Where(ac=>ac.Catalogue_ID == _catalogue.ID && ac.RootFilterContainer_ID != null);
+            .Where(ac => ac.Catalogue_ID == _catalogue.ID && ac.RootFilterContainer_ID != null);
     }
 
     /// <summary>
@@ -239,13 +239,8 @@ private IEnumerable<AggregateConfiguration> GetEligibleChildren(CohortIdentifica
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    private ISelectedDataSets GetEligibleChild(ExtractionConfiguration arg)
-    {
-        return arg.SelectedDataSets.FirstOrDefault(IsEligible);
-    }
+    private ISelectedDataSets GetEligibleChild(ExtractionConfiguration arg) =>
+        arg.SelectedDataSets.FirstOrDefault(IsEligible);
 
-    private bool IsEligible(ISelectedDataSets arg)
-    {
-        return arg.RootFilterContainer_ID != null;
-    }
+    private bool IsEligible(ISelectedDataSets arg) => arg.RootFilterContainer_ID != null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportTableInfo.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportTableInfo.cs
index 6b867260e4..ce6a7de5f0 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportTableInfo.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandImportTableInfo.cs
@@ -22,7 +22,6 @@ public class ExecuteCommandImportTableInfo : BasicCommandExecution
     private readonly bool _createCatalogue;
 
     public ExecuteCommandImportTableInfo(IBasicActivateItems activator,
-
         [DemandsInitialization("The table or view you want to reference from RDMP.  See PickTable for syntax")]
         DiscoveredTable table,
         [DemandsInitialization("True to create a Catalogue as well as a TableInfo")]
@@ -39,9 +38,9 @@ public override void Execute()
         ICatalogue c = null;
         ITableInfoImporter importer;
 
-        var t = _table ?? SelectTable(false,"Select table to import");
+        var t = _table ?? SelectTable(false, "Select table to import");
 
-        if(t == null)
+        if (t == null)
             return;
 
         //if it isn't a table valued function
@@ -52,26 +51,21 @@ public override void Execute()
 
         importer.DoImport(out var ti, out var cis);
 
-        BasicActivator.Show($"Successfully imported new TableInfo { ti.Name} with ID {ti.ID}");
+        BasicActivator.Show($"Successfully imported new TableInfo {ti.Name} with ID {ti.ID}");
 
         if (_createCatalogue)
         {
             var forwardEngineer = new ForwardEngineerCatalogue(ti, cis);
             forwardEngineer.ExecuteForwardEngineering(out c, out _, out _);
 
-            BasicActivator.Show($"Successfully imported new Catalogue { c.Name} with ID {c.ID}");
+            BasicActivator.Show($"Successfully imported new Catalogue {c.Name} with ID {c.ID}");
         }
 
         Publish((IMapsDirectlyToDatabaseTable)c ?? ti);
     }
 
-    public override string GetCommandName()
-    {
-        return "Import existing table (as new TableInfo)";
-    }
+    public override string GetCommandName() => "Import existing table (as new TableInfo)";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.TableInfo,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueItemToColumnInfo.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueItemToColumnInfo.cs
index accec863cf..46f8218c85 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueItemToColumnInfo.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandLinkCatalogueItemToColumnInfo.cs
@@ -19,7 +19,8 @@ public class ExecuteCommandLinkCatalogueItemToColumnInfo : BasicCommandExecution
     private ColumnInfo _columnInfo;
 
 
-    public ExecuteCommandLinkCatalogueItemToColumnInfo(IBasicActivateItems activator, CatalogueItem catalogueItem): base(activator)
+    public ExecuteCommandLinkCatalogueItemToColumnInfo(IBasicActivateItems activator, CatalogueItem catalogueItem) :
+        base(activator)
     {
         _catalogueItem = catalogueItem;
 
@@ -27,19 +28,18 @@ public ExecuteCommandLinkCatalogueItemToColumnInfo(IBasicActivateItems activator
             SetImpossible("ColumnInfo is already set");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Resolve an orphaned virtual column by matching it up to an actual column in the underlying database";
-    }
+    public override string GetCommandHelp() =>
+        "Resolve an orphaned virtual column by matching it up to an actual column in the underlying database";
 
-    public ExecuteCommandLinkCatalogueItemToColumnInfo(IBasicActivateItems activator, ColumnInfoCombineable cmd, CatalogueItem catalogueItem) : base(activator)
+    public ExecuteCommandLinkCatalogueItemToColumnInfo(IBasicActivateItems activator, ColumnInfoCombineable cmd,
+        CatalogueItem catalogueItem) : base(activator)
     {
         _catalogueItem = catalogueItem;
-            
+
         if (catalogueItem.ColumnInfo_ID != null)
             SetImpossible($"CatalogueItem {catalogueItem} is already associated with a different ColumnInfo");
 
-        if(cmd.ColumnInfos.Length >1)
+        if (cmd.ColumnInfos.Length > 1)
         {
             SetImpossible("Only one ColumnInfo can be associated with a CatalogueItem at a time");
             return;
@@ -52,13 +52,14 @@ public override void Execute()
     {
         base.Execute();
 
-        _columnInfo ??= SelectOne<ColumnInfo>(BasicActivator.RepositoryLocator.CatalogueRepository,_catalogueItem.Name);
+        _columnInfo ??=
+            SelectOne<ColumnInfo>(BasicActivator.RepositoryLocator.CatalogueRepository, _catalogueItem.Name);
 
         if (_columnInfo == null)
             return;
 
         _catalogueItem.SetColumnInfo(_columnInfo);
-                    
+
         //if it did not have a name before
         if (_catalogueItem.Name.StartsWith("New CatalogueItem"))
         {
@@ -71,13 +72,9 @@ public override void Execute()
         Publish(_catalogueItem);
     }
 
-    public override string GetCommandName()
-    {
-        return $"Set Column Info{(_catalogueItem.ColumnInfo_ID == null ? "(Currently MISSING)" : "")}";
-    }
+    public override string GetCommandName() =>
+        $"Set Column Info{(_catalogueItem.ColumnInfo_ID == null ? "(Currently MISSING)" : "")}";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ColumnInfo, OverlayKind.Problem);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ColumnInfo, OverlayKind.Problem);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandList.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandList.cs
index f5d1397199..077621289a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandList.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandList.cs
@@ -21,8 +21,9 @@ public class ExecuteCommandList : BasicCommandExecution
 
     [UseWithObjectConstructor]
     public ExecuteCommandList(IBasicActivateItems activator,
-        [DemandsInitialization("The objects you want listed e.g. Catalogue:*bob* or a type e.g. TableInfo or blank to list everything")]
-        IMapsDirectlyToDatabaseTable[] toList = null):base(activator)
+        [DemandsInitialization(
+            "The objects you want listed e.g. Catalogue:*bob* or a type e.g. TableInfo or blank to list everything")]
+        IMapsDirectlyToDatabaseTable[] toList = null) : base(activator)
     {
         _toList = toList;
     }
@@ -31,7 +32,7 @@ public override void Execute()
     {
         base.Execute();
 
-        if(_toList == null)
+        if (_toList == null)
         {
             ListEveryone();
             return;
@@ -47,14 +48,10 @@ public override void Execute()
     private void ListEveryone()
     {
         var sb = new StringBuilder();
-            
-        foreach(var repo in BasicActivator.RepositoryLocator.GetAllRepositories())
-        {
-            foreach(var o in repo.GetAllObjectsInDatabase())
-            {
-                sb.AppendLine($"{o.GetType().Name}:{o.ID}:{o}");
-            }
-        }
+
+        foreach (var repo in BasicActivator.RepositoryLocator.GetAllRepositories())
+        foreach (var o in repo.GetAllObjectsInDatabase())
+            sb.AppendLine($"{o.GetType().Name}:{o.ID}:{o}");
 
         BasicActivator.Show(sb.ToString());
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListSupportedCommands.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListSupportedCommands.cs
index 11df495440..d272153218 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListSupportedCommands.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListSupportedCommands.cs
@@ -17,16 +17,18 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 /// </summary>
 [Alias("lc")]
 [Alias("ListCommands")]
-internal class ExecuteCommandListSupportedCommands:BasicCommandExecution
+internal class ExecuteCommandListSupportedCommands : BasicCommandExecution
 {
     private readonly string _pattern;
     private readonly bool _verbose;
 
-    public ExecuteCommandListSupportedCommands(IBasicActivateItems basicActivator, 
-        [DemandsInitialization("Optional. A term to look for in command names.  Supports wildcards e.g. new*cata.  If not supplied then all will be shown")]
-        string pattern=null,
-        [DemandsInitialization("Optional. Set to true to display information about the command.  If specified with pattern then pattern will also search the description")]
-        bool verbose = false):base(basicActivator)
+    public ExecuteCommandListSupportedCommands(IBasicActivateItems basicActivator,
+        [DemandsInitialization(
+            "Optional. A term to look for in command names.  Supports wildcards e.g. new*cata.  If not supplied then all will be shown")]
+        string pattern = null,
+        [DemandsInitialization(
+            "Optional. Set to true to display information about the command.  If specified with pattern then pattern will also search the description")]
+        bool verbose = false) : base(basicActivator)
     {
         _pattern = pattern;
         _verbose = verbose;
@@ -38,14 +40,14 @@ public override void Execute()
 
 
         var commands = commandCaller.GetSupportedCommands().ToArray();
-        var names = commands.Select(c=>GetCommandName(c.Name)).ToArray();
+        var names = commands.Select(c => GetCommandName(c.Name)).ToArray();
         string[] descriptions;
-            
-             
-        if(_verbose)
+
+
+        if (_verbose)
         {
             var help = BasicActivator.CommentStore ?? CreateCommentStore();
-            descriptions = commands.Select(c=>help.GetTypeDocumentationIfExists(c)).ToArray();
+            descriptions = commands.Select(c => help.GetTypeDocumentationIfExists(c)).ToArray();
         }
         else
         {
@@ -54,45 +56,42 @@ public override void Execute()
 
         var onlyShowIndexes = new HashSet<int>();
 
-        if(!string.IsNullOrWhiteSpace(_pattern))
+        if (!string.IsNullOrWhiteSpace(_pattern))
         {
-            var tokens = _pattern.Split('*',StringSplitOptions.RemoveEmptyEntries);
+            var tokens = _pattern.Split('*', StringSplitOptions.RemoveEmptyEntries);
 
-            for(var i =0;i<commands.Length;i++)
+            for (var i = 0; i < commands.Length; i++)
             {
-                if(tokens.All(t=>names[i].Contains(t,StringComparison.InvariantCultureIgnoreCase)))
-                {
+                if (tokens.All(t => names[i].Contains(t, StringComparison.InvariantCultureIgnoreCase)))
                     onlyShowIndexes.Add(i);
-                }
-                if(tokens.All(t=>descriptions[i]?.Contains(t,StringComparison.InvariantCultureIgnoreCase) ?? false))
-                {
+                if (tokens.All(t => descriptions[i]?.Contains(t, StringComparison.InvariantCultureIgnoreCase) ?? false))
                     onlyShowIndexes.Add(i);
-                }
             }
 
             // Nothing matches pattern
-            if(!onlyShowIndexes.Any())
+            if (!onlyShowIndexes.Any())
             {
-                BasicActivator.GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs("No commands matched supplied pattern",CheckResult.Warning));
+                BasicActivator.GlobalErrorCheckNotifier.OnCheckPerformed(
+                    new CheckEventArgs("No commands matched supplied pattern", CheckResult.Warning));
                 return;
             }
         }
 
         var showAll = onlyShowIndexes.Count == 0;
-        var outputCommandDictionary = new Dictionary<string,string>();
+        var outputCommandDictionary = new Dictionary<string, string>();
 
-        for(var i =0;i<commands.Length;i++)
-        {
-            if(showAll || onlyShowIndexes.Contains(i))
+        for (var i = 0; i < commands.Length; i++)
+            if (showAll || onlyShowIndexes.Contains(i))
             {
-                var desc = string.IsNullOrWhiteSpace(descriptions[i]) ? "" : $"{Environment.NewLine}{descriptions[i]}{Environment.NewLine}";
-                outputCommandDictionary.Add(names[i],desc);
+                var desc = string.IsNullOrWhiteSpace(descriptions[i])
+                    ? ""
+                    : $"{Environment.NewLine}{descriptions[i]}{Environment.NewLine}";
+                outputCommandDictionary.Add(names[i], desc);
             }
-        }
 
         var output = string.Join(Environment.NewLine,
-            outputCommandDictionary.Select(kvp => kvp.Key+kvp.Value)
-                .OrderBy(s=>s));
+            outputCommandDictionary.Select(kvp => kvp.Key + kvp.Value)
+                .OrderBy(s => s));
 
         BasicActivator.Show(output);
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListUserSettings.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListUserSettings.cs
index 506bfdb878..7bee5a28b6 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListUserSettings.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandListUserSettings.cs
@@ -13,25 +13,22 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
 public class ExecuteCommandListUserSettings : BasicCommandExecution
 {
-    public ExecuteCommandListUserSettings(IBasicActivateItems activator):base(activator)
+    public ExecuteCommandListUserSettings(IBasicActivateItems activator) : base(activator)
     {
-
     }
+
     public override void Execute()
     {
         base.Execute();
 
         var sb = new StringBuilder();
 
-        foreach(var prop in 
-                typeof(UserSettings)
-                    .GetProperties(BindingFlags.Public | BindingFlags.Static)
-                    .OrderBy(p=>p.Name))
-        {
+        foreach (var prop in
+                 typeof(UserSettings)
+                     .GetProperties(BindingFlags.Public | BindingFlags.Static)
+                     .OrderBy(p => p.Name))
             sb.AppendLine($"{prop.Name}:{prop.GetValue(null)}");
-        }
 
         BasicActivator.Show(sb.ToString());
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueItemExtractable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueItemExtractable.cs
index 60299d5b36..ab24fad01c 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueItemExtractable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueItemExtractable.cs
@@ -12,35 +12,34 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandMakeCatalogueItemExtractable : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandMakeCatalogueItemExtractable : BasicCommandExecution, IAtomicCommand
 {
     private readonly CatalogueItem _catalogueItem;
 
-    public ExecuteCommandMakeCatalogueItemExtractable(IBasicActivateItems activator, CatalogueItem catalogueItem) : base(activator)
+    public ExecuteCommandMakeCatalogueItemExtractable(IBasicActivateItems activator, CatalogueItem catalogueItem) :
+        base(activator)
     {
         _catalogueItem = catalogueItem;
 
-        if(_catalogueItem.ColumnInfo_ID == null)
+        if (_catalogueItem.ColumnInfo_ID == null)
             SetImpossible("There is no underlying ColumnInfo");
 
-        if(_catalogueItem.ExtractionInformation != null)
+        if (_catalogueItem.ExtractionInformation != null)
             SetImpossible("CatalougeItem is already extractable");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Make the column/transform available for extraction to researchers";
-    }
+    public override string GetCommandHelp() => "Make the column/transform available for extraction to researchers";
 
     public override void Execute()
     {
         base.Execute();
 
         //Create a new ExtractionInformation (contains the transform sql / column name)
-        var newExtractionInformation = new ExtractionInformation(BasicActivator.RepositoryLocator.CatalogueRepository, _catalogueItem, _catalogueItem.ColumnInfo, _catalogueItem.ColumnInfo.Name);
+        var newExtractionInformation = new ExtractionInformation(BasicActivator.RepositoryLocator.CatalogueRepository,
+            _catalogueItem, _catalogueItem.ColumnInfo, _catalogueItem.ColumnInfo.Name);
 
         //it will be Core but if the Catalogue is ProjectSpecific then instead we should make our new ExtractionInformation ExtractionCategory.ProjectSpecific
-        if(_catalogueItem.Catalogue.IsProjectSpecific(BasicActivator.RepositoryLocator.DataExportRepository))
+        if (_catalogueItem.Catalogue.IsProjectSpecific(BasicActivator.RepositoryLocator.DataExportRepository))
         {
             newExtractionInformation.ExtractionCategory = ExtractionCategory.ProjectSpecific;
             newExtractionInformation.SaveToDatabase();
@@ -50,13 +49,8 @@ public override void Execute()
         Activate(newExtractionInformation);
     }
 
-    public override string GetCommandName()
-    {
-        return "Make Extractable";
-    }
+    public override string GetCommandName() => "Make Extractable";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionInformation, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionInformation, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs
index f782e32697..1d65eb5c3f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeCatalogueProjectSpecific.cs
@@ -16,44 +16,45 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandMakeCatalogueProjectSpecific : BasicCommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandMakeCatalogueProjectSpecific : BasicCommandExecution, IAtomicCommandWithTarget
 {
     private ICatalogue _catalogue;
     private IProject _project;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandMakeCatalogueProjectSpecific(IBasicActivateItems itemActivator,ICatalogue catalogue, IProject project):this(itemActivator)
+    public ExecuteCommandMakeCatalogueProjectSpecific(IBasicActivateItems itemActivator, ICatalogue catalogue,
+        IProject project) : this(itemActivator)
     {
         SetCatalogue(catalogue);
         _project = project;
     }
-    public ExecuteCommandMakeCatalogueProjectSpecific(IBasicActivateItems itemActivator): base(itemActivator)
+
+    public ExecuteCommandMakeCatalogueProjectSpecific(IBasicActivateItems itemActivator) : base(itemActivator)
     {
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Restrict use of the dataset only to extractions of the specified Project";
-    }
+    public override string GetCommandHelp() =>
+        "Restrict use of the dataset only to extractions of the specified Project";
 
     public override void Execute()
     {
-        if(_catalogue == null)
+        if (_catalogue == null)
             SetCatalogue(SelectOne<Catalogue>(BasicActivator.RepositoryLocator.CatalogueRepository));
 
         _project ??= SelectOne<Project>(BasicActivator.RepositoryLocator.DataExportRepository);
 
-        if(_project == null || _catalogue == null)
+        if (_project == null || _catalogue == null)
             return;
-            
+
         base.Execute();
 
-        var eds = BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjectsWithParent<ExtractableDataSet>(_catalogue).SingleOrDefault();
+        var eds = BasicActivator.RepositoryLocator.DataExportRepository
+            .GetAllObjectsWithParent<ExtractableDataSet>(_catalogue).SingleOrDefault();
 
         var alreadyInConfiguration = eds.ExtractionConfigurations.FirstOrDefault(ec => ec.Project_ID != _project.ID);
 
-        if(alreadyInConfiguration != null)
+        if (alreadyInConfiguration != null)
             throw new Exception(
                 $"Cannot make {_catalogue} Project Specific because it is already a part of ExtractionConfiguration {alreadyInConfiguration} (Project={alreadyInConfiguration.Project}) and possibly others");
 
@@ -63,15 +64,14 @@ public override void Execute()
             ei.ExtractionCategory = ExtractionCategory.ProjectSpecific;
             ei.SaveToDatabase();
         }
+
         eds.SaveToDatabase();
 
         Publish(_catalogue);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.ProjectCatalogue);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.ProjectCatalogue);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -111,7 +111,9 @@ private void SetCatalogue(ICatalogue catalogue)
         if (ei.Count(e => e.IsExtractionIdentifier) != 1)
             SetImpossible("Catalogue must have exactly 1 IsExtractionIdentifier column");
 
-        if (ei.Any(e => e.ExtractionCategory != ExtractionCategory.Core && e.ExtractionCategory != ExtractionCategory.ProjectSpecific))
+        if (ei.Any(e =>
+                e.ExtractionCategory != ExtractionCategory.Core &&
+                e.ExtractionCategory != ExtractionCategory.ProjectSpecific))
             SetImpossible("All existing ExtractionInformations must be ExtractionCategory.Core");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain.cs
index 95145f4576..276e6acdda 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain.cs
@@ -18,25 +18,28 @@ public class ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationS
     private readonly CohortAggregateContainer _targetCohortAggregateContainer;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(IBasicActivateItems activator, AggregateConfiguration aggregate, CohortAggregateContainer targetCohortAggregateContainer) 
-        : this (activator,new AggregateConfigurationCombineable(aggregate), targetCohortAggregateContainer)
+    public ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(IBasicActivateItems activator,
+        AggregateConfiguration aggregate, CohortAggregateContainer targetCohortAggregateContainer)
+        : this(activator, new AggregateConfigurationCombineable(aggregate), targetCohortAggregateContainer)
     {
-
     }
 
-    public ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(IBasicActivateItems activator, AggregateConfigurationCombineable sourceAggregateCommand, CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
+    public ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(IBasicActivateItems activator,
+        AggregateConfigurationCombineable sourceAggregateCommand,
+        CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
     {
         _sourceAggregateCommand = sourceAggregateCommand;
         _targetCohortAggregateContainer = targetCohortAggregateContainer;
 
-        if (!_sourceAggregateCommand.CohortIdentificationConfigurationIfAny.Equals(_targetCohortAggregateContainer.GetCohortIdentificationConfiguration()))
+        if (!_sourceAggregateCommand.CohortIdentificationConfigurationIfAny.Equals(_targetCohortAggregateContainer
+                .GetCohortIdentificationConfiguration()))
             SetImpossible("Aggregate belongs to a different CohortIdentificationConfiguration");
-            
-        if(_sourceAggregateCommand.JoinableUsersIfAny.Any())
+
+        if (_sourceAggregateCommand.JoinableUsersIfAny.Any())
             SetImpossible(
                 $"The following Cohort Set(s) use this PatientIndex table:{string.Join(",", _sourceAggregateCommand.JoinableUsersIfAny.Select(j => j.ToString()))}");
 
-        if(_targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
+        if (_targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -56,7 +59,7 @@ public override void Execute()
                     dimension.DeleteInDatabase();
                 else
                     return;
-            
+
         //make it is no longer a joinable
         _sourceAggregateCommand.JoinableDeclarationIfAny.DeleteInDatabase();
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeProjectSpecificCatalogueNormalAgain.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeProjectSpecificCatalogueNormalAgain.cs
index ffe48f1ace..8b7e6c0b8a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeProjectSpecificCatalogueNormalAgain.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMakeProjectSpecificCatalogueNormalAgain.cs
@@ -14,12 +14,13 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandMakeProjectSpecificCatalogueNormalAgain : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandMakeProjectSpecificCatalogueNormalAgain : BasicCommandExecution, IAtomicCommand
 {
     private Catalogue _catalogue;
     private ExtractableDataSet _extractableDataSet;
 
-    public ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(IBasicActivateItems activator, Catalogue catalogue):base(activator)
+    public ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(IBasicActivateItems activator, Catalogue catalogue) :
+        base(activator)
     {
         _catalogue = catalogue;
 
@@ -30,7 +31,8 @@ public ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(IBasicActivateItems
             return;
         }
 
-        _extractableDataSet = dataExportRepository.GetAllObjectsWithParent<ExtractableDataSet>(catalogue).SingleOrDefault();
+        _extractableDataSet = dataExportRepository.GetAllObjectsWithParent<ExtractableDataSet>(catalogue)
+            .SingleOrDefault();
 
         if (_extractableDataSet == null)
         {
@@ -45,10 +47,8 @@ public ExecuteCommandMakeProjectSpecificCatalogueNormalAgain(IBasicActivateItems
         }
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Take a dataset that was previously only usable with extractions of a specific project and make it free for use in any extraction project";
-    }
+    public override string GetCommandHelp() =>
+        "Take a dataset that was previously only usable with extractions of a specific project and make it free for use in any extraction project";
 
     public override void Execute()
     {
@@ -66,8 +66,6 @@ public override void Execute()
         Publish(_catalogue);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.MakeProjectSpecificCatalogueNormalAgain);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.MakeProjectSpecificCatalogueNormalAgain);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs
index c8d4d61c20..143f817172 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMergeCohortIdentificationConfigurations.cs
@@ -13,7 +13,8 @@ public class ExecuteCommandMergeCohortIdentificationConfigurations : BasicComman
 {
     public CohortIdentificationConfiguration[] ToMerge { get; }
 
-    public ExecuteCommandMergeCohortIdentificationConfigurations(IBasicActivateItems activator,CohortIdentificationConfiguration[] toMerge):base(activator)
+    public ExecuteCommandMergeCohortIdentificationConfigurations(IBasicActivateItems activator,
+        CohortIdentificationConfiguration[] toMerge) : base(activator)
     {
         ToMerge = toMerge;
     }
@@ -24,27 +25,28 @@ public override void Execute()
 
         var toMerge = ToMerge;
 
-        if(toMerge == null || toMerge.Length <= 1)
-        {
-            if(!SelectMany(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>(),out toMerge))
+        if (toMerge == null || toMerge.Length <= 1)
+            if (!SelectMany(
+                    BasicActivator.RepositoryLocator.CatalogueRepository
+                        .GetAllObjects<CohortIdentificationConfiguration>(), out toMerge))
                 return;
-        }
 
-        if(toMerge == null || toMerge.Length <= 1)
+        if (toMerge == null || toMerge.Length <= 1)
         {
             BasicActivator.Show($"You must select at least 2 configurations to merge");
             return;
         }
 
-        var merger = new CohortIdentificationConfigurationMerger((CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
-        var result = merger.Merge(toMerge,SetOperation.UNION);
+        var merger =
+            new CohortIdentificationConfigurationMerger(
+                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+        var result = merger.Merge(toMerge, SetOperation.UNION);
 
-        if(result != null)
-        { 
+        if (result != null)
+        {
             BasicActivator.Show($"Succesfully created '{result}'");
             Publish(result);
             Emphasise(result);
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveAggregateIntoContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveAggregateIntoContainer.cs
index dc941676ee..34dd194502 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveAggregateIntoContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveAggregateIntoContainer.cs
@@ -17,25 +17,29 @@ public class ExecuteCommandMoveAggregateIntoContainer : BasicCommandExecution
     private readonly AggregateConfigurationCombineable _sourceAggregateCommand;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandMoveAggregateIntoContainer(IBasicActivateItems activator, AggregateConfiguration toMove, CohortAggregateContainer into) 
-        : this(activator,new AggregateConfigurationCombineable(toMove), into)
+    public ExecuteCommandMoveAggregateIntoContainer(IBasicActivateItems activator, AggregateConfiguration toMove,
+        CohortAggregateContainer into)
+        : this(activator, new AggregateConfigurationCombineable(toMove), into)
     {
-
     }
-    public ExecuteCommandMoveAggregateIntoContainer(IBasicActivateItems activator, AggregateConfigurationCombineable sourceAggregateCommand, CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
+
+    public ExecuteCommandMoveAggregateIntoContainer(IBasicActivateItems activator,
+        AggregateConfigurationCombineable sourceAggregateCommand,
+        CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
     {
         _sourceAggregateCommand = sourceAggregateCommand;
         _targetCohortAggregateContainer = targetCohortAggregateContainer;
 
         var cic = _sourceAggregateCommand.CohortIdentificationConfigurationIfAny;
 
-        if(cic != null && !cic.Equals(_targetCohortAggregateContainer.GetCohortIdentificationConfiguration()))
+        if (cic != null && !cic.Equals(_targetCohortAggregateContainer.GetCohortIdentificationConfiguration()))
             SetImpossible("Aggregate belongs to a different CohortIdentificationConfiguration");
 
-        if(_sourceAggregateCommand.ContainerIfAny != null &&  _sourceAggregateCommand.ContainerIfAny.Equals(targetCohortAggregateContainer))
+        if (_sourceAggregateCommand.ContainerIfAny != null &&
+            _sourceAggregateCommand.ContainerIfAny.Equals(targetCohortAggregateContainer))
             SetImpossible("Aggregate is already in container");
 
-        if(targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
+        if (targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -49,9 +53,9 @@ public override void Execute()
         oldContainer?.RemoveChild(_sourceAggregateCommand.Aggregate);
 
         //add  it to the new container
-        _targetCohortAggregateContainer.AddChild(_sourceAggregateCommand.Aggregate,0);
-            
-            
+        _targetCohortAggregateContainer.AddChild(_sourceAggregateCommand.Aggregate, 0);
+
+
         //refresh the entire configuration
         Publish(_targetCohortAggregateContainer.GetCohortIdentificationConfiguration());
     }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveCohortAggregateContainerIntoSubContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveCohortAggregateContainerIntoSubContainer.cs
index f18642e0b9..7d122d6c98 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveCohortAggregateContainerIntoSubContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveCohortAggregateContainerIntoSubContainer.cs
@@ -14,25 +14,28 @@ public class ExecuteCommandMoveCohortAggregateContainerIntoSubContainer : BasicC
 {
     private readonly CohortAggregateContainerCombineable _sourceCohortAggregateContainer;
     private readonly CohortAggregateContainer _targetCohortAggregateContainer;
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(IBasicActivateItems activator, CohortAggregateContainer toMove, CohortAggregateContainer into) 
-        : this(activator,new CohortAggregateContainerCombineable(toMove),into)
+    public ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(IBasicActivateItems activator,
+        CohortAggregateContainer toMove, CohortAggregateContainer into)
+        : this(activator, new CohortAggregateContainerCombineable(toMove), into)
     {
-
     }
-    public ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(IBasicActivateItems activator, CohortAggregateContainerCombineable sourceCohortAggregateContainer, CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
-    {    
+
+    public ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(IBasicActivateItems activator,
+        CohortAggregateContainerCombineable sourceCohortAggregateContainer,
+        CohortAggregateContainer targetCohortAggregateContainer) : base(activator)
+    {
         _sourceCohortAggregateContainer = sourceCohortAggregateContainer;
         _targetCohortAggregateContainer = targetCohortAggregateContainer;
 
-        if(_sourceCohortAggregateContainer.AllSubContainersRecursively.Contains(_targetCohortAggregateContainer))
+        if (_sourceCohortAggregateContainer.AllSubContainersRecursively.Contains(_targetCohortAggregateContainer))
             SetImpossible("Cannot move a container into one of its own subcontainers");
 
-        if(_sourceCohortAggregateContainer.AggregateContainer.Equals(_targetCohortAggregateContainer))
+        if (_sourceCohortAggregateContainer.AggregateContainer.Equals(_targetCohortAggregateContainer))
             SetImpossible("Cannot move a container into itself");
-            
-        if(_targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
+
+        if (_targetCohortAggregateContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveContainerIntoContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveContainerIntoContainer.cs
index 49e187f12a..f1d4de1e4c 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveContainerIntoContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveContainerIntoContainer.cs
@@ -16,20 +16,21 @@ public class ExecuteCommandMoveContainerIntoContainer : BasicCommandExecution
     private readonly IContainer _targetContainer;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandMoveContainerIntoContainer(IBasicActivateItems activator, IContainer toMove, IContainer into) 
-        : this(activator,new ContainerCombineable(toMove),into)
+    public ExecuteCommandMoveContainerIntoContainer(IBasicActivateItems activator, IContainer toMove, IContainer into)
+        : this(activator, new ContainerCombineable(toMove), into)
     {
-
     }
-    public ExecuteCommandMoveContainerIntoContainer(IBasicActivateItems activator, ContainerCombineable containerCombineable, IContainer targetContainer) : base(activator)
+
+    public ExecuteCommandMoveContainerIntoContainer(IBasicActivateItems activator,
+        ContainerCombineable containerCombineable, IContainer targetContainer) : base(activator)
     {
         _containerCombineable = containerCombineable;
         _targetContainer = targetContainer;
 
-        if(containerCombineable.AllSubContainersRecursive.Contains(targetContainer))
+        if (containerCombineable.AllSubContainersRecursive.Contains(targetContainer))
             SetImpossible("You cannot move a container (AND/OR) into one of its own subcontainers");
 
-        if(targetContainer.ShouldBeReadOnly(out var reason))
+        if (targetContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -39,6 +40,6 @@ public override void Execute()
 
         _containerCombineable.Container.MakeIntoAnOrphan();
         _targetContainer.AddChild(_containerCombineable.Container);
-        Publish((DatabaseEntity) _targetContainer);
+        Publish((DatabaseEntity)_targetContainer);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveFilterIntoContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveFilterIntoContainer.cs
index a2d2005d9e..615a96433b 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveFilterIntoContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandMoveFilterIntoContainer.cs
@@ -16,20 +16,21 @@ public class ExecuteCommandMoveFilterIntoContainer : BasicCommandExecution
     private readonly IContainer _targetContainer;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandMoveFilterIntoContainer(IBasicActivateItems activator, IFilter toMove, IContainer into) 
-        : this(activator,new FilterCombineable(toMove),into)
+    public ExecuteCommandMoveFilterIntoContainer(IBasicActivateItems activator, IFilter toMove, IContainer into)
+        : this(activator, new FilterCombineable(toMove), into)
     {
-
     }
-    public ExecuteCommandMoveFilterIntoContainer(IBasicActivateItems activator,FilterCombineable filterCombineable, IContainer targetContainer) : base(activator)
+
+    public ExecuteCommandMoveFilterIntoContainer(IBasicActivateItems activator, FilterCombineable filterCombineable,
+        IContainer targetContainer) : base(activator)
     {
         _filterCombineable = filterCombineable;
         _targetContainer = targetContainer;
 
-        if(!filterCombineable.AllContainersInEntireTreeFromRootDown.Contains(targetContainer))
+        if (!filterCombineable.AllContainersInEntireTreeFromRootDown.Contains(targetContainer))
             SetImpossible("Filters can only be moved within their own container tree");
 
-        if(targetContainer.ShouldBeReadOnly(out var reason))
+        if (targetContainer.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -39,6 +40,6 @@ public override void Execute()
 
         _filterCombineable.Filter.FilterContainer_ID = _targetContainer.ID;
         ((DatabaseEntity)_filterCombineable.Filter).SaveToDatabase();
-        Publish((DatabaseEntity) _targetContainer);
+        Publish((DatabaseEntity)_targetContainer);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandNewObject.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandNewObject.cs
index d23f96a4c1..a8d087678f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandNewObject.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandNewObject.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 /// <summary>
 /// Creates a new <see cref="DatabaseEntity"/> in the RDMP Platform database with the provided arguments.
 /// </summary>
-public class ExecuteCommandNewObject:BasicCommandExecution
+public class ExecuteCommandNewObject : BasicCommandExecution
 {
     /// <summary>
     /// The type of <see cref="DatabaseEntity"/> the user wants to construct
@@ -28,6 +28,7 @@ public class ExecuteCommandNewObject:BasicCommandExecution
     /// values
     /// </summary>
     private CommandLineObjectPicker _picker;
+
     private Func<IMapsDirectlyToDatabaseTable> _func;
 
     /// <summary>
@@ -37,10 +38,10 @@ public class ExecuteCommandNewObject:BasicCommandExecution
     /// <param name="type"></param>
     [UseWithObjectConstructor]
     public ExecuteCommandNewObject(IBasicActivateItems activator,
-        [DemandsInitialization("Type to create",TypeOf = typeof(DatabaseEntity))]
-        Type type):base(activator)
+        [DemandsInitialization("Type to create", TypeOf = typeof(DatabaseEntity))]
+        Type type) : base(activator)
     {
-        if(!typeof(DatabaseEntity).IsAssignableFrom(type))
+        if (!typeof(DatabaseEntity).IsAssignableFrom(type))
             SetImpossible("Type must be derived from DatabaseEntity");
         _type = type;
     }
@@ -52,18 +53,20 @@ public ExecuteCommandNewObject(IBasicActivateItems activator,
     /// <param name="activator"></param>
     /// <param name="picker"></param>
     [UseWithCommandLine(
-        ParameterHelpList = "<type> <arg1> <arg2> <etc>", 
+        ParameterHelpList = "<type> <arg1> <arg2> <etc>",
         ParameterHelpBreakdown = @"type	The object to create e.g. Catalogue
 args    Dynamic list of values to satisfy the types constructor")]
-    public ExecuteCommandNewObject(IBasicActivateItems activator,CommandLineObjectPicker picker):base(activator)
+    public ExecuteCommandNewObject(IBasicActivateItems activator, CommandLineObjectPicker picker) : base(activator)
     {
-        if(!picker.HasArgumentOfType(0, typeof(Type)))
+        if (!picker.HasArgumentOfType(0, typeof(Type)))
+        {
             SetImpossible("First parameter must be a Type of DatabaseEntity");
+        }
         else
         {
             _type = picker[0].Type;
 
-            if(!typeof(DatabaseEntity).IsAssignableFrom(_type))
+            if (!typeof(DatabaseEntity).IsAssignableFrom(_type))
                 SetImpossible("Type must be derived from DatabaseEntity");
         }
 
@@ -75,7 +78,8 @@ public ExecuteCommandNewObject(IBasicActivateItems activator,CommandLineObjectPi
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="callCtor"></param>
-    public ExecuteCommandNewObject(IBasicActivateItems activator, Func<IMapsDirectlyToDatabaseTable> callCtor) : base(activator)
+    public ExecuteCommandNewObject(IBasicActivateItems activator, Func<IMapsDirectlyToDatabaseTable> callCtor) :
+        base(activator)
     {
         _func = callCtor;
     }
@@ -85,22 +89,18 @@ public override void Execute()
         base.Execute();
 
         IMapsDirectlyToDatabaseTable instance;
-        if(_func != null)
+        if (_func != null)
             instance = _func();
         else
-        {
             instance = (DatabaseEntity)Construct(_type,
-
                 //use the IRepository constructor of the _type
-                o=> ObjectConstructor.GetRepositoryConstructor(_type), 
-                
+                o => ObjectConstructor.GetRepositoryConstructor(_type),
                 //first argument is the Type, the rest are fed into the constructor of _type
                 _picker?.Arguments?.Skip(1));
-        }
-            
-        if(instance == null)
+
+        if (instance == null)
             throw new Exception("Failed to construct object with provided parameters");
 
-        Publish( instance);
+        Publish(instance);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandOverrideRawServer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandOverrideRawServer.cs
index 083cfc43e5..f1be7f0ed4 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandOverrideRawServer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandOverrideRawServer.cs
@@ -14,19 +14,20 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandOverrideRawServer:BasicCommandExecution,IAtomicCommand,IAtomicCommandWithTarget
+public class ExecuteCommandOverrideRawServer : BasicCommandExecution, IAtomicCommand, IAtomicCommandWithTarget
 {
     private readonly LoadMetadata _loadMetadata;
     private ExternalDatabaseServer _server;
     private ExternalDatabaseServer[] _available;
 
-    public ExecuteCommandOverrideRawServer(IBasicActivateItems activator,LoadMetadata loadMetadata) : base(activator)
+    public ExecuteCommandOverrideRawServer(IBasicActivateItems activator, LoadMetadata loadMetadata) : base(activator)
     {
         _loadMetadata = loadMetadata;
         _available =
-            activator.CoreChildProvider.AllExternalServers.Where(s => string.IsNullOrWhiteSpace(s.CreatedByAssembly)).ToArray();
+            activator.CoreChildProvider.AllExternalServers.Where(s => string.IsNullOrWhiteSpace(s.CreatedByAssembly))
+                .ToArray();
 
-        if(!_available.Any())
+        if (!_available.Any())
             SetImpossible("There are no compatible servers");
     }
 
@@ -36,7 +37,7 @@ public override void Execute()
 
         if (_server == null)
         {
-            if (SelectOne(_available,out var selected))
+            if (SelectOne(_available, out var selected))
                 _server = selected;
             else
                 return;
@@ -48,10 +49,8 @@ public override void Execute()
         Publish(_loadMetadata);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Link);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Link);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPrunePlugin.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPrunePlugin.cs
index 6308ceae37..3fb0581c19 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPrunePlugin.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPrunePlugin.cs
@@ -41,25 +41,18 @@ public ExecuteCommandPrunePlugin(string file) : base()
     /// <param name="activator"></param>
     public ExecuteCommandPrunePlugin(IBasicActivateItems activator) : base(activator)
     {
-
     }
 
 
-
     public override void Execute()
     {
         base.Execute();
 
         // make runtime decision about the file to run on
-        if(file == null && BasicActivator != null)
-        {
+        if (file == null && BasicActivator != null)
             file = BasicActivator.SelectFile("Select plugin to prune")?.FullName;
-        }
 
-        if(file == null)
-        {
-            return;
-        }
+        if (file == null) return;
 
         var logger = LogManager.GetCurrentClassLogger();
 
@@ -84,7 +77,8 @@ public override void Execute()
                 if (!e.Name.EndsWith(".dll", StringComparison.InvariantCultureIgnoreCase))
                     continue;
                 Assembly assembly;
-                if (SafeDirectoryCatalog.Ignore.Contains(e.Name.ToLowerInvariant()) || rdmpCoreFiles.Any(f => f.Name.Equals(e.Name)))
+                if (SafeDirectoryCatalog.Ignore.Contains(e.Name.ToLowerInvariant()) ||
+                    rdmpCoreFiles.Any(f => f.Name.Equals(e.Name)))
                 {
                     logger.Info($"Deleting '{e.FullName}' (static)");
                     e.Delete();
@@ -110,13 +104,8 @@ public override void Execute()
                 }
 
                 if (main.IsMatch(e.FullName))
-                {
                     inMain.Add(e);
-                }
-                else if (windows.IsMatch(e.FullName))
-                {
-                    inWindows.Add(e);
-                }
+                else if (windows.IsMatch(e.FullName)) inWindows.Add(e);
             }
 
             foreach (var dup in inWindows.Where(e => inMain.Any(o => o.Name.Equals(e.Name))).ToArray())
@@ -128,4 +117,4 @@ public override void Execute()
 
         BasicActivator?.Show("Prune Completed");
     }
-}
+}
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPutIntoFolder.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPutIntoFolder.cs
index 00915ae39f..7f4c99fe1e 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPutIntoFolder.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandPutIntoFolder.cs
@@ -16,24 +16,24 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandPutIntoFolder: BasicCommandExecution
+public class ExecuteCommandPutIntoFolder : BasicCommandExecution
 {
     private readonly IHasFolder[] _toMove;
     private readonly string _folder;
-        
+
     public ExecuteCommandPutIntoFolder(IBasicActivateItems activator, IHasFolderCombineable cmd, string targetModel)
-        :this(activator,new []{cmd.Folderable},targetModel)
+        : this(activator, new[] { cmd.Folderable }, targetModel)
     {
-            
     }
+
     public ExecuteCommandPutIntoFolder(IBasicActivateItems activator, ManyCataloguesCombineable cmd, string targetModel)
         : this(activator, cmd.Catalogues, targetModel)
     {
-            
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandPutIntoFolder(IBasicActivateItems activator, IHasFolder[] toMove, string folder) : base(activator)
+    public ExecuteCommandPutIntoFolder(IBasicActivateItems activator, IHasFolder[] toMove, string folder) :
+        base(activator)
     {
         _folder = folder;
         _toMove = toMove;
@@ -46,14 +46,15 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
 
         return Image.Load<Rgba32>(CatalogueIcons.CatalogueFolder);
     }
+
     public override void Execute()
     {
         base.Execute();
 
         var f = _folder;
-        if(f == null)
+        if (f == null)
         {
-            if(BasicActivator.IsInteractive)
+            if (BasicActivator.IsInteractive)
             {
                 // if theres a single current value for the folder
                 // of these objects (i.e. they are only operating on one item
@@ -65,7 +66,8 @@ public override void Execute()
                 if (!BasicActivator.TypeText(new DialogArgs
                     {
                         WindowTitle = "Folder",
-                        TaskDescription = "Enter a new virtual folder for the object.  Folder names should be lower case and start with a backslash ('\\')",
+                        TaskDescription =
+                            "Enter a new virtual folder for the object.  Folder names should be lower case and start with a backslash ('\\')",
                         EntryLabel = "New Folder"
                     }, 500, oldValue, out f, false))
                     return;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandQueryPlatformDatabase.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandQueryPlatformDatabase.cs
index b5fcbbb155..61fea15d96 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandQueryPlatformDatabase.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandQueryPlatformDatabase.cs
@@ -29,13 +29,12 @@ public class ExecuteCommandQueryPlatformDatabase : ExecuteCommandViewDataBase
 
     [UseWithObjectConstructor]
     public ExecuteCommandQueryPlatformDatabase(IBasicActivateItems activator,
-
-        [DemandsInitialization("Database type e.g. DataExport, Catalogue, QueryCaching, LoggingDatabase etc (See all IPatcher implementations)")]
+        [DemandsInitialization(
+            "Database type e.g. DataExport, Catalogue, QueryCaching, LoggingDatabase etc (See all IPatcher implementations)")]
         string databaseType,
-
-        [DemandsInitialization("Optional SQL query to execute on the database.  Or null to query the first table in the db.")]
+        [DemandsInitialization(
+            "Optional SQL query to execute on the database.  Or null to query the first table in the db.")]
         string query = null,
-
         [DemandsInitialization(ToFileDescription)]
         FileInfo toFile = null) : base(activator, toFile)
     {
@@ -72,18 +71,17 @@ public ExecuteCommandQueryPlatformDatabase(IBasicActivateItems activator,
             _table = db?.ExpectTable("Catalogue");
             return;
         }
+
         var eds = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>();
 
         var patcher = (IPatcher)Activator.CreateInstance(patcherType);
         db = GetDatabase(eds.Where(e => e.WasCreatedBy(patcher)).ToArray());
 
-        if (db == null)
-        {
-            return;
-        }
+        if (db == null) return;
 
         SetTargetDatabase(db);
     }
+
     public ExecuteCommandQueryPlatformDatabase(IBasicActivateItems activator,
         ExternalDatabaseServer eds) : base(activator, null)
     {
@@ -105,10 +103,7 @@ public ExecuteCommandQueryPlatformDatabase(IBasicActivateItems activator,
 
     private DiscoveredDatabase GetDatabase(IRepository repository)
     {
-        if (repository is TableRepository tableRepo)
-        {
-            return tableRepo.DiscoveredServer?.GetCurrentDatabase();
-        }
+        if (repository is TableRepository tableRepo) return tableRepo.DiscoveredServer?.GetCurrentDatabase();
 
         SetImpossible("Repository was not a database repo");
         return null;
@@ -136,18 +131,13 @@ private void SetTargetDatabase(DiscoveredDatabase database)
     {
         _table = database.DiscoverTables(false).FirstOrDefault();
 
-        if (_table == null)
-        {
-            SetImpossible("Database was empty");
-        }
+        if (_table == null) SetImpossible("Database was empty");
     }
 
 
-    protected override IViewSQLAndResultsCollection GetCollection()
-    {
-        return new ArbitraryTableExtractionUICollection(_table)
+    protected override IViewSQLAndResultsCollection GetCollection() =>
+        new ArbitraryTableExtractionUICollection(_table)
         {
             OverrideSql = _query
         };
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRefreshBrokenCohorts.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRefreshBrokenCohorts.cs
index 4b525f5276..8cfe3eb8ad 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRefreshBrokenCohorts.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRefreshBrokenCohorts.cs
@@ -22,8 +22,9 @@ public class ExecuteCommandRefreshBrokenCohorts : BasicCommandExecution
 
     [UseWithObjectConstructor]
     public ExecuteCommandRefreshBrokenCohorts(IBasicActivateItems activator,
-        [DemandsInitialization("The specific ExternalCohortTable to attempt to refresh connections to or null to refresh all ExternalCohortTables")]
-        ExternalCohortTable ect = null):base(activator)
+        [DemandsInitialization(
+            "The specific ExternalCohortTable to attempt to refresh connections to or null to refresh all ExternalCohortTables")]
+        ExternalCohortTable ect = null) : base(activator)
     {
         _ect = ect;
 
@@ -34,12 +35,9 @@ public ExecuteCommandRefreshBrokenCohorts(IBasicActivateItems activator,
         }
 
         // if we only want to clear one 
-        if(ect != null)
+        if (ect != null)
         {
-            if(!dx.ForbidListedSources.Contains(ect))
-            {
-                SetImpossible($"'{ect}' is not broken");
-            }
+            if (!dx.ForbidListedSources.Contains(ect)) SetImpossible($"'{ect}' is not broken");
         }
         else
         {
@@ -64,13 +62,9 @@ public override void Execute()
             return;
 
         if (_ect != null)
-        {
             dx.ForbidListedSources.Remove(_ect);
-        }
         else
-        {
             dx.ForbidListedSources.Clear();
-        }
 
 
         Publish(toPublish);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRename.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRename.cs
index a6ec34737f..13fa8fd928 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRename.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRename.cs
@@ -12,19 +12,19 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandRename : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandRename : BasicCommandExecution, IAtomicCommand
 {
     private string _newValue;
     private readonly INamed _nameable;
     private bool _explicitNewValuePassed;
 
-    public ExecuteCommandRename(IBasicActivateItems activator, INamed nameable):base(activator)
+    public ExecuteCommandRename(IBasicActivateItems activator, INamed nameable) : base(activator)
     {
         _nameable = nameable;
 
-        if(nameable is ITableInfo)
+        if (nameable is ITableInfo)
             SetImpossible("TableInfos cannot not be renamed");
-            
+
         if (nameable is IMightBeReadOnly ro && ro.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
 
@@ -32,7 +32,8 @@ public ExecuteCommandRename(IBasicActivateItems activator, INamed nameable):base
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandRename(IBasicActivateItems activator, INamed nameable, string newValue):this(activator,nameable)
+    public ExecuteCommandRename(IBasicActivateItems activator, INamed nameable, string newValue) : this(activator,
+        nameable)
     {
         _newValue = newValue;
         _explicitNewValuePassed = true;
@@ -44,30 +45,28 @@ public override void Execute()
 
         if (!_explicitNewValuePassed)
         {
-                
-            if (TypeText($"Rename {_nameable.GetType().Name}", "Name", 500, _nameable.Name,out var text))
+            if (TypeText($"Rename {_nameable.GetType().Name}", "Name", 500, _nameable.Name, out var text))
             {
-                while(UsefulStuff.IsBadName(text))
+                while (UsefulStuff.IsBadName(text))
                 {
-                        
-                    if(YesNo("Name contains illegal characters, do you want to use it anyway?","Bad Name"))
-                    {
+                    if (YesNo("Name contains illegal characters, do you want to use it anyway?", "Bad Name"))
                         //user wants to use the name anyway
                         break;
-                    }
 
                     //user does not want to use the bad name
 
                     //type a new one then
-                        
-                    if(!TypeText($"Rename {_nameable.GetType().Name}", "Name", 2000, _nameable.Name, out text))
+
+                    if (!TypeText($"Rename {_nameable.GetType().Name}", "Name", 2000, _nameable.Name, out text))
                         return;
                 }
 
                 _newValue = text;
             }
             else
+            {
                 return;
+            }
         }
 
         _nameable.Name = _newValue;
@@ -75,7 +74,6 @@ public override void Execute()
 
         _nameable.SaveToDatabase();
         Publish((DatabaseEntity)_nameable);
-
     }
 
     private void EnsureNameIfCohortIdentificationAggregate()
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandReplacedBy.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandReplacedBy.cs
index 8b2753851c..86b8a64fd2 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandReplacedBy.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandReplacedBy.cs
@@ -17,7 +17,6 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 /// </summary>
 public class ExecuteCommandReplacedBy : BasicCommandExecution, IAtomicCommand
 {
-
     public IMapsDirectlyToDatabaseTable Deprecated { get; }
     public IMapsDirectlyToDatabaseTable Replacement { get; }
 
@@ -27,62 +26,53 @@ public class ExecuteCommandReplacedBy : BasicCommandExecution, IAtomicCommand
     /// <summary>
     /// True to prompt user to pick and replacement at execute time
     /// </summary>
-    public bool PromptToPickReplacement {get;set;}
+    public bool PromptToPickReplacement { get; set; }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandReplacedBy(IBasicActivateItems activator, 
-        [DemandsInitialization("The object that is being retired.  If its Type supports being marked IsDeprecated then it must be true")]
-        IMapsDirectlyToDatabaseTable deprecated, 
-        [DemandsInitialization("The object that replaces the retired one.  Pass null to clear the replacement relationship")]
-        IMapsDirectlyToDatabaseTable replacement) 
+    public ExecuteCommandReplacedBy(IBasicActivateItems activator,
+        [DemandsInitialization(
+            "The object that is being retired.  If its Type supports being marked IsDeprecated then it must be true")]
+        IMapsDirectlyToDatabaseTable deprecated,
+        [DemandsInitialization(
+            "The object that replaces the retired one.  Pass null to clear the replacement relationship")]
+        IMapsDirectlyToDatabaseTable replacement)
         : base(activator)
     {
-            
         Deprecated = deprecated;
         Replacement = replacement;
 
         _type = deprecated.GetType();
 
-        if(deprecated is IMightBeDeprecated m && !m.IsDeprecated)
-        {
+        if (deprecated is IMightBeDeprecated m && !m.IsDeprecated)
             SetImpossible($"{deprecated} is not marked IsDeprecated so no replacement can be specified");
-        }
 
-        if(replacement != null && replacement.GetType() != _type)
-        {
+        if (replacement != null && replacement.GetType() != _type)
             SetImpossible($"'{replacement}' cannot replace '{deprecated}' because it is a different object Type");
-        }
     }
+
     public override void Execute()
     {
         base.Execute();
 
         var rep = Replacement;
 
-        if(PromptToPickReplacement && rep == null)
-        {
-            if(!BasicActivator.SelectObject(new DialogArgs{
-                   AllowSelectingNull = true
-               },BasicActivator.CoreChildProvider.AllCatalogues,out rep))
-            {
+        if (PromptToPickReplacement && rep == null)
+            if (!BasicActivator.SelectObject(new DialogArgs
+                {
+                    AllowSelectingNull = true
+                }, BasicActivator.CoreChildProvider.AllCatalogues, out rep))
                 // user cancelled
                 return;
-            }
-        }
 
         var cataRepo = BasicActivator.RepositoryLocator.CatalogueRepository;
-        foreach (var existing in 
+        foreach (var existing in
                  cataRepo.GetExtendedProperties(ExtendedProperty.ReplacedBy, Deprecated))
-        {
             // delete any old references to who we are replaced by
             existing.DeleteInDatabase();
-        }
 
         // null means delete relationship and don't create a new one
-        if(rep != null)
-        {
+        if (rep != null)
             // store the ID of the thing that replaces us
-            new ExtendedProperty(cataRepo,Deprecated, ExtendedProperty.ReplacedBy, rep.ID);
-        }
+            new ExtendedProperty(cataRepo, Deprecated, ExtendedProperty.ReplacedBy, rep.ID);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandResetExtractionProgress.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandResetExtractionProgress.cs
index 9fab121ea2..92768e66da 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandResetExtractionProgress.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandResetExtractionProgress.cs
@@ -29,20 +29,17 @@ public class ExecuteCommandResetExtractionProgress : BasicCommandExecution
     public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator,
         [DemandsInitialization("The configuration to clear progress for")]
         ExtractionConfiguration config,
-        [DemandsInitialization("Optional.  Pass null to clear all progress for all datasets.  Or pass a single Catalogue to reset progress for it only")]
+        [DemandsInitialization(
+            "Optional.  Pass null to clear all progress for all datasets.  Or pass a single Catalogue to reset progress for it only")]
         Catalogue catalogue) : base(activator)
     {
-
-        foreach(var sds in config.SelectedDataSets)
-        {
-            if(catalogue == null || sds.ExtractableDataSet.Catalogue_ID == catalogue.ID)
-            {
+        foreach (var sds in config.SelectedDataSets)
+            if (catalogue == null || sds.ExtractableDataSet.Catalogue_ID == catalogue.ID)
                 AddClearTarget(sds);
-            }
-        }
-            
+
         EvaluateIsImpossible();
     }
+
     public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, SelectedDataSets sds) : base(activator)
     {
         AddClearTarget(sds);
@@ -50,47 +47,37 @@ public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, Sele
         EvaluateIsImpossible();
     }
 
-    public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, ExtractionProgress progress) : base(activator)
+    public ExecuteCommandResetExtractionProgress(IBasicActivateItems activator, ExtractionProgress progress) :
+        base(activator)
     {
-        if (progress.ProgressDate != null)
-        {
-            _toClear.Add(progress);
-        }
+        if (progress.ProgressDate != null) _toClear.Add(progress);
 
         EvaluateIsImpossible();
     }
+
     private void EvaluateIsImpossible()
     {
-        if (_toClear.Count == 0)
-        {
-            SetImpossible("There are no ExtractionProgress underway which could be cleared");
-        }
+        if (_toClear.Count == 0) SetImpossible("There are no ExtractionProgress underway which could be cleared");
     }
 
     private void AddClearTarget(ISelectedDataSets sds)
     {
         var progress = sds.ExtractionProgressIfAny;
 
-        if(progress?.ProgressDate != null)
-        {
-            _toClear.Add(progress);
-        }
+        if (progress?.ProgressDate != null) _toClear.Add(progress);
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        foreach(var progress in _toClear)
+        foreach (var progress in _toClear)
         {
             progress.ProgressDate = null;
             progress.SaveToDatabase();
         }
 
         var config = _toClear.FirstOrDefault()?.SelectedDataSets?.ExtractionConfiguration;
-        if (config != null)
-        {
-            Publish(config);
-        }
+        if (config != null) Publish(config);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRunSupportingSql.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRunSupportingSql.cs
index 1c9e0b44c6..6735e11aac 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRunSupportingSql.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandRunSupportingSql.cs
@@ -50,18 +50,14 @@ protected override IViewSQLAndResultsCollection GetCollection()
         if (!string.IsNullOrWhiteSpace(SupportingSQLTable.SQL) &&
             BasicActivator.IsWinForms)
         {
-
             // does the query look dangerous, if so give them a choice to back out
             var requireConfirm = RiskySql().IsMatch(SupportingSQLTable.SQL);
 
             if (requireConfirm)
-            {
                 if (!BasicActivator.YesNo("Running this SQL may make changes to your database, really run?", "Run SQL"))
-                {
                     return null;
-                }
-            }
         }
+
         return collection;
     }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTable.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTable.cs
index 3892564e73..4c455f4da7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTable.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTable.cs
@@ -13,27 +13,22 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandScriptTable : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandScriptTable : BasicCommandExecution, IAtomicCommand
 {
     private readonly TableInfo _tableInfo;
 
-    public ExecuteCommandScriptTable(IBasicActivateItems activator, TableInfo tableInfo):base(activator)
+    public ExecuteCommandScriptTable(IBasicActivateItems activator, TableInfo tableInfo) : base(activator)
     {
         _tableInfo = tableInfo;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Scripts table structure to Clipboard (without dependencies)";
-    }
+    public override string GetCommandHelp() => "Scripts table structure to Clipboard (without dependencies)";
 
     public override void Execute()
     {
-        Show($"Script for {_tableInfo.GetRuntimeName()}",_tableInfo.Discover(DataAccessContext.InternalDataProcessing).ScriptTableCreation(false,false,false));
+        Show($"Script for {_tableInfo.GetRuntimeName()}",
+            _tableInfo.Discover(DataAccessContext.InternalDataProcessing).ScriptTableCreation(false, false, false));
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SQL);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.SQL);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTables.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTables.cs
index fb7c155748..a041b2ad22 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTables.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandScriptTables.cs
@@ -46,10 +46,7 @@ public ExecuteCommandScriptTables(IBasicActivateItems activator,
         _outFile = outFile;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Scripts multiple tables structure to Clipboard (without dependencies)";
-    }
+    public override string GetCommandHelp() => "Scripts multiple tables structure to Clipboard (without dependencies)";
 
     public override void Execute()
     {
@@ -59,26 +56,21 @@ public override void Execute()
         {
             var tbl = tableInfo.Discover(DataAccessContext.InternalDataProcessing);
 
-            var hypotheticalServer = new DiscoveredServer("localhost", _dbName ?? "None", _dbType ?? tableInfo.DatabaseType, null, null);
-            var hypotheticalTable = hypotheticalServer.ExpectDatabase(_dbName ?? tbl.Database.GetRuntimeName()).ExpectTable(tbl.GetRuntimeName());
+            var hypotheticalServer = new DiscoveredServer("localhost", _dbName ?? "None",
+                _dbType ?? tableInfo.DatabaseType, null, null);
+            var hypotheticalTable = hypotheticalServer.ExpectDatabase(_dbName ?? tbl.Database.GetRuntimeName())
+                .ExpectTable(tbl.GetRuntimeName());
 
             var result = tbl.ScriptTableCreation(false, false, false, hypotheticalTable);
             sbScript.AppendLine(result);
             sbScript.AppendLine();
         }
 
-        if(_outFile != null)
-        {
+        if (_outFile != null)
             File.WriteAllText(_outFile.FullName, sbScript.ToString());
-        }    
         else
-        {
             Show($"Script for {_tableInfos.Length} tables", sbScript.ToString());
-        }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SQL);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.SQL);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSet.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSet.cs
index 34c58cbe23..dee4766a96 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSet.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSet.cs
@@ -24,7 +24,7 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 /// Changes a single property of an object and saves the new value to the database.  New value must be valid for the object and respect
 /// any Type / Database constraints.
 /// </summary>
-public class ExecuteCommandSet:BasicCommandExecution
+public class ExecuteCommandSet : BasicCommandExecution
 {
     private readonly IMapsDirectlyToDatabaseTable _setOn;
     private readonly Func<IMapsDirectlyToDatabaseTable> _setOnFunc;
@@ -48,22 +48,19 @@ public class ExecuteCommandSet:BasicCommandExecution
 
     [UseWithObjectConstructor]
     public ExecuteCommandSet(IBasicActivateItems activator,
-
         [DemandsInitialization("A single object on which you want to change a given property")]
         IMapsDirectlyToDatabaseTable setOn,
         [DemandsInitialization("Name of a property you want to change e.g. Description")]
         string property,
-        [DemandsInitialization("New value to assign, this will be parsed into a valid Type if property is not a string")]
-        string value):base(activator)
+        [DemandsInitialization(
+            "New value to assign, this will be parsed into a valid Type if property is not a string")]
+        string value) : base(activator)
     {
         _setOn = setOn;
 
         _property = GetProperty(_setOn, property);
 
-        if(_setOn is IMightBeReadOnly m)
-        {
-            SetImpossibleIfReadonly(m);
-        }
+        if (_setOn is IMightBeReadOnly m) SetImpossibleIfReadonly(m);
 
         if (_property == null)
         {
@@ -71,7 +68,10 @@ public ExecuteCommandSet(IBasicActivateItems activator,
 
             //suggest similar sounding properties
             var suggestions =
-                _setOn.GetType().GetProperties().Where(c => CultureInfo.CurrentCulture.CompareInfo.IndexOf(c.Name,property, CompareOptions.IgnoreCase) >= 0).ToArray();
+                _setOn.GetType().GetProperties().Where(c =>
+                        CultureInfo.CurrentCulture.CompareInfo.IndexOf(c.Name, property, CompareOptions.IgnoreCase) >=
+                        0)
+                    .ToArray();
 
             if (suggestions.Any())
             {
@@ -85,12 +85,10 @@ public ExecuteCommandSet(IBasicActivateItems activator,
         }
         else
         {
-            var picker = new CommandLineObjectPicker(new string[]{value ?? "NULL"},activator);
+            var picker = new CommandLineObjectPicker(new string[] { value ?? "NULL" }, activator);
 
-            if(!picker.HasArgumentOfType(0,_property.PropertyType))
-            {
+            if (!picker.HasArgumentOfType(0, _property.PropertyType))
                 SetImpossible($"Provided value could not be converted to '{_property.PropertyType}'");
-            }
             else
                 NewValue = picker[0].GetValueForParameterOfType(_property.PropertyType);
         }
@@ -99,76 +97,62 @@ public ExecuteCommandSet(IBasicActivateItems activator,
     private static PropertyInfo GetProperty(IMapsDirectlyToDatabaseTable setOn, string property)
     {
         var props = setOn.GetType().GetProperties();
-            
-        return props.FirstOrDefault(p => string.Equals(p.Name, property)) ??
-               props.FirstOrDefault(p => string.Equals(p.Name, property,StringComparison.InvariantCultureIgnoreCase));
 
+        return props.FirstOrDefault(p => string.Equals(p.Name, property)) ??
+               props.FirstOrDefault(p => string.Equals(p.Name, property, StringComparison.InvariantCultureIgnoreCase));
     }
 
-    public ExecuteCommandSet(IBasicActivateItems activator,IMapsDirectlyToDatabaseTable setOn,PropertyInfo property):base(activator)
+    public ExecuteCommandSet(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable setOn, PropertyInfo property) :
+        base(activator)
     {
         _setOn = setOn;
         _property = property;
         _getValueAtExecuteTime = true;
 
-        if(string.Equals("ID",property?.Name))
-        {
-            SetImpossible("ID property cannot be changed");
-        }
-
+        if (string.Equals("ID", property?.Name)) SetImpossible("ID property cannot be changed");
     }
 
-    public ExecuteCommandSet(IBasicActivateItems activator, Func<IMapsDirectlyToDatabaseTable> setOnFunc, PropertyInfo property) : base(activator)
+    public ExecuteCommandSet(IBasicActivateItems activator, Func<IMapsDirectlyToDatabaseTable> setOnFunc,
+        PropertyInfo property) : base(activator)
     {
         _setOnFunc = setOnFunc;
         _property = property;
         _getValueAtExecuteTime = true;
 
-        if (string.Equals("ID", property?.Name))
-        {
-            SetImpossible("ID property cannot be changed");
-        }
-
+        if (string.Equals("ID", property?.Name)) SetImpossible("ID property cannot be changed");
     }
+
     public override string GetCommandName()
     {
-        if(!string.IsNullOrEmpty(OverrideCommandName))
-        {
-            return OverrideCommandName;
-        }
+        if (!string.IsNullOrEmpty(OverrideCommandName)) return OverrideCommandName;
 
-        if(_property != null)
-        {
-            return $"Set {_property.Name}";
-        }
+        if (_property != null) return $"Set {_property.Name}";
 
         return base.GetCommandName();
     }
+
     public override void Execute()
     {
         base.Execute();
 
-        if(_property == null)
+        if (_property == null)
             return;
 
         var on = _setOn;
 
-        if(_setOnFunc != null)
-        {
-            on = _setOnFunc();
-        }
+        if (_setOnFunc != null) on = _setOnFunc();
 
         if (on == null)
             return;
-            
-        if(_getValueAtExecuteTime)
+
+        if (_getValueAtExecuteTime)
         {
             var populatedNewValueWithRelationship = false;
 
             // If the property we are getting a value for is a foreign key ID field then we should show the user the compatible objects
-            if(_property.GetCustomAttribute(typeof(RelationshipAttribute)) is RelationshipAttribute rel && (_property.PropertyType == typeof(int) || _property.PropertyType == typeof(int?)))
-            {
-                if(typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(rel.Cref))
+            if (_property.GetCustomAttribute(typeof(RelationshipAttribute)) is RelationshipAttribute rel &&
+                (_property.PropertyType == typeof(int) || _property.PropertyType == typeof(int?)))
+                if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(rel.Cref))
                 {
                     IMapsDirectlyToDatabaseTable[] available;
 
@@ -176,14 +160,17 @@ public override void Execute()
                     if (!string.IsNullOrWhiteSpace(rel.ValueGetter))
                     {
                         //get available from that method
-                        var method = on.GetType().GetMethod(rel.ValueGetter,Type.EmptyTypes) ?? throw new Exception($"Could not find a method called '{rel.ValueGetter}' on Type '{on.GetType()}'.  This was specified as a ValueGetter on Property {_property.Name}");
+                        var method = on.GetType().GetMethod(rel.ValueGetter, Type.EmptyTypes) ?? throw new Exception(
+                            $"Could not find a method called '{rel.ValueGetter}' on Type '{on.GetType()}'.  This was specified as a ValueGetter on Property {_property.Name}");
                         try
                         {
                             available = ((IEnumerable<IMapsDirectlyToDatabaseTable>)method.Invoke(on, null)).ToArray();
                         }
                         catch (Exception ex)
                         {
-                            throw new Exception($"Error running method '{rel.ValueGetter}' on Type '{on.GetType()}'.  This was specified as a ValueGetter on Property {_property.Name}",ex);
+                            throw new Exception(
+                                $"Error running method '{rel.ValueGetter}' on Type '{on.GetType()}'.  This was specified as a ValueGetter on Property {_property.Name}",
+                                ex);
                         }
                     }
                     else
@@ -194,11 +181,11 @@ public override void Execute()
                     NewValue = BasicActivator.SelectOne(_property.Name, available)?.ID;
                     populatedNewValueWithRelationship = true;
                 }
-            }
 
-            if(!populatedNewValueWithRelationship)
+            if (!populatedNewValueWithRelationship)
             {
-                if (BasicActivator.SelectValueType(GetDialogArgs(on), _property.PropertyType, _property.GetValue(on), out var chosen))
+                if (BasicActivator.SelectValueType(GetDialogArgs(on), _property.PropertyType, _property.GetValue(on),
+                        out var chosen))
                 {
                     NewValue = chosen;
                 }
@@ -209,8 +196,8 @@ public override void Execute()
                 }
             }
         }
-            
-        ShareManager.SetValue(_property,NewValue, on);
+
+        ShareManager.SetValue(_property, NewValue, on);
         ((DatabaseEntity)on).SaveToDatabase();
 
         Success = true;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAggregateDimension.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAggregateDimension.cs
index 9ac9c84164..827db81750 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAggregateDimension.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAggregateDimension.cs
@@ -22,21 +22,23 @@ public class ExecuteCommandSetAggregateDimension : BasicCommandExecution, IAtomi
     private ExtractionInformation[] _available;
     private ExtractionInformation _extractionInformation;
 
-    public ExecuteCommandSetAggregateDimension(IBasicActivateItems activator, 
+    public ExecuteCommandSetAggregateDimension(IBasicActivateItems activator,
         [DemandsInitialization("The AggregateConfiguration which you want to change the extraction identifier on")]
         AggregateConfiguration ac,
-        [DemandsInitialization("The extractable column in the Catalogue which should be created as a new AggregateDimension on the aggregate.  Or null to prompt at runtime",DefaultValue = true)]
-        ExtractionInformation ei = null):base(activator)
+        [DemandsInitialization(
+            "The extractable column in the Catalogue which should be created as a new AggregateDimension on the aggregate.  Or null to prompt at runtime",
+            DefaultValue = true)]
+        ExtractionInformation ei = null) : base(activator)
     {
         if (!ac.IsCohortIdentificationAggregate)
         {
             SetImpossible("AggregateConfiguration is not a cohort aggregate");
             return;
         }
-            
+
         _extractionInformation = ei;
 
-        if(_extractionInformation != null && !_extractionInformation.IsExtractionIdentifier)
+        if (_extractionInformation != null && !_extractionInformation.IsExtractionIdentifier)
         {
             SetImpossible($"'{_extractionInformation}' is not marked IsExtractionIdentifier");
             return;
@@ -45,16 +47,14 @@ public ExecuteCommandSetAggregateDimension(IBasicActivateItems activator,
         try
         {
             var cata = ac.GetCatalogue();
-            _available = cata.GetAllExtractionInformation().Where(ci=>ci.IsExtractionIdentifier).ToArray();
+            _available = cata.GetAllExtractionInformation().Where(ci => ci.IsExtractionIdentifier).ToArray();
 
             if (_extractionInformation != null)
-            {
-                if(cata.ID != _extractionInformation.CatalogueItem.Catalogue_ID)
+                if (cata.ID != _extractionInformation.CatalogueItem.Catalogue_ID)
                 {
                     SetImpossible($"'{_extractionInformation}' does not belong to the same Catalogue as '{ac}'");
                     return;
                 }
-            }
 
             if (_available.Length == 0)
             {
@@ -62,18 +62,19 @@ public ExecuteCommandSetAggregateDimension(IBasicActivateItems activator,
                 return;
             }
 
-            if(_available.Length == 1 && ac.AggregateDimensions.Length == 1 && _available[0].ID == ac.AggregateDimensions[0].ExtractionInformation_ID)
+            if (_available.Length == 1 && ac.AggregateDimensions.Length == 1 &&
+                _available[0].ID == ac.AggregateDimensions[0].ExtractionInformation_ID)
             {
-                SetImpossible($"AggregateConfiguration already uses the only IsExtractionIdentifier column in '{cata}'");
+                SetImpossible(
+                    $"AggregateConfiguration already uses the only IsExtractionIdentifier column in '{cata}'");
                 return;
             }
-
         }
         catch (System.Exception ex)
         {
             SetImpossible($"Could not determine compatible columns:{ex.Message}");
         }
-            
+
         _aggregate = ac;
     }
 
@@ -82,22 +83,19 @@ public override void Execute()
         base.Execute();
 
         var chosen = _extractionInformation;
-            
-        if(chosen == null && BasicActivator.IsInteractive)
-        {
-            chosen = (ExtractionInformation)BasicActivator.SelectOne(new DialogArgs {
+
+        if (chosen == null && BasicActivator.IsInteractive)
+            chosen = (ExtractionInformation)BasicActivator.SelectOne(new DialogArgs
+            {
                 WindowTitle = "Select AggregateDimension",
-                TaskDescription = "Choose which column to query and link with other datasets in the CohortIdentificationConfiguration.  All datasets in the configuration must have the same identifier type to be linkable."
+                TaskDescription =
+                    "Choose which column to query and link with other datasets in the CohortIdentificationConfiguration.  All datasets in the configuration must have the same identifier type to be linkable."
             }, _available);
-        }
 
         if (chosen == null)
             return;
 
-        foreach(var d in _aggregate.AggregateDimensions)
-        {
-            d.DeleteInDatabase();
-        }
+        foreach (var d in _aggregate.AggregateDimensions) d.DeleteInDatabase();
 
         var added = _aggregate.AddDimension(chosen);
         Publish(_aggregate);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetArgument.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetArgument.cs
index 5b4a1cc5fc..cf7844db12 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetArgument.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetArgument.cs
@@ -24,8 +24,9 @@ public class ExecuteCommandSetArgument : BasicCommandExecution
     private object _value;
 
     private bool _promptUser = false;
-        
-    public ExecuteCommandSetArgument(IBasicActivateItems activator,IArgumentHost host, IArgument arg, object value):base(activator)
+
+    public ExecuteCommandSetArgument(IBasicActivateItems activator, IArgumentHost host, IArgument arg, object value) :
+        base(activator)
     {
         _host = host;
         _arg = arg;
@@ -39,12 +40,12 @@ public ExecuteCommandSetArgument(IBasicActivateItems activator,IArgumentHost hos
     /// <param name="activator"></param>
     /// <param name="arg"></param>
     /// <returns></returns>
-    public ExecuteCommandSetArgument(IBasicActivateItems activator, IArgument arg):base(activator)
+    public ExecuteCommandSetArgument(IBasicActivateItems activator, IArgument arg) : base(activator)
     {
         _arg = arg;
         _promptUser = true;
 
-        if(!activator.IsInteractive)
+        if (!activator.IsInteractive)
             SetImpossible("Activator does not support interactive mode");
     }
 
@@ -54,27 +55,28 @@ public ExecuteCommandSetArgument(IBasicActivateItems activator, IArgument arg):b
     /// <param name="activator"></param>
     /// <param name="picker"></param>
     [UseWithCommandLine(
-        ParameterHelpList = "<component> <argName> <argValue>", 
+        ParameterHelpList = "<component> <argName> <argValue>",
         ParameterHelpBreakdown = @"component    Module to set value on e.g. ProcessTask:1
 argName Name of an argument to set on the component e.g. Retry
 argValue    New value for argument e.g. Null, True, Catalogue:5 etc")]
-    public ExecuteCommandSetArgument(IBasicActivateItems activator,CommandLineObjectPicker picker):base(activator)
+    public ExecuteCommandSetArgument(IBasicActivateItems activator, CommandLineObjectPicker picker) : base(activator)
     {
-        if(picker.Arguments.Count != 3)
+        if (picker.Arguments.Count != 3)
         {
-            SetImpossible($"Wrong number of parameters supplied to command, expected 3 but got {picker.Arguments.Count}");
+            SetImpossible(
+                $"Wrong number of parameters supplied to command, expected 3 but got {picker.Arguments.Count}");
             return;
         }
 
-        if(!picker.HasArgumentOfType(0, typeof(IMapsDirectlyToDatabaseTable)))
+        if (!picker.HasArgumentOfType(0, typeof(IMapsDirectlyToDatabaseTable)))
         {
             SetImpossible("First parameter must be an IArgumentHost DatabaseEntity");
             return;
         }
 
         _host = picker[0].GetValueForParameterOfType(typeof(IMapsDirectlyToDatabaseTable)) as IArgumentHost;
-            
-        if(_host == null)
+
+        if (_host == null)
         {
             SetImpossible("First parameter must be an IArgumentHost");
             return;
@@ -82,14 +84,15 @@ public ExecuteCommandSetArgument(IBasicActivateItems activator,CommandLineObject
 
         var args = _host.GetAllArguments();
 
-        _arg = args.FirstOrDefault(a=>a.Name.Equals(picker[1].RawValue));
+        _arg = args.FirstOrDefault(a => a.Name.Equals(picker[1].RawValue));
 
-        if(_arg == null)
+        if (_arg == null)
         {
-            SetImpossible($"Could not find argument called '{picker[1].RawValue}' on '{_host}'.  Arguments found were {string.Join(",",args.Select(a=>a.Name))}");
+            SetImpossible(
+                $"Could not find argument called '{picker[1].RawValue}' on '{_host}'.  Arguments found were {string.Join(",", args.Select(a => a.Name))}");
             return;
         }
-            
+
         Type argType;
 
         try
@@ -102,21 +105,21 @@ public ExecuteCommandSetArgument(IBasicActivateItems activator,CommandLineObject
             return;
         }
 
-        if(argType == null)
+        if (argType == null)
         {
             SetImpossible($"Argument '{_arg.Name}' has no listed Type");
             return;
         }
-                
 
-        if(!picker[2].HasValueOfType(argType))
+
+        if (!picker[2].HasValueOfType(argType))
         {
-            SetImpossible($"Provided value '{picker[2].RawValue}' does not match expected Type '{argType.Name}' of argument '{_arg.Name}'");
+            SetImpossible(
+                $"Provided value '{picker[2].RawValue}' does not match expected Type '{argType.Name}' of argument '{_arg.Name}'");
             return;
         }
 
         _value = picker[2].GetValueForParameterOfType(argType);
-
     }
 
     public override void Execute()
@@ -125,24 +128,23 @@ public override void Execute()
 
         var value = _value;
 
-        if(_promptUser)
+        if (_promptUser)
         {
             var invoker = new CommandInvoker(BasicActivator);
             try
             {
                 value = invoker.GetValueForParameterOfType(new RequiredArgument(_arg));
             }
-            catch(OperationCanceledException)
+            catch (OperationCanceledException)
             {
                 return;
             }
-                
         }
 
         _arg.SetValue(value);
         _arg.SaveToDatabase();
-            
-        if(_arg is DatabaseEntity de)
+
+        if (_arg is DatabaseEntity de)
             Publish(de);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAxis.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAxis.cs
index 988df251a0..ec5fee2bbb 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAxis.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetAxis.cs
@@ -21,14 +21,16 @@ public class ExecuteCommandSetAxis : BasicCommandExecution
     private readonly string column;
     private readonly bool askAtRuntime;
 
-    public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfiguration aggregate) : base(basicActivator)
+    public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfiguration aggregate) : base(
+        basicActivator)
     {
         this.aggregate = aggregate;
 
         // don't let them try to set a axis on a cohort aggregate configuration but do let them clear it if it somehow ended up with one
         if (aggregate.IsCohortIdentificationAggregate)
         {
-            SetImpossible($"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have an axis");
+            SetImpossible(
+                $"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have an axis");
             return;
         }
 
@@ -43,7 +45,8 @@ public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfig
 
 
     [UseWithObjectConstructor]
-    public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfiguration aggregate, string column) : base(basicActivator)
+    public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfiguration aggregate, string column) :
+        base(basicActivator)
     {
         this.aggregate = aggregate;
         this.column = column;
@@ -53,7 +56,8 @@ public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfig
             // don't let them try to set an axis on a cohort aggregate configuration but do let them clear it if it somehow ended up with one
             if (aggregate.IsCohortIdentificationAggregate)
             {
-                SetImpossible($"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have an axis");
+                SetImpossible(
+                    $"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have an axis");
                 return;
             }
 
@@ -66,12 +70,10 @@ public ExecuteCommandSetAxis(IBasicActivateItems basicActivator, AggregateConfig
         else
         {
             if (aggregate.GetAxisIfAny() == null)
-            {
                 SetImpossible($"AggregateConfiguration {aggregate} does not have an axis to clear");
-            }
         }
-
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -82,10 +84,7 @@ public override void Execute()
         }
         else
         {
-            if (aggregate.GetAxisIfAny() != null)
-            {
-                throw new Exception($"Aggregate {aggregate} already has an axis");
-            }
+            if (aggregate.GetAxisIfAny() != null) throw new Exception($"Aggregate {aggregate} already has an axis");
 
             var opts = AggregateBuilderOptionsFactory.Create(aggregate);
             AggregateDimension match = null;
@@ -95,37 +94,30 @@ public override void Execute()
                 var possible = aggregate.AggregateDimensions.Where(d => d.IsDate()).ToArray();
 
                 if (!possible.Any())
-                {
-                    throw new Exception($"There are no AggregateDimensions in {aggregate} that can be used as an axis (Dimensions must be Date Type)");
-                }
+                    throw new Exception(
+                        $"There are no AggregateDimensions in {aggregate} that can be used as an axis (Dimensions must be Date Type)");
 
                 match = (AggregateDimension)BasicActivator.SelectOne("Choose axis dimension", possible);
 
-                if (match == null)
-                {
-                    return;
-                }
+                if (match == null) return;
             }
             else
             {
                 match = aggregate.AggregateDimensions.FirstOrDefault(a => string.Equals(column, a.ToString()));
                 if (match == null)
-                {
-                    throw new Exception($"Could not find AggregateDimension {column} in Aggregate {aggregate} so could not set it as an axis dimension.  Try adding the column to the aggregate first");
-                }
+                    throw new Exception(
+                        $"Could not find AggregateDimension {column} in Aggregate {aggregate} so could not set it as an axis dimension.  Try adding the column to the aggregate first");
             }
 
             if (!match.IsDate())
-            {
-                throw new Exception($"AggregateDimension {match} is not a Date so cannot set it as an axis for Aggregate {aggregate}");
-            }
+                throw new Exception(
+                    $"AggregateDimension {match} is not a Date so cannot set it as an axis for Aggregate {aggregate}");
 
             var enable = opts.ShouldBeEnabled(AggregateEditorSection.AXIS, aggregate);
 
             if (!enable)
-            {
-                throw new Exception($"Current state of Aggregate {aggregate} does not support having an axis Dimension");
-            }
+                throw new Exception(
+                    $"Current state of Aggregate {aggregate} does not support having an axis Dimension");
 
             var axis = new AggregateContinuousDateAxis(BasicActivator.RepositoryLocator.CatalogueRepository, match);
             axis.SaveToDatabase();
@@ -133,5 +125,4 @@ public override void Execute()
 
         Publish(aggregate);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetColumnSettingBase.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetColumnSettingBase.cs
index 1a7b0ed533..afba3717f5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetColumnSettingBase.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetColumnSettingBase.cs
@@ -21,11 +21,12 @@ public abstract class ExecuteCommandSetColumnSettingBase : BasicCommandExecution
     private readonly string _commandName;
     private ConcreteColumn[] _selectedDataSetColumns;
     private ConcreteColumn[] _alreadyMarkedInConfiguration;
-        
+
     /// <summary>
     /// Explicit columns to pick rather than prompting to choose at runtime
     /// </summary>
     private string[] toPick;
+
     private readonly string _commandProperty;
 
     /// <summary>
@@ -38,7 +39,7 @@ public abstract class ExecuteCommandSetColumnSettingBase : BasicCommandExecution
     /// <param name="commandName">Describe what is being changed from user perspective e.g. "Set IsExtractionIdentifier"</param>
     /// <param name="commandProperty">Name of property being changed by this command e.g "Extraction Identifier"</param>
     public ExecuteCommandSetColumnSettingBase(
-        IBasicActivateItems activator,ICatalogue catalogue,IExtractionConfiguration inConfiguration,string column,
+        IBasicActivateItems activator, ICatalogue catalogue, IExtractionConfiguration inConfiguration, string column,
         string commandName, string commandProperty
     ) : base(activator)
     {
@@ -80,13 +81,10 @@ public ExecuteCommandSetColumnSettingBase(
                 return;
             }
 
-            _alreadyMarked = _extractionInformations.Where(c=>Getter(c)).ToArray();
+            _alreadyMarked = _extractionInformations.Where(c => Getter(c)).ToArray();
         }
 
-        if (!string.IsNullOrWhiteSpace(column))
-        {
-            toPick = column.Split(',', StringSplitOptions.RemoveEmptyEntries);
-        }
+        if (!string.IsNullOrWhiteSpace(column)) toPick = column.Split(',', StringSplitOptions.RemoveEmptyEntries);
     }
 
 
@@ -102,6 +100,7 @@ public override string GetCommandName()
 
         return $"{_commandName} ({string.Join(",", cols.Select(e => e.GetRuntimeName()))})";
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -121,6 +120,7 @@ public override void Execute()
             Publish(_catalogue);
         }
     }
+
     private void ChangeFor(string initialSearchText, ConcreteColumn[] allColumns)
     {
         ConcreteColumn[] selected = null;
@@ -130,27 +130,30 @@ private void ChangeFor(string initialSearchText, ConcreteColumn[] allColumns)
             selected = allColumns.Where(a => toPick.Contains(a.GetRuntimeName())).ToArray();
 
             if (selected.Length != toPick.Length)
-            {
-                throw new Exception($"Could not find column(s) {string.Join(',', toPick)} amongst available columns ({string.Join(',', allColumns.Select(c => c.GetRuntimeName()))})");
-            }
+                throw new Exception(
+                    $"Could not find column(s) {string.Join(',', toPick)} amongst available columns ({string.Join(',', allColumns.Select(c => c.GetRuntimeName()))})");
         }
         else
         {
-            if (SelectMany(new DialogArgs { 
+            if (SelectMany(new DialogArgs
+                {
                     InitialObjectSelection = _alreadyMarked ?? _alreadyMarkedInConfiguration,
                     AllowSelectingNull = true,
                     WindowTitle = $"Set {_commandProperty}",
-                    TaskDescription = $"Choose which columns will make up the new {_commandProperty}.  Or select null to clear"
+                    TaskDescription =
+                        $"Choose which columns will make up the new {_commandProperty}.  Or select null to clear"
                 }, allColumns, out selected))
             {
                 if (selected == null || selected.Length == 0)
                     if (!YesNo($"Do you want to clear the {_commandProperty}?", $"Clear {_commandProperty}?"))
                         return;
-                if(!IsValidSelection(selected))
+                if (!IsValidSelection(selected))
                     return;
             }
             else
+            {
                 return;
+            }
         }
 
         foreach (var ec in allColumns)
@@ -159,7 +162,7 @@ private void ChangeFor(string initialSearchText, ConcreteColumn[] allColumns)
 
             if (Getter(ec) != newValue)
             {
-                Setter(ec,newValue);
+                Setter(ec, newValue);
                 ec.SaveToDatabase();
             }
         }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetContainerOperation.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetContainerOperation.cs
index fc2e31783b..bb8818160a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetContainerOperation.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetContainerOperation.cs
@@ -20,7 +20,8 @@ public class ExecuteCommandSetContainerOperation : BasicCommandExecution
     private readonly CohortAggregateContainer _container;
     private readonly SetOperation _operation;
 
-    public ExecuteCommandSetContainerOperation(IBasicActivateItems activator, CohortAggregateContainer container, SetOperation operation) : base(activator)
+    public ExecuteCommandSetContainerOperation(IBasicActivateItems activator, CohortAggregateContainer container,
+        SetOperation operation) : base(activator)
     {
         if (container.Operation == operation)
             SetImpossible($"Container already uses {operation}");
@@ -28,10 +29,7 @@ public ExecuteCommandSetContainerOperation(IBasicActivateItems activator, Cohort
         _container = container;
         _operation = operation;
 
-        if (container.ShouldBeReadOnly(out var reason))
-        {
-            SetImpossible(reason);
-        }
+        if (container.ShouldBeReadOnly(out var reason)) SetImpossible(reason);
 
         Weight = _operation switch
         {
@@ -42,10 +40,9 @@ public ExecuteCommandSetContainerOperation(IBasicActivateItems activator, Cohort
         };
     }
 
-    public override string GetCommandName()
-    {
-        return !string.IsNullOrWhiteSpace(OverrideCommandName) ? OverrideCommandName : $"Set operation {_operation}";
-    }
+    public override string GetCommandName() => !string.IsNullOrWhiteSpace(OverrideCommandName)
+        ? OverrideCommandName
+        : $"Set operation {_operation}";
 
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
@@ -66,10 +63,14 @@ public override void Execute()
 
         //if the old name was UNION and we are changing to INTERSECT Operation then we should probably change the Name too! even if they have something like 'INTERSECT the people who are big and small' and they change to UNION we want it to be changed to 'UNION the people who are big and small'
         if (_container.Name.StartsWith(oldOperation.ToString()))
+        {
             _container.Name = _operation + _container.Name[oldOperation.ToString().Length..];
+        }
         else
         {
-            if (BasicActivator.TypeText("New name for container?", "You have changed the operation, do you want to give it a new description?", 1000, _container.Name, out var newName, false))
+            if (BasicActivator.TypeText("New name for container?",
+                    "You have changed the operation, do you want to give it a new description?", 1000, _container.Name,
+                    out var newName, false))
             {
                 _container.Name = newName;
             }
@@ -79,12 +80,10 @@ public override void Execute()
                 // user cancelled the operation
                 return;
             }
-
         }
 
         _container.Operation = _operation;
         _container.SaveToDatabase();
         Publish(_container);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDataAccessContextForCredentials.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDataAccessContextForCredentials.cs
index 97f6fb5962..47b4ad8b2c 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDataAccessContextForCredentials.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDataAccessContextForCredentials.cs
@@ -16,33 +16,30 @@ public class ExecuteCommandSetDataAccessContextForCredentials : BasicCommandExec
     private DataAccessCredentialUsageNode _node;
     private readonly DataAccessContext _newContext;
 
-    public ExecuteCommandSetDataAccessContextForCredentials(IBasicActivateItems activator, DataAccessCredentialUsageNode node, DataAccessContext newContext, Dictionary<DataAccessContext, DataAccessCredentials> existingCredentials): base(activator)
+    public ExecuteCommandSetDataAccessContextForCredentials(IBasicActivateItems activator,
+        DataAccessCredentialUsageNode node, DataAccessContext newContext,
+        Dictionary<DataAccessContext, DataAccessCredentials> existingCredentials) : base(activator)
     {
         _node = node;
         _newContext = newContext;
 
         //if context is same as before
-        if(newContext == node.Context)
+        if (newContext == node.Context)
         {
             SetImpossible("This is the current usage context declared");
             return;
         }
-            
+
         //if there's already another credential for that context (other than this one)
         if (existingCredentials.TryGetValue(newContext, out var credential))
             SetImpossible(
                 $"DataAccessCredentials '{credential}' are used for accessing table under context {newContext}");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Changes which contexts the credentials can be used under e.g. DataLoad only";
-    }
+    public override string GetCommandHelp() =>
+        "Changes which contexts the credentials can be used under e.g. DataLoad only";
 
-    public override string GetCommandName()
-    {
-        return _newContext.ToString();
-    }
+    public override string GetCommandName() => _newContext.ToString();
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDefault.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDefault.cs
index 254a6a00c7..b83b90c5b6 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDefault.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetDefault.cs
@@ -19,7 +19,8 @@ public class ExecuteCommandSetDefault : BasicCommandExecution
     private readonly PermissableDefaults _toSet;
     private readonly ExternalDatabaseServer _server;
 
-    public ExecuteCommandSetDefault(IBasicActivateItems basicActivator, PermissableDefaults toSet, ExternalDatabaseServer server):base(basicActivator)
+    public ExecuteCommandSetDefault(IBasicActivateItems basicActivator, PermissableDefaults toSet,
+        ExternalDatabaseServer server) : base(basicActivator)
     {
         _toSet = toSet;
         _server = server;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtendedProperty.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtendedProperty.cs
index 7000879c05..a2f818367a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtendedProperty.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtendedProperty.cs
@@ -21,7 +21,7 @@ public class ExecuteCommandSetExtendedProperty : BasicCommandExecution, IAtomicC
     public string PropertyName { get; }
     public string Value { get; }
     public bool Strict { get; }
-        
+
     /// <summary>
     /// Set to true to prompt user for the <see cref="Value"/> at execution time (e.g. for interactive UIs)
     /// </summary>
@@ -41,15 +41,16 @@ public ExecuteCommandSetExtendedProperty(IBasicActivateItems activator,
         string propertyName,
         [DemandsInitialization("The value to store")]
         string value,
-        [DemandsInitialization("True to validate propertyName against known properties.  False to allow custom named properties.  Defaults to true.",DefaultValue = true)]
+        [DemandsInitialization(
+            "True to validate propertyName against known properties.  False to allow custom named properties.  Defaults to true.",
+            DefaultValue = true)]
         bool strict = true
     )
         : base(activator)
     {
         if (strict && !ExtendedProperty.KnownProperties.Contains(propertyName))
-        {
-            SetImpossible($"{propertyName} is not a known property.  Known properties are: {Environment.NewLine}{string.Join(Environment.NewLine,ExtendedProperty.KnownProperties)}");
-        }
+            SetImpossible(
+                $"{propertyName} is not a known property.  Known properties are: {Environment.NewLine}{string.Join(Environment.NewLine, ExtendedProperty.KnownProperties)}");
         SetOn = setOn;
         PropertyName = propertyName;
         Value = value;
@@ -70,41 +71,30 @@ public override void Execute()
 
         var cataRepo = BasicActivator.RepositoryLocator.CatalogueRepository;
         var newValue = Value;
-                        
-        foreach(var o in SetOn)
+
+        foreach (var o in SetOn)
         {
             var props = cataRepo.GetExtendedProperties(PropertyName, o).ToArray();
             var oldValue = props.FirstOrDefault()?.Value;
 
             if (PromptForValue)
-            {
                 if (!BasicActivator.TypeText(new DialogArgs
                     {
                         WindowTitle = PropertyName,
                         TaskDescription = PromptForValueTaskDescription
                     }, int.MaxValue, oldValue, out newValue, false))
-                {
                     // user cancelled entering some text
                     return;
-                }
-            }
 
             // delete any old versions
-            foreach (var d in props)
-            {
-                d.DeleteInDatabase();
-            }
+            foreach (var d in props) d.DeleteInDatabase();
 
             // Creates the new property into the db
             // If the Value passed was null just leave it deleted
-            if(!string.IsNullOrWhiteSpace(newValue))
-            {
-                new ExtendedProperty(cataRepo, o, PropertyName, newValue);
-            }
-                    
+            if (!string.IsNullOrWhiteSpace(newValue)) new ExtendedProperty(cataRepo, o, PropertyName, newValue);
         }
 
-        if(SetOn.Any())
+        if (SetOn.Any())
             Publish(SetOn.First());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionIdentifier.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionIdentifier.cs
index 6bbc924f7b..09a9eb2d90 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionIdentifier.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionIdentifier.cs
@@ -29,30 +29,24 @@ public class ExecuteCommandSetExtractionIdentifier : ExecuteCommandSetColumnSett
     public ExecuteCommandSetExtractionIdentifier(IBasicActivateItems activator,
             [DemandsInitialization("The dataset you want to change the extraction identifier for")]
             ICatalogue catalogue,
-
-            [DemandsInitialization("Optional - The specific extraction you want the change made in or Null for the Catalogue itself (will affect all future extractions)")]
+            [DemandsInitialization(
+                "Optional - The specific extraction you want the change made in or Null for the Catalogue itself (will affect all future extractions)")]
             IExtractionConfiguration inConfiguration,
-
-            [DemandsInitialization("Optional - The Column name(s) you want to select as the new linkage identifier(s).  Comma seperate multiple entries if needed")]
-            string column) 
+            [DemandsInitialization(
+                "Optional - The Column name(s) you want to select as the new linkage identifier(s).  Comma seperate multiple entries if needed")]
+            string column)
         // base class args
-        :base(activator, catalogue, inConfiguration,column,
+        : base(activator, catalogue, inConfiguration, column,
             "Set Extraction Identifier",
             "Extraction Identifier")
     {
-            
-            
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableCohort,OverlayKind.Key);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Key);
 
-    public override string GetCommandHelp()
-    {
-        return "Change which column(s) contain the patient id / linkage column e.g. CHI";
-    }
+    public override string GetCommandHelp() =>
+        "Change which column(s) contain the patient id / linkage column e.g. CHI";
 
     protected override bool IsValidSelection(ConcreteColumn[] selected)
     {
@@ -61,15 +55,15 @@ protected override bool IsValidSelection(ConcreteColumn[] selected)
 
         // if multiple selected warn user
         if (selected.Length > 1)
-            return YesNo("Are you sure you want multiple linkable extraction identifier columns (most datasets only have 1 person ID column in them)?", "Multiple IsExtractionIdentifier columns?");
+            return YesNo(
+                "Are you sure you want multiple linkable extraction identifier columns (most datasets only have 1 person ID column in them)?",
+                "Multiple IsExtractionIdentifier columns?");
 
         return true;
     }
 
-    protected override bool Getter(ConcreteColumn c)
-    {
-        return c.IsExtractionIdentifier;
-    }
+    protected override bool Getter(ConcreteColumn c) => c.IsExtractionIdentifier;
+
     protected override void Setter(ConcreteColumn c, bool newValue)
     {
         c.IsExtractionIdentifier = newValue;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionPrimaryKeys.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionPrimaryKeys.cs
index 7acdc04de6..7cb513a040 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionPrimaryKeys.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetExtractionPrimaryKeys.cs
@@ -22,33 +22,26 @@ public class ExecuteCommandSetExtractionPrimaryKeys : ExecuteCommandSetColumnSet
     public ExecuteCommandSetExtractionPrimaryKeys(IBasicActivateItems activator,
             [DemandsInitialization("The dataset you want to change the extraction primary keys for")]
             ICatalogue catalogue,
-
-            [DemandsInitialization("Optional - The specific extraction you want the change made in or Null for the Catalogue itself (will affect all future extractions)")]
+            [DemandsInitialization(
+                "Optional - The specific extraction you want the change made in or Null for the Catalogue itself (will affect all future extractions)")]
             IExtractionConfiguration inConfiguration,
-
-            [DemandsInitialization("Optional - The Column name(s) you want to select as the new extraction primary keys.  Comma seperate multiple entries if needed")]
+            [DemandsInitialization(
+                "Optional - The Column name(s) you want to select as the new extraction primary keys.  Comma seperate multiple entries if needed")]
             string column)
         // base class args
         : base(activator, catalogue, inConfiguration, column,
             "Set Extraction Primary Key",
             "Extraction Primary Key")
     {
+    }
 
+    public override string GetCommandHelp() =>
+        "Change which column(s) should be marked as primary key if extracting to database";
 
-    }
-    public override string GetCommandHelp()
-    {
-        return "Change which column(s) should be marked as primary key if extracting to database";
-    }
+    protected override bool IsValidSelection(ConcreteColumn[] selected) => true;
+
+    protected override bool Getter(ConcreteColumn c) => c.IsPrimaryKey;
 
-    protected override bool IsValidSelection(ConcreteColumn[] selected)
-    {
-        return true;
-    }
-    protected override bool Getter(ConcreteColumn c)
-    {
-        return c.IsPrimaryKey;
-    }
     protected override void Setter(ConcreteColumn ec, bool newValue)
     {
         ec.IsPrimaryKey = newValue;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetFilterTreeShortcut.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetFilterTreeShortcut.cs
index abf1382306..96d6a9924a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetFilterTreeShortcut.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetFilterTreeShortcut.cs
@@ -27,12 +27,13 @@ internal class ExecuteCommandSetFilterTreeShortcut : BasicCommandExecution
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="setOn"></param>
-    public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator, AggregateConfiguration setOn): base(activator)
+    public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator, AggregateConfiguration setOn) :
+        base(activator)
     {
         _setOn = setOn;
         _promptChoice = true;
 
-        if(_setOn.RootFilterContainer_ID != null)
+        if (_setOn.RootFilterContainer_ID != null)
             SetImpossible($"Aggregate already has a root filter container");
 
         if (_setOn.Catalogue.IsApiCall())
@@ -46,16 +47,18 @@ public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator, Aggreg
     /// <param name="setOn"></param>
     /// <param name="pointTo"></param>
     [UseWithObjectConstructor]
-    public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator, 
-        [DemandsInitialization("An aggregate for whom you want to set the WHERE logic on (must not have any current filters/containers)")]
-        AggregateConfiguration setOn, 
-        [DemandsInitialization("The destination aggregate which contains a WHERE logic tree (containers and filters) that you want to copy.  Pass Null to clear")]
+    public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator,
+        [DemandsInitialization(
+            "An aggregate for whom you want to set the WHERE logic on (must not have any current filters/containers)")]
+        AggregateConfiguration setOn,
+        [DemandsInitialization(
+            "The destination aggregate which contains a WHERE logic tree (containers and filters) that you want to copy.  Pass Null to clear")]
         AggregateConfiguration pointTo) : base(activator)
     {
         _setOn = setOn;
         _pointTo = pointTo;
 
-        if(_setOn.RootFilterContainer_ID != null)
+        if (_setOn.RootFilterContainer_ID != null)
             SetImpossible($"{_setOn} already has a root filter container");
 
         if (_setOn.Catalogue.IsApiCall())
@@ -64,16 +67,17 @@ public ExecuteCommandSetFilterTreeShortcut(IBasicActivateItems activator,
         if (_pointTo != null && _pointTo.RootFilterContainer_ID == null)
             SetImpossible($"{_pointTo} does not have a filter container tree to link to");
 
-        if(_pointTo == null && setOn.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID == null)
+        if (_pointTo == null && setOn.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID == null)
             SetImpossible($"{_pointTo} does not have a shortcut to clear");
     }
+
     public override void Execute()
     {
         base.Execute();
 
         var pointTo = _pointTo;
 
-        if(_promptChoice && pointTo == null)
+        if (_promptChoice && pointTo == null)
         {
             var available = _setOn.Repository.GetAllObjects<AggregateConfiguration>().Where(a =>
                     //which are not themselves already shortcuts!
@@ -85,16 +89,16 @@ public override void Execute()
                 .Except(new[] { _setOn }).ToArray();
 
 
-            if(!available.Any())
+            if (!available.Any())
             {
                 BasicActivator.Show("There are no other AggregateConfigurations with filter trees you could reference");
                 return;
             }
 
-            pointTo = (AggregateConfiguration)BasicActivator.SelectOne("Target",available,null,false);
-                
+            pointTo = (AggregateConfiguration)BasicActivator.SelectOne("Target", available, null, false);
+
             // Looks like they didn't make a choice
-            if(pointTo == null)
+            if (pointTo == null)
                 return;
         }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetGlobalDleIgnorePattern.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetGlobalDleIgnorePattern.cs
index 50757b1d09..c3d0fe5b6a 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetGlobalDleIgnorePattern.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetGlobalDleIgnorePattern.cs
@@ -14,9 +14,9 @@ public class ExecuteCommandSetGlobalDleIgnorePattern : BasicCommandExecution
 {
     private readonly string _pattern;
     private readonly bool _explicitPatternProvided;
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandSetGlobalDleIgnorePattern(IBasicActivateItems activator, string pattern):base(activator)
+    public ExecuteCommandSetGlobalDleIgnorePattern(IBasicActivateItems activator, string pattern) : base(activator)
     {
         _pattern = pattern;
         //if pattern is null but this constructor is used then we shouldn't ask them again what they want
@@ -27,30 +27,29 @@ public ExecuteCommandSetGlobalDleIgnorePattern(IBasicActivateItems activator, st
     /// Constructor for when we should prompt user in Gui for what the pattern should be if/when command is executed
     /// </summary>
     /// <param name="activator"></param>
-    public ExecuteCommandSetGlobalDleIgnorePattern(IBasicActivateItems activator):base(activator)
+    public ExecuteCommandSetGlobalDleIgnorePattern(IBasicActivateItems activator) : base(activator)
     {
-             
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        var existing = HICDatabaseConfiguration.GetGlobalIgnorePatternIfAny(BasicActivator.RepositoryLocator.CatalogueRepository);
+        var existing =
+            HICDatabaseConfiguration.GetGlobalIgnorePatternIfAny(BasicActivator.RepositoryLocator.CatalogueRepository);
 
-        if(existing == null)
+        if (existing == null)
         {
             existing = new StandardRegex(BasicActivator.RepositoryLocator.CatalogueRepository)
             {
                 ConceptName = StandardRegex.DataLoadEngineGlobalIgnorePattern,
                 Description = "Regex that will be applied as an ignore when running the data load engine",
                 Regex = "^ignore_.*"
-
             };
             existing.SaveToDatabase();
         }
-                
-        if(_explicitPatternProvided)
+
+        if (_explicitPatternProvided)
         {
             existing.Regex = _pattern;
             existing.SaveToDatabase();
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetIgnoredColumns.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetIgnoredColumns.cs
index 4225bd01e9..872855d115 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetIgnoredColumns.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetIgnoredColumns.cs
@@ -20,14 +20,15 @@ public class ExecuteCommandSetIgnoredColumns : BasicCommandExecution
     private readonly bool _explicitChoiceMade;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandSetIgnoredColumns(IBasicActivateItems activator, LoadMetadata loadMetadata, ColumnInfo[] columnsToIgnore):base(activator)
+    public ExecuteCommandSetIgnoredColumns(IBasicActivateItems activator, LoadMetadata loadMetadata,
+        ColumnInfo[] columnsToIgnore) : base(activator)
     {
         _loadMetadata = loadMetadata;
         _columnsToIgnore = columnsToIgnore;
         _explicitChoiceMade = true;
     }
 
-    public ExecuteCommandSetIgnoredColumns(IBasicActivateItems activator, LoadMetadata loadMetadata):base(activator)
+    public ExecuteCommandSetIgnoredColumns(IBasicActivateItems activator, LoadMetadata loadMetadata) : base(activator)
     {
         _loadMetadata = loadMetadata;
     }
@@ -36,9 +37,9 @@ public override void Execute()
     {
         base.Execute();
 
-        var availableColumns = _loadMetadata.GetDistinctTableInfoList(true).SelectMany(t=>t.ColumnInfos).ToArray();
+        var availableColumns = _loadMetadata.GetDistinctTableInfoList(true).SelectMany(t => t.ColumnInfos).ToArray();
 
-        if(_explicitChoiceMade)
+        if (_explicitChoiceMade)
         {
             var ignore = _columnsToIgnore ?? Array.Empty<ColumnInfo>();
 
@@ -50,19 +51,17 @@ public override void Execute()
         }
         else
         {
-            var chosen = BasicActivator.SelectMany("Ignore Columns (choice will replace old set)",typeof(ColumnInfo),availableColumns);
+            var chosen = BasicActivator.SelectMany("Ignore Columns (choice will replace old set)", typeof(ColumnInfo),
+                availableColumns);
 
-            if(chosen != null)
-            {
+            if (chosen != null)
                 foreach (var c in availableColumns)
                 {
                     c.IgnoreInLoads = chosen.Contains(c);
                     c.SaveToDatabase();
                 }
-            }
         }
 
         Publish(_loadMetadata);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPermissionWindow.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPermissionWindow.cs
index cadcfac1f7..d240262f25 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPermissionWindow.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPermissionWindow.cs
@@ -14,24 +14,22 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandSetPermissionWindow : BasicCommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandSetPermissionWindow : BasicCommandExecution, IAtomicCommandWithTarget
 {
     private readonly CacheProgress _cacheProgress;
     private PermissionWindow _window;
-        
-    public ExecuteCommandSetPermissionWindow(IBasicActivateItems activator, CacheProgress cacheProgress) : base(activator)
+
+    public ExecuteCommandSetPermissionWindow(IBasicActivateItems activator, CacheProgress cacheProgress) :
+        base(activator)
     {
         _cacheProgress = cacheProgress;
         _window = null;
 
-        if(!activator.CoreChildProvider.AllPermissionWindows.Any())
+        if (!activator.CoreChildProvider.AllPermissionWindows.Any())
             SetImpossible("There are no PermissionWindows created yet");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Restrict caching execution to the given time period";
-    }
+    public override string GetCommandHelp() => "Restrict caching execution to the given time period";
 
     public override void Execute()
     {
@@ -39,7 +37,7 @@ public override void Execute()
 
         _window ??= SelectOne<PermissionWindow>(BasicActivator.RepositoryLocator.CatalogueRepository);
 
-        if(_window == null)
+        if (_window == null)
             return;
 
         _cacheProgress.PermissionWindow_ID = _window.ID;
@@ -48,10 +46,8 @@ public override void Execute()
         Publish(_cacheProgress);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.PermissionWindow, OverlayKind.Link);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.PermissionWindow, OverlayKind.Link);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPivot.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPivot.cs
index 48154e06ff..a86ded99d4 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPivot.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetPivot.cs
@@ -21,23 +21,26 @@ public class ExecuteCommandSetPivot : BasicCommandExecution
     private readonly string column;
     private readonly bool askAtRuntime;
 
-    public ExecuteCommandSetPivot(IBasicActivateItems basicActivator, AggregateConfiguration aggregate):base(basicActivator)
+    public ExecuteCommandSetPivot(IBasicActivateItems basicActivator, AggregateConfiguration aggregate) : base(
+        basicActivator)
     {
         this.aggregate = aggregate;
 
         // don't let them try to set a pivot on a cohort aggregate configuration but do let them clear it if it somehow ended up with one
         if (aggregate.IsCohortIdentificationAggregate)
         {
-            SetImpossible($"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
+            SetImpossible(
+                $"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
             return;
         }
 
         askAtRuntime = true;
     }
 
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandSetPivot(IBasicActivateItems basicActivator, AggregateConfiguration aggregate, string column ) : base(basicActivator)
+    public ExecuteCommandSetPivot(IBasicActivateItems basicActivator, AggregateConfiguration aggregate, string column) :
+        base(basicActivator)
     {
         this.aggregate = aggregate;
         this.column = column;
@@ -45,21 +48,20 @@ public ExecuteCommandSetPivot(IBasicActivateItems basicActivator, AggregateConfi
         if (!string.IsNullOrWhiteSpace(column))
         {
             // don't let them try to set a pivot on a cohort aggregate configuration but do let them clear it if it somehow ended up with one
-            if(aggregate.IsCohortIdentificationAggregate)
+            if (aggregate.IsCohortIdentificationAggregate)
             {
-                SetImpossible($"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
+                SetImpossible(
+                    $"AggregateConfiguration {aggregate} is a cohort identification aggregate and so cannot have a pivot");
                 return;
             }
         }
         else
         {
-            if(aggregate.PivotOnDimensionID == null)
-            {
+            if (aggregate.PivotOnDimensionID == null)
                 SetImpossible($"AggregateConfiguration {aggregate} does not have a pivot to clear");
-            }
         }
-
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -79,37 +81,29 @@ public override void Execute()
                 var possible = aggregate.AggregateDimensions.Where(d => !d.IsDate()).ToArray();
 
                 if (!possible.Any())
-                {
                     throw new Exception($"There are no AggregateDimensions in {aggregate} that can be used as a Pivot");
-                }
 
                 match = (AggregateDimension)BasicActivator.SelectOne("Choose pivot dimension", possible);
-                    
-                if(match == null)
-                {
-                    return;
-                }
+
+                if (match == null) return;
             }
             else
             {
                 match = aggregate.AggregateDimensions.FirstOrDefault(a => string.Equals(column, a.ToString()));
                 if (match == null)
-                {
-                    throw new Exception($"Could not find AggregateDimension {column} in Aggregate {aggregate} so could not set it as a pivot dimension.  Try adding the column to the aggregate first");
-                }
+                    throw new Exception(
+                        $"Could not find AggregateDimension {column} in Aggregate {aggregate} so could not set it as a pivot dimension.  Try adding the column to the aggregate first");
             }
 
             if (match.IsDate())
-            {
-                throw new Exception($"AggregateDimension {match} is a Date so cannot set it as a Pivot for Aggregate {aggregate}");
-            }
+                throw new Exception(
+                    $"AggregateDimension {match} is a Date so cannot set it as a Pivot for Aggregate {aggregate}");
 
             var enable = opts.ShouldBeEnabled(AggregateEditorSection.PIVOT, aggregate);
 
             if (!enable)
-            {
-                throw new Exception($"Current state of Aggregate {aggregate} does not support having a Pivot Dimension");
-            }
+                throw new Exception(
+                    $"Current state of Aggregate {aggregate} does not support having a Pivot Dimension");
 
             aggregate.PivotOnDimensionID = match.ID;
             aggregate.SaveToDatabase();
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetProjectExtractionDirectory.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetProjectExtractionDirectory.cs
index 18f43ba007..514d581e65 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetProjectExtractionDirectory.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetProjectExtractionDirectory.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandSetProjectExtractionDirectory : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandSetProjectExtractionDirectory : BasicCommandExecution, IAtomicCommand
 {
     private readonly Project _project;
 
@@ -21,10 +21,8 @@ public ExecuteCommandSetProjectExtractionDirectory(IBasicActivateItems activator
         _project = project;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Change the location on disk where extracted artifacts are put when you run extraction configurations of this project";
-    }
+    public override string GetCommandHelp() =>
+        "Change the location on disk where extracted artifacts are put when you run extraction configurations of this project";
 
     public override void Execute()
     {
@@ -40,8 +38,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionDirectoryNode,OverlayKind.Edit);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionDirectoryNode, OverlayKind.Edit);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetQueryCachingDatabase.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetQueryCachingDatabase.cs
index 752d2fb1bc..bdcdf05780 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetQueryCachingDatabase.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetQueryCachingDatabase.cs
@@ -20,21 +20,22 @@ public class ExecuteCommandSetQueryCachingDatabase : BasicCommandExecution, IAto
     private readonly CohortIdentificationConfiguration _cic;
     private ExternalDatabaseServer[] _caches;
 
-    public ExecuteCommandSetQueryCachingDatabase(IBasicActivateItems activator,CohortIdentificationConfiguration cic) : base(activator)
+    public ExecuteCommandSetQueryCachingDatabase(IBasicActivateItems activator, CohortIdentificationConfiguration cic) :
+        base(activator)
     {
         _cic = cic;
 
         _caches = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
             .Where(s => s.WasCreatedBy(new QueryCachingPatcher())).ToArray();
 
-        if(!_caches.Any())
+        if (!_caches.Any())
             SetImpossible("There are no Query Caching databases set up");
     }
 
     public override void Execute()
     {
         base.Execute();
-            
+
         if (SelectOne(_caches.ToList(), out var selected))
         {
             if (selected == null)
@@ -47,13 +48,9 @@ public override void Execute()
         }
     }
 
-    public override string GetCommandName()
-    {
-        return _cic.QueryCachingServer_ID == null ? "Set Query Cache":"Change Query Cache";
-    }
+    public override string GetCommandName() =>
+        _cic.QueryCachingServer_ID == null ? "Set Query Cache" : "Change Query Cache";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer,OverlayKind.Link);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Link);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetUserSetting.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetUserSetting.cs
index 48fb0fa2f0..1897cbc890 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetUserSetting.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSetUserSetting.cs
@@ -20,7 +20,6 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
 public class ExecuteCommandSetUserSetting : BasicCommandExecution
 {
-        
     private readonly PropertyInfo _property;
     private ErrorCode _errorCode;
     private CheckResult _errorCodeValue;
@@ -29,7 +28,7 @@ public class ExecuteCommandSetUserSetting : BasicCommandExecution
     /// The new value chosen by the user during command execution
     /// </summary>
     public object NewValue { get; private set; }
-        
+
     /// <summary>
     /// True if the command was successfully completed 
     /// </summary>
@@ -37,21 +36,22 @@ public class ExecuteCommandSetUserSetting : BasicCommandExecution
 
     [UseWithObjectConstructor]
     public ExecuteCommandSetUserSetting(IBasicActivateItems activator,
-            
         [DemandsInitialization("Name of a property you want to change e.g. AllowIdentifiableExtractions")]
-        string property, 
-        [DemandsInitialization("New value to assign, this will be parsed into a valid Type if property is not a string")]
+        string property,
+        [DemandsInitialization(
+            "New value to assign, this will be parsed into a valid Type if property is not a string")]
         string value) : base(activator)
     {
         // if user is calling to set an error code e.g. 'rdmp SetUserSetting R001 Success'
         var isCode = ErrorCodes.KnownCodes.FirstOrDefault(e => e.Code.Equals(property));
 
-        if(isCode != null)
+        if (isCode != null)
         {
             _errorCode = isCode;
-            if(!Enum.TryParse<CheckResult>(value,out var result))
+            if (!Enum.TryParse<CheckResult>(value, out var result))
             {
-                SetImpossible($"Invalid enum value.  When setting an error code you must supply a value of one of :{string.Join(',', Enum.GetNames<CheckResult>())}");
+                SetImpossible(
+                    $"Invalid enum value.  When setting an error code you must supply a value of one of :{string.Join(',', Enum.GetNames<CheckResult>())}");
             }
             else
             {
@@ -64,13 +64,16 @@ public ExecuteCommandSetUserSetting(IBasicActivateItems activator,
 
         _property = typeof(UserSettings).GetProperty(property, BindingFlags.Public | BindingFlags.Static);
 
-        if(_property == null)
+        if (_property == null)
         {
             SetImpossible($"Unknown Property '{property}'");
 
             //suggest similar sounding properties
             var suggestions =
-                typeof(UserSettings).GetProperties(BindingFlags.Public | BindingFlags.Static).Where(c => CultureInfo.CurrentCulture.CompareInfo.IndexOf(c.Name,property, CompareOptions.IgnoreCase) >= 0).ToArray();
+                typeof(UserSettings).GetProperties(BindingFlags.Public | BindingFlags.Static).Where(c =>
+                        CultureInfo.CurrentCulture.CompareInfo.IndexOf(c.Name, property, CompareOptions.IgnoreCase) >=
+                        0)
+                    .ToArray();
 
             if (suggestions.Any())
             {
@@ -84,33 +87,31 @@ public ExecuteCommandSetUserSetting(IBasicActivateItems activator,
         }
         else
         {
-            var picker = new CommandLineObjectPicker(new string[]{value ?? "NULL"},activator);
+            var picker = new CommandLineObjectPicker(new string[] { value ?? "NULL" }, activator);
 
-            if(!picker.HasArgumentOfType(0,_property.PropertyType))
-            {
+            if (!picker.HasArgumentOfType(0, _property.PropertyType))
                 SetImpossible($"Provided value could not be converted to '{_property.PropertyType}'");
-            }
             else
                 NewValue = picker[0].GetValueForParameterOfType(_property.PropertyType);
         }
     }
 
-        
+
     public override void Execute()
     {
         base.Execute();
 
-        if(_errorCode != null)
+        if (_errorCode != null)
         {
             UserSettings.SetErrorReportingLevelFor(_errorCode, _errorCodeValue);
             Success = true;
             return;
         }
 
-        if(_property == null)
+        if (_property == null)
             return;
-                        
-        ShareManager.SetValue(_property,NewValue,null);
+
+        ShareManager.SetValue(_property, NewValue, null);
         Success = true;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShow.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShow.cs
index f506380652..0b9b4840ca 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShow.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShow.cs
@@ -18,10 +18,12 @@ namespace Rdmp.Core.CommandExecution.AtomicCommands;
 public class ExecuteCommandShow : BasicCommandExecution, IAtomicCommand
 {
     private IMapsDirectlyToDatabaseTable _objectToShow;
+
     /// <summary>
     /// Alternative to <see cref="_objectToShow"/> where there might be many objects and it could be expensive to fetch them so only do so when command is executed
     /// </summary>
     private Func<IEnumerable<IMapsDirectlyToDatabaseTable>> _getObjectsFunc;
+
     private IMapsDirectlyToDatabaseTable[] _objectsToPickFrom;
 
 
@@ -29,7 +31,8 @@ public class ExecuteCommandShow : BasicCommandExecution, IAtomicCommand
     public bool UseIconAndTypeName;
     private Type _objectType;
 
-    public ExecuteCommandShow(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable objectToShow, int expansionDepth, bool useIconAndTypeName = false) : base(activator)
+    public ExecuteCommandShow(IBasicActivateItems activator, IMapsDirectlyToDatabaseTable objectToShow,
+        int expansionDepth, bool useIconAndTypeName = false) : base(activator)
     {
         _objectToShow = objectToShow;
         _objectType = _objectToShow?.GetType();
@@ -43,7 +46,9 @@ public ExecuteCommandShow(IBasicActivateItems activator, IMapsDirectlyToDatabase
     }
 
 
-    public ExecuteCommandShow(IBasicActivateItems activator, IEnumerable<IMapsDirectlyToDatabaseTable> objectsToPickFrom, int expansionDepth, bool useIconAndTypeName = false) : base(activator)
+    public ExecuteCommandShow(IBasicActivateItems activator,
+        IEnumerable<IMapsDirectlyToDatabaseTable> objectsToPickFrom, int expansionDepth,
+        bool useIconAndTypeName = false) : base(activator)
     {
         if (objectsToPickFrom == null)
         {
@@ -55,9 +60,10 @@ public ExecuteCommandShow(IBasicActivateItems activator, IEnumerable<IMapsDirect
 
         //no objects!
         if (obs.Length == 0)
+        {
             SetImpossible("No objects found");
-        else
-        if (obs.Length == 1)
+        }
+        else if (obs.Length == 1)
         {
             //one object only
             _objectToShow = objectsToPickFrom.Single();
@@ -81,21 +87,24 @@ public ExecuteCommandShow(IBasicActivateItems activator, IEnumerable<IMapsDirect
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="getObjectsFunc"></param>
-    public ExecuteCommandShow(IBasicActivateItems activator, Func<IEnumerable<IMapsDirectlyToDatabaseTable>> getObjectsFunc) : base(activator)
+    public ExecuteCommandShow(IBasicActivateItems activator,
+        Func<IEnumerable<IMapsDirectlyToDatabaseTable>> getObjectsFunc) : base(activator)
     {
         _getObjectsFunc = getObjectsFunc;
 
         Weight = 50.3f;
     }
 
-    public ExecuteCommandShow(IBasicActivateItems activator, int? foreignKey, Type typeToFetch):base(activator)
+    public ExecuteCommandShow(IBasicActivateItems activator, int? foreignKey, Type typeToFetch) : base(activator)
     {
-        if(!foreignKey.HasValue)
+        if (!foreignKey.HasValue)
             SetImpossible("No object exists");
 
-        _getObjectsFunc = ()=> foreignKey.HasValue ?
-            new IMapsDirectlyToDatabaseTable[]{activator.RepositoryLocator.GetObjectByID(typeToFetch,foreignKey.Value) } :
-            Array.Empty<IMapsDirectlyToDatabaseTable>();
+        _getObjectsFunc = () =>
+            foreignKey.HasValue
+                ? new IMapsDirectlyToDatabaseTable[]
+                    { activator.RepositoryLocator.GetObjectByID(typeToFetch, foreignKey.Value) }
+                : Array.Empty<IMapsDirectlyToDatabaseTable>();
 
         OverrideCommandName = $"{typeToFetch.Name}(s)";
 
@@ -124,7 +133,8 @@ public override void Execute()
             if (show == null)
                 return;
         }
-        BasicActivator.RequestItemEmphasis(this,new EmphasiseRequest(show, _expansionDepth));
+
+        BasicActivator.RequestItemEmphasis(this, new EmphasiseRequest(show, _expansionDepth));
     }
 
     /// <summary>
@@ -133,7 +143,7 @@ public override void Execute()
     public void FetchDestinationObjects()
     {
         // If we have a lazy func to call when only on command execution, nows the time
-        if(_getObjectsFunc != null && _objectsToPickFrom == null)
+        if (_getObjectsFunc != null && _objectsToPickFrom == null)
         {
             var pick = _getObjectsFunc()?.ToArray() ?? Array.Empty<IMapsDirectlyToDatabaseTable>();
 
@@ -142,7 +152,7 @@ public void FetchDestinationObjects()
                 // base.Execute() will throw since the late load of objects returned nothing
                 SetImpossible("No objects found");
             }
-            else if(pick.Length == 1)
+            else if (pick.Length == 1)
             {
                 _objectToShow = pick[0];
             }
@@ -152,24 +162,22 @@ public void FetchDestinationObjects()
                 _objectType = _objectsToPickFrom.First().GetType();
             }
         }
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Opens the containing toolbox collection and shows the object";
-    }
+    public override string GetCommandHelp() => "Opens the containing toolbox collection and shows the object";
 
     public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     {
         if (OverrideIcon != null)
             return base.GetImage(iconProvider);
 
-        return UseIconAndTypeName && 
+        return UseIconAndTypeName &&
                // if there is something to show
-               (_objectType != null || _objectToShow != null) ?
+               (_objectType != null || _objectToShow != null)
+            ?
             // return its icon
-            iconProvider.GetImage((object)_objectToShow ?? _objectType) : null;
+            iconProvider.GetImage((object)_objectToShow ?? _objectType)
+            : null;
     }
 
     /// <summary>
@@ -180,6 +188,6 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     public IEnumerable<IMapsDirectlyToDatabaseTable> GetObjects()
     {
         FetchDestinationObjects();
-        return new[] {_objectToShow} ?? _objectsToPickFrom ?? Enumerable.Empty<IMapsDirectlyToDatabaseTable>();
+        return new[] { _objectToShow } ?? _objectsToPickFrom ?? Enumerable.Empty<IMapsDirectlyToDatabaseTable>();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShowRelatedObject.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShowRelatedObject.cs
index 80118e59a1..5f82091b85 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShowRelatedObject.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandShowRelatedObject.cs
@@ -17,17 +17,16 @@ public class ExecuteCommandShowRelatedObject : BasicCommandExecution
 {
     private DatabaseEntity _toShow;
 
-    public ExecuteCommandShowRelatedObject(IBasicActivateItems activator, ReferenceOtherObjectDatabaseEntity node) : base(activator)
+    public ExecuteCommandShowRelatedObject(IBasicActivateItems activator, ReferenceOtherObjectDatabaseEntity node) :
+        base(activator)
     {
         _toShow = (DatabaseEntity)node.GetReferencedObject(BasicActivator.RepositoryLocator);
         if (_toShow == null)
             SetImpossible("Reference is an orphan");
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AllObjectSharingNode);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AllObjectSharingNode);
 
     public override void Execute()
     {
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSimilar.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSimilar.cs
index f43e617eab..ca3caad6d5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSimilar.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSimilar.cs
@@ -27,15 +27,19 @@ public class ExecuteCommandSimilar : BasicCommandExecution
     /// <see cref="Include(IMapsDirectlyToDatabaseTable)"/>
     /// </summary>
     private readonly Type[] _diffSupportedTypes = { typeof(ColumnInfo) };
+
     private ReadOnlyCollection<IMapsDirectlyToDatabaseTable> _matched;
+
     /// <summary>
     /// The objects matched by the command (similar or different objects)
     /// </summary>
-    public ReadOnlyCollection<IMapsDirectlyToDatabaseTable> Matched {
-        get {
+    public ReadOnlyCollection<IMapsDirectlyToDatabaseTable> Matched
+    {
+        get
+        {
             if (_matched == null)
                 FetchMatches();
-                
+
             return _matched;
         }
         set => _matched = value;
@@ -49,16 +53,15 @@ public ReadOnlyCollection<IMapsDirectlyToDatabaseTable> Matched {
     public ExecuteCommandSimilar(IBasicActivateItems activator,
         [DemandsInitialization("An object for which you want to find similar objects")]
         IMapsDirectlyToDatabaseTable to,
-        [DemandsInitialization("True to show only objects that are similar (e.g. same name) but different (e.g. different data type)")]
-        bool butDifferent):base(activator)
+        [DemandsInitialization(
+            "True to show only objects that are similar (e.g. same name) but different (e.g. different data type)")]
+        bool butDifferent) : base(activator)
     {
         _to = to;
         _butDifferent = butDifferent;
 
-        if(_butDifferent && !_diffSupportedTypes.Contains(_to.GetType()))
-        {
+        if (_butDifferent && !_diffSupportedTypes.Contains(_to.GetType()))
             SetImpossible($"Differencing is not supported on {_to.GetType().Name}");
-        }
 
         Weight = 50.3f;
     }
@@ -74,21 +77,18 @@ public override void Execute()
         }
 
         if (!BasicActivator.IsInteractive && GoTo)
-        {
-            throw new Exception($"GoTo property is true on {nameof(ExecuteCommandSimilar)} but activator is not interactive");
-        }
+            throw new Exception(
+                $"GoTo property is true on {nameof(ExecuteCommandSimilar)} but activator is not interactive");
 
-        if(GoTo)
+        if (GoTo)
         {
             var selected = BasicActivator.SelectOne("Similar Objects", Matched.ToArray(), null, true);
-            if(selected != null)
-            {
-                Emphasise(selected);
-            }
+            if (selected != null) Emphasise(selected);
         }
         else
         {
-            BasicActivator.Show(string.Join(Environment.NewLine, Matched.ToArray().Select(ExecuteCommandDescribe.Describe)));
+            BasicActivator.Show(string.Join(Environment.NewLine,
+                Matched.ToArray().Select(ExecuteCommandDescribe.Describe)));
         }
     }
 
@@ -100,11 +100,9 @@ public void FetchMatches()
             Matched = others.Where(IsSimilar).Where(Include).ToList().AsReadOnly();
 
             if (Matched.Count == 0)
-            {
                 SetImpossible(_butDifferent
                     ? "There are no alternate column specifications of this column"
                     : "There are no Similar objects");
-            }
         }
         catch (Exception ex)
         {
@@ -112,20 +110,15 @@ public void FetchMatches()
         }
     }
 
-    public override string GetCommandHelp()
-    {
-        return _butDifferent
+    public override string GetCommandHelp() =>
+        _butDifferent
             ? "Find objects with the same name but different implementation (e.g. different column data type)"
             : "Find other objects with the same or similar name to this";
-    }
 
     private bool IsSimilar(IMapsDirectlyToDatabaseTable other)
     {
         // objects are not similar to themselves!
-        if (Equals(_to, other))
-        {
-            return false;
-        }
+        if (Equals(_to, other)) return false;
 
         return _to switch
         {
@@ -146,29 +139,23 @@ private static bool SimilarWord(string name1, string name2, StringComparison com
             return false;
 
         return string.Equals(
-            name1[Math.Max(0,name1.LastIndexOf('.'))..].Trim(trimChars),
-            name2[Math.Max(0,name2.LastIndexOf('.'))..].Trim(trimChars),
+            name1[Math.Max(0, name1.LastIndexOf('.'))..].Trim(trimChars),
+            name2[Math.Max(0, name2.LastIndexOf('.'))..].Trim(trimChars),
             comparisonType);
     }
 
     private bool Include(IMapsDirectlyToDatabaseTable arg)
     {
         // if we don't care that they are different then return true
-        if (!_butDifferent)
-        {
-            return true;
-        }
+        if (!_butDifferent) return true;
 
         // or they are different
-        if(_to is ColumnInfo col && arg is ColumnInfo otherCol)
-        {
-            return 
+        if (_to is ColumnInfo col && arg is ColumnInfo otherCol)
+            return
                 !string.Equals(col.Data_type, otherCol.Data_type) || !string.Equals(col.Collation, otherCol.Collation);
-        }
 
         // WHEN ADDING NEW TYPES add the Type to _diffSupportedTypes
 
         return false;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSyncTableInfo.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSyncTableInfo.cs
index 3e23d538bc..9fde8afead 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSyncTableInfo.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandSyncTableInfo.cs
@@ -30,32 +30,29 @@ public class ExecuteCommandSyncTableInfo : BasicCommandExecution
     public ExecuteCommandSyncTableInfo(IBasicActivateItems activator,
         [DemandsInitialization("The RDMP metadata object to synchronize with the underlying database state")]
         ITableInfo table,
-        [DemandsInitialization("True to also synchronize any ANOTables (anonymisation tables) associated with the TableInfo")]
+        [DemandsInitialization(
+            "True to also synchronize any ANOTables (anonymisation tables) associated with the TableInfo")]
         bool alsoSyncAno,
         [DemandsInitialization("True to accept all changes without prompting")]
-        bool autoYes):base(activator)
+        bool autoYes) : base(activator)
     {
         _tableInfo = table;
         _alsoSyncAno = alsoSyncAno;
         _autoYes = autoYes;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.Sync);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.Sync);
 
-    public override string GetCommandName()
-    {
-        return _alsoSyncAno ? "Sync TableInfo and ANO Configuration" : "Sync TableInfo";
-    }
+    public override string GetCommandName() => _alsoSyncAno ? "Sync TableInfo and ANO Configuration" : "Sync TableInfo";
 
     public override void Execute()
     {
         base.Execute();
 
         var syncher = new TableInfoSynchronizer(_tableInfo);
-        var listener = _autoYes ? new AcceptAllCheckNotifier() :(ICheckNotifier) new FromActivateItemsToCheckNotifier(BasicActivator);
+        var listener = _autoYes
+            ? new AcceptAllCheckNotifier()
+            : (ICheckNotifier)new FromActivateItemsToCheckNotifier(BasicActivator);
 
         try
         {
@@ -67,10 +64,10 @@ public override void Execute()
         }
         catch (Exception exception)
         {
-            BasicActivator.ShowException("Failed to sync",exception);
+            BasicActivator.ShowException("Failed to sync", exception);
         }
 
-        if(_alsoSyncAno)
+        if (_alsoSyncAno)
         {
             var ANOSynchronizer = new ANOTableInfoSynchronizer(_tableInfo);
 
@@ -82,11 +79,12 @@ public override void Execute()
             }
             catch (ANOConfigurationException e)
             {
-                BasicActivator.ShowException("Anonymisation configuration error",e);
+                BasicActivator.ShowException("Anonymisation configuration error", e);
             }
             catch (Exception exception)
             {
-                BasicActivator.ShowException($"Fatal error while attempting to synchronize ({exception.Message})", exception);
+                BasicActivator.ShowException($"Fatal error while attempting to synchronize ({exception.Message})",
+                    exception);
             }
         }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs
index 0704db5f98..4989453475 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnMergeCohortIdentificationConfiguration.cs
@@ -17,12 +17,15 @@ public class ExecuteCommandUnMergeCohortIdentificationConfiguration : BasicComma
     private readonly CohortAggregateContainer _target;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandUnMergeCohortIdentificationConfiguration(IBasicActivateItems activator, CohortIdentificationConfiguration cic) :
-        this(activator,cic?.RootCohortAggregateContainer)
+    public ExecuteCommandUnMergeCohortIdentificationConfiguration(IBasicActivateItems activator,
+        CohortIdentificationConfiguration cic) :
+        this(activator, cic?.RootCohortAggregateContainer)
     {
         Weight = 0.3f;
     }
-    public ExecuteCommandUnMergeCohortIdentificationConfiguration(IBasicActivateItems activator,CohortAggregateContainer container): base(activator)
+
+    public ExecuteCommandUnMergeCohortIdentificationConfiguration(IBasicActivateItems activator,
+        CohortAggregateContainer container) : base(activator)
     {
         _target = container;
 
@@ -33,21 +36,21 @@ public ExecuteCommandUnMergeCohortIdentificationConfiguration(IBasicActivateItem
             SetImpossible("No root container");
             return;
         }
-            
-        if(!_target.IsRootContainer())
-        { 
+
+        if (!_target.IsRootContainer())
+        {
             SetImpossible("Only root containers can be unmerged");
             return;
         }
 
-        if(_target.GetAggregateConfigurations().Any())
-        { 
+        if (_target.GetAggregateConfigurations().Any())
+        {
             SetImpossible("Container must contain only subcontainers (i.e. no aggregate sets)");
             return;
         }
 
-        if(_target.GetSubContainers().Length <= 1)
-        { 
+        if (_target.GetSubContainers().Length <= 1)
+        {
             SetImpossible("Container must have 2 or more immediate subcontainers for unmerging");
             return;
         }
@@ -57,17 +60,18 @@ public override void Execute()
     {
         base.Execute();
 
-        if(!BasicActivator.Confirm("Generate new Cohort Identification Configurations for each container?", "Confirm UnMerge"))
-        {
-            return;
-        }
+        if (!BasicActivator.Confirm("Generate new Cohort Identification Configurations for each container?",
+                "Confirm UnMerge")) return;
 
-        var merger = new CohortIdentificationConfigurationMerger((CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
+        var merger =
+            new CohortIdentificationConfigurationMerger(
+                (CatalogueRepository)BasicActivator.RepositoryLocator.CatalogueRepository);
         var results = merger.UnMerge(_target);
 
-        if(results != null && results.Any())
+        if (results != null && results.Any())
         {
-            BasicActivator.Show($"Created {results.Length} new configurations:{Environment.NewLine} {string.Join(Environment.NewLine,results.Select(r=>r.Name))}");
+            BasicActivator.Show(
+                $"Created {results.Length} new configurations:{Environment.NewLine} {string.Join(Environment.NewLine, results.Select(r => r.Name))}");
             Publish(results.First());
             Emphasise(results.First());
         }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnfreezeExtractionConfiguration.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnfreezeExtractionConfiguration.cs
index e84a1dc1d7..335ab5db21 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnfreezeExtractionConfiguration.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUnfreezeExtractionConfiguration.cs
@@ -12,36 +12,35 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandUnfreezeExtractionConfiguration:BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandUnfreezeExtractionConfiguration : BasicCommandExecution, IAtomicCommand
 {
     private readonly ExtractionConfiguration _configuration;
 
-    public ExecuteCommandUnfreezeExtractionConfiguration(IBasicActivateItems activator, ExtractionConfiguration configuration):base(activator)
+    public ExecuteCommandUnfreezeExtractionConfiguration(IBasicActivateItems activator,
+        ExtractionConfiguration configuration) : base(activator)
     {
         _configuration = configuration;
 
-        if(!_configuration.IsReleased)
+        if (!_configuration.IsReleased)
             SetImpossible("Extraction Configuration is not Frozen");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Reopens a released extraction configuration and deletes all record of it ever having been released";
-    }
+    public override string GetCommandHelp() =>
+        "Reopens a released extraction configuration and deletes all record of it ever having been released";
 
     public override void Execute()
     {
         base.Execute();
 
-        if(YesNo("This will mean deleting the Release Audit for the Configuration making it appear like it was never released in the first place.  If you just want to execute the Configuration again you can Clone it instead if you want.  Are you sure you want to Unfreeze?","Confirm Unfreeze"))
+        if (YesNo(
+                "This will mean deleting the Release Audit for the Configuration making it appear like it was never released in the first place.  If you just want to execute the Configuration again you can Clone it instead if you want.  Are you sure you want to Unfreeze?",
+                "Confirm Unfreeze"))
         {
             _configuration.Unfreeze();
             Publish(_configuration);
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.UnfreezeExtractionConfiguration);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.UnfreezeExtractionConfiguration);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUseCredentialsToAccessTableInfoData.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUseCredentialsToAccessTableInfoData.cs
index e253580c4b..6f5248d8ef 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUseCredentialsToAccessTableInfoData.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandUseCredentialsToAccessTableInfoData.cs
@@ -23,19 +23,19 @@ public ExecuteCommandUseCredentialsToAccessTableInfoData(IBasicActivateItems act
         _credentials = credentials;
 
         _tableInfo = targetTableInfo;
-            
-        if(_credentials == null)
+
+        if (_credentials == null)
         {
             _available = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<DataAccessCredentials>();
 
-            if(_available.Length == 0)
+            if (_available.Length == 0)
                 SetImpossible("There are no credentials configured");
         }
         else
         {
             var usage = _credentials.GetAllTableInfosThatUseThis();
-                
-            if(usage[DataAccessContext.Any].Contains(targetTableInfo))
+
+            if (usage[DataAccessContext.Any].Contains(targetTableInfo))
                 SetImpossible($"{_credentials} is already used to access {targetTableInfo} under Any context");
         }
     }
@@ -44,12 +44,13 @@ public override void Execute()
     {
         base.Execute();
 
-        var creds = _credentials ?? (DataAccessCredentials)BasicActivator.SelectOne("Select Credentials",_available);
+        var creds = _credentials ?? (DataAccessCredentials)BasicActivator.SelectOne("Select Credentials", _available);
 
-        if(creds == null)
+        if (creds == null)
             return;
 
-        BasicActivator.RepositoryLocator.CatalogueRepository.TableInfoCredentialsManager.CreateLinkBetween(creds,_tableInfo,DataAccessContext.Any);
+        BasicActivator.RepositoryLocator.CatalogueRepository.TableInfoCredentialsManager.CreateLinkBetween(creds,
+            _tableInfo, DataAccessContext.Any);
         Publish(_tableInfo);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewData.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewData.cs
index 7c9d15f447..6981057ed6 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewData.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewData.cs
@@ -40,11 +40,14 @@ public class ExecuteCommandViewData : ExecuteCommandViewDataBase, IAtomicCommand
     public ExecuteCommandViewData(IBasicActivateItems activator,
         [DemandsInitialization("The object (ColumnInfo, TableInfo etc) you want to view a sample of")]
         IMapsDirectlyToDatabaseTable obj,
-        [DemandsInitialization("Optional. The view mode you want to see.  Options include 'TOP_100', 'Aggregate', 'Distribution' or 'All'",DefaultValue = ViewType.TOP_100)]
+        [DemandsInitialization(
+            "Optional. The view mode you want to see.  Options include 'TOP_100', 'Aggregate', 'Distribution' or 'All'",
+            DefaultValue = ViewType.TOP_100)]
         ViewType viewType = ViewType.TOP_100,
         [DemandsInitialization(ToFileDescription)]
         FileInfo toFile = null,
-        [DemandsInitialization("Applies only to CohortIdentificationConfigurations.  Defaults to true.  Set to false to disable query cache use.")]
+        [DemandsInitialization(
+            "Applies only to CohortIdentificationConfigurations.  Defaults to true.  Set to false to disable query cache use.")]
         bool useCache = true) : base(activator, toFile)
     {
         _viewType = viewType;
@@ -85,8 +88,9 @@ public ExecuteCommandViewData(IBasicActivateItems activator,
             _collection = CreateCollection(ac);
         }
         else
+        {
             throw new ArgumentException($"Object '{obj}' was not an object type compatible with this command");
-
+        }
     }
 
     private IViewSQLAndResultsCollection CreateCollection(AggregateConfiguration ac)
@@ -97,31 +101,26 @@ private IViewSQLAndResultsCollection CreateCollection(AggregateConfiguration ac)
 
         //if it has a cic with a query cache AND it uses joinables.  Since this is a TOP 100 select * from dataset the cache on CHI is useless only patient index tables used by this query are useful if cached
         if (cic != null && cic.QueryCachingServer_ID != null && ac.PatientIndexJoinablesUsed.Any())
-        {
             collection.UseQueryCache = _useCache;
-        }
 
         collection.TopX = _viewType == ViewType.TOP_100 ? 100 : null;
 
         return collection;
     }
 
-    private IViewSQLAndResultsCollection CreateCollection(ExtractableCohort ec)
-    {
-
-        return new ViewCohortExtractionUICollection(ec)
+    private IViewSQLAndResultsCollection CreateCollection(ExtractableCohort ec) =>
+        new ViewCohortExtractionUICollection(ec)
         {
             Top = _viewType == ViewType.TOP_100 ? 100 : -1,
             IncludeCohortID = false
         };
-    }
 
     private IViewSQLAndResultsCollection CreateCollection(CohortIdentificationConfiguration cic)
     {
         if (_viewType == ViewType.TOP_100)
-        {
-            LogManager.GetCurrentClassLogger().Warn($"'{ViewType.TOP_100}' is not supported on '{nameof(CohortIdentificationConfiguration)}', '{ViewType.All}' will be used");
-        }
+            LogManager.GetCurrentClassLogger()
+                .Warn(
+                    $"'{ViewType.TOP_100}' is not supported on '{nameof(CohortIdentificationConfiguration)}', '{ViewType.All}' will be used");
 
         return new ViewCohortIdentificationConfigurationSqlCollection(cic)
         {
@@ -132,18 +131,15 @@ private IViewSQLAndResultsCollection CreateCollection(CohortIdentificationConfig
     private void ThrowIfNotSimpleSelectViewType()
     {
         if (_viewType != ViewType.TOP_100 && _viewType != ViewType.All)
-        {
-            throw new ArgumentException($"Only '{nameof(ViewType.TOP_100)}' or '{nameof(ViewType.All)}' can be used for this object Type");
-        }
+            throw new ArgumentException(
+                $"Only '{nameof(ViewType.TOP_100)}' or '{nameof(ViewType.All)}' can be used for this object Type");
     }
 
-    private IViewSQLAndResultsCollection CreateCollection(Catalogue cata)
-    {
-        return new ViewCatalogueDataCollection(cata)
+    private IViewSQLAndResultsCollection CreateCollection(Catalogue cata) =>
+        new ViewCatalogueDataCollection(cata)
         {
             TopX = _viewType == ViewType.All ? null : 100
         };
-    }
 
     /// <summary>
     /// Fetches the <paramref name="viewType"/> of the data in <see cref="ColumnInfo"/> <paramref name="c"/>
@@ -151,13 +147,15 @@ private IViewSQLAndResultsCollection CreateCollection(Catalogue cata)
     /// <param name="activator"></param>
     /// <param name="viewType"></param>
     /// <param name="c"></param>
-    public ExecuteCommandViewData(IBasicActivateItems activator, ViewType viewType, ColumnInfo c) : base(activator, null)
+    public ExecuteCommandViewData(IBasicActivateItems activator, ViewType viewType, ColumnInfo c) : base(activator,
+        null)
     {
         _viewType = viewType;
         _collection = CreateCollection(c);
     }
 
-    public ExecuteCommandViewData(IBasicActivateItems activator, ViewType viewType, ExtractionInformation ei) : base(activator, null)
+    public ExecuteCommandViewData(IBasicActivateItems activator, ViewType viewType, ExtractionInformation ei) : base(
+        activator, null)
     {
         _viewType = viewType;
         _collection = CreateCollection(ei);
@@ -173,6 +171,7 @@ public ExecuteCommandViewData(IBasicActivateItems activator, TableInfo tableInfo
         _viewType = ViewType.TOP_100;
         _collection = new ViewTableInfoExtractUICollection(tableInfo, _viewType);
     }
+
     #endregion
 
     private IViewSQLAndResultsCollection CreateCollection(ColumnInfo c)
@@ -201,17 +200,10 @@ public override string GetCommandName()
             return OverrideCommandName;
 
         if (_obj is CohortIdentificationConfiguration)
-        {
-            return _useCache ?
-                "Query Builder SQL/Results" :
-                "Query Builder SQL/Results (No Cache)";
-
-        }
+            return _useCache ? "Query Builder SQL/Results" : "Query Builder SQL/Results (No Cache)";
 
         return $"View {_viewType.ToString().Replace("_", " ")}";
     }
-    protected override IViewSQLAndResultsCollection GetCollection()
-    {
-        return _collection;
-    }
+
+    protected override IViewSQLAndResultsCollection GetCollection() => _collection;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewDataBase.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewDataBase.cs
index 3ef41cae8d..31daf522c7 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewDataBase.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewDataBase.cs
@@ -53,19 +53,13 @@ public override void Execute()
         {
             toFile = BasicActivator.SelectFile("Save as", "Comma Separated Values", "*.csv");
             if (toFile == null)
-            {
                 // user cancelled selecting a file
                 return;
-            }
         }
 
         if (toFile != null)
-        {
             ExtractTableVerbatim.ExtractDataToFile(collection, toFile);
-        }
         else
-        {
             BasicActivator.ShowData(collection);
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewExtractionSql.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewExtractionSql.cs
index 921efe0bad..3a18710464 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewExtractionSql.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewExtractionSql.cs
@@ -27,13 +27,10 @@ public class ExecuteCommandViewExtractionSql : ExecuteCommandViewDataBase, IAtom
 
     [UseWithObjectConstructor]
     public ExecuteCommandViewExtractionSql(IBasicActivateItems activator,
-
         [DemandsInitialization("The extraction configuration you want to know about")]
         ExtractionConfiguration ec,
-
         [DemandsInitialization("The dataset for whom you want to see the extraction SQL")]
         Catalogue c,
-
         [DemandsInitialization(ToFileDescription)]
         FileInfo toFile = null) : base(activator, toFile)
     {
@@ -41,10 +38,7 @@ public ExecuteCommandViewExtractionSql(IBasicActivateItems activator,
 
         _selectedDataSet = ec.SelectedDataSets.FirstOrDefault(sds => sds.GetCatalogue().Equals(c));
 
-        if (_selectedDataSet == null)
-        {
-            SetImpossible($"Catalogue '{c}' is not listed as a selected dataset in '{ec}'");
-        }
+        if (_selectedDataSet == null) SetImpossible($"Catalogue '{c}' is not listed as a selected dataset in '{ec}'");
     }
 
     public ExecuteCommandViewExtractionSql(IBasicActivateItems activator,
@@ -61,19 +55,16 @@ public ExecuteCommandViewExtractionSql(IBasicActivateItems activator,
         _extractionConfiguration = sds.ExtractionConfiguration;
         _selectedDataSet = sds;
     }
+
     public ExecuteCommandViewExtractionSql(IBasicActivateItems activator) : base(activator, null)
     {
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Shows the SQL that will be executed for the given dataset when it is extracted including the linkage with the cohort table";
-    }
+    public override string GetCommandHelp() =>
+        "Shows the SQL that will be executed for the given dataset when it is extracted including the linkage with the cohort table";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Execute);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Execute);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -98,7 +89,9 @@ protected override IViewSQLAndResultsCollection GetCollection()
         var sds = _selectedDataSet;
 
         if (sds == null && _extractionConfiguration != null)
-            sds = SelectOne(BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjectsWithParent<SelectedDataSets>(_extractionConfiguration));
+            sds = SelectOne(
+                BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjectsWithParent<SelectedDataSets>(
+                    _extractionConfiguration));
 
         if (_selectedDataSet == null)
             return null;
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchData.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchData.cs
index 6e7180ccc9..80535e057b 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchData.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchData.cs
@@ -34,16 +34,13 @@ public class ExecuteCommandViewFilterMatchData : ExecuteCommandViewDataBase, IAt
     /// <param name="columnName"></param>
     /// <param name="toFile"></param>
     public ExecuteCommandViewFilterMatchData(IBasicActivateItems activator,
-
         [DemandsInitialization("The filter you want to view matching data on (e.g. an AggregateFilter)")]
         IFilter filter,
-
         [DemandsInitialization("What kind of data do you want to fetch")]
         ViewType viewType = ViewType.TOP_100,
-
-        [DemandsInitialization("If filter is not implicitly tied to a specific column, pass the name of the column for whom you want to view data.")]
+        [DemandsInitialization(
+            "If filter is not implicitly tied to a specific column, pass the name of the column for whom you want to view data.")]
         string columnName = null,
-
         [DemandsInitialization(ToFileDescription)]
         FileInfo toFile = null) : this(activator, viewType, toFile)
     {
@@ -55,11 +52,10 @@ public ExecuteCommandViewFilterMatchData(IBasicActivateItems activator,
             var candidates = GetCandidates(c);
 
             // match on exact name?
-            _columnInfo = candidates.FirstOrDefault(c => c.GetRuntimeName().Equals(columnName, StringComparison.CurrentCultureIgnoreCase));
+            _columnInfo = candidates.FirstOrDefault(c =>
+                c.GetRuntimeName().Equals(columnName, StringComparison.CurrentCultureIgnoreCase));
             if (_columnInfo == null)
-            {
                 throw new Exception($"Could not find a ColumnInfo called '{columnName}' in Catalogue '{c}'");
-            }
         }
         else
         {
@@ -73,7 +69,9 @@ public ExecuteCommandViewFilterMatchData(IBasicActivateItems activator,
         // there is no single column associated with the filter so get user to pick one of them
         PopulateCandidates(filter.GetCatalogue(), filter);
     }
-    public ExecuteCommandViewFilterMatchData(IBasicActivateItems activator, IContainer container, ViewType viewType = ViewType.TOP_100) : this(activator, viewType, null)
+
+    public ExecuteCommandViewFilterMatchData(IBasicActivateItems activator, IContainer container,
+        ViewType viewType = ViewType.TOP_100) : this(activator, viewType, null)
     {
         _container = container;
 
@@ -96,10 +94,12 @@ private ColumnInfo[] GetCandidates(Catalogue catalogue)
             return null;
         }
 
-        return catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Select(e => e.ColumnInfo).Where(c => c != null).Distinct().ToArray();
+        return catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Select(e => e.ColumnInfo)
+            .Where(c => c != null).Distinct().ToArray();
     }
 
-    protected ExecuteCommandViewFilterMatchData(IBasicActivateItems activator, ViewType viewType, FileInfo toFile) : base(activator, toFile)
+    protected ExecuteCommandViewFilterMatchData(IBasicActivateItems activator, ViewType viewType, FileInfo toFile) :
+        base(activator, toFile)
     {
         _viewType = viewType;
     }
@@ -116,9 +116,9 @@ public override string GetCommandName()
                 throw new ArgumentOutOfRangeException();
         }
     }
+
     protected override IViewSQLAndResultsCollection GetCollection()
     {
-
         _columnInfo ??= SelectOne(_candidates, _columnInfo != null ? _columnInfo.Name : "");
 
         if (_columnInfo == null)
@@ -136,8 +136,7 @@ protected override IViewSQLAndResultsCollection GetCollection()
 
         return collection;
     }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ColumnInfo, OverlayKind.Filter);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ColumnInfo, OverlayKind.Filter);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewLogs.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewLogs.cs
index 7c25fa9de9..bd0ab6105f 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewLogs.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecuteCommandViewLogs.cs
@@ -27,13 +27,13 @@ public class ExecuteCommandViewLogs : BasicCommandExecution, IAtomicCommand
     protected ExternalDatabaseServer[] _loggingServers;
 
     [UseWithCommandLine(
-        ParameterHelpList = "<root> <table?> <id?>", 
+        ParameterHelpList = "<root> <table?> <id?>",
         ParameterHelpBreakdown = @"root object to view logs for or logging server
 table? Only required if <root> is logging server, specifies the table to view e.g. DataLoadRun
 int? Optional, if <root> is logging server this can be a specific audit id to show")]
-    public ExecuteCommandViewLogs(IBasicActivateItems activator,CommandLineObjectPicker picker):base(activator)
+    public ExecuteCommandViewLogs(IBasicActivateItems activator, CommandLineObjectPicker picker) : base(activator)
     {
-        if(picker.Length == 0)
+        if (picker.Length == 0)
         {
             SetImpossible("Insufficient arguments supplied");
             return;
@@ -42,30 +42,25 @@ public ExecuteCommandViewLogs(IBasicActivateItems activator,CommandLineObjectPic
         if (picker[0].HasValueOfType(typeof(DatabaseEntity)))
         {
             var obj = picker[0].GetValueForParameterOfType(typeof(DatabaseEntity));
-                
-            if(obj is ILoggedActivityRootObject root)
-                RootObject =  root;
-            else
-            if(obj is ExternalDatabaseServer eds)
-                _loggingServers = new ExternalDatabaseServer[]{eds};
+
+            if (obj is ILoggedActivityRootObject root)
+                RootObject = root;
+            else if (obj is ExternalDatabaseServer eds)
+                _loggingServers = new ExternalDatabaseServer[] { eds };
             else
-            {
-                throw new Exception($"'{obj}' is of type '{obj.GetType().Name}' which is not '{nameof(ILoggedActivityRootObject)}' so cannot be used with this command.");
-            }
+                throw new Exception(
+                    $"'{obj}' is of type '{obj.GetType().Name}' which is not '{nameof(ILoggedActivityRootObject)}' so cannot be used with this command.");
         }
 
         var table = LoggingTables.None;
-            
-        if(picker.Length >= 1)
-            if(Enum.TryParse(picker[0].RawValue, out table))
+
+        if (picker.Length >= 1)
+            if (Enum.TryParse(picker[0].RawValue, out table))
                 _filter = new LogViewerFilter(table);
-            
-        if(picker.Length >= 2)
-            if(int.TryParse(picker[0].RawValue, out var id))
-            {
-                _filter = new LogViewerFilter(table,id);
-            }
 
+        if (picker.Length >= 2)
+            if (int.TryParse(picker[0].RawValue, out var id))
+                _filter = new LogViewerFilter(table, id);
     }
 
     [UseWithObjectConstructor]
@@ -74,62 +69,56 @@ public ExecuteCommandViewLogs(IBasicActivateItems activator, ILoggedActivityRoot
         RootObject = rootObject;
     }
 
-    public ExecuteCommandViewLogs(IBasicActivateItems activator) : this(activator,new LogViewerFilter(LoggingTables.DataLoadTask))
+    public ExecuteCommandViewLogs(IBasicActivateItems activator) : this(activator,
+        new LogViewerFilter(LoggingTables.DataLoadTask))
     {
-
     }
 
-    public ExecuteCommandViewLogs(IBasicActivateItems activator, ExternalDatabaseServer loggingServer,LogViewerFilter filter) : base(activator)
+    public ExecuteCommandViewLogs(IBasicActivateItems activator, ExternalDatabaseServer loggingServer,
+        LogViewerFilter filter) : base(activator)
     {
         _filter = filter ?? new LogViewerFilter(LoggingTables.DataLoadTask);
-        _loggingServers = new ExternalDatabaseServer[]{ loggingServer};
+        _loggingServers = new ExternalDatabaseServer[] { loggingServer };
     }
 
     public ExecuteCommandViewLogs(IBasicActivateItems activator, LogViewerFilter filter) : base(activator)
     {
         _filter = filter ?? new LogViewerFilter(LoggingTables.DataLoadTask);
-        _loggingServers = BasicActivator.RepositoryLocator.CatalogueRepository.GetAllDatabases<LoggingDatabasePatcher>();
+        _loggingServers =
+            BasicActivator.RepositoryLocator.CatalogueRepository.GetAllDatabases<LoggingDatabasePatcher>();
 
-        if(!_loggingServers.Any())
+        if (!_loggingServers.Any())
             SetImpossible("There are no logging servers");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "View the hierarchical audit log of all data flows through RDMP (data load, extraction, dqe runs etc) including progress, errors etc";
-    }
+    public override string GetCommandHelp() =>
+        "View the hierarchical audit log of all data flows through RDMP (data load, extraction, dqe runs etc) including progress, errors etc";
 
     public override void Execute()
     {
         base.Execute();
 
-            
-        if(RootObject != null)
+
+        if (RootObject != null)
         {
             BasicActivator.ShowLogs(RootObject);
         }
         else
         {
-            var server = SelectOne(_loggingServers,null,true);
-            BasicActivator.ShowLogs(server,_filter?? new LogViewerFilter(LoggingTables.DataLoadRun));
+            var server = SelectOne(_loggingServers, null, true);
+            BasicActivator.ShowLogs(server, _filter ?? new LogViewerFilter(LoggingTables.DataLoadRun));
         }
     }
 
     public override string GetCommandName()
     {
-        if(!string.IsNullOrWhiteSpace(OverrideCommandName))
-        {
-            return OverrideCommandName;
-        }
+        if (!string.IsNullOrWhiteSpace(OverrideCommandName)) return OverrideCommandName;
 
         return
-            _filter != null ? 
-                UsefulStuff.PascalCaseStringToHumanReadable(_filter.LoggingTable.ToString())
+            _filter != null
+                ? UsefulStuff.PascalCaseStringToHumanReadable(_filter.LoggingTable.ToString())
                 : base.GetCommandName();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Logging);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Logging);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/ExecutecommandAddCohortSubContainer.cs b/Rdmp.Core/CommandExecution/AtomicCommands/ExecutecommandAddCohortSubContainer.cs
index db43daa0fd..f91c78b658 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/ExecutecommandAddCohortSubContainer.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/ExecutecommandAddCohortSubContainer.cs
@@ -12,32 +12,29 @@
 
 namespace Rdmp.Core.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddCohortSubContainer : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandAddCohortSubContainer : BasicCommandExecution, IAtomicCommand
 {
     private CohortAggregateContainer _container;
-        
-    public ExecuteCommandAddCohortSubContainer(IBasicActivateItems activator, CohortAggregateContainer container):base(activator)
+
+    public ExecuteCommandAddCohortSubContainer(IBasicActivateItems activator, CohortAggregateContainer container) :
+        base(activator)
     {
         Weight = 0.12f;
 
         _container = container;
 
-        if (container.ShouldBeReadOnly(out var reason))
-        {
-            SetImpossible(reason);
-        }
+        if (container.ShouldBeReadOnly(out var reason)) SetImpossible(reason);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CohortAggregateContainer,OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CohortAggregateContainer, OverlayKind.Add);
 
     public override void Execute()
     {
         base.Execute();
 
-        var newContainer = new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION);
+        var newContainer =
+            new CohortAggregateContainer(BasicActivator.RepositoryLocator.CatalogueRepository, SetOperation.UNION);
         _container.AddChild(newContainer);
         Publish(_container);
         Emphasise(newContainer);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandExportInDublinCoreFormat.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandExportInDublinCoreFormat.cs
index f59aeb73da..170b910fc5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandExportInDublinCoreFormat.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandExportInDublinCoreFormat.cs
@@ -30,6 +30,8 @@ public override void Execute()
             return;
 
         using (var stream = File.OpenWrite(_toExport.FullName))
+        {
             _definition.WriteXml(stream);
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportCatalogueDescriptionsFromShare.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportCatalogueDescriptionsFromShare.cs
index d751b96952..f8d9e9ef44 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportCatalogueDescriptionsFromShare.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportCatalogueDescriptionsFromShare.cs
@@ -22,14 +22,17 @@ public class ExecuteCommandImportCatalogueDescriptionsFromShare : ExecuteCommand
 {
     private readonly Catalogue _targetCatalogue;
 
-    public ExecuteCommandImportCatalogueDescriptionsFromShare(IBasicActivateItems activator, FileCollectionCombineable sourceFileCollection, Catalogue targetCatalogue) : base(activator, sourceFileCollection)
+    public ExecuteCommandImportCatalogueDescriptionsFromShare(IBasicActivateItems activator,
+        FileCollectionCombineable sourceFileCollection, Catalogue targetCatalogue) : base(activator,
+        sourceFileCollection)
     {
         _targetCatalogue = targetCatalogue;
         UseTripleDotSuffix = true;
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandImportCatalogueDescriptionsFromShare(IBasicActivateItems activator, Catalogue targetCatalogue) : base(activator, null)
+    public ExecuteCommandImportCatalogueDescriptionsFromShare(IBasicActivateItems activator, Catalogue targetCatalogue)
+        : base(activator, null)
     {
         _targetCatalogue = targetCatalogue;
         UseTripleDotSuffix = true;
@@ -44,7 +47,8 @@ protected override void ExecuteImpl(ShareManager shareManager, List<ShareDefinit
 
         if (_targetCatalogue.Name != (string)first.Properties["Name"])
             if (!YesNo(
-                    $"Catalogue Name is '{_targetCatalogue.Name}' but ShareDefinition is for, '{first.Properties["Name"]}'.  Import Anyway?", "Import Anyway?"))
+                    $"Catalogue Name is '{_targetCatalogue.Name}' but ShareDefinition is for, '{first.Properties["Name"]}'.  Import Anyway?",
+                    "Import Anyway?"))
                 return;
 
         ShareManager.ImportPropertiesOnly(_targetCatalogue, first);
@@ -60,7 +64,9 @@ protected override void ExecuteImpl(ShareManager shareManager, List<ShareDefinit
 
             var shareName = (string)sd.Properties["Name"];
 
-            var existingMatch = liveCatalogueItems.FirstOrDefault(ci => ci.Name.Equals(shareName)) ?? new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository, _targetCatalogue, shareName);
+            var existingMatch = liveCatalogueItems.FirstOrDefault(ci => ci.Name.Equals(shareName)) ??
+                                new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository,
+                                    _targetCatalogue, shareName);
             ShareManager.ImportPropertiesOnly(existingMatch, sd);
             existingMatch.SaveToDatabase();
         }
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportDublinCoreFormat.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportDublinCoreFormat.cs
index 9b1c9a0e0a..0e81d812bf 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportDublinCoreFormat.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportDublinCoreFormat.cs
@@ -27,7 +27,8 @@ public override void Execute()
     {
         base.Execute();
 
-        if ((_toImport ??= BasicActivator.SelectFile("Enter Dublin Core Xml File Path:","Dublin Core Xml","*.xml")) == null)
+        if ((_toImport ??= BasicActivator.SelectFile("Enter Dublin Core Xml File Path:", "Dublin Core Xml", "*.xml")) ==
+            null)
             return;
 
         var dc = new DublinCoreDefinition();
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportFilterDescriptionsFromShare.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportFilterDescriptionsFromShare.cs
index bb3b3d7431..e1bd90bcc3 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportFilterDescriptionsFromShare.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportFilterDescriptionsFromShare.cs
@@ -21,16 +21,19 @@ public class ExecuteCommandImportFilterDescriptionsFromShare : ExecuteCommandImp
     private readonly IFilter _toPopulate;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandImportFilterDescriptionsFromShare(IBasicActivateItems activator, IFilter toPopulate, FileInfo file) 
-        : this(activator, toPopulate, new FileCollectionCombineable(new[] { file}))
+    public ExecuteCommandImportFilterDescriptionsFromShare(IBasicActivateItems activator, IFilter toPopulate,
+        FileInfo file)
+        : this(activator, toPopulate, new FileCollectionCombineable(new[] { file }))
     {
-
     }
-    public ExecuteCommandImportFilterDescriptionsFromShare(IBasicActivateItems activator, IFilter toPopulate, FileCollectionCombineable cmd = null) : base(activator, cmd)
+
+    public ExecuteCommandImportFilterDescriptionsFromShare(IBasicActivateItems activator, IFilter toPopulate,
+        FileCollectionCombineable cmd = null) : base(activator, cmd)
     {
         _toPopulate = toPopulate;
 
-        if (!string.IsNullOrWhiteSpace(_toPopulate.WhereSQL) || !string.IsNullOrWhiteSpace(_toPopulate.Description) || _toPopulate.GetAllParameters().Any())
+        if (!string.IsNullOrWhiteSpace(_toPopulate.WhereSQL) || !string.IsNullOrWhiteSpace(_toPopulate.Description) ||
+            _toPopulate.GetAllParameters().Any())
             SetImpossible("Filter is not empty (import requires a new blank filter)");
     }
 
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShare.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShare.cs
index aa65971903..6c279e39c5 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShare.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShare.cs
@@ -26,7 +26,8 @@ public abstract class ExecuteCommandImportShare : BasicCommandExecution, IAtomic
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="sourceFileCollection"></param>
-    protected ExecuteCommandImportShare(IBasicActivateItems activator, FileCollectionCombineable sourceFileCollection) : base(activator)
+    protected ExecuteCommandImportShare(IBasicActivateItems activator, FileCollectionCombineable sourceFileCollection) :
+        base(activator)
     {
         if (sourceFileCollection != null)
         {
@@ -37,17 +38,17 @@ protected ExecuteCommandImportShare(IBasicActivateItems activator, FileCollectio
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.page_white_get);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(FamFamFamIcons.page_white_get);
 
     public sealed override void Execute()
     {
         base.Execute();
 
         //ensure file selected
-        if ((_shareDefinitionFile ??= BasicActivator.SelectFile("Select share definition file to import","Share Definition","*.sd")) == null)
+        if ((_shareDefinitionFile ??=
+                BasicActivator.SelectFile("Select share definition file to import", "Share Definition", "*.sd")) ==
+            null)
             return;
 
         var json = File.ReadAllText(_shareDefinitionFile.FullName);
diff --git a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShareDefinitionList.cs b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShareDefinitionList.cs
index c7043fbbef..ae8113db16 100644
--- a/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShareDefinitionList.cs
+++ b/Rdmp.Core/CommandExecution/AtomicCommands/Sharing/ExecuteCommandImportShareDefinitionList.cs
@@ -24,17 +24,16 @@ public class ExecuteCommandImportShareDefinitionList : BasicCommandExecution, IA
 {
     public ExecuteCommandImportShareDefinitionList(IBasicActivateItems activator) : base(activator)
     {
-
     }
 
     public override void Execute()
     {
         base.Execute();
 
-        var selected = BasicActivator.SelectFiles("Select ShareDefinitions to import","Sharing Definition File","*.sd");
+        var selected =
+            BasicActivator.SelectFiles("Select ShareDefinitions to import", "Sharing Definition File", "*.sd");
 
         if (selected != null && selected.Any())
-        {
             try
             {
                 var shareManager = new ShareManager(BasicActivator.RepositoryLocator)
@@ -44,23 +43,22 @@ public override void Execute()
 
                 foreach (var f in selected)
                     using (var stream = File.Open(f.FullName, FileMode.Open))
+                    {
                         shareManager.ImportSharedObject(stream);
+                    }
             }
             catch (Exception e)
             {
                 BasicActivator.ShowException("Error importing file(s)", e);
             }
-        }
     }
 
 
+    public override string GetCommandHelp() =>
+        "Import serialized RDMP objects that have been shared with you in a share definition file.  If you already have the objects then they will be updated to match the file.";
 
-    public override string GetCommandHelp()
-    {
-        return "Import serialized RDMP objects that have been shared with you in a share definition file.  If you already have the objects then they will be updated to match the file.";
-    }
-
-    private int? LocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipAttribute, ShareDefinition shareDefinition)
+    private int? LocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipAttribute,
+        ShareDefinition shareDefinition)
     {
         BasicActivator.Show(
             $"Choose a local object for '{property}' on {Environment.NewLine}{string.Join(Environment.NewLine, shareDefinition.Properties.Select(kvp => $"{kvp.Key}: {kvp.Value}"))}");
@@ -69,14 +67,16 @@ public override string GetCommandHelp()
 
         if (BasicActivator.RepositoryLocator.CatalogueRepository.SupportsObjectType(requiredType))
         {
-            var selected = SelectOne(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects(requiredType).Cast<DatabaseEntity>().ToArray());
+            var selected = SelectOne(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects(requiredType)
+                .Cast<DatabaseEntity>().ToArray());
             if (selected != null)
                 return selected.ID;
         }
 
         if (BasicActivator.RepositoryLocator.DataExportRepository.SupportsObjectType(requiredType))
         {
-            var selected = SelectOne(BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects(requiredType).Cast<DatabaseEntity>().ToArray());
+            var selected = SelectOne(BasicActivator.RepositoryLocator.DataExportRepository.GetAllObjects(requiredType)
+                .Cast<DatabaseEntity>().ToArray());
             if (selected != null)
                 return selected.ID;
         }
@@ -84,8 +84,6 @@ public override string GetCommandHelp()
         return null;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.page_white_get);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(FamFamFamIcons.page_white_get);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/BasicActivateItems.cs b/Rdmp.Core/CommandExecution/BasicActivateItems.cs
index 96e3dd26ca..d3fc684990 100644
--- a/Rdmp.Core/CommandExecution/BasicActivateItems.cs
+++ b/Rdmp.Core/CommandExecution/BasicActivateItems.cs
@@ -50,61 +50,54 @@ public abstract class BasicActivateItems : IBasicActivateItems
 
 
     /// <inheritdoc/>
-    public bool IsWinForms {get; protected set;}
+    public bool IsWinForms { get; protected set; }
 
     /// <inheritdoc/>
     public virtual bool IsInteractive => true;
 
     /// <inheritdoc/>
-    public bool InteractiveDeletes {get;set;}
+    public bool InteractiveDeletes { get; set; }
 
     /// <inheritdoc/>
-    public ICoreChildProvider CoreChildProvider { get; protected set;}
+    public ICoreChildProvider CoreChildProvider { get; protected set; }
 
     /// <inheritdoc/>
     public IServerDefaults ServerDefaults { get; }
 
     /// <inheritdoc/>
     public FavouritesProvider FavouritesProvider { get; private set; }
+
     public ICoreIconProvider CoreIconProvider { get; private set; }
 
     public CommentStore CommentStore => RepositoryLocator.CatalogueRepository.CommentStore;
 
 
     /// <inheritdoc/>
-    public bool YesNo(string text, string caption, out bool chosen)
-    {
-        return YesNo(new DialogArgs
+    public bool YesNo(string text, string caption, out bool chosen) =>
+        YesNo(new DialogArgs
         {
             WindowTitle = caption,
             TaskDescription = text
         }, out chosen);
-    }
 
     public abstract bool YesNo(DialogArgs args, out bool chosen);
 
     /// <inheritdoc/>
-    public bool YesNo(string text, string caption)
-    {
-        return YesNo(new DialogArgs
+    public bool YesNo(string text, string caption) =>
+        YesNo(new DialogArgs
         {
             WindowTitle = caption,
             TaskDescription = text
         });
-    }
-    public bool YesNo(DialogArgs args)
-    {
-        return YesNo(args, out var chosen) && chosen;
-    }
 
-    public bool Confirm(string text, string caption)
-    {
-        return Confirm(new DialogArgs
+    public bool YesNo(DialogArgs args) => YesNo(args, out var chosen) && chosen;
+
+    public bool Confirm(string text, string caption) =>
+        Confirm(new DialogArgs
         {
             WindowTitle = caption,
             TaskDescription = text
         });
-    }
 
     /// <inheritdoc/>
     public bool Confirm(DialogArgs args)
@@ -126,20 +119,21 @@ public bool Confirm(DialogArgs args)
     public event EmphasiseItemHandler Emphasise;
 
     /// <inheritdoc/>
-    public List<IPluginUserInterface> PluginUserInterfaces { get; private set; } = new List<IPluginUserInterface>();
+    public List<IPluginUserInterface> PluginUserInterfaces { get; private set; } = new();
 
     /// <inheritdoc/>
     public bool HardRefresh { get; set; }
 
     public bool IsAbleToLaunchSubprocesses { get; protected set; }
 
-    public BasicActivateItems(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier globalErrorCheckNotifier)
+    public BasicActivateItems(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICheckNotifier globalErrorCheckNotifier)
     {
         RepositoryLocator = repositoryLocator;
         GlobalErrorCheckNotifier = globalErrorCheckNotifier;
 
         ServerDefaults = RepositoryLocator.CatalogueRepository;
-            
+
         //Shouldn't ever change externally to your session so doesn't need constantly refreshed
         FavouritesProvider = new FavouritesProvider(this);
 
@@ -162,17 +156,19 @@ protected virtual ICoreChildProvider GetChildProvider()
         if (RepositoryLocator.DataExportRepository != null)
             try
             {
-                temp = new DataExportChildProvider(RepositoryLocator, PluginUserInterfaces.ToArray(), GlobalErrorCheckNotifier, CoreChildProvider as DataExportChildProvider);
+                temp = new DataExportChildProvider(RepositoryLocator, PluginUserInterfaces.ToArray(),
+                    GlobalErrorCheckNotifier, CoreChildProvider as DataExportChildProvider);
             }
             catch (Exception e)
             {
-                ShowException("Error constructing DataExportChildProvider",e);
+                ShowException("Error constructing DataExportChildProvider", e);
             }
 
         //there was an error generating a data export repository or there was no repository specified
 
         //so just create a catalogue one
-        temp ??= new CatalogueChildProvider(RepositoryLocator.CatalogueRepository, PluginUserInterfaces.ToArray(), GlobalErrorCheckNotifier, CoreChildProvider as CatalogueChildProvider);
+        temp ??= new CatalogueChildProvider(RepositoryLocator.CatalogueRepository, PluginUserInterfaces.ToArray(),
+            GlobalErrorCheckNotifier, CoreChildProvider as CatalogueChildProvider);
 
         // first time
         if (CoreChildProvider == null)
@@ -194,7 +190,6 @@ private void ConstructPluginChildProviders()
         var constructor = new ObjectConstructor();
 
         foreach (var pluginType in RepositoryLocator.CatalogueRepository.MEF.GetTypes<IPluginUserInterface>())
-        {
             try
             {
                 PluginUserInterfaces.Add((IPluginUserInterface)ObjectConstructor.Construct(pluginType, this, false));
@@ -204,18 +199,15 @@ private void ConstructPluginChildProviders()
                 GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs(
                     $"Problem occurred trying to load Plugin '{pluginType.Name}'", CheckResult.Fail, e));
             }
-        }
     }
 
     protected void OnEmphasise(object sender, EmphasiseEventArgs args)
     {
-        Emphasise?.Invoke(sender,args);
+        Emphasise?.Invoke(sender, args);
     }
+
     /// <inheritdoc/>
-    public virtual IEnumerable<Type> GetIgnoredCommands()
-    {
-        return Type.EmptyTypes;
-    }
+    public virtual IEnumerable<Type> GetIgnoredCommands() => Type.EmptyTypes;
 
     /// <inheritdoc/>
     public virtual void Wait(string title, Task task, CancellationTokenSource cts)
@@ -240,25 +232,23 @@ public virtual void RequestItemEmphasis(object sender, EmphasiseRequest emphasis
     /// <param name="emphasiseRequest"></param>
     protected void AdjustEmphasiseRequest(EmphasiseRequest emphasiseRequest)
     {
-        if(emphasiseRequest.ObjectToEmphasise is ExtractableCohort ec)
-        {
-            if(CoreChildProvider is DataExportChildProvider dx)
+        if (emphasiseRequest.ObjectToEmphasise is ExtractableCohort ec)
+            if (CoreChildProvider is DataExportChildProvider dx)
             {
                 var projects = dx.Projects.Where(p => p.ProjectNumber == ec.ExternalProjectNumber).ToArray();
 
                 // If there is only one Project with the number of this cohort
-                if(projects.Length == 1)
+                if (projects.Length == 1)
                 {
                     // we can emphasise the cohort under that Project
                     var usage = dx.GetAllCohortProjectUsageNodesFor(projects[0])
-                        .SelectMany(s=>s.CohortsUsed)
+                        .SelectMany(s => s.CohortsUsed)
                         .FirstOrDefault(k => k.ObjectBeingUsed.Equals(ec));
 
-                    if(usage != null)
+                    if (usage != null)
                         emphasiseRequest.ObjectToEmphasise = usage;
                 }
             }
-        }
     }
 
     /// <summary>
@@ -267,44 +257,37 @@ protected void AdjustEmphasiseRequest(EmphasiseRequest emphasiseRequest)
     /// </summary>
     /// <param name="objectToEmphasise"></param>
     /// <returns></returns>
-    public object GetRootObjectOrSelf(object objectToEmphasise)
-    {
-        return CoreChildProvider?.GetRootObjectOrSelf(objectToEmphasise) ?? objectToEmphasise;
-    }
+    public object GetRootObjectOrSelf(object objectToEmphasise) =>
+        CoreChildProvider?.GetRootObjectOrSelf(objectToEmphasise) ?? objectToEmphasise;
 
     /// <inheritdoc/>
-    public bool SelectEnum(string prompt, Type enumType, out Enum chosen)
-    {
-        return SelectEnum(new DialogArgs
+    public bool SelectEnum(string prompt, Type enumType, out Enum chosen) =>
+        SelectEnum(new DialogArgs
         {
             WindowTitle = prompt
         }, enumType, out chosen);
-    }
 
     public abstract bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen);
 
 
-    public bool SelectType(string prompt, Type baseTypeIfAny, out Type chosen)
-    {
-        return SelectType(new DialogArgs
+    public bool SelectType(string prompt, Type baseTypeIfAny, out Type chosen) =>
+        SelectType(new DialogArgs
         {
             WindowTitle = prompt
-        },baseTypeIfAny,out chosen);
-    }
+        }, baseTypeIfAny, out chosen);
 
-    public bool SelectType(DialogArgs args, Type baseTypeIfAny, out Type chosen)
-    {
-        return SelectType(args, baseTypeIfAny, false, false, out chosen);
-    }
+    public bool SelectType(DialogArgs args, Type baseTypeIfAny, out Type chosen) =>
+        SelectType(args, baseTypeIfAny, false, false, out chosen);
 
-    public bool SelectType(string prompt, Type baseTypeIfAny,bool allowAbstract,bool allowInterfaces, out Type chosen)
-    {
-        return SelectType(new DialogArgs
+    public bool SelectType(string prompt, Type baseTypeIfAny, bool allowAbstract, bool allowInterfaces,
+        out Type chosen) =>
+        SelectType(new DialogArgs
         {
             WindowTitle = prompt
-        },baseTypeIfAny,allowAbstract,allowInterfaces,out chosen);
-    }
-    public bool SelectType(DialogArgs args, Type baseTypeIfAny, bool allowAbstract, bool allowInterfaces, out Type chosen)
+        }, baseTypeIfAny, allowAbstract, allowInterfaces, out chosen);
+
+    public bool SelectType(DialogArgs args, Type baseTypeIfAny, bool allowAbstract, bool allowInterfaces,
+        out Type chosen)
     {
         var available =
             RepositoryLocator.CatalogueRepository.MEF.GetAllTypes()
@@ -317,35 +300,24 @@ public bool SelectType(DialogArgs args, Type baseTypeIfAny, bool allowAbstract,
         return SelectType(args, available, out chosen);
     }
 
-    public bool SelectType(string prompt, Type[] available, out Type chosen)
-    {
-        return SelectType(new DialogArgs
+    public bool SelectType(string prompt, Type[] available, out Type chosen) =>
+        SelectType(new DialogArgs
         {
             WindowTitle = prompt
         }, available, out chosen);
-    }
 
     public abstract bool SelectType(DialogArgs args, Type[] available, out Type chosen);
 
-    public virtual bool CanActivate(object target)
-    {
-        return false;
-    }
+    public virtual bool CanActivate(object target) => false;
 
     public void Activate(object o)
     {
-        if(o is IMapsDirectlyToDatabaseTable m)
-        {
+        if (o is IMapsDirectlyToDatabaseTable m)
             // if a plugin user interface exists to handle editing this then let them handle it instead of launching the
             // normal UI
             foreach (var pluginInterface in PluginUserInterfaces)
-            {
                 if (pluginInterface.CustomActivate(m))
-                {
                     return;
-                }
-            }
-        }
 
         ActivateImpl(o);
     }
@@ -357,21 +329,17 @@ public void Activate(object o)
     /// <param name="o"></param>
     protected virtual void ActivateImpl(object o)
     {
-            
     }
+
     /// <inheritdoc/>
-    public virtual IEnumerable<T> GetAll<T>()
-    {
-        return CoreChildProvider.GetAllSearchables()
+    public virtual IEnumerable<T> GetAll<T>() =>
+        CoreChildProvider.GetAllSearchables()
             .Keys.OfType<T>();
-    }
 
     /// <inheritdoc/>
-    public virtual IEnumerable<IMapsDirectlyToDatabaseTable> GetAll(Type t)
-    {
-        return CoreChildProvider.GetAllSearchables()
+    public virtual IEnumerable<IMapsDirectlyToDatabaseTable> GetAll(Type t) =>
+        CoreChildProvider.GetAllSearchables()
             .Keys.Where(t.IsInstanceOfType);
-    }
 
     /// <inheritdoc/>
     public abstract void ShowException(string errorText, Exception exception);
@@ -382,7 +350,9 @@ public void PublishNearest(object publish)
         if (publish != null)
         {
             if (publish is DatabaseEntity d)
+            {
                 Publish(d);
+            }
             else
             {
                 var descendancy = CoreChildProvider.GetDescendancyListIfAnyFor(publish);
@@ -402,10 +372,7 @@ public virtual bool DeleteWithConfirmation(IDeleteable deleteable)
         {
             var didDelete = InteractiveDelete(deleteable);
 
-            if (didDelete)
-            {
-                PublishNearest(deleteable);
-            }
+            if (didDelete) PublishNearest(deleteable);
 
             return didDelete;
         }
@@ -423,18 +390,20 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
         //If there is some special way of describing the effects of deleting this object e.g. Selected Datasets
 
         if (databaseObject is Catalogue c)
-        {
             if (c.GetExtractabilityStatus(RepositoryLocator.DataExportRepository).IsExtractable)
             {
-                if (YesNo("Catalogue must first be made non extractable before it can be deleted, mark non extractable?", "Make Non Extractable"))
+                if (YesNo(
+                        "Catalogue must first be made non extractable before it can be deleted, mark non extractable?",
+                        "Make Non Extractable"))
                 {
                     var cmd = new ExecuteCommandChangeExtractability(this, c);
                     cmd.Execute();
                 }
                 else
+                {
                     return false;
+                }
             }
-        }
 
         if (databaseObject is ExtractionFilter f)
         {
@@ -447,10 +416,7 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
                         "Delete"))
                     return false;
 
-                foreach (var child in children)
-                {
-                    child.DeleteInDatabase();
-                }
+                foreach (var child in children) child.DeleteInDatabase();
 
                 f.ClearAllInjections();
 
@@ -459,15 +425,16 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
             }
         }
 
-        if( databaseObject is AggregateConfiguration ac && ac.IsJoinablePatientIndexTable())
+        if (databaseObject is AggregateConfiguration ac && ac.IsJoinablePatientIndexTable())
         {
-            var users = ac.JoinableCohortAggregateConfiguration?.Users?.Select(u=>u.AggregateConfiguration);
-            if(users != null)
+            var users = ac.JoinableCohortAggregateConfiguration?.Users?.Select(u => u.AggregateConfiguration);
+            if (users != null)
             {
                 users = users.ToArray();
-                if(users.Any())
+                if (users.Any())
                 {
-                    Show($"Cannot Delete '{ac.Name}' because it is linked to by the following AggregateConfigurations:{Environment.NewLine}{string.Join(Environment.NewLine,users)}");
+                    Show(
+                        $"Cannot Delete '{ac.Name}' because it is linked to by the following AggregateConfigurations:{Environment.NewLine}{string.Join(Environment.NewLine, users)}");
                     return false;
                 }
             }
@@ -490,19 +457,19 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
         if (databaseObject != null)
         {
             var exports = RepositoryLocator.CatalogueRepository.GetReferencesTo<ObjectExport>(databaseObject).ToArray();
-            if(exports.Any(e=>e.Exists()))
-                if(YesNo("This object has been shared as an ObjectExport.  Deleting it may prevent you loading any saved copies.  Do you want to delete the ObjectExport definition?","Delete ObjectExport"))
-                {
-                    foreach(var e in exports)
+            if (exports.Any(e => e.Exists()))
+                if (YesNo(
+                        "This object has been shared as an ObjectExport.  Deleting it may prevent you loading any saved copies.  Do you want to delete the ObjectExport definition?",
+                        "Delete ObjectExport"))
+                    foreach (var e in exports)
                         e.DeleteInDatabase();
-                }
                 else
                     return false;
         }
-                        
+
         if (
             YesNo(
-                overrideConfirmationText??
+                overrideConfirmationText ??
                 $"{"Are you sure you want to delete '" + deleteable + "'?"}{Environment.NewLine}({deleteable.GetType().Name}{idText})",
                 $"Delete {deleteable.GetType().Name}"))
         {
@@ -511,7 +478,7 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
             if (databaseObject == null)
             {
                 var descendancy = CoreChildProvider.GetDescendancyListIfAnyFor(deleteable);
-                if(descendancy != null)
+                if (descendancy != null)
                     databaseObject = descendancy.Parents.OfType<DatabaseEntity>().LastOrDefault();
             }
 
@@ -527,15 +494,13 @@ protected virtual bool InteractiveDelete(IDeleteable deleteable)
         return false;
     }
 
-    public bool SelectValueType(string prompt, Type paramType, object initialValue, out object chosen)
-    {
-        return SelectValueType(
+    public bool SelectValueType(string prompt, Type paramType, object initialValue, out object chosen) =>
+        SelectValueType(
             new DialogArgs
             {
                 WindowTitle = $"Enter value for {prompt}",
                 EntryLabel = prompt
-            },paramType,initialValue,out chosen);
-    }
+            }, paramType, initialValue, out chosen);
 
     /// <inheritdoc/>
     public bool SelectValueType(DialogArgs args, Type paramType, object initialValue, out object chosen)
@@ -543,7 +508,7 @@ public bool SelectValueType(DialogArgs args, Type paramType, object initialValue
         var underlying = Nullable.GetUnderlyingType(paramType);
         if ((underlying ?? paramType).IsEnum)
         {
-            var ok = SelectEnum(args, underlying?? paramType, out var enumChosen);
+            var ok = SelectEnum(args, underlying ?? paramType, out var enumChosen);
             chosen = enumChosen;
             return ok;
         }
@@ -557,24 +522,21 @@ public bool SelectValueType(DialogArgs args, Type paramType, object initialValue
 
         if (paramType == typeof(string))
         {
-            var ok = TypeText(args, int.MaxValue, initialValue?.ToString(),out var stringChosen,false);
+            var ok = TypeText(args, int.MaxValue, initialValue?.ToString(), out var stringChosen, false);
             chosen = stringChosen;
             return ok;
-
         }
 
         return SelectValueTypeImpl(args, paramType, initialValue, out chosen);
     }
 
-    protected abstract bool SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen);
+    protected abstract bool
+        SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen);
 
     /// <inheritdoc/>
     public virtual void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
     {
-        if(!HardRefresh && UserSettings.SelectiveRefresh && CoreChildProvider.SelectiveRefresh(databaseEntity))
-        {
-            return;
-        }
+        if (!HardRefresh && UserSettings.SelectiveRefresh && CoreChildProvider.SelectiveRefresh(databaseEntity)) return;
 
         var fresh = GetChildProvider();
         CoreChildProvider.UpdateTo(fresh);
@@ -584,21 +546,20 @@ public virtual void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
     /// <inheritdoc/>
     public void Show(string message)
     {
-        Show("Message",message);
+        Show("Message", message);
     }
 
     public abstract void Show(string title, string message);
 
     /// <inheritdoc/>
     public bool TypeText(string header, string prompt, int maxLength, string initialText, out string text,
-        bool requireSaneHeaderText)
-    {
-        return TypeText(new DialogArgs
+        bool requireSaneHeaderText) =>
+        TypeText(new DialogArgs
         {
             WindowTitle = header,
             EntryLabel = prompt
-        },maxLength,initialText,out text,requireSaneHeaderText);
-    }
+        }, maxLength, initialText, out text, requireSaneHeaderText);
+
     public abstract bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
         bool requireSaneHeaderText);
 
@@ -611,56 +572,53 @@ public abstract bool TypeText(DialogArgs args, int maxLength, string initialText
 
     /// <inheritdoc/>
     public IMapsDirectlyToDatabaseTable[] SelectMany(string prompt, Type arrayElementType,
-        IMapsDirectlyToDatabaseTable[] availableObjects, string initialSearchText = null)
-    {
-        return SelectMany(new DialogArgs
+        IMapsDirectlyToDatabaseTable[] availableObjects, string initialSearchText = null) =>
+        SelectMany(new DialogArgs
         {
             WindowTitle = prompt,
             InitialSearchText = initialSearchText
-        },arrayElementType,availableObjects);
-    }
+        }, arrayElementType, availableObjects);
 
     /// <inheritdoc/>
     public abstract IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType,
         IMapsDirectlyToDatabaseTable[] availableObjects);
 
     /// <inheritdoc/>
-    public virtual IMapsDirectlyToDatabaseTable SelectOne(string prompt, IMapsDirectlyToDatabaseTable[] availableObjects,
-        string initialSearchText = null, bool allowAutoSelect = false)
-    {
-        return SelectOne(new DialogArgs
+    public virtual IMapsDirectlyToDatabaseTable SelectOne(string prompt,
+        IMapsDirectlyToDatabaseTable[] availableObjects,
+        string initialSearchText = null, bool allowAutoSelect = false) =>
+        SelectOne(new DialogArgs
         {
             WindowTitle = prompt,
             AllowAutoSelect = allowAutoSelect,
             InitialSearchText = initialSearchText
         }, availableObjects);
-    }
 
     /// <inheritdoc/>
-    public abstract IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects);
+    public abstract IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects);
 
     /// <inheritdoc/>
-    public bool SelectObject<T>(string prompt, T[] available, out T selected, string initialSearchText = null, bool allowAutoSelect = false) where T : class
-    {
-        return SelectObject<T>(new DialogArgs
+    public bool SelectObject<T>(string prompt, T[] available, out T selected, string initialSearchText = null,
+        bool allowAutoSelect = false) where T : class =>
+        SelectObject<T>(new DialogArgs
         {
             WindowTitle = prompt,
             InitialSearchText = initialSearchText,
             AllowAutoSelect = allowAutoSelect
         }, available, out selected);
-    }
 
     public abstract bool SelectObject<T>(DialogArgs args, T[] available, out T selected) where T : class;
 
     /// <inheritdoc/>
-    public bool SelectObjects<T>(string prompt, T[] available, out T[] selected, string initialSearchText = null) where T : class
-    {
-        return SelectObjects<T>(new DialogArgs
+    public bool SelectObjects<T>(string prompt, T[] available, out T[] selected, string initialSearchText = null)
+        where T : class =>
+        SelectObjects<T>(new DialogArgs
         {
             WindowTitle = prompt,
             InitialSearchText = initialSearchText
         }, available, out selected);
-    }
+
     public abstract bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected) where T : class;
 
     /// <inheritdoc/>
@@ -676,77 +634,75 @@ public bool SelectObjects<T>(string prompt, T[] available, out T[] selected, str
     public abstract FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern);
 
     /// <inheritdoc/>
-    public virtual List<CommandInvokerDelegate> GetDelegates()
-    {
-        return new List<CommandInvokerDelegate>();
-    }
+    public virtual List<CommandInvokerDelegate> GetDelegates() => new();
 
     /// <inheritdoc/>
-    public virtual IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline)
-    {
-        return new PipelineRunner(useCase,pipeline);
-    }
+    public virtual IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline) =>
+        new PipelineRunner(useCase, pipeline);
 
     /// <inheritdoc/>
-    public virtual CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable, IProject project, string cohortInitialDescription)
+    public virtual CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable,
+        IProject project, string cohortInitialDescription)
     {
         int version;
         var projectNumber = project?.ProjectNumber;
 
-        if(!TypeText("Name","Enter name for cohort",255,null,out var name,false))
+        if (!TypeText("Name", "Enter name for cohort", 255, null, out var name, false))
             throw new Exception("User chose not to enter a name for the cohortand none was provided");
 
 
-        if(projectNumber == null)
-            if(SelectValueType("enter project number",typeof(int),0,out var chosen))
-            {
+        if (projectNumber == null)
+            if (SelectValueType("enter project number", typeof(int), 0, out var chosen))
                 projectNumber = (int)chosen;
-            }
             else
                 throw new Exception("User chose not to enter a Project number and none was provided");
 
-            
-        if(SelectValueType("enter version number for cohort",typeof(int),0,out var chosenVersion))
-        {
+
+        if (SelectValueType("enter version number for cohort", typeof(int), 0, out var chosenVersion))
             version = (int)chosenVersion;
-        }
         else
             throw new Exception("User chose not to enter a version number and none was provided");
 
 
-        return new CohortCreationRequest(project,new CohortDefinition(null,name,version,projectNumber.Value,externalCohortTable),RepositoryLocator.DataExportRepository,cohortInitialDescription);
+        return new CohortCreationRequest(project,
+            new CohortDefinition(null, name, version, projectNumber.Value, externalCohortTable),
+            RepositoryLocator.DataExportRepository, cohortInitialDescription);
     }
 
     /// <inheritdoc/>
-    public virtual ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo, ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string catalogueFolder)
+    public virtual ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo,
+        ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific,
+        string catalogueFolder)
     {
         // Create a new Catalogue based on the table info
-        var engineer = new ForwardEngineerCatalogue(tableInfo,tableInfo.ColumnInfos);
+        var engineer = new ForwardEngineerCatalogue(tableInfo, tableInfo.ColumnInfos);
         engineer.ExecuteForwardEngineering(out var cata, out _, out var eis);
 
         // if we know the linkable private identifier column(s)
-        if(extractionIdentifierColumns != null && extractionIdentifierColumns.Any())
+        if (extractionIdentifierColumns != null && extractionIdentifierColumns.Any())
         {
             // Make the Catalogue extractable
-            var eds = new ExtractableDataSet(RepositoryLocator.DataExportRepository,cata);
+            var eds = new ExtractableDataSet(RepositoryLocator.DataExportRepository, cata);
 
             // Mark the columns specified IsExtractionIdentifier
-            foreach(var col in extractionIdentifierColumns)
+            foreach (var col in extractionIdentifierColumns)
             {
-                var match = eis.FirstOrDefault(ei=>ei.ColumnInfo?.ID == col.ID) ?? throw new ArgumentException($"Supplied ColumnInfo {col.GetRuntimeName()} was not found amongst the columns created");
+                var match = eis.FirstOrDefault(ei => ei.ColumnInfo?.ID == col.ID) ??
+                            throw new ArgumentException(
+                                $"Supplied ColumnInfo {col.GetRuntimeName()} was not found amongst the columns created");
                 match.IsExtractionIdentifier = true;
                 match.SaveToDatabase();
             }
 
             // Catalogue must be extractable to be project specific
-            if(projectSpecific != null)
+            if (projectSpecific != null)
             {
                 eds.Project_ID = projectSpecific.ID;
                 eds.SaveToDatabase();
             }
         }
 
-        if(!string.IsNullOrWhiteSpace(catalogueFolder))
+        if (!string.IsNullOrWhiteSpace(catalogueFolder))
         {
             cata.Folder = catalogueFolder;
             cata.SaveToDatabase();
@@ -755,22 +711,21 @@ public virtual ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo, Colu
         return cata;
     }
 
-    public virtual ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository, PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db)
+    public virtual ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository,
+        PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db)
     {
-
-        if (db == null && IsInteractive)
-        {
-            db = SelectDatabase(true, "Select database");
-        }
+        if (db == null && IsInteractive) db = SelectDatabase(true, "Select database");
 
         if (db == null)
-            throw new ArgumentException($"Database must be picked before calling {nameof(CreateNewPlatformDatabase)} when using {nameof(BasicActivateItems)}",nameof(db));
+            throw new ArgumentException(
+                $"Database must be picked before calling {nameof(CreateNewPlatformDatabase)} when using {nameof(BasicActivateItems)}",
+                nameof(db));
 
         var executor = new MasterDatabaseScriptExecutor(db);
-        executor.CreateAndPatchDatabase(patcher, new AcceptAllCheckNotifier { WriteToConsole = true});
+        executor.CreateAndPatchDatabase(patcher, new AcceptAllCheckNotifier { WriteToConsole = true });
 
         var eds = new ExternalDatabaseServer(catalogueRepository,
-            $"New {(defaultToSet == PermissableDefaults.None ? "" : defaultToSet.ToString())}Server",patcher);
+            $"New {(defaultToSet == PermissableDefaults.None ? "" : defaultToSet.ToString())}Server", patcher);
         eds.SetProperties(db);
 
         if (defaultToSet != PermissableDefaults.None)
@@ -787,8 +742,9 @@ public virtual bool ShowCohortWizard(out CohortIdentificationConfiguration cic)
 
     public void SelectAnythingThen(string prompt, Action<IMapsDirectlyToDatabaseTable> callback)
     {
-        SelectAnythingThen(new DialogArgs { WindowTitle = prompt}, callback);
+        SelectAnythingThen(new DialogArgs { WindowTitle = prompt }, callback);
     }
+
     public virtual void SelectAnythingThen(DialogArgs args, Action<IMapsDirectlyToDatabaseTable> callback)
     {
         var selected = SelectOne(args, CoreChildProvider.GetAllSearchables().Keys.ToArray());
@@ -813,7 +769,7 @@ public virtual void SelectAnythingThen(DialogArgs args, Action<IMapsDirectlyToDa
     /// <param name="filter"></param>
     public virtual void ShowLogs(ExternalDatabaseServer loggingServer, LogViewerFilter filter)
     {
-        ShowData(new ViewLogsCollection(loggingServer,filter));
+        ShowData(new ViewLogsCollection(loggingServer, filter));
     }
 
     /// <summary>
@@ -836,13 +792,9 @@ protected static IEnumerable<ArchivalDataLoadInfo> GetLogs(ILoggedActivityRootOb
     /// <inheritdoc/>
     public IRepository GetRepositoryFor(Type type)
     {
-        foreach(var repo in RepositoryLocator.GetAllRepositories())
-        {
-            if(repo.SupportsObjectType(type))
-            {
+        foreach (var repo in RepositoryLocator.GetAllRepositories())
+            if (repo.SupportsObjectType(type))
                 return repo;
-            }
-        }
 
         throw new ArgumentException($"Did not know what repository to use to fetch objects of Type '{type}'");
     }
diff --git a/Rdmp.Core/CommandExecution/BasicCommandExecution.cs b/Rdmp.Core/CommandExecution/BasicCommandExecution.cs
index 9faa70bf3c..3f371fabbf 100644
--- a/Rdmp.Core/CommandExecution/BasicCommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/BasicCommandExecution.cs
@@ -34,7 +34,7 @@ namespace Rdmp.Core.CommandExecution;
 /// 
 /// <para>Override GetCommandHelp and GetCommandName to change the presentation layer of the command (if applicable).</para>
 /// </summary>
-public abstract class BasicCommandExecution : ICommandExecution,IAtomicCommand
+public abstract class BasicCommandExecution : ICommandExecution, IAtomicCommand
 {
     /// <summary>
     /// The last command executed by RDMP (will be null at start)
@@ -91,13 +91,12 @@ protected void SetImpossibleIfReadonly(IMightBeReadOnly m)
             return;
 
         if (m.ShouldBeReadOnly(out var reason))
-        {
-            SetImpossible($"{(m is IContainer ? "Container" : '\'' + m.ToString() + '\'')} is readonly beacause:{reason}");
-        }
+            SetImpossible(
+                $"{(m is IContainer ? "Container" : '\'' + m.ToString() + '\'')} is readonly beacause:{reason}");
     }
+
     public BasicCommandExecution()
     {
-
     }
 
     public BasicCommandExecution(IBasicActivateItems basicActivator)
@@ -130,7 +129,6 @@ public virtual string GetCommandName()
             adjusted += "...";
 
         return UsefulStuff.PascalCaseStringToHumanReadable(adjusted);
-        
     }
 
     /// <summary>
@@ -138,29 +136,17 @@ public virtual string GetCommandName()
     /// </summary>
     /// <param name="typeName"></param>
     /// <returns></returns>
-    public static string GetCommandName(string typeName)
-    {
-        return typeName.Replace(ExecuteCommandPrefix, "");
-    }
+    public static string GetCommandName(string typeName) => typeName.Replace(ExecuteCommandPrefix, "");
 
     /// <summary>
     /// Returns the name of the command in programmatic format e.g. no spaces no triple dot suffix etc.
     /// </summary>
     /// <returns></returns>
-    public static string GetCommandName<T>() where T : BasicCommandExecution
-    {
-        return GetCommandName(typeof(T).Name);
-    }
+    public static string GetCommandName<T>() where T : BasicCommandExecution => GetCommandName(typeof(T).Name);
 
-    public virtual string GetCommandHelp()
-    {
-        return string.Empty;
-    }
+    public virtual string GetCommandHelp() => string.Empty;
 
-    public virtual Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return OverrideIcon;
-    }
+    public virtual Image<Rgba32> GetImage(IIconProvider iconProvider) => OverrideIcon;
 
     /// <summary>
     /// disables the command because of the given reason.  This will result in grayed out menu items, crashes when executed programatically etc.
@@ -171,6 +157,7 @@ protected void SetImpossible(string reason)
         IsImpossible = true;
         ReasonCommandImpossible = reason;
     }
+
     /// <summary>
     /// disables the command because of the given reason.  This will result in grayed out menu items, crashes when executed programatically etc.
     /// This overload calls string.Format with the <paramref name="objects"/>
@@ -180,7 +167,7 @@ protected void SetImpossible(string reason)
     protected void SetImpossible(string reason, params object[] objects)
     {
         IsImpossible = true;
-        ReasonCommandImpossible = string.Format(reason,objects);
+        ReasonCommandImpossible = string.Format(reason, objects);
     }
 
     /// <summary>
@@ -191,28 +178,24 @@ protected void ResetImpossibleness()
         IsImpossible = false;
         ReasonCommandImpossible = null;
     }
-        
+
     /// <summary>
     /// Offers the user a binary choice and returns true if they accept it.  This method is blocking.
     /// </summary>
     /// <param name="text">The question to pose</param>
     /// <param name="caption"></param>
     /// <returns></returns>
-    protected bool YesNo(string text,string caption)
-    {
-        return BasicActivator.YesNo(text,caption);
-    }
+    protected bool YesNo(string text, string caption) => BasicActivator.YesNo(text, caption);
 
     protected virtual void Publish(IMapsDirectlyToDatabaseTable o)
     {
-
         if (NoPublish)
             return;
 
-        if(o is DatabaseEntity d)
+        if (o is DatabaseEntity d)
             BasicActivator.Publish(d);
     }
-        
+
     /// <summary>
     /// Reports a low visibility error to the <see cref="IBasicActivateItems.GlobalErrorCheckNotifier"/>.  Throws <paramref name="ex"/>
     /// with <paramref name="msg"/> if no global errors handler is registered
@@ -222,11 +205,11 @@ protected virtual void Publish(IMapsDirectlyToDatabaseTable o)
     protected void GlobalError(string msg, Exception ex)
     {
         if (BasicActivator?.GlobalErrorCheckNotifier == null)
-            throw new Exception(msg,ex);
+            throw new Exception(msg, ex);
 
         BasicActivator.GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs(msg, CheckResult.Fail, ex));
     }
-        
+
     /// <summary>
     /// Displays the given message to the user
     /// </summary>
@@ -243,7 +226,7 @@ protected void Show(string message)
     /// <param name="message"></param>
     protected void Show(string title, string message)
     {
-        BasicActivator.Show(title,message);
+        BasicActivator.Show(title, message);
     }
 
     /// <summary>
@@ -253,7 +236,7 @@ protected void Show(string title, string message)
     /// <param name="objects">Objects to use for {0},{1} etc tokens in <paramref name="message"/></param>
     protected void Show(string message, params object[] objects)
     {
-        BasicActivator.Show(string.Format(message,objects));
+        BasicActivator.Show(string.Format(message, objects));
     }
 
 
@@ -267,22 +250,20 @@ protected void Show(string message, params object[] objects)
     /// <param name="text"></param>
     /// <param name="requireSaneHeaderText"></param>
     /// <returns></returns>
-    protected bool TypeText(string header, string prompt, int maxLength, string initialText, out string text, bool requireSaneHeaderText = false)
-    {
-        return BasicActivator.TypeText(header, prompt, maxLength, initialText, out text, requireSaneHeaderText);
-    }
+    protected bool TypeText(string header, string prompt, int maxLength, string initialText, out string text,
+        bool requireSaneHeaderText = false) =>
+        BasicActivator.TypeText(header, prompt, maxLength, initialText, out text, requireSaneHeaderText);
 
     /// <inheritdoc cref="TypeText(string, string, int, string, out string,bool)"/>
-    protected bool TypeText(string header, string prompt, out string text)
-    {
-        return TypeText(header, prompt, 500, null, out text);
-    }
-        
+    protected bool TypeText(string header, string prompt, out string text) =>
+        TypeText(header, prompt, 500, null, out text);
+
     /// <inheritdoc cref="IBasicActivateItems.ShowException"/>
     protected void ShowException(string message, Exception exception)
     {
-        BasicActivator.ShowException(message,exception);
+        BasicActivator.ShowException(message, exception);
     }
+
     /// <summary>
     /// Prompts user to select 1 of the objects of type T in the list you provide
     /// </summary>
@@ -291,14 +272,15 @@ protected void ShowException(string message, Exception exception)
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect">True to silently auto select the object if there are only 1 <paramref name="availableObjects"/></param>
     /// <returns></returns>
-    protected T SelectOne<T>(IList<T> availableObjects, string initialSearchText = null, bool allowAutoSelect = false) where T : DatabaseEntity
-    {
-        return SelectOne(new DialogArgs { 
+    protected T SelectOne<T>(IList<T> availableObjects, string initialSearchText = null, bool allowAutoSelect = false)
+        where T : DatabaseEntity =>
+        SelectOne(new DialogArgs
+        {
             InitialSearchText = initialSearchText,
             AllowAutoSelect = allowAutoSelect
-        },availableObjects, out var selected) ? selected : null;
-
-    }
+        }, availableObjects, out var selected)
+            ? selected
+            : null;
 
     /// <summary>
     /// Prompts user to select 1 of the objects of type T in the list you provide
@@ -307,10 +289,8 @@ protected T SelectOne<T>(IList<T> availableObjects, string initialSearchText = n
     /// <param name="args"></param>
     /// <param name="availableObjects"></param>
     /// <returns></returns>
-    protected T SelectOne<T>(DialogArgs args, IList<T> availableObjects) where T : DatabaseEntity
-    {
-        return SelectOne(args, availableObjects, out var selected) ? selected : null;
-    }
+    protected T SelectOne<T>(DialogArgs args, IList<T> availableObjects) where T : DatabaseEntity =>
+        SelectOne(args, availableObjects, out var selected) ? selected : null;
 
     /// <summary>
     /// Prompts user to select 1 object of type T from all the ones stored in the repository provided
@@ -320,13 +300,15 @@ protected T SelectOne<T>(DialogArgs args, IList<T> availableObjects) where T : D
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect">True to silently auto select the object if there are only 1 compatible object in the <paramref name="repository"/></param>
     /// <returns></returns>
-    protected T SelectOne<T>(IRepository repository, string initialSearchText = null, bool allowAutoSelect = false) where T : DatabaseEntity
-    {
-        return SelectOne(new DialogArgs { 
+    protected T SelectOne<T>(IRepository repository, string initialSearchText = null, bool allowAutoSelect = false)
+        where T : DatabaseEntity =>
+        SelectOne(new DialogArgs
+        {
             InitialSearchText = initialSearchText,
             AllowAutoSelect = allowAutoSelect
-        },repository.GetAllObjects<T>().ToList(),out var answer) ? answer: null;
-    }
+        }, repository.GetAllObjects<T>().ToList(), out var answer)
+            ? answer
+            : null;
 
     /// <summary>
     /// Prompts user to select 1 of the objects of type T from all the ones stored in the repository provided, returns true if they made a non null selection
@@ -337,14 +319,13 @@ protected T SelectOne<T>(IRepository repository, string initialSearchText = null
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect">True to silently auto select the object if there are only 1 compatible object in the <paramref name="repository"/></param>
     /// <returns></returns>
-    protected bool SelectOne<T>(IRepository repository, out T selected, string initialSearchText = null, bool allowAutoSelect = false) where T : DatabaseEntity
-    {
-        return SelectOne(new DialogArgs
+    protected bool SelectOne<T>(IRepository repository, out T selected, string initialSearchText = null,
+        bool allowAutoSelect = false) where T : DatabaseEntity =>
+        SelectOne(new DialogArgs
         {
             InitialSearchText = initialSearchText,
             AllowAutoSelect = allowAutoSelect
-        }, repository.GetAllObjects<T>().ToList(),out selected);
-    }
+        }, repository.GetAllObjects<T>().ToList(), out selected);
 
     /// <summary>
     /// Prompts user to select 1 of the objects of type T in the list you provide, returns true if they made a non null selection
@@ -355,14 +336,13 @@ protected bool SelectOne<T>(IRepository repository, out T selected, string initi
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect">True to silently auto select the object if there are only 1 <paramref name="availableObjects"/></param>
     /// <returns></returns>
-    protected bool SelectOne<T>(IList<T> availableObjects, out T selected, string initialSearchText = null, bool allowAutoSelect = false) where T : DatabaseEntity
-    {
-        return SelectOne(new DialogArgs
+    protected bool SelectOne<T>(IList<T> availableObjects, out T selected, string initialSearchText = null,
+        bool allowAutoSelect = false) where T : DatabaseEntity =>
+        SelectOne(new DialogArgs
         {
             InitialSearchText = initialSearchText,
             AllowAutoSelect = allowAutoSelect
-        },availableObjects,out selected);
-    }
+        }, availableObjects, out selected);
 
     /// <summary>
     /// Prompts user to select 1 of the objects of type T in the list you provide, returns true if they made a non null selection
@@ -374,7 +354,7 @@ protected bool SelectOne<T>(IList<T> availableObjects, out T selected, string in
     /// <returns></returns>
     protected bool SelectOne<T>(DialogArgs args, IList<T> availableObjects, out T selected) where T : DatabaseEntity
     {
-        selected = (T)BasicActivator.SelectOne(args,availableObjects.ToArray());
+        selected = (T)BasicActivator.SelectOne(args, availableObjects.ToArray());
         return selected != null;
     }
 
@@ -386,15 +366,17 @@ protected bool SelectOne<T>(DialogArgs args, IList<T> availableObjects, out T se
     /// <param name="repository"></param>
     /// <param name="selected"></param>
     /// <returns></returns>
-    protected bool SelectOne<T>(DialogArgs args,IRepository repository, out T selected) where T : DatabaseEntity
+    protected bool SelectOne<T>(DialogArgs args, IRepository repository, out T selected) where T : DatabaseEntity
     {
         selected = (T)BasicActivator.SelectOne(args, repository.GetAllObjects<T>().ToArray());
         return selected != null;
     }
 
-    protected bool SelectMany<T>(T[] available, out T[] selected, string initialSearchText = null) where T : DatabaseEntity
+    protected bool SelectMany<T>(T[] available, out T[] selected, string initialSearchText = null)
+        where T : DatabaseEntity
     {
-        selected = BasicActivator.SelectMany("Select Objects", typeof(T), available,initialSearchText)?.Cast<T>()?.ToArray();
+        selected = BasicActivator.SelectMany("Select Objects", typeof(T), available, initialSearchText)?.Cast<T>()
+            ?.ToArray();
         return selected != null && selected.Any();
     }
 
@@ -406,22 +388,19 @@ protected bool SelectMany<T>(DialogArgs dialogArgs, T[] available, out T[] selec
 
     protected void Wait(string title, Task task, CancellationTokenSource cts)
     {
-        BasicActivator.Wait(title,task,cts);
+        BasicActivator.Wait(title, task, cts);
     }
+
     protected void Emphasise(object o, int expansionDepth = 0)
     {
         BasicActivator.RequestItemEmphasis(this, new EmphasiseRequest(o, expansionDepth));
     }
-        
-    protected DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription)
-    {
-        return BasicActivator.SelectDatabase(allowDatabaseCreation, taskDescription);
-    }
 
-    protected DiscoveredTable SelectTable(bool allowDatabaseCreation,string taskDescription)
-    {
-        return BasicActivator.SelectTable(allowDatabaseCreation, taskDescription);
-    }
+    protected DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription) =>
+        BasicActivator.SelectDatabase(allowDatabaseCreation, taskDescription);
+
+    protected DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription) =>
+        BasicActivator.SelectTable(allowDatabaseCreation, taskDescription);
 
     protected virtual void Activate(DatabaseEntity o)
     {
@@ -455,7 +434,9 @@ protected object Construct(Type toConstruct, Func<ObjectConstructor, Constructor
             var parameterDelegate = invoker.GetDelegate(required);
 
             if (parameterDelegate.IsAuto)
+            {
                 constructorValues.Add(parameterDelegate.Run(required));
+            }
             else
             {
                 //it's not auto
@@ -463,16 +444,17 @@ protected object Construct(Type toConstruct, Func<ObjectConstructor, Constructor
                 {
                     pickerEnumerator.MoveNext();
 
-                    if(pickerEnumerator.Current == null)
-                        throw new ArgumentException($"Value needed for parameter '{required.Name}' (of type '{required.Type}')");
+                    if (pickerEnumerator.Current == null)
+                        throw new ArgumentException(
+                            $"Value needed for parameter '{required.Name}' (of type '{required.Type}')");
 
                     //construct with the picker arguments
-                    if(!pickerEnumerator.Current.HasValueOfType(required.Type))
-                        throw new NotSupportedException($"Argument '{pickerEnumerator.Current.RawValue}' could not be converted to required Type '{required.Type}' for argument {required.Name}");
+                    if (!pickerEnumerator.Current.HasValueOfType(required.Type))
+                        throw new NotSupportedException(
+                            $"Argument '{pickerEnumerator.Current.RawValue}' could not be converted to required Type '{required.Type}' for argument {required.Name}");
 
                     //it is a valid object yay!
                     constructorValues.Add(pickerEnumerator.Current.GetValueForParameterOfType(required.Type));
-
                 }
                 else
                 {
@@ -499,15 +481,11 @@ protected void SetImpossibleIfFailsChecks(ICheckable checkable)
         }
         catch (Exception e)
         {
-
             SetImpossible(ExceptionHelper.ExceptionToListOfInnerMessages(e));
         }
     }
 
-    public override string ToString()
-    {
-        return GetCommandName();
-    }
+    public override string ToString() => GetCommandName();
 
     protected static CommentStore CreateCommentStore()
     {
@@ -522,13 +500,13 @@ protected static CommentStore CreateCommentStore()
     /// </summary>
     public static bool HasCommandNameOrAlias(Type commandType, string name)
     {
-        return 
-            commandType.Name.Equals(ExecuteCommandPrefix + name,StringComparison.InvariantCultureIgnoreCase) 
-            || 
-            commandType.Name.Equals(name,StringComparison.InvariantCultureIgnoreCase) 
-            || 
+        return
+            commandType.Name.Equals(ExecuteCommandPrefix + name, StringComparison.InvariantCultureIgnoreCase)
+            ||
+            commandType.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)
+            ||
             commandType.GetCustomAttributes<AliasAttribute>(false)
-                .Any(a=>a.Name.Equals(name,StringComparison.InvariantCultureIgnoreCase));
+                .Any(a => a.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
     }
 
 
@@ -545,9 +523,9 @@ public static bool HasCommandNameOrAlias(Type commandType, string name)
     /// <param name="description"></param>
     /// <param name="trackObjects">Objects to do change tracking on within the transaction</param>
     /// <returns></returns>
-    protected bool ExecuteWithCommit(Action toRun, string description, params IMapsDirectlyToDatabaseTable[] trackObjects)
+    protected bool ExecuteWithCommit(Action toRun, string description,
+        params IMapsDirectlyToDatabaseTable[] trackObjects)
     {
-
         CommitInProgress commit = null;
         var revert = false;
 
@@ -563,28 +541,18 @@ protected bool ExecuteWithCommit(Action toRun, string description, params IMapsD
             toRun();
 
             // if user cancells transaction
-            if (commit != null && commit.TryFinish(BasicActivator) == null)
-            {
-                revert = true;
-            }
+            if (commit != null && commit.TryFinish(BasicActivator) == null) revert = true;
         }
         finally
         {
             commit?.Dispose();
         }
 
-        if(revert)
-        {
+        if (revert)
             foreach (var o in trackObjects)
-            {
-                if(o is IRevertable re)
-                {
+                if (o is IRevertable re)
                     re.RevertToDatabaseState();
-                }   
-            }
-        }
 
         return !revert;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/AggregateConfigurationCombineable.cs b/Rdmp.Core/CommandExecution/Combining/AggregateConfigurationCombineable.cs
index 058db428ff..a8c7d309f7 100644
--- a/Rdmp.Core/CommandExecution/Combining/AggregateConfigurationCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/AggregateConfigurationCombineable.cs
@@ -38,7 +38,7 @@ public class AggregateConfigurationCombineable : ICombineToMakeCommand
     /// Comprehensive list of all <see cref="CohortAggregateContainer"/> in the tree hierarchy of the  <see cref="Aggregate"/> <see cref="CohortIdentificationConfigurationIfAny"/>
     /// </summary>
     public List<CohortAggregateContainer> AllContainersInTreeIfPartOfOne { get; private set; }
-        
+
     /// <summary>
     /// True if the <see cref="Aggregate"/> is <see cref="AggregateConfiguration.IsJoinablePatientIndexTable"/>
     /// </summary>
@@ -70,25 +70,26 @@ public AggregateConfigurationCombineable(AggregateConfiguration aggregate)
         Aggregate = aggregate;
 
         IsPatientIndexTable = Aggregate.IsJoinablePatientIndexTable();
-            
-        IsTemplate = aggregate.CatalogueRepository.GetExtendedProperties(ExtendedProperty.IsTemplate,aggregate).Any(p=> Equals(p.Value, "true"));
+
+        IsTemplate = aggregate.CatalogueRepository.GetExtendedProperties(ExtendedProperty.IsTemplate, aggregate)
+            .Any(p => Equals(p.Value, "true"));
 
         //is the aggregate part of cohort identification
         CohortIdentificationConfigurationIfAny = Aggregate.GetCohortIdentificationConfigurationIfAny();
-            
+
         //assume no join users
         JoinableUsersIfAny = Array.Empty<AggregateConfiguration>();
 
         //unless there's a cic
-        if(CohortIdentificationConfigurationIfAny != null)
+        if (CohortIdentificationConfigurationIfAny != null)
         {
             //with this aggregate as a joinable
-            JoinableDeclarationIfAny = CohortIdentificationConfigurationIfAny.GetAllJoinables().SingleOrDefault(j=>j.AggregateConfiguration_ID == Aggregate.ID);
+            JoinableDeclarationIfAny = CohortIdentificationConfigurationIfAny.GetAllJoinables()
+                .SingleOrDefault(j => j.AggregateConfiguration_ID == Aggregate.ID);
 
             //then get the joinable users if any and use that array
             if (JoinableDeclarationIfAny != null)
                 JoinableUsersIfAny = JoinableDeclarationIfAny.Users.Select(u => u.AggregateConfiguration).ToArray();
-
         }
 
         //if so we should find out all the containers in the tree (Containers are INTERSECT\EXCEPT\UNION)
@@ -102,12 +103,9 @@ public AggregateConfigurationCombineable(AggregateConfiguration aggregate)
             AllContainersInTreeIfPartOfOne.Add(root);
             AllContainersInTreeIfPartOfOne.AddRange(root.GetAllSubContainersRecursively());
         }
-            
+
         ContainerIfAny = Aggregate.GetCohortAggregateContainerIfAny();
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/CacheProgressCombineable.cs b/Rdmp.Core/CommandExecution/Combining/CacheProgressCombineable.cs
index 155c99427e..87d6fbc633 100644
--- a/Rdmp.Core/CommandExecution/Combining/CacheProgressCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CacheProgressCombineable.cs
@@ -20,8 +20,5 @@ public CacheProgressCombineable(CacheProgress cacheProgress)
         CacheProgress = cacheProgress;
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/CatalogueCombineable.cs b/Rdmp.Core/CommandExecution/Combining/CatalogueCombineable.cs
index 69fd937488..6c075818b6 100644
--- a/Rdmp.Core/CommandExecution/Combining/CatalogueCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CatalogueCombineable.cs
@@ -18,20 +18,20 @@ public class CatalogueCombineable : ICombineToMakeCommand, IHasFolderCombineable
 {
     public bool ContainsAtLeastOneExtractionIdentifier { get; private set; }
     public Catalogue Catalogue { get; set; }
-    public CohortIdentificationConfiguration.ChooseWhichExtractionIdentifierToUseFromManyHandler ResolveMultipleExtractionIdentifiers { get; set; }
+
+    public CohortIdentificationConfiguration.ChooseWhichExtractionIdentifierToUseFromManyHandler
+        ResolveMultipleExtractionIdentifiers { get; set; }
 
     public IHasFolder Folderable => Catalogue;
 
     public CatalogueCombineable(Catalogue catalogue)
     {
         Catalogue = catalogue;
-        ContainsAtLeastOneExtractionIdentifier = catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Any(e => e.IsExtractionIdentifier);
+        ContainsAtLeastOneExtractionIdentifier = catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Any(e => e.IsExtractionIdentifier);
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 
     /// <summary>
     /// Creates a new AggregateConfiguration based on the Catalogue and returns it as an <see cref="AggregateConfigurationCombineable"/>, you should only use this method during EXECUTE as you do not
@@ -42,14 +42,16 @@ public string GetSqlString()
     /// <param name="importMandatoryFilters"></param>
     /// <param name="caller"></param>
     /// <returns></returns>
-    public AggregateConfigurationCombineable GenerateAggregateConfigurationFor(IBasicActivateItems activator,CohortAggregateContainer cohortAggregateContainer,bool importMandatoryFilters=true, [CallerMemberName] string caller = null)
+    public AggregateConfigurationCombineable GenerateAggregateConfigurationFor(IBasicActivateItems activator,
+        CohortAggregateContainer cohortAggregateContainer, bool importMandatoryFilters = true,
+        [CallerMemberName] string caller = null)
     {
         var cic = cohortAggregateContainer.GetCohortIdentificationConfiguration();
 
         if (cic == null)
             return null;
 
-        return GenerateAggregateConfigurationFor(activator,cic, importMandatoryFilters);
+        return GenerateAggregateConfigurationFor(activator, cic, importMandatoryFilters);
     }
 
     public AggregateConfigurationCombineable GenerateAggregateConfigurationFor(IBasicActivateItems activator,
@@ -58,7 +60,7 @@ public AggregateConfigurationCombineable GenerateAggregateConfigurationFor(IBasi
     {
         var newAggregate = cic.CreateNewEmptyConfigurationForCatalogue(Catalogue,
             ResolveMultipleExtractionIdentifiers ??
-            ((a,b)=> CohortCombineToCreateCommandHelper.PickOneExtractionIdentifier(activator,a, b)),
+            ((a, b) => CohortCombineToCreateCommandHelper.PickOneExtractionIdentifier(activator, a, b)),
             importMandatoryFilters);
         return new AggregateConfigurationCombineable(newAggregate);
     }
diff --git a/Rdmp.Core/CommandExecution/Combining/CatalogueItemCombineable.cs b/Rdmp.Core/CommandExecution/Combining/CatalogueItemCombineable.cs
index be98662a5c..575cf125f5 100644
--- a/Rdmp.Core/CommandExecution/Combining/CatalogueItemCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CatalogueItemCombineable.cs
@@ -29,7 +29,8 @@ public CatalogueItemCombineable(CatalogueItem[] catalogueItems)
 
     public string GetSqlString()
     {
-        var strings = CatalogueItems.Select(ci => ci.ExtractionInformation?.SelectSQL).Where(v => !string.IsNullOrEmpty(v)).ToArray();
+        var strings = CatalogueItems.Select(ci => ci.ExtractionInformation?.SelectSQL)
+            .Where(v => !string.IsNullOrEmpty(v)).ToArray();
         return string.Join(Environment.NewLine, strings);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/CohortAggregateContainerCombineable.cs b/Rdmp.Core/CommandExecution/Combining/CohortAggregateContainerCombineable.cs
index 14557bdf46..44c9d81d4d 100644
--- a/Rdmp.Core/CommandExecution/Combining/CohortAggregateContainerCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CohortAggregateContainerCombineable.cs
@@ -16,7 +16,7 @@ public class CohortAggregateContainerCombineable : ICombineToMakeCommand
 {
     public CohortAggregateContainer ParentContainerIfAny { get; private set; }
     public CohortAggregateContainer AggregateContainer { get; private set; }
-    public List<CohortAggregateContainer> AllSubContainersRecursively  { get; private set; }
+    public List<CohortAggregateContainer> AllSubContainersRecursively { get; private set; }
 
     public CohortAggregateContainerCombineable(CohortAggregateContainer aggregateContainer)
     {
@@ -26,10 +26,6 @@ public CohortAggregateContainerCombineable(CohortAggregateContainer aggregateCon
         ParentContainerIfAny = AggregateContainer.GetParentContainerIfAny();
     }
 
-        
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/CohortCombineToCreateCommandHelper.cs b/Rdmp.Core/CommandExecution/Combining/CohortCombineToCreateCommandHelper.cs
index c5eb9c6c56..e75dbd5c25 100644
--- a/Rdmp.Core/CommandExecution/Combining/CohortCombineToCreateCommandHelper.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CohortCombineToCreateCommandHelper.cs
@@ -11,8 +11,8 @@ namespace Rdmp.Core.CommandExecution.Combining;
 
 public class CohortCombineToCreateCommandHelper
 {
-
-    public static ExtractionInformation PickOneExtractionIdentifier(IBasicActivateItems activator,ICatalogue c, ExtractionInformation[] candidates)
+    public static ExtractionInformation PickOneExtractionIdentifier(IBasicActivateItems activator, ICatalogue c,
+        ExtractionInformation[] candidates)
     {
         if (candidates.Length == 0)
             throw new Exception(
@@ -25,7 +25,7 @@ public static ExtractionInformation PickOneExtractionIdentifier(IBasicActivateIt
 
         if (selected != null)
             return (ExtractionInformation)selected;
-            
+
         throw new Exception("User refused to choose an extraction identifier");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/CohortIdentificationConfigurationCommand.cs b/Rdmp.Core/CommandExecution/Combining/CohortIdentificationConfigurationCommand.cs
index 648bc0f323..c561be77a7 100644
--- a/Rdmp.Core/CommandExecution/Combining/CohortIdentificationConfigurationCommand.cs
+++ b/Rdmp.Core/CommandExecution/Combining/CohortIdentificationConfigurationCommand.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// <summary>
 /// <see cref="ICombineToMakeCommand"/> for an object of type <see cref="CohortAggregateContainer"/>
 /// </summary>
-public class CohortIdentificationConfigurationCommand:ICombineToMakeCommand, IHasFolderCombineable
+public class CohortIdentificationConfigurationCommand : ICombineToMakeCommand, IHasFolderCombineable
 {
     public CohortIdentificationConfiguration CohortIdentificationConfiguration { get; set; }
 
@@ -23,8 +23,5 @@ public CohortIdentificationConfigurationCommand(CohortIdentificationConfiguratio
         CohortIdentificationConfiguration = cohortIdentificationConfiguration;
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ColumnCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ColumnCombineable.cs
index 9f174d705a..1174352a46 100644
--- a/Rdmp.Core/CommandExecution/Combining/ColumnCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ColumnCombineable.cs
@@ -30,8 +30,5 @@ public ColumnCombineable(IColumn column)
     }
 
     /// <inheritdoc/>
-    public string GetSqlString()
-    {
-        return Column.SelectSQL;
-    }
+    public string GetSqlString() => Column.SelectSQL;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ColumnInfoCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ColumnInfoCombineable.cs
index 263100c8fe..149267a1a0 100644
--- a/Rdmp.Core/CommandExecution/Combining/ColumnInfoCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ColumnInfoCombineable.cs
@@ -19,7 +19,7 @@ public class ColumnInfoCombineable : ICombineToMakeCommand
 
     public ColumnInfoCombineable(ColumnInfo columnInfo)
     {
-        ColumnInfos = new []{columnInfo};
+        ColumnInfos = new[] { columnInfo };
     }
 
     public ColumnInfoCombineable(ColumnInfo[] columnInfos)
@@ -29,6 +29,6 @@ public ColumnInfoCombineable(ColumnInfo[] columnInfos)
 
     public string GetSqlString()
     {
-        return string.Join(Environment.NewLine,ColumnInfos.Select(c=>c.Name));
+        return string.Join(Environment.NewLine, ColumnInfos.Select(c => c.Name));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ContainerCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ContainerCombineable.cs
index 0b28acd1e2..71374364e8 100644
--- a/Rdmp.Core/CommandExecution/Combining/ContainerCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ContainerCombineable.cs
@@ -36,9 +36,6 @@ public ContainerCombineable(IContainer container)
         AllContainersInEntireTreeFromRootDown = root.GetAllSubContainersRecursively();
         AllContainersInEntireTreeFromRootDown.Add(root);
     }
-        
-    public string GetSqlString()
-    {
-        return null;
-    }
+
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/DataAccessCredentialsCombineable.cs b/Rdmp.Core/CommandExecution/Combining/DataAccessCredentialsCombineable.cs
index d64392f894..6fdbab931e 100644
--- a/Rdmp.Core/CommandExecution/Combining/DataAccessCredentialsCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/DataAccessCredentialsCombineable.cs
@@ -14,14 +14,11 @@ namespace Rdmp.Core.CommandExecution.Combining;
 public class DataAccessCredentialsCombineable : ICombineToMakeCommand
 {
     public DataAccessCredentials DataAccessCredentials { get; private set; }
-         
+
     public DataAccessCredentialsCombineable(DataAccessCredentials dataAccessCredentials)
     {
-        DataAccessCredentials = dataAccessCredentials; 
+        DataAccessCredentials = dataAccessCredentials;
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ExtractableCohortCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ExtractableCohortCombineable.cs
index e2d3eebffd..9c6803f80f 100644
--- a/Rdmp.Core/CommandExecution/Combining/ExtractableCohortCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ExtractableCohortCombineable.cs
@@ -19,7 +19,7 @@ public class ExtractableCohortCombineable : ICombineToMakeCommand
     public ExtractableCohort Cohort { get; set; }
 
     public Exception ErrorGettingCohortData { get; private set; }
-        
+
     public IExtractionConfiguration[] CompatibleExtractionConfigurations { get; set; }
     public Project[] CompatibleProjects { get; set; }
 
@@ -37,12 +37,10 @@ public ExtractableCohortCombineable(ExtractableCohort extractableCohort)
             return;
         }
 
-        CompatibleProjects = extractableCohort.Repository.GetAllObjectsWhere<Project>("ProjectNumber" , ExternalProjectNumber);
+        CompatibleProjects =
+            extractableCohort.Repository.GetAllObjectsWhere<Project>("ProjectNumber", ExternalProjectNumber);
         CompatibleExtractionConfigurations = CompatibleProjects.SelectMany(p => p.ExtractionConfigurations).ToArray();
     }
-        
-    public string GetSqlString()
-    {
-        return Cohort.WhereSQL();
-    }
+
+    public string GetSqlString() => Cohort.WhereSQL();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ExtractableDataSetCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ExtractableDataSetCombineable.cs
index db0f9507c5..eb1b4cd6b9 100644
--- a/Rdmp.Core/CommandExecution/Combining/ExtractableDataSetCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ExtractableDataSetCombineable.cs
@@ -18,7 +18,7 @@ public class ExtractableDataSetCombineable : ICombineToMakeCommand
 
     public ExtractableDataSetCombineable(ExtractableDataSet extractableDataSet)
     {
-        ExtractableDataSets = new ExtractableDataSet[]{extractableDataSet};
+        ExtractableDataSets = new ExtractableDataSet[] { extractableDataSet };
     }
 
     public ExtractableDataSetCombineable(ExtractableDataSet[] extractableDataSetArray)
@@ -28,12 +28,10 @@ public ExtractableDataSetCombineable(ExtractableDataSet[] extractableDataSetArra
 
     public ExtractableDataSetCombineable(ExtractableDataSetPackage extractableDataSetPackage)
     {
-        var repository = (IDataExportRepository) extractableDataSetPackage.Repository;
-        ExtractableDataSets = repository.GetAllDataSets(extractableDataSetPackage, repository.GetAllObjects<ExtractableDataSet>());
+        var repository = (IDataExportRepository)extractableDataSetPackage.Repository;
+        ExtractableDataSets =
+            repository.GetAllDataSets(extractableDataSetPackage, repository.GetAllObjects<ExtractableDataSet>());
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ExtractionFilterParameterSetCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ExtractionFilterParameterSetCombineable.cs
index f22bad81b8..f3c3c45ed4 100644
--- a/Rdmp.Core/CommandExecution/Combining/ExtractionFilterParameterSetCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ExtractionFilterParameterSetCombineable.cs
@@ -11,14 +11,12 @@ namespace Rdmp.Core.CommandExecution.Combining;
 public class ExtractionFilterParameterSetCombineable : ICombineToMakeCommand
 {
     public ExtractionFilterParameterSet ParameterSet { get; }
+
     public ExtractionFilterParameterSetCombineable(ExtractionFilterParameterSet parameterSet)
     {
         ParameterSet = parameterSet;
     }
 
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/FileCollectionCombineable.cs b/Rdmp.Core/CommandExecution/Combining/FileCollectionCombineable.cs
index a33209653c..d4b9f7097d 100644
--- a/Rdmp.Core/CommandExecution/Combining/FileCollectionCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/FileCollectionCombineable.cs
@@ -18,13 +18,13 @@ public class FileCollectionCombineable : ICombineToMakeCommand
     /// The files which have been selected for combining
     /// </summary>
     public FileInfo[] Files { get; set; }
-        
+
 
     /// <summary>
     /// True if the <see cref="Files"/> are serialized <see cref="ShareDefinition"/> files
     /// </summary>
     public bool IsShareDefinition { get; set; }
-        
+
     /// <summary>
     /// Creates a new instance in which the user is seeking to combine the given <paramref name="files"/>
     /// </summary>
@@ -33,12 +33,8 @@ public FileCollectionCombineable(FileInfo[] files)
     {
         Files = files;
         IsShareDefinition = files.Length == 1 && files[0].Extension == ".sd";
-
     }
 
     /// <inheritdoc/>
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/FilterCombineable.cs b/Rdmp.Core/CommandExecution/Combining/FilterCombineable.cs
index bb321ccc06..8086b42980 100644
--- a/Rdmp.Core/CommandExecution/Combining/FilterCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/FilterCombineable.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 public class FilterCombineable : ICombineToMakeCommand
 {
     public IFilter Filter { get; private set; }
-        
+
     public IContainer ImmediateContainerIfAny { get; private set; }
     public IContainer RootContainerIfAny { get; private set; }
 
@@ -24,7 +24,7 @@ public class FilterCombineable : ICombineToMakeCommand
     /// <summary>
     /// All the containers that are in the current filter tree (includes the Root).
     /// </summary>
-    public List<IContainer> AllContainersInEntireTreeFromRootDown { get; private set; } 
+    public List<IContainer> AllContainersInEntireTreeFromRootDown { get; private set; }
 
     public FilterCombineable(IFilter filter)
     {
@@ -34,29 +34,23 @@ public FilterCombineable(IFilter filter)
 
         if (ImmediateContainerIfAny != null)
             SourceCatalogueIfAny = ImmediateContainerIfAny.GetCatalogueIfAny();
-            
     }
-        
+
     private void FindContainers()
     {
         ImmediateContainerIfAny = Filter.FilterContainer;
         AllContainersInEntireTreeFromRootDown = new List<IContainer>();
-            
-        if(ImmediateContainerIfAny != null)
+
+        if (ImmediateContainerIfAny != null)
         {
             RootContainerIfAny = ImmediateContainerIfAny.GetRootContainerOrSelf();
-                
+
             //so we can determine whether we are being draged into a new heirarchy tree (copy) or just being dragged around inside our own tree (move)
             AllContainersInEntireTreeFromRootDown.Add(RootContainerIfAny);
             AllContainersInEntireTreeFromRootDown.AddRange(RootContainerIfAny.GetAllSubContainersRecursively());
-                
         }
     }
 
-        
 
-    public string GetSqlString()
-    {
-        return Filter.WhereSQL;
-    }
+    public string GetSqlString() => Filter.WhereSQL;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/IHasFolderCombineable.cs b/Rdmp.Core/CommandExecution/Combining/IHasFolderCombineable.cs
index 0b016c9b70..69dcc33bab 100644
--- a/Rdmp.Core/CommandExecution/Combining/IHasFolderCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/IHasFolderCombineable.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// <see cref="ICombineableSource"/> interface for anyone who hosts an <see cref="IHasFolder"/> object
 /// and wants to support drag and drop onto folders
 /// </summary>
-public interface IHasFolderCombineable: ICombineToMakeCommand
+public interface IHasFolderCombineable : ICombineToMakeCommand
 {
     IHasFolder Folderable { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/LoadMetadataCombineable.cs b/Rdmp.Core/CommandExecution/Combining/LoadMetadataCombineable.cs
index 2c3b461e87..a84e43713c 100644
--- a/Rdmp.Core/CommandExecution/Combining/LoadMetadataCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/LoadMetadataCombineable.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// </summary>
 public class LoadMetadataCombineable : ICombineToMakeCommand, IHasFolderCombineable
 {
-    public LoadMetadata LoadMetadata { get;}
+    public LoadMetadata LoadMetadata { get; }
 
     public IHasFolder Folderable => LoadMetadata;
 
@@ -25,8 +25,5 @@ public LoadMetadataCombineable(LoadMetadata lmd)
         LoadMetadata = lmd;
     }
 
-    public string GetSqlString()
-    {
-        return "";
-    }
+    public string GetSqlString() => "";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ManyCataloguesCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ManyCataloguesCombineable.cs
index 3382b6ee91..ac1ead2247 100644
--- a/Rdmp.Core/CommandExecution/Combining/ManyCataloguesCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ManyCataloguesCombineable.cs
@@ -28,8 +28,5 @@ public ManyCataloguesCombineable(Catalogue[] catalogues)
     }
 
     /// <inheritdoc/>
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/PipelineCombineable.cs b/Rdmp.Core/CommandExecution/Combining/PipelineCombineable.cs
index 11c8c5f3fc..aa278b4ea3 100644
--- a/Rdmp.Core/CommandExecution/Combining/PipelineCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/PipelineCombineable.cs
@@ -23,8 +23,5 @@ public PipelineCombineable(Pipeline pipeline)
         IsEmpty = Pipeline.PipelineComponents.Count == 0;
     }
 
-    public string GetSqlString()
-    {
-        return "";
-    }
+    public string GetSqlString() => "";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ProcessTaskCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ProcessTaskCombineable.cs
index beec0dfa72..7866f62b2e 100644
--- a/Rdmp.Core/CommandExecution/Combining/ProcessTaskCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ProcessTaskCombineable.cs
@@ -20,8 +20,5 @@ public ProcessTaskCombineable(ProcessTask processTask)
         ProcessTask = processTask;
     }
 
-    public string GetSqlString()
-    {
-        return null;
-    }
+    public string GetSqlString() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/ProjectCombineable.cs b/Rdmp.Core/CommandExecution/Combining/ProjectCombineable.cs
index 5da5f4238c..446e299348 100644
--- a/Rdmp.Core/CommandExecution/Combining/ProjectCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/ProjectCombineable.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// </summary>
 public class ProjectCombineable : ICombineToMakeCommand, IHasFolderCombineable
 {
-    public Project  Project { get; private set; }
+    public Project Project { get; private set; }
 
     public IHasFolder Folderable => Project;
 
@@ -25,8 +25,5 @@ public ProjectCombineable(Project project)
         Project = project;
     }
 
-    public string GetSqlString()
-    {
-        return "";
-    }
+    public string GetSqlString() => "";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/SqlTextOnlyCombineable.cs b/Rdmp.Core/CommandExecution/Combining/SqlTextOnlyCombineable.cs
index ea0bf72e83..591dd56935 100644
--- a/Rdmp.Core/CommandExecution/Combining/SqlTextOnlyCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/SqlTextOnlyCombineable.cs
@@ -9,7 +9,7 @@ namespace Rdmp.Core.CommandExecution.Combining;
 /// <summary>
 /// <see cref="ICombineToMakeCommand"/> which contains only Sql and cannot otherwise be combined with other objects
 /// </summary>
-public class SqlTextOnlyCombineable:ICombineToMakeCommand
+public class SqlTextOnlyCombineable : ICombineToMakeCommand
 {
     private readonly string _sql;
 
@@ -17,8 +17,6 @@ public SqlTextOnlyCombineable(string sql)
     {
         _sql = sql;
     }
-    public string GetSqlString()
-    {
-        return _sql;
-    }
+
+    public string GetSqlString() => _sql;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/Combining/TableInfoCombineable.cs b/Rdmp.Core/CommandExecution/Combining/TableInfoCombineable.cs
index de665f1ae4..2f80e69a6c 100644
--- a/Rdmp.Core/CommandExecution/Combining/TableInfoCombineable.cs
+++ b/Rdmp.Core/CommandExecution/Combining/TableInfoCombineable.cs
@@ -28,8 +28,5 @@ public TableInfoCombineable(TableInfo tableInfo)
     }
 
     /// <inheritdoc/>
-    public string GetSqlString()
-    {
-        return TableInfo.Name;
-    }
+    public string GetSqlString() => TableInfo.Name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/CommandEventArgs.cs b/Rdmp.Core/CommandExecution/CommandEventArgs.cs
index 5677785787..9677d1fa25 100644
--- a/Rdmp.Core/CommandExecution/CommandEventArgs.cs
+++ b/Rdmp.Core/CommandExecution/CommandEventArgs.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.CommandExecution;
 
-public class CommandEventArgs:EventArgs
+public class CommandEventArgs : EventArgs
 {
     public IAtomicCommand Command { get; }
 
diff --git a/Rdmp.Core/CommandExecution/CommandFactoryBase.cs b/Rdmp.Core/CommandExecution/CommandFactoryBase.cs
index 7c917ab953..8f3364b886 100644
--- a/Rdmp.Core/CommandExecution/CommandFactoryBase.cs
+++ b/Rdmp.Core/CommandExecution/CommandFactoryBase.cs
@@ -19,16 +19,13 @@ public abstract class CommandFactoryBase
     /// <returns></returns>
     public static bool Is<T>(object o, out T match)
     {
-        if(o is T o1)
+        if (o is T o1)
         {
             match = o1;
             return true;
         }
 
-        if(o is IMasqueradeAs m)
-        {
-            return Is<T>(m.MasqueradingAs(),out match);
-        }
+        if (o is IMasqueradeAs m) return Is<T>(m.MasqueradingAs(), out match);
 
         match = default;
         return false;
diff --git a/Rdmp.Core/CommandExecution/CommandInvoker.cs b/Rdmp.Core/CommandExecution/CommandInvoker.cs
index fab6f39b92..0b3071e03d 100644
--- a/Rdmp.Core/CommandExecution/CommandInvoker.cs
+++ b/Rdmp.Core/CommandExecution/CommandInvoker.cs
@@ -30,7 +30,7 @@ public class CommandInvoker
 {
     private readonly IBasicActivateItems _basicActivator;
     private readonly IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
-        
+
     /// <summary>
     /// Delegates provided by <see cref="_basicActivator"/> for fulfilling constructor arguments of the key Type
     /// </summary>
@@ -40,7 +40,7 @@ public class CommandInvoker
     /// Called when the user attempts to run a command marked <see cref="ICommandExecution.IsImpossible"/>
     /// </summary>
     public event EventHandler<CommandEventArgs> CommandImpossible;
-        
+
     /// <summary>
     /// Called when a command completes successfully
     /// </summary>
@@ -56,9 +56,10 @@ public CommandInvoker(IBasicActivateItems basicActivator)
 
         AddDelegate(typeof(ICatalogueRepository), true, p => _repositoryLocator.CatalogueRepository);
         AddDelegate(typeof(IDataExportRepository), true, p => _repositoryLocator.DataExportRepository);
-        AddDelegate(_basicActivator.GetType() , true, p => _basicActivator);
+        AddDelegate(_basicActivator.GetType(), true, p => _basicActivator);
         AddDelegate(typeof(IRDMPPlatformRepositoryServiceLocator), true, p => _repositoryLocator);
-        AddDelegate(typeof(DirectoryInfo), false, p => _basicActivator.SelectDirectory($"Enter Directory for '{p.Name}'"));
+        AddDelegate(typeof(DirectoryInfo), false,
+            p => _basicActivator.SelectDirectory($"Enter Directory for '{p.Name}'"));
         AddDelegate(typeof(FileInfo), false, p => _basicActivator.SelectFile($"Enter File for '{p.Name}'"));
 
         // Is the Global Check Notifier the best here? 
@@ -67,71 +68,77 @@ public CommandInvoker(IBasicActivateItems basicActivator)
         AddDelegate(typeof(Uri), false, p => new Uri(SelectText(p)));
         AddDelegate(typeof(Regex), false, p => new Regex(SelectText(p)));
 
-        AddDelegate(typeof(string), false,SelectText);
+        AddDelegate(typeof(string), false, SelectText);
 
-        AddDelegate(typeof(Type), false,p => 
+        AddDelegate(typeof(Type), false, p =>
             _basicActivator.SelectType(
                 new DialogArgs
                 {
                     WindowTitle = $"Type needed for {p.Name}",
                     InitialSearchText = p.DefaultValue?.ToString()
                 }, p.DemandIfAny?.TypeOf, out var chosen)
-                ? chosen 
+                ? chosen
                 : throw new OperationCanceledException());
 
-        AddDelegate(typeof(DiscoveredDatabase),false,p=>_basicActivator.SelectDatabase(true, GetPromptFor(p)));
-        AddDelegate(typeof(DiscoveredTable),false,p=>_basicActivator.SelectTable(true, GetPromptFor(p)));
+        AddDelegate(typeof(DiscoveredDatabase), false, p => _basicActivator.SelectDatabase(true, GetPromptFor(p)));
+        AddDelegate(typeof(DiscoveredTable), false, p => _basicActivator.SelectTable(true, GetPromptFor(p)));
 
-        AddDelegate(typeof(DatabaseEntity), false, p => 
+        AddDelegate(typeof(DatabaseEntity), false, p =>
             _basicActivator.SelectOne(
                 new DialogArgs
                 {
                     WindowTitle = GetPromptFor(p),
-                    InitialObjectSelection = p.DefaultValue is IMapsDirectlyToDatabaseTable m ? new IMapsDirectlyToDatabaseTable[] { m } : null,
+                    InitialObjectSelection = p.DefaultValue is IMapsDirectlyToDatabaseTable m
+                        ? new IMapsDirectlyToDatabaseTable[] { m }
+                        : null,
                     InitialSearchText = p.DefaultValue?.ToString()
                 }, GetAllObjectsOfType(p.Type)));
 
         AddDelegate(typeof(IPipeline), false, SelectPipeline);
-        AddDelegate(typeof(IMightBeDeprecated),false, SelectOne<IMightBeDeprecated>, true);
-        AddDelegate(typeof(IDisableable),false, SelectOne<IDisableable>, true);
-        AddDelegate(typeof(INamed),false, SelectOne<INamed>, true);
-        AddDelegate(typeof(IDeleteable[]), false, SelectMany<IDeleteable>,true);
-        AddDelegate(typeof(IDeleteable),false, SelectOne<IDeleteable>, true);
-        AddDelegate(typeof(ILoggedActivityRootObject),false, SelectOne<ILoggedActivityRootObject>);
+        AddDelegate(typeof(IMightBeDeprecated), false, SelectOne<IMightBeDeprecated>, true);
+        AddDelegate(typeof(IDisableable), false, SelectOne<IDisableable>, true);
+        AddDelegate(typeof(INamed), false, SelectOne<INamed>, true);
+        AddDelegate(typeof(IDeleteable[]), false, SelectMany<IDeleteable>, true);
+        AddDelegate(typeof(IDeleteable), false, SelectOne<IDeleteable>, true);
+        AddDelegate(typeof(ILoggedActivityRootObject), false, SelectOne<ILoggedActivityRootObject>);
         AddDelegate(typeof(ICollectSqlParameters), false, SelectOne<ICollectSqlParameters>);
-        AddDelegate(typeof(IRootFilterContainerHost),false, SelectOne<IRootFilterContainerHost>);            
+        AddDelegate(typeof(IRootFilterContainerHost), false, SelectOne<IRootFilterContainerHost>);
 
-        AddDelegate(typeof(Enum),false,p=>_basicActivator.SelectEnum(
-            new DialogArgs { 
+        AddDelegate(typeof(Enum), false, p => _basicActivator.SelectEnum(
+            new DialogArgs
+            {
                 WindowTitle = GetPromptFor(p),
                 InitialSearchText = p.DefaultValue?.ToString()
-            } , p.Type, out var chosen)?chosen:null);
+            }, p.Type, out var chosen)
+            ? chosen
+            : null);
 
 
-        _argumentDelegates.Add(new CommandInvokerArrayDelegate(typeof(IMapsDirectlyToDatabaseTable),false,p=>
+        _argumentDelegates.Add(new CommandInvokerArrayDelegate(typeof(IMapsDirectlyToDatabaseTable), false, p =>
         {
             var available = GetAllObjectsOfType(p.Type.GetElementType());
             var result = _basicActivator.SelectMany(
                 new DialogArgs
                 {
                     WindowTitle = GetPromptFor(p),
-                    InitialObjectSelection = p.DefaultValue == null || p.DefaultValue == DBNull.Value ? null :
-                        ((IEnumerable<IMapsDirectlyToDatabaseTable>)p.DefaultValue).ToArray()
-                },p.Type.GetElementType(), available);
-                
-            if(result == null)
+                    InitialObjectSelection = p.DefaultValue == null || p.DefaultValue == DBNull.Value
+                        ? null
+                        : ((IEnumerable<IMapsDirectlyToDatabaseTable>)p.DefaultValue).ToArray()
+                }, p.Type.GetElementType(), available);
+
+            if (result == null)
                 return null;
 
-            var typedArray = Array.CreateInstance(p.Type.GetElementType(),result.Length);
-            for(var i =0;i<typedArray.Length;i++)
-                typedArray.SetValue(result[i],i);
-                     
+            var typedArray = Array.CreateInstance(p.Type.GetElementType(), result.Length);
+            for (var i = 0; i < typedArray.Length; i++)
+                typedArray.SetValue(result[i], i);
+
             return typedArray;
         }));
-                   
+
 
         AddDelegate(typeof(ICheckable), false,
-            p=>_basicActivator.SelectOne(GetPromptFor(p), 
+            p => _basicActivator.SelectOne(GetPromptFor(p),
                 _basicActivator.GetAll<ICheckable>()
                     .Where(p.Type.IsInstanceOfType)
                     .Cast<IMapsDirectlyToDatabaseTable>()
@@ -145,57 +152,49 @@ public CommandInvoker(IBasicActivateItems basicActivator)
                     .Where(p.Type.IsInstanceOfType)
                     .ToArray()));
 
-        AddDelegate(typeof(IPatcher),false, p =>
+        AddDelegate(typeof(IPatcher), false, p =>
             {
-                if(!_basicActivator.SelectType("Select Patcher (if any)", typeof(IPatcher), out var patcherType))
+                if (!_basicActivator.SelectType("Select Patcher (if any)", typeof(IPatcher), out var patcherType))
                     throw new OperationCanceledException();
 
                 if (patcherType == null)
                     return null;
-                    
+
                 try
                 {
                     return Activator.CreateInstance(patcherType);
                 }
                 catch (Exception e)
                 {
-                    throw new Exception($"Failed to call/find blank constructor of IPatcher Type '{patcherType}'",e);
+                    throw new Exception($"Failed to call/find blank constructor of IPatcher Type '{patcherType}'", e);
                 }
             }
         );
 
-        _argumentDelegates.Add(new CommandInvokerValueTypeDelegate(p=>
-            _basicActivator.SelectValueType(GetPromptFor(p), p.Type, p.DefaultValue, out var chosen) 
-                ? chosen 
+        _argumentDelegates.Add(new CommandInvokerValueTypeDelegate(p =>
+            _basicActivator.SelectValueType(GetPromptFor(p), p.Type, p.DefaultValue, out var chosen)
+                ? chosen
                 : throw new OperationCanceledException()));
-
     }
 
-    private string SelectText(RequiredArgument p)
-    {
-        return
-            _basicActivator.TypeText(
-                new DialogArgs
-                {
-                    WindowTitle = "Value needed for parameter",
-                    EntryLabel = GetPromptFor(p)
-                }
-                , 1000, p.DefaultValue?.ToString(), out var result, false)
-                ? result
-                : throw new OperationCanceledException();
-    }
+    private string SelectText(RequiredArgument p) =>
+        _basicActivator.TypeText(
+            new DialogArgs
+            {
+                WindowTitle = "Value needed for parameter",
+                EntryLabel = GetPromptFor(p)
+            }
+            , 1000, p.DefaultValue?.ToString(), out var result, false)
+            ? result
+            : throw new OperationCanceledException();
 
-    private IPipeline SelectPipeline(RequiredArgument arg)
-    {
-        return (IPipeline)_basicActivator.SelectOne(GetPromptFor(arg), _basicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>().ToArray());
-    }
+    private IPipeline SelectPipeline(RequiredArgument arg) => (IPipeline)_basicActivator.SelectOne(GetPromptFor(arg),
+        _basicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>().ToArray());
 
-    private static string GetPromptFor(RequiredArgument p)
-    {
-        return $"Value needed for {p.Name} ({p.Type.Name})";
-    }
+    private static string GetPromptFor(RequiredArgument p) => $"Value needed for {p.Name} ({p.Type.Name})";
 
-    private void AddDelegate(Type type,bool isAuto, Func<RequiredArgument, object> func, bool requireExactMatch = false)
+    private void AddDelegate(Type type, bool isAuto, Func<RequiredArgument, object> func,
+        bool requireExactMatch = false)
     {
         _argumentDelegates.Add(new CommandInvokerDelegate(type, isAuto, func)
         {
@@ -203,10 +202,12 @@ private void AddDelegate(Type type,bool isAuto, Func<RequiredArgument, object> f
         });
     }
 
-        
+
     public IEnumerable<Type> GetSupportedCommands()
     {
-        return _basicActivator.RepositoryLocator.CatalogueRepository?.MEF?.GetAllTypes()?.Where(t=>WhyCommandNotSupported(t) is null) ?? throw new Exception("MEF property has not been initialized on the activator");
+        return _basicActivator.RepositoryLocator.CatalogueRepository?.MEF?.GetAllTypes()
+                   ?.Where(t => WhyCommandNotSupported(t) is null) ??
+               throw new Exception("MEF property has not been initialized on the activator");
     }
 
     /// <summary>
@@ -217,8 +218,9 @@ public IEnumerable<Type> GetSupportedCommands()
     /// <param name="picker"></param>
     public void ExecuteCommand(Type type, CommandLineObjectPicker picker)
     {
-        ExecuteCommand(GetConstructor(type,picker),picker);
+        ExecuteCommand(GetConstructor(type, picker), picker);
     }
+
     private void ExecuteCommand(ConstructorInfo constructorInfo, CommandLineObjectPicker picker)
     {
         var parameterValues = new List<object>();
@@ -235,16 +237,19 @@ private void ExecuteCommand(ConstructorInfo constructorInfo, CommandLineObjectPi
 
             //if it is an easy one to automatically fill e.g. IBasicActivateItems
             if (argDelegate != null && argDelegate.IsAuto)
+            {
                 parameterValues.Add(argDelegate.Run(required));
+            }
             else
                 //if the constructor argument is a picker, use the one passed in
             if (parameterInfo.ParameterType == typeof(CommandLineObjectPicker))
             {
-                if(picker == null)
-                    throw new ArgumentException($"Type {constructorInfo.DeclaringType} contained a constructor which took an {parameterInfo.ParameterType} but no picker was passed");
+                if (picker == null)
+                    throw new ArgumentException(
+                        $"Type {constructorInfo.DeclaringType} contained a constructor which took an {parameterInfo.ParameterType} but no picker was passed");
 
                 parameterValues.Add(picker);
-                    
+
                 //the parameters are expected to be consumed by the target constructors so its not really a problem if there are extra
                 complainAboutExtraParameters = false;
                 continue;
@@ -263,7 +268,7 @@ private void ExecuteCommand(ConstructorInfo constructorInfo, CommandLineObjectPi
                 }
 
                 // if user has not typed anything in for this parameter and it has a default value
-                if(picker.Length <= idx && parameterInfo.HasDefaultValue)
+                if (picker.Length <= idx && parameterInfo.HasDefaultValue)
                 {
                     // then we should use the default value
                     parameterValues.Add(parameterInfo.DefaultValue);
@@ -271,7 +276,8 @@ private void ExecuteCommand(ConstructorInfo constructorInfo, CommandLineObjectPi
                     continue;
                 }
 
-                throw new Exception($"Expected parameter at index {idx} to be a {parameterInfo.ParameterType} (for parameter '{parameterInfo.Name}') but it was {(idx >= picker.Length ? "Missing":picker[idx].RawValue)}");
+                throw new Exception(
+                    $"Expected parameter at index {idx} to be a {parameterInfo.ParameterType} (for parameter '{parameterInfo.Name}') but it was {(idx >= picker.Length ? "Missing" : picker[idx].RawValue)}");
             }
             else
             {
@@ -279,35 +285,28 @@ private void ExecuteCommand(ConstructorInfo constructorInfo, CommandLineObjectPi
             }
         }
 
-        if(picker != null && idx < picker.Length && complainAboutExtraParameters)
+        if (picker != null && idx < picker.Length && complainAboutExtraParameters)
             throw new Exception($"Unrecognised extra parameter {picker[idx].RawValue}");
 
         var instance = (IAtomicCommand)constructorInfo.Invoke(parameterValues.ToArray());
-        
+
         if (instance.IsImpossible)
         {
-            CommandImpossible?.Invoke(this,new CommandEventArgs(instance));
+            CommandImpossible?.Invoke(this, new CommandEventArgs(instance));
             return;
         }
 
         instance.Execute();
-        CommandCompleted?.Invoke(this,new CommandEventArgs(instance));
+        CommandCompleted?.Invoke(this, new CommandEventArgs(instance));
     }
 
-    public object GetValueForParameterOfType(PropertyInfo propertyInfo)
-    {
-        return GetValueForParameterOfType(new RequiredArgument(propertyInfo));
-    }
+    public object GetValueForParameterOfType(PropertyInfo propertyInfo) =>
+        GetValueForParameterOfType(new RequiredArgument(propertyInfo));
 
-    public object GetValueForParameterOfType(ParameterInfo parameterInfo)
-    {
-        return GetValueForParameterOfType(new RequiredArgument(parameterInfo));
-    }
+    public object GetValueForParameterOfType(ParameterInfo parameterInfo) =>
+        GetValueForParameterOfType(new RequiredArgument(parameterInfo));
 
-    public object GetValueForParameterOfType(RequiredArgument a)
-    {
-        return GetDelegate(a)?.Run(a);
-    }
+    public object GetValueForParameterOfType(RequiredArgument a) => GetDelegate(a)?.Run(a);
 
     private T SelectOne<T>(RequiredArgument p)
     {
@@ -315,68 +314,64 @@ private T SelectOne<T>(RequiredArgument p)
             new DialogArgs
             {
                 WindowTitle = GetPromptFor(p),
-                InitialObjectSelection = p.DefaultValue is IMapsDirectlyToDatabaseTable m ? new IMapsDirectlyToDatabaseTable[] { m } : null,
+                InitialObjectSelection = p.DefaultValue is IMapsDirectlyToDatabaseTable m
+                    ? new IMapsDirectlyToDatabaseTable[] { m }
+                    : null,
                 InitialSearchText = p.DefaultValue?.ToString()
             }
             , _basicActivator.GetAll(p.Type).Cast<IMapsDirectlyToDatabaseTable>().ToArray());
     }
-    private T[] SelectMany<T>(RequiredArgument p) 
-    {
-        return
-            _basicActivator.SelectMany(
-                    new DialogArgs
-                    {
-                        WindowTitle = p.Name,
-                        InitialObjectSelection = ((IEnumerable<T>)p.DefaultValue)?.Cast<IMapsDirectlyToDatabaseTable>().ToArray()
-                    }, typeof(T), _basicActivator.GetAll(p.Type).Cast<IMapsDirectlyToDatabaseTable>().ToArray())
-                ?.Cast<T>()?.ToArray() ?? throw new OperationCanceledException();
-    }
 
-    public string WhyCommandNotSupported(ConstructorInfo c)
-    {
-        return c.GetCustomAttribute<UseWithCommandLineAttribute>() != null
+    private T[] SelectMany<T>(RequiredArgument p) =>
+        _basicActivator.SelectMany(
+                new DialogArgs
+                {
+                    WindowTitle = p.Name,
+                    InitialObjectSelection =
+                        ((IEnumerable<T>)p.DefaultValue)?.Cast<IMapsDirectlyToDatabaseTable>().ToArray()
+                }, typeof(T), _basicActivator.GetAll(p.Type).Cast<IMapsDirectlyToDatabaseTable>().ToArray())
+            ?.Cast<T>()?.ToArray() ?? throw new OperationCanceledException();
+
+    public string WhyCommandNotSupported(ConstructorInfo c) =>
+        c.GetCustomAttribute<UseWithCommandLineAttribute>() != null
             ? null
             : c.GetParameters().Select(WhyCommandNotSupported).SkipWhile(string.IsNullOrEmpty).FirstOrDefault();
-    }
 
-    public string WhyCommandNotSupported(ParameterInfo p)
-    {
-        return GetDelegate(new RequiredArgument(p)) != null ? "":$"No delegate for {p.ParameterType}";
-    }
+    public string WhyCommandNotSupported(ParameterInfo p) =>
+        GetDelegate(new RequiredArgument(p)) != null ? "" : $"No delegate for {p.ParameterType}";
 
     private readonly ConcurrentDictionary<RequiredArgument, CommandInvokerDelegate> _delegateCache =
         new();
-    public CommandInvokerDelegate GetDelegate(RequiredArgument argument)
-    {
-        return _delegateCache.GetOrAdd(argument, GetDelegateCacheMiss);
-    }
+
+    public CommandInvokerDelegate GetDelegate(RequiredArgument argument) =>
+        _delegateCache.GetOrAdd(argument, GetDelegateCacheMiss);
+
     private CommandInvokerDelegate GetDelegateCacheMiss(RequiredArgument required)
     {
         // Special-case IMapsDirectlyToDatabaseTable and Enum, because the pickers can generate arbitrary subtypes of that
 
         CommandInvokerDelegate match;
         if (required.Type.IsAssignableTo(typeof(IMapsDirectlyToDatabaseTable)))
-            match=_argumentDelegates.FirstOrDefault(k => k.CanHandle(typeof(IMapsDirectlyToDatabaseTable))); 
+            match = _argumentDelegates.FirstOrDefault(k => k.CanHandle(typeof(IMapsDirectlyToDatabaseTable)));
         else if (required.Type.IsAssignableTo(typeof(Enum)))
             match = _argumentDelegates.FirstOrDefault(k => k.CanHandle(typeof(Enum)));
         else
-            match=_argumentDelegates.FirstOrDefault(k => k.CanHandle(required.Type));
+            match = _argumentDelegates.FirstOrDefault(k => k.CanHandle(required.Type));
 
-        if(match != null)
-        {
+        if (match != null)
             // prefer delegate if no user input required or running in interactive mode
-            if(match.IsAuto || _basicActivator.IsInteractive)
+            if (match.IsAuto || _basicActivator.IsInteractive)
                 return match;
-        }
 
 
         // use the default value (preferred if non interactive)
-        if(required.HasDefaultValue)
+        if (required.HasDefaultValue)
             return new CommandInvokerFixedValueDelegate(required.Type, required.DefaultValue);
 
         // return delegate anyway (could be null)
         return match;
     }
+
     public string WhyCommandNotSupported(Type t)
     {
         if (t.IsAbstract)
@@ -391,13 +386,12 @@ public string WhyCommandNotSupported(Type t)
 
         try
         {
-            var constructor = GetConstructor(t, new CommandLineObjectPicker(Array.Empty<string>(),_basicActivator));
+            var constructor = GetConstructor(t, new CommandLineObjectPicker(Array.Empty<string>(), _basicActivator));
 
             if (constructor == null)
                 return "No constructor";
 
             return WhyCommandNotSupported(constructor);
-
         }
         catch (Exception e)
         {
@@ -410,10 +404,7 @@ public string WhyCommandNotSupported(Type t)
     /// </summary>
     /// <param name="type"></param>
     /// <returns></returns>
-    public virtual ConstructorInfo GetConstructor(Type type)
-    {
-        return GetConstructor(type, null);
-    }
+    public virtual ConstructorInfo GetConstructor(Type type) => GetConstructor(type, null);
 
     /// <summary>
     /// Returns the first best constructor on the <paramref name="type"/> preferring those decorated with <see cref="UseWithCommandLineAttribute"/>
@@ -431,28 +422,31 @@ public virtual ConstructorInfo GetConstructor(Type type, CommandLineObjectPicker
         ConstructorInfo[] importDecorated = null;
 
         //If we have a picker, look for a constructor that wants to run from the command line
-        if(picker != null)
-            importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof(UseWithCommandLineAttribute))).ToArray();
+        if (picker != null)
+            importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof(UseWithCommandLineAttribute)))
+                .ToArray();
 
         //otherwise look for a regular decorated constructor
-        if(importDecorated == null || !importDecorated.Any())
-            importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof(UseWithObjectConstructorAttribute))).ToArray();
+        if (importDecorated == null || !importDecorated.Any())
+            importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof(UseWithObjectConstructorAttribute)))
+                .ToArray();
 
         if (importDecorated.Any())
             return importDecorated[0];
 
         return constructors[0];
     }
+
     private IMapsDirectlyToDatabaseTable[] GetAllObjectsOfType(Type type)
     {
         if (type.IsAbstract || type.IsInterface)
             return _basicActivator.GetAll(type).ToArray();
 
         if (_repositoryLocator.CatalogueRepository.SupportsObjectType(type))
-            return  _repositoryLocator.CatalogueRepository.GetAllObjects(type).ToArray();
+            return _repositoryLocator.CatalogueRepository.GetAllObjects(type).ToArray();
         if (_repositoryLocator.DataExportRepository.SupportsObjectType(type))
             return _repositoryLocator.DataExportRepository.GetAllObjects(type).ToArray();
-            
+
         return null;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/CommandInvokerArrayDelegate.cs b/Rdmp.Core/CommandExecution/CommandInvokerArrayDelegate.cs
index 341c3a22f9..096947f168 100644
--- a/Rdmp.Core/CommandExecution/CommandInvokerArrayDelegate.cs
+++ b/Rdmp.Core/CommandExecution/CommandInvokerArrayDelegate.cs
@@ -23,15 +23,11 @@ internal class CommandInvokerArrayDelegate : CommandInvokerDelegate
     /// <param name="element">The base element type of your array e.g. <see cref="IMapsDirectlyToDatabaseTable"/>(should not be an array itself)</param>
     /// <param name="isAuto">True if the <paramref name="run"/> never requires user input</param>
     /// <param name="run">Method to invoke to fetch an instance when needed</param>
-    public CommandInvokerArrayDelegate(Type element,bool isAuto,Func<RequiredArgument,object> run):base(element,isAuto,run)
+    public CommandInvokerArrayDelegate(Type element, bool isAuto, Func<RequiredArgument, object> run) : base(element,
+        isAuto, run)
     {
-            
     }
 
     /// <inheritdoc/>
-    public override bool CanHandle(Type t)
-    {
-        return t.IsArray && HandledType.IsAssignableFrom(t.GetElementType());
-    }
-        
+    public override bool CanHandle(Type t) => t.IsArray && HandledType.IsAssignableFrom(t.GetElementType());
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/CommandInvokerDelegate.cs b/Rdmp.Core/CommandExecution/CommandInvokerDelegate.cs
index 5e4d9af456..6cedccb33a 100644
--- a/Rdmp.Core/CommandExecution/CommandInvokerDelegate.cs
+++ b/Rdmp.Core/CommandExecution/CommandInvokerDelegate.cs
@@ -27,7 +27,7 @@ public class CommandInvokerDelegate
     /// <summary>
     /// The method to run when it is time to pick an object for the give <see cref="RequiredArgument"/>
     /// </summary>
-    public Func<RequiredArgument,object> Run { get; }
+    public Func<RequiredArgument, object> Run { get; }
 
     /// <summary>
     /// Set to true to require <see cref="HandledType"/> to exactly match candidates.  False to identify
@@ -53,8 +53,5 @@ public CommandInvokerDelegate(Type handledType, bool isAuto, Func<RequiredArgume
     /// </summary>
     /// <param name="t">The type of object you need</param>
     /// <returns></returns>
-    public virtual bool CanHandle(Type t)
-    {
-        return HandledType==t || (!RequireExactMatch && HandledType.IsAssignableTo(t));
-    }
+    public virtual bool CanHandle(Type t) => HandledType == t || (!RequireExactMatch && HandledType.IsAssignableTo(t));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/CommandInvokerFixedValueDelegate.cs b/Rdmp.Core/CommandExecution/CommandInvokerFixedValueDelegate.cs
index bdde377d63..b3a8d96ed9 100644
--- a/Rdmp.Core/CommandExecution/CommandInvokerFixedValueDelegate.cs
+++ b/Rdmp.Core/CommandExecution/CommandInvokerFixedValueDelegate.cs
@@ -14,13 +14,9 @@ namespace Rdmp.Core.CommandExecution;
 /// </summary>
 internal class CommandInvokerFixedValueDelegate : CommandInvokerDelegate
 {
-    public CommandInvokerFixedValueDelegate(Type type,object o):base(type,false,p=>o)
+    public CommandInvokerFixedValueDelegate(Type type, object o) : base(type, false, p => o)
     {
-            
     }
 
-    public override bool CanHandle(Type t)
-    {
-        return HandledType==t;
-    }
+    public override bool CanHandle(Type t) => HandledType == t;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/CommandInvokerValueTypeDelegate.cs b/Rdmp.Core/CommandExecution/CommandInvokerValueTypeDelegate.cs
index f7874656af..fa9d1a4b4c 100644
--- a/Rdmp.Core/CommandExecution/CommandInvokerValueTypeDelegate.cs
+++ b/Rdmp.Core/CommandExecution/CommandInvokerValueTypeDelegate.cs
@@ -14,13 +14,10 @@ namespace Rdmp.Core.CommandExecution;
 internal class CommandInvokerValueTypeDelegate : CommandInvokerDelegate
 {
     /// <inheritdoc />
-    public CommandInvokerValueTypeDelegate(Func<RequiredArgument,object> run):base(typeof(object),false,run)
-    {            
+    public CommandInvokerValueTypeDelegate(Func<RequiredArgument, object> run) : base(typeof(object), false, run)
+    {
     }
 
     /// <inheritdoc/>
-    public override bool CanHandle(Type t)
-    {
-        return t.IsValueType && !typeof(Enum).IsAssignableFrom(t);
-    }
+    public override bool CanHandle(Type t) => t.IsValueType && !typeof(Enum).IsAssignableFrom(t);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/DialogArgs.cs b/Rdmp.Core/CommandExecution/DialogArgs.cs
index ace5c9318a..0dbc771882 100644
--- a/Rdmp.Core/CommandExecution/DialogArgs.cs
+++ b/Rdmp.Core/CommandExecution/DialogArgs.cs
@@ -65,7 +65,7 @@ public class DialogArgs
     /// ticked set of objects in the dialog.
     /// </summary>
     public IMapsDirectlyToDatabaseTable[] InitialObjectSelection { get; set; }
-        
+
     /// <summary>
     /// If choosing Null is a valid option for the user then set this to true.
     /// Defaults to false.
@@ -98,10 +98,7 @@ public override string ToString()
         if (!string.IsNullOrEmpty(EntryLabel))
             sb.AppendLine($"Label:{EntryLabel}");
 
-        if(sb.Length == 0)
-        {
-            return "Undefined DialogArgs";
-        }
+        if (sb.Length == 0) return "Undefined DialogArgs";
 
         return sb.ToString();
     }
diff --git a/Rdmp.Core/CommandExecution/EmphasiseEventArgs.cs b/Rdmp.Core/CommandExecution/EmphasiseEventArgs.cs
index 876ab2d912..478a6e243a 100644
--- a/Rdmp.Core/CommandExecution/EmphasiseEventArgs.cs
+++ b/Rdmp.Core/CommandExecution/EmphasiseEventArgs.cs
@@ -11,17 +11,17 @@ namespace Rdmp.Core.CommandExecution;
 /// <summary>
 /// Event args for an <see cref="EmphasiseRequest"/> (when a TreeView object should be brought to the users attention).
 /// </summary>
-public class EmphasiseEventArgs:EventArgs
+public class EmphasiseEventArgs : EventArgs
 {
     /// <summary>
     /// The object to show and how much of its child objects to show
     /// </summary>
     public EmphasiseRequest Request { get; set; }
-        
+
     /// <summary>
     /// Top level control (e.g. Form) which requesting the showing of the object
     /// </summary>
-    public object Sender{ get; set; }
+    public object Sender { get; set; }
 
     public EmphasiseEventArgs(EmphasiseRequest request)
     {
diff --git a/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs b/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs
index 58b8d9e18a..486f78e52a 100644
--- a/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs
+++ b/Rdmp.Core/CommandExecution/ExecuteCommandPasteClipboardAsNewCatalogueItems.cs
@@ -29,7 +29,6 @@ public class ExecuteCommandPasteClipboardAsNewCatalogueItems : BasicCommandExecu
 
     [UseWithObjectConstructor]
     public ExecuteCommandPasteClipboardAsNewCatalogueItems(IBasicActivateItems activator,
-
         [DemandsInitialization("The Catalogue to add the new CatalogueItems to")]
         Catalogue catalogue,
         [DemandsInitialization("The contents of the OS clipboard or null to prompt user with a message box at runtime")]
@@ -39,15 +38,16 @@ public ExecuteCommandPasteClipboardAsNewCatalogueItems(IBasicActivateItems activ
         _clipboardContents = clipboardContents;
     }
 
-    public ExecuteCommandPasteClipboardAsNewCatalogueItems(IBasicActivateItems activator, Catalogue catalogue, Func<string> clipboardContentGetter) : base(activator)
+    public ExecuteCommandPasteClipboardAsNewCatalogueItems(IBasicActivateItems activator, Catalogue catalogue,
+        Func<string> clipboardContentGetter) : base(activator)
     {
         _catalogue = catalogue;
         _clipboardContentGetter = clipboardContentGetter;
     }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Clipboard, OverlayKind.Import);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Clipboard, OverlayKind.Import);
+
     public override void Execute()
     {
         base.Execute();
@@ -64,12 +64,9 @@ public override void Execute()
                 if (!BasicActivator.TypeText(new DialogArgs
                     {
                         WindowTitle = "Paste Columns"
-
                     }, int.MaxValue, null, out clipboard, false))
-                {
                     // user cancelled search
                     return;
-                }
         }
 
         if (clipboard == null)
@@ -80,7 +77,7 @@ public override void Execute()
         if (toImport.Any())
         {
             foreach (var name in toImport)
-                _=new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository, _catalogue, name);
+                _ = new CatalogueItem(BasicActivator.RepositoryLocator.CatalogueRepository, _catalogue, name);
 
             Publish(_catalogue);
         }
diff --git a/Rdmp.Core/CommandExecution/FromActivateItemsToCheckNotifier.cs b/Rdmp.Core/CommandExecution/FromActivateItemsToCheckNotifier.cs
index 08b9cb4549..4438a5a22b 100644
--- a/Rdmp.Core/CommandExecution/FromActivateItemsToCheckNotifier.cs
+++ b/Rdmp.Core/CommandExecution/FromActivateItemsToCheckNotifier.cs
@@ -24,15 +24,15 @@ public bool OnCheckPerformed(CheckEventArgs args)
     {
         if (args.ProposedFix != null)
             return basicActivator.YesNo(args.ProposedFix, "Apply fix?");
-            
-        if(args.Result >= CheckResult.Fail)
+
+        if (args.Result >= CheckResult.Fail)
         {
             if (args.Ex == null)
                 basicActivator.Show(args.Message);
             else
                 basicActivator.ShowException(args.Message, args.Ex);
         }
-            
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/GoToCommandFactory.cs b/Rdmp.Core/CommandExecution/GoToCommandFactory.cs
index 8c226a8e5f..930e8c06ce 100644
--- a/Rdmp.Core/CommandExecution/GoToCommandFactory.cs
+++ b/Rdmp.Core/CommandExecution/GoToCommandFactory.cs
@@ -37,42 +37,45 @@ public GoToCommandFactory(IBasicActivateItems activator)
     {
         _activator = activator;
     }
-        
+
     public IEnumerable<IAtomicCommand> GetCommands(object forObject)
     {
         //forget old values, get them up to the minute
-        if (Is(forObject , out IInjectKnown ii))
+        if (Is(forObject, out IInjectKnown ii))
             ii.ClearAllInjections();
 
         if (Is(forObject, out IMapsDirectlyToDatabaseTable mt))
         {
             // Go to import / export definitions
-            var export = _activator.RepositoryLocator.CatalogueRepository.GetReferencesTo<ObjectExport>(mt).FirstOrDefault();
+            var export = _activator.RepositoryLocator.CatalogueRepository.GetReferencesTo<ObjectExport>(mt)
+                .FirstOrDefault();
 
             if (export != null)
-                yield return new ExecuteCommandShow(_activator, export, 0, true) { OverrideCommandName = "Show Export Definition" };
+                yield return new ExecuteCommandShow(_activator, export, 0, true)
+                    { OverrideCommandName = "Show Export Definition" };
 
-            var import = _activator.RepositoryLocator.CatalogueRepository.GetReferencesTo<ObjectImport>(mt).FirstOrDefault();
+            var import = _activator.RepositoryLocator.CatalogueRepository.GetReferencesTo<ObjectImport>(mt)
+                .FirstOrDefault();
             if (import != null)
-                yield return new ExecuteCommandShow(_activator, import, 0) { OverrideCommandName = "Show Import Definition" };
+                yield return new ExecuteCommandShow(_activator, import, 0)
+                    { OverrideCommandName = "Show Import Definition" };
+
+            if (SupportsReplacement(forObject))
+                yield return new ExecuteCommandShow(_activator, () => GetReplacementIfAny(mt))
+                    { OverrideCommandName = "Replacement" };
 
-            if(SupportsReplacement(forObject))
-            {
-                yield return new ExecuteCommandShow(_activator, () => GetReplacementIfAny(mt)) { OverrideCommandName = "Replacement" };
-            }
-                    
 
             yield return new ExecuteCommandSimilar(_activator, mt, false) { GoTo = true };
         }
 
         // cic => associated projects
-        if (Is(forObject,out CohortIdentificationConfiguration cic))
-        {
+        if (Is(forObject, out CohortIdentificationConfiguration cic))
             yield return new ExecuteCommandShow(_activator, () =>
             {
                 if (_activator.CoreChildProvider is DataExportChildProvider dx)
                     if (dx.AllProjectAssociatedCics != null)
-                        return dx.AllProjectAssociatedCics.Where(a => a.CohortIdentificationConfiguration_ID == cic.ID).Select(a => a.Project).Distinct();
+                        return dx.AllProjectAssociatedCics.Where(a => a.CohortIdentificationConfiguration_ID == cic.ID)
+                            .Select(a => a.Project).Distinct();
 
                 return Array.Empty<CohortIdentificationConfiguration>();
             })
@@ -80,87 +83,109 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
                 OverrideCommandName = "Project(s)",
                 OverrideIcon = GetImage(RDMPConcept.Project)
             };
-        }
 
-        if (Is(forObject,out ColumnInfo columnInfo))
+        if (Is(forObject, out ColumnInfo columnInfo))
         {
-            yield return new ExecuteCommandSimilar(_activator, columnInfo, true) { 
+            yield return new ExecuteCommandSimilar(_activator, columnInfo, true)
+            {
                 OverrideCommandName = "Different",
                 GoTo = true,
                 OverrideIcon = GetImage(RDMPConcept.ColumnInfo)
             };
 
-            yield return new ExecuteCommandShow(_activator, columnInfo.TableInfo_ID, typeof(TableInfo)) {
+            yield return new ExecuteCommandShow(_activator, columnInfo.TableInfo_ID, typeof(TableInfo))
+            {
                 OverrideCommandName = "Table Info",
-                OverrideIcon = GetImage(RDMPConcept.TableInfo)};
-            yield return new ExecuteCommandShow(_activator,() => _activator.CoreChildProvider.AllCatalogueItems.Where(catItem => catItem.ColumnInfo_ID == columnInfo.ID)){
+                OverrideIcon = GetImage(RDMPConcept.TableInfo)
+            };
+            yield return new ExecuteCommandShow(_activator,
+                () => _activator.CoreChildProvider.AllCatalogueItems.Where(catItem =>
+                    catItem.ColumnInfo_ID == columnInfo.ID))
+            {
                 OverrideCommandName = "Catalogue Item(s)",
                 OverrideIcon = GetImage(RDMPConcept.CatalogueItem)
             };
-                
-            yield return new ExecuteCommandShow(_activator, columnInfo.ANOTable_ID, typeof(ANOTable)) { 
+
+            yield return new ExecuteCommandShow(_activator, columnInfo.ANOTable_ID, typeof(ANOTable))
+            {
                 OverrideCommandName = "ANO Table",
-                OverrideIcon = GetImage(RDMPConcept.ANOTable) };
+                OverrideIcon = GetImage(RDMPConcept.ANOTable)
+            };
         }
 
         if (Is(forObject, out ExtractionInformation ei))
         {
-            yield return new ExecuteCommandShow(_activator, ei.CatalogueItem?.Catalogue_ID, typeof(Catalogue)) {
+            yield return new ExecuteCommandShow(_activator, ei.CatalogueItem?.Catalogue_ID, typeof(Catalogue))
+            {
                 OverrideCommandName = "Catalogue",
-                OverrideIcon = GetImage(RDMPConcept.Catalogue) 
+                OverrideIcon = GetImage(RDMPConcept.Catalogue)
             };
-            yield return new ExecuteCommandShow(_activator, ei.CatalogueItem_ID, typeof(CatalogueItem)) {
+            yield return new ExecuteCommandShow(_activator, ei.CatalogueItem_ID, typeof(CatalogueItem))
+            {
                 OverrideCommandName = "Catalogue Item",
-                OverrideIcon = GetImage(RDMPConcept.CatalogueItem) 
+                OverrideIcon = GetImage(RDMPConcept.CatalogueItem)
             };
             yield return new ExecuteCommandShow(_activator, ei.ColumnInfo, 0, true)
             {
                 OverrideCommandName = "Column Info",
-                OverrideIcon = GetImage(RDMPConcept.ColumnInfo) 
+                OverrideIcon = GetImage(RDMPConcept.ColumnInfo)
             };
         }
 
         if (Is(forObject, out CatalogueItem ci))
         {
-            yield return new ExecuteCommandShow(_activator, ci.Catalogue_ID, typeof(Catalogue)) {
+            yield return new ExecuteCommandShow(_activator, ci.Catalogue_ID, typeof(Catalogue))
+            {
                 OverrideCommandName = "Catalogue",
-                OverrideIcon = GetImage(RDMPConcept.Catalogue) 
+                OverrideIcon = GetImage(RDMPConcept.Catalogue)
             };
-            yield return new ExecuteCommandShow(_activator, ci.ExtractionInformation,0,true) {
+            yield return new ExecuteCommandShow(_activator, ci.ExtractionInformation, 0, true)
+            {
                 OverrideCommandName = "Extraction Information",
-                OverrideIcon = GetImage(RDMPConcept.ExtractionInformation) 
+                OverrideIcon = GetImage(RDMPConcept.ExtractionInformation)
             };
-            yield return new ExecuteCommandShow(_activator, ci.ColumnInfo, 0,true) {
+            yield return new ExecuteCommandShow(_activator, ci.ColumnInfo, 0, true)
+            {
                 OverrideCommandName = "Column Info",
-                OverrideIcon = GetImage(RDMPConcept.ColumnInfo) };
+                OverrideIcon = GetImage(RDMPConcept.ColumnInfo)
+            };
         }
 
         if (Is(forObject, out ExtractableDataSet eds))
         {
-            yield return new ExecuteCommandShow(_activator, eds.Catalogue_ID, typeof(Catalogue)) {
+            yield return new ExecuteCommandShow(_activator, eds.Catalogue_ID, typeof(Catalogue))
+            {
                 OverrideCommandName = "Catalogue",
-                OverrideIcon = GetImage(RDMPConcept.Catalogue) 
+                OverrideIcon = GetImage(RDMPConcept.Catalogue)
             };
 
             yield return new ExecuteCommandShow(_activator, () =>
             {
                 if (_activator.CoreChildProvider is DataExportChildProvider dx)
-                    return dx.SelectedDataSets.Where(s => s.ExtractableDataSet_ID == eds.ID).Select(s => s.ExtractionConfiguration);
+                    return dx.SelectedDataSets.Where(s => s.ExtractableDataSet_ID == eds.ID)
+                        .Select(s => s.ExtractionConfiguration);
 
                 return Array.Empty<SelectedDataSets>();
-            }){ OverrideCommandName = "Extraction Configuration(s)", OverrideIcon = GetImage(RDMPConcept.ExtractionConfiguration) };
+            })
+            {
+                OverrideCommandName = "Extraction Configuration(s)",
+                OverrideIcon = GetImage(RDMPConcept.ExtractionConfiguration)
+            };
         }
 
         if (Is(forObject, out GovernancePeriod period))
-            yield return new ExecuteCommandShow(_activator, () => period.GovernedCatalogues){OverrideCommandName = "Catalogue(s)", OverrideIcon = GetImage(RDMPConcept.Catalogue) };
+            yield return new ExecuteCommandShow(_activator, () => period.GovernedCatalogues)
+                { OverrideCommandName = "Catalogue(s)", OverrideIcon = GetImage(RDMPConcept.Catalogue) };
 
         if (Is(forObject, out JoinInfo j))
-            yield return new ExecuteCommandShow(_activator, j.ForeignKey_ID, typeof(ColumnInfo)){OverrideCommandName="Foreign Key", OverrideIcon = GetImage(RDMPConcept.ColumnInfo) };
+            yield return new ExecuteCommandShow(_activator, j.ForeignKey_ID, typeof(ColumnInfo))
+                { OverrideCommandName = "Foreign Key", OverrideIcon = GetImage(RDMPConcept.ColumnInfo) };
 
         if (Is(forObject, out Lookup lookup))
         {
             yield return new ExecuteCommandShow(_activator, lookup.Description.TableInfo_ID, typeof(TableInfo));
-            yield return new ExecuteCommandShow(_activator, lookup.ForeignKey_ID, typeof(ColumnInfo)){OverrideCommandName = "Foreign Key", OverrideIcon = GetImage(RDMPConcept.ColumnInfo) };
+            yield return new ExecuteCommandShow(_activator, lookup.ForeignKey_ID, typeof(ColumnInfo))
+                { OverrideCommandName = "Foreign Key", OverrideIcon = GetImage(RDMPConcept.ColumnInfo) };
         }
 
         if (Is(forObject, out ExtractionFilter masterFilter))
@@ -169,15 +194,16 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
                 _activator.RepositoryLocator.CatalogueRepository
                     .GetAllObjectsWhere<AggregateFilter>("ClonedFromExtractionFilter_ID", masterFilter.ID)
                     .Select(f => f.GetAggregate())
-                    .Where(a=>a != null).Distinct()
-            ){OverrideCommandName = "Usages (in Cohort Builder)" };
+                    .Where(a => a != null).Distinct()
+            ) { OverrideCommandName = "Usages (in Cohort Builder)" };
 
 
             yield return new ExecuteCommandShow(_activator, () =>
-                _activator.RepositoryLocator.DataExportRepository.GetAllObjectsWhere<DeployedExtractionFilter>("ClonedFromExtractionFilter_ID", masterFilter.ID)
+                _activator.RepositoryLocator.DataExportRepository
+                    .GetAllObjectsWhere<DeployedExtractionFilter>("ClonedFromExtractionFilter_ID", masterFilter.ID)
                     .Select(f => f.GetDataset()?.ExtractionConfiguration)
                     .Where(c => c != null).Distinct()
-            ){OverrideCommandName = "Usages (in Extractions)" };
+            ) { OverrideCommandName = "Usages (in Extractions)" };
         }
 
         if (Is(forObject, out IFilter filter) && filter.ClonedFromExtractionFilter_ID.HasValue)
@@ -186,7 +212,8 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
 
             try
             {
-                parent = _activator.RepositoryLocator.CatalogueRepository.GetObjectByID<ExtractionFilter>(filter.ClonedFromExtractionFilter_ID.Value);
+                parent = _activator.RepositoryLocator.CatalogueRepository.GetObjectByID<ExtractionFilter>(
+                    filter.ClonedFromExtractionFilter_ID.Value);
             }
             catch (KeyNotFoundException)
             {
@@ -194,40 +221,51 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
             }
 
             if (parent != null)
-                yield return new ExecuteCommandShow(_activator, parent,0){OverrideCommandName = "Parent Filter", OverrideIcon = GetImage(RDMPConcept.Filter) };
+                yield return new ExecuteCommandShow(_activator, parent, 0)
+                    { OverrideCommandName = "Parent Filter", OverrideIcon = GetImage(RDMPConcept.Filter) };
         }
 
         if (Is(forObject, out SelectedDataSets selectedDataSet))
         {
-            yield return new ExecuteCommandShow(_activator, selectedDataSet.ExtractableDataSet.Catalogue_ID, typeof(Catalogue))
+            yield return new ExecuteCommandShow(_activator, selectedDataSet.ExtractableDataSet.Catalogue_ID,
+                typeof(Catalogue))
             {
                 OverrideCommandName = "Catalogue",
                 OverrideIcon = GetImage(RDMPConcept.Catalogue)
             };
 
             var ep = selectedDataSet.ExtractionProgressIfAny;
-            if(ep != null)
-            {
-                yield return new ExecuteCommandShow(_activator, ep, 0, true);
-            }
+            if (ep != null) yield return new ExecuteCommandShow(_activator, ep, 0, true);
         }
 
         if (Is(forObject, out TableInfo tableInfo))
-            yield return new ExecuteCommandShow(_activator, () => tableInfo.ColumnInfos.SelectMany(c => _activator.CoreChildProvider.AllCatalogueItems.Where(catItem => catItem.ColumnInfo_ID == c.ID).Select(catItem => catItem.Catalogue)).Distinct()){OverrideCommandName="Catalogue(s)", OverrideIcon = GetImage(RDMPConcept.Catalogue) };
+            yield return new ExecuteCommandShow(_activator,
+                () => tableInfo.ColumnInfos.SelectMany(c =>
+                    _activator.CoreChildProvider.AllCatalogueItems.Where(catItem => catItem.ColumnInfo_ID == c.ID)
+                        .Select(catItem => catItem.Catalogue)).Distinct())
+            {
+                OverrideCommandName = "Catalogue(s)", OverrideIcon = GetImage(RDMPConcept.Catalogue)
+            };
 
         if (Is(forObject, out AggregateConfiguration aggregate))
         {
-            yield return new ExecuteCommandShow(_activator, aggregate.GetCohortIdentificationConfigurationIfAny()?.ID, typeof(CohortIdentificationConfiguration)) {
+            yield return new ExecuteCommandShow(_activator, aggregate.GetCohortIdentificationConfigurationIfAny()?.ID,
+                typeof(CohortIdentificationConfiguration))
+            {
                 OverrideCommandName = "Cohort Identification Configuration",
-                OverrideIcon = GetImage(RDMPConcept.CohortIdentificationConfiguration) };
-            yield return new ExecuteCommandShow(_activator, aggregate.Catalogue_ID, typeof(Catalogue)) { 
+                OverrideIcon = GetImage(RDMPConcept.CohortIdentificationConfiguration)
+            };
+            yield return new ExecuteCommandShow(_activator, aggregate.Catalogue_ID, typeof(Catalogue))
+            {
                 OverrideCommandName = "Catalogue",
-                OverrideIcon = GetImage(RDMPConcept.Catalogue) };
+                OverrideIcon = GetImage(RDMPConcept.Catalogue)
+            };
         }
 
         if (Is(forObject, out Catalogue catalogue))
         {
-            yield return new ExecuteCommandShow(_activator, catalogue.LoadMetadata_ID,typeof(LoadMetadata)){OverrideCommandName = "Data Load", OverrideIcon = GetImage(RDMPConcept.LoadMetadata) };
+            yield return new ExecuteCommandShow(_activator, catalogue.LoadMetadata_ID, typeof(LoadMetadata))
+                { OverrideCommandName = "Data Load", OverrideIcon = GetImage(RDMPConcept.LoadMetadata) };
 
             if (_activator.CoreChildProvider is DataExportChildProvider exp)
             {
@@ -236,39 +274,58 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
                 if (cataEds != null)
                 {
                     if (cataEds.Project_ID != null)
-                    {
-                        yield return new ExecuteCommandShow(_activator, () =>
+                        yield return new ExecuteCommandShow(_activator,
+                            () =>
+                            {
+                                return new[]
                                 {
-                                    return new[] { _activator.RepositoryLocator.DataExportRepository.GetObjectByID<Project>(cataEds.Project_ID.Value) };
-                                }
-                            )
-                            { OverrideCommandName = "Associated Project", OverrideIcon = GetImage(RDMPConcept.Project) };
-                    }
-
-                    yield return new ExecuteCommandShow(_activator, () => cataEds.ExtractionConfigurations.Select(c=>c.Project).Distinct()){OverrideCommandName = "Extracted In (Project)", OverrideIcon = GetImage(RDMPConcept.Project) };
-                    yield return new ExecuteCommandShow(_activator, () => cataEds.ExtractionConfigurations){OverrideCommandName = "Extracted In (Extraction Configuration)", OverrideIcon = GetImage(RDMPConcept.ExtractionConfiguration) };                        
+                                    _activator.RepositoryLocator.DataExportRepository.GetObjectByID<Project>(
+                                        cataEds.Project_ID.Value)
+                                };
+                            }
+                        )
+                        {
+                            OverrideCommandName = "Associated Project", OverrideIcon = GetImage(RDMPConcept.Project)
+                        };
+
+                    yield return new ExecuteCommandShow(_activator,
+                        () => cataEds.ExtractionConfigurations.Select(c => c.Project).Distinct())
+                    {
+                        OverrideCommandName = "Extracted In (Project)", OverrideIcon = GetImage(RDMPConcept.Project)
+                    };
+                    yield return new ExecuteCommandShow(_activator, () => cataEds.ExtractionConfigurations)
+                    {
+                        OverrideCommandName = "Extracted In (Extraction Configuration)",
+                        OverrideIcon = GetImage(RDMPConcept.ExtractionConfiguration)
+                    };
                 }
-                        
             }
 
-            yield return new ExecuteCommandShow(_activator, () => catalogue.GetTableInfoList(true)){OverrideCommandName="Table(s)", OverrideIcon = GetImage(RDMPConcept.TableInfo) };
+            yield return new ExecuteCommandShow(_activator, () => catalogue.GetTableInfoList(true))
+                { OverrideCommandName = "Table(s)", OverrideIcon = GetImage(RDMPConcept.TableInfo) };
 
             yield return new ExecuteCommandShow(_activator,
-                    () =>
-                        _activator
-                            .CoreChildProvider
-                            .AllAggregateConfigurations.Where(ac => ac.IsCohortIdentificationAggregate && ac.Catalogue_ID == catalogue.ID)
-                            .Select(ac => ac.GetCohortIdentificationConfigurationIfAny())
-                            .Where(cataCic => cataCic != null)
-                            .Distinct())
-                { OverrideCommandName ="Cohort Identification Configuration(s)", OverrideIcon = GetImage(RDMPConcept.CohortIdentificationConfiguration) };
+                () =>
+                    _activator
+                        .CoreChildProvider
+                        .AllAggregateConfigurations.Where(ac =>
+                            ac.IsCohortIdentificationAggregate && ac.Catalogue_ID == catalogue.ID)
+                        .Select(ac => ac.GetCohortIdentificationConfigurationIfAny())
+                        .Where(cataCic => cataCic != null)
+                        .Distinct())
+            {
+                OverrideCommandName = "Cohort Identification Configuration(s)",
+                OverrideIcon = GetImage(RDMPConcept.CohortIdentificationConfiguration)
+            };
 
 
-            yield return new ExecuteCommandShow(_activator, () => _activator.CoreChildProvider.AllGovernancePeriods.Where(p => p.GovernedCatalogues.Contains(catalogue))){
+            yield return new ExecuteCommandShow(_activator,
+                () => _activator.CoreChildProvider.AllGovernancePeriods.Where(p =>
+                    p.GovernedCatalogues.Contains(catalogue)))
+            {
                 OverrideCommandName = "Governance",
                 OverrideIcon = GetImage(RDMPConcept.GovernancePeriod)
             };
-
         }
 
         if (Is(forObject, out ExtractableCohort cohort))
@@ -300,17 +357,16 @@ public IEnumerable<IAtomicCommand> GetCommands(object forObject)
 
         //if it is a masquerader and masquerading as a DatabaseEntity then add a goto the object
         if (forObject is IMasqueradeAs masqueraderIfAny)
-        {
             if (masqueraderIfAny.MasqueradingAs() is DatabaseEntity m)
-                yield return new ExecuteCommandShow(_activator, m, 0, true) { OverrideIcon = _activator.CoreIconProvider.GetImage(m) };
-        }
+                yield return new ExecuteCommandShow(_activator, m, 0, true)
+                    { OverrideIcon = _activator.CoreIconProvider.GetImage(m) };
     }
 
     private static bool SupportsReplacement(object o)
     {
         return o switch
         {
-            DashboardLayout _=> false,
+            DashboardLayout _ => false,
             _ => true
         };
     }
@@ -318,17 +374,14 @@ private static bool SupportsReplacement(object o)
     private IEnumerable<IMapsDirectlyToDatabaseTable> GetReplacementIfAny(IMapsDirectlyToDatabaseTable mt)
     {
         var replacement = _activator.RepositoryLocator.CatalogueRepository
-            .GetAllObjectsWhere<ExtendedProperty>("Name",ExtendedProperty.ReplacedBy)
-            .FirstOrDefault(r=>r.IsReferenceTo(mt));
+            .GetAllObjectsWhere<ExtendedProperty>("Name", ExtendedProperty.ReplacedBy)
+            .FirstOrDefault(r => r.IsReferenceTo(mt));
 
-        if(replacement == null)
+        if (replacement == null)
             return Enumerable.Empty<IMapsDirectlyToDatabaseTable>();
 
-        return new []{mt.Repository.GetObjectByID(mt.GetType(),int.Parse(replacement.Value))};
+        return new[] { mt.Repository.GetObjectByID(mt.GetType(), int.Parse(replacement.Value)) };
     }
 
-    private Image<Rgba32> GetImage(RDMPConcept concept)
-    {
-        return _activator.CoreIconProvider.GetImage(concept);
-    }
+    private Image<Rgba32> GetImage(RDMPConcept concept) => _activator.CoreIconProvider.GetImage(concept);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/IBasicActivateItems.cs b/Rdmp.Core/CommandExecution/IBasicActivateItems.cs
index decea8d061..d8261cc5a3 100644
--- a/Rdmp.Core/CommandExecution/IBasicActivateItems.cs
+++ b/Rdmp.Core/CommandExecution/IBasicActivateItems.cs
@@ -39,7 +39,7 @@ public interface IBasicActivateItems
     /// <summary>
     /// True for activators that can elicit immediate responses from users.  False for activators designed to run unattended e.g. command line/scripting
     /// </summary>
-    bool IsInteractive {get;}
+    bool IsInteractive { get; }
 
     /// <summary>
     /// APIs that supply additional commands or alter user interface logic (either CLI or windows client)
@@ -56,8 +56,7 @@ public interface IBasicActivateItems
     /// </summary>
     /// <param name="aggregate"></param>
     void ShowGraph(AggregateConfiguration aggregate);
-        
-        
+
 
     /// <summary>
     /// Display information about the logged activities of the <paramref name="rootObject"/>
@@ -73,7 +72,6 @@ public interface IBasicActivateItems
     void ShowLogs(ExternalDatabaseServer loggingServer, LogViewerFilter filter);
 
 
-
     /// <summary>
     /// True if <see cref="Activate(object)"/> will work for the object
     /// </summary>
@@ -84,7 +82,7 @@ public interface IBasicActivateItems
     /// <summary>
     /// True to prompt Yes/No and offer common fixes for being unable to directly delete an object.  Note that <see cref="IsInteractive"/> must be true for this flag to be respected
     /// </summary>
-    bool InteractiveDeletes {get;set;}
+    bool InteractiveDeletes { get; set; }
 
     /// <summary>
     /// Finds the nearest database object to <paramref name="publish"/> in its hierarchy and issues a publish
@@ -108,7 +106,7 @@ public interface IBasicActivateItems
     /// </summary>
     /// <param name="dataTable"></param>
     void ShowData(DataTable dataTable);
-        
+
     /// <summary>
     /// Returns the repository that stores objects of the given <paramref name="type"/> (Must be <see cref="IMapsDirectlyToDatabaseTable"/>).
     /// Throws if no compatible repo is found.
@@ -127,16 +125,16 @@ public interface IBasicActivateItems
     /// Component class for discovering the default DQE, Logging servers etc configured in the current RDMP database
     /// </summary>
     IServerDefaults ServerDefaults { get; }
-        
+
     /// <summary>
     /// Component for telling you whether a given DatabaseEntity is one of the current users favourite objects and for toggling it
     /// </summary>
-    FavouritesProvider FavouritesProvider { get;}
+    FavouritesProvider FavouritesProvider { get; }
 
     /// <summary>
     /// Provides consistent icon representations of objects
     /// </summary>
-    ICoreIconProvider CoreIconProvider { get;}
+    ICoreIconProvider CoreIconProvider { get; }
 
     /// <summary>
     /// Returns a dictionary of methods to call for each type of constructor parameter needed.  If no Type
@@ -161,9 +159,10 @@ public interface IBasicActivateItems
     /// Create a class capable of running a <see cref="IPipeline"/> under a given <see cref="IPipelineUseCase"/>.  This may be an async process e.g. non modal dialogues
     /// </summary>
     /// <returns></returns>
-    IPipelineRunner GetPipelineRunner(DialogArgs args,IPipelineUseCase useCase, IPipeline pipeline);
+    IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline);
 
     #region Select X Modal methods
+
     /// <summary>
     /// Prompts the user to enter a description for a cohort they are trying to create including whether it is intended to replace an old version of another cohort.
     /// </summary>
@@ -171,7 +170,8 @@ public interface IBasicActivateItems
     /// <param name="project">The project the cohort should be associated with</param>
     /// <param name="cohortInitialDescription">Optional initial description for the cohort which may be changed by the user</param>
     /// <returns></returns>
-    CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable, IProject project, string cohortInitialDescription);
+    CohortCreationRequest GetCohortCreationRequest(ExternalCohortTable externalCohortTable, IProject project,
+        string cohortInitialDescription);
 
     /// <summary>
     /// Show all objects in RDMP (with search).  If a single selection is made then invoke the callback
@@ -192,10 +192,12 @@ public interface IBasicActivateItems
     /// <param name="availableObjects"></param>
     /// <param name="initialSearchText"></param>
     /// <returns></returns>
-    IMapsDirectlyToDatabaseTable[] SelectMany(string prompt, Type arrayElementType,IMapsDirectlyToDatabaseTable[] availableObjects,string initialSearchText = null);
-        
+    IMapsDirectlyToDatabaseTable[] SelectMany(string prompt, Type arrayElementType,
+        IMapsDirectlyToDatabaseTable[] availableObjects, string initialSearchText = null);
+
     /// <inheritdoc cref="SelectMany(string, Type, IMapsDirectlyToDatabaseTable[], string)"/>
-    IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType, IMapsDirectlyToDatabaseTable[] availableObjects);
+    IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType,
+        IMapsDirectlyToDatabaseTable[] availableObjects);
 
     /// <summary>
     /// Prompts user to pick one of the <paramref name="availableObjects"/>
@@ -205,7 +207,8 @@ public interface IBasicActivateItems
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect"></param>
     /// <returns></returns>
-    IMapsDirectlyToDatabaseTable SelectOne(string prompt, IMapsDirectlyToDatabaseTable[] availableObjects, string initialSearchText = null, bool allowAutoSelect = false);
+    IMapsDirectlyToDatabaseTable SelectOne(string prompt, IMapsDirectlyToDatabaseTable[] availableObjects,
+        string initialSearchText = null, bool allowAutoSelect = false);
 
     /// <summary>
     /// Prompts user to pick one of the <paramref name="availableObjects"/>
@@ -224,7 +227,8 @@ public interface IBasicActivateItems
     /// <param name="initialSearchText"></param>
     /// <param name="allowAutoSelect">Determines behaviour when <paramref name="available"/> has only one element.  True to auto select the only object available</param>
     /// <returns>True if a selection was made</returns>
-    bool SelectObject<T>(string prompt, T[] available, out T selected, string initialSearchText = null, bool allowAutoSelect = false) where T : class;
+    bool SelectObject<T>(string prompt, T[] available, out T selected, string initialSearchText = null,
+        bool allowAutoSelect = false) where T : class;
 
     /// <inheritdoc cref="SelectObject{T}(string, T[], out T, string, bool)"/>
     bool SelectObject<T>(DialogArgs args, T[] available, out T selected) where T : class;
@@ -237,7 +241,8 @@ public interface IBasicActivateItems
     /// <param name="available"></param>
     /// <param name="selected"></param>
     /// <param name="initialSearchText"></param>
-    bool SelectObjects<T>(string prompt, T[] available, out T[] selected, string initialSearchText = null) where T : class;
+    bool SelectObjects<T>(string prompt, T[] available, out T[] selected, string initialSearchText = null)
+        where T : class;
 
     /// <inheritdoc cref="SelectObjects{T}(string, T[], out T[], string)"/>
     bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected) where T : class;
@@ -256,7 +261,7 @@ public interface IBasicActivateItems
     /// <returns></returns>
     FileInfo SelectFile(string prompt);
 
-        
+
     /// <summary>
     /// Prompts user to select multiple files on disk that must exist and match the <paramref name="pattern"/>
     /// </summary>
@@ -264,7 +269,7 @@ public interface IBasicActivateItems
     /// <param name="patternDescription">Type of file to select e.g. "Comma Separated Values"</param>
     /// <param name="pattern">Pattern to restrict files to e.g. *.csv</param>
     /// <returns>Selected files or null if no files chosen</returns>
-    FileInfo[] SelectFiles(string prompt,string patternDescription, string pattern);
+    FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern);
 
     /// <summary>
     /// Prompts user to select a file on disk (that may or may not exist yet) with the given pattern
@@ -273,8 +278,8 @@ public interface IBasicActivateItems
     /// <param name="patternDescription">Type of file to select e.g. "Comma Separated Values"</param>
     /// <param name="pattern">Pattern to restrict files to e.g. *.csv</param>
     /// <returns></returns>
-    FileInfo SelectFile(string prompt,string patternDescription, string pattern);
-        
+    FileInfo SelectFile(string prompt, string patternDescription, string pattern);
+
 
     /// <summary>
     /// User must supply a basic value type e.g. string, double, int
@@ -284,7 +289,7 @@ public interface IBasicActivateItems
     /// <param name="initialValue"></param>
     /// <param name="chosen"></param>
     /// <returns></returns>
-    bool SelectValueType(string prompt, Type paramType, object initialValue,out object chosen);
+    bool SelectValueType(string prompt, Type paramType, object initialValue, out object chosen);
 
 
     /// <inheritdoc cref="SelectValueType(string, Type, object, out object)"/>
@@ -339,7 +344,7 @@ public interface IBasicActivateItems
     /// <param name="title"></param>
     /// <param name="message"></param>
     void Show(string title, string message);
-        
+
     /// <summary>
     /// Prompts user to provide some textual input
     /// </summary>
@@ -350,7 +355,8 @@ public interface IBasicActivateItems
     /// <param name="text"></param>
     /// <param name="requireSaneHeaderText"></param>
     /// <returns></returns>
-    bool TypeText(string header, string prompt, int maxLength, string initialText, out string text, bool requireSaneHeaderText);
+    bool TypeText(string header, string prompt, int maxLength, string initialText, out string text,
+        bool requireSaneHeaderText);
 
     /// <inheritdoc cref="TypeText(string, string, int, string, out string, bool)"/>
     bool TypeText(DialogArgs args, int maxLength, string initialText, out string text, bool requireSaneHeaderText);
@@ -370,7 +376,7 @@ public interface IBasicActivateItems
     /// <param name="taskDescription"></param>
     /// <returns></returns>
     DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription);
-        
+
     /// <summary>
     /// Shows the given error message to the user, optionally with the <paramref name="exception"/> stack trace / Message with high visibility
     /// </summary>
@@ -378,7 +384,7 @@ public interface IBasicActivateItems
     /// <param name="exception"></param>
     void ShowException(string errorText, Exception exception);
 
-        
+
     /// <summary>
     /// Block until the <paramref name="task"/> is completed with optionally showing the user some kind of ongoing operation
     /// indication (ui) and letting them cancel the task with the <paramref name="cts"/>.
@@ -458,7 +464,8 @@ public interface IBasicActivateItems
     /// <param name="targetFolder">Optional virtual folder into which to put the <see cref="ICatalogue"/> or null.  This is not a file system folder only a visual display to the user in the RDMP client</param>
     /// <param name="extractionIdentifierColumns">Optional, which column(s) should be <see cref="ConcreteColumn.IsExtractionIdentifier"/></param>
     /// <returns>A fully configured ready to go Catalogue or null if user cancelled process e.g. if <see cref="IsInteractive"/></returns>
-    ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo,ColumnInfo[] extractionIdentifierColumns, string initialDescription, IProject projectSpecific, string targetFolder);
+    ICatalogue CreateAndConfigureCatalogue(ITableInfo tableInfo, ColumnInfo[] extractionIdentifierColumns,
+        string initialDescription, IProject projectSpecific, string targetFolder);
 
     /// <summary>
     /// Returns true if creating a cohort through an interactive wizard is supported.  If a wizard was shown and suitable input received then <paramref name="cic"/> should be populated with the result
@@ -489,7 +496,8 @@ public interface IBasicActivateItems
     /// <param name="db">The server in which the database should be created or null if the user is expected to pick themselves as part of the method e.g. through a UI</param>
     /// <param name="patcher">The schema and patches to run to create the database</param>
     /// <returns></returns>
-    ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository, PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db);
+    ExternalDatabaseServer CreateNewPlatformDatabase(ICatalogueRepository catalogueRepository,
+        PermissableDefaults defaultToSet, IPatcher patcher, DiscoveredDatabase db);
 
     /// <summary>
     /// Return all Types of the given {T} which should be <see cref="IMapsDirectlyToDatabaseTable"/>
@@ -504,6 +512,7 @@ public interface IBasicActivateItems
     /// <param name="t"></param>
     /// <returns></returns>
     IEnumerable<IMapsDirectlyToDatabaseTable> GetAll(Type t);
+
     /// <summary>
     /// Delete the <paramref name="deleteable"/> ideally asking the user for confirmation first (if appropriate)
     /// </summary>
diff --git a/Rdmp.Core/CommandExecution/ICommandExecution.cs b/Rdmp.Core/CommandExecution/ICommandExecution.cs
index c7850d4b5c..aec5241876 100644
--- a/Rdmp.Core/CommandExecution/ICommandExecution.cs
+++ b/Rdmp.Core/CommandExecution/ICommandExecution.cs
@@ -25,7 +25,7 @@ public interface ICommandExecution
     /// The reason <see cref="IsImpossible"/> is true.  Should be null if <see cref="IsImpossible"/> is false
     /// </summary>
     string ReasonCommandImpossible { get; }
-        
+
     /// <summary>
     /// Runs the command, this should normally only be called once then the command discarded.  Always ensure when overriding that you call base members
     /// because they can include logic such as <see cref="IsImpossible"/> etc.
diff --git a/Rdmp.Core/CommandExecution/ImpossibleCommand.cs b/Rdmp.Core/CommandExecution/ImpossibleCommand.cs
index ce0c6e8c35..11f7ade312 100644
--- a/Rdmp.Core/CommandExecution/ImpossibleCommand.cs
+++ b/Rdmp.Core/CommandExecution/ImpossibleCommand.cs
@@ -16,6 +16,6 @@ public class ImpossibleCommand : BasicCommandExecution, IAtomicCommand
 {
     public ImpossibleCommand(string reasonImpossible)
     {
-        SetImpossible(reasonImpossible);   
+        SetImpossible(reasonImpossible);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandExecution/RequiredArgument.cs b/Rdmp.Core/CommandExecution/RequiredArgument.cs
index f9f858363d..58d6a67da6 100644
--- a/Rdmp.Core/CommandExecution/RequiredArgument.cs
+++ b/Rdmp.Core/CommandExecution/RequiredArgument.cs
@@ -19,7 +19,7 @@ public class RequiredArgument
     public string Name { get; }
     public Type Type { get; }
     public object ReflectionObject { get; }
-    public bool HasDefaultValue { get;}
+    public bool HasDefaultValue { get; }
     public object DefaultValue { get; }
 
     public DemandsInitializationAttribute DemandIfAny { get; private set; }
@@ -43,6 +43,7 @@ public RequiredArgument(ParameterInfo parameterInfo)
         DefaultValue = parameterInfo.DefaultValue;
         DemandIfAny = parameterInfo.GetCustomAttribute<DemandsInitializationAttribute>();
     }
+
     public RequiredArgument(IArgument a)
     {
         Name = a.Name;
diff --git a/Rdmp.Core/CommandExecution/ThrowImmediatelyActivator.cs b/Rdmp.Core/CommandExecution/ThrowImmediatelyActivator.cs
index 448800e971..a67769ffa8 100644
--- a/Rdmp.Core/CommandExecution/ThrowImmediatelyActivator.cs
+++ b/Rdmp.Core/CommandExecution/ThrowImmediatelyActivator.cs
@@ -25,8 +25,10 @@ namespace Rdmp.Core.CommandExecution;
 public class ThrowImmediatelyActivator : BasicActivateItems
 {
     // DONE: This should not inherit from ConsoleInputManager
-    private static readonly ThrowImmediatelyCheckNotifier Notifier= new();
-    public ThrowImmediatelyActivator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier notifier = null):base(repositoryLocator,notifier ?? Notifier)
+    private static readonly ThrowImmediatelyCheckNotifier Notifier = new();
+
+    public ThrowImmediatelyActivator(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICheckNotifier notifier = null) : base(repositoryLocator, notifier ?? Notifier)
     {
     }
 
@@ -34,23 +36,29 @@ public ThrowImmediatelyActivator(IRDMPPlatformRepositoryServiceLocator repositor
 
     public override bool YesNo(DialogArgs args, out bool chosen) => throw new InputDisallowedException(nameof(YesNo));
 
-    public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription) => throw new InputDisallowedException(nameof(SelectTable));
+    public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription) =>
+        throw new InputDisallowedException(nameof(SelectTable));
 
     public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType,
         IMapsDirectlyToDatabaseTable[] availableObjects) =>
         throw new InputDisallowedException(nameof(SelectMany));
 
-    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects) => throw new InputDisallowedException(nameof(SelectOne));
+    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects) => throw new InputDisallowedException(nameof(SelectOne));
 
-    public override bool SelectObject<T>(DialogArgs args, T[] available, out T selected) => throw new InputDisallowedException(nameof(SelectObject));
+    public override bool SelectObject<T>(DialogArgs args, T[] available, out T selected) =>
+        throw new InputDisallowedException(nameof(SelectObject));
 
-    public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected) => throw new InputDisallowedException(nameof(SelectObjects));
+    public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected) =>
+        throw new InputDisallowedException(nameof(SelectObjects));
 
-    public override DirectoryInfo SelectDirectory(string prompt) => throw new InputDisallowedException(nameof(SelectDirectory));
+    public override DirectoryInfo SelectDirectory(string prompt) =>
+        throw new InputDisallowedException(nameof(SelectDirectory));
 
     public override FileInfo SelectFile(string prompt) => throw new InputDisallowedException(nameof(SelectFile));
 
-    public override FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern) => throw new InputDisallowedException(nameof(SelectFiles));
+    public override FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern) =>
+        throw new InputDisallowedException(nameof(SelectFiles));
 
     public override void ShowData(IViewSQLAndResultsCollection collection)
     {
@@ -70,27 +78,34 @@ public override void ShowLogs(ILoggedActivityRootObject rootObject)
     {
     }
 
-    public override FileInfo SelectFile(string prompt, string patternDescription, string pattern) => throw new InputDisallowedException(nameof(SelectFile));
+    public override FileInfo SelectFile(string prompt, string patternDescription, string pattern) =>
+        throw new InputDisallowedException(nameof(SelectFile));
 
     public override void ShowException(string errorText, Exception exception)
     {
     }
 
-    protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen) => throw new InputDisallowedException(nameof(SelectValueTypeImpl));
+    protected override bool
+        SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen) =>
+        throw new InputDisallowedException(nameof(SelectValueTypeImpl));
 
     public override void Show(string title, string message)
     {
     }
 
-    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text, bool requireSaneHeaderText)
+    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
+        bool requireSaneHeaderText)
     {
         text = null;
         return false;
     }
 
-    public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription) => throw new InputDisallowedException(nameof(SelectDatabase));
+    public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription) =>
+        throw new InputDisallowedException(nameof(SelectDatabase));
 
-    public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen) => throw new InputDisallowedException(nameof(SelectEnum));
+    public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen) =>
+        throw new InputDisallowedException(nameof(SelectEnum));
 
-    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen) => throw new InputDisallowedException(nameof(SelectType));
+    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen) =>
+        throw new InputDisallowedException(nameof(SelectType));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/CataloguePipelinesAndReferencesCreation.cs b/Rdmp.Core/CommandLine/DatabaseCreation/CataloguePipelinesAndReferencesCreation.cs
index 1ce1a8d72d..bad1a9bd27 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/CataloguePipelinesAndReferencesCreation.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/CataloguePipelinesAndReferencesCreation.cs
@@ -36,7 +36,8 @@ public class CataloguePipelinesAndReferencesCreation
     private readonly SqlConnectionStringBuilder _dqe;
     private ExternalDatabaseServer _edsLogging;
 
-    public CataloguePipelinesAndReferencesCreation(IRDMPPlatformRepositoryServiceLocator repositoryLocator, SqlConnectionStringBuilder logging, SqlConnectionStringBuilder dqe)
+    public CataloguePipelinesAndReferencesCreation(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        SqlConnectionStringBuilder logging, SqlConnectionStringBuilder dqe)
     {
         _repositoryLocator = repositoryLocator;
         _logging = logging;
@@ -45,29 +46,30 @@ public CataloguePipelinesAndReferencesCreation(IRDMPPlatformRepositoryServiceLoc
 
     private void DoStartup()
     {
-        var startup = new Startup.Startup(new EnvironmentInfo(),_repositoryLocator);
+        var startup = new Startup.Startup(new EnvironmentInfo(), _repositoryLocator);
         startup.DoStartup(new IgnoreAllErrorsCheckNotifier());
     }
-    private void CreateServers()
+    private void CreateServers(PlatformDatabaseCreationOptions options)
     {
         var defaults = _repositoryLocator.CatalogueRepository;
-
-        _edsLogging = new ExternalDatabaseServer(_repositoryLocator.CatalogueRepository, "Logging",new LoggingDatabasePatcher())
+        if(options.CreateLoggingServer){
+            _edsLogging = new ExternalDatabaseServer(_repositoryLocator.CatalogueRepository, "Logging",new LoggingDatabasePatcher())
+                {
+                    Server = _logging?.DataSource ?? throw new InvalidOperationException("Null logging database provided"),
+                    Database = _logging.InitialCatalog
+                };
+
+            if(_logging.UserID != null)
             {
-                Server = _logging.DataSource,
-                Database = _logging.InitialCatalog
-            };
+                _edsLogging.Username = _logging.UserID;
+                _edsLogging.Password = _logging.Password;
+            }
 
-        if(_logging.UserID != null)
-        {
-            _edsLogging.Username = _logging.UserID;
-            _edsLogging.Password = _logging.Password;
+            _edsLogging.SaveToDatabase();
+            defaults.SetDefault(PermissableDefaults.LiveLoggingServer_ID, _edsLogging);
+            Console.WriteLine("Successfully configured default logging server");
         }
 
-        _edsLogging.SaveToDatabase();
-        defaults.SetDefault(PermissableDefaults.LiveLoggingServer_ID, _edsLogging);
-        Console.WriteLine("Successfully configured default logging server");
-
         var edsDQE = new ExternalDatabaseServer(_repositoryLocator.CatalogueRepository, "DQE", new DataQualityEnginePatcher())
             {
                 Server = _dqe.DataSource,
@@ -85,15 +87,17 @@ private void CreateServers()
         Console.WriteLine("Successfully configured default dqe server");
 
         var edsRAW = new ExternalDatabaseServer(_repositoryLocator.CatalogueRepository, "RAW Server", null)
- {
-     Server = _dqe.DataSource
- };
+        {
+            Server = _dqe.DataSource
+        };
 
         //We are expecting a single username/password for everything here, so just use the dqe one
-        if (_dqe.UserID != null)
+        bool hasLoggingDB = _logging != null && _logging.UserID != null;
+        if (_dqe.UserID != null && hasLoggingDB)
         {
             if (_logging.UserID != _dqe.UserID || _logging.Password != _dqe.Password)
-                throw new Exception("DQE uses sql authentication but the credentials are not the same as the logging db.  Could not pick a single set of credentials to use for the RAW server entry");
+                throw new Exception(
+                    "DQE uses sql authentication but the credentials are not the same as the logging db.  Could not pick a single set of credentials to use for the RAW server entry");
 
             edsRAW.Username = _dqe.UserID;
             edsRAW.Password = _dqe.Password;
@@ -104,12 +108,14 @@ private void CreateServers()
         Console.WriteLine("Successfully configured RAW server");
     }
 
-    public void CreatePipelines()
+    public void CreatePipelines(PlatformDatabaseCreationOptions options)
     {
-        var bulkInsertCsvPipe = 
-            CreatePipeline("BULK INSERT: CSV Import File (manual column-type editing)", typeof(DelimitedFlatFileDataFlowSource), typeof(DataTableUploadDestination));
+        var bulkInsertCsvPipe =
+            CreatePipeline("BULK INSERT: CSV Import File (manual column-type editing)",
+                typeof(DelimitedFlatFileDataFlowSource), typeof(DataTableUploadDestination));
         var bulkInsertCsvPipewithAdjuster =
-            CreatePipeline("BULK INSERT: CSV Import File (automated column-type detection)", typeof(DelimitedFlatFileDataFlowSource), typeof(DataTableUploadDestination));
+            CreatePipeline("BULK INSERT: CSV Import File (automated column-type detection)",
+                typeof(DelimitedFlatFileDataFlowSource), typeof(DataTableUploadDestination));
         CreatePipeline("BULK INSERT: Excel File", typeof(ExcelDataFlowSource), typeof(DataTableUploadDestination));
 
         SetComponentProperties(bulkInsertCsvPipe.Source, "Separator", ",");
@@ -117,22 +123,27 @@ public void CreatePipelines()
         SetComponentProperties(bulkInsertCsvPipewithAdjuster.Source, "Separator", ",");
         SetComponentProperties(bulkInsertCsvPipewithAdjuster.Source, "StronglyTypeInput", false);
 
-        SetComponentProperties(bulkInsertCsvPipe.Destination, "LoggingServer", _edsLogging);
-        SetComponentProperties(bulkInsertCsvPipewithAdjuster.Destination, "LoggingServer", _edsLogging);
-
+        if(options.CreateLoggingServer){
+            SetComponentProperties(bulkInsertCsvPipe.Destination, "LoggingServer", _edsLogging);
+            SetComponentProperties(bulkInsertCsvPipewithAdjuster.Destination, "LoggingServer", _edsLogging);
+        }
         var createCohortFromCSV = CreatePipeline("CREATE COHORT:From CSV File",typeof (DelimitedFlatFileDataFlowSource), typeof (BasicCohortDestination));
         SetComponentProperties(createCohortFromCSV.Source, "Separator", ",");
 
-        CreatePipeline("CREATE COHORT:By Executing Cohort Identification Configuration",typeof (CohortIdentificationConfigurationSource), typeof (BasicCohortDestination));
+        CreatePipeline("CREATE COHORT:By Executing Cohort Identification Configuration",
+            typeof(CohortIdentificationConfigurationSource), typeof(BasicCohortDestination));
+
+        CreatePipeline("CREATE COHORT: From Catalogue", typeof(PatientIdentifierColumnSource),
+            typeof(BasicCohortDestination));
 
-        CreatePipeline("CREATE COHORT: From Catalogue", typeof(PatientIdentifierColumnSource), typeof(BasicCohortDestination));
+        CreatePipeline("IMPORT COHORT CUSTOM DATA: From PatientIndexTable", typeof(PatientIndexTableSource), null);
 
-        CreatePipeline("IMPORT COHORT CUSTOM DATA: From PatientIndexTable", typeof (PatientIndexTableSource), null);
+        CreatePipeline("DATA EXPORT:To CSV", typeof(ExecuteDatasetExtractionSource),
+            typeof(ExecuteDatasetExtractionFlatFileDestination));
 
-        CreatePipeline("DATA EXPORT:To CSV", typeof (ExecuteDatasetExtractionSource), typeof (ExecuteDatasetExtractionFlatFileDestination));
+        CreatePipeline("RELEASE PROJECT:To Directory", null, typeof(BasicDataReleaseDestination),
+            typeof(ReleaseFolderProvider));
 
-        CreatePipeline("RELEASE PROJECT:To Directory", null, typeof (BasicDataReleaseDestination),typeof(ReleaseFolderProvider));
-            
         CreatePipeline("CREATE TABLE:From Aggregate Query", null, typeof(DataTableUploadDestination));
     }
 
@@ -142,8 +153,9 @@ private static void SetComponentProperties(IPipelineComponent component, string
         d.SetValue(value);
         d.SaveToDatabase();
     }
-        
-    private Pipeline CreatePipeline(string nameOfPipe, Type sourceType, Type destinationTypeIfAny, params Type[] componentTypes)
+
+    private Pipeline CreatePipeline(string nameOfPipe, Type sourceType, Type destinationTypeIfAny,
+        params Type[] componentTypes)
     {
         if (componentTypes == null || componentTypes.Length == 0)
             return CreatePipeline(nameOfPipe, sourceType, destinationTypeIfAny);
@@ -169,12 +181,13 @@ private Pipeline CreatePipeline(string nameOfPipe, Type sourceType, Type destina
         {
             var source = new PipelineComponent(_repositoryLocator.CatalogueRepository, pipe, sourceType, 0);
             source.CreateArgumentsForClassIfNotExists(sourceType);
-            pipe.SourcePipelineComponent_ID = source.ID;    
+            pipe.SourcePipelineComponent_ID = source.ID;
         }
-            
+
         if (destinationTypeIfAny != null)
         {
-            var destination = new PipelineComponent(_repositoryLocator.CatalogueRepository, pipe,destinationTypeIfAny, 100);
+            var destination =
+                new PipelineComponent(_repositoryLocator.CatalogueRepository, pipe, destinationTypeIfAny, 100);
             destination.CreateArgumentsForClassIfNotExists(destinationTypeIfAny);
             pipe.DestinationPipelineComponent_ID = destination.ID;
         }
@@ -184,11 +197,10 @@ private Pipeline CreatePipeline(string nameOfPipe, Type sourceType, Type destina
         return pipe;
     }
 
-    public void Create()
+    public void Create(PlatformDatabaseCreationOptions options)
     {
-
         DoStartup();
-        CreateServers();
-        CreatePipelines();
+        CreateServers(options);
+        CreatePipelines(options);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs b/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs
index a5c4e0e6c5..efeca617b3 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/ExampleDatasetsCreation.cs
@@ -49,7 +49,7 @@ public class ExampleDatasetsCreation
     public const int NumberOfPeople = 5000;
     public const int NumberOfRowsPerDataset = 10000;
 
-    public ExampleDatasetsCreation(IBasicActivateItems activator,IRDMPPlatformRepositoryServiceLocator repos)
+    public ExampleDatasetsCreation(IBasicActivateItems activator, IRDMPPlatformRepositoryServiceLocator repos)
     {
         _repos = repos;
         _activator = activator;
@@ -57,49 +57,54 @@ public ExampleDatasetsCreation(IBasicActivateItems activator,IRDMPPlatformReposi
 
     internal void Create(DiscoveredDatabase db, ICheckNotifier notifier, PlatformDatabaseCreationOptions options)
     {
-        if(db.Exists())
-            if(options.DropDatabases)
+        if (db.Exists())
+            if (options.DropDatabases)
                 db.Drop();
             else
                 throw new Exception(
                     $"Database {db.GetRuntimeName()} already exists and allowDrop option was not specified");
-            
-        if(db.Server.Builder is SqlConnectionStringBuilder b)
+
+        if (db.Server.Builder is SqlConnectionStringBuilder b)
         {
             var keywords = _repos.CatalogueRepository
                 .GetAllObjects<ConnectionStringKeyword>()
-                .Where(k=>k.DatabaseType == DatabaseType.MicrosoftSQLServer)
+                .Where(k => k.DatabaseType == DatabaseType.MicrosoftSQLServer)
                 .ToArray();
 
-            AddKeywordIfSpecified(b.TrustServerCertificate, nameof(b.TrustServerCertificate),keywords);
+            AddKeywordIfSpecified(b.TrustServerCertificate, nameof(b.TrustServerCertificate), keywords);
         }
 
-        notifier.OnCheckPerformed(new CheckEventArgs($"About to create {db.GetRuntimeName()}",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"About to create {db.GetRuntimeName()}", CheckResult.Success));
         //create a new database for the datasets
         db.Create();
 
-        notifier.OnCheckPerformed(new CheckEventArgs($"Succesfully created {db.GetRuntimeName()}",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"Succesfully created {db.GetRuntimeName()}",
+            CheckResult.Success));
 
         //fixed seed so everyone gets the same datasets
         var r = new Random(options.Seed);
 
-        notifier.OnCheckPerformed(new CheckEventArgs("Generating people",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs("Generating people", CheckResult.Success));
         //people
         var people = new PersonCollection();
         people.GeneratePeople(options.NumberOfPeople, r);
 
         //datasets
-        var biochem = ImportCatalogue(Create<Biochemistry>(db,people,r,notifier, options.NumberOfRowsPerDataset, "chi","Healthboard","SampleDate","TestCode"));
-        var demography = ImportCatalogue(Create<Demography>(db,people,r,notifier, options.NumberOfRowsPerDataset, "chi","dtCreated","hb_extract"));
-        var prescribing = ImportCatalogue(Create<Prescribing>(db,people,r,notifier, options.NumberOfRowsPerDataset, "chi","PrescribedDate","Name")); //<- this is slooo!
-        var admissions = ImportCatalogue(Create<HospitalAdmissions>(db,people,r,notifier, options.NumberOfRowsPerDataset, "chi","AdmissionDate"));
+        var biochem = ImportCatalogue(Create<Biochemistry>(db, people, r, notifier, options.NumberOfRowsPerDataset,
+            "chi", "Healthboard", "SampleDate", "TestCode"));
+        var demography = ImportCatalogue(Create<Demography>(db, people, r, notifier, options.NumberOfRowsPerDataset,
+            "chi", "dtCreated", "hb_extract"));
+        var prescribing = ImportCatalogue(Create<Prescribing>(db, people, r, notifier, options.NumberOfRowsPerDataset,
+            "chi", "PrescribedDate", "Name")); //<- this is slooo!
+        var admissions = ImportCatalogue(Create<HospitalAdmissions>(db, people, r, notifier,
+            options.NumberOfRowsPerDataset, "chi", "AdmissionDate"));
 
         //Create but do not import the CarotidArteryScan dataset so that users can test out referencing a brand new table
-        Create<CarotidArteryScan>(db,people,r,notifier, options.NumberOfRowsPerDataset, "RECORD_NUMBER");
+        Create<CarotidArteryScan>(db, people, r, notifier, options.NumberOfRowsPerDataset, "RECORD_NUMBER");
 
         //the following should not be extractable
         ForExtractionInformations(demography,
-            e=>e.DeleteInDatabase(),
+            e => e.DeleteInDatabase(),
             "chi_num_of_curr_record",
             "surname",
             "forename",
@@ -124,7 +129,8 @@ internal void Create(DiscoveredDatabase db, ICheckNotifier notifier, PlatformDat
 
         //the following should be special approval only
         ForExtractionInformations(demography,
-            e=>{
+            e =>
+            {
                 e.ExtractionCategory = ExtractionCategory.SpecialApprovalRequired;
                 e.SaveToDatabase();
             },
@@ -135,43 +141,47 @@ internal void Create(DiscoveredDatabase db, ICheckNotifier notifier, PlatformDat
 
 
         CreateAdmissionsViews(db);
-        var vConditions = ImportCatalogue(db.ExpectTable("vConditions",null,TableType.View));
-        var vOperations = ImportCatalogue(db.ExpectTable("vOperations",null,TableType.View));
+        var vConditions = ImportCatalogue(db.ExpectTable("vConditions", null, TableType.View));
+        var vOperations = ImportCatalogue(db.ExpectTable("vOperations", null, TableType.View));
+
+        CreateGraph(biochem, "Test Codes", "TestCode", false, null);
+        CreateGraph(biochem, "Test Codes By Date", "SampleDate", true, "TestCode");
 
-        CreateGraph(biochem,"Test Codes","TestCode",false,null);
-        CreateGraph(biochem,"Test Codes By Date","SampleDate",true,"TestCode");
+        CreateFilter(biochem, "Creatinine", "TestCode", "TestCode like '%CRE%'",
+            @"Serum creatinine is a blood measurement.  It is an indicator of renal health.");
+        CreateFilter(biochem, "Test Code", "TestCode", "TestCode like @code", "Filters any test code set");
 
-        CreateFilter(biochem,"Creatinine","TestCode","TestCode like '%CRE%'",@"Serum creatinine is a blood measurement.  It is an indicator of renal health.");
-        CreateFilter(biochem,"Test Code","TestCode","TestCode like @code","Filters any test code set");
-            
-        CreateExtractionInformation(demography,"Age","date_of_birth","FLOOR(DATEDIFF(DAY, date_of_birth, GETDATE()) / 365.25) As Age");
-        var fAge = CreateFilter(demography,"Older at least x years","Age","FLOOR(DATEDIFF(DAY, date_of_birth, GETDATE()) / 365.25) >= @age","Patients age is greater than or equal to the provided @age");
-        SetParameter(fAge,"@age","int","16");
+        CreateExtractionInformation(demography, "Age", "date_of_birth",
+            "FLOOR(DATEDIFF(DAY, date_of_birth, GETDATE()) / 365.25) As Age");
+        var fAge = CreateFilter(demography, "Older at least x years", "Age",
+            "FLOOR(DATEDIFF(DAY, date_of_birth, GETDATE()) / 365.25) >= @age",
+            "Patients age is greater than or equal to the provided @age");
+        SetParameter(fAge, "@age", "int", "16");
 
-        CreateGraph(demography,"Patient Ages","Age",false,null);
+        CreateGraph(demography, "Patient Ages", "Age", false, null);
 
-        CreateGraph(prescribing,"Approved Name","ApprovedName",false,null);
-        CreateGraph(prescribing,"Approved Name Over Time","PrescribedDate",true,"ApprovedName");
-            
-        CreateGraph(prescribing,"Bnf","FormattedBnfCode",false,null);
-        CreateGraph(prescribing,"Bnf Over Time","PrescribedDate",true,"FormattedBnfCode");
+        CreateGraph(prescribing, "Approved Name", "ApprovedName", false, null);
+        CreateGraph(prescribing, "Approved Name Over Time", "PrescribedDate", true, "ApprovedName");
+
+        CreateGraph(prescribing, "Bnf", "FormattedBnfCode", false, null);
+        CreateGraph(prescribing, "Bnf Over Time", "PrescribedDate", true, "FormattedBnfCode");
 
         CreateFilter(
-            CreateGraph(vConditions,"Conditions frequency","Field",false,"Condition"),
+            CreateGraph(vConditions, "Conditions frequency", "Field", false, "Condition"),
             "Common Conditions Only",
             @"(Condition in 
 (select top 40 Condition from vConditions c
  WHERE Condition <> 'NULL' AND Condition <> 'Nul' 
  group by Condition order by count(*) desc))");
-                        
+
         CreateFilter(
-            CreateGraph(vOperations,"Operation frequency","Field",false,"Operation"),
+            CreateGraph(vOperations, "Operation frequency", "Field", false, "Operation"),
             "Common Operation Only",
             @"(Operation in 
 (select top 40 Operation from vOperations c
  WHERE Operation <> 'NULL' AND Operation <> 'Nul' 
- group by Operation order by count(*) desc))");            
-            
+ group by Operation order by count(*) desc))");
+
         //group these all into the same folder
         admissions.Folder = @"\admissions";
         admissions.SaveToDatabase();
@@ -186,30 +196,40 @@ WHERE Operation <> 'NULL' AND Operation <> 'Nul'
         var externalCohortTable = cmdCreateCohortTable.Created;
 
         //Find the pipeline for committing cohorts
-        var cohortCreationPipeline = _repos.CatalogueRepository.GetAllObjects<Pipeline>().FirstOrDefault(p=>p?.Source?.Class == typeof(CohortIdentificationConfigurationSource).FullName) ?? throw new Exception("Could not find a cohort committing pipeline");
+        var cohortCreationPipeline =
+            _repos.CatalogueRepository.GetAllObjects<Pipeline>().FirstOrDefault(p =>
+                p?.Source?.Class == typeof(CohortIdentificationConfigurationSource).FullName) ??
+            throw new Exception("Could not find a cohort committing pipeline");
 
         //A cohort creation query
-        var f = CreateFilter(vConditions,"Lung Cancer Condition","Condition","Condition like 'C349'","ICD-10-CM Diagnosis Code C34.9 Malignant neoplasm of unspecified part of bronchus or lung");
+        var f = CreateFilter(vConditions, "Lung Cancer Condition", "Condition", "Condition like 'C349'",
+            "ICD-10-CM Diagnosis Code C34.9 Malignant neoplasm of unspecified part of bronchus or lung");
 
         var cic = CreateCohortIdentificationConfiguration((ExtractionFilter)f);
 
-        var cohort = CommitCohortToNewProject(cic,externalCohortTable,cohortCreationPipeline,"Lung Cancer Project","P1 Lung Cancer Patients",123,out var project);
+        var cohort = CommitCohortToNewProject(cic, externalCohortTable, cohortCreationPipeline, "Lung Cancer Project",
+            "P1 Lung Cancer Patients", 123, out var project);
 
         var cohortTable = cohort.ExternalCohortTable.DiscoverCohortTable();
         using (var con = cohortTable.Database.Server.GetConnection())
         {
             con.Open();
             //delete half the records (so we can simulate cohort refresh)
-            using(var cmd = cohortTable.Database.Server.GetCommand(
-                      $"DELETE TOP (10) PERCENT from {cohortTable.GetFullyQualifiedName()}", con))
+            using (var cmd = cohortTable.Database.Server.GetCommand(
+                       $"DELETE TOP (10) PERCENT from {cohortTable.GetFullyQualifiedName()}", con))
+            {
                 cmd.ExecuteNonQuery();
+            }
         }
 
-        var ec1 = CreateExtractionConfiguration(project,cohort,"First Extraction (2016 - project 123)",true,notifier,biochem,prescribing,demography);
-        var ec2 = CreateExtractionConfiguration(project,cohort,"Project 123 - 2017 Refresh",true,notifier,biochem,prescribing,demography,admissions);
-        var ec3 = CreateExtractionConfiguration(project,cohort,"Project 123 - 2018 Refresh",true,notifier,biochem,prescribing,demography,admissions);
+        var ec1 = CreateExtractionConfiguration(project, cohort, "First Extraction (2016 - project 123)", true,
+            notifier, biochem, prescribing, demography);
+        var ec2 = CreateExtractionConfiguration(project, cohort, "Project 123 - 2017 Refresh", true, notifier, biochem,
+            prescribing, demography, admissions);
+        var ec3 = CreateExtractionConfiguration(project, cohort, "Project 123 - 2018 Refresh", true, notifier, biochem,
+            prescribing, demography, admissions);
 
-        ReleaseAllConfigurations(notifier,ec1,ec2,ec3);
+        ReleaseAllConfigurations(notifier, ec1, ec2, ec3);
 
 
         if (options.Nightmare)
@@ -230,110 +250,126 @@ private void AddKeywordIfSpecified(bool isEnabled, string name, ConnectionString
                 DatabaseType.MicrosoftSQLServer, name, "true");
 
             //pass it into the system wide static keyword collection for use with all databases of this type all the time
-            DiscoveredServerHelper.AddConnectionStringKeyword(keyword.DatabaseType, keyword.Name, keyword.Value, ConnectionStringKeywordPriority.SystemDefaultMedium);
+            DiscoveredServerHelper.AddConnectionStringKeyword(keyword.DatabaseType, keyword.Name, keyword.Value,
+                ConnectionStringKeywordPriority.SystemDefaultMedium);
         }
     }
 
-    private void ReleaseAllConfigurations(ICheckNotifier notifier,params ExtractionConfiguration[] extractionConfigurations)
+    private void ReleaseAllConfigurations(ICheckNotifier notifier,
+        params ExtractionConfiguration[] extractionConfigurations)
     {
-        var releasePipeline = _repos.CatalogueRepository.GetAllObjects<Pipeline>().FirstOrDefault(p=>p?.Destination?.Class == typeof(BasicDataReleaseDestination).FullName);
+        var releasePipeline = _repos.CatalogueRepository.GetAllObjects<Pipeline>()
+            .FirstOrDefault(p => p?.Destination?.Class == typeof(BasicDataReleaseDestination).FullName);
 
         try
         {
             //cleanup any old releases
-            var project = extractionConfigurations.Select(ec=>ec.Project).Distinct().Single();
+            var project = extractionConfigurations.Select(ec => ec.Project).Distinct().Single();
 
             var folderProvider = new ReleaseFolderProvider();
             var dir = folderProvider.GetFromProjectFolder(project);
-            if(dir.Exists)
+            if (dir.Exists)
                 dir.Delete(true);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Could not detect/delete release folder for extractions",CheckResult.Warning,ex));
+            notifier.OnCheckPerformed(new CheckEventArgs("Could not detect/delete release folder for extractions",
+                CheckResult.Warning, ex));
             return;
         }
 
 
-        if(releasePipeline != null)
+        if (releasePipeline != null)
             try
             {
                 var optsRelease = new ReleaseOptions
                 {
-                    Configurations = string.Join(",",extractionConfigurations.Select(ec=>ec.ID.ToString()).Distinct().ToArray()),
+                    Configurations = string.Join(",",
+                        extractionConfigurations.Select(ec => ec.ID.ToString()).Distinct().ToArray()),
                     Pipeline = releasePipeline.ID.ToString()
                 };
 
                 var runnerRelease = new ReleaseRunner(optsRelease);
-                runnerRelease.Run(_repos,new ThrowImmediatelyDataLoadEventListener(),notifier,new GracefulCancellationToken());
+                runnerRelease.Run(_repos, new ThrowImmediatelyDataLoadEventListener(), notifier,
+                    new GracefulCancellationToken());
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Could not Release ExtractionConfiguration (nevermind)",CheckResult.Warning,ex));
+                notifier.OnCheckPerformed(new CheckEventArgs("Could not Release ExtractionConfiguration (nevermind)",
+                    CheckResult.Warning, ex));
             }
     }
 
-    private static void ForExtractionInformations(ICatalogue catalogue, Action<ExtractionInformation> action,params string[] extractionInformations)
+    private static void ForExtractionInformations(ICatalogue catalogue, Action<ExtractionInformation> action,
+        params string[] extractionInformations)
     {
-        foreach(var e in extractionInformations.Select(s=> GetExtractionInformation(catalogue,s)))
+        foreach (var e in extractionInformations.Select(s => GetExtractionInformation(catalogue, s)))
             action(e);
     }
 
     private static void SetParameter(IFilter filter, string paramterToSet, string dataType, string value)
     {
-        var p = filter.GetAllParameters().Single(fp=>fp.ParameterName == paramterToSet);
+        var p = filter.GetAllParameters().Single(fp => fp.ParameterName == paramterToSet);
         p.ParameterSQL = $"DECLARE {paramterToSet} AS {dataType}";
         p.Value = value;
         p.SaveToDatabase();
     }
 
-    private ExtractionInformation CreateExtractionInformation(ICatalogue catalogue, string name, string columnInfoName, string selectSQL)
+    private ExtractionInformation CreateExtractionInformation(ICatalogue catalogue, string name, string columnInfoName,
+        string selectSQL)
     {
-        var col = catalogue.GetTableInfoList(false).SelectMany(t=>t.ColumnInfos).SingleOrDefault(c=>c.GetRuntimeName() == columnInfoName) ?? throw new Exception($"Could not find ColumnInfo called '{columnInfoName}' in Catalogue {catalogue}");
-        var ci = new CatalogueItem(_repos.CatalogueRepository,catalogue,name)
+        var col =
+            catalogue.GetTableInfoList(false).SelectMany(t => t.ColumnInfos)
+                .SingleOrDefault(c => c.GetRuntimeName() == columnInfoName) ??
+            throw new Exception($"Could not find ColumnInfo called '{columnInfoName}' in Catalogue {catalogue}");
+        var ci = new CatalogueItem(_repos.CatalogueRepository, catalogue, name)
         {
             ColumnInfo_ID = col.ID
         };
         ci.SaveToDatabase();
-            
-        return new ExtractionInformation(_repos.CatalogueRepository,ci,col,selectSQL);
+
+        return new ExtractionInformation(_repos.CatalogueRepository, ci, col, selectSQL);
     }
 
-    private ExtractionConfiguration CreateExtractionConfiguration(Project project, ExtractableCohort cohort,string name,bool isReleased,ICheckNotifier notifier, params ICatalogue[] catalogues)
+    private ExtractionConfiguration CreateExtractionConfiguration(Project project, ExtractableCohort cohort,
+        string name, bool isReleased, ICheckNotifier notifier, params ICatalogue[] catalogues)
     {
-        var extractionConfiguration = new ExtractionConfiguration(_repos.DataExportRepository,project)
+        var extractionConfiguration = new ExtractionConfiguration(_repos.DataExportRepository, project)
         {
             Name = name,
             Cohort_ID = cohort.ID
         };
         extractionConfiguration.SaveToDatabase();
 
-        foreach(var c in catalogues)
+        foreach (var c in catalogues)
         {
             //Get its extractableness
             var eds = _repos.DataExportRepository.GetAllObjectsWithParent<ExtractableDataSet>(c).SingleOrDefault()
-                      ?? new ExtractableDataSet(_repos.DataExportRepository,c); //or make it extractable
+                      ?? new ExtractableDataSet(_repos.DataExportRepository, c); //or make it extractable
 
             extractionConfiguration.AddDatasetToConfiguration(eds);
         }
 
-        var extractionPipeline = _repos.CatalogueRepository.GetAllObjects<Pipeline>().FirstOrDefault(p=>p?.Destination?.Class == typeof(ExecuteDatasetExtractionFlatFileDestination).FullName);
+        var extractionPipeline = _repos.CatalogueRepository.GetAllObjects<Pipeline>().FirstOrDefault(p =>
+            p?.Destination?.Class == typeof(ExecuteDatasetExtractionFlatFileDestination).FullName);
 
-        if(isReleased && extractionConfiguration != null)
+        if (isReleased && extractionConfiguration != null)
         {
             var optsExtract = new ExtractionOptions
             {
                 Pipeline = extractionPipeline.ID.ToString(),
                 ExtractionConfiguration = extractionConfiguration.ID.ToString()
             };
-            var runnerExtract = new ExtractionRunner(_activator,optsExtract);
+            var runnerExtract = new ExtractionRunner(_activator, optsExtract);
             try
             {
-                runnerExtract.Run(_repos,new ThrowImmediatelyDataLoadEventListener(),notifier,new GracefulCancellationToken());
+                runnerExtract.Run(_repos, new ThrowImmediatelyDataLoadEventListener(), notifier,
+                    new GracefulCancellationToken());
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Could not run ExtractionConfiguration (nevermind)",CheckResult.Warning,ex));
+                notifier.OnCheckPerformed(new CheckEventArgs("Could not run ExtractionConfiguration (nevermind)",
+                    CheckResult.Warning, ex));
             }
 
             extractionConfiguration.IsReleased = true;
@@ -343,10 +379,12 @@ private ExtractionConfiguration CreateExtractionConfiguration(Project project, E
         return extractionConfiguration;
     }
 
-    private ExtractableCohort CommitCohortToNewProject(CohortIdentificationConfiguration cic, ExternalCohortTable externalCohortTable,IPipeline cohortCreationPipeline,string projectName,string cohortName,int projectNumber, out Project project)
+    private ExtractableCohort CommitCohortToNewProject(CohortIdentificationConfiguration cic,
+        ExternalCohortTable externalCohortTable, IPipeline cohortCreationPipeline, string projectName,
+        string cohortName, int projectNumber, out Project project)
     {
         //create a new data extraction Project
-        project = new Project(_repos.DataExportRepository,projectName)
+        project = new Project(_repos.DataExportRepository, projectName)
         {
             ProjectNumber = projectNumber,
             ExtractionDirectory = Path.GetTempPath()
@@ -356,12 +394,14 @@ private ExtractableCohort CommitCohortToNewProject(CohortIdentificationConfigura
         //create a cohort
         var auditLogBuilder = new ExtractableCohortAuditLogBuilder();
 
-        var request = new CohortCreationRequest(project,new CohortDefinition(null,cohortName,1,projectNumber,externalCohortTable),_repos.DataExportRepository, ExtractableCohortAuditLogBuilder.GetDescription(cic))
-            {
-                CohortIdentificationConfiguration = cic
-            };
+        var request = new CohortCreationRequest(project,
+            new CohortDefinition(null, cohortName, 1, projectNumber, externalCohortTable), _repos.DataExportRepository,
+            ExtractableCohortAuditLogBuilder.GetDescription(cic))
+        {
+            CohortIdentificationConfiguration = cic
+        };
 
-        var engine = request.GetEngine(cohortCreationPipeline,new ThrowImmediatelyDataLoadEventListener());                        
+        var engine = request.GetEngine(cohortCreationPipeline, new ThrowImmediatelyDataLoadEventListener());
 
         engine.ExecutePipeline(new GracefulCancellationToken());
 
@@ -371,10 +411,10 @@ private ExtractableCohort CommitCohortToNewProject(CohortIdentificationConfigura
     private CohortIdentificationConfiguration CreateCohortIdentificationConfiguration(ExtractionFilter inclusionFilter1)
     {
         //Create the top level configuration object
-        var cic = new CohortIdentificationConfiguration(_repos.CatalogueRepository,"Tayside Lung Cancer Cohort");
+        var cic = new CohortIdentificationConfiguration(_repos.CatalogueRepository, "Tayside Lung Cancer Cohort");
 
         //create a UNION container for Inclusion Criteria
-        var container = new CohortAggregateContainer(_repos.CatalogueRepository,SetOperation.UNION)
+        var container = new CohortAggregateContainer(_repos.CatalogueRepository, SetOperation.UNION)
         {
             Name = "Inclusion Criteria"
         };
@@ -385,19 +425,20 @@ private CohortIdentificationConfiguration CreateCohortIdentificationConfiguratio
 
         //Create a new cohort set to the 'Inclusion Criteria' based on the filters Catalogue
         var cata = inclusionFilter1.ExtractionInformation.CatalogueItem.Catalogue;
-        var ac = cic.CreateNewEmptyConfigurationForCatalogue(cata,(a,b)=> throw new Exception("Problem encountered with chi column(s)"),false);
-        container.AddChild(ac,0);
+        var ac = cic.CreateNewEmptyConfigurationForCatalogue(cata,
+            (a, b) => throw new Exception("Problem encountered with chi column(s)"), false);
+        container.AddChild(ac, 0);
 
         //Add the filter to the WHERE logic of the cohort set
-        var whereContainer = new AggregateFilterContainer(_repos.CatalogueRepository,FilterContainerOperation.OR);
+        var whereContainer = new AggregateFilterContainer(_repos.CatalogueRepository, FilterContainerOperation.OR);
 
         ac.Name = $"People with {inclusionFilter1.Name}";
         ac.RootFilterContainer_ID = whereContainer.ID;
         cic.EnsureNamingConvention(ac); //this will put cicx at the front and cause implicit SaveToDatabase
 
-        var filterImporter = new FilterImporter(new AggregateFilterFactory(_repos.CatalogueRepository),null);
+        var filterImporter = new FilterImporter(new AggregateFilterFactory(_repos.CatalogueRepository), null);
         var cloneFilter = filterImporter.ImportFilter(whereContainer, inclusionFilter1, null);
-            
+
         whereContainer.AddChild(cloneFilter);
 
         return cic;
@@ -406,16 +447,18 @@ private CohortIdentificationConfiguration CreateCohortIdentificationConfiguratio
     private IFilter CreateFilter(AggregateConfiguration graph, string name, string whereSql)
     {
         AggregateFilterContainer container;
-        if(graph.RootFilterContainer_ID == null)
+        if (graph.RootFilterContainer_ID == null)
         {
-            container = new AggregateFilterContainer(_repos.CatalogueRepository,FilterContainerOperation.AND);
-            graph.RootFilterContainer_ID =container.ID;
+            container = new AggregateFilterContainer(_repos.CatalogueRepository, FilterContainerOperation.AND);
+            graph.RootFilterContainer_ID = container.ID;
             graph.SaveToDatabase();
         }
         else
+        {
             container = (AggregateFilterContainer)graph.RootFilterContainer;
+        }
 
-        var filter = new AggregateFilter(_repos.CatalogueRepository,name,container)
+        var filter = new AggregateFilter(_repos.CatalogueRepository, name, container)
         {
             WhereSQL = whereSql
         };
@@ -426,12 +469,11 @@ private IFilter CreateFilter(AggregateConfiguration graph, string name, string w
 
     private static void CreateAdmissionsViews(DiscoveredDatabase db)
     {
-        using(var con = db.Server.GetConnection())
+        using (var con = db.Server.GetConnection())
         {
             con.Open();
-            using(var cmd = db.Server.GetCommand(
-
-                      @"create view vConditions as
+            using (var cmd = db.Server.GetCommand(
+                       @"create view vConditions as
 
 SELECT chi,DateOfBirth,AdmissionDate,DischargeDate,Condition,Field
 FROM
@@ -442,13 +484,14 @@ FROM HospitalAdmissions
 UNPIVOT 
 (
   Condition FOR Field IN (MainCondition,OtherCondition1,OtherCondition2,OtherCondition3)
-) AS up;",con))
+) AS up;", con))
+            {
                 cmd.ExecuteNonQuery();
+            }
 
 
-
-            using(var cmd = db.Server.GetCommand(
-                      @"create view vOperations as
+            using (var cmd = db.Server.GetCommand(
+                       @"create view vOperations as
 
 SELECT chi,DateOfBirth,AdmissionDate,DischargeDate,Operation,Field
 FROM
@@ -459,27 +502,26 @@ FROM HospitalAdmissions
 UNPIVOT 
 (
   Operation FOR Field IN (MainOperation,OtherOperation1,OtherOperation2,OtherOperation3)
-) AS up;",con))
+) AS up;", con))
+            {
                 cmd.ExecuteNonQuery();
-
-
+            }
         }
-            
-
-
     }
 
-    private IFilter CreateFilter(ICatalogue cata, string name,string parentExtractionInformation, string whereSql,string desc)
+    private IFilter CreateFilter(ICatalogue cata, string name, string parentExtractionInformation, string whereSql,
+        string desc)
     {
-        var filter = new ExtractionFilter(_repos.CatalogueRepository,name, GetExtractionInformation(cata,parentExtractionInformation))
-            {
-                WhereSQL = whereSql,
-                Description = desc
-            };
+        var filter = new ExtractionFilter(_repos.CatalogueRepository, name,
+            GetExtractionInformation(cata, parentExtractionInformation))
+        {
+            WhereSQL = whereSql,
+            Description = desc
+        };
         filter.SaveToDatabase();
 
-        var parameterCreator = new ParameterCreator(filter.GetFilterFactory(),null,null);
-        parameterCreator.CreateAll(filter,null);
+        var parameterCreator = new ParameterCreator(filter.GetFilterFactory(), null, null);
+        parameterCreator.CreateAll(filter, null);
 
         return filter;
     }
@@ -492,21 +534,24 @@ private IFilter CreateFilter(ICatalogue cata, string name,string parentExtractio
     /// <param name="dimension1">The first dimension e.g. pass only one dimension to create a bar chart</param>
     /// <param name="isAxis">True if <paramref name="dimension1"/> should be created as a axis (creates a line chart)</param>
     /// <param name="dimension2">Optional second dimension to create (this will be the pivot column)</param>
-    private AggregateConfiguration CreateGraph(ICatalogue cata, string name, string dimension1,bool isAxis, string dimension2)
+    private AggregateConfiguration CreateGraph(ICatalogue cata, string name, string dimension1, bool isAxis,
+        string dimension2)
     {
-        var ac = new AggregateConfiguration(_repos.CatalogueRepository,cata,name)
+        var ac = new AggregateConfiguration(_repos.CatalogueRepository, cata, name)
         {
             CountSQL = "count(*) as NumberOfRecords"
         };
         ac.SaveToDatabase();
         ac.IsExtractable = true;
 
-        var mainDimension = ac.AddDimension(GetExtractionInformation(cata,dimension1));
-        var otherDimension = string.IsNullOrWhiteSpace(dimension2) ? null : ac.AddDimension(GetExtractionInformation(cata,dimension2));
-            
-        if(isAxis)
+        var mainDimension = ac.AddDimension(GetExtractionInformation(cata, dimension1));
+        var otherDimension = string.IsNullOrWhiteSpace(dimension2)
+            ? null
+            : ac.AddDimension(GetExtractionInformation(cata, dimension2));
+
+        if (isAxis)
         {
-            var axis = new AggregateContinuousDateAxis(_repos.CatalogueRepository,mainDimension)
+            var axis = new AggregateContinuousDateAxis(_repos.CatalogueRepository, mainDimension)
             {
                 StartDate = "'1970-01-01'",
                 AxisIncrement = FAnsi.Discovery.QuerySyntax.Aggregation.AxisIncrement.Year
@@ -514,12 +559,12 @@ private AggregateConfiguration CreateGraph(ICatalogue cata, string name, string
             axis.SaveToDatabase();
         }
 
-        if(otherDimension != null)
+        if (otherDimension != null)
         {
             ac.PivotOnDimensionID = otherDimension.ID;
             ac.SaveToDatabase();
-        }          
-            
+        }
+
         return ac;
     }
 
@@ -527,7 +572,8 @@ private static ExtractionInformation GetExtractionInformation(ICatalogue cata, s
     {
         try
         {
-            return cata.GetAllExtractionInformation(ExtractionCategory.Any).Single(ei=>ei.GetRuntimeName().Equals(name,StringComparison.CurrentCultureIgnoreCase));
+            return cata.GetAllExtractionInformation(ExtractionCategory.Any).Single(ei =>
+                ei.GetRuntimeName().Equals(name, StringComparison.CurrentCultureIgnoreCase));
         }
         catch
         {
@@ -535,53 +581,53 @@ private static ExtractionInformation GetExtractionInformation(ICatalogue cata, s
         }
     }
 
-    private static DiscoveredTable Create<T>(DiscoveredDatabase db,PersonCollection people, Random r, ICheckNotifier notifier,int numberOfRecords, params string[] primaryKey) where T:IDataGenerator
+    private static DiscoveredTable Create<T>(DiscoveredDatabase db, PersonCollection people, Random r,
+        ICheckNotifier notifier, int numberOfRecords, params string[] primaryKey) where T : IDataGenerator
     {
         var dataset = typeof(T).Name;
-        notifier.OnCheckPerformed(new CheckEventArgs($"Generating {numberOfRecords} records for {dataset}",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"Generating {numberOfRecords} records for {dataset}",
+            CheckResult.Success));
 
         var factory = new DataGeneratorFactory();
 
         //half a million biochemistry results
-        var biochem = factory.Create(typeof(T),r);
-        var dt = biochem.GetDataTable(people,numberOfRecords);
+        var biochem = factory.Create(typeof(T), r);
+        var dt = biochem.GetDataTable(people, numberOfRecords);
 
         //prune "nulls"
-        foreach(DataRow dr in dt.Rows)
-            for(var i = 0;i<dt.Columns.Count;i++)
-                if(string.Equals(dr[i] as string, "NULL",StringComparison.CurrentCultureIgnoreCase))
+        foreach (DataRow dr in dt.Rows)
+            for (var i = 0; i < dt.Columns.Count; i++)
+                if (string.Equals(dr[i] as string, "NULL", StringComparison.CurrentCultureIgnoreCase))
                     dr[i] = DBNull.Value;
 
 
-        notifier.OnCheckPerformed(new CheckEventArgs($"Uploading {dataset}",CheckResult.Success));
-        var tbl = db.CreateTable(dataset,dt, GetExplicitColumnDefinitions<T>());
+        notifier.OnCheckPerformed(new CheckEventArgs($"Uploading {dataset}", CheckResult.Success));
+        var tbl = db.CreateTable(dataset, dt, GetExplicitColumnDefinitions<T>());
 
-        if(primaryKey.Length != 0)
+        if (primaryKey.Length != 0)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Creating Primary Key {dataset}",CheckResult.Success));
-            var cols = primaryKey.Select(s=>tbl.DiscoverColumn(s)).ToArray();
-            tbl.CreatePrimaryKey(5000,cols);
+            notifier.OnCheckPerformed(new CheckEventArgs($"Creating Primary Key {dataset}", CheckResult.Success));
+            var cols = primaryKey.Select(s => tbl.DiscoverColumn(s)).ToArray();
+            tbl.CreatePrimaryKey(5000, cols);
         }
 
-        return tbl;            
+        return tbl;
     }
 
     private static DatabaseColumnRequest[] GetExplicitColumnDefinitions<T>() where T : IDataGenerator
     {
-            
-        if(typeof(T) == typeof(HospitalAdmissions))
-        {
-            return new []{
-                new DatabaseColumnRequest("MainOperation",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("MainOperationB",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation1",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation1B",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation2",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation2B",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation3",new DatabaseTypeRequest(typeof(string),4)),
-                new DatabaseColumnRequest("OtherOperation3B",new DatabaseTypeRequest(typeof(string),4))
+        if (typeof(T) == typeof(HospitalAdmissions))
+            return new[]
+            {
+                new DatabaseColumnRequest("MainOperation", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("MainOperationB", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation1", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation1B", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation2", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation2B", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation3", new DatabaseTypeRequest(typeof(string), 4)),
+                new DatabaseColumnRequest("OtherOperation3B", new DatabaseTypeRequest(typeof(string), 4))
             };
-        }
 
 
         return null;
@@ -589,32 +635,30 @@ private static DatabaseColumnRequest[] GetExplicitColumnDefinitions<T>() where T
 
     private ITableInfo ImportTableInfo(DiscoveredTable tbl)
     {
-        var importer = new TableInfoImporter(_repos.CatalogueRepository,tbl);
-        importer.DoImport(out var ti,out _);
-            
+        var importer = new TableInfoImporter(_repos.CatalogueRepository, tbl);
+        importer.DoImport(out var ti, out _);
+
         return ti;
     }
 
-    private ICatalogue ImportCatalogue(DiscoveredTable tbl)
-    {
-        return ImportCatalogue(ImportTableInfo(tbl));
-    }
+    private ICatalogue ImportCatalogue(DiscoveredTable tbl) => ImportCatalogue(ImportTableInfo(tbl));
+
     private ICatalogue ImportCatalogue(ITableInfo ti)
     {
-        var forwardEngineer = new ForwardEngineerCatalogue(ti,ti.ColumnInfos);
-        forwardEngineer.ExecuteForwardEngineering(out var cata, out _,out var eis);
+        var forwardEngineer = new ForwardEngineerCatalogue(ti, ti.ColumnInfos);
+        forwardEngineer.ExecuteForwardEngineering(out var cata, out _, out var eis);
 
         //get descriptions of the columns from BadMedicine
         var desc = new Descriptions();
         cata.Description = Trim(desc.Get(cata.Name));
-        if(cata.Description != null)
+        if (cata.Description != null)
         {
             cata.SaveToDatabase();
 
-            foreach(var ci in cata.CatalogueItems)
+            foreach (var ci in cata.CatalogueItems)
             {
-                var ciDescription = Trim(desc.Get(cata.Name,ci.Name));
-                if(ciDescription != null)
+                var ciDescription = Trim(desc.Get(cata.Name, ci.Name));
+                if (ciDescription != null)
                 {
                     ci.Description = ciDescription;
                     ci.SaveToDatabase();
@@ -622,23 +666,24 @@ private ICatalogue ImportCatalogue(ITableInfo ti)
             }
         }
 
-        var chi = eis.SingleOrDefault(e=>e.GetRuntimeName().Equals("chi",StringComparison.CurrentCultureIgnoreCase));
-        if(chi != null)
+        var chi = eis.SingleOrDefault(e => e.GetRuntimeName().Equals("chi", StringComparison.CurrentCultureIgnoreCase));
+        if (chi != null)
         {
             chi.IsExtractionIdentifier = true;
             chi.SaveToDatabase();
 
-            new ExtractableDataSet(_repos.DataExportRepository,cata);
+            new ExtractableDataSet(_repos.DataExportRepository, cata);
         }
+
         return cata;
     }
 
     private static string Trim(string s)
     {
-        if(string.IsNullOrWhiteSpace(s))
+        if (string.IsNullOrWhiteSpace(s))
             return null;
 
         //replace 2+ tabs and spaces with single spaces
-        return Regex.Replace(s,@"[ \t]{2,}"," ").Trim();
+        return Regex.Replace(s, @"[ \t]{2,}", " ").Trim();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/NightmareDatasets.cs b/Rdmp.Core/CommandLine/DatabaseCreation/NightmareDatasets.cs
index 02e1ce839c..76d6562a88 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/NightmareDatasets.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/NightmareDatasets.cs
@@ -19,7 +19,8 @@
 
 namespace Rdmp.Core.CommandLine.DatabaseCreation;
 
-[SuppressMessage("Security", "SCS0005:Weak random number generator.", Justification = "We are generating random metadata, security does not enter into the equation")]
+[SuppressMessage("Security", "SCS0005:Weak random number generator.",
+    Justification = "We are generating random metadata, security does not enter into the equation")]
 internal class NightmareDatasets : DataGenerator
 {
     private IRDMPPlatformRepositoryServiceLocator _repos;
@@ -34,7 +35,7 @@ internal class NightmareDatasets : DataGenerator
     /// </summary>
     public int Factor = 1;
 
-    public NightmareDatasets(IRDMPPlatformRepositoryServiceLocator repos, DiscoveredDatabase db) :base(new Random(123))
+    public NightmareDatasets(IRDMPPlatformRepositoryServiceLocator repos, DiscoveredDatabase db) : base(new Random(123))
     {
         _repos = repos;
         _db = db;
@@ -76,11 +77,11 @@ public void Create(ExternalCohortTable ect)
         for (var i = 0; i < 500 * Factor; i++)
         {
             var cata = new Catalogue(_repos.CatalogueRepository, $"Catalogue {GetRandomGPCode(r)}")
- {
-     Description = GetRandomSentence(r)
- };
+            {
+                Description = GetRandomSentence(r)
+            };
             cata.SaveToDatabase();
-            Catalogues.Add(1,cata);
+            Catalogues.Add(1, cata);
 
             // half of datasets have linkage identifiers
             var hasExtractionIdentifier = false;
@@ -98,9 +99,9 @@ public void Create(ExternalCohortTable ect)
                 if (r.Next(10) < 6)
                 {
                     var ei = new ExtractionInformation(_repos.CatalogueRepository, ci, col, col.Name)
-                        {
-                            ExtractionCategory = extractionCategories.GetRandom(r)
-                        };
+                    {
+                        ExtractionCategory = extractionCategories.GetRandom(r)
+                    };
 
                     if (first)
                     {
@@ -117,7 +118,7 @@ public void Create(ExternalCohortTable ect)
                     }
 
                     first = false;
-                }           
+                }
             }
 
             // half of the Catalogues have IsExtractionIdentifier
@@ -128,23 +129,20 @@ public void Create(ExternalCohortTable ect)
                 ExtractableDatasets.Add(1, eds);
             }
         }
-            
+
         // There are 500 tables associated with Catalogues
         // but also 250 tables that are not linked to any Catalogues
-        for (var i = 0; i < 250 * Factor; i++)
-        {
-            CreateTable();
-        }
+        for (var i = 0; i < 250 * Factor; i++) CreateTable();
 
         // open a connection to the cohort db for creating external cohorts
         using var con = ect.Discover().Server.GetManagedConnection();
-            
+
         for (var i = 0; i < 200 * Factor; i++)
         {
             // each project
             var p = new Project(_repos.DataExportRepository, $"Project {i}")
             {
-                ProjectNumber = r.Next(50) == 0 ? 5:i, // it's ok for some projects to have the same number
+                ProjectNumber = r.Next(50) == 0 ? 5 : i, // it's ok for some projects to have the same number
                 ExtractionDirectory = extractionDir
             };
             p.SaveToDatabase();
@@ -153,7 +151,7 @@ public void Create(ExternalCohortTable ect)
             // has an average of 5 ExtractionConfigurations but could have 0 to 10
             var numberOfConfigs = GetGaussianInt(0, 10);
 
-            for(var c = 0;c< numberOfConfigs; c++)
+            for (var c = 0; c < numberOfConfigs; c++)
             {
                 var config = new ExtractionConfiguration(_repos.DataExportRepository, p,
                     $"Extraction {GetRandomGPCode(r)}");
@@ -171,13 +169,14 @@ public void Create(ExternalCohortTable ect)
                     config.AddDatasetToConfiguration(ds, out var sds);
 
                     var request = new CohortCreationRequest(p,
-                        new CohortDefinition(null,"Created by NightmareDatasets",1, p.ProjectNumber.Value, ect),
+                        new CohortDefinition(null, "Created by NightmareDatasets", 1, p.ProjectNumber.Value, ect),
                         _repos.DataExportRepository,
                         $"Nightmare dreamed on {DateTime.Now}");
 
                     request.PushToServer(con);
 
-                    var cohort = new ExtractableCohort(_repos.DataExportRepository, ect, request.NewCohortDefinition.ID.Value);
+                    var cohort = new ExtractableCohort(_repos.DataExportRepository, ect,
+                        request.NewCohortDefinition.ID.Value);
                     config.Cohort_ID = cohort.ID;
                     config.SaveToDatabase();
 
@@ -213,19 +212,19 @@ public void Create(ExternalCohortTable ect)
         {
             var cic = new CohortIdentificationConfiguration(_repos.CatalogueRepository,
                 $"Cohort Query {GetRandomGPCode(r)}");
-                
+
             // 25% of cics are associated with a specific project
-            if(r.Next(4) == 0)
+            if (r.Next(4) == 0)
             {
-                var projSpecific = new ProjectCohortIdentificationConfigurationAssociation(_repos.DataExportRepository, Projects.GetRandom(r), cic);
+                var projSpecific =
+                    new ProjectCohortIdentificationConfigurationAssociation(_repos.DataExportRepository,
+                        Projects.GetRandom(r), cic);
             }
-                
         }
     }
 
     private void AddExtractionFiltersTo(IContainer container)
     {
-
         var numberOfFilters = GetGaussianInt(0, 2);
         for (var f = 0; f < numberOfFilters; f++)
         {
@@ -246,17 +245,18 @@ private IEnumerable<ColumnInfo> CreateTable()
         // 18415 columns
         // = average of 24 columns per table
         var ti = new TableInfo(_repos.CatalogueRepository, $"[MyDb].[Table{TablesCount++}]");
-            
+
         // let's not set the server name on 1 in 20 so we get all those
         // horrible null references out in the open
-        if(r.Next(20)!=0)
+        if (r.Next(20) != 0)
             ti.Server = _serverName;
 
         // let's not set the database name on 1 in 20 so we get all those
         // horrible null references out in the open
         if (r.Next(20) != 0)
-            ti.Database = r.Next(2) == 0 ? _databaseNameRuntime : _databaseNameWrapped; // some are "[mydb]" some will be "mydb"
-            
+            ti.Database =
+                r.Next(2) == 0 ? _databaseNameRuntime : _databaseNameWrapped; // some are "[mydb]" some will be "mydb"
+
         // 1 in 20 tables is a view
         ti.IsView = r.Next(20) == 0;
 
@@ -266,19 +266,11 @@ private IEnumerable<ColumnInfo> CreateTable()
 
         var numberOfColumns = GetGaussianInt(1, 48);
         for (var j = 0; j < numberOfColumns; j++)
-        {
             yield return new ColumnInfo(_repos.CatalogueRepository, $"MyCol{ColumnsCount++}", "varchar(10)", ti);
-        }
     }
 
     // we are not actually interested in these methods, just want to use GetGaussian etc
-    public override object[] GenerateTestDataRow(Person p)
-    {
-        throw new NotSupportedException();
-    }
+    public override object[] GenerateTestDataRow(Person p) => throw new NotSupportedException();
 
-    protected override string[] GetHeaders()
-    {
-        throw new NotSupportedException();
-    }
+    protected override string[] GetHeaders() => throw new NotSupportedException();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreation.cs b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreation.cs
index da0719df2a..17c9b4d845 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreation.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreation.cs
@@ -38,8 +38,11 @@ public static void CreatePlatformDatabases(PlatformDatabaseCreationOptions optio
         Create(DefaultDataExportDatabaseName, new DataExportPatcher(), options);
 
         var dqe = Create(DefaultDQEDatabaseName, new DataQualityEnginePatcher(), options);
-        var logging = Create(DefaultLoggingDatabaseName, new LoggingDatabasePatcher(), options);
-
+        
+        SqlConnectionStringBuilder logging = null;
+        if(options.CreateLoggingServer){
+            logging = Create(DefaultLoggingDatabaseName, new LoggingDatabasePatcher(), options);
+        }
         CatalogueRepository.SuppressHelpLoading = true;
 
         var repo = new PlatformDatabaseCreationRepositoryFinder(options);
@@ -47,19 +50,21 @@ public static void CreatePlatformDatabases(PlatformDatabaseCreationOptions optio
         if (!options.SkipPipelines)
         {
             var creator = new CataloguePipelinesAndReferencesCreation(repo, logging, dqe);
-            creator.Create();
+            creator.Create(options);
         }
 
-        if(options.ExampleDatasets || options.Nightmare)
+        if (options.ExampleDatasets || options.Nightmare)
         {
-            var examples = new ExampleDatasetsCreation(new ThrowImmediatelyActivator(repo,null),repo);
+            var examples = new ExampleDatasetsCreation(new ThrowImmediatelyActivator(repo, null), repo);
             var server = new DiscoveredServer(options.GetBuilder("ExampleData"));
-                
-            examples.Create(server.GetCurrentDatabase(),new ThrowImmediatelyCheckNotifier {WriteToConsole = true },options);
+
+            examples.Create(server.GetCurrentDatabase(), new ThrowImmediatelyCheckNotifier { WriteToConsole = true },
+                options);
         }
     }
 
-    private static SqlConnectionStringBuilder Create(string databaseName, IPatcher patcher, PlatformDatabaseCreationOptions options)
+    private static SqlConnectionStringBuilder Create(string databaseName, IPatcher patcher,
+        PlatformDatabaseCreationOptions options)
     {
         SqlConnection.ClearAllPools();
 
@@ -77,9 +82,9 @@ private static SqlConnectionStringBuilder Create(string databaseName, IPatcher p
         {
             BinaryCollation = options.BinaryCollation
         };
-        executor.CreateAndPatchDatabase(patcher,new AcceptAllCheckNotifier());
+        executor.CreateAndPatchDatabase(patcher, new AcceptAllCheckNotifier());
         Console.WriteLine($"Created {builder.InitialCatalog} on server {builder.DataSource}");
-            
+
         return builder;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationOptions.cs b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationOptions.cs
index 6e337424c7..401eda1ce2 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationOptions.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationOptions.cs
@@ -14,12 +14,14 @@ namespace Rdmp.Core.CommandLine.DatabaseCreation;
 /// <summary>
 /// Command line arguments for install verb of rdmp CLI
 /// </summary>
-[Verb("install" , HelpText = "Creates RMDP platform databases in the target database server")]
+[Verb("install", HelpText = "Creates RMDP platform databases in the target database server")]
 public class PlatformDatabaseCreationOptions
 {
-    [Value(0, Required = true, HelpText = "The Microsoft SQL Server on which to create the platform databases (does not have to be the same as your data repository server)")]
+    [Value(0, Required = true,
+        HelpText =
+            "The Microsoft SQL Server on which to create the platform databases (does not have to be the same as your data repository server)")]
     public string ServerName { get; set; }
-        
+
     [Value(1, Required = true, HelpText = "The prefix to append to all databases created")]
     public string Prefix { get; set; }
 
@@ -32,60 +34,95 @@ public class PlatformDatabaseCreationOptions
     [Option('b', "Binary Collation", Default = false, HelpText = "Create the databases with Binary Collation")]
     public bool BinaryCollation { get; set; }
 
-    [Option('d', "Drop Databases First",  Default = false, HelpText = "Drop the databases before attempting to create them")]
+    [Option('d', "Drop Databases First", Default = false,
+        HelpText = "Drop the databases before attempting to create them")]
     public bool DropDatabases { get; set; }
 
-    [Option('k', "Skip Pipelines", Default = false, HelpText = "Skips creating the default Pipelines and Managed Server References in the Catalogue database once created.")]
+    [Option('k', "Skip Pipelines", Default = false,
+        HelpText =
+            "Skips creating the default Pipelines and Managed Server References in the Catalogue database once created.")]
     public bool SkipPipelines { get; set; }
-        
-    [Option('e', "ExampleDatasets", Default = false, HelpText = "Create example datasets, projects, extraction configurations and cohort queries")]
-    public bool ExampleDatasets{get;set;}
 
-    [Option('s', "Seed", Default = 500, HelpText = "When ExampleDatasets is set this is the seed that is used for generating the data")]
+    [Option('l', "Create Logging Server", Default = true, HelpText = "Create the default logging server in the Catalogue database once created. Is superseeded by 'Skip Pipelines'")]
+    public bool CreateLoggingServer { get; set; }
+    
+    [Option('e', "ExampleDatasets", Default = false,
+        HelpText = "Create example datasets, projects, extraction configurations and cohort queries")]
+    public bool ExampleDatasets { get; set; }
+
+    [Option('s', "Seed", Default = 500,
+        HelpText = "When ExampleDatasets is set this is the seed that is used for generating the data")]
     public int Seed { get; set; } = 500;
 
-    [Option("NumberOfPeople", Default = ExampleDatasetsCreation.NumberOfPeople, HelpText = "When ExampleDatasets is set this is the number of unique patients to generate before building dataset rows (patient pool)")]
+    [Option("NumberOfPeople", Default = ExampleDatasetsCreation.NumberOfPeople,
+        HelpText =
+            "When ExampleDatasets is set this is the number of unique patients to generate before building dataset rows (patient pool)")]
     public int NumberOfPeople { get; set; } = ExampleDatasetsCreation.NumberOfPeople;
 
-    [Option("NumberOfRowsPerDataset", Default = ExampleDatasetsCreation.NumberOfRowsPerDataset, HelpText = "When ExampleDatasets is set this is the number of rows to create in each dataset")]
+    [Option("NumberOfRowsPerDataset", Default = ExampleDatasetsCreation.NumberOfRowsPerDataset,
+        HelpText = "When ExampleDatasets is set this is the number of rows to create in each dataset")]
     public int NumberOfRowsPerDataset { get; set; } = ExampleDatasetsCreation.NumberOfRowsPerDataset;
 
     [Option("Nightmare", Default = false, HelpText = "Create 100,000+ objects in the Catalogue database")]
     public bool Nightmare { get; set; }
 
-    [Option("NightmareFactor", Default = 1, HelpText = "Set to 2 (or more) to multiply the volume of Nightmare data generated")]
+    [Option("NightmareFactor", Default = 1,
+        HelpText = "Set to 2 (or more) to multiply the volume of Nightmare data generated")]
     public int NightmareFactor { get; set; } = 1;
 
-    [Option(Required = false, Default = false, HelpText = "Set to true to validate the SSL certificate of the server you are installing into")]
-    public bool ValidateCertificate {get;set;}
+    [Option(Required = false, Default = false,
+        HelpText = "Set to true to validate the SSL certificate of the server you are installing into")]
+    public bool ValidateCertificate { get; set; }
 
-    [Option(Required = false, Default = 30, HelpText = "Timeout in seconds for CREATE DATABASE SQL commands.  Defaults to 30")]
+    [Option(Required = false, Default = 30,
+        HelpText = "Timeout in seconds for CREATE DATABASE SQL commands.  Defaults to 30")]
     public int CreateDatabaseTimeout { get; set; } = 30;
 
-    [Option(Required = false, HelpText = "Optional connection string keywords to use e.g. \"Key1=Value1; Key2=Value2\".  When using this option you must manually specify IntegratedSecurity if required.")]
+    [Option(Required = false,
+        HelpText =
+            "Optional connection string keywords to use e.g. \"Key1=Value1; Key2=Value2\".  When using this option you must manually specify IntegratedSecurity if required.")]
     public string OtherKeywords { get; set; }
 
+
     [Usage]
     public static IEnumerable<Example> Examples
     {
         get
         {
-            yield return new Example("Normal Scenario", new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress", Prefix = "TEST_"});
-            yield return new Example("Drop existing", new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress", Prefix = "TEST_", DropDatabases = true });
-            yield return new Example("Create example datasets", new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress", Prefix = "TEST_", DropDatabases = true,ExampleDatasets = true });
-            yield return new Example("Binary Collation", new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress",Prefix =  "TEST_" , DropDatabases = true,BinaryCollation =true });
-            yield return new Example("Drop existing", new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress", Prefix = "TEST_", Username = "sa", Password = "lawl", DropDatabases = true });
+            yield return new Example("Normal Scenario",
+                new PlatformDatabaseCreationOptions { ServerName = @"localhost\sqlexpress", Prefix = "TEST_" });
+            yield return new Example("Drop existing",
+                new PlatformDatabaseCreationOptions
+                    { ServerName = @"localhost\sqlexpress", Prefix = "TEST_", DropDatabases = true });
+            yield return new Example("Create example datasets",
+                new PlatformDatabaseCreationOptions
+                {
+                    ServerName = @"localhost\sqlexpress", Prefix = "TEST_", DropDatabases = true, ExampleDatasets = true
+                });
+            yield return new Example("Binary Collation",
+                new PlatformDatabaseCreationOptions
+                {
+                    ServerName = @"localhost\sqlexpress", Prefix = "TEST_", DropDatabases = true, BinaryCollation = true
+                });
+            yield return new Example("Drop existing",
+                new PlatformDatabaseCreationOptions
+                {
+                    ServerName = @"localhost\sqlexpress", Prefix = "TEST_", Username = "sa", Password = "lawl",
+                    DropDatabases = true
+                });
         }
     }
 
     public SqlConnectionStringBuilder GetBuilder(string databaseName)
     {
-        var builder = string.IsNullOrWhiteSpace(OtherKeywords) ? new SqlConnectionStringBuilder() : new SqlConnectionStringBuilder(OtherKeywords);
+        var builder = string.IsNullOrWhiteSpace(OtherKeywords)
+            ? new SqlConnectionStringBuilder()
+            : new SqlConnectionStringBuilder(OtherKeywords);
 
         builder.DataSource = ServerName;
         builder.InitialCatalog = (Prefix ?? "") + databaseName;
         builder.TrustServerCertificate = !ValidateCertificate;
-         
+
         if (!string.IsNullOrWhiteSpace(Username))
         {
             builder.UserID = Username;
@@ -96,7 +133,7 @@ public SqlConnectionStringBuilder GetBuilder(string databaseName)
             // if they are specifying other keywords they might be auth related so we don't want to blindly turn this on
             builder.IntegratedSecurity = string.IsNullOrWhiteSpace(OtherKeywords);
         }
-            
+
         return builder;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationRepositoryFinder.cs b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationRepositoryFinder.cs
index 7e7b2dc90a..493a64c9ed 100644
--- a/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationRepositoryFinder.cs
+++ b/Rdmp.Core/CommandLine/DatabaseCreation/PlatformDatabaseCreationRepositoryFinder.cs
@@ -25,37 +25,27 @@ public class PlatformDatabaseCreationRepositoryFinder : IRDMPPlatformRepositoryS
 
     public IDataExportRepository DataExportRepository => _linkedRepositoryProvider.DataExportRepository;
 
-    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName, string databaseObjectTypeName, int objectID)
-    {
-        return _linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName, objectID);
-    }
+    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName,
+        string databaseObjectTypeName, int objectID) =>
+        _linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName, objectID);
 
-    public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID)
-    {
-        return _linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName,databaseObjectTypeName,objectID);
-    }
+    public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID) =>
+        _linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName, databaseObjectTypeName, objectID);
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable
-    {
-        return _linkedRepositoryProvider.GetObjectByID<T>(value);
-    }
+    public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable =>
+        _linkedRepositoryProvider.GetObjectByID<T>(value);
 
-    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value)
-    {
-        return _linkedRepositoryProvider.GetObjectByID(t,value);
-    }
+    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value) =>
+        _linkedRepositoryProvider.GetObjectByID(t, value);
 
-    public IEnumerable<IRepository> GetAllRepositories()
-    {
-        return _linkedRepositoryProvider.GetAllRepositories();
-    }
+    public IEnumerable<IRepository> GetAllRepositories() => _linkedRepositoryProvider.GetAllRepositories();
 
     public PlatformDatabaseCreationRepositoryFinder(PlatformDatabaseCreationOptions options)
     {
         var cata = options.GetBuilder(PlatformDatabaseCreation.DefaultCatalogueDatabaseName);
         var export = options.GetBuilder(PlatformDatabaseCreation.DefaultDataExportDatabaseName);
-            
+
         _linkedRepositoryProvider = new LinkedRepositoryProvider(cata.ConnectionString, export.ConnectionString);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/AutoComplete.cs b/Rdmp.Core/CommandLine/Interactive/AutoComplete.cs
index 03c0602355..787c590d6c 100644
--- a/Rdmp.Core/CommandLine/Interactive/AutoComplete.cs
+++ b/Rdmp.Core/CommandLine/Interactive/AutoComplete.cs
@@ -15,14 +15,14 @@ public AutoComplete(IEnumerable<string> autocompletes)
         this.autocompletes = autocompletes?.ToArray() ?? Array.Empty<string>();
     }
 
-    public char[] Separators { get;set;} = { ','};
+    public char[] Separators { get; set; } = { ',' };
 
     public string[] GetSuggestions(string text, int index)
     {
         //they haven't typed anything yet
-        if(string.IsNullOrWhiteSpace(text))
+        if (string.IsNullOrWhiteSpace(text))
             return autocompletes;
 
-        return autocompletes.Where(a=>a.StartsWith(text)).ToArray();
+        return autocompletes.Where(a => a.StartsWith(text)).ToArray();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/ConsoleInputManager.cs b/Rdmp.Core/CommandLine/Interactive/ConsoleInputManager.cs
index 19d0653705..2a9ace5cae 100644
--- a/Rdmp.Core/CommandLine/Interactive/ConsoleInputManager.cs
+++ b/Rdmp.Core/CommandLine/Interactive/ConsoleInputManager.cs
@@ -47,10 +47,12 @@ public class ConsoleInputManager : BasicActivateItems
     /// </summary>
     /// <param name="repositoryLocator">The databases to connect to</param>
     /// <param name="globalErrorCheckNotifier">The global error provider for non fatal issues</param>
-    public ConsoleInputManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier globalErrorCheckNotifier):base(repositoryLocator,globalErrorCheckNotifier)
+    public ConsoleInputManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICheckNotifier globalErrorCheckNotifier) : base(repositoryLocator, globalErrorCheckNotifier)
     {
     }
-    public override void Show(string title,string message)
+
+    public override void Show(string title, string message)
     {
         Console.WriteLine(message);
     }
@@ -63,11 +65,9 @@ public override bool TypeText(DialogArgs args, int maxLength, string initialText
                 .AllowEmpty()
         );
 
-        if(string.Equals(text , "Cancel",StringComparison.CurrentCultureIgnoreCase))
-        {
+        if (string.Equals(text, "Cancel", StringComparison.CurrentCultureIgnoreCase))
             // user does not want to type any text
             return false;
-        }
 
         // user typed "null" or some spaces or something
         if (text.IsBasicallyNull())
@@ -82,7 +82,7 @@ public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, st
         if (DisallowInput)
             throw new InputDisallowedException($"Value required for '{taskDescription}'");
 
-        var value = ReadLineWithAuto(new DialogArgs { WindowTitle = taskDescription}, new PickDatabase());
+        var value = ReadLineWithAuto(new DialogArgs { WindowTitle = taskDescription }, new PickDatabase());
         return value.Database;
     }
 
@@ -91,7 +91,7 @@ public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string t
         if (DisallowInput)
             throw new InputDisallowedException($"Value required for '{taskDescription}'");
 
-        var value = ReadLineWithAuto(new DialogArgs { WindowTitle = taskDescription },new PickTable());
+        var value = ReadLineWithAuto(new DialogArgs { WindowTitle = taskDescription }, new PickTable());
         return value.Table;
     }
 
@@ -112,19 +112,20 @@ public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
         }
         catch (Exception)
         {
-            Console.WriteLine($"Could not parse value.  Valid Enum values are:{Environment.NewLine}{string.Join(Environment.NewLine,Enum.GetNames(enumType))}" );
+            Console.WriteLine(
+                $"Could not parse value.  Valid Enum values are:{Environment.NewLine}{string.Join(Environment.NewLine, Enum.GetNames(enumType))}");
             throw;
         }
 
         return true;
     }
 
-    public override bool SelectType(DialogArgs args, Type[] available,out Type chosen)
+    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen)
     {
         if (DisallowInput)
             throw new InputDisallowedException($"Value required for '{args}'");
 
-        var chosenStr = GetString(args, available.Select(t=>t.Name).ToList());
+        var chosenStr = GetString(args, available.Select(t => t.Name).ToList());
 
         if (string.IsNullOrWhiteSpace(chosenStr))
         {
@@ -134,7 +135,7 @@ public override bool SelectType(DialogArgs args, Type[] available,out Type chose
 
         chosen = available.SingleOrDefault(t => t.Name.Equals(chosenStr));
 
-        if(chosen == null)
+        if (chosen == null)
             throw new Exception($"Unknown or incompatible Type '{chosen}'");
 
         return true;
@@ -144,12 +145,12 @@ public override bool SelectType(DialogArgs args, Type[] available,out Type chose
     public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType,
         IMapsDirectlyToDatabaseTable[] availableObjects)
     {
-        var value = ReadLineWithAuto(args,new PickObjectBase[]
-            {new PickObjectByID(this), new PickObjectByName(this)});
+        var value = ReadLineWithAuto(args, new PickObjectBase[]
+            { new PickObjectByID(this), new PickObjectByName(this) });
 
         var unavailable = value.DatabaseEntities.Except(availableObjects).ToArray();
 
-        if(unavailable.Any())
+        if (unavailable.Any())
             throw new Exception(
                 $"The following objects were not among the listed available objects {string.Join(",", unavailable.Select(o => o.ToString()))}");
 
@@ -174,16 +175,11 @@ private string GetPromptFor(DialogArgs args, bool entryLabel = true, params Pick
         {
             sb.Append(Markup.Escape(args.WindowTitle));
 
-            if(entryLabel && !string.IsNullOrWhiteSpace(args.EntryLabel))
-            {
-                sb.Append(" - ");
-            }
+            if (entryLabel && !string.IsNullOrWhiteSpace(args.EntryLabel)) sb.Append(" - ");
         }
 
         if (entryLabel && !string.IsNullOrWhiteSpace(args.EntryLabel))
-        {
             sb.Append($"[green]{Markup.Escape(args.EntryLabel)}[/]");
-        }
 
         if (!string.IsNullOrWhiteSpace(args.TaskDescription))
         {
@@ -191,14 +187,13 @@ private string GetPromptFor(DialogArgs args, bool entryLabel = true, params Pick
             sb.Append($"[grey]{Markup.Escape(args.TaskDescription)}[/]");
         }
 
-        foreach(var picker in pickers)
+        foreach (var picker in pickers)
         {
             sb.AppendLine();
             sb.Append($"Format:[grey]{Markup.Escape(picker.Format)}[/]");
 
-            if(picker.Examples.Any())
+            if (picker.Examples.Any())
             {
-
                 sb.AppendLine();
                 sb.Append($"Examples:");
                 foreach (var example in picker.Examples)
@@ -207,6 +202,7 @@ private string GetPromptFor(DialogArgs args, bool entryLabel = true, params Pick
                     sb.Append($"[grey]{Markup.Escape(example)}[/]");
                 }
             }
+
             sb.AppendLine();
             sb.Append(':');
         }
@@ -214,14 +210,12 @@ private string GetPromptFor(DialogArgs args, bool entryLabel = true, params Pick
         return sb.ToString();
     }
 
-    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects)
+    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects)
     {
         if (DisallowInput)
         {
-            if (args.AllowAutoSelect && availableObjects.Length == 1)
-            {
-                return availableObjects[0];
-            }
+            if (args.AllowAutoSelect && availableObjects.Length == 1) return availableObjects[0];
 
             throw new InputDisallowedException($"Value required for '{args}'");
         }
@@ -238,14 +232,14 @@ public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDir
         Console.Write(args.EntryLabel);
 
         var value = ReadLineWithAuto(args, new PickObjectBase[]
-            {new PickObjectByID(this), new PickObjectByName(this)});
+            { new PickObjectByID(this), new PickObjectByName(this) });
 
         var chosen = value.DatabaseEntities?.SingleOrDefault();
 
         if (chosen == null)
             return null;
 
-        if(!availableObjects.Contains(chosen))
+        if (!availableObjects.Contains(chosen))
             throw new Exception("Picked object was not one of the listed available objects");
 
         return chosen;
@@ -253,23 +247,18 @@ public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDir
 
     public override bool SelectObject<T>(DialogArgs args, T[] available, out T selected)
     {
-        for(var i =0;i<available.Length;i++)
-        {
-            Console.WriteLine($"{i}:{available[i]}");
-        }
+        for (var i = 0; i < available.Length; i++) Console.WriteLine($"{i}:{available[i]}");
 
         Console.Write(args.EntryLabel);
 
         var result = Console.ReadLine();
 
-        if(int.TryParse(result, out var idx))
-        {
-            if(idx >= 0 && idx < available.Length)
+        if (int.TryParse(result, out var idx))
+            if (idx >= 0 && idx < available.Length)
             {
                 selected = available[idx];
                 return true;
             }
-        }
 
         selected = default;
         return false;
@@ -282,7 +271,7 @@ private CommandLineObjectPickerArgumentValue ReadLineWithAuto(DialogArgs args, p
 
         var line = AnsiConsole.Prompt(
             new TextPrompt<string>(
-                GetPromptFor(args,true, pickers).Trim()));
+                GetPromptFor(args, true, pickers).Trim()));
 
 
         var cli = new CommandLineObjectPicker(new[] { line }, RepositoryLocator, pickers);
@@ -351,30 +340,30 @@ public override FileInfo[] SelectFiles(string prompt, string patternDescription,
 
         var asteriskIdx = file.IndexOf('*');
 
-        if(asteriskIdx != -1)
+        if (asteriskIdx != -1)
         {
-            var idxLastSlash = file.LastIndexOfAny(new []{ Path.DirectorySeparatorChar,Path.AltDirectorySeparatorChar });
+            var idxLastSlash =
+                file.LastIndexOfAny(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar });
 
-            if(idxLastSlash == -1 || asteriskIdx < idxLastSlash)
+            if (idxLastSlash == -1 || asteriskIdx < idxLastSlash)
                 throw new Exception("Wildcards are only supported at the file level");
 
-            var searchPattern = file[(idxLastSlash+1)..];
+            var searchPattern = file[(idxLastSlash + 1)..];
             var dirStr = file[..idxLastSlash];
 
             var dir = new DirectoryInfo(dirStr);
 
-            if(!dir.Exists)
+            if (!dir.Exists)
                 throw new DirectoryNotFoundException($"Could not find directory:{dirStr}");
 
             return dir.GetFiles(searchPattern).ToArray();
         }
 
-        return new[]{ new FileInfo(file) };
-
+        return new[] { new FileInfo(file) };
     }
 
 
-    protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue,out object chosen)
+    protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen)
     {
         chosen = UsefulStuff.ChangeType(AnsiConsole.Ask<string>(GetPromptFor(args)), paramType);
         return true;
@@ -382,7 +371,7 @@ protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, obj
 
     public override bool YesNo(DialogArgs args, out bool chosen)
     {
-        var result = GetString(args, new List<string> { "Yes","No","Cancel"});
+        var result = GetString(args, new List<string> { "Yes", "No", "Cancel" });
 
 
         chosen = result == "Yes";
@@ -406,27 +395,27 @@ public string GetString(DialogArgs args, List<string> options)
     public override void ShowData(IViewSQLAndResultsCollection collection)
     {
         var point = collection.GetDataAccessPoint();
-        var db = DataAccessPortal.ExpectDatabase(point,DataAccessContext.InternalDataProcessing);
+        var db = DataAccessPortal.ExpectDatabase(point, DataAccessContext.InternalDataProcessing);
 
         var sql = collection.GetSql();
 
         var logger = NLog.LogManager.GetCurrentClassLogger();
         logger.Trace($"About to ShowData from Query:{Environment.NewLine}{sql}");
 
-        var toRun = new ExtractTableVerbatim(db.Server,sql,Console.OpenStandardOutput(),",",null);
+        var toRun = new ExtractTableVerbatim(db.Server, sql, Console.OpenStandardOutput(), ",", null);
         toRun.DoExtraction();
     }
 
     public override void ShowLogs(ILoggedActivityRootObject rootObject)
     {
-        foreach(var load in GetLogs(rootObject).OrderByDescending(l=>l.StartTime))
+        foreach (var load in GetLogs(rootObject).OrderByDescending(l => l.StartTime))
         {
             Console.WriteLine(load.Description);
             Console.WriteLine(load.StartTime);
 
             Console.WriteLine($"Errors:{load.Errors.Count}");
 
-            foreach(var error in load.Errors)
+            foreach (var error in load.Errors)
             {
                 error.GetSummary(out var title, out var body, out _, out _);
 
@@ -436,20 +425,17 @@ public override void ShowLogs(ILoggedActivityRootObject rootObject)
 
             Console.WriteLine("Tables Loaded:");
 
-            foreach(var t in load.TableLoadInfos)
+            foreach (var t in load.TableLoadInfos)
             {
                 Console.WriteLine($"\t{t}: I={t.Inserts:N0} U={t.Updates:N0} D={t.Deletes:N0}");
 
-                foreach(var source in t.DataSources)
+                foreach (var source in t.DataSources)
                     Console.WriteLine($"\t\tSource:{source.Source}");
             }
 
             Console.WriteLine("Progress:");
 
-            foreach(var p in load.Progress)
-            {
-                Console.WriteLine($"\t{p.Date} {p.Description}");
-            }
+            foreach (var p in load.Progress) Console.WriteLine($"\t{p.Date} {p.Description}");
         }
     }
 
@@ -460,16 +446,13 @@ public override void ShowGraph(AggregateConfiguration aggregate)
 
     public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected)
     {
-        if(available.Length == 0)
+        if (available.Length == 0)
         {
             selected = Array.Empty<T>();
             return true;
         }
 
-        for(var i =0;i < available.Length; i++)
-        {
-            Console.WriteLine($"{i}:{available[i]}");
-        }
+        for (var i = 0; i < available.Length; i++) Console.WriteLine($"{i}:{available[i]}");
 
         var result = Console.ReadLine();
 
@@ -480,7 +463,7 @@ public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] se
             return true;
         }
 
-        var selectIdx = result.Split(",",StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray();
+        var selectIdx = result.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray();
 
         selected = available.Where((e, idx) => selectIdx.Contains(idx)).ToArray();
         return true;
@@ -504,15 +487,9 @@ public override void ShowData(DataTable collection)
     {
         var tbl = new Table();
 
-        foreach(DataColumn c in collection.Columns)
-        {
-            tbl.AddColumn(c.ColumnName);
-        }
+        foreach (DataColumn c in collection.Columns) tbl.AddColumn(c.ColumnName);
 
-        foreach(DataRow row in collection.Rows)
-        {
-            tbl.AddRow(row.ItemArray.Select(i => i.ToString()).ToArray());
-        }
+        foreach (DataRow row in collection.Rows) tbl.AddRow(row.ItemArray.Select(i => i.ToString()).ToArray());
         AnsiConsole.Write(tbl);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/InputDisallowedException.cs b/Rdmp.Core/CommandLine/Interactive/InputDisallowedException.cs
index 75b3f72ebf..d54ce110dd 100644
--- a/Rdmp.Core/CommandLine/Interactive/InputDisallowedException.cs
+++ b/Rdmp.Core/CommandLine/Interactive/InputDisallowedException.cs
@@ -14,8 +14,7 @@ namespace Rdmp.Core.CommandLine.Interactive;
 /// </summary>
 public class InputDisallowedException : Exception
 {
-    public InputDisallowedException(string message):base(message)
+    public InputDisallowedException(string message) : base(message)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPicker.cs b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPicker.cs
index e074279dd9..23a5eb5d42 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPicker.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPicker.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 public class CommandLineObjectPicker
 {
     public IReadOnlyCollection<CommandLineObjectPickerArgumentValue> Arguments { get; }
-        
+
     public CommandLineObjectPickerArgumentValue this[int i] => Arguments.ElementAt(i);
 
     public int Length => Arguments.Count;
@@ -50,27 +50,28 @@ public CommandLineObjectPicker(IEnumerable<string> args,
     /// <param name="args"></param>
     /// <param name="repositoryLocator"></param>
     /// <param name="pickers"></param>
-    public CommandLineObjectPicker(string[] args,IRDMPPlatformRepositoryServiceLocator repositoryLocator, IEnumerable<PickObjectBase> pickers)
+    public CommandLineObjectPicker(string[] args, IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IEnumerable<PickObjectBase> pickers)
     {
-        foreach(var p in pickers)
+        foreach (var p in pickers)
             _pickers.Add(p);
 
         Arguments = new ReadOnlyCollection<CommandLineObjectPickerArgumentValue>(args.Select(ParseValue).ToList());
     }
 
-    private CommandLineObjectPickerArgumentValue ParseValue(string arg,int idx)
+    private CommandLineObjectPickerArgumentValue ParseValue(string arg, int idx)
     {
         //find a picker that recognizes the format
         var pickers = _pickers.Where(p => p.IsMatch(arg, idx)).ToArray();
 
         if (pickers.Any())
-            return pickers.First().Parse(arg, idx).Merge(pickers.Skip(1).Select(p=>p.Parse(arg,idx)));
-            
+            return pickers.First().Parse(arg, idx).Merge(pickers.Skip(1).Select(p => p.Parse(arg, idx)));
+
         //nobody recognized it, use the raw value (maybe it's just a regular string, int etc).  Delay hard typing it till we know
         //what constructor we are trying to match it to.
-        return new CommandLineObjectPickerArgumentValue(arg,idx);
+        return new CommandLineObjectPickerArgumentValue(arg, idx);
     }
-        
+
     /// <summary>
     /// Returns true if the given <paramref name="idx"/> exists and is populated with a value of the expected <paramref name="paramType"/>
     /// </summary>
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerArgumentValue.cs b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerArgumentValue.cs
index f498396ea0..402faf1a4a 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerArgumentValue.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerArgumentValue.cs
@@ -65,28 +65,30 @@ public class CommandLineObjectPickerArgumentValue
 
     private Logger _logger = LogManager.GetCurrentClassLogger();
 
-    public CommandLineObjectPickerArgumentValue(string rawValue,int idx)
+    public CommandLineObjectPickerArgumentValue(string rawValue, int idx)
     {
         RawValue = rawValue;
         Index = idx;
     }
 
-    public CommandLineObjectPickerArgumentValue(string rawValue,int idx,IMapsDirectlyToDatabaseTable[] entities):this(rawValue, idx)
+    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, IMapsDirectlyToDatabaseTable[] entities) :
+        this(rawValue, idx)
     {
         DatabaseEntities = new ReadOnlyCollection<IMapsDirectlyToDatabaseTable>(entities);
     }
 
-    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, DiscoveredDatabase database):this(rawValue, idx)
+    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, DiscoveredDatabase database) : this(rawValue,
+        idx)
     {
         Database = database;
     }
 
-    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, DiscoveredTable table):this(rawValue, idx)
+    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, DiscoveredTable table) : this(rawValue, idx)
     {
         Table = table;
     }
 
-    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, Type type):this(rawValue,idx)
+    public CommandLineObjectPickerArgumentValue(string rawValue, int idx, Type type) : this(rawValue, idx)
     {
         Type = type;
     }
@@ -105,7 +107,7 @@ public object GetValueForParameterOfType(Type paramType)
         if (typeof(DirectoryInfo) == paramType)
             return new DirectoryInfo(RawValue);
 
-        if(typeof(FileInfo) == paramType)
+        if (typeof(FileInfo) == paramType)
             return new FileInfo(RawValue);
 
         if (typeof(string) == paramType)
@@ -126,37 +128,39 @@ public object GetValueForParameterOfType(Type paramType)
         var nullableType = Nullable.GetUnderlyingType(paramType);
 
         //it's an array of DatabaseEntities (IMapsDirectlyToDatabaseTable implements IDeleteable)
-        if (paramType.IsArray && DatabaseEntities != null && typeof(IDeleteable).IsAssignableFrom(paramType.GetElementType()))
+        if (paramType.IsArray && DatabaseEntities != null &&
+            typeof(IDeleteable).IsAssignableFrom(paramType.GetElementType()))
         {
-            if(DatabaseEntities.Count == 0)
+            if (DatabaseEntities.Count == 0)
                 _logger.Warn($"Pattern matched no objects '{RawValue}'");
 
             if (element != typeof(IDeleteable))
             {
                 var typedArray = Array.CreateInstance(element, DatabaseEntities.Count);
                 for (var i = 0; i < DatabaseEntities.Count; i++)
-                    typedArray.SetValue(DatabaseEntities[i],i);
+                    typedArray.SetValue(DatabaseEntities[i], i);
 
                 return typedArray;
             }
 
             return DatabaseEntities.ToArray();
         }
+
         if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(paramType))
             return GetOneDatabaseEntity<DatabaseEntity>();
 
         if (typeof(IMightBeDeprecated).IsAssignableFrom(paramType))
             return GetOneDatabaseEntity<IMightBeDeprecated>();
 
-        if (typeof (IDisableable) == paramType)
+        if (typeof(IDisableable) == paramType)
             return GetOneDatabaseEntity<IDisableable>();
 
-        if (typeof (INamed) == paramType)
+        if (typeof(INamed) == paramType)
             return GetOneDatabaseEntity<INamed>();
-            
-        if (typeof (IDeleteable) == paramType)
+
+        if (typeof(IDeleteable) == paramType)
             return GetOneDatabaseEntity<IDeleteable>();
-            
+
         if (typeof(ICheckable) == paramType)
             return GetOneDatabaseEntity<ICheckable>();
 
@@ -172,10 +176,10 @@ public object GetValueForParameterOfType(Type paramType)
 
         if (basicType.IsValueType && !typeof(Enum).IsAssignableFrom(basicType))
             return UsefulStuff.ChangeType(RawValue, basicType);
-            
+
         if (basicType.IsEnum)
-            return Enum.Parse(basicType, RawValue,true);
-            
+            return Enum.Parse(basicType, RawValue, true);
+
         return null;
     }
 
@@ -185,24 +189,23 @@ private object GetOneDatabaseEntity<T>()
         if (DatabaseEntities == null)
             return null;
 
-        if(DatabaseEntities.Count != 1)
+        if (DatabaseEntities.Count != 1)
         {
             var latest = NewObjectPool.Latest(DatabaseEntities.Where(d => d is T));
 
             if (latest == null)
-            {
-                _logger.Warn($"Pattern matched {DatabaseEntities.Count} objects '{RawValue}':{Environment.NewLine} {string.Join(Environment.NewLine, DatabaseEntities)}");
-            }
+                _logger.Warn(
+                    $"Pattern matched {DatabaseEntities.Count} objects '{RawValue}':{Environment.NewLine} {string.Join(Environment.NewLine, DatabaseEntities)}");
 
             return latest;
-        }   
+        }
 
         //return the single object as the type you want e.g. ICheckable
-        if(DatabaseEntities[0] is T)
+        if (DatabaseEntities[0] is T)
             return DatabaseEntities.Single();
-            
+
         //it's not ICheckable, user made an invalid object selection
-        throw new CommandLineObjectPickerParseException($"Specified object was not an '{typeof(T)}''",Index,RawValue);
+        throw new CommandLineObjectPickerParseException($"Specified object was not an '{typeof(T)}''", Index, RawValue);
     }
 
     /// <summary>
@@ -240,7 +243,7 @@ public CommandLineObjectPickerArgumentValue Merge(IEnumerable<CommandLineObjectP
     {
         foreach (var other in others)
         {
-            if(other.Index != Index || other.RawValue != RawValue)
+            if (other.Index != Index || other.RawValue != RawValue)
                 throw new ArgumentException("Merge only arguments of the same object");
 
             Type ??= other.Type;
@@ -248,14 +251,12 @@ public CommandLineObjectPickerArgumentValue Merge(IEnumerable<CommandLineObjectP
             Table ??= other.Table;
 
             //if they have some
-            if(other.DatabaseEntities != null)
+            if (other.DatabaseEntities != null)
                 //do we have any? yet
-                if ( DatabaseEntities == null || !DatabaseEntities.Any()) //no
+                if (DatabaseEntities == null || !DatabaseEntities.Any()) //no
                     DatabaseEntities = other.DatabaseEntities; //use theirs
-                else
-                if(other.DatabaseEntities.Any())
+                else if (other.DatabaseEntities.Any())
                     throw new Exception("Did not know which set to pick during merge.  Both had DatabaseEntitites");
-
         }
 
         return this;
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerParseException.cs b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerParseException.cs
index 3f9c927a80..fb1e277fe8 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerParseException.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/CommandLineObjectPickerParseException.cs
@@ -13,7 +13,7 @@ internal class CommandLineObjectPickerParseException : Exception
     public int Index { get; }
     public string RawValue { get; }
 
-    public CommandLineObjectPickerParseException(string message, int index, string rawValue):base(message)
+    public CommandLineObjectPickerParseException(string message, int index, string rawValue) : base(message)
     {
         Index = index;
         RawValue = rawValue;
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickDatabase.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickDatabase.cs
index d5d31a0a73..18e81b5928 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickDatabase.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickDatabase.cs
@@ -18,6 +18,7 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 public class PickDatabase : PickObjectBase
 {
     public override string Format => "DatabaseType:{DatabaseType}:[Name:{DatabaseName}:]{ConnectionString}";
+
     public override string Help =>
         @"DatabaseType (Required):
     MicrosoftSQLServer
@@ -26,27 +27,26 @@ public class PickDatabase : PickObjectBase
 
 Name: (Optional if in connection string)
 ConnectionString (Required)";
+
     public override IEnumerable<string> Examples => new[]
     {
         "DatabaseType:MicrosoftSQLServer:Server=myServerAddress;Database=myDataBase;Trusted_Connection=True;",
 
         //see https://stackoverflow.com/questions/4950897/odp-net-integrated-security-invalid-connection-string-argument
         "DatabaseType:Oracle:Name:Bob:Data Source=MyOracleDB;User Id=/;"
-
     };
 
     public PickDatabase() : base(null,
-        new Regex("^DatabaseType:([A-Za-z]+):(Name:[^:]+:)?(.*)$",RegexOptions.IgnoreCase))
+        new Regex("^DatabaseType:([A-Za-z]+):(Name:[^:]+:)?(.*)$", RegexOptions.IgnoreCase))
     {
-
     }
 
     public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
     {
         var m = MatchOrThrow(arg, idx);
 
-        var dbType = (DatabaseType)Enum.Parse(typeof(DatabaseType),m.Groups[1].Value,true);
-        var dbName = Trim("Name:",m.Groups[2].Value);
+        var dbType = (DatabaseType)Enum.Parse(typeof(DatabaseType), m.Groups[1].Value, true);
+        var dbName = Trim("Name:", m.Groups[2].Value);
         var connectionString = m.Groups[3].Value;
 
         var server = new DiscoveredServer(connectionString, dbType);
@@ -55,10 +55,11 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
 
         db = string.IsNullOrWhiteSpace(dbName) ? server.GetCurrentDatabase() : server.ExpectDatabase(dbName);
 
-        if(db == null)
-            throw new CommandLineObjectPickerParseException("Missing database name parameter, it was not in connection string or specified explicitly",idx,arg);
+        if (db == null)
+            throw new CommandLineObjectPickerParseException(
+                "Missing database name parameter, it was not in connection string or specified explicitly", idx, arg);
 
-        return new CommandLineObjectPickerArgumentValue(arg,idx,db);
+        return new CommandLineObjectPickerArgumentValue(arg, idx, db);
     }
 
     public override IEnumerable<string> GetAutoCompleteIfAny()
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectBase.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectBase.cs
index cd6242e31c..1cd6ef3b7f 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectBase.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectBase.cs
@@ -23,10 +23,7 @@ public abstract class PickObjectBase
     protected Regex Regex { get; }
     protected readonly IBasicActivateItems Activator;
 
-    public virtual bool IsMatch(string arg, int idx)
-    {
-        return Regex.IsMatch(arg);
-    }
+    public virtual bool IsMatch(string arg, int idx) => Regex.IsMatch(arg);
     public abstract CommandLineObjectPickerArgumentValue Parse(string arg, int idx);
 
 
@@ -41,13 +38,13 @@ protected Match MatchOrThrow(string arg, int idx)
     {
         var match = Regex.Match(arg);
 
-        if(!match.Success)
+        if (!match.Success)
             throw new InvalidOperationException("Regex did not match, no value could be parsed");
 
         return match;
     }
 
-    public PickObjectBase(IBasicActivateItems activator,Regex regex)
+    public PickObjectBase(IBasicActivateItems activator, Regex regex)
     {
         Regex = regex;
         Activator = activator;
@@ -55,9 +52,11 @@ public PickObjectBase(IBasicActivateItems activator,Regex regex)
 
     protected Type ParseDatabaseEntityType(string objectType, string arg, int idx)
     {
-        var t = (GetTypeFromShortCodeIfAny(objectType) ?? Activator.RepositoryLocator.CatalogueRepository.MEF.GetType(objectType)) ?? throw new CommandLineObjectPickerParseException("Could not recognize Type name",idx,arg);
+        var t = (GetTypeFromShortCodeIfAny(objectType) ??
+                 Activator.RepositoryLocator.CatalogueRepository.MEF.GetType(objectType)) ??
+                throw new CommandLineObjectPickerParseException("Could not recognize Type name", idx, arg);
         if (!typeof(DatabaseEntity).IsAssignableFrom(t))
-            throw new CommandLineObjectPickerParseException("Type specified must be a DatabaseEntity",idx,arg);
+            throw new CommandLineObjectPickerParseException("Type specified must be a DatabaseEntity", idx, arg);
 
         return t;
     }
@@ -71,7 +70,8 @@ protected Type ParseDatabaseEntityType(string objectType, string arg, int idx)
     /// <returns></returns>
     protected bool IsDatabaseObjectType(string possibleTypeName, out Type t)
     {
-        var mef = Activator.RepositoryLocator.CatalogueRepository.MEF ?? throw new Exception("MEF not loaded yet, program may not have loaded startup");
+        var mef = Activator.RepositoryLocator.CatalogueRepository.MEF ??
+                  throw new Exception("MEF not loaded yet, program may not have loaded startup");
         try
         {
             t = GetTypeFromShortCodeIfAny(possibleTypeName) ?? mef.GetType(possibleTypeName);
@@ -85,16 +85,14 @@ protected bool IsDatabaseObjectType(string possibleTypeName, out Type t)
         return t != null
                && typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t);
     }
-    protected static Type GetTypeFromShortCodeIfAny(string possibleShortCode)
-    {
-        return SearchablesMatchScorer.ShortCodes.TryGetValue(possibleShortCode, out var code) ?
-            code :
-            null;
-    }
+
+    protected static Type GetTypeFromShortCodeIfAny(string possibleShortCode) =>
+        SearchablesMatchScorer.ShortCodes.TryGetValue(possibleShortCode, out var code) ? code : null;
+
     protected IMapsDirectlyToDatabaseTable GetObjectByID(Type type, int id)
     {
         var repo = Activator.GetRepositoryFor(type);
-        return repo.GetObjectByID(type,id);
+        return repo.GetObjectByID(type, id);
     }
 
 
@@ -104,7 +102,7 @@ protected IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type type)
         return repo.GetAllObjects(type);
     }
 
-    private Dictionary<string,Regex> patternDictionary = new();
+    private Dictionary<string, Regex> patternDictionary = new();
 
     /// <summary>
     /// Returns true if the <paramref name="pattern"/> (which is a simple non regex e.g. "Bio*") matches the ToString of <paramref name="o"/>
@@ -116,8 +114,9 @@ protected bool FilterByPattern(object o, string pattern)
     {
         //build regex for the pattern which must be a complete match with anything (.*) matching the users wildcard
         if (!patternDictionary.ContainsKey(pattern))
-            patternDictionary.Add(pattern, new Regex($"^{Regex.Escape(pattern).Replace(@"\*", ".*")}$",RegexOptions.IgnoreCase));
-            
+            patternDictionary.Add(pattern,
+                new Regex($"^{Regex.Escape(pattern).Replace(@"\*", ".*")}$", RegexOptions.IgnoreCase));
+
         return patternDictionary[pattern].IsMatch(o.ToString());
     }
 
@@ -132,14 +131,11 @@ protected static string Trim(string key, string keyValueString)
         if (string.IsNullOrWhiteSpace(keyValueString))
             return null;
 
-        if(!keyValueString.StartsWith(key,StringComparison.CurrentCultureIgnoreCase))
+        if (!keyValueString.StartsWith(key, StringComparison.CurrentCultureIgnoreCase))
             throw new ArgumentException($"Provided value '{keyValueString}' did not start with expected key '{key}'");
 
         return keyValueString[key.Length..].Trim(':');
     }
 
-    public virtual IEnumerable<string> GetAutoCompleteIfAny()
-    {
-        return null;
-    }
+    public virtual IEnumerable<string> GetAutoCompleteIfAny() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByID.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByID.cs
index bb3e2d1a70..1d77edacaa 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByID.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByID.cs
@@ -17,21 +17,22 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 /// <summary>
 /// Determines if a command line argument provided was a reference to one or more <see cref="DatabaseEntity"/> matching based on ID (e.g. "Catalogue:23")
 /// </summary>
-public class PickObjectByID :PickObjectBase
+public class PickObjectByID : PickObjectBase
 {
     /*
         Console.WriteLine("Format \"\" e.g. \"Catalogue:*mysql*\" or \"Catalogue:12,23,34\"");
 
         */
     public override string Format => "{Type}:{ID}[,{ID2},{ID3}...]";
-    public override string Help => 
+
+    public override string Help =>
         @"Type: must be an RDMP object type e.g. Catalogue, Project etc.
 ID: must reference an object that exists
 ID2+: (optional) only allowed if you are being prompted for multiple objects, allows you to specify multiple objects of the same Type using comma separator";
-        
-    public override IEnumerable<string> Examples => new []
+
+    public override IEnumerable<string> Examples => new[]
     {
-        "Catalogue:1", 
+        "Catalogue:1",
         "Catalogue:1,2,3"
     };
 
@@ -44,12 +45,11 @@ public override bool IsMatch(string arg, int idx)
     }
 
     public PickObjectByID(IBasicActivateItems activator)
-        :base(activator,
-            new Regex("^([A-Za-z]+):([0-9,]+)$",RegexOptions.IgnoreCase))
+        : base(activator,
+            new Regex("^([A-Za-z]+):([0-9,]+)$", RegexOptions.IgnoreCase))
     {
-                
     }
-        
+
     public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
     {
         var objByID = MatchOrThrow(arg, idx);
@@ -59,8 +59,8 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
 
         var dbObjectType = ParseDatabaseEntityType(objectType, arg, idx);
 
-        var objs = objectId.Split(',').Select(id=>GetObjectByID(dbObjectType,int.Parse(id))).Distinct();
-                
-        return new CommandLineObjectPickerArgumentValue(arg,idx,objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
+        var objs = objectId.Split(',').Select(id => GetObjectByID(dbObjectType, int.Parse(id))).Distinct();
+
+        return new CommandLineObjectPickerArgumentValue(arg, idx, objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByName.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByName.cs
index 9d7c309784..61c5356c77 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByName.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByName.cs
@@ -17,25 +17,27 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 /// <summary>
 /// Determines if a command line argument provided was a reference to one or more <see cref="DatabaseEntity"/> matching based on name (e.g. "Catalogue:my*cata")
 /// </summary>
-public class PickObjectByName: PickObjectBase
+public class PickObjectByName : PickObjectBase
 {
     public override string Format => "{Type}:{NamePattern}[,{NamePattern2},{NamePattern3}...]";
-    public override string Help => 
+
+    public override string Help =>
         @"Type: must be an RDMP object type e.g. Catalogue, Project etc.
 NamePattern: must be a string that matches 1 (or more if selecting multiple objects) object based on its name (ToString).  Can include the wild card '*'.  Cannot include the ':' character.
 NamePattern2+: (optional) only allowed if you are being prompted for multiple objects, allows you to specify multiple objects of the same Type using comma separator";
-        
-    public override IEnumerable<string> Examples => new []
+
+    public override IEnumerable<string> Examples => new[]
     {
-        "Catalogue:mycata*", 
+        "Catalogue:mycata*",
         "Catalogue:mycata1,mycata2"
     };
 
     public PickObjectByName(IBasicActivateItems activator) :
         base(activator,
-            new Regex(@"^([A-Za-z]+):([^:]+)$",RegexOptions.IgnoreCase))
+            new Regex(@"^([A-Za-z]+):([^:]+)$", RegexOptions.IgnoreCase))
     {
     }
+
     public override bool IsMatch(string arg, int idx)
     {
         var baseMatch = base.IsMatch(arg, idx);
@@ -45,15 +47,13 @@ public override bool IsMatch(string arg, int idx)
                 return true;
 
         //only considered  match if the first letter is an Rdmp Type e.g. "Catalogue:fish" but not "C:\fish"
-        return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value,out _);        
+        return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value, out _);
     }
 
     public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
     {
         if (IsDatabaseObjectType(arg, out var t))
-        {
-            return new CommandLineObjectPickerArgumentValue(arg,idx,GetAllObjects(t).ToArray());
-        }
+            return new CommandLineObjectPickerArgumentValue(arg, idx, GetAllObjects(t).ToArray());
 
         var objByToString = MatchOrThrow(arg, idx);
 
@@ -62,8 +62,8 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
 
         var dbObjectType = ParseDatabaseEntityType(objectType, arg, idx);
 
-        var objs = objectToString.Split(',').SelectMany(str=>GetObjectByToString(dbObjectType,str)).Distinct();
-        return new CommandLineObjectPickerArgumentValue(arg,idx,objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
+        var objs = objectToString.Split(',').SelectMany(str => GetObjectByToString(dbObjectType, str)).Distinct();
+        return new CommandLineObjectPickerArgumentValue(arg, idx, objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
     }
 
     private IEnumerable<object> GetObjectByToString(Type dbObjectType, string str)
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByQuery.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByQuery.cs
index a6a8714011..4e13a23b08 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByQuery.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickObjectByQuery.cs
@@ -18,17 +18,18 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 /// <summary>
 /// Determines if a command line argument provided was a reference to one or more <see cref="DatabaseEntity"/> matching based on property (e.g. "Catalogue?Folder:*edris*")
 /// </summary>
-public class PickObjectByQuery: PickObjectBase
+public class PickObjectByQuery : PickObjectBase
 {
     public override string Format => "{Type}?{Property}:{PropertyValue}";
+
     public override string Help =>
         @"Type: must be an RDMP object type e.g. Catalogue, Project etc.
 Property: must be a property of the Type class.
 NamePattern: must be a value that could appear for the given Property.  Comparison will be via ToString on property value.";
 
-    public override IEnumerable<string> Examples => new []
+    public override IEnumerable<string> Examples => new[]
     {
-        "CatalogueItem?Catalogue_ID:55", 
+        "CatalogueItem?Catalogue_ID:55",
         "Catalogue?Folder:*edris*"
     };
 
@@ -37,20 +38,19 @@ public PickObjectByQuery(IBasicActivateItems activator) :
             new Regex(@"^(\w+)\?(\w+):([^:]+)$", RegexOptions.IgnoreCase))
     {
     }
+
     public override bool IsMatch(string arg, int idx)
     {
         var baseMatch = base.IsMatch(arg, idx);
 
         //only considered  match if the first letter is an Rdmp Type e.g. "Catalogue:fish" but not "C:\fish"
-        return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value,out _);        
+        return baseMatch && IsDatabaseObjectType(Regex.Match(arg).Groups[1].Value, out _);
     }
 
     public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
     {
         if (IsDatabaseObjectType(arg, out var t))
-        {
-            return new CommandLineObjectPickerArgumentValue(arg,idx,GetAllObjects(t).ToArray());
-        }
+            return new CommandLineObjectPickerArgumentValue(arg, idx, GetAllObjects(t).ToArray());
 
         var objByToString = MatchOrThrow(arg, idx);
 
@@ -60,9 +60,11 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
 
         var dbObjectType = ParseDatabaseEntityType(objectType, arg, idx);
 
-        var property = dbObjectType.GetProperty(propertyName) ?? throw new Exception($"Unknown property '{propertyName}'.  Did not exist on Type '{dbObjectType.Name}'");
-        var objs = GetObjectByToString(dbObjectType,property,objectToString);
-        return new CommandLineObjectPickerArgumentValue(arg,idx,objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
+        var property = dbObjectType.GetProperty(propertyName) ??
+                       throw new Exception(
+                           $"Unknown property '{propertyName}'.  Did not exist on Type '{dbObjectType.Name}'");
+        var objs = GetObjectByToString(dbObjectType, property, objectToString);
+        return new CommandLineObjectPickerArgumentValue(arg, idx, objs.Cast<IMapsDirectlyToDatabaseTable>().ToArray());
     }
 
     private IEnumerable<object> GetObjectByToString(Type dbObjectType, PropertyInfo property, string str)
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickTable.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickTable.cs
index 9c69d3d45f..bd92fd96b7 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickTable.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickTable.cs
@@ -17,7 +17,9 @@ namespace Rdmp.Core.CommandLine.Interactive.Picking;
 /// </summary>
 public class PickTable : PickObjectBase
 {
-    public override string Format => "Table:{TableName}:[Schema:{SchemaIfAny}:][IsView:{True/False}]:DatabaseType:{DatabaseType}:Name:{DatabaseName}:{ConnectionString}";
+    public override string Format =>
+        "Table:{TableName}:[Schema:{SchemaIfAny}:][IsView:{True/False}]:DatabaseType:{DatabaseType}:Name:{DatabaseName}:{ConnectionString}";
+
     public override string Help =>
         @"Table (Required): Name of the table you want
 Schema (Optional): leave out this section unless your table is in a sub schema within the Database (MySql doesn't support schemas)
@@ -35,12 +37,12 @@ public class PickTable : PickObjectBase
     {
         "Table:MyTable:DatabaseType:MicrosoftSQLServer:Server=myServerAddress;Database=myDataBase;Trusted_Connection=True;",
         "Table:MyTable2:Schema:dbo:IsView:True:DatabaseType:MicrosoftSQLServer:Server=myServerAddress;Database=myDataBase;Trusted_Connection=True;"
-
     };
 
 
     public PickTable() : base(null,
-        new Regex("^Table:([^:]+):(Schema:[^:]+:)?(IsView:[^:]+:)?DatabaseType:([A-Za-z]+):(Name:[^:]+:)?(.*)$",RegexOptions.IgnoreCase))
+        new Regex("^Table:([^:]+):(Schema:[^:]+:)?(IsView:[^:]+:)?DatabaseType:([A-Za-z]+):(Name:[^:]+:)?(.*)$",
+            RegexOptions.IgnoreCase))
     {
     }
 
@@ -49,13 +51,13 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
         var m = MatchOrThrow(arg, idx);
 
         var tableName = m.Groups[1].Value;
-        var schema = Trim("Schema:",m.Groups[2].Value);
+        var schema = Trim("Schema:", m.Groups[2].Value);
 
-        var isViewStr = Trim("IsView:",m.Groups[3].Value);
+        var isViewStr = Trim("IsView:", m.Groups[3].Value);
         var isViewBool = isViewStr != null && bool.Parse(isViewStr);
 
-        var dbType = (DatabaseType)Enum.Parse(typeof(DatabaseType),m.Groups[4].Value);
-        var dbName = Trim("Name:",m.Groups[5].Value);
+        var dbType = (DatabaseType)Enum.Parse(typeof(DatabaseType), m.Groups[4].Value);
+        var dbName = Trim("Name:", m.Groups[5].Value);
         var connectionString = m.Groups[6].Value;
 
         var server = new DiscoveredServer(connectionString, dbType);
@@ -64,7 +66,7 @@ public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
                  throw new CommandLineObjectPickerParseException(
                      "Missing database name parameter, it was not in connection string or specified explicitly", idx,
                      arg);
-        return new CommandLineObjectPickerArgumentValue(arg,idx,db.ExpectTable(tableName,schema,isViewBool ? TableType.View:TableType.Table));
+        return new CommandLineObjectPickerArgumentValue(arg, idx,
+            db.ExpectTable(tableName, schema, isViewBool ? TableType.View : TableType.Table));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Interactive/Picking/PickType.cs b/Rdmp.Core/CommandLine/Interactive/Picking/PickType.cs
index 170aac9ad9..a61d9c9859 100644
--- a/Rdmp.Core/CommandLine/Interactive/Picking/PickType.cs
+++ b/Rdmp.Core/CommandLine/Interactive/Picking/PickType.cs
@@ -21,25 +21,20 @@ internal class PickType : PickObjectBase
     public override string Help { get; }
     public override IEnumerable<string> Examples { get; }
 
-    public override bool IsMatch(string arg, int idx)
-    {
-        return GetType(arg) != null;
-    }
+    public override bool IsMatch(string arg, int idx) => GetType(arg) != null;
 
-    public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx)
-    {
-        return new CommandLineObjectPickerArgumentValue(arg,idx,GetType(arg));
-    }
+    public override CommandLineObjectPickerArgumentValue Parse(string arg, int idx) => new(arg, idx, GetType(arg));
 
     private Type GetType(string arg)
     {
-        if(string.IsNullOrWhiteSpace(arg))
+        if (string.IsNullOrWhiteSpace(arg))
             return null;
 
         try
         {
             return
-                Activator.RepositoryLocator.CatalogueRepository.MEF.GetType(BasicCommandExecution.ExecuteCommandPrefix + arg)
+                Activator.RepositoryLocator.CatalogueRepository.MEF.GetType(BasicCommandExecution.ExecuteCommandPrefix +
+                                                                            arg)
                 ??
                 Activator.RepositoryLocator.CatalogueRepository.MEF.GetType(arg);
         }
diff --git a/Rdmp.Core/CommandLine/Options/CacheOptions.cs b/Rdmp.Core/CommandLine/Options/CacheOptions.cs
index 9ae75cfe4c..6545c0b348 100644
--- a/Rdmp.Core/CommandLine/Options/CacheOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/CacheOptions.cs
@@ -13,13 +13,17 @@ namespace Rdmp.Core.CommandLine.Options;
 /// <summary>
 /// Command line options for the caching engine
 /// </summary>
-[Verb("cache",HelpText ="Run the Caching engine which fetches data by date from a remote endpoint in batches of a given size (independently from loading it to any relational databases)")]
-public class CacheOptions:RDMPCommandLineOptions
+[Verb("cache",
+    HelpText =
+        "Run the Caching engine which fetches data by date from a remote endpoint in batches of a given size (independently from loading it to any relational databases)")]
+public class CacheOptions : RDMPCommandLineOptions
 {
-    [Option('c', "CacheProgress", HelpText = "The ID of the CacheProgress you want to run", Required = true, Default = "0")]
+    [Option('c', "CacheProgress", HelpText = "The ID of the CacheProgress you want to run", Required = true,
+        Default = "0")]
     public string CacheProgress { get; set; }
 
-    [Option('r',"RetryMode",HelpText = "True to attempt to process archival CacheFetchFailure dates instead of new (uncached) dates.")]
+    [Option('r', "RetryMode",
+        HelpText = "True to attempt to process archival CacheFetchFailure dates instead of new (uncached) dates.")]
     public bool RetryMode { get; set; }
 
     [Usage]
@@ -27,11 +31,17 @@ public static IEnumerable<Example> Examples
     {
         get
         {
-            yield return new Example("Check the cache is runnable", new CacheOptions { Command = CommandLineActivity.check, CacheProgress = "2"});
+            yield return new Example("Check the cache is runnable",
+                new CacheOptions { Command = CommandLineActivity.check, CacheProgress = "2" });
             yield return new Example("Check the cache is runnable and returns error code " +
-                                     "instead of success if there are warnings", 
-                new CacheOptions { Command = CommandLineActivity.check, CacheProgress = "2", FailOnWarnings = true});
-            yield return new Example("Run cache progress overriding RDMP platform databases (specified in .config)", new CacheOptions { Command = CommandLineActivity.run, CacheProgress = "2", ServerName = @"localhost\sqlexpress", CatalogueDatabaseName = "RDMP_Catalogue", DataExportDatabaseName = "RDMP_DataExport" });
+                                     "instead of success if there are warnings",
+                new CacheOptions { Command = CommandLineActivity.check, CacheProgress = "2", FailOnWarnings = true });
+            yield return new Example("Run cache progress overriding RDMP platform databases (specified in .config)",
+                new CacheOptions
+                {
+                    Command = CommandLineActivity.run, CacheProgress = "2", ServerName = @"localhost\sqlexpress",
+                    CatalogueDatabaseName = "RDMP_Catalogue", DataExportDatabaseName = "RDMP_DataExport"
+                });
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/CohortCreationOptions.cs b/Rdmp.Core/CommandLine/Options/CohortCreationOptions.cs
index 5c61adc732..01db412afe 100644
--- a/Rdmp.Core/CommandLine/Options/CohortCreationOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/CohortCreationOptions.cs
@@ -21,17 +21,16 @@ public class CohortCreationOptions : RDMPCommandLineOptions
     // Other Options:
     /*
      * External Cohort Table
-     * 
+     *
      * Project (only existing?)
-     * 
+     *
      * New Cohort / Revision?
-     * 
+     *
      * Name (or existing cohort name/id?)
-     * 
+     *
      * Pipeline
-     * 
+     *
      * Description
-     * 
+     *
      */
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/ConcurrentRDMPCommandLineOptions.cs b/Rdmp.Core/CommandLine/Options/ConcurrentRDMPCommandLineOptions.cs
index 022ca2705c..05d0da03d8 100644
--- a/Rdmp.Core/CommandLine/Options/ConcurrentRDMPCommandLineOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/ConcurrentRDMPCommandLineOptions.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.CommandLine.Options;
 /// <summary>
 /// Abstract base for all engines which execute operations in parallel (e.g. data extraction)
 /// </summary>
-public abstract class ConcurrentRDMPCommandLineOptions:RDMPCommandLineOptions
+public abstract class ConcurrentRDMPCommandLineOptions : RDMPCommandLineOptions
 {
     /// <summary>
     /// Maximum number of operations to perform at once
diff --git a/Rdmp.Core/CommandLine/Options/ConnectionStringsYamlFile.cs b/Rdmp.Core/CommandLine/Options/ConnectionStringsYamlFile.cs
index 6150269f95..07e0813f53 100644
--- a/Rdmp.Core/CommandLine/Options/ConnectionStringsYamlFile.cs
+++ b/Rdmp.Core/CommandLine/Options/ConnectionStringsYamlFile.cs
@@ -54,14 +54,14 @@ public static ConnectionStringsYamlFile LoadFrom(FileInfo f)
         var deserializer = new Deserializer();
         var toReturn = deserializer.Deserialize<ConnectionStringsYamlFile>(File.ReadAllText(f.FullName));
 
-        if(toReturn == null || string.IsNullOrWhiteSpace(toReturn.CatalogueConnectionString))
-        {
-            throw new Exception($"{nameof(CatalogueConnectionString)} is missing from the RDMP connection strings file: '{f.FullName}'");
-        }
+        if (toReturn == null || string.IsNullOrWhiteSpace(toReturn.CatalogueConnectionString))
+            throw new Exception(
+                $"{nameof(CatalogueConnectionString)} is missing from the RDMP connection strings file: '{f.FullName}'");
 
         toReturn.FileLoaded = f;
         return toReturn;
     }
+
     public static bool TryLoadFrom(FileInfo f, out ConnectionStringsYamlFile result)
     {
         try
diff --git a/Rdmp.Core/CommandLine/Options/DleOptions.cs b/Rdmp.Core/CommandLine/Options/DleOptions.cs
index a8d1f18965..02821e9e5e 100644
--- a/Rdmp.Core/CommandLine/Options/DleOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/DleOptions.cs
@@ -16,16 +16,24 @@ namespace Rdmp.Core.CommandLine.Options;
 [Verb("dle", HelpText = "Runs the Data Load Engine")]
 public class DleOptions : RDMPCommandLineOptions
 {
-    [Option('l',"LoadMetadata",HelpText = "The ID of the LoadMetadata you want to run or pattern e.g. LoadMetadata:Load*bob", Required = false, Default = "0")]
+    [Option('l', "LoadMetadata",
+        HelpText = "The ID of the LoadMetadata you want to run or pattern e.g. LoadMetadata:Load*bob", Required = false,
+        Default = "0")]
     public string LoadMetadata { get; set; }
 
-    [Option('p', "LoadProgress", HelpText = "If your LoadMetadata has multiple LoadProgresses, you can run only one of them by specifying the ID of the LoadProgress to run here", Required = false, Default = "0")]
+    [Option('p', "LoadProgress",
+        HelpText =
+            "If your LoadMetadata has multiple LoadProgresses, you can run only one of them by specifying the ID of the LoadProgress to run here",
+        Required = false, Default = "0")]
     public string LoadProgress { get; set; }
 
-    [Option('i', "Iterative", HelpText = "If the LoadMetadata has LoadProgress(es) then they will be run until available data is exhausted (if false then only one batch will be loaded e.g. 5 days)",Required = false,Default = false)]
+    [Option('i', "Iterative",
+        HelpText =
+            "If the LoadMetadata has LoadProgress(es) then they will be run until available data is exhausted (if false then only one batch will be loaded e.g. 5 days)",
+        Required = false, Default = false)]
     public bool Iterative { get; set; }
 
-    [Option('d',"DaysToLoad", HelpText = "Only applies if using a LoadProgress, overrides how much is loaded at once")]
+    [Option('d', "DaysToLoad", HelpText = "Only applies if using a LoadProgress, overrides how much is loaded at once")]
     public int? DaysToLoad { get; set; }
 
     [Option(HelpText = "Do not copy files from ForLoading into the file Archive")]
@@ -34,7 +42,8 @@ public class DleOptions : RDMPCommandLineOptions
     [Option(HelpText = "Abort the data load after populating the RAW environment only")]
     public bool StopAfterRAW { get; set; }
 
-    [Option(HelpText = "Abort the data load after populating the STAGING environment (no data will be merged with LIVE)")]
+    [Option(HelpText =
+        "Abort the data load after populating the STAGING environment (no data will be merged with LIVE)")]
     public bool StopAfterSTAGING { get; set; }
 
     [Usage]
@@ -42,9 +51,22 @@ public static IEnumerable<Example> Examples
     {
         get
         {
-            yield return new Example("Run load LoadMetadata with ID 30",new DleOptions {Command = CommandLineActivity.run,LoadMetadata = "30"});
-            yield return new Example("Override for RDMP platform databases (specified in .config)", new DleOptions { Command = CommandLineActivity.run, LoadMetadata = "LoadMetadata:Loading*Biochem*", ServerName = @"localhost\sqlexpress", CatalogueDatabaseName = "RDMP_Catalogue", DataExportDatabaseName = "RDMP_DataExport" });
-            yield return new Example("Use explicit connection strings to RDMP databases", new DleOptions { Command = CommandLineActivity.run, LoadMetadata = "30", CatalogueConnectionString = ExampleCatalogueConnectionString,DataExportConnectionString = ExampleDataExportConnectionString});
+            yield return new Example("Run load LoadMetadata with ID 30",
+                new DleOptions { Command = CommandLineActivity.run, LoadMetadata = "30" });
+            yield return new Example("Override for RDMP platform databases (specified in .config)",
+                new DleOptions
+                {
+                    Command = CommandLineActivity.run, LoadMetadata = "LoadMetadata:Loading*Biochem*",
+                    ServerName = @"localhost\sqlexpress", CatalogueDatabaseName = "RDMP_Catalogue",
+                    DataExportDatabaseName = "RDMP_DataExport"
+                });
+            yield return new Example("Use explicit connection strings to RDMP databases",
+                new DleOptions
+                {
+                    Command = CommandLineActivity.run, LoadMetadata = "30",
+                    CatalogueConnectionString = ExampleCatalogueConnectionString,
+                    DataExportConnectionString = ExampleDataExportConnectionString
+                });
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/DqeOptions.cs b/Rdmp.Core/CommandLine/Options/DqeOptions.cs
index 1523eb53fb..8b37f68a1b 100644
--- a/Rdmp.Core/CommandLine/Options/DqeOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/DqeOptions.cs
@@ -12,8 +12,8 @@ namespace Rdmp.Core.CommandLine.Options;
 /// Command line parameters for the Data Quality Engine
 /// </summary>
 [Verb("dqe", HelpText = "Runs the Data Quality Engine")]
-public class DqeOptions:RDMPCommandLineOptions
+public class DqeOptions : RDMPCommandLineOptions
 {
-    [Option('c',"Catalogue",HelpText = "ID of the Catalogue to run the DQE on",Required = true)]
-    public string Catalogue{ get; set; }
+    [Option('c', "Catalogue", HelpText = "ID of the Catalogue to run the DQE on", Required = true)]
+    public string Catalogue { get; set; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/ExecuteCommandOptions.cs b/Rdmp.Core/CommandLine/Options/ExecuteCommandOptions.cs
index ff8b1f4264..2cd5863c12 100644
--- a/Rdmp.Core/CommandLine/Options/ExecuteCommandOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/ExecuteCommandOptions.cs
@@ -14,35 +14,37 @@ namespace Rdmp.Core.CommandLine.Options;
 /// <summary>
 /// Runs a given RDMP command specified by <see cref="CommandName"/> from the CLI.  See <see cref="ExecuteCommandRunner"/> for implementation.
 /// </summary>
-[Verb("cmd", isDefault:true,HelpText = "Run the specified command.  To list commands run 'rdmp cmd ListSupportedCommands'")]
+[Verb("cmd", true, HelpText = "Run the specified command.  To list commands run 'rdmp cmd ListSupportedCommands'")]
 public class ExecuteCommandOptions : RDMPCommandLineOptions
 {
-
-    [Value(0,HelpText = "The command to run e.g. Delete.  Leave blank for interactive mode")]
+    [Value(0, HelpText = "The command to run e.g. Delete.  Leave blank for interactive mode")]
     public string CommandName { get; set; }
 
-        
-    [Value(1,HelpText = "The arguments to provide for the command e.g. Catalogue:12")]
+
+    [Value(1, HelpText = "The arguments to provide for the command e.g. Catalogue:12")]
     public IEnumerable<string> CommandArgs { get; set; }
 
-    [Option('f',"file",HelpText="Runs commands in the given yaml file")]
-    public string File {get;set;}
+    [Option('f', "file", HelpText = "Runs commands in the given yaml file")]
+    public string File { get; set; }
 
     /// <summary>
     /// The deserialized contents of File or null if File is not provided.  It is up to the hosting API to populate this property
     /// </summary>
     /// <value></value>
-    public RdmpScript Script {get;set;}
-        
+    public RdmpScript Script { get; set; }
+
     [Usage]
     public static IEnumerable<Example> Examples
     {
         get
         {
-            yield return new Example("Runs the delete command on Catalogue with ID 1",new ExecuteCommandOptions {CommandName = "Delete", CommandArgs = new string[]{"Catalogue:1"}});
-            yield return new Example("List available commands",new ExecuteCommandOptions {CommandName = "ListSupportedCommands"});
-            yield return new Example("Runs all commands in the file",new ExecuteCommandOptions {File = "./myfile.yaml"});
-            yield return new Example("Prompts you which command to run",new ExecuteCommandOptions());
+            yield return new Example("Runs the delete command on Catalogue with ID 1",
+                new ExecuteCommandOptions { CommandName = "Delete", CommandArgs = new string[] { "Catalogue:1" } });
+            yield return new Example("List available commands",
+                new ExecuteCommandOptions { CommandName = "ListSupportedCommands" });
+            yield return new Example("Runs all commands in the file",
+                new ExecuteCommandOptions { File = "./myfile.yaml" });
+            yield return new Example("Prompts you which command to run", new ExecuteCommandOptions());
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/ExtractionOptions.cs b/Rdmp.Core/CommandLine/Options/ExtractionOptions.cs
index 987f635358..c34b63e69d 100644
--- a/Rdmp.Core/CommandLine/Options/ExtractionOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/ExtractionOptions.cs
@@ -14,20 +14,22 @@ namespace Rdmp.Core.CommandLine.Options;
 /// Options for the Extraction Engine which performs cohort linkage against datasets and extracts anonymous datasets
 /// </summary>
 [Verb("extract", HelpText = "Runs the Data Extraction Engine")]
-public class ExtractionOptions:ConcurrentRDMPCommandLineOptions
+public class ExtractionOptions : ConcurrentRDMPCommandLineOptions
 {
-    [Option('g',"Globals", HelpText = "Include extraction of globals (global SupportingDocuments etc")]
+    [Option('g', "Globals", HelpText = "Include extraction of globals (global SupportingDocuments etc")]
     public bool ExtractGlobals { get; set; }
 
-    [Option('e',"ExtractionConfiguration",HelpText = "The ExtractionConfiguration ID to extract",Required = true)]
+    [Option('e', "ExtractionConfiguration", HelpText = "The ExtractionConfiguration ID to extract", Required = true)]
     public string ExtractionConfiguration { get; set; }
 
     [Option('p', "Pipeline", HelpText = "The ID of the extraction Pipeline to use", Required = true)]
     public string Pipeline { get; set; }
 
-    [Option('s', "Datasets", HelpText = "Restrict extraction to only those ExtractableDatasets that have the provided list of IDs (must be part of the ExtractionConfiguration)")]
+    [Option('s', "Datasets",
+        HelpText =
+            "Restrict extraction to only those ExtractableDatasets that have the provided list of IDs (must be part of the ExtractionConfiguration)")]
     public string Datasets { get; set; }
-        
+
     [Usage]
     public static IEnumerable<Example> Examples
     {
@@ -37,13 +39,11 @@ public static IEnumerable<Example> Examples
                 new ExtractionOptions
                 {
                     Command = CommandLineActivity.check,
-                    ExtractionConfiguration =  "32",
-                    Pipeline =  "2",
+                    ExtractionConfiguration = "32",
+                    Pipeline = "2",
                     Datasets = "123,124"
                 }
             );
-                
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/PackOptions.cs b/Rdmp.Core/CommandLine/Options/PackOptions.cs
index 2be07fa7b8..64c378497f 100644
--- a/Rdmp.Core/CommandLine/Options/PackOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/PackOptions.cs
@@ -14,13 +14,13 @@ namespace Rdmp.Core.CommandLine.Options;
 /// <summary>
 /// Command line arguments for uploading plugins
 /// </summary>
-[Verb("pack",HelpText = "Uploads a new RDMP plugin into the database")]
-public class PackOptions:RDMPCommandLineOptions
+[Verb("pack", HelpText = "Uploads a new RDMP plugin into the database")]
+public class PackOptions : RDMPCommandLineOptions
 {
-    [Option('f',"file",Required = true, HelpText = $"The {PackPluginRunner.PluginPackageSuffix} plugin file to add")]
+    [Option('f', "file", Required = true, HelpText = $"The {PackPluginRunner.PluginPackageSuffix} plugin file to add")]
     public string File { get; set; }
 
-    [Option('p',"prune", HelpText =
+    [Option('p', "prune", HelpText =
         $"Modifies the {PackPluginRunner.PluginPackageSuffix} plugin file by removing duplicate dlls or those already contained in RDMP core before uploading to database")]
     public bool Prune { get; set; }
 
diff --git a/Rdmp.Core/CommandLine/Options/PatchDatabaseOptions.cs b/Rdmp.Core/CommandLine/Options/PatchDatabaseOptions.cs
index 8bd7f0b566..cc0dd28585 100644
--- a/Rdmp.Core/CommandLine/Options/PatchDatabaseOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/PatchDatabaseOptions.cs
@@ -14,7 +14,6 @@ namespace Rdmp.Core.CommandLine.Options;
 [Verb("patch", HelpText = "Patches all RDMP platform databases")]
 public class PatchDatabaseOptions : RDMPCommandLineOptions
 {
-
     [Option('b', Required = false, HelpText = @"Pass to backup databases prior to patching (if patching is required)")]
     public bool BackupDatabase { get; set; } = false;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/RDMPCommandLineOptions.cs b/Rdmp.Core/CommandLine/Options/RDMPCommandLineOptions.cs
index 4d8e292ada..897fbedde5 100644
--- a/Rdmp.Core/CommandLine/Options/RDMPCommandLineOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/RDMPCommandLineOptions.cs
@@ -22,40 +22,54 @@ public abstract class RDMPCommandLineOptions
 {
     private IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
 
-    [Option(Required = false, HelpText = @"Name of the Metadata server (where Catalogue and Data Export are stored) e.g. localhost\sqlexpress")]
+    [Option(Required = false,
+        HelpText =
+            @"Name of the Metadata server (where Catalogue and Data Export are stored) e.g. localhost\sqlexpress")]
     public string ServerName { get; set; }
 
     [Option(Required = false, HelpText = "Name of the Catalogue database e.g. RDMP_Catalogue")]
     public string CatalogueDatabaseName { get; set; }
 
-    [Option( Required = false, HelpText = "Name of the Data Export database e.g. RDMP_DataExport")]
+    [Option(Required = false, HelpText = "Name of the Data Export database e.g. RDMP_DataExport")]
     public string DataExportDatabaseName { get; set; }
 
-    [Option(Required = false, HelpText = "Full connection string to the Catalogue database, this overrides CatalogueDatabaseName and allows custom ports, username/password etc")]
+    [Option(Required = false,
+        HelpText =
+            "Full connection string to the Catalogue database, this overrides CatalogueDatabaseName and allows custom ports, username/password etc")]
     public string CatalogueConnectionString { get; set; }
 
-    [Option(Required = false, HelpText = "Full connection string to the DataExport database, this overrides DataExportDatabaseName and allows custom ports, username/password etc")]
+    [Option(Required = false,
+        HelpText =
+            "Full connection string to the DataExport database, this overrides DataExportDatabaseName and allows custom ports, username/password etc")]
     public string DataExportConnectionString { get; set; }
 
-    [Option(Required = false, HelpText = "Path to the yaml file containing database connection strings.  Defaults to 'Databases.yaml'.  Explicit command line arguments (e.g. --CatalogueConnectionString) override this", Default = "Databases.yaml")]
+    [Option(Required = false,
+        HelpText =
+            "Path to the yaml file containing database connection strings.  Defaults to 'Databases.yaml'.  Explicit command line arguments (e.g. --CatalogueConnectionString) override this",
+        Default = "Databases.yaml")]
     public string ConnectionStringsFile { get; set; }
 
-    [Option(Required =false, HelpText = @"Log StartUp output")]
-    public bool LogStartup{get;set;}
-        
-    [Option(Required = false, HelpText = @"Command to run on the engine: 'run' or 'check' ", Default = CommandLineActivity.run)]
+    [Option(Required = false, HelpText = @"Log StartUp output")]
+    public bool LogStartup { get; set; }
+
+    [Option(Required = false, HelpText = @"Command to run on the engine: 'run' or 'check' ",
+        Default = CommandLineActivity.run)]
     public CommandLineActivity Command { get; set; } = CommandLineActivity.run;
 
-    [Option(Required = false, Default = false, HelpText = "Process returns errorcode '1' (instead of 0) if there are warnings")]
+    [Option(Required = false, Default = false,
+        HelpText = "Process returns errorcode '1' (instead of 0) if there are warnings")]
     public bool FailOnWarnings { get; set; }
 
-    [Option(Required = false, HelpText = "Connect to an RDMP platform 'database' stored on the file system at this folder")]
+    [Option(Required = false,
+        HelpText = "Connect to an RDMP platform 'database' stored on the file system at this folder")]
     public string Dir { get; set; }
 
-    [Option('q',"quiet",Required = false, HelpText = "Suppress all console logging not directly tied to show/get value etc")]
+    [Option('q', "quiet", Required = false,
+        HelpText = "Suppress all console logging not directly tied to show/get value etc")]
     public bool Quiet { get; set; }
 
-    [Option("skip-patching", Required = false, HelpText = "Do not check to see if platform databases are out of date or suggest patching them")]
+    [Option("skip-patching", Required = false,
+        HelpText = "Do not check to see if platform databases are out of date or suggest patching them")]
     public bool SkipPatching { get; set; }
 
     /// <summary>
@@ -65,24 +79,25 @@ public abstract class RDMPCommandLineOptions
     /// </summary>
     public ConnectionStringsYamlFile ConnectionStringsFileLoaded { get; private set; }
 
-    protected const string ExampleCatalogueConnectionString = "Server=myServer;Database=RDMP_Catalogue;User Id=myUsername;Password=myPassword;";
-    protected const string ExampleDataExportConnectionString = "Server=myServer;Database=RDMP_DataExport;User Id=myUsername;Password=myPassword;";
+    protected const string ExampleCatalogueConnectionString =
+        "Server=myServer;Database=RDMP_Catalogue;User Id=myUsername;Password=myPassword;";
+
+    protected const string ExampleDataExportConnectionString =
+        "Server=myServer;Database=RDMP_DataExport;User Id=myUsername;Password=myPassword;";
 
-    public IRDMPPlatformRepositoryServiceLocator DoStartup(EnvironmentInfo env,ICheckNotifier checkNotifier)
+    public IRDMPPlatformRepositoryServiceLocator DoStartup(EnvironmentInfo env, ICheckNotifier checkNotifier)
     {
-        var startup = new Startup.Startup(env, GetRepositoryLocator()) { SkipPatching = SkipPatching};
+        var startup = new Startup.Startup(env, GetRepositoryLocator()) { SkipPatching = SkipPatching };
         startup.DoStartup(checkNotifier);
         return startup.RepositoryLocator;
     }
 
     public virtual IRDMPPlatformRepositoryServiceLocator GetRepositoryLocator()
     {
-        if(_repositoryLocator == null)
+        if (_repositoryLocator == null)
         {
             if (!string.IsNullOrWhiteSpace(Dir))
-            {
                 return _repositoryLocator = new RepositoryProvider(new YamlRepository(new DirectoryInfo(Dir)));
-            }
 
             GetConnectionStrings(out var c, out var d);
             _repositoryLocator = new LinkedRepositoryProvider(c?.ConnectionString, d?.ConnectionString);
@@ -91,10 +106,7 @@ public virtual IRDMPPlatformRepositoryServiceLocator GetRepositoryLocator()
         return _repositoryLocator;
     }
 
-    protected virtual bool ShouldLoadHelp()
-    {
-        return false;
-    }
+    protected virtual bool ShouldLoadHelp() => false;
 
     /// <summary>
     /// Gets the connection strings that have been defined on the command line or by providing a Databases.yaml file
@@ -112,18 +124,15 @@ public void GetConnectionStrings(out SqlConnectionStringBuilder c, out SqlConnec
             }
             catch (Exception ex)
             {
-                throw new Exception("CatalogueConnectionString is invalid",ex);
+                throw new Exception("CatalogueConnectionString is invalid", ex);
             }
-        else
-        if (CatalogueDatabaseName != null)
-        {
+        else if (CatalogueDatabaseName != null)
             c = new SqlConnectionStringBuilder
             {
                 DataSource = ServerName,
                 IntegratedSecurity = true,
                 InitialCatalog = CatalogueDatabaseName
             };
-        }
         else
             c = null;
 
@@ -136,16 +145,13 @@ public void GetConnectionStrings(out SqlConnectionStringBuilder c, out SqlConnec
             {
                 throw new Exception("DataExportConnectionString is invalid", ex);
             }
-        else
-        if (DataExportDatabaseName != null)
-        {
+        else if (DataExportDatabaseName != null)
             d = new SqlConnectionStringBuilder
             {
                 DataSource = ServerName,
                 IntegratedSecurity = true,
                 InitialCatalog = DataExportDatabaseName
             };
-        }
         else
             d = null;
     }
@@ -155,14 +161,12 @@ public void GetConnectionStrings(out SqlConnectionStringBuilder c, out SqlConnec
     /// be used (e.g. from Databases.yaml).
     /// </summary>
     /// <returns></returns>
-    public bool NoConnectionStringsSpecified()
-    {
-        return string.IsNullOrWhiteSpace(ServerName) &&
-               string.IsNullOrWhiteSpace(CatalogueDatabaseName) &&
-               string.IsNullOrWhiteSpace(DataExportDatabaseName) &&
-               string.IsNullOrWhiteSpace(CatalogueConnectionString) &&
-               string.IsNullOrWhiteSpace(DataExportConnectionString);
-    }
+    public bool NoConnectionStringsSpecified() =>
+        string.IsNullOrWhiteSpace(ServerName) &&
+        string.IsNullOrWhiteSpace(CatalogueDatabaseName) &&
+        string.IsNullOrWhiteSpace(DataExportDatabaseName) &&
+        string.IsNullOrWhiteSpace(CatalogueConnectionString) &&
+        string.IsNullOrWhiteSpace(DataExportConnectionString);
 
     public void PopulateConnectionStringsFromYamlIfMissing(ICheckNotifier notifier)
     {
@@ -170,7 +174,8 @@ public void PopulateConnectionStringsFromYamlIfMissing(ICheckNotifier notifier)
 
         if (!NoConnectionStringsSpecified())
         {
-            logger.Info("Connection string options have been specified on command line, yaml config values will be ignored");
+            logger.Info(
+                "Connection string options have been specified on command line, yaml config values will be ignored");
             return;
         }
 
@@ -178,7 +183,6 @@ public void PopulateConnectionStringsFromYamlIfMissing(ICheckNotifier notifier)
         var yaml = Path.Combine(assemblyFolder, ConnectionStringsFile);
 
         if (File.Exists(yaml))
-        {
             try
             {
                 var cstrs = ConnectionStringsYamlFile.LoadFrom(new FileInfo(yaml));
@@ -189,8 +193,8 @@ public void PopulateConnectionStringsFromYamlIfMissing(ICheckNotifier notifier)
             }
             catch (Exception ex)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs($"Failed to read yaml file '{yaml}'", CheckResult.Fail,ex));
+                notifier.OnCheckPerformed(
+                    new CheckEventArgs($"Failed to read yaml file '{yaml}'", CheckResult.Fail, ex));
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Options/RdmpScript.cs b/Rdmp.Core/CommandLine/Options/RdmpScript.cs
index b9321d28df..939e04d9ff 100644
--- a/Rdmp.Core/CommandLine/Options/RdmpScript.cs
+++ b/Rdmp.Core/CommandLine/Options/RdmpScript.cs
@@ -12,13 +12,13 @@ namespace Rdmp.Core.CommandLine.Options;
 /// <summary>
 /// Describes a series of commands to run in sequence.
 /// </summary>
-public  class RdmpScript
-{        
+public class RdmpScript
+{
     /// <summary>
     /// Commands which should be run by a <see cref="ExecuteCommandRunner"/>
     /// </summary>
     /// <value></value>
-    public string[] Commands {get;set;}
+    public string[] Commands { get; set; }
 
     /// <summary>
     /// True (default) to use a <see cref="NewObjectPool"/> to track objects created as the script is run
diff --git a/Rdmp.Core/CommandLine/Options/ReleaseOptions.cs b/Rdmp.Core/CommandLine/Options/ReleaseOptions.cs
index 67a8f44fe9..7e87d20628 100644
--- a/Rdmp.Core/CommandLine/Options/ReleaseOptions.cs
+++ b/Rdmp.Core/CommandLine/Options/ReleaseOptions.cs
@@ -12,19 +12,25 @@ namespace Rdmp.Core.CommandLine.Options;
 /// Options for the Release Engine which is responsible for gathering all the artifacts produced by the Extraction Engine (anonymised project extracts, bundled lookups and documents etc)
 /// and transmitting them somewhere as a final released package.
 /// </summary>
-[Verb("release",HelpText = "Releases one or more ExtractionConfigurations (e.g. Cases & Controls) for an extraction Project that has been succesfully extracted via the Extraction Engine (see extract command)")]
+[Verb("release",
+    HelpText =
+        "Releases one or more ExtractionConfigurations (e.g. Cases & Controls) for an extraction Project that has been succesfully extracted via the Extraction Engine (see extract command)")]
 public class ReleaseOptions : ConcurrentRDMPCommandLineOptions
 {
-    [Option('c',"Configurations",HelpText = "List of ExtractionConfiguration IDs to release, they must all belong to the same Project")]
-    public string Configurations{ get; set; }
+    [Option('c', "Configurations",
+        HelpText = "List of ExtractionConfiguration IDs to release, they must all belong to the same Project")]
+    public string Configurations { get; set; }
 
     [Option('p', "Pipeline", HelpText = "The ID of the release Pipeline to use")]
     public string Pipeline { get; set; }
 
-    [Option('s',"SelectedDatasets", HelpText = "List of SelectedDatasets IDs to release, they must all belong to ExtractionConfigurations within the same Project")]
+    [Option('s', "SelectedDatasets",
+        HelpText =
+            "List of SelectedDatasets IDs to release, they must all belong to ExtractionConfigurations within the same Project")]
     public string SelectedDataSets { get; set; }
 
-    [Option('g', "Globals", HelpText = "True to release extracted globals (default) or false to skip them", Default = true)]
+    [Option('g', "Globals", HelpText = "True to release extracted globals (default) or false to skip them",
+        Default = true)]
     public bool? ReleaseGlobals { get; set; }
 
     [Option(HelpText = "True to skip any ExtractionConfiguration that are already released")]
diff --git a/Rdmp.Core/CommandLine/RdmpCommandLineBootStrapper.cs b/Rdmp.Core/CommandLine/RdmpCommandLineBootStrapper.cs
index dea918b0d5..0c628a991e 100644
--- a/Rdmp.Core/CommandLine/RdmpCommandLineBootStrapper.cs
+++ b/Rdmp.Core/CommandLine/RdmpCommandLineBootStrapper.cs
@@ -29,8 +29,8 @@ namespace Rdmp.Core.CommandLine;
 /// </summary>
 public class RdmpCommandLineBootStrapper
 {
-
-    public static int HandleArgumentsWithStandardRunner(string[] args, Logger logger,IRDMPPlatformRepositoryServiceLocator existingLocator = null)
+    public static int HandleArgumentsWithStandardRunner(string[] args, Logger logger,
+        IRDMPPlatformRepositoryServiceLocator existingLocator = null)
     {
         try
         {
@@ -45,7 +45,7 @@ public static int HandleArgumentsWithStandardRunner(string[] args, Logger logger
                     ExecuteCommandOptions>(args)
                 .MapResult(
                     //Add new verbs as options here and invoke relevant runner
-                    (DleOptions opts) => Run(opts,null, existingLocator),
+                    (DleOptions opts) => Run(opts, null, existingLocator),
                     (DqeOptions opts) => Run(opts, null, existingLocator),
                     (CacheOptions opts) => Run(opts, null, existingLocator),
                     (ExtractionOptions opts) => Run(opts, null, existingLocator),
@@ -95,10 +95,11 @@ public static int RunCmd(ExecuteCommandOptions opts, IRDMPPlatformRepositoryServ
             }
         }
 
-        return Run((RDMPCommandLineOptions)opts,null, existingLocator);
+        return Run((RDMPCommandLineOptions)opts, null, existingLocator);
     }
 
-    public static int Run(RDMPCommandLineOptions opts, IRunner explicitRunner = null, IRDMPPlatformRepositoryServiceLocator existingLocator = null)
+    public static int Run(RDMPCommandLineOptions opts, IRunner explicitRunner = null,
+        IRDMPPlatformRepositoryServiceLocator existingLocator = null)
     {
         // if we have already done startup great!
         var repositoryLocator = existingLocator;
@@ -116,20 +117,20 @@ public static int Run(RDMPCommandLineOptions opts, IRunner explicitRunner = null
             // where RDMP objects are stored
             repositoryLocator = opts.GetRepositoryLocator();
 
-            if(repositoryLocator == null || repositoryLocator.CatalogueRepository == null)
+            if (repositoryLocator == null || repositoryLocator.CatalogueRepository == null)
             {
-                listener.OnNotify(typeof(RdmpCommandLineBootStrapper), new NotifyEventArgs(ProgressEventType.Error, "No repository has been specified.  Either create a Databases.yaml file or provide repository connection strings/paths as command line arguments"));
+                listener.OnNotify(typeof(RdmpCommandLineBootStrapper),
+                    new NotifyEventArgs(ProgressEventType.Error,
+                        "No repository has been specified.  Either create a Databases.yaml file or provide repository connection strings/paths as command line arguments"));
                 return REPO_ERROR;
             }
 
 
-            if (!CheckRepo(repositoryLocator))
-            {
-                return REPO_ERROR;
-            }
+            if (!CheckRepo(repositoryLocator)) return REPO_ERROR;
 
             CatalogueRepository.SuppressHelpLoading = false;
-            opts.DoStartup(GetEnvironmentInfo(), opts.LogStartup ? (ICheckNotifier)checker : new IgnoreAllErrorsCheckNotifier());
+            opts.DoStartup(GetEnvironmentInfo(),
+                opts.LogStartup ? (ICheckNotifier)checker : new IgnoreAllErrorsCheckNotifier());
         }
 
         //if user wants to run checking chances are they don't want checks to fail becasue of errors logged during startup (MEF shows lots of errors!)
@@ -169,44 +170,38 @@ public static int Run(RDMPCommandLineOptions opts, IRunner explicitRunner = null
     /// </summary>
     public const int REPO_ERROR = 7;
 
-    public static EnvironmentInfo GetEnvironmentInfo()
-    {
-        return new EnvironmentInfo(PluginFolders.Main);
-    }
+    public static EnvironmentInfo GetEnvironmentInfo() => new(PluginFolders.Main);
+
     public static bool CheckRepo(IRDMPPlatformRepositoryServiceLocator repo)
     {
         var logger = LogManager.GetCurrentClassLogger();
         if (repo is LinkedRepositoryProvider l)
         {
             if (l.CatalogueRepository is TableRepository c)
-            {
                 try
                 {
                     c.DiscoveredServer.TestConnection(15_000);
                 }
                 catch (Exception ex)
                 {
-                    logger.Error(ex, $"Could not reach {c.DiscoveredServer} (Database:{c.DiscoveredServer.GetCurrentDatabase()}).  Ensure that you have configured RDMP database connections in Databases.yaml correctly and/or that you have run install to setup platform databases");
+                    logger.Error(ex,
+                        $"Could not reach {c.DiscoveredServer} (Database:{c.DiscoveredServer.GetCurrentDatabase()}).  Ensure that you have configured RDMP database connections in Databases.yaml correctly and/or that you have run install to setup platform databases");
                     return false;
                 }
-            }
 
             if (l.DataExportRepository is TableRepository d)
-            {
                 try
                 {
                     d.DiscoveredServer.TestConnection();
                 }
                 catch (Exception ex)
                 {
-                    logger.Error(ex, $"Could not reach {d.DiscoveredServer} (Database:{d.DiscoveredServer.GetCurrentDatabase()}).  Ensure that you have configured RDMP database connections in Databases.yaml correctly and/or that you have run install to setup platform databases");
+                    logger.Error(ex,
+                        $"Could not reach {d.DiscoveredServer} (Database:{d.DiscoveredServer.GetCurrentDatabase()}).  Ensure that you have configured RDMP database connections in Databases.yaml correctly and/or that you have run install to setup platform databases");
                     return false;
-
                 }
-            }
         }
 
         return true;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/CacheRunner.cs b/Rdmp.Core/CommandLine/Runners/CacheRunner.cs
index 195afbcda0..cd16f5c045 100644
--- a/Rdmp.Core/CommandLine/Runners/CacheRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/CacheRunner.cs
@@ -30,15 +30,16 @@ public CacheRunner(CacheOptions options)
         _options = options;
     }
 
-    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
-
-
-        var cp = GetObjectFromCommandLineString<CacheProgress>(repositoryLocator,_options.CacheProgress);
+        var cp = GetObjectFromCommandLineString<CacheProgress>(repositoryLocator, _options.CacheProgress);
         var dataLoadTask = cp.GetDistinctLoggingTask();
 
         var defaults = repositoryLocator.CatalogueRepository;
-        var loggingServer = defaults.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID) ?? throw new NotSupportedException("No default logging server specified, you must specify one in ");
+        var loggingServer = defaults.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID) ??
+                            throw new NotSupportedException(
+                                "No default logging server specified, you must specify one in ");
         var logManager = new LogManager(loggingServer);
 
         logManager.CreateNewLoggingTaskIfNotExists(dataLoadTask);
@@ -48,7 +49,8 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
             case CommandLineActivity.run:
 
                 //Setup dual listeners for the Cache process, one ticks the lifeline one very message and one logs to the logging db
-                var toLog = new ToLoggingDatabaseDataLoadEventListener(this, logManager, dataLoadTask, cp.GetLoggingRunName());
+                var toLog = new ToLoggingDatabaseDataLoadEventListener(this, logManager, dataLoadTask,
+                    cp.GetLoggingRunName());
                 var forkListener = new ForkDataLoadEventListener(toLog, listener);
                 try
                 {
@@ -76,7 +78,7 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
             default:
                 throw new ArgumentOutOfRangeException();
         }
-            
+
         return 0;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/CohortCreationRunner.cs b/Rdmp.Core/CommandLine/Runners/CohortCreationRunner.cs
index 1104c85f18..98c87cbfb4 100644
--- a/Rdmp.Core/CommandLine/Runners/CohortCreationRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/CohortCreationRunner.cs
@@ -27,10 +27,12 @@ public class CohortCreationRunner : Runner
     public CohortCreationRunner(CohortCreationOptions options)
     {
         _options = options;
-        _configuration = GetObjectFromCommandLineString<ExtractionConfiguration>(_options.GetRepositoryLocator(),_options.ExtractionConfiguration);
+        _configuration = GetObjectFromCommandLineString<ExtractionConfiguration>(_options.GetRepositoryLocator(),
+            _options.ExtractionConfiguration);
     }
 
-    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         if (HasConfigurationPreviouslyBeenReleased())
             throw new Exception("Extraction Configuration has already been released");
diff --git a/Rdmp.Core/CommandLine/Runners/DleRunner.cs b/Rdmp.Core/CommandLine/Runners/DleRunner.cs
index e0f46723af..f5a7724a5b 100644
--- a/Rdmp.Core/CommandLine/Runners/DleRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/DleRunner.cs
@@ -28,7 +28,7 @@ namespace Rdmp.Core.CommandLine.Runners;
 /// <summary>
 /// <see cref="IRunner"/> for the Data Load Engine.  Supports both check and execute commands.
 /// </summary>
-public class DleRunner:Runner
+public class DleRunner : Runner
 {
     private readonly DleOptions _options;
 
@@ -36,19 +36,20 @@ public DleRunner(DleOptions options)
     {
         _options = options;
     }
-        
-    public override int Run(IRDMPPlatformRepositoryServiceLocator locator, IDataLoadEventListener listener, ICheckNotifier checkNotifier,GracefulCancellationToken token)
+
+    public override int Run(IRDMPPlatformRepositoryServiceLocator locator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         ILoadProgress loadProgress = GetObjectFromCommandLineString<LoadProgress>(locator, _options.LoadProgress);
-        ILoadMetadata loadMetadata = GetObjectFromCommandLineString<LoadMetadata>(locator,_options.LoadMetadata);
+        ILoadMetadata loadMetadata = GetObjectFromCommandLineString<LoadMetadata>(locator, _options.LoadMetadata);
 
         if (loadMetadata == null && loadProgress != null)
             loadMetadata = loadProgress.LoadMetadata;
-                
-        if(loadMetadata == null)
+
+        if (loadMetadata == null)
             throw new ArgumentException("No Load Metadata specified");
-            
-        if(loadProgress != null && loadProgress.LoadMetadata_ID != loadMetadata.ID)
+
+        if (loadProgress != null && loadProgress.LoadMetadata_ID != loadMetadata.ID)
             throw new ArgumentException("The supplied LoadProgress does not belong to the supplied LoadMetadata load");
 
         var databaseConfiguration = new HICDatabaseConfiguration(loadMetadata);
@@ -59,7 +60,8 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator locator, IDataLoad
             DoMigrateFromStagingToLive = !_options.StopAfterSTAGING
         };
 
-        var checkable = new CheckEntireDataLoadProcess(loadMetadata, databaseConfiguration, flags, locator.CatalogueRepository.MEF); 
+        var checkable = new CheckEntireDataLoadProcess(loadMetadata, databaseConfiguration, flags,
+            locator.CatalogueRepository.MEF);
 
         switch (_options.Command)
         {
@@ -69,7 +71,8 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator locator, IDataLoad
                 var logManager = new LogManager(loggingServer);
 
                 // Create the pipeline to pass into the DataLoadProcess object
-                var dataLoadFactory = new HICDataLoadFactory(loadMetadata, databaseConfiguration,flags,locator.CatalogueRepository, logManager);
+                var dataLoadFactory = new HICDataLoadFactory(loadMetadata, databaseConfiguration, flags,
+                    locator.CatalogueRepository, logManager);
 
                 var execution = dataLoadFactory.Create(listener);
                 IDataLoadProcess dataLoadProcess;
@@ -78,31 +81,40 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator locator, IDataLoad
                 {
                     //Then the load is designed to run X days of source data at a time
                     //Load Progress
-                    var whichLoadProgress = loadProgress != null ? (ILoadProgressSelectionStrategy) new SingleLoadProgressSelectionStrategy(loadProgress) : new AnyAvailableLoadProgressSelectionStrategy(loadMetadata);
+                    var whichLoadProgress = loadProgress != null
+                        ? (ILoadProgressSelectionStrategy)new SingleLoadProgressSelectionStrategy(loadProgress)
+                        : new AnyAvailableLoadProgressSelectionStrategy(loadMetadata);
 
                     var jobDateFactory = new JobDateGenerationStrategyFactory(whichLoadProgress);
-                    
+
                     dataLoadProcess = _options.Iterative
-                        ? (IDataLoadProcess)new IterativeScheduledDataLoadProcess(locator, loadMetadata, checkable, execution, jobDateFactory, whichLoadProgress, _options.DaysToLoad, logManager, listener, databaseConfiguration) :
-                        new SingleJobScheduledDataLoadProcess(locator, loadMetadata, checkable, execution, jobDateFactory, whichLoadProgress, _options.DaysToLoad, logManager, listener, databaseConfiguration);
+                        ? (IDataLoadProcess)new IterativeScheduledDataLoadProcess(locator, loadMetadata, checkable,
+                            execution, jobDateFactory, whichLoadProgress, _options.DaysToLoad, logManager, listener,
+                            databaseConfiguration)
+                        : new SingleJobScheduledDataLoadProcess(locator, loadMetadata, checkable, execution,
+                            jobDateFactory, whichLoadProgress, _options.DaysToLoad, logManager, listener,
+                            databaseConfiguration);
                 }
                 else
                     //OnDemand
-                    dataLoadProcess = new DataLoadProcess(locator, loadMetadata, checkable, logManager, listener, execution, databaseConfiguration);
+                {
+                    dataLoadProcess = new DataLoadProcess(locator, loadMetadata, checkable, logManager, listener,
+                        execution, databaseConfiguration);
+                }
 
                 var exitCode = dataLoadProcess.Run(token);
-            
+
                 //return 0 for success or load not required otherwise return the exit code (which will be non zero so error)
-                return exitCode == ExitCodeType.Success || exitCode == ExitCodeType.OperationNotRequired? 0: (int)exitCode;
+                return exitCode == ExitCodeType.Success || exitCode == ExitCodeType.OperationNotRequired
+                    ? 0
+                    : (int)exitCode;
             case CommandLineActivity.check:
-                    
+
                 checkable.Check(checkNotifier);
-                    
+
                 return 0;
             default:
                 throw new ArgumentOutOfRangeException();
         }
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/DqeRunner.cs b/Rdmp.Core/CommandLine/Runners/DqeRunner.cs
index cd4b298258..2746c269ee 100644
--- a/Rdmp.Core/CommandLine/Runners/DqeRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/DqeRunner.cs
@@ -16,7 +16,7 @@
 
 namespace Rdmp.Core.CommandLine.Runners;
 
-internal class DqeRunner:Runner
+internal class DqeRunner : Runner
 {
     private readonly DqeOptions _options;
 
@@ -25,17 +25,18 @@ public DqeRunner(DqeOptions options)
         _options = options;
     }
 
-    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,ICheckNotifier checkNotifier,GracefulCancellationToken token)
+    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
-        var catalogue = GetObjectFromCommandLineString<Catalogue>(repositoryLocator,_options.Catalogue);
+        var catalogue = GetObjectFromCommandLineString<Catalogue>(repositoryLocator, _options.Catalogue);
         var report = new CatalogueConstraintReport(catalogue, SpecialFieldNames.DataLoadRunID);
-            
+
         switch (_options.Command)
         {
             case CommandLineActivity.run:
                 report.GenerateReport(catalogue, listener, token.AbortToken);
                 return 0;
-                
+
             case CommandLineActivity.check:
                 report.Check(checkNotifier);
                 return 0;
diff --git a/Rdmp.Core/CommandLine/Runners/ExecuteCommandRunner.cs b/Rdmp.Core/CommandLine/Runners/ExecuteCommandRunner.cs
index 90283b0174..046c933775 100644
--- a/Rdmp.Core/CommandLine/Runners/ExecuteCommandRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/ExecuteCommandRunner.cs
@@ -24,7 +24,7 @@
 
 namespace Rdmp.Core.CommandLine.Runners;
 
-internal class ExecuteCommandRunner:IRunner
+internal class ExecuteCommandRunner : IRunner
 {
     private readonly ExecuteCommandOptions _options;
     private ConsoleInputManager _input;
@@ -37,10 +37,11 @@ public ExecuteCommandRunner(ExecuteCommandOptions options)
     {
         _options = options;
     }
+
     public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
         ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
-        _input = new ConsoleInputManager(repositoryLocator,checkNotifier)
+        _input = new ConsoleInputManager(repositoryLocator, checkNotifier)
         {
             // if there is a single command we are running then disable user input
             // but allow it if the input is ./rdmp cmd (i.e. run in a loop prompting for commands)
@@ -54,49 +55,41 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
 
         _listener = listener;
         _invoker = new CommandInvoker(_input);
-        _invoker.CommandImpossible += (s,c)=>log.Error($"Command Impossible:{c.Command.ReasonCommandImpossible}");
-        _invoker.CommandCompleted += (s,c)=>log.Info("Command Completed");
+        _invoker.CommandImpossible += (s, c) => log.Error($"Command Impossible:{c.Command.ReasonCommandImpossible}");
+        _invoker.CommandCompleted += (s, c) => log.Info("Command Completed");
 
         var commandTypes = _invoker.GetSupportedCommands().ToArray();
         _commands = new Dictionary<string, Type>(StringComparer.InvariantCultureIgnoreCase);
 
-        foreach(var type in commandTypes)
+        foreach (var type in commandTypes)
         {
             var name = BasicCommandExecution.GetCommandName(type.Name);
-            if(!_commands.TryAdd(name,type))
-            {
-                _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            if (!_commands.TryAdd(name, type))
+                _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"Found duplicate commands both called '{name}'.  They were '{type.FullName}' and '{_commands[name].FullName}'"));
-            }
         }
 
         // add Aliases (commands that can be invoked with an alternate shorthand)
-        foreach(var type in commandTypes)
-        {
-            foreach(var alias in type.GetCustomAttributes(false).OfType<AliasAttribute>())
-            {
-                if(!_commands.TryAdd(alias.Name,type))
-                {
-                    _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Bad command alias '{alias.Name}', it is already in use by '{_commands[alias.Name].FullName}' so cannot be used for '{type.FullName}'"));
-                }
-            }
-        }
+        foreach (var type in commandTypes)
+        foreach (var alias in type.GetCustomAttributes(false).OfType<AliasAttribute>())
+            if (!_commands.TryAdd(alias.Name, type))
+                _listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning,
+                        $"Bad command alias '{alias.Name}', it is already in use by '{_commands[alias.Name].FullName}' so cannot be used for '{type.FullName}'"));
 
 
         _picker =
-            _options.CommandArgs != null && _options.CommandArgs.Any() ?
-                new CommandLineObjectPicker(_options.CommandArgs, _input) :
-                null;
+            _options.CommandArgs != null && _options.CommandArgs.Any()
+                ? new CommandLineObjectPicker(_options.CommandArgs, _input)
+                : null;
 
-        if(!string.IsNullOrWhiteSpace(_options.File) && _options.Script == null)
-            throw new Exception("Command line option File was provided but Script property was null.  The host API failed to deserialize the file or correctly use the ExecuteCommandOptions class");
+        if (!string.IsNullOrWhiteSpace(_options.File) && _options.Script == null)
+            throw new Exception(
+                "Command line option File was provided but Script property was null.  The host API failed to deserialize the file or correctly use the ExecuteCommandOptions class");
 
-        if(_options.Script != null)
-        {
-            RunScript(_options.Script,repositoryLocator);
-        }
-        else
-        if (string.IsNullOrWhiteSpace(_options.CommandName))
+        if (_options.Script != null)
+            RunScript(_options.Script, repositoryLocator);
+        else if (string.IsNullOrWhiteSpace(_options.CommandName))
             RunCommandExecutionLoop(repositoryLocator);
         else
             RunCommand(_options.CommandName);
@@ -106,25 +99,25 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
 
     private void RunCommand(string command)
     {
-        if(_commands.TryGetValue(command,out var runner))
+        if (_commands.TryGetValue(command, out var runner))
         {
-            _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Trace,$"Running Command '{runner.Name}'"));
-            _invoker.ExecuteCommand(runner,_picker);
+            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Trace, $"Running Command '{runner.Name}'"));
+            _invoker.ExecuteCommand(runner, _picker);
         }
         else
         {
             var suggestions =
-                _commands.Keys.Where(c => c.Contains(command,StringComparison.CurrentCultureIgnoreCase)).ToArray();
+                _commands.Keys.Where(c => c.Contains(command, StringComparison.CurrentCultureIgnoreCase)).ToArray();
 
-            var msg = new StringBuilder($"Unknown or Unsupported Command '{command}', use {BasicCommandExecution.GetCommandName<ExecuteCommandListSupportedCommands>()} to see available commands");
+            var msg = new StringBuilder(
+                $"Unknown or Unsupported Command '{command}', use {BasicCommandExecution.GetCommandName<ExecuteCommandListSupportedCommands>()} to see available commands");
 
             if (suggestions.Any())
                 msg.AppendLine(
                     $"Similar commands include:{Environment.NewLine}{string.Join(Environment.NewLine, suggestions)}");
 
-            _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error,msg.ToString()));
+            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, msg.ToString()));
         }
-
     }
 
     /// <summary>
@@ -138,10 +131,11 @@ private void RunCommandExecutionLoop(IRDMPPlatformRepositoryServiceLocator repos
 
         while (true)
         {
-            var command = _input.GetString(new DialogArgs { WindowTitle = "Enter Command (or Ctrl+C)" }, _commands.Keys.ToList());
+            var command = _input.GetString(new DialogArgs { WindowTitle = "Enter Command (or Ctrl+C)" },
+                _commands.Keys.ToList());
             try
             {
-                command = GetCommandAndPickerFromLine(command, out _picker,repositoryLocator);
+                command = GetCommandAndPickerFromLine(command, out _picker, repositoryLocator);
 
                 if (string.Equals(command, "exit", StringComparison.CurrentCultureIgnoreCase))
                     break;
@@ -165,11 +159,12 @@ private void RunCommandExecutionLoop(IRDMPPlatformRepositoryServiceLocator repos
     /// <param name="picker"></param>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    private string GetCommandAndPickerFromLine(string command, out CommandLineObjectPicker picker,IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    private string GetCommandAndPickerFromLine(string command, out CommandLineObjectPicker picker,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         if (command.Contains(' '))
         {
-            picker = new CommandLineObjectPicker(SplitCommandLine(command).Skip(1).ToArray(),_input);
+            picker = new CommandLineObjectPicker(SplitCommandLine(command).Skip(1).ToArray(), _input);
             return command[..command.IndexOf(' ')];
         }
 
@@ -184,18 +179,18 @@ private string GetCommandAndPickerFromLine(string command, out CommandLineObject
     /// <param name="repositoryLocator"></param>
     private void RunScript(RdmpScript script, IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
-        if((script.Commands?.Length ?? 0) == 0)
-            throw new ArgumentException("script was empty",nameof(script));
+        if ((script.Commands?.Length ?? 0) == 0)
+            throw new ArgumentException("script was empty", nameof(script));
 
         using (script.UseScope ? NewObjectPool.StartSession() : null)
         {
             foreach (var s in script.Commands)
-            {
                 try
                 {
-                    if(StartsWithEngineVerb(s))
+                    if (StartsWithEngineVerb(s))
                     {
-                        var exitCode = RdmpCommandLineBootStrapper.HandleArgumentsWithStandardRunner(SplitCommandLine(s).ToArray(), LogManager.GetCurrentClassLogger(), repositoryLocator);
+                        var exitCode = RdmpCommandLineBootStrapper.HandleArgumentsWithStandardRunner(
+                            SplitCommandLine(s).ToArray(), LogManager.GetCurrentClassLogger(), repositoryLocator);
                         if (exitCode != 0)
                             throw new Exception("Exit code from runner was non zero");
                     }
@@ -209,9 +204,7 @@ private void RunScript(RdmpScript script, IRDMPPlatformRepositoryServiceLocator
                 {
                     throw new Exception($"Error executing script.  Problem line was '{s}':{ex.Message}", ex);
                 }
-            }
         }
-
     }
 
     private static bool StartsWithEngineVerb(string s)
@@ -232,37 +225,37 @@ public static IEnumerable<string> SplitCommandLine(string commandLine)
 
         var word = new StringBuilder();
 
-        for(var i =0; i<commandLine.Length;i++)
+        for (var i = 0; i < commandLine.Length; i++)
         {
             var c = commandLine[i];
 
             //if we enter quotes and it's the first letter in the word
-            if(inQuotes == null && (c == '\'' || c == '"') && word.Length == 0)
+            if (inQuotes == null && (c == '\'' || c == '"') && word.Length == 0)
             {
                 inQuotes = c;
             }
-            else
-            if(c == inQuotes)
+            else if (c == inQuotes)
             {
                 //if we exit quotes
                 inQuotes = null;
             }
-            else
-            if(c == ' ' && inQuotes == null)
+            else if (c == ' ' && inQuotes == null)
             {
                 //break character outside of quotes
                 var resultWord = word.ToString().Trim();
-                if(!string.IsNullOrWhiteSpace(resultWord))
+                if (!string.IsNullOrWhiteSpace(resultWord))
                     yield return resultWord;
 
                 word.Clear();
             }
             else
+            {
                 word.Append(c); //regular character
+            }
         }
 
         var finalWord = word.ToString().Trim();
-        if(!string.IsNullOrWhiteSpace(finalWord))
+        if (!string.IsNullOrWhiteSpace(finalWord))
             yield return finalWord;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/ExtractionRunner.cs b/Rdmp.Core/CommandLine/Runners/ExtractionRunner.cs
index d177d2f016..4622115b9d 100644
--- a/Rdmp.Core/CommandLine/Runners/ExtractionRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/ExtractionRunner.cs
@@ -40,9 +40,9 @@ public class ExtractionRunner : ManyRunner
     private Pipeline _pipeline;
     private LogManager _logManager;
     private object _oLock = new();
-    public Dictionary<ISelectedDataSets, ExtractCommand> ExtractCommands { get;private set; }
+    public Dictionary<ISelectedDataSets, ExtractCommand> ExtractCommands { get; private set; }
 
-    public ExtractionRunner(IBasicActivateItems activator,ExtractionOptions extractionOpts):base(extractionOpts)
+    public ExtractionRunner(IBasicActivateItems activator, ExtractionOptions extractionOpts) : base(extractionOpts)
     {
         _options = extractionOpts;
         _activator = activator;
@@ -51,8 +51,9 @@ public ExtractionRunner(IBasicActivateItems activator,ExtractionOptions extracti
 
     protected override void Initialize()
     {
-            
-        _configuration = GetObjectFromCommandLineString<ExtractionConfiguration>(RepositoryLocator,_options.ExtractionConfiguration);
+        _configuration =
+            GetObjectFromCommandLineString<ExtractionConfiguration>(RepositoryLocator,
+                _options.ExtractionConfiguration);
         _project = _configuration.Project;
         _pipeline = GetObjectFromCommandLineString<Pipeline>(RepositoryLocator, _options.Pipeline);
 
@@ -66,8 +67,10 @@ protected override void AfterRun()
 
     protected override object[] GetRunnables()
     {
-        lock(_oLock)
+        lock (_oLock)
+        {
             ExtractCommands.Clear();
+        }
 
         var commands = new List<IExtractCommand>();
 
@@ -75,7 +78,8 @@ protected override object[] GetRunnables()
         if (_options.ExtractGlobals)
         {
             var g = _configuration.GetGlobals();
-            var globals = new GlobalsBundle(g.OfType<SupportingDocument>().ToArray(), g.OfType<SupportingSQLTable>().ToArray());
+            var globals = new GlobalsBundle(g.OfType<SupportingDocument>().ToArray(),
+                g.OfType<SupportingSQLTable>().ToArray());
             _globalsCommand = new ExtractGlobalsCommand(RepositoryLocator, _project, _configuration, globals);
             commands.Add(_globalsCommand);
         }
@@ -86,9 +90,11 @@ protected override object[] GetRunnables()
         {
             var extractDatasetCommand = ExtractCommandCollectionFactory.Create(RepositoryLocator, sds);
             commands.Add(extractDatasetCommand);
-                
-            lock(_oLock)
-                ExtractCommands.Add(sds,extractDatasetCommand);
+
+            lock (_oLock)
+            {
+                ExtractCommands.Add(sds, extractDatasetCommand);
+            }
         }
 
         return commands.ToArray();
@@ -101,20 +107,23 @@ protected override void ExecuteRun(object runnable, OverrideSenderIDataLoadEvent
         var datasetCommand = runnable as ExtractDatasetCommand;
 
         var logging = new ToLoggingDatabaseDataLoadEventListener(_logManager, dataLoadInfo);
-        var fork = 
-            datasetCommand != null ?
-                new ForkDataLoadEventListener(logging, listener, new ElevateStateListener(datasetCommand)):
-                new ForkDataLoadEventListener(logging, listener);
+        var fork =
+            datasetCommand != null
+                ? new ForkDataLoadEventListener(logging, listener, new ElevateStateListener(datasetCommand))
+                : new ForkDataLoadEventListener(logging, listener);
 
-        if(runnable is ExtractGlobalsCommand globalCommand)
+        if (runnable is ExtractGlobalsCommand globalCommand)
         {
-            var useCase = new ExtractionPipelineUseCase(_activator,_project, _globalsCommand, _pipeline, dataLoadInfo) { Token = Token };
+            var useCase = new ExtractionPipelineUseCase(_activator, _project, _globalsCommand, _pipeline, dataLoadInfo)
+                { Token = Token };
             useCase.Execute(fork);
         }
 
         if (datasetCommand != null)
         {
-            var executeUseCase = new ExtractionPipelineUseCase(_activator,_project, datasetCommand, _pipeline, dataLoadInfo) { Token = Token };
+            var executeUseCase =
+                new ExtractionPipelineUseCase(_activator, _project, datasetCommand, _pipeline, dataLoadInfo)
+                    { Token = Token };
             executeUseCase.Execute(fork);
         }
 
@@ -132,7 +141,7 @@ protected override ICheckable[] GetCheckables(ICheckNotifier checkNotifier)
             return Array.Empty<ICheckable>();
         }
 
-        checkables.Add(new ProjectChecker(_activator,_configuration.Project)
+        checkables.Add(new ProjectChecker(_activator, _configuration.Project)
         {
             CheckDatasets = false,
             CheckConfigurations = false
@@ -150,12 +159,13 @@ protected override ICheckable[] GetCheckables(ICheckNotifier checkNotifier)
                 checkables.Add(new GlobalExtractionChecker(_activator, _configuration, globalsCommand, _pipeline));
 
             if (runnable is ExtractDatasetCommand datasetCommand)
-                checkables.Add(new SelectedDataSetsChecker(_activator,datasetCommand.SelectedDataSets,  false, _pipeline));
+                checkables.Add(new SelectedDataSetsChecker(_activator, datasetCommand.SelectedDataSets, false,
+                    _pipeline));
         }
-            
+
         return checkables.ToArray();
     }
-        
+
     private ISelectedDataSets[] GetSelectedDataSets()
     {
         if (_options.Datasets == null || !_options.Datasets.Any())
@@ -167,27 +177,24 @@ private ISelectedDataSets[] GetSelectedDataSets()
         return _configuration.SelectedDataSets.Where(ds => datasetIds.Contains(ds.ExtractableDataSet_ID)).ToArray();
     }
 
-    public ToMemoryCheckNotifier GetGlobalCheckNotifier()
-    {
-        return GetSingleCheckerResults<GlobalExtractionChecker>();
-    }
+    public ToMemoryCheckNotifier GetGlobalCheckNotifier() => GetSingleCheckerResults<GlobalExtractionChecker>();
 
     public ToMemoryCheckNotifier GetCheckNotifier(IExtractableDataSet extractableData)
     {
-        return GetSingleCheckerResults<SelectedDataSetsChecker>(sds => sds.SelectedDataSet.ExtractableDataSet_ID == extractableData.ID);
+        return GetSingleCheckerResults<SelectedDataSetsChecker>(sds =>
+            sds.SelectedDataSet.ExtractableDataSet_ID == extractableData.ID);
     }
 
     public object GetState(IExtractableDataSet extractableData)
     {
-        if(_options.Command == CommandLineActivity.check)
+        if (_options.Command == CommandLineActivity.check)
         {
             var sds = GetCheckNotifier(extractableData);
 
             return sds?.GetWorst();
         }
 
-        if(_options.Command == CommandLineActivity.run)
-        {
+        if (_options.Command == CommandLineActivity.run)
             lock (_oLock)
             {
                 var sds = ExtractCommands.Keys.FirstOrDefault(k => k.ExtractableDataSet_ID == extractableData.ID);
@@ -197,8 +204,7 @@ public object GetState(IExtractableDataSet extractableData)
 
                 return ExtractCommands[sds].State;
             }
-        }
-            
+
         return null;
     }
 
@@ -215,7 +221,6 @@ public object GetGlobalsState()
             return _globalsCommand.State;
 
         return null;
-            
     }
 
     private DataLoadInfo StartAudit()
@@ -235,7 +240,8 @@ private DataLoadInfo StartAudit()
         catch (Exception e)
         {
             throw new Exception(
-                $"Problem occurred trying to create Logging Component:{e.Message} (check user has access to {_logManager.Server} and that the DataLoadTask '{ExecuteDatasetExtractionSource.AuditTaskName}' exists)", e);
+                $"Problem occurred trying to create Logging Component:{e.Message} (check user has access to {_logManager.Server} and that the DataLoadTask '{ExecuteDatasetExtractionSource.AuditTaskName}' exists)",
+                e);
         }
 
         return dataLoadInfo;
diff --git a/Rdmp.Core/CommandLine/Runners/IRunner.cs b/Rdmp.Core/CommandLine/Runners/IRunner.cs
index c4fd7911c4..e4d102ffe7 100644
--- a/Rdmp.Core/CommandLine/Runners/IRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/IRunner.cs
@@ -17,5 +17,6 @@ namespace Rdmp.Core.CommandLine.Runners;
 /// </summary>
 public interface IRunner
 {
-    int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token);
+    int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/ManyRunner.cs b/Rdmp.Core/CommandLine/Runners/ManyRunner.cs
index f3ed15981d..388d1772e4 100644
--- a/Rdmp.Core/CommandLine/Runners/ManyRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/ManyRunner.cs
@@ -18,12 +18,12 @@
 
 namespace Rdmp.Core.CommandLine.Runners;
 
-public abstract class ManyRunner: Runner
+public abstract class ManyRunner : Runner
 {
     private readonly ConcurrentRDMPCommandLineOptions _options;
 
     protected IRDMPPlatformRepositoryServiceLocator RepositoryLocator { get; private set; }
-    protected GracefulCancellationToken Token { get;private set; }
+    protected GracefulCancellationToken Token { get; private set; }
 
     private readonly Dictionary<ICheckable, ToMemoryCheckNotifier> _checksDictionary = new();
 
@@ -37,7 +37,8 @@ protected ManyRunner(ConcurrentRDMPCommandLineOptions options)
         _options = options;
     }
 
-    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         RepositoryLocator = repositoryLocator;
         Token = token;
@@ -48,7 +49,7 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
             semaphore = new Semaphore(_options.MaxConcurrentExtractions.Value, _options.MaxConcurrentExtractions.Value);
 
         Initialize();
-            
+
         switch (_options.Command)
         {
             case CommandLineActivity.none:
@@ -79,7 +80,9 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
             case CommandLineActivity.check:
 
                 lock (_oLock)
+                {
                     _checksDictionary.Clear();
+                }
 
                 var checkables = GetCheckables(checkNotifier);
                 foreach (var checkable in checkables)
@@ -90,7 +93,9 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
                     var memory = new ToMemoryCheckNotifier(checkNotifier);
 
                     lock (_oLock)
+                    {
                         _checksDictionary.Add(checkable1, memory);
+                    }
 
                     tasks.Add(Task.Run(() =>
                     {
@@ -109,7 +114,7 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
             default:
                 throw new ArgumentOutOfRangeException();
         }
-            
+
         Task.WaitAll(tasks.ToArray());
 
         AfterRun();
@@ -121,7 +126,7 @@ public override int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
     protected abstract void AfterRun();
 
     protected abstract ICheckable[] GetCheckables(ICheckNotifier checkNotifier);
-        
+
     protected abstract object[] GetRunnables();
     protected abstract void ExecuteRun(object runnable, OverrideSenderIDataLoadEventListener listener);
 
@@ -171,15 +176,20 @@ protected ToMemoryCheckNotifier GetSingleCheckerResults<T>(Func<T, bool> func) w
     /// <typeparam name="T"></typeparam>
     /// <param name="func"></param>
     /// <returns></returns>
-    protected KeyValuePair<ICheckable, ToMemoryCheckNotifier>[] GetCheckerResults<T>(Func<T, bool> func) where T : ICheckable
+    protected KeyValuePair<ICheckable, ToMemoryCheckNotifier>[] GetCheckerResults<T>(Func<T, bool> func)
+        where T : ICheckable
     {
         lock (_oLock)
-            return GetCheckerResults<T>().Where(kvp=>func((T) kvp.Key)).ToArray();
+        {
+            return GetCheckerResults<T>().Where(kvp => func((T)kvp.Key)).ToArray();
+        }
     }
 
-    protected KeyValuePair<ICheckable, ToMemoryCheckNotifier>[] GetCheckerResults<T>() where T:ICheckable
+    protected KeyValuePair<ICheckable, ToMemoryCheckNotifier>[] GetCheckerResults<T>() where T : ICheckable
     {
         lock (_oLock)
+        {
             return _checksDictionary.Where(kvp => kvp.Key is T).ToArray();
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/CommandLine/Runners/PackPluginRunner.cs b/Rdmp.Core/CommandLine/Runners/PackPluginRunner.cs
index 16bd56dcf6..433b1d74b6 100644
--- a/Rdmp.Core/CommandLine/Runners/PackPluginRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/PackPluginRunner.cs
@@ -35,7 +35,9 @@ public PackPluginRunner(PackOptions packOpts)
     {
         _packOpts = packOpts;
     }
-    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+
+    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         var toCommit = new FileInfo(_packOpts.File);
 
@@ -51,14 +53,14 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
         //the version of rdmp on which the package depends on (e.g. 3.0)
         Version rdmpDependencyVersion;
 
-        if(_packOpts.Prune)
+        if (_packOpts.Prune)
         {
             var cmd = new ExecuteCommandPrunePlugin(_packOpts.File);
             cmd.Execute();
         }
 
         //find the manifest that lists name, version etc
-        using (var zf = ZipFile.OpenRead(toCommit.FullName) )
+        using (var zf = ZipFile.OpenRead(toCommit.FullName))
         {
             var manifests = zf.Entries.Where(e => e.FullName.EndsWith(PluginPackageManifest)).ToArray();
 
@@ -70,12 +72,18 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
             {
                 var doc = XDocument.Load(s);
 
-                var ns = doc.Root.GetDefaultNamespace();// XNamespace.Get("http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd");
-                var versionNode = doc.Root.Element(ns + "metadata").Element(ns + "version") ?? throw new Exception("Could not find version tag");
+                var ns = doc.Root
+                    .GetDefaultNamespace(); // XNamespace.Get("http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd");
+                var versionNode = doc.Root.Element(ns + "metadata").Element(ns + "version") ??
+                                  throw new Exception("Could not find version tag");
                 pluginVersion = new Version(versionSuffix.Replace(versionNode.Value, ""));
 
-                var rdmpDependencyNode = doc.Descendants(ns + "dependency").FirstOrDefault(e => e.Attribute("id").Value == "HIC.RDMP.Plugin") ?? throw new Exception("Expected a single <dependency> tag with id = HIC.RDMP.Plugin (in order to determine plugin compatibility).  Ensure your nuspec file includes a dependency on this package.");
-                rdmpDependencyVersion = new Version(versionSuffix.Replace(rdmpDependencyNode.Attribute("version").Value, ""));
+                var rdmpDependencyNode =
+                    doc.Descendants(ns + "dependency")
+                        .FirstOrDefault(e => e.Attribute("id").Value == "HIC.RDMP.Plugin") ?? throw new Exception(
+                        "Expected a single <dependency> tag with id = HIC.RDMP.Plugin (in order to determine plugin compatibility).  Ensure your nuspec file includes a dependency on this package.");
+                rdmpDependencyVersion =
+                    new Version(versionSuffix.Replace(rdmpDependencyNode.Attribute("version").Value, ""));
             }
         }
 
@@ -84,23 +92,25 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
             throw new NotSupportedException(
                 $"Plugin version {pluginVersion} is incompatible with current running version of RDMP ({runningSoftwareVersion}).");
 
-        UploadFile(repositoryLocator,checkNotifier,toCommit,pluginVersion,rdmpDependencyVersion);
-            
+        UploadFile(repositoryLocator, checkNotifier, toCommit, pluginVersion, rdmpDependencyVersion);
+
         return 0;
     }
 
-    private static void UploadFile(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier checkNotifier, FileInfo toCommit, Version pluginVersion, Version rdmpDependencyVersion)
+    private static void UploadFile(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICheckNotifier checkNotifier, FileInfo toCommit, Version pluginVersion, Version rdmpDependencyVersion)
     {
-
         // delete EXACT old versions of the Plugin
-        var oldVersion = repositoryLocator.CatalogueRepository.GetAllObjects<Curation.Data.Plugin>().SingleOrDefault(p => p.Name.Equals(toCommit.Name) && p.PluginVersion == pluginVersion);
+        var oldVersion = repositoryLocator.CatalogueRepository.GetAllObjects<Curation.Data.Plugin>()
+            .SingleOrDefault(p => p.Name.Equals(toCommit.Name) && p.PluginVersion == pluginVersion);
 
         if (oldVersion != null)
             throw new Exception($"There is already a plugin called {oldVersion.Name}");
 
         try
         {
-            var plugin = new Curation.Data.Plugin(repositoryLocator.CatalogueRepository, toCommit, pluginVersion, rdmpDependencyVersion);
+            var plugin = new Curation.Data.Plugin(repositoryLocator.CatalogueRepository, toCommit, pluginVersion,
+                rdmpDependencyVersion);
             //add the new binary
             new LoadModuleAssembly(repositoryLocator.CatalogueRepository, toCommit, plugin);
         }
diff --git a/Rdmp.Core/CommandLine/Runners/PipelineRunner.cs b/Rdmp.Core/CommandLine/Runners/PipelineRunner.cs
index 403a37a2ba..8910f00a8a 100644
--- a/Rdmp.Core/CommandLine/Runners/PipelineRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/PipelineRunner.cs
@@ -33,7 +33,8 @@ public PipelineRunner(IPipelineUseCase useCase, IPipeline pipeline)
         Pipeline = pipeline;
     }
 
-    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         // if we have no listener use a throw immediately one (generate exceptions if it went badly)
         listener ??= new ThrowImmediatelyDataLoadEventListener();
@@ -42,17 +43,17 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
         var toMemory = new ToMemoryDataLoadEventListener(false);
 
         // User might have some additional listeners registered
-        listener = new ForkDataLoadEventListener(AdditionalListeners.Union(new []{ toMemory, listener}).ToArray());
+        listener = new ForkDataLoadEventListener(AdditionalListeners.Union(new[] { toMemory, listener }).ToArray());
 
         // build the engine and run it
-        var engine = UseCase.GetEngine(Pipeline,listener);            
+        var engine = UseCase.GetEngine(Pipeline, listener);
         engine.ExecutePipeline(token ?? new GracefulCancellationToken());
 
         // return code of -1 if it went badly otherwise 0
-        var exitCode = toMemory.GetWorst() >= ProgressEventType.Error ? -1:0;
+        var exitCode = toMemory.GetWorst() >= ProgressEventType.Error ? -1 : 0;
 
-        if(exitCode ==0)
-            PipelineExecutionFinishedsuccessfully?.Invoke(this,new PipelineEngineEventArgs(engine));
+        if (exitCode == 0)
+            PipelineExecutionFinishedsuccessfully?.Invoke(this, new PipelineEngineEventArgs(engine));
 
         return exitCode;
     }
diff --git a/Rdmp.Core/CommandLine/Runners/ReleaseRunner.cs b/Rdmp.Core/CommandLine/Runners/ReleaseRunner.cs
index 89d76f82ca..0e1b534bc7 100644
--- a/Rdmp.Core/CommandLine/Runners/ReleaseRunner.cs
+++ b/Rdmp.Core/CommandLine/Runners/ReleaseRunner.cs
@@ -29,7 +29,7 @@ namespace Rdmp.Core.CommandLine.Runners;
 /// Runs the release process for one or more <see cref="ExtractionConfiguration"/> in the same <see cref="Project"/>.  This is the proces by which we gather all the artifacts
 /// produced by the Extraction Engine (anonymised project extracts, bundled lookups and documents etc) and transmit them somewhere as a final released package.
 /// </summary>
-public class ReleaseRunner:ManyRunner
+public class ReleaseRunner : ManyRunner
 {
     private readonly ReleaseOptions _options;
     private Pipeline _pipeline;
@@ -37,7 +37,7 @@ public class ReleaseRunner:ManyRunner
     private IExtractionConfiguration[] _configurations;
     private ISelectedDataSets[] _selectedDatasets;
 
-    public ReleaseRunner(ReleaseOptions options):base(options)
+    public ReleaseRunner(ReleaseOptions options) : base(options)
     {
         _options = options;
     }
@@ -45,37 +45,35 @@ public ReleaseRunner(ReleaseOptions options):base(options)
     protected override void Initialize()
     {
         _pipeline = GetObjectFromCommandLineString<Pipeline>(RepositoryLocator, _options.Pipeline);
-                        
+
         //get all configurations user has picked
-        _configurations = GetObjectsFromCommandLineString<ExtractionConfiguration>(RepositoryLocator,_options.Configurations).ToArray();
+        _configurations =
+            GetObjectsFromCommandLineString<ExtractionConfiguration>(RepositoryLocator, _options.Configurations)
+                .ToArray();
 
-        if(_options.SkipReleased)
-        {
-            _configurations = _configurations.Where(c => !c.IsReleased).ToArray();
-        }
+        if (_options.SkipReleased) _configurations = _configurations.Where(c => !c.IsReleased).ToArray();
 
         //some datasets only
-        if(_options.SelectedDataSets != null && _options.SelectedDataSets.Any())
+        if (_options.SelectedDataSets != null && _options.SelectedDataSets.Any())
         {
-            _selectedDatasets = GetObjectsFromCommandLineString<SelectedDataSets>(RepositoryLocator, _options.SelectedDataSets).ToArray();
+            _selectedDatasets =
+                GetObjectsFromCommandLineString<SelectedDataSets>(RepositoryLocator, _options.SelectedDataSets)
+                    .ToArray();
 
             var configurationIds = _configurations.Select(c => c.ID).ToArray();
 
             //if user has specified some selected datasets that do not belong to configurations they specified then we will need to include
             //those configurations as well
             foreach (var s in _selectedDatasets)
-            {
                 if (!configurationIds.Contains(s.ExtractionConfiguration_ID))
-                {
                     //add the config since it's not included in _options.Configurations
                     _configurations = _configurations.ToList().Union(new[] { s.ExtractionConfiguration }).ToArray();
-                }
-            }
-                    
         }
         else
-            _selectedDatasets = _configurations.SelectMany(c=>c.SelectedDataSets).ToArray();
-                        
+        {
+            _selectedDatasets = _configurations.SelectMany(c => c.SelectedDataSets).ToArray();
+        }
+
         if (!_configurations.Any())
             throw new Exception("No Configurations have been selected for release");
 
@@ -85,13 +83,12 @@ protected override void Initialize()
 
     protected override void AfterRun()
     {
-            
     }
 
     protected override ICheckable[] GetCheckables(ICheckNotifier checkNotifier)
     {
         foreach (var configuration in _configurations)
-            IdentifyAndRemoveOldExtractionResults(RepositoryLocator,checkNotifier, configuration);
+            IdentifyAndRemoveOldExtractionResults(RepositoryLocator, checkNotifier, configuration);
 
         var toReturn = new List<ICheckable>();
 
@@ -100,17 +97,17 @@ protected override ICheckable[] GetCheckables(ICheckNotifier checkNotifier)
             toReturn.Add(new GlobalsReleaseChecker(RepositoryLocator, _configurations));
             toReturn.AddRange(_configurations.First()
                 .GetGlobals()
-                .Select(availableGlobal => 
+                .Select(availableGlobal =>
                     new GlobalsReleaseChecker(RepositoryLocator, _configurations, availableGlobal).GetEvaluator()));
         }
 
         foreach (var configuration in _configurations)
         {
-            toReturn.AddRange(GetReleasePotentials(checkNotifier,configuration));
+            toReturn.AddRange(GetReleasePotentials(checkNotifier, configuration));
             toReturn.Add(new ReleaseEnvironmentPotential(configuration));
         }
 
-        if(_pipeline == null)
+        if (_pipeline == null)
         {
             checkNotifier.OnCheckPerformed(new CheckEventArgs("No Pipeline has been picked", CheckResult.Fail));
             return Array.Empty<ICheckable>();
@@ -126,7 +123,8 @@ protected override ICheckable[] GetCheckables(ICheckNotifier checkNotifier)
         return toReturn.ToArray();
     }
 
-    public static void IdentifyAndRemoveOldExtractionResults(IRDMPPlatformRepositoryServiceLocator repo,ICheckNotifier checkNotifier, IExtractionConfiguration configuration)
+    public static void IdentifyAndRemoveOldExtractionResults(IRDMPPlatformRepositoryServiceLocator repo,
+        ICheckNotifier checkNotifier, IExtractionConfiguration configuration)
     {
         var oldResults = configuration.CumulativeExtractionResults
             .Where(cer => !configuration.GetAllExtractableDataSets().Contains(cer.ExtractableDataSet))
@@ -142,16 +140,15 @@ public static void IdentifyAndRemoveOldExtractionResults(IRDMPPlatformRepository
             if (
                 checkNotifier.OnCheckPerformed(new CheckEventArgs(message, CheckResult.Fail, null,
                     $"Delete expired CumulativeExtractionResults for configuration.{Environment.NewLine}Not doing so may result in failures at Release time.")))
-            {
                 foreach (var result in oldResults)
                     result.DeleteInDatabase();
-            }
         }
 
         var oldLostSupplemental = configuration.CumulativeExtractionResults
             .SelectMany(c => c.SupplementalExtractionResults)
             .Union(configuration.SupplementalExtractionResults)
-            .Where(s => !repo.ArbitraryDatabaseObjectExists(s.ReferencedObjectRepositoryType, s.ReferencedObjectType, s.ReferencedObjectID))
+            .Where(s => !repo.ArbitraryDatabaseObjectExists(s.ReferencedObjectRepositoryType, s.ReferencedObjectType,
+                s.ReferencedObjectID))
             .ToArray();
 
         if (oldLostSupplemental.Any())
@@ -159,54 +156,56 @@ public static void IdentifyAndRemoveOldExtractionResults(IRDMPPlatformRepository
             var message =
                 $"In Configuration {configuration}:{Environment.NewLine}{Environment.NewLine}The following list reflect objects (supporting sql, lookups or documents) that were previously extracted but have since been deleted:";
 
-            message = oldLostSupplemental.Aggregate(message, (s, n) => s + Environment.NewLine + n.DestinationDescription);
+            message = oldLostSupplemental.Aggregate(message,
+                (s, n) => s + Environment.NewLine + n.DestinationDescription);
 
             if (
                 checkNotifier.OnCheckPerformed(new CheckEventArgs(message, CheckResult.Fail, null,
                     $"Delete expired Extraction Results for configuration.{Environment.NewLine}Not doing so may result in failures at Release time.")))
-            {
                 foreach (var result in oldLostSupplemental)
                     result.DeleteInDatabase();
-            }
         }
     }
 
-    private List<ReleasePotential> GetReleasePotentials(ICheckNotifier checkNotifier, IExtractionConfiguration configuration)
+    private List<ReleasePotential> GetReleasePotentials(ICheckNotifier checkNotifier,
+        IExtractionConfiguration configuration)
     {
         var toReturn = new List<ReleasePotential>();
 
         //create new ReleaseAssesments
-        foreach (var selectedDataSet in GetSelectedDataSets(configuration))//todo only the ones user ticked
+        foreach (var selectedDataSet in GetSelectedDataSets(configuration)) //todo only the ones user ticked
         {
             var extractionResults = selectedDataSet.GetCumulativeExtractionResultsIfAny();
 
             var progress = selectedDataSet.ExtractionProgressIfAny;
             if (progress != null)
-            {
-                if(progress.MoreToFetch())
-                {
+                if (progress.MoreToFetch())
                     checkNotifier.OnCheckPerformed(new CheckEventArgs(
                         ErrorCodes.AttemptToReleaseUnfinishedExtractionProgress,
-                        selectedDataSet,progress.ProgressDate,progress.EndDate));
-                }
-            }
+                        selectedDataSet, progress.ProgressDate, progress.EndDate));
 
             //if it has never been extracted
             if (extractionResults == null || extractionResults.DestinationDescription == null)
-                toReturn.Add(new NoReleasePotential(RepositoryLocator, selectedDataSet)); //the potential is ZERO to release this dataset
+            {
+                toReturn.Add(new NoReleasePotential(RepositoryLocator,
+                    selectedDataSet)); //the potential is ZERO to release this dataset
+            }
             else
             {
                 //it's been extracted!, who extracted it?
-                var destinationThatExtractedIt = (IExecuteDatasetExtractionDestination)ObjectConstructor.Construct(extractionResults.GetDestinationType());
+                var destinationThatExtractedIt =
+                    (IExecuteDatasetExtractionDestination)ObjectConstructor.Construct(extractionResults
+                        .GetDestinationType());
 
                 //destination tell us how releasable it is
-                var releasePotential = destinationThatExtractedIt.GetReleasePotential(RepositoryLocator, selectedDataSet);
+                var releasePotential =
+                    destinationThatExtractedIt.GetReleasePotential(RepositoryLocator, selectedDataSet);
 
                 //it is THIS much releasability!
                 toReturn.Add(releasePotential);
             }
         }
-            
+
         return toReturn;
     }
 
@@ -221,7 +220,7 @@ private ReleaseUseCase GetReleaseUseCase(ICheckNotifier checkNotifier)
 
         foreach (var configuration in _configurations)
         {
-            data.ConfigurationsForRelease.Add(configuration, GetReleasePotentials(checkNotifier,configuration));
+            data.ConfigurationsForRelease.Add(configuration, GetReleasePotentials(checkNotifier, configuration));
             data.EnvironmentPotentials.Add(configuration, new ReleaseEnvironmentPotential(configuration));
             data.SelectedDatasets.Add(configuration, GetSelectedDataSets(configuration));
         }
@@ -231,13 +230,13 @@ private ReleaseUseCase GetReleaseUseCase(ICheckNotifier checkNotifier)
         var allDdatasets = _configurations.SelectMany(ec => ec.GetAllExtractableDataSets()).ToList();
         var selectedDatasets = data.SelectedDatasets.Values.SelectMany(sd => sd.ToList()).ToList();
 
-        data.ReleaseState = allDdatasets.Count != selectedDatasets.Count 
-            ? ReleaseState.DoingPatch 
+        data.ReleaseState = allDdatasets.Count != selectedDatasets.Count
+            ? ReleaseState.DoingPatch
             : ReleaseState.DoingProperRelease;
 
         try
         {
-            return new ReleaseUseCase(_project, data,RepositoryLocator.CatalogueRepository);
+            return new ReleaseUseCase(_project, data, RepositoryLocator.CatalogueRepository);
         }
         catch (Exception ex)
         {
@@ -249,7 +248,7 @@ private ReleaseUseCase GetReleaseUseCase(ICheckNotifier checkNotifier)
 
     protected override void ExecuteRun(object runnable, OverrideSenderIDataLoadEventListener listener)
     {
-        var useCase = (ReleaseUseCase) runnable;
+        var useCase = (ReleaseUseCase)runnable;
         var engine = useCase.GetEngine(_pipeline, listener);
         engine.ExecutePipeline(Token);
     }
@@ -257,7 +256,8 @@ protected override void ExecuteRun(object runnable, OverrideSenderIDataLoadEvent
     private IEnumerable<ISelectedDataSets> GetSelectedDataSets(IExtractionConfiguration configuration)
     {
         //are we only releasing some of the datasets?
-        var onlySomeDatasets = _selectedDatasets.Where(sds => sds.ExtractionConfiguration_ID == configuration.ID).ToArray();
+        var onlySomeDatasets = _selectedDatasets.Where(sds => sds.ExtractionConfiguration_ID == configuration.ID)
+            .ToArray();
 
         if (onlySomeDatasets.Any())
             return onlySomeDatasets;
@@ -273,17 +273,17 @@ public object GetState(IExtractionConfiguration configuration)
         if (matches.Length == 0)
             return null;
 
-        return ((ReleaseEnvironmentPotential) matches.Single().Key).Assesment;
+        return ((ReleaseEnvironmentPotential)matches.Single().Key).Assesment;
     }
 
     public object GetState(ISelectedDataSets selectedDataSets)
     {
         var matches = GetCheckerResults<ReleasePotential>(rp => rp.SelectedDataSet.ID == selectedDataSets.ID);
-            
+
         if (matches.Length == 0)
             return null;
 
-        var releasePotential = (ReleasePotential) matches.Single().Key;
+        var releasePotential = (ReleasePotential)matches.Single().Key;
         var results = matches.Single().Value;
 
         //not been released ever
@@ -303,15 +303,9 @@ public object GetState(ISelectedDataSets selectedDataSets)
         return results.GetWorst();
     }
 
-    public object GetState(SupportingSQLTable global)
-    {
-        return GetState((IMapsDirectlyToDatabaseTable)global);
-    }
+    public object GetState(SupportingSQLTable global) => GetState((IMapsDirectlyToDatabaseTable)global);
 
-    public object GetState(SupportingDocument global)
-    {
-        return GetState((IMapsDirectlyToDatabaseTable)global);
-    }
+    public object GetState(SupportingDocument global) => GetState((IMapsDirectlyToDatabaseTable)global);
 
     private object GetState(IMapsDirectlyToDatabaseTable global)
     {
@@ -320,7 +314,7 @@ private object GetState(IMapsDirectlyToDatabaseTable global)
         if (matches.Length == 0)
             return null;
 
-        return ((GlobalReleasePotential) matches.Single().Key).Releasability;
+        return ((GlobalReleasePotential)matches.Single().Key).Releasability;
     }
 
     public CheckResult? GetGlobalReleaseState()
diff --git a/Rdmp.Core/CommandLine/Runners/Runner.cs b/Rdmp.Core/CommandLine/Runners/Runner.cs
index d464bada2e..715ac7e37c 100644
--- a/Rdmp.Core/CommandLine/Runners/Runner.cs
+++ b/Rdmp.Core/CommandLine/Runners/Runner.cs
@@ -21,9 +21,10 @@ namespace Rdmp.Core.CommandLine.Runners;
 /// <summary>
 /// Abstract base implementation of <see cref="IRunner"/> with convenience methods
 /// </summary>
-public abstract class Runner: IRunner
+public abstract class Runner : IRunner
 {
-    public abstract int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token);
+    public abstract int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token);
 
     /// <summary>
     /// Translates a string <paramref name="arg"/> into an object of type <typeparamref name="T"/>.  String can 
@@ -34,12 +35,10 @@ public abstract class Runner: IRunner
     /// <param name="arg"></param>
     /// <returns></returns>
     /// <exception cref="ArgumentException">Thrown if it is not possible to parse <paramref name="arg"/> into an existing object</exception>
-    protected static T GetObjectFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg) where T : IMapsDirectlyToDatabaseTable
+    protected static T GetObjectFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg)
+        where T : IMapsDirectlyToDatabaseTable
     {
-        if(string.IsNullOrWhiteSpace(arg) || arg.Trim().Equals("0"))
-        {
-            return default;
-        }
+        if (string.IsNullOrWhiteSpace(arg) || arg.Trim().Equals("0")) return default;
 
         if (int.TryParse(arg, out var id))
         {
@@ -49,28 +48,29 @@ protected static T GetObjectFromCommandLineString<T>(IRDMPPlatformRepositoryServ
 
         var picker = new CommandLineObjectPicker(new[] { arg }, new ThrowImmediatelyActivator(locator));
         if (!picker[0].HasValueOfType(typeof(T)))
-            throw new ArgumentException($"Could not translate '{arg}' into a valid object of Type '{typeof(T).Name}'.  The referenced object may not exist or has been renamed.");
+            throw new ArgumentException(
+                $"Could not translate '{arg}' into a valid object of Type '{typeof(T).Name}'.  The referenced object may not exist or has been renamed.");
 
         return (T)picker[0].GetValueForParameterOfType(typeof(T));
     }
 
-    protected static IEnumerable<T> GetObjectsFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator, string arg) where T: IMapsDirectlyToDatabaseTable
+    protected static IEnumerable<T> GetObjectsFromCommandLineString<T>(IRDMPPlatformRepositoryServiceLocator locator,
+        string arg) where T : IMapsDirectlyToDatabaseTable
     {
-        if (string.IsNullOrWhiteSpace(arg) || arg.Trim().Equals("0"))
-        {
-            return Enumerable.Empty<T>();
-        }
+        if (string.IsNullOrWhiteSpace(arg) || arg.Trim().Equals("0")) return Enumerable.Empty<T>();
 
         // if it is IDs only
-        if (Regex.IsMatch(arg,"^[0-9, ]+$"))
+        if (Regex.IsMatch(arg, "^[0-9, ]+$"))
         {
             var repo = locator.GetAllRepositories().FirstOrDefault(r => r.SupportsObjectType(typeof(T)));
-            return repo.GetAllObjectsInIDList<T>(arg.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(int.Parse).ToArray());
+            return repo.GetAllObjectsInIDList<T>(arg.Split(",", StringSplitOptions.RemoveEmptyEntries).Select(int.Parse)
+                .ToArray());
         }
 
         var picker = new CommandLineObjectPicker(new[] { arg }, new ThrowImmediatelyActivator(locator));
         if (!picker[0].HasValueOfType(typeof(T[])))
-            throw new ArgumentException($"Could not translate '{arg}' into a valid objects of Type '{typeof(T).Name}'.  The referenced object may not exist or has been renamed.");
+            throw new ArgumentException(
+                $"Could not translate '{arg}' into a valid objects of Type '{typeof(T).Name}'.  The referenced object may not exist or has been renamed.");
 
         return (T[])picker[0].GetValueForParameterOfType(typeof(T[])) ?? Enumerable.Empty<T>();
     }
diff --git a/Rdmp.Core/CommandLine/Runners/RunnerFactory.cs b/Rdmp.Core/CommandLine/Runners/RunnerFactory.cs
index 2a99001d30..493d394fef 100644
--- a/Rdmp.Core/CommandLine/Runners/RunnerFactory.cs
+++ b/Rdmp.Core/CommandLine/Runners/RunnerFactory.cs
@@ -15,36 +15,35 @@ namespace Rdmp.Core.CommandLine.Runners;
 /// </summary>
 public class RunnerFactory
 {
-    public static IRunner CreateRunner(IBasicActivateItems activator,RDMPCommandLineOptions command)
+    public static IRunner CreateRunner(IBasicActivateItems activator, RDMPCommandLineOptions command)
     {
         if (command.Command == CommandLineActivity.none)
             throw new Exception($"No command has been set on '{command.GetType().Name}'");
-            
+
         if (command is DleOptions dleOpts)
             return new DleRunner(dleOpts);
 
-        if(command is DqeOptions dqeOpts)
+        if (command is DqeOptions dqeOpts)
             return new DqeRunner(dqeOpts);
 
-        if(command is CacheOptions cacheOpts )
+        if (command is CacheOptions cacheOpts)
             return new CacheRunner(cacheOpts);
-            
-        if (command is ExtractionOptions extractionOpts )
-            return new ExtractionRunner(activator,extractionOpts);
 
-        if(command is ReleaseOptions releaseOpts )
+        if (command is ExtractionOptions extractionOpts)
+            return new ExtractionRunner(activator, extractionOpts);
+
+        if (command is ReleaseOptions releaseOpts)
             return new ReleaseRunner(releaseOpts);
 
-        if (command is CohortCreationOptions cohortOpts )
+        if (command is CohortCreationOptions cohortOpts)
             return new CohortCreationRunner(cohortOpts);
 
-        if(command is PackOptions packOpts )
+        if (command is PackOptions packOpts)
             return new PackPluginRunner(packOpts);
-            
-        if(command is ExecuteCommandOptions executeOpts)
+
+        if (command is ExecuteCommandOptions executeOpts)
             return new ExecuteCommandRunner(executeOpts);
-            
+
         throw new Exception($"RDMPCommandLineOptions Type '{command.GetType()}'");
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/ANOEngineering/ColumnInfoANOPlan.cs b/Rdmp.Core/Curation/ANOEngineering/ColumnInfoANOPlan.cs
index e4bc956f4d..f0b208dff7 100644
--- a/Rdmp.Core/Curation/ANOEngineering/ColumnInfoANOPlan.cs
+++ b/Rdmp.Core/Curation/ANOEngineering/ColumnInfoANOPlan.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.Curation.ANOEngineering;
 /// <summary>
 /// Records all ANO descisions made about a single ColumnInfo (e.g. whether to ANO it, Drop it, Dillute it etc)
 /// </summary>
-public class ColumnInfoANOPlan:ICheckable
+public class ColumnInfoANOPlan : ICheckable
 {
     public ColumnInfo ColumnInfo
     {
@@ -44,7 +44,7 @@ public ColumnInfo ColumnInfo
     private ColumnInfo _columnInfo;
     private IQuerySyntaxHelper _querySyntaxHelper;
 
-    public ANOTable ANOTable {get;set;}
+    public ANOTable ANOTable { get; set; }
     public IDilutionOperation Dilution { get; set; }
     public ExtractionCategory? ExtractionCategoryIfAny { get; set; }
 
@@ -85,7 +85,7 @@ public Plan Plan
     /// <summary>
     /// Json deserialization constructor <see cref="PickAnyConstructorJsonConverter"/>
     /// </summary>
-    public ColumnInfoANOPlan(ColumnInfo  columnInfo)
+    public ColumnInfoANOPlan(ColumnInfo columnInfo)
     {
         ColumnInfo = columnInfo;
     }
@@ -95,7 +95,9 @@ public ColumnInfoANOPlan(ColumnInfo  columnInfo)
     /// called chi or ANOchi already existing (probably from another table) then we should suggest using ANOTable ANOchi.
     /// </summary>
     /// <returns></returns>
-    internal void Initialize(ExtractionInformation[] allExtractionInformations, CatalogueItem[] allCatalogueItems, List<JoinInfo> joins, List<Lookup> lookups, ColumnInfo[] allColumnInfosSystemWide,ForwardEngineerANOCataloguePlanManager planManager)
+    internal void Initialize(ExtractionInformation[] allExtractionInformations, CatalogueItem[] allCatalogueItems,
+        List<JoinInfo> joins, List<Lookup> lookups, ColumnInfo[] allColumnInfosSystemWide,
+        ForwardEngineerANOCataloguePlanManager planManager)
     {
         _allExtractionInformations = allExtractionInformations;
         _allCatalogueItems = allCatalogueItems;
@@ -109,14 +111,12 @@ public void SetToRecommendedPlan()
     {
         //get an extraction category based on its current extractability
         ExtractionCategoryIfAny = GetMaxExtractionCategoryIfAny();
-            
+
         if (SpecialFieldNames.IsHicPrefixed(ColumnInfo))
-            Plan = Plan.Drop;//suggest dropping hic_ fields
-        else
-        if (ColumnInfo.IsPrimaryKey || IsInvolvedInLookups() || IsInvolvedInJoins())
+            Plan = Plan.Drop; //suggest dropping hic_ fields
+        else if (ColumnInfo.IsPrimaryKey || IsInvolvedInLookups() || IsInvolvedInJoins())
             Plan = Plan.PassThroughUnchanged; //if it's involved in lookups, joins or is a primary key
-        else
-        if (ExtractionCategoryIfAny == null) //if it isn't extractable
+        else if (ExtractionCategoryIfAny == null) //if it isn't extractable
             Plan = Plan.Drop;
         else
             Plan = Plan.PassThroughUnchanged; //it is extractable but not special
@@ -136,7 +136,8 @@ public void SetToRecommendedPlan()
         foreach (var catalogueItem in _allCatalogueItems.Where(ci => ci.ColumnInfo_ID == ColumnInfo.ID).ToArray())
         {
             //that are extractable
-            var extractionInformation = _allExtractionInformations.SingleOrDefault(ei => ei.CatalogueItem_ID == catalogueItem.ID);
+            var extractionInformation =
+                _allExtractionInformations.SingleOrDefault(ei => ei.CatalogueItem_ID == catalogueItem.ID);
 
             //The ColumnInfo is extractable
             if (extractionInformation != null)
@@ -144,7 +145,9 @@ public void SetToRecommendedPlan()
                 toReturn ??= extractionInformation.ExtractionCategory;
 
                 //there are multiple, if the new one is more restrictive then use the more restrictive category instead
-                toReturn = extractionInformation.ExtractionCategory > toReturn ? extractionInformation.ExtractionCategory : toReturn;
+                toReturn = extractionInformation.ExtractionCategory > toReturn
+                    ? extractionInformation.ExtractionCategory
+                    : toReturn;
             }
         }
 
@@ -154,11 +157,13 @@ public void SetToRecommendedPlan()
     private void MakeANOTableSuggestionIfApplicable()
     {
         //if there is a ColumnInfo with the same name (or that has ANO prefix)
-        var matchingOnName = _allColumnInfosSystemWide.Where(a => a.GetRuntimeName() == ColumnInfo.GetRuntimeName() || a.GetRuntimeName() ==
-            $"ANO{ColumnInfo.GetRuntimeName()}").ToArray();
+        var matchingOnName = _allColumnInfosSystemWide.Where(a => a.GetRuntimeName() == ColumnInfo.GetRuntimeName() ||
+                                                                  a.GetRuntimeName() ==
+                                                                  $"ANO{ColumnInfo.GetRuntimeName()}").ToArray();
 
         //and if the same named ColumnInfo(s) have a shared ANOTable (e.g. ANOCHI)
-        var agreedAnoTableID = matchingOnName.Where(c => c.ANOTable_ID != null).Select(c => c.ANOTable_ID).Distinct().ToArray();
+        var agreedAnoTableID = matchingOnName.Where(c => c.ANOTable_ID != null).Select(c => c.ANOTable_ID).Distinct()
+            .ToArray();
 
         //if there is a single recommended anotable id amongst all columns with matching name featuring ano tables
         if (agreedAnoTableID.Length == 1)
@@ -170,8 +175,10 @@ private void MakeANOTableSuggestionIfApplicable()
 
     public bool IsInvolvedInLookups()
     {
-        return _lookups.Any(l => l.Description_ID == ColumnInfo.ID || l.ForeignKey_ID == ColumnInfo.ID || l.PrimaryKey_ID == l.ID);
+        return _lookups.Any(l =>
+            l.Description_ID == ColumnInfo.ID || l.ForeignKey_ID == ColumnInfo.ID || l.PrimaryKey_ID == l.ID);
     }
+
     private bool IsInvolvedInJoins()
     {
         return _joins.Any(j => j.PrimaryKey_ID == ColumnInfo.ID || j.ForeignKey_ID == ColumnInfo.ID);
@@ -179,53 +186,52 @@ private bool IsInvolvedInJoins()
 
     public void Check(ICheckNotifier notifier)
     {
-        if(IsMandatory && Plan == Plan.Drop)
+        if (IsMandatory && Plan == Plan.Drop)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"ColumnInfo '{ColumnInfo}' is mandatory and cannot be dropped",CheckResult.Fail));
+                $"ColumnInfo '{ColumnInfo}' is mandatory and cannot be dropped", CheckResult.Fail));
 
-        if(Plan == Plan.ANO && ANOTable == null)
-            notifier.OnCheckPerformed(new CheckEventArgs($"No ANOTable has been picked for ColumnInfo '{ColumnInfo}'", CheckResult.Fail));
+        if (Plan == Plan.ANO && ANOTable == null)
+            notifier.OnCheckPerformed(new CheckEventArgs($"No ANOTable has been picked for ColumnInfo '{ColumnInfo}'",
+                CheckResult.Fail));
 
-        if(Plan == Plan.Dilute && Dilution == null)
+        if (Plan == Plan.Dilute && Dilution == null)
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"No Dilution Operation has been picked for ColumnInfo '{ColumnInfo}'", CheckResult.Fail));
-            
+
         if (Plan != Plan.Drop)
-        {
             try
             {
                 var datatype = GetEndpointDataType();
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"Determined endpoint data type '{datatype}' for ColumnInfo '{ColumnInfo}'", CheckResult.Success));
-
             }
             catch (Exception e)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"Could not determine endpoint data type for ColumnInfo '{ColumnInfo}'", CheckResult.Fail, e));
             }
-        }
-            
+
         //don't let user select ExtractionCategory.Any
         if (ExtractionCategoryIfAny == ExtractionCategory.Any)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Extraction Category '{ExtractionCategoryIfAny}' is not valid (on ColumnInfo {ColumnInfo})", CheckResult.Fail));
+                $"Extraction Category '{ExtractionCategoryIfAny}' is not valid (on ColumnInfo {ColumnInfo})",
+                CheckResult.Fail));
 
         //for each column we are not planning on dropping but are planning on making extractable, there must be a CatalogueItem in the source Catalogue
         if (ExtractionCategoryIfAny != null && Plan != Plan.Drop)
             if (_allCatalogueItems.All(ci => ci.ColumnInfo_ID != ColumnInfo.ID))
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"There are no CatalogueItems configured for ColumnInfo '{ColumnInfo}' but its PlannedExtractionCategory is '{ExtractionCategoryIfAny}'", CheckResult.Fail));
+                        $"There are no CatalogueItems configured for ColumnInfo '{ColumnInfo}' but its PlannedExtractionCategory is '{ExtractionCategoryIfAny}'",
+                        CheckResult.Fail));
 
         //Will there be conflicts on name?
         if (_planManager.TargetDatabase != null && Plan != Plan.Drop)
-        {
             //don't let them extract to the same database
-            if(_planManager.TargetDatabase.GetRuntimeName() == ColumnInfo.TableInfo.Database)
+            if (_planManager.TargetDatabase.GetRuntimeName() == ColumnInfo.TableInfo.Database)
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"ColumnInfo {ColumnInfo} is already in {_planManager.TargetDatabase.GetRuntimeName()} you cannot create an ANO version in the same database",CheckResult.Fail));
-        }
+                    $"ColumnInfo {ColumnInfo} is already in {_planManager.TargetDatabase.GetRuntimeName()} you cannot create an ANO version in the same database",
+                    CheckResult.Fail));
     }
 
     public string GetEndpointDataType()
@@ -234,7 +240,9 @@ public string GetEndpointDataType()
 
         //if we have picked a destination
         ITypeTranslater destinationTypeTranslater;
-        destinationTypeTranslater = _planManager.TargetDatabase != null ? _planManager.TargetDatabase.Server.GetQuerySyntaxHelper().TypeTranslater : //ensure we handle type translation between the two platforms
+        destinationTypeTranslater = _planManager.TargetDatabase != null
+            ? _planManager.TargetDatabase.Server.GetQuerySyntaxHelper().TypeTranslater
+            : //ensure we handle type translation between the two platforms
             sourceTypeTranslater; //otherwise (we haven't picked a destination yet)
 
         return Plan switch
diff --git a/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCatalogueEngine.cs b/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCatalogueEngine.cs
index e5e75bb859..987418d11f 100644
--- a/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCatalogueEngine.cs
+++ b/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCatalogueEngine.cs
@@ -37,13 +37,14 @@ public class ForwardEngineerANOCatalogueEngine
     public LoadProgress LoadProgressIfAny { get; set; }
 
     public Dictionary<ITableInfo, QueryBuilder> SelectSQLForMigrations = new();
-    public Dictionary<PreLoadDiscardedColumn,IDilutionOperation> DilutionOperationsForMigrations = new();
+    public Dictionary<PreLoadDiscardedColumn, IDilutionOperation> DilutionOperationsForMigrations = new();
 
     private ShareManager _shareManager;
 
     private ColumnInfo[] _allColumnsInfos;
 
-    public ForwardEngineerANOCatalogueEngine(IRDMPPlatformRepositoryServiceLocator repositoryLocator,ForwardEngineerANOCataloguePlanManager planManager)
+    public ForwardEngineerANOCatalogueEngine(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ForwardEngineerANOCataloguePlanManager planManager)
     {
         _catalogueRepository = repositoryLocator.CatalogueRepository;
         _shareManager = new ShareManager(repositoryLocator);
@@ -53,8 +54,7 @@ public ForwardEngineerANOCatalogueEngine(IRDMPPlatformRepositoryServiceLocator r
 
     public void Execute()
     {
-
-        if(_planManager.TargetDatabase == null)
+        if (_planManager.TargetDatabase == null)
             throw new Exception("PlanManager has no TargetDatabase set");
 
         var memoryRepo = new MemoryCatalogueRepository();
@@ -65,11 +65,9 @@ public void Execute()
             {
                 //for each skipped table
                 foreach (var skippedTable in _planManager.SkippedTables)
-                {
                     //we might have to refactor or port JoinInfos to these tables so we should establish what the parenthood of them was
-                    foreach (var columnInfo in skippedTable.ColumnInfos)
-                        GetNewColumnInfoForOld(columnInfo,true);
-                }
+                foreach (var columnInfo in skippedTable.ColumnInfos)
+                    GetNewColumnInfoForOld(columnInfo, true);
 
                 //for each table that isn't being skipped
                 foreach (var oldTableInfo in _planManager.TableInfos.Except(_planManager.SkippedTables))
@@ -88,7 +86,7 @@ public void Execute()
                         if (columnPlan.Plan != Plan.Drop)
                         {
                             //add the column verbatim to the query builder because we know we have to read it from source
-                            querybuilderForMigratingTable.AddColumn(new ColumnInfoToIColumn(memoryRepo,columnInfo));
+                            querybuilderForMigratingTable.AddColumn(new ColumnInfoToIColumn(memoryRepo, columnInfo));
 
                             var colName = columnInfo.GetRuntimeName();
 
@@ -98,14 +96,17 @@ public void Execute()
 
                             migratedColumns.Add(colName, columnInfo);
 
-                            columnsToCreate.Add(new DatabaseColumnRequest(colName, columnPlan.GetEndpointDataType(), !columnInfo.IsPrimaryKey){IsPrimaryKey = columnInfo.IsPrimaryKey});
+                            columnsToCreate.Add(
+                                new DatabaseColumnRequest(colName, columnPlan.GetEndpointDataType(),
+                                    !columnInfo.IsPrimaryKey) { IsPrimaryKey = columnInfo.IsPrimaryKey });
                         }
                     }
 
                     SelectSQLForMigrations.Add(oldTableInfo, querybuilderForMigratingTable);
 
                     //Create the actual table
-                    var tbl = _planManager.TargetDatabase.CreateTable(oldTableInfo.GetRuntimeName(), columnsToCreate.ToArray());
+                    var tbl = _planManager.TargetDatabase.CreateTable(oldTableInfo.GetRuntimeName(),
+                        columnsToCreate.ToArray());
 
                     //import the created table
                     var importer = new TableInfoImporter(_catalogueRepository, tbl);
@@ -118,7 +119,7 @@ public void Execute()
                     {
                         var oldColumnInfo = migratedColumns[newColumnInfo.GetRuntimeName()];
 
-                        var columnPlan =_planManager.GetPlanForColumnInfo(oldColumnInfo);
+                        var columnPlan = _planManager.GetPlanForColumnInfo(oldColumnInfo);
 
                         if (columnPlan.Plan == Plan.ANO)
                         {
@@ -130,12 +131,13 @@ public void Execute()
                         if (columnPlan.Plan == Plan.Dilute)
                         {
                             //Create a discarded (load only) column with name matching the new columninfo
-                            var discard = new PreLoadDiscardedColumn(_catalogueRepository, newTableInfo,newColumnInfo.GetRuntimeName())
-                                {
-                                    //record that it exists to support dilution and that the data type matches the input (old) ColumnInfo (i.e. not the new data type!)
-                                    Destination = DiscardedColumnDestination.Dilute,
-                                    SqlDataType = oldColumnInfo.Data_type
-                                };
+                            var discard = new PreLoadDiscardedColumn(_catalogueRepository, newTableInfo,
+                                newColumnInfo.GetRuntimeName())
+                            {
+                                //record that it exists to support dilution and that the data type matches the input (old) ColumnInfo (i.e. not the new data type!)
+                                Destination = DiscardedColumnDestination.Dilute,
+                                SqlDataType = oldColumnInfo.Data_type
+                            };
 
                             discard.SaveToDatabase();
 
@@ -165,7 +167,7 @@ public void Execute()
                     var oldColumnInfo = oldCatalogueItem.ColumnInfo;
 
                     //catalogue item is not connected to any ColumnInfo
-                    if(oldColumnInfo == null)
+                    if (oldColumnInfo == null)
                         continue;
 
                     var columnPlan = _planManager.GetPlanForColumnInfo(oldColumnInfo);
@@ -182,7 +184,9 @@ public void Execute()
                     newCatalogueItem.ColumnInfo_ID = newColumnInfo.ID;
 
                     //If the old CatalogueItem had the same name as its underlying ColumnInfo then we should use the new one otherwise just copy the old name whatever it was
-                    newCatalogueItem.Name = oldCatalogueItem.Name.Equals(oldColumnInfo.Name) ? newColumnInfo.GetRuntimeName() : oldCatalogueItem.Name;
+                    newCatalogueItem.Name = oldCatalogueItem.Name.Equals(oldColumnInfo.Name)
+                        ? newColumnInfo.GetRuntimeName()
+                        : oldCatalogueItem.Name;
 
                     //add ANO to the front if the underlying column was annoed
                     if (newColumnInfo.GetRuntimeName().StartsWith("ANO") && !newCatalogueItem.Name.StartsWith("ANO"))
@@ -196,10 +200,11 @@ public void Execute()
                     if (columnPlan.ExtractionCategoryIfAny != null)
                     {
                         //Create a new ExtractionInformation for the new Catalogue
-                        var newExtractionInformation = new ExtractionInformation(_catalogueRepository, newCatalogueItem, newColumnInfo, newColumnInfo.Name)
-                            {
-                                ExtractionCategory = columnPlan.ExtractionCategoryIfAny.Value
-                            };
+                        var newExtractionInformation = new ExtractionInformation(_catalogueRepository, newCatalogueItem,
+                            newColumnInfo, newColumnInfo.Name)
+                        {
+                            ExtractionCategory = columnPlan.ExtractionCategoryIfAny.Value
+                        };
 
                         newExtractionInformation.SaveToDatabase();
 
@@ -212,23 +217,26 @@ public void Execute()
                             newExtractionInformation.SelectSQL = oldExtractionInformation.SelectSQL;
 
                             //do a refactor on the old column name for the new column name
-                            SelectSQLRefactorer.RefactorColumnName(newExtractionInformation,oldColumnInfo,newColumnInfo.Name,true);
+                            SelectSQLRefactorer.RefactorColumnName(newExtractionInformation, oldColumnInfo,
+                                newColumnInfo.Name, true);
 
                             //also refactor any other column names that might be referenced by the transform SQL e.g. it could be a combo column name where forename + surname is the value of the ExtractionInformation
-                            foreach (var kvpOtherCols in _parenthoodDictionary.Where(kvp=>kvp.Key is ColumnInfo))
+                            foreach (var kvpOtherCols in _parenthoodDictionary.Where(kvp => kvp.Key is ColumnInfo))
                             {
                                 //if it's one we have already done, don't do it again
-                                if(Equals(kvpOtherCols.Value, newColumnInfo))
+                                if (Equals(kvpOtherCols.Value, newColumnInfo))
                                     continue;
 
                                 //otherwise do a non strict refactoring (don't worry if you don't finda ny references)
-                                SelectSQLRefactorer.RefactorColumnName(newExtractionInformation,(ColumnInfo)kvpOtherCols.Key,((ColumnInfo)kvpOtherCols.Value).Name,false);
+                                SelectSQLRefactorer.RefactorColumnName(newExtractionInformation,
+                                    (ColumnInfo)kvpOtherCols.Key, ((ColumnInfo)kvpOtherCols.Value).Name, false);
                             }
 
                             //make the new one exactly as extractable
                             newExtractionInformation.Order = oldExtractionInformation.Order;
                             newExtractionInformation.Alias = oldExtractionInformation.Alias;
-                            newExtractionInformation.IsExtractionIdentifier = oldExtractionInformation.IsExtractionIdentifier;
+                            newExtractionInformation.IsExtractionIdentifier =
+                                oldExtractionInformation.IsExtractionIdentifier;
                             newExtractionInformation.HashOnDataRelease = oldExtractionInformation.HashOnDataRelease;
                             newExtractionInformation.IsPrimaryKey = oldExtractionInformation.IsPrimaryKey;
                             newExtractionInformation.SaveToDatabase();
@@ -253,7 +261,8 @@ public void Execute()
 
                     //already exists
                     if (!existingJoinInfos.Any(ej => ej.ForeignKey_ID == newFk.ID && ej.PrimaryKey_ID == newPk.ID))
-                        new JoinInfo(_catalogueRepository, newFk, newPk, joinInfo.ExtractionJoinType,joinInfo.Collation); //create it
+                        new JoinInfo(_catalogueRepository, newFk, newPk, joinInfo.ExtractionJoinType,
+                            joinInfo.Collation); //create it
                 }
 
                 //migrate Lookups
@@ -265,7 +274,11 @@ public void Execute()
                     var newPk = GetNewColumnInfoForOld(lookup.PrimaryKey);
 
                     //see if we already have a Lookup declared for the NEW columns (unlikely)
-                    var newLookup = existingLookups.SingleOrDefault(l => l.Description_ID == newDesc.ID && l.ForeignKey_ID == newFk.ID) ?? new Lookup(_catalogueRepository, newDesc, newFk, newPk, lookup.ExtractionJoinType,lookup.Collation);
+                    var newLookup =
+                        existingLookups.SingleOrDefault(l =>
+                            l.Description_ID == newDesc.ID && l.ForeignKey_ID == newFk.ID) ??
+                        new Lookup(_catalogueRepository, newDesc, newFk, newPk, lookup.ExtractionJoinType,
+                            lookup.Collation);
 
                     //also mirror any composite (secondary, tertiary join column pairs needed for the Lookup to operate correclty e.g. where TestCode 'HAB1' means 2 different things depending on healthboard)
                     foreach (var compositeJoin in lookup.GetSupplementalJoins().Cast<LookupCompositeJoinInfo>())
@@ -273,8 +286,10 @@ public void Execute()
                         var newCompositeFk = GetNewColumnInfoForOld(compositeJoin.ForeignKey);
                         var newCompositePk = GetNewColumnInfoForOld(compositeJoin.PrimaryKey);
 
-                        if (!existingLookupComposites.Any(c => c.ForeignKey_ID == newCompositeFk.ID && c.PrimaryKey_ID == newCompositePk.ID))
-                            new LookupCompositeJoinInfo(_catalogueRepository, newLookup, newCompositeFk,newCompositePk, compositeJoin.Collation);
+                        if (!existingLookupComposites.Any(c =>
+                                c.ForeignKey_ID == newCompositeFk.ID && c.PrimaryKey_ID == newCompositePk.ID))
+                            new LookupCompositeJoinInfo(_catalogueRepository, newLookup, newCompositeFk, newCompositePk,
+                                compositeJoin.Collation);
                     }
                 }
 
@@ -294,15 +309,18 @@ public void Execute()
                     LoadProgressIfAny.SaveToDatabase();
 
                     //date column based migration only works for single TableInfo migrations (see Plan Manager checks)
-                    var qb = SelectSQLForMigrations.Single(kvp=>!kvp.Key.IsLookupTable()).Value;
-                    qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepo,null,
+                    var qb = SelectSQLForMigrations.Single(kvp => !kvp.Key.IsLookupTable()).Value;
+                    qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepo, null,
                         new[]
                         {
-                            new SpontaneouslyInventedFilter(memoryRepo,null, $"{_planManager.DateColumn} >= @startDate","After batch start date","",null),
-                            new SpontaneouslyInventedFilter(memoryRepo,null, $"{_planManager.DateColumn} <= @endDate","Before batch end date","",null)
+                            new SpontaneouslyInventedFilter(memoryRepo, null,
+                                $"{_planManager.DateColumn} >= @startDate", "After batch start date", "", null),
+                            new SpontaneouslyInventedFilter(memoryRepo, null, $"{_planManager.DateColumn} <= @endDate",
+                                "Before batch end date", "", null)
                         }
-                        ,FilterContainerOperation.AND);
+                        , FilterContainerOperation.AND);
                 }
+
                 try
                 {
                     foreach (var qb in SelectSQLForMigrations.Values)
@@ -310,7 +328,7 @@ public void Execute()
                 }
                 catch (Exception e)
                 {
-                    throw new Exception("Failed to generate migration SQL",e);
+                    throw new Exception("Failed to generate migration SQL", e);
                 }
 
                 _catalogueRepository.EndTransaction(true);
@@ -318,7 +336,7 @@ public void Execute()
             catch (Exception ex)
             {
                 _catalogueRepository.EndTransaction(false);
-                throw new Exception("Failed to create ANO version, transaction rolled back succesfully",ex);
+                throw new Exception("Failed to create ANO version, transaction rolled back succesfully", ex);
             }
         }
     }
@@ -340,7 +358,8 @@ private ColumnInfo GetNewColumnInfoForOld(ColumnInfo col, bool isOptional = fals
         //find a reference to the new ColumnInfo Location (note that it is possible the TableInfo was skipped, in which case we should still expect to find ColumnInfos that reference the new location because you must have created it somehow right?)
         var syntaxHelper = _planManager.TargetDatabase.Server.GetQuerySyntaxHelper();
 
-        var toReturn = FindNewColumnNamed(syntaxHelper,col,col.GetRuntimeName(),isOptional) ?? FindNewColumnNamed(syntaxHelper,col, $"ANO{col.GetRuntimeName()}",isOptional);
+        var toReturn = FindNewColumnNamed(syntaxHelper, col, col.GetRuntimeName(), isOptional) ??
+                       FindNewColumnNamed(syntaxHelper, col, $"ANO{col.GetRuntimeName()}", isOptional);
         if (toReturn == null)
             if (isOptional)
                 return null;
@@ -348,7 +367,7 @@ private ColumnInfo GetNewColumnInfoForOld(ColumnInfo col, bool isOptional = fals
                 throw new Exception(
                     $"Catalogue '{_planManager.Catalogue}' contained a CatalogueItem referencing Column '{col}' the ColumnInfo was not migrated (which is fine) but we then could not find ColumnInfo in the new ANO dataset (if it was part of SkippedTables why doesn't the Catalogue have a reference to the new location?)");
 
-        _parenthoodDictionary.Add(col,toReturn);
+        _parenthoodDictionary.Add(col, toReturn);
 
         return toReturn;
     }
@@ -363,40 +382,41 @@ private ColumnInfo GetNewColumnInfoForOld(ColumnInfo col, bool isOptional = fals
     /// <param name="expectedName"></param>
     /// <param name="isOptional"></param>
     /// <returns></returns>
-    private ColumnInfo FindNewColumnNamed(IQuerySyntaxHelper syntaxHelper, ColumnInfo col, string expectedName, bool isOptional)
+    private ColumnInfo FindNewColumnNamed(IQuerySyntaxHelper syntaxHelper, ColumnInfo col, string expectedName,
+        bool isOptional)
     {
         var expectedNewNames = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase)
         {
             //look for it in the default schema ".." or the API default server ".dbo." or the original table schema.
             syntaxHelper.EnsureFullyQualified(
-            _planManager.TargetDatabase.GetRuntimeName(),
-            null,
-            col.TableInfo.GetRuntimeName(),
-            expectedName),
+                _planManager.TargetDatabase.GetRuntimeName(),
+                null,
+                col.TableInfo.GetRuntimeName(),
+                expectedName),
 
             syntaxHelper.EnsureFullyQualified(
-            _planManager.TargetDatabase.GetRuntimeName(),
-            syntaxHelper.GetDefaultSchemaIfAny(),
-            col.TableInfo.GetRuntimeName(),
-            expectedName),
+                _planManager.TargetDatabase.GetRuntimeName(),
+                syntaxHelper.GetDefaultSchemaIfAny(),
+                col.TableInfo.GetRuntimeName(),
+                expectedName),
 
             syntaxHelper.EnsureFullyQualified(
-            _planManager.TargetDatabase.GetRuntimeName(),
-            col.TableInfo.Schema,
-            col.TableInfo.GetRuntimeName(),
-            expectedName)
+                _planManager.TargetDatabase.GetRuntimeName(),
+                col.TableInfo.Schema,
+                col.TableInfo.GetRuntimeName(),
+                expectedName)
         };
 
 
-        var columns = _allColumnsInfos.Where(c=>expectedNewNames.Contains(c.Name)).ToArray();
+        var columns = _allColumnsInfos.Where(c => expectedNewNames.Contains(c.Name)).ToArray();
 
         var failedANOToo = false;
 
         //maybe it was anonymised in the other configuration?
-        if (columns.Length == 0 && !expectedName.StartsWith("ANO",StringComparison.CurrentCultureIgnoreCase))
+        if (columns.Length == 0 && !expectedName.StartsWith("ANO", StringComparison.CurrentCultureIgnoreCase))
             try
             {
-                return FindNewColumnNamed(syntaxHelper,col, $"ANO{expectedName}", isOptional);
+                return FindNewColumnNamed(syntaxHelper, col, $"ANO{expectedName}", isOptional);
             }
             catch (Exception)
             {
@@ -407,12 +427,14 @@ private ColumnInfo FindNewColumnNamed(IQuerySyntaxHelper syntaxHelper, ColumnInf
         if (columns.Length == 1)
             return columns[0];
 
-        var columnsFromCorrectServer = columns.Where(c => c.TableInfo.Server.Equals(_planManager.TargetDatabase.Server.Name)).ToArray();
+        var columnsFromCorrectServer =
+            columns.Where(c => c.TableInfo.Server.Equals(_planManager.TargetDatabase.Server.Name)).ToArray();
 
         if (columnsFromCorrectServer.Length == 1)
             return columnsFromCorrectServer[0];
 
-        var columnsFromCorrectServerThatAreaAlsoLocalImports = columnsFromCorrectServer.Where(_shareManager.IsImportedObject).ToArray();
+        var columnsFromCorrectServerThatAreaAlsoLocalImports =
+            columnsFromCorrectServer.Where(_shareManager.IsImportedObject).ToArray();
 
         if (columnsFromCorrectServerThatAreaAlsoLocalImports.Length == 1)
             return columnsFromCorrectServerThatAreaAlsoLocalImports[0];
@@ -424,7 +446,7 @@ private ColumnInfo FindNewColumnNamed(IQuerySyntaxHelper syntaxHelper, ColumnInf
             $"Found '{columns.Length}' ColumnInfos called '{expectedNewNames.First()}'{(failedANOToo ? $" (Or 'ANO{expectedName}')" : "")}");
     }
 
-    private Dictionary<IMapsDirectlyToDatabaseTable,IMapsDirectlyToDatabaseTable> _parenthoodDictionary = new();
+    private Dictionary<IMapsDirectlyToDatabaseTable, IMapsDirectlyToDatabaseTable> _parenthoodDictionary = new();
 
 
     private void AuditParenthood(IMapsDirectlyToDatabaseTable parent, IMapsDirectlyToDatabaseTable child)
@@ -436,6 +458,6 @@ private void AuditParenthood(IMapsDirectlyToDatabaseTable parent, IMapsDirectlyT
         _shareManager.GetImportAs(export.SharingUID, child);
 
         //record in memory dictionary
-        _parenthoodDictionary.Add(parent,child);
+        _parenthoodDictionary.Add(parent, child);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCataloguePlanManager.cs b/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCataloguePlanManager.cs
index ac1daa3c87..66d2e0e25e 100644
--- a/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCataloguePlanManager.cs
+++ b/Rdmp.Core/Curation/ANOEngineering/ForwardEngineerANOCataloguePlanManager.cs
@@ -46,20 +46,17 @@ public ICatalogue Catalogue
     private CatalogueItem[] _allCatalogueItems;
 
     public Dictionary<ColumnInfo, ColumnInfoANOPlan> Plans = new();
-        
-    [JsonIgnore]
-    public List<IDilutionOperation>  DilutionOperations { get; private set; }
+
+    [JsonIgnore] public List<IDilutionOperation> DilutionOperations { get; private set; }
 
     public ITableInfo[] TableInfos { get; private set; }
 
-    [JsonIgnore]
-    public DiscoveredDatabase TargetDatabase { get; set; }
+    [JsonIgnore] public DiscoveredDatabase TargetDatabase { get; set; }
 
     public ColumnInfo DateColumn { get; set; }
     public DateTime? StartDate { get; set; }
 
-    [JsonIgnore]
-    public HashSet<ITableInfo> SkippedTables = new();
+    [JsonIgnore] public HashSet<ITableInfo> SkippedTables = new();
     private ICatalogue _catalogue;
 
     /// <summary>
@@ -69,7 +66,7 @@ public ICatalogue Catalogue
     public ForwardEngineerANOCataloguePlanManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         _shareManager = new ShareManager(repositoryLocator);
-            
+
         DilutionOperations = new List<IDilutionOperation>();
 
         var constructor = new ObjectConstructor();
@@ -78,7 +75,8 @@ public ForwardEngineerANOCataloguePlanManager(IRDMPPlatformRepositoryServiceLoca
             DilutionOperations.Add((IDilutionOperation)ObjectConstructor.Construct(operationType));
     }
 
-    public ForwardEngineerANOCataloguePlanManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICatalogue catalogue): this(repositoryLocator)
+    public ForwardEngineerANOCataloguePlanManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICatalogue catalogue) : this(repositoryLocator)
     {
         Catalogue = catalogue;
 
@@ -88,30 +86,29 @@ public ForwardEngineerANOCataloguePlanManager(IRDMPPlatformRepositoryServiceLoca
 
     public ColumnInfoANOPlan GetPlanForColumnInfo(ColumnInfo col)
     {
-        if(!Plans.ContainsKey(col))
+        if (!Plans.ContainsKey(col))
             throw new Exception($"No plan found for column {col}");
 
         return Plans[col];
     }
 
-    public IExternalDatabaseServer GetIdentifierDumpServer()
-    {
-        return Catalogue.CatalogueRepository.GetDefaultFor(PermissableDefaults.IdentifierDumpServer_ID);
-    }
+    public IExternalDatabaseServer GetIdentifierDumpServer() =>
+        Catalogue.CatalogueRepository.GetDefaultFor(PermissableDefaults.IdentifierDumpServer_ID);
+
 
-        
     public void Check(ICheckNotifier notifier)
     {
         if (TargetDatabase == null)
             notifier.OnCheckPerformed(new CheckEventArgs("No TargetDatabase has been set", CheckResult.Fail));
-        else
-        if (!TargetDatabase.Exists())
-            notifier.OnCheckPerformed(new CheckEventArgs($"TargetDatabase '{TargetDatabase}' does not exist", CheckResult.Fail));
+        else if (!TargetDatabase.Exists())
+            notifier.OnCheckPerformed(new CheckEventArgs($"TargetDatabase '{TargetDatabase}' does not exist",
+                CheckResult.Fail));
 
         var toMigrateTables = TableInfos.Except(SkippedTables).ToArray();
 
         if (!toMigrateTables.Any())
-            notifier.OnCheckPerformed(new CheckEventArgs("There are no TableInfos selected for anonymisation",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("There are no TableInfos selected for anonymisation",
+                CheckResult.Fail));
 
         try
         {
@@ -120,7 +117,7 @@ public void Check(ICheckNotifier notifier)
 
             foreach (var joinInfo in joinInfos)
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Found required JoinInfo '{joinInfo}' that will have to be migrated",CheckResult.Success));
+                    $"Found required JoinInfo '{joinInfo}' that will have to be migrated", CheckResult.Success));
 
             foreach (var lookup in GetLookupsRequiredCatalogue())
             {
@@ -128,54 +125,58 @@ public void Check(ICheckNotifier notifier)
                     $"Found required Lookup '{lookup}' that will have to be migrated", CheckResult.Success));
 
                 //for each key involved in the lookup
-                foreach (var c in new[] { lookup.ForeignKey ,lookup.PrimaryKey,lookup.Description})
+                foreach (var c in new[] { lookup.ForeignKey, lookup.PrimaryKey, lookup.Description })
                 {
                     //lookup / table has already been migrated 
-                    if(SkippedTables.Any(t=>t.ID == c.TableInfo_ID))
+                    if (SkippedTables.Any(t => t.ID == c.TableInfo_ID))
                         continue;
 
                     //make sure that the plan is sensible
                     if (GetPlanForColumnInfo(c).Plan != Plan.PassThroughUnchanged)
                         notifier.OnCheckPerformed(new CheckEventArgs(
                             $"ColumnInfo '{c}' is part of a Lookup so must PassThroughUnchanged", CheckResult.Fail));
-                            
                 }
             }
         }
         catch (Exception ex)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Failed to generate Catalogue SQL", CheckResult.Fail,ex));
+            notifier.OnCheckPerformed(new CheckEventArgs("Failed to generate Catalogue SQL", CheckResult.Fail, ex));
         }
-            
+
         if (DateColumn != null)
         {
             var dateColumnPlan = GetPlanForColumnInfo(DateColumn);
-            if(dateColumnPlan.Plan != Plan.PassThroughUnchanged)
-                if(notifier.OnCheckPerformed(new CheckEventArgs($"Plan for {DateColumn} must be PassThroughUnchanged",CheckResult.Fail,null,"Set plan to PassThroughUnchanged")))
+            if (dateColumnPlan.Plan != Plan.PassThroughUnchanged)
+                if (notifier.OnCheckPerformed(new CheckEventArgs($"Plan for {DateColumn} must be PassThroughUnchanged",
+                        CheckResult.Fail, null, "Set plan to PassThroughUnchanged")))
                     dateColumnPlan.Plan = Plan.PassThroughUnchanged;
 
             //get a count of the number of non lookup used tables
             var usedTables = TableInfos.Except(SkippedTables).Count(t => !t.IsLookupTable());
-                
+
             if (usedTables > 1)
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"You cannot have a date based migration because you are trying to migrate {usedTables} TableInfos at once", CheckResult.Fail));
-
+                        $"You cannot have a date based migration because you are trying to migrate {usedTables} TableInfos at once",
+                        CheckResult.Fail));
         }
-            
-        if (Plans.Any(p=>p.Value.Plan == Plan.Dilute))
+
+        if (Plans.Any(p => p.Value.Plan == Plan.Dilute))
             if (GetIdentifierDumpServer() == null)
-                notifier.OnCheckPerformed(new CheckEventArgs("No default Identifier Dump server has been configured", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs("No default Identifier Dump server has been configured",
+                    CheckResult.Fail));
 
         var refactorer = new SelectSQLRefactorer();
 
         foreach (var e in _allExtractionInformations)
             if (!SelectSQLRefactorer.IsRefactorable(e))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"ExtractionInformation '{e}' is a not refactorable due to reason:{SelectSQLRefactorer.GetReasonNotRefactorable(e)}", CheckResult.Fail));
-            
-        notifier.OnCheckPerformed(new CheckEventArgs($"Preparing to evaluate {toMigrateTables.Length}' tables ({string.Join(",",toMigrateTables.Select(t=>t.GetFullyQualifiedName()))})", CheckResult.Success));
+                    $"ExtractionInformation '{e}' is a not refactorable due to reason:{SelectSQLRefactorer.GetReasonNotRefactorable(e)}",
+                    CheckResult.Fail));
+
+        notifier.OnCheckPerformed(new CheckEventArgs(
+            $"Preparing to evaluate {toMigrateTables.Length}' tables ({string.Join(",", toMigrateTables.Select(t => t.GetFullyQualifiedName()))})",
+            CheckResult.Success));
 
         foreach (TableInfo tableInfo in toMigrateTables)
         {
@@ -189,8 +190,9 @@ public void Check(ICheckNotifier notifier)
 
             if (!pks.Any())
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"TableInfo '{tableInfo}' does not have any Primary Keys, it cannot be anonymised", CheckResult.Fail));
-                
+                    $"TableInfo '{tableInfo}' does not have any Primary Keys, it cannot be anonymised",
+                    CheckResult.Fail));
+
             if (tableInfo.IsTableValuedFunction)
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"TableInfo '{tableInfo}' is an IsTableValuedFunction so cannot be anonymised", CheckResult.Fail));
@@ -204,7 +206,7 @@ public void Check(ICheckNotifier notifier)
             p.Check(notifier);
     }
 
-    private void EnsureNotAlreadySharedLocally<T>(ICheckNotifier notifier,T m) where T:IMapsDirectlyToDatabaseTable
+    private void EnsureNotAlreadySharedLocally<T>(ICheckNotifier notifier, T m) where T : IMapsDirectlyToDatabaseTable
     {
         if (_shareManager.IsExportedObject(m))
         {
@@ -244,7 +246,6 @@ public void RefreshTableInfos()
 
     private void InitializePlans()
     {
-                        
         _allExtractionInformations = Catalogue.GetAllExtractionInformation(ExtractionCategory.Any);
         _allCatalogueItems = Catalogue.CatalogueItems.Where(ci => ci.ColumnInfo_ID != null).ToArray();
         var allColumnInfosSystemWide = Catalogue.Repository.GetAllObjects<ColumnInfo>();
@@ -252,7 +253,8 @@ private void InitializePlans()
         var lookups = GetLookupsRequiredCatalogue();
 
         foreach (var plan in Plans.Values)
-            plan.Initialize(_allExtractionInformations, _allCatalogueItems, joins, lookups, allColumnInfosSystemWide,this);
+            plan.Initialize(_allExtractionInformations, _allCatalogueItems, joins, lookups, allColumnInfosSystemWide,
+                this);
     }
 
     public List<JoinInfo> GetJoinInfosRequiredCatalogue()
diff --git a/Rdmp.Core/Curation/ANOEngineering/IDilutionOperation.cs b/Rdmp.Core/Curation/ANOEngineering/IDilutionOperation.cs
index 9d9cb931c5..c777725ef0 100644
--- a/Rdmp.Core/Curation/ANOEngineering/IDilutionOperation.cs
+++ b/Rdmp.Core/Curation/ANOEngineering/IDilutionOperation.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.Curation.ANOEngineering;
 /// Describes a way of anonymising a field (ColumnToDilute) by dilution (making data less granular) e.g. rounding dates to the nearest quarter.  Implementation 
 /// must be based on running an SQL query in AdjustStaging.  See Dilution for more information.
 /// </summary>
-public interface IDilutionOperation:ICheckable
+public interface IDilutionOperation : ICheckable
 {
     IPreLoadDiscardedColumn ColumnToDilute { set; }
     string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer);
diff --git a/Rdmp.Core/Curation/Checks/BadAssembliesChecker.cs b/Rdmp.Core/Curation/Checks/BadAssembliesChecker.cs
index 31ebcd5443..de5b484c78 100644
--- a/Rdmp.Core/Curation/Checks/BadAssembliesChecker.cs
+++ b/Rdmp.Core/Curation/Checks/BadAssembliesChecker.cs
@@ -35,7 +35,8 @@ public BadAssembliesChecker(MEF mefPlugins)
     public void Check(ICheckNotifier notifier)
     {
         foreach (var badAssembly in _mefPlugins.ListBadAssemblies())
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not load assembly {badAssembly.Key}", CheckResult.Fail, badAssembly.Value));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not load assembly {badAssembly.Key}", CheckResult.Fail,
+                badAssembly.Value));
 
         foreach (var t in _mefPlugins.GetAllTypes())
         {
diff --git a/Rdmp.Core/Curation/Checks/ClonedFilterChecker.cs b/Rdmp.Core/Curation/Checks/ClonedFilterChecker.cs
index 30ba3acc6b..1ecb331319 100644
--- a/Rdmp.Core/Curation/Checks/ClonedFilterChecker.cs
+++ b/Rdmp.Core/Curation/Checks/ClonedFilterChecker.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.Curation.Checks;
 /// Checks whether a given IFilter which was known to be cloned is still identical to its parent ExtractionFilter.  Also confirms that its parent still exists.
 /// It is legal to modify an IFilter after cloning into a subfilter (e.g. AggregateFilter) therefore this class only provides Warning level events
 /// </summary>
-public class ClonedFilterChecker:ICheckable
+public class ClonedFilterChecker : ICheckable
 {
     private readonly IFilter _child;
     private int? _allegedParent;
@@ -27,7 +27,8 @@ public class ClonedFilterChecker:ICheckable
     /// <param name="child"></param>
     /// <param name="allegedParentExtractionFilterID">ExtractionFilter from which the IFilter was derrived</param>
     /// <param name="catalogueDatabaseRepository"></param>
-    public ClonedFilterChecker(IFilter child, int? allegedParentExtractionFilterID, IRepository catalogueDatabaseRepository)
+    public ClonedFilterChecker(IFilter child, int? allegedParentExtractionFilterID,
+        IRepository catalogueDatabaseRepository)
     {
         _child = child;
         _allegedParent = allegedParentExtractionFilterID;
@@ -43,7 +44,6 @@ public void Check(ICheckNotifier notifier)
     {
         if (_allegedParent == null)
         {
-
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     $"Filter {_child} is not cloned from a Catalogue filter so does not need checking for synchronicity",
@@ -58,13 +58,14 @@ public void Check(ICheckNotifier notifier)
         //tell them if it has been nuked
         notifier.OnCheckPerformed(
             new CheckEventArgs(
-                $"Catalogue reports that the original filter we were cloned from {(exist ? " still exists " : " no longer exists")}", exist ? CheckResult.Success : CheckResult.Warning));
+                $"Catalogue reports that the original filter we were cloned from {(exist ? " still exists " : " no longer exists")}",
+                exist ? CheckResult.Success : CheckResult.Warning));
 
         //it hasn't been nuked
         if (exist)
         {
             //get it
-            var parent = _catalogueDatabaseRepository.GetObjectByID<ExtractionFilter>((int) _allegedParent);
+            var parent = _catalogueDatabaseRepository.GetObjectByID<ExtractionFilter>((int)_allegedParent);
 
             if (string.IsNullOrWhiteSpace(parent.WhereSQL) || string.IsNullOrWhiteSpace(_child.WhereSQL))
                 return;
@@ -75,19 +76,18 @@ public void Check(ICheckNotifier notifier)
                     $"Filter {_child} has the same WhereSQL as parent",
                     CheckResult.Success));
             else
-            {
                 try
                 {
-                    throw new ExpectedIdenticalStringsException("Expected WHERE SQL to be identical", parent.WhereSQL,_child.WhereSQL);
+                    throw new ExpectedIdenticalStringsException("Expected WHERE SQL to be identical", parent.WhereSQL,
+                        _child.WhereSQL);
                 }
                 catch (ExpectedIdenticalStringsException ex)
-                { 
+                {
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
                             $"{_child.GetType().Name} called '{_child}' (ID={_child.ID}) WhereSQL does not match the parent it was originally cloned from (ExtractionFilter ID={_allegedParent}).  You might have made a deliberate change in your copy or it might mean that someone has corrected the parent since you first cloned it",
                             CheckResult.Warning, ex));
                 }
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Checks/MEFChecker.cs b/Rdmp.Core/Curation/Checks/MEFChecker.cs
index ae52e635f6..527ace542c 100644
--- a/Rdmp.Core/Curation/Checks/MEFChecker.cs
+++ b/Rdmp.Core/Curation/Checks/MEFChecker.cs
@@ -33,7 +33,7 @@ public class MEFChecker : ICheckable
     /// <param name="mefPlugins"></param>
     /// <param name="classToFind"></param>
     /// <param name="userAcceptedSubstitution"></param>
-    public MEFChecker(MEF mefPlugins,string classToFind, Action<string> userAcceptedSubstitution)
+    public MEFChecker(MEF mefPlugins, string classToFind, Action<string> userAcceptedSubstitution)
     {
         _mefPlugins = mefPlugins;
         _classToFind = classToFind;
@@ -61,9 +61,11 @@ public void Check(ICheckNotifier notifier)
         var allTypes = _mefPlugins.GetAllTypes().ToArray();
 
         if (allTypes.Any(t => t.FullName.Equals(_classToFind)))
+        {
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"Found MEF class {_classToFind}",
                 CheckResult.Success, null));
+        }
         else
         {
             var substitute = allTypes.Where(t => t.Name.Equals(typeNameOnly)).ToArray();
@@ -76,20 +78,20 @@ public void Check(ICheckNotifier notifier)
                         $"Could not find MEF class called {_classToFind} in LoadModuleAssembly.GetAllTypes() and couldn't even find any with the same basic name (Note that we only checked Exported MEF types e.g. classes implementing IPluginAttacher, IPluginDataProvider etc)",
                         CheckResult.Fail, null));
 
-                        var badAssemblies = _mefPlugins.ListBadAssemblies();
+                    var badAssemblies = _mefPlugins.ListBadAssemblies();
 
                     if (badAssemblies.Any())
                         notifier.OnCheckPerformed(new CheckEventArgs(
                             "It is possible that the class you are looking for is in the BadAssemblies list",
                             CheckResult.Fail, null));
-                    foreach ((var assembly, var exception) in badAssemblies)
+                    foreach (var (assembly, exception) in badAssemblies)
                         notifier.OnCheckPerformed(new CheckEventArgs($"Bad Assembly {assembly}", CheckResult.Warning,
                             exception));
                     break;
                 }
                 case 1:
                 {
-                        var acceptSubstitution = notifier.OnCheckPerformed(new CheckEventArgs(
+                    var acceptSubstitution = notifier.OnCheckPerformed(new CheckEventArgs(
                         $"Could not find MEF class called {_classToFind} but did find one called {substitute[0].FullName}",
                         CheckResult.Fail, null,
                         $"Change reference to {_classToFind} to point to MEF assembly type {substitute[0].FullName}"));
diff --git a/Rdmp.Core/Curation/Checks/MissingFieldsChecker.cs b/Rdmp.Core/Curation/Checks/MissingFieldsChecker.cs
index 4dc4eab201..c2dfb46262 100644
--- a/Rdmp.Core/Curation/Checks/MissingFieldsChecker.cs
+++ b/Rdmp.Core/Curation/Checks/MissingFieldsChecker.cs
@@ -27,20 +27,20 @@ public MissingFieldsChecker(TableRepository repository)
     {
         _repository = repository;
     }
-        
+
     public void Check(ICheckNotifier notifier)
     {
         var server = _repository.DiscoveredServer;
-        if(!server.Exists())
+        if (!server.Exists())
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Could not reach server",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Could not reach server", CheckResult.Fail));
             return;
         }
 
         var db = server.GetCurrentDatabase();
-        if(!db.Exists())
+        if (!db.Exists())
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not find database {db}",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not find database {db}", CheckResult.Fail));
             return;
         }
 
@@ -58,7 +58,7 @@ public void Check(ICheckNotifier notifier)
     /// <param name="tables"></param>
     private static void CheckEntities(ICheckNotifier notifier, Type type, DiscoveredTable[] tables)
     {
-        if(type.IsInterface)
+        if (type.IsInterface)
             return;
 
         if (type.IsAbstract)
@@ -67,11 +67,11 @@ private static void CheckEntities(ICheckNotifier notifier, Type type, Discovered
         if (typeof(SpontaneousObject).IsAssignableFrom(type))
             return;
 
-        if(type.Name.StartsWith("Spontaneous"))
+        if (type.Name.StartsWith("Spontaneous"))
             return;
 
         //make sure argument was IMaps..
-        if(!typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(type))
+        if (!typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(type))
             throw new ArgumentException($"Type {type.Name} passed into method was not an IMapsDirectlyToDatabaseTable");
 
         //make sure table exists with exact same name as class
@@ -80,10 +80,11 @@ private static void CheckEntities(ICheckNotifier notifier, Type type, Discovered
         if (table == null)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Could not find Table called {type.Name} (which implements IMapsDirectlyToDatabaseTable)",CheckResult.Fail, null));
-            return;   
+                $"Could not find Table called {type.Name} (which implements IMapsDirectlyToDatabaseTable)",
+                CheckResult.Fail, null));
+            return;
         }
-            
+
         notifier.OnCheckPerformed(new CheckEventArgs($"Found Table {type.Name}", CheckResult.Success, null));
 
 
@@ -103,11 +104,12 @@ private static void CheckEntities(ICheckNotifier notifier, Type type, Discovered
         var problems = false;
         foreach (var missingProperty in missingProperties)
         {
-            if(missingProperty.GetRuntimeName().Equals("RowVer"))
+            if (missingProperty.GetRuntimeName().Equals("RowVer"))
                 continue;
 
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Missing property {missingProperty} on class definition {type.FullName}, the underlying table contains this field but the class does not", CheckResult.Fail,
+                $"Missing property {missingProperty} on class definition {type.FullName}, the underlying table contains this field but the class does not",
+                CheckResult.Fail,
                 null));
             problems = true;
         }
@@ -120,8 +122,9 @@ private static void CheckEntities(ICheckNotifier notifier, Type type, Discovered
                 null));
             problems = true;
         }
-            
+
         if (!problems)
-            notifier.OnCheckPerformed(new CheckEventArgs($"All fields present and correct in Type/Table {table}",CheckResult.Success,null));
+            notifier.OnCheckPerformed(new CheckEventArgs($"All fields present and correct in Type/Table {table}",
+                CheckResult.Success, null));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Checks/PipelineChecker.cs b/Rdmp.Core/Curation/Checks/PipelineChecker.cs
index 5a2a1eaf35..a7a198100f 100644
--- a/Rdmp.Core/Curation/Checks/PipelineChecker.cs
+++ b/Rdmp.Core/Curation/Checks/PipelineChecker.cs
@@ -25,7 +25,7 @@ public PipelineChecker(IPipeline pipeline)
     {
         _pipeline = pipeline;
     }
-        
+
     /// <summary>
     /// Checks that all the components defined in the pipeline are found using a MEFChecker.  This will also handle classes changing namespaces by updating
     /// class name reference.
@@ -34,11 +34,15 @@ public PipelineChecker(IPipeline pipeline)
     public void Check(ICheckNotifier notifier)
     {
         var mef = ((ICatalogueRepository)_pipeline.Repository).MEF;
-            
+
         foreach (var component in _pipeline.PipelineComponents)
         {
             var copy = component;
-            var mefChecker = new MEFChecker(mef, component.Class, delegate(string s) { copy.Class = s; copy.SaveToDatabase(); });
+            var mefChecker = new MEFChecker(mef, component.Class, delegate(string s)
+            {
+                copy.Class = s;
+                copy.SaveToDatabase();
+            });
             mefChecker.Check(notifier);
         }
     }
diff --git a/Rdmp.Core/Curation/Data/AggregateTopX.cs b/Rdmp.Core/Curation/Data/AggregateTopX.cs
index eedf786295..2e87646ec6 100644
--- a/Rdmp.Core/Curation/Data/AggregateTopX.cs
+++ b/Rdmp.Core/Curation/Data/AggregateTopX.cs
@@ -38,7 +38,7 @@ public class AggregateTopX : DatabaseEntity, IAggregateTopX
     public int AggregateConfiguration_ID
     {
         get => _aggregateConfigurationID;
-        set => SetField(ref _aggregateConfigurationID , value);
+        set => SetField(ref _aggregateConfigurationID, value);
     }
 
     /// <inheritdoc/>
@@ -63,10 +63,12 @@ public AggregateTopXOrderByDirection OrderByDirection
         get => _orderByDirection;
         set => SetField(ref _orderByDirection, value);
     }
+
     #endregion
 
-        
+
     #region Relationships
+
     /// <inheritdoc cref="OrderByDimensionIfAny_ID"/>
     [NoMappingToDatabase]
     public AggregateDimension OrderByDimensionIfAny
@@ -102,7 +104,8 @@ internal AggregateTopX(ICatalogueRepository repository, DbDataReader r)
         AggregateConfiguration_ID = (int)r["AggregateConfiguration_ID"];
         TopX = (int)r["TopX"];
         OrderByDimensionIfAny_ID = ObjectToNullableInt(r["OrderByDimensionIfAny_ID"]);
-        OrderByDirection = (AggregateTopXOrderByDirection) Enum.Parse(typeof (AggregateTopXOrderByDirection), r["OrderByDirection"].ToString());
+        OrderByDirection = (AggregateTopXOrderByDirection)Enum.Parse(typeof(AggregateTopXOrderByDirection),
+            r["OrderByDirection"].ToString());
     }
 
     /// <summary>
@@ -114,18 +117,14 @@ internal AggregateTopX(ICatalogueRepository repository, DbDataReader r)
     /// <param name="topX"></param>
     public AggregateTopX(ICatalogueRepository repository, AggregateConfiguration forConfiguration, int topX)
     {
-        if(forConfiguration.GetTopXIfAny() != null)
-        {
+        if (forConfiguration.GetTopXIfAny() != null)
             throw new Exception($"AggregateConfiguration {forConfiguration} already has a TopX");
-        }
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"AggregateConfiguration_ID", forConfiguration.ID},
-            {"TopX", topX},
-            { nameof(OrderByDirection) , AggregateTopXOrderByDirection.Descending}
+            { "AggregateConfiguration_ID", forConfiguration.ID },
+            { "TopX", topX },
+            { nameof(OrderByDirection), AggregateTopXOrderByDirection.Descending }
         });
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateConfiguration.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateConfiguration.cs
index b826da4b90..c561efae3d 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateConfiguration.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateConfiguration.cs
@@ -43,13 +43,15 @@ namespace Rdmp.Core.Curation.Data.Aggregation;
 /// <para>If your Aggregate is part of cohort identification (Identifier List or Patient Index Table) then its name will start with cic_X_ where X is the ID of the cohort identification
 /// configuration.  Depending on the user interface though this might not appear (See ToString implementation).</para>
 /// </summary>
-public class AggregateConfiguration : DatabaseEntity, ICheckable, IOrderable, ICollectSqlParameters, INamed, IHasDependencies, IHasQuerySyntaxHelper,
+public class AggregateConfiguration : DatabaseEntity, ICheckable, IOrderable, ICollectSqlParameters, INamed,
+    IHasDependencies, IHasQuerySyntaxHelper,
     IInjectKnown<JoinableCohortAggregateConfiguration>,
     IInjectKnown<AggregateDimension[]>,
     IInjectKnown<Catalogue>,
-    IDisableable,IKnowWhatIAm,IMightBeReadOnly, IRootFilterContainerHost
+    IDisableable, IKnowWhatIAm, IMightBeReadOnly, IRootFilterContainerHost
 {
     #region Database Properties
+
     private string _countSQL;
     private int _catalogueID;
     private string _name;
@@ -67,7 +69,7 @@ public class AggregateConfiguration : DatabaseEntity, ICheckable, IOrderable, IC
     public string CountSQL
     {
         get => _countSQL;
-        set => SetField(ref  _countSQL, value);
+        set => SetField(ref _countSQL, value);
     }
 
     /// <summary>
@@ -77,7 +79,7 @@ public string CountSQL
     public int Catalogue_ID
     {
         get => _catalogueID;
-        set => SetField(ref  _catalogueID, value);
+        set => SetField(ref _catalogueID, value);
     }
 
     /// <summary>
@@ -87,7 +89,7 @@ public int Catalogue_ID
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -96,7 +98,7 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -105,7 +107,7 @@ public string Description
     public DateTime dtCreated
     {
         get => _dtCreated;
-        set => SetField(ref  _dtCreated, value);
+        set => SetField(ref _dtCreated, value);
     }
 
     /// <summary>
@@ -117,7 +119,7 @@ public DateTime dtCreated
     public int? PivotOnDimensionID
     {
         get => _pivotOnDimensionID;
-        set => SetField(ref  _pivotOnDimensionID, value);
+        set => SetField(ref _pivotOnDimensionID, value);
     }
 
     /// <summary>
@@ -127,7 +129,7 @@ public int? PivotOnDimensionID
     public bool IsExtractable
     {
         get => _isExtractable;
-        set => SetField(ref  _isExtractable, value);
+        set => SetField(ref _isExtractable, value);
     }
 
 
@@ -139,7 +141,7 @@ public bool IsExtractable
     public string HavingSQL
     {
         get => _havingSQL;
-        set => SetField(ref  _havingSQL, value);
+        set => SetField(ref _havingSQL, value);
     }
 
     /// <summary>
@@ -155,7 +157,7 @@ public int? RootFilterContainer_ID
                 throw new NotSupportedException(
                     $"This AggregateConfiguration has a shortcut to another AggregateConfiguration's Filters (its OverrideFiltersByUsingParentAggregateConfigurationInstead_ID is {OverrideFiltersByUsingParentAggregateConfigurationInstead_ID}) which means it cannot be assigned its own RootFilterContainerID");
 
-            SetField(ref _rootFilterContainerID ,value);
+            SetField(ref _rootFilterContainerID, value);
         }
     }
 
@@ -183,6 +185,7 @@ public bool IsDisabled
         get => _isDisabled;
         set => SetField(ref _isDisabled, value);
     }
+
     #endregion
 
     #region Relationships
@@ -203,13 +206,13 @@ public IContainer RootFilterContainer
             //if there is an override
             if (OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
                 return Repository.GetObjectByID<AggregateConfiguration>(
-                    (int) OverrideFiltersByUsingParentAggregateConfigurationInstead_ID).RootFilterContainer;
+                    (int)OverrideFiltersByUsingParentAggregateConfigurationInstead_ID).RootFilterContainer;
             //return the overriding one
 
             //else return the actual root filter container or null if there isn't one
             return RootFilterContainer_ID == null
                 ? null
-                : Repository.GetObjectByID<AggregateFilterContainer>((int) RootFilterContainer_ID);
+                : Repository.GetObjectByID<AggregateFilterContainer>((int)RootFilterContainer_ID);
         }
     }
 
@@ -221,27 +224,17 @@ public IContainer RootFilterContainer
     /// <param name="dt"></param>
     public static void AdjustGraphDataTable(DataTable dt)
     {
-        if(dt.Rows.Count ==0)
-        {
-            return;
-        }
+        if (dt.Rows.Count == 0) return;
 
         if (!UserSettings.IncludeZeroSeriesInGraphs)
-        {
             foreach (var col in dt.Columns.Cast<DataColumn>().ToArray())
-            {
                 if (dt.Rows.Cast<DataRow>().All(r => IsBasicallyZero(r[col.ColumnName])))
-                {
                     dt.Columns.Remove(col);
-                }
-            }
-        }
     }
 
-    private static bool IsBasicallyZero(object v)
-    {
-        return v == null || v == DBNull.Value || string.IsNullOrWhiteSpace(v.ToString()) || string.Equals(v.ToString(), "0");
-    }
+    private static bool IsBasicallyZero(object v) => v == null || v == DBNull.Value ||
+                                                     string.IsNullOrWhiteSpace(v.ToString()) ||
+                                                     string.Equals(v.ToString(), "0");
 
     /// <summary>
     /// Gets all parameters (e.g. @studyStartDate ) associated with this AggregateConfiguration (there might not be any).
@@ -250,10 +243,7 @@ private static bool IsBasicallyZero(object v)
     public IEnumerable<AnyTableSqlParameter> Parameters => CatalogueRepository.GetAllParametersForParentTable(this);
 
     /// <inheritdoc cref="Parameters"/>
-    public ISqlParameter[] GetAllParameters()
-    {
-        return Parameters.ToArray();
-    }
+    public ISqlParameter[] GetAllParameters() => Parameters.ToArray();
 
     /// <summary>
     /// An AggregateConfiguration is a Group By statement.  This will involve using at least one Table in the FROM section of the query.  The descision on which tables
@@ -272,14 +262,16 @@ public ISqlParameter[] GetAllParameters()
     /// for building its join.</para>
     /// </summary>
     [NoMappingToDatabase]
-    public JoinableCohortAggregateConfigurationUse[] PatientIndexJoinablesUsed => Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfigurationUse>(this).ToArray();
+    public JoinableCohortAggregateConfigurationUse[] PatientIndexJoinablesUsed => Repository
+        .GetAllObjectsWithParent<JoinableCohortAggregateConfigurationUse>(this).ToArray();
 
     /// <summary>
     /// Only populated if the AggregateConfiguration is acting as a patient index table.  Returns the <see cref="JoinableCohortAggregateConfiguration"/> object
     /// which makes this a fact.
     /// </summary>
     [NoMappingToDatabase]
-    public JoinableCohortAggregateConfiguration JoinableCohortAggregateConfiguration => _knownJoinableCohortAggregateConfiguration.Value;
+    public JoinableCohortAggregateConfiguration JoinableCohortAggregateConfiguration =>
+        _knownJoinableCohortAggregateConfiguration.Value;
 
     /// <summary>
     /// An AggregateConfiguration is a Group By statement.  This will return all the SELECT columns for the query (including any count(*) / sum(*) etc columns).
@@ -293,7 +285,7 @@ public ISqlParameter[] GetAllParameters()
     public AggregateDimension PivotDimension =>
         PivotOnDimensionID == null
             ? null
-            : Repository.GetObjectByID<AggregateDimension>((int) PivotOnDimensionID);
+            : Repository.GetObjectByID<AggregateDimension>((int)PivotOnDimensionID);
 
     public AggregateConfiguration()
     {
@@ -306,7 +298,7 @@ public AggregateConfiguration()
         _overrideFiltersByUsingParentAggregateConfigurationInsteadID == null
             ? null
             : Repository.GetObjectByID<AggregateConfiguration>(
-                (int) _overrideFiltersByUsingParentAggregateConfigurationInsteadID);
+                (int)_overrideFiltersByUsingParentAggregateConfigurationInsteadID);
 
     #endregion
 
@@ -337,7 +329,7 @@ public int Order
 
         set
         {
-            CatalogueRepository.CohortContainerManager.SetOrder(this,value);
+            CatalogueRepository.CohortContainerManager.SetOrder(this, value);
             _orderWithinKnownContainer = value;
         }
     }
@@ -364,8 +356,8 @@ public AggregateConfiguration(ICatalogueRepository repository, ICatalogue catalo
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"Catalogue_ID", catalogue.ID}
+            { "Name", name },
+            { "Catalogue_ID", catalogue.ID }
         });
 
         ClearAllInjections();
@@ -428,9 +420,12 @@ public void InjectKnown(JoinableCohortAggregateConfiguration instance)
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
-        _knownJoinableCohortAggregateConfiguration = new Lazy<JoinableCohortAggregateConfiguration>(()=>Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this).SingleOrDefault());
-        _knownAggregateDimensions = new Lazy<AggregateDimension[]>(()=>Repository.GetAllObjectsWithParent<AggregateDimension>(this).ToArray());
-        _knownCatalogue = new Lazy<Catalogue>(()=>Repository.GetObjectByID<Catalogue>(Catalogue_ID));
+        _knownJoinableCohortAggregateConfiguration = new Lazy<JoinableCohortAggregateConfiguration>(() =>
+            Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this).SingleOrDefault());
+        _knownAggregateDimensions =
+            new Lazy<AggregateDimension[]>(() =>
+                Repository.GetAllObjectsWithParent<AggregateDimension>(this).ToArray());
+        _knownCatalogue = new Lazy<Catalogue>(() => Repository.GetObjectByID<Catalogue>(Catalogue_ID));
     }
 
     public void InjectKnown(AggregateDimension[] instance)
@@ -448,11 +443,9 @@ public void InjectKnown(Catalogue instance)
     /// then the prefix is removed from the return value.
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
+    public override string ToString() =>
         //strip the cic section from the front
-        return Regex.Replace(Name, $@"{CohortIdentificationConfiguration.CICPrefix}\d+_?", "");
-    }
+        Regex.Replace(Name, $@"{CohortIdentificationConfiguration.CICPrefix}\d+_?", "");
 
     public bool ShouldBeReadOnly(out string reason)
     {
@@ -470,10 +463,7 @@ public bool ShouldBeReadOnly(out string reason)
     /// Gets an IQuerySyntaxHelper from the Catalogue powering this AggregateConfiguration (<see cref="IHasQuerySyntaxHelper.GetQuerySyntaxHelper"/>)
     /// </summary>
     /// <returns></returns>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return Catalogue.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => Catalogue.GetQuerySyntaxHelper();
 
     /// <summary>
     /// Specifies that that given <see cref="ExtractionInformation"/> should become a new SELECT column in the GROUP BY of this AggregateConfiguration.  This
@@ -484,7 +474,7 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     public AggregateDimension AddDimension(ExtractionInformation basedOnColumn)
     {
         ClearAllInjections();
-        return new AggregateDimension((ICatalogueRepository) basedOnColumn.Repository, basedOnColumn, this);
+        return new AggregateDimension((ICatalogueRepository)basedOnColumn.Repository, basedOnColumn, this);
     }
 
     /// <summary>
@@ -496,7 +486,7 @@ public AggregateDimension AddDimension(ExtractionInformation basedOnColumn)
     /// <returns></returns>
     public AggregateBuilder GetQueryBuilder(int? topX = null)
     {
-        if(string.IsNullOrWhiteSpace(CountSQL))
+        if (string.IsNullOrWhiteSpace(CountSQL))
             throw new NotSupportedException(
                 $"Cannot generate an AggregateBuilder because the AggregateConfiguration '{this}' has no Count SQL, usually this is the case for 'Cohort Set' Aggregates or 'Patient Index Table' Aggregates.  In either case you should use CohortQueryBuilder instead of AggregateBuilder");
 
@@ -542,10 +532,7 @@ public AggregateContinuousDateAxis GetAxisIfAny()
     /// on non cohort identification AggregateConfigurations
     /// </summary>
     /// <returns></returns>
-    public AggregateTopX GetTopXIfAny()
-    {
-        return Repository.GetAllObjectsWithParent<AggregateTopX>(this).SingleOrDefault();
-    }
+    public AggregateTopX GetTopXIfAny() => Repository.GetAllObjectsWithParent<AggregateTopX>(this).SingleOrDefault();
 
     /// <summary>
     /// Determines whether the AggregateConfiguration could be used in a <see cref="CohortIdentificationConfiguration"/> to identify a list of patients.  This will be true
@@ -578,17 +565,19 @@ public bool IsAcceptableAsCohortGenerationSource(out string reason)
     public void Check(ICheckNotifier notifier)
     {
         if (HavingSQL != null && HavingSQL.StartsWith("HAVING", StringComparison.CurrentCultureIgnoreCase))
-            notifier.OnCheckPerformed(new CheckEventArgs("HavingSql does not need the word 'HAVING' at the start, it is implicit", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "HavingSql does not need the word 'HAVING' at the start, it is implicit", CheckResult.Fail));
 
         //these are not checkable since they are intended for use by CohortQueryBuilder instead
-        if(IsCohortIdentificationAggregate)
+        if (IsCohortIdentificationAggregate)
             return;
 
         //if it's a normal aggregate then don't let the user have more than 2 columns
         if (AggregateDimensions.Length > 2)
-            throw new QueryBuildingException("Too many columns, You can only have a maximum of 2 columns in any graph (plus a count column).  These are: \r\n 1. The time axis (if any) \r\n 2. The pivot column (if any)");
+            throw new QueryBuildingException(
+                "Too many columns, You can only have a maximum of 2 columns in any graph (plus a count column).  These are: \r\n 1. The time axis (if any) \r\n 2. The pivot column (if any)");
 
-        if(AggregateDimensions.Length == 2 && !PivotOnDimensionID.HasValue)
+        if (AggregateDimensions.Length == 2 && !PivotOnDimensionID.HasValue)
             throw new QueryBuildingException("In order to have 2 columns, one must be selected as a pivot");
 
         try
@@ -610,16 +599,13 @@ public void Check(ICheckNotifier notifier)
     private bool orderFetchAttempted;
 
 
-
     /// <summary>
     /// If the AggregateConfiguration is set up as a cohort identification set in a <see cref="CohortIdentificationConfiguration"/> then this method will return the set container
     /// (e.g. UNION / INTERSECT / EXCEPT) that it is in.  Returns null if it is not in a <see cref="CohortAggregateContainer"/>.
     /// </summary>
     /// <returns></returns>
-    public CohortAggregateContainer GetCohortAggregateContainerIfAny()
-    {
-        return CatalogueRepository.CohortContainerManager.GetParent(this);
-    }
+    public CohortAggregateContainer GetCohortAggregateContainerIfAny() =>
+        CatalogueRepository.CohortContainerManager.GetParent(this);
 
     /// <summary>
     /// All AggregateConfigurations have the potential a'Joinable Patient Index Table' (see AggregateConfiguration class documentation).  This method returns
@@ -627,10 +613,7 @@ public CohortAggregateContainer GetCohortAggregateContainerIfAny()
     /// </summary>
     /// <returns>true if the AggregateConfiguration is part of a cic fulfilling the role of 'Patient Index Table' as defined by the existence of a
     ///  JoinableCohortAggregateConfiguration object</returns>
-    public bool IsJoinablePatientIndexTable()
-    {
-        return JoinableCohortAggregateConfiguration != null;
-    }
+    public bool IsJoinablePatientIndexTable() => JoinableCohortAggregateConfiguration != null;
 
     /// <summary>
     /// If the AggregateConfiguration is set up as a cohort identification set or patient index table then this method will return the associated
@@ -663,20 +646,21 @@ public AggregateConfiguration CreateClone()
         var cataRepo = CatalogueRepository;
         var clone = ShallowClone();
 
-        if(clone.PivotOnDimensionID != null)
+        if (clone.PivotOnDimensionID != null)
             throw new NotImplementedException("Cannot clone due to PIVOT");
 
         foreach (var aggregateDimension in AggregateDimensions)
         {
-            var cloneDimension = new AggregateDimension((ICatalogueRepository) Repository, aggregateDimension.ExtractionInformation, clone)
-                {
-                    Alias = aggregateDimension.Alias,
-                    SelectSQL = aggregateDimension.SelectSQL,
-                    Order = aggregateDimension.Order
-                };
+            var cloneDimension = new AggregateDimension((ICatalogueRepository)Repository,
+                aggregateDimension.ExtractionInformation, clone)
+            {
+                Alias = aggregateDimension.Alias,
+                SelectSQL = aggregateDimension.SelectSQL,
+                Order = aggregateDimension.Order
+            };
             cloneDimension.SaveToDatabase();
 
-            if(aggregateDimension.AggregateContinuousDateAxis != null)
+            if (aggregateDimension.AggregateContinuousDateAxis != null)
                 throw new NotImplementedException("Cannot clone due to AXIS");
         }
 
@@ -705,6 +689,7 @@ public AggregateConfiguration CreateClone()
 
         return clone;
     }
+
     /// <summary>
     /// Using the set; on Order property changes the Order. if you want to informt his object of its Order because you already know what it is but this object doesn't know yet
     /// then you can use this method to force a specific known order onto the object in memory.
@@ -727,8 +712,9 @@ public override void DeleteInDatabase()
 
         container?.RemoveChild(this);
 
-        var isAJoinable = Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this).SingleOrDefault();
-        if(isAJoinable != null)
+        var isAJoinable = Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this)
+            .SingleOrDefault();
+        if (isAJoinable != null)
             if (isAJoinable.Users.Any())
                 throw new NotSupportedException(
                     $"Cannot Delete AggregateConfiguration '{this}' because it is a Joinable Patient Index Table AND it has join users.  You must first remove the join usages and then you can delete it.");
@@ -757,7 +743,7 @@ public IHasDependencies[] GetObjectsDependingOnThis()
         var dependers = new List<IHasDependencies>();
 
         var cic = GetCohortIdentificationConfigurationIfAny();
-        if(cic != null)
+        if (cic != null)
             dependers.Add(cic);
 
         return dependers.ToArray();
@@ -779,7 +765,6 @@ public string WhatIsThis()
 
         return
             @"This is an AggregateConfiguration running as an 'Aggregate Graph'.  its role is to produce summary information about a dataset designed to be displayed in a graph e.g. number of records each year by healthboard";
-
     }
 
     public AggregateConfiguration ShallowClone()
@@ -799,13 +784,7 @@ public void CreateRootContainerIfNotExists()
         }
     }
 
-    public ICatalogue GetCatalogue()
-    {
-        return Catalogue;
-    }
+    public ICatalogue GetCatalogue() => Catalogue;
 
-    public IFilterFactory GetFilterFactory()
-    {
-        return new AggregateFilterFactory(CatalogueRepository);
-    }
+    public IFilterFactory GetFilterFactory() => new AggregateFilterFactory(CatalogueRepository);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateContinuousDateAxis.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateContinuousDateAxis.cs
index 9310c8e3d8..3483d31b47 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateContinuousDateAxis.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateContinuousDateAxis.cs
@@ -19,11 +19,10 @@ namespace Rdmp.Core.Curation.Data.Aggregation;
 /// 
 /// <para>For this to work the AggregateDimension output data should be of type a date also.</para>
 /// </summary>
-public class AggregateContinuousDateAxis: DatabaseEntity, IQueryAxis
+public class AggregateContinuousDateAxis : DatabaseEntity, IQueryAxis
 {
-    
-
     #region Database Properties
+
     private int _aggregateDimensionID;
     private string _startDate;
     private string _endDate;
@@ -37,7 +36,7 @@ public class AggregateContinuousDateAxis: DatabaseEntity, IQueryAxis
     public int AggregateDimension_ID
     {
         get => _aggregateDimensionID;
-        set => SetField(ref  _aggregateDimensionID, value);
+        set => SetField(ref _aggregateDimensionID, value);
     }
 
     /// <summary>
@@ -46,7 +45,7 @@ public int AggregateDimension_ID
     public string StartDate
     {
         get => _startDate;
-        set => SetField(ref  _startDate, value);
+        set => SetField(ref _startDate, value);
     }
 
     /// <summary>
@@ -55,7 +54,7 @@ public string StartDate
     public string EndDate
     {
         get => _endDate;
-        set => SetField(ref  _endDate, value);
+        set => SetField(ref _endDate, value);
     }
 
     /// <summary>
@@ -64,12 +63,13 @@ public string EndDate
     public AxisIncrement AxisIncrement
     {
         get => _axisIncrement;
-        set => SetField(ref  _axisIncrement, value);
+        set => SetField(ref _axisIncrement, value);
     }
 
     #endregion
 
     #region Relationships
+
     /// <inheritdoc cref="AggregateDimension_ID"/>
     [NoMappingToDatabase]
     public AggregateDimension AggregateDimension => Repository.GetObjectByID<AggregateDimension>(AggregateDimension_ID);
@@ -78,7 +78,6 @@ public AxisIncrement AxisIncrement
 
     public AggregateContinuousDateAxis()
     {
-
     }
 
     /// <summary>
@@ -88,30 +87,27 @@ public AggregateContinuousDateAxis()
     /// <remarks>To use this you will first have to create an AggregateConfiguration and setup the count(*)/sum(*) etc stuff and then add a new AggregateDimension <see cref="AggregateConfiguration.AddDimension"/> </remarks>
     /// <param name="repository"></param>
     /// <param name="dimension"></param>
-    public AggregateContinuousDateAxis(ICatalogueRepository repository,AggregateDimension dimension)
+    public AggregateContinuousDateAxis(ICatalogueRepository repository, AggregateDimension dimension)
     {
-        var todaysDateFunction = dimension.AggregateConfiguration.GetQuerySyntaxHelper().GetScalarFunctionSql(MandatoryScalarFunctions.GetTodaysDate);
+        var todaysDateFunction = dimension.AggregateConfiguration.GetQuerySyntaxHelper()
+            .GetScalarFunctionSql(MandatoryScalarFunctions.GetTodaysDate);
 
-        repository.InsertAndHydrate(this, 
+        repository.InsertAndHydrate(this,
             new Dictionary<string, object>
             {
-                {"AggregateDimension_ID",dimension.ID},
-                {"EndDate",todaysDateFunction}
-                    
+                { "AggregateDimension_ID", dimension.ID },
+                { "EndDate", todaysDateFunction }
             });
     }
-        
+
     /// <inheritdoc/>
-    internal AggregateContinuousDateAxis(ICatalogueRepository repository,DbDataReader r) : base(repository,r)
+    internal AggregateContinuousDateAxis(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         AggregateDimension_ID = int.Parse(r["AggregateDimension_ID"].ToString());
         StartDate = r["StartDate"].ToString();
         EndDate = r["EndDate"].ToString();
-        AxisIncrement = (AxisIncrement) r["AxisIncrement"];
+        AxisIncrement = (AxisIncrement)r["AxisIncrement"];
     }
 
-    public override string ToString()
-    {
-        return "Axis";
-    }
+    public override string ToString() => "Axis";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateDimension.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateDimension.cs
index 870f076bb9..c00f884fbe 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateDimension.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateDimension.cs
@@ -24,7 +24,8 @@ namespace Rdmp.Core.Curation.Data.Aggregation;
 /// want to create an aggregate configuration (when patients were admitted) over time.  However the class also allows you to specify new SelectSQL which can change how the field
 /// is extracted e.g. you might want to change "[MyDatabase].[MyTable].[AdmissionDate]" into "YEAR([MyDatabase].[MyTable].[AdmissionDate]) as AdmissionDate" 
 /// </summary>
-public class AggregateDimension : DatabaseEntity, ISaveable, IDeleteable, IColumn, IHasDependencies, IInjectKnown<ExtractionInformation>
+public class AggregateDimension : DatabaseEntity, ISaveable, IDeleteable, IColumn, IHasDependencies,
+    IInjectKnown<ExtractionInformation>
 {
     #region Database Properties
 
@@ -33,7 +34,7 @@ public class AggregateDimension : DatabaseEntity, ISaveable, IDeleteable, IColum
     private string _alias;
     private string _selectSQL;
     private int _order;
-        
+
 
     /// <summary>
     /// An <see cref="AggregateDimension"/> is a column in the SELECT, GROUP BY and ORDER BY sections of an <see cref="AggregateConfiguration"/>.  This property returns
@@ -42,7 +43,7 @@ public class AggregateDimension : DatabaseEntity, ISaveable, IDeleteable, IColum
     public int AggregateConfiguration_ID
     {
         get => _aggregateConfigurationID;
-        set => SetField(ref  _aggregateConfigurationID, value);
+        set => SetField(ref _aggregateConfigurationID, value);
     }
 
     /// <summary>
@@ -55,7 +56,7 @@ public int AggregateConfiguration_ID
     public int ExtractionInformation_ID
     {
         get => _extractionInformationID;
-        set => SetField(ref  _extractionInformationID, value);
+        set => SetField(ref _extractionInformationID, value);
     }
 
     /// <summary>
@@ -65,7 +66,7 @@ public int ExtractionInformation_ID
     public string Alias
     {
         get => _alias;
-        set => SetField(ref  _alias, value);
+        set => SetField(ref _alias, value);
     }
 
     /// <summary>
@@ -78,7 +79,7 @@ public string Alias
     public string SelectSQL
     {
         get => _selectSQL;
-        set => SetField(ref  _selectSQL, value);
+        set => SetField(ref _selectSQL, value);
     }
 
     /// <summary>
@@ -89,11 +90,12 @@ public string SelectSQL
     public int Order
     {
         get => _order;
-        set => SetField(ref  _order, value);
+        set => SetField(ref _order, value);
     }
+
     #endregion
 
-        
+
     #region Relationships
 
     /// <inheritdoc cref="IColumn.HashOnDataRelease"/>
@@ -118,7 +120,8 @@ public int Order
     /// </summary>
     /// <seealso cref="Aggregation.AggregateContinuousDateAxis.AggregateDimension_ID"/>
     [NoMappingToDatabase]
-    public AggregateContinuousDateAxis AggregateContinuousDateAxis => Repository.GetAllObjectsWithParent<AggregateContinuousDateAxis>(this).SingleOrDefault();
+    public AggregateContinuousDateAxis AggregateContinuousDateAxis =>
+        Repository.GetAllObjectsWithParent<AggregateContinuousDateAxis>(this).SingleOrDefault();
 
     /// <inheritdoc cref="ExtractionInformation_ID"/>
     [NoMappingToDatabase]
@@ -142,40 +145,41 @@ public AggregateDimension()
     /// <param name="repository"></param>
     /// <param name="basedOnColumn"></param>
     /// <param name="configuration"></param>
-    public AggregateDimension(ICatalogueRepository repository, ExtractionInformation basedOnColumn, AggregateConfiguration configuration)
+    public AggregateDimension(ICatalogueRepository repository, ExtractionInformation basedOnColumn,
+        AggregateConfiguration configuration)
     {
         object alias = DBNull.Value;
         if (basedOnColumn.Alias != null) alias = basedOnColumn.Alias;
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"AggregateConfiguration_ID", configuration.ID},
-            {"ExtractionInformation_ID", basedOnColumn.ID},
-            {"SelectSQL", basedOnColumn.SelectSQL},
-            {"Alias", alias},
-            {"Order", basedOnColumn.Order}
+            { "AggregateConfiguration_ID", configuration.ID },
+            { "ExtractionInformation_ID", basedOnColumn.ID },
+            { "SelectSQL", basedOnColumn.SelectSQL },
+            { "Alias", alias },
+            { "Order", basedOnColumn.Order }
         });
 
         ClearAllInjections();
     }
 
-    internal AggregateDimension(ICatalogueRepository repository,DbDataReader r) : base(repository,r)
+    internal AggregateDimension(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         AggregateConfiguration_ID = int.Parse(r["AggregateConfiguration_ID"].ToString());
         ExtractionInformation_ID = int.Parse(r["ExtractionInformation_ID"].ToString());
-            
+
         SelectSQL = r["SelectSQL"] as string;
         Alias = r["Alias"] as string;
 
         Order = int.Parse(r["Order"].ToString());
-            
+
         ClearAllInjections();
     }
 
     /// <inheritdoc/>
     public string GetRuntimeName()
     {
-        if(string.IsNullOrWhiteSpace(Alias))
+        if (string.IsNullOrWhiteSpace(Alias))
         {
             var syntax = _knownExtractionInformation.Value?.ColumnInfo?.GetQuerySyntaxHelper() ??
                          AggregateConfiguration.GetQuerySyntaxHelper();
@@ -186,7 +190,7 @@ public string GetRuntimeName()
         return Alias;
     }
 
-        
+
     private Lazy<ExtractionInformation> _knownExtractionInformation;
     private Lazy<AggregateConfiguration> _knownAggregateConfiguration;
 
@@ -194,7 +198,7 @@ public void InjectKnown(ExtractionInformation instance)
     {
         _knownExtractionInformation = new Lazy<ExtractionInformation>(instance);
     }
-        
+
     public void InjectKnown(AggregateConfiguration ac)
     {
         _knownAggregateConfiguration = new Lazy<AggregateConfiguration>(ac);
@@ -202,8 +206,10 @@ public void InjectKnown(AggregateConfiguration ac)
 
     public void ClearAllInjections()
     {
-        _knownExtractionInformation = new Lazy<ExtractionInformation>(() => Repository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID));
-        _knownAggregateConfiguration = new Lazy<AggregateConfiguration>(()=>Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID));
+        _knownExtractionInformation = new Lazy<ExtractionInformation>(() =>
+            Repository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID));
+        _knownAggregateConfiguration = new Lazy<AggregateConfiguration>(() =>
+            Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID));
     }
 
     /// <inheritdoc/>
@@ -228,7 +234,7 @@ public void Check(ICheckNotifier notifier)
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {ExtractionInformation};
+        return new[] { ExtractionInformation };
     }
 
     /// <inheritdoc/>
@@ -251,7 +257,8 @@ public bool IsDate()
 
         try
         {
-            return col.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(col.Data_type) == typeof(DateTime);
+            return col.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(col.Data_type) ==
+                   typeof(DateTime);
         }
         catch (Exception)
         {
@@ -271,25 +278,19 @@ public override void DeleteInDatabase()
         {
             // it's gone already, must be a bad reference
         }
-            
-        if(ac != null)
-        {
-            if(ac.PivotOnDimensionID == ID)
+
+        if (ac != null)
+            if (ac.PivotOnDimensionID == ID)
             {
                 ac.PivotOnDimensionID = null;
                 ac.SaveToDatabase();
-
             }
-        }
+
         var axis = ac?.GetAxisIfAny();
-            
-        if(axis != null && axis.AggregateDimension_ID == ID)
-        {
-            axis.DeleteInDatabase();
-        }
+
+        if (axis != null && axis.AggregateDimension_ID == ID) axis.DeleteInDatabase();
 
         //delete it in the database
         base.DeleteInDatabase();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilter.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilter.cs
index a9235176a2..7b23404346 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilter.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilter.cs
@@ -24,10 +24,10 @@ namespace Rdmp.Core.Curation.Data.Aggregation;
 /// in QueryBuilding even if it is not a selected dimension (this allows you to for example aggregate the drug codes but filter by drug prescribed date even
 /// when the two fields are in different tables - that will be joined at Query Time).
 /// 
-/// <para>Each AggregateFilter can have a collection of AggregateFilterParameters which store SQL paramater values (along with descriptions for the user) that let you
+/// <para>Each AggregateFilter can have a collection of AggregateFilterParameters which store SQL parameter values (along with descriptions for the user) that let you
 /// paramaterise (for the user) your AggregateFilter</para>
 /// </summary>
-public class AggregateFilter : ConcreteFilter,IDisableable
+public class AggregateFilter : ConcreteFilter, IDisableable
 {
     #region Database Properties
 
@@ -40,15 +40,15 @@ public class AggregateFilter : ConcreteFilter,IDisableable
     public override int? ClonedFromExtractionFilter_ID
     {
         get => _clonedFromExtractionFilterID;
-        set => SetField(ref _clonedFromExtractionFilterID , value);
+        set => SetField(ref _clonedFromExtractionFilterID, value);
     }
 
     /// <inheritdoc/>
-    [Relationship(typeof(AggregateFilterContainer),RelationshipType.SharedObject)]
+    [Relationship(typeof(AggregateFilterContainer), RelationshipType.SharedObject)]
     public override int? FilterContainer_ID
     {
         get => _filterContainerID;
-        set => SetField(ref  _filterContainerID, value);
+        set => SetField(ref _filterContainerID, value);
     }
 
 
@@ -59,39 +59,41 @@ public override int? FilterContainer_ID
     public int? AssociatedColumnInfo_ID
     {
         get => _associatedColumnInfoID;
-        set => SetField(ref  _associatedColumnInfoID, value);
+        set => SetField(ref _associatedColumnInfoID, value);
     }
 
     /// <inheritdoc/>
     public bool IsDisabled
     {
         get => _isDisabled;
-        set => SetField(ref  _isDisabled, value);
+        set => SetField(ref _isDisabled, value);
     }
+
     #endregion
 
     /// <inheritdoc cref="GetAllParameters"/>
+
     #region Relationships
+
     [NoMappingToDatabase]
-    public IEnumerable<AggregateFilterParameter> AggregateFilterParameters {
+    public IEnumerable<AggregateFilterParameter> AggregateFilterParameters
+    {
         get { return Repository.GetAllObjectsWithParent<AggregateFilterParameter>(this); }
     }
 
     /// <inheritdoc/>
-    public override ISqlParameter[] GetAllParameters()
-    {
-        return AggregateFilterParameters.ToArray();
-    }
+    public override ISqlParameter[] GetAllParameters() => AggregateFilterParameters.ToArray();
 
     ///<inheritdoc/>
     [NoMappingToDatabase]
-    public override IContainer FilterContainer => FilterContainer_ID.HasValue? Repository.GetObjectByID<AggregateFilterContainer>(FilterContainer_ID.Value):null;
+    public override IContainer FilterContainer => FilterContainer_ID.HasValue
+        ? Repository.GetObjectByID<AggregateFilterContainer>(FilterContainer_ID.Value)
+        : null;
 
     #endregion
 
     public AggregateFilter()
     {
-
     }
 
     /// <summary>
@@ -100,18 +102,19 @@ public AggregateFilter()
     /// <param name="repository"></param>
     /// <param name="name"></param>
     /// <param name="container"></param>
-    public AggregateFilter(ICatalogueRepository repository, string name=null, AggregateFilterContainer container=null)
+    public AggregateFilter(ICatalogueRepository repository, string name = null,
+        AggregateFilterContainer container = null)
     {
         name ??= $"New AggregateFilter{Guid.NewGuid()}";
-            
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"FilterContainer_ID", container != null ? (object)container.ID : DBNull.Value}
+            { "Name", name },
+            { "FilterContainer_ID", container != null ? (object)container.ID : DBNull.Value }
         });
     }
 
-    internal AggregateFilter(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal AggregateFilter(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         WhereSQL = r["WhereSQL"] as string;
         Description = r["Description"] as string;
@@ -133,10 +136,7 @@ internal AggregateFilter(ICatalogueRepository repository, DbDataReader r): base(
 
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
     public override ColumnInfo GetColumnInfoIfExists()
@@ -153,16 +153,15 @@ public override ColumnInfo GetColumnInfoIfExists()
 
         return null;
     }
+
     /// <inheritdoc/>
-    public override IFilterFactory GetFilterFactory()
-    {
-        return new AggregateFilterFactory((ICatalogueRepository)Repository);
-    }
+    public override IFilterFactory GetFilterFactory() => new AggregateFilterFactory((ICatalogueRepository)Repository);
+
     /// <inheritdoc/>
     public override Catalogue GetCatalogue()
     {
         var agg = GetAggregate() ?? throw new Exception(
-                $"Cannot determine the Catalogue for AggregateFilter {this} because GetAggregate returned null, possibly the Filter does not belong to any AggregateFilterContainer (i.e. it is an orphan?)");
+            $"Cannot determine the Catalogue for AggregateFilter {this} because GetAggregate returned null, possibly the Filter does not belong to any AggregateFilterContainer (i.e. it is an orphan?)");
         return agg.Catalogue;
     }
 
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterContainer.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterContainer.cs
index 43020dca42..6bbcaa1075 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterContainer.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterContainer.cs
@@ -40,7 +40,6 @@ public bool IsDisabled
 
     public AggregateFilterContainer()
     {
-
     }
 
     /// <summary>
@@ -48,22 +47,21 @@ public AggregateFilterContainer()
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="operation"></param>
-    public AggregateFilterContainer(ICatalogueRepository repository, FilterContainerOperation operation):base(repository.FilterManager)
+    public AggregateFilterContainer(ICatalogueRepository repository, FilterContainerOperation operation) : base(
+        repository.FilterManager)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object> {{"Operation" ,operation.ToString()}});
+        repository.InsertAndHydrate(this, new Dictionary<string, object> { { "Operation", operation.ToString() } });
     }
 
 
-    internal AggregateFilterContainer(ICatalogueRepository repository, DbDataReader r): base(repository.FilterManager,repository, r)
+    internal AggregateFilterContainer(ICatalogueRepository repository, DbDataReader r) : base(repository.FilterManager,
+        repository, r)
     {
         IsDisabled = Convert.ToBoolean(r["IsDisabled"]);
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Operation.ToString();
-    }
+    public override string ToString() => Operation.ToString();
 
 
     /// <inheritdoc/>
@@ -99,7 +97,7 @@ public override IContainer DeepCloneEntireTreeRecursivelyIncludingFilters()
     {
         //clone ourselves
         var clone = ShallowClone();
-            
+
         //clone our filters
         foreach (AggregateFilter filterToClone in GetFilters())
         {
@@ -140,7 +138,8 @@ private AggregateFilterContainer ShallowClone()
     /// <returns></returns>
     public AggregateConfiguration GetAggregate()
     {
-        var aggregateConfiguration = Repository.GetAllObjectsWhere<AggregateConfiguration>("RootFilterContainer_ID",ID).SingleOrDefault();
+        var aggregateConfiguration = Repository.GetAllObjectsWhere<AggregateConfiguration>("RootFilterContainer_ID", ID)
+            .SingleOrDefault();
 
         if (aggregateConfiguration != null)
             return aggregateConfiguration;
@@ -150,16 +149,14 @@ public AggregateConfiguration GetAggregate()
         return ((AggregateFilterContainer)parentContainer)?.GetAggregate();
     }
 
-    public override IFilterFactory GetFilterFactory()
-    {
-        return new AggregateFilterFactory(CatalogueRepository);
-    }
+    public override IFilterFactory GetFilterFactory() => new AggregateFilterFactory(CatalogueRepository);
 
     public override void DeleteInDatabase()
     {
         base.DeleteInDatabase();
 
-        foreach(var ac in Repository.GetAllObjectsWhere<AggregateConfiguration>(nameof(AggregateConfiguration.RootFilterContainer_ID),ID))
+        foreach (var ac in Repository.GetAllObjectsWhere<AggregateConfiguration>(
+                     nameof(AggregateConfiguration.RootFilterContainer_ID), ID))
         {
             ac.RootFilterContainer_ID = null;
             ac.SaveToDatabase();
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterParameter.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterParameter.cs
index 3b94d343c1..b3fa894419 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterParameter.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateFilterParameter.cs
@@ -24,6 +24,7 @@ namespace Rdmp.Core.Curation.Data.Aggregation;
 public class AggregateFilterParameter : DatabaseEntity, ISqlParameter
 {
     #region Database Properties
+
     private int _aggregateFilterID;
     private string _parameterSQL;
     private string _value;
@@ -33,35 +34,35 @@ public class AggregateFilterParameter : DatabaseEntity, ISqlParameter
     /// The ID of the <see cref="AggregateFilter"/> to which this parameter should be used with.  The filter should have a reference to the parameter name (e.g. @startDate)
     /// in its WhereSQL.
     /// </summary>
-    [Relationship(typeof(AggregateFilter),RelationshipType.SharedObject)]
+    [Relationship(typeof(AggregateFilter), RelationshipType.SharedObject)]
     public int AggregateFilter_ID
     {
         get => _aggregateFilterID;
-        set => SetField(ref  _aggregateFilterID, value);
+        set => SetField(ref _aggregateFilterID, value);
     } // changing this is required for cloning functionality i.e. clone parameter then point it to new parent
 
-        
+
     /// <inheritdoc/>
     [Sql]
     public string ParameterSQL
     {
         get => _parameterSQL;
-        set => SetField(ref  _parameterSQL, value);
+        set => SetField(ref _parameterSQL, value);
     }
-         
+
     /// <inheritdoc/>
     [Sql]
     public string Value
     {
         get => _value;
-        set => SetField(ref  _value, value);
+        set => SetField(ref _value, value);
     }
 
     /// <inheritdoc/>
     public string Comment
     {
         get => _comment;
-        set => SetField(ref  _comment, value);
+        set => SetField(ref _comment, value);
     }
 
     #endregion
@@ -82,7 +83,6 @@ public string Comment
 
     public AggregateFilterParameter()
     {
-
     }
 
     /// <summary>
@@ -94,15 +94,15 @@ public AggregateFilterParameter()
     /// <param name="parent"></param>
     internal AggregateFilterParameter(ICatalogueRepository repository, string parameterSQL, AggregateFilter parent)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ParameterSQL", parameterSQL},
-            {"AggregateFilter_ID", parent.ID}
+            { "ParameterSQL", parameterSQL },
+            { "AggregateFilter_ID", parent.ID }
         });
     }
 
 
-    internal AggregateFilterParameter(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal AggregateFilterParameter(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         AggregateFilter_ID = int.Parse(r["AggregateFilter_ID"].ToString());
         ParameterSQL = r["ParameterSQL"] as string;
@@ -111,10 +111,7 @@ internal AggregateFilterParameter(ICatalogueRepository repository, DbDataReader
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     /// <inheritdoc cref="ParameterSyntaxChecker"/>
     public void Check(ICheckNotifier notifier)
@@ -123,16 +120,10 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return AggregateFilter.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => AggregateFilter.GetQuerySyntaxHelper();
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return AggregateFilter;
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() => AggregateFilter;
 
 
     public AggregateFilterParameter ShallowClone(AggregateFilter into)
diff --git a/Rdmp.Core/Curation/Data/Aggregation/AggregateForcedJoin.cs b/Rdmp.Core/Curation/Data/Aggregation/AggregateForcedJoin.cs
index d87c8ac9d1..0b9c2a27cb 100644
--- a/Rdmp.Core/Curation/Data/Aggregation/AggregateForcedJoin.cs
+++ b/Rdmp.Core/Curation/Data/Aggregation/AggregateForcedJoin.cs
@@ -51,8 +51,11 @@ public void BreakLinkBetween(AggregateConfiguration configuration, ITableInfo ta
     public void CreateLinkBetween(AggregateConfiguration configuration, ITableInfo tableInfo)
     {
         using (var con = _repository.GetConnection())
-        using(var cmd = DatabaseCommandHelper.GetCommand(
-                  $"INSERT INTO AggregateForcedJoin (AggregateConfiguration_ID,TableInfo_ID) VALUES ({configuration.ID},{tableInfo.ID})", con.Connection,con.Transaction))
+        using (var cmd = DatabaseCommandHelper.GetCommand(
+                   $"INSERT INTO AggregateForcedJoin (AggregateConfiguration_ID,TableInfo_ID) VALUES ({configuration.ID},{tableInfo.ID})",
+                   con.Connection, con.Transaction))
+        {
             cmd.ExecuteNonQuery();
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Cache/CacheFetchFailure.cs b/Rdmp.Core/Curation/Data/Cache/CacheFetchFailure.cs
index 81ef396fe1..230832381a 100644
--- a/Rdmp.Core/Curation/Data/Cache/CacheFetchFailure.cs
+++ b/Rdmp.Core/Curation/Data/Cache/CacheFetchFailure.cs
@@ -32,49 +32,48 @@ public class CacheFetchFailure : DatabaseEntity, ICacheFetchFailure
     public int CacheProgress_ID
     {
         get => _cacheProgressID;
-        set => SetField(ref  _cacheProgressID, value);
+        set => SetField(ref _cacheProgressID, value);
     }
 
     /// <inheritdoc/>
     public DateTime FetchRequestStart
     {
         get => _fetchRequestStart;
-        set => SetField(ref  _fetchRequestStart, value);
+        set => SetField(ref _fetchRequestStart, value);
     }
 
     /// <inheritdoc cref="ICacheFetchFailure.FetchRequestStart"/>
     public DateTime FetchRequestEnd
     {
         get => _fetchRequestEnd;
-        set => SetField(ref  _fetchRequestEnd, value);
+        set => SetField(ref _fetchRequestEnd, value);
     }
 
     /// <inheritdoc/>
     public string ExceptionText
     {
         get => _exceptionText;
-        set => SetField(ref  _exceptionText, value);
+        set => SetField(ref _exceptionText, value);
     }
 
     /// <inheritdoc/>
     public DateTime LastAttempt
     {
         get => _lastAttempt;
-        set => SetField(ref  _lastAttempt, value);
+        set => SetField(ref _lastAttempt, value);
     }
 
     /// <inheritdoc/>
     public DateTime? ResolvedOn
     {
         get => _resolvedOn;
-        set => SetField(ref  _resolvedOn, value);
+        set => SetField(ref _resolvedOn, value);
     }
 
     #endregion
 
     public CacheFetchFailure()
     {
-                
     }
 
     /// <summary>
@@ -85,16 +84,17 @@ public CacheFetchFailure()
     /// <param name="start"></param>
     /// <param name="end"></param>
     /// <param name="e"></param>
-    public CacheFetchFailure(ICatalogueRepository repository, ICacheProgress cacheProgress, DateTime start, DateTime end, Exception e)
+    public CacheFetchFailure(ICatalogueRepository repository, ICacheProgress cacheProgress, DateTime start,
+        DateTime end, Exception e)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"CacheProgress_ID", cacheProgress.ID},
-            {"FetchRequestStart", start},
-            {"FetchRequestEnd", end},
-            {"ExceptionText", ExceptionHelper.ExceptionToListOfInnerMessages(e,true)},
-            {"LastAttempt", DateTime.Now},
-            {"ResolvedOn", DBNull.Value}
+            { "CacheProgress_ID", cacheProgress.ID },
+            { "FetchRequestStart", start },
+            { "FetchRequestEnd", end },
+            { "ExceptionText", ExceptionHelper.ExceptionToListOfInnerMessages(e, true) },
+            { "LastAttempt", DateTime.Now },
+            { "ResolvedOn", DBNull.Value }
         });
     }
 
diff --git a/Rdmp.Core/Curation/Data/Cache/CacheLagPeriod.cs b/Rdmp.Core/Curation/Data/Cache/CacheLagPeriod.cs
index 77f20c6775..0cd6b6abd8 100644
--- a/Rdmp.Core/Curation/Data/Cache/CacheLagPeriod.cs
+++ b/Rdmp.Core/Curation/Data/Cache/CacheLagPeriod.cs
@@ -105,7 +105,7 @@ private void SetTypeFromString(string type)
 
         switch (type)
         {
-            case "m": 
+            case "m":
                 Type = PeriodType.Month;
                 break;
             case "d":
@@ -156,10 +156,7 @@ internal DateTime CalculateStartOfLagPeriodFrom(DateTime dt)
     /// <seealso cref="Duration"/>
     /// <param name="time"></param>
     /// <returns></returns>
-    public bool TimeIsWithinPeriod(DateTime time)
-    {
-        return time >= CalculateStartOfLagPeriodFrom(DateTime.Now);
-    }
+    public bool TimeIsWithinPeriod(DateTime time) => time >= CalculateStartOfLagPeriodFrom(DateTime.Now);
 
     /// <summary>
     /// Allows comparing a TimeSpan with a CacheLagPeriod.  This treats the Timespan as an offset equivalent to <see cref="Duration"/>
diff --git a/Rdmp.Core/Curation/Data/Cache/CacheProgress.cs b/Rdmp.Core/Curation/Data/Cache/CacheProgress.cs
index 6844fb71ed..6efc837c23 100644
--- a/Rdmp.Core/Curation/Data/Cache/CacheProgress.cs
+++ b/Rdmp.Core/Curation/Data/Cache/CacheProgress.cs
@@ -57,42 +57,42 @@ public int LoadProgress_ID
     public int? PermissionWindow_ID
     {
         get => _permissionWindowID;
-        set => SetField(ref  _permissionWindowID, value);
+        set => SetField(ref _permissionWindowID, value);
     }
 
     /// <inheritdoc/>
     public DateTime? CacheFillProgress
     {
         get => _cacheFillProgress;
-        set => SetField(ref  _cacheFillProgress, value);
+        set => SetField(ref _cacheFillProgress, value);
     }
 
     ///<inheritdoc/>
     public string CacheLagPeriod
     {
         get => _cacheLagPeriod;
-        set => SetField(ref  _cacheLagPeriod, value);
+        set => SetField(ref _cacheLagPeriod, value);
     } // stored as string in DB, use GetCacheLagPeriod() to get as CacheLagPeriod
 
     ///<inheritdoc/>
     public int? Pipeline_ID
     {
         get => _pipelineID;
-        set => SetField(ref  _pipelineID, value);
+        set => SetField(ref _pipelineID, value);
     }
 
     ///<inheritdoc/>
     public TimeSpan ChunkPeriod
     {
         get => _chunkPeriod;
-        set => SetField(ref  _chunkPeriod, value);
+        set => SetField(ref _chunkPeriod, value);
     }
 
     ///<inheritdoc/>
     public string CacheLagPeriodLoadDelay
     {
         get => _cacheLagPeriodLoadDelay;
-        set => SetField(ref  _cacheLagPeriodLoadDelay, value);
+        set => SetField(ref _cacheLagPeriodLoadDelay, value);
     }
 
     #endregion
@@ -101,7 +101,8 @@ public string CacheLagPeriodLoadDelay
 
     ///<inheritdoc/>
     [NoMappingToDatabase]
-    public IEnumerable<ICacheFetchFailure> CacheFetchFailures => Repository.GetAllObjectsWithParent<CacheFetchFailure>(this);
+    public IEnumerable<ICacheFetchFailure> CacheFetchFailures =>
+        Repository.GetAllObjectsWithParent<CacheFetchFailure>(this);
 
     /// <inheritdoc cref="ICacheProgress.LoadProgress_ID"/>
     [NoMappingToDatabase]
@@ -116,9 +117,10 @@ public string CacheLagPeriodLoadDelay
     public IPermissionWindow PermissionWindow =>
         PermissionWindow_ID == null
             ? null
-            : Repository.GetObjectByID<PermissionWindow>((int) PermissionWindow_ID);
+            : Repository.GetObjectByID<PermissionWindow>((int)PermissionWindow_ID);
 
     #endregion
+
     /// <inheritdoc cref="ICacheProgress.CacheLagPeriod"/>
     public CacheLagPeriod GetCacheLagPeriod()
     {
@@ -151,7 +153,6 @@ public void SetCacheLagPeriodLoadDelay(CacheLagPeriod cacheLagLoadDelayPeriod)
 
     public CacheProgress()
     {
-
     }
 
     /// <summary>
@@ -162,10 +163,10 @@ public CacheProgress()
     /// <param name="loadProgress"></param>
     public CacheProgress(ICatalogueRepository repository, ILoadProgress loadProgress)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"LoadProgress_ID", loadProgress.ID},
-            {"Name", $"New CacheProgress {Guid.NewGuid()}" }
+            { "LoadProgress_ID", loadProgress.ID },
+            { "Name", $"New CacheProgress {Guid.NewGuid()}" }
         });
     }
 
@@ -189,22 +190,24 @@ public IEnumerable<ICacheFetchFailure> FetchPage(int start, int batchSize)
 
         using (var conn = ((CatalogueRepository)Repository).GetConnection())
         {
-            using(var cmd =
-                  DatabaseCommandHelper.GetCommand($@"SELECT ID FROM CacheFetchFailure 
+            using (var cmd =
+                   DatabaseCommandHelper.GetCommand($@"SELECT ID FROM CacheFetchFailure 
 WHERE CacheProgress_ID = @CacheProgressID AND ResolvedOn IS NULL
 ORDER BY FetchRequestStart
 OFFSET {start} ROWS
-FETCH NEXT {batchSize} ROWS ONLY", conn.Connection,conn.Transaction))
+FETCH NEXT {batchSize} ROWS ONLY", conn.Connection, conn.Transaction))
             {
-                DatabaseCommandHelper.AddParameterWithValueToCommand("@CacheProgressID",cmd, ID);
+                DatabaseCommandHelper.AddParameterWithValueToCommand("@CacheProgressID", cmd, ID);
 
                 using (var reader = cmd.ExecuteReader())
+                {
                     while (reader.Read())
                         toReturnIds.Add(Convert.ToInt32(reader["ID"]));
+                }
             }
         }
 
-        return Repository.GetAllObjectsInIDList<CacheFetchFailure>(toReturnIds); 
+        return Repository.GetAllObjectsInIDList<CacheFetchFailure>(toReturnIds);
     }
 
     ///<inheritdoc/>
@@ -215,7 +218,9 @@ public TimeSpan GetShortfall()
 
         TimeSpan shortfall;
         if (CacheFillProgress != null)
+        {
             shortfall = lastExpectedCacheDate.Subtract(CacheFillProgress.Value);
+        }
         else
         {
             var load = LoadProgress;
@@ -231,10 +236,7 @@ public TimeSpan GetShortfall()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Returns all the Catalogues in this caches LoadMetadata OR if it has a PermissionWindow then ALL the unique catalogues across ALL the LoadMetadatas of ANY cache that uses the same permission window
@@ -242,20 +244,19 @@ public override string ToString()
     /// <returns></returns>
     public Catalogue[] GetAllCataloguesMaximisingOnPermissionWindow()
     {
-        if(PermissionWindow_ID == null)
+        if (PermissionWindow_ID == null)
             return LoadProgress.LoadMetadata.GetAllCatalogues().Cast<Catalogue>().Distinct().ToArray();
-            
-        return PermissionWindow.CacheProgresses.SelectMany(p => p.LoadProgress.LoadMetadata.GetAllCatalogues()).Cast<Catalogue>().Distinct().ToArray();
+
+        return PermissionWindow.CacheProgresses.SelectMany(p => p.LoadProgress.LoadMetadata.GetAllCatalogues())
+            .Cast<Catalogue>().Distinct().ToArray();
     }
 
     /// <summary>
     /// Returns
     /// </summary>
     /// <returns></returns>
-    public DiscoveredServer GetDistinctLoggingDatabase()
-    {
-        return CatalogueRepository.GetDefaultLogManager()?.Server ?? throw new Exception("No default logging server configured");
-    }
+    public DiscoveredServer GetDistinctLoggingDatabase() => CatalogueRepository.GetDefaultLogManager()?.Server ??
+                                                            throw new Exception("No default logging server configured");
 
     public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer serverChosen)
     {
@@ -267,16 +268,10 @@ public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer s
     /// Returns the unique logging name for <see cref="ArchivalDataLoadInfo"/> runs of this cache
     /// </summary>
     /// <returns></returns>
-    public string GetLoggingRunName()
-    {
-        return $"Caching {Name}";
-    }
+    public string GetLoggingRunName() => $"Caching {Name}";
 
 
-    public string GetDistinctLoggingTask()
-    {
-        return "caching";
-    }
+    public string GetDistinctLoggingTask() => "caching";
 
     public IEnumerable<ArchivalDataLoadInfo> FilterRuns(IEnumerable<ArchivalDataLoadInfo> runs)
     {
diff --git a/Rdmp.Core/Curation/Data/Cache/ICacheFetchFailure.cs b/Rdmp.Core/Curation/Data/Cache/ICacheFetchFailure.cs
index 751d27e16f..ca3f7d686a 100644
--- a/Rdmp.Core/Curation/Data/Cache/ICacheFetchFailure.cs
+++ b/Rdmp.Core/Curation/Data/Cache/ICacheFetchFailure.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Curation.Data.Cache;
 /// <summary>
 /// See CacheFetchFailure
 /// </summary>
-public interface ICacheFetchFailure : ISaveable, IDeleteable,IMapsDirectlyToDatabaseTable
+public interface ICacheFetchFailure : ISaveable, IDeleteable, IMapsDirectlyToDatabaseTable
 {
     /// <summary>
     /// The ID of the <see cref="CacheProgress"/> that was being executed when the fetch error occured.
diff --git a/Rdmp.Core/Curation/Data/Cache/ICacheProgress.cs b/Rdmp.Core/Curation/Data/Cache/ICacheProgress.cs
index b3e6ccae92..b35136dd9f 100644
--- a/Rdmp.Core/Curation/Data/Cache/ICacheProgress.cs
+++ b/Rdmp.Core/Curation/Data/Cache/ICacheProgress.cs
@@ -69,7 +69,7 @@ public interface ICacheProgress : INamed, ILoggedActivityRootObject
     IEnumerable<ICacheFetchFailure> CacheFetchFailures { get; }
 
     /// <inheritdoc cref="LoadProgress_ID"/>
-    ILoadProgress LoadProgress { get;}
+    ILoadProgress LoadProgress { get; }
 
     /// <inheritdoc cref="ICacheProgress.CacheLagPeriod"/>
     CacheLagPeriod GetCacheLagPeriod();
diff --git a/Rdmp.Core/Curation/Data/Catalogue.cs b/Rdmp.Core/Curation/Data/Catalogue.cs
index 0b843e1900..64a42b638c 100644
--- a/Rdmp.Core/Curation/Data/Catalogue.cs
+++ b/Rdmp.Core/Curation/Data/Catalogue.cs
@@ -35,7 +35,8 @@
 namespace Rdmp.Core.Curation.Data;
 
 /// <inheritdoc cref="ICatalogue"/>
-public class Catalogue : DatabaseEntity, IComparable, ICatalogue, IInjectKnown<CatalogueItem[]>,IInjectKnown<CatalogueExtractabilityStatus>
+public class Catalogue : DatabaseEntity, IComparable, ICatalogue, IInjectKnown<CatalogueItem[]>,
+    IInjectKnown<CatalogueExtractabilityStatus>
 {
     #region Database Properties
 
@@ -95,7 +96,7 @@ public class Catalogue : DatabaseEntity, IComparable, ICatalogue, IInjectKnown<C
     public string Acronym
     {
         get => _acronym;
-        set => SetField(ref  _acronym, value);
+        set => SetField(ref _acronym, value);
     }
 
     /// <summary>
@@ -108,7 +109,7 @@ public string Acronym
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
@@ -117,7 +118,7 @@ public string Name
     public string Folder
     {
         get => _folder;
-        set => SetField(ref  _folder, FolderHelper.Adjust(value));
+        set => SetField(ref _folder, FolderHelper.Adjust(value));
     }
 
 
@@ -126,7 +127,7 @@ public string Folder
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -135,7 +136,7 @@ public string Description
     public Uri Detail_Page_URL
     {
         get => _detailPageUrl;
-        set => SetField(ref  _detailPageUrl, value);
+        set => SetField(ref _detailPageUrl, value);
     }
 
     /// <summary>
@@ -144,14 +145,14 @@ public Uri Detail_Page_URL
     public CatalogueType Type
     {
         get => _type;
-        set => SetField(ref  _type, value);
+        set => SetField(ref _type, value);
     }
 
     /// <inheritdoc/>
     public CataloguePeriodicity Periodicity
     {
         get => _periodicity;
-        set => SetField(ref  _periodicity, value);
+        set => SetField(ref _periodicity, value);
     }
 
     /// <summary>
@@ -160,7 +161,7 @@ public CataloguePeriodicity Periodicity
     public CatalogueGranularity Granularity
     {
         get => _granularity;
-        set => SetField(ref  _granularity, value);
+        set => SetField(ref _granularity, value);
     }
 
     /// <summary>
@@ -169,7 +170,7 @@ public CatalogueGranularity Granularity
     public string Geographical_coverage
     {
         get => _geographicalCoverage;
-        set => SetField(ref  _geographicalCoverage, value);
+        set => SetField(ref _geographicalCoverage, value);
     }
 
     /// <summary>
@@ -178,7 +179,7 @@ public string Geographical_coverage
     public string Background_summary
     {
         get => _backgroundSummary;
-        set => SetField(ref  _backgroundSummary, value);
+        set => SetField(ref _backgroundSummary, value);
     }
 
     /// <summary>
@@ -187,7 +188,7 @@ public string Background_summary
     public string Search_keywords
     {
         get => _searchKeywords;
-        set => SetField(ref  _searchKeywords, value);
+        set => SetField(ref _searchKeywords, value);
     }
 
     /// <summary>
@@ -197,7 +198,7 @@ public string Search_keywords
     public string Update_freq
     {
         get => _updateFreq;
-        set => SetField(ref  _updateFreq, value);
+        set => SetField(ref _updateFreq, value);
     }
 
     /// <summary>
@@ -207,7 +208,7 @@ public string Update_freq
     public string Update_sched
     {
         get => _updateSched;
-        set => SetField(ref  _updateSched, value);
+        set => SetField(ref _updateSched, value);
     }
 
 
@@ -215,7 +216,7 @@ public string Update_sched
     public string Time_coverage
     {
         get => _timeCoverage;
-        set => SetField(ref  _timeCoverage, value);
+        set => SetField(ref _timeCoverage, value);
     }
 
     /// <summary>
@@ -224,7 +225,7 @@ public string Time_coverage
     public DateTime? Last_revision_date
     {
         get => _lastRevisionDate;
-        set => SetField(ref  _lastRevisionDate, value);
+        set => SetField(ref _lastRevisionDate, value);
     }
 
     /// <summary>
@@ -233,7 +234,7 @@ public DateTime? Last_revision_date
     public string Contact_details
     {
         get => _contactDetails;
-        set => SetField(ref  _contactDetails, value);
+        set => SetField(ref _contactDetails, value);
     }
 
     /// <summary>
@@ -242,7 +243,7 @@ public string Contact_details
     public string Resource_owner
     {
         get => _resourceOwner;
-        set => SetField(ref  _resourceOwner, value);
+        set => SetField(ref _resourceOwner, value);
     }
 
     /// <summary>
@@ -251,7 +252,7 @@ public string Resource_owner
     public string Attribution_citation
     {
         get => _attributionCitation;
-        set => SetField(ref  _attributionCitation, value);
+        set => SetField(ref _attributionCitation, value);
     }
 
     /// <summary>
@@ -260,7 +261,7 @@ public string Attribution_citation
     public string Access_options
     {
         get => _accessOptions;
-        set => SetField(ref  _accessOptions, value);
+        set => SetField(ref _accessOptions, value);
     }
 
     /// <summary>
@@ -269,7 +270,7 @@ public string Access_options
     public string SubjectNumbers
     {
         get => _subjectNumbers;
-        set => SetField(ref  _subjectNumbers, value);
+        set => SetField(ref _subjectNumbers, value);
     }
 
     /// <summary>
@@ -278,7 +279,7 @@ public string SubjectNumbers
     public Uri API_access_URL
     {
         get => _apiAccessUrl;
-        set => SetField(ref  _apiAccessUrl, value);
+        set => SetField(ref _apiAccessUrl, value);
     }
 
     /// <summary>
@@ -287,7 +288,7 @@ public Uri API_access_URL
     public Uri Browse_URL
     {
         get => _browseUrl;
-        set => SetField(ref  _browseUrl, value);
+        set => SetField(ref _browseUrl, value);
     }
 
     /// <summary>
@@ -296,7 +297,7 @@ public Uri Browse_URL
     public Uri Bulk_Download_URL
     {
         get => _bulkDownloadUrl;
-        set => SetField(ref  _bulkDownloadUrl, value);
+        set => SetField(ref _bulkDownloadUrl, value);
     }
 
     /// <summary>
@@ -305,7 +306,7 @@ public Uri Bulk_Download_URL
     public Uri Query_tool_URL
     {
         get => _queryToolUrl;
-        set => SetField(ref  _queryToolUrl, value);
+        set => SetField(ref _queryToolUrl, value);
     }
 
     /// <summary>
@@ -314,7 +315,7 @@ public Uri Query_tool_URL
     public Uri Source_URL
     {
         get => _sourceUrl;
-        set => SetField(ref  _sourceUrl, value);
+        set => SetField(ref _sourceUrl, value);
     }
 
     /// <summary>
@@ -323,7 +324,7 @@ public Uri Source_URL
     public string Country_of_origin
     {
         get => _countryOfOrigin;
-        set => SetField(ref  _countryOfOrigin, value);
+        set => SetField(ref _countryOfOrigin, value);
     }
 
     /// <summary>
@@ -332,7 +333,7 @@ public string Country_of_origin
     public string Data_standards
     {
         get => _dataStandards;
-        set => SetField(ref  _dataStandards, value);
+        set => SetField(ref _dataStandards, value);
     }
 
     /// <summary>
@@ -341,7 +342,7 @@ public string Data_standards
     public string Administrative_contact_name
     {
         get => _administrativeContactName;
-        set => SetField(ref  _administrativeContactName, value);
+        set => SetField(ref _administrativeContactName, value);
     }
 
     /// <summary>
@@ -350,7 +351,7 @@ public string Administrative_contact_name
     public string Administrative_contact_email
     {
         get => _administrativeContactEmail;
-        set => SetField(ref  _administrativeContactEmail, value);
+        set => SetField(ref _administrativeContactEmail, value);
     }
 
     /// <summary>
@@ -359,7 +360,7 @@ public string Administrative_contact_email
     public string Administrative_contact_telephone
     {
         get => _administrativeContactTelephone;
-        set => SetField(ref  _administrativeContactTelephone, value);
+        set => SetField(ref _administrativeContactTelephone, value);
     }
 
     /// <summary>
@@ -368,7 +369,7 @@ public string Administrative_contact_telephone
     public string Administrative_contact_address
     {
         get => _administrativeContactAddress;
-        set => SetField(ref  _administrativeContactAddress, value);
+        set => SetField(ref _administrativeContactAddress, value);
     }
 
     /// <summary>
@@ -377,7 +378,7 @@ public string Administrative_contact_address
     public bool? Explicit_consent
     {
         get => _explicitConsent;
-        set => SetField(ref  _explicitConsent, value);
+        set => SetField(ref _explicitConsent, value);
     }
 
     /// <summary>
@@ -386,7 +387,7 @@ public bool? Explicit_consent
     public string Ethics_approver
     {
         get => _ethicsApprover;
-        set => SetField(ref  _ethicsApprover, value);
+        set => SetField(ref _ethicsApprover, value);
     }
 
     /// <summary>
@@ -395,7 +396,7 @@ public string Ethics_approver
     public string Source_of_data_collection
     {
         get => _sourceOfDataCollection;
-        set => SetField(ref  _sourceOfDataCollection, value);
+        set => SetField(ref _sourceOfDataCollection, value);
     }
 
     /// <summary>
@@ -413,7 +414,7 @@ public string Ticket
     public string LoggingDataTask
     {
         get => _loggingDataTask;
-        set => SetField(ref  _loggingDataTask, value);
+        set => SetField(ref _loggingDataTask, value);
     }
 
     /// <inheritdoc/>
@@ -421,25 +422,27 @@ public string LoggingDataTask
     public string ValidatorXML
     {
         get => _validatorXml;
-        set => SetField(ref  _validatorXml, value);
+        set => SetField(ref _validatorXml, value);
     }
 
     /// <inheritdoc/>
-    [Relationship(typeof(ExtractionInformation), RelationshipType.IgnoreableLocalReference, ValueGetter = nameof(GetAllExtractionInformation))] //todo do we want to share this?
+    [Relationship(typeof(ExtractionInformation), RelationshipType.IgnoreableLocalReference,
+        ValueGetter = nameof(GetAllExtractionInformation))] //todo do we want to share this?
     [DoNotExtractProperty]
     public int? TimeCoverage_ExtractionInformation_ID
     {
         get => _timeCoverageExtractionInformationID;
-        set => SetField(ref  _timeCoverageExtractionInformationID, value);
+        set => SetField(ref _timeCoverageExtractionInformationID, value);
     }
 
     /// <inheritdoc/>
     [DoNotExtractProperty]
-    [Relationship(typeof(ExtractionInformation), RelationshipType.IgnoreableLocalReference, ValueGetter=nameof(GetAllExtractionInformation))]
+    [Relationship(typeof(ExtractionInformation), RelationshipType.IgnoreableLocalReference,
+        ValueGetter = nameof(GetAllExtractionInformation))]
     public int? PivotCategory_ExtractionInformation_ID
     {
         get => _pivotCategoryExtractionInformationID;
-        set => SetField(ref  _pivotCategoryExtractionInformationID, value);
+        set => SetField(ref _pivotCategoryExtractionInformationID, value);
     }
 
     /// <inheritdoc/>
@@ -448,7 +451,7 @@ public int? PivotCategory_ExtractionInformation_ID
     public bool IsDeprecated
     {
         get => _isDeprecated;
-        set => SetField(ref  _isDeprecated, value);
+        set => SetField(ref _isDeprecated, value);
     }
 
     /// <inheritdoc/>
@@ -457,7 +460,7 @@ public bool IsDeprecated
     public bool IsInternalDataset
     {
         get => _isInternalDataset;
-        set => SetField(ref  _isInternalDataset, value);
+        set => SetField(ref _isInternalDataset, value);
     }
 
     /// <inheritdoc/>
@@ -466,7 +469,7 @@ public bool IsInternalDataset
     public bool IsColdStorageDataset
     {
         get => _isColdStorageDataset;
-        set => SetField(ref  _isColdStorageDataset, value);
+        set => SetField(ref _isColdStorageDataset, value);
     }
 
     /// <inheritdoc/>
@@ -475,14 +478,14 @@ public bool IsColdStorageDataset
     public int? LiveLoggingServer_ID
     {
         get => _liveLoggingServerID;
-        set => SetField(ref  _liveLoggingServerID, value);
+        set => SetField(ref _liveLoggingServerID, value);
     }
 
     /// <inheritdoc/>
     public DateTime? DatasetStartDate
     {
         get => _datasetStartDate;
-        set => SetField(ref  _datasetStartDate, value);
+        set => SetField(ref _datasetStartDate, value);
     }
 
     private int? _loadMetadataId;
@@ -493,11 +496,13 @@ public DateTime? DatasetStartDate
     public int? LoadMetadata_ID
     {
         get => _loadMetadataId;
-        set => SetField(ref _loadMetadataId , value);
+        set => SetField(ref _loadMetadataId, value);
     }
+
     #endregion
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public CatalogueItem[] CatalogueItems => _knownCatalogueItems.Value;
@@ -511,20 +516,28 @@ public LoadMetadata LoadMetadata
             if (LoadMetadata_ID == null)
                 return null;
 
-            return Repository.GetObjectByID<LoadMetadata>((int) LoadMetadata_ID);
+            return Repository.GetObjectByID<LoadMetadata>((int)LoadMetadata_ID);
         }
     }
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public AggregateConfiguration[] AggregateConfigurations => Repository.GetAllObjectsWithParent<AggregateConfiguration>(this);
+    public AggregateConfiguration[] AggregateConfigurations =>
+        Repository.GetAllObjectsWithParent<AggregateConfiguration>(this);
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public ExternalDatabaseServer LiveLoggingServer =>
-        LiveLoggingServer_ID == null
-            ? null
-            : Repository.GetObjectByID<ExternalDatabaseServer>((int)LiveLoggingServer_ID);
+     public ExternalDatabaseServer LiveLoggingServer {
+        get{
+            if(LiveLoggingServer_ID != null){  
+                ExternalDatabaseServer[] dbs = Repository.GetAllObjectsWhere<ExternalDatabaseServer>("id",(int)LiveLoggingServer_ID);
+                if(dbs.Length > 0){
+                    return dbs.First();
+                }                         
+            }
+            return null;
+        }
+     }
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
@@ -543,6 +556,7 @@ public LoadMetadata LoadMetadata
     #endregion
 
     #region Enums
+
     /// <summary>
     /// Somewhat arbitrary concepts for defining the limitations of a Catalogues data
     /// </summary>
@@ -594,14 +608,17 @@ public enum CataloguePeriodicity
         /// Data is updated on a daily basis
         /// </summary>
         Daily,
+
         /// <summary>
         /// Data is updated on a weekly basis
         /// </summary>
         Weekly,
+
         /// <summary>
         /// Data is updated every 2 weeks
         /// </summary>
         Fortnightly,
+
         /// <summary>
         /// Data is updated every month
         /// </summary>
@@ -658,6 +675,7 @@ public enum CatalogueGranularity
         /// </summary>
         Clinic
     }
+
     #endregion
 
     /// <summary>
@@ -681,10 +699,10 @@ public Catalogue(ICatalogueRepository repository, string name)
     {
         var loggingServer = repository.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name",name},
-            {"LiveLoggingServer_ID",loggingServer == null ? DBNull.Value:loggingServer.ID}
+            { "Name", name },
+            { "LiveLoggingServer_ID", loggingServer == null ? DBNull.Value : loggingServer.ID }
         });
 
         if (ID == 0 || string.IsNullOrWhiteSpace(Name) || Repository != repository)
@@ -695,7 +713,7 @@ public Catalogue(ICatalogueRepository repository, string name)
         {
             var liveLoggingServer = repository.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
 
-            if(liveLoggingServer != null)
+            if (liveLoggingServer != null)
                 LiveLoggingServer_ID = liveLoggingServer.ID;
         }
 
@@ -711,7 +729,7 @@ public Catalogue(ICatalogueRepository repository, string name)
     internal Catalogue(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        if(r["LoadMetadata_ID"] != DBNull.Value)
+        if (r["LoadMetadata_ID"] != DBNull.Value)
             LoadMetadata_ID = int.Parse(r["LoadMetadata_ID"].ToString());
 
         Acronym = r["Acronym"].ToString();
@@ -726,39 +744,42 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
         if (r["LiveLoggingServer_ID"] == DBNull.Value)
             LiveLoggingServer_ID = null;
         else
-            LiveLoggingServer_ID = (int) r["LiveLoggingServer_ID"];
+            LiveLoggingServer_ID = (int)r["LiveLoggingServer_ID"];
 
         ////Type - with handling for invalid enum values listed in database
         var type = r["Type"];
         if (type == null || type == DBNull.Value)
+        {
             Type = CatalogueType.Unknown;
+        }
         else
         {
             if (Enum.TryParse(type.ToString(), true, out CatalogueType typeAsEnum))
                 Type = typeAsEnum;
             else
                 throw new Exception($" r[\"Type\"] had value {type} which is not contained in Enum CatalogueType");
-
         }
 
         //Periodicity - with handling for invalid enum values listed in database
         var periodicity = r["Periodicity"];
         if (periodicity == null || periodicity == DBNull.Value)
+        {
             Periodicity = CataloguePeriodicity.Unknown;
+        }
         else
         {
             if (Enum.TryParse(periodicity.ToString(), true, out CataloguePeriodicity periodicityAsEnum))
                 Periodicity = periodicityAsEnum;
             else
-            {
                 throw new Exception(
                     $" r[\"Periodicity\"] had value {periodicity} which is not contained in Enum CataloguePeriodicity");
-            }
         }
 
         var granularity = r["Granularity"];
         if (granularity == null || granularity == DBNull.Value)
+        {
             Granularity = CatalogueGranularity.Unknown;
+        }
         else
         {
             if (Enum.TryParse(granularity.ToString(), true, out CatalogueGranularity granularityAsEnum))
@@ -766,7 +787,6 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
             else
                 throw new Exception(
                     $" r[\"granularity\"] had value {granularity} which is not contained in Enum CatalogueGranularity");
-
         }
 
         Geographical_coverage = r["Geographical_coverage"].ToString();
@@ -797,7 +817,7 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
         Ethics_approver = r["Ethics_approver"].ToString();
         Source_of_data_collection = r["Source_of_data_collection"].ToString();
 
-        if (r["Explicit_consent"] != null && r["Explicit_consent"]!= DBNull.Value)
+        if (r["Explicit_consent"] != null && r["Explicit_consent"] != DBNull.Value)
             Explicit_consent = (bool)r["Explicit_consent"];
 
         TimeCoverage_ExtractionInformation_ID = ObjectToNullableInt(r["TimeCoverage_ExtractionInformation_ID"]);
@@ -807,7 +827,7 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
         if (oDatasetStartDate == null || oDatasetStartDate == DBNull.Value)
             DatasetStartDate = null;
         else
-            DatasetStartDate = (DateTime) oDatasetStartDate;
+            DatasetStartDate = (DateTime)oDatasetStartDate;
 
 
         ValidatorXML = r["ValidatorXML"] as string;
@@ -816,13 +836,13 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
 
         //detailed info url with support for invalid urls
         API_access_URL = ParseUrl(r, "API_access_URL");
-        Browse_URL = ParseUrl(r, "Browse_URL" );
+        Browse_URL = ParseUrl(r, "Browse_URL");
         Bulk_Download_URL = ParseUrl(r, "Bulk_Download_URL");
         Query_tool_URL = ParseUrl(r, "Query_tool_URL");
         Source_URL = ParseUrl(r, "Source_URL");
-        IsDeprecated = (bool) r["IsDeprecated"];
+        IsDeprecated = (bool)r["IsDeprecated"];
         IsInternalDataset = (bool)r["IsInternalDataset"];
-        IsColdStorageDataset = (bool) r["IsColdStorageDataset"];
+        IsColdStorageDataset = (bool)r["IsColdStorageDataset"];
 
         Folder = r["Folder"].ToString();
 
@@ -831,15 +851,12 @@ internal Catalogue(ICatalogueRepository repository, DbDataReader r)
 
     internal Catalogue(ShareManager shareManager, ShareDefinition shareDefinition)
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
         ClearAllInjections();
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Sorts alphabetically based on <see cref="Name"/>
@@ -848,10 +865,7 @@ public override string ToString()
     /// <returns></returns>
     public int CompareTo(object obj)
     {
-        if (obj is Catalogue)
-        {
-            return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
-        }
+        if (obj is Catalogue) return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
 
         throw new Exception($"Cannot compare {GetType().Name} to {obj.GetType().Name}");
     }
@@ -868,7 +882,8 @@ public void Check(ICheckNotifier notifier)
                     $"Catalogue name {Name} (ID={ID}) does not follow naming conventions reason:{reason}",
                     CheckResult.Fail));
         else
-            notifier.OnCheckPerformed(new CheckEventArgs($"Catalogue name {Name} follows naming conventions ",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Catalogue name {Name} follows naming conventions ",
+                CheckResult.Success));
 
         var tables = GetTableInfoList(true);
         foreach (TableInfo t in tables)
@@ -880,7 +895,7 @@ public void Check(ICheckNotifier notifier)
         {
             var missingColumnInfos = false;
 
-            foreach (var missingColumnInfo in extractionInformations.Where(e=>e.ColumnInfo == null))
+            foreach (var missingColumnInfo in extractionInformations.Where(e => e.ColumnInfo == null))
             {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
@@ -894,7 +909,8 @@ public void Check(ICheckNotifier notifier)
 
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Found {extractionInformations.Length} ExtractionInformation(s), preparing to validate SQL with QueryBuilder", CheckResult.Success));
+                    $"Found {extractionInformations.Length} ExtractionInformation(s), preparing to validate SQL with QueryBuilder",
+                    CheckResult.Success));
 
             var accessContext = DataAccessContext.InternalDataProcessing;
 
@@ -917,7 +933,8 @@ public void Check(ICheckNotifier notifier)
 
                         sql = qb.SQL;
                         notifier.OnCheckPerformed(new CheckEventArgs(
-                            $"Query Builder assembled the following SQL:{Environment.NewLine}{sql}", CheckResult.Success));
+                            $"Query Builder assembled the following SQL:{Environment.NewLine}{sql}",
+                            CheckResult.Success));
                     }
                     catch (Exception e)
                     {
@@ -927,17 +944,19 @@ public void Check(ICheckNotifier notifier)
                         return;
                     }
 
-                    using(var cmd = DatabaseCommandHelper.GetCommand(sql, con))
+                    using (var cmd = DatabaseCommandHelper.GetCommand(sql, con))
                     {
                         cmd.CommandTimeout = 10;
                         using (var r = cmd.ExecuteReader())
                         {
                             if (r.Read())
                                 notifier.OnCheckPerformed(new CheckEventArgs(
-                                    $"successfully read a row of data from the extraction SQL of Catalogue {this}",CheckResult.Success));
+                                    $"successfully read a row of data from the extraction SQL of Catalogue {this}",
+                                    CheckResult.Success));
                             else
                                 notifier.OnCheckPerformed(new CheckEventArgs(
-                                    $"The query produced an empty result set for Catalogue{this}", CheckResult.Warning));
+                                    $"The query produced an empty result set for Catalogue{this}",
+                                    CheckResult.Warning));
                         }
                     }
 
@@ -972,7 +991,7 @@ public ITableInfo[] GetTableInfoList(bool includeLookupTables)
     /// <inheritdoc/>
     public ITableInfo[] GetLookupTableInfoList()
     {
-        GetTableInfos(out List<ITableInfo> normalTables, out var lookupTables);
+        GetTableInfos(out var normalTables, out var lookupTables);
 
         return lookupTables.ToArray();
     }
@@ -984,12 +1003,14 @@ public void GetTableInfos(out List<ITableInfo> normalTables, out List<ITableInfo
     }
 
     /// <inheritdoc/>
-    public void GetTableInfos(ICoreChildProvider provider, out List<ITableInfo> normalTables, out List<ITableInfo> lookupTables)
+    public void GetTableInfos(ICoreChildProvider provider, out List<ITableInfo> normalTables,
+        out List<ITableInfo> lookupTables)
     {
         GetAllTableInfos(t => t.IsLookupTable(provider), out normalTables, out lookupTables);
     }
 
-    private void GetAllTableInfos(Func<ITableInfo, bool> isLookupTableDelegate, out List<ITableInfo> normalTables, out List<ITableInfo> lookupTables)
+    private void GetAllTableInfos(Func<ITableInfo, bool> isLookupTableDelegate, out List<ITableInfo> normalTables,
+        out List<ITableInfo> lookupTables)
     {
         var tables = GetColumnInfos().GroupBy(c => c.TableInfo_ID).Select(c => c.First().TableInfo).ToArray();
 
@@ -1002,13 +1023,15 @@ private IEnumerable<ColumnInfo> GetColumnInfos()
         if (CatalogueItems.All(ci => ci.IsColumnInfoCached()))
             return CatalogueItems.Select(ci => ci.ColumnInfo).Where(col => col != null);
 
-        return Repository.GetAllObjectsInIDList<ColumnInfo>(CatalogueItems.Where(ci => ci.ColumnInfo_ID.HasValue).Select(ci => ci.ColumnInfo_ID.Value).Distinct().ToList());
+        return Repository.GetAllObjectsInIDList<ColumnInfo>(CatalogueItems.Where(ci => ci.ColumnInfo_ID.HasValue)
+            .Select(ci => ci.ColumnInfo_ID.Value).Distinct().ToList());
     }
 
     /// <inheritdoc/>
     public ExtractionFilter[] GetAllMandatoryFilters()
     {
-        return GetAllExtractionInformation(ExtractionCategory.Any).SelectMany(f=>f.ExtractionFilters).Where(f=>f.IsMandatory).ToArray();
+        return GetAllExtractionInformation(ExtractionCategory.Any).SelectMany(f => f.ExtractionFilters)
+            .Where(f => f.IsMandatory).ToArray();
     }
 
     /// <inheritdoc/>
@@ -1018,7 +1041,8 @@ public ExtractionFilter[] GetAllFilters()
     }
 
     /// <inheritdoc/>
-    public DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase, out IDataAccessPoint distinctAccessPoint)
+    public DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase,
+        out IDataAccessPoint distinctAccessPoint)
     {
         var tables = GetTableInfosIdeallyJustFromMainTables();
 
@@ -1028,15 +1052,12 @@ public DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context,
     }
 
     /// <inheritdoc/>
-    public DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase)
-    {
-        return DataAccessPortal.ExpectDistinctServer(GetTableInfosIdeallyJustFromMainTables(), context, setInitialDatabase);
-    }
+    public DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase) =>
+        DataAccessPortal.ExpectDistinctServer(GetTableInfosIdeallyJustFromMainTables(), context, setInitialDatabase);
 
     /// <inheritdoc/>
     public ITableInfo[] GetTableInfosIdeallyJustFromMainTables()
     {
-
         //try with only the normal tables
         var tables = GetTableInfoList(false);
 
@@ -1082,7 +1103,7 @@ public void HardDisassociateLoadMetadata()
     /// <returns></returns>
     public LogManager GetLogManager()
     {
-        if(LiveLoggingServer_ID == null)
+        if (LiveLoggingServer_ID == null)
             throw new Exception($"No live logging server set for Catalogue {Name}");
 
         var server = DataAccessPortal.ExpectServer(LiveLoggingServer, DataAccessContext.Logging);
@@ -1097,17 +1118,14 @@ public IHasDependencies[] GetObjectsThisDependsOn()
 
         iDependOn.AddRange(CatalogueItems);
 
-        if(LoadMetadata != null)
+        if (LoadMetadata != null)
             iDependOn.Add(LoadMetadata);
 
         return iDependOn.ToArray();
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return AggregateConfigurations;
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => AggregateConfigurations;
 
     /// <inheritdoc/>
     public SupportingDocument[] GetAllSupportingDocuments(FetchOptions fetch)
@@ -1118,7 +1136,7 @@ public SupportingDocument[] GetAllSupportingDocuments(FetchOptions fetch)
     /// <inheritdoc/>
     public SupportingSQLTable[] GetAllSupportingSQLTablesForCatalogue(FetchOptions fetch)
     {
-        return Repository.GetAllObjects<SupportingSQLTable>().Where(o=>Fetch(o,fetch)).ToArray();
+        return Repository.GetAllObjects<SupportingSQLTable>().Where(o => Fetch(o, fetch)).ToArray();
     }
 
     private bool Fetch(ISupportingObject o, FetchOptions fetch)
@@ -1136,7 +1154,7 @@ private bool Fetch(ISupportingObject o, FetchOptions fetch)
     }
 
 
-    private string GetFetchSQL<T>(FetchOptions fetch) where T:IMapsDirectlyToDatabaseTable
+    private string GetFetchSQL<T>(FetchOptions fetch) where T : IMapsDirectlyToDatabaseTable
     {
         return fetch switch
         {
@@ -1153,10 +1171,7 @@ private string GetFetchSQL<T>(FetchOptions fetch) where T:IMapsDirectlyToDatabas
     }
 
     /// <inheritdoc/>
-    public ExtractionInformation[] GetAllExtractionInformation()
-    {
-        return GetAllExtractionInformation(ExtractionCategory.Any);
-    }
+    public ExtractionInformation[] GetAllExtractionInformation() => GetAllExtractionInformation(ExtractionCategory.Any);
 
     /// <inheritdoc/>
     public ExtractionInformation[] GetAllExtractionInformation(ExtractionCategory category)
@@ -1191,7 +1206,8 @@ public void InjectKnown(CatalogueItem[] instance)
     public void ClearAllInjections()
     {
         _extractabilityStatus = null;
-        _knownCatalogueItems = new Lazy<CatalogueItem[]>(() => Repository.GetAllObjectsWithParent<CatalogueItem,Catalogue>(this));
+        _knownCatalogueItems =
+            new Lazy<CatalogueItem[]>(() => Repository.GetAllObjectsWithParent<CatalogueItem, Catalogue>(this));
     }
 
     /// <inheritdoc/>
@@ -1222,11 +1238,12 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     {
         var f = new QuerySyntaxHelperFactory();
         var type = GetDistinctLiveDatabaseServerType() ?? throw new AmbiguousDatabaseTypeException(
-                $"Catalogue '{this}' has no extractable columns so no Database Type could be determined");
+            $"Catalogue '{this}' has no extractable columns so no Database Type could be determined");
         return f.Create(type);
     }
 
     #region Static Methods
+
     /// <summary>
     /// Returns true if the given name would be sensible for a Catalogue.  This means no slashes, hashes @ symbols etc and other things which make XML serialization hard
     /// or prevent naming a database table after a Catalogue (all things we might want to do with the <see cref="Catalogue.Name"/>).
@@ -1242,7 +1259,9 @@ public static bool IsAcceptableName(string name, out string reason)
             return false;
         }
 
-        var invalidCharacters = name.Where(c => Path.GetInvalidPathChars().Contains(c) || c == '\\' || c == '/' || c == '.' || c == '#' || c == '@' || c == '$').ToArray();
+        var invalidCharacters = name.Where(c =>
+            Path.GetInvalidPathChars().Contains(c) || c == '\\' || c == '/' || c == '.' || c == '#' || c == '@' ||
+            c == '$').ToArray();
         if (invalidCharacters.Any())
         {
             reason =
@@ -1255,12 +1274,9 @@ public static bool IsAcceptableName(string name, out string reason)
     }
 
     /// <inheritdoc cref="Catalogue.IsAcceptableName(string,out string)"/>
-    public static bool IsAcceptableName(string name)
-    {
-        return IsAcceptableName(name, out string whoCares);
-    }
-    #endregion
+    public static bool IsAcceptableName(string name) => IsAcceptableName(name, out var whoCares);
 
+    #endregion
 
 
     /// <inheritdoc/>
@@ -1272,23 +1288,18 @@ public ICatalogue ShallowClone()
     }
 
 
-    public bool IsApiCall()
-    {
-        return Name.StartsWith(PluginCohortCompiler.ApiPrefix);
-    }
+    public bool IsApiCall() => Name.StartsWith(PluginCohortCompiler.ApiPrefix);
 
     public bool IsApiCall(out IPluginCohortCompiler plugin)
     {
-        if(!IsApiCall())
+        if (!IsApiCall())
         {
             plugin = null;
             return false;
         }
 
-        if(CatalogueRepository.MEF == null)
-        {
+        if (CatalogueRepository.MEF == null)
             throw new Exception("MEF has not been loaded yet so cannot find compatible IPluginCohortCompilers");
-        }
 
         plugin = new PluginCohortCompilerFactory(CatalogueRepository.MEF)
             .CreateAll().FirstOrDefault(p => p.ShouldRun(this));
diff --git a/Rdmp.Core/Curation/Data/CatalogueItem.cs b/Rdmp.Core/Curation/Data/CatalogueItem.cs
index 97890a0fdf..de0550fa37 100644
--- a/Rdmp.Core/Curation/Data/CatalogueItem.cs
+++ b/Rdmp.Core/Curation/Data/CatalogueItem.cs
@@ -36,7 +36,8 @@ namespace Rdmp.Core.Curation.Data;
 /// 
 /// <para>Both the above would extract from the same ColumnInfo DateOfBirth</para>
 /// </summary>
-public class CatalogueItem : DatabaseEntity, IDeleteable, IComparable, IHasDependencies, IRevertable, INamed, IInjectKnown<ExtractionInformation>,IInjectKnown<ColumnInfo>, IInjectKnown<Catalogue>
+public class CatalogueItem : DatabaseEntity, IDeleteable, IComparable, IHasDependencies, IRevertable, INamed,
+    IInjectKnown<ExtractionInformation>, IInjectKnown<ColumnInfo>, IInjectKnown<Catalogue>
 {
     #region Database Properties
 
@@ -59,7 +60,7 @@ public class CatalogueItem : DatabaseEntity, IDeleteable, IComparable, IHasDepen
     /// <summary>
     /// The ID of the parent <see cref="Catalogue"/> (dataset) to which this is a virtual column/column description
     /// </summary>
-    [Relationship(typeof(Catalogue),RelationshipType.SharedObject)]
+    [Relationship(typeof(Catalogue), RelationshipType.SharedObject)]
     [DoNotExtractProperty]
     public int Catalogue_ID
     {
@@ -70,18 +71,21 @@ public int Catalogue_ID
             ClearAllInjections();
         }
     }
+
     /// <inheritdoc/>
     [NotNull]
     [DoNotImportDescriptions]
-    public string Name {
+    public string Name
+    {
         get => _Name;
-        set => SetField(ref _Name,value);
+        set => SetField(ref _Name, value);
     }
 
     /// <summary>
     /// User supplied field meant to identify any statistical anomalies with the data in the column described.  Not used for anything by RDMP.
     /// </summary>
-    public string Statistical_cons {
+    public string Statistical_cons
+    {
         get => _Statistical_cons;
         set => SetField(ref _Statistical_cons, value);
     }
@@ -92,7 +96,7 @@ public string Statistical_cons {
     public string Research_relevance
     {
         get => _Research_relevance;
-        set => SetField(ref _Research_relevance , value);
+        set => SetField(ref _Research_relevance, value);
     }
 
 
@@ -103,7 +107,7 @@ public string Research_relevance
     public string Description
     {
         get => _Description;
-        set => SetField(ref _Description , value);
+        set => SetField(ref _Description, value);
     }
 
     /// <summary>
@@ -112,7 +116,7 @@ public string Description
     public string Topic
     {
         get => _Topic;
-        set => SetField(ref _Topic , value);
+        set => SetField(ref _Topic, value);
     }
 
     /// <summary>
@@ -121,7 +125,7 @@ public string Topic
     public string Agg_method
     {
         get => _Agg_method;
-        set => SetField(ref _Agg_method , value);
+        set => SetField(ref _Agg_method, value);
     }
 
     /// <summary>
@@ -130,7 +134,7 @@ public string Agg_method
     public string Limitations
     {
         get => _Limitations;
-        set => SetField(ref _Limitations , value);
+        set => SetField(ref _Limitations, value);
     }
 
     /// <summary>
@@ -139,7 +143,7 @@ public string Limitations
     public string Comments
     {
         get => _Comments;
-        set => SetField( ref _Comments , value);
+        set => SetField(ref _Comments, value);
     }
 
     /// <summary>
@@ -148,17 +152,18 @@ public string Comments
     /// e.g. you might release the first 3 digits of a postcode to anyone (<see cref="ExtractionCategory.Core"/>) but only release the full postcode with
     /// <see cref="ExtractionCategory.SpecialApprovalRequired"/>.
     /// </summary>
-    [Relationship(typeof(ColumnInfo), RelationshipType.IgnoreableLocalReference)]  //will appear as empty, then the user can guess from a table
+    [Relationship(typeof(ColumnInfo),
+        RelationshipType.IgnoreableLocalReference)] //will appear as empty, then the user can guess from a table
     public int? ColumnInfo_ID
     {
         get => _columnInfoID;
         set
         {
             //don't change it to the same value it already has
-            if(value == ColumnInfo_ID )
+            if (value == ColumnInfo_ID)
                 return;
 
-            SetField(ref _columnInfoID , value);
+            SetField(ref _columnInfoID, value);
             ClearAllInjections();
         }
     }
@@ -169,13 +174,14 @@ public int? ColumnInfo_ID
     public Catalogue.CataloguePeriodicity Periodicity
     {
         get => _periodicity;
-        set => SetField(ref _periodicity , value);
+        set => SetField(ref _periodicity, value);
     }
 
     #endregion
 
 
     #region Relationships
+
     /// <inheritdoc cref="Catalogue_ID"/>
     [NoMappingToDatabase]
     public Catalogue Catalogue => _knownCatalogue.Value;
@@ -191,10 +197,7 @@ public Catalogue.CataloguePeriodicity Periodicity
     [NoMappingToDatabase]
     public ColumnInfo ColumnInfo => _knownColumnInfo.Value;
 
-    internal bool IsColumnInfoCached()
-    {
-        return _knownColumnInfo.IsValueCreated;
-    }
+    internal bool IsColumnInfoCached() => _knownColumnInfo.IsValueCreated;
 
     #endregion
 
@@ -218,10 +221,10 @@ public CatalogueItem()
     /// </summary>
     public CatalogueItem(ICatalogueRepository repository, ICatalogue parent, string name)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"Catalogue_ID", parent.ID}
+            { "Name", name },
+            { "Catalogue_ID", parent.ID }
         });
 
         ClearAllInjections();
@@ -231,7 +234,9 @@ public CatalogueItem(ICatalogueRepository repository, ICatalogue parent, string
     internal CatalogueItem(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        Catalogue_ID = int.Parse(r["Catalogue_ID"].ToString()); //gets around decimals and other random crud number field types that sql returns
+        Catalogue_ID =
+            int.Parse(r["Catalogue_ID"]
+                .ToString()); //gets around decimals and other random crud number field types that sql returns
         Name = (string)r["Name"];
         Statistical_cons = r["Statistical_cons"].ToString();
         Research_relevance = r["Research_relevance"].ToString();
@@ -255,7 +260,7 @@ internal CatalogueItem(ICatalogueRepository repository, DbDataReader r)
 
     internal CatalogueItem(ShareManager shareManager, ShareDefinition shareDefinition)
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
     }
 
     /// <inheritdoc/>
@@ -272,15 +277,10 @@ public void ClearAllInjections()
         _knownCatalogue = new Lazy<Catalogue>(FetchCatalogue);
     }
 
-    private Catalogue FetchCatalogue()
-    {
-        return Repository.GetObjectByID<Catalogue>(Catalogue_ID);
-    }
+    private Catalogue FetchCatalogue() => Repository.GetObjectByID<Catalogue>(Catalogue_ID);
 
-    private ExtractionInformation FetchExtractionInformationIfAny()
-    {
-        return Repository.GetAllObjectsWithParent<ExtractionInformation>(this).SingleOrDefault();
-    }
+    private ExtractionInformation FetchExtractionInformationIfAny() =>
+        Repository.GetAllObjectsWithParent<ExtractionInformation>(this).SingleOrDefault();
 
     private ColumnInfo FetchColumnInfoIfAny()
     {
@@ -295,6 +295,7 @@ public void InjectKnown(ExtractionInformation instance)
     {
         _knownExtractionInformation = new Lazy<ExtractionInformation>(instance);
     }
+
     /// <inheritdoc/>
     public void InjectKnown(ColumnInfo instance)
     {
@@ -302,10 +303,7 @@ public void InjectKnown(ColumnInfo instance)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Sorts alphabetically by <see cref="Name"/>
@@ -314,10 +312,7 @@ public override string ToString()
     /// <returns></returns>
     public int CompareTo(object obj)
     {
-        if (obj is CatalogueItem)
-        {
-            return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
-        }
+        if (obj is CatalogueItem) return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
 
         throw new Exception($"Cannot compare {GetType().Name} to {obj.GetType().Name}");
     }
@@ -329,22 +324,23 @@ public int CompareTo(object obj)
     /// <returns></returns>
     public CatalogueItem CloneCatalogueItemWithIDIntoCatalogue(Catalogue cataToImportTo)
     {
-        if(Catalogue_ID == cataToImportTo.ID)
-            throw new ArgumentException("Cannot clone a CatalogueItem into its own parent, specify a different catalogue to clone into");
+        if (Catalogue_ID == cataToImportTo.ID)
+            throw new ArgumentException(
+                "Cannot clone a CatalogueItem into its own parent, specify a different catalogue to clone into");
 
         var clone = new CatalogueItem((ICatalogueRepository)cataToImportTo.Repository, cataToImportTo, Name);
 
         //Get all the properties
-        var propertyInfo = GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        var propertyInfo =
+            GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
         //Assign all source property to taget object 's properties
         foreach (var property in propertyInfo)
-        {
             //Check whether property can be written to
             if (property.CanWrite && !property.Name.Equals("ID") && !property.Name.Equals("Catalogue_ID"))
-                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum || property.PropertyType.Equals(typeof(string)))
+                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum ||
+                    property.PropertyType.Equals(typeof(string)))
                     property.SetValue(clone, property.GetValue(this, null), null);
-        }
 
         clone.SaveToDatabase();
 
@@ -372,7 +368,8 @@ public IEnumerable<ColumnInfo> GuessAssociatedColumn(ColumnInfo[] guessPool, boo
             return Guess;
 
         //ignore caps and remove spaces match instead
-        Guess = guessPool.Where(col => col.GetRuntimeName().ToLower().Replace(" ", "").Equals(Name.ToLower().Replace(" ", ""))).ToArray();
+        Guess = guessPool.Where(col =>
+            col.GetRuntimeName().ToLower().Replace(" ", "").Equals(Name.ToLower().Replace(" ", ""))).ToArray();
         if (Guess.Any())
             return Guess;
 
@@ -387,10 +384,7 @@ public IEnumerable<ColumnInfo> GuessAssociatedColumn(ColumnInfo[] guessPool, boo
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return null;
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => null;
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsDependingOnThis()
@@ -399,10 +393,10 @@ public IHasDependencies[] GetObjectsDependingOnThis()
 
         var exInfo = ExtractionInformation;
 
-        if(exInfo != null)
+        if (exInfo != null)
             dependantObjects.Add(exInfo);
 
-        if(ColumnInfo_ID != null)
+        if (ColumnInfo_ID != null)
             dependantObjects.Add(ColumnInfo);
 
         dependantObjects.Add(Catalogue);
@@ -434,9 +428,7 @@ public override string GetSummary(bool includeName, bool includeID)
         var sb = new StringBuilder();
 
         foreach (var prop in GetType().GetProperties().Where(p => p.Name.Contains("Description")))
-        {
             AppendPropertyToSummary(sb, prop, includeName, includeID, false);
-        }
 
         sb.AppendLine(SUMMARY_LINE_DIVIDER);
 
@@ -445,9 +437,7 @@ public override string GetSummary(bool includeName, bool includeID)
         sb.AppendLine($"Category: {ExtractionInformation?.ExtractionCategory ?? (object)"Not Extractable"}");
 
         foreach (var prop in GetType().GetProperties().Where(p => !p.Name.Contains("Description")))
-        {
             AppendPropertyToSummary(sb, prop, includeName, includeID);
-        }
 
         return sb.ToString();
     }
diff --git a/Rdmp.Core/Curation/Data/CatalogueObscureDependencyFinder.cs b/Rdmp.Core/Curation/Data/CatalogueObscureDependencyFinder.cs
index 2d456c114a..708851b7b1 100644
--- a/Rdmp.Core/Curation/Data/CatalogueObscureDependencyFinder.cs
+++ b/Rdmp.Core/Curation/Data/CatalogueObscureDependencyFinder.cs
@@ -35,7 +35,7 @@ public CatalogueObscureDependencyFinder(ICatalogueRepository repository)
     /// Plugin and supplemental child IObscureDependencyFinders
     /// </summary>
     public List<IObscureDependencyFinder> OtherDependencyFinders = new();
-        
+
     /// <inheritdoc/>
     /// <remarks>Consults each <see cref="OtherDependencyFinders"/> to see if deleting is disallowed</remarks>
     /// <param name="oTableWrapperObject"></param>
@@ -55,7 +55,7 @@ public void HandleCascadeDeletesForDeletedObject(IMapsDirectlyToDatabaseTable oT
             obscureDependencyFinder.HandleCascadeDeletesForDeletedObject(oTableWrapperObject);
 
         //Delete any SQLFilterParameters associated with the parent object (which has just been deleted!)
-        if(AnyTableSqlParameter.IsSupportedType(oTableWrapperObject.GetType()))
+        if (AnyTableSqlParameter.IsSupportedType(oTableWrapperObject.GetType()))
             foreach (var p in _repository.GetAllParametersForParentTable(oTableWrapperObject))
                 p.DeleteInDatabase();
     }
@@ -65,7 +65,8 @@ public void HandleCascadeDeletesForDeletedObject(IMapsDirectlyToDatabaseTable oT
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="repositoryLocator"></param>
-    public void AddOtherDependencyFinderIfNotExists<T>(IRDMPPlatformRepositoryServiceLocator repositoryLocator) where T:IObscureDependencyFinder
+    public void AddOtherDependencyFinderIfNotExists<T>(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+        where T : IObscureDependencyFinder
     {
         if (OtherDependencyFinders.All(f => f.GetType() != typeof(T)))
         {
diff --git a/Rdmp.Core/Curation/Data/Cohort/AnyTableSqlParameter.cs b/Rdmp.Core/Curation/Data/Cohort/AnyTableSqlParameter.cs
index bbf64570f9..547a67204a 100644
--- a/Rdmp.Core/Curation/Data/Cohort/AnyTableSqlParameter.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/AnyTableSqlParameter.cs
@@ -28,15 +28,14 @@ namespace Rdmp.Core.Curation.Data.Cohort;
 /// so that you don't have to manually update every parameter when you want to change your study criteria.  For this to work all AggregateFilterParameters must have the same name
 /// and datatype AND comment! as the study filters (see CohortQueryBuilder).
 /// </summary>
-public class AnyTableSqlParameter : ReferenceOtherObjectDatabaseEntity, ISqlParameter,IHasDependencies
+public class AnyTableSqlParameter : ReferenceOtherObjectDatabaseEntity, ISqlParameter, IHasDependencies
 {
-
     /// <summary>
     /// Names that are not allowed for user custom parameters because they
     /// are used internally by RMDP query building engines
     /// </summary>
-    public static readonly string[] ProhibitedParameterNames = {
-
+    public static readonly string[] ProhibitedParameterNames =
+    {
         "@CohortDefinitionID",
         "@ProjectNumber",
         "@dateAxis",
@@ -50,19 +49,21 @@ public class AnyTableSqlParameter : ReferenceOtherObjectDatabaseEntity, ISqlPara
         "@pos",
         "@len",
         "@startDate",
-        "@endDate"};
+        "@endDate"
+    };
 
     #region Database Properties
+
     private string _parameterSQL;
     private string _value;
     private string _comment;
-        
+
     /// <inheritdoc/>
     [Sql]
     public string ParameterSQL
     {
         get => _parameterSQL;
-        set => SetField(ref  _parameterSQL, value);
+        set => SetField(ref _parameterSQL, value);
     }
 
     /// <inheritdoc/>
@@ -70,14 +71,14 @@ public string ParameterSQL
     public string Value
     {
         get => _value;
-        set => SetField(ref  _value, value);
+        set => SetField(ref _value, value);
     }
 
     /// <inheritdoc/>
     public string Comment
     {
         get => _comment;
-        set => SetField(ref  _comment, value);
+        set => SetField(ref _comment, value);
     }
 
     #endregion
@@ -93,7 +94,6 @@ public string Comment
 
     public AnyTableSqlParameter()
     {
-
     }
 
     /// <summary>
@@ -104,14 +104,15 @@ public AnyTableSqlParameter()
     /// <param name="repository"></param>
     /// <param name="parent"></param>
     /// <param name="parameterSQL"></param>
-    public AnyTableSqlParameter(ICatalogueRepository repository, IMapsDirectlyToDatabaseTable parent, string parameterSQL)
+    public AnyTableSqlParameter(ICatalogueRepository repository, IMapsDirectlyToDatabaseTable parent,
+        string parameterSQL)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",parent.ID},
-            {"ReferencedObjectType",parent.GetType().Name},
-            {"ReferencedObjectRepositoryType",parent.Repository.GetType().Name},
-            {"ParameterSQL", parameterSQL}
+            { "ReferencedObjectID", parent.ID },
+            { "ReferencedObjectType", parent.GetType().Name },
+            { "ReferencedObjectRepositoryType", parent.Repository.GetType().Name },
+            { "ParameterSQL", parameterSQL }
         });
     }
 
@@ -124,10 +125,7 @@ internal AnyTableSqlParameter(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     /// <inheritdoc cref="ParameterSyntaxChecker"/>
     public void Check(ICheckNotifier notifier)
@@ -139,7 +137,8 @@ public void Check(ICheckNotifier notifier)
     public IQuerySyntaxHelper GetQuerySyntaxHelper()
     {
         if (GetOwnerIfAny() is not IHasQuerySyntaxHelper parentWithQuerySyntaxHelper)
-            throw new AmbiguousDatabaseTypeException($"Could not figure out what the query syntax helper is for {this}");
+            throw new AmbiguousDatabaseTypeException(
+                $"Could not figure out what the query syntax helper is for {this}");
 
         return parentWithQuerySyntaxHelper.GetQuerySyntaxHelper();
     }
@@ -151,10 +150,7 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     /// <param name="type"></param>
     /// <returns></returns>
     /// <seealso cref="DescribeUseCaseForParent"/>
-    public static bool IsSupportedType(Type type)
-    {
-        return DescribeUseCaseForParent(type) != null;
-    }
+    public static bool IsSupportedType(Type type) => DescribeUseCaseForParent(type) != null;
 
     /// <summary>
     /// Describes how the <see cref="ISqlParameter"/>s declared in this table will be used with parents of the supplied Type (See <see cref="ReferenceOtherObjectDatabaseEntity.ReferencedObjectType"/>).
@@ -165,13 +161,16 @@ public static bool IsSupportedType(Type type)
     public static string DescribeUseCaseForParent(Type type)
     {
         if (type == typeof(CohortIdentificationConfiguration))
-            return "SQLParameters at this level are global for a given cohort identification configuration task e.g. @StudyWindowStartDate which could then be used by 10 datasets within that configuration";
+            return
+                "SQLParameters at this level are global for a given cohort identification configuration task e.g. @StudyWindowStartDate which could then be used by 10 datasets within that configuration";
 
-        if (type == typeof (AggregateConfiguration))
-            return "SQLParameters at this level are intended for fulfilling table valued function parameters and centralising parameter declarations across multiple AggregateFilter(s) within a single AggregateConfiguration (note that while these are 'global' with respect to the filters, if the AggregateConfiguration is part of a multiple configuration CohortIdentificationConfiguration then this is less 'global' than those declared at that level)";
+        if (type == typeof(AggregateConfiguration))
+            return
+                "SQLParameters at this level are intended for fulfilling table valued function parameters and centralising parameter declarations across multiple AggregateFilter(s) within a single AggregateConfiguration (note that while these are 'global' with respect to the filters, if the AggregateConfiguration is part of a multiple configuration CohortIdentificationConfiguration then this is less 'global' than those declared at that level)";
 
         if (type == typeof(TableInfo))
-            return "SQLParameters at this level are intended for fulfilling table valued function parameters, note that these should/can be overridden later on e.g. in Extraction/Cohort generation.  This value is intended to give a baseline result which can be run through DataQualityEngine and Checking etc";
+            return
+                "SQLParameters at this level are intended for fulfilling table valued function parameters, note that these should/can be overridden later on e.g. in Extraction/Cohort generation.  This value is intended to give a baseline result which can be run through DataQualityEngine and Checking etc";
 
         return null;
     }
@@ -186,7 +185,8 @@ public static string DescribeUseCaseForParent(Type type)
     public static bool HasProhibitedName(ISqlParameter parameter)
     {
         //it is a user parameter and has a prohibited name
-        return parameter is IMapsDirectlyToDatabaseTable && ProhibitedParameterNames.Any(n => n.Equals(parameter.ParameterName, StringComparison.CurrentCultureIgnoreCase));
+        return parameter is IMapsDirectlyToDatabaseTable && ProhibitedParameterNames.Any(n =>
+            n.Equals(parameter.ParameterName, StringComparison.CurrentCultureIgnoreCase));
     }
 
     /// <summary>
@@ -195,22 +195,19 @@ public static bool HasProhibitedName(ISqlParameter parameter)
     /// <returns></returns>
     public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
     {
-        var type = typeof (Catalogue).Assembly.GetTypes().Single(t=>t.Name.Equals(ReferencedObjectType));
+        var type = typeof(Catalogue).Assembly.GetTypes().Single(t => t.Name.Equals(ReferencedObjectType));
 
-        return Repository.GetObjectByID(type,ReferencedObjectID);
+        return Repository.GetObjectByID(type, ReferencedObjectID);
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsDependingOnThis()
     {
         if (GetOwnerIfAny() is IHasDependencies parent)
-            return new[] {parent};
+            return new[] { parent };
 
         return Array.Empty<IHasDependencies>();
     }
@@ -220,16 +217,11 @@ public IHasDependencies[] GetObjectsDependingOnThis()
     /// </summary>
     /// <param name="parameterName"></param>
     /// <returns></returns>
-    public static string GetDefaultDeclaration(string parameterName)
-    {
-        return $"DECLARE {parameterName} as varchar(10)";
-    }
+    public static string GetDefaultDeclaration(string parameterName) => $"DECLARE {parameterName} as varchar(10)";
 
     /// <inheritdoc cref="GetValuePromptDialogArgs(IFilter, ISqlParameter)"/>
-    public static DialogArgs GetValuePromptDialogArgs(ISqlParameter parameter)
-    {
-        return GetValuePromptDialogArgs(null, parameter);
-    }
+    public static DialogArgs GetValuePromptDialogArgs(ISqlParameter parameter) =>
+        GetValuePromptDialogArgs(null, parameter);
 
     /// <summary>
     /// Returns a task description with user friendly information for when a parameter value needs to be changed
@@ -243,16 +235,11 @@ public static DialogArgs GetValuePromptDialogArgs(IFilter filter, ISqlParameter
             return null;
 
         var windowTitle = $"Set '{parameter.ParameterName}' value";
-        if (filter != null)
-        {
-            windowTitle += $" for '{filter.Name}'";
-        }
+        if (filter != null) windowTitle += $" for '{filter.Name}'";
 
         var desc = $"Enter a value for the parameter '{parameter.ParameterName}'.";
         if (!string.IsNullOrWhiteSpace(parameter.Comment))
-        {
             desc += $"{parameter.ParameterName} is '{parameter.Comment}'";
-        }
 
         return new DialogArgs
         {
diff --git a/Rdmp.Core/Curation/Data/Cohort/CohortAggregateContainer.cs b/Rdmp.Core/Curation/Data/Cohort/CohortAggregateContainer.cs
index e9f8a24775..c1223d7c38 100644
--- a/Rdmp.Core/Curation/Data/Cohort/CohortAggregateContainer.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/CohortAggregateContainer.cs
@@ -29,7 +29,7 @@ namespace Rdmp.Core.Curation.Data.Cohort;
 /// <para>EXCEPT - Take patients in the first child container/aggregate and discard any appearing in subsequent child containers/aggregates</para>
 /// 
 /// </summary>
-public class CohortAggregateContainer : DatabaseEntity, IOrderable,INamed,IDisableable, IMightBeReadOnly
+public class CohortAggregateContainer : DatabaseEntity, IOrderable, INamed, IDisableable, IMightBeReadOnly
 {
     #region Database Properties
 
@@ -45,7 +45,7 @@ public class CohortAggregateContainer : DatabaseEntity, IOrderable,INamed,IDisab
     public SetOperation Operation
     {
         get => _operation;
-        set => SetField(ref  _operation, value);
+        set => SetField(ref _operation, value);
     }
 
     /// <inheritdoc/>
@@ -56,7 +56,7 @@ public SetOperation Operation
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -67,22 +67,21 @@ public string Name
     public int Order
     {
         get => _order;
-        set => SetField(ref  _order, value);
+        set => SetField(ref _order, value);
     }
 
     /// <inheritdoc/>
     public bool IsDisabled
     {
         get => _isDisabled;
-        set => SetField(ref _isDisabled , value);
+        set => SetField(ref _isDisabled, value);
     }
 
     #endregion
 
-        
+
     public CohortAggregateContainer()
     {
-
     }
 
     internal CohortAggregateContainer(ICatalogueRepository repository, DbDataReader r)
@@ -104,11 +103,11 @@ internal CohortAggregateContainer(ICatalogueRepository repository, DbDataReader
     /// <param name="operation"></param>
     public CohortAggregateContainer(ICatalogueRepository repository, SetOperation operation)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Operation", operation.ToString()},
-            {"Order", 0},
-            {"Name", operation.ToString()}
+            { "Operation", operation.ToString() },
+            { "Order", 0 },
+            { "Name", operation.ToString() }
         });
     }
 
@@ -118,19 +117,15 @@ public CohortAggregateContainer(ICatalogueRepository repository, SetOperation op
     /// <para>You might want to instead use <seealso cref="GetOrderedContents"/></para>
     /// </summary>
     /// <returns></returns>
-    public CohortAggregateContainer[] GetSubContainers()
-    {
-        return CatalogueRepository.CohortContainerManager.GetChildren(this).OfType<CohortAggregateContainer>().ToArray();
-    }
+    public CohortAggregateContainer[] GetSubContainers() => CatalogueRepository.CohortContainerManager.GetChildren(this)
+        .OfType<CohortAggregateContainer>().ToArray();
 
     /// <summary>
     /// Gets the parent container of the current container (if it is not a root / orphan container)
     /// </summary>
     /// <returns></returns>
-    public CohortAggregateContainer GetParentContainerIfAny()
-    {
-        return CatalogueRepository.CohortContainerManager.GetParent(this);
-    }
+    public CohortAggregateContainer GetParentContainerIfAny() =>
+        CatalogueRepository.CohortContainerManager.GetParent(this);
 
     /// <summary>
     /// Returns all the cohort identifier set queries (See <see cref="AggregateConfiguration"/>) declared as immediate children of the container.  These exist in 
@@ -138,10 +133,8 @@ public CohortAggregateContainer GetParentContainerIfAny()
     /// <para>You might want to instead use <seealso cref="GetOrderedContents"/></para>
     /// </summary>
     /// <returns></returns>
-    public AggregateConfiguration[] GetAggregateConfigurations()
-    {
-        return CatalogueRepository.CohortContainerManager.GetChildren(this).OfType<AggregateConfiguration>().ToArray();
-    }
+    public AggregateConfiguration[] GetAggregateConfigurations() => CatalogueRepository.CohortContainerManager
+        .GetChildren(this).OfType<AggregateConfiguration>().ToArray();
 
     /// <summary>
     /// Makes the configuration a member of this container.
@@ -150,7 +143,7 @@ public AggregateConfiguration[] GetAggregateConfigurations()
     /// <param name="order"></param>
     public void AddChild(AggregateConfiguration configuration, int order)
     {
-        CreateInsertionPointAtOrder(configuration,configuration.Order,true);
+        CreateInsertionPointAtOrder(configuration, configuration.Order, true);
         CatalogueRepository.CohortContainerManager.Add(this, configuration, order);
         configuration.ReFetchOrder();
     }
@@ -166,15 +159,15 @@ public void RemoveChild(AggregateConfiguration configuration)
         CatalogueRepository.CohortContainerManager.Remove(this, configuration);
     }
 
-        
+
     /// <summary>
     /// Deletes all relationships in which this has a parent - kills all containers parents
     /// </summary>
     public void MakeIntoAnOrphan()
     {
         var parent = GetParentContainerIfAny();
-        if(parent != null)
-            CatalogueRepository.CohortContainerManager.Remove(parent,this);
+        if (parent != null)
+            CatalogueRepository.CohortContainerManager.Remove(parent, this);
     }
 
 
@@ -184,11 +177,11 @@ public void MakeIntoAnOrphan()
     /// <param name="child"></param>
     public void AddChild(CohortAggregateContainer child)
     {
-        if(child.IsRootContainer())
+        if (child.IsRootContainer())
             throw new InvalidOperationException("Root containers cannot be added as subcontainers");
 
-        CreateInsertionPointAtOrder(child,child.Order,true);
-        CatalogueRepository.CohortContainerManager.Add(this,child);
+        CreateInsertionPointAtOrder(child, child.Order, true);
+        CatalogueRepository.CohortContainerManager.Add(this, child);
     }
 
     /// <inheritdoc/>
@@ -208,10 +201,7 @@ public override void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public bool ShouldBeReadOnly(out string reason)
     {
@@ -236,10 +226,11 @@ public bool HasChild(CohortAggregateContainer potentialChild)
         var foundChildThroughRecursion = false;
 
         //recurse into all children
-        foreach(var c in GetSubContainers())
-            if (c.HasChild(potentialChild))//ask children recursively the same question (see return statement for the question we are asking)
+        foreach (var c in GetSubContainers())
+            if (c.HasChild(
+                    potentialChild)) //ask children recursively the same question (see return statement for the question we are asking)
                 foundChildThroughRecursion = true;
-            
+
         //are we the one you are looking for or were any of our children
         return potentialChild.ID == ID || foundChildThroughRecursion;
     }
@@ -255,13 +246,14 @@ public bool HasChild(AggregateConfiguration configuration)
 
         //recurse into all children
         foreach (var c in GetSubContainers())
-            if (c.HasChild(configuration))//ask children recursively the same question (see return statement for the question we are asking)
+            if (c.HasChild(
+                    configuration)) //ask children recursively the same question (see return statement for the question we are asking)
                 foundChildThroughRecursion = true;
 
         //are any of the configurations in this bucket the one you are looking for
         return
-            GetAggregateConfigurations().Any(c => c.ID == configuration.ID)//yes
-            || foundChildThroughRecursion;//no but a child had it
+            GetAggregateConfigurations().Any(c => c.ID == configuration.ID) //yes
+            || foundChildThroughRecursion; //no but a child had it
     }
 
     /// <summary>
@@ -299,7 +291,10 @@ public List<AggregateConfiguration> GetAllAggregateConfigurationsRecursively()
     /// <param name="original"></param>
     /// <param name="clone"></param>
     /// <param name="parentToCloneJoinablesDictionary"></param>
-    public CohortAggregateContainer CloneEntireTreeRecursively(ICheckNotifier notifier, CohortIdentificationConfiguration original, CohortIdentificationConfiguration clone, Dictionary<JoinableCohortAggregateConfiguration, JoinableCohortAggregateConfiguration> parentToCloneJoinablesDictionary)
+    public CohortAggregateContainer CloneEntireTreeRecursively(ICheckNotifier notifier,
+        CohortIdentificationConfiguration original, CohortIdentificationConfiguration clone,
+        Dictionary<JoinableCohortAggregateConfiguration, JoinableCohortAggregateConfiguration>
+            parentToCloneJoinablesDictionary)
     {
         //what is in us?
         var contents = GetOrderedContents();
@@ -348,8 +343,8 @@ public CohortAggregateContainer CloneEntireTreeRecursively(ICheckNotifier notifi
                     //is the Joinable we need to do a replace to point them at the correct ix number (although if they are good users they will have aliased any 
                     //patient index columns anyway)
                     if (configClone.RootFilterContainer_ID != null)
-                    {
-                        foreach (var clonedFilter in SqlQueryBuilderHelper.GetAllFiltersUsedInContainerTreeRecursively(configClone.RootFilterContainer))
+                        foreach (var clonedFilter in SqlQueryBuilderHelper.GetAllFiltersUsedInContainerTreeRecursively(
+                                     configClone.RootFilterContainer))
                         {
                             var oldTableAlias = j.GetJoinTableAlias();
                             var newTableAlias = cloneJoinUse.GetJoinTableAlias();
@@ -357,18 +352,18 @@ public CohortAggregateContainer CloneEntireTreeRecursively(ICheckNotifier notifi
                             clonedFilter.WhereSQL = clonedFilter.WhereSQL.Replace(oldTableAlias, newTableAlias);
                             clonedFilter.SaveToDatabase();
                         }
-                    }
-
                 }
             }
 
             //its another container (a subcontainer), recursively call the clone operation on it and add that subtree to teh clone container
             if (content is CohortAggregateContainer container)
             {
-                var cloneSubContainer = container.CloneEntireTreeRecursively(notifier, original, clone,parentToCloneJoinablesDictionary);
+                var cloneSubContainer =
+                    container.CloneEntireTreeRecursively(notifier, original, clone, parentToCloneJoinablesDictionary);
 
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Created clone container {cloneSubContainer} with ID {cloneSubContainer.ID}", CheckResult.Success));
+                    $"Created clone container {cloneSubContainer} with ID {cloneSubContainer.ID}",
+                    CheckResult.Success));
                 cloneContainer.AddChild(cloneSubContainer);
             }
         }
@@ -447,7 +442,7 @@ public List<CohortAggregateContainer> GetAllSubContainersRecursively()
 
         foreach (var sub in subs)
             toReturn.AddRange(sub.GetAllSubContainersRecursively());
-            
+
         return toReturn;
     }
 
diff --git a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs
index b25a15ffa7..9500fae018 100644
--- a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfiguration.cs
@@ -31,7 +31,8 @@ namespace Rdmp.Core.Curation.Data.Cohort;
 /// for cohort generation and includes a high level description of what the cohort requirements are, an optional ticket and is the hanging off point for all the
 /// RootCohortAggregateContainers (the bit that provides the actual filtering/technical data about how the cohort is identified).
 /// </summary>
-public class CohortIdentificationConfiguration : DatabaseEntity, ICollectSqlParameters,INamed, IHasDependencies,ICustomSearchString, IMightBeReadOnly, IHasFolder
+public class CohortIdentificationConfiguration : DatabaseEntity, ICollectSqlParameters, INamed, IHasDependencies,
+    ICustomSearchString, IMightBeReadOnly, IHasFolder
 {
     /// <summary>
     /// Characters that apear in front of any <see cref="AggregateConfiguration"/> which is acting as a cohort identification list or patient index table
@@ -40,6 +41,7 @@ public class CohortIdentificationConfiguration : DatabaseEntity, ICollectSqlPara
     public const string CICPrefix = "cic_";
 
     #region Database Properties
+
     private string _name;
     private string _description;
     private string _ticket;
@@ -57,7 +59,7 @@ public class CohortIdentificationConfiguration : DatabaseEntity, ICollectSqlPara
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -67,7 +69,7 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -77,7 +79,7 @@ public string Description
     public string Ticket
     {
         get => _ticket;
-        set => SetField(ref  _ticket, value);
+        set => SetField(ref _ticket, value);
     }
 
     /// <summary>
@@ -88,7 +90,7 @@ public string Ticket
     public int? RootCohortAggregateContainer_ID
     {
         get => _rootCohortAggregateContainerID;
-        set => SetField(ref  _rootCohortAggregateContainerID, value);
+        set => SetField(ref _rootCohortAggregateContainerID, value);
     }
 
     /// <summary>
@@ -103,7 +105,7 @@ public int? RootCohortAggregateContainer_ID
     public int? QueryCachingServer_ID
     {
         get => _queryCachingServerID;
-        set => SetField(ref  _queryCachingServerID, value);
+        set => SetField(ref _queryCachingServerID, value);
     }
 
     /// <summary>
@@ -114,7 +116,7 @@ public int? QueryCachingServer_ID
     public bool Frozen
     {
         get => _frozen;
-        set => SetField(ref  _frozen, value);
+        set => SetField(ref _frozen, value);
     }
 
     /// <summary>
@@ -124,7 +126,7 @@ public bool Frozen
     public string FrozenBy
     {
         get => _frozenBy;
-        set => SetField(ref  _frozenBy, value);
+        set => SetField(ref _frozenBy, value);
     }
 
     /// <summary>
@@ -134,7 +136,7 @@ public string FrozenBy
     public DateTime? FrozenDate
     {
         get => _frozenDate;
-        set => SetField(ref  _frozenDate, value);
+        set => SetField(ref _frozenDate, value);
     }
 
     /// <summary>
@@ -146,7 +148,7 @@ public DateTime? FrozenDate
     public int? ClonedFrom_ID
     {
         get => _clonedFrom_ID;
-        set => SetField(ref  _clonedFrom_ID, value);
+        set => SetField(ref _clonedFrom_ID, value);
     }
 
     /// <inheritdoc/>
@@ -156,14 +158,17 @@ public string Folder
         get => _folder;
         set => SetField(ref _folder, FolderHelper.Adjust(value));
     }
+
     #endregion
 
     #region Relationships
+
     /// <inheritdoc cref="RootCohortAggregateContainer_ID"/>
     [NoMappingToDatabase]
     public CohortAggregateContainer RootCohortAggregateContainer =>
-        RootCohortAggregateContainer_ID == null?  null:
-            Repository.GetObjectByID<CohortAggregateContainer>((int) RootCohortAggregateContainer_ID);
+        RootCohortAggregateContainer_ID == null
+            ? null
+            : Repository.GetObjectByID<CohortAggregateContainer>((int)RootCohortAggregateContainer_ID);
 
     /// <inheritdoc cref="QueryCachingServer_ID"/>
     [NoMappingToDatabase]
@@ -176,7 +181,6 @@ public string Folder
 
     public CohortIdentificationConfiguration()
     {
-
     }
 
     /// <summary>
@@ -189,11 +193,11 @@ public CohortIdentificationConfiguration(ICatalogueRepository repository, string
     {
         var queryCache = repository.GetDefaultFor(PermissableDefaults.CohortIdentificationQueryCachingServer_ID);
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"QueryCachingServer_ID",queryCache?.ID ?? (object) DBNull.Value},
-            {"Folder" , FolderHelper.Root}
+            { "Name", name },
+            { "QueryCachingServer_ID", queryCache?.ID ?? (object)DBNull.Value },
+            { "Folder", FolderHelper.Root }
         });
     }
 
@@ -224,15 +228,12 @@ public override void DeleteInDatabase()
             RootCohortAggregateContainer.DeleteInDatabase();
 
         //shouldnt ever happen but double check anyway incase somebody removes the CASCADE
-        if(Exists())
+        if (Exists())
             base.DeleteInDatabase();
         else
-        {
             //make sure to do the obscure cross server/database cascade activities too
-
             //if the repository has obscure dependencies
             CatalogueRepository.ObscureDependencyFinder?.HandleCascadeDeletesForDeletedObject(this);
-        }
     }
 
     /// <summary>
@@ -244,7 +245,8 @@ public void CreateRootContainerIfNotExists()
         if (RootCohortAggregateContainer_ID == null)
         {
             //create a new one and record its ID
-            RootCohortAggregateContainer_ID = new CohortAggregateContainer((ICatalogueRepository) Repository,SetOperation.UNION).ID;
+            RootCohortAggregateContainer_ID =
+                new CohortAggregateContainer((ICatalogueRepository)Repository, SetOperation.UNION).ID;
 
             //save us to database to cement the object
             SaveToDatabase();
@@ -252,10 +254,7 @@ public void CreateRootContainerIfNotExists()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public bool ShouldBeReadOnly(out string reason)
     {
@@ -270,24 +269,16 @@ public bool ShouldBeReadOnly(out string reason)
     }
 
     /// <inheritdoc/>
-    public string GetSearchString()
-    {
+    public string GetSearchString() =>
         //let the cic acronym match cohort identification configuration
-        return $"cic {Name}";
-    }
+        $"cic {Name}";
 
     /// <inheritdoc/>
-    public ISqlParameter[] GetAllParameters()
-    {
-        return CatalogueRepository.GetAllParametersForParentTable(this).ToArray();
-    }
+    public ISqlParameter[] GetAllParameters() => CatalogueRepository.GetAllParametersForParentTable(this).ToArray();
 
 
     /// <inheritdoc cref="CICPrefix"/>
-    public string GetNamingConventionPrefixForConfigurations()
-    {
-        return $"{CICPrefix}{ID}_";
-    }
+    public string GetNamingConventionPrefixForConfigurations() => $"{CICPrefix}{ID}_";
 
     /// <summary>
     /// Returns true if the <see cref="AggregateConfiguration"/> provided has Name compatible with <see cref="CICPrefix"/>
@@ -295,10 +286,8 @@ public string GetNamingConventionPrefixForConfigurations()
     /// </summary>
     /// <param name="aggregate"></param>
     /// <returns></returns>
-    public bool IsValidNamedConfiguration(AggregateConfiguration aggregate)
-    {
-        return aggregate.Name.StartsWith(GetNamingConventionPrefixForConfigurations());
-    }
+    public bool IsValidNamedConfiguration(AggregateConfiguration aggregate) =>
+        aggregate.Name.StartsWith(GetNamingConventionPrefixForConfigurations());
 
     /// <summary>
     /// All <see cref="AggregateConfiguration"/>s within a <see cref="CohortIdentificationConfiguration"/> must start with the appropriate prefix (and ID of the cic)
@@ -319,20 +308,18 @@ public void EnsureNamingConvention(AggregateConfiguration aggregate)
         var origName = aggregate.Name;
 
 
-        var otherConfigurations = Repository.GetAllObjects<AggregateConfiguration>().Except(new[] {aggregate}).ToArray();
+        var otherConfigurations =
+            Repository.GetAllObjects<AggregateConfiguration>().Except(new[] { aggregate }).ToArray();
 
         //if there is a conflict on the name
         if (otherConfigurations.Any(c => c.Name.Equals(origName)))
-        {
             do
             {
                 //add Copy 1 then Copy 2 etc
                 copy++;
                 aggregate.Name = $"{origName} (Copy {copy})";
-            }
-            while (otherConfigurations.Any(c => c.Name.Equals(aggregate.Name)));//until there are no more copies
-        }
-            
+            } while (otherConfigurations.Any(c => c.Name.Equals(aggregate.Name))); //until there are no more copies
+
         aggregate.SaveToDatabase();
     }
 
@@ -346,23 +333,26 @@ public void EnsureNamingConvention(AggregateConfiguration aggregate)
     public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier)
     {
         //todo this would be nice if it was ICatalogueRepository but transaction is super SQLy
-        var cataRepo = (ICatalogueRepository) Repository;
+        var cataRepo = (ICatalogueRepository)Repository;
         //start a new super transaction
         using (cataRepo.BeginNewTransaction())
         {
             try
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Super Transaction started on Catalogue Repository", CheckResult.Success));
+                notifier.OnCheckPerformed(new CheckEventArgs("Super Transaction started on Catalogue Repository",
+                    CheckResult.Success));
 
                 var clone = new CohortIdentificationConfiguration(cataRepo, $"{Name} (Clone)");
 
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Created clone configuration '{clone.Name}' with ID {clone.ID} called {clone}", CheckResult.Success));
+                    $"Created clone configuration '{clone.Name}' with ID {clone.ID} called {clone}",
+                    CheckResult.Success));
 
                 //clone the global parameters
                 foreach (var p in GetAllParameters())
                 {
-                    notifier.OnCheckPerformed(new CheckEventArgs($"Cloning global parameter {p.ParameterName}",CheckResult.Success));
+                    notifier.OnCheckPerformed(new CheckEventArgs($"Cloning global parameter {p.ParameterName}",
+                        CheckResult.Success));
                     var cloneP = new AnyTableSqlParameter(cataRepo, clone, p.ParameterSQL)
                     {
                         Comment = p.Comment,
@@ -372,7 +362,8 @@ public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier)
                 }
 
                 //key is the original, value is the clone
-                var parentToCloneJoinablesDictionary = new Dictionary<JoinableCohortAggregateConfiguration, JoinableCohortAggregateConfiguration>();
+                var parentToCloneJoinablesDictionary =
+                    new Dictionary<JoinableCohortAggregateConfiguration, JoinableCohortAggregateConfiguration>();
 
                 //clone the joinables
                 foreach (var joinable in GetAllJoinables())
@@ -381,28 +372,35 @@ public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier)
                     var cloneJoinableAggregate = joinable.AggregateConfiguration.CreateClone();
 
                     //clone the join permission
-                    var cloneJoinable = new JoinableCohortAggregateConfiguration(cataRepo, clone, cloneJoinableAggregate);
+                    var cloneJoinable =
+                        new JoinableCohortAggregateConfiguration(cataRepo, clone, cloneJoinableAggregate);
 
-                    parentToCloneJoinablesDictionary.Add(joinable,cloneJoinable);
+                    parentToCloneJoinablesDictionary.Add(joinable, cloneJoinable);
                 }
 
                 clone.ClonedFrom_ID = ID;
-                clone.RootCohortAggregateContainer_ID = RootCohortAggregateContainer.CloneEntireTreeRecursively(notifier, this, clone, parentToCloneJoinablesDictionary).ID;
+                clone.RootCohortAggregateContainer_ID = RootCohortAggregateContainer
+                    .CloneEntireTreeRecursively(notifier, this, clone, parentToCloneJoinablesDictionary).ID;
                 clone.SaveToDatabase();
 
-                notifier.OnCheckPerformed(new CheckEventArgs("Clone creation successful, about to commit Super Transaction", CheckResult.Success));
+                notifier.OnCheckPerformed(
+                    new CheckEventArgs("Clone creation successful, about to commit Super Transaction",
+                        CheckResult.Success));
                 cataRepo.EndTransaction(true);
-                notifier.OnCheckPerformed(new CheckEventArgs("Super Transaction committed successfully", CheckResult.Success));
+                notifier.OnCheckPerformed(new CheckEventArgs("Super Transaction committed successfully",
+                    CheckResult.Success));
 
                 return clone;
             }
             catch (Exception e)
             {
                 cataRepo.EndTransaction(false);
-                notifier.OnCheckPerformed(new CheckEventArgs("Cloning failed, See Exception for details, the Super Transaction was rolled back successfully though", CheckResult.Fail,e));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "Cloning failed, See Exception for details, the Super Transaction was rolled back successfully though",
+                    CheckResult.Fail, e));
             }
         }
-            
+
         return null;
     }
 
@@ -416,33 +414,35 @@ public CohortIdentificationConfiguration CreateClone(ICheckNotifier notifier)
     ///  marked IsExtractionIdentifier</param>
     /// <param name="useTransaction">True to run the import in a transaction</param>
     /// <returns></returns>
-    public AggregateConfiguration ImportAggregateConfigurationAsIdentifierList(AggregateConfiguration toClone, ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers, bool useTransaction = true)
+    public AggregateConfiguration ImportAggregateConfigurationAsIdentifierList(AggregateConfiguration toClone,
+        ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers,
+        bool useTransaction = true)
     {
-        if(!useTransaction)
+        if (!useTransaction)
             return CreateCloneOfAggregateConfigurationPrivate(toClone, resolveMultipleExtractionIdentifiers);
 
         if (Repository is ITableRepository tableRepo)
-        {
             using (tableRepo.BeginNewTransactedConnection())
             {
                 try
                 {
-                    var toReturn =  CreateCloneOfAggregateConfigurationPrivate(toClone, resolveMultipleExtractionIdentifiers);
+                    var toReturn =
+                        CreateCloneOfAggregateConfigurationPrivate(toClone, resolveMultipleExtractionIdentifiers);
                     tableRepo.EndTransactedConnection(true);
                     return toReturn;
                 }
                 catch (Exception)
                 {
-                    tableRepo.EndTransactedConnection(false);//abandon
+                    tableRepo.EndTransactedConnection(false); //abandon
                     throw;
                 }
             }
-        }
 
         return CreateCloneOfAggregateConfigurationPrivate(toClone, resolveMultipleExtractionIdentifiers);
     }
 
-    private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(AggregateConfiguration toClone, ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
+    private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(AggregateConfiguration toClone,
+        ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
     {
         var cataRepo = CatalogueRepository;
 
@@ -455,17 +455,18 @@ private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(Aggreg
         //now clear its pivot dimension, make it not extratcable and make its countSQL basic/sane
         newConfiguration.PivotOnDimensionID = null;
         newConfiguration.IsExtractable = false;
-        newConfiguration.CountSQL = null;//clear the count sql
+        newConfiguration.CountSQL = null; //clear the count sql
         newConfiguration.Description = toClone.Description;
 
         //clone parameters
         foreach (var toCloneParameter in toClone.Parameters)
         {
-            var newParam = new AnyTableSqlParameter((ICatalogueRepository)newConfiguration.Repository, newConfiguration, toCloneParameter.ParameterSQL)
-                {
-                    Value = toCloneParameter.Value,
-                    Comment = toCloneParameter.Comment
-                };
+            var newParam = new AnyTableSqlParameter((ICatalogueRepository)newConfiguration.Repository, newConfiguration,
+                toCloneParameter.ParameterSQL)
+            {
+                Value = toCloneParameter.Value,
+                Comment = toCloneParameter.Comment
+            };
             newParam.SaveToDatabase();
         }
 
@@ -477,7 +478,8 @@ private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(Aggreg
         if (!toClone.Catalogue.IsApiCall())
         {
             //two cases here either the import has a custom freaky CHI column (dimension) or it doesn't reference CHI at all if it is freaky we want to preserve its freakyness
-            var extractionIdentifier = GetExtractionIdentifierFrom(toClone, out var underlyingExtractionInformation, resolveMultipleExtractionIdentifiers);
+            var extractionIdentifier = GetExtractionIdentifierFrom(toClone, out var underlyingExtractionInformation,
+                resolveMultipleExtractionIdentifiers);
 
             //now give it 1 dimension which is the only IsExtractionIdentifier column
             var newDimension = new AggregateDimension(cataRepo, underlyingExtractionInformation, newConfiguration);
@@ -517,7 +519,8 @@ private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(Aggreg
     /// <param name="catalogue"></param>
     /// <param name="candidates"></param>
     /// <returns></returns>
-    public delegate ExtractionInformation ChooseWhichExtractionIdentifierToUseFromManyHandler(ICatalogue catalogue, ExtractionInformation[] candidates);
+    public delegate ExtractionInformation ChooseWhichExtractionIdentifierToUseFromManyHandler(ICatalogue catalogue,
+        ExtractionInformation[] candidates);
 
 
     /// <summary>
@@ -530,16 +533,19 @@ private AggregateConfiguration CreateCloneOfAggregateConfigurationPrivate(Aggreg
     ///  marked IsExtractionIdentifier</param>
     /// <param name="importMandatoryFilters"></param>
     /// <returns></returns>
-    public AggregateConfiguration CreateNewEmptyConfigurationForCatalogue(ICatalogue catalogue, ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers, bool importMandatoryFilters = true)
+    public AggregateConfiguration CreateNewEmptyConfigurationForCatalogue(ICatalogue catalogue,
+        ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers,
+        bool importMandatoryFilters = true)
     {
-        var cataRepo = (ICatalogueRepository) Repository;
+        var cataRepo = (ICatalogueRepository)Repository;
 
-        var configuration = new AggregateConfiguration(cataRepo,catalogue, $"People in {catalogue}");
+        var configuration = new AggregateConfiguration(cataRepo, catalogue, $"People in {catalogue}");
         EnsureNamingConvention(configuration);
 
-        if(!catalogue.IsApiCall())
+        if (!catalogue.IsApiCall())
         {
-            var extractionIdentifier = (ExtractionInformation)GetExtractionIdentifierFrom(catalogue, resolveMultipleExtractionIdentifiers);
+            var extractionIdentifier =
+                (ExtractionInformation)GetExtractionIdentifierFrom(catalogue, resolveMultipleExtractionIdentifiers);
             //make the extraction identifier column into the sole dimension on the new configuration
             new AggregateDimension(cataRepo, extractionIdentifier, configuration);
         }
@@ -548,15 +554,17 @@ public AggregateConfiguration CreateNewEmptyConfigurationForCatalogue(ICatalogue
         configuration.CountSQL = null;
         configuration.SaveToDatabase();
 
-        if(importMandatoryFilters)
-            ImportMandatoryFilters(catalogue, configuration,GetAllParameters());
+        if (importMandatoryFilters)
+            ImportMandatoryFilters(catalogue, configuration, GetAllParameters());
 
         return configuration;
     }
 
-    private void ImportMandatoryFilters(ICatalogue catalogue, AggregateConfiguration configuration, ISqlParameter[] globalParameters)
+    private void ImportMandatoryFilters(ICatalogue catalogue, AggregateConfiguration configuration,
+        ISqlParameter[] globalParameters)
     {
-        var filterImporter = new FilterImporter(new AggregateFilterFactory((ICatalogueRepository) catalogue.Repository), globalParameters);
+        var filterImporter = new FilterImporter(new AggregateFilterFactory((ICatalogueRepository)catalogue.Repository),
+            globalParameters);
 
         //Find any Mandatory Filters
         var mandatoryFilters = catalogue.GetAllMandatoryFilters();
@@ -565,7 +573,8 @@ private void ImportMandatoryFilters(ICatalogue catalogue, AggregateConfiguration
 
         if (mandatoryFilters.Any())
         {
-            var container = new AggregateFilterContainer((ICatalogueRepository) Repository, FilterContainerOperation.AND);
+            var container =
+                new AggregateFilterContainer((ICatalogueRepository)Repository, FilterContainerOperation.AND);
             configuration.RootFilterContainer_ID = container.ID;
             configuration.SaveToDatabase();
 
@@ -590,14 +599,17 @@ private void ImportMandatoryFilters(ICatalogue catalogue, AggregateConfiguration
     /// <param name="underlyingExtractionInformation"></param>
     /// <param name="resolveMultipleExtractionIdentifiers"></param>
     /// <returns></returns>
-    private static IColumn GetExtractionIdentifierFrom(AggregateConfiguration toClone, out ExtractionInformation underlyingExtractionInformation, ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
+    private static IColumn GetExtractionIdentifierFrom(AggregateConfiguration toClone,
+        out ExtractionInformation underlyingExtractionInformation,
+        ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
     {
         //make sure it can be cloned before starting
 
         //Aggregates have AggregateDimensions which are a subset of the Catalogues ExtractionInformations.  Most likely there won't be an AggregateDimension which IsExtractionIdentifier
         //because why would the user have graphs of chi numbers?
 
-        var existingExtractionIdentifierDimensions = toClone.AggregateDimensions.Where(d => d.IsExtractionIdentifier).ToArray();
+        var existingExtractionIdentifierDimensions =
+            toClone.AggregateDimensions.Where(d => d.IsExtractionIdentifier).ToArray();
         IColumn extractionIdentifier = null;
 
         //very unexpected, he had multiple IsExtractionIdentifier Dimensions all configured for simultaneous use on this Aggregate, it is very freaky and we definetly don't want to let him import it for cohort identification
@@ -628,21 +640,27 @@ private static IColumn GetExtractionIdentifierFrom(AggregateConfiguration toClon
         return extractionIdentifier;
     }
 
-    private static IColumn GetExtractionIdentifierFrom(ICatalogue catalogue, ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
+    private static IColumn GetExtractionIdentifierFrom(ICatalogue catalogue,
+        ChooseWhichExtractionIdentifierToUseFromManyHandler resolveMultipleExtractionIdentifiers)
     {
         //the aggregate they are cloning does not have an extraction identifier but the dataset might still have one
-        var catalogueCandidates = catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Where(e => e.IsExtractionIdentifier).ToArray();
+        var catalogueCandidates = catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Where(e => e.IsExtractionIdentifier).ToArray();
 
         //if there are multiple IsExtractionInformation columns
         if (catalogueCandidates.Length != 1)
-            if (resolveMultipleExtractionIdentifiers == null)//no delegate has been provided for resolving this
+            if (resolveMultipleExtractionIdentifiers == null) //no delegate has been provided for resolving this
+            {
                 throw new NotSupportedException(
                     $"Cannot create AggregateConfiguration because the Catalogue {catalogue} has {catalogueCandidates.Length} IsExtractionIdentifier ExtractionInformations");
+            }
             else
             {
                 //there is a delegate to resolve this, invoke it
-                var answer = resolveMultipleExtractionIdentifiers(catalogue, catalogueCandidates) ?? throw new Exception("User did not pick a candidate ExtractionInformation column from those we offered");
-                return answer;//the delegate picked one
+                var answer = resolveMultipleExtractionIdentifiers(catalogue, catalogueCandidates) ??
+                             throw new Exception(
+                                 "User did not pick a candidate ExtractionInformation column from those we offered");
+                return answer; //the delegate picked one
             }
 
         return catalogueCandidates[0];
@@ -652,10 +670,8 @@ private static IColumn GetExtractionIdentifierFrom(ICatalogue catalogue, ChooseW
     /// Returns all patient index tables declared in this <see cref="CohortIdentificationConfiguration"/> (See <see cref="JoinableCohortAggregateConfiguration"/>)
     /// </summary>
     /// <returns></returns>
-    public JoinableCohortAggregateConfiguration[] GetAllJoinables()
-    {
-        return Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this).ToArray();
-    }
+    public JoinableCohortAggregateConfiguration[] GetAllJoinables() =>
+        Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfiguration>(this).ToArray();
 
 
     /// <summary>
@@ -667,11 +683,12 @@ public TableInfo[] GetDistinctTableInfos()
     {
         return
             RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively() //get all the aggregate sets
-                .SelectMany(a=>a.AggregateDimensions //get all the Dimensions (should really be 1 per aggregate which is the IsExtractionIdentifier column but who are we to check)
-                    .Select(d=>d.ColumnInfo)) //get the underlying Column for the dimension
+                .SelectMany(a => a
+                    .AggregateDimensions //get all the Dimensions (should really be 1 per aggregate which is the IsExtractionIdentifier column but who are we to check)
+                    .Select(d => d.ColumnInfo)) //get the underlying Column for the dimension
                 .Select(c => c.TableInfo) //get the TableInfo from the column
                 .Distinct() //return distinct array of them
-                .ToArray(); 
+                .ToArray();
     }
 
     /// <summary>
@@ -681,7 +698,7 @@ public TableInfo[] GetDistinctTableInfos()
     /// </summary>
     public void Freeze()
     {
-        if(Frozen)
+        if (Frozen)
             return;
 
         Frozen = true;
@@ -695,7 +712,7 @@ public void Freeze()
     /// </summary>
     public void Unfreeze()
     {
-        if(!Frozen)
+        if (!Frozen)
             return;
 
         Frozen = false;
@@ -708,18 +725,15 @@ public void Unfreeze()
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
         var dependencies = new List<IHasDependencies>();
-            
+
         dependencies.AddRange(GetAllParameters().Cast<AnyTableSqlParameter>());
-            
-        if(RootCohortAggregateContainer_ID != null)
+
+        if (RootCohortAggregateContainer_ID != null)
             dependencies.AddRange(RootCohortAggregateContainer.GetAllAggregateConfigurationsRecursively());
 
         return dependencies.ToArray();
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Array.Empty<IHasDependencies>();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs
index ac8f6bf499..c69d73d09f 100644
--- a/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/CohortIdentificationConfigurationMerger.cs
@@ -34,27 +34,26 @@ public CohortIdentificationConfigurationMerger(ICatalogueRepository repository)
     /// <returns>The new merged CohortIdentificationConfiguration which contains all the provided <paramref name="cics"/> </returns>
     public CohortIdentificationConfiguration Merge(CohortIdentificationConfiguration[] cics, SetOperation operation)
     {
-        if(cics.Length <= 1)
-            throw new ArgumentException("You must select at least 2 cics to merge",nameof(cics));
+        if (cics.Length <= 1)
+            throw new ArgumentException("You must select at least 2 cics to merge", nameof(cics));
 
         //clone them
         var cicClones = new CohortIdentificationConfiguration[cics.Length];
         try
         {
             for (var i = 0; i < cics.Length; i++)
-            {
                 cicClones[i] = cics[i].CreateClone(new ThrowImmediatelyCheckNotifier());
-            }
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            throw new Exception("Error during pre merge cloning stage, no merge will be attempted",ex);
+            throw new Exception("Error during pre merge cloning stage, no merge will be attempted", ex);
         }
 
-        using(_repository.BeginNewTransaction())
+        using (_repository.BeginNewTransaction())
         {
             // Create a new master configuration
-            var cicMaster = new CohortIdentificationConfiguration(_repository,$"Merged cics (IDs {string.Join(",",cics.Select(c=>c.ID))})" );
+            var cicMaster = new CohortIdentificationConfiguration(_repository,
+                $"Merged cics (IDs {string.Join(",", cics.Select(c => c.ID))})");
 
             // With a single top level container with the provided operation
             cicMaster.CreateRootContainerIfNotExists();
@@ -63,7 +62,7 @@ public CohortIdentificationConfiguration Merge(CohortIdentificationConfiguration
             rootContainer.SaveToDatabase();
 
             //Grab the root container of each of the input cics
-            foreach(var cic in cicClones)
+            foreach (var cic in cicClones)
             {
                 var container = cic.RootCohortAggregateContainer;
 
@@ -75,8 +74,8 @@ public CohortIdentificationConfiguration Merge(CohortIdentificationConfiguration
                 rootContainer.AddChild(container);
 
                 // Make the new name of all the AggregateConfigurations match the new master cic
-                foreach(var child in container.GetAllAggregateConfigurationsRecursively())
-                    EnsureNamingConvention(cicMaster,child);
+                foreach (var child in container.GetAllAggregateConfigurationsRecursively())
+                    EnsureNamingConvention(cicMaster, child);
 
                 // Delete the old now empty clones
                 cic.DeleteInDatabase();
@@ -96,27 +95,26 @@ public CohortIdentificationConfiguration Merge(CohortIdentificationConfiguration
     /// <param name="into">The container into which you want to add the <paramref name="cics"/></param>
     public void Import(CohortIdentificationConfiguration[] cics, CohortAggregateContainer into)
     {
-        var cicInto = into.GetCohortIdentificationConfiguration() ?? throw new ArgumentException($"Cannot import into orphan container '{into}'",nameof(into));
+        var cicInto = into.GetCohortIdentificationConfiguration() ??
+                      throw new ArgumentException($"Cannot import into orphan container '{into}'", nameof(into));
 
         //clone them
         var cicClones = new CohortIdentificationConfiguration[cics.Length];
         try
         {
             for (var i = 0; i < cics.Length; i++)
-            {
                 cicClones[i] = cics[i].CreateClone(new ThrowImmediatelyCheckNotifier());
-            }
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            throw new Exception("Error during pre import cloning stage, no import will be attempted",ex);
+            throw new Exception("Error during pre import cloning stage, no import will be attempted", ex);
         }
-            
 
-        using(_repository.BeginNewTransaction())
+
+        using (_repository.BeginNewTransaction())
         {
             //Grab the root container of each of the input cics
-            foreach(var cic in cicClones)
+            foreach (var cic in cicClones)
             {
                 var container = cic.RootCohortAggregateContainer;
 
@@ -128,8 +126,8 @@ public void Import(CohortIdentificationConfiguration[] cics, CohortAggregateCont
                 into.AddChild(container);
 
                 // Make the new name of all the AggregateConfigurations match the owner of import into container
-                foreach(var child in container.GetAllAggregateConfigurationsRecursively())
-                    EnsureNamingConvention(cicInto,child);
+                foreach (var child in container.GetAllAggregateConfigurationsRecursively())
+                    EnsureNamingConvention(cicInto, child);
 
                 // Delete the old now empty clones
                 cic.DeleteInDatabase();
@@ -141,11 +139,10 @@ public void Import(CohortIdentificationConfiguration[] cics, CohortAggregateCont
     }
 
 
-
     private static void EnsureNamingConvention(CohortIdentificationConfiguration cic, AggregateConfiguration ac)
     {
         //clear any old cic_x prefixes
-        ac.Name = Regex.Replace(ac.Name, $@"^({CohortIdentificationConfiguration.CICPrefix }\d+_?)+","");
+        ac.Name = Regex.Replace(ac.Name, $@"^({CohortIdentificationConfiguration.CICPrefix}\d+_?)+", "");
         ac.SaveToDatabase();
 
         //and add the new correct one
@@ -159,18 +156,20 @@ private static void EnsureNamingConvention(CohortIdentificationConfiguration cic
     /// <returns>All new configurations unmerged out of the <paramref name="rootContainer"/></returns>
     public CohortIdentificationConfiguration[] UnMerge(CohortAggregateContainer rootContainer)
     {
-        if(!rootContainer.IsRootContainer())
-            throw new ArgumentException("Container must be a root container to be unmerged",nameof(rootContainer));
-            
-        if(rootContainer.GetAggregateConfigurations().Any())
-            throw new ArgumentException("Container must contain only sub-containers (i.e. no aggregates)",nameof(rootContainer));
+        if (!rootContainer.IsRootContainer())
+            throw new ArgumentException("Container must be a root container to be unmerged", nameof(rootContainer));
+
+        if (rootContainer.GetAggregateConfigurations().Any())
+            throw new ArgumentException("Container must contain only sub-containers (i.e. no aggregates)",
+                nameof(rootContainer));
 
-        if(rootContainer.GetSubContainers().Length <= 1)
-            throw new ArgumentException("Container must contain 2+ sub-containers to be unmerged",nameof(rootContainer));
+        if (rootContainer.GetSubContainers().Length <= 1)
+            throw new ArgumentException("Container must contain 2+ sub-containers to be unmerged",
+                nameof(rootContainer));
 
         var cic = rootContainer.GetCohortIdentificationConfiguration();
         var toReturn = new List<CohortIdentificationConfiguration>();
-            
+
         try
         {
             // clone the input cic
@@ -179,18 +178,19 @@ public CohortIdentificationConfiguration[] UnMerge(CohortAggregateContainer root
             // grab the new clone root container
             rootContainer = cic.RootCohortAggregateContainer;
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            throw new Exception("Error during pre merge cloning stage, no UnMerge will be attempted",ex);
+            throw new Exception("Error during pre merge cloning stage, no UnMerge will be attempted", ex);
         }
-                        
-        using(_repository.BeginNewTransaction())
+
+        using (_repository.BeginNewTransaction())
         {
             // For each of these
-            foreach(var subContainer in rootContainer.GetSubContainers().OrderBy(c=>c.Order))
+            foreach (var subContainer in rootContainer.GetSubContainers().OrderBy(c => c.Order))
             {
                 // create a new config
-                var newCic = new CohortIdentificationConfiguration(_repository,$"Un Merged { subContainer.Name } ({subContainer.ID }) ");
+                var newCic = new CohortIdentificationConfiguration(_repository,
+                    $"Un Merged {subContainer.Name} ({subContainer.ID}) ");
 
                 //take the container we are splitting out
                 subContainer.MakeIntoAnOrphan();
@@ -200,8 +200,8 @@ public CohortIdentificationConfiguration[] UnMerge(CohortAggregateContainer root
                 newCic.SaveToDatabase();
 
                 // Make the new name of all the AggregateConfigurations match the new cic
-                foreach(var child in subContainer.GetAllAggregateConfigurationsRecursively())
-                    EnsureNamingConvention(newCic,child);
+                foreach (var child in subContainer.GetAllAggregateConfigurationsRecursively())
+                    EnsureNamingConvention(newCic, child);
 
                 toReturn.Add(newCic);
             }
diff --git a/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfiguration.cs b/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfiguration.cs
index ad2823678b..2b1fbdbb7a 100644
--- a/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfiguration.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfiguration.cs
@@ -30,7 +30,7 @@ public class JoinableCohortAggregateConfiguration : DatabaseEntity
     public int CohortIdentificationConfiguration_ID
     {
         get => _cohortIdentificationConfigurationID;
-        set => SetField(ref  _cohortIdentificationConfigurationID, value);
+        set => SetField(ref _cohortIdentificationConfigurationID, value);
     }
 
     /// <summary>
@@ -39,7 +39,7 @@ public int CohortIdentificationConfiguration_ID
     public int AggregateConfiguration_ID
     {
         get => _aggregateConfigurationID;
-        set => SetField(ref  _aggregateConfigurationID, value);
+        set => SetField(ref _aggregateConfigurationID, value);
     }
 
     #endregion
@@ -52,21 +52,23 @@ public int AggregateConfiguration_ID
     /// <see cref="JoinableCohortAggregateConfigurationUse.AggregateConfiguration"/> to fetch the actual <see cref="AggregateConfiguration"/></para>
     /// </summary>
     [NoMappingToDatabase]
-    public JoinableCohortAggregateConfigurationUse[] Users => Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfigurationUse>(this).ToArray();
+    public JoinableCohortAggregateConfigurationUse[] Users =>
+        Repository.GetAllObjectsWithParent<JoinableCohortAggregateConfigurationUse>(this).ToArray();
 
     /// <inheritdoc cref="CohortIdentificationConfiguration_ID"/>
     [NoMappingToDatabase]
-    public CohortIdentificationConfiguration CohortIdentificationConfiguration => Repository.GetObjectByID<CohortIdentificationConfiguration>(CohortIdentificationConfiguration_ID);
+    public CohortIdentificationConfiguration CohortIdentificationConfiguration =>
+        Repository.GetObjectByID<CohortIdentificationConfiguration>(CohortIdentificationConfiguration_ID);
 
     /// <inheritdoc cref="AggregateConfiguration_ID"/>
     [NoMappingToDatabase]
-    public AggregateConfiguration AggregateConfiguration => Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID);
+    public AggregateConfiguration AggregateConfiguration =>
+        Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID);
 
     #endregion
 
     public JoinableCohortAggregateConfiguration()
     {
-
     }
 
     internal JoinableCohortAggregateConfiguration(ICatalogueRepository repository, DbDataReader r)
@@ -83,22 +85,23 @@ internal JoinableCohortAggregateConfiguration(ICatalogueRepository repository, D
     /// <param name="repository"></param>
     /// <param name="cic"></param>
     /// <param name="aggregate"></param>
-    public JoinableCohortAggregateConfiguration(ICatalogueRepository repository, CohortIdentificationConfiguration cic, AggregateConfiguration aggregate)
+    public JoinableCohortAggregateConfiguration(ICatalogueRepository repository, CohortIdentificationConfiguration cic,
+        AggregateConfiguration aggregate)
     {
         var extractionIdentifiers = aggregate.AggregateDimensions.Count(d => d.IsExtractionIdentifier);
 
-        if( !aggregate.Catalogue.IsApiCall() && extractionIdentifiers != 1)
+        if (!aggregate.Catalogue.IsApiCall() && extractionIdentifiers != 1)
             throw new NotSupportedException(
                 $"Cannot make aggregate {aggregate} into a Joinable aggregate because it has {extractionIdentifiers} columns marked IsExtractionIdentifier");
 
-        if(aggregate.GetCohortAggregateContainerIfAny() != null)
+        if (aggregate.GetCohortAggregateContainerIfAny() != null)
             throw new NotSupportedException(
                 $"Cannot make aggregate {aggregate} into a Joinable aggregate because it is already in a CohortAggregateContainer");
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"CohortIdentificationConfiguration_ID",cic.ID},
-            {"AggregateConfiguration_ID",aggregate.ID}
+            { "CohortIdentificationConfiguration_ID", cic.ID },
+            { "AggregateConfiguration_ID", aggregate.ID }
         });
     }
 
@@ -110,21 +113,24 @@ public JoinableCohortAggregateConfiguration(ICatalogueRepository repository, Coh
     /// <returns></returns>
     public JoinableCohortAggregateConfigurationUse AddUser(AggregateConfiguration user)
     {
-        if(user.ID == AggregateConfiguration_ID)
-            throw new NotSupportedException($"Cannot configure AggregateConfiguration {user} as a Join user to itself!");
+        if (user.ID == AggregateConfiguration_ID)
+            throw new NotSupportedException(
+                $"Cannot configure AggregateConfiguration {user} as a Join user to itself!");
 
-        var existing = Repository.GetAllObjects<JoinableCohortAggregateConfigurationUse>().FirstOrDefault(u => u.AggregateConfiguration_ID == user.ID);
+        var existing = Repository.GetAllObjects<JoinableCohortAggregateConfigurationUse>()
+            .FirstOrDefault(u => u.AggregateConfiguration_ID == user.ID);
 
         // they are trying to use us but you are already using us
         if (Equals(existing, this))
             return existing;
 
         if (existing != null)
-            throw new Exception($"AggregateConfiguration '{user}' already uses '{existing.JoinableCohortAggregateConfiguration}'. Only one patient index table join is permitted.");
-            
+            throw new Exception(
+                $"AggregateConfiguration '{user}' already uses '{existing.JoinableCohortAggregateConfiguration}'. Only one patient index table join is permitted.");
+
         user.ClearAllInjections();
 
-        return new JoinableCohortAggregateConfigurationUse((ICatalogueRepository) Repository, user, this);
+        return new JoinableCohortAggregateConfigurationUse((ICatalogueRepository)Repository, user, this);
     }
 
 
@@ -134,14 +140,11 @@ public JoinableCohortAggregateConfigurationUse AddUser(AggregateConfiguration us
     private int _aggregateConfigurationID;
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return _toStringName ?? GetCachedName();
-    }
+    public override string ToString() => _toStringName ?? GetCachedName();
 
     private string GetCachedName()
     {
-        _toStringName = ToStringPrefix + AggregateConfiguration.Name;//cached answer
+        _toStringName = ToStringPrefix + AggregateConfiguration.Name; //cached answer
         return _toStringName;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfigurationUse.cs b/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfigurationUse.cs
index f01bcae1b6..7cd8192e4a 100644
--- a/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfigurationUse.cs
+++ b/Rdmp.Core/Curation/Data/Cohort/Joinables/JoinableCohortAggregateConfigurationUse.cs
@@ -17,9 +17,10 @@ namespace Rdmp.Core.Curation.Data.Cohort.Joinables;
 /// <summary>
 /// Indicates that a given AggregateConfiguration in a CohortIdentificationConfiguration is implicitly joined against a 'PatientIndexTable' See JoinableCohortAggregateConfiguration
 /// </summary>
-public class JoinableCohortAggregateConfigurationUse:DatabaseEntity
+public class JoinableCohortAggregateConfigurationUse : DatabaseEntity
 {
     #region Database Properties
+
     private int _joinableCohortAggregateConfigurationID;
     private int _aggregateConfigurationID;
     private ExtractionJoinType _joinType;
@@ -30,7 +31,7 @@ public class JoinableCohortAggregateConfigurationUse:DatabaseEntity
     public int JoinableCohortAggregateConfiguration_ID
     {
         get => _joinableCohortAggregateConfigurationID;
-        set => SetField(ref  _joinableCohortAggregateConfigurationID, value);
+        set => SetField(ref _joinableCohortAggregateConfigurationID, value);
     }
 
     /// <summary>
@@ -40,7 +41,7 @@ public int JoinableCohortAggregateConfiguration_ID
     public int AggregateConfiguration_ID
     {
         get => _aggregateConfigurationID;
-        set => SetField(ref  _aggregateConfigurationID, value);
+        set => SetField(ref _aggregateConfigurationID, value);
     }
 
     /// <summary>
@@ -50,25 +51,27 @@ public int AggregateConfiguration_ID
     public ExtractionJoinType JoinType
     {
         get => _joinType;
-        set => SetField(ref  _joinType, value);
+        set => SetField(ref _joinType, value);
     }
 
     #endregion
 
     #region Relationships
+
     /// <inheritdoc cref="JoinableCohortAggregateConfiguration_ID"/>
     [NoMappingToDatabase]
-    public JoinableCohortAggregateConfiguration JoinableCohortAggregateConfiguration => Repository.GetObjectByID<JoinableCohortAggregateConfiguration>(JoinableCohortAggregateConfiguration_ID);
+    public JoinableCohortAggregateConfiguration JoinableCohortAggregateConfiguration =>
+        Repository.GetObjectByID<JoinableCohortAggregateConfiguration>(JoinableCohortAggregateConfiguration_ID);
 
     /// <inheritdoc cref="AggregateConfiguration_ID"/>
     [NoMappingToDatabase]
-    public AggregateConfiguration AggregateConfiguration => Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID);
+    public AggregateConfiguration AggregateConfiguration =>
+        Repository.GetObjectByID<AggregateConfiguration>(AggregateConfiguration_ID);
 
     #endregion
 
     public JoinableCohortAggregateConfigurationUse()
     {
-
     }
 
     internal JoinableCohortAggregateConfigurationUse(ICatalogueRepository repository, DbDataReader r)
@@ -79,30 +82,29 @@ internal JoinableCohortAggregateConfigurationUse(ICatalogueRepository repository
 
         JoinableCohortAggregateConfiguration_ID = Convert.ToInt32(r["JoinableCohortAggregateConfiguration_ID"]);
         AggregateConfiguration_ID = Convert.ToInt32(r["AggregateConfiguration_ID"]);
-
     }
 
-    internal JoinableCohortAggregateConfigurationUse(ICatalogueRepository repository, AggregateConfiguration user, JoinableCohortAggregateConfiguration joinable)
+    internal JoinableCohortAggregateConfigurationUse(ICatalogueRepository repository, AggregateConfiguration user,
+        JoinableCohortAggregateConfiguration joinable)
     {
-        if (repository.GetAllObjectsWhere<JoinableCohortAggregateConfiguration>("AggregateConfiguration_ID", user.ID).Any())
+        if (repository.GetAllObjectsWhere<JoinableCohortAggregateConfiguration>("AggregateConfiguration_ID", user.ID)
+            .Any())
             throw new NotSupportedException(
                 $"Cannot add user {user} because that AggregateConfiguration is itself a JoinableCohortAggregateConfiguration");
-         
-        if(user.Catalogue.IsApiCall())
-        {
-            throw new NotSupportedException("API calls cannot join with PatientIndexTables (The API call must be self contained)");
-        }
 
-        if(user.AggregateDimensions.Count(u=>u.IsExtractionIdentifier) != 1)
+        if (user.Catalogue.IsApiCall())
+            throw new NotSupportedException(
+                "API calls cannot join with PatientIndexTables (The API call must be self contained)");
+
+        if (user.AggregateDimensions.Count(u => u.IsExtractionIdentifier) != 1)
             throw new NotSupportedException(
                 $"Cannot configure AggregateConfiguration {user} as join user because it does not contain exactly 1 IsExtractionIdentifier dimension");
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"JoinableCohortAggregateConfiguration_ID",joinable.ID},
-            {"AggregateConfiguration_ID",user.ID},
-            {"JoinType",ExtractionJoinType.Left.ToString()}
-
+            { "JoinableCohortAggregateConfiguration_ID", joinable.ID },
+            { "AggregateConfiguration_ID", user.ID },
+            { "JoinType", ExtractionJoinType.Left.ToString() }
         });
     }
 
@@ -128,16 +130,14 @@ public string GetJoinDirectionSQL()
 
     private const string ToStringPrefix = "JOIN Against:";
     private string _toStringName;
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return _toStringName ?? GetCachedName();
-    }
+    public override string ToString() => _toStringName ?? GetCachedName();
 
     private string GetCachedName()
     {
-        _toStringName =  ToStringPrefix + JoinableCohortAggregateConfiguration.AggregateConfiguration.Name;//cached answer
+        _toStringName =
+            ToStringPrefix + JoinableCohortAggregateConfiguration.AggregateConfiguration.Name; //cached answer
         return _toStringName;
     }
 
@@ -146,8 +146,5 @@ private string GetCachedName()
     /// <code>'select chi from Tbl1 INNER JOIN TblPatIndx ix123 on Tbl1.chi = ix123.chi where ix123.date > GETDATE()'</code>
     /// </summary>
     /// <returns></returns>
-    public string GetJoinTableAlias()
-    {
-        return $"ix{JoinableCohortAggregateConfiguration_ID}";
-    }
+    public string GetJoinTableAlias() => $"ix{JoinableCohortAggregateConfiguration_ID}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ColumnInfo.cs b/Rdmp.Core/Curation/Data/ColumnInfo.cs
index de9215fcfe..4c98bd9e66 100644
--- a/Rdmp.Core/Curation/Data/ColumnInfo.cs
+++ b/Rdmp.Core/Curation/Data/ColumnInfo.cs
@@ -32,9 +32,9 @@ namespace Rdmp.Core.Curation.Data;
 /// <para>ColumnInfo ensures a cached representation of the underlying database so that RDMP can rationalize and inform the system user of disappearing
 /// columns etc and let the user make decisions about how to resolve it.</para>
 /// </summary>
-public class ColumnInfo : DatabaseEntity, IComparable, IResolveDuplication, IHasDependencies, ICheckable, IHasQuerySyntaxHelper, IHasFullyQualifiedNameToo, ISupplementalColumnInformation, IInjectKnown<TableInfo>, INamed
+public class ColumnInfo : DatabaseEntity, IComparable, IResolveDuplication, IHasDependencies, ICheckable,
+    IHasQuerySyntaxHelper, IHasFullyQualifiedNameToo, ISupplementalColumnInformation, IInjectKnown<TableInfo>, INamed
 {
-        
     #region Database Properties
 
     private int _tableInfoID;
@@ -61,7 +61,7 @@ public class ColumnInfo : DatabaseEntity, IComparable, IResolveDuplication, IHas
     public int TableInfo_ID
     {
         get => _tableInfoID;
-        private set => SetField(ref  _tableInfoID, value);
+        private set => SetField(ref _tableInfoID, value);
     }
 
     /// <summary>
@@ -71,7 +71,7 @@ public int TableInfo_ID
     public int? ANOTable_ID
     {
         get => _anoTableID;
-        set => SetField(ref  _anoTableID, value);
+        set => SetField(ref _anoTableID, value);
     }
 
     /// <summary>
@@ -81,14 +81,14 @@ public int? ANOTable_ID
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
     public string Data_type
     {
         get => _dataType;
-        set => SetField(ref  _dataType, value);
+        set => SetField(ref _dataType, value);
     }
 
     /// <summary>
@@ -98,7 +98,7 @@ public string Data_type
     public string Format
     {
         get => _format;
-        set => SetField(ref  _format, value);
+        set => SetField(ref _format, value);
     }
 
     /// <summary>
@@ -107,7 +107,7 @@ public string Format
     public string Digitisation_specs
     {
         get => _digitisationSpecs;
-        set => SetField(ref  _digitisationSpecs, value);
+        set => SetField(ref _digitisationSpecs, value);
     }
 
     /// <summary>
@@ -116,7 +116,7 @@ public string Digitisation_specs
     public string Source
     {
         get => _source;
-        set => SetField(ref  _source, value);
+        set => SetField(ref _source, value);
     }
 
     /// <summary>
@@ -125,7 +125,7 @@ public string Source
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -134,7 +134,7 @@ public string Description
     public ColumnStatus? Status
     {
         get => _status;
-        set => SetField(ref  _status, value);
+        set => SetField(ref _status, value);
     }
 
     /// <summary>
@@ -144,9 +144,9 @@ public ColumnStatus? Status
     public string RegexPattern
     {
         get => _regexPattern;
-        set => SetField(ref  _regexPattern, value);
+        set => SetField(ref _regexPattern, value);
     }
-        
+
     /// <summary>
     /// Not used for anything by RDMP.
     /// <para>Use the data quality engine instead (See <see cref="Catalogue.ValidatorXML"/>)</para>
@@ -154,30 +154,30 @@ public string RegexPattern
     public string ValidationRules
     {
         get => _validationRules;
-        set => SetField(ref  _validationRules, value);
+        set => SetField(ref _validationRules, value);
     }
 
     /// <inheritdoc/>
     public bool IsPrimaryKey
     {
         get => _isPrimaryKey;
-        set => SetField(ref  _isPrimaryKey, value);
+        set => SetField(ref _isPrimaryKey, value);
     }
 
     /// <inheritdoc/>
     public bool IsAutoIncrement
     {
         get => _isAutoIncrement;
-        set => SetField(ref  _isAutoIncrement, value);
+        set => SetField(ref _isAutoIncrement, value);
     }
 
     /// <inheritdoc/>
     public string Collation
     {
         get => _collation;
-        set => SetField(ref  _collation, value);
+        set => SetField(ref _collation, value);
     }
-        
+
     /// <summary>
     /// The importance of this column in resolving primary key collisions during data loads (in RAW).  Columns with a lower number are consulted first when resolving
     /// collisions.  E.g. are the colliding records different on this column? if yes use <see cref="DuplicateRecordResolutionIsAscending"/> to pick which to delete
@@ -187,7 +187,7 @@ public string Collation
     public int? DuplicateRecordResolutionOrder
     {
         get => _duplicateRecordResolutionOrder;
-        set => SetField(ref  _duplicateRecordResolutionOrder, value);
+        set => SetField(ref _duplicateRecordResolutionOrder, value);
     }
 
     /// <summary>
@@ -198,7 +198,7 @@ public int? DuplicateRecordResolutionOrder
     public bool DuplicateRecordResolutionIsAscending
     {
         get => _duplicateRecordResolutionIsAscending;
-        set => SetField(ref  _duplicateRecordResolutionIsAscending, value);
+        set => SetField(ref _duplicateRecordResolutionIsAscending, value);
     }
 
     /// <summary>
@@ -207,7 +207,7 @@ public bool DuplicateRecordResolutionIsAscending
     public bool IgnoreInLoads
     {
         get => _ignoreInLoads;
-        set => SetField(ref  _ignoreInLoads, value);
+        set => SetField(ref _ignoreInLoads, value);
     }
 
     #endregion
@@ -220,15 +220,16 @@ public bool IgnoreInLoads
 
     /// <inheritdoc cref="ANOTable_ID"/>
     [NoMappingToDatabase]
-    public ANOTable ANOTable => ANOTable_ID == null ? null : Repository.GetObjectByID<ANOTable>((int) ANOTable_ID);
+    public ANOTable ANOTable => ANOTable_ID == null ? null : Repository.GetObjectByID<ANOTable>((int)ANOTable_ID);
 
     /// <summary>
     /// Fetches all <see cref="ExtractionInformation"/> which draw on this <see cref="ColumnInfo"/>.  This could be none (if it is not extractable) or more than one
     /// (if there are multiple extraction transforms available for the column or if the column/table is part of multiple <see cref="Catalogue"/>)
     /// </summary>
     [NoMappingToDatabase]
-    public IEnumerable<ExtractionInformation> ExtractionInformations {
-        get { return CatalogueItems.Select(e=>e.ExtractionInformation).Where(o=>o != null); }
+    public IEnumerable<ExtractionInformation> ExtractionInformations
+    {
+        get { return CatalogueItems.Select(e => e.ExtractionInformation).Where(o => o != null); }
     }
 
     /// <summary>
@@ -239,7 +240,7 @@ public IEnumerable<ExtractionInformation> ExtractionInformations {
     public IEnumerable<CatalogueItem> CatalogueItems => Repository.GetAllObjectsWithParent<CatalogueItem>(this);
 
     #endregion
-        
+
     /// <summary>
     /// Notional usage status of a <see cref="ColumnInfo"/>.  Not used for anything by RDMP.
     /// </summary>
@@ -285,12 +286,12 @@ public ColumnInfo(ICatalogueRepository repository, string name, string type, ITa
         //defaults
         DuplicateRecordResolutionIsAscending = true;
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name != null ? (object) name : DBNull.Value},
-            {"Data_type", type != null ? (object) type : DBNull.Value},
-            {"TableInfo_ID", parent.ID},
-            { "IgnoreInLoads",false}
+            { "Name", name != null ? (object)name : DBNull.Value },
+            { "Data_type", type != null ? (object)type : DBNull.Value },
+            { "TableInfo_ID", parent.ID },
+            { "IgnoreInLoads", false }
         });
 
         ClearAllInjections();
@@ -300,7 +301,7 @@ internal ColumnInfo(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
         TableInfo_ID = int.Parse(r["TableInfo_ID"].ToString());
-        Name =r["Name"].ToString();
+        Name = r["Name"].ToString();
         Data_type = r["Data_type"].ToString();
         Format = r["Format"].ToString();
         Digitisation_specs = r["Digitisation_specs"].ToString();
@@ -337,10 +338,7 @@ internal ColumnInfo(ICatalogueRepository repository, DbDataReader r)
     /// Returns the fully qualified <see cref="Name"/> of the <see cref="ColumnInfo"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Allows sorting by fully qualified <see cref="Name"/>.
@@ -349,15 +347,11 @@ public override string ToString()
     /// <returns></returns>
     public int CompareTo(object obj)
     {
-        if (obj is ColumnInfo)
-        {
-            return - obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
-        }
-            
+        if (obj is ColumnInfo) return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
+
         throw new Exception($"Cannot compare {GetType().Name} to {obj.GetType().Name}");
-            
     }
-        
+
     ///<inheritdoc/>
     public string GetRuntimeName()
     {
@@ -368,10 +362,7 @@ public string GetRuntimeName()
     }
 
     ///<inheritdoc/>
-    public string GetFullyQualifiedName()
-    {
-        return Name;
-    }
+    public string GetFullyQualifiedName() => Name;
 
     private IQuerySyntaxHelper _cachedQuerySyntaxHelper;
     private Lazy<TableInfo> _knownTableInfo;
@@ -390,11 +381,9 @@ public string GetRuntimeName(LoadStage stage)
         var finalName = GetRuntimeName();
 
         if (stage <= LoadStage.AdjustRaw)
-        {
             //see if it has an ANO Transform on it
             if (ANOTable_ID != null && finalName.StartsWith("ANO"))
                 return finalName["ANO".Length..];
-        }
 
         //any other stage will be the regular final name
         return finalName;
@@ -413,25 +402,27 @@ public string GetRuntimeDataType(LoadStage loadStage)
         {
             //if it has an ANO transform
             if (ANOTable_ID != null)
-                return ANOTable.GetRuntimeDataType(loadStage);    //get the datatype from the ANOTable because ColumnInfo is of mutable type depending on whether it has been anonymised yet 
+                return
+                    ANOTable.GetRuntimeDataType(
+                        loadStage); //get the datatype from the ANOTable because ColumnInfo is of mutable type depending on whether it has been anonymised yet 
 
             //it doesn't have an ANOtransform but it might be the subject of dilution
-            var discard = TableInfo.PreLoadDiscardedColumns.SingleOrDefault(c=>c.GetRuntimeName().Equals(GetRuntimeName(),StringComparison.InvariantCultureIgnoreCase));
+            var discard = TableInfo.PreLoadDiscardedColumns.SingleOrDefault(c =>
+                c.GetRuntimeName().Equals(GetRuntimeName(), StringComparison.InvariantCultureIgnoreCase));
 
             //The column exists both in the live database and in the identifier dump.  This is because it goes through horrendous bitcrushing operations e.g. Load RAW with full
             //postcode varchar(8) and ship postcode off to identifier dump but also let it go through to live but only as the first 4 letters varchar(4).  so the datatype of the column
             //in RAW is varchar(8) but in Live is varchar(4)
             if (discard != null)
                 return discard.Data_type;
-                    
+
             return Data_type;
-                
         }
 
         //The user is asking about a stage other than RAW so tell them about the final column type state
         return Data_type;
     }
-        
+
     /// <summary>
     /// Connects to the live database referenced by this <seealso cref="ColumnInfo"/> and discovers the column returning the
     /// live state of the column.
@@ -456,7 +447,7 @@ public IHasDependencies[] GetObjectsThisDependsOn()
 
         if (ANOTable_ID != null)
             iDependOn.Add(ANOTable);
-            
+
         return iDependOn.ToArray();
     }
 
@@ -465,10 +456,10 @@ public IHasDependencies[] GetObjectsThisDependsOn()
     public IHasDependencies[] GetObjectsDependingOnThis()
     {
         var dependantObjects = new List<IHasDependencies>();
-            
+
         //also any CatalogueItems that reference us
         dependantObjects.AddRange(CatalogueItems);
-            
+
         //also lookups are dependent on us
         dependantObjects.AddRange(GetAllLookupForColumnInfoWhereItIsA(LookupType.AnyKey));
 
@@ -495,12 +486,16 @@ public void Check(ICheckNotifier notifier)
             //make sure it doesn't start with ANO (if it does it should have an ANOTable, maybe the user is calling his column ANOUNCEMENT or something (not permitted)
             if (GetRuntimeName().StartsWith(ANOTable.ANOPrefix))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"ColumnInfo {this} (ID={ID}) begins with {ANOTable.ANOPrefix} but does not have an ANOTable configured for it", CheckResult.Warning, null));
+                    $"ColumnInfo {this} (ID={ID}) begins with {ANOTable.ANOPrefix} but does not have an ANOTable configured for it",
+                    CheckResult.Warning, null));
         }
-        else//if it does have an ANO transform it must start with ANO
-        if(!GetRuntimeName().StartsWith(ANOTable.ANOPrefix))
+        else //if it does have an ANO transform it must start with ANO
+        if (!GetRuntimeName().StartsWith(ANOTable.ANOPrefix))
+        {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"ColumnInfo {this} (ID={ID}) has an ANOTable configured but does not start with {ANOTable.ANOPrefix} (All anonymised columns must start with {ANOTable.ANOPrefix})", CheckResult.Fail, null));
+                $"ColumnInfo {this} (ID={ID}) has an ANOTable configured but does not start with {ANOTable.ANOPrefix} (All anonymised columns must start with {ANOTable.ANOPrefix})",
+                CheckResult.Fail, null));
+        }
     }
 
     /// <summary>
@@ -513,10 +508,11 @@ public Lookup[] GetAllLookupForColumnInfoWhereItIsA(LookupType type)
         if (type == LookupType.Description)
             return Repository.GetAllObjectsWhere<Lookup>("Description_ID", ID);
         if (type == LookupType.AnyKey)
-            return Repository.GetAllObjectsWhere<Lookup>("ForeignKey_ID", ID,ExpressionType.OrElse,"PrimaryKey_ID",ID);      
+            return Repository.GetAllObjectsWhere<Lookup>("ForeignKey_ID", ID, ExpressionType.OrElse, "PrimaryKey_ID",
+                ID);
         if (type == LookupType.ForeignKey)
             return Repository.GetAllObjectsWhere<Lookup>("ForeignKey_ID", ID);
-            
+
         throw new NotImplementedException($"Unrecognised LookupType {type}");
     }
 
@@ -544,7 +540,7 @@ public bool IsNumerical()
         {
             //is it numerical?
             var cSharpType = GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(Data_type);
-            return cSharpType == typeof (decimal) || cSharpType == typeof (int);
+            return cSharpType == typeof(decimal) || cSharpType == typeof(int);
         }
         catch (Exception)
         {
diff --git a/Rdmp.Core/Curation/Data/Commit.cs b/Rdmp.Core/Curation/Data/Commit.cs
index 17772ea48e..08750b1710 100644
--- a/Rdmp.Core/Curation/Data/Commit.cs
+++ b/Rdmp.Core/Curation/Data/Commit.cs
@@ -19,6 +19,7 @@ namespace Rdmp.Core.Curation.Data;
 public class Commit : DatabaseEntity
 {
     #region Database Properties
+
     private string _username;
     private DateTime _date;
     private string _transaction;
@@ -35,11 +36,13 @@ public DateTime Date
         get => _date;
         set => SetField(ref _date, value);
     }
+
     public string Transaction
     {
         get => _transaction;
         set => SetField(ref _transaction, value);
     }
+
     public string Description
     {
         get => _description;
@@ -50,16 +53,14 @@ public string Description
 
     #region Relationships
 
-
-    [NoMappingToDatabase]
-    public Memento[] Mementos => Repository.GetAllObjectsWithParent<Memento>(this);
+    [NoMappingToDatabase] public Memento[] Mementos => Repository.GetAllObjectsWithParent<Memento>(this);
 
     #endregion
 
     public Commit()
     {
-
     }
+
     public Commit(ICatalogueRepository repo, DbDataReader r) : base(repo, r)
     {
         Transaction = r["Transaction"].ToString();
@@ -67,19 +68,17 @@ public Commit(ICatalogueRepository repo, DbDataReader r) : base(repo, r)
         Date = Convert.ToDateTime(r["Date"]);
         Description = r["Description"].ToString();
     }
+
     public Commit(ICatalogueRepository repository, Guid transaction, string description)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Transaction",transaction.ToString("N")},
-            {"Username", Environment.UserName},
-            {"Date", DateTime.Now},
-            {"Description",description}
+            { "Transaction", transaction.ToString("N") },
+            { "Username", Environment.UserName },
+            { "Date", DateTime.Now },
+            { "Description", description }
         });
     }
 
-    public override string ToString()
-    {
-        return Transaction;
-    }
+    public override string ToString() => Transaction;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/CommitInProgress.cs b/Rdmp.Core/Curation/Data/CommitInProgress.cs
index 77c32e5982..017d7ad410 100644
--- a/Rdmp.Core/Curation/Data/CommitInProgress.cs
+++ b/Rdmp.Core/Curation/Data/CommitInProgress.cs
@@ -35,6 +35,7 @@ public class CommitInProgress : IDisposable
     /// save suppression
     /// </summary>
     private bool _finishing;
+
     private bool _isDisposed;
 
     /// <summary>
@@ -42,32 +43,28 @@ public class CommitInProgress : IDisposable
     /// </summary>
     /// <param name="locator"></param>
     /// <param name="settings"></param>
-    public CommitInProgress(IRDMPPlatformRepositoryServiceLocator locator,CommitInProgressSettings settings)
+    public CommitInProgress(IRDMPPlatformRepositoryServiceLocator locator, CommitInProgressSettings settings)
     {
         Settings = settings;
 
         _locator = locator;
 
         _repositories = _locator.GetAllRepositories().ToList();
-        _serializer = YamlRepository.CreateSerializer(_repositories.SelectMany(r=>r.GetCompatibleTypes()).Distinct()
+        _serializer = YamlRepository.CreateSerializer(_repositories.SelectMany(r => r.GetCompatibleTypes()).Distinct()
         );
 
-        foreach(var repo in _repositories)
+        foreach (var repo in _repositories)
         {
             repo.Deleting += Deleting;
             repo.Inserting += Inserting;
 
-            if(settings.UseTransactions)
-            {
+            if (settings.UseTransactions)
                 // these get cleaned up in Dispose or TryFinish
                 repo.BeginNewTransaction();
-            }
         }
 
-        foreach(var t in settings.ObjectsToTrack)
-        {
-            originalStates.Add(t, new MementoInProgress(t,_serializer.Serialize(t)));
-        }
+        foreach (var t in settings.ObjectsToTrack)
+            originalStates.Add(t, new MementoInProgress(t, _serializer.Serialize(t)));
     }
 
     private void Inserting(object sender, IMapsDirectlyToDatabaseTableEventArgs e)
@@ -77,25 +74,18 @@ private void Inserting(object sender, IMapsDirectlyToDatabaseTableEventArgs e)
 
         // if we are not in global mode with transactions then this is a long term
         // commit (e.g. user has tab open for half an hour).  Don't hoover up all created/deleted objects
-        if (!Settings.UseTransactions)
-        {
-            return;
-        }
+        if (!Settings.UseTransactions) return;
 
         // how can we be tracking an object that was not created yet?
         if (originalStates.TryGetValue(e.Object, out var state))
-        {
             // oh well just pretend it magicked into existence
             state.Type = MementoType.Add;
-        }
         else
-        {
             // legit new object we didn't know about before
             originalStates.Add(e.Object, new MementoInProgress(e.Object, null)
             {
                 Type = MementoType.Add
             });
-        }
     }
 
     private void Deleting(object sender, IMapsDirectlyToDatabaseTableEventArgs e)
@@ -105,27 +95,19 @@ private void Deleting(object sender, IMapsDirectlyToDatabaseTableEventArgs e)
 
         // if we are not in global mode with transactions then this is a long term
         // commit (e.g. user has tab open for half an hour).  Don't hoover up all created/deleted objects
-        if(!Settings.UseTransactions)
-        {
-            return;
-        }
+        if (!Settings.UseTransactions) return;
 
         // one of the objects we are tracking has been deleted
         if (originalStates.ContainsKey(e.Object))
         {
             // change our understanding of this object
 
-            if(originalStates[e.Object].Type == MementoType.Add)
-            {
+            if (originalStates[e.Object].Type == MementoType.Add)
                 // ok user created this object during the commit then deleted it again... odd but fair enough
-                    
                 // pretend it never existed
                 originalStates.Remove(e.Object);
-            }
             else
-            {
                 originalStates[e.Object].Type = MementoType.Delete;
-            }
         }
         else
         {
@@ -145,30 +127,27 @@ private void Deleting(object sender, IMapsDirectlyToDatabaseTableEventArgs e)
     public Commit TryFinish(IBasicActivateItems activator)
     {
         if (_finishing)
-            throw new ObjectDisposedException($"{nameof(CommitInProgress)} has already been successfully finished and shutdown",nameof(CommitInProgress));
+            throw new ObjectDisposedException(
+                $"{nameof(CommitInProgress)} has already been successfully finished and shutdown",
+                nameof(CommitInProgress));
 
         if (_isDisposed)
             throw new ObjectDisposedException(nameof(CommitInProgress));
 
-        var changes = new Dictionary<IMapsDirectlyToDatabaseTable, Tuple<MementoInProgress,string>>();
+        var changes = new Dictionary<IMapsDirectlyToDatabaseTable, Tuple<MementoInProgress, string>>();
 
         foreach (var t in originalStates)
         {
             // serialize the current state on finishing into yaml (or use null for deleted objects)
-            var newYaml = t.Value.Type == MementoType.Delete ? null :  _serializer.Serialize(t.Key);
-                
+            var newYaml = t.Value.Type == MementoType.Delete ? null : _serializer.Serialize(t.Key);
+
             //something changed
-            if(newYaml != t.Value.OldYaml)
-            {
-                changes.Add(t.Key, Tuple.Create(t.Value, newYaml));
-            }
+            if (newYaml != t.Value.OldYaml) changes.Add(t.Key, Tuple.Create(t.Value, newYaml));
         }
 
-        if(!changes.Any())
-        {
+        if (!changes.Any())
             // no changes so no need for a Commit
             return null;
-        }
         var cataRepo = _locator.CatalogueRepository;
 
         var description = GetDescription(changes);
@@ -177,22 +156,18 @@ public Commit TryFinish(IBasicActivateItems activator)
         if (activator.IsInteractive)
         {
             // object name or count of the number of objects
-            var collectionDescription = changes.Count == 1 ?
-                changes.Single().Key.ToString() : $"{changes.Count} object(s)";
+            var collectionDescription =
+                changes.Count == 1 ? changes.Single().Key.ToString() : $"{changes.Count} object(s)";
 
             if (activator.TypeText(new DialogArgs
-                { 
+                {
                     WindowTitle = transaction.ToString(),
                     TaskDescription = $"Enter a description of what changes you have made to {collectionDescription}"
                 }, int.MaxValue, description, out var newDescription, false))
-            {
                 description = newDescription;
-            }
             else
-            {
                 // user cancelled creating Commit
                 return null;
-            }
         }
 
         // We couldn't describe the changes, that's bad...
@@ -206,21 +181,15 @@ public Commit TryFinish(IBasicActivateItems activator)
 
         var c = new Commit(cataRepo, transaction, description);
 
-        foreach(var m in changes.OrderBy(c => c.Value.Item1.Order))
-        {
-            _=new Memento(cataRepo, c, m.Value.Item1.Type, m.Key, m.Value.Item1.OldYaml, m.Value.Item2);
-        }
-            
+        foreach (var m in changes.OrderBy(c => c.Value.Item1.Order))
+            _ = new Memento(cataRepo, c, m.Value.Item1.Type, m.Key, m.Value.Item1.OldYaml, m.Value.Item2);
+
         // if we created a bunch of db transactions (one per database/server known about) for this commit
         // then we should be letting these changes go ahead
-        if(Settings.UseTransactions)
-        {
+        if (Settings.UseTransactions)
             foreach (var repo in _repositories)
-            {
                 repo.EndTransaction(true);
-            }
-        }
-            
+
         return c;
     }
 
@@ -230,28 +199,19 @@ private string GetDescription(Dictionary<IMapsDirectlyToDatabaseTable, Tuple<Mem
         if (changes.Count == 0)
             return null;
 
-        if(Settings.Description != null)
-        {
-            return Settings.Description;
-        }
+        if (Settings.Description != null) return Settings.Description;
 
         // we can't summarise changes to multiple objects
-        if(changes.Count != 1)
-        {
-            return "TODO";
-        }
+        if (changes.Count != 1) return "TODO";
 
         var kv = changes.Single();
         var props = kv.Value.Item1.GetDiffProperties(kv.Key).ToArray();
 
         // no visible changes... but yaml is different which is odd.
         // Either way abandon this commit.
-        if(!props.Any())
-        {
-            return null;
-        }
+        if (!props.Any()) return null;
 
-        return $"Update {kv.Key.GetType().Name} {string.Join(", ",props.Select(p => p.Name).ToArray())}";
+        return $"Update {kv.Key.GetType().Name} {string.Join(", ", props.Select(p => p.Name).ToArray())}";
     }
 
     public void Dispose()
@@ -264,7 +224,6 @@ public void Dispose()
 
 
             if (Settings.UseTransactions && _finishing == false)
-            {
                 try
                 {
                     // Abandon transactions
@@ -274,7 +233,6 @@ public void Dispose()
                 {
                     // ok maybe someone else shut this down somehow... whatever
                 }
-            }
         }
 
         _isDisposed = true;
diff --git a/Rdmp.Core/Curation/Data/ConcreteColumn.cs b/Rdmp.Core/Curation/Data/ConcreteColumn.cs
index 795a72d87d..d408584628 100644
--- a/Rdmp.Core/Curation/Data/ConcreteColumn.cs
+++ b/Rdmp.Core/Curation/Data/ConcreteColumn.cs
@@ -23,7 +23,7 @@ namespace Rdmp.Core.Curation.Data;
 /// 
 /// <para>Provides an implementation of IColumn whilst still being a DatabaseEntity (saveable / part of a database repository etc)</para>
 /// </summary>
-public abstract class ConcreteColumn : DatabaseEntity, IColumn,IOrderable,IComparable
+public abstract class ConcreteColumn : DatabaseEntity, IColumn, IOrderable, IComparable
 {
     #region Database Properties
 
@@ -61,28 +61,28 @@ public string SelectSQL
     public string Alias
     {
         get => _alias;
-        set => SetField(ref _alias , value);
+        set => SetField(ref _alias, value);
     }
 
     /// <inheritdoc/>
     public bool HashOnDataRelease
     {
         get => _hashOnDataRelease;
-        set => SetField(ref _hashOnDataRelease , value);
+        set => SetField(ref _hashOnDataRelease, value);
     }
 
     /// <inheritdoc/>
     public bool IsExtractionIdentifier
     {
         get => _isExtractionIdentifier;
-        set => SetField(ref _isExtractionIdentifier , value);
+        set => SetField(ref _isExtractionIdentifier, value);
     }
 
     /// <inheritdoc/>
     public bool IsPrimaryKey
     {
         get => _isPrimaryKey;
-        set => SetField(ref _isPrimaryKey , value);
+        set => SetField(ref _isPrimaryKey, value);
     }
 
     #endregion
@@ -96,23 +96,21 @@ public bool IsPrimaryKey
     #endregion
 
     /// <inheritdoc/>
-    protected ConcreteColumn(IRepository repository, DbDataReader r):base(repository,r)
+    protected ConcreteColumn(IRepository repository, DbDataReader r) : base(repository, r)
     {
-
     }
 
     /// <inheritdoc/>
-    protected ConcreteColumn():base()
+    protected ConcreteColumn() : base()
     {
-
     }
 
     /// <inheritdoc/>
     public string GetRuntimeName()
     {
-        var helper = ColumnInfo == null ? MicrosoftQuerySyntaxHelper.Instance: ColumnInfo.GetQuerySyntaxHelper();
+        var helper = ColumnInfo == null ? MicrosoftQuerySyntaxHelper.Instance : ColumnInfo.GetQuerySyntaxHelper();
         if (!string.IsNullOrWhiteSpace(Alias))
-            return helper.GetRuntimeName(Alias);//.GetRuntimeName(); RDMPQuerySyntaxHelper.GetRuntimeName(this);
+            return helper.GetRuntimeName(Alias); //.GetRuntimeName(); RDMPQuerySyntaxHelper.GetRuntimeName(this);
 
         if (!string.IsNullOrWhiteSpace(SelectSQL))
             return helper.GetRuntimeName(SelectSQL);
diff --git a/Rdmp.Core/Curation/Data/ConcreteContainer.cs b/Rdmp.Core/Curation/Data/ConcreteContainer.cs
index 0f608b704e..0fa4d689ba 100644
--- a/Rdmp.Core/Curation/Data/ConcreteContainer.cs
+++ b/Rdmp.Core/Curation/Data/ConcreteContainer.cs
@@ -16,30 +16,31 @@ namespace Rdmp.Core.Curation.Data;
 /// <summary>
 /// Common abstract base class for IContainer (AND/OR Where logic) classes that are persisted in the database as a <see cref="DatabaseEntity"/>
 /// </summary>
-public abstract class ConcreteContainer:DatabaseEntity, IContainer
+public abstract class ConcreteContainer : DatabaseEntity, IContainer
 {
     private IFilterManager _manager;
     private FilterContainerOperation _operation;
+
     /// <inheritdoc/>
     public FilterContainerOperation Operation
     {
         get => _operation;
-        set => SetField(ref  _operation, value);
+        set => SetField(ref _operation, value);
     }
 
     public ConcreteContainer()
     {
-
     }
 
     public void SetManager(IFilterManager manager)
     {
         _manager = manager;
     }
-    protected ConcreteContainer(IFilterManager manager,IRepository repository, DbDataReader r):base(repository,r)
+
+    protected ConcreteContainer(IFilterManager manager, IRepository repository, DbDataReader r) : base(repository, r)
     {
         _manager = manager;
-        Operation = (FilterContainerOperation) Enum.Parse(typeof(FilterContainerOperation), r["Operation"].ToString());
+        Operation = (FilterContainerOperation)Enum.Parse(typeof(FilterContainerOperation), r["Operation"].ToString());
     }
 
     protected ConcreteContainer(IFilterManager manager)
@@ -48,27 +49,18 @@ protected ConcreteContainer(IFilterManager manager)
     }
 
     /// <inheritdoc/>
-    public IContainer GetParentContainerIfAny()
-    {
-        return _manager.GetParentContainerIfAny(this);
-    }
+    public IContainer GetParentContainerIfAny() => _manager.GetParentContainerIfAny(this);
 
     /// <inheritdoc/>
-    public IContainer[] GetSubContainers()
-    {
-        return _manager.GetSubContainers(this);
-    }
+    public IContainer[] GetSubContainers() => _manager.GetSubContainers(this);
 
     /// <inheritdoc/>
-    public IFilter[] GetFilters()
-    {
-        return _manager.GetFilters(this);
-    }
+    public IFilter[] GetFilters() => _manager.GetFilters(this);
 
     /// <inheritdoc/>
     public void AddChild(IContainer child)
     {
-        _manager.AddSubContainer(this,child);
+        _manager.AddSubContainer(this, child);
     }
 
     /// <inheritdoc/>
@@ -97,7 +89,7 @@ public override void DeleteInDatabase()
 
         //then delete any children it has itself
         foreach (var subContainer in GetAllSubContainersRecursively())
-            if(subContainer.Exists())
+            if (subContainer.Exists())
                 subContainer.DeleteInDatabase();
 
         //clean up the orphans that will be created by killing ourselves
@@ -113,10 +105,7 @@ public override void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public IContainer GetRootContainerOrSelf()
-    {
-        return GetRootContainerOrSelf(this);
-    }
+    public IContainer GetRootContainerOrSelf() => GetRootContainerOrSelf(this);
 
     private IContainer GetRootContainerOrSelf(IContainer container)
     {
@@ -128,11 +117,9 @@ private IContainer GetRootContainerOrSelf(IContainer container)
     }
 
     /// <inheritdoc/>
-    public List<IFilter> GetAllFiltersIncludingInSubContainersRecursively()
-    {
-        return GetAllFiltersIncludingInSubContainersRecursively(this);
-    }
-        
+    public List<IFilter> GetAllFiltersIncludingInSubContainersRecursively() =>
+        GetAllFiltersIncludingInSubContainersRecursively(this);
+
     private List<IFilter> GetAllFiltersIncludingInSubContainersRecursively(IContainer container)
     {
         var toReturn = new List<IFilter>();
@@ -151,10 +138,7 @@ private List<IFilter> GetAllFiltersIncludingInSubContainersRecursively(IContaine
     public abstract Catalogue GetCatalogueIfAny();
 
     /// <inheritdoc/>
-    public List<IContainer> GetAllSubContainersRecursively()
-    {
-        return GetAllSubContainersRecursively(this);
-    }
+    public List<IContainer> GetAllSubContainersRecursively() => GetAllSubContainersRecursively(this);
 
     private List<IContainer> GetAllSubContainersRecursively(IContainer current)
     {
diff --git a/Rdmp.Core/Curation/Data/ConcreteFilter.cs b/Rdmp.Core/Curation/Data/ConcreteFilter.cs
index 03899abcf4..fcc9e13c80 100644
--- a/Rdmp.Core/Curation/Data/ConcreteFilter.cs
+++ b/Rdmp.Core/Curation/Data/ConcreteFilter.cs
@@ -25,18 +25,16 @@ namespace Rdmp.Core.Curation.Data;
 /// <para>ConcreteFilter is used to provide UI editing of an IFilter without having to add persistence / DatabaseEntity logic to IFilter (which would break
 /// SpontaneouslyInventedFilters)</para>
 /// </summary>
-public abstract class ConcreteFilter :  DatabaseEntity,IFilter, ICheckable
+public abstract class ConcreteFilter : DatabaseEntity, IFilter, ICheckable
 {
     /// <inheritdoc/>
-    protected ConcreteFilter(IRepository repository,DbDataReader r) : base(repository, r)
+    protected ConcreteFilter(IRepository repository, DbDataReader r) : base(repository, r)
     {
-
     }
 
     /// <inheritdoc/>
-    protected ConcreteFilter():base()
+    protected ConcreteFilter() : base()
     {
-
     }
 
     #region Database Properties
@@ -51,14 +49,15 @@ protected ConcreteFilter():base()
     public string WhereSQL
     {
         get => _whereSQL;
-        set => SetField(ref  _whereSQL, value);
+        set => SetField(ref _whereSQL, value);
     }
+
     /// <inheritdoc/>
     [NotNull]
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
@@ -66,14 +65,14 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <inheritdoc/>
     public bool IsMandatory
     {
         get => _isMandatory;
-        set => SetField(ref  _isMandatory, value);
+        set => SetField(ref _isMandatory, value);
     }
 
     #endregion
@@ -132,10 +131,7 @@ public bool IsMandatory
     /// Returns an appropriately typed <see cref="IQuerySyntaxHelper"/> depending on the DatabaseType of the Catalogue that it relates to.
     /// </summary>
     /// <returns></returns>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return new QuerySyntaxHelperFactory().Create(GetDatabaseType());
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => new QuerySyntaxHelperFactory().Create(GetDatabaseType());
 
     private DatabaseType? _cachedDatabaseTypeAnswer;
 
@@ -150,7 +146,8 @@ protected DatabaseType GetDatabaseType()
             return _cachedDatabaseTypeAnswer.Value;
 
         var col = GetColumnInfoIfExists();
-        _cachedDatabaseTypeAnswer = col != null ? col.TableInfo.DatabaseType : GetCatalogue().GetDistinctLiveDatabaseServerType();
+        _cachedDatabaseTypeAnswer =
+            col != null ? col.TableInfo.DatabaseType : GetCatalogue().GetDistinctLiveDatabaseServerType();
 
         if (!_cachedDatabaseTypeAnswer.HasValue)
             throw new AmbiguousDatabaseTypeException($"Unable to determine DatabaseType for Filter '{this}'");
@@ -165,7 +162,9 @@ protected DatabaseType GetDatabaseType()
     public virtual void Check(ICheckNotifier notifier)
     {
         if (WhereSQL != null && WhereSQL.StartsWith("where ", StringComparison.CurrentCultureIgnoreCase))
-            notifier.OnCheckPerformed(new CheckEventArgs("Filters do not need to start with 'where' keyword, it is implicit",CheckResult.Fail));
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("Filters do not need to start with 'where' keyword, it is implicit",
+                    CheckResult.Fail));
 
         new FilterSyntaxChecker(this).Check(notifier);
     }
@@ -176,5 +175,4 @@ public bool ShouldBeReadOnly(out string reason)
         reason = null;
         return FilterContainer?.ShouldBeReadOnly(out reason) ?? false;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ConnectionStringKeyword.cs b/Rdmp.Core/Curation/Data/ConnectionStringKeyword.cs
index fb775ea50e..788a375405 100644
--- a/Rdmp.Core/Curation/Data/ConnectionStringKeyword.cs
+++ b/Rdmp.Core/Curation/Data/ConnectionStringKeyword.cs
@@ -30,8 +30,9 @@ public class ConnectionStringKeyword : DatabaseEntity, INamed, ICheckable
     private DatabaseType _databaseType;
     private string _name;
     private string _value;
+
     #endregion
-        
+
     /// <summary>
     /// The DBMS (Oracle / MySql etc) which this keyword should be used when connecting to
     /// </summary>
@@ -62,7 +63,6 @@ public string Value
 
     public ConnectionStringKeyword()
     {
-
     }
 
     /// <summary>
@@ -72,13 +72,14 @@ public ConnectionStringKeyword()
     /// <param name="databaseType"></param>
     /// <param name="keyword"></param>
     /// <param name="value"></param>
-    public ConnectionStringKeyword(ICatalogueRepository repository,DatabaseType databaseType, string keyword, string value)
+    public ConnectionStringKeyword(ICatalogueRepository repository, DatabaseType databaseType, string keyword,
+        string value)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"DatabaseType",databaseType.ToString()},
-            {"Name",keyword},
-            {"Value",value}
+            { "DatabaseType", databaseType.ToString() },
+            { "Name", keyword },
+            { "Value", value }
         });
 
         if (ID == 0 || Repository != repository)
@@ -88,16 +89,13 @@ public ConnectionStringKeyword(ICatalogueRepository repository,DatabaseType data
     internal ConnectionStringKeyword(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        DatabaseType = (DatabaseType) Enum.Parse(typeof(DatabaseType),r["DatabaseType"].ToString());
+        DatabaseType = (DatabaseType)Enum.Parse(typeof(DatabaseType), r["DatabaseType"].ToString());
         Name = r["Name"].ToString();
         Value = r["Value"] as string;
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Checks that the keyword is valid syntax for the <see cref="DatabaseType"/> and can be set on a <see cref="DbConnectionStringBuilder"/>
@@ -109,7 +107,8 @@ public void Check(ICheckNotifier notifier)
         {
             var accumulator = new ConnectionStringKeywordAccumulator(DatabaseType);
             accumulator.AddOrUpdateKeyword(Name, Value, ConnectionStringKeywordPriority.SystemDefaultLow);
-            notifier.OnCheckPerformed(new CheckEventArgs("Integrity of keyword is ok according to ConnectionStringKeywordAccumulator", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Integrity of keyword is ok according to ConnectionStringKeywordAccumulator", CheckResult.Success));
         }
         catch (Exception e)
         {
diff --git a/Rdmp.Core/Curation/Data/CredentialsInUseException.cs b/Rdmp.Core/Curation/Data/CredentialsInUseException.cs
index f46b5b0b17..ec765e0f3a 100644
--- a/Rdmp.Core/Curation/Data/CredentialsInUseException.cs
+++ b/Rdmp.Core/Curation/Data/CredentialsInUseException.cs
@@ -18,7 +18,6 @@ public class CredentialsInUseException : Exception
     /// </inheritdoc>
     public CredentialsInUseException(string s) : base(s)
     {
-        
     }
 
     /// <inheritdoc>
@@ -26,6 +25,5 @@ public CredentialsInUseException(string s) : base(s)
     /// </inheritdoc>
     public CredentialsInUseException(string s, Exception inner) : base(s, inner)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/DashboardControl.cs b/Rdmp.Core/Curation/Data/Dashboarding/DashboardControl.cs
index d00ad9d85c..4f0b280250 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/DashboardControl.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/DashboardControl.cs
@@ -20,9 +20,10 @@ namespace Rdmp.Core.Curation.Data.Dashboarding;
 /// 4. Step2 collection given the Objects referenced by ObjectsUsed
 /// 5. Control instance given the Hydrated collection with SetCollection method
 /// </summary>
-public class DashboardControl:DatabaseEntity
+public class DashboardControl : DatabaseEntity
 {
     #region Database Properties
+
     private int _dashboardLayout_ID;
     private int _x;
     private int _y;
@@ -113,7 +114,6 @@ public string PersistenceString
 
     public DashboardControl()
     {
-
     }
 
     internal DashboardControl(ICatalogueRepository repository, DbDataReader r)
@@ -125,8 +125,8 @@ internal DashboardControl(ICatalogueRepository repository, DbDataReader r)
         Height = Convert.ToInt32(r["Height"]);
         Width = Convert.ToInt32(r["Width"]);
 
-        ControlType = r["ControlType"].ToString();//cannot be null
-        PersistenceString = r["PersistenceString"] as string;//can be null
+        ControlType = r["ControlType"].ToString(); //cannot be null
+        PersistenceString = r["PersistenceString"] as string; //can be null
     }
 
     /// <summary>
@@ -140,27 +140,25 @@ internal DashboardControl(ICatalogueRepository repository, DbDataReader r)
     /// <param name="w"></param>
     /// <param name="h"></param>
     /// <param name="persistenceString"></param>
-    public DashboardControl(ICatalogueRepository repository, DashboardLayout parent, Type controlType, int x, int y, int w, int h, string persistenceString)
+    public DashboardControl(ICatalogueRepository repository, DashboardLayout parent, Type controlType, int x, int y,
+        int w, int h, string persistenceString)
     {
         Repository = repository;
 
-        Repository.InsertAndHydrate(this,new Dictionary<string, object>
+        Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"DashboardLayout_ID",parent.ID},
-            {"X",x},
-            {"Y",y},
-            {"Width",w},
-            {"Height",h},
-            {"ControlType",controlType.Name},
-            {"PersistenceString",persistenceString}
-        });   
+            { "DashboardLayout_ID", parent.ID },
+            { "X", x },
+            { "Y", y },
+            { "Width", w },
+            { "Height", h },
+            { "ControlType", controlType.Name },
+            { "PersistenceString", persistenceString }
+        });
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{ControlType}( {ID} )";
-    }
+    public override string ToString() => $"{ControlType}( {ID} )";
 
     /// <summary>
     /// Serializes the current state settings of the IDashboardableControl into <see cref="PersistenceString"/>
@@ -177,6 +175,6 @@ public void SaveCollectionState(IPersistableObjectCollection collection)
             o.DeleteInDatabase();
 
         foreach (var objectToSave in collection.DatabaseObjects)
-            new DashboardObjectUse((ICatalogueRepository) Repository, this, objectToSave);
+            new DashboardObjectUse((ICatalogueRepository)Repository, this, objectToSave);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/DashboardLayout.cs b/Rdmp.Core/Curation/Data/Dashboarding/DashboardLayout.cs
index 9549029108..b6be236046 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/DashboardLayout.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/DashboardLayout.cs
@@ -19,9 +19,10 @@ namespace Rdmp.Core.Curation.Data.Dashboarding;
 /// has a collection of DashboardControls which are IDashboardableControl instances that the user has configured on his Dashboard via DashboardLayoutUI.  This can include plugins. Not only
 /// does this class provide persistence for useful layouts of controls between application executions but it allows users to share their dashboards with one another.
 /// </summary>
-public class DashboardLayout : DatabaseEntity,INamed
+public class DashboardLayout : DatabaseEntity, INamed
 {
     #region Database Properties
+
     private string _name;
     private DateTime _created;
     private string _username;
@@ -52,6 +53,7 @@ public string Username
         get => _username;
         set => SetField(ref _username, value);
     }
+
     #endregion
 
     #region Relationships
@@ -66,7 +68,6 @@ public string Username
 
     public DashboardLayout()
     {
-
     }
 
     internal DashboardLayout(ICatalogueRepository repository, DbDataReader r)
@@ -86,16 +87,13 @@ public DashboardLayout(ICatalogueRepository repository, string name)
     {
         Repository = repository;
 
-        Repository.InsertAndHydrate(this,new Dictionary<string, object>
+        Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Username",Environment.UserName},
-            {"Name",name}
-        });   
+            { "Username", Environment.UserName },
+            { "Name", name }
+        });
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/DashboardObjectUse.cs b/Rdmp.Core/Curation/Data/Dashboarding/DashboardObjectUse.cs
index 4e05c56454..ded348cc75 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/DashboardObjectUse.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/DashboardObjectUse.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.Curation.Data.Dashboarding;
 /// DashboardControl for the pie chart and a DashboardObjectUse pointing at that specific Catalogue.  These refernces do not stop objects being deleted.  References can also be 
 /// cross database (e.g. pointing at objects in a DataExport database like Project etc).
 /// </summary>
-public class DashboardObjectUse: ReferenceOtherObjectDatabaseEntity
+public class DashboardObjectUse : ReferenceOtherObjectDatabaseEntity
 {
     #region Database Properties
 
@@ -30,39 +30,35 @@ public class DashboardObjectUse: ReferenceOtherObjectDatabaseEntity
     public int DashboardControl_ID
     {
         get => _dashboardControlID;
-        set => SetField(ref _dashboardControlID , value);
+        set => SetField(ref _dashboardControlID, value);
     }
 
-
-
     #endregion
 
     public DashboardObjectUse()
     {
-
     }
 
     internal DashboardObjectUse(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         DashboardControl_ID = Convert.ToInt32(r["DashboardControl_ID"]);
-
     }
-         
+
     /// <summary>
     /// Records the fact that the given <see cref="DashboardControl"/> targets the given object (and hopefully displays information about it)
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="parentControl"></param>
     /// <param name="objectToSave"></param>
-    public DashboardObjectUse(ICatalogueRepository repository, DashboardControl parentControl, IMapsDirectlyToDatabaseTable objectToSave)
+    public DashboardObjectUse(ICatalogueRepository repository, DashboardControl parentControl,
+        IMapsDirectlyToDatabaseTable objectToSave)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",objectToSave.ID},
-            {"ReferencedObjectType",objectToSave.GetType().Name},
-            {"ReferencedObjectRepositoryType",objectToSave.Repository.GetType().Name},
-            {"DashboardControl_ID",parentControl.ID}
-
+            { "ReferencedObjectID", objectToSave.ID },
+            { "ReferencedObjectType", objectToSave.GetType().Name },
+            { "ReferencedObjectRepositoryType", objectToSave.Repository.GetType().Name },
+            { "DashboardControl_ID", parentControl.ID }
         });
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/PersistStringHelper.cs b/Rdmp.Core/Curation/Data/Dashboarding/PersistStringHelper.cs
index 718ffa8599..ecf5efbb0b 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/PersistStringHelper.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/PersistStringHelper.cs
@@ -65,7 +65,7 @@ public static string SaveDictionaryToString(Dictionary<string, string> dict)
     /// <returns></returns>
     public static Dictionary<string, string> LoadDictionaryFromString(string str)
     {
-        if(string.IsNullOrWhiteSpace(str))
+        if (string.IsNullOrWhiteSpace(str))
             return new Dictionary<string, string>();
 
         var rootElement = XElement.Parse(str);
@@ -95,7 +95,6 @@ public static string GetValueIfExistsFromPersistString(string key, string persis
     /// <returns></returns>
     public static string GetObjectCollectionPersistString(params IMapsDirectlyToDatabaseTable[] objects)
     {
-
         var sb = new StringBuilder();
 
         //output [obj1,obj2,obj3]
@@ -111,7 +110,9 @@ public static string GetObjectCollectionPersistString(params IMapsDirectlyToData
         return sb.ToString();
     }
 
-    private static readonly Regex CollectionPattern = new($"{Regex.Escape(CollectionStartDelimiter.ToString())}(.*){Regex.Escape(CollectionEndDelimiter.ToString())}",RegexOptions.CultureInvariant);
+    private static readonly Regex CollectionPattern =
+        new($"{Regex.Escape(CollectionStartDelimiter.ToString())}(.*){Regex.Escape(CollectionEndDelimiter.ToString())}",
+            RegexOptions.CultureInvariant);
 
     /// <summary>
     /// Returns the object list section of any <paramref name="persistenceString"/>. This string must take the format [RepoType:ObjectType:ID,RepoType:ObjectType:ID]
@@ -140,13 +141,15 @@ public static string MatchCollectionInString(string persistenceString)
     /// <param name="allObjectsString">A string with a list of objects ID's, should have the format [RepoType:ObjectType:ID,RepoType:ObjectType:ID]</param>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public static List<IMapsDirectlyToDatabaseTable> GetObjectCollectionFromPersistString(string allObjectsString, IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    public static List<IMapsDirectlyToDatabaseTable> GetObjectCollectionFromPersistString(string allObjectsString,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         var toReturn = new List<IMapsDirectlyToDatabaseTable>();
 
         allObjectsString = allObjectsString.Trim(CollectionStartDelimiter, CollectionEndDelimiter);
 
-        var objectStrings = allObjectsString.Split(new[] { CollectionObjectSeparator }, StringSplitOptions.RemoveEmptyEntries);
+        var objectStrings =
+            allObjectsString.Split(new[] { CollectionObjectSeparator }, StringSplitOptions.RemoveEmptyEntries);
 
         foreach (var objectString in objectStrings)
         {
@@ -156,7 +159,8 @@ public static List<IMapsDirectlyToDatabaseTable> GetObjectCollectionFromPersistS
                 throw new PersistenceException(
                     $"Could not figure out what database object to fetch because the list contained an item with an invalid number of tokens ({objectTokens.Length} tokens).  The current object string is:{Environment.NewLine}{objectString}");
 
-            var dbObj = repositoryLocator.GetArbitraryDatabaseObject(objectTokens[0], objectTokens[1], int.Parse(objectTokens[2]));
+            var dbObj = repositoryLocator.GetArbitraryDatabaseObject(objectTokens[0], objectTokens[1],
+                int.Parse(objectTokens[2]));
 
             if (dbObj != null)
                 toReturn.Add(dbObj);
@@ -192,10 +196,9 @@ public static string GetExtraText(string persistString)
     /// <returns></returns>
     public static bool GetBool(Dictionary<string, string> dict, string key, bool valueIfMissing)
     {
-        if(dict == null || !dict.ContainsKey(key))
+        if (dict == null || !dict.ContainsKey(key))
             return valueIfMissing;
 
         return bool.Parse(dict[key]);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/PersistableObjectCollection.cs b/Rdmp.Core/Curation/Data/Dashboarding/PersistableObjectCollection.cs
index 717ec9a878..e4883c33d7 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/PersistableObjectCollection.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/PersistableObjectCollection.cs
@@ -21,27 +21,21 @@ public PersistableObjectCollection()
         Helper = new PersistStringHelper();
     }
 
-    public virtual string SaveExtraText()
-    {
-        return "";
-    }
+    public virtual string SaveExtraText() => "";
 
     public virtual void LoadExtraText(string s)
     {
-            
     }
 
-    protected bool Equals(PersistableObjectCollection other)
-    {
-        return DatabaseObjects.SequenceEqual(other.DatabaseObjects) && Equals(SaveExtraText(), other.SaveExtraText());
-    }
+    protected bool Equals(PersistableObjectCollection other) => DatabaseObjects.SequenceEqual(other.DatabaseObjects) &&
+                                                                Equals(SaveExtraText(), other.SaveExtraText());
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((PersistableObjectCollection) obj);
+        return Equals((PersistableObjectCollection)obj);
     }
 
     public override int GetHashCode()
@@ -49,12 +43,12 @@ public override int GetHashCode()
         unchecked
         {
             return
-                (397 * (DatabaseObjects != null ?
-                        DatabaseObjects.Aggregate(0, (old, curr) =>
-                            (old * 397) ^ (curr != null ? curr.GetHashCode() : 0)) :
-                        0)
+                (397 * (DatabaseObjects != null
+                        ? DatabaseObjects.Aggregate(0, (old, curr) =>
+                            (old * 397) ^ (curr != null ? curr.GetHashCode() : 0))
+                        : 0)
                 ) ^
                 (SaveExtraText() != null ? SaveExtraText().GetHashCode() : 0);
-        } 
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Dashboarding/PersistenceException.cs b/Rdmp.Core/Curation/Data/Dashboarding/PersistenceException.cs
index 8b57425467..d8e464b345 100644
--- a/Rdmp.Core/Curation/Data/Dashboarding/PersistenceException.cs
+++ b/Rdmp.Core/Curation/Data/Dashboarding/PersistenceException.cs
@@ -20,7 +20,6 @@ public class PersistenceException : Exception
     /// <param name="message"></param>
     public PersistenceException(string message) : base(message)
     {
-            
     }
 
     /// <summary>
@@ -28,7 +27,7 @@ public PersistenceException(string message) : base(message)
     /// </summary>
     /// <param name="message"></param>
     /// <param name="exception"></param>
-    public PersistenceException(string message, Exception exception):base(message,exception)
+    public PersistenceException(string message, Exception exception) : base(message, exception)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataAccessCredentials.cs b/Rdmp.Core/Curation/Data/DataAccessCredentials.cs
index 72cbaf63e3..3f9f1bdc42 100644
--- a/Rdmp.Core/Curation/Data/DataAccessCredentials.cs
+++ b/Rdmp.Core/Curation/Data/DataAccessCredentials.cs
@@ -22,11 +22,12 @@ namespace Rdmp.Core.Curation.Data;
 /// the methods of base class EncryptedPasswordHost which currently uses SimpleStringValueEncryption which is a wrapper for RSACryptoServiceProvider.  The layout
 /// of this hierarchy however allows for future plugin utility e.g. using different encryption keys for different tables / user access rights etc.
 /// </summary>
-public class DataAccessCredentials : DatabaseEntity, IDataAccessCredentials,INamed,IHasDependencies
+public class DataAccessCredentials : DatabaseEntity, IDataAccessCredentials, INamed, IHasDependencies
 {
     private EncryptedPasswordHost _encryptedPasswordHost;
 
     #region Database Properties
+
     private string _name;
     private string _username;
 
@@ -36,14 +37,14 @@ public class DataAccessCredentials : DatabaseEntity, IDataAccessCredentials,INam
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
     public string Username
     {
         get => _username;
-        set => SetField(ref  _username, value);
+        set => SetField(ref _username, value);
     }
 
     /// <inheritdoc/>
@@ -72,7 +73,7 @@ public DataAccessCredentials()
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="name"></param>
-    public DataAccessCredentials(ICatalogueRepository repository, string name= null)
+    public DataAccessCredentials(ICatalogueRepository repository, string name = null)
     {
         name ??= $"New Credentials {Guid.NewGuid()}";
 
@@ -80,7 +81,7 @@ public DataAccessCredentials(ICatalogueRepository repository, string name= null)
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name}
+            { "Name", name }
         });
     }
 
@@ -88,7 +89,7 @@ internal DataAccessCredentials(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
         _encryptedPasswordHost = new EncryptedPasswordHost(repository);
-            
+
         Name = (string)r["Name"];
         Username = r["Username"].ToString();
         Password = r["Password"].ToString();
@@ -101,7 +102,8 @@ public override void DeleteInDatabase()
 
         // if there are any contexts where there are any associated tables using this credentials
         if (users.Any(k => k.Value.Any()))
-            throw new CredentialsInUseException($"Cannot delete credentials {Name} because it is in use by one or more TableInfo objects({string.Join(",", users.SelectMany(u => u.Value).Distinct().Select(t => t.Name))})");
+            throw new CredentialsInUseException(
+                $"Cannot delete credentials {Name} because it is in use by one or more TableInfo objects({string.Join(",", users.SelectMany(u => u.Value).Distinct().Select(t => t.Name))})");
 
         try
         {
@@ -109,9 +111,10 @@ public override void DeleteInDatabase()
         }
         catch (Exception e)
         {
-            if(e.Message.Contains("FK_DataAccessCredentials_TableInfo_DataAccessCredentials"))
+            if (e.Message.Contains("FK_DataAccessCredentials_TableInfo_DataAccessCredentials"))
                 throw new CredentialsInUseException(
-                    $"Cannot delete credentials {Name} because it is in use by one or more TableInfo objects({string.Join("", GetAllTableInfosThatUseThis().Values.Select(t => string.Join(",", t)))})",e);
+                    $"Cannot delete credentials {Name} because it is in use by one or more TableInfo objects({string.Join("", GetAllTableInfosThatUseThis().Values.Select(t => string.Join(",", t)))})",
+                    e);
 
             throw;
         }
@@ -122,36 +125,29 @@ public override void DeleteInDatabase()
     /// credentials are used e.g. <see cref="DataAccessContext.DataLoad"/>
     /// </summary>
     /// <returns></returns>
-    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTableInfosThatUseThis()
-    {
-        return CatalogueRepository.TableInfoCredentialsManager.GetAllTablesUsingCredentials(this);
-    }
+    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTableInfosThatUseThis() =>
+        CatalogueRepository.TableInfoCredentialsManager.GetAllTablesUsingCredentials(this);
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
     public string GetDecryptedPassword()
     {
         if (_encryptedPasswordHost == null)
-            throw new Exception($"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
+            throw new Exception(
+                $"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
 
         return _encryptedPasswordHost.GetDecryptedPassword() ?? "";
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsDependingOnThis()
     {
-        return GetAllTableInfosThatUseThis().SelectMany(kvp=>kvp.Value).Cast<IHasDependencies>().ToArray();
+        return GetAllTableInfosThatUseThis().SelectMany(kvp => kvp.Value).Cast<IHasDependencies>().ToArray();
     }
 
     public bool PasswordIs(string password)
diff --git a/Rdmp.Core/Curation/Data/DataAccessCredentialsFactory.cs b/Rdmp.Core/Curation/Data/DataAccessCredentialsFactory.cs
index 924e2b9ba0..0b32b16428 100644
--- a/Rdmp.Core/Curation/Data/DataAccessCredentialsFactory.cs
+++ b/Rdmp.Core/Curation/Data/DataAccessCredentialsFactory.cs
@@ -34,9 +34,11 @@ public DataAccessCredentialsFactory(ICatalogueRepository cataRepository)
     /// <param name="username"></param>
     /// <param name="password"></param>
     /// <param name="usageContext"></param>
-    public DataAccessCredentials Create(ITableInfo tableInfoCreated, string username, string password, DataAccessContext usageContext)
+    public DataAccessCredentials Create(ITableInfo tableInfoCreated, string username, string password,
+        DataAccessContext usageContext)
     {
-        var credentialsToAssociate = _cataRepository.TableInfoCredentialsManager.GetCredentialByUsernameAndPasswordIfExists(username, password);
+        var credentialsToAssociate =
+            _cataRepository.TableInfoCredentialsManager.GetCredentialByUsernameAndPasswordIfExists(username, password);
 
         if (credentialsToAssociate == null)
         {
@@ -49,7 +51,8 @@ public DataAccessCredentials Create(ITableInfo tableInfoCreated, string username
             credentialsToAssociate.SaveToDatabase();
         }
 
-        _cataRepository.TableInfoCredentialsManager.CreateLinkBetween(credentialsToAssociate, tableInfoCreated,usageContext);
+        _cataRepository.TableInfoCredentialsManager.CreateLinkBetween(credentialsToAssociate, tableInfoCreated,
+            usageContext);
 
         return credentialsToAssociate;
     }
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ANOTable.cs b/Rdmp.Core/Curation/Data/DataLoad/ANOTable.cs
index 0cf6464a78..eb3165f020 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ANOTable.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ANOTable.cs
@@ -35,7 +35,7 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 /// NEVER deleting ANOTables that reference existing data  (in the ANOStore database).</para>
 /// 
 /// </summary>
-public class ANOTable : DatabaseEntity, ISaveable, IDeleteable,ICheckable,IRevertable, IHasDependencies
+public class ANOTable : DatabaseEntity, ISaveable, IDeleteable, ICheckable, IRevertable, IHasDependencies
 {
     /// <summary>
     /// Prefix to put on anonymous columns
@@ -59,7 +59,7 @@ public class ANOTable : DatabaseEntity, ISaveable, IDeleteable,ICheckable,IRever
     public string TableName
     {
         get => _tableName;
-        set => SetField(ref  _tableName, value);
+        set => SetField(ref _tableName, value);
     }
 
     /// <summary>
@@ -69,7 +69,7 @@ public string TableName
     public int NumberOfIntegersToUseInAnonymousRepresentation
     {
         get => _numberOfIntegersToUseInAnonymousRepresentation;
-        set => SetField(ref  _numberOfIntegersToUseInAnonymousRepresentation, value);
+        set => SetField(ref _numberOfIntegersToUseInAnonymousRepresentation, value);
     }
 
     /// <summary>
@@ -79,18 +79,18 @@ public int NumberOfIntegersToUseInAnonymousRepresentation
     public int NumberOfCharactersToUseInAnonymousRepresentation
     {
         get => _numberOfCharactersToUseInAnonymousRepresentation;
-        set => SetField(ref  _numberOfCharactersToUseInAnonymousRepresentation, value);
+        set => SetField(ref _numberOfCharactersToUseInAnonymousRepresentation, value);
     }
 
     /// <summary>
     /// The ID of the ExternalDatabaseServer which stores the anonymous identifier substitutions (e.g. chi=>ANOchi).  This should have been created by the
     /// <see cref="ANOStorePatcher"/>
     /// </summary>
-    [Relationship(typeof(ExternalDatabaseServer),RelationshipType.SharedObject)]
+    [Relationship(typeof(ExternalDatabaseServer), RelationshipType.SharedObject)]
     public int Server_ID
     {
         get => _serverID;
-        set => SetField(ref  _serverID, value);
+        set => SetField(ref _serverID, value);
     }
 
     /// <summary>
@@ -103,6 +103,7 @@ public string Suffix
         get => _suffix;
         set => SetField(ref _suffix, value);
     }
+
     #endregion
 
     #region Relationships
@@ -112,6 +113,7 @@ public string Suffix
     public ExternalDatabaseServer Server => Repository.GetObjectByID<ExternalDatabaseServer>(Server_ID);
 
     #endregion
+
     public ANOTable()
     {
         // Defaults
@@ -127,7 +129,8 @@ public ANOTable()
     /// <param name="externalDatabaseServer"></param>
     /// <param name="tableName"></param>
     /// <param name="suffix"></param>
-    public ANOTable(ICatalogueRepository repository, ExternalDatabaseServer externalDatabaseServer, string tableName, string suffix)
+    public ANOTable(ICatalogueRepository repository, ExternalDatabaseServer externalDatabaseServer, string tableName,
+        string suffix)
     {
         if (string.IsNullOrWhiteSpace(tableName))
             throw new NullReferenceException("ANOTable must have a name");
@@ -139,11 +142,11 @@ public ANOTable(ICatalogueRepository repository, ExternalDatabaseServer external
         if (repository.GetAllObjects<ANOTable>().Any(a => string.Equals(a.Suffix, suffix)))
             throw new Exception($"There is already another {nameof(ANOTable)} with the suffix '{suffix}'");
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"TableName", tableName},
-            {"Suffix", suffix},
-            {"Server_ID", externalDatabaseServer.ID}
+            { "TableName", tableName },
+            { "Suffix", suffix },
+            { "Server_ID", externalDatabaseServer.ID }
         });
     }
 
@@ -153,14 +156,16 @@ internal ANOTable(ICatalogueRepository repository, DbDataReader r)
         Server_ID = Convert.ToInt32(r["Server_ID"]);
         TableName = r["TableName"].ToString();
 
-        NumberOfIntegersToUseInAnonymousRepresentation = Convert.ToInt32(r["NumberOfIntegersToUseInAnonymousRepresentation"].ToString());
-        NumberOfCharactersToUseInAnonymousRepresentation = Convert.ToInt32(r["NumberOfCharactersToUseInAnonymousRepresentation"].ToString());
+        NumberOfIntegersToUseInAnonymousRepresentation =
+            Convert.ToInt32(r["NumberOfIntegersToUseInAnonymousRepresentation"].ToString());
+        NumberOfCharactersToUseInAnonymousRepresentation =
+            Convert.ToInt32(r["NumberOfCharactersToUseInAnonymousRepresentation"].ToString());
         Suffix = r["Suffix"].ToString();
     }
 
     internal ANOTable(ShareManager shareManager, ShareDefinition shareDefinition)
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
     }
 
     /// <summary>
@@ -183,10 +188,7 @@ public override void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return TableName;
-    }
+    public override string ToString() => TableName;
 
     /// <summary>
     /// Checks that the remote mapping table referenced by this object exists and checks <see cref="ANOTable"/> settings (<see cref="Suffix"/> etc).
@@ -199,27 +201,35 @@ public void Check(ICheckNotifier notifier)
                 new CheckEventArgs(
                     "You must choose a suffix for your ANO identifiers so that they can be distinguished from regular identifiers",
                     CheckResult.Fail));
-        else
-        if (Suffix.StartsWith("_"))
-            notifier.OnCheckPerformed(new CheckEventArgs("Suffix will automatically include an underscore, there is no need to add it",CheckResult.Fail));
-            
+        else if (Suffix.StartsWith("_"))
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Suffix will automatically include an underscore, there is no need to add it", CheckResult.Fail));
+
         if (NumberOfIntegersToUseInAnonymousRepresentation < 0)
-            notifier.OnCheckPerformed(new CheckEventArgs("NumberOfIntegersToUseInAnonymousRepresentation cannot be negative", CheckResult.Fail));
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("NumberOfIntegersToUseInAnonymousRepresentation cannot be negative",
+                    CheckResult.Fail));
 
         if (NumberOfCharactersToUseInAnonymousRepresentation < 0)
-            notifier.OnCheckPerformed(new CheckEventArgs("NumberOfCharactersToUseInAnonymousRepresentation cannot be negative", CheckResult.Fail));
-            
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("NumberOfCharactersToUseInAnonymousRepresentation cannot be negative",
+                    CheckResult.Fail));
+
         if (NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation == 0)
-            notifier.OnCheckPerformed(new CheckEventArgs("Anonymous representations must have at least 1 integer or character", CheckResult.Fail));
-            
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("Anonymous representations must have at least 1 integer or character",
+                    CheckResult.Fail));
+
         try
         {
             if (!IsTablePushed())
-                notifier.OnCheckPerformed(new CheckEventArgs($"Could not find table {TableName} on server {Server}",CheckResult.Warning));
+                notifier.OnCheckPerformed(new CheckEventArgs($"Could not find table {TableName} on server {Server}",
+                    CheckResult.Warning));
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to get list of tables on server {Server}",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to get list of tables on server {Server}",
+                CheckResult.Fail, e));
         }
     }
 
@@ -227,10 +237,7 @@ public void Check(ICheckNotifier notifier)
     /// Returns true if the anonymous mapping table (<see cref="TableName"/> exists in the referenced mapping database (<see cref="Server"/>)
     /// </summary>
     /// <returns></returns>
-    public bool IsTablePushed()
-    {
-        return GetPushedTable() != null;
-    }
+    public bool IsTablePushed() => GetPushedTable() != null;
 
     /// <summary>
     /// Connects to <see cref="Server"/> and returns a <see cref="DiscoveredTable"/> that contains the anonymous identifier mappings
@@ -257,13 +264,14 @@ public void DeleteANOTableInANOStore()
         RevertToDatabaseState();
 
         var s = Server;
-        if(string.IsNullOrWhiteSpace(s.Name) || string.IsNullOrWhiteSpace(s.Database) || string.IsNullOrWhiteSpace(TableName))
+        if (string.IsNullOrWhiteSpace(s.Name) || string.IsNullOrWhiteSpace(s.Database) ||
+            string.IsNullOrWhiteSpace(TableName))
             return;
 
         var tbl = GetPushedTable();
 
         if (tbl != null && tbl.Exists())
-            if(!tbl.IsEmpty())
+            if (!tbl.IsEmpty())
                 throw new Exception(
                     $"Cannot delete ANOTable because it references {TableName} which is a table on server {Server} which contains rows, deleting this reference would leave that table as an orphan, we can only delete when there are 0 rows in the table");
             else
@@ -277,12 +285,13 @@ public void DeleteANOTableInANOStore()
     /// <param name="notifier"></param>
     /// <param name="forceConnection"></param>
     /// <param name="forceTransaction"></param>
-    public void PushToANOServerAsNewTable(string identifiableDatatype, ICheckNotifier notifier, DbConnection forceConnection=null,DbTransaction forceTransaction = null)
+    public void PushToANOServerAsNewTable(string identifiableDatatype, ICheckNotifier notifier,
+        DbConnection forceConnection = null, DbTransaction forceTransaction = null)
     {
         var server = DataAccessPortal.ExpectServer(Server, DataAccessContext.DataLoad);
 
         //matches varchar(100) and has capture group 100
-        var regexGetLengthOfCharType =new Regex(@".*char.*\((\d*)\)");
+        var regexGetLengthOfCharType = new Regex(@".*char.*\((\d*)\)");
         var match = regexGetLengthOfCharType.Match(identifiableDatatype);
 
         //if user supplies varchar(100) and says he wants 3 ints and 3 chars in his anonymous identifiers he will soon run out of combinations
@@ -295,19 +304,21 @@ public void PushToANOServerAsNewTable(string identifiableDatatype, ICheckNotifie
                 NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation)
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"You asked to create a table with a datatype of length {length}({identifiableDatatype}) but you did not allocate an equal or greater number of anonymous identifier types (NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation={NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation})", CheckResult.Warning));
+                        $"You asked to create a table with a datatype of length {length}({identifiableDatatype}) but you did not allocate an equal or greater number of anonymous identifier types (NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation={NumberOfCharactersToUseInAnonymousRepresentation + NumberOfIntegersToUseInAnonymousRepresentation})",
+                        CheckResult.Warning));
         }
 
-        var con = forceConnection ?? server.GetConnection();//use the forced connection or open a new one
+        var con = forceConnection ?? server.GetConnection(); //use the forced connection or open a new one
 
         try
         {
-            if(forceConnection == null)
+            if (forceConnection == null)
                 con.Open();
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to ano server {Server}",CheckResult.Fail,e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to ano server {Server}", CheckResult.Fail,
+                e));
             return;
         }
 
@@ -335,34 +346,39 @@ CONSTRAINT PK_{TableName} PRIMARY KEY CLUSTERED
         {
             cmd.Transaction = forceTransaction;
 
-            notifier.OnCheckPerformed(new CheckEventArgs($"Decided appropriate create statement is:{cmd.CommandText}", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Decided appropriate create statement is:{cmd.CommandText}",
+                CheckResult.Success));
             try
             {
                 cmd.ExecuteNonQuery();
 
-                if(forceConnection == null)//if we opened this ourselves
-                    con.Close();//shut it
+                if (forceConnection == null) //if we opened this ourselves
+                    con.Close(); //shut it
             }
             catch (Exception e)
             {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Failed to successfully create the anonymous/identifier mapping Table in the ANO database on server {Server}", CheckResult.Fail, e));
+                        $"Failed to successfully create the anonymous/identifier mapping Table in the ANO database on server {Server}",
+                        CheckResult.Fail, e));
                 return;
             }
         }
 
         try
         {
-            if(forceTransaction == null)//if there was no transaction then this has hit the LIVE ANO database and is for real, so save the ANOTable such that it is synchronized with reality
+            if (forceTransaction ==
+                null) //if there was no transaction then this has hit the LIVE ANO database and is for real, so save the ANOTable such that it is synchronized with reality
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Saving state because table has been pushed",CheckResult.Success));
+                notifier.OnCheckPerformed(new CheckEventArgs("Saving state because table has been pushed",
+                    CheckResult.Success));
                 SaveToDatabase();
             }
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Failed to save state after table was successfully? pushed to ANO server", CheckResult.Fail,e));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Failed to save state after table was successfully? pushed to ANO server", CheckResult.Fail, e));
         }
     }
 
@@ -378,7 +394,7 @@ CONSTRAINT PK_{TableName} PRIMARY KEY CLUSTERED
     public string GetRuntimeDataType(LoadStage loadStage)
     {
         //cache answers
-        if(_identifiableDataType == null)
+        if (_identifiableDataType == null)
         {
             var server = DataAccessPortal.ExpectServer(Server, DataAccessContext.DataLoad);
 
@@ -387,9 +403,10 @@ public string GetRuntimeDataType(LoadStage loadStage)
             var expectedIdentifiableName = TableName["ANO".Length..];
 
             var anonymous = columnsFoundInANO.SingleOrDefault(c => c.GetRuntimeName().Equals(TableName));
-            var identifiable = columnsFoundInANO.SingleOrDefault(c=>c.GetRuntimeName().Equals(expectedIdentifiableName));
+            var identifiable =
+                columnsFoundInANO.SingleOrDefault(c => c.GetRuntimeName().Equals(expectedIdentifiableName));
 
-            if(anonymous == null)
+            if (anonymous == null)
                 throw new Exception(
                     $"Could not find a column called {TableName} in table {TableName} on server {Server} (Columns found were {string.Join(",", columnsFoundInANO.Select(c => c.GetRuntimeName()).ToArray())})");
 
@@ -414,14 +431,8 @@ public string GetRuntimeDataType(LoadStage loadStage)
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Repository.GetAllObjectsWithParent<ColumnInfo>(this);
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Repository.GetAllObjectsWithParent<ColumnInfo>(this);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataLoad/Argument.cs b/Rdmp.Core/Curation/Data/DataLoad/Argument.cs
index 34445a2f13..bd4bb7a60a 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/Argument.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/Argument.cs
@@ -35,7 +35,6 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 /// </summary>
 public abstract class Argument : DatabaseEntity, IArgument
 {
-
     /// <summary>
     /// All Types that are supported for <see cref="Type"/> and <see cref="Value"/> of <see cref="IArgument"/>s.
     /// 
@@ -43,7 +42,7 @@ public abstract class Argument : DatabaseEntity, IArgument
     /// </summary>
     public static readonly Type[] PermissableTypes =
     {
-        typeof(char?),typeof(char),
+        typeof(char?), typeof(char),
         typeof(int?), typeof(int),
         typeof(DateTime?), typeof(DateTime),
         typeof(double?), typeof(double),
@@ -54,21 +53,23 @@ public abstract class Argument : DatabaseEntity, IArgument
         typeof(string), typeof(FileInfo),
         typeof(DirectoryInfo),
         typeof(Enum), typeof(Uri), typeof(Regex),
-            
+
         typeof(Type),
 
         //IMapsDirectlyToDatabaseTable
-        typeof(TableInfo), typeof(ColumnInfo), typeof(PreLoadDiscardedColumn), typeof(LoadProgress), typeof(LoadMetadata),
-        typeof(CacheProgress), typeof(ExternalDatabaseServer), typeof(StandardRegex),typeof(CohortIdentificationConfiguration),
-        typeof(RemoteRDMP),typeof(Catalogue),typeof(CatalogueItem),
+        typeof(TableInfo), typeof(ColumnInfo), typeof(PreLoadDiscardedColumn), typeof(LoadProgress),
+        typeof(LoadMetadata),
+        typeof(CacheProgress), typeof(ExternalDatabaseServer), typeof(StandardRegex),
+        typeof(CohortIdentificationConfiguration),
+        typeof(RemoteRDMP), typeof(Catalogue), typeof(CatalogueItem),
         typeof(DataAccessCredentials),
-           
+
         //wierd special cases
         typeof(ICustomUIDrivenClass), typeof(EncryptedString),
-            
+
         //special static argument type, always gets the same value never has a database persisted value
-        typeof(CatalogueRepository), 
-            
+        typeof(CatalogueRepository),
+
         //user must be IDemandToUseAPipeline<T>
         typeof(Pipeline)
     };
@@ -84,7 +85,7 @@ public abstract class Argument : DatabaseEntity, IArgument
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
@@ -92,27 +93,27 @@ public string Name
     public string Value
     {
         get => _value;
-        set => SetField(ref  _value, value);
+        set => SetField(ref _value, value);
     }
 
     /// <inheritdoc/>
     public string Type
     {
         get => _type;
-        protected set => SetField(ref  _type, value);
+        protected set => SetField(ref _type, value);
     }
 
     /// <inheritdoc/>
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     #endregion
 
     /// <inheritdoc/>
-    protected Argument():base()
+    protected Argument() : base()
     {
     }
 
@@ -123,10 +124,7 @@ protected Argument(ICatalogueRepository repository, DbDataReader dataReader)
     }
 
     /// <inheritdoc/>
-    public object GetValueAsSystemType()
-    {
-        return Deserialize(Value, Type);
-    }
+    public object GetValueAsSystemType() => Deserialize(Value, Type);
 
     private object Deserialize(string value, string type)
     {
@@ -216,7 +214,6 @@ private object Deserialize(string value, string type)
         if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(concreteType))
             try
             {
-
                 return Repository.GetObjectByID(concreteType, Convert.ToInt32(value));
             }
             catch (KeyNotFoundException)
@@ -242,15 +239,12 @@ private object Deserialize(string value, string type)
             }
         }
 
-        if (typeof(IDictionary).IsAssignableFrom(concreteType))
-        {
-            return DeserializeDictionary(value,concreteType);
-        }
+        if (typeof(IDictionary).IsAssignableFrom(concreteType)) return DeserializeDictionary(value, concreteType);
 
         if (type.Equals(typeof(EncryptedString).ToString()))
             return new EncryptedString(CatalogueRepository) { Value = value };
 
-        if(type.Equals(typeof(CultureInfo).ToString()))
+        if (type.Equals(typeof(CultureInfo).ToString()))
             return new CultureInfo(value);
 
         throw new NotSupportedException($"Custom arguments cannot be of type {type}");
@@ -272,26 +266,27 @@ private bool HandleIfICustomUIDrivenClass(string value, Type concreteType, out o
 
                 var constructor = new ObjectConstructor();
 
-                result = (ICustomUIDrivenClass)ObjectConstructor.Construct(t, (ICatalogueRepository) Repository);
-
+                result = (ICustomUIDrivenClass)ObjectConstructor.Construct(t, (ICatalogueRepository)Repository);
             }
             catch (Exception e)
             {
                 throw new Exception(
-                    $"Failed to create an ICustomUIDrivenClass of type {concreteType.FullName} make sure that you mark your class as public, commit it to the catalogue and mark it with the export ''", e);
+                    $"Failed to create an ICustomUIDrivenClass of type {concreteType.FullName} make sure that you mark your class as public, commit it to the catalogue and mark it with the export ''",
+                    e);
             }
 
             try
             {
-                result.RestoreStateFrom(value);//, (CatalogueRepository)Repository);
+                result.RestoreStateFrom(value); //, (CatalogueRepository)Repository);
             }
             catch (Exception e)
             {
                 throw new Exception(
-                    $"RestoreState failed on your ICustomUIDrivenClass called {concreteType.FullName} the restore value was the string value '{value}'", e);
+                    $"RestoreState failed on your ICustomUIDrivenClass called {concreteType.FullName} the restore value was the string value '{value}'",
+                    e);
             }
 
-            answer =  result;
+            answer = result;
             return true;
         }
 
@@ -300,20 +295,15 @@ private bool HandleIfICustomUIDrivenClass(string value, Type concreteType, out o
     }
 
     /// <inheritdoc/>
-    public Type GetSystemType()
-    {
-        return GetSystemType(Type);
-    }
+    public Type GetSystemType() => GetSystemType(Type);
 
     private Type GetSystemType(string type)
     {
         //if we know they type (it is exactly one we are expecting)
         foreach (var knownType in PermissableTypes)
-        {
             //return the type
             if (knownType.ToString().Equals(type))
                 return knownType;
-        }
 
         var arrayType = new Regex(@"(.*)\[]");
         var arrayMatch = arrayType.Match(type);
@@ -324,27 +314,25 @@ private Type GetSystemType(string type)
 
             //it is an unknown Type e.g. Bob where Bob is an ICustomUIDrivenClass or something
             var elementType = CatalogueRepository.MEF.GetType(elementTypeAsString) ?? throw new Exception(
-                    $"Could not figure out what SystemType to use for elementType = '{elementTypeAsString}' of Type '{type}'");
+                $"Could not figure out what SystemType to use for elementType = '{elementTypeAsString}' of Type '{type}'");
             return Array.CreateInstance(elementType, 0).GetType();
         }
 
         if (IsDictionary(type, out var kType, out var vType))
         {
             var genericClass = typeof(Dictionary<,>);
-            var constructedClass = genericClass.MakeGenericType(kType,vType);
+            var constructedClass = genericClass.MakeGenericType(kType, vType);
             return constructedClass;
         }
 
         //it is an unknown Type e.g. Bob where Bob is an ICustomUIDrivenClass or something
-        var anyType = CatalogueRepository.MEF.GetType(type) ?? throw new Exception($"Could not figure out what SystemType to use for Type = '{type}'");
+        var anyType = CatalogueRepository.MEF.GetType(type) ??
+                      throw new Exception($"Could not figure out what SystemType to use for Type = '{type}'");
         return anyType;
     }
 
     /// <inheritdoc/>
-    public Type GetConcreteSystemType()
-    {
-        return GetConcreteSystemType(Type);
-    }
+    public Type GetConcreteSystemType() => GetConcreteSystemType(Type);
 
     /// <inheritdoc cref="GetConcreteSystemType()"/>
     public Type GetConcreteSystemType(string typeAsString)
@@ -372,6 +360,7 @@ public void SetType(Type t)
 
         Type = t.ToString();
     }
+
     /// <inheritdoc/>
     public void SetValue(object o)
     {
@@ -423,12 +412,11 @@ private string Serialize(object o, string asType)
                 $"DemandsInitialization arrays must be of Type IMapsDirectlyToDatabaseTable e.g. TableInfo[].  Supplied Type was {type}");
         }
 
-        if (type != null && typeof (IDictionary).IsAssignableFrom(type))
-            return SerializeDictionary((IDictionary) o);
+        if (type != null && typeof(IDictionary).IsAssignableFrom(type))
+            return SerializeDictionary((IDictionary)o);
 
         //if we already have a known type set on us
         if (!string.IsNullOrWhiteSpace(asType))
-        {
             //if we are not being passed an Enum
             if (!typeof(Enum).IsAssignableFrom(type))
             {
@@ -448,9 +436,7 @@ private string Serialize(object o, string asType)
                         throw new Exception(
                             $"Cannot set value {o} (of Type {o.GetType().FullName}) to on ProcessTaskArgument because it has an incompatible Type specified ({type.FullName})");
                     }
-
             }
-        }
 
         if (o is IMapsDirectlyToDatabaseTable table)
             return table.ID.ToString();
@@ -459,6 +445,7 @@ private string Serialize(object o, string asType)
     }
 
     #region Dictionary Handling
+
     private IDictionary DeserializeDictionary(string value, Type type)
     {
         var instance = (IDictionary)Activator.CreateInstance(type);
@@ -481,7 +468,7 @@ private IDictionary DeserializeDictionary(string value, Type type)
 
                 var valueInstance = Deserialize(vValue, vType);
 
-                instance.Add(keyInstance,valueInstance);
+                instance.Add(keyInstance, valueInstance);
             }
         }
 
@@ -505,13 +492,14 @@ private string SerializeDictionary(IDictionary dictionary)
                     var keyObjectType = keyObject.GetType().ToString();
 
                     var valueObject = entry.Value;
-                    var valueObjectType = valueObject == null ? typeof(object).ToString() : valueObject.GetType().ToString();
+                    var valueObjectType =
+                        valueObject == null ? typeof(object).ToString() : valueObject.GetType().ToString();
 
                     xmlWriter.WriteStartElement("entry");
 
                     xmlWriter.WriteStartElement("key");
                     xmlWriter.WriteAttributeString("type", keyObjectType);
-                    xmlWriter.WriteAttributeString("o", Serialize(keyObject,keyObjectType));
+                    xmlWriter.WriteAttributeString("o", Serialize(keyObject, keyObjectType));
                     xmlWriter.WriteEndElement();
 
                     xmlWriter.WriteStartElement("value");
@@ -524,8 +512,8 @@ private string SerializeDictionary(IDictionary dictionary)
 
                 xmlWriter.WriteEndDocument();
                 xmlWriter.Close();
-
             }
+
             return sw.ToString();
         }
     }
@@ -559,5 +547,6 @@ private bool IsDictionary(string type, out Type kType, out Type vType)
 
         return true;
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ArgumentFactory.cs b/Rdmp.Core/Curation/Data/DataLoad/ArgumentFactory.cs
index 5998514411..36a2f2451b 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ArgumentFactory.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ArgumentFactory.cs
@@ -26,10 +26,8 @@ public class ArgumentFactory
     /// <inheritdoc cref = "CreateArgumentsForClassIfNotExistsGeneric(Type,IArgumentHost,IArgument[])"/>
     /// <typeparam name="T">A class with one or more Properties marked with DemandsInitialization</typeparam>
     /// <returns>Each new ProcessTaskArgument created - note that it will not return existing ones that were already present (and therefore not created)</returns>
-    public static IEnumerable<IArgument> CreateArgumentsForClassIfNotExistsGeneric<T>( IArgumentHost host, IArgument[] existingArguments)
-    {
-        return CreateArgumentsForClassIfNotExistsGeneric(typeof (T),host,existingArguments);
-    }
+    public static IEnumerable<IArgument> CreateArgumentsForClassIfNotExistsGeneric<T>(IArgumentHost host,
+        IArgument[] existingArguments) => CreateArgumentsForClassIfNotExistsGeneric(typeof(T), host, existingArguments);
 
     /// <summary>
     /// Interrogates a class via reflection and enumerates its properties to find any that have the attribute [DemandsInitialization]
@@ -37,7 +35,7 @@ public static IEnumerable<IArgument> CreateArgumentsForClassIfNotExistsGeneric<T
     /// </summary>
     /// <returns>Each new ProcessTaskArgument created - note that it will not return existing ones that were already present (and therefore not created)</returns>
     public static IEnumerable<IArgument> CreateArgumentsForClassIfNotExistsGeneric(
-        Type underlyingClassTypeForWhichArgumentsWillPopulate,IArgumentHost host,
+        Type underlyingClassTypeForWhichArgumentsWillPopulate, IArgumentHost host,
         IArgument[] existingArguments)
     {
         var classType = underlyingClassTypeForWhichArgumentsWillPopulate;
@@ -82,7 +80,7 @@ public static IEnumerable<IArgument> CreateArgumentsForClassIfNotExistsGeneric(
     public static List<RequiredPropertyInfo> GetRequiredProperties(Type classType)
     {
         var required = new List<RequiredPropertyInfo>();
-            
+
         foreach (var propertyInfo in classType.GetProperties())
         {
             if (propertyInfo.GetCustomAttributes(typeof(DemandsNestedInitializationAttribute), true).Any())
@@ -95,11 +93,11 @@ public static List<RequiredPropertyInfo> GetRequiredProperties(Type classType)
                     var attribute = nestedPropInfo.GetCustomAttribute<DemandsInitializationAttribute>();
 
                     if (attribute != null)
-                        required.Add(new RequiredPropertyInfo(attribute,nestedPropInfo,propertyInfo));
+                        required.Add(new RequiredPropertyInfo(attribute, nestedPropInfo, propertyInfo));
                 }
             }
 
-            var demands = propertyInfo.GetCustomAttributes(typeof (DemandsInitializationAttribute), true);
+            var demands = propertyInfo.GetCustomAttributes(typeof(DemandsInitializationAttribute), true);
 
             if (demands.Length > 1)
                 throw new Exception(
@@ -108,7 +106,7 @@ public static List<RequiredPropertyInfo> GetRequiredProperties(Type classType)
             var demand = (DemandsInitializationAttribute)demands.SingleOrDefault();
 
             //found a tagged attribute
-            if(demand != null)
+            if (demand != null)
                 required.Add(new RequiredPropertyInfo(demand, propertyInfo));
         }
 
@@ -123,24 +121,27 @@ public static List<RequiredPropertyInfo> GetRequiredProperties(Type classType)
     /// <param name="underlyingClassTypeForWhichArgumentsWillPopulate"></param>
     public static void SyncArgumentsForClass(IArgumentHost host, Type underlyingClassTypeForWhichArgumentsWillPopulate)
     {
-        if(host.GetClassNameWhoArgumentsAreFor() != underlyingClassTypeForWhichArgumentsWillPopulate.FullName)
-            throw new ExpectedIdenticalStringsException("IArgumentHost is not currently hosting the Type requested for sync", host.GetClassNameWhoArgumentsAreFor(), underlyingClassTypeForWhichArgumentsWillPopulate.FullName);
+        if (host.GetClassNameWhoArgumentsAreFor() != underlyingClassTypeForWhichArgumentsWillPopulate.FullName)
+            throw new ExpectedIdenticalStringsException(
+                "IArgumentHost is not currently hosting the Type requested for sync",
+                host.GetClassNameWhoArgumentsAreFor(), underlyingClassTypeForWhichArgumentsWillPopulate.FullName);
 
         var existingArguments = host.GetAllArguments().ToList();
         var required = GetRequiredProperties(underlyingClassTypeForWhichArgumentsWillPopulate);
-            
+
         //get rid of arguments that are no longer required
         foreach (var argumentsNotRequired in existingArguments.Where(e => required.All(r => r.Name != e.Name)))
-            ((IDeleteable) argumentsNotRequired).DeleteInDatabase();
+            ((IDeleteable)argumentsNotRequired).DeleteInDatabase();
 
         //create new arguments
-        existingArguments.AddRange(CreateArgumentsForClassIfNotExistsGeneric(underlyingClassTypeForWhichArgumentsWillPopulate,host, existingArguments.ToArray()));
+        existingArguments.AddRange(CreateArgumentsForClassIfNotExistsGeneric(
+            underlyingClassTypeForWhichArgumentsWillPopulate, host, existingArguments.ToArray()));
 
         //handle mismatches of Type/incompatible values / unloaded Types etc
         foreach (var r in required)
         {
             var existing = existingArguments.SingleOrDefault(e => e.Name == r.Name) ?? throw new Exception(
-                    $"Despite creating new Arguments for class '{underlyingClassTypeForWhichArgumentsWillPopulate}' we do not have an IArgument called '{r.Name}' in the database (host='{host}')");
+                $"Despite creating new Arguments for class '{underlyingClassTypeForWhichArgumentsWillPopulate}' we do not have an IArgument called '{r.Name}' in the database (host='{host}')");
             if (existing.GetSystemType() != r.PropertyInfo.PropertyType)
             {
                 //user wants to fix the problem
@@ -157,7 +158,8 @@ public static void SyncArgumentsForClass(IArgumentHost host, Type underlyingClas
     /// <param name="host"></param>
     /// <param name="underlyingClassTypeForWhichArgumentsWillPopulate"></param>
     /// <returns></returns>
-    public static Dictionary<IArgument, RequiredPropertyInfo> GetDemandDictionary(IArgumentHost host, Type underlyingClassTypeForWhichArgumentsWillPopulate)
+    public static Dictionary<IArgument, RequiredPropertyInfo> GetDemandDictionary(IArgumentHost host,
+        Type underlyingClassTypeForWhichArgumentsWillPopulate)
     {
         var toReturn = new Dictionary<IArgument, RequiredPropertyInfo>();
 
@@ -166,7 +168,7 @@ public static Dictionary<IArgument, RequiredPropertyInfo> GetDemandDictionary(IA
         var required = GetRequiredProperties(underlyingClassTypeForWhichArgumentsWillPopulate);
 
         foreach (var key in host.GetAllArguments())
-            toReturn.Add(key,required.Single(e => e.Name == key.Name));
+            toReturn.Add(key, required.Single(e => e.Name == key.Name));
 
         return toReturn;
     }
diff --git a/Rdmp.Core/Curation/Data/DataLoad/Extensions/LoadStageExtensions.cs b/Rdmp.Core/Curation/Data/DataLoad/Extensions/LoadStageExtensions.cs
index a8d853582d..ab9a2f4b2f 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/Extensions/LoadStageExtensions.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/Extensions/LoadStageExtensions.cs
@@ -27,7 +27,7 @@ public static LoadBubble ToLoadBubble(this LoadStage loadStage)
             LoadStage.AdjustRaw => LoadBubble.Raw,
             LoadStage.AdjustStaging => LoadBubble.Staging,
             LoadStage.PostLoad => LoadBubble.Live,
-            _ => throw new ArgumentOutOfRangeException(nameof(loadStage),$"Unknown value for LoadStage: {loadStage}")
+            _ => throw new ArgumentOutOfRangeException(nameof(loadStage), $"Unknown value for LoadStage: {loadStage}")
         };
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataLoad/IArgument.cs b/Rdmp.Core/Curation/Data/DataLoad/IArgument.cs
index 64af350e4e..4244e208ac 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/IArgument.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/IArgument.cs
@@ -13,13 +13,13 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 /// Records the user configured value of a property marked with [DemandsInitialization] declared on a data flow/dle component (including plugin components).
 ///  See Argument for full description.
 /// </summary>
-public interface IArgument:IMapsDirectlyToDatabaseTable,ISaveable
+public interface IArgument : IMapsDirectlyToDatabaseTable, ISaveable
 {
     /// <summary>
     /// The name of the Property which this object stores the value of.  The Property should be decorated with [DemandsInitialization]
     /// </summary>
     string Name { get; set; }
-        
+
     /// <summary>
     /// Record of <see cref="DemandsInitializationAttribute.Description"/> as it was specified when the <see cref="IArgument"/> was created
     /// </summary>
@@ -47,7 +47,7 @@ public interface IArgument:IMapsDirectlyToDatabaseTable,ISaveable
     /// </summary>
     /// <returns></returns>
     object GetValueAsSystemType();
-        
+
     /// <summary>
     /// Parses the current <see cref="Type"/> string into a <see cref="System.Type"/>
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ICustomUI.cs b/Rdmp.Core/Curation/Data/DataLoad/ICustomUI.cs
index 3ed8eaa36c..8288e902b3 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ICustomUI.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ICustomUI.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 /// <summary>
 /// Powers the creation of instances of T in an ICustomUI
 /// </summary>
-public interface ICustomUI<T> : ICustomUI where T:ICustomUIDrivenClass
+public interface ICustomUI<T> : ICustomUI where T : ICustomUIDrivenClass
 {
     /// <summary>
     /// Loads the current value into the user interface
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ICustomUIDrivenClass.cs b/Rdmp.Core/Curation/Data/DataLoad/ICustomUIDrivenClass.cs
index d9d5796708..9fe64d4fde 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ICustomUIDrivenClass.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ICustomUIDrivenClass.cs
@@ -24,7 +24,7 @@ public interface ICustomUIDrivenClass
     /// then <paramref name="value"/> may be null
     /// </summary>
     /// <param name="value"></param>
-    void RestoreStateFrom([CanBeNull]string value);
+    void RestoreStateFrom([CanBeNull] string value);
 
     /// <summary>
     /// Persist the current state of the <see cref="ICustomUIDrivenClass"/> as a string.  This must be compatible with <see cref="RestoreStateFrom"/>
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs b/Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs
index dfb519d050..f1dac398da 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ILoadMetadata.cs
@@ -36,7 +36,7 @@ public interface ILoadMetadata : INamed, ILoggedActivityRootObject
     /// <summary>
     /// Set to true to ignore the requirement for live tables to need the backup archive trigger
     /// </summary>
-    bool IgnoreTrigger {get;}
+    bool IgnoreTrigger { get; }
 
     /// <summary>
     /// Optional - Overrides the <see cref="ServerDefaults"/> RAWDataLoadServer with an explicit RAW server to use this load only.
@@ -47,7 +47,7 @@ public interface ILoadMetadata : INamed, ILoggedActivityRootObject
     /// List of all the user configured steps in a data load.  For example you could have 2 ProcessTasks, one that downloads files from an FTP server and one that loads RAW.
     /// </summary>
     IOrderedEnumerable<IProcessTask> ProcessTasks { get; }
-        
+
     /// <summary>
     /// Returns all datasets this load is responsible for supplying data to.  This determines which <see cref="TableInfo"/> are 
     /// available during RAW=>STAGING=>LIVE migration (the super set of all tables underlying all catalogues).
diff --git a/Rdmp.Core/Curation/Data/DataLoad/IPreLoadDiscardedColumn.cs b/Rdmp.Core/Curation/Data/DataLoad/IPreLoadDiscardedColumn.cs
index ec0cfb2a32..8dd55e6360 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/IPreLoadDiscardedColumn.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/IPreLoadDiscardedColumn.cs
@@ -9,7 +9,7 @@
 namespace Rdmp.Core.Curation.Data.DataLoad;
 
 /// <inheritdoc cref="PreLoadDiscardedColumn"/>
-public interface IPreLoadDiscardedColumn : IResolveDuplication,IMapsDirectlyToDatabaseTable
+public interface IPreLoadDiscardedColumn : IResolveDuplication, IMapsDirectlyToDatabaseTable
 {
     /// <summary>
     /// Where the RAW column values will end up during a load.  Either dropped completely, diluted into LIVE or routed to an identifier dump
@@ -34,5 +34,6 @@ public interface IPreLoadDiscardedColumn : IResolveDuplication,IMapsDirectlyToDa
     /// </summary>
     [NoMappingToDatabase]
     ITableInfo TableInfo { get; }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataLoad/IProcessTask.cs b/Rdmp.Core/Curation/Data/DataLoad/IProcessTask.cs
index a83fd0f518..9f22cb24e9 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/IProcessTask.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/IProcessTask.cs
@@ -36,10 +36,11 @@ public interface IProcessTask : IRevertable, IArgumentHost, IOrderable, IDisable
     /// <inheritdoc cref="DataLoad.ProcessTaskType"/>
     ProcessTaskType ProcessTaskType { get; }
 
-        
+
     /// <summary>
     /// Deprecated property
     /// </summary>
-    [Obsolete("Since you can't change which Catalogues are loaded by a LoadMetadata at runtime, this property is now obsolete")]
+    [Obsolete(
+        "Since you can't change which Catalogues are loaded by a LoadMetadata at runtime, this property is now obsolete")]
     int? RelatesSolelyToCatalogue_ID { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs b/Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs
index 5349882bed..5ae249be09 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/LoadMetadata.cs
@@ -41,13 +41,12 @@ public enum CacheArchiveType
     Zip = 1
 }
 
-
-
 /// <inheritdoc cref="ILoadMetadata"/>
-public class LoadMetadata : DatabaseEntity, ILoadMetadata, IHasDependencies, IHasQuerySyntaxHelper, ILoggedActivityRootObject, IHasFolder
+public class LoadMetadata : DatabaseEntity, ILoadMetadata, IHasDependencies, IHasQuerySyntaxHelper,
+    ILoggedActivityRootObject, IHasFolder
 {
-
     #region Database Properties
+
     private string _locationOfFlatFiles;
     private string _anonymisationEngineClass;
     private string _name;
@@ -135,7 +134,9 @@ public string Folder
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public ExternalDatabaseServer OverrideRAWServer => OverrideRAWServer_ID.HasValue? Repository.GetObjectByID<ExternalDatabaseServer>(OverrideRAWServer_ID.Value): null;
+    public ExternalDatabaseServer OverrideRAWServer => OverrideRAWServer_ID.HasValue
+        ? Repository.GetObjectByID<ExternalDatabaseServer>(OverrideRAWServer_ID.Value)
+        : null;
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
@@ -151,11 +152,11 @@ public IOrderedEnumerable<IProcessTask> ProcessTasks
                 Repository.GetAllObjectsWithParent<ProcessTask>(this).Cast<IProcessTask>().OrderBy(pt => pt.Order);
         }
     }
+
     #endregion
 
     public LoadMetadata()
     {
-
     }
 
     /// <summary>
@@ -168,11 +169,11 @@ public LoadMetadata()
     public LoadMetadata(ICatalogueRepository repository, string name = null)
     {
         name ??= $"NewLoadMetadata{Guid.NewGuid()}";
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name",name},
-            { "IgnoreTrigger",false/*todo could be system global default here*/},
-            {"Folder",FolderHelper.Root }
+            { "Name", name },
+            { "IgnoreTrigger", false /*todo could be system global default here*/ },
+            { "Folder", FolderHelper.Root }
         });
     }
 
@@ -183,16 +184,16 @@ internal LoadMetadata(ICatalogueRepository repository, DbDataReader r)
         Name = r["Name"] as string;
         AnonymisationEngineClass = r["AnonymisationEngineClass"].ToString();
         Name = r["Name"].ToString();
-        Description = r["Description"] as string;//allows for nulls
+        Description = r["Description"] as string; //allows for nulls
         CacheArchiveType = (CacheArchiveType)r["CacheArchiveType"];
         OverrideRAWServer_ID = ObjectToNullableInt(r["OverrideRAWServer_ID"]);
-        IgnoreTrigger = ObjectToNullableBool(r["IgnoreTrigger"])??false;
+        IgnoreTrigger = ObjectToNullableBool(r["IgnoreTrigger"]) ?? false;
         Folder = r["Folder"] as string ?? FolderHelper.Root;
     }
 
-    internal LoadMetadata(ShareManager shareManager,ShareDefinition shareDefinition):base()
+    internal LoadMetadata(ShareManager shareManager, ShareDefinition shareDefinition) : base()
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
     }
 
     /// <inheritdoc/>
@@ -208,16 +209,10 @@ public override void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
-    public IEnumerable<ICatalogue> GetAllCatalogues()
-    {
-        return Repository.GetAllObjectsWithParent<Catalogue>(this);
-    }
+    public IEnumerable<ICatalogue> GetAllCatalogues() => Repository.GetAllObjectsWithParent<Catalogue>(this);
 
     /// <inheritdoc cref="GetDistinctLoggingDatabase()"/>
     public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer serverChosen)
@@ -237,10 +232,7 @@ public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer s
     /// The unique logging server for auditing the load (found by querying <see cref="Catalogue.LiveLoggingServer"/>)
     /// </summary>
     /// <returns></returns>
-    public DiscoveredServer GetDistinctLoggingDatabase()
-    {
-        return GetDistinctLoggingDatabase(out IExternalDatabaseServer whoCares);
-    }
+    public DiscoveredServer GetDistinctLoggingDatabase() => GetDistinctLoggingDatabase(out var whoCares);
 
     private IDataAccessPoint[] GetLoggingServers()
     {
@@ -261,17 +253,18 @@ public string GetDistinctLoggingTask()
     {
         var catalogueMetadatas = GetAllCatalogues().ToArray();
 
-        if(!catalogueMetadatas.Any())
+        if (!catalogueMetadatas.Any())
             throw new Exception($"There are no Catalogues associated with load metadata (ID={ID})");
 
-        var cataloguesWithoutLoggingTasks = catalogueMetadatas.Where(c => string.IsNullOrWhiteSpace(c.LoggingDataTask)).ToArray();
+        var cataloguesWithoutLoggingTasks =
+            catalogueMetadatas.Where(c => string.IsNullOrWhiteSpace(c.LoggingDataTask)).ToArray();
 
-        if(cataloguesWithoutLoggingTasks.Any())
+        if (cataloguesWithoutLoggingTasks.Any())
             throw new Exception(
                 $"The following Catalogues do not have a LoggingDataTask specified:{cataloguesWithoutLoggingTasks.Aggregate("", (s, n) => $"{s}{n}(ID={n.ID}),")}");
 
         var distinctLoggingTasks = catalogueMetadatas.Select(c => c.LoggingDataTask).Distinct().ToArray();
-        if(distinctLoggingTasks.Length >= 2)
+        if (distinctLoggingTasks.Length >= 2)
             throw new Exception(
                 $"There are {distinctLoggingTasks.Length} logging tasks in Catalogues belonging to this metadata (ID={ID})");
 
@@ -312,26 +305,20 @@ public DiscoveredServer GetDistinctLiveDatabaseServer()
         }
 
         if (normalTables.Any())
-            return DataAccessPortal.ExpectDistinctServer(normalTables.ToArray(), DataAccessContext.DataLoad,true);
-            
-        if(lookupTables.Any())
-            return DataAccessPortal.ExpectDistinctServer(lookupTables.ToArray(), DataAccessContext.DataLoad,true);
-            
+            return DataAccessPortal.ExpectDistinctServer(normalTables.ToArray(), DataAccessContext.DataLoad, true);
+
+        if (lookupTables.Any())
+            return DataAccessPortal.ExpectDistinctServer(lookupTables.ToArray(), DataAccessContext.DataLoad, true);
+
         throw new Exception(
             $"LoadMetadata {this} has no TableInfos configured (or possibly the tables have been deleted resulting in MISSING ColumnInfos?)");
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return null;
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => null;
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return GetAllCatalogues().ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => GetAllCatalogues().ToArray();
 
     /// <summary>
     /// Tests that the logging database for the load is reachable and that it has an appropriate logging task for the load (if not a new task will be created 'Loading X')
@@ -349,10 +336,13 @@ public void EnsureLoggingWorksFor(ICatalogue catalogue)
             if (loggingServer != null)
                 catalogue.LiveLoggingServer_ID = loggingServer.ID;
             else
-                throw new NotSupportedException("You do not yet have any logging servers configured so cannot create data loads");
+                throw new NotSupportedException(
+                    "You do not yet have any logging servers configured so cannot create data loads");
         }
         else
+        {
             loggingServer = Repository.GetObjectByID<ExternalDatabaseServer>(catalogue.LiveLoggingServer_ID.Value);
+        }
 
         //if there's no logging task yet and there's a logging server
         if (string.IsNullOrWhiteSpace(catalogue.LoggingDataTask))
@@ -382,10 +372,7 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     /// </summary>
     /// <param name="runs"></param>
     /// <returns></returns>
-    public IEnumerable<ArchivalDataLoadInfo> FilterRuns(IEnumerable<ArchivalDataLoadInfo> runs)
-    {
-        return runs;
-    }
+    public IEnumerable<ArchivalDataLoadInfo> FilterRuns(IEnumerable<ArchivalDataLoadInfo> runs) => runs;
 
     public static bool UsesPersistentRaw(ILoadMetadata loadMetadata)
     {
diff --git a/Rdmp.Core/Curation/Data/DataLoad/LoadStage.cs b/Rdmp.Core/Curation/Data/DataLoad/LoadStage.cs
index 672dea7280..b35a86e04d 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/LoadStage.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/LoadStage.cs
@@ -44,7 +44,7 @@ public enum LoadStage
     /// defined in the Catalogue ColumnInfos to merge the new data into the current LIVE database
     /// </summary>
     AdjustStaging,
-        
+
     /// <summary>
     /// "Processes in this category are executed after the new data has been merged into the LIVE database.  This 
     /// is your opportunity to update dependent data, run longitudinal/dataset wide cleaning algorithms etc."
diff --git a/Rdmp.Core/Curation/Data/DataLoad/PreLoadDiscardedColumn.cs b/Rdmp.Core/Curation/Data/DataLoad/PreLoadDiscardedColumn.cs
index 9c00eac878..e5d424e3f9 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/PreLoadDiscardedColumn.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/PreLoadDiscardedColumn.cs
@@ -24,18 +24,17 @@ public enum DiscardedColumnDestination
     /// <summary>
     /// Column appears in RAW and might be used in AdjustRaw but is droped completely prior to migration to Staging
     /// </summary>
-    Oblivion=1,
+    Oblivion = 1,
 
     /// <summary>
     /// Column appears in RAW but is seperated off and stored in an IdentifierDump (See IdentifierDumper) and not passed through to Staging
     /// </summary>
-    StoreInIdentifiersDump=2,
+    StoreInIdentifiersDump = 2,
 
     /// <summary>
     /// Column appears in RAW but is Diluted during AdjustStaging prior to joining the live dataset e.g. by rounding dates to the nearest quarter.  The undilted value may be stored in the IdentifierDump (See IdentifierDumper).
     /// </summary>
-    Dilute=3
-
+    Dilute = 3
 }
 
 /// <summary>
@@ -63,41 +62,48 @@ public class PreLoadDiscardedColumn : DatabaseEntity, IPreLoadDiscardedColumn, I
     public int TableInfo_ID
     {
         get => _tableInfoID;
-        set => SetField(ref  _tableInfoID, value);
+        set => SetField(ref _tableInfoID, value);
     }
+
     /// <inheritdoc/>
     public DiscardedColumnDestination Destination
     {
         get => _destination;
-        set => SetField(ref  _destination, value);
+        set => SetField(ref _destination, value);
     }
+
     /// <inheritdoc/>
     public string RuntimeColumnName
     {
         get => _runtimeColumnName;
-        set => SetField(ref  _runtimeColumnName, value);
+        set => SetField(ref _runtimeColumnName, value);
     }
+
     /// <inheritdoc/>
     public string SqlDataType
     {
         get => _sqlDataType;
-        set => SetField(ref  _sqlDataType, value);
+        set => SetField(ref _sqlDataType, value);
     }
+
     /// <inheritdoc/>
     public int? DuplicateRecordResolutionOrder
     {
         get => _duplicateRecordResolutionOrder;
-        set => SetField(ref  _duplicateRecordResolutionOrder, value);
+        set => SetField(ref _duplicateRecordResolutionOrder, value);
     }
+
     /// <inheritdoc/>
     public bool DuplicateRecordResolutionIsAscending
     {
         get => _duplicateRecordResolutionIsAscending;
-        set => SetField(ref  _duplicateRecordResolutionIsAscending, value);
+        set => SetField(ref _duplicateRecordResolutionIsAscending, value);
     }
 
     #endregion
+
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public ITableInfo TableInfo => _knownTableInfo.Value;
@@ -125,11 +131,11 @@ public PreLoadDiscardedColumn()
     /// <param name="name"></param>
     public PreLoadDiscardedColumn(ICatalogueRepository repository, ITableInfo parent, string name = null)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"TableInfo_ID", parent.ID},
-            {"Destination", DiscardedColumnDestination.Oblivion},
-            {"RuntimeColumnName", name ?? $"NewColumn{Guid.NewGuid()}" }
+            { "TableInfo_ID", parent.ID },
+            { "Destination", DiscardedColumnDestination.Oblivion },
+            { "RuntimeColumnName", name ?? $"NewColumn{Guid.NewGuid()}" }
         });
 
         ClearAllInjections();
@@ -139,10 +145,10 @@ internal PreLoadDiscardedColumn(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
         TableInfo_ID = int.Parse(r["TableInfo_ID"].ToString());
-        Destination = (DiscardedColumnDestination) r["Destination"];
+        Destination = (DiscardedColumnDestination)r["Destination"];
         RuntimeColumnName = r["RuntimeColumnName"] as string;
         SqlDataType = r["SqlDataType"] as string;
-            
+
         if (r["DuplicateRecordResolutionOrder"] != DBNull.Value)
             DuplicateRecordResolutionOrder = int.Parse(r["DuplicateRecordResolutionOrder"].ToString());
         else
@@ -154,10 +160,7 @@ internal PreLoadDiscardedColumn(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{RuntimeColumnName} ({Destination})";
-    }
+    public override string ToString() => $"{RuntimeColumnName} ({Destination})";
 
 
     public void Check(ICheckNotifier notifier)
@@ -180,8 +183,9 @@ public void Check(ICheckNotifier notifier)
 
             //are there duplicate named columns?
             TableInfo.GetColumnsAtStage(LoadStage.AdjustRaw)
-                .Except(new[] {this})
-                .Any(c => c.GetRuntimeName(LoadStage.AdjustRaw).Equals(GetRuntimeName(LoadStage.AdjustRaw),StringComparison.CurrentCultureIgnoreCase)))
+                .Except(new[] { this })
+                .Any(c => c.GetRuntimeName(LoadStage.AdjustRaw).Equals(GetRuntimeName(LoadStage.AdjustRaw),
+                    StringComparison.CurrentCultureIgnoreCase)))
             notifier.OnCheckPerformed(
                 new CheckEventArgs($"There are 2+ columns called '{GetRuntimeName(LoadStage.AdjustRaw)}' in this table",
                     CheckResult.Fail));
@@ -190,29 +194,23 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public string GetRuntimeName()
-    {
+    public string GetRuntimeName() =>
         //belt and bracers, the user could be typing something mental into this field in his database
-        return MicrosoftQuerySyntaxHelper.Instance.GetRuntimeName(RuntimeColumnName);
-    }
+        MicrosoftQuerySyntaxHelper.Instance.GetRuntimeName(RuntimeColumnName);
+
     /// <inheritdoc/>
-    public string GetRuntimeName(LoadStage stage)
-    {
-        return GetRuntimeName();
-    }
-        
+    public string GetRuntimeName(LoadStage stage) => GetRuntimeName();
+
     /// <summary>
     /// true if destination for column is to store in identifier dump including undiluted versions of dilutes 
     /// (Dilution involves making clean values dirty for purposes of anonymisation and storing the clean values in
     /// the Identifier Dump).
     /// </summary>
     /// <returns></returns>
-    public bool GoesIntoIdentifierDump()
-    {
-        return Destination == DiscardedColumnDestination.StoreInIdentifiersDump
-               ||
-               Destination == DiscardedColumnDestination.Dilute;
-    }
+    public bool GoesIntoIdentifierDump() =>
+        Destination == DiscardedColumnDestination.StoreInIdentifiersDump
+        ||
+        Destination == DiscardedColumnDestination.Dilute;
 
     public void InjectKnown(ITableInfo instance)
     {
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ProcessTask.cs b/Rdmp.Core/Curation/Data/DataLoad/ProcessTask.cs
index 1550fa8928..584f42be86 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ProcessTask.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ProcessTask.cs
@@ -32,7 +32,7 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 /// reflection to query the Path e.g. 'AnySeparatorFileAttacher' for all properties marked with [DemandsInitialization] attribute.  This allows for 3rd party developers
 /// to write plugin classes to easily handle proprietary/bespoke source file types or complex data load requirements.</para>
 /// </summary>
-public class ProcessTask : DatabaseEntity, IProcessTask, IOrderable,INamed, ICheckable
+public class ProcessTask : DatabaseEntity, IProcessTask, IOrderable, INamed, ICheckable
 {
     #region Database Properties
 
@@ -48,25 +48,27 @@ public class ProcessTask : DatabaseEntity, IProcessTask, IOrderable,INamed, IChe
     /// <summary>
     /// The load the process task exists as part of
     /// </summary>
-    [Relationship(typeof(LoadMetadata),RelationshipType.SharedObject)]
+    [Relationship(typeof(LoadMetadata), RelationshipType.SharedObject)]
     public int LoadMetadata_ID
     {
         get => _loadMetadataID;
-        set => SetField(ref  _loadMetadataID, value);
+        set => SetField(ref _loadMetadataID, value);
     }
+
     /// <inheritdoc/>
-    [Obsolete("Since you can't change which Catalogues are loaded by a LoadMetadata at runtime, this property is now obsolete")]
+    [Obsolete(
+        "Since you can't change which Catalogues are loaded by a LoadMetadata at runtime, this property is now obsolete")]
     public int? RelatesSolelyToCatalogue_ID
     {
         get => _relatesSolelyToCatalogueID;
-        set => SetField(ref  _relatesSolelyToCatalogueID, value);
+        set => SetField(ref _relatesSolelyToCatalogueID, value);
     }
 
     /// <inheritdoc/>
     public int Order
     {
         get => _order;
-        set => SetField(ref  _order, value);
+        set => SetField(ref _order, value);
     }
 
     /// <inheritdoc/>
@@ -74,7 +76,7 @@ public int Order
     public string Path
     {
         get => _path;
-        set => SetField(ref  _path, value);
+        set => SetField(ref _path, value);
     }
 
     /// <inheritdoc cref="IProcessTask.Name"/>
@@ -82,36 +84,42 @@ public string Path
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
+
     /// <inheritdoc/>
     public LoadStage LoadStage
     {
         get => _loadStage;
-        set => SetField(ref  _loadStage, value);
+        set => SetField(ref _loadStage, value);
     }
+
     /// <inheritdoc/>
     public ProcessTaskType ProcessTaskType
     {
         get => _processTaskType;
-        set => SetField(ref  _processTaskType, value);
+        set => SetField(ref _processTaskType, value);
     }
+
     /// <inheritdoc/>
     public bool IsDisabled
     {
         get => _isDisabled;
-        set => SetField(ref  _isDisabled, value);
+        set => SetField(ref _isDisabled, value);
     }
 
     #endregion
+
     #region Relationships
+
     /// <inheritdoc cref="LoadMetadata_ID"/>
     [NoMappingToDatabase]
     public LoadMetadata LoadMetadata => Repository.GetObjectByID<LoadMetadata>(LoadMetadata_ID);
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IEnumerable<ProcessTaskArgument> ProcessTaskArguments => Repository.GetAllObjectsWithParent<ProcessTaskArgument>(this);
+    public IEnumerable<ProcessTaskArgument> ProcessTaskArguments =>
+        Repository.GetAllObjectsWithParent<ProcessTaskArgument>(this);
 
     /// <summary>
     /// All <see cref="ILoadProgress"/> (if any) that can be advanced by executing this load.  This allows batch execution of large loads
@@ -123,7 +131,6 @@ public bool IsDisabled
 
     public ProcessTask()
     {
-
     }
 
     /// <summary>
@@ -134,15 +141,16 @@ public ProcessTask()
     /// <param name="stage"></param>
     public ProcessTask(ICatalogueRepository repository, ILoadMetadata parent, LoadStage stage)
     {
-        var order = repository.GetAllObjectsWithParent<ProcessTask>(parent).Select(t => t.Order).DefaultIfEmpty().Max() + 1;
-            
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        var order =
+            repository.GetAllObjectsWithParent<ProcessTask>(parent).Select(t => t.Order).DefaultIfEmpty().Max() + 1;
+
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"LoadMetadata_ID", parent.ID},
-            {"ProcessTaskType", ProcessTaskType.Executable.ToString()},
-            {"LoadStage", stage},
-            {"Name", $"New Process{Guid.NewGuid()}" },
-            {"Order", order}
+            { "LoadMetadata_ID", parent.ID },
+            { "ProcessTaskType", ProcessTaskType.Executable.ToString() },
+            { "LoadStage", stage },
+            { "Name", $"New Process{Guid.NewGuid()}" },
+            { "Order", order }
         });
     }
 
@@ -173,14 +181,11 @@ internal ProcessTask(ICatalogueRepository repository, DbDataReader r)
 
     internal ProcessTask(ShareManager shareManager, ShareDefinition shareDefinition)
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
     public void Check(ICheckNotifier notifier)
@@ -215,25 +220,29 @@ private void CheckForProblemsInSQLFile(ICheckNotifier notifier)
             //let's check for any SQL that indicates user is trying to modify a STAGING table in a RAW script (for example)
             foreach (var tableInfo in LoadMetadata.GetDistinctTableInfoList(false))
                 //for each stage get all the object names that are in that stage
-            foreach (var stage in new[]{LoadStage.AdjustRaw, LoadStage.AdjustStaging, LoadStage.PostLoad})
+            foreach (var stage in new[] { LoadStage.AdjustRaw, LoadStage.AdjustStaging, LoadStage.PostLoad })
             {
                 //process task belongs in that stage anyway so nothing is prohibited
-                if (stage == (LoadStage == LoadStage.Mounting? LoadStage.AdjustRaw:LoadStage))
+                if (stage == (LoadStage == LoadStage.Mounting ? LoadStage.AdjustRaw : LoadStage))
                     continue;
 
-                    //figure out what is prohibited
-                    var prohibitedSql = tableInfo.GetQuerySyntaxHelper().EnsureFullyQualified(tableInfo.GetDatabaseRuntimeName(stage),null, tableInfo.GetRuntimeName(stage));
+                //figure out what is prohibited
+                var prohibitedSql = tableInfo.GetQuerySyntaxHelper()
+                    .EnsureFullyQualified(tableInfo.GetDatabaseRuntimeName(stage), null,
+                        tableInfo.GetRuntimeName(stage));
 
                 //if we reference it, complain
                 if (sql.Contains(prohibitedSql))
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"Sql in file '{Path}' contains a reference to '{prohibitedSql}' which is prohibited since the ProcessTask ('{Name}') runs in LoadStage {LoadStage}", CheckResult.Warning));
+                            $"Sql in file '{Path}' contains a reference to '{prohibitedSql}' which is prohibited since the ProcessTask ('{Name}') runs in LoadStage {LoadStage}",
+                            CheckResult.Warning));
             }
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to check the contents of the SQL file '{Path}'", CheckResult.Fail,e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to check the contents of the SQL file '{Path}'",
+                CheckResult.Fail, e));
         }
     }
 
@@ -241,7 +250,8 @@ private void CheckFileExistenceAndUniqueness(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(Path))
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"No Path specified for ProcessTask '{Name}'",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs($"No Path specified for ProcessTask '{Name}'",
+                CheckResult.Fail));
             return;
         }
 
@@ -251,53 +261,41 @@ private void CheckFileExistenceAndUniqueness(ICheckNotifier notifier)
 
 
         var matchingPaths = Repository.GetAllObjects<ProcessTask>().Where(pt => pt.Path.Equals(Path));
-        foreach (var duplicate in matchingPaths.Except(new[] {this}))
+        foreach (var duplicate in matchingPaths.Except(new[] { this }))
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"ProcessTask '{duplicate}' (ID={duplicate.ID}) also uses file '{System.IO.Path.GetFileName(Path)}'", CheckResult.Warning));
+                    $"ProcessTask '{duplicate}' (ID={duplicate.ID}) also uses file '{System.IO.Path.GetFileName(Path)}'",
+                    CheckResult.Warning));
 
         //conflicting tokens in Name string
         foreach (Match match in Regex.Matches(Name, @"'.*((\.exe')|(\.sql'))"))
-        {
             if (match.Success)
             {
-
                 var referencedFile = System.IO.Path.GetFileName(match.Value.Trim('\''));
                 var actualFile = System.IO.Path.GetFileName(Path);
 
                 if (referencedFile != actualFile)
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"Name of ProcessTask '{Name}' (ID={ID}) references file '{match.Value}' but the Path of the ProcessTask is '{Path}'", CheckResult.Fail));
+                            $"Name of ProcessTask '{Name}' (ID={ID}) references file '{match.Value}' but the Path of the ProcessTask is '{Path}'",
+                            CheckResult.Fail));
             }
-
-        }
     }
 
     /// <summary>
     /// Returns all tables loaded by the parent <see cref="LoadMetadata"/>
     /// </summary>
     /// <returns></returns>
-    public IEnumerable<TableInfo> GetTableInfos()
-    {
-        return LoadMetadata.GetDistinctTableInfoList(true);
-    }
+    public IEnumerable<TableInfo> GetTableInfos() => LoadMetadata.GetDistinctTableInfoList(true);
 
     /// <inheritdoc/>
-    public IEnumerable<IArgument> GetAllArguments()
-    {
-        return ProcessTaskArguments;
-    }
+    public IEnumerable<IArgument> GetAllArguments() => ProcessTaskArguments;
+
     /// <inheritdoc/>
-    public IArgument CreateNewArgument()
-    {
-        return new ProcessTaskArgument((ICatalogueRepository) Repository,this);
-    }
+    public IArgument CreateNewArgument() => new ProcessTaskArgument((ICatalogueRepository)Repository, this);
+
     /// <inheritdoc/>
-    public string GetClassNameWhoArgumentsAreFor()
-    {
-        return Path;
-    }
+    public string GetClassNameWhoArgumentsAreFor() => Path;
 
     /// <summary>
     /// Creates a new copy of the processTask and all its arguments in the database, this clone is then hooked up to the
@@ -308,7 +306,7 @@ public string GetClassNameWhoArgumentsAreFor()
     /// <returns>the new ProcessTask (the clone has a different ID to the parent)</returns>
     public ProcessTask CloneToNewLoadMetadataStage(LoadMetadata loadMetadata, LoadStage loadStage)
     {
-        var cataRepository = (ICatalogueRepository) Repository;
+        var cataRepository = (ICatalogueRepository)Repository;
 
         //clone only accepts sql connections so make sure we aren't in mysql land or something
         using (cataRepository.BeginNewTransaction())
@@ -319,15 +317,13 @@ public ProcessTask CloneToNewLoadMetadataStage(LoadMetadata loadMetadata, LoadSt
                 var toCloneArguments = ProcessTaskArguments.ToArray();
 
                 //create a new transaction for all the cloning - note that once all objects are cloned the transaction is committed then all the objects are adjusted outside the transaction
-                var clone = new ProcessTask(CatalogueRepository,LoadMetadata,loadStage);
+                var clone = new ProcessTask(CatalogueRepository, LoadMetadata, loadStage);
                 CopyShallowValuesTo(clone);
 
                 //foreach of our child arguments
                 foreach (var argument in toCloneArguments)
-                {
                     //clone it but rewire it to the proper ProcessTask parent (the clone)
                     argument.ShallowClone(clone);
-                }
 
                 //the values passed into parameter
                 clone.LoadMetadata_ID = loadMetadata.ID;
@@ -340,7 +336,7 @@ public ProcessTask CloneToNewLoadMetadataStage(LoadMetadata loadMetadata, LoadSt
                 //return the clone
                 return clone;
             }
-            catch(Exception)
+            catch (Exception)
             {
                 cataRepository.EndTransaction(false);
                 throw;
@@ -366,12 +362,8 @@ public IArgument[] CreateArgumentsForClassIfNotExists(Type t)
     }
 
 
-
     /// <inheritdoc/>
-    public IArgument[] CreateArgumentsForClassIfNotExists<T>()
-    {
-        return CreateArgumentsForClassIfNotExists(typeof(T));
-    }
+    public IArgument[] CreateArgumentsForClassIfNotExists<T>() => CreateArgumentsForClassIfNotExists(typeof(T));
 
     /// <summary>
     /// Returns true if the <see cref="ProcessTaskType"/> is allowed to happen during the given <see cref="LoadStage"/>  (e.g. you can't use an IAttacher to
@@ -397,10 +389,9 @@ public static bool IsCompatibleStage(ProcessTaskType type, LoadStage stage)
     /// True if <see cref="Path"/> is the name of a C# class (as opposed to the path to an executable or SQL file etc)
     /// </summary>
     /// <returns></returns>
-    public bool IsPluginType()
-    {
-        return ProcessTaskType == ProcessTaskType.Attacher || ProcessTaskType == ProcessTaskType.MutilateDataTable || ProcessTaskType == ProcessTaskType.DataProvider;
-    }
+    public bool IsPluginType() => ProcessTaskType == ProcessTaskType.Attacher ||
+                                  ProcessTaskType == ProcessTaskType.MutilateDataTable ||
+                                  ProcessTaskType == ProcessTaskType.DataProvider;
 
     /// <summary>
     /// Sets the value of the corresponding <see cref="IArgument"/> (which must already exist) to the given value.  If your argument doesn't exist yet you
@@ -410,8 +401,9 @@ public bool IsPluginType()
     /// <param name="o"></param>
     public void SetArgumentValue(string parameterName, object o)
     {
-        var matchingArgument = ProcessTaskArguments.SingleOrDefault(p => p.Name.Equals(parameterName)) ?? throw new Exception(
-                $"Could not find a ProcessTaskArgument called '{parameterName}', have you called CreateArgumentsForClassIfNotExists<T> yet?");
+        var matchingArgument = ProcessTaskArguments.SingleOrDefault(p => p.Name.Equals(parameterName)) ??
+                               throw new Exception(
+                                   $"Could not find a ProcessTaskArgument called '{parameterName}', have you called CreateArgumentsForClassIfNotExists<T> yet?");
         matchingArgument.SetValue(o);
         matchingArgument.SaveToDatabase();
     }
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskArgument.cs b/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskArgument.cs
index 7006b5f3af..c82bb0b38b 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskArgument.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskArgument.cs
@@ -26,6 +26,7 @@ namespace Rdmp.Core.Curation.Data.DataLoad;
 public sealed class ProcessTaskArgument : Argument
 {
     #region Database Properties
+
     private int _processTask_ID;
 
     /// <summary>
@@ -37,7 +38,7 @@ public int ProcessTask_ID
         get => _processTask_ID;
         set => SetField(ref _processTask_ID, value);
     }
-        
+
     #endregion
 
     #region Relationships
@@ -50,7 +51,6 @@ public int ProcessTask_ID
 
     public ProcessTaskArgument()
     {
-
     }
 
     /// <summary>
@@ -61,11 +61,11 @@ public ProcessTaskArgument()
     /// <param name="parent"></param>
     public ProcessTaskArgument(ICatalogueRepository repository, ProcessTask parent)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ProcessTask_ID", parent.ID},
-            {"Name", $"Parameter{Guid.NewGuid()}" },
-            {"Type", typeof (string).ToString()}
+            { "ProcessTask_ID", parent.ID },
+            { "Name", $"Parameter{Guid.NewGuid()}" },
+            { "Type", typeof(string).ToString() }
         });
     }
 
@@ -81,17 +81,17 @@ internal ProcessTaskArgument(ICatalogueRepository repository, DbDataReader r)
 
     internal ProcessTaskArgument(ShareManager shareManager, ShareDefinition shareDefinition)
     {
-        shareManager.UpsertAndHydrate(this,shareDefinition);
+        shareManager.UpsertAndHydrate(this, shareDefinition);
         try
         {
-
             //if the import is into a repository other than the master original repository
-            if(!shareManager.IsExportedObject(ProcessTask.LoadMetadata))
+            if (!shareManager.IsExportedObject(ProcessTask.LoadMetadata))
             {
                 //and we are a reference type e.g. to a ColumnInfo or something
                 var t = GetConcreteSystemType();
 
-                if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t) || typeof(IEnumerable<IMapsDirectlyToDatabaseTable>).IsAssignableFrom(t))
+                if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t) ||
+                    typeof(IEnumerable<IMapsDirectlyToDatabaseTable>).IsAssignableFrom(t))
                 {
                     //then use the value Null because whatever ID is stored in us won't be pointing to the same object
                     //as when we were exported!
@@ -106,12 +106,10 @@ internal ProcessTaskArgument(ShareManager shareManager, ShareDefinition shareDef
             Console.WriteLine(e);
         }
     }
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
-        
+    public override string ToString() => Name;
+
     /// <summary>
     /// Creates new ProcessTaskArguments for the supplied class T (based on what DemandsInitialization fields it has).  Parent is the ProcessTask that hosts the class T e.g. IAttacher
     /// </summary>
@@ -121,7 +119,6 @@ public static IArgument[] CreateArgumentsForClassIfNotExists<T>(IProcessTask par
     {
         var argFactory = new ArgumentFactory();
         return ArgumentFactory.CreateArgumentsForClassIfNotExistsGeneric<T>(
-                
                 //tell it how to create new instances of us related to parent
                 parent,
 
@@ -135,7 +132,7 @@ public static IArgument[] CreateArgumentsForClassIfNotExists<T>(IProcessTask par
     public ProcessTaskArgument ShallowClone(ProcessTask into)
     {
         var clone = new ProcessTaskArgument(CatalogueRepository, into);
-        CopyShallowValuesTo(clone,true);
+        CopyShallowValuesTo(clone, true);
 
         return clone;
     }
diff --git a/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskType.cs b/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskType.cs
index d96d2d7891..089f36a993 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskType.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/ProcessTaskType.cs
@@ -21,7 +21,7 @@ public enum ProcessTaskType
     /// ProcessTask is to run an SQL file directly on the server
     /// </summary>
     SQLFile,
-        
+
     /// <summary>
     /// ProcessTask is to instantiate the IAttacher class Type specified in Path and hydrate its [DemandsInitialization] properties with values matching 
     /// ProcessTaskArguments and run it in the specified load stage in an AttacherRuntimeTask wrapper.
@@ -33,7 +33,7 @@ public enum ProcessTaskType
     /// ProcessTaskArguments and run it in the specified load stage in an DataProviderRuntimeTask wrapper.
     /// </summary>
     DataProvider,
-        
+
     /// <summary>
     /// ProcessTask is to instantiate the IMutilateDataTables class Type specified in Path and hydrate its [DemandsInitialization] properties with values matching 
     /// ProcessTaskArguments and run it in the specified load stage in an MutilateDataTablesRuntimeTask wrapper.
diff --git a/Rdmp.Core/Curation/Data/DataLoad/RequiredPropertyInfo.cs b/Rdmp.Core/Curation/Data/DataLoad/RequiredPropertyInfo.cs
index 24eba14250..01bc44434d 100644
--- a/Rdmp.Core/Curation/Data/DataLoad/RequiredPropertyInfo.cs
+++ b/Rdmp.Core/Curation/Data/DataLoad/RequiredPropertyInfo.cs
@@ -39,7 +39,8 @@ public class RequiredPropertyInfo
     /// <param name="demand"></param>
     /// <param name="propertyInfo"></param>
     /// <param name="parentPropertyInfo"></param>
-    public RequiredPropertyInfo(DemandsInitializationAttribute demand, PropertyInfo propertyInfo, PropertyInfo parentPropertyInfo = null)
+    public RequiredPropertyInfo(DemandsInitializationAttribute demand, PropertyInfo propertyInfo,
+        PropertyInfo parentPropertyInfo = null)
     {
         Demand = demand;
         ParentPropertyInfo = parentPropertyInfo;
@@ -49,5 +50,6 @@ public RequiredPropertyInfo(DemandsInitializationAttribute demand, PropertyInfo
     /// <summary>
     /// The property name.  If the property is a nested one (i.e. DemandsNestedInitialization) then returns the full expression parent.property
     /// </summary>
-    public string Name => ParentPropertyInfo == null ? PropertyInfo.Name : $"{ParentPropertyInfo.Name}.{PropertyInfo.Name}";
+    public string Name =>
+        ParentPropertyInfo == null ? PropertyInfo.Name : $"{ParentPropertyInfo.Name}.{PropertyInfo.Name}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DatabaseEntity.cs b/Rdmp.Core/Curation/Data/DatabaseEntity.cs
index d86ef636c0..13d5a64e9e 100644
--- a/Rdmp.Core/Curation/Data/DatabaseEntity.cs
+++ b/Rdmp.Core/Curation/Data/DatabaseEntity.cs
@@ -37,7 +37,7 @@ namespace Rdmp.Core.Curation.Data;
 /// <para>A DatabaseEntity must have the same name as a Table in in the IRepository and must only have public properties that match columns in that table.  This enforces
 /// a transparent mapping between code and database.  If you need to add other public properties you must decorate them with [NoMappingToDatabase]</para>
 /// </summary>
-public abstract class DatabaseEntity : IRevertable,  INotifyPropertyChanged, ICanBeSummarised
+public abstract class DatabaseEntity : IRevertable, INotifyPropertyChanged, ICanBeSummarised
 {
     /// <summary>
     /// The maximum length for any given line in return value of <see cref="GetSummary"/>
@@ -87,17 +87,15 @@ protected DatabaseEntity(IRepository repository, DbDataReader r)
             throw new InvalidOperationException(
                 $"The DataReader passed to this type ({GetType().Name}) does not contain an 'ID' column. This is a requirement for all IMapsDirectlyToDatabaseTable implementing classes.");
 
-        ID = int.Parse(r["ID"].ToString()); // gets around decimals and other random crud number field types that sql returns
-
+        ID = int.Parse(r["ID"]
+            .ToString()); // gets around decimals and other random crud number field types that sql returns
     }
 
     private static bool HasColumn(IDataRecord reader, string columnName)
     {
         for (var i = 0; i < reader.FieldCount; i++)
-        {
             if (reader.GetName(i).Equals(columnName, StringComparison.InvariantCultureIgnoreCase))
                 return true;
-        }
 
         return false;
     }
@@ -119,16 +117,10 @@ protected static Uri ParseUrl(DbDataReader r, string fieldName)
     }
 
     /// <inheritdoc cref="IRepository.GetHashCode(IMapsDirectlyToDatabaseTable)"/>
-    public override int GetHashCode()
-    {
-        return Repository.GetHashCode(this);
-    }
+    public override int GetHashCode() => Repository.GetHashCode(this);
 
     /// <inheritdoc cref="IRepository.AreEqual(IMapsDirectlyToDatabaseTable,object)"/>
-    public override bool Equals(object obj)
-    {
-        return Repository.AreEqual(this, obj);
-    }
+    public override bool Equals(object obj) => Repository.AreEqual(this, obj);
 
     /// <inheritdoc/>
     public virtual void SaveToDatabase()
@@ -152,16 +144,10 @@ public virtual void RevertToDatabaseState()
     }
 
     /// <inheritdoc/>
-    public RevertableObjectReport HasLocalChanges()
-    {
-        return Repository.HasLocalChanges(this);
-    }
+    public RevertableObjectReport HasLocalChanges() => Repository.HasLocalChanges(this);
 
     /// <inheritdoc/>
-    public virtual bool Exists()
-    {
-        return Repository.StillExists(this);
-    }
+    public virtual bool Exists() => Repository.StillExists(this);
 
     /// <summary>
     /// Converts the supplied object to a <see cref="DateTime"/> or null if o is null/DBNull.Value
@@ -212,9 +198,10 @@ public virtual bool Exists()
     /// <param name="newValue"></param>
     /// <param name="propertyName"></param>
     [NotifyPropertyChangedInvocator]
-    protected virtual void OnPropertyChanged(object oldValue, object newValue, [CallerMemberName] string propertyName = null)
+    protected virtual void OnPropertyChanged(object oldValue, object newValue,
+        [CallerMemberName] string propertyName = null)
     {
-        PropertyChanged?.Invoke(this, new PropertyChangedExtendedEventArgs(propertyName,oldValue,newValue));
+        PropertyChanged?.Invoke(this, new PropertyChangedExtendedEventArgs(propertyName, oldValue, newValue));
     }
 
     /// <summary>
@@ -231,7 +218,8 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string prope
         if (EqualityComparer<T>.Default.Equals(field, value)) return false;
 
         //treat null and "" as the same
-        if (typeof(T) == typeof(string) && string.IsNullOrWhiteSpace(field as string) && string.IsNullOrWhiteSpace(value as string))
+        if (typeof(T) == typeof(string) && string.IsNullOrWhiteSpace(field as string) &&
+            string.IsNullOrWhiteSpace(value as string))
             return false;
 
         if (_readonly)
@@ -258,7 +246,7 @@ public void SetReadOnly()
     /// <param name="to"></param>
     /// <param name="copyName"></param>
     /// <param name="save"></param>
-    protected void CopyShallowValuesTo(DatabaseEntity to,bool copyName = false,bool save = true)
+    protected void CopyShallowValuesTo(DatabaseEntity to, bool copyName = false, bool save = true)
     {
         if (GetType() != to.GetType())
             throw new NotSupportedException(
@@ -266,7 +254,7 @@ protected void CopyShallowValuesTo(DatabaseEntity to,bool copyName = false,bool
 
         var noMappingFinder = new AttributePropertyFinder<NoMappingToDatabase>(to);
         var relationsFinder = new AttributePropertyFinder<RelationshipAttribute>(to);
-            
+
         foreach (var p in GetType().GetProperties())
         {
             if (p.Name.Equals("ID"))
@@ -275,31 +263,26 @@ protected void CopyShallowValuesTo(DatabaseEntity to,bool copyName = false,bool
             if (p.Name.Equals("Name") && !copyName)
                 continue;
 
-            if(noMappingFinder.GetAttribute(p) != null || relationsFinder.GetAttribute(p) != null)
+            if (noMappingFinder.GetAttribute(p) != null || relationsFinder.GetAttribute(p) != null)
                 continue;
 
             p.SetValue(to, p.GetValue(this));
         }
 
-        if(save)
+        if (save)
             to.SaveToDatabase();
     }
 
     /// <inheritdoc/>
     public virtual string GetSummary(bool includeName, bool includeID)
     {
-
         var sbPart1 = new StringBuilder();
-        foreach (var prop in GetType().GetProperties().Where(p=>p.Name.Contains("Description")))
-        {
+        foreach (var prop in GetType().GetProperties().Where(p => p.Name.Contains("Description")))
             AppendPropertyToSummary(sbPart1, prop, includeName, includeID, false);
-        }
 
         var sbPart2 = new StringBuilder();
         foreach (var prop in GetType().GetProperties().Where(p => !p.Name.Contains("Description")))
-        {
             AppendPropertyToSummary(sbPart2, prop, includeName, includeID);
-        }
 
         if (sbPart1.Length > 0 && sbPart2.Length > 0)
             sbPart1.AppendLine(SUMMARY_LINE_DIVIDER);
@@ -308,7 +291,8 @@ public virtual string GetSummary(bool includeName, bool includeID)
         return sbPart1.ToString();
     }
 
-    protected void AppendPropertyToSummary(StringBuilder sb, PropertyInfo prop, bool includeName, bool includeID, bool includePropertyName = true)
+    protected void AppendPropertyToSummary(StringBuilder sb, PropertyInfo prop, bool includeName, bool includeID,
+        bool includePropertyName = true)
     {
         // don't show Name if we are being told not to
         if (!includeName && prop.Name.EndsWith("Name"))
@@ -335,10 +319,7 @@ protected void AppendPropertyToSummary(StringBuilder sb, PropertyInfo prop, bool
         }
         catch (TargetInvocationException ex)
         {
-            if(ex.InnerException is NotSupportedException)
-            {
-                return;
-            }
+            if (ex.InnerException is NotSupportedException) return;
 
             throw;
         }
@@ -353,17 +334,13 @@ protected void AppendPropertyToSummary(StringBuilder sb, PropertyInfo prop, bool
             if (val is Enum e && Convert.ToInt32(e) == 0 && val is not DatabaseType)
                 return;
 
-            var representation = $"{(includePropertyName? $"{FormatPropertyNameForSummary(prop)}: " : "")}{FormatForSummary(val)}";
+            var representation =
+                $"{(includePropertyName ? $"{FormatPropertyNameForSummary(prop)}: " : "")}{FormatForSummary(val)}";
 
             if (representation.Length > MAX_SUMMARY_ITEM_LENGTH)
-            {
                 representation = $"{representation[..(MAX_SUMMARY_ITEM_LENGTH - 3)]}...";
-            }
 
-            if (representation.Contains('\n'))
-            {
-                representation = Regex.Replace(representation, @"\r?\n", " ");
-            }
+            if (representation.Contains('\n')) representation = Regex.Replace(representation, @"\r?\n", " ");
 
             sb.AppendLine(representation);
         }
@@ -374,10 +351,8 @@ protected void AppendPropertyToSummary(StringBuilder sb, PropertyInfo prop, bool
     /// </summary>
     /// <param name="prop"></param>
     /// <returns></returns>
-    protected virtual string FormatPropertyNameForSummary(PropertyInfo prop)
-    {
-        return UsefulStuff.PascalCaseStringToHumanReadable(prop.Name);
-    }
+    protected virtual string FormatPropertyNameForSummary(PropertyInfo prop) =>
+        UsefulStuff.PascalCaseStringToHumanReadable(prop.Name);
 
     /// <summary>
     /// Formats a given value for user readability in the results of <see cref="GetSummary(bool,bool)"/>
@@ -386,10 +361,7 @@ protected virtual string FormatPropertyNameForSummary(PropertyInfo prop)
     /// <returns></returns>
     protected static string FormatForSummary(object val)
     {
-        if(val is bool b)
-        {
-            return b ? "Yes" : "No";
-        }
+        if (val is bool b) return b ? "Yes" : "No";
 
         return val.ToString()?.Trim();
     }
diff --git a/Rdmp.Core/Curation/Data/Defaults/IServerDefaults.cs b/Rdmp.Core/Curation/Data/Defaults/IServerDefaults.cs
index 8e593c55e9..748232b330 100644
--- a/Rdmp.Core/Curation/Data/Defaults/IServerDefaults.cs
+++ b/Rdmp.Core/Curation/Data/Defaults/IServerDefaults.cs
@@ -18,7 +18,7 @@ public interface IServerDefaults
     /// <param name="field"></param>
     /// <returns>the currently configured ExternalDatabaseServer the user wants to use as the default for the supplied role or null if no default has yet been picked</returns>
     IExternalDatabaseServer GetDefaultFor(PermissableDefaults field);
-        
+
     /// <summary>
     /// Sets the database <paramref name="toDelete"/> default to null (not configured)
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/Defaults/PermissableDefaults.cs b/Rdmp.Core/Curation/Data/Defaults/PermissableDefaults.cs
index 790cfaa718..bbb5e7250a 100644
--- a/Rdmp.Core/Curation/Data/Defaults/PermissableDefaults.cs
+++ b/Rdmp.Core/Curation/Data/Defaults/PermissableDefaults.cs
@@ -23,7 +23,7 @@ public enum PermissableDefaults
     /// Relational logging database to store logs in while loading, running DQE, extracting etc
     /// </summary>
     LiveLoggingServer_ID,
-        
+
     /// <summary>
     /// Server to split sensitive identifiers off to during load (e.g. IdentifierDumper)
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/Defaults/ServerDefaults.cs b/Rdmp.Core/Curation/Data/Defaults/ServerDefaults.cs
index 1334eb60ff..281f4c7a33 100644
--- a/Rdmp.Core/Curation/Data/Defaults/ServerDefaults.cs
+++ b/Rdmp.Core/Curation/Data/Defaults/ServerDefaults.cs
@@ -9,7 +9,7 @@
 namespace Rdmp.Core.Curation.Data.Defaults;
 
 public static class ServerDefaults
-{        
+{
     /// <summary>
     /// The value that will actually be stored in the ServerDefaults table as a dictionary (see constructor for population
     /// </summary>
@@ -19,13 +19,14 @@ static ServerDefaults()
     {
         StringExpansionDictionary.Add(PermissableDefaults.LiveLoggingServer_ID, "Catalogue.LiveLoggingServer_ID");
         StringExpansionDictionary.Add(PermissableDefaults.IdentifierDumpServer_ID, "TableInfo.IdentifierDumpServer_ID");
-        StringExpansionDictionary.Add(PermissableDefaults.CohortIdentificationQueryCachingServer_ID, "CIC.QueryCachingServer_ID");
+        StringExpansionDictionary.Add(PermissableDefaults.CohortIdentificationQueryCachingServer_ID,
+            "CIC.QueryCachingServer_ID");
         StringExpansionDictionary.Add(PermissableDefaults.ANOStore, "ANOTable.Server_ID");
 
         StringExpansionDictionary.Add(PermissableDefaults.WebServiceQueryCachingServer_ID, "WebServiceQueryCache");
-            
+
         //this doesn't actually map to a field in the database, it is a bit of an abuse fo the defaults system
         StringExpansionDictionary.Add(PermissableDefaults.DQE, "DQE");
         StringExpansionDictionary.Add(PermissableDefaults.RAWDataLoadServer, "RAWDataLoadServer");
-    }        
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/DemandsInitializationAttribute.cs b/Rdmp.Core/Curation/Data/DemandsInitializationAttribute.cs
index bf5e6d30f9..028b6ec506 100644
--- a/Rdmp.Core/Curation/Data/DemandsInitializationAttribute.cs
+++ b/Rdmp.Core/Curation/Data/DemandsInitializationAttribute.cs
@@ -63,7 +63,8 @@ public class DemandsInitializationAttribute : Attribute
     /// <param name="defaultValue"></param>
     /// <param name="typeOf"></param>
     /// <param name="mandatory"></param>
-    public DemandsInitializationAttribute(string description,DemandType demandType =  DemandType.Unspecified, object defaultValue = null, Type typeOf = null, bool mandatory = false)
+    public DemandsInitializationAttribute(string description, DemandType demandType = DemandType.Unspecified,
+        object defaultValue = null, Type typeOf = null, bool mandatory = false)
     {
         Description = description;
         DemandType = demandType;
diff --git a/Rdmp.Core/Curation/Data/EncryptedPasswordHost.cs b/Rdmp.Core/Curation/Data/EncryptedPasswordHost.cs
index d1024c8c29..33c6e00843 100644
--- a/Rdmp.Core/Curation/Data/EncryptedPasswordHost.cs
+++ b/Rdmp.Core/Curation/Data/EncryptedPasswordHost.cs
@@ -26,15 +26,9 @@ public class EncryptedPasswordHost : IEncryptedPasswordHost
     internal class FakeEncryptedString : IEncryptedString
     {
         public string Value { get; set; }
-        public string GetDecryptedValue()
-        {
-            return Value;
-        }
+        public string GetDecryptedValue() => Value;
 
-        public bool IsStringEncrypted(string value)
-        {
-            return false;
-        }
+        public bool IsStringEncrypted(string value) => false;
     }
 
     private IEncryptedString _encryptedString;
@@ -66,13 +60,11 @@ public EncryptedPasswordHost(ICatalogueRepository repository)
     /// <param name="repository"></param>
     public void SetRepository(ICatalogueRepository repository)
     {
-        if(_encryptedString is FakeEncryptedString f)
-        {
+        if (_encryptedString is FakeEncryptedString f)
             _encryptedString = new EncryptedString(repository)
             {
                 Value = f.Value
             };
-        }            
     }
 
     /// <inheritdoc/>
@@ -81,7 +73,8 @@ public string Password
         get
         {
             if (_encryptedString is FakeEncryptedString)
-                throw new Exception($"Encryption setup failed, API caller must have forgotten to call {nameof(SetRepository)}");
+                throw new Exception(
+                    $"Encryption setup failed, API caller must have forgotten to call {nameof(SetRepository)}");
 
             return _encryptedString.Value;
         }
@@ -92,7 +85,8 @@ public string Password
     public string GetDecryptedPassword()
     {
         if (_encryptedString == null)
-            throw new Exception($"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
+            throw new Exception(
+                $"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
 
         return _encryptedString.GetDecryptedValue() ?? "";
     }
diff --git a/Rdmp.Core/Curation/Data/EncryptedString.cs b/Rdmp.Core/Curation/Data/EncryptedString.cs
index cbeb7d0c45..126c6ca373 100644
--- a/Rdmp.Core/Curation/Data/EncryptedString.cs
+++ b/Rdmp.Core/Curation/Data/EncryptedString.cs
@@ -21,10 +21,7 @@ public class EncryptedString : IEncryptedString
     private string _value;
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Value;
-    }
+    public override string ToString() => Value;
 
     /// <inheritdoc/>
     public string Value
@@ -34,26 +31,25 @@ public string Value
             _value;
         set
         {
-
-            if (string.IsNullOrWhiteSpace(value))//if it is null
+            if (string.IsNullOrWhiteSpace(value)) //if it is null
                 _value = null;
-            else
-            if (!_encrypter.IsStringEncrypted(value))//it is not null, is it already encrypted?
+            else if (!_encrypter.IsStringEncrypted(value)) //it is not null, is it already encrypted?
                 try
                 {
-                    _value = _encrypter.Encrypt(value);//not yet encrypted so encrypt it
+                    _value = _encrypter.Encrypt(value); //not yet encrypted so encrypt it
                 }
                 catch (Exception e)
                 {
                     if (e.Message.Contains("Bad Length") || e.Message.Contains("data too large for key size"))
                         throw new InvalidOperationException(
-                            $"The free text Value supplied to this class was too long to be encrypted (Length of string was {value.Length})", e);
+                            $"The free text Value supplied to this class was too long to be encrypted (Length of string was {value.Length})",
+                            e);
 
                     //it's some other exception
                     throw;
                 }
             else
-                _value = value;//it is encrypted already so just store in normally
+                _value = value; //it is encrypted already so just store in normally
         }
     }
 
@@ -63,7 +59,7 @@ public string Value
     /// <param name="repository"></param>
     public EncryptedString(ICatalogueRepository repository)
     {
-        _encrypter =  repository.EncryptionManager.GetEncrypter();
+        _encrypter = repository.EncryptionManager.GetEncrypter();
     }
 
     /// <inheritdoc/>
@@ -80,8 +76,5 @@ public string GetDecryptedValue()
     }
 
     /// <inheritdoc/>
-    public bool IsStringEncrypted(string value)
-    {
-        return _encrypter.IsStringEncrypted(value);
-    }
+    public bool IsStringEncrypted(string value) => _encrypter.IsStringEncrypted(value);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/EntityNaming/FixedStagingDatabaseNamer.cs b/Rdmp.Core/Curation/Data/EntityNaming/FixedStagingDatabaseNamer.cs
index 42471de1f1..75b8a1a60e 100644
--- a/Rdmp.Core/Curation/Data/EntityNaming/FixedStagingDatabaseNamer.cs
+++ b/Rdmp.Core/Curation/Data/EntityNaming/FixedStagingDatabaseNamer.cs
@@ -37,7 +37,7 @@ public override string GetName(string tableName, LoadBubble convention)
 
         return base.GetName(tableName, convention);
     }
-        
+
     /// <inheritdoc/>
     public override string GetDatabaseName(string rootDatabaseName, LoadBubble stage)
     {
@@ -57,7 +57,7 @@ protected static string EnsureValueIsNotWrapped(string s)
         if (s == null)
             return null;
 
-        var toReturn = s.Trim(new char[] { '[', ']', '`' ,'"'});
+        var toReturn = s.Trim(new char[] { '[', ']', '`', '"' });
 
         if (
             toReturn.Contains('[') ||
diff --git a/Rdmp.Core/Curation/Data/EntityNaming/INameDatabasesAndTablesDuringLoads.cs b/Rdmp.Core/Curation/Data/EntityNaming/INameDatabasesAndTablesDuringLoads.cs
index 320b6085e5..3716119fa6 100644
--- a/Rdmp.Core/Curation/Data/EntityNaming/INameDatabasesAndTablesDuringLoads.cs
+++ b/Rdmp.Core/Curation/Data/EntityNaming/INameDatabasesAndTablesDuringLoads.cs
@@ -20,7 +20,7 @@ public interface INameDatabasesAndTablesDuringLoads
     /// <param name="convention">The stage for which you want to know the corresponding database name</param>
     /// <returns></returns>
     string GetDatabaseName(string rootDatabaseName, LoadBubble convention);
-        
+
     /// <summary>
     /// Determines what name to give to passed LIVE table in the given DLE load bubble (e.g. RAW / STAGING)
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/EntityNaming/SuffixBasedNamer.cs b/Rdmp.Core/Curation/Data/EntityNaming/SuffixBasedNamer.cs
index 34bdd937c6..33b2f0ab38 100644
--- a/Rdmp.Core/Curation/Data/EntityNaming/SuffixBasedNamer.cs
+++ b/Rdmp.Core/Curation/Data/EntityNaming/SuffixBasedNamer.cs
@@ -17,10 +17,10 @@ public class SuffixBasedNamer : INameDatabasesAndTablesDuringLoads
 {
     protected static readonly Dictionary<LoadBubble, string> Suffixes = new()
     {
-        {LoadBubble.Raw, ""},
-        {LoadBubble.Staging, "_STAGING"},
-        {LoadBubble.Live, ""},
-        {LoadBubble.Archive, "_Archive"}
+        { LoadBubble.Raw, "" },
+        { LoadBubble.Staging, "_STAGING" },
+        { LoadBubble.Live, "" },
+        { LoadBubble.Archive, "_Archive" }
     };
 
     /// <inheritdoc/>
@@ -38,10 +38,9 @@ public virtual string GetDatabaseName(string rootDatabaseName, LoadBubble stage)
     /// <inheritdoc/>
     public virtual string GetName(string tableName, LoadBubble convention)
     {
-        if (!Suffixes.TryGetValue(convention,out var suffix))
+        if (!Suffixes.TryGetValue(convention, out var suffix))
             throw new ArgumentException($"Do not have a suffix for convention: {convention}");
 
         return $"{tableName}{suffix}";
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ExtendedProperty.cs b/Rdmp.Core/Curation/Data/ExtendedProperty.cs
index 0f362d75fe..3dbc5e2de7 100644
--- a/Rdmp.Core/Curation/Data/ExtendedProperty.cs
+++ b/Rdmp.Core/Curation/Data/ExtendedProperty.cs
@@ -21,13 +21,13 @@ namespace Rdmp.Core.Curation.Data;
 /// <summary>
 /// Stores a single named value for a specific <see cref="DatabaseEntity"/>.  This can be used to store custom field values e.g. for plugins
 /// </summary>
-public class ExtendedProperty  : Argument,IReferenceOtherObjectWithPersist, IInjectKnown<IMapsDirectlyToDatabaseTable>, INamed
+public class ExtendedProperty : Argument, IReferenceOtherObjectWithPersist, IInjectKnown<IMapsDirectlyToDatabaseTable>,
+    INamed
 {
-
     /// <summary>
     /// Key for <see cref="ExtendedProperty"/> that indicates an object is replaced by another
     /// </summary>
-    public const  string ReplacedBy = "ReplacedBy";
+    public const string ReplacedBy = "ReplacedBy";
 
     /// <summary>
     /// Key for <see cref="ExtendedProperty"/> that indicates an object is a reusable curated template
@@ -40,14 +40,18 @@ public class ExtendedProperty  : Argument,IReferenceOtherObjectWithPersist, IInj
     /// Key for use in <see cref="ExtendedProperty"/> for defining <see cref="IJoin.GetCustomJoinSql"/>
     /// </summary>
     public const string CustomJoinSql = "CustomJoinSql";
-    public const string CustomJoinSqlDescription = "Enter the column comparison(s) SQL for the JOIN line.  Your string should include only the boolean comparison logic that follows the ON keyword.  E.g. col1=col2.  You can optionally use substitution tokens {0} and {1} for table name/alias (e.g. for lookup)";
+
+    public const string CustomJoinSqlDescription =
+        "Enter the column comparison(s) SQL for the JOIN line.  Your string should include only the boolean comparison logic that follows the ON keyword.  E.g. col1=col2.  You can optionally use substitution tokens {0} and {1} for table name/alias (e.g. for lookup)";
 
     /// <summary>
     /// Key used in <see cref="ExtendedProperty"/> to indicate that a <see cref="LoadMetadata"/> should not
     /// attempt to DROP/CREATE its RAW database each time it is run
     /// </summary>
     public const string PersistentRaw = "PersistentRaw";
-    public const string PersistentRawDescription = "Should the load leave old RAW databases in the RAW server and only cleanup/reload tables at runtime? Value must be 'true' or 'false'";
+
+    public const string PersistentRawDescription =
+        "Should the load leave old RAW databases in the RAW server and only cleanup/reload tables at runtime? Value must be 'true' or 'false'";
 
     /// <summary>
     /// Collection of all known property names.  Plugins are free to add to these if desired but must do so pre startup
@@ -56,7 +60,8 @@ public class ExtendedProperty  : Argument,IReferenceOtherObjectWithPersist, IInj
 
     static ExtendedProperty()
     {
-        var fields = typeof(ExtendedProperty).GetFields(BindingFlags.Public | BindingFlags.Static).Where(p => p.FieldType == typeof(string));
+        var fields = typeof(ExtendedProperty).GetFields(BindingFlags.Public | BindingFlags.Static)
+            .Where(p => p.FieldType == typeof(string));
 
         foreach (var field in fields)
         {
@@ -69,6 +74,7 @@ static ExtendedProperty()
     }
 
     #region Database Properties
+
     private string _referencedObjectType;
     private int _referencedObjectID;
     private string _referencedObjectRepositoryType;
@@ -94,30 +100,32 @@ public string ReferencedObjectRepositoryType
         set => SetField(ref _referencedObjectRepositoryType, value);
     }
 
-
     #endregion
+
     public ExtendedProperty()
     {
         ClearAllInjections();
     }
-    public ExtendedProperty(ICatalogueRepository repository,IMapsDirectlyToDatabaseTable setOn, string name, object value)
+
+    public ExtendedProperty(ICatalogueRepository repository, IMapsDirectlyToDatabaseTable setOn, string name,
+        object value)
     {
-        if(repository == null)
+        if (repository == null)
             throw new ArgumentNullException(nameof(repository));
-        if(value == null)
+        if (value == null)
             throw new ArgumentNullException(nameof(value));
-        if(setOn == null)
+        if (setOn == null)
             throw new ArgumentNullException(nameof(setOn));
-        if(name == null)
+        if (name == null)
             throw new ArgumentNullException(nameof(name));
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",setOn.ID},
-            {"ReferencedObjectType",setOn.GetType().Name},
-            {"ReferencedObjectRepositoryType",setOn.Repository.GetType().Name},
-            {"Name", name},
-            {"Type", value.GetType().ToString()}
+            { "ReferencedObjectID", setOn.ID },
+            { "ReferencedObjectType", setOn.GetType().Name },
+            { "ReferencedObjectRepositoryType", setOn.Repository.GetType().Name },
+            { "Name", name },
+            { "Type", value.GetType().ToString() }
         });
 
         SetValue(value);
@@ -125,7 +133,7 @@ public ExtendedProperty(ICatalogueRepository repository,IMapsDirectlyToDatabaseT
     }
 
     /// <inheritdoc/>
-    public ExtendedProperty(ICatalogueRepository repository,DbDataReader r):base(repository,r)
+    public ExtendedProperty(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         ReferencedObjectType = r["ReferencedObjectType"].ToString();
         ReferencedObjectID = Convert.ToInt32(r["ReferencedObjectID"]);
@@ -141,51 +149,42 @@ public ExtendedProperty(ICatalogueRepository repository,DbDataReader r):base(rep
     /// </summary>
     /// <param name="type"></param>
     /// <returns></returns>
-    public bool IsReferenceTo(Type type)
-    {
-        return AreProbablySameType(ReferencedObjectType, type);
-    }
+    public bool IsReferenceTo(Type type) => AreProbablySameType(ReferencedObjectType, type);
 
     /// <summary>
     /// True if the <paramref name="o"/> is the object that is explicitly referenced by this class instance
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o)
-    {
-        return o.ID == ReferencedObjectID
-               &&
-               AreProbablySameType(ReferencedObjectType, o.GetType())
-               &&
-               AreProbablySameType(ReferencedObjectRepositoryType, o.Repository.GetType());
-    }
+    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o) =>
+        o.ID == ReferencedObjectID
+        &&
+        AreProbablySameType(ReferencedObjectType, o.GetType())
+        &&
+        AreProbablySameType(ReferencedObjectRepositoryType, o.Repository.GetType());
 
-    private static bool AreProbablySameType(string storedTypeName, Type candidate)
-    {
-        return
-            storedTypeName.Equals(candidate.Name, StringComparison.CurrentCultureIgnoreCase) ||
-            storedTypeName.Equals(candidate.FullName, StringComparison.CurrentCultureIgnoreCase);
-    }
+    private static bool AreProbablySameType(string storedTypeName, Type candidate) =>
+        storedTypeName.Equals(candidate.Name, StringComparison.CurrentCultureIgnoreCase) ||
+        storedTypeName.Equals(candidate.FullName, StringComparison.CurrentCultureIgnoreCase);
 
     /// <summary>
     /// Returns the instance of the object referenced by this class or null if it no longer exists (e.g. has been deleted)
     /// </summary>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public virtual IMapsDirectlyToDatabaseTable GetReferencedObject(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
-    {
-        return repositoryLocator.GetArbitraryDatabaseObject(ReferencedObjectRepositoryType, ReferencedObjectType, ReferencedObjectID);
-    }
+    public virtual IMapsDirectlyToDatabaseTable
+        GetReferencedObject(IRDMPPlatformRepositoryServiceLocator repositoryLocator) =>
+        repositoryLocator.GetArbitraryDatabaseObject(ReferencedObjectRepositoryType, ReferencedObjectType,
+            ReferencedObjectID);
 
     /// <summary>
     /// Returns true if the object referenced by this class still exists in the database
     /// </summary>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public bool ReferencedObjectExists(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
-    {
-        return repositoryLocator.ArbitraryDatabaseObjectExists(ReferencedObjectRepositoryType, ReferencedObjectType, ReferencedObjectID);
-    }
+    public bool ReferencedObjectExists(IRDMPPlatformRepositoryServiceLocator repositoryLocator) =>
+        repositoryLocator.ArbitraryDatabaseObjectExists(ReferencedObjectRepositoryType, ReferencedObjectType,
+            ReferencedObjectID);
 
     public void InjectKnown(IMapsDirectlyToDatabaseTable instance)
     {
@@ -193,12 +192,10 @@ public void InjectKnown(IMapsDirectlyToDatabaseTable instance)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     private Lazy<IMapsDirectlyToDatabaseTable> _knownReferenceTo;
+
     public void ClearAllInjections()
     {
         _knownReferenceTo = null;
@@ -210,13 +207,14 @@ public void ClearAllInjections()
     /// <param name="repository"></param>
     /// <param name="forObject"></param>
     /// <returns></returns>
-    internal static IEnumerable<ExtendedProperty> GetProperties(ICatalogueRepository repository, IMapsDirectlyToDatabaseTable forObject)
+    internal static IEnumerable<ExtendedProperty> GetProperties(ICatalogueRepository repository,
+        IMapsDirectlyToDatabaseTable forObject)
     {
         return repository.GetAllObjectsWhere<ExtendedProperty>(
-                "ReferencedObjectID", forObject.ID ,
+                "ReferencedObjectID", forObject.ID,
                 System.Linq.Expressions.ExpressionType.And,
                 "ReferencedObjectType", forObject.GetType().Name)
-            .Where(p=>p.IsReferenceTo(forObject));
+            .Where(p => p.IsReferenceTo(forObject));
     }
 
     /// <summary>
@@ -225,7 +223,8 @@ internal static IEnumerable<ExtendedProperty> GetProperties(ICatalogueRepository
     /// <param name="repository"></param>
     /// <param name="named"></param>
     /// <param name="forObject"></param>
-    internal static ExtendedProperty GetProperty(ICatalogueRepository repository, string named, IMapsDirectlyToDatabaseTable forObject)
+    internal static ExtendedProperty GetProperty(ICatalogueRepository repository, string named,
+        IMapsDirectlyToDatabaseTable forObject)
     {
         return GetProperties(repository, forObject).SingleOrDefault(e => e.Name.Equals(named));
     }
diff --git a/Rdmp.Core/Curation/Data/ExternalDatabaseServer.cs b/Rdmp.Core/Curation/Data/ExternalDatabaseServer.cs
index 19d486edfb..4a4b0254ab 100644
--- a/Rdmp.Core/Curation/Data/ExternalDatabaseServer.cs
+++ b/Rdmp.Core/Curation/Data/ExternalDatabaseServer.cs
@@ -26,7 +26,8 @@
 namespace Rdmp.Core.Curation.Data;
 
 /// <inheritdoc cref="IExternalDatabaseServer"/>
-public class ExternalDatabaseServer : DatabaseEntity, IExternalDatabaseServer, IDataAccessCredentials, INamed, ICheckable
+public class ExternalDatabaseServer : DatabaseEntity, IExternalDatabaseServer, IDataAccessCredentials, INamed,
+    ICheckable
 {
     #region Database Properties
 
@@ -43,7 +44,7 @@ public class ExternalDatabaseServer : DatabaseEntity, IExternalDatabaseServer, I
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -53,7 +54,7 @@ public string Name
     public string CreatedByAssembly
     {
         get => _createdByAssembly;
-        set => SetField(ref  _createdByAssembly, value);
+        set => SetField(ref _createdByAssembly, value);
     }
 
     /// <summary>
@@ -77,7 +78,7 @@ public string Server
 
             var old = _selfCertifyingDataAccessPoint.Server;
             _selfCertifyingDataAccessPoint.Server = value;
-            OnPropertyChanged(old,value);
+            OnPropertyChanged(old, value);
         }
     }
 
@@ -87,7 +88,7 @@ public string Database
         get => _selfCertifyingDataAccessPoint.Database;
         set
         {
-            if (Equals(_selfCertifyingDataAccessPoint.Database,value))
+            if (Equals(_selfCertifyingDataAccessPoint.Database, value))
                 return;
 
             var old = _selfCertifyingDataAccessPoint.Database;
@@ -146,6 +147,7 @@ public ExternalDatabaseServer()
             DatabaseType = DatabaseType.MicrosoftSQLServer
         };
     }
+
     /// <summary>
     /// Creates a new persistent server reference in RDMP platform database that allows it to connect to a (usually database) server.
     /// 
@@ -159,15 +161,15 @@ public ExternalDatabaseServer(ICatalogueRepository repository, string name, IPat
     {
         var parameters = new Dictionary<string, object>
         {
-            {"Name", name},
-            {"DatabaseType",DatabaseType.MicrosoftSQLServer}
+            { "Name", name },
+            { "DatabaseType", DatabaseType.MicrosoftSQLServer }
         };
-            
-        if(creatorIfAny != null)
-            parameters.Add("CreatedByAssembly" , creatorIfAny.Name);
-            
+
+        if (creatorIfAny != null)
+            parameters.Add("CreatedByAssembly", creatorIfAny.Name);
+
         Repository = repository;
-        _selfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository,DatabaseType.MicrosoftSQLServer);
+        _selfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository, DatabaseType.MicrosoftSQLServer);
         repository.InsertAndHydrate(this, parameters);
     }
 
@@ -176,18 +178,19 @@ internal ExternalDatabaseServer(ShareManager shareManager, ShareDefinition share
     {
         var repo = shareManager.RepositoryLocator.CatalogueRepository;
         Repository = repo;
-        _selfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(CatalogueRepository, DatabaseType.MicrosoftSQLServer/*will get changed by UpsertAndHydrate*/); 
+        _selfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(CatalogueRepository,
+            DatabaseType.MicrosoftSQLServer /*will get changed by UpsertAndHydrate*/);
 
         shareManager.UpsertAndHydrate(this, shareDefinition);
     }
 
-    internal ExternalDatabaseServer(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal ExternalDatabaseServer(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         Name = r["Name"] as string;
         CreatedByAssembly = r["CreatedByAssembly"] as string;
         MappedDataPath = r["MappedDataPath"] as string;
 
-        var databaseType = (DatabaseType) Enum.Parse(typeof (DatabaseType), r["DatabaseType"].ToString());
+        var databaseType = (DatabaseType)Enum.Parse(typeof(DatabaseType), r["DatabaseType"].ToString());
 
         _selfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository, databaseType)
         {
@@ -199,17 +202,13 @@ internal ExternalDatabaseServer(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public void Check(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(Server))
             notifier.OnCheckPerformed(new CheckEventArgs("No Server set", CheckResult.Warning));
-        else
-        if (string.IsNullOrWhiteSpace(Database))
+        else if (string.IsNullOrWhiteSpace(Database))
             notifier.OnCheckPerformed(new CheckEventArgs("No Database set", CheckResult.Warning));
         else
             try
@@ -219,7 +218,8 @@ public void Check(ICheckNotifier notifier)
             }
             catch (Exception exception)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Failed to connect to server", CheckResult.Fail, exception));
+                notifier.OnCheckPerformed(
+                    new CheckEventArgs("Failed to connect to server", CheckResult.Fail, exception));
                 return;
             }
 
@@ -229,21 +229,14 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _selfCertifyingDataAccessPoint.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => _selfCertifyingDataAccessPoint.GetQuerySyntaxHelper();
+
     /// <inheritdoc/>
-    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
-    {
-        return _selfCertifyingDataAccessPoint.GetCredentialsIfExists(context);
-    }
+    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context) =>
+        _selfCertifyingDataAccessPoint.GetCredentialsIfExists(context);
 
     /// <inheritdoc/>
-    public string GetDecryptedPassword()
-    {
-        return _selfCertifyingDataAccessPoint.GetDecryptedPassword()?? "";
-    }
+    public string GetDecryptedPassword() => _selfCertifyingDataAccessPoint.GetDecryptedPassword() ?? "";
 
     /// <summary>
     /// Sets server,database,username and password properties based on the supplied DiscoveredDatabase (which doesn't have to actually exist).  This method also optionally calls
@@ -253,14 +246,13 @@ public string GetDecryptedPassword()
     /// <param name="save">true if you want to call SaveToDatabase after setting the properties</param>
     public void SetProperties(DiscoveredDatabase discoveredDatabase, bool save = true)
     {
-
         Server = discoveredDatabase.Server.Name;
         Database = discoveredDatabase.GetRuntimeName();
         Username = discoveredDatabase.Server.ExplicitUsernameIfAny;
         Password = discoveredDatabase.Server.ExplicitPasswordIfAny;
         DatabaseType = discoveredDatabase.Server.DatabaseType;
 
-        if(save)
+        if (save)
             SaveToDatabase();
     }
 
@@ -269,36 +261,37 @@ public bool WasCreatedBy(IPatcher patcher)
     {
         if (string.IsNullOrWhiteSpace(CreatedByAssembly))
             return false;
-            
+
         return patcher.Name == CreatedByAssembly || patcher.LegacyName == CreatedByAssembly;
     }
 
     /// <inheritdoc/>
-    public DiscoveredDatabase Discover(DataAccessContext context)
-    {
-        return _selfCertifyingDataAccessPoint.Discover(context);
-    }
+    public DiscoveredDatabase Discover(DataAccessContext context) => _selfCertifyingDataAccessPoint.Discover(context);
 
     /// <inheritdoc/>
-    public bool DiscoverExistence(DataAccessContext context,out string reason)
-    {
-        return _selfCertifyingDataAccessPoint.DiscoverExistence(context,out reason);
-    }
+    public bool DiscoverExistence(DataAccessContext context, out string reason) =>
+        _selfCertifyingDataAccessPoint.DiscoverExistence(context, out reason);
 
 
     public override void DeleteInDatabase()
     {
+        
+         if (WasCreatedBy(new LoggingDatabasePatcher())){
+            //If you're trying to delete a logging server, remove all references to it first
+            Catalogue[] catalogues = Repository.GetAllObjectsWhere<Catalogue>("LiveLoggingServer_ID",base.ID);
+            foreach(Catalogue catalogue in catalogues){
+                catalogue.LiveLoggingServer_ID = null;
+                catalogue.SaveToDatabase();
+            }
+         }
         base.DeleteInDatabase();
 
         // normally in database schema deleting an ExternalDatabaseServer will cascade to clear defaults
         // but some repositories do not support this implicit removal so lets double check theres no references
-        foreach(PermissableDefaults d in Enum.GetValues(typeof(PermissableDefaults)))
+        foreach (PermissableDefaults d in Enum.GetValues(typeof(PermissableDefaults)))
         {
             var existingDefault = CatalogueRepository.GetDefaultFor(d);
-            if (Equals(existingDefault))
-            {
-                CatalogueRepository.ClearDefault(d);
-            }
+            if (Equals(existingDefault)) CatalogueRepository.ClearDefault(d);
         }
     }
 
diff --git a/Rdmp.Core/Curation/Data/ExtractionCategory.cs b/Rdmp.Core/Curation/Data/ExtractionCategory.cs
index 37ebc6efc7..bc33363eec 100644
--- a/Rdmp.Core/Curation/Data/ExtractionCategory.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionCategory.cs
@@ -46,5 +46,4 @@ public enum ExtractionCategory
     /// Value can only be used for fetching ExtractionInformations.  This means that all will be returned.  You cannot set a column to have an ExtractionCategory of Any
     /// </summary>
     Any
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ExtractionFilter.cs b/Rdmp.Core/Curation/Data/ExtractionFilter.cs
index 04230d88dc..f6ce6f8d4c 100644
--- a/Rdmp.Core/Curation/Data/ExtractionFilter.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionFilter.cs
@@ -36,8 +36,8 @@ namespace Rdmp.Core.Curation.Data;
 /// </summary>
 public class ExtractionFilter : ConcreteFilter, IHasDependencies, IInjectKnown<ExtractionFilterParameterSet[]>
 {
-
     #region Database Properties
+
     private int _extractionInformationID;
     private Lazy<ExtractionFilterParameterSet[]> _knownExtractionFilterParameterSets;
 
@@ -45,11 +45,11 @@ public class ExtractionFilter : ConcreteFilter, IHasDependencies, IInjectKnown<E
     /// The column in the <see cref="Catalogue"/> which is best/most associated with this filter.  A filter can query any column in any of the table(s) under
     /// the <see cref="Catalogue"/> but must always be associated with only one specific extractable column (<see cref="ExtractionInformation"/>)
     /// </summary>
-    [Relationship(typeof(ExtractionInformation),RelationshipType.LocalReference)]
+    [Relationship(typeof(ExtractionInformation), RelationshipType.LocalReference)]
     public int ExtractionInformation_ID
     {
         get => _extractionInformationID;
-        set => SetField(ref _extractionInformationID , value);
+        set => SetField(ref _extractionInformationID, value);
     }
 
     #endregion
@@ -74,37 +74,28 @@ public override int? FilterContainer_ID
     public ExtractionFilterParameterSet[] ExtractionFilterParameterSets => _knownExtractionFilterParameterSets.Value;
 
     /// <inheritdoc/>
-    public override ColumnInfo GetColumnInfoIfExists()
-    {
-        return ExtractionInformation.ColumnInfo;
-    }
+    public override ColumnInfo GetColumnInfoIfExists() => ExtractionInformation.ColumnInfo;
 
     /// <inheritdoc/>
-    public override IFilterFactory GetFilterFactory()
-    {
-        return new ExtractionFilterFactory(ExtractionInformation);
-    }
+    public override IFilterFactory GetFilterFactory() => new ExtractionFilterFactory(ExtractionInformation);
 
     /// <inheritdoc/>
-    public override Catalogue GetCatalogue()
-    {
-        return ExtractionInformation.CatalogueItem.Catalogue;
-    }
+    public override Catalogue GetCatalogue() => ExtractionInformation.CatalogueItem.Catalogue;
+
     /// <inheritdoc/>
-    public override ISqlParameter[] GetAllParameters()
-    {
-        return ExtractionFilterParameters.ToArray();
-    }
+    public override ISqlParameter[] GetAllParameters() => ExtractionFilterParameters.ToArray();
 
     #region Relationships
 
     /// <inheritdoc cref="ExtractionInformation_ID"/>
     [NoMappingToDatabase]
-    public ExtractionInformation ExtractionInformation => Repository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID);
+    public ExtractionInformation ExtractionInformation =>
+        Repository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID);
 
     /// <inheritdoc cref="ConcreteFilter.GetAllParameters"/>
     [NoMappingToDatabase]
-    public IEnumerable<ExtractionFilterParameter> ExtractionFilterParameters => Repository.GetAllObjectsWithParent<ExtractionFilterParameter>(this);
+    public IEnumerable<ExtractionFilterParameter> ExtractionFilterParameters =>
+        Repository.GetAllObjectsWithParent<ExtractionFilterParameter>(this);
 
     #endregion
 
@@ -125,10 +116,10 @@ public ExtractionFilter(ICatalogueRepository repository, string name, Extraction
     {
         name ??= $"New Filter {Guid.NewGuid()}";
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"ExtractionInformation_ID", parent.ID}
+            { "Name", name },
+            { "ExtractionInformation_ID", parent.ID }
         });
 
         ClearAllInjections();
@@ -141,16 +132,13 @@ internal ExtractionFilter(ICatalogueRepository repository, DbDataReader r)
         WhereSQL = r["WhereSQL"] as string;
         Description = r["Description"] as string;
         Name = r["Name"] as string;
-        IsMandatory = (bool) r["IsMandatory"];
+        IsMandatory = (bool)r["IsMandatory"];
 
         ClearAllInjections();
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     //we are an extraction filter ourselves! so obviously we werent cloned from one! (this is for aggregate and data export filters and satisfies IFilter).  Actually we can
     //be cloned via the publishing (elevation) from a custom filter defined at Aggregate level for example.  But in this case we don't need to know the ID anyway since we
@@ -163,7 +151,8 @@ public override string ToString()
     public override int? ClonedFromExtractionFilter_ID
     {
         get => null;
-        set => throw new NotSupportedException("ClonedFromExtractionFilter_ID is only supported on lower level filters e.g. DeployedExtractionFilter and AggregateFilter");
+        set => throw new NotSupportedException(
+            "ClonedFromExtractionFilter_ID is only supported on lower level filters e.g. DeployedExtractionFilter and AggregateFilter");
     }
 
     /// <inheritdoc/>
@@ -173,10 +162,7 @@ public IHasDependencies[] GetObjectsThisDependsOn()
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return ExtractionFilterParameters.ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => ExtractionFilterParameters.ToArray();
 
     public void InjectKnown(ExtractionFilterParameterSet[] instance)
     {
@@ -185,13 +171,15 @@ public void InjectKnown(ExtractionFilterParameterSet[] instance)
 
     public void ClearAllInjections()
     {
-        _knownExtractionFilterParameterSets = new Lazy<ExtractionFilterParameterSet[]>(() => CatalogueRepository.GetAllObjectsWithParent<ExtractionFilterParameterSet>(this));
+        _knownExtractionFilterParameterSets = new Lazy<ExtractionFilterParameterSet[]>(() =>
+            CatalogueRepository.GetAllObjectsWithParent<ExtractionFilterParameterSet>(this));
     }
 
     public override void DeleteInDatabase()
     {
         if (ExtractionFilterParameterSets.Any())
-            throw new Exception($"Cannot delete '{this}' because there are one or more {nameof(ExtractionFilterParameterSet)} declared on it");
+            throw new Exception(
+                $"Cannot delete '{this}' because there are one or more {nameof(ExtractionFilterParameterSet)} declared on it");
 
         base.DeleteInDatabase();
     }
diff --git a/Rdmp.Core/Curation/Data/ExtractionFilterParameter.cs b/Rdmp.Core/Curation/Data/ExtractionFilterParameter.cs
index b813aa8314..a60f3d00ad 100644
--- a/Rdmp.Core/Curation/Data/ExtractionFilterParameter.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionFilterParameter.cs
@@ -29,7 +29,7 @@ public class ExtractionFilterParameter : DatabaseEntity, IDeleteable, ISqlParame
     private string _comment;
     private string _parameterSQL;
     private int _extractionFilterID;
-        
+
     /// <inheritdoc/>
     [Sql]
     public string Value
@@ -37,12 +37,14 @@ public string Value
         get => _value;
         set => SetField(ref _value, value);
     }
+
     /// <inheritdoc/>
     public string Comment
     {
         get => _comment;
         set => SetField(ref _comment, value);
     }
+
     /// <inheritdoc/>
     [Sql]
     public string ParameterSQL
@@ -58,7 +60,7 @@ public string ParameterSQL
     public int ExtractionFilter_ID
     {
         get => _extractionFilterID;
-        set => SetField(ref _extractionFilterID , value);
+        set => SetField(ref _extractionFilterID, value);
     }
 
     #endregion
@@ -71,6 +73,7 @@ public int ExtractionFilter_ID
     public string ParameterName => QuerySyntaxHelper.GetParameterNameFromDeclarationSQL(ParameterSQL);
 
     #region Relationships
+
     /// <inheritdoc cref="ExtractionFilter_ID"/>
     [NoMappingToDatabase]
     public ExtractionFilter ExtractionFilter => Repository.GetObjectByID<ExtractionFilter>(ExtractionFilter_ID);
@@ -79,7 +82,6 @@ public int ExtractionFilter_ID
 
     public ExtractionFilterParameter()
     {
-
     }
 
     /// <summary>
@@ -91,10 +93,10 @@ public ExtractionFilterParameter()
     /// <param name="parent"></param>
     public ExtractionFilterParameter(ICatalogueRepository repository, string parameterSQL, ExtractionFilter parent)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ParameterSQL", parameterSQL},
-            {"ExtractionFilter_ID", parent.ID}
+            { "ParameterSQL", parameterSQL },
+            { "ExtractionFilter_ID", parent.ID }
         });
     }
 
@@ -109,10 +111,7 @@ internal ExtractionFilterParameter(ICatalogueRepository repository, DbDataReader
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     /// <inheritdoc cref="ParameterSyntaxChecker"/>
     public void Check(ICheckNotifier notifier)
@@ -121,22 +120,16 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return ExtractionFilter.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => ExtractionFilter.GetQuerySyntaxHelper();
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {ExtractionFilter};
+        return new[] { ExtractionFilter };
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return null;
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => null;
 
     /// <summary>
     /// Returns true if a  <see cref="Comment"/> has been provided and an example/initial <see cref="Value"/> specified.  This is a requirement of
@@ -151,8 +144,7 @@ public static bool IsProperlyDocumented(ISqlParameter sqlParameter, out string r
 
         if (string.IsNullOrWhiteSpace(sqlParameter.ParameterSQL))
             reasonParameterRejected = "There is no ParameterSQL";
-        else
-        if (string.IsNullOrWhiteSpace(sqlParameter.Value))
+        else if (string.IsNullOrWhiteSpace(sqlParameter.Value))
             reasonParameterRejected = "There is no value/default value listed";
 
 
@@ -160,8 +152,5 @@ public static bool IsProperlyDocumented(ISqlParameter sqlParameter, out string r
     }
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return ExtractionFilter;
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() => ExtractionFilter;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ExtractionFilterParameterSet.cs b/Rdmp.Core/Curation/Data/ExtractionFilterParameterSet.cs
index e5a51a6fa5..9b4d980122 100644
--- a/Rdmp.Core/Curation/Data/ExtractionFilterParameterSet.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionFilterParameterSet.cs
@@ -21,9 +21,10 @@ namespace Rdmp.Core.Curation.Data;
 /// can provide a name and a description for the concept.  Then you create a value for each parameter in the associated filter.  See ExtractionFilterParameterSetValue for
 /// the value recordings.
 /// </summary>
-public class ExtractionFilterParameterSet:DatabaseEntity, ICollectSqlParameters,INamed
+public class ExtractionFilterParameterSet : DatabaseEntity, ICollectSqlParameters, INamed
 {
     #region Database Properties
+
     private string _name;
     private string _description;
     private int _extractionFilterID;
@@ -33,7 +34,7 @@ public class ExtractionFilterParameterSet:DatabaseEntity, ICollectSqlParameters,
     public string Name
     {
         get => _name;
-        set => SetField(ref _name , value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -42,7 +43,7 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref _description , value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -66,13 +67,13 @@ public int ExtractionFilter_ID
     /// Gets all the individual parameter values required for populating the filter to achieve this concept (e.g. 'Diabetes Drugs' might have 2 parameter values @DrugList='123.122.1,1.2... etc' and @DrugCodeFormat='bnf')
     /// </summary>
     [NoMappingToDatabase]
-    public IEnumerable<ExtractionFilterParameterSetValue> Values => Repository.GetAllObjectsWithParent<ExtractionFilterParameterSetValue>(this);
+    public IEnumerable<ExtractionFilterParameterSetValue> Values =>
+        Repository.GetAllObjectsWithParent<ExtractionFilterParameterSetValue>(this);
 
     #endregion
 
     public ExtractionFilterParameterSet()
     {
-
     }
 
     internal ExtractionFilterParameterSet(ICatalogueRepository repository, DbDataReader r)
@@ -94,25 +95,19 @@ public ExtractionFilterParameterSet(ICatalogueRepository repository, ExtractionF
     {
         name ??= $"New ExtractionFilterParameterSet {Guid.NewGuid()}";
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name",name},
-            {"ExtractionFilter_ID",filter.ID}
+            { "Name", name },
+            { "ExtractionFilter_ID", filter.ID }
         });
     }
 
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc cref="Values"/>
-    public ISqlParameter[] GetAllParameters()
-    {
-        return Values.ToArray();
-    }
+    public ISqlParameter[] GetAllParameters() => Values.ToArray();
 
     /// <summary>
     /// Identifies all parameters which do not exist yet as declared values
@@ -120,7 +115,8 @@ public ISqlParameter[] GetAllParameters()
     /// <returns></returns>
     public IEnumerable<ExtractionFilterParameter> GetMissingEntries()
     {
-        var existingCatalogueParameters = ExtractionFilter.GetAllParameters().Cast<ExtractionFilterParameter>().ToArray();
+        var existingCatalogueParameters =
+            ExtractionFilter.GetAllParameters().Cast<ExtractionFilterParameter>().ToArray();
 
         var personalChildren = Values.ToArray();
 
@@ -128,6 +124,7 @@ public IEnumerable<ExtractionFilterParameter> GetMissingEntries()
             if (personalChildren.All(c => c.ExtractionFilterParameter_ID != catalogueParameter.ID))
                 yield return catalogueParameter;
     }
+
     /// <summary>
     /// Creates new value entries for each parameter in the filter that does not yet have a value in this value set
     /// </summary>
@@ -138,17 +135,15 @@ public ExtractionFilterParameterSetValue[] CreateNewValueEntries()
 
         foreach (var catalogueParameter in GetMissingEntries())
             //we have a master that does not have any child values yet
-            toReturn.Add(new ExtractionFilterParameterSetValue((ICatalogueRepository) Repository, this, catalogueParameter));
+            toReturn.Add(new ExtractionFilterParameterSetValue((ICatalogueRepository)Repository, this,
+                catalogueParameter));
 
         return toReturn.ToArray();
     }
 
     public override void DeleteInDatabase()
     {
-        foreach(var v in Values)
-        {
-            v.DeleteInDatabase();
-        }
+        foreach (var v in Values) v.DeleteInDatabase();
 
         base.DeleteInDatabase();
     }
diff --git a/Rdmp.Core/Curation/Data/ExtractionFilterParameterSetValue.cs b/Rdmp.Core/Curation/Data/ExtractionFilterParameterSetValue.cs
index 067e26b834..4a5d1743db 100644
--- a/Rdmp.Core/Curation/Data/ExtractionFilterParameterSetValue.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionFilterParameterSetValue.cs
@@ -20,9 +20,10 @@ namespace Rdmp.Core.Curation.Data;
 /// <summary>
 /// Stores a known specific useful value for a given ExtractionFilterParameter.  See <see cref="Data.ExtractionFilterParameterSet"/> for a use case for this.
 /// </summary>
-public class ExtractionFilterParameterSetValue: DatabaseEntity, ISqlParameter, IInjectKnown<ExtractionFilterParameter>
+public class ExtractionFilterParameterSetValue : DatabaseEntity, ISqlParameter, IInjectKnown<ExtractionFilterParameter>
 {
     #region Database Properties
+
     private string _value;
     private int _extractionFilterParameterSetID;
     private int _extractionFilterParameterID;
@@ -33,7 +34,7 @@ public class ExtractionFilterParameterSetValue: DatabaseEntity, ISqlParameter, I
     public int ExtractionFilterParameterSet_ID
     {
         get => _extractionFilterParameterSetID;
-        set => SetField(ref _extractionFilterParameterSetID , value);
+        set => SetField(ref _extractionFilterParameterSetID, value);
     }
 
     /// <summary>
@@ -42,7 +43,7 @@ public int ExtractionFilterParameterSet_ID
     public int ExtractionFilterParameter_ID
     {
         get => _extractionFilterParameterID;
-        set => SetField(ref _extractionFilterParameterID , value);
+        set => SetField(ref _extractionFilterParameterID, value);
     }
 
     /// <inheritdoc/>
@@ -52,6 +53,7 @@ public string Value
         get => _value;
         set => SetField(ref _value, value);
     }
+
     #endregion
 
     #region cached values stored so we can act like a readonly ISqlParameter but secretly only Value will actually be changeable
@@ -79,24 +81,23 @@ public string ParameterSQL
     public string Comment
     {
         get => _knownExtractionFilterParameter.Value.Comment;
-        set {  }
+        set { }
     }
 
     /// <summary>
     /// Returns the <see cref="ExtractionFilterParameterSet"/> this known good value belongs to
     /// </summary>
     /// <returns></returns>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return ExtractionFilterParameterSet;
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() => ExtractionFilterParameterSet;
+
     #endregion
 
     #region Relationships
 
     /// <inheritdoc cref="ExtractionFilterParameterSet_ID"/>
     [NoMappingToDatabase]
-    public ExtractionFilterParameterSet ExtractionFilterParameterSet => Repository.GetObjectByID<ExtractionFilterParameterSet>(ExtractionFilterParameterSet_ID);
+    public ExtractionFilterParameterSet ExtractionFilterParameterSet =>
+        Repository.GetObjectByID<ExtractionFilterParameterSet>(ExtractionFilterParameterSet_ID);
 
     /// <inheritdoc cref="ExtractionFilterParameter_ID"/>
     [NoMappingToDatabase]
@@ -113,8 +114,8 @@ public ExtractionFilterParameterSetValue()
     internal ExtractionFilterParameterSetValue(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        ExtractionFilterParameterSet_ID =   Convert.ToInt32(r["ExtractionFilterParameterSet_ID"]);
-        ExtractionFilterParameter_ID =      Convert.ToInt32(r["ExtractionFilterParameter_ID"]);
+        ExtractionFilterParameterSet_ID = Convert.ToInt32(r["ExtractionFilterParameterSet_ID"]);
+        ExtractionFilterParameter_ID = Convert.ToInt32(r["ExtractionFilterParameter_ID"]);
         Value = r["Value"] as string;
 
         ClearAllInjections();
@@ -131,22 +132,20 @@ internal ExtractionFilterParameterSetValue(ICatalogueRepository repository, DbDa
     /// <param name="repository"></param>
     /// <param name="parent"></param>
     /// <param name="valueIsForParameter"></param>
-    public ExtractionFilterParameterSetValue(ICatalogueRepository repository, ExtractionFilterParameterSet parent, ExtractionFilterParameter valueIsForParameter)
+    public ExtractionFilterParameterSetValue(ICatalogueRepository repository, ExtractionFilterParameterSet parent,
+        ExtractionFilterParameter valueIsForParameter)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ExtractionFilterParameterSet_ID",parent.ID},
-            {"ExtractionFilterParameter_ID",valueIsForParameter.ID}
+            { "ExtractionFilterParameterSet_ID", parent.ID },
+            { "ExtractionFilterParameter_ID", valueIsForParameter.ID }
         });
 
         ClearAllInjections();
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return ExtractionFilterParameter.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => ExtractionFilterParameter.GetQuerySyntaxHelper();
 
     /// <inheritdoc/>
     public void Check(ICheckNotifier notifier)
@@ -154,10 +153,7 @@ public void Check(ICheckNotifier notifier)
         new ParameterSyntaxChecker(this).Check(notifier);
     }
 
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     public void InjectKnown(ExtractionFilterParameter instance)
     {
@@ -166,6 +162,7 @@ public void InjectKnown(ExtractionFilterParameter instance)
 
     public void ClearAllInjections()
     {
-        _knownExtractionFilterParameter = new Lazy<ExtractionFilterParameter>(() => Repository.GetObjectByID<ExtractionFilterParameter>(ExtractionFilterParameter_ID));
+        _knownExtractionFilterParameter = new Lazy<ExtractionFilterParameter>(() =>
+            Repository.GetObjectByID<ExtractionFilterParameter>(ExtractionFilterParameter_ID));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ExtractionInformation.cs b/Rdmp.Core/Curation/Data/ExtractionInformation.cs
index fb58041c08..d7ff846db2 100644
--- a/Rdmp.Core/Curation/Data/ExtractionInformation.cs
+++ b/Rdmp.Core/Curation/Data/ExtractionInformation.cs
@@ -35,21 +35,21 @@ namespace Rdmp.Core.Curation.Data;
 /// This is the column(s) which will be joined against cohorts in data extraction linkages.  This should be the private identifier you use to identify
 /// people in your datasets (e.g. Community Health Index or NHS Number).</para>
 /// </summary>
-public class ExtractionInformation : ConcreteColumn, IHasDependencies, IInjectKnown<ColumnInfo>,IInjectKnown<CatalogueItem>, IHasQuerySyntaxHelper
+public class ExtractionInformation : ConcreteColumn, IHasDependencies, IInjectKnown<ColumnInfo>,
+    IInjectKnown<CatalogueItem>, IHasQuerySyntaxHelper
 {
-        
-    #region Properties 
-        
+    #region Properties
+
     private int _catalogueItemID;
     private ExtractionCategory _extractionCategory;
-        
+
     /// <summary>
     /// The virtual column (description, name etc) to which this <see cref="ExtractionInformation"/> provides extraction SELECT SQL for.
     /// </summary>
     public int CatalogueItem_ID
     {
         get => _catalogueItemID;
-        set => SetField(ref _catalogueItemID , value);
+        set => SetField(ref _catalogueItemID, value);
     }
 
     /// <summary>
@@ -61,15 +61,17 @@ public ExtractionCategory ExtractionCategory
         set
         {
             if (value == ExtractionCategory.Any)
-                throw new ArgumentException("Any is only usable as an extraction argument and cannot be assigned to an ExtractionInformation");
+                throw new ArgumentException(
+                    "Any is only usable as an extraction argument and cannot be assigned to an ExtractionInformation");
 
             SetField(ref _extractionCategory, value);
         }
     }
-        
+
     #endregion
 
     #region Relationships
+
     //These fields are fetched (cached version) from lookup link table - ExtractionInformation can only exist where there is a relationship between a CatalogueItem and a ColumnInfo
     /// <inheritdoc cref="CatalogueItem_ID"/>
     [NoMappingToDatabase]
@@ -94,7 +96,8 @@ public ExtractionCategory ExtractionCategory
     /// filters (<see cref="ExtractionFilter"/>) and act as templates that can be imported/cloned into other use cases (e.g. cohort identification, extraction etc).
     /// </summary>
     [NoMappingToDatabase]
-    public IEnumerable<ExtractionFilter> ExtractionFilters => Repository.GetAllObjectsWithParent<ExtractionFilter>(this);
+    public IEnumerable<ExtractionFilter> ExtractionFilters =>
+        Repository.GetAllObjectsWithParent<ExtractionFilter>(this);
 
     #endregion
 
@@ -111,22 +114,22 @@ public ExtractionInformation()
     /// <param name="catalogueItem">The virtual column to make extractable (could be a transform e.g. YearOfBirth)</param>
     /// <param name="column">The column underlying the virtual column (e.g. `MyTable`.`DateOfBirth`)</param>
     /// <param name="selectSQL">The fully specified column name or transform SQL to execute as a line of SELECT Sql </param>
-    public ExtractionInformation(ICatalogueRepository repository, CatalogueItem catalogueItem, ColumnInfo column, string selectSQL)
+    public ExtractionInformation(ICatalogueRepository repository, CatalogueItem catalogueItem, ColumnInfo column,
+        string selectSQL)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"SelectSQL", string.IsNullOrWhiteSpace(selectSQL) ? column.Name : selectSQL},
-            {"Order", GetMaxOrder(catalogueItem)},
-            {"ExtractionCategory", ExtractionCategory.Core.ToString()},
-            {"CatalogueItem_ID",catalogueItem.ID}
+            { "SelectSQL", string.IsNullOrWhiteSpace(selectSQL) ? column.Name : selectSQL },
+            { "Order", GetMaxOrder(catalogueItem) },
+            { "ExtractionCategory", ExtractionCategory.Core.ToString() },
+            { "CatalogueItem_ID", catalogueItem.ID }
         });
-            
+
         catalogueItem.ClearAllInjections();
 
         if (catalogueItem.ColumnInfo_ID == null)
             repository.SaveSpecificPropertyOnlyToDatabase(catalogueItem, "ColumnInfo_ID", column.ID);
-        else
-        if (catalogueItem.ColumnInfo_ID != column.ID)
+        else if (catalogueItem.ColumnInfo_ID != column.ID)
             throw new ArgumentException(
                 $"Cannot create an ExtractionInformation for CatalogueItem {catalogueItem} with ColumnInfo {column} because the CatalogueItem is already associated with a different ColumnInfo: {catalogueItem.ColumnInfo}");
         ClearAllInjections();
@@ -154,7 +157,7 @@ private static int GetMaxOrder(CatalogueItem catalogueItem)
         }
     }
 
-    internal ExtractionInformation(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal ExtractionInformation(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         SelectSQL = r["SelectSQL"].ToString();
 
@@ -168,9 +171,9 @@ internal ExtractionInformation(ICatalogueRepository repository, DbDataReader r):
         Alias = r["Alias"] as string;
 
         HashOnDataRelease = (bool)r["HashOnDataRelease"];
-        IsExtractionIdentifier = (bool) r["IsExtractionIdentifier"];
-        IsPrimaryKey = (bool) r["IsPrimaryKey"];
-        CatalogueItem_ID = (int) r["CatalogueItem_ID"];
+        IsExtractionIdentifier = (bool)r["IsExtractionIdentifier"];
+        IsPrimaryKey = (bool)r["IsPrimaryKey"];
+        CatalogueItem_ID = (int)r["CatalogueItem_ID"];
 
         ClearAllInjections();
     }
@@ -181,7 +184,7 @@ internal ExtractionInformation(ICatalogueRepository repository, DbDataReader r):
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
-        _knownColumninfo = new Lazy<ColumnInfo>(()=>CatalogueItem.ColumnInfo);
+        _knownColumninfo = new Lazy<ColumnInfo>(() => CatalogueItem.ColumnInfo);
         _knownCatalogueItem = new Lazy<CatalogueItem>(() => Repository.GetObjectByID<CatalogueItem>(CatalogueItem_ID));
     }
 
@@ -190,11 +193,13 @@ public void InjectKnown(ColumnInfo instance)
     {
         _knownColumninfo = new Lazy<ColumnInfo>(instance);
     }
+
     /// <inheritdoc/>
     public void InjectKnown(CatalogueItem instance)
     {
         _knownCatalogueItem = new Lazy<CatalogueItem>(instance);
     }
+
     /// <inheritdoc/>
     public override string ToString()
     {
@@ -210,22 +215,21 @@ public override string ToString()
             return $"BROKEN ExtractionInformation:{SelectSQL}";
         }
     }
+
     /// <inheritdoc/>
-    public override int GetHashCode()
-    {
-        return ID.GetHashCode();
-    }
+    public override int GetHashCode() => ID.GetHashCode();
+
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return ColumnInfo != null? new IHasDependencies[] {ColumnInfo}: Array.Empty<IHasDependencies>();
+        return ColumnInfo != null ? new IHasDependencies[] { ColumnInfo } : Array.Empty<IHasDependencies>();
     }
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsDependingOnThis()
     {
         var dependencies = new List<IHasDependencies>();
-            
+
         dependencies.AddRange(ExtractionFilters);
         dependencies.Add(CatalogueItem);
 
@@ -254,10 +258,7 @@ public bool IsProperTransform()
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return ColumnInfo?.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => ColumnInfo?.GetQuerySyntaxHelper();
 
     public override string GetSummary(bool includeName, bool includeID)
     {
diff --git a/Rdmp.Core/Curation/Data/Favourite.cs b/Rdmp.Core/Curation/Data/Favourite.cs
index 6c9132e337..4a07ac8c11 100644
--- a/Rdmp.Core/Curation/Data/Favourite.cs
+++ b/Rdmp.Core/Curation/Data/Favourite.cs
@@ -18,19 +18,20 @@ namespace Rdmp.Core.Curation.Data;
 /// whenever an RDMPCollectionUI is visible and that object is onscreen a star will appear beside it.  Favourites are stored on a 'per user' basis in the Catalogue database so 
 /// even if you switch computers/change sessions Favourites are preserved. 
 /// </summary>
-public class Favourite:ReferenceOtherObjectDatabaseEntity
+public class Favourite : ReferenceOtherObjectDatabaseEntity
 {
     #region Database Properties
+
     private string _username;
     private DateTime _favouritedDate;
-        
+
     /// <summary>
     /// The user that favourited the object
     /// </summary>
     public string Username
     {
         get => _username;
-        set => SetField(ref _username , value);
+        set => SetField(ref _username, value);
     }
 
     /// <summary>
@@ -41,14 +42,14 @@ public DateTime FavouritedDate
         get => _favouritedDate;
         set => SetField(ref _favouritedDate, value);
     }
+
     #endregion
 
     public Favourite()
     {
-
     }
 
-    internal Favourite(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal Favourite(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         Username = r["Username"].ToString();
         FavouritedDate = Convert.ToDateTime(r["FavouritedDate"]);
@@ -64,11 +65,11 @@ public Favourite(ICatalogueRepository repository, IMapsDirectlyToDatabaseTable o
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",objectToFavourite.ID},
-            {"ReferencedObjectType",objectToFavourite.GetType().Name},
-            {"ReferencedObjectRepositoryType",objectToFavourite.Repository.GetType().Name},
-            {"Username", Environment.UserName},
-            {"FavouritedDate", DateTime.Now}
+            { "ReferencedObjectID", objectToFavourite.ID },
+            { "ReferencedObjectType", objectToFavourite.GetType().Name },
+            { "ReferencedObjectRepositoryType", objectToFavourite.Repository.GetType().Name },
+            { "Username", Environment.UserName },
+            { "FavouritedDate", DateTime.Now }
         });
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/FolderHelper.cs b/Rdmp.Core/Curation/Data/FolderHelper.cs
index 9b744e0edd..3f20aebcf0 100644
--- a/Rdmp.Core/Curation/Data/FolderHelper.cs
+++ b/Rdmp.Core/Curation/Data/FolderHelper.cs
@@ -33,10 +33,7 @@ public static string Adjust(string candidate)
             candidate = candidate.ToLower();
             candidate = candidate.TrimEnd('\\');
 
-            if(string.IsNullOrWhiteSpace(candidate))
-            {
-                candidate = Root;
-            }
+            if (string.IsNullOrWhiteSpace(candidate)) candidate = Root;
 
             return candidate;
         }
@@ -49,15 +46,13 @@ public static bool IsValidPath(string candidatePath, out string reason)
         reason = null;
 
         if (string.IsNullOrWhiteSpace(candidatePath))
-            reason = "An attempt was made to set Catalogue Folder to null, every Catalogue must have a folder, set it to \\ if you want the root";
-        else
-        if (!candidatePath.StartsWith("\\"))
+            reason =
+                "An attempt was made to set Catalogue Folder to null, every Catalogue must have a folder, set it to \\ if you want the root";
+        else if (!candidatePath.StartsWith("\\"))
             reason = $"All catalogue paths must start with \\.  Invalid path was:{candidatePath}";
-        else
-        if (candidatePath.Contains("\\\\"))//if it contains double slash
+        else if (candidatePath.Contains("\\\\")) //if it contains double slash
             reason = $"Catalogue paths cannot contain double slashes '\\\\', Invalid path was:{candidatePath}";
-        else
-        if (candidatePath.Contains('/'))//if it contains double slash
+        else if (candidatePath.Contains('/')) //if it contains double slash
             reason =
                 $"Catalogue paths must use backwards slashes not forward slashes, Invalid path was:{candidatePath}";
 
@@ -69,19 +64,16 @@ public static bool IsValidPath(string candidatePath, out string reason)
     /// </summary>
     /// <param name="candidatePath"></param>
     /// <returns></returns>
-    public static bool IsValidPath(string candidatePath)
-    {
-        return IsValidPath(candidatePath, out _);
-    }
+    public static bool IsValidPath(string candidatePath) => IsValidPath(candidatePath, out _);
 
-    public static FolderNode<T> BuildFolderTree<T>(T[] objects, FolderNode<T> currentBranch = null) where T: class, IHasFolder
+    public static FolderNode<T> BuildFolderTree<T>(T[] objects, FolderNode<T> currentBranch = null)
+        where T : class, IHasFolder
     {
         currentBranch ??= new FolderNode<T>(Root);
         var currentBranchFullName = currentBranch.FullName;
 
         foreach (var g in objects.GroupBy(g => g.Folder).ToArray())
-        {
-            if(g.Key.Equals(currentBranchFullName, StringComparison.CurrentCultureIgnoreCase))
+            if (g.Key.Equals(currentBranchFullName, StringComparison.CurrentCultureIgnoreCase))
             {
                 // all these are in the exact folder we are looking at, they are our children
                 currentBranch.ChildObjects.AddRange(g);
@@ -90,35 +82,35 @@ public static FolderNode<T> BuildFolderTree<T>(T[] objects, FolderNode<T> curren
             {
                 // these objects are in a subdirectory of us.  Find the next subdirectory name
                 // bearing in mind we may be at '\' and be seing '\dog\cat\fish' as the next
-                var idx = g.Key.IndexOf(currentBranchFullName, StringComparison.CurrentCultureIgnoreCase) + currentBranchFullName.Length;
+                var idx = g.Key.IndexOf(currentBranchFullName, StringComparison.CurrentCultureIgnoreCase) +
+                          currentBranchFullName.Length;
 
                 // if we have objects that do not live under this full path thats a problem
-
                 // or its also a problem if we found a full match to the end of the string
-
                 // this branch deals with sub folders and that would mean the current group
                 // are not in any subfolders
-                if (idx == -1 || idx == g.Key.Length -1)
-                {
-                    throw new Exception($"Unable to build folder groups.  Current group was not a child of the current branch.  Branch was '{currentBranch.FullName}' while Group was '{g.Key}'");
-                }
+                if (idx == -1 || idx == g.Key.Length - 1)
+                    throw new Exception(
+                        $"Unable to build folder groups.  Current group was not a child of the current branch.  Branch was '{currentBranch.FullName}' while Group was '{g.Key}'");
 
                 var subFolders = g.Key[idx..];
-                var nextFolder = subFolders.Split('\\',StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() ?? throw new Exception($"Unable to build folder groups.  Current group had malformed Folder name.  Branch was '{currentBranch.FullName}' while Group was '{g.Key}'");
+                var nextFolder = subFolders.Split('\\', StringSplitOptions.RemoveEmptyEntries).FirstOrDefault() ??
+                                 throw new Exception(
+                                     $"Unable to build folder groups.  Current group had malformed Folder name.  Branch was '{currentBranch.FullName}' while Group was '{g.Key}'");
 
                 // we may already have created this as part of a subgroup e.g. seeing \1\2 then seeing \1 alone (we don't want multiple copies of \1 folder).
-                var existing = currentBranch.ChildFolders.FirstOrDefault(f => f.Name.Equals(nextFolder, StringComparison.CurrentCultureIgnoreCase));
+                var existing = currentBranch.ChildFolders.FirstOrDefault(f =>
+                    f.Name.Equals(nextFolder, StringComparison.CurrentCultureIgnoreCase));
 
-                if(existing == null)
+                if (existing == null)
                 {
                     // we don't have one already so create it
                     existing = new FolderNode<T>(nextFolder, currentBranch);
                     currentBranch.ChildFolders.Add(existing);
                 }
 
-                BuildFolderTree(g.ToArray(),existing);
+                BuildFolderTree(g.ToArray(), existing);
             }
-        }
 
         return currentBranch;
     }
diff --git a/Rdmp.Core/Curation/Data/FolderNode.cs b/Rdmp.Core/Curation/Data/FolderNode.cs
index 04fa1e3b4d..7319fec823 100644
--- a/Rdmp.Core/Curation/Data/FolderNode.cs
+++ b/Rdmp.Core/Curation/Data/FolderNode.cs
@@ -18,18 +18,24 @@ namespace Rdmp.Core.Curation.Data;
 /// dynamically based on the current <see cref="IHasFolder.Folder"/> strings.
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public class FolderNode<T> : IFolderNode, IOrderable /*Orderable interface ensures that folders always appear before datasets in tree*/
-    where T: class, IHasFolder
+public class
+    FolderNode<T> : IFolderNode,
+        IOrderable /*Orderable interface ensures that folders always appear before datasets in tree*/
+    where T : class, IHasFolder
 {
     public string Name { get; set; }
-    public List<T> ChildObjects { get; set; } = new List<T>();
-    public List<FolderNode<T>> ChildFolders { get; set; } = new List<FolderNode<T>>();
+    public List<T> ChildObjects { get; set; } = new();
+    public List<FolderNode<T>> ChildFolders { get; set; } = new();
 
     public FolderNode<T> Parent { get; set; }
 
     public string FullName => GetFullName();
 
-    int IOrderable.Order { get => -1; set => throw new NotSupportedException(); }
+    int IOrderable.Order
+    {
+        get => -1;
+        set => throw new NotSupportedException();
+    }
 
     public FolderNode(string name, FolderNode<T> parent = null)
     {
@@ -45,7 +51,7 @@ private string GetFullName()
 
         var p = Parent;
 
-        while(p != null)
+        while (p != null)
         {
             sb.Insert(0, p.Name.Equals(FolderHelper.Root) ? p.Name : $"{p.Name}\\");
 
@@ -63,19 +69,11 @@ private FolderNode<T> GetChild(string key)
                ?? throw new ArgumentOutOfRangeException($"Could not find a child folder with the key '{key}'");
     }
 
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
-    public override bool Equals(object obj)
-    {
-        return obj is FolderNode<T> node &&
-               FullName == node.FullName;
-    }
+    public override bool Equals(object obj) =>
+        obj is FolderNode<T> node &&
+        FullName == node.FullName;
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(FullName);
-    }
+    public override int GetHashCode() => HashCode.Combine(FullName);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Governance/GovernanceDocument.cs b/Rdmp.Core/Curation/Data/Governance/GovernanceDocument.cs
index 821840e303..67fcd8415b 100644
--- a/Rdmp.Core/Curation/Data/Governance/GovernanceDocument.cs
+++ b/Rdmp.Core/Curation/Data/Governance/GovernanceDocument.cs
@@ -22,7 +22,7 @@ namespace Rdmp.Core.Curation.Data.Governance;
 /// datasets for a given period of time.  Also includes a name (which should really match the file name) and a description which should be a plain summary of what is in the document
 /// such that lay users can appreciate what the document contains/means for the system.
 /// </summary>
-public class GovernanceDocument : DatabaseEntity,INamed
+public class GovernanceDocument : DatabaseEntity, INamed
 {
     #region Database Properties
 
@@ -37,7 +37,7 @@ public class GovernanceDocument : DatabaseEntity,INamed
     public int GovernancePeriod_ID
     {
         get => _governancePeriodID;
-        private set => SetField(ref  _governancePeriodID, value);
+        private set => SetField(ref _governancePeriodID, value);
     } //every document belongs to only one period of governance knoweldge (via fk relationship)
 
     /// <inheritdoc/>
@@ -45,7 +45,7 @@ public int GovernancePeriod_ID
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -54,7 +54,7 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -64,14 +64,13 @@ public string Description
     public string URL
     {
         get => _url;
-        set => SetField(ref  _url, value);
+        set => SetField(ref _url, value);
     }
 
     #endregion
 
     public GovernanceDocument()
     {
-
     }
 
     /// <summary>
@@ -82,11 +81,11 @@ public GovernanceDocument()
     /// <param name="file"></param>
     public GovernanceDocument(ICatalogueRepository repository, GovernancePeriod parent, FileInfo file)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"GovernancePeriod_ID", parent.ID},
-            {"URL", file.FullName},
-            {"Name", file.Name}
+            { "GovernancePeriod_ID", parent.ID },
+            { "URL", file.FullName },
+            { "Name", file.Name }
         });
     }
 
@@ -105,10 +104,7 @@ internal GovernanceDocument(ICatalogueRepository repository, DbDataReader r)
 
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Checks that the file exists
@@ -116,7 +112,6 @@ public override string ToString()
     /// <param name="notifier"></param>
     public void Check(ICheckNotifier notifier)
     {
-
         try
         {
             var fileInfo = new FileInfo(URL);
@@ -124,17 +119,20 @@ public void Check(ICheckNotifier notifier)
             if (fileInfo.Exists)
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Found intact attachment file {fileInfo} with length {UsefulStuff.GetHumanReadableByteSize(fileInfo.Length)}", CheckResult.Success));
+                        $"Found intact attachment file {fileInfo} with length {UsefulStuff.GetHumanReadableByteSize(fileInfo.Length)}",
+                        CheckResult.Success));
             else
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"File {fileInfo.FullName} does not exist (for GovernanceDocument '{this}' (ID={ID})", CheckResult.Fail));
+                        $"File {fileInfo.FullName} does not exist (for GovernanceDocument '{this}' (ID={ID})",
+                        CheckResult.Fail));
         }
         catch (Exception ex)
         {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Failed to check for existance of the file described by GovernanceDocument '{this}' (ID={ID})", CheckResult.Fail,ex));
+                    $"Failed to check for existance of the file described by GovernanceDocument '{this}' (ID={ID})",
+                    CheckResult.Fail, ex));
         }
     }
 
@@ -142,8 +140,5 @@ public void Check(ICheckNotifier notifier)
     /// Returns the name of the file (See also <see cref="URL"/>)
     /// </summary>
     /// <returns></returns>
-    public string GetFilenameOnly()
-    {
-        return Path.GetFileName(URL);
-    }
+    public string GetFilenameOnly() => Path.GetFileName(URL);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Governance/GovernancePeriod.cs b/Rdmp.Core/Curation/Data/Governance/GovernancePeriod.cs
index 202a29962f..955492b768 100644
--- a/Rdmp.Core/Curation/Data/Governance/GovernancePeriod.cs
+++ b/Rdmp.Core/Curation/Data/Governance/GovernancePeriod.cs
@@ -29,18 +29,18 @@ namespace Rdmp.Core.Curation.Data.Governance;
 /// <para>The correct usage of GovernancePeriods is to never delete them e.g. your dataset MyDataset1 would have Governacne 2001-2002 (with attachment
 /// letters of approval) and another one for 2003-2004 and another from 2005 onwards etc.</para>
 /// </summary>
-public class GovernancePeriod : DatabaseEntity, ICheckable,INamed
+public class GovernancePeriod : DatabaseEntity, ICheckable, INamed
 {
     private IGovernanceManager _manager;
 
     #region Database Properties
-        
+
     private DateTime _startDate;
     private DateTime? _endDate;
     private string _name;
     private string _description;
     private string _ticket;
-        
+
 
     /// <summary>
     /// When did the governance come into effect (in realtime not dataset time)
@@ -48,7 +48,7 @@ public class GovernancePeriod : DatabaseEntity, ICheckable,INamed
     public DateTime StartDate
     {
         get => _startDate;
-        set => SetField(ref  _startDate, value);
+        set => SetField(ref _startDate, value);
     }
 
     /// <summary>
@@ -57,7 +57,7 @@ public DateTime StartDate
     public DateTime? EndDate
     {
         get => _endDate;
-        set => SetField(ref  _endDate, value);
+        set => SetField(ref _endDate, value);
     }
 
     /// <inheritdoc/>
@@ -66,7 +66,7 @@ public DateTime? EndDate
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -75,7 +75,7 @@ public string Name
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <summary>
@@ -84,7 +84,7 @@ public string Description
     public string Ticket
     {
         get => _ticket;
-        set => SetField(ref  _ticket, value);
+        set => SetField(ref _ticket, value);
     }
 
     #endregion
@@ -96,7 +96,8 @@ public string Ticket
     /// <see cref="GovernancePeriod"/>
     /// </summary>
     [NoMappingToDatabase]
-    public IEnumerable<GovernanceDocument> GovernanceDocuments => Repository.GetAllObjectsWithParent<GovernanceDocument>(this);
+    public IEnumerable<GovernanceDocument> GovernanceDocuments =>
+        Repository.GetAllObjectsWithParent<GovernanceDocument>(this);
 
     /// <summary>
     /// All datasets to which this governance grants permission to hold
@@ -108,7 +109,6 @@ public string Ticket
 
     public GovernancePeriod()
     {
-
     }
 
     /// <summary>
@@ -120,8 +120,8 @@ public GovernancePeriod(ICatalogueRepository repository, string name = null)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name ?? $"GovernancePeriod{Guid.NewGuid()}" },
-            {"StartDate",DateTime.Now.Date}
+            { "Name", name ?? $"GovernancePeriod{Guid.NewGuid()}" },
+            { "StartDate", DateTime.Now.Date }
         });
 
         _manager = CatalogueRepository.GovernanceManager;
@@ -138,16 +138,13 @@ internal GovernancePeriod(ICatalogueRepository repository, DbDataReader r)
         Ticket = r["Ticket"] as string;
         EndDate = ObjectToNullableDateTime(r["EndDate"]);
         Description = r["Description"] as string;
-            
+
         _manager = CatalogueRepository.GovernanceManager;
     }
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
-        
+    public override string ToString() => Name;
+
     /// <summary>
     /// Checks that the governance has not expired before it began etc
     /// </summary>
@@ -155,17 +152,19 @@ public override string ToString()
     public void Check(ICheckNotifier notifier)
     {
         if (EndDate == null)
-            notifier.OnCheckPerformed(new CheckEventArgs($"There is no end date for GovernancePeriod {Name}",CheckResult.Warning));
-        else
-        if (EndDate <= StartDate)
-            notifier.OnCheckPerformed(new CheckEventArgs($"GovernancePeriod {Name} expires before it begins!", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs($"There is no end date for GovernancePeriod {Name}",
+                CheckResult.Warning));
+        else if (EndDate <= StartDate)
+            notifier.OnCheckPerformed(new CheckEventArgs($"GovernancePeriod {Name} expires before it begins!",
+                CheckResult.Fail));
         else
-            notifier.OnCheckPerformed(new CheckEventArgs($"GovernancePeriod {Name} expiry date is after the start date", CheckResult.Success));
-            
+            notifier.OnCheckPerformed(new CheckEventArgs($"GovernancePeriod {Name} expiry date is after the start date",
+                CheckResult.Success));
+
         foreach (var doc in GovernanceDocuments)
             doc.Check(notifier);
     }
-        
+
     /// <summary>
     /// Marks the given <see cref="Catalogue"/> as no longer requiring governance approval from this <see cref="GovernancePeriod"/>.
     /// </summary>
@@ -199,5 +198,4 @@ public bool IsExpired()
 
         return DateTime.Now.Date > EndDate.Value.Date;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/IAggregateTopX.cs b/Rdmp.Core/Curation/Data/IAggregateTopX.cs
index 84208475fc..a526ae9ebc 100644
--- a/Rdmp.Core/Curation/Data/IAggregateTopX.cs
+++ b/Rdmp.Core/Curation/Data/IAggregateTopX.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Curation.Data;
 /// <summary>
 /// See AggregateTopX
 /// </summary>
-public interface IAggregateTopX:IMapsDirectlyToDatabaseTable
+public interface IAggregateTopX : IMapsDirectlyToDatabaseTable
 {
     /// <summary>
     /// The number of records to return from the TopX e.g. Top 10
@@ -29,5 +29,4 @@ public interface IAggregateTopX:IMapsDirectlyToDatabaseTable
     /// count / sum etc is highest.
     /// </summary>
     AggregateTopXOrderByDirection OrderByDirection { get; }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ICatalogue.cs b/Rdmp.Core/Curation/Data/ICatalogue.cs
index 2922e84f8a..2c72290794 100644
--- a/Rdmp.Core/Curation/Data/ICatalogue.cs
+++ b/Rdmp.Core/Curation/Data/ICatalogue.cs
@@ -33,18 +33,18 @@ namespace Rdmp.Core.Curation.Data;
 /// <para>Catalogues are always flat views although they can be built from multiple relational data tables underneath.</para>
 /// 
 /// </summary>
-public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper,INamed, IMightBeDeprecated, IInjectKnown, ICheckable, IHasFolder
+public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper, INamed, IMightBeDeprecated, IInjectKnown,
+    ICheckable, IHasFolder
 {
-
     /// <summary>
     /// Returns where the object exists (e.g. database) as <see cref="ICatalogueRepository"/> or null if the object does not exist in a catalogue repository.
     /// </summary>
-    ICatalogueRepository CatalogueRepository {get; }
+    ICatalogueRepository CatalogueRepository { get; }
 
     /// <summary>
     /// The load configuration (if any) which is used to load data into the Catalogue tables.  A single <see cref="LoadMetadata"/> can load multiple Catalogues.
     /// </summary>
-    int? LoadMetadata_ID { get; set;}
+    int? LoadMetadata_ID { get; set; }
 
     /// <summary>
     /// Name of a task in the logging database which should be used for documenting the loading of this Catalogue. 
@@ -88,32 +88,32 @@ public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper,INamed, IM
     /// datasets for cohort generation / extraction but don't want them to clog up your user interface.
     /// </summary>
     bool IsColdStorageDataset { get; set; }
-        
-        
+
+
     /// <summary>
     /// User specified free text field.  Not used for anything by RDMP.
     /// <seealso cref="Periodicity"/>
     /// </summary>
-    string Time_coverage {get;set;}
-        
+    string Time_coverage { get; set; }
+
     /// <summary>
     /// User specified period on how regularly the dataset is updated.  This does not have any technical bearing on how often it is loaded
     /// and might be an outright lie.
     /// </summary>
-    Catalogue.CataloguePeriodicity Periodicity{get;set;}
+    Catalogue.CataloguePeriodicity Periodicity { get; set; }
 
     /// <summary>
     /// Human readable description provided by the RDMP user that describes what the dataset contains.  
     /// <para>This can be multiple paragraphs.</para>
     /// </summary>
-    string Description {get;set;}
+    string Description { get; set; }
 
     /// <summary>
     /// The alledged user specified date at which data began being collected.  For a more accurate answer you should run the DQE (See also DatasetTimespanCalculator)
     /// <para>This field is optional</para>
     /// </summary>
     DateTime? DatasetStartDate { get; set; }
-        
+
     /// <inheritdoc cref="TimeCoverage_ExtractionInformation_ID"/>
     ExtractionInformation TimeCoverage_ExtractionInformation { get; }
 
@@ -169,7 +169,8 @@ public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper,INamed, IM
     /// <remarks>
     /// <para>High performance overload where you have a <see cref="ICoreChildProvider"/></para>
     /// </remarks>
-    void GetTableInfos(ICoreChildProvider provider, out List<ITableInfo> normalTables, out List<ITableInfo> lookupTables);
+    void GetTableInfos(ICoreChildProvider provider, out List<ITableInfo> normalTables,
+        out List<ITableInfo> lookupTables);
 
     /// <summary>
     /// Returns the unique <see cref="DiscoveredServer"/> from which to access connect to in order to run queries generated from the <see cref="Catalogue"/>.  This is 
@@ -180,7 +181,8 @@ public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper,INamed, IM
     /// <param name="setInitialDatabase">True to require all tables be in the same database.  False will just connect to master / unspecified database</param>
     /// <param name="distinctAccessPoint"></param>
     /// <returns></returns>
-    DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase, out IDataAccessPoint distinctAccessPoint);
+    DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase,
+        out IDataAccessPoint distinctAccessPoint);
 
     /// <inheritdoc cref="GetDistinctLiveDatabaseServer(DataAccessContext,bool,out IDataAccessPoint)"/>
     DiscoveredServer GetDistinctLiveDatabaseServer(DataAccessContext context, bool setInitialDatabase);
@@ -242,7 +244,7 @@ public interface ICatalogue : IHasDependencies, IHasQuerySyntaxHelper,INamed, IM
     /// <returns></returns>
     CatalogueExtractabilityStatus GetExtractabilityStatus(IDataExportRepository dataExportRepository);
 
-        
+
     /// <summary>
     /// Provides a new instance of the object (in the database).  Properties will be copied from this object (child objects will not be created).
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/IContainer.cs b/Rdmp.Core/Curation/Data/IContainer.cs
index 14e464ee88..ade21fc092 100644
--- a/Rdmp.Core/Curation/Data/IContainer.cs
+++ b/Rdmp.Core/Curation/Data/IContainer.cs
@@ -34,9 +34,8 @@ public enum FilterContainerOperation
 /// ('result is clinically significant').  Each subcontainer / IFilter are seperated with the Operation (See FilterContainerOperation) when building SQL
 /// (See SqlQueryBuilderHelper).
 /// </summary>
-public interface IContainer: IRevertable,IMightBeReadOnly
+public interface IContainer : IRevertable, IMightBeReadOnly
 {
-
     /// <summary>
     /// Defines the boolean operation (AND / OR) to separate contained lines of WHERE Sql (See <see cref="IFilter"/>).  If the container has only one IFilter
     /// then no operation is used, if there are 2+ then the resultant SQL built will be each filter's WhereSQL separated by the AND/OR.  This also applies to 
@@ -122,7 +121,7 @@ public interface IContainer: IRevertable,IMightBeReadOnly
     /// </summary>
     /// <returns></returns>
     IContainer DeepCloneEntireTreeRecursivelyIncludingFilters();
-        
+
     /// <summary>
     /// Returns a filter factory of the appropriate Type to create filters and subcontainers in this container
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/IExternalDatabaseServer.cs b/Rdmp.Core/Curation/Data/IExternalDatabaseServer.cs
index 6977c873b8..f3c160506f 100644
--- a/Rdmp.Core/Curation/Data/IExternalDatabaseServer.cs
+++ b/Rdmp.Core/Curation/Data/IExternalDatabaseServer.cs
@@ -41,5 +41,4 @@ public interface IExternalDatabaseServer : IDataAccessPoint, INamed
     /// <param name="context"></param>
     /// <returns></returns>
     DiscoveredDatabase Discover(DataAccessContext context);
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/IExtractionResults.cs b/Rdmp.Core/Curation/Data/IExtractionResults.cs
index 30743e1e67..4fe72fcc7d 100644
--- a/Rdmp.Core/Curation/Data/IExtractionResults.cs
+++ b/Rdmp.Core/Curation/Data/IExtractionResults.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Curation.Data;
 /// Record of a single component extracted as part of an <see cref="IExtractionConfiguration"/>.  This could be an anonymised dataset or bundled supporting
 /// documents e.g. Lookups , pdfs etc.  This audit is used to perform release process (where all extracted artifacts are collected and sent somewhere).
 /// </summary>
-public interface IExtractionResults : IReferenceOtherObject,IMapsDirectlyToDatabaseTable, ISaveable
+public interface IExtractionResults : IReferenceOtherObject, IMapsDirectlyToDatabaseTable, ISaveable
 {
     /// <summary>
     /// Description of the file path, database table name etc of the extracted artifact.  This must make sense to the pipeline
@@ -67,5 +67,6 @@ public interface IExtractionResults : IReferenceOtherObject,IMapsDirectlyToDatab
     /// <param name="recordsExtracted">Total number of records in the dataset extracted</param>
     /// <param name="isBatchResume">True if the <paramref name="recordsExtracted"/> is a subset of those already extracted</param>
     /// <param name="failed">True if the extraction pipeline execution failed otherwise false</param>
-    void CompleteAudit(Type destinationType, string destinationDescription, int recordsExtracted, bool isBatchResume, bool failed);
+    void CompleteAudit(Type destinationType, string destinationDescription, int recordsExtracted, bool isBatchResume,
+        bool failed);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/IFilter.cs b/Rdmp.Core/Curation/Data/IFilter.cs
index 917af5d303..d52202d327 100644
--- a/Rdmp.Core/Curation/Data/IFilter.cs
+++ b/Rdmp.Core/Curation/Data/IFilter.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.Curation.Data;
 /// A line of WHERE sql which can be combined in IContainers.  IFilters can be either ConcreteFilter (there is persisted user defined database object that makes 
 /// up the IFilter) or SpontaneouslyInventedFilter.
 /// </summary>
-public interface IFilter : ICollectSqlParameters, INamed,IHasQuerySyntaxHelper,ICheckable, IMightBeReadOnly
+public interface IFilter : ICollectSqlParameters, INamed, IHasQuerySyntaxHelper, ICheckable, IMightBeReadOnly
 {
     /// <summary>
     /// Single line of WHERE Sql for use in query generation.  Does not include the WHERE keyword.
@@ -29,7 +29,7 @@ public interface IFilter : ICollectSqlParameters, INamed,IHasQuerySyntaxHelper,I
     /// Human readable description of what the WHERE logic is supposed to achieve (e.g. Tayside records only)
     /// </summary>
     string Description { get; set; }
-        
+
     /// <summary>
     /// True if the <see cref="IFilter"/> should always be used with the <see cref="Catalogue"/> it is associated with if any (See <see cref="GetCatalogue"/>).
     /// 
@@ -54,7 +54,7 @@ public interface IFilter : ICollectSqlParameters, INamed,IHasQuerySyntaxHelper,I
 
     /// <inheritdoc cref="FilterContainer_ID"/>
     [NoMappingToDatabase]
-    IContainer FilterContainer { get;}
+    IContainer FilterContainer { get; }
 
     /// <summary>
     /// Fetches the underlying <see cref="ColumnInfo"/> for the column (e.g. <see cref="CatalogueItem"/>) which this <see cref="IFilter"/> is ultimately associated with).
@@ -77,5 +77,4 @@ public interface IFilter : ICollectSqlParameters, INamed,IHasQuerySyntaxHelper,I
     /// </summary>
     /// <returns></returns>
     Catalogue GetCatalogue();
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/IJoin.cs b/Rdmp.Core/Curation/Data/IJoin.cs
index b5b26170d0..df16a601a9 100644
--- a/Rdmp.Core/Curation/Data/IJoin.cs
+++ b/Rdmp.Core/Curation/Data/IJoin.cs
@@ -36,7 +36,7 @@ public interface IJoin
     /// Which SQL join keyword to use when linking the <see cref="PrimaryKey"/> and <see cref="ForeignKey"/>.
     /// </summary>
     ExtractionJoinType ExtractionJoinType { get; }
-        
+
     /// <summary>
     /// If it is nessesary to join on more than one column, use this method to indicate the aditional fk / pk pairs (they must belong to the same TableInfos as the 
     /// main IJoin)
diff --git a/Rdmp.Core/Curation/Data/ILoadProgress.cs b/Rdmp.Core/Curation/Data/ILoadProgress.cs
index 5203cc21a5..d35a484d4a 100644
--- a/Rdmp.Core/Curation/Data/ILoadProgress.cs
+++ b/Rdmp.Core/Curation/Data/ILoadProgress.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Curation.Data;
 /// Describes the progress of a large iterative load which cannot be completed in a single batch.  Includes start and end dates for what is trying to
 /// be loaded as well as how far through that process progress has been made up to date.
 /// </summary>
-public interface ILoadProgress :INamed, ICheckable
+public interface ILoadProgress : INamed, ICheckable
 {
     /// <summary>
     /// The date the dataset starts at, this is in dataset time e.g. if you have prescribing records held from 2001-01-01 to present then the <see cref="OriginDate"/> is 2001-01-01
@@ -44,13 +44,13 @@ public interface ILoadProgress :INamed, ICheckable
     /// </summary>
     ICacheProgress CacheProgress { get; }
 
-        
+
     /// <summary>
     /// Do not use, is not respected
     /// </summary>
     [Obsolete("Not respected")]
     bool IsDisabled { get; set; }
-        
+
     /// <summary>
     /// The number of days to load each time the DLE is run with the <see cref="ILoadProgress"/>
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/IProjectCohortIdentificationConfigurationAssociation.cs b/Rdmp.Core/Curation/Data/IProjectCohortIdentificationConfigurationAssociation.cs
index 06b0ed5822..79fdb0f3a4 100644
--- a/Rdmp.Core/Curation/Data/IProjectCohortIdentificationConfigurationAssociation.cs
+++ b/Rdmp.Core/Curation/Data/IProjectCohortIdentificationConfigurationAssociation.cs
@@ -15,7 +15,8 @@ namespace Rdmp.Core.Curation.Data;
 /// associated configurations in a given project (e.g. cases, controls, time based etc).  You can also associate the same configuration with multiple Projects if
 /// you need to.
 /// </summary>
-public interface IProjectCohortIdentificationConfigurationAssociation : IMapsDirectlyToDatabaseTable,IMasqueradeAs, IDeletableWithCustomMessage, IMightBeReadOnly
+public interface IProjectCohortIdentificationConfigurationAssociation : IMapsDirectlyToDatabaseTable, IMasqueradeAs,
+    IDeletableWithCustomMessage, IMightBeReadOnly
 {
     /// <summary>
     /// The <see cref="IProject"/> to which the <see cref="CohortIdentificationConfiguration_ID"/> is associated with.
diff --git a/Rdmp.Core/Curation/Data/ISqlParameter.cs b/Rdmp.Core/Curation/Data/ISqlParameter.cs
index b54cb5ad85..72190d7243 100644
--- a/Rdmp.Core/Curation/Data/ISqlParameter.cs
+++ b/Rdmp.Core/Curation/Data/ISqlParameter.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.Curation.Data;
 /// Class for persisting the Comment, type and value of an Sql Parameter (e.g. /*mycool variable*/ DECLARE @bob as Varchar(10); Set @bob = 'fish').  RDMP supports 
 /// parameter overriding and merging duplicate parameters etc during query building (See ParameterManager).
 /// </summary>
-public interface ISqlParameter : ISaveable, IHasQuerySyntaxHelper,ICheckable
+public interface ISqlParameter : ISaveable, IHasQuerySyntaxHelper, ICheckable
 {
     /// <summary>
     /// The name only of the parameter e.g. @bob, this should be automatically calculated from the ParameterSQL to avoid any potential for mismatch
@@ -36,7 +36,7 @@ public interface ISqlParameter : ISaveable, IHasQuerySyntaxHelper,ICheckable
     /// </summary>
     [Sql]
     string Value { get; set; }
-        
+
     /// <summary>
     /// An optional description of what the parameter represents.  This will be included in SQL generated and will be wrapped in an SQL comment block.
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/ISupplementalExtractionResults.cs b/Rdmp.Core/Curation/Data/ISupplementalExtractionResults.cs
index 78d31563c4..2893afdf46 100644
--- a/Rdmp.Core/Curation/Data/ISupplementalExtractionResults.cs
+++ b/Rdmp.Core/Curation/Data/ISupplementalExtractionResults.cs
@@ -34,7 +34,7 @@ public interface ISupplementalExtractionResults : IExtractionResults, IReference
     /// by looking at whether <see cref="CumulativeExtractionResults_ID"/> or <see cref="ExtractionConfiguration_ID"/> is populated.
     /// </summary>
     bool IsGlobal { get; }
-        
+
     /// <summary>
     /// The Name of the object that was extracted (this is the logical name not the path e.g. "HelpDocs pdf file")
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/ISupplementalJoin.cs b/Rdmp.Core/Curation/Data/ISupplementalJoin.cs
index 67daf472da..1e234fa840 100644
--- a/Rdmp.Core/Curation/Data/ISupplementalJoin.cs
+++ b/Rdmp.Core/Curation/Data/ISupplementalJoin.cs
@@ -12,7 +12,6 @@ namespace Rdmp.Core.Curation.Data;
 /// </summary>
 public interface ISupplementalJoin
 {
-
     /// <inheritdoc cref="IJoin.ForeignKey"/>
     ColumnInfo ForeignKey { get; }
 
@@ -21,5 +20,4 @@ public interface ISupplementalJoin
 
     /// <inheritdoc cref="IJoin.Collation"/>
     string Collation { get; }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ITableInfo.cs b/Rdmp.Core/Curation/Data/ITableInfo.cs
index 4bc8a8722e..0c7cebe95e 100644
--- a/Rdmp.Core/Curation/Data/ITableInfo.cs
+++ b/Rdmp.Core/Curation/Data/ITableInfo.cs
@@ -31,14 +31,14 @@ public interface ITableInfo : IComparable, IHasRuntimeName, IDataAccessPoint, IH
     /// The Schema scope of the table (or blank if dbo / default / not supported by dbms).  This scope exists below Database and Above Table.  Not all database management
     /// engines support the concept of Schema (e.g. MySql).
     /// </summary>
-    string Schema { get; set;}
+    string Schema { get; set; }
 
     /// <summary>
     /// True if the table referenced is an sql server table valued function (which probably takes parameters)
     /// </summary>
-    bool IsTableValuedFunction { get; set;}
+    bool IsTableValuedFunction { get; set; }
+
 
-        
     /// <summary>
     /// <para>Indicates that this TableInfo should be the first table joined in any query that has multiple other TableInfos</para>
     /// 
@@ -46,7 +46,7 @@ public interface ITableInfo : IComparable, IHasRuntimeName, IDataAccessPoint, IH
     /// the tables.  If it cannot work out how to resolve the join order (e.g. if there are 3+ tables and joins going in both directions) then it will demand that one of the 
     /// <see cref="TableInfo"/> be picked as the first table from which all other tables should then be joined.</para>
     /// </summary>
-    bool IsPrimaryExtractionTable {get;set; }
+    bool IsPrimaryExtractionTable { get; set; }
 
     /// <summary>
     /// The server that stores <see cref="PreLoadDiscardedColumn"/> values which do not make it to LIVE during a data load e.g. because they contain identifiable data that
@@ -83,7 +83,7 @@ public interface ITableInfo : IComparable, IHasRuntimeName, IDataAccessPoint, IH
     /// </summary>
     [NoMappingToDatabase]
     PreLoadDiscardedColumn[] PreLoadDiscardedColumns { get; }
-        
+
     /// <summary>
     /// True if the <see cref="TableInfo"/> has <see cref="Lookup"/> relationships declared which make it a linkable lookup table in queries.
     /// </summary>
@@ -124,7 +124,7 @@ public interface ITableInfo : IComparable, IHasRuntimeName, IDataAccessPoint, IH
     /// <returns></returns>
     string GetFullyQualifiedName();
 
-        
+
     /// <summary>
     /// Returns <see cref="IDataAccessPoint.Database"/> trimmed of any database qualifiers (e.g. square brackets)
     /// </summary>
@@ -134,8 +134,8 @@ public interface ITableInfo : IComparable, IHasRuntimeName, IDataAccessPoint, IH
     /// <summary>
     /// True if the object referenced is a database view
     /// </summary>
-    bool IsView {get;set; }
-        
+    bool IsView { get; set; }
+
     /// <summary>
     /// The repository this object is stored in
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/ImportExport/ObjectExport.cs b/Rdmp.Core/Curation/Data/ImportExport/ObjectExport.cs
index 88a839a1f5..3eb531839f 100644
--- a/Rdmp.Core/Curation/Data/ImportExport/ObjectExport.cs
+++ b/Rdmp.Core/Curation/Data/ImportExport/ObjectExport.cs
@@ -24,7 +24,7 @@ public class ObjectExport : ReferenceOtherObjectDatabaseEntity, IInjectKnown<IMa
     #region Database Properties
 
     private string _sharingUID;
-        
+
     #endregion
 
     /// <summary>
@@ -36,7 +36,7 @@ public string SharingUID
         get => _sharingUID;
         set => SetField(ref _sharingUID, value);
     }
-        
+
     /// <inheritdoc cref="SharingUID"/>
     [NoMappingToDatabase]
     public Guid SharingUIDAsGuid => Guid.Parse(SharingUID);
@@ -56,11 +56,10 @@ internal ObjectExport(ICatalogueRepository repository, IMapsDirectlyToDatabaseTa
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",objectForSharing.ID},
-            {"ReferencedObjectType",objectForSharing.GetType().Name},
-            {"ReferencedObjectRepositoryType",objectForSharing.Repository.GetType().Name},
-            {"SharingUID",guid.ToString()}
-
+            { "ReferencedObjectID", objectForSharing.ID },
+            { "ReferencedObjectType", objectForSharing.GetType().Name },
+            { "ReferencedObjectRepositoryType", objectForSharing.Repository.GetType().Name },
+            { "SharingUID", guid.ToString() }
         });
 
         if (ID == 0 || Repository != repository)
@@ -82,12 +81,12 @@ public void InjectKnown(IMapsDirectlyToDatabaseTable instance)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return _knownReferenceTo != null ? $"E::{_knownReferenceTo.Value}" : $"E::{ReferencedObjectType}::{SharingUID}";
-    }
+    public override string ToString() => _knownReferenceTo != null
+        ? $"E::{_knownReferenceTo.Value}"
+        : $"E::{ReferencedObjectType}::{SharingUID}";
 
     private Lazy<IMapsDirectlyToDatabaseTable> _knownReferenceTo;
+
     public void ClearAllInjections()
     {
         _knownReferenceTo = null;
diff --git a/Rdmp.Core/Curation/Data/ImportExport/ObjectImport.cs b/Rdmp.Core/Curation/Data/ImportExport/ObjectImport.cs
index 8cf757c0e3..7dbddd3626 100644
--- a/Rdmp.Core/Curation/Data/ImportExport/ObjectImport.cs
+++ b/Rdmp.Core/Curation/Data/ImportExport/ObjectImport.cs
@@ -27,7 +27,7 @@ public class ObjectImport : ReferenceOtherObjectDatabaseEntity
     #region Database Properties
 
     private string _sharingUID;
-        
+
     #endregion
 
     /// <summary>
@@ -47,7 +47,6 @@ public string SharingUID
 
     public ObjectImport()
     {
-
     }
 
     /// <summary>
@@ -56,15 +55,14 @@ public ObjectImport()
     /// <param name="repository"></param>
     /// <param name="sharingUID"></param>
     /// <param name="localObject"></param>
-    internal ObjectImport(ICatalogueRepository repository, string sharingUID,IMapsDirectlyToDatabaseTable localObject)
+    internal ObjectImport(ICatalogueRepository repository, string sharingUID, IMapsDirectlyToDatabaseTable localObject)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectRepositoryType",localObject.Repository.GetType().Name},
-            {"ReferencedObjectType",localObject.GetType().Name},
-            {"ReferencedObjectID",localObject.ID},
-            {"SharingUID",sharingUID}
-                
+            { "ReferencedObjectRepositoryType", localObject.Repository.GetType().Name },
+            { "ReferencedObjectType", localObject.GetType().Name },
+            { "ReferencedObjectID", localObject.ID },
+            { "SharingUID", sharingUID }
         });
 
         if (ID == 0 || Repository != repository)
@@ -79,9 +77,5 @@ public ObjectImport(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"I::{ReferencedObjectType}::{SharingUID}";
-    }
-
+    public override string ToString() => $"I::{ReferencedObjectType}::{SharingUID}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ImportExport/ShareManager.cs b/Rdmp.Core/Curation/Data/ImportExport/ShareManager.cs
index 8b4d4dd0d5..2ed260cc17 100644
--- a/Rdmp.Core/Curation/Data/ImportExport/ShareManager.cs
+++ b/Rdmp.Core/Curation/Data/ImportExport/ShareManager.cs
@@ -32,6 +32,7 @@ public class ShareManager
     /// Tells the location of the platform databases to create objects/import references in
     /// </summary>
     public readonly IRDMPPlatformRepositoryServiceLocator RepositoryLocator;
+
     private readonly ICatalogueRepository _catalogueRepository;
 
     private const char PersistenceSeparator = '|';
@@ -47,19 +48,21 @@ public class ShareManager
     /// </summary>
     /// <param name="repositoryLocator"></param>
     /// <param name="localReferenceGetter"></param>
-    public ShareManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator, LocalReferenceGetterDelegate localReferenceGetter = null)
+    public ShareManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        LocalReferenceGetterDelegate localReferenceGetter = null)
     {
         RepositoryLocator = repositoryLocator;
         _catalogueRepository = repositoryLocator.CatalogueRepository;
         LocalReferenceGetter = localReferenceGetter ?? DefaultLocalReferenceGetter;
     }
 
-    private int? DefaultLocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipattribute, ShareDefinition sharedefinition)
+    private int? DefaultLocalReferenceGetter(PropertyInfo property, RelationshipAttribute relationshipattribute,
+        ShareDefinition sharedefinition)
     {
         var defaults = RepositoryLocator.CatalogueRepository;
 
 
-        if(property.Name == "LiveLoggingServer_ID" || property.Name == "TestLoggingServer_ID")
+        if (property.Name == "LiveLoggingServer_ID" || property.Name == "TestLoggingServer_ID")
         {
             var server = defaults.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
 
@@ -68,7 +71,6 @@ public ShareManager(IRDMPPlatformRepositoryServiceLocator repositoryLocator, Loc
 
         throw new SharingException(
             $"No default implementation exists for LocalReferenceGetterDelegate for property {property.Name}");
-
     }
 
     /// <summary>
@@ -104,9 +106,9 @@ public IMapsDirectlyToDatabaseTable GetObjectFromPersistenceString(string persis
         if (string.IsNullOrWhiteSpace(persistenceString))
             return null;
 
-        var elements = persistenceString.Split(new []{PersistenceSeparator},StringSplitOptions.None);
+        var elements = persistenceString.Split(new[] { PersistenceSeparator }, StringSplitOptions.None);
 
-        if(elements.Length < 4)
+        if (elements.Length < 4)
             throw new Exception($"Malformed persistenceString:{persistenceString}");
 
         //elements[0];//type name of the class we are fetching
@@ -115,7 +117,7 @@ public IMapsDirectlyToDatabaseTable GetObjectFromPersistenceString(string persis
         //elements[3]; // SharingUI if it has one
 
         //if it has a sharing UID
-        if(!string.IsNullOrWhiteSpace(elements[3]))
+        if (!string.IsNullOrWhiteSpace(elements[3]))
         {
             var localImport = GetExistingImport(elements[3]);
 
@@ -125,7 +127,8 @@ public IMapsDirectlyToDatabaseTable GetObjectFromPersistenceString(string persis
         }
 
         //otherwise get the existing master object
-        var o = RepositoryLocator.GetArbitraryDatabaseObject(elements[2], elements[0], int.Parse(elements[1])) ?? throw new Exception($"Could not find object for persistenceString:{persistenceString}");
+        var o = RepositoryLocator.GetArbitraryDatabaseObject(elements[2], elements[0], int.Parse(elements[1])) ??
+                throw new Exception($"Could not find object for persistenceString:{persistenceString}");
         return o;
     }
 
@@ -134,10 +137,8 @@ public IMapsDirectlyToDatabaseTable GetObjectFromPersistenceString(string persis
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    public bool IsExportedObject(IMapsDirectlyToDatabaseTable o)
-    {
-        return _catalogueRepository.GetReferencesTo<ObjectExport>(o).Any();
-    }
+    public bool IsExportedObject(IMapsDirectlyToDatabaseTable o) =>
+        _catalogueRepository.GetReferencesTo<ObjectExport>(o).Any();
 
 
     /// <summary>
@@ -145,10 +146,8 @@ public bool IsExportedObject(IMapsDirectlyToDatabaseTable o)
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    public bool IsImportedObject(IMapsDirectlyToDatabaseTable o)
-    {
-        return _catalogueRepository.GetReferencesTo<ObjectImport>(o).Any();
-    }
+    public bool IsImportedObject(IMapsDirectlyToDatabaseTable o) =>
+        _catalogueRepository.GetReferencesTo<ObjectImport>(o).Any();
 
     /// <summary>
     /// Returns true if an <see cref="ObjectImport"/> has been declared for the given shared object identified by its <paramref name="sharingUID"/>
@@ -172,17 +171,19 @@ public bool IsImported(string sharingUID)
     /// <returns></returns>
     public ObjectExport GetNewOrExistingExportFor(IMapsDirectlyToDatabaseTable o)
     {
-        var existingExport = _catalogueRepository.GetAllObjects<ObjectExport>().SingleOrDefault(e => e.IsReferenceTo(o));
+        var existingExport =
+            _catalogueRepository.GetAllObjects<ObjectExport>().SingleOrDefault(e => e.IsReferenceTo(o));
 
         if (existingExport != null)
             return existingExport;
 
-        var existingImport = _catalogueRepository.GetAllObjects<ObjectImport>().SingleOrDefault(e => e.IsReferenceTo(o));
+        var existingImport =
+            _catalogueRepository.GetAllObjects<ObjectImport>().SingleOrDefault(e => e.IsReferenceTo(o));
 
         if (existingImport != null)
             return new ObjectExport(_catalogueRepository, o, existingImport.SharingUIDAsGuid);
 
-        return new ObjectExport(_catalogueRepository, o,Guid.NewGuid());
+        return new ObjectExport(_catalogueRepository, o, Guid.NewGuid());
     }
 
 
@@ -200,10 +201,7 @@ public IMapsDirectlyToDatabaseTable GetExistingImportObject(string sharingUID)
     }
 
     /// <inheritdoc cref="GetExistingImportObject(string)"/>
-    public object GetExistingImportObject(Guid sharingGuid)
-    {
-        return GetExistingImportObject(sharingGuid.ToString());
-    }
+    public object GetExistingImportObject(Guid sharingGuid) => GetExistingImportObject(sharingGuid.ToString());
 
     /// <summary>
     /// Returns the local object which was exported under the given <paramref name="sharingUID"/> (or null if the object has never
@@ -219,10 +217,7 @@ public IMapsDirectlyToDatabaseTable GetExistingExportObject(string sharingUID)
     }
 
     /// <inheritdoc cref="GetExistingExportObject(string)"/>
-    public object GetExistingExportObject(Guid sharingGuid)
-    {
-        return GetExistingExportObject(sharingGuid.ToString());
-    }
+    public object GetExistingExportObject(Guid sharingGuid) => GetExistingExportObject(sharingGuid.ToString());
 
 
     /// <summary>
@@ -230,32 +225,22 @@ public object GetExistingExportObject(Guid sharingGuid)
     /// </summary>
     /// <param name="sharingUID"></param>
     /// <returns></returns>
-    public ObjectImport GetExistingImport(string sharingUID)
-    {
-        return _catalogueRepository.GetAllObjectsWhere<ObjectImport>("SharingUID", sharingUID).SingleOrDefault();
-    }
+    public ObjectImport GetExistingImport(string sharingUID) => _catalogueRepository
+        .GetAllObjectsWhere<ObjectImport>("SharingUID", sharingUID).SingleOrDefault();
 
     /// <inheritdoc cref="GetExistingImport(string)"/>
-    public ObjectImport GetExistingImport(Guid sharingUID)
-    {
-        return GetExistingImport(sharingUID.ToString());
-    }
+    public ObjectImport GetExistingImport(Guid sharingUID) => GetExistingImport(sharingUID.ToString());
 
     /// <summary>
     /// Returns a matching ObjectExport for the provided sharingUID or null if the UID has never been imported
     /// </summary>
     /// <param name="sharingUID"></param>
     /// <returns></returns>
-    public ObjectExport GetExistingExport(string sharingUID)
-    {
-        return _catalogueRepository.GetAllObjectsWhere<ObjectExport>("SharingUID", sharingUID).SingleOrDefault();
-    }
+    public ObjectExport GetExistingExport(string sharingUID) => _catalogueRepository
+        .GetAllObjectsWhere<ObjectExport>("SharingUID", sharingUID).SingleOrDefault();
 
     /// <inheritdoc cref="GetExistingExport(string)"/>
-    public ObjectExport GetExistingExport(Guid sharingUID)
-    {
-        return GetExistingExport(sharingUID.ToString());
-    }
+    public ObjectExport GetExistingExport(Guid sharingUID) => GetExistingExport(sharingUID.ToString());
 
     /// <summary>
     /// Marks the given local object <paramref name="o"/> as an imported instance of a shared object (identified by its <paramref name="sharingUID"/>)
@@ -263,19 +248,14 @@ public ObjectExport GetExistingExport(Guid sharingUID)
     /// <param name="sharingUID"></param>
     /// <param name="o"></param>
     /// <returns></returns>
-    public ObjectImport GetImportAs(string sharingUID, IMapsDirectlyToDatabaseTable o)
-    {
-        return GetExistingImport(sharingUID) ?? new ObjectImport(_catalogueRepository, sharingUID, o);
-    }
+    public ObjectImport GetImportAs(string sharingUID, IMapsDirectlyToDatabaseTable o) =>
+        GetExistingImport(sharingUID) ?? new ObjectImport(_catalogueRepository, sharingUID, o);
 
     /// <summary>
     /// Gets all import definitions (ObjectImport) defined in the Catalogue database
     /// </summary>
     /// <returns></returns>
-    public ObjectImport[] GetAllImports()
-    {
-        return _catalogueRepository.GetAllObjects<ObjectImport>();
-    }
+    public ObjectImport[] GetAllImports() => _catalogueRepository.GetAllObjects<ObjectImport>();
 
     /// <summary>
     /// Deletes all import definitions (ObjectImport) for which the referenced object (IMapsDirectlyToDatabaseTable) no longer exists (has been deleted)
@@ -293,7 +273,8 @@ public void DeleteAllOrphanImportDefinitions()
     /// <param name="sharedObjectsFile"></param>
     /// <param name="deleteExisting"></param>
     /// <returns></returns>
-    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(Stream sharedObjectsFile, bool deleteExisting = false)
+    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(Stream sharedObjectsFile,
+        bool deleteExisting = false)
     {
         var sr = new StreamReader(sharedObjectsFile);
         var text = sr.ReadToEnd();
@@ -307,7 +288,8 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(Stream share
     /// <param name="sharedObjectsFileText"></param>
     /// <param name="deleteExisting"></param>
     /// <returns></returns>
-    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(string sharedObjectsFileText, bool deleteExisting = false)
+    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(string sharedObjectsFileText,
+        bool deleteExisting = false)
     {
         var toImport = GetShareDefinitionList(sharedObjectsFileText);
 
@@ -319,20 +301,17 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(string share
     /// </summary>
     /// <param name="json"></param>
     /// <returns></returns>
-    public List<ShareDefinition> GetShareDefinitionList(string json)
-    {
-        return (List<ShareDefinition>)JsonConvertExtensions.DeserializeObject(json, typeof (List<ShareDefinition>), RepositoryLocator);
-    }
+    public List<ShareDefinition> GetShareDefinitionList(string json) =>
+        (List<ShareDefinition>)JsonConvertExtensions.DeserializeObject(json, typeof(List<ShareDefinition>),
+            RepositoryLocator);
 
     /// <summary>
     /// Imports a list of shared objects and creates local copies of the objects as well as marking them as <see cref="ObjectImport"/>s
     /// </summary>
     /// <param name="toImport"></param>
     /// <returns></returns>
-    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<ShareDefinition> toImport)
-    {
-        return ImportSharedObject(toImport, false);
-    }
+    public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<ShareDefinition> toImport) =>
+        ImportSharedObject(toImport, false);
 
     /// <summary>
     /// Imports a list of shared objects and creates local copies of the objects as well as marking them as <see cref="ObjectImport"/>s
@@ -340,12 +319,12 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<ShareDe
     /// <param name="toImport"></param>
     /// <param name="deleteExisting">Deletes the object if the object has already been imported previously (not a good idea).</param>
     /// <returns></returns>
-    internal IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<ShareDefinition> toImport, bool deleteExisting)
+    internal IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<ShareDefinition> toImport,
+        bool deleteExisting)
     {
         var created = new List<IMapsDirectlyToDatabaseTable>();
 
         foreach (var sd in toImport)
-        {
             try
             {
                 if (deleteExisting)
@@ -353,16 +332,17 @@ internal IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<Share
                     var actual = (IMapsDirectlyToDatabaseTable)GetExistingImportObject(sd.SharingGuid);
                     actual?.DeleteInDatabase();
                 }
+
                 var objectConstructor = new ObjectConstructor();
-                var instance = (IMapsDirectlyToDatabaseTable)ObjectConstructor.ConstructIfPossible(sd.Type, this, sd) ?? throw new ObjectLacksCompatibleConstructorException(
-                        $"Could not find a ShareManager constructor for '{sd.Type}'");
+                var instance = (IMapsDirectlyToDatabaseTable)ObjectConstructor.ConstructIfPossible(sd.Type, this, sd) ??
+                               throw new ObjectLacksCompatibleConstructorException(
+                                   $"Could not find a ShareManager constructor for '{sd.Type}'");
                 created.Add(instance);
             }
             catch (Exception e)
             {
                 throw new Exception($"Error constructing {sd.Type}", e);
             }
-        }
 
         return created;
     }
@@ -376,16 +356,17 @@ internal IEnumerable<IMapsDirectlyToDatabaseTable> ImportSharedObject(List<Share
     /// <param name="relationshipAttribute">The attribute that decorates the <paramref name="property"/> which indicates what type of object the parent is etc</param>
     /// <param name="shareDefinition">The serialization of the child you are trying to import</param>
     /// <returns></returns>
-    public int? GetLocalReference(PropertyInfo property, RelationshipAttribute relationshipAttribute, ShareDefinition shareDefinition)
+    public int? GetLocalReference(PropertyInfo property, RelationshipAttribute relationshipAttribute,
+        ShareDefinition shareDefinition)
     {
-        if(property.DeclaringType == null)
+        if (property.DeclaringType == null)
             throw new Exception($"DeclaringType on Property '{property}' is null");
 
         if (relationshipAttribute.Type != RelationshipType.LocalReference)
             throw new Exception(
                 $"Relationship was of Type {relationshipAttribute.Type} expected {RelationshipType.LocalReference}");
 
-        if(LocalReferenceGetter == null)
+        if (LocalReferenceGetter == null)
             throw new Exception(
                 string.Format("No LocalReferenceGetter has been set, cannot populate Property {0} {1}",
                     property.Name,
@@ -411,13 +392,13 @@ public static void ImportPropertiesOnly(IMapsDirectlyToDatabaseTable o, ShareDef
         //for each property that isn't [NoMappingToDatabase]
         foreach (var kvp in shareDefinition.GetDictionaryForImport())
         {
-            if(kvp.Key == "Name")
+            if (kvp.Key == "Name")
                 continue;
 
             var prop = o.GetType().GetProperty(kvp.Key);
 
             //If the property is a relationship e.g. _ID skip it
-            if(relationshipPropertyFinder.GetAttribute(prop) != null)
+            if (relationshipPropertyFinder.GetAttribute(prop) != null)
                 continue;
 
             //do we skip this property?
@@ -430,18 +411,21 @@ public static void ImportPropertiesOnly(IMapsDirectlyToDatabaseTable o, ShareDef
                     //is it currently not null? (if so skip)
                     var oldVal = prop.GetValue(o);
 
-                    if(!(oldVal == DBNull.Value || oldVal == null || string.IsNullOrWhiteSpace(oldVal.ToString())))
+                    if (!(oldVal == DBNull.Value || oldVal == null || string.IsNullOrWhiteSpace(oldVal.ToString())))
                         continue;
                 }
                 else
+                {
                     continue; //always skip
+                }
             }
 
-            SetValue(prop,kvp.Value,o);
+            SetValue(prop, kvp.Value, o);
         }
     }
 
-    public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) where T : class,IMapsDirectlyToDatabaseTable
+    public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition)
+        where T : class, IMapsDirectlyToDatabaseTable
     {
         IRepository repo;
 
@@ -460,7 +444,8 @@ public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) whe
 
         //If we have already got a local copy of this shared object?
         //either as an import or as an export
-        var actual = (T)GetExistingImportObject(shareDefinition.SharingGuid) ?? (T)GetExistingExportObject(shareDefinition.SharingGuid);
+        var actual = (T)GetExistingImportObject(shareDefinition.SharingGuid) ??
+                     (T)GetExistingExportObject(shareDefinition.SharingGuid);
 
         //we already have a copy imported of the shared object
         if (actual != null)
@@ -469,14 +454,12 @@ public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) whe
 
             //copy all the values out of the share definition / database copy
             foreach (var prop in TableRepository.GetPropertyInfos(typeof(T)))
-            {
                 //don't update any ID columns or any with relationships on UPDATE
                 if (propertiesDictionary.TryGetValue(prop.Name, out var value) && finder.GetAttribute(prop) == null)
                     SetValue(prop, value, toCreate);
                 else
-                    prop.SetValue(toCreate, prop.GetValue(actual)); //or use the database one if it isn't shared (e.g. ID, MyParent_ID etc)
-
-            }
+                    prop.SetValue(toCreate,
+                        prop.GetValue(actual)); //or use the database one if it isn't shared (e.g. ID, MyParent_ID etc)
 
             toCreate.Repository = actual.Repository;
 
@@ -494,7 +477,7 @@ public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) whe
 
                 //if it has a relationship attribute then we would expect the ShareDefinition to include a dependency relationship with the sharing UID of the parent
                 //and also that we had already imported it since dependencies must be imported in order
-                if(relationshipAttribute != null)
+                if (relationshipAttribute != null)
                 {
                     int? newValue;
 
@@ -506,15 +489,17 @@ public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) whe
                             //Confirm that the share definition includes the knowledge that there's a parent class to this object
                             if (!shareDefinition.RelationshipProperties.ContainsKey(relationshipAttribute))
                                 //if it doesn't but the field is optional, ignore it
-                                if(relationshipAttribute.Type == RelationshipType.OptionalSharedObject)
+                                if (relationshipAttribute.Type == RelationshipType.OptionalSharedObject)
                                 {
                                     newValue = null;
                                     break;
                                 }
                                 else
                                     //otherwise we are missing a required shared object being referenced. That's bad news.
+                                {
                                     throw new Exception(
                                         $"Share Definition for object of Type {typeof(T)} is missing an expected RelationshipProperty called {property.Name}");
+                                }
 
                             //Get the SharingUID of the parent for this property
                             var importGuidOfParent = shareDefinition.RelationshipProperties[relationshipAttribute];
@@ -547,12 +532,12 @@ public void UpsertAndHydrate<T>(T toCreate, ShareDefinition shareDefinition) whe
                     if (propertiesDictionary.ContainsKey(property.Name))
                         propertiesDictionary[property.Name] = newValue;
                     else
-                        propertiesDictionary.Add(property.Name,newValue);
+                        propertiesDictionary.Add(property.Name, newValue);
                 }
             }
 
             //insert the full dictionary into the database under the Type
-            repo.InsertAndHydrate(toCreate,propertiesDictionary);
+            repo.InsertAndHydrate(toCreate, propertiesDictionary);
 
             //document that a local import of the share now exists and should be updated/reused from now on when that same GUID comes in / gets used by child objects
             GetImportAs(shareDefinition.SharingGuid.ToString(), toCreate);
@@ -566,21 +551,22 @@ public static void SetValue(PropertyInfo prop, object value, IMapsDirectlyToData
         var propertyType = prop.PropertyType;
 
         //if it is a nullable int etc
-        if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition() == typeof (Nullable<>))
+        if (propertyType.IsGenericType && propertyType.GetGenericTypeDefinition() == typeof(Nullable<>))
             propertyType = propertyType.GetGenericArguments()[0]; //let's pretend it's just int / whatever
 
         if (value != null && value != DBNull.Value && !propertyType.IsInstanceOfType(value))
             if (propertyType == typeof(Uri))
-                value = value is string s ? new Uri(s):(Uri) value;
-            else
-            if (typeof(Enum).IsAssignableFrom(propertyType))
-                value = Enum.ToObject(propertyType, value);//if the property is an enum
+                value = value is string s ? new Uri(s) : (Uri)value;
+            else if (typeof(Enum).IsAssignableFrom(propertyType))
+                value = Enum.ToObject(propertyType, value); //if the property is an enum
             else
                 value = UsefulStuff.ChangeType(value, propertyType); //the property is not an enum
 
-        prop.SetValue(onObject, value); //if it's a shared property (most properties) use the new shared value being imported
+        prop.SetValue(onObject,
+            value); //if it's a shared property (most properties) use the new shared value being imported
     }
 }
 
 /// <inheritdoc cref="ShareManager.LocalReferenceGetter"/>
-public delegate int? LocalReferenceGetterDelegate(PropertyInfo property, RelationshipAttribute relationshipAttribute, ShareDefinition shareDefinition);
\ No newline at end of file
+public delegate int? LocalReferenceGetterDelegate(PropertyInfo property, RelationshipAttribute relationshipAttribute,
+    ShareDefinition shareDefinition);
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/ImportExport/SharingException.cs b/Rdmp.Core/Curation/Data/ImportExport/SharingException.cs
index fbe73a9f27..14f3d04e69 100644
--- a/Rdmp.Core/Curation/Data/ImportExport/SharingException.cs
+++ b/Rdmp.Core/Curation/Data/ImportExport/SharingException.cs
@@ -12,17 +12,15 @@ namespace Rdmp.Core.Curation.Data.ImportExport;
 /// <summary>
 /// Thrown when there are problems importing or exporting objects from RDMP (either in gathering dependencies or loading <see cref="ShareDefinition"/>
 /// </summary>
-public class SharingException:Exception
+public class SharingException : Exception
 {
     /// <inheritdoc/>
     public SharingException(string msg) : base(msg)
     {
-            
     }
 
     /// <inheritdoc/>
-    public SharingException(string msg, Exception ex):base(msg,ex)
+    public SharingException(string msg, Exception ex) : base(msg, ex)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/JoinInfo.cs b/Rdmp.Core/Curation/Data/JoinInfo.cs
index ba8dc7bda2..35f9d295ea 100644
--- a/Rdmp.Core/Curation/Data/JoinInfo.cs
+++ b/Rdmp.Core/Curation/Data/JoinInfo.cs
@@ -70,7 +70,7 @@ public enum ExtractionJoinType
 /// <para>'Combo Joins' (or ISupplementalJoin) are when you need to use multiple columns to do the join e.g. A Left Join B on A.x = B.x AND A.y = B.y.  You can define
 /// these by simply declaring additional JoinInfos for the other column pairings with the same ExtractionJoinType.</para>
 /// </summary>
-public class JoinInfo : DatabaseEntity, IJoin,IHasDependencies
+public class JoinInfo : DatabaseEntity, IJoin, IHasDependencies
 {
     #region Database Properties
 
@@ -83,28 +83,28 @@ public class JoinInfo : DatabaseEntity, IJoin,IHasDependencies
     public int ForeignKey_ID
     {
         get => _foreignKeyID;
-        set => SetField(ref _foreignKeyID , value);
+        set => SetField(ref _foreignKeyID, value);
     }
 
     /// <inheritdoc cref="IJoin.PrimaryKey"/>
     public int PrimaryKey_ID
     {
         get => _primaryKeyID;
-        set => SetField(ref _primaryKeyID , value);
+        set => SetField(ref _primaryKeyID, value);
     }
 
     /// <inheritdoc/>
     public string Collation
     {
         get => _collation;
-        set => SetField(ref _collation , value);
+        set => SetField(ref _collation, value);
     }
 
     /// <inheritdoc/>
     public ExtractionJoinType ExtractionJoinType
     {
         get => _extractionJoinType;
-        set => SetField(ref _extractionJoinType , value);
+        set => SetField(ref _extractionJoinType, value);
     }
 
     #endregion
@@ -117,6 +117,7 @@ public ExtractionJoinType ExtractionJoinType
     private List<JoinInfo> _queryTimeComboJoins = new();
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public ColumnInfo ForeignKey => _foreignKey ??= Repository.GetObjectByID<ColumnInfo>(ForeignKey_ID);
@@ -129,7 +130,6 @@ public ExtractionJoinType ExtractionJoinType
 
     public JoinInfo()
     {
-
     }
 
     /// <summary>
@@ -137,7 +137,7 @@ public JoinInfo()
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="r"></param>
-    internal JoinInfo(IRepository repository,DbDataReader r):base(repository,r)
+    internal JoinInfo(IRepository repository, DbDataReader r) : base(repository, r)
     {
         ForeignKey_ID = Convert.ToInt32(r["ForeignKey_ID"]);
         PrimaryKey_ID = Convert.ToInt32(r["PrimaryKey_ID"]);
@@ -154,7 +154,8 @@ internal JoinInfo(IRepository repository,DbDataReader r):base(repository,r)
     }
 
 
-    public JoinInfo(ICatalogueRepository repository, ColumnInfo foreignKey, ColumnInfo primaryKey, ExtractionJoinType type, string collation)
+    public JoinInfo(ICatalogueRepository repository, ColumnInfo foreignKey, ColumnInfo primaryKey,
+        ExtractionJoinType type, string collation)
     {
         if (foreignKey.ID == primaryKey.ID)
             throw new ArgumentException("Joink Key 1 and Join Key 2 cannot be the same");
@@ -162,21 +163,17 @@ public JoinInfo(ICatalogueRepository repository, ColumnInfo foreignKey, ColumnIn
         if (foreignKey.TableInfo_ID == primaryKey.TableInfo_ID)
             throw new ArgumentException("Joink Key 1 and Join Key 2 are from the same table, this is not cool");
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ForeignKey_ID",foreignKey.ID},
-            {"PrimaryKey_ID",primaryKey.ID},
-            {"ExtractionJoinType",type.ToString()},
-            {"Collation",collation}
+            { "ForeignKey_ID", foreignKey.ID },
+            { "PrimaryKey_ID", primaryKey.ID },
+            { "ExtractionJoinType", type.ToString() },
+            { "Collation", collation }
         });
-
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $" {ForeignKey.Name} = {PrimaryKey.Name}";
-    }
+    public override string ToString() => $" {ForeignKey.Name} = {PrimaryKey.Name}";
 
     /// <summary>
     /// Notifies the join that other columns also need to be joined at runtime (e.g. when you have 2+ column pairs all of
@@ -185,10 +182,10 @@ public override string ToString()
     /// <param name="availableJoin"></param>
     public void AddQueryBuildingTimeComboJoinDiscovery(JoinInfo availableJoin)
     {
-        if(availableJoin.Equals(this))
+        if (availableJoin.Equals(this))
             throw new Exception("A JoinInfo cannot add QueryTimeComboJoin to itself");
 
-        if(!_queryTimeComboJoins.Contains(availableJoin))
+        if (!_queryTimeComboJoins.Contains(availableJoin))
             _queryTimeComboJoins.Add(availableJoin);
     }
 
@@ -215,7 +212,7 @@ public ExtractionJoinType GetInvertedJoinType()
         };
     }
 
-    private class QueryTimeComboJoin :ISupplementalJoin
+    private class QueryTimeComboJoin : ISupplementalJoin
     {
         /// <inheritdoc cref="IJoin.ForeignKey"/>
         public ColumnInfo ForeignKey { get; set; }
@@ -246,18 +243,13 @@ public void SetKnownColumns(ColumnInfo primaryKey, ColumnInfo foreignKey)
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {PrimaryKey, ForeignKey};
+        return new[] { PrimaryKey, ForeignKey };
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Array.Empty<IHasDependencies>();
 
     /// <inheritdoc/>
-    public string GetCustomJoinSql()
-    {
-        return CatalogueRepository.GetExtendedProperties(ExtendedProperty.CustomJoinSql, this).FirstOrDefault()?.Value;
-    }
+    public string GetCustomJoinSql() => CatalogueRepository.GetExtendedProperties(ExtendedProperty.CustomJoinSql, this)
+        .FirstOrDefault()?.Value;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/LoadModuleAssembly.cs b/Rdmp.Core/Curation/Data/LoadModuleAssembly.cs
index dc4c1bb143..02d9cc813c 100644
--- a/Rdmp.Core/Curation/Data/LoadModuleAssembly.cs
+++ b/Rdmp.Core/Curation/Data/LoadModuleAssembly.cs
@@ -28,6 +28,7 @@ namespace Rdmp.Core.Curation.Data;
 public class LoadModuleAssembly : DatabaseEntity, IInjectKnown<Plugin>
 {
     #region Database Properties
+
     private byte[] _bin;
     private string _committer;
     private DateTime _uploadDate;
@@ -42,7 +43,7 @@ public class LoadModuleAssembly : DatabaseEntity, IInjectKnown<Plugin>
     public byte[] Bin
     {
         get => _bin;
-        set => SetField(ref _bin,value);
+        set => SetField(ref _bin, value);
     }
 
     /// <summary>
@@ -51,7 +52,7 @@ public byte[] Bin
     public string Committer
     {
         get => _committer;
-        set => SetField(ref _committer,value);
+        set => SetField(ref _committer, value);
     }
 
     /// <summary>
@@ -60,7 +61,7 @@ public string Committer
     public DateTime UploadDate
     {
         get => _uploadDate;
-        set => SetField(ref _uploadDate,value);
+        set => SetField(ref _uploadDate, value);
     }
 
     /// <summary>
@@ -70,7 +71,7 @@ public DateTime UploadDate
     public int Plugin_ID
     {
         get => _plugin_ID;
-        set => SetField(ref _plugin_ID,value);
+        set => SetField(ref _plugin_ID, value);
     }
 
     #endregion
@@ -101,7 +102,7 @@ public LoadModuleAssembly(ICatalogueRepository repository, FileInfo f, Plugin pl
         //so we can reference it in fetch requests to check for duplication (normally Repository is set during hydration by the repo)
         Repository = repository;
 
-        Repository.InsertAndHydrate(this,dictionaryParameters);
+        Repository.InsertAndHydrate(this, dictionaryParameters);
         ClearAllInjections();
     }
 
@@ -128,15 +129,16 @@ internal LoadModuleAssembly(ShareManager shareManager, ShareDefinition shareDefi
     /// <param name="downloadDirectory"></param>
     public string DownloadAssembly(DirectoryInfo downloadDirectory)
     {
-        var targetDirectory = downloadDirectory.FullName ?? throw new Exception("Could not get currently executing assembly directory");
+        var targetDirectory = downloadDirectory.FullName ??
+                              throw new Exception("Could not get currently executing assembly directory");
         if (!downloadDirectory.Exists)
             downloadDirectory.Create();
 
         var targetFile = Path.Combine(targetDirectory, Plugin.Name);
-            
+
         //file already exists
         if (File.Exists(targetFile))
-            if(AreEqual(File.ReadAllBytes(targetFile), Bin))
+            if (AreEqual(File.ReadAllBytes(targetFile), Bin))
                 return targetFile;
 
         var timeout = 5000;
@@ -163,16 +165,16 @@ public string DownloadAssembly(DirectoryInfo downloadDirectory)
 
     private static Dictionary<string, object> GetDictionaryParameters(FileInfo f, Plugin plugin)
     {
-        if(f.Extension != PackPluginRunner.PluginPackageSuffix)
+        if (f.Extension != PackPluginRunner.PluginPackageSuffix)
             throw new Exception($"Expected LoadModuleAssembly file to be a {PackPluginRunner.PluginPackageSuffix}");
 
         var allBytes = File.ReadAllBytes(f.FullName);
 
         var dictionaryParameters = new Dictionary<string, object>
         {
-            {"Bin",allBytes},
-            {"Committer",Environment.UserName},
-            {"Plugin_ID",plugin.ID}
+            { "Bin", allBytes },
+            { "Committer", Environment.UserName },
+            { "Plugin_ID", plugin.ID }
         };
 
         return dictionaryParameters;
@@ -192,10 +194,7 @@ public void InjectKnown(Plugin instance)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"LoadModuleAssembly_{ID}";
-    }
+    public override string ToString() => $"LoadModuleAssembly_{ID}";
 
     public void ClearAllInjections()
     {
diff --git a/Rdmp.Core/Curation/Data/LoadProgress.cs b/Rdmp.Core/Curation/Data/LoadProgress.cs
index 07c2cb31b4..1964518a33 100644
--- a/Rdmp.Core/Curation/Data/LoadProgress.cs
+++ b/Rdmp.Core/Curation/Data/LoadProgress.cs
@@ -22,6 +22,7 @@ namespace Rdmp.Core.Curation.Data;
 public class LoadProgress : DatabaseEntity, ILoadProgress, ICheckable
 {
     #region Database Properties
+
     private bool _isDisabled;
     private string _name;
     private DateTime? _originDate;
@@ -36,6 +37,7 @@ public bool IsDisabled
         get => _isDisabled;
         set => SetField(ref _isDisabled, value);
     }
+
     /// <inheritdoc/>
     [NotNull]
     [Unique]
@@ -44,6 +46,7 @@ public string Name
         get => _name;
         set => SetField(ref _name, value);
     }
+
     /// <inheritdoc/>
     public DateTime? OriginDate
     {
@@ -60,12 +63,14 @@ public string LoadPeriodicity
         get => _loadPeriodicity;
         set => SetField(ref _loadPeriodicity, value);
     }
+
     /// <inheritdoc/>
     public DateTime? DataLoadProgress
     {
         get => _dataLoadProgress;
         set => SetField(ref _dataLoadProgress, value);
     }
+
     /// <inheritdoc/>
     public int LoadMetadata_ID
     {
@@ -81,7 +86,9 @@ public int DefaultNumberOfDaysToLoadEachTime
     }
 
     #endregion
+
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public ILoadMetadata LoadMetadata => Repository.GetObjectByID<LoadMetadata>(LoadMetadata_ID);
@@ -94,17 +101,16 @@ public int DefaultNumberOfDaysToLoadEachTime
 
     public LoadProgress()
     {
-
     }
 
     /// <inheritdoc cref="ILoadProgress"/>
     public LoadProgress(ICatalogueRepository repository, LoadMetadata parent)
     {
-        repository.InsertAndHydrate(this,  
+        repository.InsertAndHydrate(this,
             new Dictionary<string, object>
             {
-                {"Name", Guid.NewGuid().ToString()},
-                {"LoadMetadata_ID", parent.ID}
+                { "Name", Guid.NewGuid().ToString() },
+                { "LoadMetadata_ID", parent.ID }
             });
     }
 
@@ -119,20 +125,18 @@ internal LoadProgress(ICatalogueRepository repository, DbDataReader r)
         IsDisabled = Convert.ToBoolean(r["IsDisabled"]);
         DefaultNumberOfDaysToLoadEachTime = Convert.ToInt32(r["DefaultNumberOfDaysToLoadEachTime"]);
     }
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{Name} ID={ID}";
-    }
+    public override string ToString() => $"{Name} ID={ID}";
 
     public void Check(ICheckNotifier notifier)
     {
-        if(OriginDate != null && OriginDate > DateTime.Now)
-            notifier.OnCheckPerformed(new CheckEventArgs($"OriginDate cannot be in the future ({Name})",CheckResult.Fail));
-
-        if(DataLoadProgress != null && DataLoadProgress > DateTime.Now)
-            notifier.OnCheckPerformed(new CheckEventArgs($"DataLoadProgress cannot be in the future ({Name})",CheckResult.Fail));
+        if (OriginDate != null && OriginDate > DateTime.Now)
+            notifier.OnCheckPerformed(new CheckEventArgs($"OriginDate cannot be in the future ({Name})",
+                CheckResult.Fail));
 
+        if (DataLoadProgress != null && DataLoadProgress > DateTime.Now)
+            notifier.OnCheckPerformed(new CheckEventArgs($"DataLoadProgress cannot be in the future ({Name})",
+                CheckResult.Fail));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Lookup.cs b/Rdmp.Core/Curation/Data/Lookup.cs
index f65fa5393c..9f59aca1f6 100644
--- a/Rdmp.Core/Curation/Data/Lookup.cs
+++ b/Rdmp.Core/Curation/Data/Lookup.cs
@@ -41,6 +41,7 @@ public class Lookup : DatabaseEntity, IJoin, IHasDependencies, ICheckable
 
 
     #region Database Properties
+
     private int _description_ID;
     private int _foreignKey_ID;
     private int _primaryKey_ID;
@@ -92,6 +93,7 @@ public ExtractionJoinType ExtractionJoinType
     #endregion
 
     #region Relationships
+
     /// <summary>
     /// These are dereferenced cached versions of the entities to which the _ID properties refer to, to change them change the _ID version
     /// </summary>
@@ -130,11 +132,11 @@ public ColumnInfo PrimaryKey
             return _primaryKey;
         }
     }
+
     #endregion
 
     public Lookup()
     {
-
     }
 
     /// <summary>
@@ -146,7 +148,8 @@ public Lookup()
     /// <param name="primaryKey">The lookup table column that contains the code e.g. z_DrugLookup.Code</param>
     /// <param name="type"></param>
     /// <param name="collation"></param>
-    public Lookup(ICatalogueRepository repository, ColumnInfo description, ColumnInfo foreignKey, ColumnInfo primaryKey, ExtractionJoinType type, string collation)
+    public Lookup(ICatalogueRepository repository, ColumnInfo description, ColumnInfo foreignKey, ColumnInfo primaryKey,
+        ExtractionJoinType type, string collation)
     {
         //do checks before it hits the database.
         if (foreignKey.ID == primaryKey.ID)
@@ -156,18 +159,19 @@ public Lookup(ICatalogueRepository repository, ColumnInfo description, ColumnInf
             throw new ArgumentException("Join Key 1 and Join Key 2 are from the same table, this is not cool");
 
         if (description.TableInfo_ID != primaryKey.TableInfo_ID)
-            throw new ArgumentException("Join Key 2 must be in the same table as the Description ColumnInfo (i.e. Primary Key)");
+            throw new ArgumentException(
+                "Join Key 2 must be in the same table as the Description ColumnInfo (i.e. Primary Key)");
 
-        if(description.ID == primaryKey.ID)
+        if (description.ID == primaryKey.ID)
             throw new ArgumentException("Description Column and PrimaryKey Column cannot be the same column!");
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Description_ID", description.ID},
-            {"ForeignKey_ID", foreignKey.ID},
-            {"PrimaryKey_ID", primaryKey.ID},
-            {"ExtractionJoinType", type.ToString()},
-            {"Collation", string.IsNullOrWhiteSpace(collation) ? DBNull.Value : (object)collation}
+            { "Description_ID", description.ID },
+            { "ForeignKey_ID", foreignKey.ID },
+            { "PrimaryKey_ID", primaryKey.ID },
+            { "ExtractionJoinType", type.ToString() },
+            { "Collation", string.IsNullOrWhiteSpace(collation) ? DBNull.Value : (object)collation }
         });
     }
 
@@ -190,12 +194,10 @@ internal Lookup(ICatalogueRepository repository, DbDataReader r)
 
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return ToStringCached();
-    }
+    public override string ToString() => ToStringCached();
 
     private string _cachedToString = null;
+
     private string ToStringCached()
     {
         return _cachedToString ??= $" {ForeignKey.Name} = {PrimaryKey.Name}";
@@ -208,20 +210,19 @@ private string ToStringCached()
     /// <param name="foreignKeyTable">The main dataset table</param>
     /// <param name="primaryKeyTable">The hypothesized lookup table</param>
     /// <returns>All lookup relationships, a given table could have 2+ of these e.g. SendingLocation and DischargeLocation could both reference z_Location lookup</returns>
-    public static Lookup[] GetAllLookupsBetweenTables(TableInfo foreignKeyTable,TableInfo primaryKeyTable)
+    public static Lookup[] GetAllLookupsBetweenTables(TableInfo foreignKeyTable, TableInfo primaryKeyTable)
     {
         var toReturn = new List<Lookup>();
 
-        if(foreignKeyTable.Equals(primaryKeyTable))
+        if (foreignKeyTable.Equals(primaryKeyTable))
             throw new NotSupportedException("Tables must be different");
 
-        if(!foreignKeyTable.Repository.Equals(primaryKeyTable.Repository))
+        if (!foreignKeyTable.Repository.Equals(primaryKeyTable.Repository))
             throw new NotSupportedException("TableInfos come from different repositories!");
 
-        var repo = (CatalogueRepository) foreignKeyTable.Repository;
+        var repo = (CatalogueRepository)foreignKeyTable.Repository;
         using (var con = repo.GetConnection())
         {
-
             using (var cmd = DatabaseCommandHelper.GetCommand(@"SELECT * FROM [Lookup] 
   WHERE 
   (SELECT TableInfo_ID FROM ColumnInfo where ID = PrimaryKey_ID) = @primaryKeyTableID
@@ -236,8 +237,10 @@ public static Lookup[] GetAllLookupsBetweenTables(TableInfo foreignKeyTable,Tabl
                 cmd.Parameters["@foreignKeyTableID"].Value = foreignKeyTable.ID;
 
                 using (var r = cmd.ExecuteReader())
+                {
                     while (r.Read())
                         toReturn.Add(new Lookup(repo, r));
+                }
             }
 
             return toReturn.ToArray();
@@ -250,14 +253,14 @@ public static Lookup[] GetAllLookupsBetweenTables(TableInfo foreignKeyTable,Tabl
     /// <param name="notifier"></param>
     public void Check(ICheckNotifier notifier)
     {
-            
         if (ForeignKey.TableInfo_ID == PrimaryKey.TableInfo_ID)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Foreign Key and Primary Key are from the same table for Lookup {ID}",CheckResult.Fail));
+                $"Foreign Key and Primary Key are from the same table for Lookup {ID}", CheckResult.Fail));
 
         if (Description.TableInfo_ID != PrimaryKey.TableInfo_ID)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Description Key and Primary Key are from different tables (Not allowed) in Lookup {ID}", CheckResult.Fail));
+                $"Description Key and Primary Key are from different tables (Not allowed) in Lookup {ID}",
+                CheckResult.Fail));
     }
 
     /// <inheritdoc/>
@@ -271,31 +274,28 @@ public override void SaveToDatabase()
             throw new ArgumentException("Join Key 1 and Join Key 2 are from the same table, this is not cool");
 
         if (Description.TableInfo_ID != PrimaryKey.TableInfo_ID)
-            throw new ArgumentException("Join Key 2 must be in the same table as the Description ColumnInfo (i.e. Primary Key)");
+            throw new ArgumentException(
+                "Join Key 2 must be in the same table as the Description ColumnInfo (i.e. Primary Key)");
 
         base.SaveToDatabase();
     }
 
     /// <inheritdoc/>
-    public IEnumerable<ISupplementalJoin> GetSupplementalJoins()
-    {
-        return Repository.GetAllObjectsWhere<LookupCompositeJoinInfo>("OriginalLookup_ID" , ID);
-    }
+    public IEnumerable<ISupplementalJoin> GetSupplementalJoins() =>
+        Repository.GetAllObjectsWhere<LookupCompositeJoinInfo>("OriginalLookup_ID", ID);
+
     /// <inheritdoc/>
-    public ExtractionJoinType GetInvertedJoinType()
-    {
-        throw new NotSupportedException("Lookup joins should never be inverted... can't see why you would want to do that... they are always LEFT joined ");
-    }
+    public ExtractionJoinType GetInvertedJoinType() => throw new NotSupportedException(
+        "Lookup joins should never be inverted... can't see why you would want to do that... they are always LEFT joined ");
+
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {Description, ForeignKey, PrimaryKey};
+        return new[] { Description, ForeignKey, PrimaryKey };
     }
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return null;
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => null;
 
     /// <summary>
     /// Tells the the <see cref="Lookup"/> what the objects are referenced by <see cref="PrimaryKey_ID"/>, <see cref="ForeignKey_ID"/> and
@@ -306,7 +306,7 @@ public IHasDependencies[] GetObjectsDependingOnThis()
     /// <param name="descriptionColumn"></param>
     public void SetKnownColumns(ColumnInfo primaryKey, ColumnInfo foreignKey, ColumnInfo descriptionColumn)
     {
-        if(PrimaryKey_ID != primaryKey.ID || ForeignKey_ID != foreignKey.ID || Description_ID != descriptionColumn.ID)
+        if (PrimaryKey_ID != primaryKey.ID || ForeignKey_ID != foreignKey.ID || Description_ID != descriptionColumn.ID)
             throw new Exception("Injected arguments did not match on ID");
 
         _primaryKey = primaryKey;
@@ -315,8 +315,6 @@ public void SetKnownColumns(ColumnInfo primaryKey, ColumnInfo foreignKey, Column
     }
 
     /// <inheritdoc/>
-    public string GetCustomJoinSql()
-    {
-        return CatalogueRepository.GetExtendedProperties(ExtendedProperty.CustomJoinSql,this).FirstOrDefault()?.Value;
-    }
+    public string GetCustomJoinSql() => CatalogueRepository.GetExtendedProperties(ExtendedProperty.CustomJoinSql, this)
+        .FirstOrDefault()?.Value;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/LookupCompositeJoinInfo.cs b/Rdmp.Core/Curation/Data/LookupCompositeJoinInfo.cs
index 46b0e16e54..b247807d78 100644
--- a/Rdmp.Core/Curation/Data/LookupCompositeJoinInfo.cs
+++ b/Rdmp.Core/Curation/Data/LookupCompositeJoinInfo.cs
@@ -21,6 +21,7 @@ namespace Rdmp.Core.Curation.Data;
 public class LookupCompositeJoinInfo : DatabaseEntity, ISupplementalJoin
 {
     #region Database Properties
+
     private int _originalLookup_ID;
     private int _foreignKey_ID;
     private int _primaryKey_ID;
@@ -41,6 +42,7 @@ public int ForeignKey_ID
         get => _foreignKey_ID;
         set => SetField(ref _foreignKey_ID, value);
     }
+
     /// <inheritdoc cref="IJoin.PrimaryKey"/>
     public int PrimaryKey_ID
     {
@@ -71,7 +73,6 @@ public string Collation
 
     public LookupCompositeJoinInfo()
     {
-
     }
 
     /// <inheritdoc cref="LookupCompositeJoinInfo"/>
@@ -84,12 +85,12 @@ public LookupCompositeJoinInfo(ICatalogueRepository repository, Lookup parent, C
         if (foreignKey.TableInfo_ID == primaryKey.TableInfo_ID)
             throw new ArgumentException("Join Key 1 and Join Key 2 are from the same table, this is not cool");
 
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"OriginalLookup_ID", parent.ID},
-            {"ForeignKey_ID", foreignKey.ID},
-            {"PrimaryKey_ID", primaryKey.ID},
-            {"Collation", string.IsNullOrWhiteSpace(collation) ? DBNull.Value : (object) collation}
+            { "OriginalLookup_ID", parent.ID },
+            { "ForeignKey_ID", foreignKey.ID },
+            { "PrimaryKey_ID", primaryKey.ID },
+            { "Collation", string.IsNullOrWhiteSpace(collation) ? DBNull.Value : (object)collation }
         });
     }
 
@@ -104,12 +105,10 @@ internal LookupCompositeJoinInfo(ICatalogueRepository repository, DbDataReader r
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return ToStringCached();
-    }
+    public override string ToString() => ToStringCached();
 
     private string _cachedToString = null;
+
     private string ToStringCached()
     {
         return _cachedToString ??= $"{ForeignKey.Name} = {PrimaryKey.Name}";
diff --git a/Rdmp.Core/Curation/Data/Memento.cs b/Rdmp.Core/Curation/Data/Memento.cs
index 913fc01406..91f40b3892 100644
--- a/Rdmp.Core/Curation/Data/Memento.cs
+++ b/Rdmp.Core/Curation/Data/Memento.cs
@@ -21,6 +21,7 @@ namespace Rdmp.Core.Curation.Data;
 public class Memento : ReferenceOtherObjectDatabaseEntity
 {
     #region Database Properties
+
     private string _beforeYaml;
     private string _afterYaml;
     private int _commit_ID;
@@ -31,34 +32,38 @@ public string BeforeYaml
         get => _beforeYaml;
         set => SetField(ref _beforeYaml, value);
     }
+
     public string AfterYaml
     {
         get => _afterYaml;
         set => SetField(ref _afterYaml, value);
     }
+
     public int Commit_ID
     {
         get => _commit_ID;
         set => SetField(ref _commit_ID, value);
     }
+
     public MementoType Type
     {
         get => _type;
         set => SetField(ref _type, value);
     }
+
     #endregion
 
     #region Relationships
-    [NoMappingToDatabase]
-    public Commit Commit => Repository.GetObjectByID<Commit>(Commit_ID);
+
+    [NoMappingToDatabase] public Commit Commit => Repository.GetObjectByID<Commit>(Commit_ID);
 
     #endregion
 
     public Memento()
     {
-
     }
-    public Memento(ICatalogueRepository repo,DbDataReader r) : base(repo, r)
+
+    public Memento(ICatalogueRepository repo, DbDataReader r) : base(repo, r)
     {
         BeforeYaml = r["BeforeYaml"].ToString();
         AfterYaml = r["AfterYaml"].ToString();
@@ -66,21 +71,20 @@ public Memento(ICatalogueRepository repo,DbDataReader r) : base(repo, r)
         Type = (MementoType)Enum.Parse<MementoType>(r["Type"].ToString());
     }
 
-    public Memento(ICatalogueRepository repository, Commit commit, MementoType type, IMapsDirectlyToDatabaseTable entity,string beforeYaml, string afterYaml)
+    public Memento(ICatalogueRepository repository, Commit commit, MementoType type,
+        IMapsDirectlyToDatabaseTable entity, string beforeYaml, string afterYaml)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",entity.ID},
-            {"ReferencedObjectType",entity.GetType().Name},
-            {"ReferencedObjectRepositoryType",entity.Repository.GetType().Name},
-            {"Commit_ID",commit.ID},
-            {"BeforeYaml",beforeYaml},
-            {"AfterYaml",afterYaml},
-            {"Type",type}
+            { "ReferencedObjectID", entity.ID },
+            { "ReferencedObjectType", entity.GetType().Name },
+            { "ReferencedObjectRepositoryType", entity.Repository.GetType().Name },
+            { "Commit_ID", commit.ID },
+            { "BeforeYaml", beforeYaml },
+            { "AfterYaml", afterYaml },
+            { "Type", type }
         });
     }
-    public override string ToString()
-    {
-        return $"{ReferencedObjectType}:{ReferencedObjectID}";
-    }
+
+    public override string ToString() => $"{ReferencedObjectType}:{ReferencedObjectID}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/MementoInProgress.cs b/Rdmp.Core/Curation/Data/MementoInProgress.cs
index 0058692b3c..2d3eedb711 100644
--- a/Rdmp.Core/Curation/Data/MementoInProgress.cs
+++ b/Rdmp.Core/Curation/Data/MementoInProgress.cs
@@ -35,10 +35,7 @@ public class MementoInProgress
     public MementoInProgress(IMapsDirectlyToDatabaseTable o, string oldYaml)
     {
         OldYaml = oldYaml;
-        foreach(var prop in TableRepository.GetPropertyInfos(o.GetType()))
-        {
-            _props.Add(prop, prop.GetValue(o, null));
-        }
+        foreach (var prop in TableRepository.GetPropertyInfos(o.GetType())) _props.Add(prop, prop.GetValue(o, null));
     }
 
     /// <summary>
@@ -49,24 +46,21 @@ public MementoInProgress(IMapsDirectlyToDatabaseTable o, string oldYaml)
     /// <returns></returns>
     public IEnumerable<PropertyInfo> GetDiffProperties(IMapsDirectlyToDatabaseTable currentState)
     {
-        foreach(var prop in _props)
+        foreach (var prop in _props)
         {
             var newState = prop.Key.GetValue(currentState, null);
 
             // if new state is not null
-            if(newState != null)
+            if (newState != null)
             {
                 // any change is a difference
-                if(!newState.Equals(prop.Value))
+                if (!newState.Equals(prop.Value))
                     yield return prop.Key;
             }
             else
             {
                 // value changed from null to not null
-                if(prop.Value != null)
-                {
-                    yield return prop.Key;
-                }
+                if (prop.Value != null) yield return prop.Key;
             }
         }
     }
diff --git a/Rdmp.Core/Curation/Data/PermissionWindow.cs b/Rdmp.Core/Curation/Data/PermissionWindow.cs
index 5a08c1b627..e429817c6a 100644
--- a/Rdmp.Core/Curation/Data/PermissionWindow.cs
+++ b/Rdmp.Core/Curation/Data/PermissionWindow.cs
@@ -26,34 +26,35 @@ public class PermissionWindow : DatabaseEntity, IPermissionWindow
     private string _name;
     private string _description;
     private bool _requiresSynchronousAccess;
-        
+
     /// <inheritdoc/>
     [NotNull]
     [Unique]
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <inheritdoc/>
     public bool RequiresSynchronousAccess
     {
         get => _requiresSynchronousAccess;
-        set => SetField(ref  _requiresSynchronousAccess, value);
+        set => SetField(ref _requiresSynchronousAccess, value);
     }
-        
+
     /// <summary>
     /// The serialized string of <see cref="PermissionWindowPeriods"/> which is written/read from the catalogue database
     /// </summary>
-    public string PermissionPeriodConfig {
+    public string PermissionPeriodConfig
+    {
         get => SerializePermissionWindowPeriods();
         set
         {
@@ -79,7 +80,7 @@ public string PermissionPeriodConfig {
 
     private string SerializePermissionWindowPeriods()
     {
-        var serializer = new XmlSerializer(typeof (List<PermissionWindowPeriod>));
+        var serializer = new XmlSerializer(typeof(List<PermissionWindowPeriod>));
         using var output = new StringWriter();
         serializer.Serialize(output, PermissionWindowPeriods);
         return output.ToString();
@@ -88,18 +89,19 @@ private string SerializePermissionWindowPeriods()
     private void DeserializePermissionWindowPeriods(string permissionPeriodConfig)
     {
         if (string.IsNullOrWhiteSpace(permissionPeriodConfig))
+        {
             PermissionWindowPeriods = new List<PermissionWindowPeriod>();
+        }
         else
         {
-            var deserializer = new XmlSerializer(typeof (List<PermissionWindowPeriod>));
-            PermissionWindowPeriods = deserializer.Deserialize(new StringReader(permissionPeriodConfig)) as List<PermissionWindowPeriod>;
+            var deserializer = new XmlSerializer(typeof(List<PermissionWindowPeriod>));
+            PermissionWindowPeriods =
+                deserializer.Deserialize(new StringReader(permissionPeriodConfig)) as List<PermissionWindowPeriod>;
         }
     }
+
     /// <inheritdoc/>
-    public bool WithinPermissionWindow()
-    {
-        return WithinPermissionWindow(DateTime.UtcNow);
-    }
+    public bool WithinPermissionWindow() => WithinPermissionWindow(DateTime.UtcNow);
 
     /// <inheritdoc/>
     public virtual bool WithinPermissionWindow(DateTime dateTimeUTC)
@@ -112,7 +114,6 @@ public virtual bool WithinPermissionWindow(DateTime dateTimeUTC)
 
     public PermissionWindow()
     {
-
     }
 
     /// <summary>
@@ -121,10 +122,10 @@ public PermissionWindow()
     /// <param name="repository"></param>
     public PermissionWindow(ICatalogueRepository repository)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"PermissionPeriodConfig", DBNull.Value},
-            {"Name", $"New PermissionWindow{Guid.NewGuid()}" }
+            { "PermissionPeriodConfig", DBNull.Value },
+            { "Name", $"New PermissionWindow{Guid.NewGuid()}" }
         });
     }
 
@@ -136,13 +137,10 @@ internal PermissionWindow(ICatalogueRepository repository, DbDataReader r)
         RequiresSynchronousAccess = Convert.ToBoolean(r["RequiresSynchronousAccess"]);
         PermissionPeriodConfig = r["PermissionPeriodConfig"].ToString();
     }
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{(string.IsNullOrWhiteSpace(Name) ? "Unnamed" : Name)}(ID = {ID})";
-    }
-        
+    public override string ToString() => $"{(string.IsNullOrWhiteSpace(Name) ? "Unnamed" : Name)}(ID = {ID})";
+
     /// <inheritdoc/>
     public void SetPermissionWindowPeriods(List<PermissionWindowPeriod> windowPeriods)
     {
diff --git a/Rdmp.Core/Curation/Data/PermissionWindowPeriod.cs b/Rdmp.Core/Curation/Data/PermissionWindowPeriod.cs
index e22df6fc22..be23f76a33 100644
--- a/Rdmp.Core/Curation/Data/PermissionWindowPeriod.cs
+++ b/Rdmp.Core/Curation/Data/PermissionWindowPeriod.cs
@@ -19,7 +19,7 @@ public class PermissionWindowPeriod
     /// Which day this period is in (periods cannot cross day boundaries)
     /// </summary>
     public int DayOfWeek { get; set; }
-        
+
     // XML Serialiser doesn't support TimeSpan :(
 
     /// <summary>
@@ -84,17 +84,14 @@ public PermissionWindowPeriod(int dayOfWeek, TimeSpan start, TimeSpan end)
     /// <returns></returns>
     public bool Contains(DateTime timeToTest, bool testToNearestSecond = false)
     {
-        if ((int) timeToTest.DayOfWeek != DayOfWeek)
+        if ((int)timeToTest.DayOfWeek != DayOfWeek)
             return false;
 
         // If we are not testing to the nearest second, set the seconds var in the test to 0 so any Start and Ends defined without seconds are compared correctly
-        var testTime = new TimeSpan(timeToTest.Hour, timeToTest.Minute, testToNearestSecond? timeToTest.Second : 0);
+        var testTime = new TimeSpan(timeToTest.Hour, timeToTest.Minute, testToNearestSecond ? timeToTest.Second : 0);
         return testTime >= Start && testTime <= End;
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{Start:hh':'mm}-{End:hh':'mm}";
-    }
+    public override string ToString() => $"{Start:hh':'mm}-{End:hh':'mm}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Pipelines/AdvertisedPipelineComponentTypeUnderContext.cs b/Rdmp.Core/Curation/Data/Pipelines/AdvertisedPipelineComponentTypeUnderContext.cs
index 8514026cbf..24a6ea04fa 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/AdvertisedPipelineComponentTypeUnderContext.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/AdvertisedPipelineComponentTypeUnderContext.cs
@@ -47,38 +47,22 @@ public AdvertisedPipelineComponentTypeUnderContext(Type componentType, IPipeline
 
         foreach (var requiredInputType in context.GetIPipelineRequirementsForType(componentType))
             //if there are no initialization objects that are instances of an IPipelineRequirement<T> then we cannot satisfy the components pipeline requirements (e.g. a component  DelimitedFlatFileDataFlowSource requires a FlatFileToLoad but pipeline is trying to load from a database reference)
-            if (!initializationTypes.Any(available => requiredInputType == available || requiredInputType.IsAssignableFrom(available)))
+            if (!initializationTypes.Any(available =>
+                    requiredInputType == available || requiredInputType.IsAssignableFrom(available)))
                 unmetRequirements.Add(requiredInputType);
     }
 
-    public Type GetComponentType()
-    {
-        return _componentType;
-    }
+    public Type GetComponentType() => _componentType;
 
-    public string Namespace()
-    {
-        return _componentType.Namespace;
-    }
+    public string Namespace() => _componentType.Namespace;
 
-    public override string ToString()
-    {
-        return _componentType.Name;
-    }
+    public override string ToString() => _componentType.Name;
 
-    public PipelineComponentRole GetRole()
-    {
-        return _role;
-    }
-    public string UIDescribeCompatible()
-    {
-        return _allowableUnderContext && !unmetRequirements.Any() ? "Yes" : "No";
-    }
+    public PipelineComponentRole GetRole() => _role;
 
-    public bool IsCompatible()
-    {
-        return _allowableUnderContext && !unmetRequirements.Any();
-    }
+    public string UIDescribeCompatible() => _allowableUnderContext && !unmetRequirements.Any() ? "Yes" : "No";
+
+    public bool IsCompatible() => _allowableUnderContext && !unmetRequirements.Any();
 
     public string GetReasonIncompatible()
     {
@@ -93,7 +77,6 @@ public string GetReasonIncompatible()
 
             toReturn +=
                 $" following types are required by the component but not available as input objects to the pipeline {string.Join(",", unmetRequirements)}";
-
         }
 
         return toReturn;
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IDataFlowPipelineEngine.cs b/Rdmp.Core/Curation/Data/Pipelines/IDataFlowPipelineEngine.cs
index 8eab33dd62..07ccbe0b3e 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IDataFlowPipelineEngine.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IDataFlowPipelineEngine.cs
@@ -55,5 +55,4 @@ public interface IDataFlowPipelineEngine : ICheckable
     /// The IDataFlowSource component at the start of the pipeline
     /// </summary>
     object SourceObject { get; }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IPipeline.cs b/Rdmp.Core/Curation/Data/Pipelines/IPipeline.cs
index 8976abbf9e..d1168aaf77 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IPipeline.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IPipeline.cs
@@ -31,7 +31,7 @@ public interface IPipeline : IInjectKnown<IPipelineComponent[]>, INamed
     /// what the pipeline is supposed to do.
     /// </summary>
     string Description { get; set; }
-        
+
     /// <summary>
     /// The component acting as the source of the pipeline and producing data (e.g. by reading a flat file).  This
     /// can be null if the <see cref="IPipelineUseCase"/> has a fixed runtime source instance instead.
@@ -61,5 +61,4 @@ public interface IPipeline : IInjectKnown<IPipelineComponent[]>, INamed
     /// </summary>
     /// <returns></returns>
     Pipeline Clone();
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponent.cs b/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponent.cs
index f7e81b083d..ba3f11dfc2 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponent.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponent.cs
@@ -23,7 +23,8 @@ namespace Rdmp.Core.Curation.Data.Pipelines;
 /// <para>PipelineComponent is the Design time class (where it appears in Pipeline, what argument values it should be hydrated with etc) while IDataFlowComponent is 
 /// the runtime instance of the configuration. </para>
 /// </summary>
-public interface IPipelineComponent : IArgumentHost, ISaveable, IMapsDirectlyToDatabaseTable,IHasDependencies,IOrderable
+public interface IPipelineComponent : IArgumentHost, ISaveable, IMapsDirectlyToDatabaseTable, IHasDependencies,
+    IOrderable
 {
     /// <summary>
     /// The human readable name for the pipeline component (currently this is the same as the <see cref="Class"/>).
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponentArgument.cs b/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponentArgument.cs
index f6bcadccf3..2ea1ae1ece 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponentArgument.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IPipelineComponentArgument.cs
@@ -13,7 +13,8 @@ namespace Rdmp.Core.Curation.Data.Pipelines;
 /// <summary>
 /// See PipelineComponentArgument
 /// </summary>
-public interface IPipelineComponentArgument : IArgument, IMapsDirectlyToDatabaseTable, ISaveable, IDeleteable,IHasDependencies
+public interface IPipelineComponentArgument : IArgument, IMapsDirectlyToDatabaseTable, ISaveable, IDeleteable,
+    IHasDependencies
 {
     /// <summary>
     /// Component for whom this <see cref="IPipelineComponentArgument"/> provides a value for.  There will be one <see cref="IPipelineComponentArgument"/>
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IPipelineUseCase.cs b/Rdmp.Core/Curation/Data/Pipelines/IPipelineUseCase.cs
index 9738008ce2..1e206732be 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IPipelineUseCase.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IPipelineUseCase.cs
@@ -34,7 +34,7 @@ public interface IPipelineUseCase : IHasDesignTimeMode
     /// <param name="pipelines"></param>
     /// <returns></returns>
     IEnumerable<Pipeline> FilterCompatiblePipelines(IEnumerable<Pipeline> pipelines);
-        
+
     /// <summary>
     /// Returns true if the <paramref name="pipeline"/> is compatible with the use case
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/Pipelines/IPipelineUser.cs b/Rdmp.Core/Curation/Data/Pipelines/IPipelineUser.cs
index 4ea2ff5bc2..1f4317b1be 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/IPipelineUser.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/IPipelineUser.cs
@@ -16,7 +16,7 @@ public interface IPipelineUser
     /// Delegate for returning the referenced <see cref="Pipeline"/> for the <see cref="IPipelineUser"/>
     /// </summary>
     PipelineGetter Getter { get; }
-        
+
     /// <summary>
     /// Delegate for changing the referenced <see cref="Pipeline"/> for the <see cref="IPipelineUser"/>
     /// </summary>
diff --git a/Rdmp.Core/Curation/Data/Pipelines/Pipeline.cs b/Rdmp.Core/Curation/Data/Pipelines/Pipeline.cs
index 46df8ba8da..a7f01c4b8a 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/Pipeline.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/Pipeline.cs
@@ -17,7 +17,7 @@
 namespace Rdmp.Core.Curation.Data.Pipelines;
 
 /// <inheritdoc cref="IPipeline"/>
-public class Pipeline : DatabaseEntity, IPipeline,IHasDependencies
+public class Pipeline : DatabaseEntity, IPipeline, IHasDependencies
 {
     #region Database Properties
 
@@ -32,46 +32,50 @@ public class Pipeline : DatabaseEntity, IPipeline,IHasDependencies
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
     public string Description
     {
         get => _description;
-        set => SetField(ref  _description, value);
+        set => SetField(ref _description, value);
     }
 
     /// <inheritdoc/>
     public int? DestinationPipelineComponent_ID
     {
         get => _destinationPipelineComponentID;
-        set => SetField(ref  _destinationPipelineComponentID, value);
+        set => SetField(ref _destinationPipelineComponentID, value);
     }
+
     /// <inheritdoc/>
     public int? SourcePipelineComponent_ID
     {
         get => _sourcePipelineComponentID;
-        set => SetField(ref  _sourcePipelineComponentID, value);
+        set => SetField(ref _sourcePipelineComponentID, value);
     }
 
     #endregion
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public IList<IPipelineComponent> PipelineComponents => _knownPipelineComponents.Value;
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IPipelineComponent Destination {
+    public IPipelineComponent Destination
+    {
         get
         {
             return DestinationPipelineComponent_ID == null
                 ? null
-                :_knownPipelineComponents.Value.Single(c=>c.ID == DestinationPipelineComponent_ID.Value);
+                : _knownPipelineComponents.Value.Single(c => c.ID == DestinationPipelineComponent_ID.Value);
         }
     }
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public IPipelineComponent Source
@@ -80,15 +84,17 @@ public IPipelineComponent Source
         {
             return SourcePipelineComponent_ID == null
                 ? null
-                :_knownPipelineComponents.Value.Single(c=>c.ID == SourcePipelineComponent_ID.Value);
+                : _knownPipelineComponents.Value.Single(c => c.ID == SourcePipelineComponent_ID.Value);
         }
     }
 
     #endregion
+
     public Pipeline()
     {
         ClearAllInjections();
     }
+
     /// <summary>
     /// Creates a new empty <see cref="Pipeline"/> in the database, this is a sequence of <see cref="PipelineComponent"/> which when combined
     /// with an <see cref="IPipelineUseCase"/> achieve a specific goal (e.g. loading records into the database from a flat file).
@@ -99,9 +105,9 @@ public Pipeline(ICatalogueRepository repository, string name = null)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name ?? $"NewPipeline {Guid.NewGuid()}" }
+            { "Name", name ?? $"NewPipeline {Guid.NewGuid()}" }
         });
-            
+
         ClearAllInjections();
     }
 
@@ -110,7 +116,7 @@ internal Pipeline(ICatalogueRepository repository, DbDataReader r)
     {
         Name = r["Name"].ToString();
 
-        var o =  r["DestinationPipelineComponent_ID"];
+        var o = r["DestinationPipelineComponent_ID"];
         if (o == DBNull.Value)
             DestinationPipelineComponent_ID = null;
         else
@@ -126,12 +132,9 @@ internal Pipeline(ICatalogueRepository repository, DbDataReader r)
 
         ClearAllInjections();
     }
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Creates (in the database) and returns a new <see cref="Pipeline"/> which is an identical copy of the current.  This includes creating new copies
@@ -142,7 +145,7 @@ public Pipeline Clone()
     {
         var name = GetUniqueCloneName();
 
-        var clonePipe = new Pipeline((ICatalogueRepository)Repository,name)
+        var clonePipe = new Pipeline((ICatalogueRepository)Repository, name)
         {
             Description = Description
         };
@@ -153,6 +156,7 @@ public Pipeline Clone()
             var cloneSource = originalSource.Clone(clonePipe);
             clonePipe.SourcePipelineComponent_ID = cloneSource.ID;
         }
+
         var originalDestination = Destination;
         if (originalDestination != null)
         {
@@ -182,7 +186,7 @@ private string GetUniqueCloneName()
         var proposedName = $"{Name} (Clone)";
         var suffix = 1;
 
-        while(otherPipelines.Any(p=>proposedName.Equals(p.Name,StringComparison.CurrentCultureIgnoreCase)))
+        while (otherPipelines.Any(p => proposedName.Equals(p.Name, StringComparison.CurrentCultureIgnoreCase)))
         {
             suffix++;
             proposedName = $"{Name} (Clone{suffix})";
@@ -192,22 +196,19 @@ private string GetUniqueCloneName()
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return PipelineComponents.Cast<IHasDependencies>().ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => PipelineComponents.Cast<IHasDependencies>().ToArray();
 
     private Lazy<IList<IPipelineComponent>> _knownPipelineComponents;
+
     /// <inheritdoc/>
     public void InjectKnown(IPipelineComponent[] instance)
     {
-        _knownPipelineComponents = new Lazy<IList<IPipelineComponent>>(()=>instance.OrderBy(p=>p.Order).ToList());
+        _knownPipelineComponents = new Lazy<IList<IPipelineComponent>>(() => instance.OrderBy(p => p.Order).ToList());
     }
+
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
diff --git a/Rdmp.Core/Curation/Data/Pipelines/PipelineComponent.cs b/Rdmp.Core/Curation/Data/Pipelines/PipelineComponent.cs
index a6f79a31b8..29e66c9299 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/PipelineComponent.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/PipelineComponent.cs
@@ -30,26 +30,28 @@ public class PipelineComponent : DatabaseEntity, IPipelineComponent
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <inheritdoc/>
     public int Order
     {
         get => _order;
-        set => SetField(ref  _order, value);
+        set => SetField(ref _order, value);
     }
+
     /// <inheritdoc/>
     public int Pipeline_ID
     {
         get => _pipelineID;
-        set => SetField(ref  _pipelineID, value);
+        set => SetField(ref _pipelineID, value);
     }
+
     /// <inheritdoc/>
     public string Class
     {
         get => _class;
-        set => SetField(ref  _class, value);
+        set => SetField(ref _class, value);
     }
 
     #endregion
@@ -58,7 +60,8 @@ public string Class
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IEnumerable<IPipelineComponentArgument> PipelineComponentArguments => Repository.GetAllObjectsWithParent<PipelineComponentArgument>(this);
+    public IEnumerable<IPipelineComponentArgument> PipelineComponentArguments =>
+        Repository.GetAllObjectsWithParent<PipelineComponentArgument>(this);
 
     /// <inheritdoc cref="Pipeline_ID"/>
     [NoMappingToDatabase]
@@ -68,14 +71,10 @@ public string Class
 
     public PipelineComponent()
     {
-
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Creates a new component in the <paramref name="parent"/> <see cref="Pipeline"/>.  This will mean that when run the <see cref="Pipeline"/>
@@ -89,13 +88,13 @@ public override string ToString()
     public PipelineComponent(ICatalogueRepository repository, IPipeline parent, Type componentType, int order,
         string name = null)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name ?? $"Run {componentType.Name}" },
-            {"Pipeline_ID", parent.ID},
-            {"Class", componentType.ToString()},
-            {"Order", order}
-        });   
+            { "Name", name ?? $"Run {componentType.Name}" },
+            { "Pipeline_ID", parent.ID },
+            { "Class", componentType.ToString() },
+            { "Order", order }
+        });
     }
 
     internal PipelineComponent(ICatalogueRepository repository, DbDataReader r)
@@ -106,28 +105,18 @@ internal PipelineComponent(ICatalogueRepository repository, DbDataReader r)
         Class = r["Class"].ToString();
         Name = r["Name"].ToString();
     }
-        
+
     /// <inheritdoc/>
-    public IEnumerable<IArgument> GetAllArguments()
-    {
-        return PipelineComponentArguments;
-    }
+    public IEnumerable<IArgument> GetAllArguments() => PipelineComponentArguments;
+
     /// <inheritdoc/>
-    public IArgument CreateNewArgument()
-    {
-        return new PipelineComponentArgument((ICatalogueRepository)Repository,this);
-    }
+    public IArgument CreateNewArgument() => new PipelineComponentArgument((ICatalogueRepository)Repository, this);
+
     /// <inheritdoc/>
-    public string GetClassNameWhoArgumentsAreFor()
-    {
-        return Class;
-    }
+    public string GetClassNameWhoArgumentsAreFor() => Class;
 
     /// <inheritdoc/>
-    public Type GetClassAsSystemType()
-    {
-        return CatalogueRepository.MEF.GetType(Class);
-    }
+    public Type GetClassAsSystemType() => CatalogueRepository.MEF.GetType(Class);
 
     /// <inheritdoc/>
     public string GetClassNameLastPart()
@@ -137,40 +126,34 @@ public string GetClassNameLastPart()
 
         return Class[(Class.LastIndexOf('.') + 1)..];
     }
-        
+
     /// <inheritdoc/>
     public PipelineComponent Clone(Pipeline intoTargetPipeline)
     {
-        var cataRepo = (ICatalogueRepository) intoTargetPipeline.Repository;
+        var cataRepo = (ICatalogueRepository)intoTargetPipeline.Repository;
 
         var type = GetClassAsSystemType();
 
-        var clone = new PipelineComponent(cataRepo, intoTargetPipeline,type ?? typeof(object) , Order);
-    
+        var clone = new PipelineComponent(cataRepo, intoTargetPipeline, type ?? typeof(object), Order);
+
         // the Type for the PipelineComponent could not be resolved
         // Maybe the user created this pipe with a Plugin and then uninstalled
         // the plugin.  So tell the API its an Object then update the Class
         // to the name of it even though it doesnt exist (its just cloning afterall)
 
-        if(type == null)
+        if (type == null)
             clone.Class = Class;
 
-        foreach (var argument in PipelineComponentArguments)
-        {
-            argument.Clone(clone);
-        }
+        foreach (var argument in PipelineComponentArguments) argument.Clone(clone);
 
         clone.Name = Name;
         clone.SaveToDatabase();
-            
+
         return clone;
     }
 
     /// <inheritdoc/>
-    public IArgument[] CreateArgumentsForClassIfNotExists<T>()
-    {
-        return CreateArgumentsForClassIfNotExists(typeof(T));
-    }
+    public IArgument[] CreateArgumentsForClassIfNotExists<T>() => CreateArgumentsForClassIfNotExists(typeof(T));
 
     /// <inheritdoc/>
     public IArgument[] CreateArgumentsForClassIfNotExists(Type underlyingComponentType)
@@ -191,28 +174,22 @@ public IArgument[] CreateArgumentsForClassIfNotExists(Type underlyingComponentTy
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new IHasDependencies[] {Pipeline};
+        return new IHasDependencies[] { Pipeline };
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return PipelineComponentArguments.Cast<IHasDependencies>().ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() =>
+        PipelineComponentArguments.Cast<IHasDependencies>().ToArray();
 
     public override void DeleteInDatabase()
     {
-        if(Pipeline is Pipeline parent)
+        if (Pipeline is Pipeline parent)
         {
-            if(parent.SourcePipelineComponent_ID == ID)
-            {
+            if (parent.SourcePipelineComponent_ID == ID)
                 CatalogueRepository.SaveSpecificPropertyOnlyToDatabase(parent, "SourcePipelineComponent_ID", null);
-            }
 
             if (parent.DestinationPipelineComponent_ID == ID)
-            {
                 CatalogueRepository.SaveSpecificPropertyOnlyToDatabase(parent, "DestinationPipelineComponent_ID", null);
-            }
         }
 
         base.DeleteInDatabase();
diff --git a/Rdmp.Core/Curation/Data/Pipelines/PipelineComponentArgument.cs b/Rdmp.Core/Curation/Data/Pipelines/PipelineComponentArgument.cs
index b8b461c1f8..d89d61fbf3 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/PipelineComponentArgument.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/PipelineComponentArgument.cs
@@ -30,11 +30,11 @@ public class PipelineComponentArgument : Argument, IPipelineComponentArgument
     public int PipelineComponent_ID
     {
         get => _pipelineComponentID;
-        set => SetField(ref  _pipelineComponentID, value);
+        set => SetField(ref _pipelineComponentID, value);
     }
 
     #endregion
-        
+
     #region Relationships
 
     /// <inheritdoc cref="PipelineComponent_ID"/>
@@ -45,7 +45,6 @@ public int PipelineComponent_ID
 
     public PipelineComponentArgument()
     {
-
     }
 
     /// <summary>
@@ -58,10 +57,11 @@ public PipelineComponentArgument()
     public PipelineComponentArgument(ICatalogueRepository repository, PipelineComponent parent)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
-        { 
-            {"PipelineComponent_ID",parent.ID},
-            {"Name", $"Parameter{Guid.NewGuid()}" },
-            {"Type", typeof (string).ToString()} });
+        {
+            { "PipelineComponent_ID", parent.ID },
+            { "Name", $"Parameter{Guid.NewGuid()}" },
+            { "Type", typeof(string).ToString() }
+        });
     }
 
     internal PipelineComponentArgument(ICatalogueRepository repository, DbDataReader r)
@@ -75,32 +75,27 @@ internal PipelineComponentArgument(ICatalogueRepository repository, DbDataReader
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {PipelineComponent};
+        return new[] { PipelineComponent };
     }
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Array.Empty<IHasDependencies>();
 
     /// <inheritdoc/>
     public void Clone(PipelineComponent intoTargetComponent)
     {
         var cloneArg = new PipelineComponentArgument(intoTargetComponent.CatalogueRepository, intoTargetComponent)
-            {
-                Name = Name,
-                Value = Value,
-                Type = Type,
-                Description = Description
-            };
+        {
+            Name = Name,
+            Value = Value,
+            Type = Type,
+            Description = Description
+        };
 
         cloneArg.SaveToDatabase();
     }
diff --git a/Rdmp.Core/Curation/Data/Pipelines/PipelineUseCase.cs b/Rdmp.Core/Curation/Data/Pipelines/PipelineUseCase.cs
index 272de0fa07..df628ff8ef 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/PipelineUseCase.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/PipelineUseCase.cs
@@ -21,15 +21,12 @@ namespace Rdmp.Core.Curation.Data.Pipelines;
 public abstract class PipelineUseCase : IPipelineUseCase
 {
     /// <inheritdoc/>
-    public HashSet<object> GetInitializationObjects()
-    {
-        return InitializationObjects;
-    }
+    public HashSet<object> GetInitializationObjects() => InitializationObjects;
 
     /// <inheritdoc/>
     public IDataFlowPipelineContext GetContext()
     {
-        if(_context == null)
+        if (_context == null)
             throw new Exception(
                 $"Context has not been initialized yet for use case {GetType()} make sure to add a call to GenerateContext method in the constructor (and mark class as sealed)");
 
@@ -54,6 +51,7 @@ protected void GenerateContext()
 
     /// <inheritdoc/>
     public object ExplicitSource { get; protected set; }
+
     /// <inheritdoc/>
     public object ExplicitDestination { get; protected set; }
 
@@ -64,7 +62,7 @@ protected void GenerateContext()
     /// <para>If this is true then GetInitializationObjects should return Type[] instead of the actually selected objects for the task</para>
     /// </summary>
     public bool IsDesignTime { get; private set; }
-        
+
     protected HashSet<object> InitializationObjects = new();
     private IDataFlowPipelineContext _context;
 
@@ -89,11 +87,9 @@ protected PipelineUseCase(Type[] designTimeInitializationObjectTypes)
     }
 
     /// <inheritdoc/>
-    public virtual IEnumerable<Pipeline> FilterCompatiblePipelines(IEnumerable<Pipeline> pipelines)
-    {
-        return pipelines.Where(IsAllowable);
-    }
-        
+    public virtual IEnumerable<Pipeline> FilterCompatiblePipelines(IEnumerable<Pipeline> pipelines) =>
+        pipelines.Where(IsAllowable);
+
     /// <inheritdoc/>
     public virtual IDataFlowPipelineEngine GetEngine(IPipeline pipeline, IDataLoadEventListener listener)
     {
@@ -116,26 +112,17 @@ protected void AddInitializationObject(object o)
     public bool IsAllowable(Pipeline pipeline)
     {
         // Pipeline is not compatible with the execution context of the pipeline use case
-        if(!_context.IsAllowable(pipeline))
-        {
-            return false;
-        }
+        if (!_context.IsAllowable(pipeline)) return false;
         try
         {
             // Does the pipeline contain any components that are invalid under the current list of available initialization objects etc
             foreach (var component in pipeline.PipelineComponents)
             {
                 var type = component.GetClassAsSystemType();
-                if(type == null)
-                {
-                    return false;
-                }
+                if (type == null) return false;
 
                 var advert = new AdvertisedPipelineComponentTypeUnderContext(type, this);
-                if (!advert.IsCompatible())
-                {
-                    return false;
-                }
+                if (!advert.IsCompatible()) return false;
             }
         }
         catch (Exception)
diff --git a/Rdmp.Core/Curation/Data/Pipelines/PipelineUser.cs b/Rdmp.Core/Curation/Data/Pipelines/PipelineUser.cs
index 7cdca33c62..01f5567dbd 100644
--- a/Rdmp.Core/Curation/Data/Pipelines/PipelineUser.cs
+++ b/Rdmp.Core/Curation/Data/Pipelines/PipelineUser.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.Curation.Data.Pipelines;
 /// 
 /// <para>Currently used primarily by PipelineSelectionUIFactory </para>
 /// </summary>
-public class PipelineUser:IPipelineUser
+public class PipelineUser : IPipelineUser
 {
     private readonly PropertyInfo _property;
     private ICatalogueRepository _catalogueRepository;
@@ -41,12 +41,12 @@ public class PipelineUser:IPipelineUser
     /// <param name="property"></param>
     /// <param name="user"></param>
     /// <param name="repository"></param>
-    public PipelineUser(PropertyInfo property, DatabaseEntity user,ICatalogueRepository repository = null)
+    public PipelineUser(PropertyInfo property, DatabaseEntity user, ICatalogueRepository repository = null)
     {
         _property = property;
         User = user;
 
-        if(property.PropertyType != typeof (int?))
+        if (property.PropertyType != typeof(int?))
             throw new NotSupportedException($"Property {property} must be of PropertyType nullable int");
 
         //if user passed in an explicit one
@@ -66,30 +66,29 @@ public PipelineUser(PropertyInfo property, DatabaseEntity user,ICatalogueReposit
             if (_catalogueRepository == null)
                 throw new Exception(
                     $"Repository of Host '{User}' was not an ICatalogueRepository or a IDataExportRepository.  user came from a Repository called '{user.Repository.GetType().Name}' in this case you will need to specify the ICatalogueRepository property to this method so we know where to fetch Pipelines from");
-                
         }
+
         Getter = Get;
         Setter = Set;
     }
-        
+
     /// <summary>
     /// Gets a <see cref="PipelineUser"/> targetting <see cref="CacheProgress.Pipeline_ID"/>
     /// </summary>
     /// <param name="cacheProgress"></param>
-    public PipelineUser(CacheProgress cacheProgress):this(typeof(CacheProgress).GetProperty("Pipeline_ID"),cacheProgress)
+    public PipelineUser(CacheProgress cacheProgress) : this(typeof(CacheProgress).GetProperty("Pipeline_ID"),
+        cacheProgress)
     {
-            
     }
 
     private Pipeline Get()
     {
-        var id = (int?) _property.GetValue(User);
+        var id = (int?)_property.GetValue(User);
 
-        if(id == null)
+        if (id == null)
             return null;
 
         return _catalogueRepository.GetObjectByID<Pipeline>(id.Value);
-
     }
 
     private void Set(Pipeline newPipelineOrNull)
diff --git a/Rdmp.Core/Curation/Data/Plugin.cs b/Rdmp.Core/Curation/Data/Plugin.cs
index bfa02ae5ef..ef2aa6e20a 100644
--- a/Rdmp.Core/Curation/Data/Plugin.cs
+++ b/Rdmp.Core/Curation/Data/Plugin.cs
@@ -22,7 +22,7 @@ namespace Rdmp.Core.Curation.Data;
 /// stored in the RDMP platform databases and written to disk/loaded when executed by the RDMP client - this ensures that all users run the same
 /// version of the Plugin(s).
 /// </summary>
-public class Plugin : DatabaseEntity,INamed
+public class Plugin : DatabaseEntity, INamed
 {
     #region Database Properties
 
@@ -36,7 +36,7 @@ public class Plugin : DatabaseEntity,INamed
     public string Name
     {
         get => _name;
-        set => SetField(ref  _name, value);
+        set => SetField(ref _name, value);
     }
 
     /// <summary>
@@ -45,11 +45,10 @@ public string Name
     public string UploadedFromDirectory
     {
         get => _uploadedFromDirectory;
-        set => SetField(ref  _uploadedFromDirectory, value);
+        set => SetField(ref _uploadedFromDirectory, value);
     }
 
-        
-        
+
     /// <summary>
     /// Returns <see cref="Name"/> without the verison e.g. "Rdmp.Dicom" from an ambigious name:
     ///  Rdmp.Dicom.0.0.1.nupkg 
@@ -60,7 +59,7 @@ public string UploadedFromDirectory
     public string GetShortName()
     {
         var regexSuffix = new Regex(@"(\.\d*)*(\.nupkg)?$");
-        return regexSuffix.Replace(Name,"");
+        return regexSuffix.Replace(Name, "");
     }
 
     /// <summary>
@@ -70,7 +69,7 @@ public string GetShortName()
     public Version PluginVersion
     {
         get => _pluginVersion;
-        set => SetField(ref  _pluginVersion, value);
+        set => SetField(ref _pluginVersion, value);
     }
 
     /// <summary>
@@ -80,14 +79,13 @@ public Version PluginVersion
     public Version RdmpVersion
     {
         get => _rdmpVersion;
-        set => SetField(ref  _rdmpVersion, value);
+        set => SetField(ref _rdmpVersion, value);
     }
 
     #endregion
 
     public Plugin()
     {
-
     }
 
     /// <summary>
@@ -101,12 +99,11 @@ public Plugin(ICatalogueRepository repository, FileInfo pluginZipFile, Version p
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", pluginZipFile.Name},
-            {"UploadedFromDirectory", pluginZipFile.DirectoryName},
-            {"PluginVersion", pluginVersion ?? new Version(0,0,0,0)},
-            {"RdmpVersion", rdmpVersion ?? new Version(0,0,0,0)}
+            { "Name", pluginZipFile.Name },
+            { "UploadedFromDirectory", pluginZipFile.DirectoryName },
+            { "PluginVersion", pluginVersion ?? new Version(0, 0, 0, 0) },
+            { "RdmpVersion", rdmpVersion ?? new Version(0, 0, 0, 0) }
         });
-            
     }
 
     internal Plugin(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
@@ -120,15 +117,20 @@ internal Plugin(ICatalogueRepository repository, DbDataReader r) : base(reposito
         }
         catch (ArgumentException)
         {
-            PluginVersion = new Version("0.0.0.0");//user hacked database and typed in 'I've got a lovely bunch of coconuts' into the version field?
+            PluginVersion =
+                new Version(
+                    "0.0.0.0"); //user hacked database and typed in 'I've got a lovely bunch of coconuts' into the version field?
         }
+
         try
         {
             RdmpVersion = new Version((string)r["RdmpVersion"]);
         }
         catch (ArgumentException)
         {
-            RdmpVersion = new Version("0.0.0.0");//user hacked database and typed in 'I've got a lovely bunch of coconuts' into the version field?
+            RdmpVersion =
+                new Version(
+                    "0.0.0.0"); //user hacked database and typed in 'I've got a lovely bunch of coconuts' into the version field?
         }
     }
 
@@ -138,10 +140,7 @@ internal Plugin(ShareManager shareManager, ShareDefinition shareDefinition)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     #region Relationships
 
@@ -149,7 +148,8 @@ public override string ToString()
     /// Gets all the dlls and source code(if available) stored as <see cref="LoadModuleAssembly"/> in the catalogue database
     /// </summary>
     [NoMappingToDatabase]
-    public IEnumerable<LoadModuleAssembly> LoadModuleAssemblies => Repository.GetAllObjectsWithParent<LoadModuleAssembly>(this);
+    public IEnumerable<LoadModuleAssembly> LoadModuleAssemblies =>
+        Repository.GetAllObjectsWithParent<LoadModuleAssembly>(this);
 
     #endregion
 
@@ -163,9 +163,9 @@ public string GetPluginDirectoryName(DirectoryInfo downloadDirectoryRoot)
     {
         var pluginName = Path.GetFileNameWithoutExtension(Name);
 
-        if(string.IsNullOrWhiteSpace(pluginName))
+        if (string.IsNullOrWhiteSpace(pluginName))
             throw new Exception("Plugin doens't have a valid name");
 
-        return Path.Combine(downloadDirectoryRoot.FullName ,pluginName);
+        return Path.Combine(downloadDirectoryRoot.FullName, pluginName);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Referencing/ReferenceOtherObjectDatabaseEntity.cs b/Rdmp.Core/Curation/Data/Referencing/ReferenceOtherObjectDatabaseEntity.cs
index 7c36891f45..39b087f012 100644
--- a/Rdmp.Core/Curation/Data/Referencing/ReferenceOtherObjectDatabaseEntity.cs
+++ b/Rdmp.Core/Curation/Data/Referencing/ReferenceOtherObjectDatabaseEntity.cs
@@ -42,12 +42,12 @@ public string ReferencedObjectRepositoryType
     }
 
     /// <inheritdoc/>
-    protected ReferenceOtherObjectDatabaseEntity():base()
+    protected ReferenceOtherObjectDatabaseEntity() : base()
     {
-            
     }
+
     /// <inheritdoc/>
-    protected ReferenceOtherObjectDatabaseEntity(IRepository repository,DbDataReader r):base(repository,r)
+    protected ReferenceOtherObjectDatabaseEntity(IRepository repository, DbDataReader r) : base(repository, r)
     {
         ReferencedObjectType = r["ReferencedObjectType"].ToString();
         ReferencedObjectID = Convert.ToInt32(r["ReferencedObjectID"]);
@@ -59,50 +59,40 @@ protected ReferenceOtherObjectDatabaseEntity(IRepository repository,DbDataReader
     /// </summary>
     /// <param name="type"></param>
     /// <returns></returns>
-    public bool IsReferenceTo(Type type)
-    {
-        return AreProbablySameType(ReferencedObjectType, type);
-    }
-        
+    public bool IsReferenceTo(Type type) => AreProbablySameType(ReferencedObjectType, type);
+
     /// <summary>
     /// True if the <paramref name="o"/> is the object that is explicitly referenced by this class instance
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o)
-    {
-        return o.ID == ReferencedObjectID
-               &&
-               AreProbablySameType(ReferencedObjectType, o.GetType())
-               &&
-               AreProbablySameType(ReferencedObjectRepositoryType, o.Repository.GetType());
-    }
+    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o) =>
+        o.ID == ReferencedObjectID
+        &&
+        AreProbablySameType(ReferencedObjectType, o.GetType())
+        &&
+        AreProbablySameType(ReferencedObjectRepositoryType, o.Repository.GetType());
+
+    private static bool AreProbablySameType(string storedTypeName, Type candidate) =>
+        storedTypeName.Equals(candidate.Name, StringComparison.CurrentCultureIgnoreCase) ||
+        storedTypeName.Equals(candidate.FullName, StringComparison.CurrentCultureIgnoreCase);
 
-    private static bool AreProbablySameType(string storedTypeName, Type candidate)
-    {
-        return
-            storedTypeName.Equals(candidate.Name, StringComparison.CurrentCultureIgnoreCase) ||
-            storedTypeName.Equals(candidate.FullName, StringComparison.CurrentCultureIgnoreCase);
-    }
-        
     /// <summary>
     /// Returns the instance of the object referenced by this class or null if it no longer exists (e.g. has been deleted)
     /// </summary>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public virtual IMapsDirectlyToDatabaseTable GetReferencedObject(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
-    {
-        return repositoryLocator.GetArbitraryDatabaseObject(ReferencedObjectRepositoryType, ReferencedObjectType, ReferencedObjectID);
-    }
-        
+    public virtual IMapsDirectlyToDatabaseTable
+        GetReferencedObject(IRDMPPlatformRepositoryServiceLocator repositoryLocator) =>
+        repositoryLocator.GetArbitraryDatabaseObject(ReferencedObjectRepositoryType, ReferencedObjectType,
+            ReferencedObjectID);
+
     /// <summary>
     /// Returns true if the object referenced by this class still exists in the database
     /// </summary>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public bool ReferencedObjectExists(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
-    {
-        return repositoryLocator.ArbitraryDatabaseObjectExists(ReferencedObjectRepositoryType, ReferencedObjectType, ReferencedObjectID);
-    }
-
+    public bool ReferencedObjectExists(IRDMPPlatformRepositoryServiceLocator repositoryLocator) =>
+        repositoryLocator.ArbitraryDatabaseObjectExists(ReferencedObjectRepositoryType, ReferencedObjectType,
+            ReferencedObjectID);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Remoting/RemoteRDMP.cs b/Rdmp.Core/Curation/Data/Remoting/RemoteRDMP.cs
index c2596fe0df..f29a2a3c2a 100644
--- a/Rdmp.Core/Curation/Data/Remoting/RemoteRDMP.cs
+++ b/Rdmp.Core/Curation/Data/Remoting/RemoteRDMP.cs
@@ -62,7 +62,7 @@ public string Username
         get => _username;
         set => SetField(ref _username, value);
     }
-        
+
     /// <inheritdoc/>
     public string Password
     {
@@ -70,13 +70,14 @@ public string Password
         set
         {
             // if we are being deserialized (using blank constructor)
-            if(_encryptedPasswordHost == null)
+            if (_encryptedPasswordHost == null)
             {
                 // store the encrypted value from the database in a temp variable
                 // until we get told how to decrypt (see SetRepository)
                 _tempPassword = value;
                 return;
             }
+
             _encryptedPasswordHost.Password = value;
             OnPropertyChanged(null, value);
         }
@@ -86,17 +87,18 @@ public string Password
     public string GetDecryptedPassword()
     {
         if (_encryptedPasswordHost == null)
-            throw new Exception($"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
+            throw new Exception(
+                $"Passwords cannot be decrypted until {nameof(SetRepository)} has been called and decryption strategy is established");
 
-        return _encryptedPasswordHost.GetDecryptedPassword()?? "";
+        return _encryptedPasswordHost.GetDecryptedPassword() ?? "";
     }
+
     public RemoteRDMP()
     {
-
     }
 
     /// <inheritdoc/>
-    public RemoteRDMP(ICatalogueRepository repository):base()
+    public RemoteRDMP(ICatalogueRepository repository) : base()
     {
         // need a new copy of the catalogue repository so a new DB connection can be made to use with the encrypted host.
         _encryptedPasswordHost = new EncryptedPasswordHost(repository);
@@ -115,7 +117,7 @@ public RemoteRDMP(ICatalogueRepository repository):base()
     public RemoteRDMP(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         // need a new copy of the catalogue repository so a new DB connection can be made to use with the encrypted host.
-        _encryptedPasswordHost = new EncryptedPasswordHost((ICatalogueRepository) repository);
+        _encryptedPasswordHost = new EncryptedPasswordHost((ICatalogueRepository)repository);
 
         URL = r["URL"].ToString();
         Name = r["Name"].ToString();
@@ -124,11 +126,7 @@ public RemoteRDMP(ICatalogueRepository repository, DbDataReader r) : base(reposi
     }
 
     /// <inheritdoc cref="Name"/>
-    public override string ToString()
-    {
-        return Name;
-    }
-
+    public override string ToString() => Name;
 
 
     /// <summary>
@@ -144,7 +142,7 @@ public string GetUrlFor<T>(bool isarray = false)
             baseUri.Query = "isarray=true";
 
         baseUri.Path += $"/api/{typeof(T).Name}";
-            
+
         return baseUri.ToString();
     }
 
diff --git a/Rdmp.Core/Curation/Data/SafeDirectoryCatalog.cs b/Rdmp.Core/Curation/Data/SafeDirectoryCatalog.cs
index 9cff631bd9..7d0bcdc85b 100644
--- a/Rdmp.Core/Curation/Data/SafeDirectoryCatalog.cs
+++ b/Rdmp.Core/Curation/Data/SafeDirectoryCatalog.cs
@@ -30,394 +30,393 @@ public class SafeDirectoryCatalog
     /// </summary>
     public static readonly HashSet<string> Ignore = new()
     {
-
-"0harmony.dll",
-"accessibility.dll",
-"api-ms-win-core-console-l1-1-0.dll",
-"api-ms-win-core-console-l1-2-0.dll",
-"api-ms-win-core-datetime-l1-1-0.dll",
-"api-ms-win-core-debug-l1-1-0.dll",
-"api-ms-win-core-errorhandling-l1-1-0.dll",
-"api-ms-win-core-fibers-l1-1-0.dll",
-"api-ms-win-core-file-l1-1-0.dll",
-"api-ms-win-core-file-l1-2-0.dll",
-"api-ms-win-core-file-l2-1-0.dll",
-"api-ms-win-core-handle-l1-1-0.dll",
-"api-ms-win-core-heap-l1-1-0.dll",
-"api-ms-win-core-interlocked-l1-1-0.dll",
-"api-ms-win-core-libraryloader-l1-1-0.dll",
-"api-ms-win-core-localization-l1-2-0.dll",
-"api-ms-win-core-memory-l1-1-0.dll",
-"api-ms-win-core-namedpipe-l1-1-0.dll",
-"api-ms-win-core-processenvironment-l1-1-0.dll",
-"api-ms-win-core-processthreads-l1-1-0.dll",
-"api-ms-win-core-processthreads-l1-1-1.dll",
-"api-ms-win-core-profile-l1-1-0.dll",
-"api-ms-win-core-rtlsupport-l1-1-0.dll",
-"api-ms-win-core-string-l1-1-0.dll",
-"api-ms-win-core-synch-l1-1-0.dll",
-"api-ms-win-core-synch-l1-2-0.dll",
-"api-ms-win-core-sysinfo-l1-1-0.dll",
-"api-ms-win-core-timezone-l1-1-0.dll",
-"api-ms-win-core-util-l1-1-0.dll",
-"api-ms-win-crt-conio-l1-1-0.dll",
-"api-ms-win-crt-convert-l1-1-0.dll",
-"api-ms-win-crt-environment-l1-1-0.dll",
-"api-ms-win-crt-filesystem-l1-1-0.dll",
-"api-ms-win-crt-heap-l1-1-0.dll",
-"api-ms-win-crt-locale-l1-1-0.dll",
-"api-ms-win-crt-math-l1-1-0.dll",
-"api-ms-win-crt-multibyte-l1-1-0.dll",
-"api-ms-win-crt-private-l1-1-0.dll",
-"api-ms-win-crt-process-l1-1-0.dll",
-"api-ms-win-crt-runtime-l1-1-0.dll",
-"api-ms-win-crt-stdio-l1-1-0.dll",
-"api-ms-win-crt-string-l1-1-0.dll",
-"api-ms-win-crt-time-l1-1-0.dll",
-"api-ms-win-crt-utility-l1-1-0.dll",
-"archive.dll",
-"autoupdater.net.dll",
-"autoupdater.net.resources.dll",
-"azure.core.dll",
-"azure.identity.dll",
-"badmedicine.core.dll",
-"bouncycastle.crypto.dll",
-"clretwrc.dll",
-"clrjit.dll",
-"commandline.dll",
-"consolecontrol.dll",
-"consolecontrolapi.dll",
-"coreclr.dll",
-"csvhelper.dll",
-"d3dcompiler_47_cor3.dll",
-"dbgshim.dll",
-"directwriteforwarder.dll",
-"excelnumberformat.dll",
-"fansi.dll",
-"fansi.implementations.microsoftsql.dll",
-"fansi.implementations.mysql.dll",
-"fansi.implementations.oracle.dll",
-"fansi.implementations.postgresql.dll",
-"hostfxr.dll",
-"hostpolicy.dll",
-"hunspellx64.dll",
-"hunspellx86.dll",
-"icsharpcode.sharpziplib.dll",
-"lexilla.dll",
-"libarchive.net.dll",
-"mapsdirectlytodatabasetable.dll",
-"mathnet.numerics.dll",
-"microsoft.bcl.asyncinterfaces.dll",
-"microsoft.csharp.dll",
-"microsoft.data.sqlclient.dll",
-"microsoft.data.sqlclient.sni.dll",
-"microsoft.diasymreader.native.amd64.dll",
-"microsoft.identity.client.dll",
-"microsoft.identity.client.extensions.msal.dll",
-"microsoft.identitymodel.abstractions.dll",
-"microsoft.identitymodel.jsonwebtokens.dll",
-"microsoft.identitymodel.logging.dll",
-"microsoft.identitymodel.protocols.dll",
-"microsoft.identitymodel.protocols.openidconnect.dll",
-"microsoft.identitymodel.tokens.dll",
-"microsoft.sqlserver.server.dll",
-"microsoft.visualbasic.core.dll",
-"microsoft.visualbasic.dll",
-"microsoft.visualbasic.forms.dll",
-"microsoft.visualbasic.forms.resources.dll",
-"microsoft.web.webview2.core.dll",
-"microsoft.web.webview2.winforms.dll",
-"microsoft.web.webview2.wpf.dll",
-"microsoft.win32.primitives.dll",
-"microsoft.win32.registry.accesscontrol.dll",
-"microsoft.win32.registry.dll",
-"microsoft.win32.systemevents.dll",
-"mono.cecil.dll",
-"mono.cecil.mdb.dll",
-"mono.cecil.pdb.dll",
-"mono.cecil.rocks.dll",
-"monomod.common.dll",
-"mscordaccore.dll",
-"mscordaccore_amd64_amd64_6.0.1122.52304.dll",
-"mscordbi.dll",
-"mscorlib.dll",
-"mscorrc.dll",
-"msquic.dll",
-"mysqlconnector.dll",
-"netstandard.dll",
-"newtonsoft.json.dll",
-"nhunspell.dll",
-"nlog.dll",
-"npgsql.dll",
-"npoi.dll",
-"npoi.ooxml.dll",
-"npoi.openxml4net.dll",
-"npoi.openxmlformats.dll",
-"objectlistview.dll",
-"objectlistview2022net.dll",
-"oracle.manageddataaccess.dll",
-"penimc_cor3.dll",
-"plugin.settings.abstractions.dll",
-"plugin.settings.dll",
-"presentationcore.dll",
-"presentationcore.resources.dll",
-"presentationframework-systemcore.dll",
-"presentationframework-systemdata.dll",
-"presentationframework-systemdrawing.dll",
-"presentationframework-systemxml.dll",
-"presentationframework-systemxmllinq.dll",
-"presentationframework.aero.dll",
-"presentationframework.aero2.dll",
-"presentationframework.aerolite.dll",
-"presentationframework.classic.dll",
-"presentationframework.dll",
-"presentationframework.luna.dll",
-"presentationframework.resources.dll",
-"presentationframework.royale.dll",
-"presentationnative_cor3.dll",
-"presentationui.dll",
-"presentationui.resources.dll",
-"rdmp.core.dll",
-"rdmp.core.resources.dll",
-"rdmp.ui.dll",
-"reachframework.dll",
-"reachframework.resources.dll",
-"renci.sshnet.dll",
-"researchdatamanagementplatform.dll",
-"reusablelibrarycode.dll",
-"scintilla.dll",
-"scintilla.net.dll",
-"scintillanet.dll",
-"sixlabors.fonts.dll",
-"sixlabors.imagesharp.dll",
-"sixlabors.imagesharp.drawing.dll",
-"spectre.console.dll",
-"sshnet.security.cryptography.dll",
-"system.appcontext.dll",
-"system.buffers.dll",
-"system.codedom.dll",
-"system.collections.concurrent.dll",
-"system.collections.dll",
-"system.collections.immutable.dll",
-"system.collections.nongeneric.dll",
-"system.collections.specialized.dll",
-"system.componentmodel.annotations.dll",
-"system.componentmodel.composition.dll",
-"system.componentmodel.dataannotations.dll",
-"system.componentmodel.dll",
-"system.componentmodel.eventbasedasync.dll",
-"system.componentmodel.primitives.dll",
-"system.componentmodel.typeconverter.dll",
-"system.configuration.configurationmanager.dll",
-"system.configuration.dll",
-"system.console.dll",
-"system.core.dll",
-"system.data.common.dll",
-"system.data.datasetextensions.dll",
-"system.data.dll",
-"system.design.dll",
-"system.diagnostics.contracts.dll",
-"system.diagnostics.debug.dll",
-"system.diagnostics.diagnosticsource.dll",
-"system.diagnostics.eventlog.dll",
-"system.diagnostics.eventlog.messages.dll",
-"system.diagnostics.fileversioninfo.dll",
-"system.diagnostics.performancecounter.dll",
-"system.diagnostics.process.dll",
-"system.diagnostics.stacktrace.dll",
-"system.diagnostics.textwritertracelistener.dll",
-"system.diagnostics.tools.dll",
-"system.diagnostics.tracesource.dll",
-"system.diagnostics.tracing.dll",
-"system.directoryservices.dll",
-"system.directoryservices.protocols.dll",
-"system.dll",
-"system.drawing.common.dll",
-"system.drawing.design.dll",
-"system.drawing.dll",
-"system.drawing.primitives.dll",
-"system.dynamic.runtime.dll",
-"system.formats.asn1.dll",
-"system.globalization.calendars.dll",
-"system.globalization.dll",
-"system.globalization.extensions.dll",
-"system.identitymodel.tokens.jwt.dll",
-"system.io.compression.brotli.dll",
-"system.io.compression.dll",
-"system.io.compression.filesystem.dll",
-"system.io.compression.native.dll",
-"system.io.compression.zipfile.dll",
-"system.io.dll",
-"system.io.filesystem.accesscontrol.dll",
-"system.io.filesystem.dll",
-"system.io.filesystem.driveinfo.dll",
-"system.io.filesystem.primitives.dll",
-"system.io.filesystem.watcher.dll",
-"system.io.isolatedstorage.dll",
-"system.io.memorymappedfiles.dll",
-"system.io.packaging.dll",
-"system.io.pipes.accesscontrol.dll",
-"system.io.pipes.dll",
-"system.io.unmanagedmemorystream.dll",
-"system.linq.dll",
-"system.linq.expressions.dll",
-"system.linq.parallel.dll",
-"system.linq.queryable.dll",
-"system.memory.data.dll",
-"system.memory.dll",
-"system.net.dll",
-"system.net.http.dll",
-"system.net.http.json.dll",
-"system.net.httplistener.dll",
-"system.net.mail.dll",
-"system.net.nameresolution.dll",
-"system.net.networkinformation.dll",
-"system.net.ping.dll",
-"system.net.primitives.dll",
-"system.net.quic.dll",
-"system.net.requests.dll",
-"system.net.security.dll",
-"system.net.servicepoint.dll",
-"system.net.sockets.dll",
-"system.net.webclient.dll",
-"system.net.webheadercollection.dll",
-"system.net.webproxy.dll",
-"system.net.websockets.client.dll",
-"system.net.websockets.dll",
-"system.numerics.dll",
-"system.numerics.vectors.dll",
-"system.objectmodel.dll",
-"system.printing.dll",
-"system.private.corelib.dll",
-"system.private.datacontractserialization.dll",
-"system.private.uri.dll",
-"system.private.xml.dll",
-"system.private.xml.linq.dll",
-"system.reflection.dispatchproxy.dll",
-"system.reflection.dll",
-"system.reflection.emit.dll",
-"system.reflection.emit.ilgeneration.dll",
-"system.reflection.emit.lightweight.dll",
-"system.reflection.extensions.dll",
-"system.reflection.metadata.dll",
-"system.reflection.primitives.dll",
-"system.reflection.typeextensions.dll",
-"system.resources.extensions.dll",
-"system.resources.reader.dll",
-"system.resources.resourcemanager.dll",
-"system.resources.writer.dll",
-"system.runtime.caching.dll",
-"system.runtime.compilerservices.unsafe.dll",
-"system.runtime.compilerservices.visualc.dll",
-"system.runtime.dll",
-"system.runtime.extensions.dll",
-"system.runtime.handles.dll",
-"system.runtime.interopservices.dll",
-"system.runtime.interopservices.runtimeinformation.dll",
-"system.runtime.intrinsics.dll",
-"system.runtime.loader.dll",
-"system.runtime.numerics.dll",
-"system.runtime.serialization.dll",
-"system.runtime.serialization.formatters.dll",
-"system.runtime.serialization.json.dll",
-"system.runtime.serialization.primitives.dll",
-"system.runtime.serialization.xml.dll",
-"system.security.accesscontrol.dll",
-"system.security.claims.dll",
-"system.security.cryptography.algorithms.dll",
-"system.security.cryptography.cng.dll",
-"system.security.cryptography.csp.dll",
-"system.security.cryptography.encoding.dll",
-"system.security.cryptography.openssl.dll",
-"system.security.cryptography.pkcs.dll",
-"system.security.cryptography.primitives.dll",
-"system.security.cryptography.protecteddata.dll",
-"system.security.cryptography.x509certificates.dll",
-"system.security.cryptography.xml.dll",
-"system.security.dll",
-"system.security.permissions.dll",
-"system.security.principal.dll",
-"system.security.principal.windows.dll",
-"system.security.securestring.dll",
-"system.servicemodel.web.dll",
-"system.serviceprocess.dll",
-"system.text.encoding.codepages.dll",
-"system.text.encoding.dll",
-"system.text.encoding.extensions.dll",
-"system.text.encodings.web.dll",
-"system.text.json.dll",
-"system.text.regularexpressions.dll",
-"system.threading.accesscontrol.dll",
-"system.threading.channels.dll",
-"system.threading.dll",
-"system.threading.overlapped.dll",
-"system.threading.tasks.dataflow.dll",
-"system.threading.tasks.dll",
-"system.threading.tasks.extensions.dll",
-"system.threading.tasks.parallel.dll",
-"system.threading.thread.dll",
-"system.threading.threadpool.dll",
-"system.threading.timer.dll",
-"system.transactions.dll",
-"system.transactions.local.dll",
-"system.valuetuple.dll",
-"system.web.dll",
-"system.web.httputility.dll",
-"system.windows.controls.ribbon.dll",
-"system.windows.controls.ribbon.resources.dll",
-"system.windows.dll",
-"system.windows.extensions.dll",
-"system.windows.forms.datavisualization.dll",
-"system.windows.forms.design.dll",
-"system.windows.forms.design.editors.dll",
-"system.windows.forms.design.resources.dll",
-"system.windows.forms.dll",
-"system.windows.forms.primitives.dll",
-"system.windows.forms.primitives.resources.dll",
-"system.windows.forms.resources.dll",
-"system.windows.input.manipulations.dll",
-"system.windows.input.manipulations.resources.dll",
-"system.windows.presentation.dll",
-"system.xaml.dll",
-"system.xaml.resources.dll",
-"system.xml.dll",
-"system.xml.linq.dll",
-"system.xml.readerwriter.dll",
-"system.xml.serialization.dll",
-"system.xml.xdocument.dll",
-"system.xml.xmldocument.dll",
-"system.xml.xmlserializer.dll",
-"system.xml.xpath.dll",
-"system.xml.xpath.xdocument.dll",
-"typeguesser.dll",
-"ucrtbase.dll",
-"uiautomationclient.dll",
-"uiautomationclient.resources.dll",
-"uiautomationclientsideproviders.dll",
-"uiautomationclientsideproviders.resources.dll",
-"uiautomationprovider.dll",
-"uiautomationprovider.resources.dll",
-"uiautomationtypes.dll",
-"uiautomationtypes.resources.dll",
-"universaltypeconverter.dll",
-"vcruntime140_cor3.dll",
-"vpksoft.scintillalexers.net.dll",
-"webview2loader.dll",
-"wecantspell.hunspell.dll",
-"weifenluo.winformsui.docking.dll",
-"weifenluo.winformsui.docking.themevs2015.dll",
-"windowsbase.dll",
-"windowsbase.resources.dll",
-"windowsformsintegration.dll",
-"windowsformsintegration.resources.dll",
-"wpfgfx_cor3.dll",
-"yamldotnet.dll"
+        "0harmony.dll",
+        "accessibility.dll",
+        "api-ms-win-core-console-l1-1-0.dll",
+        "api-ms-win-core-console-l1-2-0.dll",
+        "api-ms-win-core-datetime-l1-1-0.dll",
+        "api-ms-win-core-debug-l1-1-0.dll",
+        "api-ms-win-core-errorhandling-l1-1-0.dll",
+        "api-ms-win-core-fibers-l1-1-0.dll",
+        "api-ms-win-core-file-l1-1-0.dll",
+        "api-ms-win-core-file-l1-2-0.dll",
+        "api-ms-win-core-file-l2-1-0.dll",
+        "api-ms-win-core-handle-l1-1-0.dll",
+        "api-ms-win-core-heap-l1-1-0.dll",
+        "api-ms-win-core-interlocked-l1-1-0.dll",
+        "api-ms-win-core-libraryloader-l1-1-0.dll",
+        "api-ms-win-core-localization-l1-2-0.dll",
+        "api-ms-win-core-memory-l1-1-0.dll",
+        "api-ms-win-core-namedpipe-l1-1-0.dll",
+        "api-ms-win-core-processenvironment-l1-1-0.dll",
+        "api-ms-win-core-processthreads-l1-1-0.dll",
+        "api-ms-win-core-processthreads-l1-1-1.dll",
+        "api-ms-win-core-profile-l1-1-0.dll",
+        "api-ms-win-core-rtlsupport-l1-1-0.dll",
+        "api-ms-win-core-string-l1-1-0.dll",
+        "api-ms-win-core-synch-l1-1-0.dll",
+        "api-ms-win-core-synch-l1-2-0.dll",
+        "api-ms-win-core-sysinfo-l1-1-0.dll",
+        "api-ms-win-core-timezone-l1-1-0.dll",
+        "api-ms-win-core-util-l1-1-0.dll",
+        "api-ms-win-crt-conio-l1-1-0.dll",
+        "api-ms-win-crt-convert-l1-1-0.dll",
+        "api-ms-win-crt-environment-l1-1-0.dll",
+        "api-ms-win-crt-filesystem-l1-1-0.dll",
+        "api-ms-win-crt-heap-l1-1-0.dll",
+        "api-ms-win-crt-locale-l1-1-0.dll",
+        "api-ms-win-crt-math-l1-1-0.dll",
+        "api-ms-win-crt-multibyte-l1-1-0.dll",
+        "api-ms-win-crt-private-l1-1-0.dll",
+        "api-ms-win-crt-process-l1-1-0.dll",
+        "api-ms-win-crt-runtime-l1-1-0.dll",
+        "api-ms-win-crt-stdio-l1-1-0.dll",
+        "api-ms-win-crt-string-l1-1-0.dll",
+        "api-ms-win-crt-time-l1-1-0.dll",
+        "api-ms-win-crt-utility-l1-1-0.dll",
+        "archive.dll",
+        "autoupdater.net.dll",
+        "autoupdater.net.resources.dll",
+        "azure.core.dll",
+        "azure.identity.dll",
+        "badmedicine.core.dll",
+        "bouncycastle.crypto.dll",
+        "clretwrc.dll",
+        "clrjit.dll",
+        "commandline.dll",
+        "consolecontrol.dll",
+        "consolecontrolapi.dll",
+        "coreclr.dll",
+        "csvhelper.dll",
+        "d3dcompiler_47_cor3.dll",
+        "dbgshim.dll",
+        "directwriteforwarder.dll",
+        "excelnumberformat.dll",
+        "fansi.dll",
+        "fansi.implementations.microsoftsql.dll",
+        "fansi.implementations.mysql.dll",
+        "fansi.implementations.oracle.dll",
+        "fansi.implementations.postgresql.dll",
+        "hostfxr.dll",
+        "hostpolicy.dll",
+        "hunspellx64.dll",
+        "hunspellx86.dll",
+        "icsharpcode.sharpziplib.dll",
+        "lexilla.dll",
+        "libarchive.net.dll",
+        "mapsdirectlytodatabasetable.dll",
+        "mathnet.numerics.dll",
+        "microsoft.bcl.asyncinterfaces.dll",
+        "microsoft.csharp.dll",
+        "microsoft.data.sqlclient.dll",
+        "microsoft.data.sqlclient.sni.dll",
+        "microsoft.diasymreader.native.amd64.dll",
+        "microsoft.identity.client.dll",
+        "microsoft.identity.client.extensions.msal.dll",
+        "microsoft.identitymodel.abstractions.dll",
+        "microsoft.identitymodel.jsonwebtokens.dll",
+        "microsoft.identitymodel.logging.dll",
+        "microsoft.identitymodel.protocols.dll",
+        "microsoft.identitymodel.protocols.openidconnect.dll",
+        "microsoft.identitymodel.tokens.dll",
+        "microsoft.sqlserver.server.dll",
+        "microsoft.visualbasic.core.dll",
+        "microsoft.visualbasic.dll",
+        "microsoft.visualbasic.forms.dll",
+        "microsoft.visualbasic.forms.resources.dll",
+        "microsoft.web.webview2.core.dll",
+        "microsoft.web.webview2.winforms.dll",
+        "microsoft.web.webview2.wpf.dll",
+        "microsoft.win32.primitives.dll",
+        "microsoft.win32.registry.accesscontrol.dll",
+        "microsoft.win32.registry.dll",
+        "microsoft.win32.systemevents.dll",
+        "mono.cecil.dll",
+        "mono.cecil.mdb.dll",
+        "mono.cecil.pdb.dll",
+        "mono.cecil.rocks.dll",
+        "monomod.common.dll",
+        "mscordaccore.dll",
+        "mscordaccore_amd64_amd64_6.0.1122.52304.dll",
+        "mscordbi.dll",
+        "mscorlib.dll",
+        "mscorrc.dll",
+        "msquic.dll",
+        "mysqlconnector.dll",
+        "netstandard.dll",
+        "newtonsoft.json.dll",
+        "nhunspell.dll",
+        "nlog.dll",
+        "npgsql.dll",
+        "npoi.dll",
+        "npoi.ooxml.dll",
+        "npoi.openxml4net.dll",
+        "npoi.openxmlformats.dll",
+        "objectlistview.dll",
+        "objectlistview2022net.dll",
+        "oracle.manageddataaccess.dll",
+        "penimc_cor3.dll",
+        "plugin.settings.abstractions.dll",
+        "plugin.settings.dll",
+        "presentationcore.dll",
+        "presentationcore.resources.dll",
+        "presentationframework-systemcore.dll",
+        "presentationframework-systemdata.dll",
+        "presentationframework-systemdrawing.dll",
+        "presentationframework-systemxml.dll",
+        "presentationframework-systemxmllinq.dll",
+        "presentationframework.aero.dll",
+        "presentationframework.aero2.dll",
+        "presentationframework.aerolite.dll",
+        "presentationframework.classic.dll",
+        "presentationframework.dll",
+        "presentationframework.luna.dll",
+        "presentationframework.resources.dll",
+        "presentationframework.royale.dll",
+        "presentationnative_cor3.dll",
+        "presentationui.dll",
+        "presentationui.resources.dll",
+        "rdmp.core.dll",
+        "rdmp.core.resources.dll",
+        "rdmp.ui.dll",
+        "reachframework.dll",
+        "reachframework.resources.dll",
+        "renci.sshnet.dll",
+        "researchdatamanagementplatform.dll",
+        "reusablelibrarycode.dll",
+        "scintilla.dll",
+        "scintilla.net.dll",
+        "scintillanet.dll",
+        "sixlabors.fonts.dll",
+        "sixlabors.imagesharp.dll",
+        "sixlabors.imagesharp.drawing.dll",
+        "spectre.console.dll",
+        "sshnet.security.cryptography.dll",
+        "system.appcontext.dll",
+        "system.buffers.dll",
+        "system.codedom.dll",
+        "system.collections.concurrent.dll",
+        "system.collections.dll",
+        "system.collections.immutable.dll",
+        "system.collections.nongeneric.dll",
+        "system.collections.specialized.dll",
+        "system.componentmodel.annotations.dll",
+        "system.componentmodel.composition.dll",
+        "system.componentmodel.dataannotations.dll",
+        "system.componentmodel.dll",
+        "system.componentmodel.eventbasedasync.dll",
+        "system.componentmodel.primitives.dll",
+        "system.componentmodel.typeconverter.dll",
+        "system.configuration.configurationmanager.dll",
+        "system.configuration.dll",
+        "system.console.dll",
+        "system.core.dll",
+        "system.data.common.dll",
+        "system.data.datasetextensions.dll",
+        "system.data.dll",
+        "system.design.dll",
+        "system.diagnostics.contracts.dll",
+        "system.diagnostics.debug.dll",
+        "system.diagnostics.diagnosticsource.dll",
+        "system.diagnostics.eventlog.dll",
+        "system.diagnostics.eventlog.messages.dll",
+        "system.diagnostics.fileversioninfo.dll",
+        "system.diagnostics.performancecounter.dll",
+        "system.diagnostics.process.dll",
+        "system.diagnostics.stacktrace.dll",
+        "system.diagnostics.textwritertracelistener.dll",
+        "system.diagnostics.tools.dll",
+        "system.diagnostics.tracesource.dll",
+        "system.diagnostics.tracing.dll",
+        "system.directoryservices.dll",
+        "system.directoryservices.protocols.dll",
+        "system.dll",
+        "system.drawing.common.dll",
+        "system.drawing.design.dll",
+        "system.drawing.dll",
+        "system.drawing.primitives.dll",
+        "system.dynamic.runtime.dll",
+        "system.formats.asn1.dll",
+        "system.globalization.calendars.dll",
+        "system.globalization.dll",
+        "system.globalization.extensions.dll",
+        "system.identitymodel.tokens.jwt.dll",
+        "system.io.compression.brotli.dll",
+        "system.io.compression.dll",
+        "system.io.compression.filesystem.dll",
+        "system.io.compression.native.dll",
+        "system.io.compression.zipfile.dll",
+        "system.io.dll",
+        "system.io.filesystem.accesscontrol.dll",
+        "system.io.filesystem.dll",
+        "system.io.filesystem.driveinfo.dll",
+        "system.io.filesystem.primitives.dll",
+        "system.io.filesystem.watcher.dll",
+        "system.io.isolatedstorage.dll",
+        "system.io.memorymappedfiles.dll",
+        "system.io.packaging.dll",
+        "system.io.pipes.accesscontrol.dll",
+        "system.io.pipes.dll",
+        "system.io.unmanagedmemorystream.dll",
+        "system.linq.dll",
+        "system.linq.expressions.dll",
+        "system.linq.parallel.dll",
+        "system.linq.queryable.dll",
+        "system.memory.data.dll",
+        "system.memory.dll",
+        "system.net.dll",
+        "system.net.http.dll",
+        "system.net.http.json.dll",
+        "system.net.httplistener.dll",
+        "system.net.mail.dll",
+        "system.net.nameresolution.dll",
+        "system.net.networkinformation.dll",
+        "system.net.ping.dll",
+        "system.net.primitives.dll",
+        "system.net.quic.dll",
+        "system.net.requests.dll",
+        "system.net.security.dll",
+        "system.net.servicepoint.dll",
+        "system.net.sockets.dll",
+        "system.net.webclient.dll",
+        "system.net.webheadercollection.dll",
+        "system.net.webproxy.dll",
+        "system.net.websockets.client.dll",
+        "system.net.websockets.dll",
+        "system.numerics.dll",
+        "system.numerics.vectors.dll",
+        "system.objectmodel.dll",
+        "system.printing.dll",
+        "system.private.corelib.dll",
+        "system.private.datacontractserialization.dll",
+        "system.private.uri.dll",
+        "system.private.xml.dll",
+        "system.private.xml.linq.dll",
+        "system.reflection.dispatchproxy.dll",
+        "system.reflection.dll",
+        "system.reflection.emit.dll",
+        "system.reflection.emit.ilgeneration.dll",
+        "system.reflection.emit.lightweight.dll",
+        "system.reflection.extensions.dll",
+        "system.reflection.metadata.dll",
+        "system.reflection.primitives.dll",
+        "system.reflection.typeextensions.dll",
+        "system.resources.extensions.dll",
+        "system.resources.reader.dll",
+        "system.resources.resourcemanager.dll",
+        "system.resources.writer.dll",
+        "system.runtime.caching.dll",
+        "system.runtime.compilerservices.unsafe.dll",
+        "system.runtime.compilerservices.visualc.dll",
+        "system.runtime.dll",
+        "system.runtime.extensions.dll",
+        "system.runtime.handles.dll",
+        "system.runtime.interopservices.dll",
+        "system.runtime.interopservices.runtimeinformation.dll",
+        "system.runtime.intrinsics.dll",
+        "system.runtime.loader.dll",
+        "system.runtime.numerics.dll",
+        "system.runtime.serialization.dll",
+        "system.runtime.serialization.formatters.dll",
+        "system.runtime.serialization.json.dll",
+        "system.runtime.serialization.primitives.dll",
+        "system.runtime.serialization.xml.dll",
+        "system.security.accesscontrol.dll",
+        "system.security.claims.dll",
+        "system.security.cryptography.algorithms.dll",
+        "system.security.cryptography.cng.dll",
+        "system.security.cryptography.csp.dll",
+        "system.security.cryptography.encoding.dll",
+        "system.security.cryptography.openssl.dll",
+        "system.security.cryptography.pkcs.dll",
+        "system.security.cryptography.primitives.dll",
+        "system.security.cryptography.protecteddata.dll",
+        "system.security.cryptography.x509certificates.dll",
+        "system.security.cryptography.xml.dll",
+        "system.security.dll",
+        "system.security.permissions.dll",
+        "system.security.principal.dll",
+        "system.security.principal.windows.dll",
+        "system.security.securestring.dll",
+        "system.servicemodel.web.dll",
+        "system.serviceprocess.dll",
+        "system.text.encoding.codepages.dll",
+        "system.text.encoding.dll",
+        "system.text.encoding.extensions.dll",
+        "system.text.encodings.web.dll",
+        "system.text.json.dll",
+        "system.text.regularexpressions.dll",
+        "system.threading.accesscontrol.dll",
+        "system.threading.channels.dll",
+        "system.threading.dll",
+        "system.threading.overlapped.dll",
+        "system.threading.tasks.dataflow.dll",
+        "system.threading.tasks.dll",
+        "system.threading.tasks.extensions.dll",
+        "system.threading.tasks.parallel.dll",
+        "system.threading.thread.dll",
+        "system.threading.threadpool.dll",
+        "system.threading.timer.dll",
+        "system.transactions.dll",
+        "system.transactions.local.dll",
+        "system.valuetuple.dll",
+        "system.web.dll",
+        "system.web.httputility.dll",
+        "system.windows.controls.ribbon.dll",
+        "system.windows.controls.ribbon.resources.dll",
+        "system.windows.dll",
+        "system.windows.extensions.dll",
+        "system.windows.forms.datavisualization.dll",
+        "system.windows.forms.design.dll",
+        "system.windows.forms.design.editors.dll",
+        "system.windows.forms.design.resources.dll",
+        "system.windows.forms.dll",
+        "system.windows.forms.primitives.dll",
+        "system.windows.forms.primitives.resources.dll",
+        "system.windows.forms.resources.dll",
+        "system.windows.input.manipulations.dll",
+        "system.windows.input.manipulations.resources.dll",
+        "system.windows.presentation.dll",
+        "system.xaml.dll",
+        "system.xaml.resources.dll",
+        "system.xml.dll",
+        "system.xml.linq.dll",
+        "system.xml.readerwriter.dll",
+        "system.xml.serialization.dll",
+        "system.xml.xdocument.dll",
+        "system.xml.xmldocument.dll",
+        "system.xml.xmlserializer.dll",
+        "system.xml.xpath.dll",
+        "system.xml.xpath.xdocument.dll",
+        "typeguesser.dll",
+        "ucrtbase.dll",
+        "uiautomationclient.dll",
+        "uiautomationclient.resources.dll",
+        "uiautomationclientsideproviders.dll",
+        "uiautomationclientsideproviders.resources.dll",
+        "uiautomationprovider.dll",
+        "uiautomationprovider.resources.dll",
+        "uiautomationtypes.dll",
+        "uiautomationtypes.resources.dll",
+        "universaltypeconverter.dll",
+        "vcruntime140_cor3.dll",
+        "vpksoft.scintillalexers.net.dll",
+        "webview2loader.dll",
+        "wecantspell.hunspell.dll",
+        "weifenluo.winformsui.docking.dll",
+        "weifenluo.winformsui.docking.themevs2015.dll",
+        "windowsbase.dll",
+        "windowsbase.resources.dll",
+        "windowsformsintegration.dll",
+        "windowsformsintegration.resources.dll",
+        "wpfgfx_cor3.dll",
+        "yamldotnet.dll"
     };
 
 
     private readonly object _oTypesLock = new();
     private readonly HashSet<Type> _types = new();
-    public readonly ConcurrentDictionary<string,Type> TypesByName = new();
+    public readonly ConcurrentDictionary<string, Type> TypesByName = new();
 
     /// <summary>
     /// The number of ignored dlls that were skipped because another copy was already seen
@@ -428,12 +427,12 @@ public class SafeDirectoryCatalog
     /// <summary>
     /// Assemblies which could not be loaded
     /// </summary>
-    public Dictionary<string,Exception> BadAssembliesDictionary { get; }
-        
+    public Dictionary<string, Exception> BadAssembliesDictionary { get; }
+
     /// <summary>
     /// Delegate for skipping certain dlls
     /// </summary>
-    public static Func<FileInfo,bool> IgnoreDll { get; set; }
+    public static Func<FileInfo, bool> IgnoreDll { get; set; }
 
     /// <summary>
     /// Creates a new list of MEF plugin classes from the dlls/files in the directory list provided
@@ -445,12 +444,10 @@ public SafeDirectoryCatalog(ICheckNotifier listener, params string[] directories
         BadAssembliesDictionary = new Dictionary<string, Exception>();
 
         foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
-        {
-            foreach (var type in assembly.GetTypes())
-                AddType(type);
-        }
+        foreach (var type in assembly.GetTypes())
+            AddType(type);
         var files = new HashSet<FileInfo>();
-                       
+
         foreach (var directory in directories)
         {
             if (directory is null)
@@ -458,7 +455,7 @@ public SafeDirectoryCatalog(ICheckNotifier listener, params string[] directories
             if (!Directory.Exists(directory))
                 Directory.CreateDirectory(directory); //empty directory 
 
-            foreach(var f in Directory.EnumerateFiles(directory, "*.dll", SearchOption.AllDirectories))
+            foreach (var f in Directory.EnumerateFiles(directory, "*.dll", SearchOption.AllDirectories))
             {
                 var newOne = new FileInfo(f);
                 var existing = files.SingleOrDefault(d => d.Name.Equals(newOne.Name));
@@ -506,16 +503,16 @@ public SafeDirectoryCatalog(ICheckNotifier listener, params string[] directories
         }
 
         // Find and load all the DLLs which are not ignored
-        foreach(var file in files)
-            LoadDll(file,listener);
+        foreach (var file in files)
+            LoadDll(file, listener);
     }
 
     private void LoadDll(FileInfo f, ICheckNotifier listener)
     {
         Assembly ass = null;
         if (Ignore.Contains(f.Name.ToLowerInvariant()))
-          return;
-            
+            return;
+
         try
         {
             ass = AssemblyResolver.LoadFile(f);
@@ -528,7 +525,7 @@ private void LoadDll(FileInfo f, ICheckNotifier listener)
             {
                 listener?.OnCheckPerformed(new CheckEventArgs(
                     ErrorCodes.CouldOnlyHalfLoadDll,
-                    ex,null,
+                    ex, null,
                     ex.Types.Count(t => t != null),
                     ex.Types.Length,
                     f.Name));
@@ -536,17 +533,19 @@ private void LoadDll(FileInfo f, ICheckNotifier listener)
                 AddTypes(f, ex.Types, listener); //the assembly is bad but at least some of the Types were legit
             }
             else
+            {
                 AddBadAssembly(f, ex, listener); //the assembly could not be loaded properly
+            }
         }
         catch (BadImageFormatException)
         {
-            listener?.OnCheckPerformed(new CheckEventArgs($"Did not load '{f}' because it is not a dotnet assembly", CheckResult.Success));
+            listener?.OnCheckPerformed(new CheckEventArgs($"Did not load '{f}' because it is not a dotnet assembly",
+                CheckResult.Success));
         }
         catch (Exception ex)
         {
             AddBadAssembly(f, ex, listener);
         }
-            
     }
 
     /// <summary>
@@ -555,12 +554,10 @@ private void LoadDll(FileInfo f, ICheckNotifier listener)
     /// <param name="newOneVersion"></param>
     /// <param name="existingOneVersion"></param>
     /// <returns></returns>
-    private static bool FileVersionsAreEqual(FileVersionInfo newOneVersion, FileVersionInfo existingOneVersion)
-    {
-        return newOneVersion.FileMajorPart == existingOneVersion.FileMajorPart &&
-               newOneVersion.FileMinorPart == existingOneVersion.FileMinorPart &&
-               newOneVersion.FileBuildPart == existingOneVersion.FileBuildPart;
-    }
+    private static bool FileVersionsAreEqual(FileVersionInfo newOneVersion, FileVersionInfo existingOneVersion) =>
+        newOneVersion.FileMajorPart == existingOneVersion.FileMajorPart &&
+        newOneVersion.FileMinorPart == existingOneVersion.FileMinorPart &&
+        newOneVersion.FileBuildPart == existingOneVersion.FileBuildPart;
 
     /// <summary>
     /// Returns true if the <paramref name="newOneVersion"/> is a later version than <paramref name="existingOneVersion"/>.
@@ -589,25 +586,26 @@ private static bool FileVersionGreaterThan(FileVersionInfo newOneVersion, FileVe
         return false;
     }
 
-    private void AddBadAssembly(FileInfo f, Exception ex,ICheckNotifier listener)
+    private void AddBadAssembly(FileInfo f, Exception ex, ICheckNotifier listener)
     {
-        if (BadAssembliesDictionary.ContainsKey(f.FullName)) return;    // Only report each failure once
+        if (BadAssembliesDictionary.ContainsKey(f.FullName)) return; // Only report each failure once
         BadAssembliesDictionary.Add(f.FullName, ex);
-        listener?.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CouldNotLoadDll, null,ex,f.FullName));
+        listener?.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CouldNotLoadDll, null, ex, f.FullName));
     }
 
     private void AddTypes(FileInfo f, Type[] types, ICheckNotifier listener)
     {
-        foreach(var t in types.Where(t => t is { FullName: not null } && !TypesByName.ContainsKey(t.FullName)))
+        foreach (var t in types.Where(t => t is { FullName: not null } && !TypesByName.ContainsKey(t.FullName)))
             AddType(t);
 
         //tell them as we go how far we are through
-        listener?.OnCheckPerformed(new CheckEventArgs($"Successfully loaded Assembly {f.FullName} into memory", CheckResult.Success));
+        listener?.OnCheckPerformed(new CheckEventArgs($"Successfully loaded Assembly {f.FullName} into memory",
+            CheckResult.Success));
     }
 
-    internal void AddType(Type type, string typeNameOrAlias=null)
+    internal void AddType(Type type, string typeNameOrAlias = null)
     {
-        typeNameOrAlias??=type.FullName;
+        typeNameOrAlias ??= type.FullName;
         //only add it if it is novel
         TypesByName.TryAdd(typeNameOrAlias, type);
 
@@ -619,7 +617,9 @@ internal void AddType(Type type, string typeNameOrAlias=null)
 
     public IEnumerable<Type> GetAllTypes()
     {
-        lock(_oTypesLock)
+        lock (_oTypesLock)
+        {
             return _types.AsEnumerable();
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs b/Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs
index 6900f487b7..3ad5865d20 100644
--- a/Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs
+++ b/Rdmp.Core/Curation/Data/SelfCertifyingDataAccessPoint.cs
@@ -28,7 +28,6 @@ public class SelfCertifyingDataAccessPoint : EncryptedPasswordHost, IDataAccessC
     /// </summary>
     public SelfCertifyingDataAccessPoint()
     {
-
     }
 
     /// <inheritdoc cref="SelfCertifyingDataAccessPoint"/>
@@ -49,8 +48,10 @@ public SelfCertifyingDataAccessPoint(DiscoveredServer server)
 
     /// <inheritdoc/>
     public string Server { get; set; }
+
     /// <inheritdoc/>
     public string Database { get; set; }
+
     /// <inheritdoc/>
     public string Username { get; set; }
 
@@ -70,10 +71,7 @@ public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return new QuerySyntaxHelperFactory().Create(DatabaseType);
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => new QuerySyntaxHelperFactory().Create(DatabaseType);
 
     public bool DiscoverExistence(DataAccessContext context, out string reason)
     {
@@ -87,9 +85,9 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
             reason = ex.Message;
             return false;
         }
-            
 
-        if(!db.Exists())
+
+        if (!db.Exists())
         {
             reason = "database did not exist";
             return false;
@@ -99,8 +97,5 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
         return true;
     }
 
-    internal DiscoveredDatabase Discover(DataAccessContext context)
-    {
-        return DataAccessPortal.ExpectDatabase(this, context);
-    }
+    internal DiscoveredDatabase Discover(DataAccessContext context) => DataAccessPortal.ExpectDatabase(this, context);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Serialization/DatabaseEntityJsonConverter.cs b/Rdmp.Core/Curation/Data/Serialization/DatabaseEntityJsonConverter.cs
index a278768866..47af590d86 100644
--- a/Rdmp.Core/Curation/Data/Serialization/DatabaseEntityJsonConverter.cs
+++ b/Rdmp.Core/Curation/Data/Serialization/DatabaseEntityJsonConverter.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.Curation.Data.Serialization;
 /// <para>Also stores the ObjectExport SharingUID if available which will allow deserializing shared objects that might only exist in a local import form i.e. with a different ID
 /// (<see cref="ShareManager"/>)</para>
 /// </summary>
-public class DatabaseEntityJsonConverter:JsonConverter
+public class DatabaseEntityJsonConverter : JsonConverter
 {
     private readonly ShareManager _shareManager;
 
@@ -54,7 +54,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         writer.WriteRawValue($"\"{_shareManager.GetPersistenceString((IMapsDirectlyToDatabaseTable)value)}\"");
         writer.WriteEndObject();
     }
-        
+
     /// <summary>
     /// Deserializes a persisted <see cref="IMapsDirectlyToDatabaseTable"/> by resolving it as a reference and fetching the original 
     /// object using <see cref="ShareManager.GetObjectFromPersistenceString"/>.
@@ -67,24 +67,24 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
     public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
     {
         if (reader.TokenType == JsonToken.Null) return null;
-            
-        if (reader.TokenType != JsonToken.StartObject) 
+
+        if (reader.TokenType != JsonToken.StartObject)
             throw new JsonReaderException("Malformed json");
-            
+
         //instance to populate
         reader.Read();
 
-        if(!reader.Value.Equals("PersistenceString"))
+        if (!reader.Value.Equals("PersistenceString"))
             throw new JsonReaderException("Malformed json, expected single property PersistenceString");
 
         //read the value
         reader.Read();
-        var o = _shareManager.GetObjectFromPersistenceString((string) reader.Value);
+        var o = _shareManager.GetObjectFromPersistenceString((string)reader.Value);
 
         reader.Read();
 
         //read the end object
-        if(reader.TokenType != JsonToken.EndObject)
+        if (reader.TokenType != JsonToken.EndObject)
             throw new JsonReaderException("Did not find EndObject");
 
 
@@ -96,8 +96,6 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
     /// </summary>
     /// <param name="objectType"></param>
     /// <returns></returns>
-    public override bool CanConvert(Type objectType)
-    {
-        return typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(objectType);
-    }
+    public override bool CanConvert(Type objectType) =>
+        typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(objectType);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Serialization/DictionaryAsArrayResolver.cs b/Rdmp.Core/Curation/Data/Serialization/DictionaryAsArrayResolver.cs
index cd533dfbef..f0f18ebeb2 100644
--- a/Rdmp.Core/Curation/Data/Serialization/DictionaryAsArrayResolver.cs
+++ b/Rdmp.Core/Curation/Data/Serialization/DictionaryAsArrayResolver.cs
@@ -20,12 +20,11 @@ public class DictionaryAsArrayResolver : DefaultContractResolver
 {
     protected override JsonContract CreateContract(Type objectType)
     {
-        if (objectType.GetInterfaces().Any(i => i == typeof(IDictionary) || 
-                                                (i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IDictionary<,>))))
-        {
+        if (objectType.GetInterfaces().Any(i => i == typeof(IDictionary) ||
+                                                (i.IsGenericType && i.GetGenericTypeDefinition() ==
+                                                    typeof(IDictionary<,>))))
             return base.CreateArrayContract(objectType);
-        }
-        
+
         return base.CreateContract(objectType);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs b/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs
index a291345d18..677677b920 100644
--- a/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs
+++ b/Rdmp.Core/Curation/Data/Serialization/JsonConvertExtensions.cs
@@ -30,10 +30,10 @@ public static string SerializeObject(object value, IRDMPPlatformRepositoryServic
         {
             TypeNameHandling = TypeNameHandling.None,
             TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
-            Converters = new JsonConverter[] {databaseEntityJsonConverter},
+            Converters = new JsonConverter[] { databaseEntityJsonConverter },
             ContractResolver = new DictionaryAsArrayResolver()
         };
-            
+
         return JsonConvert.SerializeObject(value, settings);
     }
 
@@ -50,19 +50,22 @@ public static string SerializeObject(object value, IRDMPPlatformRepositoryServic
     /// <param name="repositoryLocator"></param>
     /// <param name="objectsForConstructingStuffWith"></param>
     /// <returns></returns>
-    public static object DeserializeObject(string value, Type type,IRDMPPlatformRepositoryServiceLocator repositoryLocator, params object[] objectsForConstructingStuffWith)
+    public static object DeserializeObject(string value, Type type,
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, params object[] objectsForConstructingStuffWith)
     {
         var databaseEntityJsonConverter = new DatabaseEntityJsonConverter(repositoryLocator);
-        var lazyJsonConverter = new PickAnyConstructorJsonConverter(new[] {repositoryLocator}.Union(objectsForConstructingStuffWith).ToArray());
+        var lazyJsonConverter =
+            new PickAnyConstructorJsonConverter(new[] { repositoryLocator }.Union(objectsForConstructingStuffWith)
+                .ToArray());
 
         var settings = new JsonSerializerSettings
         {
             TypeNameHandling = TypeNameHandling.None,
             TypeNameAssemblyFormatHandling = TypeNameAssemblyFormatHandling.Simple,
-            Converters = new JsonConverter[] {databaseEntityJsonConverter, lazyJsonConverter},
+            Converters = new JsonConverter[] { databaseEntityJsonConverter, lazyJsonConverter },
             ContractResolver = new DictionaryAsArrayResolver()
         };
-            
+
         return JsonConvert.DeserializeObject(value, type, settings);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Serialization/PickAnyConstructorJsonConverter.cs b/Rdmp.Core/Curation/Data/Serialization/PickAnyConstructorJsonConverter.cs
index 69795e31c5..8833c3b033 100644
--- a/Rdmp.Core/Curation/Data/Serialization/PickAnyConstructorJsonConverter.cs
+++ b/Rdmp.Core/Curation/Data/Serialization/PickAnyConstructorJsonConverter.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.Curation.Data.Serialization;
 /// arguments to classes you want to deserialize.  This JsonConverter will assert that it CanConvert any object for which it finds no default constructor and
 /// a single constructor which is compatible with the constructorObjects (or a subset of them)
 /// </summary>
-public class PickAnyConstructorJsonConverter:JsonConverter
+public class PickAnyConstructorJsonConverter : JsonConverter
 {
     private readonly object[] _constructorObjects;
     private ObjectConstructor _objectConstructor;
@@ -67,7 +67,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
         var instance = constructor.Key.Invoke(constructor.Value.ToArray());
 
-        serializer.Populate(reader,instance);
+        serializer.Populate(reader, instance);
 
         var callback = instance as IPickAnyConstructorFinishedCallback;
         callback?.AfterConstruction();
@@ -100,8 +100,6 @@ public override bool CanConvert(Type objectType)
             $"There were {constructors.Count} compatible constructors for the constructorObjects provided");
     }
 
-    private Dictionary<ConstructorInfo, List<object>> GetConstructors(Type objectType)
-    {
-        return ObjectConstructor.GetConstructors(objectType, false, false, _constructorObjects);
-    }
+    private Dictionary<ConstructorInfo, List<object>> GetConstructors(Type objectType) =>
+        ObjectConstructor.GetConstructors(objectType, false, false, _constructorObjects);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Serialization/ShareDefinition.cs b/Rdmp.Core/Curation/Data/Serialization/ShareDefinition.cs
index 7171c2db68..bccab527df 100644
--- a/Rdmp.Core/Curation/Data/Serialization/ShareDefinition.cs
+++ b/Rdmp.Core/Curation/Data/Serialization/ShareDefinition.cs
@@ -53,18 +53,19 @@ public class ShareDefinition
     public Dictionary<RelationshipAttribute, Guid> RelationshipProperties = new();
 
     /// <inheritdoc cref="ShareDefinition"/>
-    public ShareDefinition(Guid sharingGuid, int id, Type type, Dictionary<string, object> properties, Dictionary<RelationshipAttribute, Guid> relationshipProperties)
+    public ShareDefinition(Guid sharingGuid, int id, Type type, Dictionary<string, object> properties,
+        Dictionary<RelationshipAttribute, Guid> relationshipProperties)
     {
         if (!typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(type))
             throw new ArgumentException("Type must be IMapsDirectlyToDatabaseTable", nameof(type));
-            
+
         SharingGuid = sharingGuid;
         ID = id;
         Type = type;
         Properties = properties;
-            
+
         RelationshipProperties = new Dictionary<RelationshipAttribute, Guid>();
-            
+
         foreach (var kvp in relationshipProperties)
             RelationshipProperties.Add(kvp.Key, kvp.Value);
     }
@@ -79,10 +80,8 @@ public Dictionary<string, object> GetDictionaryForImport()
 
         //remove null arguments they won't help us here
         foreach (var key in newDictionary.Keys.ToArray())
-        {
             if (newDictionary[key] == null)
                 newDictionary.Remove(key);
-        }
 
         return newDictionary;
     }
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneousObject.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneousObject.cs
index b621b2d1cc..99cf99cf61 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneousObject.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneousObject.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.Curation.Data.Spontaneous;
 /// <para>SpontaneousObjects all have NEGATIVE IDs which are randomly generated, this lets the RDMP software use ID for object equality without getting confused but prevents the
 /// system from ever accidentally saving a SpontaneousObject into a data table in the Catalogue</para>
 /// </summary>
-public abstract class SpontaneousObject: DatabaseEntity
+public abstract class SpontaneousObject : DatabaseEntity
 {
     /// <summary>
     /// Optional repository for tracking the objects relationship to other <see cref="SpontaneousObject"/>
@@ -29,12 +29,11 @@ public abstract class SpontaneousObject: DatabaseEntity
     /// <param name="repository"></param>
     protected SpontaneousObject(MemoryRepository repository)
     {
-        repository?.InsertAndHydrate(this,new Dictionary<string, object>());
+        repository?.InsertAndHydrate(this, new Dictionary<string, object>());
     }
 
     public override void SaveToDatabase()
     {
-            
     }
 
     public override void DeleteInDatabase()
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedAggregateTopX.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedAggregateTopX.cs
index fb36ea7181..366a8af975 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedAggregateTopX.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedAggregateTopX.cs
@@ -31,7 +31,8 @@ public class SpontaneouslyInventedAggregateTopX : SpontaneousObject, IAggregateT
     /// <param name="topX"></param>
     /// <param name="orderByDirection"></param>
     /// <param name="orderByColumn"></param>
-    public SpontaneouslyInventedAggregateTopX(MemoryRepository repo,int topX, AggregateTopXOrderByDirection orderByDirection, IColumn orderByColumn):base(repo)
+    public SpontaneouslyInventedAggregateTopX(MemoryRepository repo, int topX,
+        AggregateTopXOrderByDirection orderByDirection, IColumn orderByColumn) : base(repo)
     {
         TopX = topX;
         OrderByDirection = orderByDirection;
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedArgument.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedArgument.cs
index a91e91644e..0ff0dfe6a6 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedArgument.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedArgument.cs
@@ -17,7 +17,7 @@ public class SpontaneouslyInventedArgument : SpontaneousObject, IArgument
 {
     private readonly object _value;
 
-    public SpontaneouslyInventedArgument(MemoryRepository repo,string name, object value):base(repo)
+    public SpontaneouslyInventedArgument(MemoryRepository repo, string name, object value) : base(repo)
     {
         Name = name;
         _value = value;
@@ -35,20 +35,11 @@ public void SetValue(object o)
         throw new NotSupportedException();
     }
 
-    public object GetValueAsSystemType()
-    {
-        return _value;
-    }
+    public object GetValueAsSystemType() => _value;
 
-    public Type GetSystemType()
-    {
-        return _value.GetType();
-    }
+    public Type GetSystemType() => _value.GetType();
 
-    public Type GetConcreteSystemType()
-    {
-        return _value.GetType();
-    }
+    public Type GetConcreteSystemType() => _value.GetType();
 
     public void SetType(Type t)
     {
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedColumn.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedColumn.cs
index 8a3e484550..b8d3d5d24a 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedColumn.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedColumn.cs
@@ -14,16 +14,16 @@ namespace Rdmp.Core.Curation.Data.Spontaneous;
 /// <summary>
 /// Spontaneous (memory only) implementation of IColumn.
 /// </summary>
-public class SpontaneouslyInventedColumn : ConcreteColumn,IColumn
+public class SpontaneouslyInventedColumn : ConcreteColumn, IColumn
 {
     public SpontaneouslyInventedColumn(MemoryRepository repo, string alias, string selectSQl)
     {
-        if(string.IsNullOrWhiteSpace(alias))
+        if (string.IsNullOrWhiteSpace(alias))
             throw new Exception("Column must have an alias");
         Alias = alias;
         SelectSQL = selectSQl;
-            
-        repo.InsertAndHydrate(this,new Dictionary<string, object>());
+
+        repo.InsertAndHydrate(this, new Dictionary<string, object>());
     }
 
     public override ColumnInfo ColumnInfo => null;
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilter.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilter.cs
index f89a5f802a..844c9802dd 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilter.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilter.cs
@@ -18,11 +18,11 @@ namespace Rdmp.Core.Curation.Data.Spontaneous;
 /// 
 /// <para>The other way to inject sql code into an ISqlQueryBuilder is via CustomLine but that's less precise.</para>
 /// </summary>
-public class SpontaneouslyInventedFilter:ConcreteFilter
+public class SpontaneouslyInventedFilter : ConcreteFilter
 {
     private readonly MemoryCatalogueRepository _repo;
     private readonly ISqlParameter[] _filterParametersIfAny;
-        
+
     /// <summary>
     /// Creates a new temporary (unsaveable) filter in the given memory <paramref name="repo"/>
     /// </summary>
@@ -32,19 +32,20 @@ public class SpontaneouslyInventedFilter:ConcreteFilter
     /// <param name="name"></param>
     /// <param name="description"></param>
     /// <param name="filterParametersIfAny"></param>
-    public SpontaneouslyInventedFilter(MemoryCatalogueRepository repo,IContainer notionalParent, string whereSql, string name, string description, ISqlParameter[] filterParametersIfAny)
+    public SpontaneouslyInventedFilter(MemoryCatalogueRepository repo, IContainer notionalParent, string whereSql,
+        string name, string description, ISqlParameter[] filterParametersIfAny)
     {
         _repo = repo;
         _filterParametersIfAny = filterParametersIfAny;
         WhereSQL = whereSql;
         Name = name;
         Description = description;
-            
-        repo.InsertAndHydrate(this,new Dictionary<string, object>());
 
-        if(notionalParent != null)
+        repo.InsertAndHydrate(this, new Dictionary<string, object>());
+
+        if (notionalParent != null)
         {
-            repo.AddChild(notionalParent,this);
+            repo.AddChild(notionalParent, this);
             FilterContainer_ID = notionalParent.ID;
         }
     }
@@ -54,17 +55,14 @@ public SpontaneouslyInventedFilter(MemoryCatalogueRepository repo,IContainer not
     /// </summary>
     /// <param name="repo">The repository to store the temporary object in</param>
     /// <param name="copyFrom"></param>
-    public SpontaneouslyInventedFilter(MemoryCatalogueRepository repo,IFilter copyFrom):this(repo,null,copyFrom.WhereSQL,copyFrom.Name,copyFrom.Description,copyFrom.GetAllParameters())
+    public SpontaneouslyInventedFilter(MemoryCatalogueRepository repo, IFilter copyFrom) : this(repo, null,
+        copyFrom.WhereSQL, copyFrom.Name, copyFrom.Description, copyFrom.GetAllParameters())
     {
-            
     }
 
     public override int? ClonedFromExtractionFilter_ID { get; set; }
     public override int? FilterContainer_ID { get; set; }
-    public override ISqlParameter[] GetAllParameters()
-    {
-        return _filterParametersIfAny??Array.Empty<ISqlParameter>();
-    }
+    public override ISqlParameter[] GetAllParameters() => _filterParametersIfAny ?? Array.Empty<ISqlParameter>();
 
     public override IContainer FilterContainer
     {
@@ -77,18 +75,9 @@ public override IContainer FilterContainer
         }
     }
 
-    public override ColumnInfo GetColumnInfoIfExists()
-    {
-        return null;
-    }
+    public override ColumnInfo GetColumnInfoIfExists() => null;
 
-    public override IFilterFactory GetFilterFactory()
-    {
-        return null;
-    }
+    public override IFilterFactory GetFilterFactory() => null;
 
-    public override Catalogue GetCatalogue()
-    {
-        return null;
-    }
+    public override Catalogue GetCatalogue() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilterContainer.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilterContainer.cs
index 806d60a238..78baa0b4ea 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilterContainer.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedFilterContainer.cs
@@ -31,9 +31,10 @@ namespace Rdmp.Core.Curation.Data.Spontaneous;
 /// </summary>
 public class SpontaneouslyInventedFilterContainer : ConcreteContainer, IContainer
 {
-    public SpontaneouslyInventedFilterContainer(MemoryCatalogueRepository repo, IContainer[] subContainersIfAny, IFilter[] filtersIfAny, FilterContainerOperation operation):base(repo)
+    public SpontaneouslyInventedFilterContainer(MemoryCatalogueRepository repo, IContainer[] subContainersIfAny,
+        IFilter[] filtersIfAny, FilterContainerOperation operation) : base(repo)
     {
-        repo.InsertAndHydrate(this,new Dictionary<string, object>());
+        repo.InsertAndHydrate(this, new Dictionary<string, object>());
 
         if (subContainersIfAny != null)
             foreach (var container in subContainersIfAny)
@@ -51,10 +52,7 @@ public SpontaneouslyInventedFilterContainer(MemoryCatalogueRepository repo, ICon
     }
 
 
-    public override Catalogue GetCatalogueIfAny()
-    {
-        return null;
-    }
+    public override Catalogue GetCatalogueIfAny() => null;
 
     public override bool ShouldBeReadOnly(out string reason)
     {
@@ -62,13 +60,9 @@ public override bool ShouldBeReadOnly(out string reason)
         return false;
     }
 
-    public override IContainer DeepCloneEntireTreeRecursivelyIncludingFilters()
-    {
+    public override IContainer DeepCloneEntireTreeRecursivelyIncludingFilters() =>
         throw new NotSupportedException("Spontaneously invented filter containers cannot be cloned");
-    }
 
-    public override IFilterFactory GetFilterFactory()
-    {
+    public override IFilterFactory GetFilterFactory() =>
         throw new NotSupportedException("Spontaneously invented filters do not have a corresponding IFilterFactory");
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedPermissionWindow.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedPermissionWindow.cs
index 89ce690130..7e6e3fb9a2 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedPermissionWindow.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedPermissionWindow.cs
@@ -16,39 +16,39 @@ namespace Rdmp.Core.Curation.Data.Spontaneous;
 /// Spontaneous (non database persisted) version of PermissionWindow.  Use this class when you want to define a runtime only (in memory) window of execution for
 /// caching / loading etc.  SpontaneouslyInventedPermissionWindow are never locked.
 /// </summary>
-public class SpontaneouslyInventedPermissionWindow:SpontaneousObject,IPermissionWindow
+public class SpontaneouslyInventedPermissionWindow : SpontaneousObject, IPermissionWindow
 {
     private readonly ICacheProgress _cp;
 
-    public SpontaneouslyInventedPermissionWindow(ICacheProgress cp):this()
+    public SpontaneouslyInventedPermissionWindow(ICacheProgress cp) : this()
     {
         _cp = cp;
         PermissionWindowPeriods = new List<PermissionWindowPeriod>();
     }
 
-    public SpontaneouslyInventedPermissionWindow(ICacheProgress cp, List<PermissionWindowPeriod> windows):this()
+    public SpontaneouslyInventedPermissionWindow(ICacheProgress cp, List<PermissionWindowPeriod> windows) : this()
     {
         _cp = cp;
         PermissionWindowPeriods = windows;
     }
 
-    private SpontaneouslyInventedPermissionWindow():base(new MemoryRepository())
+    private SpontaneouslyInventedPermissionWindow() : base(new MemoryRepository())
     {
         RequiresSynchronousAccess = true;
         Name = "Spontaneous Permission Window";
     }
 
-        
+
     public static void RefreshLockPropertiesFromDatabase()
     {
-            
     }
 
     public string Name { get; set; }
     public string Description { get; set; }
     public bool RequiresSynchronousAccess { get; set; }
-        
+
     public List<PermissionWindowPeriod> PermissionWindowPeriods { get; private set; }
+
     public bool WithinPermissionWindow()
     {
         //if no periods then yeah its in the window yo
@@ -58,13 +58,13 @@ public bool WithinPermissionWindow()
         return PermissionWindowPeriods.Any(w => w.Contains(DateTime.Now, true));
     }
 
-    public bool WithinPermissionWindow(DateTime dateTimeUTC)
+    public bool WithinPermissionWindow(DateTime dateTimeUTC) => WithinPermissionWindow(DateTime.UtcNow);
+
+    public IEnumerable<ICacheProgress> CacheProgresses
     {
-        return WithinPermissionWindow(DateTime.UtcNow);
+        get { return new[] { _cp }; }
     }
 
-    public IEnumerable<ICacheProgress> CacheProgresses{get { return new[] {_cp}; }}
-
     public void SetPermissionWindowPeriods(List<PermissionWindowPeriod> windowPeriods)
     {
         PermissionWindowPeriods = windowPeriods;
diff --git a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedSqlParameter.cs b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedSqlParameter.cs
index 3d9743db1a..081edbf7e2 100644
--- a/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedSqlParameter.cs
+++ b/Rdmp.Core/Curation/Data/Spontaneous/SpontaneouslyInventedSqlParameter.cs
@@ -22,15 +22,14 @@ public class SpontaneouslyInventedSqlParameter : SpontaneousObject, ISqlParamete
 {
     private readonly IQuerySyntaxHelper _syntaxHelper;
 
-    [Sql]
-    public string ParameterSQL { get; set; }
+    [Sql] public string ParameterSQL { get; set; }
+
+    [Sql] public string Value { get; set; }
 
-    [Sql]
-    public string Value { get; set; }
-        
     public string Comment { get; set; }
 
-    public SpontaneouslyInventedSqlParameter(MemoryRepository repo, string declarationSql, string value, string comment, IQuerySyntaxHelper syntaxHelper):base(repo)
+    public SpontaneouslyInventedSqlParameter(MemoryRepository repo, string declarationSql, string value, string comment,
+        IQuerySyntaxHelper syntaxHelper) : base(repo)
     {
         _syntaxHelper = syntaxHelper;
         ParameterSQL = declarationSql;
@@ -40,16 +39,11 @@ public SpontaneouslyInventedSqlParameter(MemoryRepository repo, string declarati
 
     public string ParameterName => QuerySyntaxHelper.GetParameterNameFromDeclarationSQL(ParameterSQL);
 
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() =>
         //I am my own owner! mwahahaha
-        return this;
-    }
+        this;
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _syntaxHelper;
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => _syntaxHelper;
 
     public void Check(ICheckNotifier notifier)
     {
diff --git a/Rdmp.Core/Curation/Data/StandardRegex.cs b/Rdmp.Core/Curation/Data/StandardRegex.cs
index 6294c29cdd..b048b15a5e 100644
--- a/Rdmp.Core/Curation/Data/StandardRegex.cs
+++ b/Rdmp.Core/Curation/Data/StandardRegex.cs
@@ -27,6 +27,7 @@ public class StandardRegex : DatabaseEntity, ICheckable
     public const string DataLoadEngineGlobalIgnorePattern = "DataLoadEngineGlobalIgnorePattern";
 
     #region Database Properties
+
     private string _conceptName;
     private string _regex;
     private string _description;
@@ -62,7 +63,6 @@ public string Description
 
     public StandardRegex()
     {
-
     }
 
     /// <summary>
@@ -72,10 +72,10 @@ public StandardRegex()
     /// <param name="repository"></param>
     public StandardRegex(ICatalogueRepository repository)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ConceptName", $"New StandardRegex{Guid.NewGuid()}" },
-            {"Regex", ".*"}
+            { "ConceptName", $"New StandardRegex{Guid.NewGuid()}" },
+            { "Regex", ".*" }
         });
     }
 
@@ -88,14 +88,11 @@ internal StandardRegex(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return ConceptName;
-    }
+    public override string ToString() => ConceptName;
 
     public void Check(ICheckNotifier notifier)
     {
-        if(!string.IsNullOrWhiteSpace(Regex))
+        if (!string.IsNullOrWhiteSpace(Regex))
             try
             {
                 new Regex(Regex);
@@ -105,7 +102,5 @@ public void Check(ICheckNotifier notifier)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs("Regex is invalid", CheckResult.Fail, ex));
             }
-           
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/SupportingDocument.cs b/Rdmp.Core/Curation/Data/SupportingDocument.cs
index 57487a7d2d..8610938a52 100644
--- a/Rdmp.Core/Curation/Data/SupportingDocument.cs
+++ b/Rdmp.Core/Curation/Data/SupportingDocument.cs
@@ -25,9 +25,10 @@ namespace Rdmp.Core.Curation.Data;
 /// 
 /// <para>Finally you can tie in the Ticketing system so that you can audit time spent curating the document etc.</para>
 /// </summary>
-public class SupportingDocument : DatabaseEntity,INamed, ISupportingObject
+public class SupportingDocument : DatabaseEntity, INamed, ISupportingObject
 {
     #region Database Properties
+
     private string _name;
     private Uri _uRL;
     private string _description;
@@ -98,15 +99,15 @@ public bool IsGlobal
     public int Catalogue_ID
     {
         get => _catalogueID;
-        set => SetField(ref _catalogueID , value);
+        set => SetField(ref _catalogueID, value);
     }
 
     #endregion
 
     public SupportingDocument()
     {
-
     }
+
     /// <summary>
     /// Creates a new supporting document for helping understand the dataset <paramref name="parent"/>
     /// </summary>
@@ -115,17 +116,19 @@ public SupportingDocument()
     /// <param name="name"></param>
     public SupportingDocument(ICatalogueRepository repository, ICatalogue parent, string name)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"Catalogue_ID", parent.ID}
+            { "Name", name },
+            { "Catalogue_ID", parent.ID }
         });
     }
 
     internal SupportingDocument(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        Catalogue_ID = int.Parse(r["Catalogue_ID"].ToString()); //gets around decimals and other random crud number field types that sql returns
+        Catalogue_ID =
+            int.Parse(r["Catalogue_ID"]
+                .ToString()); //gets around decimals and other random crud number field types that sql returns
         Name = r["Name"].ToString();
         URL = ParseUrl(r, "URL");
         Description = r["Description"].ToString();
@@ -133,12 +136,9 @@ internal SupportingDocument(ICatalogueRepository repository, DbDataReader r)
         Extractable = (bool)r["Extractable"];
         IsGlobal = Convert.ToBoolean(r["IsGlobal"]);
     }
-        
+
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <summary>
     /// Returns true if <see cref="Extractable"/> and has a valid <see cref="URL"/>
@@ -148,7 +148,7 @@ public bool IsReleasable()
     {
         if (!Extractable)
             return false;
-            
+
         //if it has no url or the url is blank or the url is to something that isn't a file
         if (URL == null || string.IsNullOrWhiteSpace(URL.AbsoluteUri) || !URL.IsFile)
             return false;
@@ -168,10 +168,7 @@ public FileInfo GetFileName()
 
         var unescaped = Uri.UnescapeDataString(URL.AbsolutePath);
 
-        if (URL.IsUnc)
-        {
-            return new FileInfo($@"\\{URL.Host}{unescaped}");
-        }
+        if (URL.IsUnc) return new FileInfo($@"\\{URL.Host}{unescaped}");
 
         return new FileInfo(unescaped);
     }
diff --git a/Rdmp.Core/Curation/Data/SupportingSQLTable.cs b/Rdmp.Core/Curation/Data/SupportingSQLTable.cs
index c13700947c..21200dae38 100644
--- a/Rdmp.Core/Curation/Data/SupportingSQLTable.cs
+++ b/Rdmp.Core/Curation/Data/SupportingSQLTable.cs
@@ -28,7 +28,7 @@ namespace Rdmp.Core.Curation.Data;
 /// <para>If the Global flag is set then the SQL will be run and the result provided to every researcher regardless of what datasets they have asked for in 
 /// an extraction, this is useful for large lookups like ICD / SNOMED CT which are likely to be used by many datasets. </para>
 /// </summary>
-public class SupportingSQLTable : DatabaseEntity,INamed, ISupportingObject
+public class SupportingSQLTable : DatabaseEntity, INamed, ISupportingObject
 {
     /// <summary>
     /// The subfolder of extractions in which to put <see cref="Extractable"/> <see cref="SupportingSQLTable"/> when doing project extractions
@@ -36,6 +36,7 @@ public class SupportingSQLTable : DatabaseEntity,INamed, ISupportingObject
     public const string ExtractionFolderName = "SupportingDataTables";
 
     #region Database Properties
+
     private int _catalogue_ID;
     private string _description;
     private string _name;
@@ -124,19 +125,21 @@ public bool IsGlobal
     #endregion
 
     #region Relationships
+
     /// <inheritdoc cref="Catalogue_ID"/>
     [NoMappingToDatabase]
     public Catalogue Catalogue => Repository.GetObjectByID<Catalogue>(Catalogue_ID);
 
     /// <inheritdoc cref="ExternalDatabaseServer_ID"/>
     [NoMappingToDatabase]
-    public ExternalDatabaseServer ExternalDatabaseServer => ExternalDatabaseServer_ID == null ? null : Repository.GetObjectByID<ExternalDatabaseServer>((int)ExternalDatabaseServer_ID);
+    public ExternalDatabaseServer ExternalDatabaseServer => ExternalDatabaseServer_ID == null
+        ? null
+        : Repository.GetObjectByID<ExternalDatabaseServer>((int)ExternalDatabaseServer_ID);
 
     #endregion
 
     public SupportingSQLTable()
     {
-
     }
 
     /// <summary>
@@ -147,10 +150,10 @@ public SupportingSQLTable()
     /// <param name="name"></param>
     public SupportingSQLTable(ICatalogueRepository repository, ICatalogue parent, string name)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"Catalogue_ID", parent.ID}
+            { "Name", name },
+            { "Catalogue_ID", parent.ID }
         });
     }
 
@@ -160,24 +163,21 @@ internal SupportingSQLTable(ICatalogueRepository repository, DbDataReader r)
         Catalogue_ID = int.Parse(r["Catalogue_ID"].ToString());
         Description = r["Description"] as string;
         Name = r["Name"] as string;
-        Extractable = (bool) r["Extractable"];
-        IsGlobal = (bool) r["IsGlobal"];
+        Extractable = (bool)r["Extractable"];
+        IsGlobal = (bool)r["IsGlobal"];
         SQL = r["SQL"] as string;
 
-        if(r["ExternalDatabaseServer_ID"] == null || r["ExternalDatabaseServer_ID"] == DBNull.Value)
-            ExternalDatabaseServer_ID = null; 
+        if (r["ExternalDatabaseServer_ID"] == null || r["ExternalDatabaseServer_ID"] == DBNull.Value)
+            ExternalDatabaseServer_ID = null;
         else
-            ExternalDatabaseServer_ID = Convert.ToInt32(r["ExternalDatabaseServer_ID"]); 
+            ExternalDatabaseServer_ID = Convert.ToInt32(r["ExternalDatabaseServer_ID"]);
 
         Ticket = r["Ticket"] as string;
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
-        
+    public override string ToString() => Name;
+
     /// <summary>
     /// Returns the decrypted connection string you can use to access the data (fetched from ExternalDatabaseServer_ID - which can be null).  If there is no 
     /// ExternalDatabaseServer_ID associated with the SupportingSQLTable then a NotSupportedException will be thrown
diff --git a/Rdmp.Core/Curation/Data/TableInfo.cs b/Rdmp.Core/Curation/Data/TableInfo.cs
index 33374c1b6b..2902cc1d21 100644
--- a/Rdmp.Core/Curation/Data/TableInfo.cs
+++ b/Rdmp.Core/Curation/Data/TableInfo.cs
@@ -38,7 +38,8 @@ namespace Rdmp.Core.Curation.Data;
 /// A TableInfo represents a cached state of the live database table schema.  You can synchronize a TableInfo at any time to handle schema changes
 /// (e.g. dropping columns) (see <see cref="TableInfoSynchronizer"/>).</para>
 /// </summary>
-public class TableInfo : DatabaseEntity,ITableInfo,INamed, IHasFullyQualifiedNameToo, IInjectKnown<ColumnInfo[]>,ICheckable
+public class TableInfo : DatabaseEntity, ITableInfo, INamed, IHasFullyQualifiedNameToo, IInjectKnown<ColumnInfo[]>,
+    ICheckable
 {
     /// <summary>
     /// Cached results of <see cref="GetQuerySyntaxHelper"/>
@@ -46,6 +47,7 @@ public class TableInfo : DatabaseEntity,ITableInfo,INamed, IHasFullyQualifiedNam
     private static ConcurrentDictionary<DatabaseType, IQuerySyntaxHelper> _cachedSyntaxHelpers = new();
 
     #region Database Properties
+
     private string _name;
     private DatabaseType _databaseType;
     private string _server;
@@ -140,7 +142,8 @@ public string Schema
         set => SetField(ref _schema, value);
     }
 
-    public bool IsView {
+    public bool IsView
+    {
         get => _isView;
         set => SetField(ref _isView, value);
     }
@@ -153,20 +156,22 @@ public bool IsView {
 
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public ColumnInfo[] ColumnInfos => _knownColumnInfos.Value;
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public PreLoadDiscardedColumn[] PreLoadDiscardedColumns => Repository.GetAllObjectsWithParent<PreLoadDiscardedColumn>(this);
+    public PreLoadDiscardedColumn[] PreLoadDiscardedColumns =>
+        Repository.GetAllObjectsWithParent<PreLoadDiscardedColumn>(this);
 
     /// <inheritdoc cref="IdentifierDumpServer_ID"/>
     [NoMappingToDatabase]
     public ExternalDatabaseServer IdentifierDumpServer =>
         IdentifierDumpServer_ID == null
             ? null
-            : Repository.GetObjectByID<ExternalDatabaseServer>((int) IdentifierDumpServer_ID);
+            : Repository.GetObjectByID<ExternalDatabaseServer>((int)IdentifierDumpServer_ID);
 
     #endregion
 
@@ -187,8 +192,8 @@ public TableInfo(ICatalogueRepository repository, string name)
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name},
-            {"IdentifierDumpServer_ID",dumpServer?.ID ?? (object) DBNull.Value}
+            { "Name", name },
+            { "IdentifierDumpServer_ID", dumpServer?.ID ?? (object)DBNull.Value }
         });
 
         ClearAllInjections();
@@ -197,7 +202,7 @@ public TableInfo(ICatalogueRepository repository, string name)
     internal TableInfo(ICatalogueRepository repository, DbDataReader r)
         : base(repository, r)
     {
-        Name =r["Name"].ToString();
+        Name = r["Name"].ToString();
         DatabaseType = (DatabaseType)Enum.Parse(typeof(DatabaseType), r["DatabaseType"].ToString());
         Server = r["Server"].ToString();
         Database = r["Database"].ToString();
@@ -205,9 +210,11 @@ internal TableInfo(ICatalogueRepository repository, DbDataReader r)
         Schema = r["Schema"].ToString();
         _validationXml = r["ValidationXml"].ToString();
 
-        IsTableValuedFunction = r["IsTableValuedFunction"] != DBNull.Value && Convert.ToBoolean(r["IsTableValuedFunction"]);
+        IsTableValuedFunction =
+            r["IsTableValuedFunction"] != DBNull.Value && Convert.ToBoolean(r["IsTableValuedFunction"]);
 
-        IsPrimaryExtractionTable = r["IsPrimaryExtractionTable"] != DBNull.Value && Convert.ToBoolean(r["IsPrimaryExtractionTable"]);
+        IsPrimaryExtractionTable = r["IsPrimaryExtractionTable"] != DBNull.Value &&
+                                   Convert.ToBoolean(r["IsPrimaryExtractionTable"]);
 
         IdentifierDumpServer_ID =
             r["IdentifierDumpServer_ID"] == DBNull.Value ? null : (int)r["IdentifierDumpServer_ID"];
@@ -218,16 +225,10 @@ internal TableInfo(ICatalogueRepository repository, DbDataReader r)
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     /// <inheritdoc/>
-    public ISqlParameter[] GetAllParameters()
-    {
-        return CatalogueRepository.GetAllParametersForParentTable(this).ToArray();
-    }
+    public ISqlParameter[] GetAllParameters() => CatalogueRepository.GetAllParametersForParentTable(this).ToArray();
 
     /// <summary>
     /// Sorts two <see cref="TableInfo"/> alphabetically
@@ -236,36 +237,25 @@ public ISqlParameter[] GetAllParameters()
     /// <returns></returns>
     public int CompareTo(object obj)
     {
-        if (obj is TableInfo)
-        {
-            return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
-        }
+        if (obj is TableInfo) return -obj.ToString().CompareTo(ToString()); //sort alphabetically (reverse)
 
         throw new Exception($"Cannot compare {GetType().Name} to {obj.GetType().Name}");
     }
 
 
     /// <inheritdoc/>
-    public string GetRuntimeName()
-    {
-        return GetQuerySyntaxHelper().GetRuntimeName(Name);
-    }
+    public string GetRuntimeName() => GetQuerySyntaxHelper().GetRuntimeName(Name);
 
     /// <inheritdoc cref="ITableInfo.GetFullyQualifiedName"/>
-    public string GetFullyQualifiedName()
-    {
-        return GetQuerySyntaxHelper().EnsureFullyQualified(Database, Schema, GetRuntimeName());
-    }
+    public string GetFullyQualifiedName() =>
+        GetQuerySyntaxHelper().EnsureFullyQualified(Database, Schema, GetRuntimeName());
 
     /// <inheritdoc cref="ITableInfo.GetDatabaseRuntimeName()"/>
-    public string GetDatabaseRuntimeName()
-    {
-        return Database.Trim(QuerySyntaxHelper.TableNameQualifiers);
-    }
+    public string GetDatabaseRuntimeName() => Database.Trim(QuerySyntaxHelper.TableNameQualifiers);
 
 
     /// <inheritdoc/>
-    public string GetDatabaseRuntimeName(LoadStage loadStage,INameDatabasesAndTablesDuringLoads namer = null)
+    public string GetDatabaseRuntimeName(LoadStage loadStage, INameDatabasesAndTablesDuringLoads namer = null)
     {
         var baseName = GetDatabaseRuntimeName();
 
@@ -286,10 +276,8 @@ public string GetRuntimeName(LoadBubble bubble, INameDatabasesAndTablesDuringLoa
     }
 
     /// <inheritdoc/>
-    public string GetRuntimeName(LoadStage stage, INameDatabasesAndTablesDuringLoads tableNamingScheme = null)
-    {
-        return GetRuntimeName(stage.ToLoadBubble(), tableNamingScheme);
-    }
+    public string GetRuntimeName(LoadStage stage, INameDatabasesAndTablesDuringLoads tableNamingScheme = null) =>
+        GetRuntimeName(stage.ToLoadBubble(), tableNamingScheme);
 
     /// <inheritdoc/>
     public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
@@ -307,23 +295,25 @@ public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
     /// <param name="credentials">Credentials to use (username / encrypted password)</param>
     /// <param name="context">When the credentials can be used (Use Any for any case)</param>
     /// <param name="allowOverwriting">False will throw if there is already credentials declared for the table/context</param>
-    public void SetCredentials(DataAccessCredentials credentials, DataAccessContext context, bool allowOverwriting = false)
+    public void SetCredentials(DataAccessCredentials credentials, DataAccessContext context,
+        bool allowOverwriting = false)
     {
-        var existingCredentials = CatalogueRepository.TableInfoCredentialsManager.GetCredentialsIfExistsFor(this, context);
+        var existingCredentials =
+            CatalogueRepository.TableInfoCredentialsManager.GetCredentialsIfExistsFor(this, context);
 
         //if user told us to set credentials to null complain
-        if(credentials == null)
-            throw new Exception("Credentials was null, to remove a credential use TableInfoToCredentialsLinker.BreakLinkBetween instead");
+        if (credentials == null)
+            throw new Exception(
+                "Credentials was null, to remove a credential use TableInfoToCredentialsLinker.BreakLinkBetween instead");
 
         //if there are existing credentials already
         if (existingCredentials != null)
         {
-
             //user is trying to set the same credentials again
-            if(existingCredentials.Equals(credentials))
-                return;//don't bother
+            if (existingCredentials.Equals(credentials))
+                return; //don't bother
 
-            if(!allowOverwriting)
+            if (!allowOverwriting)
                 throw new Exception(
                     $"Cannot overwrite existing credentials {existingCredentials.Name} with new credentials {credentials.Name} with context {context} because allowOverwriting was false");
 
@@ -331,6 +321,7 @@ public void SetCredentials(DataAccessCredentials credentials, DataAccessContext
             //remove the existing link
             CatalogueRepository.TableInfoCredentialsManager.BreakLinkBetween(existingCredentials, this, context);
         }
+
         //create a new one to the new credentials
         CatalogueRepository.TableInfoCredentialsManager.CreateLinkBetween(credentials, this, context);
     }
@@ -344,11 +335,9 @@ public IHasDependencies[] GetObjectsThisDependsOn()
                 .Cast<IHasDependencies>()
                 .ToArray();
     }
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return ColumnInfos.ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => ColumnInfos.ToArray();
 
 
     /// <summary>
@@ -360,7 +349,8 @@ public void Check(ICheckNotifier notifier)
     {
         if (IsLookupTable())
             if (IsPrimaryExtractionTable)
-                notifier.OnCheckPerformed(new CheckEventArgs("Table is both a Lookup table AND is marked IsPrimaryExtractionTable",CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "Table is both a Lookup table AND is marked IsPrimaryExtractionTable", CheckResult.Fail));
 
         try
         {
@@ -369,7 +359,8 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Synchronization failed on TableInfo {this}",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Synchronization failed on TableInfo {this}",
+                CheckResult.Fail, e));
         }
     }
 
@@ -387,52 +378,42 @@ public bool IsLookupTable(ICoreChildProvider childProvider)
     }
 
     /// <inheritdoc/>
-    public bool IsLookupTable()
-    {
-        return _knownIsLookup.Value;
-    }
+    public bool IsLookupTable() => _knownIsLookup.Value;
 
-    private bool FetchIsLookup()
-    {
-        return CatalogueRepository.IsLookupTable(this);
-    }
+    private bool FetchIsLookup() => CatalogueRepository.IsLookupTable(this);
 
     /// <inheritdoc/>
-    public Catalogue[] GetAllRelatedCatalogues()
-    {
-        return CatalogueRepository.GetAllCataloguesUsing(this);
-    }
+    public Catalogue[] GetAllRelatedCatalogues() => CatalogueRepository.GetAllCataloguesUsing(this);
 
     /// <inheritdoc/>
     public IEnumerable<IHasStageSpecificRuntimeName> GetColumnsAtStage(LoadStage loadStage)
     {
         //if it is AdjustRaw then it will also have the pre load discarded columns
         if (loadStage <= LoadStage.AdjustRaw)
-            foreach (var discardedColumn in PreLoadDiscardedColumns.Where(c => c.Destination != DiscardedColumnDestination.Dilute))
+            foreach (var discardedColumn in PreLoadDiscardedColumns.Where(c =>
+                         c.Destination != DiscardedColumnDestination.Dilute))
                 yield return discardedColumn;
 
         //also add column infos
         foreach (var c in ColumnInfos)
             if (loadStage <= LoadStage.AdjustRaw && SpecialFieldNames.IsHicPrefixed(c))
                 continue;
-            else
-            if(loadStage <= LoadStage.AdjustStaging && c.IsAutoIncrement) //auto increment columns do not get created in RAW/STAGING
+            else if (loadStage <= LoadStage.AdjustStaging &&
+                     c.IsAutoIncrement) //auto increment columns do not get created in RAW/STAGING
                 continue;
-            else
-            if(loadStage == LoadStage.AdjustStaging &&
-               //these two do not appear in staging
-               (c.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID)  || c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom))
-              )
+            else if (loadStage == LoadStage.AdjustStaging &&
+                     //these two do not appear in staging
+                     (c.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID) ||
+                      c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom))
+                    )
                 continue;
             else
                 yield return c;
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _cachedSyntaxHelpers.GetOrAdd(DatabaseType,new QuerySyntaxHelperFactory().Create(DatabaseType));
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() =>
+        _cachedSyntaxHelpers.GetOrAdd(DatabaseType, new QuerySyntaxHelperFactory().Create(DatabaseType));
 
     /// <inheritdoc/>
     public void InjectKnown(ColumnInfo[] instance)
@@ -461,10 +442,7 @@ public void ClearAllInjections()
         }
     }
 
-    private ColumnInfo[] FetchColumnInfos()
-    {
-        return Repository.GetAllObjectsWithParent<ColumnInfo,TableInfo>(this);
-    }
+    private ColumnInfo[] FetchColumnInfos() => Repository.GetAllObjectsWithParent<ColumnInfo, TableInfo>(this);
 
     /// <inheritdoc/>
     public DiscoveredTable Discover(DataAccessContext context)
@@ -474,7 +452,7 @@ public DiscoveredTable Discover(DataAccessContext context)
         if (IsTableValuedFunction)
             return db.ExpectTableValuedFunction(GetRuntimeName(), Schema);
 
-        return db.ExpectTable(GetRuntimeName(),Schema, IsView?TableType.View : TableType.Table);
+        return db.ExpectTable(GetRuntimeName(), Schema, IsView ? TableType.View : TableType.Table);
     }
 
     /// <inheritdoc/>
@@ -492,19 +470,19 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
             return false;
         }
 
-        if(!tbl.Database.Server.Exists())
+        if (!tbl.Database.Server.Exists())
         {
             reason = $"Server {tbl.Database.Server} did not exist";
             return false;
         }
 
-        if(!tbl.Database.Exists())
+        if (!tbl.Database.Exists())
         {
             reason = $"Database {tbl.Database} did not exist";
             return false;
         }
 
-        if(!tbl.Exists())
+        if (!tbl.Exists())
         {
             reason = $"Table {tbl.GetFullyQualifiedName()} did not exist";
             return false;
@@ -515,7 +493,6 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
     }
 
 
-
     /// <summary>
     /// Returns true if the TableInfo is a reference to the discovered live table (same database, same table name, same server)
     /// <para>By default servername is not checked since you can have server aliases e.g. localhost\sqlexpress could be the same as 127.0.0.1\sqlexpress</para>
@@ -523,11 +500,11 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
     /// <param name="discoveredTable">Pass true to also check the servername is EXACTLY the same (dangerous due to the fact that servers can be accessed by hostname or IP etc)</param>
     /// <param name="alsoCheckServer"></param>
     /// <returns></returns>
-    public bool Is(DiscoveredTable discoveredTable,bool alsoCheckServer = false)
-    {
-        return GetRuntimeName().Equals(discoveredTable.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase) &&
-               GetDatabaseRuntimeName().Equals(discoveredTable.Database.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase) &&
-               DatabaseType == discoveredTable.Database.Server.DatabaseType &&
-               (!alsoCheckServer || discoveredTable.Database.Server.Name.Equals(Server,StringComparison.CurrentCultureIgnoreCase));
-    }
+    public bool Is(DiscoveredTable discoveredTable, bool alsoCheckServer = false) =>
+        GetRuntimeName().Equals(discoveredTable.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase) &&
+        GetDatabaseRuntimeName()
+            .Equals(discoveredTable.Database.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase) &&
+        DatabaseType == discoveredTable.Database.Server.DatabaseType &&
+        (!alsoCheckServer ||
+         discoveredTable.Database.Server.Name.Equals(Server, StringComparison.CurrentCultureIgnoreCase));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/Data/TicketingSystemConfiguration.cs b/Rdmp.Core/Curation/Data/TicketingSystemConfiguration.cs
index a32d76dc8e..2eced0afce 100644
--- a/Rdmp.Core/Curation/Data/TicketingSystemConfiguration.cs
+++ b/Rdmp.Core/Curation/Data/TicketingSystemConfiguration.cs
@@ -33,6 +33,7 @@ namespace Rdmp.Core.Curation.Data;
 public class TicketingSystemConfiguration : DatabaseEntity, INamed
 {
     #region Database Properties
+
     private bool _isActive;
     private string _url;
     private string _type;
@@ -99,29 +100,28 @@ public int? DataAccessCredentials_ID
     public DataAccessCredentials DataAccessCredentials =>
         DataAccessCredentials_ID == null
             ? null
-            : Repository.GetObjectByID<DataAccessCredentials>((int) DataAccessCredentials_ID);
+            : Repository.GetObjectByID<DataAccessCredentials>((int)DataAccessCredentials_ID);
 
     #endregion
 
     public TicketingSystemConfiguration()
     {
-
     }
 
     /// <inheritdoc/>
-    public TicketingSystemConfiguration(ICatalogueRepository repository, string name):base()
+    public TicketingSystemConfiguration(ICatalogueRepository repository, string name) : base()
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name != null ? (object) name : DBNull.Value},
-            {"IsActive", true}
+            { "Name", name != null ? (object)name : DBNull.Value },
+            { "IsActive", true }
         });
     }
 
     /// <inheritdoc/>
-    internal TicketingSystemConfiguration(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    internal TicketingSystemConfiguration(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
-        IsActive = (bool) r["IsActive"];
+        IsActive = (bool)r["IsActive"];
         Url = r["Url"] as string;
         Type = r["Type"] as string;
         Name = r["Name"] as string;
diff --git a/Rdmp.Core/Curation/Data/WindowLayout.cs b/Rdmp.Core/Curation/Data/WindowLayout.cs
index 79cd0202c9..4106c330ce 100644
--- a/Rdmp.Core/Curation/Data/WindowLayout.cs
+++ b/Rdmp.Core/Curation/Data/WindowLayout.cs
@@ -17,12 +17,13 @@ namespace Rdmp.Core.Curation.Data;
 /// <summary>
 /// Persisted window layout of RDMPMainForm as Xml.  This can be used to reload RDMP to a given layout of windows and can be shared between users.
 /// </summary>
-public class WindowLayout: DatabaseEntity,INamed
+public class WindowLayout : DatabaseEntity, INamed
 {
     #region Database Properties
 
     private string _name;
     private string _layoutData;
+
     #endregion
 
     /// <inheritdoc/>
@@ -45,7 +46,6 @@ public string LayoutData
 
     public WindowLayout()
     {
-
     }
 
     /// <summary>
@@ -56,10 +56,10 @@ public WindowLayout()
     /// <param name="layoutXml">The layout Xml of RDMPMainForm, use GetCurrentLayoutXml to get this, cannot be null</param>
     public WindowLayout(ICatalogueRepository repository, string name, string layoutXml)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name",name},
-            {"LayoutData",layoutXml}
+            { "Name", name },
+            { "LayoutData", layoutXml }
         });
 
         if (ID == 0 || Repository != repository)
@@ -67,15 +67,12 @@ public WindowLayout(ICatalogueRepository repository, string name, string layoutX
     }
 
     /// <inheritdoc/>
-    public WindowLayout(ICatalogueRepository repository, DbDataReader r): base(repository, r)
+    public WindowLayout(ICatalogueRepository repository, DbDataReader r) : base(repository, r)
     {
         Name = r["Name"].ToString();
         LayoutData = r["LayoutData"].ToString();
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/DataHelper/JoinHelper.cs b/Rdmp.Core/Curation/DataHelper/JoinHelper.cs
index 07b4e1cd01..8bd78ac853 100644
--- a/Rdmp.Core/Curation/DataHelper/JoinHelper.cs
+++ b/Rdmp.Core/Curation/DataHelper/JoinHelper.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.Curation.DataHelper;
 /// </summary>
 public class JoinHelper
 {
-        
     /// <summary>
     /// Assembles ANSI Sql for the JOIN section of a query including any supplemental join columns (e.g. T1 LEFT JOIN T2 on T1.A = T2.A AND T1.B = T2.B)
     /// </summary>
@@ -49,25 +48,27 @@ public static string GetJoinSQL(IJoin join)
             return SQL;
 
         SQL = AppendSupplementalJoins(SQL, join);
-            
+
         return SQL;
     }
 
-    private static string GetOnSql(IJoin join,string key1Table,string key2Table, string key1, string key2,out bool hasCustomSql)
+    private static string GetOnSql(IJoin join, string key1Table, string key2Table, string key1, string key2,
+        out bool hasCustomSql)
     {
         var custom = join.GetCustomJoinSql();
 
-        if(!string.IsNullOrWhiteSpace(custom))
+        if (!string.IsNullOrWhiteSpace(custom))
         {
             hasCustomSql = true;
             custom = custom.Replace("{0}", key1Table);
             custom = custom.Replace("{1}", key2Table);
 
             // remove newlines in users SQL
-            custom = Regex.Replace(custom,"\r?\n", " ");
+            custom = Regex.Replace(custom, "\r?\n", " ");
 
             return $" ON {custom}";
         }
+
         hasCustomSql = false;
 
         return $" ON {key1} = {key2}";
@@ -112,7 +113,6 @@ public static string GetJoinSQLForeignKeySideOnly(IJoin join)
     }
 
 
-
     /// <summary>
     /// Gets the JOIN Sql for the JoinInfo as foreign key JOIN primary key on fk.col1 = pk.col2.  Pass in a number
     /// in order to have the primary key table be assigned an alias e.g. 1 to give it t1
@@ -148,8 +148,7 @@ public static string GetJoinSQLPrimaryKeySideOnly(IJoin join, int aliasNumber =
         {
             toReturn =
                 $" {join.ExtractionJoinType} JOIN {primaryTable}{GetOnSql(join, foreignTable, primaryTable, key1, key2, out hasCustomSql)}";
-                
-        }   
+        }
         else
         {
             var lookupAlias = GetLookupTableAlias(aliasNumber);
@@ -165,7 +164,7 @@ public static string GetJoinSQLPrimaryKeySideOnly(IJoin join, int aliasNumber =
             return toReturn;
 
         toReturn = AppendSupplementalJoins(toReturn, join, aliasNumber);
-            
+
         return toReturn;
     }
 
@@ -181,14 +180,12 @@ public static string GetLookupTableAlias(int aliasNumber, bool requirePrefix = f
             return $" AS lookup_{aliasNumber}";
 
         return $"lookup_{aliasNumber}";
-
     }
 
 
     [Pure]
     private static string AppendSupplementalJoins(string sql, IJoin join, int aliasNumber = -1)
     {
-
         var supplementalJoins = join.GetSupplementalJoins();
 
         if (supplementalJoins != null)
@@ -206,23 +203,17 @@ private static string AppendSupplementalJoins(string sql, IJoin join, int aliasN
                 sql = AppendCollation(sql, supplementalJoin);
             }
 
-        
 
         return sql;
     }
 
 
     [Pure]
-    private static string AppendCollation(string sql, ISupplementalJoin supplementalJoin)
-    {
-        return AppendCollation(sql, supplementalJoin.Collation);
-    }
+    private static string AppendCollation(string sql, ISupplementalJoin supplementalJoin) =>
+        AppendCollation(sql, supplementalJoin.Collation);
 
     [Pure]
-    private static string AppendCollation(string sql, IJoin join)
-    {
-        return AppendCollation(sql, join.Collation);
-    }
+    private static string AppendCollation(string sql, IJoin join) => AppendCollation(sql, join.Collation);
 
     [Pure]
     private static string AppendCollation(string sql, string collation)
diff --git a/Rdmp.Core/Curation/FilterImporting/AggregateFilterUIOptions.cs b/Rdmp.Core/Curation/FilterImporting/AggregateFilterUIOptions.cs
index 6418bc9ce6..5e8b8039f2 100644
--- a/Rdmp.Core/Curation/FilterImporting/AggregateFilterUIOptions.cs
+++ b/Rdmp.Core/Curation/FilterImporting/AggregateFilterUIOptions.cs
@@ -22,7 +22,7 @@ public class AggregateFilterUIOptions : FilterUIOptions
     public AggregateFilterUIOptions(AggregateFilter aggregateFilter) : base(aggregateFilter)
     {
         var aggregateConfiguration = aggregateFilter.GetAggregate() ?? throw new Exception(
-                $"AggregateFilter '{aggregateFilter}' (ID={aggregateFilter.ID}) does not belong to any AggregateConfiguration, is it somehow an orphan?");
+            $"AggregateFilter '{aggregateFilter}' (ID={aggregateFilter.ID}) does not belong to any AggregateConfiguration, is it somehow an orphan?");
 
         //it part of an AggregateConfiguration so get the same factory that is used by AggregateEditorUI to tell us about the globals and the columns
         var options = AggregateBuilderOptionsFactory.Create(aggregateConfiguration);
@@ -35,18 +35,9 @@ public AggregateFilterUIOptions(AggregateFilter aggregateFilter) : base(aggregat
         _columns = options.GetAvailableWHEREColumns(aggregateConfiguration);
     }
 
-    public override ITableInfo[] GetTableInfos()
-    {
-        return _tables;
-    }
+    public override ITableInfo[] GetTableInfos() => _tables;
 
-    public override ISqlParameter[] GetGlobalParametersInFilterScope()
-    {
-        return _globals;
-    }
+    public override ISqlParameter[] GetGlobalParametersInFilterScope() => _globals;
 
-    public override IColumn[] GetIColumnsInFilterScope()
-    {
-        return _columns;
-    }
+    public override IColumn[] GetIColumnsInFilterScope() => _columns;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/Construction/AggregateFilterFactory.cs b/Rdmp.Core/Curation/FilterImporting/Construction/AggregateFilterFactory.cs
index 34e513e3c2..9e35ae6a70 100644
--- a/Rdmp.Core/Curation/FilterImporting/Construction/AggregateFilterFactory.cs
+++ b/Rdmp.Core/Curation/FilterImporting/Construction/AggregateFilterFactory.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.Curation.FilterImporting.Construction;
 /// <summary>
 /// Constructs IFilters etc for AggregateConfigurations (See IFilterFactory)
 /// </summary>
-public class AggregateFilterFactory :IFilterFactory
+public class AggregateFilterFactory : IFilterFactory
 {
     private readonly ICatalogueRepository _repository;
 
@@ -28,31 +28,17 @@ public AggregateFilterFactory(ICatalogueRepository repository)
     }
 
     /// <inheritdoc/>
-    public IFilter CreateNewFilter(string name)
-    {
-        return new AggregateFilter(_repository,name);
-    }
+    public IFilter CreateNewFilter(string name) => new AggregateFilter(_repository, name);
 
     /// <inheritdoc/>
-    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL)
-    {
-        return new AggregateFilterParameter(_repository,parameterSQL,(AggregateFilter)filter);
-    }
+    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL) =>
+        new AggregateFilterParameter(_repository, parameterSQL, (AggregateFilter)filter);
 
     /// <inheritdoc/>
-    public Type GetRootOwnerType()
-    {
-        return typeof (AggregateConfiguration);
-    }
+    public Type GetRootOwnerType() => typeof(AggregateConfiguration);
 
     /// <inheritdoc/>
-    public Type GetIContainerTypeIfAny()
-    {
-        return typeof (AggregateFilterContainer);
-    }
+    public Type GetIContainerTypeIfAny() => typeof(AggregateFilterContainer);
 
-    public IContainer CreateNewContainer()
-    {
-        return new AggregateFilterContainer(_repository,FilterContainerOperation.AND);
-    }
+    public IContainer CreateNewContainer() => new AggregateFilterContainer(_repository, FilterContainerOperation.AND);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/Construction/ExtractionFilterFactory.cs b/Rdmp.Core/Curation/FilterImporting/Construction/ExtractionFilterFactory.cs
index cdda43e6be..1f1b2bf4a3 100644
--- a/Rdmp.Core/Curation/FilterImporting/Construction/ExtractionFilterFactory.cs
+++ b/Rdmp.Core/Curation/FilterImporting/Construction/ExtractionFilterFactory.cs
@@ -31,31 +31,18 @@ public ExtractionFilterFactory(ExtractionInformation extractionInformation)
     }
 
     /// <inheritdoc/>
-    public IFilter CreateNewFilter(string name)
-    {
-        return new ExtractionFilter(_repository, name, _extractionInformation);
-    }
+    public IFilter CreateNewFilter(string name) => new ExtractionFilter(_repository, name, _extractionInformation);
 
     /// <inheritdoc/>
-    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL)
-    {
-        return new ExtractionFilterParameter(_repository, parameterSQL, (ExtractionFilter)filter);
-    }
+    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL) =>
+        new ExtractionFilterParameter(_repository, parameterSQL, (ExtractionFilter)filter);
 
     /// <inheritdoc/>
-    public Type GetRootOwnerType()
-    {
-        return typeof(ExtractionInformation);
-    }
+    public Type GetRootOwnerType() => typeof(ExtractionInformation);
 
     /// <inheritdoc/>
-    public Type GetIContainerTypeIfAny()
-    {
-        return null;
-    }
+    public Type GetIContainerTypeIfAny() => null;
 
-    public IContainer CreateNewContainer()
-    {
+    public IContainer CreateNewContainer() =>
         throw new NotSupportedException("Catalogue level master filters do not support IContainers");
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/DeployedExtractionFilterUIOptions.cs b/Rdmp.Core/Curation/FilterImporting/DeployedExtractionFilterUIOptions.cs
index 20a1023717..b8f45428ed 100644
--- a/Rdmp.Core/Curation/FilterImporting/DeployedExtractionFilterUIOptions.cs
+++ b/Rdmp.Core/Curation/FilterImporting/DeployedExtractionFilterUIOptions.cs
@@ -18,7 +18,8 @@ public class DeployedExtractionFilterUIOptions : FilterUIOptions
     private ITableInfo[] _tables;
     private IColumn[] _columns;
 
-    public DeployedExtractionFilterUIOptions(DeployedExtractionFilter deployedExtractionFilter) : base(deployedExtractionFilter)
+    public DeployedExtractionFilterUIOptions(DeployedExtractionFilter deployedExtractionFilter) : base(
+        deployedExtractionFilter)
     {
         var selectedDataSet = deployedExtractionFilter.GetDataset();
 
@@ -37,18 +38,9 @@ public DeployedExtractionFilterUIOptions(DeployedExtractionFilter deployedExtrac
         _columns = columns.ToArray();
     }
 
-    public override ITableInfo[] GetTableInfos()
-    {
-        return _tables;
-    }
+    public override ITableInfo[] GetTableInfos() => _tables;
 
-    public override ISqlParameter[] GetGlobalParametersInFilterScope()
-    {
-        return _globals;
-    }
+    public override ISqlParameter[] GetGlobalParametersInFilterScope() => _globals;
 
-    public override IColumn[] GetIColumnsInFilterScope()
-    {
-        return _columns;
-    }
+    public override IColumn[] GetIColumnsInFilterScope() => _columns;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/ExtractionFilterUIOptions.cs b/Rdmp.Core/Curation/FilterImporting/ExtractionFilterUIOptions.cs
index 6f824fd1c6..f84ef161aa 100644
--- a/Rdmp.Core/Curation/FilterImporting/ExtractionFilterUIOptions.cs
+++ b/Rdmp.Core/Curation/FilterImporting/ExtractionFilterUIOptions.cs
@@ -20,25 +20,16 @@ public ExtractionFilterUIOptions(ExtractionFilter masterCatalogueFilter) : base(
     {
         var c = masterCatalogueFilter.ExtractionInformation.CatalogueItem.Catalogue;
 
-        var colInfo = masterCatalogueFilter.GetColumnInfoIfExists() ?? throw new MissingColumnInfoException($"No ColumnInfo found for filter '{masterCatalogueFilter}'");
+        var colInfo = masterCatalogueFilter.GetColumnInfoIfExists() ??
+                      throw new MissingColumnInfoException($"No ColumnInfo found for filter '{masterCatalogueFilter}'");
         _globals = colInfo.TableInfo.GetAllParameters();
         _tables = c.GetTableInfoList(false);
         _columns = c.GetAllExtractionInformation(ExtractionCategory.Any);
-
     }
 
-    public override ITableInfo[] GetTableInfos()
-    {
-        return _tables;
-    }
+    public override ITableInfo[] GetTableInfos() => _tables;
 
-    public override ISqlParameter[] GetGlobalParametersInFilterScope()
-    {
-        return _globals;
-    }
+    public override ISqlParameter[] GetGlobalParametersInFilterScope() => _globals;
 
-    public override IColumn[] GetIColumnsInFilterScope()
-    {
-        return _columns;
-    }
+    public override IColumn[] GetIColumnsInFilterScope() => _columns;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/FilterImportWizard.cs b/Rdmp.Core/Curation/FilterImporting/FilterImportWizard.cs
index 03d7928d2f..04470cb0c8 100644
--- a/Rdmp.Core/Curation/FilterImporting/FilterImportWizard.cs
+++ b/Rdmp.Core/Curation/FilterImporting/FilterImportWizard.cs
@@ -32,11 +32,11 @@ public FilterImportWizard(IBasicActivateItems activator)
         _activator = activator;
     }
 
-    public IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport)
-    {
-        return Import(containerToImportOneInto, filterToImport, null);
-    }
-    public IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport, ExtractionFilterParameterSet parameterSet)
+    public IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport) =>
+        Import(containerToImportOneInto, filterToImport, null);
+
+    public IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport,
+        ExtractionFilterParameterSet parameterSet)
     {
         GetGlobalsAndFilters(containerToImportOneInto, out var globals, out var otherFilters);
         return Import(containerToImportOneInto, filterToImport, globals, otherFilters, parameterSet);
@@ -48,18 +48,21 @@ public IFilter ImportOneFromSelection(IContainer containerToImportOneInto, IFilt
         return ImportOneFromSelection(containerToImportOneInto, filtersThatCouldBeImported, global, otherFilters);
     }
 
-    public IEnumerable<IFilter> ImportManyFromSelection(IContainer containerToImportOneInto, IFilter[] filtersThatCouldBeImported)
+    public IEnumerable<IFilter> ImportManyFromSelection(IContainer containerToImportOneInto,
+        IFilter[] filtersThatCouldBeImported)
     {
         GetGlobalsAndFilters(containerToImportOneInto, out var global, out var otherFilters);
         return ImportManyFromSelection(containerToImportOneInto, filtersThatCouldBeImported, global, otherFilters);
     }
 
-    private IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport, ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope, ExtractionFilterParameterSet parameterSet)
+    private IFilter Import(IContainer containerToImportOneInto, IFilter filterToImport,
+        ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope, ExtractionFilterParameterSet parameterSet)
     {
         var cancel = false;
 
         //Sometimes filters have some recommended parameter values which the user can pick from (e.g. filter Condition could have parameter value sets for 'Dementia', 'Alzheimers' etc
-        var chosenParameterValues = parameterSet ?? AdvertiseAvailableFilterParameterSetsIfAny(filterToImport, out cancel);
+        var chosenParameterValues =
+            parameterSet ?? AdvertiseAvailableFilterParameterSetsIfAny(filterToImport, out cancel);
 
         if (cancel)
             return null;
@@ -67,20 +70,25 @@ private IFilter Import(IContainer containerToImportOneInto, IFilter filterToImpo
         FilterImporter importer = null;
 
         if (containerToImportOneInto is AggregateFilterContainer)
-            importer = new FilterImporter(new AggregateFilterFactory((ICatalogueRepository)containerToImportOneInto.Repository), globalParameters);
+            importer = new FilterImporter(
+                new AggregateFilterFactory((ICatalogueRepository)containerToImportOneInto.Repository),
+                globalParameters);
         else if (containerToImportOneInto is FilterContainer)
             importer =
-                new FilterImporter(new DeployedExtractionFilterFactory((IDataExportRepository)containerToImportOneInto.Repository), globalParameters);
+                new FilterImporter(
+                    new DeployedExtractionFilterFactory((IDataExportRepository)containerToImportOneInto.Repository),
+                    globalParameters);
         else
             throw new ArgumentException(
-                $"Cannot import into IContainer of type {containerToImportOneInto.GetType().Name}", nameof(containerToImportOneInto));
+                $"Cannot import into IContainer of type {containerToImportOneInto.GetType().Name}",
+                nameof(containerToImportOneInto));
 
         //if there is a parameter value set then tell the importer to use these parameter values instead of the IFilter's default ones
         if (chosenParameterValues != null)
             importer.AlternateValuesToUseForNewParameters = chosenParameterValues.GetAllParameters();
 
         //create the filter
-        var newFilter = importer.ImportFilter(containerToImportOneInto,filterToImport, otherFiltersInScope);
+        var newFilter = importer.ImportFilter(containerToImportOneInto, filterToImport, otherFiltersInScope);
 
         //if we used custom parameter values we should update the filter name so the user is reminded that the concept of the filter includes both 'Condition' and the value they selected e.g. 'Dementia'
         if (chosenParameterValues != null)
@@ -91,64 +99,57 @@ private IFilter Import(IContainer containerToImportOneInto, IFilter filterToImpo
 
         //If we've not imported values but there is a parameter then ask for their values
         if (chosenParameterValues == null && newFilter.GetAllParameters().Any())
-        {
             foreach (var parameter in newFilter.GetAllParameters())
             {
                 var initialText = parameter.Value;
-                if(initialText == AnyTableSqlParameter.DefaultValue)
-                {
-                    initialText = null;
-                }
+                if (initialText == AnyTableSqlParameter.DefaultValue) initialText = null;
 
-                if (_activator.IsInteractive && _activator.TypeText(AnyTableSqlParameter.GetValuePromptDialogArgs(newFilter, parameter), 255, initialText, out var param, false))
+                if (_activator.IsInteractive && _activator.TypeText(
+                        AnyTableSqlParameter.GetValuePromptDialogArgs(newFilter, parameter), 255, initialText,
+                        out var param, false))
                 {
                     parameter.Value = param;
                     parameter.SaveToDatabase();
                 }
             }
-        }
 
         return newFilter;
     }
 
-    private IFilter ImportOneFromSelection(IContainer containerToImportOneInto, IFilter[] filtersThatCouldBeImported, ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope)
+    private IFilter ImportOneFromSelection(IContainer containerToImportOneInto, IFilter[] filtersThatCouldBeImported,
+        ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope)
     {
         var chosenFilter = _activator.SelectOne("Import filter", filtersThatCouldBeImported);
 
         if (chosenFilter != null)
-        {
-            return Import(containerToImportOneInto, (IFilter)chosenFilter, globalParameters, otherFiltersInScope,null);
-        }
+            return Import(containerToImportOneInto, (IFilter)chosenFilter, globalParameters, otherFiltersInScope, null);
 
-        return null;//user chose not to import anything
+        return null; //user chose not to import anything
     }
 
-    private IEnumerable<IFilter> ImportManyFromSelection(IContainer containerToImportOneInto, IFilter[] filtersThatCouldBeImported, ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope)
+    private IEnumerable<IFilter> ImportManyFromSelection(IContainer containerToImportOneInto,
+        IFilter[] filtersThatCouldBeImported, ISqlParameter[] globalParameters, IFilter[] otherFiltersInScope)
     {
         var results = _activator.SelectMany(new DialogArgs
         {
             WindowTitle = "Import Filter(s)",
             EntryLabel = "Import",
-            TaskDescription = "The following Catalogue filters are available for importing.  Selecting a filter will make a new cloned copy in your WHERE container.  If a filter has declared parameters you may be prompted to pick from an existing predetermined set of values."
-
+            TaskDescription =
+                "The following Catalogue filters are available for importing.  Selecting a filter will make a new cloned copy in your WHERE container.  If a filter has declared parameters you may be prompted to pick from an existing predetermined set of values."
         }, typeof(ExtractionFilter), filtersThatCouldBeImported);
 
         if (results is not null)
-        {
             foreach (var f in results)
             {
-                var i = Import(containerToImportOneInto, (IFilter)f, globalParameters, otherFiltersInScope,null);
+                var i = Import(containerToImportOneInto, (IFilter)f, globalParameters, otherFiltersInScope, null);
 
                 // returns null if cancelled
                 if (i != null)
                     yield return i;
                 else
-                {
                     // user cancelled import half way through
                     yield break;
-                }
             }
-        }
     }
 
     private ExtractionFilterParameterSet AdvertiseAvailableFilterParameterSetsIfAny(IFilter filter, out bool cancel)
@@ -159,7 +160,9 @@ private ExtractionFilterParameterSet AdvertiseAvailableFilterParameterSetsIfAny(
         if (filter is not ExtractionFilter extractionFilterOrNull)
             return null;
 
-        var parameterSets = extractionFilterOrNull.Repository.GetAllObjectsWithParent<ExtractionFilterParameterSet>(extractionFilterOrNull);
+        var parameterSets =
+            extractionFilterOrNull.Repository.GetAllObjectsWithParent<ExtractionFilterParameterSet>(
+                extractionFilterOrNull);
 
 
         if (parameterSets.Any())
@@ -168,7 +171,7 @@ private ExtractionFilterParameterSet AdvertiseAvailableFilterParameterSetsIfAny(
             {
                 WindowTitle = "Choose Parameter Set",
                 TaskDescription = @$"Filter '{filter}' has parameters ({
-                    string.Join(',',filter.GetAllParameters().Select(p=>p.ParameterName))
+                    string.Join(',', filter.GetAllParameters().Select(p => p.ParameterName))
                 }).  There are existing parameter sets configured for these parameters.  Choose which parameter values to use with this filter"
             }, parameterSets);
 
@@ -180,7 +183,8 @@ private ExtractionFilterParameterSet AdvertiseAvailableFilterParameterSetsIfAny(
         return null;
     }
 
-    private void GetGlobalsAndFilters(IContainer containerToImportOneInto, out ISqlParameter[] globals, out IFilter[] otherFilters)
+    private void GetGlobalsAndFilters(IContainer containerToImportOneInto, out ISqlParameter[] globals,
+        out IFilter[] otherFilters)
     {
         if (containerToImportOneInto is AggregateFilterContainer aggregatecontainer)
         {
@@ -190,18 +194,24 @@ private void GetGlobalsAndFilters(IContainer containerToImportOneInto, out ISqlP
 
             globals = options.GetAllParameters(aggregate);
             var root = aggregate.RootFilterContainer;
-            otherFilters = root == null ? Array.Empty<IFilter>() : GetAllFiltersRecursively(root, new List<IFilter>()).ToArray();
+            otherFilters = root == null
+                ? Array.Empty<IFilter>()
+                : GetAllFiltersRecursively(root, new List<IFilter>()).ToArray();
             return;
         }
 
         if (containerToImportOneInto is FilterContainer filtercontainer)
         {
-            var selectedDataSet = filtercontainer.GetSelectedDataSetsRecursively() ?? throw new Exception($"Cannot import filter container {filtercontainer} because it does not belong to any SelectedDataSets");
+            var selectedDataSet = filtercontainer.GetSelectedDataSetsRecursively() ??
+                                  throw new Exception(
+                                      $"Cannot import filter container {filtercontainer} because it does not belong to any SelectedDataSets");
             var config = selectedDataSet.ExtractionConfiguration;
             var root = selectedDataSet.RootFilterContainer;
 
             globals = config.GlobalExtractionFilterParameters;
-            otherFilters = root == null ? Array.Empty<IFilter>() : GetAllFiltersRecursively(root, new List<IFilter>()).ToArray();
+            otherFilters = root == null
+                ? Array.Empty<IFilter>()
+                : GetAllFiltersRecursively(root, new List<IFilter>()).ToArray();
 
             return;
         }
diff --git a/Rdmp.Core/Curation/FilterImporting/FilterImporter.cs b/Rdmp.Core/Curation/FilterImporting/FilterImporter.cs
index 37370600f2..18f623f798 100644
--- a/Rdmp.Core/Curation/FilterImporting/FilterImporter.cs
+++ b/Rdmp.Core/Curation/FilterImporting/FilterImporter.cs
@@ -51,24 +51,25 @@ public FilterImporter(IFilterFactory factory, ISqlParameter[] globals)
     /// <param name="fromMaster"></param>
     /// <param name="existingFiltersAlreadyInScope"></param>
     /// <returns></returns>
-    public IFilter ImportFilter(IContainer containerToImportOneInto, IFilter fromMaster, IFilter[] existingFiltersAlreadyInScope)
+    public IFilter ImportFilter(IContainer containerToImportOneInto, IFilter fromMaster,
+        IFilter[] existingFiltersAlreadyInScope)
     {
-        if(fromMaster is ExtractionFilter extractionFilter && extractionFilter.ExtractionInformation.ColumnInfo == null)
+        if (fromMaster is ExtractionFilter extractionFilter &&
+            extractionFilter.ExtractionInformation.ColumnInfo == null)
             throw new Exception(
                 $"Could not import filter {extractionFilter} because it could not be traced back to a ColumnInfo");
 
         //If user is trying to publish a filter into the Catalogue as a new master top level filter, make sure it is properly documented
         if (_factory is ExtractionFilterFactory)
-        {
-            if(!IsProperlyDocumented(fromMaster, out var reason))
+            if (!IsProperlyDocumented(fromMaster, out var reason))
                 throw new Exception($"Cannot clone filter called '{fromMaster.Name}' because:{reason}");
-        }
 
         //Handle problems with existing filters
         existingFiltersAlreadyInScope ??= Array.Empty<IFilter>();
 
-        if(existingFiltersAlreadyInScope.Contains(fromMaster))
-            throw new ArgumentException("Master filter (that you are trying to import) cannot be part of the existing filters collection!");
+        if (existingFiltersAlreadyInScope.Contains(fromMaster))
+            throw new ArgumentException(
+                "Master filter (that you are trying to import) cannot be part of the existing filters collection!");
 
         //Ensure that the new filter has a unique name within the scope
         var name = fromMaster.Name;
@@ -85,30 +86,31 @@ public IFilter ImportFilter(IContainer containerToImportOneInto, IFilter fromMas
         newFilter.WhereSQL = fromMaster.WhereSQL;
 
         //if we are down cloning from a master ExtractionFilter so record that the new filter is
-        if(fromMaster is ExtractionFilter)
-            newFilter.ClonedFromExtractionFilter_ID = fromMaster.ID;//make the new filters parent the master
+        if (fromMaster is ExtractionFilter)
+            newFilter.ClonedFromExtractionFilter_ID = fromMaster.ID; //make the new filters parent the master
 
         //if we are up cloning we are publishing a child into being a new master catalogue filter (ExtractionFilter)
         if (newFilter is ExtractionFilter)
         {
             newFilter.Description +=
                 $"{Environment.NewLine} Published by {Environment.UserName} on {DateTime.Now} from object {fromMaster.GetType().Name} with ID {fromMaster.ID}";
-            fromMaster.ClonedFromExtractionFilter_ID = newFilter.ID;//Make the newly created master our parent (since we are published)
+            fromMaster.ClonedFromExtractionFilter_ID =
+                newFilter.ID; //Make the newly created master our parent (since we are published)
         }
 
-        if(containerToImportOneInto != null)
-        {
-            newFilter.FilterContainer_ID = containerToImportOneInto.ID;
-        }
+        if (containerToImportOneInto != null) newFilter.FilterContainer_ID = containerToImportOneInto.ID;
 
         newFilter.SaveToDatabase();
 
         //If there are some filters already in scope then we need to take into account their parameters when it comes to importing, so fetch a union of all the parameters
-        var existingFiltersParametersAlreadyInScope = existingFiltersAlreadyInScope.SelectMany(f => f.GetAllParameters()).ToArray();
+        var existingFiltersParametersAlreadyInScope =
+            existingFiltersAlreadyInScope.SelectMany(f => f.GetAllParameters()).ToArray();
 
         //now create parameters while respecting globals
-        var parameterCreator = new ParameterCreator(_factory, _globals, AlternateValuesToUseForNewParameters ?? fromMaster.GetAllParameters());
-        parameterCreator.CreateAll(newFilter, existingFiltersParametersAlreadyInScope); //Create the parameters while handling the existing parameters in scope
+        var parameterCreator = new ParameterCreator(_factory, _globals,
+            AlternateValuesToUseForNewParameters ?? fromMaster.GetAllParameters());
+        parameterCreator.CreateAll(newFilter,
+            existingFiltersParametersAlreadyInScope); //Create the parameters while handling the existing parameters in scope
 
         return newFilter;
     }
@@ -121,7 +123,8 @@ public IFilter ImportFilter(IContainer containerToImportOneInto, IFilter fromMas
     /// <param name="allMasters"></param>
     /// <param name="existingFiltersAlreadyInScope"></param>
     /// <returns></returns>
-    public IFilter[] ImportAllFilters(IContainer containerToImportInto, IFilter[] allMasters, IFilter[] existingFiltersAlreadyInScope)
+    public IFilter[] ImportAllFilters(IContainer containerToImportInto, IFilter[] allMasters,
+        IFilter[] existingFiltersAlreadyInScope)
     {
         var createdSoFar = new List<IFilter>();
 
@@ -129,7 +132,8 @@ public IFilter[] ImportAllFilters(IContainer containerToImportInto, IFilter[] al
 
         foreach (var master in allMasters)
         {
-            var added = ImportFilter(containerToImportInto,master, createdSoFar.Union(existingFiltersAlreadyInScope).ToArray());
+            var added = ImportFilter(containerToImportInto, master,
+                createdSoFar.Union(existingFiltersAlreadyInScope).ToArray());
             createdSoFar.Add(added);
         }
 
@@ -148,25 +152,20 @@ public static bool IsProperlyDocumented(IFilter filter, out string reason)
 
         if (string.IsNullOrWhiteSpace(filter.Description))
             reason = "There is no description";
-        else
-        if (filter.Description.Length <= 20)
+        else if (filter.Description.Length <= 20)
             reason = "Description is not long enough (minimum length is 20 characters)";
         else if (string.IsNullOrWhiteSpace(filter.WhereSQL))
             reason = "WhereSQL is not populated";
 
         //if we have not yet found a reason to complain, look at parameters for a reason to complain
         if (reason == null)
-        {
             //check to see if there's a problem with the parameters
             foreach (var filterParameter in filter.GetAllParameters())
-            {
                 if (!ExtractionFilterParameter.IsProperlyDocumented(filterParameter, out var reasonParameterRejected))
                 {
                     reason = $"Parameter '{filterParameter.ParameterName}' was rejected :{reasonParameterRejected}";
                     break;
                 }
-            }
-        }
 
         return reason == null;
     }
diff --git a/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptions.cs b/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptions.cs
index aeddd92919..2bb0a77da0 100644
--- a/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptions.cs
+++ b/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptions.cs
@@ -27,6 +27,7 @@ public class ParameterCollectionUIOptions
     /// True if the <see cref="Collector"/> is <see cref="IMightBeReadOnly"/> and is readonly
     /// </summary>
     public bool ReadOnly { get; set; }
+
     public ParameterLevel CurrentLevel { get; set; }
     public ParameterManager ParameterManager { get; set; }
     private CreateNewSqlParameterHandler _createNewParameterDelegate;
@@ -35,9 +36,9 @@ public class ParameterCollectionUIOptions
 
     public string UseCase { get; private set; }
 
-    public ParameterCollectionUIOptions(string useCase, ICollectSqlParameters collector, ParameterLevel currentLevel, ParameterManager parameterManager, CreateNewSqlParameterHandler createNewParameterDelegate = null)
+    public ParameterCollectionUIOptions(string useCase, ICollectSqlParameters collector, ParameterLevel currentLevel,
+        ParameterManager parameterManager, CreateNewSqlParameterHandler createNewParameterDelegate = null)
     {
-
         UseCase = useCase;
         Collector = collector;
         CurrentLevel = currentLevel;
@@ -53,7 +54,6 @@ public ParameterCollectionUIOptions(string useCase, ICollectSqlParameters collec
     }
 
 
-
     /// <summary>
     /// Method called when creating new parameters if no CreateNewSqlParameterHandler was provided during construction
     /// </summary>
@@ -64,46 +64,29 @@ private ISqlParameter CreateNewParameterDefaultImplementation(ICollectSqlParamet
             parameterName = $"@{parameterName}";
 
         var entity = (IMapsDirectlyToDatabaseTable)collector;
-        var newParam = new AnyTableSqlParameter((ICatalogueRepository)entity.Repository, entity, AnyTableSqlParameter.GetDefaultDeclaration(parameterName))
-            {
-                Value = AnyTableSqlParameter.DefaultValue
-            };
+        var newParam = new AnyTableSqlParameter((ICatalogueRepository)entity.Repository, entity,
+            AnyTableSqlParameter.GetDefaultDeclaration(parameterName))
+        {
+            Value = AnyTableSqlParameter.DefaultValue
+        };
         newParam.SaveToDatabase();
         return newParam;
     }
 
-    public bool CanNewParameters()
-    {
-        return _createNewParameterDelegate != null;
-    }
+    public bool CanNewParameters() => _createNewParameterDelegate != null;
 
-    public ISqlParameter CreateNewParameter(string parameterName)
-    {
-        return _createNewParameterDelegate(Collector, parameterName);
-    }
+    public ISqlParameter CreateNewParameter(string parameterName) =>
+        _createNewParameterDelegate(Collector, parameterName);
 
-    public bool IsHigherLevel(ISqlParameter parameter)
-    {
-        return ParameterManager.GetLevelForParameter(parameter) > CurrentLevel;
-    }
+    public bool IsHigherLevel(ISqlParameter parameter) =>
+        ParameterManager.GetLevelForParameter(parameter) > CurrentLevel;
 
-    private bool IsDifferentLevel(ISqlParameter p)
-    {
-        return ParameterManager.GetLevelForParameter(p) != CurrentLevel;
-    }
+    private bool IsDifferentLevel(ISqlParameter p) => ParameterManager.GetLevelForParameter(p) != CurrentLevel;
 
-    public bool IsOverridden(ISqlParameter sqlParameter)
-    {
-        return ParameterManager.GetOverrideIfAnyFor(sqlParameter) != null;
-    }
+    public bool IsOverridden(ISqlParameter sqlParameter) => ParameterManager.GetOverrideIfAnyFor(sqlParameter) != null;
 
-    public bool ShouldBeDisabled(ISqlParameter p)
-    {
-        return IsOverridden(p) || IsHigherLevel(p) || p is SpontaneousObject;
-    }
+    public bool ShouldBeDisabled(ISqlParameter p) => IsOverridden(p) || IsHigherLevel(p) || p is SpontaneousObject;
 
-    public bool ShouldBeReadOnly(ISqlParameter p)
-    {
-        return ReadOnly || IsOverridden(p) || IsDifferentLevel(p) || p is SpontaneousObject;
-    }
+    public bool ShouldBeReadOnly(ISqlParameter p) =>
+        ReadOnly || IsOverridden(p) || IsDifferentLevel(p) || p is SpontaneousObject;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptionsFactory.cs b/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptionsFactory.cs
index 4dbdb186e3..c773c1553c 100644
--- a/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptionsFactory.cs
+++ b/Rdmp.Core/Curation/FilterImporting/ParameterCollectionUIOptionsFactory.cs
@@ -41,7 +41,6 @@ public class ParameterCollectionUIOptionsFactory
         @"You are trying to perform a data extraction of one or more datasets against a cohort.  It is likely that your datasets contain filters (e.g. 'only records from Tayside').  These filters may contain duplicate parameters (e.g. if you have 5 datasets each filtered by healthboard each with a parameter called @healthboard).  This dialog lets you configure a single 'overriding' master copy at the ExtractionConfiguration level which will allow you to change all copies at once in one place.  You will also see two global parameters the system generates automatically when doing extractions these are @CohortDefinitionID and @ProjectNumber";
 
 
-
     public static ParameterCollectionUIOptions Create(IFilter value, ISqlParameter[] globalFilterParameters)
     {
         var pm = new ParameterManager();
@@ -60,6 +59,7 @@ public static ParameterCollectionUIOptions Create(ITableInfo tableInfo)
         pm.AddParametersFor(tableInfo);
         return new ParameterCollectionUIOptions(UseCaseTableInfo, tableInfo, ParameterLevel.TableInfo, pm);
     }
+
     public static ParameterCollectionUIOptions Create(ExtractionFilterParameterSet parameterSet)
     {
         var pm = new ParameterManager();
@@ -67,13 +67,14 @@ public static ParameterCollectionUIOptions Create(ExtractionFilterParameterSet p
 
         return new ParameterCollectionUIOptions(UseCaseParameterValueSet, parameterSet, ParameterLevel.TableInfo, pm);
     }
-    public static ParameterCollectionUIOptions Create(AggregateConfiguration aggregateConfiguration, ICoreChildProvider coreChildProvider)
+
+    public static ParameterCollectionUIOptions Create(AggregateConfiguration aggregateConfiguration,
+        ICoreChildProvider coreChildProvider)
     {
         ParameterManager pm;
 
         if (aggregateConfiguration.IsCohortIdentificationAggregate)
         {
-
             //Add the globals if it is part of a CohortIdentificationConfiguration
             var cic = aggregateConfiguration.GetCohortIdentificationConfigurationIfAny();
 
@@ -109,11 +110,11 @@ public static ParameterCollectionUIOptions Create(AggregateConfiguration aggrega
         }
 
 
-        return new ParameterCollectionUIOptions(UseCaseAggregateConfiguration, aggregateConfiguration, ParameterLevel.CompositeQueryLevel, pm);
+        return new ParameterCollectionUIOptions(UseCaseAggregateConfiguration, aggregateConfiguration,
+            ParameterLevel.CompositeQueryLevel, pm);
     }
 
 
-
     public ParameterCollectionUIOptions Create(ICollectSqlParameters host, ICoreChildProvider coreChildProvider)
     {
         if (host is TableInfo info)
@@ -139,17 +140,20 @@ public ParameterCollectionUIOptions Create(ICollectSqlParameters host, ICoreChil
         if (host is ExtractionConfiguration extractionConfiguration)
             return Create(extractionConfiguration);
 
-        throw new ArgumentException("Host Type was not recognised as one of the Types we know how to deal with", nameof(host));
+        throw new ArgumentException("Host Type was not recognised as one of the Types we know how to deal with",
+            nameof(host));
     }
 
-    private static ParameterCollectionUIOptions Create(CohortIdentificationConfiguration cohortIdentificationConfiguration, ICoreChildProvider coreChildProvider)
+    private static ParameterCollectionUIOptions Create(
+        CohortIdentificationConfiguration cohortIdentificationConfiguration, ICoreChildProvider coreChildProvider)
     {
         var builder = new CohortQueryBuilder(cohortIdentificationConfiguration, coreChildProvider);
         builder.RegenerateSQL();
 
         var paramManager = builder.ParameterManager;
 
-        return new ParameterCollectionUIOptions(UseCaseCohortIdentificationConfiguration, cohortIdentificationConfiguration, ParameterLevel.Global, paramManager);
+        return new ParameterCollectionUIOptions(UseCaseCohortIdentificationConfiguration,
+            cohortIdentificationConfiguration, ParameterLevel.Global, paramManager);
     }
 
     private ParameterCollectionUIOptions Create(ExtractionConfiguration extractionConfiguration)
@@ -164,20 +168,24 @@ private ParameterCollectionUIOptions Create(ExtractionConfiguration extractionCo
 
             if (rootFilterContainer != null)
             {
-                var allFilters = SqlQueryBuilderHelper.GetAllFiltersUsedInContainerTreeRecursively(rootFilterContainer).ToList();
-                paramManager.AddParametersFor(allFilters);//query level
+                var allFilters = SqlQueryBuilderHelper.GetAllFiltersUsedInContainerTreeRecursively(rootFilterContainer)
+                    .ToList();
+                paramManager.AddParametersFor(allFilters); //query level
             }
         }
 
-        return new ParameterCollectionUIOptions(UseCaseExtractionConfigurationGlobals, extractionConfiguration, ParameterLevel.Global, paramManager, CreateNewParameterForExtractionConfiguration);
+        return new ParameterCollectionUIOptions(UseCaseExtractionConfigurationGlobals, extractionConfiguration,
+            ParameterLevel.Global, paramManager, CreateNewParameterForExtractionConfiguration);
     }
 
-    private ISqlParameter CreateNewParameterForExtractionConfiguration(ICollectSqlParameters collector, string parameterName)
+    private ISqlParameter CreateNewParameterForExtractionConfiguration(ICollectSqlParameters collector,
+        string parameterName)
     {
         if (!parameterName.StartsWith("@"))
             parameterName = $"@{parameterName}";
 
         var ec = (ExtractionConfiguration)collector;
-        return new GlobalExtractionFilterParameter((IDataExportRepository)ec.Repository, ec, AnyTableSqlParameter.GetDefaultDeclaration(parameterName));
+        return new GlobalExtractionFilterParameter((IDataExportRepository)ec.Repository, ec,
+            AnyTableSqlParameter.GetDefaultDeclaration(parameterName));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/FilterImporting/ParameterCreator.cs b/Rdmp.Core/Curation/FilterImporting/ParameterCreator.cs
index e575896542..f2eba1382f 100644
--- a/Rdmp.Core/Curation/FilterImporting/ParameterCreator.cs
+++ b/Rdmp.Core/Curation/FilterImporting/ParameterCreator.cs
@@ -47,7 +47,7 @@ public class ParameterCreator
     /// <param name="importFromIfAny">Desired parameter values, if a filter requires a parameter that matches importFromIfAny then it will get the value from here</param>
     public ParameterCreator(IFilterFactory factory, IEnumerable<ISqlParameter> globals, ISqlParameter[] importFromIfAny)
     {
-        if(globals != null)
+        if (globals != null)
             _globals = globals.ToArray();
 
         _factory = factory;
@@ -64,7 +64,7 @@ public ParameterCreator(IFilterFactory factory, IEnumerable<ISqlParameter> globa
     public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParametersInScope)
     {
         //get what parameter exists
-        var sqlParameters = filterToCreateFor.GetAllParameters()??Array.Empty<ISqlParameter>();
+        var sqlParameters = filterToCreateFor.GetAllParameters() ?? Array.Empty<ISqlParameter>();
 
         //all parameters in the Select SQL
         var parametersRequiredByWhereSQL = GetRequiredParamaterNamesForQuery(filterToCreateFor.WhereSQL, _globals);
@@ -76,7 +76,6 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
 
         //find new parameters that we don't have
         foreach (var requiredParameterName in parametersRequiredByWhereSQL)
-        {
             if (!sqlParameters.Any(p => p.ParameterName.Equals(requiredParameterName)))
             {
                 ISqlParameter matchingTemplateFilter = null;
@@ -84,16 +83,20 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
 
                 //now we might be in the process of cloning another IFilter in which case we want the filters to match the templates ones
                 if (_importFromIfAny != null)
-                    matchingTemplateFilter = _importFromIfAny.SingleOrDefault(t => t.ParameterName.Equals(requiredParameterName));
+                    matchingTemplateFilter =
+                        _importFromIfAny.SingleOrDefault(t => t.ParameterName.Equals(requiredParameterName));
 
                 var proposedNewParameterName = requiredParameterName;
                 var proposedAliasNumber = 2;
 
                 //Figure out of there are any collisions with existing parameters
-                if(existingParametersInScope != null)
-                    if(existingParametersInScope.Any(e => e.ParameterName.Equals(proposedNewParameterName)))//there is a conflict between the parameter you are importing and one that already exists in scope
+                if (existingParametersInScope != null)
+                    if (existingParametersInScope.Any(e =>
+                            e.ParameterName.Equals(
+                                proposedNewParameterName))) //there is a conflict between the parameter you are importing and one that already exists in scope
                     {
-                        while (existingParametersInScope.Any(e => e.ParameterName.Equals(proposedNewParameterName + proposedAliasNumber)))
+                        while (existingParametersInScope.Any(e =>
+                                   e.ParameterName.Equals(proposedNewParameterName + proposedAliasNumber)))
                             proposedAliasNumber++;
 
                         //Naming conflict has been resolved! (by adding the proposed alias number on) so record that this is the new name
@@ -103,12 +106,13 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
                 //The final name is different e.g. bob2 instead of bob so propagate into the WHERE SQL of the filter
                 if (!proposedNewParameterName.Equals(requiredParameterName))
                 {
-                    filterToCreateFor.WhereSQL = RenameParameterInSQL(filterToCreateFor.WhereSQL,requiredParameterName, proposedNewParameterName);
+                    filterToCreateFor.WhereSQL = RenameParameterInSQL(filterToCreateFor.WhereSQL, requiredParameterName,
+                        proposedNewParameterName);
                     filterToCreateFor.SaveToDatabase();
                 }
 
                 //If there is a matching Template Filter
-                if(matchingTemplateFilter != null)
+                if (matchingTemplateFilter != null)
                 {
                     var toCreate = matchingTemplateFilter.ParameterSQL;
 
@@ -117,15 +121,16 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
                         toCreate = toCreate.Replace(requiredParameterName, proposedNewParameterName);
 
                     //construct it as a match to the existing parameter declared at the template level (see below for full match propogation)
-                    newParameter = _factory.CreateNewParameter(filterToCreateFor,toCreate);
+                    newParameter = _factory.CreateNewParameter(filterToCreateFor, toCreate);
                 }
                 else
                 {
                     var syntaxHelper = filterToCreateFor.GetQuerySyntaxHelper();
                     //its not got a template match so just create it as varchar(50)
-                    var declaration = syntaxHelper.GetParameterDeclaration(proposedNewParameterName,new DatabaseTypeRequest(typeof(string),50));
+                    var declaration = syntaxHelper.GetParameterDeclaration(proposedNewParameterName,
+                        new DatabaseTypeRequest(typeof(string), 50));
 
-                    newParameter = _factory.CreateNewParameter(filterToCreateFor,declaration);
+                    newParameter = _factory.CreateNewParameter(filterToCreateFor, declaration);
 
                     if (newParameter != null)
                     {
@@ -133,9 +138,10 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
                         newParameter.SaveToDatabase();
                     }
                 }
-                if (newParameter == null)
-                    throw new NullReferenceException("Parameter construction method returned null, expected it to return an ISqlParameter");
 
+                if (newParameter == null)
+                    throw new NullReferenceException(
+                        "Parameter construction method returned null, expected it to return an ISqlParameter");
 
 
                 //We have a template so copy across the remaining values
@@ -145,9 +151,7 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
                     newParameter.Comment = matchingTemplateFilter.Comment;
                     newParameter.SaveToDatabase();
                 }
-
             }
-        }
     }
 
     /// <summary>
@@ -157,7 +161,8 @@ public void CreateAll(IFilter filterToCreateFor, ISqlParameter[] existingParamet
     /// <param name="whereSql">the SQL filter WHERE section you want to determine the parameter names in, does.  Should not nclude WHERE (only the boolean logic bit)</param>
     /// <param name="globals">optional parameter, an enumerable of parameters that already exist in a superscope (i.e. global parametetrs)</param>
     /// <returns>parameter names that are required by the SQL but are not already declared in the globals</returns>
-    private static HashSet<string> GetRequiredParamaterNamesForQuery(string whereSql, IEnumerable<ISqlParameter> globals)
+    private static HashSet<string> GetRequiredParamaterNamesForQuery(string whereSql,
+        IEnumerable<ISqlParameter> globals)
     {
         var toReturn = QuerySyntaxHelper.GetAllParameterNamesFromQuery(whereSql);
 
diff --git a/Rdmp.Core/Curation/FilterImporting/ParameterRefactorer.cs b/Rdmp.Core/Curation/FilterImporting/ParameterRefactorer.cs
index 9a67336ab3..f7a06745a1 100644
--- a/Rdmp.Core/Curation/FilterImporting/ParameterRefactorer.cs
+++ b/Rdmp.Core/Curation/FilterImporting/ParameterRefactorer.cs
@@ -64,5 +64,4 @@ public bool HandleRename(ISqlParameter parameter, string oldName, string newName
 
         return true;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/ForwardEngineerCatalogue.cs b/Rdmp.Core/Curation/ForwardEngineerCatalogue.cs
index 7cea44e010..59d9943b34 100644
--- a/Rdmp.Core/Curation/ForwardEngineerCatalogue.cs
+++ b/Rdmp.Core/Curation/ForwardEngineerCatalogue.cs
@@ -24,7 +24,6 @@ public class ForwardEngineerCatalogue
     public ForwardEngineerCatalogue(ITableInfo tableInfo, ColumnInfo[] columnInfos, bool markAllExtractable)
         : this(tableInfo, columnInfos)
     {
-
     }
 
     /// <summary>
@@ -40,7 +39,8 @@ public ForwardEngineerCatalogue(ITableInfo tableInfo, ColumnInfo[] columnInfos)
 
 
     /// <inheritdoc cref="ExecuteForwardEngineering()"/>
-    public void ExecuteForwardEngineering(out ICatalogue catalogue, out CatalogueItem[] items, out ExtractionInformation[] extractionInformations)
+    public void ExecuteForwardEngineering(out ICatalogue catalogue, out CatalogueItem[] items,
+        out ExtractionInformation[] extractionInformations)
     {
         ExecuteForwardEngineering(null, out catalogue, out items, out extractionInformations);
     }
@@ -51,7 +51,7 @@ public void ExecuteForwardEngineering(out ICatalogue catalogue, out CatalogueIte
     /// </summary>
     public void ExecuteForwardEngineering()
     {
-        ExecuteForwardEngineering(null,out _,out _,out _);
+        ExecuteForwardEngineering(null, out _, out _, out _);
     }
 
     /// <summary>
@@ -62,12 +62,12 @@ public void ExecuteForwardEngineering()
     /// <param name="intoExistingCatalogue"></param>
     public void ExecuteForwardEngineering(ICatalogue intoExistingCatalogue)
     {
-
         ExecuteForwardEngineering(intoExistingCatalogue, out _, out _, out _);
     }
 
     /// <inheritdoc cref="ExecuteForwardEngineering()"/>
-    public void ExecuteForwardEngineering(ICatalogue intoExistingCatalogue,out ICatalogue catalogue, out CatalogueItem[] catalogueItems, out ExtractionInformation[] extractionInformations)
+    public void ExecuteForwardEngineering(ICatalogue intoExistingCatalogue, out ICatalogue catalogue,
+        out CatalogueItem[] catalogueItems, out ExtractionInformation[] extractionInformations)
     {
         var repo = _tableInfo.CatalogueRepository;
 
@@ -87,7 +87,8 @@ public void ExecuteForwardEngineering(ICatalogue intoExistingCatalogue,out ICata
             order++;
 
             //create it with the same name
-            var cataItem = new CatalogueItem(repo, intoExistingCatalogue, col.Name[(col.Name.LastIndexOf(".") + 1)..].Trim('[', ']', '`','"'));
+            var cataItem = new CatalogueItem(repo, intoExistingCatalogue,
+                col.Name[(col.Name.LastIndexOf(".") + 1)..].Trim('[', ']', '`', '"'));
             catalogueItemsCreated.Add(cataItem);
 
             var newExtractionInfo = new ExtractionInformation(repo, cataItem, col, col.Name)
diff --git a/Rdmp.Core/Curation/IRootFilterContainerHost.cs b/Rdmp.Core/Curation/IRootFilterContainerHost.cs
index 9d71ff57cc..a6b02a4aab 100644
--- a/Rdmp.Core/Curation/IRootFilterContainerHost.cs
+++ b/Rdmp.Core/Curation/IRootFilterContainerHost.cs
@@ -13,9 +13,8 @@ namespace Rdmp.Core.Curation;
 /// <summary>
 /// Interface for objects with <see cref="IContainer"/> (WHERE) logic defined for them
 /// </summary>
-public interface IRootFilterContainerHost: ISaveable, IMapsDirectlyToDatabaseTable, IMightBeReadOnly
+public interface IRootFilterContainerHost : ISaveable, IMapsDirectlyToDatabaseTable, IMightBeReadOnly
 {
-        
     /// <summary>
     /// The root AND/OR container which provides WHERE logic that should be included in the query when extracting the dataset
     /// </summary>
@@ -31,7 +30,7 @@ public interface IRootFilterContainerHost: ISaveable, IMapsDirectlyToDatabaseTab
     /// Returns the root container specified by the <see cref="RootFilterContainer_ID"/>
     /// </summary>
     /// <returns></returns>
-    IContainer RootFilterContainer {get;}
+    IContainer RootFilterContainer { get; }
 
     /// <summary>
     /// Creates an appropriate filter to be the root of the hierarchy (See <see cref="RootFilterContainer"/>)
diff --git a/Rdmp.Core/Curation/LoadDirectory.cs b/Rdmp.Core/Curation/LoadDirectory.cs
index 08f35f7b87..1577085804 100644
--- a/Rdmp.Core/Curation/LoadDirectory.cs
+++ b/Rdmp.Core/Curation/LoadDirectory.cs
@@ -17,14 +17,19 @@ public class LoadDirectory : ILoadDirectory
 {
     /// <inheritdoc/>
     public DirectoryInfo ForLoading { get; private set; }
+
     /// <inheritdoc/>
     public DirectoryInfo ForArchiving { get; private set; }
+
     /// <inheritdoc/>
     public DirectoryInfo Cache { get; private set; }
+
     /// <inheritdoc/>
     public DirectoryInfo RootPath { get; private set; }
+
     /// <inheritdoc/>
     public DirectoryInfo DataPath { get; private set; }
+
     /// <inheritdoc/>
     public DirectoryInfo ExecutablesPath { get; private set; }
 
@@ -39,6 +44,7 @@ public class LoadDirectory : ILoadDirectory
 61,68,date_into_practice,8,yyyyMMdd
 69,76,date_out_of_practice,8,yyyyMMdd
 ";
+
     /// <summary>
     /// Declares that a new directory contains the folder structure required by the DLE.  Thows Exceptions if this folder doesn't exist or isn't set up yet.
     /// 
@@ -67,15 +73,14 @@ public LoadDirectory(string rootPath)
         Cache = FindFolderInPath(DataPath, "Cache");
     }
 
-    private static DirectoryInfo FindFolderInPath(DirectoryInfo path, string folderName)
-    {
-        return path.EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).FirstOrDefault();
-    }
+    private static DirectoryInfo FindFolderInPath(DirectoryInfo path, string folderName) =>
+        path.EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).FirstOrDefault();
 
     private static DirectoryInfo FindFolderInPathOrThrow(DirectoryInfo path, string folderName)
     {
-        var d = path.EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).FirstOrDefault() ?? throw new DirectoryNotFoundException(
-                $"This dataset requires the directory '{folderName}' located at {Path.Combine(path.FullName, folderName)}");
+        var d = path.EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).FirstOrDefault() ??
+                throw new DirectoryNotFoundException(
+                    $"This dataset requires the directory '{folderName}' located at {Path.Combine(path.FullName, folderName)}");
         return d;
     }
 
@@ -86,7 +91,8 @@ private static DirectoryInfo FindFolderInPathOrThrow(DirectoryInfo path, string
     /// <param name="dirName">Root folder name for the DLE e.g. LoadingBiochem</param>
     /// <param name="overrideExistsCheck">Determines behaviour if the folder already exists and contains files.  True to carry on, False to throw an Exception</param>
     /// <returns></returns>
-    public static LoadDirectory CreateDirectoryStructure(DirectoryInfo parentDir, string dirName, bool overrideExistsCheck = false)
+    public static LoadDirectory CreateDirectoryStructure(DirectoryInfo parentDir, string dirName,
+        bool overrideExistsCheck = false)
     {
         if (!parentDir.Exists)
             parentDir.Create();
@@ -96,7 +102,7 @@ public static LoadDirectory CreateDirectoryStructure(DirectoryInfo parentDir, st
         if (!overrideExistsCheck && projectDir.Exists && projectDir.GetFileSystemInfos().Any())
             throw new Exception(
                 $"The directory {projectDir.FullName} already exists (and we don't want to accidentally nuke anything)");
-            
+
         projectDir.Create();
 
         var dataDir = projectDir.CreateSubdirectory("Data");
diff --git a/Rdmp.Core/Curation/SimpleStringValueEncryption.cs b/Rdmp.Core/Curation/SimpleStringValueEncryption.cs
index d5850da943..ca42a5fb96 100644
--- a/Rdmp.Core/Curation/SimpleStringValueEncryption.cs
+++ b/Rdmp.Core/Curation/SimpleStringValueEncryption.cs
@@ -19,8 +19,8 @@ namespace Rdmp.Core.Curation;
 /// </summary>
 public class SimpleStringValueEncryption : IEncryptStrings
 {
-    private readonly RSACryptoServiceProvider _turing= new();
-        
+    private readonly RSACryptoServiceProvider _turing = new();
+
     private const string Key =
         @"<?xml version=""1.0"" encoding=""utf-16""?>
 <RSAParameters xmlns:xsd=""http://www.w3.org/2001/XMLSchema"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">
@@ -55,14 +55,14 @@ public string Encrypt(string toEncrypt)
         aes.GenerateIV();
         aes.GenerateKey();
         var cipherText = Convert.ToBase64String(aes.EncryptCfb(Encoding.UTF8.GetBytes(toEncrypt), aes.IV));
-        var keyBlock = new byte[1+aes.IV.Length+aes.Key.Length];
-        keyBlock[0] = (byte)aes.IV.Length;  // Note: this encoding assumes IV cannot exceed 255 bytes!
-        Array.Copy(aes.IV,0,keyBlock,1,aes.IV.Length);
-        Array.Copy(aes.Key,0,keyBlock,1+aes.IV.Length,aes.Key.Length);
+        var keyBlock = new byte[1 + aes.IV.Length + aes.Key.Length];
+        keyBlock[0] = (byte)aes.IV.Length; // Note: this encoding assumes IV cannot exceed 255 bytes!
+        Array.Copy(aes.IV, 0, keyBlock, 1, aes.IV.Length);
+        Array.Copy(aes.Key, 0, keyBlock, 1 + aes.IV.Length, aes.Key.Length);
         var key = Convert.ToBase64String(_turing.Encrypt(keyBlock, true));
         return $"$js1${key}${cipherText}$";
     }
-        
+
     /// <summary>
     /// Takes an encrypted byte[] (in string format as produced by BitConverter.ToString() 
     /// </summary>
@@ -75,13 +75,14 @@ public string Decrypt(string toDecrypt)
             // Good, it's a new-style AES+RSA encrypted string
             var parts = toDecrypt.Split('$');
             if (parts.Length != 5)
-                throw new CryptographicException("Could not decrypt an encrypted string, it was not in the expected format of $js1$<base64key>$<base64ciphertext>$");
-            var keyBlock = _turing.Decrypt(Convert.FromBase64String(parts[2]),true);
+                throw new CryptographicException(
+                    "Could not decrypt an encrypted string, it was not in the expected format of $js1$<base64key>$<base64ciphertext>$");
+            var keyBlock = _turing.Decrypt(Convert.FromBase64String(parts[2]), true);
             var ivLength = keyBlock[0];
             var iv = new byte[ivLength];
             var key = new byte[keyBlock.Length - 1 - ivLength];
-            Array.Copy(keyBlock,1,iv,0,ivLength);
-            Array.Copy(keyBlock,1+ivLength,key,0,key.Length);
+            Array.Copy(keyBlock, 1, iv, 0, ivLength);
+            Array.Copy(keyBlock, 1 + ivLength, key, 0, key.Length);
             var cipherText = Convert.FromBase64String(parts[3]);
             using var aes = Aes.Create();
             aes.KeySize = 256;
@@ -89,13 +90,16 @@ public string Decrypt(string toDecrypt)
             aes.Key = key;
             return Encoding.UTF8.GetString(aes.DecryptCfb(cipherText, aes.IV));
         }
+
         try
         {
             return Encoding.UTF8.GetString(_turing.Decrypt(ByteConverterGetBytes(toDecrypt), false));
         }
         catch (CryptographicException e)
         {
-            throw new CryptographicException("Could not decrypt an encrypted string, possibly you are trying to decrypt it after having changed the PrivateKey to a different one than at the time it was encrypted?",e);
+            throw new CryptographicException(
+                "Could not decrypt an encrypted string, possibly you are trying to decrypt it after having changed the PrivateKey to a different one than at the time it was encrypted?",
+                e);
         }
     }
 
diff --git a/Rdmp.Core/Curation/SupportingDocumentsFetcher.cs b/Rdmp.Core/Curation/SupportingDocumentsFetcher.cs
index a6a5dba003..4afb3b4f8d 100644
--- a/Rdmp.Core/Curation/SupportingDocumentsFetcher.cs
+++ b/Rdmp.Core/Curation/SupportingDocumentsFetcher.cs
@@ -42,7 +42,7 @@ public string ExtractToDirectory(DirectoryInfo directory)
 
     private static string ExtractToDirectory(DirectoryInfo directory, SupportingDocument supportingDocument)
     {
-        if(!supportingDocument.IsReleasable())
+        if (!supportingDocument.IsReleasable())
             throw new Exception(
                 $"Cannot extract SupportingDocument {supportingDocument} because it was not evaluated as IsReleasable()");
 
@@ -51,13 +51,13 @@ private static string ExtractToDirectory(DirectoryInfo directory, SupportingDocu
         if (!Directory.Exists(Path.Combine(directory.FullName, "SupportingDocuments")))
             Directory.CreateDirectory(Path.Combine(directory.FullName, "SupportingDocuments"));
 
-        if(!toCopy.Exists)
+        if (!toCopy.Exists)
             throw new FileNotFoundException(
                 $"Could not find supporting document '{supportingDocument}' which was expected to be at path:{toCopy.FullName}");
 
         //copy with overwritte
         File.Copy(toCopy.FullName, Path.Combine(directory.FullName, "SupportingDocuments", toCopy.Name), true);
-            
+
         return Path.Combine(directory.FullName, "SupportingDocuments", toCopy.Name);
     }
 
@@ -66,10 +66,9 @@ public void Check(ICheckNotifier notifier)
         if (_singleDocument)
             CheckDocument(_document, notifier);
         else
-        {
-            foreach (var supportingDocument in _catalogue.GetAllSupportingDocuments(FetchOptions.ExtractableGlobalsAndLocals))
+            foreach (var supportingDocument in _catalogue.GetAllSupportingDocuments(FetchOptions
+                         .ExtractableGlobalsAndLocals))
                 CheckDocument(supportingDocument, notifier);
-        }
     }
 
     private void CheckDocument(SupportingDocument document, ICheckNotifier notifier)
@@ -79,7 +78,7 @@ private void CheckDocument(SupportingDocument document, ICheckNotifier notifier)
             notifier.OnCheckPerformed(new CheckEventArgs("SupportingDocument has not been set", CheckResult.Fail));
             return;
         }
-            
+
         try
         {
             var toCopy = document.GetFileName();
@@ -90,12 +89,14 @@ private void CheckDocument(SupportingDocument document, ICheckNotifier notifier)
                         CheckResult.Success));
             else
                 notifier.OnCheckPerformed(
-                    new CheckEventArgs($"SupportingDocument {document }(ID={ document.ID }) does not map to an existing file despite being flagged as Extractable.  Expected it to exist and be at '{toCopy}'",
+                    new CheckEventArgs(
+                        $"SupportingDocument {document}(ID={document.ID}) does not map to an existing file despite being flagged as Extractable.  Expected it to exist and be at '{toCopy}'",
                         CheckResult.Fail));
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not check supporting documents of {_catalogue}", CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not check supporting documents of {_catalogue}",
+                CheckResult.Fail, e));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/SynchronizationFailedException.cs b/Rdmp.Core/Curation/SynchronizationFailedException.cs
index 91c7b8b387..b5e3cfbc26 100644
--- a/Rdmp.Core/Curation/SynchronizationFailedException.cs
+++ b/Rdmp.Core/Curation/SynchronizationFailedException.cs
@@ -14,14 +14,11 @@ namespace Rdmp.Core.Curation;
 /// </summary>
 public class SynchronizationFailedException : Exception
 {
-    public SynchronizationFailedException(string s):base(s)
+    public SynchronizationFailedException(string s) : base(s)
     {
-            
-
     }
 
-    public SynchronizationFailedException(string s, Exception exception):base(s,exception)
+    public SynchronizationFailedException(string s, Exception exception) : base(s, exception)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/TableInfoImporter.cs b/Rdmp.Core/Curation/TableInfoImporter.cs
index ea965c0079..d414113266 100644
--- a/Rdmp.Core/Curation/TableInfoImporter.cs
+++ b/Rdmp.Core/Curation/TableInfoImporter.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.Curation;
 /// Generates TableInfo entries in the ICatalogueRepository based the table/view specified on the live database server.  Can also be used to import new ColumnInfos into existing
 /// TableInfos (See TableInfoSynchronizer).
 /// </summary>
-public class TableInfoImporter:ITableInfoImporter
+public class TableInfoImporter : ITableInfoImporter
 {
     private readonly ICatalogueRepository _repository;
     private readonly string _importFromServer;
@@ -52,10 +52,13 @@ public class TableInfoImporter:ITableInfoImporter
     /// <param name="usageContext"></param>
     /// <param name="importFromSchema"></param>
     /// <param name="importTableType"></param>
-    public TableInfoImporter(ICatalogueRepository repository,string importFromServer, string importDatabaseName, string importTableName, DatabaseType type, string username=null,string password=null, DataAccessContext usageContext=DataAccessContext.Any, string importFromSchema = null,TableType importTableType = TableType.Table)
+    public TableInfoImporter(ICatalogueRepository repository, string importFromServer, string importDatabaseName,
+        string importTableName, DatabaseType type, string username = null, string password = null,
+        DataAccessContext usageContext = DataAccessContext.Any, string importFromSchema = null,
+        TableType importTableType = TableType.Table)
     {
         var syntax = ImplementationManager.GetImplementation(type).GetQuerySyntaxHelper();
-            
+
         _repository = repository;
         _importFromServer = importFromServer;
         _importDatabaseName = importDatabaseName;
@@ -77,7 +80,8 @@ public TableInfoImporter(ICatalogueRepository repository,string importFromServer
     /// <param name="catalogueRepository"></param>
     /// <param name="table"></param>
     /// <param name="usageContext"></param>
-    public TableInfoImporter(ICatalogueRepository catalogueRepository, DiscoveredTable table, DataAccessContext usageContext = DataAccessContext.Any)
+    public TableInfoImporter(ICatalogueRepository catalogueRepository, DiscoveredTable table,
+        DataAccessContext usageContext = DataAccessContext.Any)
         : this(catalogueRepository,
             table.Database.Server.Name,
             table.Database.GetRuntimeName(),
@@ -95,8 +99,9 @@ public TableInfoImporter(ICatalogueRepository catalogueRepository, DiscoveredTab
 
     private void InitializeBuilder()
     {
-        _server = new DiscoveredServer(_importFromServer, _importDatabaseName, _type,_username, _password);
+        _server = new DiscoveredServer(_importFromServer, _importDatabaseName, _type, _username, _password);
     }
+
     #endregion
 
     /// <inheritdoc/>
@@ -108,7 +113,7 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
         }
         catch (Exception e)
         {
-            throw new Exception($"Could not reach server {_server.Name}",e);
+            throw new Exception($"Could not reach server {_server.Name}", e);
         }
 
         var querySyntaxHelper = _server.GetQuerySyntaxHelper();
@@ -127,7 +132,7 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
         var databaseName = querySyntaxHelper.EnsureWrapped(_importDatabaseName);
 
         var discoveredColumns = _server.ExpectDatabase(_importDatabaseName)
-            .ExpectTable(_importTableName,_importFromSchema, _importTableType)
+            .ExpectTable(_importTableName, _importFromSchema, _importTableType)
             .DiscoverColumns();
 
         var parent = new TableInfo(_repository, tableName)
@@ -137,7 +142,6 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
             Server = _importFromServer,
             Schema = _importFromSchema,
             IsView = _importTableType == TableType.View
-
         };
 
         parent.SaveToDatabase();
@@ -145,13 +149,13 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
         var newCols = new List<ColumnInfo>();
 
         foreach (var discoveredColumn in discoveredColumns)
-            newCols.Add(CreateNewColumnInfo(parent,discoveredColumn));
+            newCols.Add(CreateNewColumnInfo(parent, discoveredColumn));
 
         tableInfoCreated = parent;
         columnInfosCreated = newCols.ToArray();
 
         //if there is a username then we need to associate it with the TableInfo we just created
-        if(!string.IsNullOrWhiteSpace(_username) )
+        if (!string.IsNullOrWhiteSpace(_username))
         {
             var credentialsFactory = new DataAccessCredentialsFactory(_repository);
             credentialsFactory.Create(tableInfoCreated, _username, _password, _usageContext);
@@ -159,20 +163,21 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
     }
 
     /// <inheritdoc/>
-    public ColumnInfo CreateNewColumnInfo(ITableInfo parent,DiscoveredColumn discoveredColumn)
+    public ColumnInfo CreateNewColumnInfo(ITableInfo parent, DiscoveredColumn discoveredColumn)
     {
-        var col = new ColumnInfo((ICatalogueRepository) parent.Repository,discoveredColumn.GetFullyQualifiedName(), discoveredColumn.DataType.SQLType, parent)
-            {
-                //if it has an explicitly specified format (Collation)
-                Format = discoveredColumn.Format,
-                //if it is a primary key
-                IsPrimaryKey = discoveredColumn.IsPrimaryKey,
-                IsAutoIncrement = discoveredColumn.IsAutoIncrement,
-                Collation = discoveredColumn.Collation
-            };
+        var col = new ColumnInfo((ICatalogueRepository)parent.Repository, discoveredColumn.GetFullyQualifiedName(),
+            discoveredColumn.DataType.SQLType, parent)
+        {
+            //if it has an explicitly specified format (Collation)
+            Format = discoveredColumn.Format,
+            //if it is a primary key
+            IsPrimaryKey = discoveredColumn.IsPrimaryKey,
+            IsAutoIncrement = discoveredColumn.IsAutoIncrement,
+            Collation = discoveredColumn.Collation
+        };
 
         col.SaveToDatabase();
-        
+
 
         return col;
     }
@@ -183,7 +188,8 @@ public void DoImport()
         DoImport(out _, out _);
     }
 
-    private static readonly string[] ProhibitedNames = {
+    private static readonly string[] ProhibitedNames =
+    {
         "ADD",
         "EXTERNAL",
         "PROCEDURE",
@@ -370,5 +376,4 @@ public void DoImport()
         "EXIT",
         "PROC"
     };
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/TableInfoSynchronizer.cs b/Rdmp.Core/Curation/TableInfoSynchronizer.cs
index f39c46cd3c..7d921b4a39 100644
--- a/Rdmp.Core/Curation/TableInfoSynchronizer.cs
+++ b/Rdmp.Core/Curation/TableInfoSynchronizer.cs
@@ -28,7 +28,7 @@ public class TableInfoSynchronizer
     private DiscoveredServer _toSyncTo;
     private ICatalogueRepository _repository;
 
-    public HashSet<Catalogue> ChangedCatalogues  = new();
+    public HashSet<Catalogue> ChangedCatalogues = new();
 
     /// <summary>
     /// Synchronizes the TableInfo against the underlying database to ensure the Catalogues understanding of what columns exist, what are primary keys,
@@ -42,6 +42,7 @@ public TableInfoSynchronizer(ITableInfo tableToSync)
 
         _toSyncTo = DataAccessPortal.ExpectServer(tableToSync, DataAccessContext.InternalDataProcessing);
     }
+
     /// <summary>
     /// 
     /// </summary>
@@ -63,7 +64,7 @@ public bool Synchronize(ICheckNotifier notifier)
 
         //database exists?
         var expectedDatabase = _toSyncTo.ExpectDatabase(_tableToSync.GetDatabaseRuntimeName());
-        if(!expectedDatabase.Exists())
+        if (!expectedDatabase.Exists())
             throw new SynchronizationFailedException(
                 $"Server did not contain a database called {_tableToSync.GetDatabaseRuntimeName()}");
 
@@ -73,18 +74,20 @@ public bool Synchronize(ICheckNotifier notifier)
 
         if (_tableToSync.IsTableValuedFunction)
         {
-            expectedTable = expectedDatabase.ExpectTableValuedFunction(_tableToSync.GetRuntimeName(),_tableToSync.Schema);
-            if(!expectedTable.Exists())
+            expectedTable =
+                expectedDatabase.ExpectTableValuedFunction(_tableToSync.GetRuntimeName(), _tableToSync.Schema);
+            if (!expectedTable.Exists())
                 throw new SynchronizationFailedException(
                     $"Database {expectedDatabase} did not contain a TABLE VALUED FUNCTION called {_tableToSync.GetRuntimeName()}");
         }
         else
         {
             //table exists?
-            expectedTable = expectedDatabase.ExpectTable(_tableToSync.GetRuntimeName(),_tableToSync.Schema,_tableToSync.IsView ? TableType.View:TableType.Table);
-            if(!expectedTable.Exists())
+            expectedTable = expectedDatabase.ExpectTable(_tableToSync.GetRuntimeName(), _tableToSync.Schema,
+                _tableToSync.IsView ? TableType.View : TableType.Table);
+            if (!expectedTable.Exists())
                 throw new SynchronizationFailedException(
-                    $"Database {expectedDatabase} did not contain a {(_tableToSync.IsView ? "view" : "table") } called {_tableToSync.GetRuntimeName()} (make sure you have marked whether it is a table/view and that it exists in your database)");
+                    $"Database {expectedDatabase} did not contain a {(_tableToSync.IsView ? "view" : "table")} called {_tableToSync.GetRuntimeName()} (make sure you have marked whether it is a table/view and that it exists in your database)");
         }
 
         try
@@ -94,7 +97,8 @@ public bool Synchronize(ICheckNotifier notifier)
         catch (SqlException e)
         {
             throw new Exception(
-                $"Failed to enumerate columns in {_toSyncTo} (we were attempting to synchronize the TableInfo {_tableToSync} (ID={_tableToSync.ID}).  Check the inner exception for specifics", e);
+                $"Failed to enumerate columns in {_toSyncTo} (we were attempting to synchronize the TableInfo {_tableToSync} (ID={_tableToSync.ID}).  Check the inner exception for specifics",
+                e);
         }
 
         var catalogueColumns = _tableToSync.ColumnInfos.ToArray();
@@ -113,74 +117,79 @@ public bool Synchronize(ICheckNotifier notifier)
 
         //for importing new stuff
         if (_tableToSync.IsTableValuedFunction)
-            importer = new TableValuedFunctionImporter(_repository, (DiscoveredTableValuedFunction) expectedTable);
+            importer = new TableValuedFunctionImporter(_repository, (DiscoveredTableValuedFunction)expectedTable);
         else
-            importer = new TableInfoImporter(_repository, _toSyncTo.Name, _toSyncTo.GetCurrentDatabase().GetRuntimeName(), _tableToSync.GetRuntimeName(), _tableToSync.DatabaseType, username: usr, password: pwd, importFromSchema: _tableToSync.Schema, importTableType:_tableToSync.IsView ? TableType.View:TableType.Table);
+            importer = new TableInfoImporter(_repository, _toSyncTo.Name,
+                _toSyncTo.GetCurrentDatabase().GetRuntimeName(), _tableToSync.GetRuntimeName(),
+                _tableToSync.DatabaseType, usr, pwd, importFromSchema: _tableToSync.Schema,
+                importTableType: _tableToSync.IsView ? TableType.View : TableType.Table);
 
-        var newColumnsInLive = 
+        var newColumnsInLive =
             liveColumns.Where(
-                live => !catalogueColumns.Any(columnInfo => 
+                live => !catalogueColumns.Any(columnInfo =>
                     columnInfo.GetRuntimeName()
                         .Equals(live.GetRuntimeName()))).ToArray();
 
         //there are new columns in the live database that are not in the Catalogue
-        if(newColumnsInLive.Any())
+        if (newColumnsInLive.Any())
         {
             //see if user wants to add missing columns
             var addMissingColumns = notifier.OnCheckPerformed(new CheckEventArgs(
-                $"The following columns are missing from the TableInfo:{string.Join(",", newColumnsInLive.Select(c => c.GetRuntimeName()))}",CheckResult.Fail,null,"The ColumnInfos will be created and added to the TableInfo"));
+                $"The following columns are missing from the TableInfo:{string.Join(",", newColumnsInLive.Select(c => c.GetRuntimeName()))}",
+                CheckResult.Fail, null, "The ColumnInfos will be created and added to the TableInfo"));
 
             var added = new List<ColumnInfo>();
 
-            if(addMissingColumns)
+            if (addMissingColumns)
             {
                 foreach (var missingColumn in newColumnsInLive)
                     added.Add(importer.CreateNewColumnInfo(_tableToSync, missingColumn));
 
-                ForwardEngineerExtractionInformationIfAppropriate(added,notifier);
+                ForwardEngineerExtractionInformationIfAppropriate(added, notifier);
             }
             else
+            {
                 IsSynched = false;
+            }
         }
 
         //See if we need to delete any ColumnInfos
-        var columnsInCatalogueButSinceDisapeared = 
+        var columnsInCatalogueButSinceDisapeared =
             catalogueColumns
                 .Where(columnInfo => !liveColumns.Any( //there are not any
-                        c=>columnInfo.GetRuntimeName().Equals(c.GetRuntimeName())) //columns with the same name between discovery/columninfo
+                        c => columnInfo.GetRuntimeName()
+                            .Equals(c.GetRuntimeName())) //columns with the same name between discovery/columninfo
                 ).ToArray();
 
         if (columnsInCatalogueButSinceDisapeared.Any())
-        {
             foreach (var columnInfo in columnsInCatalogueButSinceDisapeared)
             {
-
                 var deleteExtraColumnInfos = notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"The ColumnInfo {columnInfo.GetRuntimeName()} no longer appears in the live table.",CheckResult.Fail,null,
+                    $"The ColumnInfo {columnInfo.GetRuntimeName()} no longer appears in the live table.",
+                    CheckResult.Fail, null,
                     $"Delete ColumnInfo {columnInfo.GetRuntimeName()}"));
                 if (deleteExtraColumnInfos)
                     columnInfo.DeleteInDatabase();
                 else
                     IsSynched = false;
             }
-        }
 
         _tableToSync.ClearAllInjections();
 
         if (IsSynched)
-            IsSynched = SynchronizeTypes(notifier,liveColumns);
-            
-        if (IsSynched && !_tableToSync.IsTableValuedFunction)//table valued functions don't have primary keys!
+            IsSynched = SynchronizeTypes(notifier, liveColumns);
+
+        if (IsSynched && !_tableToSync.IsTableValuedFunction) //table valued functions don't have primary keys!
             IsSynched = SynchronizeField(liveColumns, _tableToSync.ColumnInfos, notifier, "IsPrimaryKey");
 
-        if (IsSynched && !_tableToSync.IsTableValuedFunction)//table valued functions don't have autonum
+        if (IsSynched && !_tableToSync.IsTableValuedFunction) //table valued functions don't have autonum
             IsSynched = SynchronizeField(liveColumns, _tableToSync.ColumnInfos, notifier, "IsAutoIncrement");
 
         if (IsSynched)
             IsSynched = SynchronizeField(liveColumns, _tableToSync.ColumnInfos, notifier, "Collation");
 
         if (IsSynched && _tableToSync.IsTableValuedFunction)
-            IsSynched = SynchronizeParameters((TableValuedFunctionImporter)importer,notifier);
+            IsSynched = SynchronizeParameters((TableValuedFunctionImporter)importer, notifier);
 
         _tableToSync.ClearAllInjections();
 
@@ -197,19 +206,21 @@ private void ForwardEngineerExtractionInformationIfAppropriate(List<ColumnInfo>
         //if there is only one catalogue powered by this TableInfo
         if (relatedCatalogues.Length == 1)
             //And there are ExtractionInformations already for ColumnInfos in this _tableToSync
-            if (relatedCatalogues[0].GetAllExtractionInformation(ExtractionCategory.Any).Any(e => e.ColumnInfo != null && e.ColumnInfo.TableInfo_ID == _tableToSync.ID))
+            if (relatedCatalogues[0].GetAllExtractionInformation(ExtractionCategory.Any).Any(e =>
+                    e.ColumnInfo != null && e.ColumnInfo.TableInfo_ID == _tableToSync.ID))
                 //And user wants to create new ExtractionInformations for the newly created sync'd ColumnInfos
                 if (notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"Would you also like to make these columns Extractable in Catalogue {relatedCatalogues[0].Name}?", CheckResult.Warning, null,
+                            $"Would you also like to make these columns Extractable in Catalogue {relatedCatalogues[0].Name}?",
+                            CheckResult.Warning, null,
                             "Also make columns Extractable?")))
                 {
                     //Create CatalogueItems for the new columns
                     var c = new ForwardEngineerCatalogue(_tableToSync, added.ToArray());
 
                     //In the Catalogue
-                    c.ExecuteForwardEngineering(relatedCatalogues[0],out var cata, out var cis, out var eis);
-                        
+                    c.ExecuteForwardEngineering(relatedCatalogues[0], out var cata, out var cis, out var eis);
+
                     //make them extractable only as internal since it is likely they could contain sensitive data if user is just used to hammering Ok on all dialogues
                     foreach (var e in eis)
                     {
@@ -218,54 +229,59 @@ private void ForwardEngineerExtractionInformationIfAppropriate(List<ColumnInfo>
                     }
 
                     ChangedCatalogues.Add(relatedCatalogues[0]);
-
                 }
     }
 
     private bool SynchronizeTypes(ICheckNotifier notifier, DiscoveredColumn[] liveColumns)
     {
         var IsSynched = true;
-            
+
         foreach (var columnInfo in _tableToSync.ColumnInfos)
         {
             var liveState = liveColumns.Single(c => c.GetRuntimeName().Equals(columnInfo.GetRuntimeName()));
-                
+
             //deal with mismatch in type
             if (!liveState.DataType.SQLType.Equals(columnInfo.Data_type))
                 if (notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"ColumnInfo {{{columnInfo.Name}}} is type {liveState.DataType.SQLType} in the live database but in the Catalogue appears as {columnInfo.Data_type}",CheckResult.Fail,null,
+                        $"ColumnInfo {{{columnInfo.Name}}} is type {liveState.DataType.SQLType} in the live database but in the Catalogue appears as {columnInfo.Data_type}",
+                        CheckResult.Fail, null,
                         "Update type in Catalogue?")))
                 {
                     columnInfo.Data_type = liveState.DataType.SQLType;
                     columnInfo.SaveToDatabase();
                 }
                 else
+                {
                     IsSynched = false;
+                }
 
             //if column has collation and live collation is not matching the one in the catalogue
             if (!string.IsNullOrWhiteSpace(liveState.Format) && !liveState.Format.Equals(columnInfo.Format))
                 if (
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Mismatch between format in live of {liveState.Format} and Catalogue entry {columnInfo.Format}",CheckResult.Fail,null, "Fix collation on ColumnInfo record to match live")))
+                        $"Mismatch between format in live of {liveState.Format} and Catalogue entry {columnInfo.Format}",
+                        CheckResult.Fail, null, "Fix collation on ColumnInfo record to match live")))
                 {
                     columnInfo.Format = liveState.Format;
                     columnInfo.SaveToDatabase();
                 }
                 else
+                {
                     IsSynched = false;
+                }
         }
 
         return IsSynched;
-
     }
 
-    private static bool SynchronizeField(DiscoveredColumn[] liveColumns,ColumnInfo[] columnsInCatalogue, ICheckNotifier notifier,string property)
+    private static bool SynchronizeField(DiscoveredColumn[] liveColumns, ColumnInfo[] columnsInCatalogue,
+        ICheckNotifier notifier, string property)
     {
         var IsSynched = true;
 
-        var discoveredPropertyGetter = typeof (DiscoveredColumn).GetProperty(property);
+        var discoveredPropertyGetter = typeof(DiscoveredColumn).GetProperty(property);
         var cataloguePropertyGetter = typeof(ColumnInfo).GetProperty(property);
-            
+
         foreach (var cataColumn in columnsInCatalogue)
         {
             var catalogueValue = cataloguePropertyGetter.GetValue(cataColumn);
@@ -277,7 +293,8 @@ private static bool SynchronizeField(DiscoveredColumn[] liveColumns,ColumnInfo[]
             if (!Equals(catalogueValue, liveValue))
             {
                 var fix = notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"{property} in ColumnInfo {cataColumn} is '{catalogueValue} but in live table it is '{liveValue}'", CheckResult.Fail, null, "Update to live value?"));
+                    $"{property} in ColumnInfo {cataColumn} is '{catalogueValue} but in live table it is '{liveValue}'",
+                    CheckResult.Fail, null, "Update to live value?"));
 
                 if (fix)
                 {
@@ -285,27 +302,32 @@ private static bool SynchronizeField(DiscoveredColumn[] liveColumns,ColumnInfo[]
                     cataColumn.SaveToDatabase();
                 }
                 else
+                {
                     IsSynched = false;
+                }
             }
         }
 
         return IsSynched;
     }
-        
+
     private bool SynchronizeParameters(TableValuedFunctionImporter importer, ICheckNotifier notifier)
     {
-        var discoveredParameters = _toSyncTo.GetCurrentDatabase().ExpectTableValuedFunction(_tableToSync.GetRuntimeName(),_tableToSync.Schema).DiscoverParameters();
+        var discoveredParameters = _toSyncTo.GetCurrentDatabase()
+            .ExpectTableValuedFunction(_tableToSync.GetRuntimeName(), _tableToSync.Schema).DiscoverParameters();
         var currentParameters = _tableToSync.GetAllParameters();
-            
+
         //For each parameter in underlying database
         foreach (var parameter in discoveredParameters)
         {
-            var existingCatalogueReference = currentParameters.SingleOrDefault(p => p.ParameterName.Equals(parameter.ParameterName));
-            if (existingCatalogueReference == null)// that is not known about by the TableInfo
+            var existingCatalogueReference =
+                currentParameters.SingleOrDefault(p => p.ParameterName.Equals(parameter.ParameterName));
+            if (existingCatalogueReference == null) // that is not known about by the TableInfo
             {
                 var create = notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"TableInfo {_tableToSync} is a Table Valued Function but it does not have a record of the parameter {parameter.ParameterName} which appears in the underlying database", CheckResult.Fail,
+                        $"TableInfo {_tableToSync} is a Table Valued Function but it does not have a record of the parameter {parameter.ParameterName} which appears in the underlying database",
+                        CheckResult.Fail,
                         null, "Create the Parameter"));
 
                 if (!create)
@@ -324,7 +346,8 @@ private bool SynchronizeParameters(TableValuedFunctionImporter importer, ICheckN
                     var modify =
                         notifier.OnCheckPerformed(
                             new CheckEventArgs(
-                                $"Parameter {existingCatalogueReference.ParameterName} is declared as '{dbDefinition}' but in the Catalogue it appears as '{existingCatalogueReference.ParameterSQL}'", CheckResult.Fail, null,
+                                $"Parameter {existingCatalogueReference.ParameterName} is declared as '{dbDefinition}' but in the Catalogue it appears as '{existingCatalogueReference.ParameterSQL}'",
+                                CheckResult.Fail, null,
                                 $"Change the definition in the Catalogue to '{dbDefinition}'"));
 
                     if (!modify)
@@ -333,7 +356,7 @@ private bool SynchronizeParameters(TableValuedFunctionImporter importer, ICheckN
                     existingCatalogueReference.ParameterSQL = dbDefinition;
                     existingCatalogueReference.SaveToDatabase();
                 }
-            }   
+            }
         }
 
         //Find redundant parameters - parameters that the catalogue knows about but no longer appear in the table valued function signature in the database
@@ -343,17 +366,16 @@ private bool SynchronizeParameters(TableValuedFunctionImporter importer, ICheckN
                 var delete =
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"TableInfo {_tableToSync} is a Table Valued Function, in the Catalogue it has a parameter called {currentParameter.ParameterName} but this parameter no longer appears in the underlying database", CheckResult.Fail,
+                            $"TableInfo {_tableToSync} is a Table Valued Function, in the Catalogue it has a parameter called {currentParameter.ParameterName} but this parameter no longer appears in the underlying database",
+                            CheckResult.Fail,
                             null, $"Delete Parameter {currentParameter.ParameterName}"));
 
                 if (!delete)
                     return false;
 
                 ((IDeleteable)currentParameter).DeleteInDatabase();
-                    
             }
 
         return true;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Curation/TableValuedFunctionImporter.cs b/Rdmp.Core/Curation/TableValuedFunctionImporter.cs
index 6ce6b666f6..874b4c4f76 100644
--- a/Rdmp.Core/Curation/TableValuedFunctionImporter.cs
+++ b/Rdmp.Core/Curation/TableValuedFunctionImporter.cs
@@ -49,7 +49,8 @@ public class TableValuedFunctionImporter : ITableInfoImporter
     /// <param name="repository"></param>
     /// <param name="tableValuedFunction"></param>
     /// <param name="usageContext"></param>
-    public TableValuedFunctionImporter(ICatalogueRepository repository, DiscoveredTableValuedFunction tableValuedFunction, DataAccessContext usageContext = DataAccessContext.Any)
+    public TableValuedFunctionImporter(ICatalogueRepository repository,
+        DiscoveredTableValuedFunction tableValuedFunction, DataAccessContext usageContext = DataAccessContext.Any)
     {
         _repository = repository;
         _tableValuedFunction = tableValuedFunction;
@@ -64,11 +65,10 @@ public TableValuedFunctionImporter(ICatalogueRepository repository, DiscoveredTa
                 $"Could not find tableValuedFunction with name '{_tableValuedFunction.GetRuntimeName()}' (.Exists() returned false)");
 
         _tableValuedFunctionName = _tableValuedFunction.GetRuntimeName();
-                 
+
         _parameters = _tableValuedFunction.DiscoverParameters().ToArray();
 
         ParametersCreated = new List<AnyTableSqlParameter>();
-            
     }
 
 
@@ -97,7 +97,8 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
         if (server.ExplicitUsernameIfAny != null)
         {
             var credentialsFactory = new DataAccessCredentialsFactory(_repository);
-            credentialsFactory.Create(tableInfoCreated, server.ExplicitUsernameIfAny, server.ExplicitPasswordIfAny, _usageContext);
+            credentialsFactory.Create(tableInfoCreated, server.ExplicitUsernameIfAny, server.ExplicitPasswordIfAny,
+                _usageContext);
         }
     }
 
@@ -105,7 +106,7 @@ public void DoImport(out ITableInfo tableInfoCreated, out ColumnInfo[] columnInf
     public ColumnInfo CreateNewColumnInfo(ITableInfo parent, DiscoveredColumn discoveredColumn)
     {
         var toAdd =
-            new ColumnInfo((ICatalogueRepository) parent.Repository,discoveredColumn.GetFullyQualifiedName(),
+            new ColumnInfo((ICatalogueRepository)parent.Repository, discoveredColumn.GetFullyQualifiedName(),
                 discoveredColumn.DataType.SQLType, parent)
             {
                 Format = discoveredColumn.Format,
@@ -128,10 +129,10 @@ private ColumnInfo[] CreateColumnInfosBasedOnReturnColumnsOfFunction(ITableInfo
             var toAdd = CreateNewColumnInfo(parent, discoveredColumn);
             newColumnInfosToReturn.Add(toAdd);
         }
-            
+
         foreach (var discoveredParameter in _tableValuedFunction.DiscoverParameters())
-            CreateParameter(parent,discoveredParameter);
-                
+            CreateParameter(parent, discoveredParameter);
+
         return newColumnInfosToReturn.ToArray();
     }
 
@@ -160,5 +161,4 @@ internal string GetParamaterDeclarationSQL(DiscoveredParameter parameter)
 
         return syntaxHelper.GetParameterDeclaration(parameter.ParameterName, parameter.DataType.SQLType);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/BetweenCatalogueAndDataExportObscureDependencyFinder.cs b/Rdmp.Core/DataExport/BetweenCatalogueAndDataExportObscureDependencyFinder.cs
index 6586cd4ae1..ec25cd514a 100644
--- a/Rdmp.Core/DataExport/BetweenCatalogueAndDataExportObscureDependencyFinder.cs
+++ b/Rdmp.Core/DataExport/BetweenCatalogueAndDataExportObscureDependencyFinder.cs
@@ -43,10 +43,11 @@ public void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperOb
         if (oTableWrapperObject is Catalogue cata)
         {
             //they are deleting a catalogue! see if it has an ExtractableDataSet associated with it
-            var dependencies = _serviceLocator.DataExportRepository.GetAllObjectsWhere<ExtractableDataSet>("Catalogue_ID" , cata.ID).ToArray();
-            
+            var dependencies = _serviceLocator.DataExportRepository
+                .GetAllObjectsWhere<ExtractableDataSet>("Catalogue_ID", cata.ID).ToArray();
+
             //we have any dependant catalogues?
-            if(dependencies.Any())
+            if (dependencies.Any())
                 throw new Exception(
                     $"Cannot delete Catalogue {cata} because there are ExtractableDataSets which depend on them (IDs={string.Join(",", dependencies.Select(ds => ds.ID.ToString()))})");
         }
diff --git a/Rdmp.Core/DataExport/Checks/ExtractionConfigurationChecker.cs b/Rdmp.Core/DataExport/Checks/ExtractionConfigurationChecker.cs
index f2bb393a8b..9951247237 100644
--- a/Rdmp.Core/DataExport/Checks/ExtractionConfigurationChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/ExtractionConfigurationChecker.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.DataExport.Checks;
 /// Checks <see cref="ExtractionConfiguration"/> to ensure they are in a valid state for execution (have a cohort, linkable patient columns etc).  Optionally also checks
 /// each dataset in the configuration with a <see cref="SelectedDataSetsChecker"/>
 /// </summary>
-public class ExtractionConfigurationChecker:ICheckable
+public class ExtractionConfigurationChecker : ICheckable
 {
     private IExtractionConfiguration _config;
     private IBasicActivateItems _activator;
@@ -39,7 +39,7 @@ public class ExtractionConfigurationChecker:ICheckable
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="config"></param>
-    public ExtractionConfigurationChecker(IBasicActivateItems activator,IExtractionConfiguration config)
+    public ExtractionConfigurationChecker(IBasicActivateItems activator, IExtractionConfiguration config)
     {
         _config = config;
         _activator = activator;
@@ -61,27 +61,30 @@ private void CheckReleaseConfiguration(ICheckNotifier notifier)
     {
         var projectDirectory = new DirectoryInfo(_config.Project.ExtractionDirectory);
 
-        notifier.OnCheckPerformed(new CheckEventArgs($"Found Frozen/Released configuration '{_config}'", CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"Found Frozen/Released configuration '{_config}'",
+            CheckResult.Success));
 
         foreach (var directoryInfo in projectDirectory.GetDirectories(
                      $"{ExtractionDirectory.GetExtractionDirectoryPrefix(_config)}*").ToArray())
-        {
             if (DirectoryIsEmpty(directoryInfo, out var firstFileFound))
             {
                 var deleteIt =
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
-                            $"Found empty folder {directoryInfo.Name} which is left over extracted folder after data release", CheckResult.Warning, null,
+                            $"Found empty folder {directoryInfo.Name} which is left over extracted folder after data release",
+                            CheckResult.Warning, null,
                             "Delete empty folder"));
 
                 if (deleteIt)
                     directoryInfo.Delete(true);
             }
             else
+            {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Found non-empty folder {directoryInfo.Name} which is left over extracted folder after data release (First file found was '{firstFileFound}' but there may be others)", CheckResult.Fail));
-        }
+                        $"Found non-empty folder {directoryInfo.Name} which is left over extracted folder after data release (First file found was '{firstFileFound}' but there may be others)",
+                        CheckResult.Fail));
+            }
     }
 
     private bool DirectoryIsEmpty(DirectoryInfo d, out string firstFileFound)
@@ -132,17 +135,15 @@ private void CheckInProgressConfiguration(ICheckNotifier notifier)
 
         //make sure that its cohort is retrievable
         var cohort = repo.GetObjectByID<ExtractableCohort>((int)_config.Cohort_ID);
-        if(cohort.IsDeprecated)
-        {
+        if (cohort.IsDeprecated)
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     $"Cohort '{cohort}' is marked IsDeprecated",
                     CheckResult.Fail));
-        }
 
         if (CheckDatasets)
             foreach (var s in _config.SelectedDataSets)
-                new SelectedDataSetsChecker(_activator,s).Check(notifier);
+                new SelectedDataSetsChecker(_activator, s).Check(notifier);
 
         //globals
         if (CheckGlobals)
diff --git a/Rdmp.Core/DataExport/Checks/GlobalExtractionChecker.cs b/Rdmp.Core/DataExport/Checks/GlobalExtractionChecker.cs
index 5cbb140fbe..e9b82c66f0 100644
--- a/Rdmp.Core/DataExport/Checks/GlobalExtractionChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/GlobalExtractionChecker.cs
@@ -34,12 +34,15 @@ public class GlobalExtractionChecker : ICheckable
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="configuration"></param>
-    public GlobalExtractionChecker(IBasicActivateItems activator,ExtractionConfiguration configuration) : this (activator,configuration, null, null)
-    { }
+    public GlobalExtractionChecker(IBasicActivateItems activator, ExtractionConfiguration configuration) : this(
+        activator, configuration, null, null)
+    {
+    }
 
 
     /// <inheritdoc cref="GlobalExtractionChecker(IBasicActivateItems,ExtractionConfiguration)"/>
-    public GlobalExtractionChecker(IBasicActivateItems activator,ExtractionConfiguration configuration, ExtractGlobalsCommand command, IPipeline alsoCheckPipeline)
+    public GlobalExtractionChecker(IBasicActivateItems activator, ExtractionConfiguration configuration,
+        ExtractGlobalsCommand command, IPipeline alsoCheckPipeline)
     {
         _configuration = configuration;
         _command = command;
@@ -62,7 +65,8 @@ public void Check(ICheckNotifier notifier)
 
         if (_alsoCheckPipeline != null && _command != null)
         {
-            var engine = new ExtractionPipelineUseCase(_activator,_configuration.Project, _command, _alsoCheckPipeline, DataLoadInfo.Empty)
+            var engine = new ExtractionPipelineUseCase(_activator, _configuration.Project, _command, _alsoCheckPipeline,
+                    DataLoadInfo.Empty)
                 .GetEngine(_alsoCheckPipeline, new FromCheckNotifierToDataLoadEventListener(notifier));
             engine.Check(notifier);
         }
diff --git a/Rdmp.Core/DataExport/Checks/GlobalsReleaseChecker.cs b/Rdmp.Core/DataExport/Checks/GlobalsReleaseChecker.cs
index 7cb7773338..2bbbf99ce3 100644
--- a/Rdmp.Core/DataExport/Checks/GlobalsReleaseChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/GlobalsReleaseChecker.cs
@@ -37,7 +37,8 @@ public class GlobalsReleaseChecker : ICheckable
     /// <param name="repositoryLocator"></param>
     /// <param name="extractionConfigurations"></param>
     /// <param name="globalToCheck">Determines the return of <see cref="GetEvaluator"/>.  Pass a global </param>
-    public GlobalsReleaseChecker(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IExtractionConfiguration[] extractionConfigurations, IMapsDirectlyToDatabaseTable globalToCheck = null)
+    public GlobalsReleaseChecker(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IExtractionConfiguration[] extractionConfigurations, IMapsDirectlyToDatabaseTable globalToCheck = null)
     {
         _repositoryLocator = repositoryLocator;
         _configurations = extractionConfigurations;
@@ -53,8 +54,9 @@ public GlobalsReleaseChecker(IRDMPPlatformRepositoryServiceLocator repositoryLoc
     /// <returns></returns>
     public GlobalReleasePotential GetEvaluator()
     {
-        if(_globalToCheck == null)
-            throw new NotSupportedException("You cannot call GetEvaluator when you provided no globalToCheck during construction");
+        if (_globalToCheck == null)
+            throw new NotSupportedException(
+                "You cannot call GetEvaluator when you provided no globalToCheck during construction");
 
         var globalResult = _configurations.SelectMany(c => c.SupplementalExtractionResults)
             .Distinct()
@@ -64,10 +66,12 @@ public GlobalReleasePotential GetEvaluator()
             return new NoGlobalReleasePotential(_repositoryLocator, null, _globalToCheck);
 
         //it's been extracted!, who extracted it?
-        var destinationThatExtractedIt = (IExecuteDatasetExtractionDestination)ObjectConstructor.Construct(globalResult.GetDestinationType());
+        var destinationThatExtractedIt =
+            (IExecuteDatasetExtractionDestination)ObjectConstructor.Construct(globalResult.GetDestinationType());
 
         //destination tell us how releasable it is
-        return destinationThatExtractedIt.GetGlobalReleasabilityEvaluator(_repositoryLocator, globalResult, _globalToCheck);
+        return destinationThatExtractedIt.GetGlobalReleasabilityEvaluator(_repositoryLocator, globalResult,
+            _globalToCheck);
     }
 
     /// <summary>
@@ -80,21 +84,27 @@ public void Check(ICheckNotifier notifier)
         // checks for pollution in the globals directory
         foreach (var extractionConfiguration in _configurations)
         {
-            var allExtracted = extractionConfiguration.SupplementalExtractionResults.Where(ser => IsValidPath(ser.DestinationDescription));
+            var allExtracted =
+                extractionConfiguration.SupplementalExtractionResults.Where(ser =>
+                    IsValidPath(ser.DestinationDescription));
             var extractDir = extractionConfiguration.GetProject().ExtractionDirectory;
             var folder = new ExtractionDirectory(extractDir, extractionConfiguration).GetGlobalsDirectory();
 
-            var unexpectedDirectories = folder.EnumerateDirectories().Where(d => !d.Name.Equals("SupportingDocuments")).ToList();
+            var unexpectedDirectories =
+                folder.EnumerateDirectories().Where(d => !d.Name.Equals("SupportingDocuments")).ToList();
 
             if (unexpectedDirectories.Any())
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Unexpected directories found in extraction directory ({string.Join(",", unexpectedDirectories.Select(d => d.FullName))}. Pollution of extract directory is not permitted.", CheckResult.Fail));
+                    $"Unexpected directories found in extraction directory ({string.Join(",", unexpectedDirectories.Select(d => d.FullName))}. Pollution of extract directory is not permitted.",
+                    CheckResult.Fail));
 
-            var unexpectedFiles = folder.EnumerateFiles("*.*", SearchOption.AllDirectories).Where(f => allExtracted.All(ae => ae.DestinationDescription != f.FullName)).ToList();
+            var unexpectedFiles = folder.EnumerateFiles("*.*", SearchOption.AllDirectories)
+                .Where(f => allExtracted.All(ae => ae.DestinationDescription != f.FullName)).ToList();
 
             if (unexpectedFiles.Any())
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Unexpected files found in extract directory ({string.Join(",", unexpectedFiles.Select(d => d.FullName))}). Pollution of extract directory is not permitted.", CheckResult.Fail));
+                    $"Unexpected files found in extract directory ({string.Join(",", unexpectedFiles.Select(d => d.FullName))}). Pollution of extract directory is not permitted.",
+                    CheckResult.Fail));
         }
     }
 
diff --git a/Rdmp.Core/DataExport/Checks/ProjectChecker.cs b/Rdmp.Core/DataExport/Checks/ProjectChecker.cs
index 8a0476d1d4..0ba10f3c96 100644
--- a/Rdmp.Core/DataExport/Checks/ProjectChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/ProjectChecker.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.DataExport.Checks;
 /// Runs checks on a Project to make sure it has an extraction folder, project number etc.  Also checks ExtractionConfigurations that are part of the project
 /// to see if valid queries can be built and rows read.
 /// </summary>
-public class ProjectChecker:ICheckable
+public class ProjectChecker : ICheckable
 {
     private readonly IProject _project;
     private readonly IBasicActivateItems _activator;
@@ -39,7 +39,7 @@ public class ProjectChecker:ICheckable
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="project"></param>
-    public ProjectChecker(IBasicActivateItems activator,IProject project)
+    public ProjectChecker(IBasicActivateItems activator, IProject project)
     {
         _project = project;
         _activator = activator;
@@ -54,12 +54,14 @@ public ProjectChecker(IBasicActivateItems activator,IProject project)
     /// <param name="notifier"></param>
     public void Check(ICheckNotifier notifier)
     {
-        notifier.OnCheckPerformed(new CheckEventArgs($"About to check project {_project.Name} (ID={_project.ID})", CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"About to check project {_project.Name} (ID={_project.ID})",
+            CheckResult.Success));
 
         _extractionConfigurations = _project.ExtractionConfigurations;
 
         if (!_extractionConfigurations.Any())
-            notifier.OnCheckPerformed(new CheckEventArgs("Project does not have any ExtractionConfigurations yet",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Project does not have any ExtractionConfigurations yet",
+                CheckResult.Fail));
 
         if (_project.ProjectNumber == null)
             notifier.OnCheckPerformed(
@@ -69,7 +71,8 @@ public void Check(ICheckNotifier notifier)
 
         //check to see if there is an extraction directory
         if (string.IsNullOrWhiteSpace(_project.ExtractionDirectory))
-            notifier.OnCheckPerformed(new CheckEventArgs("Project does not have an ExtractionDirectory",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Project does not have an ExtractionDirectory",
+                CheckResult.Fail));
         try
         {
             //see if they punched the keyboard instead of typing a legit folder
@@ -78,34 +81,36 @@ public void Check(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Project ExtractionDirectory ('{_project.ExtractionDirectory}') is not a valid directory name ", CheckResult.Fail, e));
+                $"Project ExtractionDirectory ('{_project.ExtractionDirectory}') is not a valid directory name ",
+                CheckResult.Fail, e));
             return;
         }
 
         //tell them whether it exists or not
         notifier.OnCheckPerformed(new CheckEventArgs(
-            $"Project ExtractionDirectory ('{_project.ExtractionDirectory}') {(_projectDirectory.Exists ? "Exists" : "Does Not Exist")}", _projectDirectory.Exists?CheckResult.Success : CheckResult.Fail));
+            $"Project ExtractionDirectory ('{_project.ExtractionDirectory}') {(_projectDirectory.Exists ? "Exists" : "Does Not Exist")}",
+            _projectDirectory.Exists ? CheckResult.Success : CheckResult.Fail));
 
         if (CheckConfigurations)
             foreach (var extractionConfiguration in _extractionConfigurations)
             {
-                var extractionConfigurationChecker = new ExtractionConfigurationChecker(_activator, extractionConfiguration) { CheckDatasets = CheckDatasets };
+                var extractionConfigurationChecker =
+                    new ExtractionConfigurationChecker(_activator, extractionConfiguration)
+                        { CheckDatasets = CheckDatasets };
                 extractionConfigurationChecker.Check(notifier);
             }
 
 
         foreach (var assoc in _project.ProjectCohortIdentificationConfigurationAssociations)
-        {
             if (assoc.CohortIdentificationConfiguration == null)
                 if (notifier.OnCheckPerformed(
                         new CheckEventArgs(
                             "Project contains a reference to a CohortIdentificationConfiguration which does not exist anymore",
-                            CheckResult.Fail, null, "Delete orphan ProjectCohortIdentificationConfigurationAssociation?")))
-                {
+                            CheckResult.Fail, null,
+                            "Delete orphan ProjectCohortIdentificationConfigurationAssociation?")))
                     assoc.DeleteInDatabase();
-                }
-        }
 
-        notifier.OnCheckPerformed(new CheckEventArgs("All Project Checks Finished (Not necessarily without errors)", CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs("All Project Checks Finished (Not necessarily without errors)",
+            CheckResult.Success));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs
index df332b0119..8365cd5ec3 100644
--- a/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/SelectedDataSetsChecker.cs
@@ -47,7 +47,8 @@ public class SelectedDataSetsChecker : ICheckable
     /// <param name="selectedDataSet"></param>
     /// <param name="checkGlobals"></param>
     /// <param name="alsoCheckPipeline"></param>
-    public SelectedDataSetsChecker(IBasicActivateItems activator, ISelectedDataSets selectedDataSet, bool checkGlobals = false, IPipeline alsoCheckPipeline = null)
+    public SelectedDataSetsChecker(IBasicActivateItems activator, ISelectedDataSets selectedDataSet,
+        bool checkGlobals = false, IPipeline alsoCheckPipeline = null)
     {
         _checkGlobals = checkGlobals;
         _alsoCheckPipeline = alsoCheckPipeline;
@@ -91,20 +92,21 @@ public void Check(ICheckNotifier notifier)
             .Where(c => c.CatalogueExtractionInformation == null)
             .ToArray();
 
-        if(orphans.Any())
-        {
+        if (orphans.Any())
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     ErrorCodes.ExtractionInformationMissing,
                     Environment.NewLine +
                     string.Join(Environment.NewLine, orphans.Select(o => o.GetRuntimeName()).ToArray()))
             );
-        }
-            
 
-        WarnAboutExtractionCategory(notifier, config, ds,eis, ErrorCodes.ExtractionContainsSpecialApprovalRequired, ExtractionCategory.SpecialApprovalRequired);
-        WarnAboutExtractionCategory(notifier, config, ds, eis, ErrorCodes.ExtractionContainsInternal, ExtractionCategory.Internal);
-        WarnAboutExtractionCategory(notifier, config, ds, eis, ErrorCodes.ExtractionContainsDeprecated, ExtractionCategory.Deprecated);
+
+        WarnAboutExtractionCategory(notifier, config, ds, eis, ErrorCodes.ExtractionContainsSpecialApprovalRequired,
+            ExtractionCategory.SpecialApprovalRequired);
+        WarnAboutExtractionCategory(notifier, config, ds, eis, ErrorCodes.ExtractionContainsInternal,
+            ExtractionCategory.Internal);
+        WarnAboutExtractionCategory(notifier, config, ds, eis, ErrorCodes.ExtractionContainsDeprecated,
+            ExtractionCategory.Deprecated);
 
         ICatalogue cata;
         try
@@ -113,17 +115,19 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Unable to find Catalogue for ExtractableDataSet", CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs("Unable to find Catalogue for ExtractableDataSet",
+                CheckResult.Fail, e));
             return;
         }
 
         if (cata.IsInternalDataset)
-        {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Dataset '{ds}' is marked {nameof(ICatalogue.IsInternalDataset)} so should not be extracted", CheckResult.Fail));
-        }
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"Dataset '{ds}' is marked {nameof(ICatalogue.IsInternalDataset)} so should not be extracted",
+                CheckResult.Fail));
 
-        var request = new ExtractDatasetCommand( config, cohort, new ExtractableDatasetBundle(ds),
-            selectedcols, new HICProjectSalt(project), new ExtractionDirectory(project.ExtractionDirectory, config)) { TopX = 1 };
+        var request = new ExtractDatasetCommand(config, cohort, new ExtractableDatasetBundle(ds),
+                selectedcols, new HICProjectSalt(project), new ExtractionDirectory(project.ExtractionDirectory, config))
+            { TopX = 1 };
 
         try
         {
@@ -133,7 +137,8 @@ public void Check(ICheckNotifier notifier)
         {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Could not generate valid extraction SQL for dataset {ds} in configuration {config}", CheckResult.Fail, e));
+                    $"Could not generate valid extraction SQL for dataset {ds} in configuration {config}",
+                    CheckResult.Fail, e));
             return;
         }
 
@@ -147,58 +152,63 @@ public void Check(ICheckNotifier notifier)
 
         if (cohortServer == null || !cohortServer.Exists())
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Cohort server did not exist or was unreachable",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Cohort server did not exist or was unreachable",
+                CheckResult.Fail));
             return;
         }
 
         //when 2+ columns have the same Name it's a problem
-        foreach (var grouping in request.ColumnsToExtract.GroupBy(c=>c.GetRuntimeName()).Where(g=>g.Count()>1))
-            notifier.OnCheckPerformed(new CheckEventArgs($"There are { grouping.Count() } columns in the extract ({request.DatasetBundle?.DataSet}) called '{ grouping.Key }'",CheckResult.Fail));
+        foreach (var grouping in request.ColumnsToExtract.GroupBy(c => c.GetRuntimeName()).Where(g => g.Count() > 1))
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"There are {grouping.Count()} columns in the extract ({request.DatasetBundle?.DataSet}) called '{grouping.Key}'",
+                CheckResult.Fail));
 
 
         // ntext and text columns don't play nicely with DISTINCT, so warn user
         var textCols = request.ColumnsToExtract.Where(IsTextDatatype).ToArray();
-        if(textCols.Any())
-        {
-            notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.TextColumnsInExtraction, string.Join(",", textCols.Select(c=>c.GetRuntimeName()).ToArray())));
-        }
+        if (textCols.Any())
+            notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.TextColumnsInExtraction,
+                string.Join(",", textCols.Select(c => c.GetRuntimeName()).ToArray())));
 
         //when 2+ columns have the same Order it's a problem because
-        foreach (var grouping in request.ColumnsToExtract.GroupBy(c=>c.Order).Where(g=>g.Count()>1))
-            notifier.OnCheckPerformed(new CheckEventArgs($"There are { grouping.Count() } columns in the extract ({request.DatasetBundle?.DataSet}) that share the same Order '{ grouping.Key }'",CheckResult.Fail));
+        foreach (var grouping in request.ColumnsToExtract.GroupBy(c => c.Order).Where(g => g.Count() > 1))
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"There are {grouping.Count()} columns in the extract ({request.DatasetBundle?.DataSet}) that share the same Order '{grouping.Key}'",
+                CheckResult.Fail));
 
         // Warn user if stuff is out of sync with the Catalogue version (changes have happened to the master but not propagated to the copy in this extraction)
         var outOfSync = selectedcols.OfType<ExtractableColumn>().Where(c => c.IsOutOfSync()).ToArray();
-        if(outOfSync.Any())
+        if (outOfSync.Any())
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"'{ds}' columns out of sync with CatalogueItem version(s): {Environment.NewLine + string.Join(',', outOfSync.Select(o => o.ToString() + Environment.NewLine))}{Environment.NewLine} Extraction Configuration: '{config}' ", CheckResult.Warning));
+                $"'{ds}' columns out of sync with CatalogueItem version(s): {Environment.NewLine + string.Join(',', outOfSync.Select(o => o.ToString() + Environment.NewLine))}{Environment.NewLine} Extraction Configuration: '{config}' ",
+                CheckResult.Warning));
 
         var nonSelectedCore = cata.GetAllExtractionInformation(ExtractionCategory.Core)
             .Union(cata.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific))
-            .Where(ei => !ei.IsExtractionIdentifier && selectedcols.OfType<ExtractableColumn>().All(ec => ec.CatalogueExtractionInformation_ID != ei.ID))
+            .Where(ei => !ei.IsExtractionIdentifier && selectedcols.OfType<ExtractableColumn>()
+                .All(ec => ec.CatalogueExtractionInformation_ID != ei.ID))
             .ToArray();
 
         if (nonSelectedCore.Any())
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"'{ds}' Core columns not selected for extractions: {Environment.NewLine + string.Join(',', nonSelectedCore.Select(o => o.ToString() + Environment.NewLine))}{Environment.NewLine} Extraction Configuration: '{config}' ", CheckResult.Warning));
+                $"'{ds}' Core columns not selected for extractions: {Environment.NewLine + string.Join(',', nonSelectedCore.Select(o => o.ToString() + Environment.NewLine))}{Environment.NewLine} Extraction Configuration: '{config}' ",
+                CheckResult.Warning));
 
         ComplainIfUserHasHotSwappedCohort(notifier, cohort);
 
         //Make sure cohort and dataset are on same server before checking (can still get around this at runtime by using ExecuteCrossServerDatasetExtractionSource)
-        if (!cohortServer.Server.Name.Equals(server.Name,StringComparison.CurrentCultureIgnoreCase) || !cohortServer.Server.DatabaseType.Equals(server.DatabaseType))
-        {
+        if (!cohortServer.Server.Name.Equals(server.Name, StringComparison.CurrentCultureIgnoreCase) ||
+            !cohortServer.Server.DatabaseType.Equals(server.DatabaseType))
             notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CohortAndExtractableDatasetsAreOnDifferentServers,
-                cohortServer.Server.Name, cohortServer.Server.DatabaseType, request.DatasetBundle?.DataSet, server.Name, server.DatabaseType));
-        }
+                cohortServer.Server.Name, cohortServer.Server.DatabaseType, request.DatasetBundle?.DataSet, server.Name,
+                server.DatabaseType));
         else
-        {
             //Try to fetch TOP 1 data
             try
             {
                 using (var con = server.BeginNewTransactedConnection())
                 {
                     //in case user somehow manages to write a filter/transform that nukes data or something
-
                     DbCommand cmd;
 
                     try
@@ -243,9 +253,8 @@ public void Check(ICheckNotifier notifier)
             }
             catch (Exception e)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExtractionFailedToExecuteTop1,e,ds));
+                notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExtractionFailedToExecuteTop1, e, ds));
             }
-        }
 
         var fetchOptions = _checkGlobals ? FetchOptions.ExtractableGlobalsAndLocals : FetchOptions.ExtractableLocals;
 
@@ -258,7 +267,8 @@ public void Check(ICheckNotifier notifier)
 
         if (_alsoCheckPipeline != null)
         {
-            var engine = new ExtractionPipelineUseCase(_activator,request.Project, request, _alsoCheckPipeline, DataLoadInfo.Empty)
+            var engine = new ExtractionPipelineUseCase(_activator, request.Project, request, _alsoCheckPipeline,
+                    DataLoadInfo.Empty)
                 .GetEngine(_alsoCheckPipeline, new FromCheckNotifierToDataLoadEventListener(notifier));
             engine.Check(notifier);
         }
@@ -267,16 +277,13 @@ public void Check(ICheckNotifier notifier)
     private void ComplainIfUserHasHotSwappedCohort(ICheckNotifier notifier, IExtractableCohort cohort)
     {
         var progress = SelectedDataSet.ExtractionProgressIfAny;
-            
+
         // no problem, changing cohort mid way through extraction is only a problem
         // if we are doing an iterative partial set of extractions
 
         // it's the first batch, thats good - user reset the progress after they changed the cohort
         // so extraction should begin at the start date correctly and cleanup any remnants
-        if(progress?.ProgressDate == null)
-        {
-            return;
-        }
+        if (progress?.ProgressDate == null) return;
 
         ReleasePotential rp;
 
@@ -287,10 +294,11 @@ private void ComplainIfUserHasHotSwappedCohort(ICheckNotifier notifier, IExtract
         }
         catch (Exception ex)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.NoSqlAuditedForExtractionProgress,ex,new object[]{ progress}));
+            notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.NoSqlAuditedForExtractionProgress, ex,
+                new object[] { progress }));
             return;
         }
-                        
+
         if (string.IsNullOrWhiteSpace(rp.SqlExtracted))
         {
             notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.NoSqlAuditedForExtractionProgress, progress));
@@ -300,9 +308,7 @@ private void ComplainIfUserHasHotSwappedCohort(ICheckNotifier notifier, IExtract
         var whereSql = cohort.WhereSQL();
 
         if (!rp.SqlExtracted.Contains(whereSql))
-        {
             notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CohortSwappedMidExtraction, progress, whereSql));
-        }
     }
 
     /// <summary>
@@ -322,7 +328,8 @@ private bool IsTextDatatype(IColumn arg)
 
         type = type.Trim();
 
-        return type.Equals("text", StringComparison.CurrentCultureIgnoreCase) || type.Equals("ntext", StringComparison.CurrentCultureIgnoreCase);
+        return type.Equals("text", StringComparison.CurrentCultureIgnoreCase) ||
+               type.Equals("ntext", StringComparison.CurrentCultureIgnoreCase);
     }
 
     /// <summary>
@@ -335,13 +342,12 @@ private bool IsTextDatatype(IColumn arg)
     /// <param name="cols"></param>
     /// <param name="errorCode"></param>
     /// <param name="category"></param>
-    public static void WarnAboutExtractionCategory(ICheckNotifier notifier, IExtractionConfiguration configuration, IExtractableDataSet dataset, ExtractionInformation[] cols, ErrorCode errorCode, ExtractionCategory category)
+    public static void WarnAboutExtractionCategory(ICheckNotifier notifier, IExtractionConfiguration configuration,
+        IExtractableDataSet dataset, ExtractionInformation[] cols, ErrorCode errorCode, ExtractionCategory category)
     {
         if (cols.Any(c => c?.ExtractionCategory == category))
-        {
             notifier.OnCheckPerformed(new CheckEventArgs(errorCode, configuration, dataset,
                 string.Join(",", cols.Where(c => c?.ExtractionCategory == category)
                     .Select(c => c.GetRuntimeName()))));
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Checks/SupportingSQLTableChecker.cs b/Rdmp.Core/DataExport/Checks/SupportingSQLTableChecker.cs
index 64181d2d1e..b654907437 100644
--- a/Rdmp.Core/DataExport/Checks/SupportingSQLTableChecker.cs
+++ b/Rdmp.Core/DataExport/Checks/SupportingSQLTableChecker.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.DataExport.Checks;
 /// <summary>
 /// Checks that a given <see cref="SupportingSQLTable"/> is reachable by the current user and that the <see cref="SupportingSQLTable.SQL"/> can be executed and returns data.
 /// </summary>
-public class SupportingSQLTableChecker:ICheckable
+public class SupportingSQLTableChecker : ICheckable
 {
     private readonly SupportingSQLTable _table;
 
@@ -34,7 +34,8 @@ public void Check(ICheckNotifier notifier)
     {
         try
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Found SupportingSQLTable {_table} about to check it", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Found SupportingSQLTable {_table} about to check it",
+                CheckResult.Success));
 
             var supportingSQLServer = _table.GetServer();
 
@@ -46,11 +47,13 @@ public void Check(ICheckNotifier notifier)
             {
                 con.Open();
 
-                notifier.OnCheckPerformed(new CheckEventArgs($"About to check Extraction SQL:{_table.SQL}", CheckResult.Success));
+                notifier.OnCheckPerformed(new CheckEventArgs($"About to check Extraction SQL:{_table.SQL}",
+                    CheckResult.Success));
 
                 using (var cmd = supportingSQLServer.GetCommand(_table.SQL, con))
                 {
-                    using(var reader = cmd.ExecuteReader())
+                    using (var reader = cmd.ExecuteReader())
+                    {
                         if (reader.Read())
                             notifier.OnCheckPerformed(
                                 new CheckEventArgs(
@@ -59,6 +62,7 @@ public void Check(ICheckNotifier notifier)
                         else
                             notifier.OnCheckPerformed(new CheckEventArgs(
                                 $"No data was successfully read from SupportingSQLTable {_table}", CheckResult.Fail));
+                    }
                 }
             }
         }
diff --git a/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionDataTableAsyncFetch.cs b/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionDataTableAsyncFetch.cs
index ce486f60fd..fd600b8aff 100644
--- a/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionDataTableAsyncFetch.cs
+++ b/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionDataTableAsyncFetch.cs
@@ -39,21 +39,16 @@ public void Begin()
             using (var con = server.GetConnection())
             {
                 con.Open();
-                using(var cmd = server.GetCommand(Source.GetCountsDataTableSql(), con))
+                using (var cmd = server.GetCommand(Source.GetCountsDataTableSql(), con))
                 {
                     cmd.CommandTimeout = 120; //give it up to 2 minutes
                     server.GetDataAdapter(cmd).Fill(DataTable);
-                }   
+                }
             }
-                
         });
 
-        Task.ContinueWith(s =>
-        {
-            Finished?.Invoke();
-        });
+        Task.ContinueWith(s => { Finished?.Invoke(); });
 
         Task.Start();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionFactory.cs b/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionFactory.cs
index 6f8d56b8bf..1e92303d35 100644
--- a/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionFactory.cs
+++ b/Rdmp.Core/DataExport/CohortDescribing/CohortDescriptionFactory.cs
@@ -43,18 +43,18 @@ public CohortDescriptionFactory(IDataExportRepository repository)
     /// <returns></returns>
     public Dictionary<CohortDescriptionDataTableAsyncFetch, ExtractableCohortDescription[]> Create()
     {
-        var toReturn = new Dictionary<CohortDescriptionDataTableAsyncFetch,ExtractableCohortDescription[]>();
+        var toReturn = new Dictionary<CohortDescriptionDataTableAsyncFetch, ExtractableCohortDescription[]>();
 
         foreach (var source in _sources)
         {
             //setup the async data retreival which can take a long time if there are a lot of cohorts or millions of identifiers
             var asyncFetch = new CohortDescriptionDataTableAsyncFetch(source);
-            var cohorts = _cohorts.Where(c => c.ExternalCohortTable_ID == source.ID).Select(c => new ExtractableCohortDescription(c, asyncFetch)).ToArray();
+            var cohorts = _cohorts.Where(c => c.ExternalCohortTable_ID == source.ID)
+                .Select(c => new ExtractableCohortDescription(c, asyncFetch)).ToArray();
 
             asyncFetch.Begin();
 
-            toReturn.Add(asyncFetch,cohorts);
-
+            toReturn.Add(asyncFetch, cohorts);
         }
 
         return toReturn;
diff --git a/Rdmp.Core/DataExport/CohortDescribing/ExtractableCohortDescription.cs b/Rdmp.Core/DataExport/CohortDescribing/ExtractableCohortDescription.cs
index 9680958f58..cc008b501d 100644
--- a/Rdmp.Core/DataExport/CohortDescribing/ExtractableCohortDescription.cs
+++ b/Rdmp.Core/DataExport/CohortDescribing/ExtractableCohortDescription.cs
@@ -68,9 +68,9 @@ public ExtractableCohortDescription(ExtractableCohort cohort)
             Exception = e;
             throw;
         }
+
         OriginID = cohort.OriginID;
 
-            
 
         try
         {
@@ -96,7 +96,6 @@ public ExtractableCohortDescription(ExtractableCohort cohort)
         CreationDate = externalData.ExternalCohortCreationDate;
         ProjectNumber = externalData.ExternalProjectNumber;
         Description = externalData.ExternalDescription;
-
     }
 
 
@@ -117,7 +116,7 @@ public ExtractableCohortDescription(ExtractableCohort cohort, CohortDescriptionD
         Count = -1;
         CountDistinct = -1;
         SourceName = fetch.Source.Name;
-            
+
         try
         {
             ReleaseIdentifier = cohort.GetReleaseIdentifier(true);
@@ -126,7 +125,7 @@ public ExtractableCohortDescription(ExtractableCohort cohort, CohortDescriptionD
         {
             ReleaseIdentifier = "Unknown";
         }
-            
+
         try
         {
             PrivateIdentifier = cohort.GetPrivateIdentifier(true);
@@ -135,7 +134,7 @@ public ExtractableCohortDescription(ExtractableCohort cohort, CohortDescriptionD
         {
             PrivateIdentifier = "Unknown";
         }
-            
+
         ProjectNumber = -1;
         Version = -1;
         Description = "Loading...";
@@ -148,21 +147,21 @@ public ExtractableCohortDescription(ExtractableCohort cohort, CohortDescriptionD
     }
 
 
-
     private void FetchOnFinished()
     {
         try
         {
             if (Fetch.Task.IsFaulted)
                 throw new Exception(
-                    $"Fetch cohort data failed for source {Fetch.Source} see inner Exception for details",Fetch.Task.Exception);
+                    $"Fetch cohort data failed for source {Fetch.Source} see inner Exception for details",
+                    Fetch.Task.Exception);
 
             if (Fetch.DataTable == null)
                 throw new Exception($"IsFaulted was false but DataTable was not populated for fetch {Fetch.Source}");
 
-            var row = Fetch.DataTable.Rows.Cast<DataRow>().FirstOrDefault(r => Convert.ToInt32(r["OriginID"]) == OriginID) ?? throw new Exception(
-                    $"No row found for Origin ID {OriginID} in fetched cohort description table for source {Fetch.Source}");
-
+            var row = Fetch.DataTable.Rows.Cast<DataRow>()
+                .FirstOrDefault(r => Convert.ToInt32(r["OriginID"]) == OriginID) ?? throw new Exception(
+                $"No row found for Origin ID {OriginID} in fetched cohort description table for source {Fetch.Source}");
 
 
             //it's overriden ugh, got to go the slow way
@@ -176,12 +175,11 @@ private void FetchOnFinished()
                 //it's a proper not overriden release identifier so we can use the DataTable value
                 Count = Convert.ToInt32(row["Count"]);
                 CountDistinct = Convert.ToInt32(row["CountDistinct"]);
-
             }
 
             ProjectNumber = Convert.ToInt32(row["ProjectNumber"]);
             Version = Convert.ToInt32(row["Version"]);
-            Description =  row["Description"] as string;
+            Description = row["Description"] as string;
             CreationDate = ObjectToNullableDateTime(row["dtCreated"]);
         }
         catch (Exception e)
@@ -191,10 +189,7 @@ private void FetchOnFinished()
     }
 
 
-    public override string ToString()
-    {
-        return Cohort.ToString();
-    }
+    public override string ToString() => Cohort.ToString();
 
     private static DateTime? ObjectToNullableDateTime(object o)
     {
@@ -203,5 +198,4 @@ public override string ToString()
 
         return (DateTime)o;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/CohortDefinition.cs b/Rdmp.Core/DataExport/Data/CohortDefinition.cs
index 84b2ac8bf3..8e9eff9f10 100644
--- a/Rdmp.Core/DataExport/Data/CohortDefinition.cs
+++ b/Rdmp.Core/DataExport/Data/CohortDefinition.cs
@@ -28,7 +28,7 @@ public class CohortDefinition : ICohortDefinition
 
     /// <inheritdoc/>
     public int ProjectNumber { get; set; }
-        
+
     /// <inheritdoc/>
     public IExternalCohortTable LocationOfCohort { get; private set; }
 
@@ -44,7 +44,8 @@ public class CohortDefinition : ICohortDefinition
     /// <param name="version">The version number where there are multiple revisions to a cohort over time (these must share the same <paramref name="description"/>)</param>
     /// <param name="projectNumber">The <see cref="IProject.ProjectNumber"/> that the cohort can be used with</param>
     /// <param name="locationOfCohort">The database where the row will be written to (or read from)</param>
-    public CohortDefinition(int? id, string description, int version, int projectNumber, IExternalCohortTable locationOfCohort)
+    public CohortDefinition(int? id, string description, int version, int projectNumber,
+        IExternalCohortTable locationOfCohort)
     {
         ID = id;
         Description = description;
@@ -53,19 +54,20 @@ public CohortDefinition(int? id, string description, int version, int projectNum
         LocationOfCohort = locationOfCohort;
 
         if (string.IsNullOrWhiteSpace(description))
-            if(id == null)
+            if (id == null)
                 throw new ArgumentNullException("Cohorts must have a description");
             else
                 throw new NullReferenceException(
                     $"There is a cohort (with ID {id}) in {locationOfCohort.DefinitionTableName} which has a blank/null description.  You must fix this.");
     }
-        
+
     /// <inheritdoc/>
     public bool IsAcceptableAsNewCohort(out string matchDescription)
     {
         //if there is an ID
         if (ID != null)
-            if (ExtractableCohort.GetImportableCohortDefinitions((ExternalCohortTable) LocationOfCohort).Any(t => t.ID == ID))
+            if (ExtractableCohort.GetImportableCohortDefinitions((ExternalCohortTable)LocationOfCohort)
+                .Any(t => t.ID == ID))
                 //the same ID already exists
             {
                 matchDescription = $"Found a cohort in {LocationOfCohort} with the ID {ID}";
@@ -77,19 +79,24 @@ public bool IsAcceptableAsNewCohort(out string matchDescription)
 
         try
         {
-            foundSimilar = ExtractableCohort.GetImportableCohortDefinitions((ExternalCohortTable)LocationOfCohort)//see if there is one with the same name
-                .Any(t => t.Description.Equals(Description) && t.Version.Equals(Version));//and description (it might have a different ID but it is still against the rules)
-
-        }catch(Exception ex)
+            foundSimilar = ExtractableCohort
+                .GetImportableCohortDefinitions(
+                    (ExternalCohortTable)LocationOfCohort) //see if there is one with the same name
+                .Any(t => t.Description.Equals(Description) &&
+                          t.Version.Equals(
+                              Version)); //and description (it might have a different ID but it is still against the rules)
+        }
+        catch (Exception ex)
         {
-            matchDescription = 
-                string.Format("Error occured when checking for existing cohorts in the Project.  We were looking in {0} Error was: {1}",
+            matchDescription =
+                string.Format(
+                    "Error occured when checking for existing cohorts in the Project.  We were looking in {0} Error was: {1}",
                     LocationOfCohort + Environment.NewLine + Environment.NewLine,
                     ExceptionHelper.ExceptionToListOfInnerMessages(ex));
 
-            return false;    
+            return false;
         }
-                    
+
 
         if (foundSimilar)
         {
@@ -107,8 +114,5 @@ public bool IsAcceptableAsNewCohort(out string matchDescription)
     /// Returns the <see cref="Description"/>, <see cref="Version"/> and <see cref="ID"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return $"{Description}(Version {Version}, ID={ID})";
-    }
+    public override string ToString() => $"{Description}(Version {Version}, ID={ID})";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/CumulativeExtractionResults.cs b/Rdmp.Core/DataExport/Data/CumulativeExtractionResults.cs
index 3a2d69dea6..2919aac7de 100644
--- a/Rdmp.Core/DataExport/Data/CumulativeExtractionResults.cs
+++ b/Rdmp.Core/DataExport/Data/CumulativeExtractionResults.cs
@@ -16,9 +16,11 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="ICumulativeExtractionResults"/>
-public class CumulativeExtractionResults : DatabaseEntity, ICumulativeExtractionResults, IInjectKnown<IExtractableDataSet>
+public class CumulativeExtractionResults : DatabaseEntity, ICumulativeExtractionResults,
+    IInjectKnown<IExtractableDataSet>
 {
     #region Database Properties
+
     private int _extractionConfiguration_ID;
     private int _extractableDataSet_ID;
     private DateTime _dateOfExtraction;
@@ -38,60 +40,70 @@ public int ExtractionConfiguration_ID
         get => _extractionConfiguration_ID;
         set => SetField(ref _extractionConfiguration_ID, value);
     }
+
     /// <inheritdoc/>
     public int ExtractableDataSet_ID
     {
         get => _extractableDataSet_ID;
         private set => SetField(ref _extractableDataSet_ID, value);
     }
+
     /// <inheritdoc/>
     public DateTime DateOfExtraction
     {
         get => _dateOfExtraction;
         private set => SetField(ref _dateOfExtraction, value);
     }
+
     /// <inheritdoc/>
     public string DestinationType
     {
         get => _destinationType;
         private set => SetField(ref _destinationType, value);
     }
+
     /// <inheritdoc/>
     public string DestinationDescription
     {
         get => _destinationDescription;
         private set => SetField(ref _destinationDescription, value);
     }
+
     /// <inheritdoc/>
     public int RecordsExtracted
     {
         get => _recordsExtracted;
         set => SetField(ref _recordsExtracted, value);
     }
+
     /// <inheritdoc/>
     public int DistinctReleaseIdentifiersEncountered
     {
         get => _distinctReleaseIdentifiersEncountered;
         set => SetField(ref _distinctReleaseIdentifiersEncountered, value);
     }
+
     /// <inheritdoc/>
     public string FiltersUsed
     {
         get => _filtersUsed;
         set => SetField(ref _filtersUsed, value);
     }
+
     /// <inheritdoc/>
     public string Exception
     {
         get => _exception;
         set => SetField(ref _exception, value);
     }
+
     /// <inheritdoc/>
     public string SQLExecuted
     {
         get => _sQLExecuted;
         private set => SetField(ref _sQLExecuted, value);
     }
+
     /// <inheritdoc/>
     public int CohortExtracted
     {
@@ -102,6 +114,7 @@ public int CohortExtracted
     #endregion
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public IExtractableDataSet ExtractableDataSet => _knownExtractableDataSet.Value;
@@ -113,7 +126,8 @@ public int CohortExtracted
             Repository.GetAllObjectsWithParent<SupplementalExtractionResults>(this));
 
     /// <inheritdoc/>
-    public ISupplementalExtractionResults AddSupplementalExtractionResult(string sqlExecuted, IMapsDirectlyToDatabaseTable extractedObject)
+    public ISupplementalExtractionResults AddSupplementalExtractionResult(string sqlExecuted,
+        IMapsDirectlyToDatabaseTable extractedObject)
     {
         var result = new SupplementalExtractionResults(DataExportRepository, this, sqlExecuted, extractedObject);
         SupplementalExtractionResults.Add(result);
@@ -121,11 +135,9 @@ public ISupplementalExtractionResults AddSupplementalExtractionResult(string sql
     }
 
     /// <inheritdoc/>
-    public bool IsFor(ISelectedDataSets selectedDataSet)
-    {
-        return selectedDataSet.ExtractableDataSet_ID == ExtractableDataSet_ID &&
-               selectedDataSet.ExtractionConfiguration_ID == ExtractionConfiguration_ID;
-    }
+    public bool IsFor(ISelectedDataSets selectedDataSet) =>
+        selectedDataSet.ExtractableDataSet_ID == ExtractableDataSet_ID &&
+        selectedDataSet.ExtractionConfiguration_ID == ExtractionConfiguration_ID;
 
     #endregion
 
@@ -143,15 +155,16 @@ public CumulativeExtractionResults()
     /// <param name="configuration"></param>
     /// <param name="dataset"></param>
     /// <param name="sql"></param>
-    public CumulativeExtractionResults(IDataExportRepository repository, IExtractionConfiguration configuration, IExtractableDataSet dataset, string sql)
+    public CumulativeExtractionResults(IDataExportRepository repository, IExtractionConfiguration configuration,
+        IExtractableDataSet dataset, string sql)
     {
         Repository = repository;
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ExtractionConfiguration_ID", configuration.ID},
-            {"ExtractableDataSet_ID", dataset.ID},
-            {"SQLExecuted", sql},
-            {"CohortExtracted", configuration.Cohort_ID}
+            { "ExtractionConfiguration_ID", configuration.ID },
+            { "ExtractableDataSet_ID", dataset.ID },
+            { "SQLExecuted", sql },
+            { "CohortExtracted", configuration.Cohort_ID }
         });
 
         ClearAllInjections();
@@ -189,35 +202,26 @@ public IReleaseLog GetReleaseLogEntryIfAny()
     }
 
     /// <inheritdoc/>
-    public Type GetDestinationType()
-    {
-        return ((IDataExportRepository)Repository).CatalogueRepository.MEF.GetType(_destinationType);
-    }
+    public Type GetDestinationType() =>
+        ((IDataExportRepository)Repository).CatalogueRepository.MEF.GetType(_destinationType);
 
     /// <inheritdoc/>
-    public bool IsReferenceTo(Type t)
-    {
-        return t == typeof (ExtractableDataSet);
-    }
+    public bool IsReferenceTo(Type t) => t == typeof(ExtractableDataSet);
 
     /// <inheritdoc/>
-    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o)
-    {
-        return o is ExtractableDataSet eds && eds.ID == ExtractionConfiguration_ID;
-    }
+    public bool IsReferenceTo(IMapsDirectlyToDatabaseTable o) =>
+        o is ExtractableDataSet eds && eds.ID == ExtractionConfiguration_ID;
 
     /// <inheritdoc/>
-    public void CompleteAudit(Type destinationType, string destinationDescription, int recordsExtracted, bool isBatchResume, bool failed)
+    public void CompleteAudit(Type destinationType, string destinationDescription, int recordsExtracted,
+        bool isBatchResume, bool failed)
     {
         DestinationType = destinationType.FullName;
         DestinationDescription = destinationDescription;
 
-        if(isBatchResume)
+        if (isBatchResume)
         {
-            if(!failed)
-            {
-                RecordsExtracted += recordsExtracted;
-            }
+            if (!failed) RecordsExtracted += recordsExtracted;
         }
         else
         {
@@ -231,10 +235,7 @@ public void CompleteAudit(Type destinationType, string destinationDescription, i
     /// Returns the name of the dataset for which this extraction is an audit of
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return ExtractableDataSet.Catalogue.Name;
-    }
+    public override string ToString() => ExtractableDataSet.Catalogue.Name;
 
     /// <inheritdoc/>
     public void InjectKnown(IExtractableDataSet instance)
@@ -245,6 +246,7 @@ public void InjectKnown(IExtractableDataSet instance)
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
-        _knownExtractableDataSet = new Lazy<IExtractableDataSet>(() => Repository.GetObjectByID<ExtractableDataSet>(ExtractableDataSet_ID));
+        _knownExtractableDataSet =
+            new Lazy<IExtractableDataSet>(() => Repository.GetObjectByID<ExtractableDataSet>(ExtractableDataSet_ID));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/DeployedExtractionFilter.cs b/Rdmp.Core/DataExport/Data/DeployedExtractionFilter.cs
index ca6ec26186..1d9048221d 100644
--- a/Rdmp.Core/DataExport/Data/DeployedExtractionFilter.cs
+++ b/Rdmp.Core/DataExport/Data/DeployedExtractionFilter.cs
@@ -41,43 +41,42 @@ public class DeployedExtractionFilter : ConcreteFilter
     public override int? ClonedFromExtractionFilter_ID
     {
         get => _clonedFromExtractionFilterID;
-        set => SetField(ref _clonedFromExtractionFilterID , value);
+        set => SetField(ref _clonedFromExtractionFilterID, value);
     }
-        
+
     /// <inheritdoc/>
     [Relationship(typeof(FilterContainer), RelationshipType.SharedObject)]
     public override int? FilterContainer_ID
     {
         get => _filterContainerID;
-        set => SetField(ref _filterContainerID , value);
+        set => SetField(ref _filterContainerID, value);
     }
 
     #endregion
+
     #region Relationships
 
     /// <summary>
     /// Returns all parameters declared against this filter (does not include other parameters in scope e.g. globals)
     /// </summary>
     [NoMappingToDatabase]
-    public DeployedExtractionFilterParameter[] ExtractionFilterParameters => Repository.GetAllObjectsWhere<DeployedExtractionFilterParameter>("ExtractionFilter_ID" , ID).ToArray();
+    public DeployedExtractionFilterParameter[] ExtractionFilterParameters => Repository
+        .GetAllObjectsWhere<DeployedExtractionFilterParameter>("ExtractionFilter_ID", ID).ToArray();
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public override IContainer FilterContainer => FilterContainer_ID.HasValue ? Repository.GetObjectByID<FilterContainer>(FilterContainer_ID.Value) : null;
+    public override IContainer FilterContainer => FilterContainer_ID.HasValue
+        ? Repository.GetObjectByID<FilterContainer>(FilterContainer_ID.Value)
+        : null;
 
     #endregion
 
     /// <inheritdoc/>
-    public override ColumnInfo GetColumnInfoIfExists()
-    {
-        return null;
-    }
+    public override ColumnInfo GetColumnInfoIfExists() => null;
 
     /// <inheritdoc/>
-    public override IFilterFactory GetFilterFactory()
-    {
-        return new DeployedExtractionFilterFactory((IDataExportRepository)Repository);
-    }
+    public override IFilterFactory GetFilterFactory() =>
+        new DeployedExtractionFilterFactory((IDataExportRepository)Repository);
 
     /// <inheritdoc/>
     public override Catalogue GetCatalogue()
@@ -87,7 +86,7 @@ public override Catalogue GetCatalogue()
         {
             return (Catalogue)ds.Catalogue;
         }
-        catch(Exception)
+        catch (Exception)
         {
             //could be that the catalogue has been deleted
             return null;
@@ -95,15 +94,10 @@ public override Catalogue GetCatalogue()
     }
 
     /// <inheritdoc/>
-    public override ISqlParameter[] GetAllParameters()
-    {
-        return ExtractionFilterParameters.Cast<ISqlParameter>().ToArray();
-
-    }
+    public override ISqlParameter[] GetAllParameters() => ExtractionFilterParameters.Cast<ISqlParameter>().ToArray();
 
     public DeployedExtractionFilter()
     {
-
     }
 
     /// <summary>
@@ -120,8 +114,8 @@ public DeployedExtractionFilter(IDataExportRepository repository, string name, F
         Repository = repository;
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name != null ? (object) name : DBNull.Value},
-            {"FilterContainer_ID", container != null ? (object) container.ID : DBNull.Value}
+            { "Name", name != null ? (object)name : DBNull.Value },
+            { "FilterContainer_ID", container != null ? (object)container.ID : DBNull.Value }
         });
     }
 
@@ -150,12 +144,9 @@ internal DeployedExtractionFilter(IDataExportRepository repository, DbDataReader
     /// Returns Name of filters
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
+
 
-        
     /// <summary>
     /// Checks the filter is properly defined (e.g. not blank).
     /// </summary>
@@ -164,7 +155,8 @@ public override void Check(ICheckNotifier notifier)
     {
         base.Check(notifier);
 
-        var checker = new ClonedFilterChecker(this, ClonedFromExtractionFilter_ID, ((IDataExportRepository)Repository).CatalogueRepository);
+        var checker = new ClonedFilterChecker(this, ClonedFromExtractionFilter_ID,
+            ((IDataExportRepository)Repository).CatalogueRepository);
         checker.Check(notifier);
     }
 
diff --git a/Rdmp.Core/DataExport/Data/DeployedExtractionFilterFactory.cs b/Rdmp.Core/DataExport/Data/DeployedExtractionFilterFactory.cs
index 78eb907650..30fdeb131e 100644
--- a/Rdmp.Core/DataExport/Data/DeployedExtractionFilterFactory.cs
+++ b/Rdmp.Core/DataExport/Data/DeployedExtractionFilterFactory.cs
@@ -27,33 +27,19 @@ public DeployedExtractionFilterFactory(IDataExportRepository repository)
     {
         _repository = repository;
     }
-    
+
     /// <inheritdoc/>
-    public IFilter CreateNewFilter(string name)
-    {
-        return new DeployedExtractionFilter(_repository,name,null);
-    }
+    public IFilter CreateNewFilter(string name) => new DeployedExtractionFilter(_repository, name, null);
 
     /// <inheritdoc/>
-    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL)
-    {
-        return new DeployedExtractionFilterParameter(_repository,parameterSQL,filter);
-    }
+    public ISqlParameter CreateNewParameter(IFilter filter, string parameterSQL) =>
+        new DeployedExtractionFilterParameter(_repository, parameterSQL, filter);
 
     /// <inheritdoc/>
-    public Type GetRootOwnerType()
-    {
-        return typeof (SelectedDataSets);
-    }
+    public Type GetRootOwnerType() => typeof(SelectedDataSets);
 
     /// <inheritdoc/>
-    public Type GetIContainerTypeIfAny()
-    {
-        return typeof (FilterContainer);
-    }
+    public Type GetIContainerTypeIfAny() => typeof(FilterContainer);
 
-    public IContainer CreateNewContainer()
-    {
-        return new FilterContainer(_repository);
-    }
+    public IContainer CreateNewContainer() => new FilterContainer(_repository);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/DeployedExtractionFilterParameter.cs b/Rdmp.Core/DataExport/Data/DeployedExtractionFilterParameter.cs
index 2548b0db13..146d06e25a 100644
--- a/Rdmp.Core/DataExport/Data/DeployedExtractionFilterParameter.cs
+++ b/Rdmp.Core/DataExport/Data/DeployedExtractionFilterParameter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) The University of Dundee 2018-2019
+// Copyright (c) The University of Dundee 2018-2023
 // This file is part of the Research Data Management Platform (RDMP).
 // RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
@@ -20,9 +20,10 @@ namespace Rdmp.Core.DataExport.Data;
 /// <summary>
 /// Stores parameter values for a DeployedExtractionFilter e.g. @healthboard = 'T'
 /// </summary>
-public class DeployedExtractionFilterParameter: DatabaseEntity, ISqlParameter
+public class DeployedExtractionFilterParameter : DatabaseEntity, ISqlParameter
 {
     #region Database Properties
+
     private int _extractionFilter_ID;
     private string _parameterSQL;
     private string _value;
@@ -32,7 +33,7 @@ public class DeployedExtractionFilterParameter: DatabaseEntity, ISqlParameter
     /// The <see cref="ExtractionFilter"/> against which the parameter is declared.  The WHERE Sql of the filter should
     /// reference this parameter (e.g. "[mydb]..[mytbl].[hb_extract] = @healthboard").
     /// </summary>
-    [Relationship(typeof(DeployedExtractionFilter),RelationshipType.SharedObject)]
+    [Relationship(typeof(DeployedExtractionFilter), RelationshipType.SharedObject)]
     public int ExtractionFilter_ID
     {
         get => _extractionFilter_ID;
@@ -61,21 +62,24 @@ public string Comment
         get => _comment;
         set => SetField(ref _comment, value);
     }
+
     #endregion
-        
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public string ParameterName => QuerySyntaxHelper.GetParameterNameFromDeclarationSQL(ParameterSQL);
 
     #region Relationships
+
+    /// <inheritdoc cref="ExtractionFilter_ID"/>
     [NoMappingToDatabase]
-    public DeployedExtractionFilter ExtractionFilter => Repository.GetObjectByID<DeployedExtractionFilter>(ExtractionFilter_ID);
+    public DeployedExtractionFilter ExtractionFilter =>
+        Repository.GetObjectByID<DeployedExtractionFilter>(ExtractionFilter_ID);
 
     #endregion
 
     public DeployedExtractionFilterParameter()
     {
-
     }
 
     /// <summary>
@@ -90,8 +94,8 @@ public DeployedExtractionFilterParameter(IDataExportRepository repository, strin
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ParameterSQL", parameterSQL},
-            {"ExtractionFilter_ID", parent.ID}
+            { "ParameterSQL", parameterSQL },
+            { "ExtractionFilter_ID", parent.ID }
         });
     }
 
@@ -100,7 +104,7 @@ public DeployedExtractionFilterParameter(IDataExportRepository repository, strin
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="r"></param>
-    internal DeployedExtractionFilterParameter(IDataExportRepository repository, DbDataReader r): base(repository, r)
+    internal DeployedExtractionFilterParameter(IDataExportRepository repository, DbDataReader r) : base(repository, r)
     {
         ExtractionFilter_ID = int.Parse(r["ExtractionFilter_ID"].ToString());
         ParameterSQL = r["ParameterSQL"] as string;
@@ -112,10 +116,7 @@ internal DeployedExtractionFilterParameter(IDataExportRepository repository, DbD
     /// returns the <see cref="ParameterName"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     /// <summary>
     /// Checks the parameter syntax (See <see cref="ParameterSyntaxChecker"/>)
@@ -127,16 +128,12 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return ((DeployedExtractionFilter) GetOwnerIfAny()).GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() =>
+        ((DeployedExtractionFilter)GetOwnerIfAny()).GetQuerySyntaxHelper();
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return Repository.GetObjectByID<DeployedExtractionFilter>(ExtractionFilter_ID);
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() =>
+        Repository.GetObjectByID<DeployedExtractionFilter>(ExtractionFilter_ID);
 
     public DeployedExtractionFilterParameter ShallowClone(DeployedExtractionFilter into)
     {
@@ -144,4 +141,4 @@ public DeployedExtractionFilterParameter ShallowClone(DeployedExtractionFilter i
         CopyShallowValuesTo(clone);
         return clone;
     }
-}
\ No newline at end of file
+}
diff --git a/Rdmp.Core/DataExport/Data/ExternalCohortDefinitionData.cs b/Rdmp.Core/DataExport/Data/ExternalCohortDefinitionData.cs
index cfe65f7f07..4b86c65ebc 100644
--- a/Rdmp.Core/DataExport/Data/ExternalCohortDefinitionData.cs
+++ b/Rdmp.Core/DataExport/Data/ExternalCohortDefinitionData.cs
@@ -28,7 +28,6 @@ public ExternalCohortDefinitionData(DbDataReader r, string tableName)
 
     private ExternalCohortDefinitionData()
     {
-
     }
 
     /// <inheritdoc/>
diff --git a/Rdmp.Core/DataExport/Data/ExternalCohortTable.cs b/Rdmp.Core/DataExport/Data/ExternalCohortTable.cs
index 5ad70afcba..d3271c01f6 100644
--- a/Rdmp.Core/DataExport/Data/ExternalCohortTable.cs
+++ b/Rdmp.Core/DataExport/Data/ExternalCohortTable.cs
@@ -24,9 +24,10 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IExternalCohortTable"/>
-public class ExternalCohortTable : DatabaseEntity, IDataAccessCredentials, IExternalCohortTable,INamed
+public class ExternalCohortTable : DatabaseEntity, IDataAccessCredentials, IExternalCohortTable, INamed
 {
     #region Database Properties
+
     private string _name;
 
     /// <summary>
@@ -42,58 +43,58 @@ public string Name
 
     #endregion
 
-    [NoMappingToDatabase]
-    private SelfCertifyingDataAccessPoint SelfCertifyingDataAccessPoint { get; set; }
+    [NoMappingToDatabase] private SelfCertifyingDataAccessPoint SelfCertifyingDataAccessPoint { get; set; }
 
     /// <inheritdoc/>
     public string DefinitionTableForeignKeyField
     {
         get => _definitionTableForeignKeyField;
-        set => SetField(ref _definitionTableForeignKeyField, Qualify(Database ?? string.Empty, TableName?? string.Empty, value));
+        set => SetField(ref _definitionTableForeignKeyField,
+            Qualify(Database ?? string.Empty, TableName ?? string.Empty, value));
     }
 
     /// <inheritdoc/>
     public string TableName
     {
         get => _tableName;
-        set => SetField(ref _tableName, Qualify(Database?? string.Empty, value?? string.Empty));
+        set => SetField(ref _tableName, Qualify(Database ?? string.Empty, value ?? string.Empty));
     }
 
     private string Qualify(string db, string tbl, string col = null)
     {
         //if we already have a value being set that is qualified don't mess it up!
-        if((col ?? tbl ?? string.Empty).Contains('.'))
+        if ((col ?? tbl ?? string.Empty).Contains('.'))
             return col ?? tbl;
 
         //they sent us something like "bob" for a table/column name, let's fully qualify it with the Database etc
         var syntax = GetQuerySyntaxHelper();
 
-        if(col == null)
-            return  syntax.EnsureFullyQualified(
+        if (col == null)
+            return syntax.EnsureFullyQualified(
                 syntax.GetRuntimeName(db ?? string.Empty),
                 null /*no schema*/,
                 syntax.GetRuntimeName(tbl ?? string.Empty));
 
-        return  syntax.EnsureFullyQualified(
+        return syntax.EnsureFullyQualified(
             syntax.GetRuntimeName(db ?? string.Empty),
             null /*no schema*/,
             syntax.GetRuntimeName(tbl ?? string.Empty),
             syntax.GetRuntimeName(col));
-
     }
 
     /// <inheritdoc/>
     public string DefinitionTableName
     {
         get => _definitionTableName;
-        set => SetField(ref _definitionTableName, Qualify(Database?? string.Empty, value?? string.Empty));
+        set => SetField(ref _definitionTableName, Qualify(Database ?? string.Empty, value ?? string.Empty));
     }
 
     /// <inheritdoc/>
     public string PrivateIdentifierField
     {
         get => _privateIdentifierField;
-        set => SetField(ref _privateIdentifierField, Qualify(Database?? string.Empty,TableName, value?? string.Empty));
+        set => SetField(ref _privateIdentifierField,
+            Qualify(Database ?? string.Empty, TableName, value ?? string.Empty));
     }
 
     /// <inheritdoc/>
@@ -103,13 +104,15 @@ public string PrivateIdentifierField
     public string ReleaseIdentifierField
     {
         get => _releaseIdentifierField;
-        set => SetField(ref _releaseIdentifierField, Qualify(Database?? string.Empty, TableName, value?? string.Empty));
+        set => SetField(ref _releaseIdentifierField,
+            Qualify(Database ?? string.Empty, TableName, value ?? string.Empty));
     }
 
     /// <summary>
     /// Fields expected to be part of any table referenced by the <see cref="DefinitionTableName"/> property
     /// </summary>
-    public static readonly string[] CohortDefinitionTable_RequiredFields = {
+    public static readonly string[] CohortDefinitionTable_RequiredFields =
+    {
         "id",
         // joins to CohortToDefinitionTableJoinColumn and is used as ID in all ExtractableCohort entities throughout DataExportManager
         "projectNumber",
@@ -128,15 +131,13 @@ public string ReleaseIdentifierField
     /// Returns <see cref="Name"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public ExternalCohortTable()
     {
         SelfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint();
     }
+
     /// <summary>
     /// Creates a new blank pointer to a cohort database.
     /// </summary>
@@ -149,8 +150,8 @@ public ExternalCohortTable(IDataExportRepository repository, string name, Databa
         SelfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository.CatalogueRepository, databaseType);
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name", name ?? $"NewExternalSource{Guid.NewGuid()}" },
-            {"DatabaseType",databaseType.ToString()}
+            { "Name", name ?? $"NewExternalSource{Guid.NewGuid()}" },
+            { "DatabaseType", databaseType.ToString() }
         });
     }
 
@@ -165,33 +166,29 @@ internal ExternalCohortTable(IDataExportRepository repository, DbDataReader r)
         Name = r["Name"] as string;
         var databaseType = (DatabaseType)Enum.Parse(typeof(DatabaseType), r["DatabaseType"].ToString());
 
-        SelfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository.CatalogueRepository,databaseType);
+        SelfCertifyingDataAccessPoint = new SelfCertifyingDataAccessPoint(repository.CatalogueRepository, databaseType);
 
         Server = r["Server"] as string;
         Username = r["Username"] as string;
         Password = r["Password"] as string;
         Database = r["Database"] as string ?? string.Empty;
-            
-        TableName = Qualify(Database,  r["TableName"] as string ?? string.Empty);
-        DefinitionTableForeignKeyField = Qualify(Database, TableName, r["DefinitionTableForeignKeyField"] as string ?? string.Empty);
+
+        TableName = Qualify(Database, r["TableName"] as string ?? string.Empty);
+        DefinitionTableForeignKeyField = Qualify(Database, TableName,
+            r["DefinitionTableForeignKeyField"] as string ?? string.Empty);
 
         DefinitionTableName = Qualify(Database, r["DefinitionTableName"] as string ?? string.Empty);
-            
+
         PrivateIdentifierField = Qualify(Database, TableName, r["PrivateIdentifierField"] as string ?? string.Empty);
         ReleaseIdentifierField = Qualify(Database, TableName, r["ReleaseIdentifierField"] as string ?? string.Empty);
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return new QuerySyntaxHelperFactory().Create(SelfCertifyingDataAccessPoint.DatabaseType);
-    }
-        
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() =>
+        new QuerySyntaxHelperFactory().Create(SelfCertifyingDataAccessPoint.DatabaseType);
+
     /// <inheritdoc/>
-    public DiscoveredDatabase Discover()
-    {
-        return SelfCertifyingDataAccessPoint.Discover(DataAccessContext.DataExport);
-    }
+    public DiscoveredDatabase Discover() => SelfCertifyingDataAccessPoint.Discover(DataAccessContext.DataExport);
 
     /// <inheritdoc/>
     public DiscoveredTable DiscoverCohortTable()
@@ -207,26 +204,17 @@ public DiscoveredTable DiscoverDefinitionTable()
     }
 
     /// <inheritdoc/>
-    public DiscoveredColumn DiscoverPrivateIdentifier()
-    {
-        return Discover(DiscoverCohortTable(), PrivateIdentifierField);
-    }
+    public DiscoveredColumn DiscoverPrivateIdentifier() => Discover(DiscoverCohortTable(), PrivateIdentifierField);
+
     /// <inheritdoc/>
-    public DiscoveredColumn DiscoverReleaseIdentifier()
-    {
-        return Discover(DiscoverCohortTable(), ReleaseIdentifierField);
-    }
+    public DiscoveredColumn DiscoverReleaseIdentifier() => Discover(DiscoverCohortTable(), ReleaseIdentifierField);
 
-    public DiscoveredColumn DiscoverDefinitionTableForeignKey()
-    {
-        return Discover(DiscoverCohortTable(), DefinitionTableForeignKeyField);
-    }
+    public DiscoveredColumn DiscoverDefinitionTableForeignKey() =>
+        Discover(DiscoverCohortTable(), DefinitionTableForeignKeyField);
+
+    private static DiscoveredColumn Discover(DiscoveredTable tbl, string column) =>
+        tbl.DiscoverColumn(tbl.Database.Server.GetQuerySyntaxHelper().GetRuntimeName(column));
 
-    private static DiscoveredColumn Discover(DiscoveredTable tbl, string column)
-    {
-        return tbl.DiscoverColumn(tbl.Database.Server.GetQuerySyntaxHelper().GetRuntimeName(column));
-    }
-        
 
     /// <summary>
     /// Checks that the remote cohort storage database described by this class exists and contains a compatible schema.
@@ -235,9 +223,9 @@ private static DiscoveredColumn Discover(DiscoveredTable tbl, string column)
     public void Check(ICheckNotifier notifier)
     {
         //make sure we can get to server
-        CheckCohortDatabaseAccessible( notifier);
+        CheckCohortDatabaseAccessible(notifier);
 
-        CheckCohortDatabaseHasCorrectTables( notifier);
+        CheckCohortDatabaseHasCorrectTables(notifier);
 
         if (string.Equals(PrivateIdentifierField, ReleaseIdentifierField))
             notifier.OnCheckPerformed(
@@ -245,19 +233,20 @@ public void Check(ICheckNotifier notifier)
     }
 
     #region Stuff for checking the remote (not data export manager) table where the cohort is allegedly stored
-        
+
     /// <inheritdoc/>
     public bool IDExistsInCohortTable(int originID)
     {
         var server = DataAccessPortal.ExpectServer(this, DataAccessContext.DataExport);
-            
+
         using (var con = server.GetConnection())
         {
             con.Open();
 
             var sql = $@"select count(*) from {DefinitionTableName} where id = {originID}";
 
-            using(var cmdGetDescriptionOfCohortFromConsus = server.GetCommand(sql, con))
+            using (var cmdGetDescriptionOfCohortFromConsus = server.GetCommand(sql, con))
+            {
                 try
                 {
                     return int.Parse(cmdGetDescriptionOfCohortFromConsus.ExecuteScalar().ToString()) >= 1;
@@ -265,11 +254,13 @@ public bool IDExistsInCohortTable(int originID)
                 catch (Exception e)
                 {
                     throw new Exception(
-                        $"Could not connect to server {Server} (Database '{Database}') which is the data source of ExternalCohortTable (source) called '{Name}' (ID={ID})", e);
+                        $"Could not connect to server {Server} (Database '{Database}') which is the data source of ExternalCohortTable (source) called '{Name}' (ID={ID})",
+                        e);
                 }
+            }
         }
-
     }
+
     private void CheckCohortDatabaseHasCorrectTables(ICheckNotifier notifier)
     {
         try
@@ -279,14 +270,18 @@ private void CheckCohortDatabaseHasCorrectTables(ICheckNotifier notifier)
             var cohortTable = DiscoverCohortTable();
             if (cohortTable.Exists())
             {
-                notifier.OnCheckPerformed(new CheckEventArgs($"Found table {cohortTable} in database {Database}", CheckResult.Success, null));
-                    
+                notifier.OnCheckPerformed(new CheckEventArgs($"Found table {cohortTable} in database {Database}",
+                    CheckResult.Success, null));
+
                 DiscoverPrivateIdentifier();
                 DiscoverReleaseIdentifier();
                 DiscoverDefinitionTableForeignKey();
             }
             else
-                notifier.OnCheckPerformed(new CheckEventArgs($"Could not find table {TableName} in database {Database}", CheckResult.Fail, null));
+            {
+                notifier.OnCheckPerformed(new CheckEventArgs($"Could not find table {TableName} in database {Database}",
+                    CheckResult.Fail, null));
+            }
 
             var foundCohortDefinitionTable = DiscoverDefinitionTable();
 
@@ -296,13 +291,15 @@ private void CheckCohortDatabaseHasCorrectTables(ICheckNotifier notifier)
                     $"Found table {DefinitionTableName} in database {Database}", CheckResult.Success, null));
 
                 var cols = foundCohortDefinitionTable.DiscoverColumns();
-                    
+
                 foreach (var requiredField in CohortDefinitionTable_RequiredFields)
                     ComplainIfColumnMissing(DefinitionTableName, cols, requiredField, notifier);
             }
             else
+            {
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"Could not find table {DefinitionTableName} in database {Database}", CheckResult.Fail, null));
+            }
         }
         catch (Exception e)
         {
@@ -310,38 +307,42 @@ private void CheckCohortDatabaseHasCorrectTables(ICheckNotifier notifier)
                 $"Could not check table intactness for ExternalCohortTable '{Name}'", CheckResult.Fail, e));
         }
     }
-        
+
     private void CheckCohortDatabaseAccessible(ICheckNotifier notifier)
     {
         try
         {
             DataAccessPortal.ExpectServer(this, DataAccessContext.DataExport).TestConnection();
-              
-            notifier.OnCheckPerformed(new CheckEventArgs($"Connected to Cohort database '{Name}'", CheckResult.Success, null));
+
+            notifier.OnCheckPerformed(new CheckEventArgs($"Connected to Cohort database '{Name}'", CheckResult.Success,
+                null));
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to Cohort database called '{Name}'", CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to Cohort database called '{Name}'",
+                CheckResult.Fail, e));
         }
     }
-        
+
     /// <inheritdoc/>
-    public void PushToServer(ICohortDefinition newCohortDefinition,IManagedConnection connection)
+    public void PushToServer(ICohortDefinition newCohortDefinition, IManagedConnection connection)
     {
         newCohortDefinition.ID = DiscoverDefinitionTable().Insert(new Dictionary<string, object>
         {
-            {"projectNumber",newCohortDefinition.ProjectNumber},
-            {"version",newCohortDefinition.Version},
-            {"description",newCohortDefinition.Description}
-        },connection.ManagedTransaction);
+            { "projectNumber", newCohortDefinition.ProjectNumber },
+            { "version", newCohortDefinition.Version },
+            { "description", newCohortDefinition.Description }
+        }, connection.ManagedTransaction);
     }
+
     #endregion
 
-    private void ComplainIfColumnMissing(string tableNameFullyQualified, DiscoveredColumn[] columns, string colToFindCanBeFullyQualifiedIfYouLike, ICheckNotifier notifier)
+    private void ComplainIfColumnMissing(string tableNameFullyQualified, DiscoveredColumn[] columns,
+        string colToFindCanBeFullyQualifiedIfYouLike, ICheckNotifier notifier)
     {
         var tofind = GetQuerySyntaxHelper().GetRuntimeName(colToFindCanBeFullyQualifiedIfYouLike);
 
-        if (columns.Any(col=>col.GetRuntimeName().Equals(tofind,StringComparison.CurrentCultureIgnoreCase)))
+        if (columns.Any(col => col.GetRuntimeName().Equals(tofind, StringComparison.CurrentCultureIgnoreCase)))
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"Found required field {tofind} in table {tableNameFullyQualified}",
                 CheckResult.Success, null));
@@ -350,10 +351,10 @@ private void ComplainIfColumnMissing(string tableNameFullyQualified, DiscoveredC
                 $"Could not find required field {tofind} in table {tableNameFullyQualified}(It had the following columns:{columns.Aggregate("", (s, n) => $"{s}{n},")})",
                 CheckResult.Fail, null));
     }
-        
+
 
     #region IDataAccessCredentials and IDataAccessPoint delegation
-        
+
     /// <inheritdoc/>
     public string Password
     {
@@ -366,10 +367,7 @@ public string Password
     }
 
     /// <inheritdoc/>
-    public string GetDecryptedPassword()
-    {
-        return SelfCertifyingDataAccessPoint.GetDecryptedPassword()?? "";
-    }
+    public string GetDecryptedPassword() => SelfCertifyingDataAccessPoint.GetDecryptedPassword() ?? "";
 
     /// <inheritdoc/>
     public string Username
@@ -432,10 +430,9 @@ public DatabaseType DatabaseType
     }
 
     /// <inheritdoc/>
-    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
-    {
-        return SelfCertifyingDataAccessPoint.GetCredentialsIfExists(context);
-    }
+    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context) =>
+        SelfCertifyingDataAccessPoint.GetCredentialsIfExists(context);
+
     #endregion
 
 
@@ -447,7 +444,7 @@ public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
     public string GetCountsDataTableSql()
     {
         var syntax = GetQuerySyntaxHelper();
-            
+
 
         return $@"SELECT 
 id as OriginID,
@@ -467,9 +464,8 @@ group by
    version,
    description,
    {syntax.EnsureWrapped("dtCreated")}";
-
     }
-        
+
     /// <summary>
     /// Returns SQL query for listing all cohorts stored in the database referenced by this <see cref="ExternalCohortTable"/>.
     /// This includes only the ids, project numbers, version, description etc not the actual patient identifiers themselves.
@@ -487,17 +483,13 @@ public string GetExternalDataSql()
 {syntax.EnsureWrapped("dtCreated")}
   FROM
    {DefinitionTableName}";
-
     }
-        
+
     /// <summary>
     /// Returns nothing
     /// </summary>
     /// <returns></returns>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
 
     /// <summary>
     /// Returns all cohorts in the source
@@ -505,27 +497,24 @@ public IHasDependencies[] GetObjectsThisDependsOn()
     /// <returns></returns>
     public IHasDependencies[] GetObjectsDependingOnThis()
     {
-        return (IHasDependencies[])Repository.GetAllObjects<ExtractableCohort>().Where(c => c.ExternalCohortTable_ID == ID); 
+        return (IHasDependencies[])Repository.GetAllObjects<ExtractableCohort>()
+            .Where(c => c.ExternalCohortTable_ID == ID);
     }
 
     /// <summary>
     /// returns true if all the relevant fields are populated (table names, column names etc)
     /// </summary>
     /// <returns></returns>
-    public bool IsFullyPopulated()
-    {
-        return !
+    public bool IsFullyPopulated() =>
+        !
             (string.IsNullOrWhiteSpace(TableName) ||
              string.IsNullOrWhiteSpace(PrivateIdentifierField) ||
              string.IsNullOrWhiteSpace(ReleaseIdentifierField) ||
              string.IsNullOrWhiteSpace(DefinitionTableForeignKeyField) ||
              string.IsNullOrWhiteSpace(DefinitionTableName));
-    }
 
-    public bool DiscoverExistence(DataAccessContext context, out string reason)
-    {
-        return SelfCertifyingDataAccessPoint.DiscoverExistence(context,out reason);
-    }
+    public bool DiscoverExistence(DataAccessContext context, out string reason) =>
+        SelfCertifyingDataAccessPoint.DiscoverExistence(context, out reason);
 
     public void SetRepository(ICatalogueRepository repository)
     {
diff --git a/Rdmp.Core/DataExport/Data/ExtractableCohort.cs b/Rdmp.Core/DataExport/Data/ExtractableCohort.cs
index 9dad5d66ab..e082e82a88 100644
--- a/Rdmp.Core/DataExport/Data/ExtractableCohort.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractableCohort.cs
@@ -24,7 +24,8 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IExtractableCohort"/>
-public class ExtractableCohort : DatabaseEntity, IExtractableCohort, IInjectKnown<IExternalCohortDefinitionData>, IInjectKnown<ExternalCohortTable>,  ICustomSearchString
+public class ExtractableCohort : DatabaseEntity, IExtractableCohort, IInjectKnown<IExternalCohortDefinitionData>,
+    IInjectKnown<ExternalCohortTable>, ICustomSearchString
 {
     /// <summary>
     /// Logging entry in the RDMP central relational log under which to record all activities that relate to creating cohorts
@@ -32,6 +33,7 @@ public class ExtractableCohort : DatabaseEntity, IExtractableCohort, IInjectKnow
     public const string CohortLoggingTask = "CohortManagement";
 
     #region Database Properties
+
     private int _externalCohortTable_ID;
     private string _overrideReleaseIdentifierSQL;
     private string _auditLog;
@@ -77,7 +79,6 @@ public bool IsDeprecated
     #endregion
 
 
-        
     private int _count = -1;
 
 
@@ -95,6 +96,7 @@ public int Count
     }
 
     private int _countDistinct = -1;
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public int CountDistinct
@@ -109,8 +111,9 @@ public int CountDistinct
     }
 
     private Dictionary<string, string> _releaseToPrivateKeyDictionary;
-        
+
     #region Relationships
+
     /// <inheritdoc cref="ExternalCohortTable_ID"/>
     [NoMappingToDatabase]
     public IExternalCohortTable ExternalCohortTable => _knownExternalCohortTable.Value;
@@ -159,7 +162,7 @@ private object GetFromCacheData(Func<IExternalCohortDefinitionData, object> func
             _broken = true;
             _cacheData = new Lazy<IExternalCohortDefinitionData>((IExternalCohortDefinitionData)null);
         }
-                
+
         return null;
     }
 
@@ -197,17 +200,14 @@ public IExternalCohortDefinitionData GetExternalData(int timeoutInSeconds = -1)
 where 
     {syntax.EnsureWrapped("id")} = {OriginID}";
 
-        if(timeoutInSeconds != -1)
-        {
-            db.Server.TestConnection(timeoutInSeconds * 1000);
-        }
+        if (timeoutInSeconds != -1) db.Server.TestConnection(timeoutInSeconds * 1000);
 
         using (var con = db.Server.GetConnection())
         {
             con.Open();
             using (var getDescription = db.Server.GetCommand(sql, con))
             {
-                if(timeoutInSeconds != -1)
+                if (timeoutInSeconds != -1)
                     getDescription.CommandTimeout = timeoutInSeconds;
 
                 using (var r = getDescription.ExecuteReader())
@@ -221,7 +221,7 @@ public IExternalCohortDefinitionData GetExternalData(int timeoutInSeconds = -1)
         }
     }
 
-        
+
     private Lazy<IExternalCohortDefinitionData> _cacheData;
     private Lazy<IExternalCohortTable> _knownExternalCohortTable;
     private int _originID;
@@ -238,12 +238,13 @@ public ExtractableCohort(IDataExportRepository repository, ExternalCohortTable e
         Repository = repository;
 
         if (!externalSource.IDExistsInCohortTable(originalId))
-            throw new Exception($"ID {originalId} does not exist in Cohort Definitions (Referential Integrity Problem)");
+            throw new Exception(
+                $"ID {originalId} does not exist in Cohort Definitions (Referential Integrity Problem)");
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"OriginID", originalId},
-            {"ExternalCohortTable_ID", externalSource.ID}
+            { "OriginID", originalId },
+            { "ExternalCohortTable_ID", externalSource.ID }
         });
 
         ClearAllInjections();
@@ -260,13 +261,10 @@ public override string ToString()
     }
 
     /// <inheritdoc/>
-    public string GetSearchString()
-    {
-        return $"{ToString()} {ExternalProjectNumber} {ExternalVersion}";
-    }
+    public string GetSearchString() => $"{ToString()} {ExternalProjectNumber} {ExternalVersion}";
 
     private IQuerySyntaxHelper _cachedQuerySyntaxHelper;
-        
+
     /// <inheritdoc/>
     public IQuerySyntaxHelper GetQuerySyntaxHelper()
     {
@@ -276,7 +274,7 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     }
 
     #region Stuff for executing the actual queries described by this class (generating cohorts etc)
-        
+
     /// <inheritdoc/>
     public DataTable FetchEntireCohort()
     {
@@ -294,17 +292,17 @@ public DataTable FetchEntireCohort()
             da.Fill(dtReturn);
 
             dtReturn.TableName = cohortTable.GetRuntimeName();
-                
+
             return dtReturn;
         }
     }
-        
+
     /// <inheritdoc/>
     public string WhereSQL()
     {
         var ect = ExternalCohortTable;
         var syntax = ect.GetQuerySyntaxHelper();
-            
+
         return
             $"{syntax.EnsureFullyQualified(syntax.GetRuntimeName(ect.Database ?? string.Empty), /* no schema*/ null, syntax.GetRuntimeName(ect.TableName ?? string.Empty), syntax.GetRuntimeName(ect.DefinitionTableForeignKeyField ?? string.Empty))}={OriginID}";
     }
@@ -318,8 +316,10 @@ private int CountCohortInDatabase()
         {
             con.Open();
 
-            using(var cmd = db.Server.GetCommand($"SELECT count(*) FROM {ect.TableName} WHERE {WhereSQL()}", con))
+            using (var cmd = db.Server.GetCommand($"SELECT count(*) FROM {ect.TableName} WHERE {WhereSQL()}", con))
+            {
                 return Convert.ToInt32(cmd.ExecuteScalar());
+            }
         }
     }
 
@@ -327,9 +327,10 @@ private int CountCohortInDatabase()
     public int GetCountDistinctFromDatabase(int timeout = -1)
     {
         var syntax = GetQuerySyntaxHelper();
-            
+
         return Convert.ToInt32(ExecuteScalar(
-            $"SELECT count(DISTINCT {syntax.EnsureWrapped(GetReleaseIdentifier(true))}) FROM {ExternalCohortTable.TableName} WHERE {WhereSQL()}",timeout));
+            $"SELECT count(DISTINCT {syntax.EnsureWrapped(GetReleaseIdentifier(true))}) FROM {ExternalCohortTable.TableName} WHERE {WhereSQL()}",
+            timeout));
     }
 
     private object ExecuteScalar(string sql, int timeout = -1)
@@ -341,19 +342,18 @@ private object ExecuteScalar(string sql, int timeout = -1)
         {
             con.Open();
 
-            using(var cmd = db.Server.GetCommand(sql, con))
+            using (var cmd = db.Server.GetCommand(sql, con))
             {
-                if(timeout != -1)
+                if (timeout != -1)
                     cmd.CommandTimeout = timeout;
 
                 return cmd.ExecuteScalar();
             }
-                    
         }
     }
-        
+
     #endregion
-        
+
     /// <summary>
     /// Returns details of all cohorts held in <paramref name="externalSource"/> (that have at least one identifier mapping).
     /// </summary>
@@ -368,15 +368,13 @@ public static IEnumerable<CohortDefinition> GetImportableCohortDefinitions(Exter
                    out var projectNumberMemberName))
         {
             foreach (DataRow r in dt.Rows)
-            {
                 yield return
                     new CohortDefinition(
                         Convert.ToInt32(r[valueMemberName]),
                         r[displayMemberName].ToString(),
                         Convert.ToInt32(r[versionMemberName]),
                         Convert.ToInt32(r[projectNumberMemberName])
-                        ,externalSource);
-            }
+                        , externalSource);
         }
     }
 
@@ -389,7 +387,9 @@ public static IEnumerable<CohortDefinition> GetImportableCohortDefinitions(Exter
     /// <param name="versionMemberName"></param>
     /// <param name="projectNumberMemberName"></param>
     /// <returns></returns>
-    public static DataTable GetImportableCohortDefinitionsTable(ExternalCohortTable externalSource, out string displayMemberName, out string valueMemberName, out string versionMemberName, out string projectNumberMemberName)
+    public static DataTable GetImportableCohortDefinitionsTable(ExternalCohortTable externalSource,
+        out string displayMemberName, out string valueMemberName, out string versionMemberName,
+        out string projectNumberMemberName)
     {
         var server = externalSource.Discover().Server;
         var syntax = server.GetQuerySyntaxHelper();
@@ -420,7 +420,7 @@ public static DataTable GetImportableCohortDefinitionsTable(ExternalCohortTable
             }
         }
     }
-        
+
     /// <inheritdoc/>
     public string GetReleaseIdentifier(bool runtimeName = false)
     {
@@ -435,7 +435,8 @@ public string GetReleaseIdentifier(bool runtimeName = false)
 
         var syntaxHelper = GetQuerySyntaxHelper();
 
-        if (syntaxHelper.GetRuntimeName(toReturn).Equals(syntaxHelper.GetRuntimeName(ExternalCohortTable.PrivateIdentifierField)))
+        if (syntaxHelper.GetRuntimeName(toReturn)
+            .Equals(syntaxHelper.GetRuntimeName(ExternalCohortTable.PrivateIdentifierField)))
             new ThrowImmediatelyCheckNotifier()
                 .OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExtractionIsIdentifiable));
 
@@ -443,42 +444,31 @@ public string GetReleaseIdentifier(bool runtimeName = false)
     }
 
     /// <inheritdoc/>
-    public string GetPrivateIdentifier(bool runtimeName = false)
-    {
-        return runtimeName ? GetQuerySyntaxHelper().GetRuntimeName(ExternalCohortTable.PrivateIdentifierField) : ExternalCohortTable.PrivateIdentifierField;
-    }
+    public string GetPrivateIdentifier(bool runtimeName = false) => runtimeName
+        ? GetQuerySyntaxHelper().GetRuntimeName(ExternalCohortTable.PrivateIdentifierField)
+        : ExternalCohortTable.PrivateIdentifierField;
 
     /// <inheritdoc/>
-    public string GetPrivateIdentifierDataType()
-    {
-        return ExternalCohortTable.DiscoverPrivateIdentifier().DataType.SQLType;
-            
-    }
+    public string GetPrivateIdentifierDataType() => ExternalCohortTable.DiscoverPrivateIdentifier().DataType.SQLType;
 
     /// <inheritdoc/>
-    public string GetReleaseIdentifierDataType()
-    {
-        return ExternalCohortTable.DiscoverReleaseIdentifier().DataType.SQLType;
-    }
-        
+    public string GetReleaseIdentifierDataType() => ExternalCohortTable.DiscoverReleaseIdentifier().DataType.SQLType;
+
 
     /// <inheritdoc/>
-    public DiscoveredDatabase GetDatabaseServer()
-    {
-        return ExternalCohortTable.Discover();
-    }
+    public DiscoveredDatabase GetDatabaseServer() => ExternalCohortTable.Discover();
 
     //these need to be private since ReverseAnonymiseDataTable will likely be called in batch
     private int _reverseAnonymiseProgressFetchingMap = 0;
     private int _reverseAnonymiseProgressReversing = 0;
-        
+
     /// <summary>
     /// Indicates whether the database described in ExternalCohortTable is unreachable or if the cohort has since been deleted etc.
     /// </summary>
     private bool _broken;
 
     /// <inheritdoc/>
-    public void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListener listener,bool allowCaching)
+    public void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListener listener, bool allowCaching)
     {
         var haveWarnedAboutTop1AlreadyCount = 10;
 
@@ -490,7 +480,6 @@ public void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListene
         //if we don't want to support caching or there is no cached value yet
         if (!allowCaching || _releaseToPrivateKeyDictionary == null)
         {
-
             var map = FetchEntireCohort();
 
 
@@ -502,33 +491,43 @@ public void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListene
             {
                 if (_releaseToPrivateKeyDictionary.Keys.Contains(r[releaseIdentifier]))
                 {
-                    if (haveWarnedAboutTop1AlreadyCount >0)
+                    if (haveWarnedAboutTop1AlreadyCount > 0)
                     {
                         haveWarnedAboutTop1AlreadyCount--;
                         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                             $"Top 1-ing will occur for release identifier {r[releaseIdentifier]} because it maps to multiple private identifiers"));
-                            
                     }
                     else
                     {
                         if (haveWarnedAboutTop1AlreadyCount == 0)
                         {
                             haveWarnedAboutTop1AlreadyCount = -1;
-                            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Top 1-ing error message disabled due to flood of messages"));
+                            listener.OnNotify(this,
+                                new NotifyEventArgs(ProgressEventType.Warning,
+                                    "Top 1-ing error message disabled due to flood of messages"));
                         }
                     }
                 }
                 else
-                    _releaseToPrivateKeyDictionary.Add(r[releaseIdentifier].ToString().Trim(), r[privateIdentifier].ToString().Trim());
+                {
+                    _releaseToPrivateKeyDictionary.Add(r[releaseIdentifier].ToString().Trim(),
+                        r[privateIdentifier].ToString().Trim());
+                }
 
                 _reverseAnonymiseProgressFetchingMap++;
 
-                if(_reverseAnonymiseProgressFetchingMap%500 == 0)
-                    listener.OnProgress(this, new ProgressEventArgs("Assembling Release Map Dictionary", new ProgressMeasurement(_reverseAnonymiseProgressFetchingMap, ProgressType.Records), sw.Elapsed));
+                if (_reverseAnonymiseProgressFetchingMap % 500 == 0)
+                    listener.OnProgress(this,
+                        new ProgressEventArgs("Assembling Release Map Dictionary",
+                            new ProgressMeasurement(_reverseAnonymiseProgressFetchingMap, ProgressType.Records),
+                            sw.Elapsed));
             }
 
-            listener.OnProgress(this, new ProgressEventArgs("Assembling Release Map Dictionary", new ProgressMeasurement(_reverseAnonymiseProgressFetchingMap, ProgressType.Records), sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Assembling Release Map Dictionary",
+                    new ProgressMeasurement(_reverseAnonymiseProgressFetchingMap, ProgressType.Records), sw.Elapsed));
         }
+
         var nullsFound = 0;
         var substitutions = 0;
 
@@ -537,44 +536,50 @@ public void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListene
 
         //fix values
         foreach (DataRow row in toProcess.Rows)
-        {
             try
             {
                 var value = row[releaseIdentifier];
 
-                if(value == null || value == DBNull.Value)
+                if (value == null || value == DBNull.Value)
                 {
                     nullsFound++;
                     continue;
                 }
 
-                row[releaseIdentifier] = _releaseToPrivateKeyDictionary[value.ToString().Trim()].Trim();//swap release value for private value (reversing the anonymisation)
+                row[releaseIdentifier] =
+                    _releaseToPrivateKeyDictionary[value.ToString().Trim()]
+                        .Trim(); //swap release value for private value (reversing the anonymisation)
                 substitutions++;
 
                 _reverseAnonymiseProgressReversing++;
 
                 if (_reverseAnonymiseProgressReversing % 500 == 0)
-                    listener.OnProgress(this, new ProgressEventArgs("Substituting Release Identifiers For Private Identifiers", new ProgressMeasurement(_reverseAnonymiseProgressReversing, ProgressType.Records), sw2.Elapsed));
+                    listener.OnProgress(this,
+                        new ProgressEventArgs("Substituting Release Identifiers For Private Identifiers",
+                            new ProgressMeasurement(_reverseAnonymiseProgressReversing, ProgressType.Records),
+                            sw2.Elapsed));
             }
             catch (KeyNotFoundException e)
             {
                 throw new Exception(
-                    $"Could not find private identifier ({privateIdentifier}) for the release identifier ({releaseIdentifier}) with value '{row[releaseIdentifier]}' in cohort with cohortDefinitionID {OriginID}",e);
+                    $"Could not find private identifier ({privateIdentifier}) for the release identifier ({releaseIdentifier}) with value '{row[releaseIdentifier]}' in cohort with cohortDefinitionID {OriginID}",
+                    e);
             }
-        }
-            
+
         //final value
-        listener.OnProgress(this, new ProgressEventArgs("Substituting Release Identifiers For Private Identifiers", new ProgressMeasurement(_reverseAnonymiseProgressReversing, ProgressType.Records), sw2.Elapsed));
-            
-        if(nullsFound > 0)
+        listener.OnProgress(this,
+            new ProgressEventArgs("Substituting Release Identifiers For Private Identifiers",
+                new ProgressMeasurement(_reverseAnonymiseProgressReversing, ProgressType.Records), sw2.Elapsed));
+
+        if (nullsFound > 0)
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Found {nullsFound} null release identifiers amongst the {toProcess.Rows.Count} rows of the input data table (on which we were attempting to reverse annonymise)"));
 
-        listener.OnNotify(this, new NotifyEventArgs(substitutions >0?ProgressEventType.Information : ProgressEventType.Error,
+        listener.OnNotify(this, new NotifyEventArgs(
+            substitutions > 0 ? ProgressEventType.Information : ProgressEventType.Error,
             $"Substituted {substitutions} release identifiers for private identifiers in input data table (input data table contained {toProcess.Rows.Count} rows)"));
 
         toProcess.Columns[releaseIdentifier].ColumnName = privateIdentifier;
-        
     }
 
     /// <summary>
@@ -602,11 +607,13 @@ public void InjectKnown(ExternalCohortTable instance)
     {
         _knownExternalCohortTable = new Lazy<IExternalCohortTable>(instance);
     }
+
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
-        _cacheData = new Lazy<IExternalCohortDefinitionData>(()=>GetExternalData());
-        _knownExternalCohortTable = new Lazy<IExternalCohortTable>(()=>Repository.GetObjectByID<ExternalCohortTable>(ExternalCohortTable_ID));
+        _cacheData = new Lazy<IExternalCohortDefinitionData>(() => GetExternalData());
+        _knownExternalCohortTable =
+            new Lazy<IExternalCohortTable>(() => Repository.GetObjectByID<ExternalCohortTable>(ExternalCohortTable_ID));
         _broken = false;
     }
 
@@ -617,8 +624,6 @@ public IHasDependencies[] GetObjectsThisDependsOn()
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Repository.GetAllObjectsWhere<ExtractionConfiguration>("Cohort_ID " , ID);
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() =>
+        Repository.GetAllObjectsWhere<ExtractionConfiguration>("Cohort_ID ", ID);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ExtractableCohortAuditLogBuilder.cs b/Rdmp.Core/DataExport/Data/ExtractableCohortAuditLogBuilder.cs
index 8f33768d26..c97ee3cad8 100644
--- a/Rdmp.Core/DataExport/Data/ExtractableCohortAuditLogBuilder.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractableCohortAuditLogBuilder.cs
@@ -27,6 +27,7 @@ public class ExtractableCohortAuditLogBuilder
     /// writing that ID into the <see cref="ExtractableCohort.AuditLog"/>
     /// </summary>
     private Regex _legacyCic = new(@"Created by running cic ([\d]+)");
+
     private const string InFile = "Patient identifiers in file";
     private const string InColumn = "Patient identifiers in column ";
     private const string InCohortIdentificationConfiguration = "Patients in CohortIdentificationConfiguration";
@@ -38,10 +39,8 @@ public class ExtractableCohortAuditLogBuilder
     /// </summary>
     /// <param name="cic"></param>
     /// <returns></returns>
-    public static string GetDescription(CohortIdentificationConfiguration cic)
-    {
-        return $"{InCohortIdentificationConfiguration} '{cic}' (ID={cic.ID})";
-    }
+    public static string GetDescription(CohortIdentificationConfiguration cic) =>
+        $"{InCohortIdentificationConfiguration} '{cic}' (ID={cic.ID})";
 
     /// <summary>
     /// Returns a human readable description recording that an <see cref="ExtractableCohort"/>
@@ -49,16 +48,10 @@ public static string GetDescription(CohortIdentificationConfiguration cic)
     /// </summary>
     /// <param name="extractionIdentifierColumn"></param>
     /// <returns></returns>
-    public static string GetDescription(ExtractionInformation extractionIdentifierColumn)
-    {
-        return
-            $"{InExtractionInformation} '{extractionIdentifierColumn.CatalogueItem.Catalogue}.{extractionIdentifierColumn.GetRuntimeName()}'  (ID={extractionIdentifierColumn.ID})";
-    }
+    public static string GetDescription(ExtractionInformation extractionIdentifierColumn) =>
+        $"{InExtractionInformation} '{extractionIdentifierColumn.CatalogueItem.Catalogue}.{extractionIdentifierColumn.GetRuntimeName()}'  (ID={extractionIdentifierColumn.ID})";
 
-    internal static string GetDescription(DiscoveredColumn col)
-    {
-        return $"{InColumn} '{col.GetFullyQualifiedName()}'";
-    }
+    internal static string GetDescription(DiscoveredColumn col) => $"{InColumn} '{col.GetFullyQualifiedName()}'";
 
     /// <summary>
     /// Returns a human readable description recording that an <see cref="ExtractableCohort"/>
@@ -66,10 +59,7 @@ internal static string GetDescription(DiscoveredColumn col)
     /// </summary>
     /// <param name="file"></param>
     /// <returns></returns>
-    public static string GetDescription(FileInfo file)
-    {
-        return $"{InFile} '{file.FullName}'";
-    }
+    public static string GetDescription(FileInfo file) => $"{InFile} '{file.FullName}'";
 
     /// <summary>
     /// Returns the object that was the source of the given <paramref name="cohort"/>. 
@@ -79,36 +69,28 @@ public static string GetDescription(FileInfo file)
     /// <param name="cohort"></param>
     /// <param name="repositoryLocator"></param>
     /// <returns></returns>
-    public object GetObjectIfAny(IExtractableCohort cohort, Repositories.IRDMPPlatformRepositoryServiceLocator repositoryLocator)
+    public object GetObjectIfAny(IExtractableCohort cohort,
+        Repositories.IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         var audit = cohort.AuditLog;
-            
+
         // no audit means no object
-        if(string.IsNullOrWhiteSpace(audit))
-        {
-            return null;
-        }
+        if (string.IsNullOrWhiteSpace(audit)) return null;
 
-        if(_legacyCic.IsMatch(audit))
-        {
-            return GetObjectFromLog<CohortIdentificationConfiguration>(_legacyCic.Match(audit), repositoryLocator.CatalogueRepository);
-        }
+        if (_legacyCic.IsMatch(audit))
+            return GetObjectFromLog<CohortIdentificationConfiguration>(_legacyCic.Match(audit),
+                repositoryLocator.CatalogueRepository);
 
-        if(audit.Contains(InCohortIdentificationConfiguration))
-        {
+        if (audit.Contains(InCohortIdentificationConfiguration))
             return GetObjectFromLog<CohortIdentificationConfiguration>(audit, repositoryLocator.CatalogueRepository);
-        }
 
-        if(audit.Contains(InExtractionInformation))
-        {
+        if (audit.Contains(InExtractionInformation))
             return GetObjectFromLog<ExtractionInformation>(audit, repositoryLocator.CatalogueRepository);
-        }
 
         if (audit.Contains(InFile))
         {
             var m = _regexGetFilePath.Match(audit);
-            if(m.Success)
-            {
+            if (m.Success)
                 try
                 {
                     return new FileInfo(m.Groups[1].Value);
@@ -118,29 +100,24 @@ public object GetObjectIfAny(IExtractableCohort cohort, Repositories.IRDMPPlatfo
                     // its not a valid filename, maybe someone hacked the Audit Log by hand
                     return null;
                 }
-            }
         }
+
         if (audit.Contains(InColumn))
         {
             var m = _regexGetColumn.Match(audit);
-            if (m.Success)
-            {
-                return m.Groups[1].Value;
-            }
+            if (m.Success) return m.Groups[1].Value;
         }
+
         // who knows how this cohort was created
         return null;
     }
 
-    private T GetObjectFromLog<T>(string audit, IRepository repository) where T: class, IMapsDirectlyToDatabaseTable
+    private T GetObjectFromLog<T>(string audit, IRepository repository) where T : class, IMapsDirectlyToDatabaseTable
     {
         var m = _regexGetID.Match(audit);
 
         // If the ID bit is  missing
-        if (!m.Success)
-        {
-            return null;
-        }
+        if (!m.Success) return null;
 
         return GetObjectFromLog<T>(m, repository);
     }
diff --git a/Rdmp.Core/DataExport/Data/ExtractableColumn.cs b/Rdmp.Core/DataExport/Data/ExtractableColumn.cs
index b1edf5dfc5..4f01833bee 100644
--- a/Rdmp.Core/DataExport/Data/ExtractableColumn.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractableColumn.cs
@@ -31,13 +31,15 @@ namespace Rdmp.Core.DataExport.Data;
 /// that if you clone a 10 year old extraction you will still get the same SQL (along with lots of warnings about orphan CatalogueExtractionInformation_ID etc).  It even allows you
 /// to delete entire datasets (Catalogues) without breaking old extractions (this is not a good idea though - you should always just deprecate the Catalogue instead).</para>
 /// </summary>
-public class ExtractableColumn : ConcreteColumn, IComparable, IInjectKnown<CatalogueItem>,IInjectKnown<ColumnInfo>, IInjectKnown<ExtractionInformation>
+public class ExtractableColumn : ConcreteColumn, IComparable, IInjectKnown<CatalogueItem>, IInjectKnown<ColumnInfo>,
+    IInjectKnown<ExtractionInformation>
 {
     #region Database Properties
+
     private int _extractableDataSet_ID;
     private int _extractionConfiguration_ID;
     private int? _catalogueExtractionInformation_ID;
-        
+
     /// <summary>
     /// The dataset to which this column belongs.  This is used with <see cref="ExtractionConfiguration_ID"/> to specify which dataset in which extraction 
     /// this line of SELECT sql is used.
@@ -76,9 +78,8 @@ public int? CatalogueExtractionInformation_ID
     }
 
     #endregion
-        
-    #region Relationships
 
+    #region Relationships
 
     /// <inheritdoc cref="CatalogueExtractionInformation_ID"/>
     [NoMappingToDatabase]
@@ -107,18 +108,22 @@ public ExtractableColumn()
     /// <param name="extractionInformation"></param>
     /// <param name="order"></param>
     /// <param name="selectSQL"></param>
-    public ExtractableColumn(IDataExportRepository repository, IExtractableDataSet dataset, ExtractionConfiguration configuration, ExtractionInformation extractionInformation, int order, string selectSQL)
+    public ExtractableColumn(IDataExportRepository repository, IExtractableDataSet dataset,
+        ExtractionConfiguration configuration, ExtractionInformation extractionInformation, int order, string selectSQL)
     {
         Repository = repository;
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ExtractableDataSet_ID", dataset.ID},
-            {"ExtractionConfiguration_ID", configuration.ID},
-            {"CatalogueExtractionInformation_ID", extractionInformation == null ? DBNull.Value : (object)extractionInformation.ID},
-            {"Order", order},
-            {"SelectSQL", string.IsNullOrWhiteSpace(selectSQL) ? DBNull.Value : (object)selectSQL}
+            { "ExtractableDataSet_ID", dataset.ID },
+            { "ExtractionConfiguration_ID", configuration.ID },
+            {
+                "CatalogueExtractionInformation_ID",
+                extractionInformation == null ? DBNull.Value : (object)extractionInformation.ID
+            },
+            { "Order", order },
+            { "SelectSQL", string.IsNullOrWhiteSpace(selectSQL) ? DBNull.Value : (object)selectSQL }
         });
-            
+
         ClearAllInjections();
     }
 
@@ -138,12 +143,13 @@ internal ExtractableColumn(IDataExportRepository repository, DbDataReader r)
         Alias = r["Alias"] as string;
         HashOnDataRelease = (bool)r["HashOnDataRelease"];
         IsExtractionIdentifier = (bool)r["IsExtractionIdentifier"];
-        IsPrimaryKey = (bool) r["IsPrimaryKey"];
-            
+        IsPrimaryKey = (bool)r["IsPrimaryKey"];
+
         ClearAllInjections();
     }
 
     #region value caching and injection
+
     private Lazy<CatalogueItem> _knownCatalogueItem;
     private Lazy<ColumnInfo> _knownColumnInfo;
     private Lazy<ExtractionInformation> _knownExtractionInformation;
@@ -184,7 +190,8 @@ public void ClearAllInjections()
         _knownExtractionInformation = new Lazy<ExtractionInformation>(FetchExtractionInformation);
         _knownColumnInfo = new Lazy<ColumnInfo>(FetchColumnInfo);
     }
-    #endregion 
+
+    #endregion
 
     /// <summary>
     /// Returns the <see cref="ConcreteColumn.SelectSQL"/> or <see cref="ConcreteColumn.Alias"/> of the column (if it has one)
@@ -192,20 +199,17 @@ public void ClearAllInjections()
     /// <returns></returns>
     public override string ToString()
     {
-        if(!string.IsNullOrWhiteSpace(Alias))
+        if (!string.IsNullOrWhiteSpace(Alias))
             return Alias;
 
         return SelectSQL;
     }
-        
+
     /// <summary>
     /// Returns true if the underlying column (<see cref="Curation.Data.ColumnInfo"/>) referenced by this class has disapeared since its creation.
     /// </summary>
     /// <returns></returns>
-    public bool HasOriginalExtractionInformationVanished()
-    {
-        return ColumnInfo == null;
-    }
+    public bool HasOriginalExtractionInformationVanished() => ColumnInfo == null;
 
     private ColumnInfo FetchColumnInfo()
     {
@@ -228,10 +232,11 @@ private ExtractionInformation FetchExtractionInformation()
         //it's not based on a Catalogue column
         if (!CatalogueExtractionInformation_ID.HasValue)
             return null;
-            
+
         try
         {
-            return ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<ExtractionInformation>(CatalogueExtractionInformation_ID.Value);
+            return ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<ExtractionInformation>(
+                CatalogueExtractionInformation_ID.Value);
         }
         catch (KeyNotFoundException)
         {
@@ -251,9 +256,9 @@ public bool IsOutOfSync()
         if (ei != null)
             if (ei.IsExtractionIdentifier != IsExtractionIdentifier ||
                 IsPrimaryKey != ei.IsPrimaryKey ||
-                ei.SelectSQL != SelectSQL || 
-                ei.Order != Order || 
-                ei.Alias != Alias || 
+                ei.SelectSQL != SelectSQL ||
+                ei.Order != Order ||
+                ei.Alias != Alias ||
                 ei.HashOnDataRelease != HashOnDataRelease)
                 return true;
 
@@ -281,7 +286,8 @@ public ExtractableColumn ShallowClone()
         var eds = DataExportRepository.GetObjectByID<ExtractableDataSet>(ExtractableDataSet_ID);
         var config = DataExportRepository.GetObjectByID<ExtractionConfiguration>(ExtractionConfiguration_ID);
 
-        var clone = new ExtractableColumn(DataExportRepository, eds, config, CatalogueExtractionInformation, Order, SelectSQL);
+        var clone = new ExtractableColumn(DataExportRepository, eds, config, CatalogueExtractionInformation, Order,
+            SelectSQL);
         CopyShallowValuesTo(clone);
         return clone;
     }
diff --git a/Rdmp.Core/DataExport/Data/ExtractableDataSet.cs b/Rdmp.Core/DataExport/Data/ExtractableDataSet.cs
index d9bfb45802..665aa61fe4 100644
--- a/Rdmp.Core/DataExport/Data/ExtractableDataSet.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractableDataSet.cs
@@ -19,6 +19,7 @@ namespace Rdmp.Core.DataExport.Data;
 public class ExtractableDataSet : DatabaseEntity, IExtractableDataSet, IInjectKnown<ICatalogue>
 {
     #region Database Properties
+
     private int _catalogue_ID;
     private bool _disableExtraction;
     private int? _project_ID;
@@ -33,6 +34,7 @@ public int Catalogue_ID
             SetField(ref _catalogue_ID, value);
         }
     }
+
     /// <inheritdoc/>
     public bool DisableExtraction
     {
@@ -49,9 +51,9 @@ public int? Project_ID
     }
 
     #endregion
-        
+
     #region Relationships
-        
+
     /// <summary>
     /// Returns all <see cref="IExtractionConfiguration"/> in which this dataset is one of the extracted datasets
     /// </summary>
@@ -78,17 +80,18 @@ public ExtractableDataSet()
     {
         ClearAllInjections();
     }
+
     /// <summary>
     /// Defines that the given Catalogue is extractable to researchers as a data set, this is stored in the DataExport database
     /// </summary>
     /// <returns></returns>
-    public ExtractableDataSet(IDataExportRepository repository, ICatalogue catalogue, bool disableExtraction =false)
+    public ExtractableDataSet(IDataExportRepository repository, ICatalogue catalogue, bool disableExtraction = false)
     {
         Repository = repository;
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"DisableExtraction", disableExtraction},
-            {"Catalogue_ID",catalogue.ID}
+            { "DisableExtraction", disableExtraction },
+            { "Catalogue_ID", catalogue.ID }
         });
 
         ClearAllInjections();
@@ -99,7 +102,7 @@ internal ExtractableDataSet(IDataExportRepository repository, DbDataReader r)
         : base(repository, r)
     {
         Catalogue_ID = Convert.ToInt32(r["Catalogue_ID"]);
-        DisableExtraction = (bool) r["DisableExtraction"];
+        DisableExtraction = (bool)r["DisableExtraction"];
         Project_ID = ObjectToNullableInt(r["Project_ID"]);
 
         ClearAllInjections();
@@ -124,9 +127,9 @@ public override string ToString()
 
         return Catalogue.Name;
     }
-        
+
     #region Stuff for updating our internal database records
-        
+
     /// <summary>
     /// Deletes the dataset, this will make the <see cref="ICatalogue"/> non extractable.  This operation fails if
     /// the dataset is part of any <see cref="ExtractionConfigurations"/>.
@@ -139,29 +142,28 @@ public override void DeleteInDatabase()
         }
         catch (Exception e)
         {
-            if(e.Message.Contains("FK_SelectedDataSets_ExtractableDataSet"))
+            if (e.Message.Contains("FK_SelectedDataSets_ExtractableDataSet"))
                 throw new Exception(
-                    $"Cannot delete {this} because it is in use by the following configurations :{Environment.NewLine}{string.Join(Environment.NewLine, ExtractionConfigurations.Select(c => $"{c.Name}({c.Project})"))}", e);
+                    $"Cannot delete {this} because it is in use by the following configurations :{Environment.NewLine}{string.Join(Environment.NewLine, ExtractionConfigurations.Select(c => $"{c.Name}({c.Project})"))}",
+                    e);
             throw;
         }
     }
+
     #endregion
 
     /// <summary>
     /// Returns an object indicating whether the dataset is project specific or not
     /// </summary>
     /// <returns></returns>
-    public CatalogueExtractabilityStatus GetCatalogueExtractabilityStatus()
-    {
-        return new CatalogueExtractabilityStatus(true, Project_ID != null);
-    }
+    public CatalogueExtractabilityStatus GetCatalogueExtractabilityStatus() => new(true, Project_ID != null);
 
     private Lazy<ICatalogue> _catalogue;
-        
+
     /// <inheritdoc/>
     public void InjectKnown(ICatalogue instance)
     {
-        if(instance.ID != Catalogue_ID)
+        if (instance.ID != Catalogue_ID)
             throw new ArgumentOutOfRangeException(nameof(instance),
                 $"You told us our Catalogue was '{instance}' but its ID didn't match so that is NOT our Catalogue");
         _catalogue = new Lazy<ICatalogue>(instance);
@@ -177,7 +179,7 @@ private ICatalogue FetchCatalogue()
     {
         try
         {
-            var cata =  ((IDataExportRepository) Repository).CatalogueRepository.GetObjectByID<Catalogue>(Catalogue_ID);
+            var cata = ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<Catalogue>(Catalogue_ID);
             cata.InjectKnown(GetCatalogueExtractabilityStatus());
             return cata;
         }
diff --git a/Rdmp.Core/DataExport/Data/ExtractableDataSetPackage.cs b/Rdmp.Core/DataExport/Data/ExtractableDataSetPackage.cs
index 5452ff4399..cc2f6ce0b4 100644
--- a/Rdmp.Core/DataExport/Data/ExtractableDataSetPackage.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractableDataSetPackage.cs
@@ -15,9 +15,10 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IExtractableDataSetPackage"/>
-public class ExtractableDataSetPackage:DatabaseEntity, IExtractableDataSetPackage
+public class ExtractableDataSetPackage : DatabaseEntity, IExtractableDataSetPackage
 {
     #region Database Properties
+
     private string _name;
     private string _creator;
     private DateTime _creationDate;
@@ -56,7 +57,6 @@ public DateTime CreationDate
 
     public ExtractableDataSetPackage()
     {
-
     }
 
     /// <summary>
@@ -80,11 +80,11 @@ public ExtractableDataSetPackage(IDataExportRepository dataExportRepository, DbD
     /// <param name="name"></param>
     public ExtractableDataSetPackage(IDataExportRepository dataExportRepository, string name)
     {
-        dataExportRepository.InsertAndHydrate(this,new Dictionary<string, object>
+        dataExportRepository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Name",name},
-            {"Creator",Environment.UserName},
-            {"CreationDate",DateTime.Now }
+            { "Name", name },
+            { "Creator", Environment.UserName },
+            { "CreationDate", DateTime.Now }
         });
     }
 
@@ -92,8 +92,5 @@ public ExtractableDataSetPackage(IDataExportRepository dataExportRepository, str
     /// Returns <see cref="Name"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ExtractionConfiguration.cs b/Rdmp.Core/DataExport/Data/ExtractionConfiguration.cs
index 7a5a400bba..061237f721 100644
--- a/Rdmp.Core/DataExport/Data/ExtractionConfiguration.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractionConfiguration.cs
@@ -29,9 +29,11 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IExtractionConfiguration"/>
-public class ExtractionConfiguration : DatabaseEntity, IExtractionConfiguration, ICollectSqlParameters,INamed,ICustomSearchString
+public class ExtractionConfiguration : DatabaseEntity, IExtractionConfiguration, ICollectSqlParameters, INamed,
+    ICustomSearchString
 {
     #region Database Properties
+
     private DateTime? _dtCreated;
     private int? _cohort_ID;
     private string _requestTicket;
@@ -52,7 +54,7 @@ public class ExtractionConfiguration : DatabaseEntity, IExtractionConfiguration,
     public int? CohortRefreshPipeline_ID
     {
         get => _cohortRefreshPipelineID;
-        set => SetField(ref _cohortRefreshPipelineID , value);
+        set => SetField(ref _cohortRefreshPipelineID, value);
     }
 
     /// <inheritdoc/>
@@ -86,13 +88,13 @@ public int? Cohort_ID
     /// <inheritdoc/>
     public bool IsExtractable(out string reason)
     {
-        if(IsReleased)
+        if (IsReleased)
         {
             reason = "ExtractionConfiguration is released so cannot be executed";
             return false;
         }
 
-        if(Cohort_ID == null)
+        if (Cohort_ID == null)
         {
             reason = "No cohort has been configured for ExtractionConfiguration";
             return false;
@@ -103,7 +105,7 @@ public bool IsExtractable(out string reason)
             reason = "ExtractionConfiguration does not have an selected datasets";
             return false;
         }
-                
+
         reason = null;
         return true;
     }
@@ -114,36 +116,42 @@ public string RequestTicket
         get => _requestTicket;
         set => SetField(ref _requestTicket, value);
     }
+
     /// <inheritdoc/>
     public string ReleaseTicket
     {
         get => _releaseTicket;
         set => SetField(ref _releaseTicket, value);
     }
+
     /// <inheritdoc/>
     public int Project_ID
     {
         get => _project_ID;
         set => SetField(ref _project_ID, value);
     }
+
     /// <inheritdoc/>
     public string Username
     {
         get => _username;
         set => SetField(ref _username, value);
     }
+
     /// <inheritdoc/>
     public string Separator
     {
         get => _separator;
         set => SetField(ref _separator, value);
     }
+
     /// <inheritdoc/>
     public string Description
     {
         get => _description;
         set => SetField(ref _description, value);
     }
+
     /// <inheritdoc/>
     public bool IsReleased
     {
@@ -182,38 +190,48 @@ public int? ClonedFrom_ID
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IEnumerable<ICumulativeExtractionResults> CumulativeExtractionResults => Repository.GetAllObjectsWithParent<CumulativeExtractionResults>(this);
+    public IEnumerable<ICumulativeExtractionResults> CumulativeExtractionResults =>
+        Repository.GetAllObjectsWithParent<CumulativeExtractionResults>(this);
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IEnumerable<ISupplementalExtractionResults> SupplementalExtractionResults => Repository.GetAllObjectsWithParent<SupplementalExtractionResults>(this);
+    public IEnumerable<ISupplementalExtractionResults> SupplementalExtractionResults =>
+        Repository.GetAllObjectsWithParent<SupplementalExtractionResults>(this);
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IExtractableCohort Cohort => Cohort_ID == null ? null : Repository.GetObjectByID<ExtractableCohort>(Cohort_ID.Value);
+    public IExtractableCohort Cohort =>
+        Cohort_ID == null ? null : Repository.GetObjectByID<ExtractableCohort>(Cohort_ID.Value);
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public ISelectedDataSets[] SelectedDataSets => Repository.GetAllObjectsWithParent<SelectedDataSets>(this).Cast<ISelectedDataSets>().ToArray();
+    public ISelectedDataSets[] SelectedDataSets => Repository.GetAllObjectsWithParent<SelectedDataSets>(this)
+        .Cast<ISelectedDataSets>().ToArray();
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
     public IReleaseLog[] ReleaseLog
     {
-        get { return CumulativeExtractionResults.Select(c => c.GetReleaseLogEntryIfAny()).Where(l => l != null).ToArray(); }
+        get
+        {
+            return CumulativeExtractionResults.Select(c => c.GetReleaseLogEntryIfAny()).Where(l => l != null).ToArray();
+        }
     }
 
     /// <inheritdoc cref="DefaultPipeline_ID"/>
     [NoMappingToDatabase]
-    public IPipeline DefaultPipeline {
+    public IPipeline DefaultPipeline
+    {
         get
         {
             if (DefaultPipeline_ID == null)
                 return null;
 
             return
-                ((IDataExportRepository) Repository).CatalogueRepository.GetObjectByID<Pipeline>(DefaultPipeline_ID.Value);
-        }}
+                ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<Pipeline>(
+                    DefaultPipeline_ID.Value);
+        }
+    }
 
 
     /// <inheritdoc cref="CohortIdentificationConfiguration_ID"/>
@@ -226,7 +244,8 @@ public CohortIdentificationConfiguration CohortIdentificationConfiguration
                 return null;
 
             return
-                ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<CohortIdentificationConfiguration>(CohortIdentificationConfiguration_ID.Value);
+                ((IDataExportRepository)Repository).CatalogueRepository
+                .GetObjectByID<CohortIdentificationConfiguration>(CohortIdentificationConfiguration_ID.Value);
         }
     }
 
@@ -240,7 +259,8 @@ public IPipeline CohortRefreshPipeline
                 return null;
 
             return
-                ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<Pipeline>(CohortRefreshPipeline_ID.Value);
+                ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<Pipeline>(CohortRefreshPipeline_ID
+                    .Value);
         }
     }
 
@@ -248,16 +268,9 @@ public IPipeline CohortRefreshPipeline
     /// Returns a name suitable for describing the extraction of a dataset(s) from this configuration (in a <see cref="DataLoadInfo"/>)
     /// </summary>
     /// <returns></returns>
-    public string GetLoggingRunName()
-    {
-        return $"{Project.Name} {GetExtractionLoggingName()}";
-    }
-
-    private string GetExtractionLoggingName()
-    {
-        return $"(ExtractionConfiguration ID={ID})";
-    }
+    public string GetLoggingRunName() => $"{Project.Name} {GetExtractionLoggingName()}";
 
+    private string GetExtractionLoggingName() => $"(ExtractionConfiguration ID={ID})";
 
     #endregion
 
@@ -286,26 +299,23 @@ public ExtractionConfiguration(IDataExportRepository repository, IProject projec
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"dtCreated", DateTime.Now},
-            {"Project_ID", project.ID},
-            {"Username", Environment.UserName},
-            {"Description", "Initial Configuration"},
-            {"Name",string.IsNullOrWhiteSpace(name) ? $"New ExtractionConfiguration{Guid.NewGuid()}" : name },
-            {"Separator",","}
+            { "dtCreated", DateTime.Now },
+            { "Project_ID", project.ID },
+            { "Username", Environment.UserName },
+            { "Description", "Initial Configuration" },
+            { "Name", string.IsNullOrWhiteSpace(name) ? $"New ExtractionConfiguration{Guid.NewGuid()}" : name },
+            { "Separator", "," }
         });
     }
+
     /// <summary>
     /// Provides a short human readable representation of the <see cref="Project"/> to which this
     /// <see cref="ExtractionConfiguration"/> is associated with
     /// </summary>
     /// <param name="shortString">True for a short representation.  False for a longer representation.</param>
     /// <returns></returns>
-    public string GetProjectHint(bool shortString)
-    {
-        return
-            shortString ? $"({ Project.ProjectNumber})" :
-                $"'{Project.Name}' (PNo. { Project.ProjectNumber})";
-    }
+    public string GetProjectHint(bool shortString) =>
+        shortString ? $"({Project.ProjectNumber})" : $"'{Project.Name}' (PNo. {Project.ProjectNumber})";
 
     /// <summary>
     /// Reads an existing <see cref="IExtractionConfiguration"/> out of the  <paramref name="repository"/> database.
@@ -328,7 +338,7 @@ internal ExtractionConfiguration(IDataExportRepository repository, DbDataReader
         if (dt == null || dt == DBNull.Value)
             dtCreated = null;
         else
-            dtCreated = (DateTime) dt;
+            dtCreated = (DateTime)dt;
 
         Username = r["Username"] as string;
         Description = r["Description"] as string;
@@ -347,25 +357,16 @@ internal ExtractionConfiguration(IDataExportRepository repository, DbDataReader
     }
 
     /// <inheritdoc/>
-    public string GetSearchString()
-    {
-        return $"{ToString()}_{RequestTicket}_{ReleaseTicket}";
-    }
+    public string GetSearchString() => $"{ToString()}_{RequestTicket}_{ReleaseTicket}";
 
     /// <inheritdoc/>
-    public ISqlParameter[] GetAllParameters()
-    {
-        return GlobalExtractionFilterParameters;
-    }
+    public ISqlParameter[] GetAllParameters() => GlobalExtractionFilterParameters;
 
     /// <summary>
     /// Returns the configuration Name
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public bool ShouldBeReadOnly(out string reason)
     {
@@ -409,14 +410,17 @@ public ExtractionConfiguration DeepCloneWithNewIDs()
                     }
 
                     //clone should copy accross the forced joins (if any)
-                    foreach (var oldForcedJoin in Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(selected))
-                        new SelectedDataSetsForcedJoin((IDataExportRepository) Repository, newSelectedDataSet,oldForcedJoin.TableInfo);
+                    foreach (var oldForcedJoin in Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(
+                                 selected))
+                        new SelectedDataSetsForcedJoin((IDataExportRepository)Repository, newSelectedDataSet,
+                            oldForcedJoin.TableInfo);
 
                     // clone should copy any ExtractionProgresses
-                    if(selected.ExtractionProgressIfAny != null)
+                    if (selected.ExtractionProgressIfAny != null)
                     {
-                        var old =  selected.ExtractionProgressIfAny;
-                        var clonedProgress = new ExtractionProgress(repo, newSelectedDataSet,old.StartDate,old.EndDate,old.NumberOfDaysPerBatch,old.Name,old.ExtractionInformation_ID);
+                        var old = selected.ExtractionProgressIfAny;
+                        var clonedProgress = new ExtractionProgress(repo, newSelectedDataSet, old.StartDate,
+                            old.EndDate, old.NumberOfDaysPerBatch, old.Name, old.ExtractionInformation_ID);
 
                         // Notice that we do not set the ProgressDate because the cloned copy should be extracting from the begining
                         // when it is run.  We don't want the user to have to manually reset it
@@ -441,14 +445,15 @@ public ExtractionConfiguration DeepCloneWithNewIDs()
                     {
                         clone.DeleteInDatabase();
                         throw new Exception(
-                            $"Problem occurred during cloning filters, problem was {e.Message} deleted the clone configuration successfully",e);
+                            $"Problem occurred during cloning filters, problem was {e.Message} deleted the clone configuration successfully",
+                            e);
                     }
                 }
 
                 clone.dtCreated = DateTime.Now;
                 clone.IsReleased = false;
                 clone.Username = Environment.UserName;
-                clone.Description = "TO"+"DO:Populate change log here";
+                clone.Description = "TO" + "DO:Populate change log here";
                 clone.ReleaseTicket = null;
 
                 //wire up some changes
@@ -478,10 +483,7 @@ private ExtractionConfiguration ShallowClone()
     }
 
     /// <inheritdoc/>
-    public IProject GetProject()
-    {
-        return Repository.GetObjectByID<Project>(Project_ID);
-    }
+    public IProject GetProject() => Repository.GetObjectByID<Project>(Project_ID);
 
     /// <inheritdoc/>
     public ExtractableColumn[] GetAllExtractableColumnsFor(IExtractableDataSet dataset)
@@ -490,6 +492,7 @@ public ExtractableColumn[] GetAllExtractableColumnsFor(IExtractableDataSet datas
             Repository.GetAllObjectsWhere<ExtractableColumn>("ExtractionConfiguration_ID", ID)
                 .Where(e => e.ExtractableDataSet_ID == dataset.ID).ToArray();
     }
+
     /// <inheritdoc/>
     public IContainer GetFilterContainerFor(IExtractableDataSet dataset)
     {
@@ -502,22 +505,25 @@ private ExternalDatabaseServer GetDistinctLoggingServer(bool testLoggingServer)
     {
         var uniqueLoggingServerID = -1;
 
-        var repo = (IDataExportRepository) Repository;
+        var repo = (IDataExportRepository)Repository;
 
-        foreach (int? catalogueID in GetAllExtractableDataSets().Select(ds=>ds.Catalogue_ID))
+        foreach (int? catalogueID in GetAllExtractableDataSets().Select(ds => ds.Catalogue_ID))
         {
-            if(catalogueID == null)
-                throw new Exception("Cannot get logging server because some ExtractableDatasets in the configuration do not have associated Catalogues (possibly the Catalogue was deleted)");
+            if (catalogueID == null)
+                throw new Exception(
+                    "Cannot get logging server because some ExtractableDatasets in the configuration do not have associated Catalogues (possibly the Catalogue was deleted)");
 
             var catalogue = repo.CatalogueRepository.GetObjectByID<Catalogue>((int)catalogueID);
 
             var loggingServer = catalogue.LiveLoggingServer_ID ?? throw new Exception(
-                    $"Catalogue {catalogue.Name} does not have a {(testLoggingServer ? "test" : "")} logging server configured");
+                $"Catalogue {catalogue.Name} does not have a {(testLoggingServer ? "test" : "")} logging server configured");
             if (uniqueLoggingServerID == -1)
-                uniqueLoggingServerID = (int) catalogue.LiveLoggingServer_ID;
+            {
+                uniqueLoggingServerID = (int)catalogue.LiveLoggingServer_ID;
+            }
             else
             {
-                if(uniqueLoggingServerID != catalogue.LiveLoggingServer_ID)
+                if (uniqueLoggingServerID != catalogue.LiveLoggingServer_ID)
                     throw new Exception("Catalogues in configuration have different logging servers");
             }
         }
@@ -564,7 +570,7 @@ public void AddDatasetToConfiguration(IExtractableDataSet extractableDataSet, ou
         selectedDataSet = null;
 
         //it is already part of the configuration
-        if( SelectedDataSets.Any(s => s.ExtractableDataSet_ID == extractableDataSet.ID))
+        if (SelectedDataSets.Any(s => s.ExtractableDataSet_ID == extractableDataSet.ID))
             return;
 
         var dataExportRepo = (IDataExportRepository)Repository;
@@ -590,7 +596,8 @@ public void AddDatasetToConfiguration(IExtractableDataSet extractableDataSet, ou
             var globals = GlobalExtractionFilterParameters;
             var importer = new FilterImporter(new DeployedExtractionFilterFactory(dataExportRepo), globals);
 
-            var mandatoryFilters = importer.ImportAllFilters(rootFilterContainer,mandatoryExtractionFiltersToApplyToDataset, null);
+            var mandatoryFilters =
+                importer.ImportAllFilters(rootFilterContainer, mandatoryExtractionFiltersToApplyToDataset, null);
 
             foreach (var filter in mandatoryFilters.Cast<DeployedExtractionFilter>())
             {
@@ -603,7 +610,8 @@ public void AddDatasetToConfiguration(IExtractableDataSet extractableDataSet, ou
 
         //add Core or ProjectSpecific columns
         foreach (var all in extractableDataSet.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any))
-            if(all.ExtractionCategory == ExtractionCategory.Core || all.ExtractionCategory == ExtractionCategory.ProjectSpecific)
+            if (all.ExtractionCategory == ExtractionCategory.Core ||
+                all.ExtractionCategory == ExtractionCategory.ProjectSpecific)
                 if (legacyColumns.All(l => l.CatalogueExtractionInformation_ID != all.ID))
                     AddColumnToExtraction(extractableDataSet, all);
     }
@@ -626,7 +634,8 @@ public ExtractableColumn AddColumnToExtraction(IExtractableDataSet forDataSet, I
     {
         if (string.IsNullOrWhiteSpace(column.SelectSQL))
             throw new ArgumentException(
-                $"IColumn ({column.GetType().Name}) {column} has a blank value for SelectSQL, fix this in the CatalogueManager", "item");
+                $"IColumn ({column.GetType().Name}) {column} has a blank value for SelectSQL, fix this in the CatalogueManager",
+                "item");
 
         var query = "";
         query = column.SelectSQL;
@@ -636,7 +645,8 @@ public ExtractableColumn AddColumnToExtraction(IExtractableDataSet forDataSet, I
         if (column is ExtractionInformation information)
             addMe = new ExtractableColumn((IDataExportRepository)Repository, forDataSet, this, information, -1, query);
         else
-            addMe = new ExtractableColumn((IDataExportRepository)Repository, forDataSet, this, null, -1, query); // its custom column of some kind, not tied to a catalogue entry
+            addMe = new ExtractableColumn((IDataExportRepository)Repository, forDataSet, this, null, -1,
+                query); // its custom column of some kind, not tied to a catalogue entry
 
         addMe.UpdateValuesToMatch(column);
 
@@ -649,7 +659,7 @@ public ExtractableColumn AddColumnToExtraction(IExtractableDataSet forDataSet, I
     /// <returns></returns>
     public LogManager GetExplicitLoggingDatabaseServerOrDefault()
     {
-        ExternalDatabaseServer loggingServer=null;
+        ExternalDatabaseServer loggingServer = null;
         try
         {
             loggingServer = GetDistinctLoggingServer(false);
@@ -667,7 +677,9 @@ public LogManager GetExplicitLoggingDatabaseServerOrDefault()
                 loggingServer = (ExternalDatabaseServer)defaultLoggingServer;
             else
                 //no, there is no default or user does not want to use it.
-                throw new Exception("There is no default logging server configured and there was a problem asking Catalogues for a logging server instead.  Configure a default logging server via ManageExternalServersUI", e);
+                throw new Exception(
+                    "There is no default logging server configured and there was a problem asking Catalogues for a logging server instead.  Configure a default logging server via ManageExternalServersUI",
+                    e);
         }
 
         var server = DataAccessPortal.ExpectServer(loggingServer, DataAccessContext.Logging);
@@ -679,15 +691,13 @@ public LogManager GetExplicitLoggingDatabaseServerOrDefault()
             lm = new LogManager(server);
 
             if (!lm.ListDataTasks().Contains(ExecuteDatasetExtractionSource.AuditTaskName))
-            {
                 throw new Exception(
                     $"The logging database {server} does not contain a DataLoadTask called '{ExecuteDatasetExtractionSource.AuditTaskName}' (all data exports are logged under this task regardless of dataset/Catalogue)");
-
-            }
         }
         catch (Exception e)
         {
-            throw new Exception($"Problem figuring out what logging server to use:{Environment.NewLine}\t{e.Message}", e);
+            throw new Exception($"Problem figuring out what logging server to use:{Environment.NewLine}\t{e.Message}",
+                e);
         }
 
         return lm;
@@ -709,9 +719,9 @@ public void Unfreeze()
     /// <inheritdoc/>
     public IMapsDirectlyToDatabaseTable[] GetGlobals()
     {
-        var sds = SelectedDataSets.FirstOrDefault(s=>s.ExtractableDataSet.Catalogue != null);
+        var sds = SelectedDataSets.FirstOrDefault(s => s.ExtractableDataSet.Catalogue != null);
 
-        if(sds == null)
+        if (sds == null)
             return Array.Empty<IMapsDirectlyToDatabaseTable>();
 
         var cata = sds.ExtractableDataSet.Catalogue;
@@ -736,19 +746,14 @@ public override void DeleteInDatabase()
     /// <inheritdoc/>
     public IHasDependencies[] GetObjectsThisDependsOn()
     {
-        return new[] {Project};
+        return new[] { Project };
     }
 
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Array.Empty<IHasDependencies>();
 
-    public DiscoveredServer GetDistinctLoggingDatabase()
-    {
-        return GetDistinctLoggingServer(false).Discover(DataAccessContext.Logging).Server;
-    }
+    public DiscoveredServer GetDistinctLoggingDatabase() =>
+        GetDistinctLoggingServer(false).Discover(DataAccessContext.Logging).Server;
 
     public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer serverChosen)
     {
@@ -756,10 +761,7 @@ public DiscoveredServer GetDistinctLoggingDatabase(out IExternalDatabaseServer s
         return serverChosen.Discover(DataAccessContext.Logging).Server;
     }
 
-    public string GetDistinctLoggingTask()
-    {
-        return ExecuteDatasetExtractionSource.AuditTaskName;
-    }
+    public string GetDistinctLoggingTask() => ExecuteDatasetExtractionSource.AuditTaskName;
 
     /// <summary>
     /// Returns runs from the data extraction task where the run was for this ExtractionConfiguration
@@ -769,6 +771,6 @@ public string GetDistinctLoggingTask()
     public IEnumerable<ArchivalDataLoadInfo> FilterRuns(IEnumerable<ArchivalDataLoadInfo> runs)
     {
         // allow for the project name changing but not our ID
-        return runs.Where(r=>r.Description.Contains(GetExtractionLoggingName()));
+        return runs.Where(r => r.Description.Contains(GetExtractionLoggingName()));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ExtractionProgress.cs b/Rdmp.Core/DataExport/Data/ExtractionProgress.cs
index 8e2884c518..591b8178e6 100644
--- a/Rdmp.Core/DataExport/Data/ExtractionProgress.cs
+++ b/Rdmp.Core/DataExport/Data/ExtractionProgress.cs
@@ -30,6 +30,7 @@ public class ExtractionProgress : DatabaseEntity, IExtractionProgress
     private int _numberOfDaysPerBatch;
     private string _name;
     private RetryStrategy _retry;
+
     #endregion
 
     /// <inheritdoc/>
@@ -88,15 +89,18 @@ public RetryStrategy Retry
     }
 
     #region Relationships
+
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public ISelectedDataSets SelectedDataSets => DataExportRepository.GetObjectByID<SelectedDataSets>(SelectedDataSets_ID);
+    public ISelectedDataSets SelectedDataSets =>
+        DataExportRepository.GetObjectByID<SelectedDataSets>(SelectedDataSets_ID);
 
-    public static void ValidateSelectedColumn(ICheckNotifier notifier,ExtractionInformation ei)
+    public static void ValidateSelectedColumn(ICheckNotifier notifier, ExtractionInformation ei)
     {
         if (ei == null)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("A date column on which to split batches must be selected", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("A date column on which to split batches must be selected",
+                CheckResult.Fail));
             return;
         }
 
@@ -104,79 +108,78 @@ public static void ValidateSelectedColumn(ICheckNotifier notifier,ExtractionInfo
 
         if (col == null)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"ExtractionInformation '{ei}' is an orphan with no associated ColumnInfo", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"ExtractionInformation '{ei}' is an orphan with no associated ColumnInfo", CheckResult.Fail));
             return;
         }
 
         try
         {
-
             if (col.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(col.Data_type) != typeof(DateTime))
-            {
-                notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExtractionProgressColumnProbablyNotADate, ei, col.Data_type));
-            }
+                notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExtractionProgressColumnProbablyNotADate, ei,
+                    col.Data_type));
         }
         catch (Exception ex)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not determine datatype of ColumnInfo {col} ('{col?.Data_type}')", CheckResult.Fail, ex));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"Could not determine datatype of ColumnInfo {col} ('{col?.Data_type}')", CheckResult.Fail, ex));
         }
-            
     }
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public ExtractionInformation ExtractionInformation => DataExportRepository.CatalogueRepository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID);
+    public ExtractionInformation ExtractionInformation =>
+        DataExportRepository.CatalogueRepository.GetObjectByID<ExtractionInformation>(ExtractionInformation_ID);
 
     #endregion
 
     public ExtractionProgress()
     {
-
     }
 
-    public ExtractionProgress(IDataExportRepository repository, ISelectedDataSets sds, DateTime? startDate, DateTime? endDate,int numberOfDaysPerBatch,string name, int extractionInformation_ID)
+    public ExtractionProgress(IDataExportRepository repository, ISelectedDataSets sds, DateTime? startDate,
+        DateTime? endDate, int numberOfDaysPerBatch, string name, int extractionInformation_ID)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            { "SelectedDataSets_ID",sds.ID},
-            { "ExtractionInformation_ID",extractionInformation_ID},
-            { "NumberOfDaysPerBatch",numberOfDaysPerBatch},
-            { "StartDate", startDate},
-            { "EndDate", endDate},
-            { "Name",name },
-            { "Retry",RetryStrategy.NoRetry }
+            { "SelectedDataSets_ID", sds.ID },
+            { "ExtractionInformation_ID", extractionInformation_ID },
+            { "NumberOfDaysPerBatch", numberOfDaysPerBatch },
+            { "StartDate", startDate },
+            { "EndDate", endDate },
+            { "Name", name },
+            { "Retry", RetryStrategy.NoRetry }
         });
 
         if (ID == 0 || Repository != repository)
             throw new ArgumentException("Repository failed to properly hydrate this class");
     }
+
     public ExtractionProgress(IDataExportRepository repository, ISelectedDataSets sds)
     {
         var cata = sds.GetCatalogue();
         var coverageColId = cata?.TimeCoverage_ExtractionInformation_ID;
 
-        if(sds.ExtractionProgressIfAny != null)
-        {
+        if (sds.ExtractionProgressIfAny != null)
             throw new Exception($"There is already an ExtractionProgress associated with {sds}");
-        }
 
         if (!coverageColId.HasValue)
-        {
-            throw new ArgumentException($"Cannot create ExtractionProgress because Catalogue {cata} does not have a time coverage column");
-        }
+            throw new ArgumentException(
+                $"Cannot create ExtractionProgress because Catalogue {cata} does not have a time coverage column");
 
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            { "SelectedDataSets_ID",sds.ID},
-            { "ExtractionInformation_ID",coverageColId},
-            { "NumberOfDaysPerBatch",365},
+            { "SelectedDataSets_ID", sds.ID },
+            { "ExtractionInformation_ID", coverageColId },
+            { "NumberOfDaysPerBatch", 365 },
             { "Name", $"ExtractionProgress{Guid.NewGuid()}" },
-            { "Retry",RetryStrategy.NoRetry }
+            { "Retry", RetryStrategy.NoRetry }
         });
 
         if (ID == 0 || Repository != repository)
             throw new ArgumentException("Repository failed to properly hydrate this class");
     }
+
     public ExtractionProgress(IDataExportRepository repository, DbDataReader r) : base(repository, r)
     {
         SelectedDataSets_ID = Convert.ToInt32(r["SelectedDataSets_ID"]);
@@ -186,20 +189,15 @@ public ExtractionProgress(IDataExportRepository repository, DbDataReader r) : ba
         ExtractionInformation_ID = Convert.ToInt32(r["ExtractionInformation_ID"]);
         NumberOfDaysPerBatch = Convert.ToInt32(r["NumberOfDaysPerBatch"]);
         Name = r["Name"].ToString();
-        Retry = (RetryStrategy)Enum.Parse(typeof(RetryStrategy),r["Retry"].ToString());
+        Retry = (RetryStrategy)Enum.Parse(typeof(RetryStrategy), r["Retry"].ToString());
     }
 
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
-    public bool MoreToFetch()
-    {
-        return ProgressDate < EndDate;
-    }
+    public bool MoreToFetch() => ProgressDate < EndDate;
 
-    public bool ApplyRetryWaitStrategy(GracefulCancellationToken token, IDataLoadEventListener listener, int totalFailureCount, int consecutiveFailureCount)
+    public bool ApplyRetryWaitStrategy(GracefulCancellationToken token, IDataLoadEventListener listener,
+        int totalFailureCount, int consecutiveFailureCount)
     {
         return Retry switch
         {
@@ -209,23 +207,22 @@ public bool ApplyRetryWaitStrategy(GracefulCancellationToken token, IDataLoadEve
         };
     }
 
-    private bool IterativeBackoff1Hour(GracefulCancellationToken token, IDataLoadEventListener listener, int totalFailureCount)
+    private bool IterativeBackoff1Hour(GracefulCancellationToken token, IDataLoadEventListener listener,
+        int totalFailureCount)
     {
         token.ThrowIfAbortRequested();
 
         int[] waitTimes = { 0, 1, 2, 3, 5, 8, 13, 21, 34 };
 
-        if (totalFailureCount > waitTimes.Length)
-        {
-            return false;
-        }
+        if (totalFailureCount > waitTimes.Length) return false;
 
         // sleep for however many minutes we are up to
-        var mins  = waitTimes[totalFailureCount];
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Waiting {mins} mins before retry"));
-                
+        var mins = waitTimes[totalFailureCount];
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"Waiting {mins} mins before retry"));
+
         // wait for the minutes but cancel if abort is hit
-        Task.Delay((int)TimeSpan.FromMinutes(mins).TotalMilliseconds,token.AbortToken).Wait();
+        Task.Delay((int)TimeSpan.FromMinutes(mins).TotalMilliseconds, token.AbortToken).Wait();
 
         token.ThrowIfAbortRequested();
 
diff --git a/Rdmp.Core/DataExport/Data/FilterContainer.cs b/Rdmp.Core/DataExport/Data/FilterContainer.cs
index 2775a2d908..09ed824aa1 100644
--- a/Rdmp.Core/DataExport/Data/FilterContainer.cs
+++ b/Rdmp.Core/DataExport/Data/FilterContainer.cs
@@ -20,26 +20,27 @@ namespace Rdmp.Core.DataExport.Data;
 /// </summary>
 public class FilterContainer : ConcreteContainer, IContainer
 {
-
     public FilterContainer()
     {
-
     }
+
     /// <summary>
     /// Creates a new instance with the given <paramref name="operation"/>
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="operation"></param>
-    public FilterContainer(IDataExportRepository repository, FilterContainerOperation operation = FilterContainerOperation.AND):base(repository.FilterManager)
+    public FilterContainer(IDataExportRepository repository,
+        FilterContainerOperation operation = FilterContainerOperation.AND) : base(repository.FilterManager)
     {
         Repository = repository;
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Operation", operation.ToString()}
+            { "Operation", operation.ToString() }
         });
     }
 
-    internal FilterContainer(IDataExportRepository repository, DbDataReader r) : base(repository.FilterManager,repository, r)
+    internal FilterContainer(IDataExportRepository repository, DbDataReader r) : base(repository.FilterManager,
+        repository, r)
     {
     }
 
@@ -67,22 +68,19 @@ public override bool ShouldBeReadOnly(out string reason)
     /// Returns the <see cref="ConcreteContainer.Operation"/> "AND" or "OR"
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Operation.ToString();
-    }
+    public override string ToString() => Operation.ToString();
 
 
     public override IContainer DeepCloneEntireTreeRecursivelyIncludingFilters()
     {
         //clone ourselves
         var clonedFilterContainer = ShallowClone();
-            
+
         //clone our filters
         foreach (var deployedExtractionFilter in GetFilters())
         {
             //clone it
-            var cloneFilter = ((DeployedExtractionFilter) deployedExtractionFilter).ShallowClone(clonedFilterContainer);
+            var cloneFilter = ((DeployedExtractionFilter)deployedExtractionFilter).ShallowClone(clonedFilterContainer);
 
             //clone parameters
             foreach (DeployedExtractionFilterParameter parameter in deployedExtractionFilter.GetAllParameters())
@@ -154,19 +152,16 @@ public SelectedDataSets GetSelectedDataSetsRecursively()
 
         //our parent must be the root container maybe? recursive
         return parent?.GetSelectedDataSetsRecursively();
-
     }
 
-    public override IFilterFactory GetFilterFactory()
-    {
-        return new DeployedExtractionFilterFactory(DataExportRepository);
-    }
+    public override IFilterFactory GetFilterFactory() => new DeployedExtractionFilterFactory(DataExportRepository);
 
     public override void DeleteInDatabase()
     {
         base.DeleteInDatabase();
 
-        foreach (var sds in Repository.GetAllObjectsWhere<SelectedDataSets>(nameof(SelectedDataSets.RootFilterContainer_ID), ID))
+        foreach (var sds in Repository.GetAllObjectsWhere<SelectedDataSets>(
+                     nameof(SelectedDataSets.RootFilterContainer_ID), ID))
         {
             sds.RootFilterContainer_ID = null;
             sds.SaveToDatabase();
diff --git a/Rdmp.Core/DataExport/Data/GlobalExtractionFilterParameter.cs b/Rdmp.Core/DataExport/Data/GlobalExtractionFilterParameter.cs
index fe8cf8547f..701caec333 100644
--- a/Rdmp.Core/DataExport/Data/GlobalExtractionFilterParameter.cs
+++ b/Rdmp.Core/DataExport/Data/GlobalExtractionFilterParameter.cs
@@ -33,6 +33,7 @@ public class GlobalExtractionFilterParameter : DatabaseEntity, ISqlParameter, II
     public string ParameterName => QuerySyntaxHelper.GetParameterNameFromDeclarationSQL(ParameterSQL);
 
     #region Database Properties
+
     private string _parameterSQL;
     private string _value;
     private string _comment;
@@ -73,10 +74,11 @@ public int ExtractionConfiguration_ID
     #endregion
 
     #region Relationships
-        
+
     /// <inheritdoc cref="ExtractionConfiguration_ID"/>
     [NoMappingToDatabase]
-    public ExtractionConfiguration ExtractionConfiguration => Repository.GetObjectByID<ExtractionConfiguration>(ExtractionConfiguration_ID);
+    public ExtractionConfiguration ExtractionConfiguration =>
+        Repository.GetObjectByID<ExtractionConfiguration>(ExtractionConfiguration_ID);
 
     #endregion
 
@@ -91,14 +93,15 @@ public GlobalExtractionFilterParameter()
     /// <param name="repository"></param>
     /// <param name="configuration"></param>
     /// <param name="parameterSQL"></param>
-    public GlobalExtractionFilterParameter(IDataExportRepository repository, ExtractionConfiguration configuration, string parameterSQL)
+    public GlobalExtractionFilterParameter(IDataExportRepository repository, ExtractionConfiguration configuration,
+        string parameterSQL)
     {
         Repository = repository;
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ParameterSQL", parameterSQL},
-            {"ExtractionConfiguration_ID", configuration.ID}
+            { "ParameterSQL", parameterSQL },
+            { "ExtractionConfiguration_ID", configuration.ID }
         });
     }
 
@@ -121,10 +124,7 @@ internal GlobalExtractionFilterParameter(IDataExportRepository repository, DbDat
     /// Returns <see cref="ParameterName"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
 
     /// <inheritdoc/>
@@ -137,16 +137,14 @@ public void Check(ICheckNotifier notifier)
     public IQuerySyntaxHelper GetQuerySyntaxHelper()
     {
         if (_syntaxHelper == null)
-            throw new NotSupportedException("Global extraction parameters are multi database type (depending on which ExtractableDataSet they are being used with)");
+            throw new NotSupportedException(
+                "Global extraction parameters are multi database type (depending on which ExtractableDataSet they are being used with)");
 
         return _syntaxHelper;
     }
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return ExtractionConfiguration;
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() => ExtractionConfiguration;
 
     private IQuerySyntaxHelper _syntaxHelper;
 
diff --git a/Rdmp.Core/DataExport/Data/HICProjectSalt.cs b/Rdmp.Core/DataExport/Data/HICProjectSalt.cs
index ce8096448d..1f896ddd15 100644
--- a/Rdmp.Core/DataExport/Data/HICProjectSalt.cs
+++ b/Rdmp.Core/DataExport/Data/HICProjectSalt.cs
@@ -26,8 +26,5 @@ public HICProjectSalt(IProject project)
     /// Returns the <see cref="IProject.ProjectNumber"/> (set during construction).
     /// </summary>
     /// <returns></returns>
-    public string GetSalt()
-    {
-        return _project.ProjectNumber.ToString();
-    }
+    public string GetSalt() => _project.ProjectNumber.ToString();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ICohortDefinition.cs b/Rdmp.Core/DataExport/Data/ICohortDefinition.cs
index 12c42be47e..5d52121207 100644
--- a/Rdmp.Core/DataExport/Data/ICohortDefinition.cs
+++ b/Rdmp.Core/DataExport/Data/ICohortDefinition.cs
@@ -52,5 +52,4 @@ public interface ICohortDefinition
     /// <param name="matchDescription"></param>
     /// <returns></returns>
     bool IsAcceptableAsNewCohort(out string matchDescription);
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ICumulativeExtractionResults.cs b/Rdmp.Core/DataExport/Data/ICumulativeExtractionResults.cs
index ba5e386a60..4d329ec690 100644
--- a/Rdmp.Core/DataExport/Data/ICumulativeExtractionResults.cs
+++ b/Rdmp.Core/DataExport/Data/ICumulativeExtractionResults.cs
@@ -61,7 +61,7 @@ public interface ICumulativeExtractionResults : IExtractionResults, IRevertable
     /// </summary>
     /// <returns>Release audit or null if artifacts have not been released</returns>
     IReleaseLog GetReleaseLogEntryIfAny();
-        
+
     /// <summary>
     /// If there are supplemental artifacts produced during extraction (e.g. lookup tables) then this method returns the audit object(s) for these
     /// </summary>
@@ -73,7 +73,8 @@ public interface ICumulativeExtractionResults : IExtractionResults, IRevertable
     /// <param name="sqlExecuted"></param>
     /// <param name="extractedObject"></param>
     /// <returns></returns>
-    ISupplementalExtractionResults AddSupplementalExtractionResult(string sqlExecuted, IMapsDirectlyToDatabaseTable extractedObject);
+    ISupplementalExtractionResults AddSupplementalExtractionResult(string sqlExecuted,
+        IMapsDirectlyToDatabaseTable extractedObject);
 
     /// <summary>
     /// Returns true if the audit described by this class is for the given <see cref="ISelectedDataSets"/>
@@ -81,5 +82,4 @@ public interface ICumulativeExtractionResults : IExtractionResults, IRevertable
     /// <param name="selectedDataSet"></param>
     /// <returns></returns>
     bool IsFor(ISelectedDataSets selectedDataSet);
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/IExternalCohortTable.cs b/Rdmp.Core/DataExport/Data/IExternalCohortTable.cs
index 6686807f96..d8ddafe49d 100644
--- a/Rdmp.Core/DataExport/Data/IExternalCohortTable.cs
+++ b/Rdmp.Core/DataExport/Data/IExternalCohortTable.cs
@@ -33,7 +33,7 @@ namespace Rdmp.Core.DataExport.Data;
 /// release identifiers assigned automatically either as autonums or GUIDs (I suggest using GUIDs to prevent accidental crosstalk from ever occuring if you handle magic numbers from
 /// other agencies). </para>
 /// </summary>
-public interface IExternalCohortTable : ICheckable, IDataAccessPoint, IHasDependencies,INamed
+public interface IExternalCohortTable : ICheckable, IDataAccessPoint, IHasDependencies, INamed
 {
     /// <summary>
     /// Name of the table in your database that contains the private to release identifier mappings (e.g. 'Cohort').
@@ -61,13 +61,13 @@ public interface IExternalCohortTable : ICheckable, IDataAccessPoint, IHasDepend
     /// The name of the field in the cohort (mapping) table which is a foreign key into <see cref="DefinitionTableName"/> (cohort descriptions) table (e.g. cohortDefinition_id).
     /// </summary>
     string DefinitionTableForeignKeyField { get; set; }
-        
+
     /// <summary>
     /// Returns an object for connecting to/interacting with the cohort database referenced by this object.
     /// </summary>
     /// <returns></returns>
     DiscoveredDatabase Discover();
-        
+
     /// <summary>
     /// Returns the cohort table (linkage table with the <see cref="PrivateIdentifierField"/> and <see cref="ReleaseIdentifierField"/>)
     /// </summary>
diff --git a/Rdmp.Core/DataExport/Data/IExtractableCohort.cs b/Rdmp.Core/DataExport/Data/IExtractableCohort.cs
index 1f9ab3eeb8..8bb599751d 100644
--- a/Rdmp.Core/DataExport/Data/IExtractableCohort.cs
+++ b/Rdmp.Core/DataExport/Data/IExtractableCohort.cs
@@ -109,7 +109,7 @@ public interface IExtractableCohort : IHasQuerySyntaxHelper, IMightBeDeprecated,
     /// </summary>
     /// <param name="timeout">Number of seconds to allow query to execute for before giving up</param>
     IExternalCohortDefinitionData GetExternalData(int timeout = -1);
-        
+
     /// <summary>
     /// Returns the data type of the identifiable column (e.g. "varchar(10)")
     /// </summary>
@@ -138,5 +138,4 @@ public interface IExtractableCohort : IHasQuerySyntaxHelper, IMightBeDeprecated,
     /// <param name="allowCaching"></param>
     /// <exception cref="KeyNotFoundException"></exception>
     void ReverseAnonymiseDataTable(DataTable toProcess, IDataLoadEventListener listener, bool allowCaching);
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/IExtractableDataSet.cs b/Rdmp.Core/DataExport/Data/IExtractableDataSet.cs
index 5b9fe77810..f9949c9eba 100644
--- a/Rdmp.Core/DataExport/Data/IExtractableDataSet.cs
+++ b/Rdmp.Core/DataExport/Data/IExtractableDataSet.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.DataExport.Data;
 /// Controls whether a given <see cref="Catalogue"/> is extractable or not.  Includes whether it is usable only with a specific <see cref="Project"/> or
 /// if extraction of the <see cref="Catalogue"/> has been temporarily disabled.
 /// </summary>
-public interface IExtractableDataSet:IMapsDirectlyToDatabaseTable,IRevertable
+public interface IExtractableDataSet : IMapsDirectlyToDatabaseTable, IRevertable
 {
     /// <summary>
     /// The <see cref="Curation.Data.Catalogue"/> (dataset) which this object allows the extraction of.  The Catalogue object will exist in
diff --git a/Rdmp.Core/DataExport/Data/IExtractionConfiguration.cs b/Rdmp.Core/DataExport/Data/IExtractionConfiguration.cs
index 5384ecd415..018e9f255f 100644
--- a/Rdmp.Core/DataExport/Data/IExtractionConfiguration.cs
+++ b/Rdmp.Core/DataExport/Data/IExtractionConfiguration.cs
@@ -29,7 +29,7 @@ namespace Rdmp.Core.DataExport.Data;
 /// <para>If you need to perform a repeat extraction (e.g. an update of data 5 years on) then you should 'Clone' the ExtractionConfiguration in the Project and give it a new name 
 /// e.g. 'Cases - 5 year update'.</para>
 /// </summary>
-public interface IExtractionConfiguration:INamed,IHasDependencies, IMightBeReadOnly, ILoggedActivityRootObject
+public interface IExtractionConfiguration : INamed, IHasDependencies, IMightBeReadOnly, ILoggedActivityRootObject
 {
     IDataExportRepository DataExportRepository { get; }
 
@@ -90,8 +90,8 @@ public interface IExtractionConfiguration:INamed,IHasDependencies, IMightBeReadO
 
 
     /// <inheritdoc cref="Cohort_ID"/>
-    IExtractableCohort Cohort { get;}
-        
+    IExtractableCohort Cohort { get; }
+
     /// <summary>
     /// The <see cref="IPipeline"/> which should be used to extract the linked datasets unless the user specifies a specific alternative.
     /// </summary>
diff --git a/Rdmp.Core/DataExport/Data/IExtractionProgress.cs b/Rdmp.Core/DataExport/Data/IExtractionProgress.cs
index c4b2277b96..54e5f4b938 100644
--- a/Rdmp.Core/DataExport/Data/IExtractionProgress.cs
+++ b/Rdmp.Core/DataExport/Data/IExtractionProgress.cs
@@ -78,5 +78,6 @@ public interface IExtractionProgress : IMapsDirectlyToDatabaseTable, ISaveable,
     /// <param name="totalFailureCount"></param>
     /// <param name="consecutiveFailureCount"></param>
     /// <returns></returns>
-    bool ApplyRetryWaitStrategy(GracefulCancellationToken token, IDataLoadEventListener listener, int totalFailureCount, int consecutiveFailureCount);
+    bool ApplyRetryWaitStrategy(GracefulCancellationToken token, IDataLoadEventListener listener, int totalFailureCount,
+        int consecutiveFailureCount);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/IProject.cs b/Rdmp.Core/DataExport/Data/IProject.cs
index ba4f5a35f4..bd397342c8 100644
--- a/Rdmp.Core/DataExport/Data/IProject.cs
+++ b/Rdmp.Core/DataExport/Data/IProject.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.DataExport.Data;
 /// 
 /// <para>The <see cref="ProjectNumber"/> must match the project number of the cohorts in your cohort database.</para>
 /// </summary>
-public interface IProject:IHasDependencies, INamed, IHasFolder
+public interface IProject : IHasDependencies, INamed, IHasFolder
 {
     /// <summary>
     /// Optional ticket identifier for auditing time, project requirements etc.  Should be compatible with your currently configured <see cref="ITicketingSystem"/>
@@ -38,7 +38,7 @@ public interface IProject:IHasDependencies, INamed, IHasFolder
     /// You can have multiple <see cref="IProject"/> with the same number (in which case they will have shared access to the same cohorts, anonymisation mappings etc).
     /// </summary>
     int? ProjectNumber { get; set; }
-        
+
     /// <summary>
     /// A <see cref="IProject"/> can have multiple <see cref="IExtractionConfiguration"/> defined (e.g. Cases / Controls or multiple extractions over time).  This
     /// returns all current and frozen (released) configurations.
@@ -49,7 +49,7 @@ public interface IProject:IHasDependencies, INamed, IHasFolder
     /// Returns all association links to <see cref="CohortIdentificationConfiguration"/> (cohort queries that are associated with the project).  These are 
     /// association objects not the actual configuration itself.
     /// </summary>
-    IProjectCohortIdentificationConfigurationAssociation[] ProjectCohortIdentificationConfigurationAssociations {get; }
+    IProjectCohortIdentificationConfigurationAssociation[] ProjectCohortIdentificationConfigurationAssociations { get; }
 
     /// <summary>
     /// The database in which the object is persisted
diff --git a/Rdmp.Core/DataExport/Data/ISelectedDataSets.cs b/Rdmp.Core/DataExport/Data/ISelectedDataSets.cs
index edd7ad6711..10acaa657b 100644
--- a/Rdmp.Core/DataExport/Data/ISelectedDataSets.cs
+++ b/Rdmp.Core/DataExport/Data/ISelectedDataSets.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.DataExport.Data;
 /// <summary>
 /// Represents the desire to extract a given dataset for a given <see cref="ExtractableDataSet"/> for a given <see cref="ExtractionConfiguration"/>.  
 /// </summary>
-public interface ISelectedDataSets:IDeleteable,IRevertable, IMightBeReadOnly,IRootFilterContainerHost
+public interface ISelectedDataSets : IDeleteable, IRevertable, IMightBeReadOnly, IRootFilterContainerHost
 {
     /// <summary>
     /// <see cref="IExtractionConfiguration"/> in which the <see cref="ExtractableDataSet_ID"/> is selected
@@ -28,7 +28,7 @@ public interface ISelectedDataSets:IDeleteable,IRevertable, IMightBeReadOnly,IRo
 
 
     /// <inheritdoc cref="ExtractionConfiguration_ID"/>
-    IExtractionConfiguration ExtractionConfiguration { get;}
+    IExtractionConfiguration ExtractionConfiguration { get; }
 
     /// <inheritdoc cref="ExtractableDataSet_ID"/>
     IExtractableDataSet ExtractableDataSet { get; }
@@ -43,8 +43,8 @@ public interface ISelectedDataSets:IDeleteable,IRevertable, IMightBeReadOnly,IRo
     /// Returns all tables which should be force joined against when extracting the <see cref="ISelectedDataSets"/> (regardless of extracted columns).
     /// This does not include implicitly joined <see cref="ITableInfo"/> (i.e. if you are extracting a column from that table).
     /// </summary>
-    ISelectedDataSetsForcedJoin[] SelectedDataSetsForcedJoins { get;}
-        
+    ISelectedDataSetsForcedJoin[] SelectedDataSetsForcedJoins { get; }
+
     /// <summary>
     /// If this dataset has been extracted in the past this will return the last extract audit record.  Otherwise it will return null
     /// </summary>
diff --git a/Rdmp.Core/DataExport/Data/ISelectedDataSetsForcedJoin.cs b/Rdmp.Core/DataExport/Data/ISelectedDataSetsForcedJoin.cs
index 04749ebe7a..ec13364222 100644
--- a/Rdmp.Core/DataExport/Data/ISelectedDataSetsForcedJoin.cs
+++ b/Rdmp.Core/DataExport/Data/ISelectedDataSetsForcedJoin.cs
@@ -17,9 +17,8 @@ namespace Rdmp.Core.DataExport.Data;
 /// 
 /// <para>A <see cref="JoinInfo"/> must still exist to tell <see cref="QueryBuilding.QueryBuilder"/> how to write the Join section of the query.</para>
 /// </summary>
-public interface ISelectedDataSetsForcedJoin:IMapsDirectlyToDatabaseTable
+public interface ISelectedDataSetsForcedJoin : IMapsDirectlyToDatabaseTable
 {
-
     /// <summary>
     /// The dataset in an <see cref="IExtractionConfiguration"/> which should always be joined against the refered <see cref="TableInfo_ID"/>
     /// </summary>
@@ -31,5 +30,5 @@ public interface ISelectedDataSetsForcedJoin:IMapsDirectlyToDatabaseTable
     int TableInfo_ID { get; }
 
     /// <inheritdoc cref="TableInfo_ID"/>
-    TableInfo TableInfo { get;}
+    TableInfo TableInfo { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/Project.cs b/Rdmp.Core/DataExport/Data/Project.cs
index 4b560cd533..170cc9617b 100644
--- a/Rdmp.Core/DataExport/Data/Project.cs
+++ b/Rdmp.Core/DataExport/Data/Project.cs
@@ -23,9 +23,10 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IProject"/>
-public class Project : DatabaseEntity, IProject, ICustomSearchString,ICheckable, IHasFolder
+public class Project : DatabaseEntity, IProject, ICustomSearchString, ICheckable, IHasFolder
 {
     #region Database Properties
+
     private string _name;
     private string _masterTicket;
     private string _extractionDirectory;
@@ -40,6 +41,7 @@ public string Name
         get => _name;
         set => SetField(ref _name, value);
     }
+
     /// <inheritdoc/>
     public string MasterTicket
     {
@@ -85,13 +87,14 @@ public string Folder
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IProjectCohortIdentificationConfigurationAssociation[] ProjectCohortIdentificationConfigurationAssociations => Repository.GetAllObjectsWithParent<ProjectCohortIdentificationConfigurationAssociation>(this);
+    public IProjectCohortIdentificationConfigurationAssociation[]
+        ProjectCohortIdentificationConfigurationAssociations =>
+        Repository.GetAllObjectsWithParent<ProjectCohortIdentificationConfigurationAssociation>(this);
 
     #endregion
 
     public Project()
     {
-
     }
 
     /// <summary>
@@ -105,8 +108,8 @@ public Project(IDataExportRepository repository, string name)
         {
             Repository.InsertAndHydrate(this, new Dictionary<string, object>
             {
-                {"Name", name},
-                {"Folder" , FolderHelper.Root}
+                { "Name", name },
+                { "Folder", FolderHelper.Root }
             });
         }
         catch (Exception ex)
@@ -124,9 +127,10 @@ public Project(IDataExportRepository repository, string name)
                 {
                     throw;
                 }
-                throw new Exception(
-                    $"Could not create a new Project because there is already another Project in the system ({offender}) which is missing a Project Number.  All projects must have a ProjectNumber, there can be 1 Project at a time which does not have a number and that is one that is being built by the user right now.  Either delete Project {offender} or give it a project number", ex);
 
+                throw new Exception(
+                    $"Could not create a new Project because there is already another Project in the system ({offender}) which is missing a Project Number.  All projects must have a ProjectNumber, there can be 1 Project at a time which does not have a number and that is one that is being built by the user right now.  Either delete Project {offender} or give it a project number",
+                    ex);
             }
 
             throw;
@@ -149,14 +153,12 @@ internal Project(IDataExportRepository repository, DbDataReader r)
     /// Returns <see cref="Name"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return Name;
-    }
+    public override string ToString() => Name;
 
     public void Check(ICheckNotifier notifier)
     {
-        new ProjectChecker(new ThrowImmediatelyActivator(new RepositoryProvider(DataExportRepository),notifier),this).Check(notifier);
+        new ProjectChecker(new ThrowImmediatelyActivator(new RepositoryProvider(DataExportRepository), notifier), this)
+            .Check(notifier);
     }
 
     /// <summary>
@@ -170,7 +172,7 @@ public string GetSearchString()
 
         return $"{ProjectNumber}_{Name}_{MasterTicket}";
     }
-        
+
     /// <summary>
     /// Returns all <see cref="CohortIdentificationConfiguration"/> which are associated with the <see cref="IProject"/> (usually because
     /// they have been used to create <see cref="ExtractableCohort"/> used by the <see cref="IProject"/>).
@@ -178,8 +180,9 @@ public string GetSearchString()
     /// <returns></returns>
     public CohortIdentificationConfiguration[] GetAssociatedCohortIdentificationConfigurations()
     {
-        var associations = Repository.GetAllObjectsWithParent<ProjectCohortIdentificationConfigurationAssociation>(this);
-        return associations.Select(a => a.CohortIdentificationConfiguration).Where(c=>c != null).ToArray();
+        var associations =
+            Repository.GetAllObjectsWithParent<ProjectCohortIdentificationConfigurationAssociation>(this);
+        return associations.Select(a => a.CohortIdentificationConfiguration).Where(c => c != null).ToArray();
     }
 
     /// <summary>
@@ -188,10 +191,9 @@ public CohortIdentificationConfiguration[] GetAssociatedCohortIdentificationConf
     /// </summary>
     /// <param name="cic"></param>
     /// <returns></returns>
-    public ProjectCohortIdentificationConfigurationAssociation AssociateWithCohortIdentification(CohortIdentificationConfiguration cic)
-    {
-        return new ProjectCohortIdentificationConfigurationAssociation((IDataExportRepository) Repository, this, cic);
-    }
+    public ProjectCohortIdentificationConfigurationAssociation
+        AssociateWithCohortIdentification(CohortIdentificationConfiguration cic) =>
+        new((IDataExportRepository)Repository, this, cic);
 
     /// <inheritdoc/>
     public ICatalogue[] GetAllProjectCatalogues()
@@ -208,23 +210,17 @@ public ExtractionInformation[] GetAllProjectCatalogueColumns(ExtractionCategory
     /// <inheritdoc/>
     public ExtractionInformation[] GetAllProjectCatalogueColumns(ICoreChildProvider childProvider, ExtractionCategory c)
     {
-        if(childProvider is DataExportChildProvider dx)
-        {
+        if (childProvider is DataExportChildProvider dx)
             return dx.ExtractableDataSets.Where(eds => eds.Project_ID == ID)
                 .Select(e => dx.AllCataloguesDictionary[e.Catalogue_ID])
-                .SelectMany(cata=>cata.GetAllExtractionInformation(c)).ToArray();
-        }
+                .SelectMany(cata => cata.GetAllExtractionInformation(c)).ToArray();
 
         return GetAllProjectCatalogueColumns(c);
     }
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
+
     /// <inheritdoc/>
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return ExtractionConfigurations;
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => ExtractionConfigurations;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/ProjectCohortIdentificationConfigurationAssociation.cs b/Rdmp.Core/DataExport/Data/ProjectCohortIdentificationConfigurationAssociation.cs
index e4a59e8993..4a462ff0ed 100644
--- a/Rdmp.Core/DataExport/Data/ProjectCohortIdentificationConfigurationAssociation.cs
+++ b/Rdmp.Core/DataExport/Data/ProjectCohortIdentificationConfigurationAssociation.cs
@@ -17,12 +17,14 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="IProjectCohortIdentificationConfigurationAssociation"/>
-public class ProjectCohortIdentificationConfigurationAssociation : DatabaseEntity, IProjectCohortIdentificationConfigurationAssociation,IInjectKnown<CohortIdentificationConfiguration>
+public class ProjectCohortIdentificationConfigurationAssociation : DatabaseEntity,
+    IProjectCohortIdentificationConfigurationAssociation, IInjectKnown<CohortIdentificationConfiguration>
 {
     #region Database Properties
 
     private int _project_ID;
     private int _cohortIdentificationConfiguration_ID;
+
     #endregion
 
     /// <inheritdoc/>
@@ -44,7 +46,6 @@ public int CohortIdentificationConfiguration_ID
 
     #region Relationships
 
-
     /// <inheritdoc cref="Project_ID"/>
     [NoMappingToDatabase]
     public IProject Project => Repository.GetObjectByID<Project>(Project_ID);
@@ -71,12 +72,13 @@ public ProjectCohortIdentificationConfigurationAssociation()
     /// <param name="repository"></param>
     /// <param name="project"></param>
     /// <param name="cic"></param>
-    public ProjectCohortIdentificationConfigurationAssociation(IDataExportRepository repository, Project project, CohortIdentificationConfiguration cic)
+    public ProjectCohortIdentificationConfigurationAssociation(IDataExportRepository repository, Project project,
+        CohortIdentificationConfiguration cic)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"Project_ID",project.ID},
-            {"CohortIdentificationConfiguration_ID",cic.ID}
+            { "Project_ID", project.ID },
+            { "CohortIdentificationConfiguration_ID", cic.ID }
         });
 
         if (ID == 0 || Repository != repository)
@@ -84,6 +86,7 @@ public ProjectCohortIdentificationConfigurationAssociation(IDataExportRepository
 
         ClearAllInjections();
     }
+
     internal ProjectCohortIdentificationConfigurationAssociation(IDataExportRepository repository, DbDataReader r)
         : base(repository, r)
     {
@@ -101,15 +104,12 @@ public void InjectKnown(CohortIdentificationConfiguration instance)
 
     public void ClearAllInjections()
     {
-        _knownCic = new Lazy<CohortIdentificationConfiguration>(FetchCohortIdentificationConfiguration); 
+        _knownCic = new Lazy<CohortIdentificationConfiguration>(FetchCohortIdentificationConfiguration);
     }
 
-    private CohortIdentificationConfiguration FetchCohortIdentificationConfiguration()
-    {
-        return
-            DataExportRepository.CatalogueRepository.GetAllObjectsWhere<CohortIdentificationConfiguration>("ID",
-                CohortIdentificationConfiguration_ID).SingleOrDefault();
-    }
+    private CohortIdentificationConfiguration FetchCohortIdentificationConfiguration() =>
+        DataExportRepository.CatalogueRepository.GetAllObjectsWhere<CohortIdentificationConfiguration>("ID",
+            CohortIdentificationConfiguration_ID).SingleOrDefault();
 
 
     /// <summary>
@@ -119,7 +119,7 @@ private CohortIdentificationConfiguration FetchCohortIdentificationConfiguration
     public override string ToString()
     {
         var assoc = CohortIdentificationConfiguration;
-        return assoc == null ? "Orphan Association" :assoc.Name;
+        return assoc == null ? "Orphan Association" : assoc.Name;
     }
 
     public bool ShouldBeReadOnly(out string reason)
@@ -129,23 +129,14 @@ public bool ShouldBeReadOnly(out string reason)
     }
 
     /// <inheritdoc/>
-    public string GetDeleteMessage()
-    {
-        return "remove CohortIdentificationConfiguration from the Project";
-    }
+    public string GetDeleteMessage() => "remove CohortIdentificationConfiguration from the Project";
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 
     /// <summary>
     /// Returns the <see cref="CohortIdentificationConfiguration_ID"/>
     /// </summary>
     /// <returns></returns>
-    public object MasqueradingAs()
-    {
-        return CohortIdentificationConfiguration;
-    }
+    public object MasqueradingAs() => CohortIdentificationConfiguration;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/RetryStrategy.cs b/Rdmp.Core/DataExport/Data/RetryStrategy.cs
index a797380e57..c01738da4c 100644
--- a/Rdmp.Core/DataExport/Data/RetryStrategy.cs
+++ b/Rdmp.Core/DataExport/Data/RetryStrategy.cs
@@ -10,5 +10,4 @@ public enum RetryStrategy
 {
     NoRetry,
     IterativeBackoff1Hour
-            
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/SelectedDataSets.cs b/Rdmp.Core/DataExport/Data/SelectedDataSets.cs
index aabb26d5f5..5c8ed8ab66 100644
--- a/Rdmp.Core/DataExport/Data/SelectedDataSets.cs
+++ b/Rdmp.Core/DataExport/Data/SelectedDataSets.cs
@@ -17,10 +17,11 @@
 namespace Rdmp.Core.DataExport.Data;
 
 /// <inheritdoc cref="ISelectedDataSets"/>
-public class SelectedDataSets : DatabaseEntity, ISelectedDataSets, IInjectKnown<IExtractableDataSet>, IInjectKnown<IExtractionConfiguration>, IInjectKnown<ISelectedDataSetsForcedJoin[]>,IDeletableWithCustomMessage
+public class SelectedDataSets : DatabaseEntity, ISelectedDataSets, IInjectKnown<IExtractableDataSet>,
+    IInjectKnown<IExtractionConfiguration>, IInjectKnown<ISelectedDataSetsForcedJoin[]>, IDeletableWithCustomMessage
 {
     #region Database Properties
-        
+
     private int _extractionConfiguration_ID;
     private int _extractableDataSet_ID;
     private int? _rootFilterContainer_ID;
@@ -35,6 +36,7 @@ public int ExtractionConfiguration_ID
         get => _extractionConfiguration_ID;
         set => SetField(ref _extractionConfiguration_ID, value);
     }
+
     /// <inheritdoc/>
     public int ExtractableDataSet_ID
     {
@@ -45,6 +47,7 @@ public int ExtractableDataSet_ID
             SetField(ref _extractableDataSet_ID, value);
         }
     }
+
     /// <inheritdoc/>
     public int? RootFilterContainer_ID
     {
@@ -52,7 +55,6 @@ public int? RootFilterContainer_ID
         set => SetField(ref _rootFilterContainer_ID, value);
     }
 
-
     #endregion
 
     #region Relationships
@@ -79,13 +81,14 @@ public int? RootFilterContainer_ID
 
     /// <inheritdoc/>
     [NoMappingToDatabase]
-    public IExtractionProgress ExtractionProgressIfAny => DataExportRepository.GetAllObjectsWithParent<ExtractionProgress>(this).SingleOrDefault();
+    public IExtractionProgress ExtractionProgressIfAny =>
+        DataExportRepository.GetAllObjectsWithParent<ExtractionProgress>(this).SingleOrDefault();
 
     #endregion
 
     public SelectedDataSets()
     {
-        ClearAllInjections(); 
+        ClearAllInjections();
     }
 
     internal SelectedDataSets(IDataExportRepository repository, DbDataReader r)
@@ -103,50 +106,41 @@ internal SelectedDataSets(IDataExportRepository repository, DbDataReader r)
     /// <param name="configuration"></param>
     /// <param name="dataSet"></param>
     /// <param name="rootContainerIfAny">Adds the restriction that the extraction SQL should include the WHERE logic in this container</param>
-    public SelectedDataSets(IDataExportRepository repository, ExtractionConfiguration configuration, IExtractableDataSet dataSet, FilterContainer rootContainerIfAny)
+    public SelectedDataSets(IDataExportRepository repository, ExtractionConfiguration configuration,
+        IExtractableDataSet dataSet, FilterContainer rootContainerIfAny)
     {
-        repository.InsertAndHydrate(this,new Dictionary<string, object>
+        repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ExtractionConfiguration_ID",configuration.ID},
-            {"ExtractableDataSet_ID",dataSet.ID},
-            {"RootFilterContainer_ID",rootContainerIfAny != null?(object) rootContainerIfAny.ID:DBNull.Value}
+            { "ExtractionConfiguration_ID", configuration.ID },
+            { "ExtractableDataSet_ID", dataSet.ID },
+            { "RootFilterContainer_ID", rootContainerIfAny != null ? (object)rootContainerIfAny.ID : DBNull.Value }
         });
-            
+
         ClearAllInjections();
         InjectKnown(dataSet);
     }
-        
+
     /// <summary>
     /// Returns the <see cref="ExtractableDataSet"/> name
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return ExtractableDataSet.ToString();
-    }
+    public override string ToString() => ExtractableDataSet.ToString();
 
-    public bool ShouldBeReadOnly(out string reason)
-    {
-        return ExtractionConfiguration.ShouldBeReadOnly(out reason);
-    }
+    public bool ShouldBeReadOnly(out string reason) => ExtractionConfiguration.ShouldBeReadOnly(out reason);
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 
     /// <inheritdoc/>
-    public string GetDeleteMessage()
-    {
-        return $"remove '{ExtractableDataSet}' from ExtractionConfiguration '{ExtractionConfiguration}'";
-    }
+    public string GetDeleteMessage() =>
+        $"remove '{ExtractableDataSet}' from ExtractionConfiguration '{ExtractionConfiguration}'";
 
     /// <inheritdoc/>
     public void InjectKnown(IExtractableDataSet instance)
     {
-        if(instance.ID != ExtractableDataSet_ID)
-            throw new ArgumentException($"That is not our dataset, our dataset has ID {ExtractableDataSet_ID}",nameof(instance));
+        if (instance.ID != ExtractableDataSet_ID)
+            throw new ArgumentException($"That is not our dataset, our dataset has ID {ExtractableDataSet_ID}",
+                nameof(instance));
 
         _extractableDataSet = new Lazy<IExtractableDataSet>(instance);
     }
@@ -157,15 +151,15 @@ public void InjectKnown(IExtractionConfiguration instance)
         _extractionConfiguration = new Lazy<IExtractionConfiguration>(FetchExtractionConfiguration);
     }
 
-    private IExtractionConfiguration FetchExtractionConfiguration()
-    {
-        return Repository.GetObjectByID<ExtractionConfiguration>(ExtractionConfiguration_ID);
-    }
+    private IExtractionConfiguration FetchExtractionConfiguration() =>
+        Repository.GetObjectByID<ExtractionConfiguration>(ExtractionConfiguration_ID);
+
     /// <inheritdoc/>
     public void InjectKnown(ISelectedDataSetsForcedJoin[] instances)
     {
         _selectedDatasetsForcedJoins = new Lazy<ISelectedDataSetsForcedJoin[]>(instances);
     }
+
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
@@ -174,20 +168,13 @@ public void ClearAllInjections()
         _extractableDataSet = new Lazy<IExtractableDataSet>(FetchExtractableDataset);
     }
 
-    private ISelectedDataSetsForcedJoin[] FetchForcedJoins()
-    {
-        return Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(this).ToArray();
-    }
+    private ISelectedDataSetsForcedJoin[] FetchForcedJoins() =>
+        Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(this).ToArray();
 
-    public ICatalogue GetCatalogue()
-    {
-        return ExtractableDataSet.Catalogue;
-    }
+    public ICatalogue GetCatalogue() => ExtractableDataSet.Catalogue;
 
-    private IExtractableDataSet FetchExtractableDataset()
-    {
-        return Repository.GetObjectByID<ExtractableDataSet>(ExtractableDataSet_ID);
-    }
+    private IExtractableDataSet FetchExtractableDataset() =>
+        Repository.GetObjectByID<ExtractableDataSet>(ExtractableDataSet_ID);
 
     /// <inheritdoc/>
     public ICumulativeExtractionResults GetCumulativeExtractionResultsIfAny()
@@ -203,10 +190,7 @@ public void CreateRootContainerIfNotExists()
         SaveToDatabase();
     }
 
-    public IFilterFactory GetFilterFactory()
-    {
-        return new DeployedExtractionFilterFactory(DataExportRepository);
-    }
+    public IFilterFactory GetFilterFactory() => new DeployedExtractionFilterFactory(DataExportRepository);
 
     public override void DeleteInDatabase()
     {
@@ -214,13 +198,9 @@ public override void DeleteInDatabase()
 
         ExtractionProgressIfAny?.DeleteInDatabase();
         base.DeleteInDatabase();
-            
-        foreach(var col in cols)
-        {
-            if(col.Exists())
-            {
+
+        foreach (var col in cols)
+            if (col.Exists())
                 col.DeleteInDatabase();
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/SelectedDataSetsForcedJoin.cs b/Rdmp.Core/DataExport/Data/SelectedDataSetsForcedJoin.cs
index ef8c5eeb10..82b779978a 100644
--- a/Rdmp.Core/DataExport/Data/SelectedDataSetsForcedJoin.cs
+++ b/Rdmp.Core/DataExport/Data/SelectedDataSetsForcedJoin.cs
@@ -40,6 +40,7 @@ public int TableInfo_ID
     }
 
     #region Relationships
+
     /// <inheritdoc cref="TableInfo_ID"/>
     [NoMappingToDatabase]
     public TableInfo TableInfo => _knownTableInfo.Value;
@@ -59,12 +60,12 @@ public SelectedDataSetsForcedJoin()
     /// <param name="repository"></param>
     /// <param name="sds"></param>
     /// <param name="tableInfo"></param>
-    public SelectedDataSetsForcedJoin(IDataExportRepository repository,SelectedDataSets sds, ITableInfo tableInfo)
+    public SelectedDataSetsForcedJoin(IDataExportRepository repository, SelectedDataSets sds, ITableInfo tableInfo)
     {
         repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"SelectedDataSets_ID",sds.ID},
-            {"TableInfo_ID",tableInfo.ID}
+            { "SelectedDataSets_ID", sds.ID },
+            { "TableInfo_ID", tableInfo.ID }
         });
 
         if (ID == 0 || Repository != repository)
@@ -72,7 +73,8 @@ public SelectedDataSetsForcedJoin(IDataExportRepository repository,SelectedDataS
 
         ClearAllInjections();
     }
-    internal SelectedDataSetsForcedJoin(IRepository repository, DbDataReader r): base(repository, r)
+
+    internal SelectedDataSetsForcedJoin(IRepository repository, DbDataReader r) : base(repository, r)
     {
         SelectedDataSets_ID = Convert.ToInt32(r["SelectedDataSets_ID"]);
         TableInfo_ID = Convert.ToInt32(r["TableInfo_ID"]);
@@ -85,14 +87,13 @@ public void InjectKnown(TableInfo instance)
     {
         _knownTableInfo = new Lazy<TableInfo>(instance);
     }
+
     /// <inheritdoc/>
     public void ClearAllInjections()
     {
         _knownTableInfo = new Lazy<TableInfo>(FetchTableInfo);
     }
 
-    private TableInfo FetchTableInfo()
-    {
-        return ((IDataExportRepository) Repository).CatalogueRepository.GetObjectByID<TableInfo>(TableInfo_ID);
-    }
+    private TableInfo FetchTableInfo() =>
+        ((IDataExportRepository)Repository).CatalogueRepository.GetObjectByID<TableInfo>(TableInfo_ID);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/Data/SupplementalExtractionResults.cs b/Rdmp.Core/DataExport/Data/SupplementalExtractionResults.cs
index 310497e108..58b5e83f67 100644
--- a/Rdmp.Core/DataExport/Data/SupplementalExtractionResults.cs
+++ b/Rdmp.Core/DataExport/Data/SupplementalExtractionResults.cs
@@ -35,18 +35,21 @@ public int? CumulativeExtractionResults_ID
         get => _cumulativeExtractionResults_ID;
         set => SetField(ref _cumulativeExtractionResults_ID, value);
     }
+
     /// <inheritdoc/>
     public int? ExtractionConfiguration_ID
     {
         get => _extractionConfiguration_ID;
         set => SetField(ref _extractionConfiguration_ID, value);
     }
+
     /// <inheritdoc/>
     public string DestinationDescription
     {
         get => _destinationDescription;
         set => SetField(ref _destinationDescription, value);
     }
+
     /// <inheritdoc/>
     public int RecordsExtracted
     {
@@ -67,12 +70,14 @@ public string Exception
         get => _exception;
         set => SetField(ref _exception, value);
     }
+
     /// <inheritdoc/>
     public string SQLExecuted
     {
         get => _sQLExecuted;
         set => SetField(ref _sQLExecuted, value);
     }
+
     /// <inheritdoc/>
     public string ExtractedName
     {
@@ -95,7 +100,6 @@ public string DestinationType
 
     public SupplementalExtractionResults()
     {
-
     }
 
     /// <summary>
@@ -106,7 +110,8 @@ public SupplementalExtractionResults()
     /// <param name="configuration">The configuration being extracted</param>
     /// <param name="sql">The SQL executed to generate the artifact or null if not appropriate (e.g. if it is a <see cref="SupportingDocument"/>)</param>
     /// <param name="extractedObject">The owner of the artifact being extracted (e.g. a <see cref="SupportingDocument"/> or <see cref="SupportingSQLTable"/>)</param>
-    public SupplementalExtractionResults(IDataExportRepository repository, IExtractionConfiguration configuration, string sql, IMapsDirectlyToDatabaseTable extractedObject)
+    public SupplementalExtractionResults(IDataExportRepository repository, IExtractionConfiguration configuration,
+        string sql, IMapsDirectlyToDatabaseTable extractedObject)
     {
         Repository = repository;
         var name = extractedObject.GetType().FullName;
@@ -116,12 +121,12 @@ public SupplementalExtractionResults(IDataExportRepository repository, IExtracti
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",extractedObject.ID},
-            {"ReferencedObjectType",extractedObject.GetType().Name},
-            {"ReferencedObjectRepositoryType",extractedObject.Repository.GetType().Name},
-            {"ExtractionConfiguration_ID", configuration.ID},
-            {"SQLExecuted", sql},
-            {"ExtractedName", name }
+            { "ReferencedObjectID", extractedObject.ID },
+            { "ReferencedObjectType", extractedObject.GetType().Name },
+            { "ReferencedObjectRepositoryType", extractedObject.Repository.GetType().Name },
+            { "ExtractionConfiguration_ID", configuration.ID },
+            { "SQLExecuted", sql },
+            { "ExtractedName", name }
         });
 
         IsGlobal = true;
@@ -135,7 +140,8 @@ public SupplementalExtractionResults(IDataExportRepository repository, IExtracti
     /// <param name="mainAudit">The dataset extraction audit for the dataset to which this supplemental artifact belongs</param>
     /// <param name="sql">The SQL executed to generate the artifact or null if not appropriate (e.g. if it is a <see cref="SupportingDocument"/>)</param>
     /// <param name="extractedObject">The owner of the artifact being extracted (e.g. a <see cref="SupportingDocument"/> or <see cref="SupportingSQLTable"/>)</param>
-    public SupplementalExtractionResults(IDataExportRepository repository, ICumulativeExtractionResults mainAudit, string sql, IMapsDirectlyToDatabaseTable extractedObject)
+    public SupplementalExtractionResults(IDataExportRepository repository, ICumulativeExtractionResults mainAudit,
+        string sql, IMapsDirectlyToDatabaseTable extractedObject)
     {
         Repository = repository;
 
@@ -146,16 +152,17 @@ public SupplementalExtractionResults(IDataExportRepository repository, ICumulati
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"ReferencedObjectID",extractedObject.ID},
-            {"ReferencedObjectType",extractedObject.GetType().Name},
-            {"ReferencedObjectRepositoryType",extractedObject.Repository.GetType().Name},
-            {"CumulativeExtractionResults_ID", mainAudit.ID},
-            {"SQLExecuted", sql},
-            {"ExtractedName", name }
+            { "ReferencedObjectID", extractedObject.ID },
+            { "ReferencedObjectType", extractedObject.GetType().Name },
+            { "ReferencedObjectRepositoryType", extractedObject.Repository.GetType().Name },
+            { "CumulativeExtractionResults_ID", mainAudit.ID },
+            { "SQLExecuted", sql },
+            { "ExtractedName", name }
         });
 
         IsGlobal = false;
     }
+
     /// <summary>
     /// Reads an existing audit record out of the data export database
     /// </summary>
@@ -172,19 +179,18 @@ internal SupplementalExtractionResults(IRepository repository, DbDataReader r)
         Exception = r["Exception"] as string;
         SQLExecuted = r["SQLExecuted"] as string;
         ExtractedName = r["ExtractedName"] as string;
-        DestinationType = r["DestinationType"] as string; 
+        DestinationType = r["DestinationType"] as string;
 
         IsGlobal = CumulativeExtractionResults_ID == null && ExtractionConfiguration_ID != null;
     }
 
     /// <inheritdoc/>
-    public Type GetDestinationType()
-    {
-        return ((IDataExportRepository)Repository).CatalogueRepository.MEF.GetType(DestinationType);
-    }
+    public Type GetDestinationType() =>
+        ((IDataExportRepository)Repository).CatalogueRepository.MEF.GetType(DestinationType);
 
     /// <inheritdoc/>
-    public void CompleteAudit(Type destinationType, string destinationDescription, int distinctIdentifiers, bool isBatchResume, bool failed)
+    public void CompleteAudit(Type destinationType, string destinationDescription, int distinctIdentifiers,
+        bool isBatchResume, bool failed)
     {
         DestinationType = destinationType.FullName;
         DestinationDescription = destinationDescription;
@@ -197,8 +203,5 @@ public void CompleteAudit(Type destinationType, string destinationDescription, i
     /// Returns <see cref="ExtractedName"/>
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return ExtractedName;
-    }
+    public override string ToString() => ExtractedName;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommand.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommand.cs
index dc6a33e8f5..00e2482735 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommand.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommand.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.DataExport.DataExtraction.Commands;
 
-public abstract class ExtractCommand:IExtractCommand
+public abstract class ExtractCommand : IExtractCommand
 {
     public IProject Project { get; private set; }
     public IExtractionConfiguration Configuration { get; private set; }
@@ -22,15 +22,15 @@ protected ExtractCommand(IExtractionConfiguration configuration)
         Configuration = configuration;
 
         //needed for ExtractDatasetCommand.EmptyCommand
-        if(configuration != null)
+        if (configuration != null)
             Project = configuration.Project;
     }
 
     public abstract DirectoryInfo GetExtractionDirectory();
-        
+
     public abstract string DescribeExtractionImplementation();
     public ExtractCommandState State { get; private set; }
-        
+
     public void ElevateState(ExtractCommandState newState)
     {
         State = newState;
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollection.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollection.cs
index 36ebdf5cf3..ddf7aadeb1 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollection.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollection.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.DataExport.DataExtraction.Commands;
 public class ExtractCommandCollection
 {
     public IExtractDatasetCommand[] Datasets { get; set; }
-        
+
 
     public ExtractCommandCollection(IEnumerable<ExtractDatasetCommand> datasetBundles)
     {
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollectionFactory.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollectionFactory.cs
index 402a0dfa26..eeb74a7f0f 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollectionFactory.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractCommandCollectionFactory.cs
@@ -18,7 +18,8 @@ namespace Rdmp.Core.DataExport.DataExtraction.Commands;
 /// </summary>
 public class ExtractCommandCollectionFactory
 {
-    public static ExtractCommandCollection Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ExtractionConfiguration configuration)
+    public static ExtractCommandCollection Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ExtractionConfiguration configuration)
     {
         var cohort = configuration.Cohort;
         var datasets = configuration.GetAllExtractableDataSets();
@@ -28,7 +29,8 @@ public static ExtractCommandCollection Create(IRDMPPlatformRepositoryServiceLoca
         return new ExtractCommandCollection(datasetBundles);
     }
 
-    private static ExtractDatasetCommand CreateDatasetCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IExtractableDataSet dataset, IExtractionConfiguration configuration)
+    private static ExtractDatasetCommand CreateDatasetCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IExtractableDataSet dataset, IExtractionConfiguration configuration)
     {
         var catalogue = dataset.Catalogue;
 
@@ -37,20 +39,19 @@ private static ExtractDatasetCommand CreateDatasetCommand(IRDMPPlatformRepositor
         var sqls = catalogue.GetAllSupportingSQLTablesForCatalogue(FetchOptions.ExtractableLocals);
 
         //Now find all the lookups and include them into the bundle
-        catalogue.GetTableInfos(out List<ITableInfo> normalTablesFound, out var lookupsFound);
+        catalogue.GetTableInfos(out var normalTablesFound, out var lookupsFound);
 
         //bundle consists of:
         var bundle = new ExtractableDatasetBundle(
-            dataset,//the dataset
-            docs,//all non global extractable docs (SupportingDocuments)
-            sqls.Where(sql => sql.IsGlobal == false).ToArray(),//all non global extractable sql (SupportingSQL)
-            lookupsFound.ToArray());//all lookups associated with the Catalogue (the one behind the ExtractableDataset)
+            dataset, //the dataset
+            docs, //all non global extractable docs (SupportingDocuments)
+            sqls.Where(sql => sql.IsGlobal == false).ToArray(), //all non global extractable sql (SupportingSQL)
+            lookupsFound.ToArray()); //all lookups associated with the Catalogue (the one behind the ExtractableDataset)
 
         return new ExtractDatasetCommand(configuration, bundle);
     }
 
-    public static ExtractDatasetCommand Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSets)
-    {
-        return CreateDatasetCommand(repositoryLocator, selectedDataSets.ExtractableDataSet,selectedDataSets.ExtractionConfiguration);
-    }
+    public static ExtractDatasetCommand Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSets) => CreateDatasetCommand(repositoryLocator,
+        selectedDataSets.ExtractableDataSet, selectedDataSets.ExtractionConfiguration);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractDatasetCommand.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractDatasetCommand.cs
index 1d13771ab8..1227f1e15c 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractDatasetCommand.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractDatasetCommand.cs
@@ -39,15 +39,17 @@ public IExtractableDatasetBundle DatasetBundle
         {
             _datasetBundle = value;
 
-            Catalogue = value == null ? null : DataExportRepository.CatalogueRepository.GetObjectByID<Catalogue>(value.DataSet.Catalogue_ID);
+            Catalogue = value == null
+                ? null
+                : DataExportRepository.CatalogueRepository.GetObjectByID<Catalogue>(value.DataSet.Catalogue_ID);
         }
     }
 
     public IDataExportRepository DataExportRepository { get; set; }
 
-    public List<IColumn> ColumnsToExtract{get;set;}
-    public IHICProjectSalt Salt{get;set;}
-    public bool IncludeValidation {get;set;}
+    public List<IColumn> ColumnsToExtract { get; set; }
+    public IHICProjectSalt Salt { get; set; }
+    public bool IncludeValidation { get; set; }
 
     public IExtractionDirectory Directory { get; set; }
     public ICatalogue Catalogue { get; private set; }
@@ -60,10 +62,14 @@ public IExtractableDatasetBundle DatasetBundle
 
     /// <inheritdoc/>
     public DateTime? BatchStart { get; set; }
+
     /// <inheritdoc/>
     public DateTime? BatchEnd { get; set; }
 
-    public ExtractDatasetCommand( IExtractionConfiguration configuration, IExtractableCohort extractableCohort, IExtractableDatasetBundle datasetBundle, List<IColumn> columnsToExtract, IHICProjectSalt salt, IExtractionDirectory directory, bool includeValidation = false, bool includeLookups = false):this(configuration,datasetBundle.DataSet)
+    public ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractableCohort extractableCohort,
+        IExtractableDatasetBundle datasetBundle, List<IColumn> columnsToExtract, IHICProjectSalt salt,
+        IExtractionDirectory directory, bool includeValidation = false, bool includeLookups = false) : this(
+        configuration, datasetBundle.DataSet)
     {
         DataExportRepository = configuration.DataExportRepository;
         ExtractableCohort = extractableCohort;
@@ -80,7 +86,6 @@ public ExtractDatasetCommand( IExtractionConfiguration configuration, IExtractab
     }
 
 
-
     /// <summary>
     /// This version has less arguments because it goes back to the database and queries the configuration and explores who the cohort is etc, it will result in more database
     /// queries than the more explicit constructor
@@ -89,7 +94,8 @@ public ExtractDatasetCommand( IExtractionConfiguration configuration, IExtractab
     /// <param name="datasetBundle"></param>
     /// <param name="includeValidation"></param>
     /// <param name="includeLookups"></param>
-    public ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractableDatasetBundle datasetBundle, bool includeValidation = false, bool includeLookups = false):this(configuration,datasetBundle.DataSet)
+    public ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractableDatasetBundle datasetBundle,
+        bool includeValidation = false, bool includeLookups = false) : this(configuration, datasetBundle.DataSet)
     {
         DataExportRepository = configuration.DataExportRepository;
         //ExtractableCohort = ExtractableCohort.GetExtractableCohortByID((int) configuration.Cohort_ID);
@@ -109,9 +115,11 @@ public ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractabl
     public static readonly ExtractDatasetCommand EmptyCommand = new();
 
 
-    private ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractableDataSet dataset):base(configuration)
+    private ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractableDataSet dataset) : base(
+        configuration)
     {
-        var selectedDataSets = configuration.SelectedDataSets.Where(ds => ds.ExtractableDataSet_ID == dataset.ID).ToArray();
+        var selectedDataSets = configuration.SelectedDataSets.Where(ds => ds.ExtractableDataSet_ID == dataset.ID)
+            .ToArray();
 
         if (selectedDataSets.Length != 1)
             throw new Exception(
@@ -124,7 +132,6 @@ private ExtractDatasetCommand(IExtractionConfiguration configuration, IExtractab
 
     private ExtractDatasetCommand() : base(null)
     {
-
     }
 
     /// <summary>
@@ -135,10 +142,11 @@ public void Reset()
         ColumnsToExtract = _origColumnsToExtract.ToList();
         QueryBuilder = null;
     }
+
     public void GenerateQueryBuilder()
     {
         var host = new ExtractionQueryBuilder(DataExportRepository);
-        QueryBuilder = host.GetSQLCommandForFullExtractionSet(this,out var substitutions);
+        QueryBuilder = host.GetSQLCommandForFullExtractionSet(this, out var substitutions);
         ReleaseIdentifierSubstitutions = substitutions;
     }
 
@@ -157,21 +165,20 @@ public override DirectoryInfo GetExtractionDirectory()
 
         return Directory.GetDirectoryForDataset(DatasetBundle.DataSet);
     }
-    public override string DescribeExtractionImplementation()
-    {
-        return QueryBuilder.SQL;
-    }
+
+    public override string DescribeExtractionImplementation() => QueryBuilder.SQL;
 
     /// <inheritdoc/>
     public DiscoveredServer GetDistinctLiveDatabaseServer()
     {
-        IDataAccessPoint[] points = QueryBuilder?.TablesUsedInQuery != null ? QueryBuilder.TablesUsedInQuery.ToArray() : //get it from the request if it has been built
+        IDataAccessPoint[] points = QueryBuilder?.TablesUsedInQuery != null
+            ? QueryBuilder.TablesUsedInQuery.ToArray()
+            : //get it from the request if it has been built
             Catalogue.GetTableInfoList(false); //or from the Catalogue directly if the query hasn't been built
 
         var singleServer = new DataAccessPointCollection(true, DataAccessContext.DataExport);
         singleServer.AddRange(points);
 
         return singleServer.GetDistinctServer();
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractGlobalsCommand.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractGlobalsCommand.cs
index 4dc9e26819..606d7c77c3 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractGlobalsCommand.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/ExtractGlobalsCommand.cs
@@ -25,10 +25,11 @@ public class ExtractGlobalsCommand : ExtractCommand
     public GlobalsBundle Globals { get; set; }
 
     public IRDMPPlatformRepositoryServiceLocator RepositoryLocator { get; private set; }
-        
+
     public List<IExtractionResults> ExtractionResults { get; private set; }
 
-    public ExtractGlobalsCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IProject project, ExtractionConfiguration configuration, GlobalsBundle globals):base(configuration)
+    public ExtractGlobalsCommand(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IProject project,
+        ExtractionConfiguration configuration, GlobalsBundle globals) : base(configuration)
     {
         RepositoryLocator = repositoryLocator;
         this.project = project;
@@ -37,18 +38,10 @@ public ExtractGlobalsCommand(IRDMPPlatformRepositoryServiceLocator repositoryLoc
         ExtractionResults = new List<IExtractionResults>();
     }
 
-    public override DirectoryInfo GetExtractionDirectory()
-    {
-        return new ExtractionDirectory(project.ExtractionDirectory, Configuration).GetGlobalsDirectory();
-    }
+    public override DirectoryInfo GetExtractionDirectory() =>
+        new ExtractionDirectory(project.ExtractionDirectory, Configuration).GetGlobalsDirectory();
 
-    public override string DescribeExtractionImplementation()
-    {
-        return string.Join(";", Globals.Contents);
-    }
+    public override string DescribeExtractionImplementation() => string.Join(";", Globals.Contents);
 
-    public override string ToString()
-    {
-        return ExtractionDirectory.GLOBALS_DATA_NAME;
-    }
+    public override string ToString() => ExtractionDirectory.GLOBALS_DATA_NAME;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Commands/IExtractCommand.cs b/Rdmp.Core/DataExport/DataExtraction/Commands/IExtractCommand.cs
index 20582114d7..1408841b85 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Commands/IExtractCommand.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Commands/IExtractCommand.cs
@@ -27,5 +27,5 @@ public interface IExtractCommand
     /// set of new data that has not been succesfully outputted yet and should be appended to the destination 
     /// instead of overwriting.
     /// </summary>
-    bool IsBatchResume{ get; set; }
+    bool IsBatchResume { get; set; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/ExtractTableVerbatim.cs b/Rdmp.Core/DataExport/DataExtraction/ExtractTableVerbatim.cs
index 293e4201ee..e001bba815 100644
--- a/Rdmp.Core/DataExport/DataExtraction/ExtractTableVerbatim.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/ExtractTableVerbatim.cs
@@ -38,9 +38,10 @@ public class ExtractTableVerbatim
 
     public string OutputFilename { get; private set; }
 
-    public ExtractTableVerbatim(DiscoveredServer server, string[] tableNames, DirectoryInfo outputDirectory, string separator, string dateTimeFormat)
+    public ExtractTableVerbatim(DiscoveredServer server, string[] tableNames, DirectoryInfo outputDirectory,
+        string separator, string dateTimeFormat)
     {
-        if(tableNames.Length == 0)
+        if (tableNames.Length == 0)
             throw new ArgumentException("You must select at least one table to extract");
 
         _tableNames = tableNames;
@@ -50,9 +51,10 @@ public ExtractTableVerbatim(DiscoveredServer server, string[] tableNames, Direct
         _server = server;
     }
 
-    public ExtractTableVerbatim(DirectoryInfo outputDirectory, string separator, string dateTimeFormat,params DiscoveredTable[] tables)
-        :this(tables.Select(t=>t.Database.Server).Distinct().Single(),
-            tables.Select(t=>t.GetFullyQualifiedName()).ToArray(),
+    public ExtractTableVerbatim(DirectoryInfo outputDirectory, string separator, string dateTimeFormat,
+        params DiscoveredTable[] tables)
+        : this(tables.Select(t => t.Database.Server).Distinct().Single(),
+            tables.Select(t => t.GetFullyQualifiedName()).ToArray(),
             outputDirectory,
             separator,
             dateTimeFormat)
@@ -68,20 +70,18 @@ public ExtractTableVerbatim(DirectoryInfo outputDirectory, string separator, str
     /// <param name="outputDirectory"></param>
     /// <param name="separator"></param>
     /// <param name="dateTimeFormat"></param>
-    public ExtractTableVerbatim(DiscoveredServer server, string sql,string outputName, DirectoryInfo outputDirectory, string separator,string dateTimeFormat)
+    public ExtractTableVerbatim(DiscoveredServer server, string sql, string outputName, DirectoryInfo outputDirectory,
+        string separator, string dateTimeFormat)
     {
         _specificSQL = sql;
         _specificSQLTableName = outputName;
         _outputDirectory = outputDirectory;
         _separator = separator;
-        _dateTimeFormat = dateTimeFormat?? GetDefaultDateTimeFormat();
+        _dateTimeFormat = dateTimeFormat ?? GetDefaultDateTimeFormat();
         _server = server;
     }
 
-    private static string GetDefaultDateTimeFormat()
-    {
-        return "yyyy-MM-dd hh:mm:ss";
-    }
+    private static string GetDefaultDateTimeFormat() => "yyyy-MM-dd hh:mm:ss";
 
 
     /// <summary>
@@ -92,8 +92,9 @@ private static string GetDefaultDateTimeFormat()
     /// <param name="stream">The output stream to write data to</param>
     /// <param name="separator"></param>
     /// <param name="dateTimeFormat"></param>
-    public ExtractTableVerbatim(DiscoveredServer server, string sql,Stream stream, string separator,string dateTimeFormat)
-        :this(server, sql,null,null, separator,dateTimeFormat)
+    public ExtractTableVerbatim(DiscoveredServer server, string sql, Stream stream, string separator,
+        string dateTimeFormat)
+        : this(server, sql, null, null, separator, dateTimeFormat)
     {
         _stream = stream;
     }
@@ -106,14 +107,11 @@ public int DoExtraction()
         {
             con.Open();
 
-            if (_specificSQL != null)
-            {
-                linesWritten += ExtractSQL(_specificSQL,_specificSQLTableName,con);
-            }
-            
-            if(_tableNames != null)
+            if (_specificSQL != null) linesWritten += ExtractSQL(_specificSQL, _specificSQLTableName, con);
+
+            if (_tableNames != null)
                 foreach (var table in _tableNames)
-                    linesWritten += ExtractSQL($"select * from {table}", table,con);
+                    linesWritten += ExtractSQL($"select * from {table}", table, con);
 
             con.Close();
         }
@@ -129,9 +127,9 @@ private int ExtractSQL(string sql, string tableName, DbConnection con)
         {
             string filename = null;
 
-            if (_outputDirectory !=null)
+            if (_outputDirectory != null)
             {
-                if(!Directory.Exists(_outputDirectory.FullName))
+                if (!Directory.Exists(_outputDirectory.FullName))
                     Directory.CreateDirectory(_outputDirectory.FullName);
 
                 filename = tableName.Replace("[", "").Replace("]", "").ToLower().Trim();
@@ -141,35 +139,39 @@ private int ExtractSQL(string sql, string tableName, DbConnection con)
             }
 
             StreamWriter sw;
-                
-            if(_stream != null)
+
+            if (_stream != null)
+            {
                 sw = new StreamWriter(_stream);
+            }
             else
-            { 
-                if(_outputDirectory == null)
-                    throw new Exception($"{nameof(_outputDirectory)} cannot be null when using file output mode (only with an explicit stream out).");
-                    
-                if(filename == null)
-                    throw new Exception($"{nameof(filename)} cannot be null when using file output mode (only with an explicit stream out).");
-
-                OutputFilename = Path.Combine(_outputDirectory.FullName , filename);
+            {
+                if (_outputDirectory == null)
+                    throw new Exception(
+                        $"{nameof(_outputDirectory)} cannot be null when using file output mode (only with an explicit stream out).");
+
+                if (filename == null)
+                    throw new Exception(
+                        $"{nameof(filename)} cannot be null when using file output mode (only with an explicit stream out).");
+
+                OutputFilename = Path.Combine(_outputDirectory.FullName, filename);
                 sw = new StreamWriter(OutputFilename);
             }
-                 
+
             cmdExtract.CommandTimeout = 500000;
 
-            using(var r = cmdExtract.ExecuteReader())
+            using (var r = cmdExtract.ExecuteReader())
             {
                 WriteHeader(sw, r, _separator, _dateTimeFormat);
-                linesWritten = WriteBody(sw, r, _separator, _dateTimeFormat,RoundFloatsTo);
+                linesWritten = WriteBody(sw, r, _separator, _dateTimeFormat, RoundFloatsTo);
 
                 r.Close();
             }
-                
+
             sw.Flush();
             sw.Close();
         }
-            
+
         return linesWritten;
     }
 
@@ -178,14 +180,16 @@ public static void WriteHeader(StreamWriter sw, DbDataReader r, string separator
         //write headers
         for (var i = 0; i < r.FieldCount; i++)
         {
-            sw.Write(CSVOutputFormat.CleanString(r.GetName(i), separator, out _, dateTimeFormat,null));
+            sw.Write(CSVOutputFormat.CleanString(r.GetName(i), separator, out _, dateTimeFormat, null));
             if (i < r.FieldCount - 1)
                 sw.Write(separator);
             else
                 sw.WriteLine();
         }
     }
-    public static int WriteBody(StreamWriter sw, DbDataReader r, string separator, string dateTimeFormat, int? roundFloatsTo)
+
+    public static int WriteBody(StreamWriter sw, DbDataReader r, string separator, string dateTimeFormat,
+        int? roundFloatsTo)
     {
         var linesWritten = 0;
 
@@ -199,10 +203,9 @@ public static int WriteBody(StreamWriter sw, DbDataReader r, string separator, s
                 if (i < r.FieldCount - 1)
                     sw.Write(separator); //if not the last element add a ','
                 else
-                {
                     sw.WriteLine();
-                }
             }
+
             linesWritten++;
         }
 
@@ -215,15 +218,13 @@ public static int WriteBody(StreamWriter sw, DbDataReader r, string separator, s
     /// <param name="collection"></param>
     /// <param name="toFile"></param>
     /// <param name="context">Determines which access credentials (if any) are used to run the query</param>
-    public static void ExtractDataToFile(IViewSQLAndResultsCollection collection, FileInfo toFile, DataAccessContext context = DataAccessContext.InternalDataProcessing)
+    public static void ExtractDataToFile(IViewSQLAndResultsCollection collection, FileInfo toFile,
+        DataAccessContext context = DataAccessContext.InternalDataProcessing)
     {
         var point = collection.GetDataAccessPoint();
-        var db = DataAccessPortal.ExpectDatabase(point,context);
+        var db = DataAccessPortal.ExpectDatabase(point, context);
 
-        if(!toFile.Directory.Exists)
-        {
-            toFile.Directory.Create();
-        }
+        if (!toFile.Directory.Exists) toFile.Directory.Create();
 
         using (var fs = File.OpenWrite(toFile.FullName))
         {
diff --git a/Rdmp.Core/DataExport/DataExtraction/ExtractionDirectory.cs b/Rdmp.Core/DataExport/DataExtraction/ExtractionDirectory.cs
index 92671f28c0..156499cbc2 100644
--- a/Rdmp.Core/DataExport/DataExtraction/ExtractionDirectory.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/ExtractionDirectory.cs
@@ -37,7 +37,8 @@ public ExtractionDirectory(string rootExtractionDirectory, IExtractionConfigurat
     {
     }
 
-    private ExtractionDirectory(string rootExtractionDirectory, IExtractionConfiguration configuration, DateTime extractionDate)
+    private ExtractionDirectory(string rootExtractionDirectory, IExtractionConfiguration configuration,
+        DateTime extractionDate)
     {
         if (string.IsNullOrWhiteSpace(rootExtractionDirectory))
             throw new NullReferenceException("Extraction Directory not set");
@@ -57,18 +58,16 @@ private ExtractionDirectory(string rootExtractionDirectory, IExtractionConfigura
             : root.CreateSubdirectory(subdirectoryName);
     }
 
-    public static string GetExtractionDirectoryPrefix(IExtractionConfiguration configuration)
-    {
-        return STANDARD_EXTRACTION_PREFIX + configuration.ID;
-    }
+    public static string GetExtractionDirectoryPrefix(IExtractionConfiguration configuration) =>
+        STANDARD_EXTRACTION_PREFIX + configuration.ID;
 
     public DirectoryInfo GetDirectoryForDataset(IExtractableDataSet dataset)
     {
-        if(dataset.ToString().Equals(CUSTOM_COHORT_DATA_FOLDER_NAME))
+        if (dataset.ToString().Equals(CUSTOM_COHORT_DATA_FOLDER_NAME))
             throw new Exception(
                 $"You cannot call a dataset '{CUSTOM_COHORT_DATA_FOLDER_NAME}' because this string is reserved for cohort custom data the system spits out itself");
 
-        if(!Catalogue.IsAcceptableName(dataset.Catalogue.Name,out var reason))
+        if (!Catalogue.IsAcceptableName(dataset.Catalogue.Name, out var reason))
             throw new NotSupportedException(
                 $"Cannot extract dataset {dataset} because it points at Catalogue with an invalid name, name is invalid because:{reason}");
 
@@ -80,14 +79,12 @@ public DirectoryInfo GetDirectoryForDataset(IExtractableDataSet dataset)
         catch (Exception e)
         {
             throw new Exception(
-                $"Could not create a directory called '{datasetDirectory}' as a subfolder of Project extraction directory {ExtractionDirectoryInfo.Root}",e);
+                $"Could not create a directory called '{datasetDirectory}' as a subfolder of Project extraction directory {ExtractionDirectoryInfo.Root}",
+                e);
         }
     }
 
-    public DirectoryInfo GetGlobalsDirectory()
-    {
-        return ExtractionDirectoryInfo.CreateSubdirectory(GLOBALS_DATA_NAME);
-    }
+    public DirectoryInfo GetGlobalsDirectory() => ExtractionDirectoryInfo.CreateSubdirectory(GLOBALS_DATA_NAME);
 
     public static bool IsOwnerOf(IExtractionConfiguration configuration, DirectoryInfo directory)
     {
@@ -104,19 +101,17 @@ public static bool IsOwnerOf(IExtractionConfiguration configuration, DirectoryIn
         return directory.Name.StartsWith(STANDARD_EXTRACTION_PREFIX + configuration.ID);
     }
 
-    public DirectoryInfo GetDirectoryForCohortCustomData()
-    {
-        return ExtractionDirectoryInfo.CreateSubdirectory(CUSTOM_COHORT_DATA_FOLDER_NAME);
-    }
+    public DirectoryInfo GetDirectoryForCohortCustomData() =>
+        ExtractionDirectoryInfo.CreateSubdirectory(CUSTOM_COHORT_DATA_FOLDER_NAME);
 
-    public DirectoryInfo GetDirectoryForMasterData()
-    {
-        return ExtractionDirectoryInfo.CreateSubdirectory(MASTER_DATA_FOLDER_NAME);
-    }
+    public DirectoryInfo GetDirectoryForMasterData() =>
+        ExtractionDirectoryInfo.CreateSubdirectory(MASTER_DATA_FOLDER_NAME);
 
-    public static void CleanupExtractionDirectory(object sender, string extractionDirectory, IEnumerable<IExtractionConfiguration> configurations, IDataLoadEventListener listener)
+    public static void CleanupExtractionDirectory(object sender, string extractionDirectory,
+        IEnumerable<IExtractionConfiguration> configurations, IDataLoadEventListener listener)
     {
-        var projectExtractionDirectory = new DirectoryInfo(Path.Combine(extractionDirectory, EXTRACTION_SUB_FOLDER_NAME));
+        var projectExtractionDirectory =
+            new DirectoryInfo(Path.Combine(extractionDirectory, EXTRACTION_SUB_FOLDER_NAME));
         var directoriesToDelete = new List<DirectoryInfo>();
         var filesToDelete = new List<FileInfo>();
 
@@ -160,11 +155,13 @@ public static void CleanupExtractionDirectory(object sender, string extractionDi
         }
     }
 
-    private static void AddDirectoryToCleanupList(DirectoryInfo toCleanup, bool isRoot, List<DirectoryInfo> directoriesToDelete, List<FileInfo> filesToDelete)
+    private static void AddDirectoryToCleanupList(DirectoryInfo toCleanup, bool isRoot,
+        List<DirectoryInfo> directoriesToDelete, List<FileInfo> filesToDelete)
     {
         //only add root folders to the delete queue
         if (isRoot)
-            if (!directoriesToDelete.Any(dir => dir.FullName.Equals(toCleanup.FullName))) //don't add the same folder twice
+            if (!directoriesToDelete.Any(dir =>
+                    dir.FullName.Equals(toCleanup.FullName))) //don't add the same folder twice
                 directoriesToDelete.Add(toCleanup);
 
         filesToDelete.AddRange(toCleanup.EnumerateFiles());
diff --git a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregator.cs b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregator.cs
index 2d7b0ebb38..b2547116d9 100644
--- a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregator.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregator.cs
@@ -29,10 +29,11 @@ public class ExtractionTimeTimeCoverageAggregator
     private string _expectedTimeFieldInOutputBuffer = null;
     private string _expectedExtractionIdentifierInOutputBuffer = null;
 
-    private bool haveCheckedTimeFieldExists=false;
+    private bool haveCheckedTimeFieldExists = false;
 
 
-    private const ExtractionTimeTimeCoverageAggregatorBucket.BucketSize BucketSize = ExtractionTimeTimeCoverageAggregatorBucket.BucketSize.Month;
+    private const ExtractionTimeTimeCoverageAggregatorBucket.BucketSize BucketSize =
+        ExtractionTimeTimeCoverageAggregatorBucket.BucketSize.Month;
 
     public ExtractionTimeTimeCoverageAggregator(ICatalogue catalogue, IExtractableCohort cohort)
     {
@@ -40,7 +41,7 @@ public ExtractionTimeTimeCoverageAggregator(ICatalogue catalogue, IExtractableCo
 
         Buckets = new Dictionary<DateTime, ExtractionTimeTimeCoverageAggregatorBucket>();
 
-        if(!catalogue.TimeCoverage_ExtractionInformation_ID.HasValue)
+        if (!catalogue.TimeCoverage_ExtractionInformation_ID.HasValue)
             return;
         try
         {
@@ -49,10 +50,12 @@ public ExtractionTimeTimeCoverageAggregator(ICatalogue catalogue, IExtractableCo
         catch (Exception e)
         {
             throw new Exception(
-                $"Could not resolve TimeCoverage_ExtractionInformation for Catalogue '{catalogue}',time coverage ExtractionInformationID was:{catalogue.TimeCoverage_ExtractionInformation_ID}",e);
+                $"Could not resolve TimeCoverage_ExtractionInformation for Catalogue '{catalogue}',time coverage ExtractionInformationID was:{catalogue.TimeCoverage_ExtractionInformation_ID}",
+                e);
         }
 
-        _expectedExtractionIdentifierInOutputBuffer = cohort.GetQuerySyntaxHelper().GetRuntimeName(cohort.GetReleaseIdentifier());
+        _expectedExtractionIdentifierInOutputBuffer =
+            cohort.GetQuerySyntaxHelper().GetRuntimeName(cohort.GetReleaseIdentifier());
     }
 
     private bool firstRow = true;
@@ -60,7 +63,7 @@ public ExtractionTimeTimeCoverageAggregator(ICatalogue catalogue, IExtractableCo
     public void ProcessRow(DataRow row)
     {
         //there is no configured time period field for the dataset, we have already thrown so just ignore calls
-        if(string.IsNullOrWhiteSpace(_expectedTimeFieldInOutputBuffer))
+        if (string.IsNullOrWhiteSpace(_expectedTimeFieldInOutputBuffer))
             return;
 
         //check that the listed extraction field that has timeliness information in it is actually included in the column collection
@@ -88,19 +91,15 @@ public void ProcessRow(DataRow row)
             if (_expectedExtractionIdentifierInOutputBuffer != null)
                 identifier = row[_expectedExtractionIdentifierInOutputBuffer];
         }
-        catch (Exception )
+        catch (Exception)
         {
             //could not find the identifier in the output buffer, could be that there are multiple CHI columns e.g. CHI_Baby1, CHI_Baby2 or something
             //only swallow this exception (and abandon counting of distinct release identifiers) if it is the first output row.
-            if(firstRow)
-            {
-                _expectedExtractionIdentifierInOutputBuffer = null;//give up trying to work out the extraction identifier
-            }
+            if (firstRow)
+                _expectedExtractionIdentifierInOutputBuffer =
+                    null; //give up trying to work out the extraction identifier
             else
-            {
                 throw;
-            }
-
         }
 
         firstRow = false;
@@ -109,7 +108,6 @@ public void ProcessRow(DataRow row)
         {
             if (value is string s)
             {
-
                 if (string.IsNullOrWhiteSpace(s))
                 {
                     countOfNullsSeen++;
@@ -119,29 +117,33 @@ public void ProcessRow(DataRow row)
                 var valueAsString = s;
 
                 //trim off times
-                if (Regex.IsMatch(valueAsString,"[0-2][0-9]:[0-5][0-9]:[0-5][0-9]"))
+                if (Regex.IsMatch(valueAsString, "[0-2][0-9]:[0-5][0-9]:[0-5][0-9]"))
                     valueAsString = valueAsString[..^"00:00:00".Length].Trim();
 
                 key = DateTime.ParseExact(valueAsString, "dd/MM/yyyy", null);
             }
             else if (value is DateTime time)
+            {
                 key = time;
+            }
             else
+            {
                 key = Convert.ToDateTime(value);
+            }
         }
-        catch (Exception )
+        catch (Exception)
         {
             countOfBrokenDates++;
             return;
         }
 
         //drop the time part
-        key = ExtractionTimeTimeCoverageAggregatorBucket.RoundDateTimeDownToNearestBucketFloor(key,BucketSize);
+        key = ExtractionTimeTimeCoverageAggregatorBucket.RoundDateTimeDownToNearestBucketFloor(key, BucketSize);
 
         if (!Buckets.Any())
         {
             //no buckets yet, create a bucket here
-            Buckets.Add(key,new ExtractionTimeTimeCoverageAggregatorBucket(key));
+            Buckets.Add(key, new ExtractionTimeTimeCoverageAggregatorBucket(key));
             Buckets[key].SawIdentifier(identifier);
         }
         else
@@ -161,11 +163,10 @@ public void ProcessRow(DataRow row)
     /// <param name="key"></param>
     private void ExtendBucketsToEncompas(DateTime key)
     {
-
         var addCount = 0;
         var somethingHasGoneWrongIfAddedThisManyBuckets = 100000;
 
-        if(Buckets.Keys.Max() < key)
+        if (Buckets.Keys.Max() < key)
         {
             //extend upwards
             var toAdd = Buckets.Keys.Max();
@@ -177,8 +178,7 @@ private void ExtendBucketsToEncompas(DateTime key)
                 addCount++;
             }
         }
-        else
-        if(Buckets.Keys.Min() >key)
+        else if (Buckets.Keys.Min() > key)
         {
             //extend downwards
             var toAdd = Buckets.Keys.Min();
@@ -186,7 +186,7 @@ private void ExtendBucketsToEncompas(DateTime key)
             while (toAdd != key && addCount < somethingHasGoneWrongIfAddedThisManyBuckets)
             {
                 toAdd = ExtractionTimeTimeCoverageAggregatorBucket.DecreaseDateTimeBy(toAdd, BucketSize);
-                Buckets.Add(toAdd,new ExtractionTimeTimeCoverageAggregatorBucket(toAdd));
+                Buckets.Add(toAdd, new ExtractionTimeTimeCoverageAggregatorBucket(toAdd));
                 addCount++;
             }
         }
@@ -196,17 +196,16 @@ private void ExtendBucketsToEncompas(DateTime key)
                 $"Could not work out how to extend agregation buckets where dictionary of datetimes had a max of {Buckets.Keys.Max()} and a min of{Buckets.Keys.Min()} which could not be extended in either direction to encompas{key}");
         }
 
-        if(addCount == somethingHasGoneWrongIfAddedThisManyBuckets)
-            throw new Exception($"Added {addCount} buckets without reaching the key... oops"); 
+        if (addCount == somethingHasGoneWrongIfAddedThisManyBuckets)
+            throw new Exception($"Added {addCount} buckets without reaching the key... oops");
     }
 
     public static bool HasColumn(DbDataReader Reader, string ColumnName)
     {
         foreach (DataRow row in Reader.GetSchemaTable().Rows)
-        {
             if (row["ColumnName"].ToString() == ColumnName)
-                return true;
-        } //Still here? Column not found.
+                return true; //Still here? Column not found.
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregatorBucket.cs b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregatorBucket.cs
index fd5e49426f..a302b174e1 100644
--- a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregatorBucket.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeTimeCoverageAggregatorBucket.cs
@@ -36,11 +36,9 @@ public bool IsTimeInBucket(DateTime toCheck, BucketSize bucketSize)
         var upperLimit = Time;
         if (bucketSize == BucketSize.Day)
             upperLimit = upperLimit.AddDays(1);
-        else
-        if (bucketSize == BucketSize.Month)
+        else if (bucketSize == BucketSize.Month)
             upperLimit = upperLimit.AddMonths(1);
-        else
-        if (bucketSize == BucketSize.Year)
+        else if (bucketSize == BucketSize.Year)
             upperLimit = upperLimit.AddYears(1);
 
         return toCheck >= Time && toCheck < upperLimit;
@@ -50,26 +48,26 @@ public void SawIdentifier(object identifier)
     {
         CountOfTimesSeen++;
 
-        if(identifier == DBNull.Value)
+        if (identifier == DBNull.Value)
             return;
 
-        if(identifier == null)
+        if (identifier == null)
             return;
-            
+
         if (!_identifiersSeen.Contains(identifier))
             _identifiersSeen.Add(identifier);
     }
 
     public static DateTime RoundDateTimeDownToNearestBucketFloor(DateTime toRound, BucketSize bucketSize)
     {
-        if(bucketSize == BucketSize.Day)
-            return new DateTime(toRound.Year,toRound.Month,toRound.Day);
-            
-        if(bucketSize == BucketSize.Month)
-            return new DateTime(toRound.Year,toRound.Month,1);
-
-        if(bucketSize == BucketSize.Year)
-            return new DateTime(toRound.Year,1,1);
+        if (bucketSize == BucketSize.Day)
+            return new DateTime(toRound.Year, toRound.Month, toRound.Day);
+
+        if (bucketSize == BucketSize.Month)
+            return new DateTime(toRound.Year, toRound.Month, 1);
+
+        if (bucketSize == BucketSize.Year)
+            return new DateTime(toRound.Year, 1, 1);
 
         throw new NotSupportedException($"Unknown bucket size {bucketSize}");
     }
diff --git a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeValidator.cs b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeValidator.cs
index 6b98a5e602..32c3c9a428 100644
--- a/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeValidator.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/ExtractionTimeValidator.cs
@@ -40,7 +40,7 @@ public ExtractionTimeValidator(ICatalogue catalogue, List<IColumn> columnsToExtr
     {
         _catalogue = catalogue;
         _columnsToExtract = columnsToExtract;
-            
+
         Validator = Validator.LoadFromXml(_catalogue.ValidatorXML);
 
         if (string.IsNullOrWhiteSpace(_catalogue.ValidatorXML))
@@ -49,7 +49,7 @@ public ExtractionTimeValidator(ICatalogue catalogue, List<IColumn> columnsToExtr
         IgnoredBecauseColumnHashed = new List<ItemValidator>();
     }
 
-    public void Validate(DataTable dt,string validationColumnToPopulateIfAny)
+    public void Validate(DataTable dt, string validationColumnToPopulateIfAny)
     {
         if (!_initialized)
             Initialize(dt);
@@ -58,13 +58,12 @@ public void Validate(DataTable dt,string validationColumnToPopulateIfAny)
         {
             //additive validation results, Results is a class that wraps DictionaryOfFailure which is an array of columns and each element is another array of consequences (with a row count for each consequence)
             //think of it like a 2D array with X columns and Y consquences and a number in each box which is how many values in that column failed validation with that consequence
-            Results = Validator.ValidateVerboseAdditive(r, Results, out Consequence? consequenceOnLastRowProcessed);
+            Results = Validator.ValidateVerboseAdditive(r, Results, out var consequenceOnLastRowProcessed);
 
 
             if (validationColumnToPopulateIfAny != null)
                 r[validationColumnToPopulateIfAny] = consequenceOnLastRowProcessed;
         }
-
     }
 
     private void Initialize(DataTable dt)
@@ -73,8 +72,10 @@ private void Initialize(DataTable dt)
 
         //discard any item validators that don't exist in our colmn collection (from schema) - These are likely just columns that are not used during validation
         foreach (var iv in Validator.ItemValidators)
-            if (!dt.Columns.Contains(iv.TargetProperty))  //if target property is not in the column collection
+            if (!dt.Columns.Contains(iv.TargetProperty)) //if target property is not in the column collection
+            {
                 toDiscard.Add(iv);
+            }
             else
             {
                 //also discard any that have an underlying column that is Hashed as they will not match validation constraints post hash (hashing is done in SQL so we will never see original value)
@@ -93,13 +94,11 @@ private void Initialize(DataTable dt)
                     IgnoredBecauseColumnHashed.Add(iv);
                     toDiscard.Add(iv);
                 }
-
             }
 
         foreach (var itemValidator in toDiscard)
             Validator.ItemValidators.Remove(itemValidator);
 
         _initialized = true;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/CSVOutputFormat.cs b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/CSVOutputFormat.cs
index a2369a5ca5..a7ef47ab31 100644
--- a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/CSVOutputFormat.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/CSVOutputFormat.cs
@@ -25,30 +25,28 @@ public class CSVOutputFormat : FileOutputFormat
     public string DateFormat { get; set; }
 
     public int SeparatorsStrippedOut { get; private set; }
-    private static readonly string[] ThingsToStripOut = { "\r", "\n", "\t","\""};
+    private static readonly string[] ThingsToStripOut = { "\r", "\n", "\t", "\"" };
     private StreamWriter _sw;
     private StringBuilder _sbWriteOutLinesBuffer;
     private const string _illegalCharactersReplacement = " ";
 
-    public CSVOutputFormat(string outputFilename,string separator, string dateFormat): base(outputFilename)
+    public CSVOutputFormat(string outputFilename, string separator, string dateFormat) : base(outputFilename)
     {
         Separator = separator;
         DateFormat = dateFormat;
     }
 
-    public override string GetFileExtension()
-    {
-        return ".csv";
-    }
+    public override string GetFileExtension() => ".csv";
 
     public override void Open()
     {
         _sw = new StreamWriter(OutputFilename);
         _sbWriteOutLinesBuffer = new StringBuilder();
     }
+
     public override void Open(bool append)
     {
-        _sw = new StreamWriter(OutputFilename,append);
+        _sw = new StreamWriter(OutputFilename, append);
         _sbWriteOutLinesBuffer = new StringBuilder();
     }
 
@@ -56,9 +54,8 @@ public override void WriteHeaders(DataTable t)
     {
         //write headers separated by separator
         _sw.Write(string.Join(Separator, t.Columns.Cast<DataColumn>().Select(c => c.ColumnName).ToArray()));
-            
-        _sw.WriteLine();
 
+        _sw.WriteLine();
     }
 
     public override void Append(DataRow r)
@@ -86,7 +83,8 @@ public override void Close()
 
     public string CleanString(object o)
     {
-        var toReturn = CleanString(o, Separator, out var numberOfSeparatorsStrippedOutThisPass, DateFormat,RoundFloatsTo);
+        var toReturn = CleanString(o, Separator, out var numberOfSeparatorsStrippedOutThisPass, DateFormat,
+            RoundFloatsTo);
 
         SeparatorsStrippedOut += numberOfSeparatorsStrippedOutThisPass;
 
@@ -94,7 +92,8 @@ public string CleanString(object o)
     }
 
 
-    public static string CleanString(object o, string separator, out int separatorsStrippedOut, string dateFormat, int? roundFloatsTo)
+    public static string CleanString(object o, string separator, out int separatorsStrippedOut, string dateFormat,
+        int? roundFloatsTo)
     {
         if (o is DateTime dt)
         {
@@ -105,10 +104,10 @@ public static string CleanString(object o, string separator, out int separatorsS
         if (roundFloatsTo.HasValue)
         {
             separatorsStrippedOut = 0;
-            switch(o)
+            switch (o)
             {
-                case float f : return f.ToString($"N{roundFloatsTo.Value}");
-                case decimal dec : return dec.ToString($"N{roundFloatsTo.Value}");
+                case float f: return f.ToString($"N{roundFloatsTo.Value}");
+                case decimal dec: return dec.ToString($"N{roundFloatsTo.Value}");
                 case double d: return d.ToString($"N{roundFloatsTo.Value}");
             }
         }
@@ -130,5 +129,4 @@ public static string CleanString(object o, string separator, out int separatorsS
 
         return o.ToString().Trim();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/FileOutputFormat.cs b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/FileOutputFormat.cs
index 3621022d16..7d57a37213 100644
--- a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/FileOutputFormat.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/FileOutputFormat.cs
@@ -8,7 +8,7 @@
 
 namespace Rdmp.Core.DataExport.DataExtraction.FileOutputFormats;
 
-public abstract class FileOutputFormat:IFileOutputFormat
+public abstract class FileOutputFormat : IFileOutputFormat
 {
     public abstract string GetFileExtension();
 
diff --git a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/IFileOutputFormat.cs b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/IFileOutputFormat.cs
index 9cdc2ddb3c..5fe85b35a4 100644
--- a/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/IFileOutputFormat.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/FileOutputFormats/IFileOutputFormat.cs
@@ -10,7 +10,6 @@ namespace Rdmp.Core.DataExport.DataExtraction.FileOutputFormats;
 
 internal interface IFileOutputFormat
 {
-
     string GetFileExtension();
     string OutputFilename { get; }
     void Open();
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteDatasetExtractionFlatFileDestination.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteDatasetExtractionFlatFileDestination.cs
index 711450930f..3ff382a76a 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteDatasetExtractionFlatFileDestination.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteDatasetExtractionFlatFileDestination.cs
@@ -36,22 +36,25 @@ public class ExecuteDatasetExtractionFlatFileDestination : ExtractionDestination
 {
     private FileOutputFormat _output;
 
-    [DemandsInitialization("The kind of flat file to generate for the extraction", DemandType.Unspecified, ExecuteExtractionToFlatFileType.CSV)]
+    [DemandsInitialization("The kind of flat file to generate for the extraction", DemandType.Unspecified,
+        ExecuteExtractionToFlatFileType.CSV)]
     public ExecuteExtractionToFlatFileType FlatFileType { get; set; }
 
-    [DemandsInitialization("The number of decimal places to round floating point numbers to.  This only applies to data in the pipeline which is hard typed Float and not to string values", DemandType.Unspecified)]
+    [DemandsInitialization(
+        "The number of decimal places to round floating point numbers to.  This only applies to data in the pipeline which is hard typed Float and not to string values",
+        DemandType.Unspecified)]
     public int? RoundFloatsTo { get; internal set; }
 
-    public ExecuteDatasetExtractionFlatFileDestination():base(true)
+    public ExecuteDatasetExtractionFlatFileDestination() : base(true)
     {
-
     }
 
     protected override void PreInitializeImpl(IExtractCommand request, IDataLoadEventListener listener)
     {
         if (_request is ExtractGlobalsCommand)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Request is for the extraction of Globals."));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, "Request is for the extraction of Globals."));
             OutputFile = _request.GetExtractionDirectory().FullName;
             return;
         }
@@ -74,9 +77,10 @@ protected override void PreInitializeImpl(IExtractCommand request, IDataLoadEven
             $"Setup data extraction destination as {OutputFile} (will not exist yet)"));
     }
 
-    protected override void Open(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken)
+    protected override void Open(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken)
     {
-        if(_request.IsBatchResume)
+        if (_request.IsBatchResume)
         {
             if (File.Exists(_output.OutputFilename))
             {
@@ -87,20 +91,19 @@ protected override void Open(DataTable toProcess, IDataLoadEventListener job, Gr
             }
             else
             {
-                throw new Exception($"Batch resume is true but there was no file to append to (expected a file to exist at '{_output.OutputFilename}')");
+                throw new Exception(
+                    $"Batch resume is true but there was no file to append to (expected a file to exist at '{_output.OutputFilename}')");
             }
         }
 
         _output.Open(_request.IsBatchResume);
 
         // write the headers for the file unless we are resuming
-        if(!_request.IsBatchResume)
-        {
-            _output.WriteHeaders(toProcess);
-        }
+        if (!_request.IsBatchResume) _output.WriteHeaders(toProcess);
     }
 
-    protected override void WriteRows(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken, Stopwatch stopwatch)
+    protected override void WriteRows(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken, Stopwatch stopwatch)
     {
         foreach (DataRow row in toProcess.Rows)
         {
@@ -109,12 +112,18 @@ protected override void WriteRows(DataTable toProcess, IDataLoadEventListener jo
             LinesWritten++;
 
             if (LinesWritten % 1000 == 0)
-                job.OnProgress(this, new ProgressEventArgs($"Write to file {OutputFile}", new ProgressMeasurement(LinesWritten, ProgressType.Records), stopwatch.Elapsed));
+                job.OnProgress(this,
+                    new ProgressEventArgs($"Write to file {OutputFile}",
+                        new ProgressMeasurement(LinesWritten, ProgressType.Records), stopwatch.Elapsed));
         }
-        job.OnProgress(this, new ProgressEventArgs($"Write to file {OutputFile}", new ProgressMeasurement(LinesWritten, ProgressType.Records), stopwatch.Elapsed));
 
+        job.OnProgress(this,
+            new ProgressEventArgs($"Write to file {OutputFile}",
+                new ProgressMeasurement(LinesWritten, ProgressType.Records), stopwatch.Elapsed));
     }
-    protected override void Flush(IDataLoadEventListener job, GracefulCancellationToken cancellationToken, Stopwatch stopwatch)
+
+    protected override void Flush(IDataLoadEventListener job, GracefulCancellationToken cancellationToken,
+        Stopwatch stopwatch)
     {
         _output.Flush();
     }
@@ -124,17 +133,17 @@ public override void Dispose(IDataLoadEventListener listener, Exception pipeline
         CloseFile(listener, pipelineFailureExceptionIfAny != null);
 
         // if pipeline execution failed and we are doing a batch resume
-        if(pipelineFailureExceptionIfAny != null &&
-           (_request?.IsBatchResume ?? false) && _backupFile != null && _output?.OutputFilename != null)
-        {
-            if(File.Exists(_backupFile))
+        if (pipelineFailureExceptionIfAny != null &&
+            (_request?.IsBatchResume ?? false) && _backupFile != null && _output?.OutputFilename != null)
+            if (File.Exists(_backupFile))
             {
-                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Pipeline crashed so restoring backup file {_backupFile}"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"Pipeline crashed so restoring backup file {_backupFile}"));
                 File.Copy(_backupFile, _output.OutputFilename, true);
             }
-        }
 
-        if(_backupFile != null && File.Exists(_backupFile))
+        if (_backupFile != null && File.Exists(_backupFile))
         {
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Deleting {_backupFile}"));
             File.Delete(_backupFile);
@@ -143,7 +152,7 @@ public override void Dispose(IDataLoadEventListener listener, Exception pipeline
 
     public override void Abort(IDataLoadEventListener listener)
     {
-        CloseFile(listener,true);
+        CloseFile(listener, true);
     }
 
     private bool _fileAlreadyClosed = false;
@@ -158,7 +167,7 @@ public override void Abort(IDataLoadEventListener listener)
     private void CloseFile(IDataLoadEventListener listener, bool failed)
     {
         //we never even started or have already closed
-        if (!haveOpened || _fileAlreadyClosed )
+        if (!haveOpened || _fileAlreadyClosed)
             return;
 
         _fileAlreadyClosed = true;
@@ -169,10 +178,7 @@ private void CloseFile(IDataLoadEventListener listener, bool failed)
             _output.Close();
             GC.Collect(); //prevents file locks from sticking around
 
-            if(TableLoadInfo == null)
-            {
-                return;
-            }
+            if (TableLoadInfo == null) return;
 
             //close audit object - unless it was prematurely closed e.g. by a failure somewhere
             if (!TableLoadInfo.IsClosed)
@@ -182,42 +188,39 @@ private void CloseFile(IDataLoadEventListener listener, bool failed)
 
             // also close off the cumulative extraction result
             var result = ((IExtractDatasetCommand)_request).CumulativeExtractionResults;
-            result?.CompleteAudit(GetType(), GetDestinationDescription(), LinesWritten,_request.IsBatchResume, failed);
+            result?.CompleteAudit(GetType(), GetDestinationDescription(), LinesWritten, _request.IsBatchResume, failed);
         }
         catch (Exception e)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Error when trying to close csv file", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Error when trying to close csv file", e));
         }
     }
 
 
-    public override string GetDestinationDescription()
-    {
-        return OutputFile;
-    }
+    public override string GetDestinationDescription() => OutputFile;
 
-    public override ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet)
-    {
-        return new FlatFileReleasePotential(repositoryLocator, selectedDataSet);
-    }
+    public override ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet) => new FlatFileReleasePotential(repositoryLocator, selectedDataSet);
 
-    public override FixedReleaseSource<ReleaseAudit> GetReleaseSource(ICatalogueRepository catalogueRepository)
-    {
-        return new FlatFileReleaseSource<ReleaseAudit>();
-    }
+    public override FixedReleaseSource<ReleaseAudit> GetReleaseSource(ICatalogueRepository catalogueRepository) =>
+        new FlatFileReleaseSource<ReleaseAudit>();
 
-    public override GlobalReleasePotential GetGlobalReleasabilityEvaluator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
-    {
-        return new FlatFileGlobalsReleasePotential(repositoryLocator, globalResult, globalToCheck);
-    }
+    public override GlobalReleasePotential GetGlobalReleasabilityEvaluator(
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult,
+        IMapsDirectlyToDatabaseTable globalToCheck) =>
+        new FlatFileGlobalsReleasePotential(repositoryLocator, globalResult, globalToCheck);
 
     public override void Check(ICheckNotifier notifier)
     {
         if (_request == ExtractDatasetCommand.EmptyCommand)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out",CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out",
+                CheckResult.Warning));
             return;
         }
+
         try
         {
             var result = DateTime.Now.ToString(DateFormat);
@@ -226,15 +229,15 @@ public override void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"DateFormat '{DateFormat}' was invalid",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"DateFormat '{DateFormat}' was invalid", CheckResult.Fail,
+                e));
         }
 
         if (UseAcronymForFileNaming && _request is ExtractDatasetCommand dsRequest)
-        {
-            if(string.IsNullOrWhiteSpace(dsRequest.Catalogue.Acronym))
+            if (string.IsNullOrWhiteSpace(dsRequest.Catalogue.Acronym))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but UseAcronymForFileNaming is true",CheckResult.Fail));
-        }
+                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but UseAcronymForFileNaming is true",
+                    CheckResult.Fail));
 
         if (CleanExtractionFolderBeforeExtraction)
         {
@@ -244,7 +247,8 @@ public override void Check(ICheckNotifier notifier)
             if (contents.Length > 0
                 &&
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Extraction directory '{rootDir.FullName}' contained {contents.Length} files/folders:\r\n {string.Join(Environment.NewLine, contents.Take(100).Select(e => e.Name))}", CheckResult.Warning,null,"Delete Files"))
+                    $"Extraction directory '{rootDir.FullName}' contained {contents.Length} files/folders:\r\n {string.Join(Environment.NewLine, contents.Take(100).Select(e => e.Name))}",
+                    CheckResult.Warning, null, "Delete Files"))
                )
             {
                 rootDir.Delete(true);
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteFullExtractionToDatabaseMSSql.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteFullExtractionToDatabaseMSSql.cs
index 6df28b5818..a05b19feaf 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteFullExtractionToDatabaseMSSql.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExecuteFullExtractionToDatabaseMSSql.cs
@@ -35,7 +35,9 @@ namespace Rdmp.Core.DataExport.DataExtraction.Pipeline.Destinations;
 /// </summary>
 public class ExecuteFullExtractionToDatabaseMSSql : ExtractionDestination
 {
-    [DemandsInitialization("External server to create the extraction into, a new database will be created for the project based on the naming pattern provided",Mandatory = true)]
+    [DemandsInitialization(
+        "External server to create the extraction into, a new database will be created for the project based on the naming pattern provided",
+        Mandatory = true)]
     public IExternalDatabaseServer TargetDatabaseServer { get; set; }
 
     [DemandsInitialization(@"How do you want to name datasets, use the following tokens if you need them:   
@@ -55,22 +57,30 @@ public class ExecuteFullExtractionToDatabaseMSSql : ExtractionDestination
          $a - Dataset acronym (e.g. 'Presc') 
 
          You must have either $a or $d
-         ",Mandatory=true,DefaultValue="$c_$d")]
+         ", Mandatory = true, DefaultValue = "$c_$d")]
     public string TableNamingPattern { get; set; }
 
-    [DemandsInitialization(@"If the extraction fails half way through AND the destination table was created during the extraction then the table will be dropped from the destination rather than being left in a half loaded state ",defaultValue:true)]
+    [DemandsInitialization(
+        @"If the extraction fails half way through AND the destination table was created during the extraction then the table will be dropped from the destination rather than being left in a half loaded state ",
+        defaultValue: true)]
     public bool DropTableIfLoadFails { get; set; }
 
     [DemandsInitialization(DataTableUploadDestination.AlterTimeout_Description, DefaultValue = 300)]
     public int AlterTimeout { get; set; }
 
-    [DemandsInitialization("True to copy the column collations from the source database when creating the destination database.  Only works if both the source and destination have the same DatabaseType.  Excludes columns which feature a transform as part of extraction.",DefaultValue=false)]
+    [DemandsInitialization(
+        "True to copy the column collations from the source database when creating the destination database.  Only works if both the source and destination have the same DatabaseType.  Excludes columns which feature a transform as part of extraction.",
+        DefaultValue = false)]
     public bool CopyCollations { get; set; }
 
-    [DemandsInitialization("True to always drop the destination database table(s) from the destination if they already existed", DefaultValue = false)]
+    [DemandsInitialization(
+        "True to always drop the destination database table(s) from the destination if they already existed",
+        DefaultValue = false)]
     public bool AlwaysDropExtractionTables { get; set; }
 
-    [DemandsInitialization("True to apply a distincting operation to the final table when using an ExtractionProgress.  This prevents data duplication from failed batch resumes.", DefaultValue = true)]
+    [DemandsInitialization(
+        "True to apply a distincting operation to the final table when using an ExtractionProgress.  This prevents data duplication from failed batch resumes.",
+        DefaultValue = true)]
     public bool MakeFinalTableDistinctWhenBatchResuming { get; set; } = true;
 
     private DiscoveredDatabase _destinationDatabase;
@@ -80,9 +90,8 @@ You must have either $a or $d
     private bool _isTableAlreadyNamed;
     private DataTable _toProcess;
 
-    public ExecuteFullExtractionToDatabaseMSSql():base(false)
+    public ExecuteFullExtractionToDatabaseMSSql() : base(false)
     {
-
     }
 
     public override DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener job,
@@ -92,12 +101,14 @@ public override DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEven
         return base.ProcessPipelineData(toProcess, job, cancellationToken);
     }
 
-    protected override void Open(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken)
+    protected override void Open(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken)
     {
         _toProcess = toProcess;
 
         //give the data table the correct name
-        if (_toProcess.ExtendedProperties.ContainsKey("ProperlyNamed") && _toProcess.ExtendedProperties["ProperlyNamed"].Equals(true))
+        if (_toProcess.ExtendedProperties.ContainsKey("ProperlyNamed") &&
+            _toProcess.ExtendedProperties["ProperlyNamed"].Equals(true))
             _isTableAlreadyNamed = true;
 
         _toProcess.TableName = GetTableName();
@@ -106,18 +117,13 @@ protected override void Open(DataTable toProcess, IDataLoadEventListener job, Gr
         OutputFile = _toProcess.TableName;
     }
 
-    protected override void WriteRows(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken, Stopwatch stopwatch)
+    protected override void WriteRows(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken, Stopwatch stopwatch)
     {
         // empty batches are allowed when using batch/resume
-        if(toProcess.Rows.Count == 0 && _request.IsBatchResume)
-        {
-            return;
-        }
-            
-        if(_request.IsBatchResume)
-        {
-            _destination.AllowLoadingPopulatedTables = true;
-        }
+        if (toProcess.Rows.Count == 0 && _request.IsBatchResume) return;
+
+        if (_request.IsBatchResume) _destination.AllowLoadingPopulatedTables = true;
 
         _destination.ProcessPipelineData(toProcess, job, cancellationToken);
 
@@ -128,7 +134,8 @@ private DataTableUploadDestination PrepareDestination(IDataLoadEventListener lis
     {
         //see if the user has entered an extraction server/database
         if (TargetDatabaseServer == null)
-            throw new Exception("TargetDatabaseServer (the place you want to extract the project data to) property has not been set!");
+            throw new Exception(
+                "TargetDatabaseServer (the place you want to extract the project data to) property has not been set!");
 
         try
         {
@@ -144,14 +151,12 @@ private DataTableUploadDestination PrepareDestination(IDataLoadEventListener lis
             var existing = _destinationDatabase.ExpectTable(tblName);
             if (existing.Exists())
             {
-                if(_request.IsBatchResume)
+                if (_request.IsBatchResume)
                 {
                     listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                         $"Table {existing.GetFullyQualifiedName()} already exists but it IsBatchResume so no problem."));
-
                 }
-                else
-                if (AlwaysDropExtractionTables)
+                else if (AlwaysDropExtractionTables)
                 {
                     listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"Table {existing.GetFullyQualifiedName()} already exists, dropping because setting {nameof(AlwaysDropExtractionTables)} is on"));
@@ -177,12 +182,14 @@ private DataTableUploadDestination PrepareDestination(IDataLoadEventListener lis
         catch (Exception e)
         {
             //Probably the database didn't exist or the credentials were wrong or something
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Failed to inspect destination for already existing datatables", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error,
+                    "Failed to inspect destination for already existing datatables", e));
         }
 
         _destination = new DataTableUploadDestination();
 
-        PrimeDestinationTypesBasedOnCatalogueTypes(listener,toProcess);
+        PrimeDestinationTypesBasedOnCatalogueTypes(listener, toProcess);
 
         _destination.AllowResizingColumnsAtUploadTime = true;
         _destination.AlterTimeout = AlterTimeout;
@@ -193,16 +200,18 @@ private DataTableUploadDestination PrepareDestination(IDataLoadEventListener lis
     }
 
     private void PrimeDestinationTypesBasedOnCatalogueTypes(IDataLoadEventListener listener, DataTable toProcess)
-    { 
+    {
         //if the extraction is of a Catalogue
 
-        if(_request is not IExtractDatasetCommand datasetCommand)
+        if (_request is not IExtractDatasetCommand datasetCommand)
             return;
 
         //for every extractable column in the Catalogue
-        foreach (var extractionInformation in datasetCommand.ColumnsToExtract.OfType<ExtractableColumn>().Select(ec=>ec.CatalogueExtractionInformation))//.GetAllExtractionInformation(ExtractionCategory.Any))
+        foreach (var extractionInformation in datasetCommand.ColumnsToExtract.OfType<ExtractableColumn>()
+                     .Select(ec =>
+                         ec.CatalogueExtractionInformation)) //.GetAllExtractionInformation(ExtractionCategory.Any))
         {
-            if(extractionInformation == null)
+            if (extractionInformation == null)
                 continue;
 
             var catItem = extractionInformation.CatalogueItem;
@@ -210,18 +219,25 @@ private void PrimeDestinationTypesBasedOnCatalogueTypes(IDataLoadEventListener l
             //if we do not know the data type or the ei is a transform
             if (catItem == null)
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it had no associated CatalogueItem"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning,
+                        $"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it had no associated CatalogueItem"));
                 continue;
             }
-            if(catItem.ColumnInfo == null)
+
+            if (catItem.ColumnInfo == null)
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it had no associated ColumnInfo"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning,
+                        $"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it had no associated ColumnInfo"));
                 continue;
             }
 
-            if(extractionInformation.IsProperTransform())
+            if (extractionInformation.IsProperTransform())
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it is a Transform"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning,
+                        $"Did not copy Types for ExtractionInformation {extractionInformation} (ID={extractionInformation.ID}) because it is a Transform"));
                 continue;
             }
 
@@ -238,15 +254,19 @@ private void PrimeDestinationTypesBasedOnCatalogueTypes(IDataLoadEventListener l
             if (CopyCollations && _destinationDatabase.Server.DatabaseType == catItem.ColumnInfo.TableInfo.DatabaseType)
                 addedType.Collation = catItem.ColumnInfo.Collation;
 
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Set Type for {columnName} to {destinationType} (IsPrimaryKey={(addedType.IsPrimaryKey ? "true":"false")}) to match the source table"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    $"Set Type for {columnName} to {destinationType} (IsPrimaryKey={(addedType.IsPrimaryKey ? "true" : "false")}) to match the source table"));
         }
 
-        foreach (ReleaseIdentifierSubstitution sub in datasetCommand.QueryBuilder.SelectColumns.Where(sc => sc.IColumn is ReleaseIdentifierSubstitution).Select(sc => sc.IColumn))
+        foreach (ReleaseIdentifierSubstitution sub in datasetCommand.QueryBuilder.SelectColumns
+                     .Where(sc => sc.IColumn is ReleaseIdentifierSubstitution).Select(sc => sc.IColumn))
         {
             var columnName = sub.GetRuntimeName();
             var isPk = toProcess.PrimaryKey.Any(dc => dc.ColumnName == columnName);
 
-            var addedType = _destination.AddExplicitWriteType(columnName, datasetCommand.ExtractableCohort.GetReleaseIdentifierDataType());
+            var addedType = _destination.AddExplicitWriteType(columnName,
+                datasetCommand.ExtractableCohort.GetReleaseIdentifierDataType());
             addedType.IsPrimaryKey = isPk;
             addedType.AllowNulls = !isPk;
         }
@@ -265,7 +285,7 @@ private string GetDestinationDatabaseType(ConcreteColumn col)
             var intermediate = fromSyntax.TypeTranslater.GetDataTypeRequestForSQLDBType(col.ColumnInfo.Data_type);
             return toSyntax.TypeTranslater.GetSQLDBTypeForCSharpType(intermediate);
         }
-            
+
         return col.ColumnInfo.Data_type;
     }
 
@@ -284,7 +304,7 @@ private string GetTableName(string suffix = null)
 
         tblName = TableNamingPattern;
         var project = _request.Configuration.Project;
-            
+
         tblName = tblName.Replace("$p", project.Name);
         tblName = tblName.Replace("$n", project.ProjectNumber.ToString());
         tblName = tblName.Replace("$c", _request.Configuration.Name);
@@ -311,10 +331,11 @@ private string GetTableName(string suffix = null)
     private string SanitizeNameForDatabase(string tblName)
     {
         if (_destinationDatabase == null)
-            throw new Exception("Cannot pick a TableName until we know what type of server it is going to, _server is null");
+            throw new Exception(
+                "Cannot pick a TableName until we know what type of server it is going to, _server is null");
 
         //get rid of brackets and dots
-        tblName = Regex.Replace(tblName,"[.()]", "_");
+        tblName = Regex.Replace(tblName, "[.()]", "_");
 
         var syntax = _destinationDatabase.Server.GetQuerySyntaxHelper();
         syntax.ValidateTableName(tblName);
@@ -331,18 +352,17 @@ private string SanitizeNameForDatabase(string tblName)
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-        if(_destination != null)
+        if (_destination != null)
         {
             _destination.Dispose(listener, pipelineFailureExceptionIfAny);
 
             //if the extraction failed, the table didn't exist in the destination (i.e. the table was created during the extraction) and we are to DropTableIfLoadFails
             if (pipelineFailureExceptionIfAny != null && _tableDidNotExistAtStartOfLoad && DropTableIfLoadFails)
-            {
-                if(_destinationDatabase != null)
+                if (_destinationDatabase != null)
                 {
                     var tbl = _destinationDatabase.ExpectTable(_toProcess.TableName);
 
-                    if(tbl.Exists())
+                    if (tbl.Exists())
                     {
                         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                             $"DropTableIfLoadFails is true so about to drop table {tbl}"));
@@ -350,25 +370,25 @@ public override void Dispose(IDataLoadEventListener listener, Exception pipeline
                         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, $"Dropped table {tbl}"));
                     }
                 }
-            }
 
-            if(pipelineFailureExceptionIfAny == null
-               && _request.IsBatchResume
-               && MakeFinalTableDistinctWhenBatchResuming
-               && _destinationDatabase != null
-               && _toProcess != null)
+            if (pipelineFailureExceptionIfAny == null
+                && _request.IsBatchResume
+                && MakeFinalTableDistinctWhenBatchResuming
+                && _destinationDatabase != null
+                && _toProcess != null)
             {
                 var tbl = _destinationDatabase.ExpectTable(_toProcess.TableName);
                 if (tbl.Exists())
-                {
                     // if there is no primary key then failed batches may have introduced duplication
-                    if(!tbl.DiscoverColumns().Any(p=>p.IsPrimaryKey))
+                    if (!tbl.DiscoverColumns().Any(p => p.IsPrimaryKey))
                     {
-                        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Making {tbl} distinct incase there are duplicate rows from bad batch resumes"));
+                        listener.OnNotify(this,
+                            new NotifyEventArgs(ProgressEventType.Information,
+                                $"Making {tbl} distinct incase there are duplicate rows from bad batch resumes"));
                         tbl.MakeDistinct(50000000);
-                        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Finished distincting {tbl}"));
+                        listener.OnNotify(this,
+                            new NotifyEventArgs(ProgressEventType.Information, $"Finished distincting {tbl}"));
                     }
-                }
             }
         }
 
@@ -379,7 +399,8 @@ public override void Dispose(IDataLoadEventListener listener, Exception pipeline
         {
             var result = ((IExtractDatasetCommand)_request).CumulativeExtractionResults;
             if (result != null && _toProcess != null)
-                result.CompleteAudit(GetType(), GetDestinationDescription(), TableLoadInfo.Inserts, _request.IsBatchResume, pipelineFailureExceptionIfAny != null);
+                result.CompleteAudit(GetType(), GetDestinationDescription(), TableLoadInfo.Inserts,
+                    _request.IsBatchResume, pipelineFailureExceptionIfAny != null);
         }
     }
 
@@ -387,16 +408,13 @@ public override void Abort(IDataLoadEventListener listener)
     {
         _destination?.Abort(listener);
     }
+
     protected override void PreInitializeImpl(IExtractCommand value, IDataLoadEventListener listener)
     {
-            
     }
 
 
-    public override string GetDestinationDescription()
-    {
-        return GetDestinationDescription(suffix: "");
-    }
+    public override string GetDestinationDescription() => GetDestinationDescription("");
 
     private string GetDestinationDescription(string suffix = "")
     {
@@ -411,25 +429,21 @@ private string GetDestinationDescription(string suffix = "")
         return $"{TargetDatabaseServer.ID}|{dbName}|{tblName}";
     }
 
-    public static DestinationType GetDestinationType()
-    {
-        return DestinationType.Database;
-    }
+    public static DestinationType GetDestinationType() => DestinationType.Database;
 
-    public override ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet)
-    {
-        return new MsSqlExtractionReleasePotential(repositoryLocator, selectedDataSet);
-    }
-    public override FixedReleaseSource<ReleaseAudit> GetReleaseSource(ICatalogueRepository catalogueRepository)
-    {
-        return new MsSqlReleaseSource<ReleaseAudit>(catalogueRepository);
-    }
-    public override GlobalReleasePotential GetGlobalReleasabilityEvaluator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
-    {
-        return new MsSqlGlobalsReleasePotential(repositoryLocator, globalResult, globalToCheck);
-    }
+    public override ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet) => new MsSqlExtractionReleasePotential(repositoryLocator, selectedDataSet);
+
+    public override FixedReleaseSource<ReleaseAudit> GetReleaseSource(ICatalogueRepository catalogueRepository) =>
+        new MsSqlReleaseSource<ReleaseAudit>(catalogueRepository);
 
-    protected override void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlTable, DirectoryInfo directory, IExtractionConfiguration configuration,IDataLoadEventListener listener, out int linesWritten,
+    public override GlobalReleasePotential GetGlobalReleasabilityEvaluator(
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult,
+        IMapsDirectlyToDatabaseTable globalToCheck) =>
+        new MsSqlGlobalsReleasePotential(repositoryLocator, globalResult, globalToCheck);
+
+    protected override void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlTable, DirectoryInfo directory,
+        IExtractionConfiguration configuration, IDataLoadEventListener listener, out int linesWritten,
         out string destinationDescription)
     {
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
@@ -443,7 +457,7 @@ protected override void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlT
 
             using (var dt = new DataTable())
             {
-                using(var cmd = DatabaseCommandHelper.GetCommand(sqlTable.SQL, con))
+                using (var cmd = DatabaseCommandHelper.GetCommand(sqlTable.SQL, con))
                 using (var da = DatabaseCommandHelper.GetDataAdapter(cmd))
                 {
                     var sw = new Stopwatch();
@@ -452,16 +466,17 @@ protected override void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlT
                     da.Fill(dt);
                 }
 
-                dt.TableName = GetTableName(_destinationDatabase.Server.GetQuerySyntaxHelper().GetSensibleEntityNameFromString(sqlTable.Name));
+                dt.TableName = GetTableName(_destinationDatabase.Server.GetQuerySyntaxHelper()
+                    .GetSensibleEntityNameFromString(sqlTable.Name));
                 linesWritten = dt.Rows.Count;
 
                 var destinationDb = GetDestinationDatabase(listener);
                 var tbl = destinationDb.ExpectTable(dt.TableName);
 
-                if(tbl.Exists())
+                if (tbl.Exists())
                     tbl.Drop();
 
-                destinationDb.CreateTable(dt.TableName,dt);
+                destinationDb.CreateTable(dt.TableName, dt);
                 destinationDescription = $"{TargetDatabaseServer.ID}|{GetDatabaseName()}|{dt.TableName}";
             }
         }
@@ -469,11 +484,13 @@ protected override void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlT
 
 
     protected override void TryExtractLookupTableImpl(BundledLookupTable lookup, DirectoryInfo lookupDir,
-        IExtractionConfiguration requestConfiguration,IDataLoadEventListener listener, out int linesWritten, out string destinationDescription)
+        IExtractionConfiguration requestConfiguration, IDataLoadEventListener listener, out int linesWritten,
+        out string destinationDescription)
     {
         using var dt = lookup.GetDataTable();
-                
-        dt.TableName = GetTableName(_destinationDatabase.Server.GetQuerySyntaxHelper().GetSensibleEntityNameFromString(lookup.TableInfo.Name));
+
+        dt.TableName = GetTableName(_destinationDatabase.Server.GetQuerySyntaxHelper()
+            .GetSensibleEntityNameFromString(lookup.TableInfo.Name));
 
         //describe the destination for the abstract base
         destinationDescription = $"{TargetDatabaseServer.ID}|{GetDatabaseName()}|{dt.TableName}";
@@ -481,10 +498,10 @@ protected override void TryExtractLookupTableImpl(BundledLookupTable lookup, Dir
 
         var destinationDb = GetDestinationDatabase(listener);
         var existing = destinationDb.ExpectTable(dt.TableName);
-                
-        if(existing.Exists())
+
+        if (existing.Exists())
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Dropping existing Lookup table '{existing.GetFullyQualifiedName()}'"));
             existing.Drop();
         }
@@ -500,10 +517,10 @@ private DiscoveredDatabase GetDestinationDatabase(IDataLoadEventListener listene
 
         var databaseName = GetDatabaseName();
 
-        var discoveredServer = DataAccessPortal.ExpectServer(TargetDatabaseServer, DataAccessContext.DataExport, setInitialDatabase: false);
+        var discoveredServer = DataAccessPortal.ExpectServer(TargetDatabaseServer, DataAccessContext.DataExport, false);
 
         var db = discoveredServer.ExpectDatabase(databaseName);
-        if(!db.Exists())
+        if (!db.Exists())
             db.Create();
 
         return db;
@@ -513,7 +530,7 @@ private string GetDatabaseName()
     {
         var dbName = DatabaseNamingPattern;
 
-        if(_project.ProjectNumber == null)
+        if (_project.ProjectNumber == null)
             throw new ProjectNumberException($"Project '{_project}' must have a ProjectNumber");
 
         if (_request == null)
@@ -535,65 +552,80 @@ public override void Check(ICheckNotifier notifier)
     {
         if (TargetDatabaseServer == null)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Target database server property has not been set (This component does not know where to extract data to!), " +
-                                                         "to fix this you must edit the pipeline and choose an ExternalDatabaseServer to extract to)",
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Target database server property has not been set (This component does not know where to extract data to!), " +
+                "to fix this you must edit the pipeline and choose an ExternalDatabaseServer to extract to)",
                 CheckResult.Fail));
             return;
         }
 
         if (string.IsNullOrWhiteSpace(TargetDatabaseServer.Server))
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("TargetDatabaseServer does not have a .Server specified", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("TargetDatabaseServer does not have a .Server specified",
+                CheckResult.Fail));
             return;
         }
 
-        if(!string.IsNullOrWhiteSpace(TargetDatabaseServer.Database))
-        {
-            notifier.OnCheckPerformed(new CheckEventArgs("TargetDatabaseServer has .Database specified but this will be ignored!", CheckResult.Warning));
-        }
+        if (!string.IsNullOrWhiteSpace(TargetDatabaseServer.Database))
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "TargetDatabaseServer has .Database specified but this will be ignored!", CheckResult.Warning));
 
-        if(string.IsNullOrWhiteSpace(TableNamingPattern))
+        if (string.IsNullOrWhiteSpace(TableNamingPattern))
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("You must specify TableNamingPattern, this will tell the component how to name tables it generates in the remote destination",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "You must specify TableNamingPattern, this will tell the component how to name tables it generates in the remote destination",
+                CheckResult.Fail));
             return;
         }
 
         if (string.IsNullOrWhiteSpace(DatabaseNamingPattern))
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("You must specify DatabaseNamingPattern, this will tell the component what database to create or use in the remote destination", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "You must specify DatabaseNamingPattern, this will tell the component what database to create or use in the remote destination",
+                CheckResult.Fail));
             return;
         }
 
-        if (!DatabaseNamingPattern.Contains("$p") && !DatabaseNamingPattern.Contains("$n") && !DatabaseNamingPattern.Contains("$t") && !DatabaseNamingPattern.Contains("$r") && !DatabaseNamingPattern.Contains("$l"))
-            notifier.OnCheckPerformed(new CheckEventArgs("DatabaseNamingPattern does not contain any token. The tables may be created alongside existing tables and Release would be impossible.", CheckResult.Warning));
+        if (!DatabaseNamingPattern.Contains("$p") && !DatabaseNamingPattern.Contains("$n") &&
+            !DatabaseNamingPattern.Contains("$t") && !DatabaseNamingPattern.Contains("$r") &&
+            !DatabaseNamingPattern.Contains("$l"))
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "DatabaseNamingPattern does not contain any token. The tables may be created alongside existing tables and Release would be impossible.",
+                CheckResult.Warning));
 
         if (!TableNamingPattern.Contains("$d") && !TableNamingPattern.Contains("$a"))
-            notifier.OnCheckPerformed(new CheckEventArgs("TableNamingPattern must contain either $d or $a, the name/acronym of the dataset being extracted otherwise you will get collisions when you extract multiple tables at once", CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "TableNamingPattern must contain either $d or $a, the name/acronym of the dataset being extracted otherwise you will get collisions when you extract multiple tables at once",
+                CheckResult.Warning));
 
         if (_request == ExtractDatasetCommand.EmptyCommand)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Request is ExtractDatasetCommand.EmptyCommand, will not try to connect to Database",CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Request is ExtractDatasetCommand.EmptyCommand, will not try to connect to Database",
+                CheckResult.Warning));
             return;
         }
 
         if (TableNamingPattern != null && TableNamingPattern.Contains("$a"))
-        {
             if (_request is ExtractDatasetCommand dsRequest && string.IsNullOrWhiteSpace(dsRequest.Catalogue.Acronym))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but TableNamingPattern contains $a", CheckResult.Fail));
-        }
-            
+                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but TableNamingPattern contains $a",
+                    CheckResult.Fail));
+
         base.Check(notifier);
 
         try
         {
-            var server = DataAccessPortal.ExpectServer(TargetDatabaseServer, DataAccessContext.DataExport, setInitialDatabase: false);
+            var server = DataAccessPortal.ExpectServer(TargetDatabaseServer, DataAccessContext.DataExport, false);
             var database = _destinationDatabase = server.ExpectDatabase(GetDatabaseName());
 
             if (database.Exists())
+            {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Database {database} already exists! if an extraction has already been run you may have errors if you are re-extracting the same tables", CheckResult.Warning));
+                        $"Database {database} already exists! if an extraction has already been run you may have errors if you are re-extracting the same tables",
+                        CheckResult.Warning));
+            }
             else
             {
                 notifier.OnCheckPerformed(
@@ -607,7 +639,6 @@ public override void Check(ICheckNotifier notifier)
 
             if (tables.Any())
             {
-
                 string tableName;
 
                 try
@@ -616,19 +647,21 @@ public override void Check(ICheckNotifier notifier)
                 }
                 catch (Exception ex)
                 {
-                    notifier.OnCheckPerformed(new CheckEventArgs("Could not determine table name", CheckResult.Fail,ex));
+                    notifier.OnCheckPerformed(
+                        new CheckEventArgs("Could not determine table name", CheckResult.Fail, ex));
                     return;
                 }
 
                 // if the expected table exists and we are not doing a batch resume
-                if(tables.Any(t=>t.GetRuntimeName().Equals(tableName))  && !_request.IsBatchResume)
-                {
-                    notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExistingExtractionTableInDatabase, tableName,database));
-                }
-
+                if (tables.Any(t => t.GetRuntimeName().Equals(tableName)) && !_request.IsBatchResume)
+                    notifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.ExistingExtractionTableInDatabase,
+                        tableName, database));
             }
             else
-                notifier.OnCheckPerformed(new CheckEventArgs($"Confirmed that database {database} is empty of tables", CheckResult.Success));
+            {
+                notifier.OnCheckPerformed(new CheckEventArgs($"Confirmed that database {database} is empty of tables",
+                    CheckResult.Success));
+            }
         }
         catch (Exception e)
         {
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExtractionDestination.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExtractionDestination.cs
index fa4aab3def..64409fa0c6 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExtractionDestination.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/ExtractionDestination.cs
@@ -28,18 +28,25 @@
 
 namespace Rdmp.Core.DataExport.DataExtraction.Pipeline.Destinations;
 
-public abstract class ExtractionDestination: IExecuteDatasetExtractionDestination, IPipelineRequirement<IProject>
+public abstract class ExtractionDestination : IExecuteDatasetExtractionDestination, IPipelineRequirement<IProject>
 {
     //user configurable properties
 
-    [DemandsInitialization("Naming of flat files is usually based on Catalogue.Name, if this is true then the Catalogue.Acronym will be used instead", defaultValue: false)]
+    [DemandsInitialization(
+        "Naming of flat files is usually based on Catalogue.Name, if this is true then the Catalogue.Acronym will be used instead",
+        defaultValue: false)]
     public bool UseAcronymForFileNaming { get; set; }
 
-    [DemandsInitialization("The date format to output all datetime fields in e.g. dd/MM/yyyy for uk format yyyy-MM-dd for something more machine processable, see https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx", DemandType.Unspecified, "yyyy-MM-dd", Mandatory = true)]
+    [DemandsInitialization(
+        "The date format to output all datetime fields in e.g. dd/MM/yyyy for uk format yyyy-MM-dd for something more machine processable, see https://msdn.microsoft.com/en-us/library/8kb3ddd4(v=vs.110).aspx",
+        DemandType.Unspecified, "yyyy-MM-dd", Mandatory = true)]
     public string DateFormat { get; set; }
 
-    [DemandsInitialization("If this is true, the dataset/globals extraction folder will be wiped clean before extracting the dataset. Useful if you suspect there are spurious files in the folder", defaultValue: false)]
+    [DemandsInitialization(
+        "If this is true, the dataset/globals extraction folder will be wiped clean before extracting the dataset. Useful if you suspect there are spurious files in the folder",
+        defaultValue: false)]
     public bool CleanExtractionFolderBeforeExtraction { get; set; }
+
     public bool GeneratesFiles { get; }
 
     [DemandsInitialization(@"Overrides the extraction sub directory of datasets as they are extracted
@@ -77,13 +84,16 @@ public ExtractionDestination(bool generatesFiles)
     }
 
     #region PreInitialize
+
     public void PreInitialize(IExtractCommand request, IDataLoadEventListener listener)
     {
         _request = request;
 
         if (_request == ExtractDatasetCommand.EmptyCommand)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out"));
             return;
         }
 
@@ -93,6 +103,7 @@ public void PreInitialize(IExtractCommand request, IDataLoadEventListener listen
 
         PreInitializeImpl(request, listener);
     }
+
     protected abstract void PreInitializeImpl(IExtractCommand request, IDataLoadEventListener listener);
 
 
@@ -105,6 +116,7 @@ public virtual void PreInitialize(IProject value, IDataLoadEventListener listene
     {
         _project = value;
     }
+
     #endregion
 
     /// <inheritdoc/>
@@ -130,7 +142,8 @@ public virtual string GetFilename()
     /// <param name="job"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken)
+    public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken)
     {
         _request.ElevateState(ExtractCommandState.WritingToFile);
 
@@ -139,7 +152,7 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
             WriteBundleContents(((ExtractDatasetCommand)_request).DatasetBundle, job, cancellationToken);
             haveWrittenBundleContents = true;
         }
-                
+
         if (_request is ExtractGlobalsCommand)
         {
             ExtractGlobals((ExtractGlobalsCommand)_request, job, _dataLoadInfo);
@@ -151,21 +164,21 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
         {
             haveOpened = true;
             LinesWritten = 0;
-            Open(toProcess,job,cancellationToken);
+            Open(toProcess, job, cancellationToken);
 
             //create an audit object
-            TableLoadInfo = new TableLoadInfo(_dataLoadInfo, "", OutputFile, new DataSource[] { new DataSource(_request.DescribeExtractionImplementation(), DateTime.Now) }, -1);
-
+            TableLoadInfo = new TableLoadInfo(_dataLoadInfo, "", OutputFile,
+                new DataSource[] { new(_request.DescribeExtractionImplementation(), DateTime.Now) }, -1);
         }
 
-        WriteRows(toProcess,job,cancellationToken, stopwatch);
-            
+        WriteRows(toProcess, job, cancellationToken, stopwatch);
+
         if (TableLoadInfo.IsClosed)
             throw new Exception(
                 $"TableLoadInfo was closed so could not write number of rows ({LinesWritten}) to audit object - most likely the extraction crashed?");
         TableLoadInfo.Inserts = LinesWritten;
 
-        Flush(job, cancellationToken,stopwatch);
+        Flush(job, cancellationToken, stopwatch);
         stopwatch.Stop();
 
         return null;
@@ -183,7 +196,8 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
     /// <param name="toProcess"></param>
     /// <param name="job"></param>
     /// <param name="cancellationToken"></param>
-    protected abstract void Open(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken);
+    protected abstract void Open(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken);
 
     /// <summary>
     /// Called once per batch of records to be extracted, these should be written to the output stream you opened in <see cref="Open"/>
@@ -192,7 +206,8 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
     /// <param name="job"></param>
     /// <param name="cancellationToken"></param>
     /// <param name="stopwatch"></param>
-    protected abstract void WriteRows(DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken, Stopwatch stopwatch);
+    protected abstract void WriteRows(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken, Stopwatch stopwatch);
 
     /// <summary>
     /// Called after each batch is written, allows you to flush your stream (if required)
@@ -200,9 +215,9 @@ public virtual DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEvent
     /// <param name="job"></param>
     /// <param name="cancellationToken"></param>
     /// <param name="stopwatch"></param>
-    protected virtual void Flush(IDataLoadEventListener job, GracefulCancellationToken cancellationToken,Stopwatch stopwatch)
+    protected virtual void Flush(IDataLoadEventListener job, GracefulCancellationToken cancellationToken,
+        Stopwatch stopwatch)
     {
-
     }
 
     /// <inheritdoc/>
@@ -226,12 +241,12 @@ public virtual void Check(ICheckNotifier notifier)
                     "ExtractionSubdirectoryPattern must contain a Configuration element ($i or $c)",
                     CheckResult.Fail));
 
-            if (!ExtractionSubdirectoryPattern.Contains("$a") && !ExtractionSubdirectoryPattern.Contains("$d") && !ExtractionSubdirectoryPattern.Contains("$n"))
+            if (!ExtractionSubdirectoryPattern.Contains("$a") && !ExtractionSubdirectoryPattern.Contains("$d") &&
+                !ExtractionSubdirectoryPattern.Contains("$n"))
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     "ExtractionSubdirectoryPattern must contain a Dataset element ($d, $a or $n)",
                     CheckResult.Fail));
         }
-
     }
 
     #endregion
@@ -240,9 +255,14 @@ public virtual void Check(ICheckNotifier notifier)
     #region Release Related Methods
 
     /// <inheritdoc/>
-    public abstract ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet);
+    public abstract ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet);
+
     /// <inheritdoc/>
-    public abstract GlobalReleasePotential GetGlobalReleasabilityEvaluator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck);
+    public abstract GlobalReleasePotential GetGlobalReleasabilityEvaluator(
+        IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult,
+        IMapsDirectlyToDatabaseTable globalToCheck);
+
     /// <inheritdoc/>
     public abstract FixedReleaseSource<ReleaseAudit> GetReleaseSource(ICatalogueRepository catalogueRepository);
 
@@ -251,7 +271,8 @@ public virtual void Check(ICheckNotifier notifier)
 
     #region Bundled Content (and Globals)
 
-    private void ExtractGlobals(ExtractGlobalsCommand request, IDataLoadEventListener listener, DataLoadInfo dataLoadInfo)
+    private void ExtractGlobals(ExtractGlobalsCommand request, IDataLoadEventListener listener,
+        DataLoadInfo dataLoadInfo)
     {
         var globalsDirectory = GetDirectoryFor(request);
         if (CleanExtractionFolderBeforeExtraction)
@@ -261,63 +282,63 @@ private void ExtractGlobals(ExtractGlobalsCommand request, IDataLoadEventListene
         }
 
         foreach (var doc in request.Globals.Documents)
-            request.Globals.States[doc] = TryExtractSupportingDocument(doc,globalsDirectory, listener)
+            request.Globals.States[doc] = TryExtractSupportingDocument(doc, globalsDirectory, listener)
                 ? ExtractCommandState.Completed
                 : ExtractCommandState.Crashed;
 
         foreach (var sql in request.Globals.SupportingSQL)
-            request.Globals.States[sql] = TryExtractSupportingSQLTable(sql,globalsDirectory, request.Configuration, listener, dataLoadInfo)
-                ? ExtractCommandState.Completed
-                : ExtractCommandState.Crashed;
+            request.Globals.States[sql] =
+                TryExtractSupportingSQLTable(sql, globalsDirectory, request.Configuration, listener, dataLoadInfo)
+                    ? ExtractCommandState.Completed
+                    : ExtractCommandState.Crashed;
     }
 
-    private void WriteBundleContents(IExtractableDatasetBundle datasetBundle, IDataLoadEventListener job, GracefulCancellationToken cancellationToken)
+    private void WriteBundleContents(IExtractableDatasetBundle datasetBundle, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken)
     {
         var rootDir = GetDirectoryFor(_request);
-        var supportingSQLFolder = new DirectoryInfo(Path.Combine(rootDir.FullName, SupportingSQLTable.ExtractionFolderName));
+        var supportingSQLFolder =
+            new DirectoryInfo(Path.Combine(rootDir.FullName, SupportingSQLTable.ExtractionFolderName));
         var lookupDir = rootDir.CreateSubdirectory("Lookups");
-                       
+
         //extract the documents
         foreach (var doc in datasetBundle.Documents)
-            datasetBundle.States[doc] = TryExtractSupportingDocument(doc,rootDir, job)
+            datasetBundle.States[doc] = TryExtractSupportingDocument(doc, rootDir, job)
                 ? ExtractCommandState.Completed
                 : ExtractCommandState.Crashed;
 
         //extract supporting SQL
         foreach (var sql in datasetBundle.SupportingSQL)
-            datasetBundle.States[sql] = TryExtractSupportingSQLTable(sql,supportingSQLFolder, _request.Configuration, job, _dataLoadInfo)
-                ? ExtractCommandState.Completed
-                : ExtractCommandState.Crashed;
+            datasetBundle.States[sql] =
+                TryExtractSupportingSQLTable(sql, supportingSQLFolder, _request.Configuration, job, _dataLoadInfo)
+                    ? ExtractCommandState.Completed
+                    : ExtractCommandState.Crashed;
 
         //extract lookups
         foreach (BundledLookupTable lookup in datasetBundle.LookupTables)
-        {
-
-            datasetBundle.States[lookup] = TryExtractLookupTable(lookup, lookupDir,job)
+            datasetBundle.States[lookup] = TryExtractLookupTable(lookup, lookupDir, job)
                 ? ExtractCommandState.Completed
                 : ExtractCommandState.Crashed;
-        }
     }
 
     public DirectoryInfo GetDirectoryFor(IExtractCommand request)
     {
-        if(string.IsNullOrWhiteSpace(ExtractionSubdirectoryPattern) || request is not IExtractDatasetCommand cmd)
+        if (string.IsNullOrWhiteSpace(ExtractionSubdirectoryPattern) || request is not IExtractDatasetCommand cmd)
             return request.GetExtractionDirectory();
 
         var cata = cmd.SelectedDataSets.ExtractableDataSet.Catalogue;
 
         if (ExtractionSubdirectoryPattern.Contains("$a") && string.IsNullOrWhiteSpace(cata.Acronym))
-        {
-            throw new Exception($"Catalogue {cata} does not have an Acronym and ExtractionSubdirectoryPattern contains $a");
-        }
+            throw new Exception(
+                $"Catalogue {cata} does not have an Acronym and ExtractionSubdirectoryPattern contains $a");
 
         var path = Path.Combine(cmd.Project.ExtractionDirectory,
             ExtractionSubdirectoryPattern
-                .Replace("$c",QuerySyntaxHelper.MakeHeaderNameSensible(cmd.Configuration.Name))
-                .Replace("$i",cmd.Configuration.ID.ToString())
-                .Replace("$d",QuerySyntaxHelper.MakeHeaderNameSensible(cata.Name))
-                .Replace("$a",QuerySyntaxHelper.MakeHeaderNameSensible(cata.Acronym))
-                .Replace("$n",cata.ID.ToString())
+                .Replace("$c", QuerySyntaxHelper.MakeHeaderNameSensible(cmd.Configuration.Name))
+                .Replace("$i", cmd.Configuration.ID.ToString())
+                .Replace("$d", QuerySyntaxHelper.MakeHeaderNameSensible(cata.Name))
+                .Replace("$a", QuerySyntaxHelper.MakeHeaderNameSensible(cata.Acronym))
+                .Replace("$n", cata.ID.ToString())
         );
 
         var dir = new DirectoryInfo(path);
@@ -327,23 +348,29 @@ public DirectoryInfo GetDirectoryFor(IExtractCommand request)
         return dir;
     }
 
-    protected bool TryExtractLookupTable(BundledLookupTable lookup, DirectoryInfo lookupDir,IDataLoadEventListener job)
+    protected bool TryExtractLookupTable(BundledLookupTable lookup, DirectoryInfo lookupDir, IDataLoadEventListener job)
     {
         var sw = new Stopwatch();
         sw.Start();
 
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to extract lookup {lookup}"));
-            
+
         try
         {
-            TryExtractLookupTableImpl(lookup,lookupDir,_request.Configuration,job,out var linesWritten, out var destinationDescription);
+            TryExtractLookupTableImpl(lookup, lookupDir, _request.Configuration, job, out var linesWritten,
+                out var destinationDescription);
 
             sw.Stop();
-            job.OnProgress(this, new ProgressEventArgs($"Lookup {lookup}", new ProgressMeasurement(linesWritten, ProgressType.Records), sw.Elapsed));
+            job.OnProgress(this,
+                new ProgressEventArgs($"Lookup {lookup}", new ProgressMeasurement(linesWritten, ProgressType.Records),
+                    sw.Elapsed));
 
             //audit in the log the extraction
-            var tableLoadInfo = _dataLoadInfo.CreateTableLoadInfo("", destinationDescription, new[] { new DataSource(
-                $"SELECT * FROM {lookup.TableInfo.Name}", DateTime.Now) }, -1);
+            var tableLoadInfo = _dataLoadInfo.CreateTableLoadInfo("", destinationDescription, new[]
+            {
+                new DataSource(
+                    $"SELECT * FROM {lookup.TableInfo.Name}", DateTime.Now)
+            }, -1);
             tableLoadInfo.Inserts = linesWritten;
             tableLoadInfo.CloseAndArchive();
 
@@ -353,11 +380,10 @@ protected bool TryExtractLookupTable(BundledLookupTable lookup, DirectoryInfo lo
                 var result = command.CumulativeExtractionResults;
                 var supplementalResult = result.AddSupplementalExtractionResult(
                     $"SELECT * FROM {lookup.TableInfo.Name}", lookup.TableInfo);
-                supplementalResult.CompleteAudit(GetType(), destinationDescription, linesWritten,false,false);
+                supplementalResult.CompleteAudit(GetType(), destinationDescription, linesWritten, false, false);
             }
 
             return true;
-
         }
         catch (Exception e)
         {
@@ -375,7 +401,8 @@ protected bool TryExtractLookupTable(BundledLookupTable lookup, DirectoryInfo lo
     /// <param name="directory"></param>
     /// <param name="listener"></param>
     /// <returns></returns>
-    protected virtual bool TryExtractSupportingDocument(SupportingDocument doc, DirectoryInfo directory, IDataLoadEventListener listener)
+    protected virtual bool TryExtractSupportingDocument(SupportingDocument doc, DirectoryInfo directory,
+        IDataLoadEventListener listener)
     {
         var fetcher = new SupportingDocumentsFetcher(doc);
 
@@ -388,17 +415,18 @@ protected virtual bool TryExtractSupportingDocument(SupportingDocument doc, Dire
             {
                 var result = command.CumulativeExtractionResults;
                 var supplementalResult = result.AddSupplementalExtractionResult(null, doc);
-                supplementalResult.CompleteAudit(GetType(), outputPath, 0,false , false);
+                supplementalResult.CompleteAudit(GetType(), outputPath, 0, false, false);
             }
             else
             {
                 var extractGlobalsCommand = _request as ExtractGlobalsCommand;
                 Debug.Assert(extractGlobalsCommand != null, "extractGlobalsCommand != null");
-                var result = new SupplementalExtractionResults(extractGlobalsCommand.RepositoryLocator.DataExportRepository,
+                var result = new SupplementalExtractionResults(
+                    extractGlobalsCommand.RepositoryLocator.DataExportRepository,
                     extractGlobalsCommand.Configuration,
                     null,
                     doc);
-                result.CompleteAudit(GetType(), outputPath, 0,false,false);
+                result.CompleteAudit(GetType(), outputPath, 0, false, false);
                 extractGlobalsCommand.ExtractionResults.Add(result);
             }
 
@@ -412,7 +440,8 @@ protected virtual bool TryExtractSupportingDocument(SupportingDocument doc, Dire
         }
     }
 
-    protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInfo directory, IExtractionConfiguration configuration, IDataLoadEventListener listener, DataLoadInfo dataLoadInfo)
+    protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInfo directory,
+        IExtractionConfiguration configuration, IDataLoadEventListener listener, DataLoadInfo dataLoadInfo)
     {
         try
         {
@@ -424,9 +453,11 @@ protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInf
 
             //start auditing it as a table load
             var target = Path.Combine(directory.FullName, $"{sql.Name}.csv");
-            var tableLoadInfo = dataLoadInfo.CreateTableLoadInfo("", target, new[] { new DataSource(sql.SQL, DateTime.Now) }, -1);
+            var tableLoadInfo =
+                dataLoadInfo.CreateTableLoadInfo("", target, new[] { new DataSource(sql.SQL, DateTime.Now) }, -1);
 
-            TryExtractSupportingSQLTableImpl(sql,directory,configuration,listener, out var sqlLinesWritten, out var description);
+            TryExtractSupportingSQLTableImpl(sql, directory, configuration, listener, out var sqlLinesWritten,
+                out var description);
 
             sw.Stop();
 
@@ -438,7 +469,7 @@ protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInf
             {
                 var result = command.CumulativeExtractionResults;
                 var supplementalResult = result.AddSupplementalExtractionResult(sql.SQL, sql);
-                supplementalResult.CompleteAudit(GetType(),description , sqlLinesWritten, false,false);
+                supplementalResult.CompleteAudit(GetType(), description, sqlLinesWritten, false, false);
             }
             else
             {
@@ -453,7 +484,9 @@ protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInf
                 extractGlobalsCommand.ExtractionResults.Add(result);
             }
 
-            listener.OnProgress(this, new ProgressEventArgs($"Extract {sql}", new ProgressMeasurement(sqlLinesWritten, ProgressType.Records), sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs($"Extract {sql}", new ProgressMeasurement(sqlLinesWritten, ProgressType.Records),
+                    sw.Elapsed));
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Extracted {sqlLinesWritten} records from SupportingSQL {sql} into directory {directory.FullName}"));
 
@@ -463,7 +496,8 @@ protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInf
         {
             if (e is SqlException)
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
-                    $"Failed to run extraction SQL (make sure to fully specify all database/table/column objects completely):{Environment.NewLine}{sql.SQL}", e));
+                    $"Failed to run extraction SQL (make sure to fully specify all database/table/column objects completely):{Environment.NewLine}{sql.SQL}",
+                    e));
             else
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                     $"Failed to extract {sql} into directory {directory.FullName}", e));
@@ -472,25 +506,30 @@ protected bool TryExtractSupportingSQLTable(SupportingSQLTable sql, DirectoryInf
         }
     }
 
-    protected virtual void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlTable, DirectoryInfo directory, IExtractionConfiguration configuration,IDataLoadEventListener listener, out int linesWritten, out string destinationDescription)
+    protected virtual void TryExtractSupportingSQLTableImpl(SupportingSQLTable sqlTable, DirectoryInfo directory,
+        IExtractionConfiguration configuration, IDataLoadEventListener listener, out int linesWritten,
+        out string destinationDescription)
     {
-        var extractor = new ExtractTableVerbatim(sqlTable.GetServer(),sqlTable.SQL,sqlTable.Name,directory, configuration.Separator, DateFormat);
+        var extractor = new ExtractTableVerbatim(sqlTable.GetServer(), sqlTable.SQL, sqlTable.Name, directory,
+            configuration.Separator, DateFormat);
         linesWritten = extractor.DoExtraction();
         destinationDescription = extractor.OutputFilename;
     }
 
-    protected virtual void TryExtractLookupTableImpl( BundledLookupTable lookup, DirectoryInfo lookupDir, IExtractionConfiguration requestConfiguration,IDataLoadEventListener listener, out int linesWritten, out string destinationDescription)
+    protected virtual void TryExtractLookupTableImpl(BundledLookupTable lookup, DirectoryInfo lookupDir,
+        IExtractionConfiguration requestConfiguration, IDataLoadEventListener listener, out int linesWritten,
+        out string destinationDescription)
     {
         //extract the lookup table SQL
         var sql = lookup.GetDataTableFetchSql();
 
         var extractTableVerbatim = new ExtractTableVerbatim(
             lookup.TableInfo.Discover(DataAccessContext.DataExport).Database.Server,
-            sql,lookup.TableInfo.GetRuntimeName(), lookupDir, _request.Configuration.Separator, DateFormat);
+            sql, lookup.TableInfo.GetRuntimeName(), lookupDir, _request.Configuration.Separator, DateFormat);
 
         linesWritten = extractTableVerbatim.DoExtraction();
         destinationDescription = extractTableVerbatim.OutputFilename;
     }
-    #endregion
 
+    #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/IExecuteDatasetExtractionDestination.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/IExecuteDatasetExtractionDestination.cs
index 38cff57413..344feb2314 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/IExecuteDatasetExtractionDestination.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Destinations/IExecuteDatasetExtractionDestination.cs
@@ -23,7 +23,8 @@ namespace Rdmp.Core.DataExport.DataExtraction.Pipeline.Destinations;
 /// Destination for Extraction Pipelines.  Saves the extracted (anonymous) data contained in the DataTables received (which arrive in batches) to some location
 /// (depending on implementation).  Destinations must also support one off calls (per ExtractionConfiguration) to ExtractGlobals
 /// </summary>
-public interface IExecuteDatasetExtractionDestination : IPluginDataFlowComponent<DataTable>, IDataFlowDestination<DataTable>, IPipelineRequirement<IExtractCommand>, IPipelineRequirement<DataLoadInfo>
+public interface IExecuteDatasetExtractionDestination : IPluginDataFlowComponent<DataTable>,
+    IDataFlowDestination<DataTable>, IPipelineRequirement<IExtractCommand>, IPipelineRequirement<DataLoadInfo>
 {
     TableLoadInfo TableLoadInfo { get; }
     DirectoryInfo DirectoryPopulated { get; }
@@ -31,14 +32,14 @@ public interface IExecuteDatasetExtractionDestination : IPluginDataFlowComponent
     string OutputFile { get; }
     int SeparatorsStrippedOut { get; }
     string DateFormat { get; }
-        
+
     /// <summary>
     /// Returns a string suitable for naming the extracted artifact e.g. "Biochemistry", or "BIO".  Should not contain a file extension.
     /// </summary>
     /// <returns></returns>
     string GetFilename();
-        
-        
+
+
     /// <summary>
     /// Provide a short description of where the <see cref="ExtractionDestination"/> puts rows e.g. a file path for a csv
     /// </summary>
@@ -52,7 +53,8 @@ public interface IExecuteDatasetExtractionDestination : IPluginDataFlowComponent
     /// <param name="repositoryLocator"></param>
     /// <param name="selectedDataSet"></param>
     /// <returns></returns>
-    ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet);
+    ReleasePotential GetReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet);
 
 
     /// <summary>
@@ -71,5 +73,6 @@ public interface IExecuteDatasetExtractionDestination : IPluginDataFlowComponent
     /// <param name="globalResult"></param>
     /// <param name="globalToCheck"></param>
     /// <returns></returns>
-    GlobalReleasePotential GetGlobalReleasabilityEvaluator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck);
+    GlobalReleasePotential GetGlobalReleasabilityEvaluator(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/ExtractionPipelineUseCase.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/ExtractionPipelineUseCase.cs
index 840576abf7..d4b2297558 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/ExtractionPipelineUseCase.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/ExtractionPipelineUseCase.cs
@@ -42,7 +42,8 @@ public sealed class ExtractionPipelineUseCase : PipelineUseCase
     /// </summary>
     public IExecuteDatasetExtractionDestination Destination { get; private set; }
 
-    public ExtractionPipelineUseCase(IBasicActivateItems activator,IProject project, IExtractCommand extractCommand, IPipeline pipeline, DataLoadInfo dataLoadInfo)
+    public ExtractionPipelineUseCase(IBasicActivateItems activator, IProject project, IExtractCommand extractCommand,
+        IPipeline pipeline, DataLoadInfo dataLoadInfo)
     {
         _dataLoadInfo = dataLoadInfo;
         ExtractCommand = extractCommand;
@@ -60,7 +61,6 @@ public ExtractionPipelineUseCase(IBasicActivateItems activator,IProject project,
     }
 
 
-
     protected override IDataFlowPipelineContext GenerateContextImpl()
     {
         //create the context using the standard context factory
@@ -68,7 +68,8 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
         var context = contextFactory.Create(PipelineUsage.LogsToTableLoadInfo);
 
         //adjust context: we want a destination requirement of IExecuteDatasetExtractionDestination
-        context.MustHaveDestination = typeof(IExecuteDatasetExtractionDestination);//we want this freaky destination type
+        context.MustHaveDestination =
+            typeof(IExecuteDatasetExtractionDestination); //we want this freaky destination type
         context.MustHaveSource = typeof(ExecuteDatasetExtractionSource);
 
         return context;
@@ -76,7 +77,7 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
 
     public void Execute(IDataLoadEventListener listener)
     {
-        if(ExtractCommand is ExtractDatasetCommand eds)
+        if (ExtractCommand is ExtractDatasetCommand eds)
         {
             bool runAgain;
             var totalFailureCount = 0;
@@ -97,15 +98,15 @@ public void Execute(IDataLoadEventListener listener)
                     runSuccessful = false;
                 }
 
-                if(runSuccessful)
+                if (runSuccessful)
                 {
                     runAgain = IncrementProgressIfAny(eds, listener);
                     consecutiveFailureCount = 0;
 
-                    if(runAgain)
-                    {
-                        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Running pipeline again for next batch in ExtractionProgress"));
-                    }
+                    if (runAgain)
+                        listener.OnNotify(this,
+                            new NotifyEventArgs(ProgressEventType.Information,
+                                $"Running pipeline again for next batch in ExtractionProgress"));
                 }
                 else
                 {
@@ -114,13 +115,11 @@ public void Execute(IDataLoadEventListener listener)
 
                     runAgain = ShouldRetry(eds, listener, totalFailureCount, consecutiveFailureCount);
 
-                    if(runAgain)
-                    {
-                        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Retrying pipeline"));
-                    }
+                    if (runAgain)
+                        listener.OnNotify(this,
+                            new NotifyEventArgs(ProgressEventType.Information, $"Retrying pipeline"));
                 }
-            }
-            while (runAgain);
+            } while (runAgain);
         }
         else
         {
@@ -148,7 +147,9 @@ private bool IncrementProgressIfAny(ExtractDatasetCommand extractDatasetCommand,
             // update our progress
             progress.ProgressDate = extractDatasetCommand.BatchEnd.Value;
             progress.SaveToDatabase();
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Saving batch extraction progress as {progress.ProgressDate}"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    $"Saving batch extraction progress as {progress.ProgressDate}"));
 
             if (progress.MoreToFetch())
             {
@@ -159,6 +160,7 @@ private bool IncrementProgressIfAny(ExtractDatasetCommand extractDatasetCommand,
 
             return false;
         }
+
         return false;
     }
 
@@ -171,14 +173,15 @@ private bool IncrementProgressIfAny(ExtractDatasetCommand extractDatasetCommand,
     /// <param name="totalFailureCount"></param>
     /// <param name="consecutiveFailureCount"></param>
     /// <returns></returns>
-    private bool ShouldRetry(ExtractDatasetCommand extractDatasetCommand, IDataLoadEventListener listener, int totalFailureCount, int consecutiveFailureCount)
+    private bool ShouldRetry(ExtractDatasetCommand extractDatasetCommand, IDataLoadEventListener listener,
+        int totalFailureCount, int consecutiveFailureCount)
     {
         var progress = extractDatasetCommand.SelectedDataSets.ExtractionProgressIfAny;
 
         if (progress == null)
             return false;
 
-        return progress.ApplyRetryWaitStrategy(Token,listener, totalFailureCount, consecutiveFailureCount);
+        return progress.ApplyRetryWaitStrategy(Token, listener, totalFailureCount, consecutiveFailureCount);
     }
 
 
@@ -193,7 +196,9 @@ private bool ExecuteOnce(IDataLoadEventListener listener)
         {
             ExtractCommand.ElevateState(ExtractCommandState.WaitingToExecute);
 
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Running Extraction {ExtractCommand} with Pipeline {_pipeline.Name} (ID={_pipeline.ID})"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    $"Running Extraction {ExtractCommand} with Pipeline {_pipeline.Name} (ID={_pipeline.ID})"));
 
             var engine = GetEngine(_pipeline, listener);
 
@@ -206,7 +211,8 @@ private bool ExecuteOnce(IDataLoadEventListener listener)
             catch (Exception e)
             {
                 ExtractCommand.ElevateState(ExtractCommandState.Crashed);
-                _dataLoadInfo.LogFatalError("Execute extraction pipeline", ExceptionHelper.ExceptionToListOfInnerMessages(e, true));
+                _dataLoadInfo.LogFatalError("Execute extraction pipeline",
+                    ExceptionHelper.ExceptionToListOfInnerMessages(e, true));
 
                 if (ExtractCommand is ExtractDatasetCommand command)
                 {
@@ -259,7 +265,8 @@ private bool ExecuteOnce(IDataLoadEventListener listener)
         }
         catch (Exception ex)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Execute pipeline failed with Exception", ex));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Execute pipeline failed with Exception", ex));
             ExtractCommand.ElevateState(ExtractCommandState.Crashed);
         }
 
@@ -272,7 +279,9 @@ private bool ExecuteOnce(IDataLoadEventListener listener)
                 ExtractCommand.ElevateState(ExtractCommandState.Completed);
         }
         else
+        {
             return false; // it crashed or was aborted etc
+        }
 
         return true;
     }
@@ -280,10 +289,12 @@ private bool ExecuteOnce(IDataLoadEventListener listener)
     public override IDataFlowPipelineEngine GetEngine(IPipeline pipeline, IDataLoadEventListener listener)
     {
         var engine = base.GetEngine(pipeline, listener);
-            
-        Destination = (IExecuteDatasetExtractionDestination)engine.DestinationObject; //record the destination that was created as part of the Pipeline configured
+
+        Destination =
+            (IExecuteDatasetExtractionDestination)engine
+                .DestinationObject; //record the destination that was created as part of the Pipeline configured
         Source = (ExecuteDatasetExtractionSource)engine.SourceObject;
-            
+
         return engine;
     }
 
@@ -292,11 +303,11 @@ private void WriteMetadata(IDataLoadEventListener listener)
         ExtractCommand.ElevateState(ExtractCommandState.WritingMetadata);
         WordDataWriter wordDataWriter;
 
-            
+
         try
         {
             wordDataWriter = new WordDataWriter(this);
-            wordDataWriter.GenerateWordFile();//run the report
+            wordDataWriter.GenerateWordFile(); //run the report
         }
         catch (Exception e)
         {
@@ -304,17 +315,20 @@ private void WriteMetadata(IDataLoadEventListener listener)
             // tell user that we could not run the report and set the status to warning
             ExtractCommand.ElevateState(ExtractCommandState.Warning);
 
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Word metadata document NOT CREATED",e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Word metadata document NOT CREATED", e));
             return;
         }
-            
+
         //if there were any exceptions
         if (wordDataWriter.ExceptionsGeneratingWordFile.Any())
         {
             ExtractCommand.ElevateState(ExtractCommandState.Warning);
 
             foreach (var e in wordDataWriter.ExceptionsGeneratingWordFile)
-                listener.OnNotify(wordDataWriter, new NotifyEventArgs(ProgressEventType.Warning, "Word metadata document creation caused exception", e));
+                listener.OnNotify(wordDataWriter,
+                    new NotifyEventArgs(ProgressEventType.Warning, "Word metadata document creation caused exception",
+                        e));
         }
         else
         {
@@ -335,8 +349,5 @@ private ExtractionPipelineUseCase()
         GenerateContext();
     }
 
-    public static ExtractionPipelineUseCase DesignTime()
-    {
-        return new ExtractionPipelineUseCase();
-    }
+    public static ExtractionPipelineUseCase DesignTime() => new();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/FileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/FileExtractor.cs
index 49a920002d..6144274e77 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/FileExtractor.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/FileExtractor.cs
@@ -17,9 +17,9 @@ namespace Rdmp.Core.DataExport.DataExtraction.Pipeline;
 /// <summary>
 /// Extraction component for extracting (and optionally transforming in some way) arbitrary files on disk as part of an extraction
 /// </summary>
-public abstract class FileExtractor : IPluginDataFlowComponent<DataTable>,  IPipelineRequirement<IExtractCommand>
+public abstract class FileExtractor : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IExtractCommand>
 {
-    protected ExtractGlobalsCommand _command {get;set;}
+    protected ExtractGlobalsCommand _command { get; set; }
 
     private bool _isFirstTime = true;
 
@@ -41,15 +41,18 @@ public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener
         _command = value as ExtractGlobalsCommand;
     }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        if(_command == null)
+        if (_command == null)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Ignoring {GetType().Name} component because command is not ExtractGlobalsCommand"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    $"Ignoring {GetType().Name} component because command is not ExtractGlobalsCommand"));
             return toProcess;
         }
 
-        if(_isFirstTime)
+        if (_isFirstTime)
             MoveFiles(_command, listener, cancellationToken);
 
         _isFirstTime = false;
@@ -63,5 +66,6 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
     /// <param name="command"></param>
     /// <param name="listener"></param>
     /// <param name="cancellationToken"></param>
-    protected abstract void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken);
+    protected abstract void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs
index f1fc6cc2a0..c0256e1332 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/SimpleFileExtractor.cs
@@ -30,16 +30,22 @@ namespace Rdmp.Core.DataExport.DataExtraction.Pipeline;
 public class SimpleFileExtractor : FileExtractor
 {
     [DemandsInitialization("Location of files on disk that should be copied to the output directory", Mandatory = true)]
-    public DirectoryInfo LocationOfFiles {get;set;}
+    public DirectoryInfo LocationOfFiles { get; set; }
 
-    [DemandsInitialization("True if the LocationOfFiles contains a number of directories to be copied.  False if it contains files only (no subdirectories)", Mandatory = true, DefaultValue =true)]
-    public bool Directories { get;set;}
+    [DemandsInitialization(
+        "True if the LocationOfFiles contains a number of directories to be copied.  False if it contains files only (no subdirectories)",
+        Mandatory = true, DefaultValue = true)]
+    public bool Directories { get; set; }
 
-    [DemandsInitialization("True if there is 1 or more files/folders per patient (if so Pattern must contain $p).  False if there is one arbitrary file/folder that needs copied once only", Mandatory = true, DefaultValue =true)]
-    public bool PerPatient {get;set;}
+    [DemandsInitialization(
+        "True if there is 1 or more files/folders per patient (if so Pattern must contain $p).  False if there is one arbitrary file/folder that needs copied once only",
+        Mandatory = true, DefaultValue = true)]
+    public bool PerPatient { get; set; }
 
-    [DemandsInitialization("Expected naming pattern of files to be moved.  If PerPatient is true then this should include the symbol $p to indicate the private identifier value of each patient to be moved e.g. $p.txt.  This symbol will be replaced in the file/path names (but not file body)", Mandatory = true)]
-    public string Pattern {get;set;} = "$p";
+    [DemandsInitialization(
+        "Expected naming pattern of files to be moved.  If PerPatient is true then this should include the symbol $p to indicate the private identifier value of each patient to be moved e.g. $p.txt.  This symbol will be replaced in the file/path names (but not file body)",
+        Mandatory = true)]
+    public string Pattern { get; set; } = "$p";
 
     [DemandsInitialization(@"Directory where files should be put 
 $p - Project Extraction Directory (e.g. c:\MyProject\)
@@ -48,32 +54,41 @@ public class SimpleFileExtractor : FileExtractor
 ", Mandatory = true, DefaultValue = "$c\\Files\\")]
     public string OutputDirectoryName { get; set; } = "$c\\Files\\";
 
-    [DemandsInitialization("Determines behaviour when the destination file already exists either due to an old run or cohort private identifier aliases.  Set to true to overwrite or false to crash.", DefaultValue = true)]
+    [DemandsInitialization(
+        "Determines behaviour when the destination file already exists either due to an old run or cohort private identifier aliases.  Set to true to overwrite or false to crash.",
+        DefaultValue = true)]
     public bool Overwrite { get; set; } = true;
 
     public override void Check(ICheckNotifier notifier)
     {
         base.Check(notifier);
 
-        if(PerPatient && Pattern.IndexOf("$p") == -1)
-            notifier.OnCheckPerformed(new CheckEventArgs($"PerPatient is true but Pattern {Pattern} did not contain token $p",CheckResult.Fail));
+        if (PerPatient && Pattern.IndexOf("$p") == -1)
+            notifier.OnCheckPerformed(
+                new CheckEventArgs($"PerPatient is true but Pattern {Pattern} did not contain token $p",
+                    CheckResult.Fail));
 
-        if(!PerPatient && Pattern.IndexOf("$p") != -1)
-            notifier.OnCheckPerformed(new CheckEventArgs($"PerPatient is false but Pattern {Pattern} contains token $p.  This token will never be matched in MoveAll mode",CheckResult.Fail));
+        if (!PerPatient && Pattern.IndexOf("$p") != -1)
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"PerPatient is false but Pattern {Pattern} contains token $p.  This token will never be matched in MoveAll mode",
+                CheckResult.Fail));
 
         try
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Output path is:{GetDestinationDirectory()}",
+                CheckResult.Success));
         }
         catch (Exception ex)
         {
-            throw new Exception("Unable to to determine output directory from 'OutputDirectoryName'.  Perhaps pattern is bad", ex);
+            throw new Exception(
+                "Unable to to determine output directory from 'OutputDirectoryName'.  Perhaps pattern is bad", ex);
         }
     }
 
-    protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        if(!LocationOfFiles.Exists)
+        if (!LocationOfFiles.Exists)
             throw new Exception($"LocationOfFiles {LocationOfFiles} did not exist");
 
         var destinationDirectory = GetDestinationDirectory();
@@ -89,10 +104,8 @@ protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventL
             var priv = cohort.GetPrivateIdentifier(true);
             var rel = cohort.GetReleaseIdentifier(true);
 
-            foreach(DataRow r in cohortData.Rows)
-            {
-                MovePatient(r[priv] , r[rel],destinationDirectory, listener, cancellationToken);
-            }
+            foreach (DataRow r in cohortData.Rows)
+                MovePatient(r[priv], r[rel], destinationDirectory, listener, cancellationToken);
         }
         else
         {
@@ -107,20 +120,14 @@ protected override void MoveFiles(ExtractGlobalsCommand command, IDataLoadEventL
     public DirectoryInfo GetDestinationDirectory()
     {
         var path = OutputDirectoryName;
-            
-        if (path.Contains("$p"))
-        {
-            path = path.Replace("$p", _command.Project.ExtractionDirectory);
-        }
-        if (path.Contains("$n"))
-        {
-            path = path.Replace("$n", _command.Project.ProjectNumber.ToString());
-        }
-            
+
+        if (path.Contains("$p")) path = path.Replace("$p", _command.Project.ExtractionDirectory);
+        if (path.Contains("$n")) path = path.Replace("$n", _command.Project.ProjectNumber.ToString());
+
         if (path.Contains("$c"))
-        {
-            path = path.Replace("$c", new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration).ExtractionDirectoryInfo.FullName);
-        }
+            path = path.Replace("$c",
+                new ExtractionDirectory(_command.Project.ExtractionDirectory, _command.Configuration)
+                    .ExtractionDirectoryInfo.FullName);
 
         return new DirectoryInfo(path);
     }
@@ -128,22 +135,27 @@ public DirectoryInfo GetDestinationDirectory()
     /// <summary>
     /// Called when <see cref="PerPatient"/> is false.  Called once per extraction
     /// </summary>
-    public virtual void MoveAll(DirectoryInfo destinationDirectory, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public virtual void MoveAll(DirectoryInfo destinationDirectory, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var atLeastOne = false;
 
         var infos = new List<FileSystemInfo>();
-            
-        if(Pattern.Contains('*'))
+
+        if (Pattern.Contains('*'))
+        {
             infos.AddRange(LocationOfFiles.EnumerateFileSystemInfos(Pattern));
+        }
         else
         {
-            var f = LocationOfFiles.GetFiles().FirstOrDefault(f=>f.Name.Equals(Pattern, StringComparison.OrdinalIgnoreCase));
-                
+            var f = LocationOfFiles.GetFiles()
+                .FirstOrDefault(f => f.Name.Equals(Pattern, StringComparison.OrdinalIgnoreCase));
+
             if (f != null)
                 infos.Add(f);
 
-            var d = LocationOfFiles.GetDirectories().FirstOrDefault(d => d.Name.Equals(Pattern, StringComparison.OrdinalIgnoreCase));
+            var d = LocationOfFiles.GetDirectories()
+                .FirstOrDefault(d => d.Name.Equals(Pattern, StringComparison.OrdinalIgnoreCase));
 
             if (d != null)
                 infos.Add(d);
@@ -151,99 +163,117 @@ public virtual void MoveAll(DirectoryInfo destinationDirectory, IDataLoadEventLi
 
         foreach (var e in infos)
         {
-            if(Directories && e is DirectoryInfo dir)
+            if (Directories && e is DirectoryInfo dir)
             {
-                var dest = Path.Combine(destinationDirectory.FullName,dir.Name);
+                var dest = Path.Combine(destinationDirectory.FullName, dir.Name);
 
                 // Recursively copy all files from input path to destination path
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Copying directory '{e.FullName}' to '{dest}'"));
-                CopyFolder(e.FullName,dest);
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"Copying directory '{e.FullName}' to '{dest}'"));
+                CopyFolder(e.FullName, dest);
                 atLeastOne = true;
             }
 
-            if(!Directories && e is FileInfo f)
+            if (!Directories && e is FileInfo f)
             {
-                var dest = Path.Combine(destinationDirectory.FullName,f.Name);
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Copying file '{f.FullName}' to '{dest}'"));
-                File.Copy(f.FullName,dest,Overwrite);
+                var dest = Path.Combine(destinationDirectory.FullName, f.Name);
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information, $"Copying file '{f.FullName}' to '{dest}'"));
+                File.Copy(f.FullName, dest, Overwrite);
                 atLeastOne = true;
             }
         }
 
-        if(!atLeastOne)
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,$"No {(Directories ? "Directories": "Files")} were found matching Pattern {Pattern} in {LocationOfFiles.FullName}"));
+        if (!atLeastOne)
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    $"No {(Directories ? "Directories" : "Files")} were found matching Pattern {Pattern} in {LocationOfFiles.FullName}"));
     }
-        
+
     /// <summary>
     /// Called when <see cref="PerPatient"/> is true.  Called once per private identifier.  Note that it is possible for 2 private identifiers to map to the same release identifier - be careful
     /// </summary>
-    public virtual void MovePatient(object privateIdentifier, object releaseIdentifier, DirectoryInfo destinationDirectory, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public virtual void MovePatient(object privateIdentifier, object releaseIdentifier,
+        DirectoryInfo destinationDirectory, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var atLeastOne = false;
 
-        if(privateIdentifier == DBNull.Value || string.IsNullOrWhiteSpace(privateIdentifier?.ToString()))
+        if (privateIdentifier == DBNull.Value || string.IsNullOrWhiteSpace(privateIdentifier?.ToString()))
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,"Skipped NULL private identifier found in cohort when trying to copy files"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    "Skipped NULL private identifier found in cohort when trying to copy files"));
             return;
         }
-            
-        if(releaseIdentifier == DBNull.Value || string.IsNullOrWhiteSpace(releaseIdentifier?.ToString()))
+
+        if (releaseIdentifier == DBNull.Value || string.IsNullOrWhiteSpace(releaseIdentifier?.ToString()))
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error,$"Found NULL release identifier in cohort when trying to copy files.  This is not allowed as it breaks file name substitutions.  Private identifier was {privateIdentifier}"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error,
+                    $"Found NULL release identifier in cohort when trying to copy files.  This is not allowed as it breaks file name substitutions.  Private identifier was {privateIdentifier}"));
             return;
         }
 
         // What we will be writing into the file/path names in place of the private identifier
         var releaseSub = UsefulStuff.RemoveIllegalFilenameCharacters(releaseIdentifier.ToString());
 
-        var patternAfterTokenInsertion = Pattern.Replace("$p",privateIdentifier.ToString());
+        var patternAfterTokenInsertion = Pattern.Replace("$p", privateIdentifier.ToString());
 
-        foreach(var e in LocationOfFiles.EnumerateFileSystemInfos(patternAfterTokenInsertion))
+        foreach (var e in LocationOfFiles.EnumerateFileSystemInfos(patternAfterTokenInsertion))
         {
-            if(Directories && e is DirectoryInfo dir)
+            if (Directories && e is DirectoryInfo dir)
             {
                 var dest = Path.Combine(
                     destinationDirectory.FullName,
-                    dir.Name.Replace(privateIdentifier.ToString(),releaseSub));
+                    dir.Name.Replace(privateIdentifier.ToString(), releaseSub));
 
                 // Recursively copy all files from input path to destination path
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Copying directory '{e.FullName}' to '{dest}'"));
-                CopyFolder(e.FullName,dest);
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"Copying directory '{e.FullName}' to '{dest}'"));
+                CopyFolder(e.FullName, dest);
                 atLeastOne = true;
             }
 
-            if(!Directories && e is FileInfo f)
+            if (!Directories && e is FileInfo f)
             {
                 var dest = Path.Combine(
                     destinationDirectory.FullName,
-                    f.Name.Replace(privateIdentifier.ToString(),releaseSub));
+                    f.Name.Replace(privateIdentifier.ToString(), releaseSub));
 
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Copying file '{f.FullName}' to '{dest}'"));
-                File.Copy(f.FullName,dest,Overwrite);
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information, $"Copying file '{f.FullName}' to '{dest}'"));
+                File.Copy(f.FullName, dest, Overwrite);
                 atLeastOne = true;
             }
         }
-        if(!atLeastOne)
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,$"No {(Directories ? "Directories": "Files")} were found matching Pattern {patternAfterTokenInsertion} in {LocationOfFiles.FullName}.  For private identifier '{privateIdentifier}'"));
+
+        if (!atLeastOne)
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    $"No {(Directories ? "Directories" : "Files")} were found matching Pattern {patternAfterTokenInsertion} in {LocationOfFiles.FullName}.  For private identifier '{privateIdentifier}'"));
     }
 
-    protected void CopyFolder( string sourceFolder, string destFolder )
+    protected void CopyFolder(string sourceFolder, string destFolder)
     {
-        if (!Directory.Exists( destFolder ))
-            Directory.CreateDirectory( destFolder );
-        var files = Directory.GetFiles( sourceFolder );
+        if (!Directory.Exists(destFolder))
+            Directory.CreateDirectory(destFolder);
+        var files = Directory.GetFiles(sourceFolder);
         foreach (var file in files)
         {
-            var name = Path.GetFileName( file );
-            var dest = Path.Combine( destFolder, name );
-            File.Copy( file, dest,Overwrite );
+            var name = Path.GetFileName(file);
+            var dest = Path.Combine(destFolder, name);
+            File.Copy(file, dest, Overwrite);
         }
-        var folders = Directory.GetDirectories( sourceFolder );
+
+        var folders = Directory.GetDirectories(sourceFolder);
         foreach (var folder in folders)
         {
-            var name = Path.GetFileName( folder );
-            var dest = Path.Combine( destFolder, name );
-            CopyFolder( folder, dest );
+            var name = Path.GetFileName(folder);
+            var dest = Path.Combine(destFolder, name);
+            CopyFolder(folder, dest);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/DistinctStrategy.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/DistinctStrategy.cs
index 25176fef97..1a88ad9533 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/DistinctStrategy.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/DistinctStrategy.cs
@@ -25,5 +25,4 @@ public enum DistinctStrategy
     /// Apply an ORDER BY release id and apply the DISTINCT in memory as batches are read
     /// </summary>
     OrderByAndDistinctInMemory
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs
index f8aea7d33f..786edc8912 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteCrossServerDatasetExtractionSource.cs
@@ -29,16 +29,23 @@ public class ExecuteCrossServerDatasetExtractionSource : ExecuteDatasetExtractio
 {
     private bool _haveCopiedCohortAndAdjustedSql = false;
 
-    [DemandsInitialization("Database to upload the cohort to prior to linking", defaultValue: "tempdb",mandatory:true)]
+    [DemandsInitialization("Database to upload the cohort to prior to linking", defaultValue: "tempdb",
+        mandatory: true)]
     public string TemporaryDatabaseName { get; set; }
 
-    [DemandsInitialization("Determines behaviour if TemporaryDatabaseName is not found on the dataset server.  True to create it as a new database, False to crash", defaultValue: true)]
+    [DemandsInitialization(
+        "Determines behaviour if TemporaryDatabaseName is not found on the dataset server.  True to create it as a new database, False to crash",
+        defaultValue: true)]
     public bool CreateTemporaryDatabaseIfNotExists { get; set; }
 
-    [DemandsInitialization("Determines behaviour if TemporaryDatabaseName already contains a Cohort table.  True to drop it, False to crash", defaultValue: true)]
+    [DemandsInitialization(
+        "Determines behaviour if TemporaryDatabaseName already contains a Cohort table.  True to drop it, False to crash",
+        defaultValue: true)]
     public bool DropExistingCohortTableIfExists { get; set; }
 
-    [DemandsInitialization("Naming pattern for the temporary cohort database table created on the data server(s) for extraction. Use $g for a guid.",defaultValue: "$g")]
+    [DemandsInitialization(
+        "Naming pattern for the temporary cohort database table created on the data server(s) for extraction. Use $g for a guid.",
+        defaultValue: "$g")]
     public string TemporaryTableName { get; set; }
 
     public override DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
@@ -46,18 +53,18 @@ public override DataTable GetChunk(IDataLoadEventListener listener, GracefulCanc
         SetServer();
 
         if (!_haveCopiedCohortAndAdjustedSql && Request != null && _doNotMigrate == false)
-            CopyCohortToDataServer(listener,cancellationToken);
+            CopyCohortToDataServer(listener, cancellationToken);
 
         return base.GetChunk(listener, cancellationToken);
     }
-        
+
     private List<DiscoveredTable> tablesToCleanup = new();
 
     public static Semaphore OneCrossServerExtractionAtATime = new(1, 1);
     private DiscoveredServer _server;
     private DiscoveredDatabase _tempDb;
     private bool _semaphoreObtained;
-        
+
     /// <summary>
     /// True if we decided not to move the cohort after all (e.g. if one or more datasets being extracted are already on the same server).
     /// </summary>
@@ -72,14 +79,17 @@ public override string HackExtractionSQL(string sql, IDataLoadEventListener list
 
         //call base hacks
         sql = base.HackExtractionSQL(sql, listener);
-            
+
         if (_doNotMigrate)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,"Cohort and Data are on same server so no migration will occur"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "Cohort and Data are on same server so no migration will occur"));
             return sql;
         }
-            
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Original (unhacked) SQL was {sql}", null));
+
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"Original (unhacked) SQL was {sql}", null));
 
         //now replace database with tempdb
         var extractableCohort = Request.ExtractableCohort;
@@ -101,31 +111,36 @@ public override string HackExtractionSQL(string sql, IDataLoadEventListener list
         var destinationTable = GetTableName() ?? sourceTable;
         var sourcePrivateId = sourceSyntax.GetRuntimeName(extractableCohort.GetPrivateIdentifier());
         var sourceReleaseId = sourceSyntax.GetRuntimeName(extractableCohort.GetReleaseIdentifier());
-        var sourceCohortDefinitionId = sourceSyntax.GetRuntimeName(extractableCohortSource.DefinitionTableForeignKeyField);
+        var sourceCohortDefinitionId =
+            sourceSyntax.GetRuntimeName(extractableCohortSource.DefinitionTableForeignKeyField);
 
         //Swaps the given entity for the same entity but in _tempDb
-        AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourcePrivateId, sourceSyntax, destinationSyntax);
+        AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourcePrivateId, sourceSyntax,
+            destinationSyntax);
 
         // If it is not an identifiable extraction (private and release are different)
-        if(!string.Equals(sourcePrivateId,sourceReleaseId))
-            AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourceReleaseId, sourceSyntax, destinationSyntax);
+        if (!string.Equals(sourcePrivateId, sourceReleaseId))
+            AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourceReleaseId, sourceSyntax,
+                destinationSyntax);
 
-        AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourceCohortDefinitionId, sourceSyntax, destinationSyntax);
+        AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourceCohortDefinitionId,
+            sourceSyntax, destinationSyntax);
         AddReplacement(replacementStrings, sourceDb, sourceTable, destinationTable, sourceSyntax, destinationSyntax);
-            
+
         foreach (var r in replacementStrings)
         {
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Replacing '{r.Key}' with '{r.Value}'", null));
-                
-            if(!sql.Contains(r.Key))
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+
+            if (!sql.Contains(r.Key))
+                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"SQL extraction query string did not contain the text '{r.Key}' (which we expected to replace with '{r.Value}"));
 
             sql = sql.Replace(r.Key, r.Value);
         }
-            
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Adjusted (hacked) SQL was {sql}", null));
+
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"Adjusted (hacked) SQL was {sql}", null));
 
         //replace [MyCohortDatabase].. with [tempdb].. (while dealing with Cohort..Cohort replacement correctly as well as 'Cohort.dbo.Cohort.Fish' correctly)
         return sql;
@@ -133,7 +148,7 @@ public override string HackExtractionSQL(string sql, IDataLoadEventListener list
 
     private string GetTableName()
     {
-        lock(_tableName)
+        lock (_tableName)
         {
             if (_tablename != null)
                 return _tablename;
@@ -142,20 +157,23 @@ private string GetTableName()
                 return null;
 
             // add a g to avoid creating a table name that starts with a number (can cause problems and always requires wrapping etc... just bad)
-            var guid = $"g{Guid.NewGuid():N}";                
+            var guid = $"g{Guid.NewGuid():N}";
 
             return _tablename = TemporaryTableName.Replace("$g", guid);
         }
     }
 
-    private void AddReplacement(Dictionary<string, string> replacementStrings, string sourceDb, string sourceTable,string destinationTable, string col, IQuerySyntaxHelper sourceSyntax, IQuerySyntaxHelper destinationSyntax)
+    private void AddReplacement(Dictionary<string, string> replacementStrings, string sourceDb, string sourceTable,
+        string destinationTable, string col, IQuerySyntaxHelper sourceSyntax, IQuerySyntaxHelper destinationSyntax)
     {
         replacementStrings.Add(
             sourceSyntax.EnsureFullyQualified(sourceDb, null, sourceTable, col),
             destinationSyntax.EnsureFullyQualified(_tempDb.GetRuntimeName(), null, destinationTable, col)
         );
     }
-    private void AddReplacement(Dictionary<string, string> replacementStrings, string sourceDb, string sourceTable, string destinationTable, IQuerySyntaxHelper sourceSyntax, IQuerySyntaxHelper destinationSyntax)
+
+    private void AddReplacement(Dictionary<string, string> replacementStrings, string sourceDb, string sourceTable,
+        string destinationTable, IQuerySyntaxHelper sourceSyntax, IQuerySyntaxHelper destinationSyntax)
     {
         replacementStrings.Add(
             sourceSyntax.EnsureFullyQualified(sourceDb, null, sourceTable),
@@ -165,16 +183,16 @@ private void AddReplacement(Dictionary<string, string> replacementStrings, strin
 
     private void SetServer()
     {
-        if(_server == null && Request != null)
+        if (_server == null && Request != null)
         {
             //it's a legit dataset being extracted?
             _server = Request.GetDistinctLiveDatabaseServer();
-                
+
             //expect a database called called tempdb
             _tempDb = _server.ExpectDatabase(TemporaryDatabaseName);
 
             var cohortServer = Request.ExtractableCohort.ExternalCohortTable.Discover();
-            if (AreOnSameServer(_server , cohortServer.Server))
+            if (AreOnSameServer(_server, cohortServer.Server))
                 _doNotMigrate = true;
         }
     }
@@ -186,14 +204,11 @@ private void SetServer()
     /// <param name="a"></param>
     /// <param name="b"></param>
     /// <returns></returns>
-    protected static bool AreOnSameServer(DiscoveredServer a, DiscoveredServer b)
-    {
-        return
-            string.Equals(a.Name, b.Name, StringComparison.CurrentCultureIgnoreCase) &&
-            a.DatabaseType == b.DatabaseType &&
-            a.ExplicitUsernameIfAny == b.ExplicitUsernameIfAny &&
-            a.ExplicitPasswordIfAny == b.ExplicitPasswordIfAny;
-    }
+    protected static bool AreOnSameServer(DiscoveredServer a, DiscoveredServer b) =>
+        string.Equals(a.Name, b.Name, StringComparison.CurrentCultureIgnoreCase) &&
+        a.DatabaseType == b.DatabaseType &&
+        a.ExplicitUsernameIfAny == b.ExplicitUsernameIfAny &&
+        a.ExplicitPasswordIfAny == b.ExplicitPasswordIfAny;
 
 
     private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
@@ -201,10 +216,13 @@ private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCan
         DataTable cohortDataTable = null;
         SetServer();
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,"About to wait for Semaphore OneCrossServerExtractionAtATime to become available"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                "About to wait for Semaphore OneCrossServerExtractionAtATime to become available"));
         OneCrossServerExtractionAtATime.WaitOne(-1);
         _semaphoreObtained = true;
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Captured Semaphore OneCrossServerExtractionAtATime"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, "Captured Semaphore OneCrossServerExtractionAtATime"));
 
         try
         {
@@ -213,9 +231,11 @@ private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCan
         }
         catch (Exception e)
         {
-            throw new Exception("An error occurred while trying to download the cohort from the Cohort server (in preparation for transfering it to the data server for linkage and extraction)",e);
+            throw new Exception(
+                "An error occurred while trying to download the cohort from the Cohort server (in preparation for transfering it to the data server for linkage and extraction)",
+                e);
         }
-            
+
         //make sure tempdb exists (this covers you for servers where it doesn't exist e.g. mysql or when user has specified a different database name)
         if (!_tempDb.Exists())
             if (CreateTemporaryDatabaseIfNotExists)
@@ -226,30 +246,28 @@ private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCan
 
 
         var tbl = _tempDb.ExpectTable(GetTableName() ?? cohortDataTable.TableName);
-            
-        if(tbl.Exists())
+
+        if (tbl.Exists())
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Found existing table called '{tbl}' in '{_tempDb}'"));
 
-            if(DropExistingCohortTableIfExists)
+            if (DropExistingCohortTableIfExists)
             {
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"About to drop existing table '{tbl}'"));
-                    
+
                 try
                 {
                     tbl.Drop();
                     listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"Dropped existing table '{tbl}'"));
                 }
-                catch(Exception ex)
+                catch (Exception ex)
                 {
                     listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
-                        $"Warning dropping '{tbl}' failed",ex));
+                        $"Warning dropping '{tbl}' failed", ex));
                 }
-
-                    
             }
             else
             {
@@ -265,21 +283,23 @@ private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCan
         {
             // attempt to set primary key of the private identifier to improve
             // query performance. e.g. chi
-            cohortDataTable.PrimaryKey = new[] { cohortDataTable.Columns[Request.ExtractableCohort.GetPrivateIdentifier(true)]};
+            cohortDataTable.PrimaryKey = new[]
+                { cohortDataTable.Columns[Request.ExtractableCohort.GetPrivateIdentifier(true)] };
         }
         catch (Exception ex)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Failed to set primary key on cross server copied cohort.  Query performance may be slow",ex));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    "Failed to set primary key on cross server copied cohort.  Query performance may be slow", ex));
         }
 
         var destination = new DataTableUploadDestination();
         destination.PreInitialize(_tempDb, listener);
         destination.ProcessPipelineData(cohortDataTable, listener, cancellationToken);
-        destination.Dispose(listener,null);
+        destination.Dispose(listener, null);
 
-            
 
-        if(!tbl.Exists())
+        if (!tbl.Exists())
             throw new Exception(
                 $"Table '{tbl}' did not exist despite DataTableUploadDestination completing Successfully!");
 
@@ -292,28 +312,29 @@ private void CopyCohortToDataServer(IDataLoadEventListener listener, GracefulCan
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "About to release Semaphore OneCrossServerExtractionAtATime"));
-        if(_semaphoreObtained)
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                "About to release Semaphore OneCrossServerExtractionAtATime"));
+        if (_semaphoreObtained)
             OneCrossServerExtractionAtATime.Release(1);
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Released Semaphore OneCrossServerExtractionAtATime"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, "Released Semaphore OneCrossServerExtractionAtATime"));
 
         foreach (var table in tablesToCleanup)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to drop table '{table}'"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, $"About to drop table '{table}'"));
             table.Drop();
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Dropped table '{table}'"));
         }
-          
+
         base.Dispose(listener, pipelineFailureExceptionIfAny);
     }
 
     public override void Check(ICheckNotifier notifier)
     {
-            
     }
 
-    public override DataTable TryGetPreview()
-    {
-        throw new NotSupportedException("Previews are not supported for Cross Server extraction since it involves shipping off the cohort into tempdb.");
-    }
+    public override DataTable TryGetPreview() => throw new NotSupportedException(
+        "Previews are not supported for Cross Server extraction since it involves shipping off the cohort into tempdb.");
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteDatasetExtractionSource.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteDatasetExtractionSource.cs
index 983d454890..3657c35e63 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteDatasetExtractionSource.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecuteDatasetExtractionSource.cs
@@ -54,30 +54,37 @@ public class ExecuteDatasetExtractionSource : IPluginDataFlowSource<DataTable>,
 
     public ExtractionTimeTimeCoverageAggregator ExtractionTimeTimeCoverageAggregator { get; set; }
 
-    [DemandsInitialization("Determines the systems behaviour when an extraction query returns 0 rows.  Default (false) is that an error is reported.  If set to true (ticked) then instead a DataTable with 0 rows but all the correct headers will be generated usually resulting in a headers only 0 line/empty extract file")]
+    [DemandsInitialization(
+        "Determines the systems behaviour when an extraction query returns 0 rows.  Default (false) is that an error is reported.  If set to true (ticked) then instead a DataTable with 0 rows but all the correct headers will be generated usually resulting in a headers only 0 line/empty extract file")]
     public bool AllowEmptyExtractions { get; set; }
 
-    [DemandsInitialization("Batch size, number of records to read from source before releasing it into the extraction pipeline", DefaultValue = 10000, Mandatory = true)]
+    [DemandsInitialization(
+        "Batch size, number of records to read from source before releasing it into the extraction pipeline",
+        DefaultValue = 10000, Mandatory = true)]
     public int BatchSize { get; set; }
 
-    [DemandsInitialization("In seconds. Overrides the global timeout for SQL query execution. Use 0 for infinite timeout.", DefaultValue = 50000, Mandatory = true)]
+    [DemandsInitialization(
+        "In seconds. Overrides the global timeout for SQL query execution. Use 0 for infinite timeout.",
+        DefaultValue = 50000, Mandatory = true)]
     public int ExecutionTimeout { get; set; }
 
     [DemandsInitialization(@"Determines how the system achieves DISTINCT on extraction.  These include:
 None - Do not DISTINCT the records, can result in duplication in your extract (not recommended)
 SqlDistinct - Adds the DISTINCT keyword to the SELECT sql sent to the server
 OrderByAndDistinctInMemory - Adds an ORDER BY statement to the query and applies the DISTINCT in memory as records are read from the server (this can help when extracting very large data sets where DISTINCT keyword blocks record streaming until all records are ready to go)"
-        ,DefaultValue = DistinctStrategy.SqlDistinct)]
+        , DefaultValue = DistinctStrategy.SqlDistinct)]
     public DistinctStrategy DistinctStrategy { get; set; }
 
 
     [DemandsInitialization("When DBMS is SqlServer then HASH JOIN should be used instead of regular JOINs")]
     public bool UseHashJoins { get; set; }
 
-    [DemandsInitialization("When DBMS is SqlServer and the extraction is for any of these datasets then HASH JOIN should be used instead of regular JOINs")]
+    [DemandsInitialization(
+        "When DBMS is SqlServer and the extraction is for any of these datasets then HASH JOIN should be used instead of regular JOINs")]
     public Catalogue[] UseHashJoinsForCatalogues { get; set; }
 
-    [DemandsInitialization("Exclusion list.  A collection of Catalogues which will never be considered for HASH JOIN even when UseHashJoins is enabled.  Being on this list takes precedence for a Catalogue even if it is on UseHashJoinsForCatalogues.")]
+    [DemandsInitialization(
+        "Exclusion list.  A collection of Catalogues which will never be considered for HASH JOIN even when UseHashJoins is enabled.  Being on this list takes precedence for a Catalogue even if it is on UseHashJoinsForCatalogues.")]
     public Catalogue[] DoNotUseHashJoinsForCatalogues { get; set; }
 
 
@@ -88,6 +95,7 @@ public class ExecuteDatasetExtractionSource : IPluginDataFlowSource<DataTable>,
     /// a recommended SqlDbType is passed back.
     /// </summary>
     public Dictionary<ExtractableColumn, ExtractTimeTransformationObserved> ExtractTimeTransformationsObserved;
+
     private DbDataCommandDataFlowSource _hostedSource;
 
     protected virtual void Initialize(ExtractDatasetCommand request)
@@ -101,25 +109,28 @@ protected virtual void Initialize(ExtractDatasetCommand request)
         _timeSpentCalculatingDISTINCT = new Stopwatch();
         _timeSpentBuckettingDates = new Stopwatch();
 
-        Request.ColumnsToExtract.Sort();//ensure they are in the right order so we can record the release identifiers
-        
+        Request.ColumnsToExtract.Sort(); //ensure they are in the right order so we can record the release identifiers
+
         //if we have a cached builder already
-        if(request.QueryBuilder == null)
+        if (request.QueryBuilder == null)
             request.GenerateQueryBuilder();
-            
+
         foreach (var substitution in Request.ReleaseIdentifierSubstitutions)
             _extractionIdentifiersidx.Add(substitution.GetRuntimeName());
-            
+
         UniqueReleaseIdentifiersEncountered = new HashSet<object>();
 
         _catalogue = request.Catalogue;
 
         if (!string.IsNullOrWhiteSpace(_catalogue.ValidatorXML))
             ExtractionTimeValidator = new ExtractionTimeValidator(_catalogue, request.ColumnsToExtract);
-          
+
         //if there is a time periodicity ExtractionInformation (AND! it is among the columns the user selected to be extracted)
-        if (_catalogue.TimeCoverage_ExtractionInformation_ID != null && request.ColumnsToExtract.Cast<ExtractableColumn>().Any(c => c.CatalogueExtractionInformation_ID == _catalogue.TimeCoverage_ExtractionInformation_ID))
-            ExtractionTimeTimeCoverageAggregator = new ExtractionTimeTimeCoverageAggregator(_catalogue, request.ExtractableCohort);
+        if (_catalogue.TimeCoverage_ExtractionInformation_ID != null && request.ColumnsToExtract
+                .Cast<ExtractableColumn>().Any(c =>
+                    c.CatalogueExtractionInformation_ID == _catalogue.TimeCoverage_ExtractionInformation_ID))
+            ExtractionTimeTimeCoverageAggregator =
+                new ExtractionTimeTimeCoverageAggregator(_catalogue, request.ExtractableCohort);
         else
             ExtractionTimeTimeCoverageAggregator = null;
     }
@@ -168,14 +179,14 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
 
         Request.ElevateState(ExtractCommandState.WaitingForSQLServer);
 
-        if(_cancel)
+        if (_cancel)
             throw new Exception("User cancelled data extraction");
 
         if (_hostedSource == null)
         {
             StartAudit(Request.QueryBuilder.SQL);
 
-            if(Request.DatasetBundle.DataSet.DisableExtraction)
+            if (Request.DatasetBundle.DataSet.DisableExtraction)
                 throw new Exception(
                     $"Cannot extract {Request.DatasetBundle.DataSet} because DisableExtraction is set to true");
 
@@ -201,15 +212,15 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
             //if we are trying to distinct the records in memory based on release id
             if (DistinctStrategy == DistinctStrategy.OrderByAndDistinctInMemory)
             {
-                var releaseIdentifierColumn =  Request.ReleaseIdentifierSubstitutions.First().GetRuntimeName();
+                var releaseIdentifierColumn = Request.ReleaseIdentifierSubstitutions.First().GetRuntimeName();
 
-                if(chunk != null && chunk.Rows.Count > 0)
+                if (chunk != null && chunk.Rows.Count > 0)
                 {
                     //last release id in the current chunk
                     var lastReleaseId = chunk.Rows[^1][releaseIdentifierColumn];
 
-                    _peeker.AddWhile(_hostedSource,r=>Equals(r[releaseIdentifierColumn], lastReleaseId),chunk);
-                    chunk = MakeDistinct(chunk,listener,cancellationToken);
+                    _peeker.AddWhile(_hostedSource, r => Equals(r[releaseIdentifierColumn], lastReleaseId), chunk);
+                    chunk = MakeDistinct(chunk, listener, cancellationToken);
                 }
             }
         }
@@ -222,10 +233,10 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
         }
         catch (Exception e)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, "Read from source failed",e));
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Read from source failed", e));
         }
 
-        if(cancellationToken.IsCancellationRequested)
+        if (cancellationToken.IsCancellationRequested)
             throw new Exception("Data read cancelled because our cancellationToken was set, aborting data reading");
 
         //if the first chunk is null
@@ -239,16 +250,17 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
         //data exhausted
         if (chunk == null)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Data exhausted after reading {_rowsRead} rows of data ({UniqueReleaseIdentifiersEncountered.Count} unique release identifiers seen)"));
             if (Request != null)
-                Request.CumulativeExtractionResults.DistinctReleaseIdentifiersEncountered = Request.IsBatchResume ? -1 : UniqueReleaseIdentifiersEncountered.Count;
+                Request.CumulativeExtractionResults.DistinctReleaseIdentifiersEncountered =
+                    Request.IsBatchResume ? -1 : UniqueReleaseIdentifiersEncountered.Count;
             return null;
         }
 
         _rowsRead += chunk.Rows.Count;
         //chunk will have datatypes for all the things in the buffer so we can populate our dictionary of facts about what columns/catalogue items have spontaneously changed name/type etc
-        if(ExtractTimeTransformationsObserved == null)
+        if (ExtractTimeTransformationsObserved == null)
             GenerateExtractionTransformObservations(chunk);
 
 
@@ -270,14 +282,18 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
                 ExtractionTimeValidator.Validate(chunk, ValidationColumnName);
 
                 _rowsValidated += chunk.Rows.Count;
-                listener.OnProgress(this,new ProgressEventArgs("Validation",new ProgressMeasurement(_rowsValidated,ProgressType.Records), _timeSpentValidating.Elapsed));
+                listener.OnProgress(this,
+                    new ProgressEventArgs("Validation", new ProgressMeasurement(_rowsValidated, ProgressType.Records),
+                        _timeSpentValidating.Elapsed));
             }
             catch (Exception ex)
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, "Could not validate data chunk",ex));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Error, "Could not validate data chunk", ex));
                 ValidationFailureException = ex;
                 ExtractionTimeValidator = null;
             }
+
         _timeSpentValidating.Stop();
 
         _timeSpentBuckettingDates.Start();
@@ -288,8 +304,11 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
             foreach (DataRow row in chunk.Rows)
                 ExtractionTimeTimeCoverageAggregator.ProcessRow(row);
 
-            listener.OnProgress(this, new ProgressEventArgs("Bucketting Dates",new ProgressMeasurement(_rowsBucketted,ProgressType.Records),_timeSpentCalculatingDISTINCT.Elapsed ));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Bucketting Dates", new ProgressMeasurement(_rowsBucketted, ProgressType.Records),
+                    _timeSpentCalculatingDISTINCT.Elapsed));
         }
+
         _timeSpentBuckettingDates.Stop();
 
         _timeSpentCalculatingDISTINCT.Start();
@@ -310,8 +329,12 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
                         UniqueReleaseIdentifiersEncountered.Add(r[idx]);
                 }
 
-                listener.OnProgress(this,new ProgressEventArgs("Calculating Distinct Release Identifiers",new ProgressMeasurement(UniqueReleaseIdentifiersEncountered.Count, ProgressType.Records),_timeSpentCalculatingDISTINCT.Elapsed ));
+                listener.OnProgress(this,
+                    new ProgressEventArgs("Calculating Distinct Release Identifiers",
+                        new ProgressMeasurement(UniqueReleaseIdentifiersEncountered.Count, ProgressType.Records),
+                        _timeSpentCalculatingDISTINCT.Elapsed));
             }
+
         _timeSpentCalculatingDISTINCT.Stop();
 
         return chunk;
@@ -324,9 +347,10 @@ public virtual DataTable GetChunk(IDataLoadEventListener listener, GracefulCance
     /// <param name="listener"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    private static DataTable MakeDistinct(DataTable chunk, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    private static DataTable MakeDistinct(DataTable chunk, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        var removeDuplicates = new RemoveDuplicates {NoLogging=true};
+        var removeDuplicates = new RemoveDuplicates { NoLogging = true };
         return removeDuplicates.ProcessPipelineData(chunk, listener, cancellationToken);
     }
 
@@ -357,7 +381,9 @@ private void GenerateExtractionTransformObservations(DataTable chunk)
                         chunk.Columns[column.GetRuntimeName()].DataType;
                 }
                 else
+                {
                     ExtractTimeTransformationsObserved[column].FoundAtExtractTime = false;
+                }
             }
         }
     }
@@ -383,13 +409,13 @@ private string GetCommandSQL(IDataLoadEventListener listener)
                 ((QueryBuilder)Request.QueryBuilder).SetLimitationSQL("");
 
                 //find the release identifier substitution (e.g. chi for PROCHI)
-                var substitution =  Request.ReleaseIdentifierSubstitutions.First();
+                var substitution = Request.ReleaseIdentifierSubstitutions.First();
 
                 //add a line at the end of the query to ORDER BY the ReleaseId column (e.g. PROCHI)
                 var orderBySql = $"ORDER BY {substitution.SelectSQL}";
 
                 // don't add the line if it is already there (e.g. because of Retry)
-                if(!Request.QueryBuilder.CustomLines.Any(l=>string.Equals(l.Text,orderBySql)))
+                if (!Request.QueryBuilder.CustomLines.Any(l => string.Equals(l.Text, orderBySql)))
                     Request.QueryBuilder.AddCustomLine(orderBySql, QueryComponent.Postfix);
 
                 break;
@@ -399,18 +425,19 @@ private string GetCommandSQL(IDataLoadEventListener listener)
 
         var sql = Request.QueryBuilder.SQL;
 
-        sql = HackExtractionSQL(sql,listener);
+        sql = HackExtractionSQL(sql, listener);
 
         if (ShouldUseHashedJoins())
         {
             //use hash joins!
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Substituting JOIN for HASH JOIN"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, "Substituting JOIN for HASH JOIN"));
             sql = sql.Replace(" JOIN ", " HASH JOIN ");
         }
 
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"/*Decided on extraction SQL:*/{Environment.NewLine}{sql}"));
-            
+
         return sql;
     }
 
@@ -436,21 +463,21 @@ private bool ShouldUseHashedJoins()
         return false;
     }
 
-    public virtual string HackExtractionSQL(string sql, IDataLoadEventListener listener)
-    {
-        return sql;
-
-    }
+    public virtual string HackExtractionSQL(string sql, IDataLoadEventListener listener) => sql;
 
     private void StartAudit(string sql)
     {
         var dataExportRepo = Request.DataExportRepository;
 
-        var previousAudit = dataExportRepo.GetAllCumulativeExtractionResultsFor(Request.Configuration, Request.DatasetBundle.DataSet).ToArray();
+        var previousAudit = dataExportRepo
+            .GetAllCumulativeExtractionResultsFor(Request.Configuration, Request.DatasetBundle.DataSet).ToArray();
 
         if (Request.IsBatchResume)
         {
-            var match = previousAudit.FirstOrDefault(a => a.ExtractableDataSet_ID == Request.DatasetBundle.DataSet.ID) ?? throw new Exception($"Could not find previous CumulativeExtractionResults for dataset {Request.DatasetBundle.DataSet} despite the Request being marked as a batch resume");
+            var match =
+                previousAudit.FirstOrDefault(a => a.ExtractableDataSet_ID == Request.DatasetBundle.DataSet.ID) ??
+                throw new Exception(
+                    $"Could not find previous CumulativeExtractionResults for dataset {Request.DatasetBundle.DataSet} despite the Request being marked as a batch resume");
             Request.CumulativeExtractionResults = match;
         }
         else
@@ -459,9 +486,12 @@ private void StartAudit(string sql)
             foreach (var audit in previousAudit)
                 audit.DeleteInDatabase();
 
-            var extractionResults = new CumulativeExtractionResults(dataExportRepo, Request.Configuration, Request.DatasetBundle.DataSet, sql);
+            var extractionResults = new CumulativeExtractionResults(dataExportRepo, Request.Configuration,
+                Request.DatasetBundle.DataSet, sql);
 
-            var filterDescriptions = RecursivelyListAllFilterNames(Request.Configuration.GetFilterContainerFor(Request.DatasetBundle.DataSet));
+            var filterDescriptions =
+                RecursivelyListAllFilterNames(
+                    Request.Configuration.GetFilterContainerFor(Request.DatasetBundle.DataSet));
 
             extractionResults.FiltersUsed = filterDescriptions.TrimEnd(',');
             extractionResults.SaveToDatabase();
@@ -474,7 +504,9 @@ private void StartAuditGlobals()
     {
         var repo = GlobalsRequest.RepositoryLocator.DataExportRepository;
 
-        var previousAudit = repo.GetAllObjectsWhere<SupplementalExtractionResults>("ExtractionConfiguration_ID", GlobalsRequest.Configuration.ID)
+        var previousAudit = repo
+            .GetAllObjectsWhere<SupplementalExtractionResults>("ExtractionConfiguration_ID",
+                GlobalsRequest.Configuration.ID)
             .Where(c => c.CumulativeExtractionResults_ID == null);
 
         //delete old audit records
@@ -493,29 +525,28 @@ private string RecursivelyListAllFilterNames(IContainer filterContainer)
             foreach (var subContainer in filterContainer.GetSubContainers())
                 toReturn += RecursivelyListAllFilterNames(subContainer);
 
-        if(filterContainer.GetFilters() != null)
+        if (filterContainer.GetFilters() != null)
             foreach (var f in filterContainer.GetFilters())
                 toReturn += $"{f.Name},";
 
         return toReturn;
     }
+
     public virtual void Dispose(IDataLoadEventListener job, Exception pipelineFailureExceptionIfAny)
     {
-
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public virtual DataTable TryGetPreview()
     {
-        if(Request == ExtractDatasetCommand.EmptyCommand)
+        if (Request == ExtractDatasetCommand.EmptyCommand)
             return new DataTable();
 
         var toReturn = new DataTable();
-        var server = _catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport,false);
+        var server = _catalogue.GetDistinctLiveDatabaseServer(DataAccessContext.DataExport, false);
 
         using (var con = server.GetConnection())
         {
@@ -544,16 +575,19 @@ public virtual void Check(ICheckNotifier notifier)
     {
         if (Request == ExtractDatasetCommand.EmptyCommand)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out",CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Request is ExtractDatasetCommand.EmptyCommand, checking will not be carried out",
+                CheckResult.Warning));
             return;
         }
 
         if (GlobalsRequest != null)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Request is for Globals, checking will not be carried out at source", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Request is for Globals, checking will not be carried out at source", CheckResult.Success));
             return;
         }
-            
+
         if (Request == null)
         {
             notifier.OnCheckPerformed(new CheckEventArgs("ExtractionRequest has not been set", CheckResult.Fail));
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecutePkSynthesizerDatasetExtractionSource.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecutePkSynthesizerDatasetExtractionSource.cs
index 5318ec46a1..401315518d 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecutePkSynthesizerDatasetExtractionSource.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/ExecutePkSynthesizerDatasetExtractionSource.cs
@@ -30,6 +30,7 @@ public class ExecutePkSynthesizerDatasetExtractionSource : ExecuteDatasetExtract
 {
     private const string SYNTH_PK_COLUMN = "SynthesizedPk";
     private bool _synthesizePkCol = false;
+
     public override string HackExtractionSQL(string sql, IDataLoadEventListener listener)
     {
         // let's look for primary keys in the Extraction Information
@@ -51,7 +52,8 @@ public override string HackExtractionSQL(string sql, IDataLoadEventListener list
                 var syntaxHelper = Request.Catalogue.GetQuerySyntaxHelper();
 
                 Request.QueryBuilder.AddColumn(
-                    new SpontaneouslyInventedColumn(new MemoryRepository(),SYNTH_PK_COLUMN,syntaxHelper.HowDoWeAchieveMd5(newSql))
+                    new SpontaneouslyInventedColumn(new MemoryRepository(), SYNTH_PK_COLUMN,
+                        syntaxHelper.HowDoWeAchieveMd5(newSql))
                     {
                         HashOnDataRelease = true,
                         IsPrimaryKey = true,
@@ -66,7 +68,7 @@ public override string HackExtractionSQL(string sql, IDataLoadEventListener list
 
     private IEnumerable<ITableInfo> GetProperTables()
     {
-        if(Request.QueryBuilder.SQLOutOfDate)
+        if (Request.QueryBuilder.SQLOutOfDate)
             Request.QueryBuilder.RegenerateSQL();
 
         return Request.QueryBuilder.TablesUsedInQuery.Where(ti => !ti.IsLookupTable());
@@ -84,39 +86,46 @@ public override DataTable GetChunk(IDataLoadEventListener listener, GracefulCanc
         var catalogueItemPkColumns = GetCatalogueItemPrimaryKeys().Select(c => c.GetRuntimeName()).ToArray();
 
         if (catalogueItemPkColumns.Any())
-            chunk.PrimaryKey = chunk.Columns.Cast<DataColumn>().Where(c => catalogueItemPkColumns.Contains(c.ColumnName, StringComparer.CurrentCultureIgnoreCase)).ToArray();
-        else
-        if (_synthesizePkCol)
+            chunk.PrimaryKey = chunk.Columns.Cast<DataColumn>().Where(c =>
+                catalogueItemPkColumns.Contains(c.ColumnName, StringComparer.CurrentCultureIgnoreCase)).ToArray();
+        else if (_synthesizePkCol)
             chunk.PrimaryKey = new[] { chunk.Columns[SYNTH_PK_COLUMN] };
-                
+
         return chunk;
     }
 
     public override void Check(ICheckNotifier notifier)
     {
         base.Check(notifier);
-        if (Request == null || Request == ExtractDatasetCommand.EmptyCommand) // it is the globals, and there is no PK involved in there... although there should be...
+        if (Request == null ||
+            Request == ExtractDatasetCommand
+                .EmptyCommand) // it is the globals, and there is no PK involved in there... although there should be...
             return;
 
         var cataloguePrimaryKeys = GetCatalogueItemPrimaryKeys().ToArray();
         if (!cataloguePrimaryKeys.Any())
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"PKSynthesizer:No CatalogueItems marked IsPrimaryKey in '{Request.SelectedDataSets}'",CheckResult.Warning) );
+                $"PKSynthesizer:No CatalogueItems marked IsPrimaryKey in '{Request.SelectedDataSets}'",
+                CheckResult.Warning));
 
             var columnInfoPrimaryKeys = GetColumnInfoPrimaryKeys().ToArray();
 
             if (columnInfoPrimaryKeys.Any())
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"PKSynthesizer:Found ColumnInfo(s) marked IsPrimaryKey in '{Request.SelectedDataSets}'{string.Join(",", columnInfoPrimaryKeys.Select(c => c.Name))}", CheckResult.Success));
+                    $"PKSynthesizer:Found ColumnInfo(s) marked IsPrimaryKey in '{Request.SelectedDataSets}'{string.Join(",", columnInfoPrimaryKeys.Select(c => c.Name))}",
+                    CheckResult.Success));
             else
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"PKSynthesizer:No ColumnInfo marked IsPrimaryKey in '{Request.SelectedDataSets}'", CheckResult.Fail));
-
+                    $"PKSynthesizer:No ColumnInfo marked IsPrimaryKey in '{Request.SelectedDataSets}'",
+                    CheckResult.Fail));
         }
         else
+        {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"PKSynthesizer:Found CatalogueItem(s) marked IsPrimaryKey in '{Request.SelectedDataSets}'{string.Join(",", cataloguePrimaryKeys.Select(c => c.GetRuntimeName()))}", CheckResult.Success));
+                $"PKSynthesizer:Found CatalogueItem(s) marked IsPrimaryKey in '{Request.SelectedDataSets}'{string.Join(",", cataloguePrimaryKeys.Select(c => c.GetRuntimeName()))}",
+                CheckResult.Success));
+        }
     }
 
     private IEnumerable<IColumn> GetCatalogueItemPrimaryKeys()
@@ -134,6 +143,6 @@ private IEnumerable<IColumn> GetCatalogueItemPrimaryKeys()
 
     private IEnumerable<ColumnInfo> GetColumnInfoPrimaryKeys()
     {
-        return GetProperTables().SelectMany(t=>t.ColumnInfos).Where(column => column.IsPrimaryKey);
+        return GetProperTables().SelectMany(t => t.ColumnInfos).Where(column => column.IsPrimaryKey);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/RowPeeker.cs b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/RowPeeker.cs
index 3ad2147234..3a897fad35 100644
--- a/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/RowPeeker.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/Pipeline/Sources/RowPeeker.cs
@@ -29,10 +29,8 @@ public DataTable AddPeekedRowsIfAny(DataTable chunk, bool clearPeek = true)
     {
         //if we have a peeked record
         if (_peekedRecord != null)
-        {
             try
             {
-
                 //if we are at the end of the batch
                 if (chunk == null)
                 {
@@ -48,19 +46,18 @@ public DataTable AddPeekedRowsIfAny(DataTable chunk, bool clearPeek = true)
                 // We "clone" the row
                 newRow.ItemArray = _peekedRecord.ItemArray;
                 //add the peeked record
-                chunk.Rows.InsertAt(newRow,0);
+                chunk.Rows.InsertAt(newRow, 0);
             }
             finally
             {
                 //clear the peek
-                if(clearPeek)
+                if (clearPeek)
                     _peekedRecord = null;
             }
-        }
 
         return chunk;
     }
-        
+
     /// <summary>
     /// Reads records one at a time from the <paramref name="source"/> until a record is read where the
     /// <paramref name="equalityFunc"/> returns false.  Rows read (that passed <paramref name="equalityFunc"/>)
@@ -69,18 +66,21 @@ public DataTable AddPeekedRowsIfAny(DataTable chunk, bool clearPeek = true)
     /// <param name="source"></param>
     /// <param name="equalityFunc"></param>
     /// <param name="chunk"></param>
-    public void AddWhile(IDbDataCommandDataFlowSource source, Func<DataRow,bool> equalityFunc,DataTable chunk)
+    public void AddWhile(IDbDataCommandDataFlowSource source, Func<DataRow, bool> equalityFunc, DataTable chunk)
     {
-        if(_peekedRecord != null)
-            throw new Exception("Cannot AddWhile when there is an existing peeked record, call AddPeekedRowsIfAny to drain the Peek");
+        if (_peekedRecord != null)
+            throw new Exception(
+                "Cannot AddWhile when there is an existing peeked record, call AddPeekedRowsIfAny to drain the Peek");
 
         DataRow r;
-                        
+
         //while we are still successfully reading rows and those rows have the same release id
-        while((r = source.ReadOneRow()) != null)
-            if(equalityFunc(r))
+        while ((r = source.ReadOneRow()) != null)
+            if (equalityFunc(r))
                 //add it to the current chunk
+            {
                 chunk.ImportRow(r);
+            }
             else
             {
                 //match was failure on this new record (but the data is not exhausted).  So the peek becomes this new record
diff --git a/Rdmp.Core/DataExport/DataExtraction/UserPicks/Bundle.cs b/Rdmp.Core/DataExport/DataExtraction/UserPicks/Bundle.cs
index 213ad1ccd9..4d8dbb67a1 100644
--- a/Rdmp.Core/DataExport/DataExtraction/UserPicks/Bundle.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/UserPicks/Bundle.cs
@@ -29,7 +29,7 @@ protected Bundle(object[] finalObjectsDoNotAddToThisLater)
         foreach (var o in finalObjectsDoNotAddToThisLater)
             States.Add(o, ExtractCommandState.NotLaunched);
     }
-        
+
     public void SetAllStatesTo(ExtractCommandState state)
     {
         foreach (var k in States.Keys.ToArray())
@@ -44,5 +44,6 @@ public void DropContent(object toDrop)
         //tell child to remove the object too
         OnDropContent(toDrop);
     }
+
     protected abstract void OnDropContent(object toDrop);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataExtraction/UserPicks/BundledLookupTable.cs b/Rdmp.Core/DataExport/DataExtraction/UserPicks/BundledLookupTable.cs
index cd08a4b7c1..9f6fc8cbb5 100644
--- a/Rdmp.Core/DataExport/DataExtraction/UserPicks/BundledLookupTable.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/UserPicks/BundledLookupTable.cs
@@ -23,16 +23,13 @@ public class BundledLookupTable : IBundledLookupTable
 
     public BundledLookupTable(ITableInfo tableInfo)
     {
-        if(!tableInfo.IsLookupTable())
+        if (!tableInfo.IsLookupTable())
             throw new Exception($"TableInfo {tableInfo} is not a lookup table");
 
         TableInfo = tableInfo;
     }
 
-    public override string ToString()
-    {
-        return TableInfo.ToString();
-    }
+    public override string ToString() => TableInfo.ToString();
 
     /// <summary>
     /// Reads lookup data from the <see cref="TableInfo"/> using <see cref="DataAccessContext.DataExport"/>
@@ -49,11 +46,12 @@ public DataTable GetDataTable()
         {
             con.Open();
             using (var da = server.GetDataAdapter(
-                       server.GetCommand(GetDataTableFetchSql(),con)))
+                       server.GetCommand(GetDataTableFetchSql(), con)))
             {
                 da.Fill(dt);
             }
         }
+
         return dt;
     }
 
@@ -68,7 +66,7 @@ public string GetDataTableFetchSql()
 
             // Extract core columns only (and definetly not extraction identifiers)
             var eis = cata.GetAllExtractionInformation(ExtractionCategory.Core)
-                .Where(e=>!e.IsExtractionIdentifier)
+                .Where(e => !e.IsExtractionIdentifier)
                 .ToArray();
 
             if (eis.Length > 0)
@@ -78,7 +76,8 @@ public string GetDataTableFetchSql()
                 return qb.SQL;
             }
 
-            throw new QueryBuildingException($"Lookup table '{TableInfo}' has a Catalogue defined '{cata}' but it has no Core extractable columns");
+            throw new QueryBuildingException(
+                $"Lookup table '{TableInfo}' has a Catalogue defined '{cata}' but it has no Core extractable columns");
         }
 
         return $"select * from {TableInfo.GetFullyQualifiedName()}";
diff --git a/Rdmp.Core/DataExport/DataExtraction/UserPicks/ExtractableDatasetBundle.cs b/Rdmp.Core/DataExport/DataExtraction/UserPicks/ExtractableDatasetBundle.cs
index 50980aff42..aabdb17bef 100644
--- a/Rdmp.Core/DataExport/DataExtraction/UserPicks/ExtractableDatasetBundle.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/UserPicks/ExtractableDatasetBundle.cs
@@ -26,11 +26,13 @@ public class ExtractableDatasetBundle : Bundle, IExtractableDatasetBundle
     public List<SupportingDocument> Documents { get; private set; }
     public List<SupportingSQLTable> SupportingSQL { get; private set; }
     public List<IBundledLookupTable> LookupTables { get; private set; }
-        
 
-    public ExtractableDatasetBundle(IExtractableDataSet dataSet, SupportingDocument[] documents, SupportingSQLTable[] supportingSQL, ITableInfo[] lookupTables) : 
+
+    public ExtractableDatasetBundle(IExtractableDataSet dataSet, SupportingDocument[] documents,
+        SupportingSQLTable[] supportingSQL, ITableInfo[] lookupTables) :
         base(
-            new [] {(object)dataSet}.Union(documents).Union(supportingSQL).Union(lookupTables).ToArray() //pass all the objects to the base class so it can allocate initial States
+            new[] { (object)dataSet }.Union(documents).Union(supportingSQL).Union(lookupTables)
+                .ToArray() //pass all the objects to the base class so it can allocate initial States
         )
     {
         DataSet = dataSet;
@@ -43,15 +45,12 @@ public ExtractableDatasetBundle(IExtractableDataSet dataSet)
         : this(dataSet, Array.Empty<SupportingDocument>(), Array.Empty<SupportingSQLTable>(), Array.Empty<TableInfo>())
     {
     }
-        
-    public override string ToString()
-    {
-        return $"{DataSet} Bundle";
-    }
+
+    public override string ToString() => $"{DataSet} Bundle";
 
     protected override void OnDropContent(object toDrop)
     {
-        if(toDrop is ExtractableDataSet)
+        if (toDrop is ExtractableDataSet)
             throw new NotSupportedException(
                 $"Cannot drop {toDrop} from Bundle {this}, you cannot perform an extraction without the dataset component (only documents/lookups etc are optional)");
 
diff --git a/Rdmp.Core/DataExport/DataExtraction/UserPicks/GlobalsBundle.cs b/Rdmp.Core/DataExport/DataExtraction/UserPicks/GlobalsBundle.cs
index 8bd510d1a0..b38fa21f73 100644
--- a/Rdmp.Core/DataExport/DataExtraction/UserPicks/GlobalsBundle.cs
+++ b/Rdmp.Core/DataExport/DataExtraction/UserPicks/GlobalsBundle.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.DataExport.DataExtraction.UserPicks;
 /// Bundle containing references to all the globally extractable (supplied with every project extraction regardless of dataset) documents and tables that need
 /// to be extracted/copied to the output ExtractionDirectory.
 /// </summary>
-public class GlobalsBundle:Bundle
+public class GlobalsBundle : Bundle
 {
     public List<SupportingDocument> Documents { get; private set; }
     public List<SupportingSQLTable> SupportingSQL { get; private set; }
@@ -30,10 +30,7 @@ public GlobalsBundle(SupportingDocument[] documents, SupportingSQLTable[] suppor
         SupportingSQL = supportingSQL.ToList();
     }
 
-    public bool Any()
-    {
-        return Documents.Any() || SupportingSQL.Any();
-    }
+    public bool Any() => Documents.Any() || SupportingSQL.Any();
 
 
     protected override void OnDropContent(object toDrop)
@@ -52,6 +49,5 @@ protected override void OnDropContent(object toDrop)
 
 
         throw new NotSupportedException($"Did not know how to drop object of type {toDrop.GetType()}");
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Audit/ReleaseLog.cs b/Rdmp.Core/DataExport/DataRelease/Audit/ReleaseLog.cs
index 13a1cd8613..872768ed97 100644
--- a/Rdmp.Core/DataExport/DataRelease/Audit/ReleaseLog.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Audit/ReleaseLog.cs
@@ -25,7 +25,7 @@ namespace Rdmp.Core.DataExport.DataRelease.Audit;
 /// only 1 ReleaseLog entry per CumulativeExtractionResult.  This means that once a dataset has been released it cannot be extracted/released again (this
 /// is intended behaviour).  If you want to re run a released ExtractionConfiguration then you should clone it.</para>
 /// </summary>
-public class ReleaseLog : DatabaseEntity,IReleaseLog
+public class ReleaseLog : DatabaseEntity, IReleaseLog
 {
     public int CumulativeExtractionResults_ID
     {
@@ -36,19 +36,19 @@ public int CumulativeExtractionResults_ID
     public string Username
     {
         get => _username;
-        set => SetField(ref _username , value);
+        set => SetField(ref _username, value);
     }
 
     public DateTime DateOfRelease
     {
         get => _dateOfRelease;
-        set => SetField(ref  _dateOfRelease, value);
+        set => SetField(ref _dateOfRelease, value);
     }
 
     public string MD5OfDatasetFile
     {
         get => _md5OfDatasetFile;
-        set => SetField(ref  _md5OfDatasetFile, value);
+        set => SetField(ref _md5OfDatasetFile, value);
     }
 
     public string DatasetState
@@ -72,7 +72,7 @@ public bool IsPatch
     public string ReleaseFolder
     {
         get => _releaseFolder;
-        set => SetField(ref _releaseFolder , value);
+        set => SetField(ref _releaseFolder, value);
     }
 
 
@@ -86,13 +86,16 @@ public string ReleaseFolder
     private string _releaseFolder;
 
     private string _datasetName;
+
     public override string ToString()
     {
         if (_datasetName == null)
             try
             {
-                ICumulativeExtractionResults cumulativeExtractionResults = Repository.GetObjectByID<CumulativeExtractionResults>(CumulativeExtractionResults_ID);
-                IExtractableDataSet ds = Repository.GetObjectByID<ExtractableDataSet>(cumulativeExtractionResults.ExtractableDataSet_ID);
+                ICumulativeExtractionResults cumulativeExtractionResults =
+                    Repository.GetObjectByID<CumulativeExtractionResults>(CumulativeExtractionResults_ID);
+                IExtractableDataSet ds =
+                    Repository.GetObjectByID<ExtractableDataSet>(cumulativeExtractionResults.ExtractableDataSet_ID);
                 _datasetName = ds.ToString();
             }
             catch (Exception e)
@@ -109,27 +112,33 @@ public override string ToString()
                 DateOfRelease,
                 Username);
     }
+
     public ReleaseLog()
     {
-
     }
-    public ReleaseLog(IDataExportRepository repository,ReleasePotential dataset, ReleaseEnvironmentPotential environment,bool isPatch,DirectoryInfo releaseDirectory,FileInfo datasetFileBeingReleased)
+
+    public ReleaseLog(IDataExportRepository repository, ReleasePotential dataset,
+        ReleaseEnvironmentPotential environment, bool isPatch, DirectoryInfo releaseDirectory,
+        FileInfo datasetFileBeingReleased)
     {
         repository.InsertAndHydrate(this,
             new Dictionary<string, object>
             {
-                {"CumulativeExtractionResults_ID", dataset.DatasetExtractionResult.ID},
-                {"Username", Environment.UserName},
-                {"DateOfRelease", DateTime.Now},
-                {"MD5OfDatasetFile", datasetFileBeingReleased == null ? "X" : UsefulStuff.HashFile(datasetFileBeingReleased.FullName)},
-                {"DatasetState", dataset.DatasetExtractionResult.ToString()},
-                {"EnvironmentState", environment.Assesment.ToString()},
-                {"IsPatch", isPatch},
-                {"ReleaseFolder", releaseDirectory.FullName}
+                { "CumulativeExtractionResults_ID", dataset.DatasetExtractionResult.ID },
+                { "Username", Environment.UserName },
+                { "DateOfRelease", DateTime.Now },
+                {
+                    "MD5OfDatasetFile",
+                    datasetFileBeingReleased == null ? "X" : UsefulStuff.HashFile(datasetFileBeingReleased.FullName)
+                },
+                { "DatasetState", dataset.DatasetExtractionResult.ToString() },
+                { "EnvironmentState", environment.Assesment.ToString() },
+                { "IsPatch", isPatch },
+                { "ReleaseFolder", releaseDirectory.FullName }
             });
     }
 
-    public ReleaseLog(IDataExportRepository repository, DbDataReader r):base(repository,r)
+    public ReleaseLog(IDataExportRepository repository, DbDataReader r) : base(repository, r)
     {
         CumulativeExtractionResults_ID = Convert.ToInt32(r["CumulativeExtractionResults_ID"]);
         Username = r["Username"].ToString();
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/BasicDataReleaseDestination.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/BasicDataReleaseDestination.cs
index ab70177c4d..3737455ef7 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/BasicDataReleaseDestination.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/BasicDataReleaseDestination.cs
@@ -22,10 +22,10 @@ namespace Rdmp.Core.DataExport.DataRelease.Pipeline;
 /// <summary>
 /// Default release pipeline destination implementation wraps Release Engine for the supplied ReleaseData.
 /// </summary>
-public class BasicDataReleaseDestination : IPluginDataFlowComponent<ReleaseAudit>, IDataFlowDestination<ReleaseAudit>, IPipelineRequirement<Project>, IPipelineRequirement<ReleaseData>
+public class BasicDataReleaseDestination : IPluginDataFlowComponent<ReleaseAudit>, IDataFlowDestination<ReleaseAudit>,
+    IPipelineRequirement<Project>, IPipelineRequirement<ReleaseData>
 {
-    [DemandsNestedInitialization]
-    public ReleaseEngineSettings ReleaseSettings { get; set; }
+    [DemandsNestedInitialization] public ReleaseEngineSettings ReleaseSettings { get; set; }
 
     private ReleaseData _releaseData;
     private Project _project;
@@ -33,17 +33,21 @@ public class BasicDataReleaseDestination : IPluginDataFlowComponent<ReleaseAudit
     private ReleaseEngine _engine;
     private List<IExtractionConfiguration> _configurationReleased;
 
-    public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (releaseAudit == null)
             return null;
 
         if (releaseAudit.ReleaseFolder == null)
-            throw new ArgumentException("This component needs a destination folder! Did you forget to introduce and initialize the ReleaseFolderProvider in the pipeline?");
+            throw new ArgumentException(
+                "This component needs a destination folder! Did you forget to introduce and initialize the ReleaseFolderProvider in the pipeline?");
 
         if (_releaseData.ReleaseState == ReleaseState.DoingPatch)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "CumulativeExtractionResults for datasets not included in the Patch will now be erased."));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "CumulativeExtractionResults for datasets not included in the Patch will now be erased."));
 
             var recordsDeleted = 0;
 
@@ -51,22 +55,25 @@ public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEven
             {
                 var current = configuration;
                 var currentResults = configuration.CumulativeExtractionResults;
-                
+
                 //foreach existing CumulativeExtractionResults if it is not included in the patch then it should be deleted
-                foreach (var redundantResult in currentResults.Where(r => _releaseData.ConfigurationsForRelease[current].All(rp => rp.DataSet.ID != r.ExtractableDataSet_ID)))
+                foreach (var redundantResult in currentResults.Where(r =>
+                             _releaseData.ConfigurationsForRelease[current]
+                                 .All(rp => rp.DataSet.ID != r.ExtractableDataSet_ID)))
                 {
                     redundantResult.DeleteInDatabase();
                     recordsDeleted++;
                 }
             }
-                
+
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Deleted {recordsDeleted} old CumulativeExtractionResults (That were not included in the final Patch you are preparing)"));
         }
 
         _engine = new ReleaseEngine(_project, ReleaseSettings, listener, releaseAudit);
 
-        _engine.DoRelease(_releaseData.ConfigurationsForRelease, _releaseData.EnvironmentPotentials, isPatch: _releaseData.ReleaseState == ReleaseState.DoingPatch);
+        _engine.DoRelease(_releaseData.ConfigurationsForRelease, _releaseData.EnvironmentPotentials,
+            _releaseData.ReleaseState == ReleaseState.DoingPatch);
 
         _destinationFolder = _engine.ReleaseAudit.ReleaseFolder;
         _configurationReleased = _engine.ConfigurationsReleased;
@@ -77,7 +84,6 @@ public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEven
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
         if (pipelineFailureExceptionIfAny != null && _releaseData != null)
-        {
             try
             {
                 var remnantsDeleted = 0;
@@ -95,9 +101,10 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
             }
             catch (Exception e1)
             {
-                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Error occurred when trying to clean up remnant ReleaseLogEntries", e1));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Error,
+                        "Error occurred when trying to clean up remnant ReleaseLogEntries", e1));
             }
-        }
 
         if (pipelineFailureExceptionIfAny == null && _destinationFolder != null)
         {
@@ -109,10 +116,12 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
                 config.IsReleased = true;
                 config.SaveToDatabase();
             }
+
             if (ReleaseSettings.DeleteFilesOnSuccess)
             {
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Cleaning up..."));
-                ExtractionDirectory.CleanupExtractionDirectory(this, _project.ExtractionDirectory, _configurationReleased, listener);
+                ExtractionDirectory.CleanupExtractionDirectory(this, _project.ExtractionDirectory,
+                    _configurationReleased, listener);
             }
 
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "All done!"));
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/FixedReleaseSource.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/FixedReleaseSource.cs
index e49670f6c5..2f36e451c0 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/FixedReleaseSource.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/FixedReleaseSource.cs
@@ -28,7 +28,8 @@ namespace Rdmp.Core.DataExport.DataRelease.Pipeline;
 /// Extraction Destinations will return an implementation of this class based on the extraction method used.
 /// </summary>
 /// <typeparam name="T">The type which is passed around in the pipeline</typeparam>
-public abstract class FixedReleaseSource<T> : ICheckable, IPipelineRequirement<ReleaseData>, IDataFlowSource<T> where T : ReleaseAudit
+public abstract class FixedReleaseSource<T> : ICheckable, IPipelineRequirement<ReleaseData>, IDataFlowSource<T>
+    where T : ReleaseAudit
 {
     protected readonly T flowData;
     protected ReleaseData _releaseData;
@@ -56,11 +57,8 @@ public T GetChunk(IDataLoadEventListener listener, GracefulCancellationToken can
     public abstract void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny);
 
     public abstract void Abort(IDataLoadEventListener listener);
-        
-    public T TryGetPreview()
-    {
-        return null;
-    }
+
+    public T TryGetPreview() => null;
 
     public void PreInitialize(ReleaseData value, IDataLoadEventListener listener)
     {
@@ -73,7 +71,9 @@ private void Check(ICheckNotifier notifier, bool isRunTime)
         {
             var allPotentials = _releaseData.ConfigurationsForRelease.SelectMany(c => c.Value).ToList();
             var staleDatasets = allPotentials.Where(
-                p => p.DatasetExtractionResult.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyWasDeleted).ToArray();
+                    p => p.DatasetExtractionResult.HasLocalChanges().Evaluation ==
+                         ChangeDescription.DatabaseCopyWasDeleted)
+                .ToArray();
 
             if (staleDatasets.Any())
                 throw new Exception(
@@ -113,7 +113,9 @@ private void Check(ICheckNotifier notifier, bool isRunTime)
             foreach (var environmentPotential in _releaseData.EnvironmentPotentials.Values)
             {
                 environmentPotential.Check(notifier);
-                if (environmentPotential.Assesment != TicketingReleaseabilityEvaluation.Releaseable && environmentPotential.Assesment != TicketingReleaseabilityEvaluation.TicketingLibraryMissingOrNotConfiguredCorrectly)
+                if (environmentPotential.Assesment != TicketingReleaseabilityEvaluation.Releaseable &&
+                    environmentPotential.Assesment != TicketingReleaseabilityEvaluation
+                        .TicketingLibraryMissingOrNotConfiguredCorrectly)
                     throw new Exception(
                         $"Ticketing system decided that the Environment is not ready for release. Reason: {environmentPotential.Reason}");
             }
@@ -121,10 +123,12 @@ private void Check(ICheckNotifier notifier, bool isRunTime)
 
         var projects = _releaseData.ConfigurationsForRelease.Keys.Select(cfr => cfr.Project_ID).Distinct().ToList();
         if (projects.Count != 1)
-            notifier.OnCheckPerformed(new CheckEventArgs("How is it possible that you are doing a release for multiple different projects?", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "How is it possible that you are doing a release for multiple different projects?", CheckResult.Fail));
 
         if (_releaseData.ConfigurationsForRelease.Any(kvp => kvp.Key.Project_ID != projects.First()))
-            notifier.OnCheckPerformed(new CheckEventArgs("Mismatch between project passed into constructor and DoRelease projects", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Mismatch between project passed into constructor and DoRelease projects", CheckResult.Fail));
 
         RunSpecificChecks(notifier, isRunTime);
     }
@@ -148,9 +152,7 @@ protected virtual DirectoryInfo PrepareSourceGlobalFolder()
             var firstGlobal = globalDirectoriesFound.First();
 
             foreach (var directoryInfo in globalDirectoriesFound.Distinct(new DirectoryInfoComparer()))
-            {
                 UsefulStuff.ConfirmContentsOfDirectoryAreTheSame(firstGlobal, directoryInfo);
-            }
 
             return firstGlobal;
         }
@@ -158,14 +160,17 @@ protected virtual DirectoryInfo PrepareSourceGlobalFolder()
         return null;
     }
 
-    protected IEnumerable<DirectoryInfo> GetAllGlobalFolders(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
+    protected IEnumerable<DirectoryInfo> GetAllGlobalFolders(
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
     {
         const string folderName = ExtractionDirectory.GLOBALS_DATA_NAME;
 
         foreach (var releasePotential in toRelease.Value)
         {
-            Debug.Assert(releasePotential.ExtractDirectory.Parent != null, "releasePotential.ExtractDirectory.Parent != null");
-            var globalFolderForThisExtract = releasePotential.ExtractDirectory.Parent.EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).SingleOrDefault();
+            Debug.Assert(releasePotential.ExtractDirectory.Parent != null,
+                "releasePotential.ExtractDirectory.Parent != null");
+            var globalFolderForThisExtract = releasePotential.ExtractDirectory.Parent
+                .EnumerateDirectories(folderName, SearchOption.TopDirectoryOnly).SingleOrDefault();
 
             if (globalFolderForThisExtract == null) //this particular release didn't include globals/custom data at all
                 continue;
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/FlatFileReleaseSource.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/FlatFileReleaseSource.cs
index a9548d37aa..4ef9a398d6 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/FlatFileReleaseSource.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/FlatFileReleaseSource.cs
@@ -18,13 +18,12 @@ namespace Rdmp.Core.DataExport.DataRelease.Pipeline;
 /// <typeparam name="T">The ReleaseAudit object passed around in the pipeline</typeparam>
 public class FlatFileReleaseSource<T> : FixedReleaseSource<ReleaseAudit>
 {
-    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-    {
-        return flowData ?? new ReleaseAudit
+    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken) =>
+        flowData ?? new ReleaseAudit
         {
             SourceGlobalFolder = PrepareSourceGlobalFolder()
         };
-    }
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -38,7 +37,6 @@ public override void Abort(IDataLoadEventListener listener)
 
     protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTime)
     {
-            
     }
 
     protected override DirectoryInfo PrepareSourceGlobalFolder()
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/MsSqlReleaseSource.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/MsSqlReleaseSource.cs
index 6cded4f5ea..3c043a014b 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/MsSqlReleaseSource.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/MsSqlReleaseSource.cs
@@ -35,7 +35,8 @@ public MsSqlReleaseSource(ICatalogueRepository catalogueRepository)
         _catalogueRepository = catalogueRepository;
     }
 
-    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var sourceFolder = GetSourceFolder();
         Debug.Assert(sourceFolder != null, "sourceFolder != null");
@@ -53,7 +54,8 @@ protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener, Gr
 
             File.Copy(Path.Combine(_dataPathMap.FullName, $"{databaseName}.mdf"), Path.Combine(dbOutputFolder.FullName,
                 $"{databaseName}.mdf"));
-            File.Copy(Path.Combine(_dataPathMap.FullName, $"{databaseName}_log.ldf"), Path.Combine(dbOutputFolder.FullName,
+            File.Copy(Path.Combine(_dataPathMap.FullName, $"{databaseName}_log.ldf"), Path.Combine(
+                dbOutputFolder.FullName,
                 $"{databaseName}_log.ldf"));
             File.Delete(Path.Combine(_dataPathMap.FullName, $"{databaseName}.mdf"));
             File.Delete(Path.Combine(_dataPathMap.FullName, $"{databaseName}_log.ldf"));
@@ -66,7 +68,8 @@ private DirectoryInfo GetSourceFolder()
     {
         var extractDir = _releaseData.ConfigurationsForRelease.First().Key.GetProject().ExtractionDirectory;
 
-        return new ExtractionDirectory(extractDir, _releaseData.ConfigurationsForRelease.First().Key).ExtractionDirectoryInfo;
+        return new ExtractionDirectory(extractDir, _releaseData.ConfigurationsForRelease.First().Key)
+            .ExtractionDirectoryInfo;
     }
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
@@ -82,11 +85,14 @@ public override void Abort(IDataLoadEventListener listener)
     protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTime)
     {
         if (!_releaseData.ReleaseGlobals || _releaseData.ReleaseState == ReleaseState.DoingPatch)
-            notifier.OnCheckPerformed(new CheckEventArgs("You cannot untick globals or release a subset of datasets when releasing from a DB", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "You cannot untick globals or release a subset of datasets when releasing from a DB",
+                CheckResult.Fail));
 
         var foundConnection = string.Empty;
         var tables = new List<string>();
-        foreach (var cumulativeResult in _releaseData.ConfigurationsForRelease.SelectMany(x => x.Key.CumulativeExtractionResults))
+        foreach (var cumulativeResult in _releaseData.ConfigurationsForRelease.SelectMany(x =>
+                     x.Key.CumulativeExtractionResults))
         {
             if (cumulativeResult.DestinationDescription.Split('|').Length != 3)
                 throw new Exception("The extraction did not generate a description that can be parsed. " +
@@ -101,8 +107,9 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
                 foundConnection = candidate;
 
             if (foundConnection != candidate) // ...then we check that all other candidates point to the same DB
-                throw new Exception("You are trying to extract from multiple servers or databases. This is not allowed! " +
-                                    "Please re-run the extracts against the same database.");
+                throw new Exception(
+                    "You are trying to extract from multiple servers or databases. This is not allowed! " +
+                    "Please re-run the extracts against the same database.");
 
             foreach (var supplementalResult in cumulativeResult.SupplementalExtractionResults
                          .Where(x => x.IsReferenceTo(typeof(SupportingSQLTable)) ||
@@ -118,12 +125,14 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
                 tables.Add(supplementalResult.DestinationDescription.Split('|')[2]);
 
                 if (foundConnection != candidate) // ...then we check that all other candidates point to the same DB
-                    throw new Exception("You are trying to extract from multiple servers or databases. This is not allowed! " +
-                                        "Please re-run the extracts against the same database.");
+                    throw new Exception(
+                        "You are trying to extract from multiple servers or databases. This is not allowed! " +
+                        "Please re-run the extracts against the same database.");
             }
         }
 
-        foreach (var globalResult in _releaseData.ConfigurationsForRelease.SelectMany(x => x.Key.SupplementalExtractionResults)
+        foreach (var globalResult in _releaseData.ConfigurationsForRelease
+                     .SelectMany(x => x.Key.SupplementalExtractionResults)
                      .Where(x => x.IsReferenceTo(typeof(SupportingSQLTable)) ||
                                  x.IsReferenceTo(typeof(TableInfo))))
         {
@@ -140,8 +149,9 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
                 foundConnection = candidate;
 
             if (foundConnection != candidate) // ...then we check that all other candidates point to the same DB
-                throw new Exception("You are trying to extract from multiple servers or databases. This is not allowed! " +
-                                    "Please re-run the extracts against the same database.");
+                throw new Exception(
+                    "You are trying to extract from multiple servers or databases. This is not allowed! " +
+                    "Please re-run the extracts against the same database.");
         }
 
         var externalServerId = int.Parse(foundConnection.Split('|')[0]);
@@ -154,21 +164,15 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
             throw new Exception(
                 $"The selected Server ({externalServer.Name}) must have a Data Path in order to be used as an extraction destination.");
 
-        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, setInitialDatabase: false);
+        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, false);
         _database = server.ExpectDatabase(dbName);
 
-        if (!_database.Exists())
-        {
-            throw new Exception($"Database {_database} does not exist!");
-        }
+        if (!_database.Exists()) throw new Exception($"Database {_database} does not exist!");
 
         foreach (var table in tables)
         {
             var foundTable = _database.ExpectTable(table);
-            if (!foundTable.Exists())
-            {
-                throw new Exception($"Table {table} does not exist!");
-            }
+            if (!foundTable.Exists()) throw new Exception($"Table {table} does not exist!");
         }
 
         var spuriousTables = _database.DiscoverTables(false).Where(t => !tables.Contains(t.GetRuntimeName())).ToList();
@@ -177,10 +181,8 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
                 CheckResult.Warning,
                 null,
                 "Are you sure you want to continue the release process?")))
-        {
             if (!isRunTime)
                 throw new Exception("Release aborted by user.");
-        }
 
         var sourceFolder = GetSourceFolder();
         var dbOutputFolder = sourceFolder.CreateSubdirectory(ExtractionDirectory.MASTER_DATA_FOLDER_NAME);
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/NullReleaseSource.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/NullReleaseSource.cs
index d7ed195b03..e0f1fdafef 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/NullReleaseSource.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/NullReleaseSource.cs
@@ -17,10 +17,8 @@ namespace Rdmp.Core.DataExport.DataRelease.Pipeline;
 /// <typeparam name="T">The ReleaseAudit object passed around in the pipeline</typeparam>
 public class NullReleaseSource<T> : FixedReleaseSource<ReleaseAudit>
 {
-    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-    {
-        throw new NotImplementedException();
-    }
+    protected override ReleaseAudit GetChunkImpl(IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken) => throw new NotImplementedException();
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
@@ -36,8 +34,5 @@ protected override void RunSpecificChecks(ICheckNotifier notifier, bool isRunTim
     {
     }
 
-    public override string ToString()
-    {
-        return "Fixed Release Source";
-    }
+    public override string ToString() => "Fixed Release Source";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseData.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseData.cs
index bd8cfbb79e..2214b7c58c 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseData.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseData.cs
@@ -24,14 +24,14 @@ public class ReleaseData
     public Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential> EnvironmentPotentials { get; set; }
     public Dictionary<IExtractionConfiguration, IEnumerable<ISelectedDataSets>> SelectedDatasets { get; set; }
     public bool ReleaseGlobals { get; set; }
-        
+
     public ReleaseState ReleaseState { get; set; }
-        
+
     public ReleaseData(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         RepositoryLocator = repositoryLocator;
         ConfigurationsForRelease = new Dictionary<IExtractionConfiguration, List<ReleasePotential>>();
         EnvironmentPotentials = new Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential>();
         SelectedDatasets = new Dictionary<IExtractionConfiguration, IEnumerable<ISelectedDataSets>>();
-    } 
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseFolderProvider.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseFolderProvider.cs
index 261f8955bc..46c79f85ce 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseFolderProvider.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseFolderProvider.cs
@@ -20,21 +20,22 @@ namespace Rdmp.Core.DataExport.DataRelease.Pipeline;
 /// Middle component for preparing the Release Folders for the Release Pipeline.
 /// Some destination components will complain if this is not present!
 /// </summary>
-public class ReleaseFolderProvider : IPluginDataFlowComponent<ReleaseAudit>, IPipelineRequirement<Project>, IPipelineRequirement<ReleaseData>
+public class ReleaseFolderProvider : IPluginDataFlowComponent<ReleaseAudit>, IPipelineRequirement<Project>,
+    IPipelineRequirement<ReleaseData>
 {
     private Project _project;
     private ReleaseData _releaseData;
     private DirectoryInfo _releaseFolder;
 
-    [DemandsNestedInitialization]
-    public ReleaseFolderSettings FolderSettings { get; set; }
+    [DemandsNestedInitialization] public ReleaseFolderSettings FolderSettings { get; set; }
 
-    public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public ReleaseAudit ProcessPipelineData(ReleaseAudit releaseAudit, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (releaseAudit == null)
             return null;
 
-        if(_releaseFolder == null)
+        if (_releaseFolder == null)
             PrepareAndCheckReleaseFolder(new FromDataLoadEventListenerToCheckNotifier(listener));
 
         releaseAudit.ReleaseFolder = _releaseFolder;
@@ -68,19 +69,17 @@ public void PreInitialize(ReleaseData value, IDataLoadEventListener listener)
 
     private void PrepareAndCheckReleaseFolder(ICheckNotifier notifier)
     {
-        if (FolderSettings.CustomReleaseFolder != null && !string.IsNullOrWhiteSpace(FolderSettings.CustomReleaseFolder.FullName))
-        {
+        if (FolderSettings.CustomReleaseFolder != null &&
+            !string.IsNullOrWhiteSpace(FolderSettings.CustomReleaseFolder.FullName))
             _releaseFolder = FolderSettings.CustomReleaseFolder;
-        }
         else
-        {
             _releaseFolder = GetFromProjectFolder(_project);
-        }
 
         if (_releaseFolder.Exists && _releaseFolder.EnumerateFileSystemInfos().Any())
         {
             if (notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Release folder {_releaseFolder.FullName} already exists!", CheckResult.Fail, null, "Do you want to delete it? You should check the contents first.")))
+                    $"Release folder {_releaseFolder.FullName} already exists!", CheckResult.Fail, null,
+                    "Do you want to delete it? You should check the contents first.")))
                 _releaseFolder.Delete(true);
             else
                 return;
@@ -100,7 +99,8 @@ public DirectoryInfo GetFromProjectFolder(IProject p)
 
         var prefix = DateTime.UtcNow.ToString("yyyy-MM-dd");
         var suffix = string.Empty;
-        if (_releaseData != null && _releaseData.ConfigurationsForRelease != null && _releaseData.ConfigurationsForRelease.Keys.Any())
+        if (_releaseData != null && _releaseData.ConfigurationsForRelease != null &&
+            _releaseData.ConfigurationsForRelease.Keys.Any())
         {
             var releaseTicket = _releaseData.ConfigurationsForRelease.Keys.First().ReleaseTicket;
             if (_releaseData.ConfigurationsForRelease.Keys.All(x => x.ReleaseTicket == releaseTicket))
@@ -110,9 +110,7 @@ public DirectoryInfo GetFromProjectFolder(IProject p)
         }
 
         if (string.IsNullOrWhiteSpace(suffix))
-        {
             suffix = string.IsNullOrWhiteSpace(p.MasterTicket) ? $"{p.ID}_{p.Name}" : p.MasterTicket;
-        }
 
         return new DirectoryInfo(Path.Combine(p.ExtractionDirectory, $"{prefix}_{suffix}"));
     }
diff --git a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseUseCase.cs b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseUseCase.cs
index 647950be35..60c17401ac 100644
--- a/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseUseCase.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Pipeline/ReleaseUseCase.cs
@@ -36,7 +36,7 @@ public ReleaseUseCase(IProject project, ReleaseData releaseData, ICatalogueRepos
         if (releaseTypes.Count == 0)
             throw new Exception("How did you manage to have multiple ZERO types in the extraction?");
 
-        if (releaseTypes.Count(t => t != typeof (NoReleasePotential)) > 1)
+        if (releaseTypes.Count(t => t != typeof(NoReleasePotential)) > 1)
             throw new Exception(
                 $"You cannot release multiple configurations which have been extracted in multiple ways; e.g. one to DB and one to disk.  Your datasets have been extracted in the following ways:{Environment.NewLine}{string.Join($",{Environment.NewLine}", releaseTypes.Select(t => t.Name))}");
 
@@ -44,13 +44,15 @@ public ReleaseUseCase(IProject project, ReleaseData releaseData, ICatalogueRepos
             releasePotentials.FirstOrDefault(rp => rp.DatasetExtractionResult != null);
 
         if (releasePotentialWithKnownDestination == null)
+        {
             ExplicitSource = new NullReleaseSource<ReleaseAudit>();
+        }
         else
         {
             var destinationType = catalogueRepository.MEF
                 .GetType(
                     releasePotentialWithKnownDestination.DatasetExtractionResult.DestinationType,
-                    typeof (IExecuteDatasetExtractionDestination));
+                    typeof(IExecuteDatasetExtractionDestination));
             var constructor = new ObjectConstructor();
             var destinationUsedAtExtraction =
                 (IExecuteDatasetExtractionDestination)ObjectConstructor.Construct(destinationType, catalogueRepository);
@@ -82,18 +84,16 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
     /// <summary>
     /// Design time constructor
     /// </summary>
-    public ReleaseUseCase():base(new []
+    public ReleaseUseCase() : base(new[]
     {
         typeof(Project),
         typeof(ReleaseData),
-        typeof(CatalogueRepository)})
+        typeof(CatalogueRepository)
+    })
     {
         ExplicitSource = new NullReleaseSource<ReleaseAudit>();
         GenerateContext();
     }
 
-    public static ReleaseUseCase DesignTime()
-    {
-        return new ReleaseUseCase();
-    }
+    public static ReleaseUseCase DesignTime() => new();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileGlobalsReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileGlobalsReleasePotential.cs
index e5e441e098..fcd2d7db8f 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileGlobalsReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileGlobalsReleasePotential.cs
@@ -17,7 +17,8 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class FlatFileGlobalsReleasePotential : GlobalReleasePotential
 {
-    public FlatFileGlobalsReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
+    public FlatFileGlobalsReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
         : base(repositoryLocator, globalResult, globalToCheck)
     {
     }
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileReleasePotential.cs
index 2ff6ec4962..276bcac57a 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/FlatFileReleasePotential.cs
@@ -22,11 +22,13 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class FlatFileReleasePotential : ReleasePotential
 {
-    public FlatFileReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSets): base(repositoryLocator, selectedDataSets)
+    public FlatFileReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSets) : base(repositoryLocator, selectedDataSets)
     {
     }
 
-    protected override Releaseability GetSupplementalSpecificAssessment(IExtractionResults supplementalExtractionResults)
+    protected override Releaseability GetSupplementalSpecificAssessment(
+        IExtractionResults supplementalExtractionResults)
     {
         if (File.Exists(supplementalExtractionResults.DestinationDescription))
             return Releaseability.Undefined;
@@ -39,9 +41,11 @@ protected override Releaseability GetSpecificAssessment(IExtractionResults extra
         ExtractDirectory = new FileInfo(extractionResults.DestinationDescription).Directory;
         if (FilesAreMissing(extractionResults))
             return Releaseability.ExtractFilesMissing;
-            
+
         ThrowIfPollutionFoundInConfigurationRootExtractionFolder();
-        return Releaseability.Undefined;// Assesment = SqlDifferencesVsLiveCatalogue() ? Releaseability.ColumnDifferencesVsCatalogue : Releaseability.Releaseable;
+        return
+            Releaseability
+                .Undefined; // Assesment = SqlDifferencesVsLiveCatalogue() ? Releaseability.ColumnDifferencesVsCatalogue : Releaseability.Releaseable;
     }
 
     private bool FilesAreMissing(IExtractionResults extractionResults)
@@ -50,7 +54,7 @@ private bool FilesAreMissing(IExtractionResults extractionResults)
         var metadataFile = new FileInfo(extractionResults.DestinationDescription.Replace(".csv", ".docx"));
 
         if (!ExtractFile.Exists)
-            return true;//extract is missing
+            return true; //extract is missing
 
         if (!ExtractFile.Extension.Equals(".csv"))
             throw new Exception($"Extraction file had extension '{ExtractFile.Extension}' (expected .csv)");
@@ -67,7 +71,8 @@ private bool FilesAreMissing(IExtractionResults extractionResults)
                 $"Unexpected file found in extract directory {unexpectedFile.FullName} (pollution of extract directory is not permitted)");
 
         var unexpectedDirectory = ExtractFile.Directory.EnumerateDirectories().FirstOrDefault(d =>
-            !(d.Name.Equals("Lookups") || d.Name.Equals("SupportingDocuments") || d.Name.Equals(SupportingSQLTable.ExtractionFolderName)));
+            !(d.Name.Equals("Lookups") || d.Name.Equals("SupportingDocuments") ||
+              d.Name.Equals(SupportingSQLTable.ExtractionFolderName)));
 
         if (unexpectedDirectory != null)
             throw new Exception(
@@ -78,7 +83,8 @@ private bool FilesAreMissing(IExtractionResults extractionResults)
 
     private void ThrowIfPollutionFoundInConfigurationRootExtractionFolder()
     {
-        Debug.Assert(ExtractDirectory.Parent != null, "Don't call this method until you have determined that an extracted file was actually produced!");
+        Debug.Assert(ExtractDirectory.Parent != null,
+            "Don't call this method until you have determined that an extracted file was actually produced!");
 
         if (ExtractDirectory.Parent.GetFiles().Any())
             throw new Exception(
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/GlobalReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/GlobalReleasePotential.cs
index 70aa5ba0f4..d42d459946 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/GlobalReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/GlobalReleasePotential.cs
@@ -16,11 +16,12 @@ public abstract class GlobalReleasePotential : ICheckable
 {
     protected readonly IRDMPPlatformRepositoryServiceLocator RepositoryLocator;
     protected readonly ISupplementalExtractionResults GlobalResult;
-        
+
     public IMapsDirectlyToDatabaseTable RelatedGlobal { get; protected set; }
     public Releaseability Releasability { get; protected set; }
 
-    protected GlobalReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
+    protected GlobalReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
     {
         RepositoryLocator = repositoryLocator;
         GlobalResult = globalResult;
@@ -31,25 +32,28 @@ public virtual void Check(ICheckNotifier notifier)
     {
         if (GlobalResult == null) // this should be already covered by the NoGlobalPotential
             return;
-            
+
         if (GlobalResult.SQLExecuted != null)
         {
             var table = RelatedGlobal as SupportingSQLTable;
             if (table == null)
-            { 
+            {
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"The executed Global {GlobalResult.ExtractedName} has a SQL script but the extracted type ({GlobalResult.ReferencedObjectType}) is not a SupportingSQLTable", CheckResult.Fail));
+                    $"The executed Global {GlobalResult.ExtractedName} has a SQL script but the extracted type ({GlobalResult.ReferencedObjectType}) is not a SupportingSQLTable",
+                    CheckResult.Fail));
                 Releasability = Releaseability.ExtractionSQLDesynchronisation;
             }
+
             if (table.SQL != GlobalResult.SQLExecuted)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"The executed Global {GlobalResult.ExtractedName} has a SQL script which is different from the current one!", CheckResult.Fail));
+                    $"The executed Global {GlobalResult.ExtractedName} has a SQL script which is different from the current one!",
+                    CheckResult.Fail));
                 Releasability = Releaseability.ExtractionSQLDesynchronisation;
             }
         }
 
-        if (GlobalResult.IsReferenceTo(typeof (SupportingDocument)))
+        if (GlobalResult.IsReferenceTo(typeof(SupportingDocument)))
             CheckFileExists(notifier, GlobalResult.DestinationDescription);
         else
             CheckDestination(notifier, GlobalResult);
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlExtractionReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlExtractionReleasePotential.cs
index 642e341b3d..969c8a0377 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlExtractionReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlExtractionReleasePotential.cs
@@ -19,11 +19,13 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class MsSqlExtractionReleasePotential : ReleasePotential
 {
-    public MsSqlExtractionReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSets): base(repositoryLocator, selectedDataSets)
+    public MsSqlExtractionReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSets) : base(repositoryLocator, selectedDataSets)
     {
     }
 
-    protected override Releaseability GetSupplementalSpecificAssessment(IExtractionResults supplementalExtractionResults)
+    protected override Releaseability GetSupplementalSpecificAssessment(
+        IExtractionResults supplementalExtractionResults)
     {
         if (supplementalExtractionResults.IsReferenceTo(typeof(SupportingDocument)))
             if (File.Exists(supplementalExtractionResults.DestinationDescription))
@@ -31,7 +33,7 @@ protected override Releaseability GetSupplementalSpecificAssessment(IExtractionR
             else
                 return Releaseability.ExtractFilesMissing;
 
-        if (supplementalExtractionResults.IsReferenceTo(typeof (SupportingSQLTable)) ||
+        if (supplementalExtractionResults.IsReferenceTo(typeof(SupportingSQLTable)) ||
             supplementalExtractionResults.IsReferenceTo(typeof(TableInfo)))
             return GetSpecificAssessment(supplementalExtractionResults);
 
@@ -45,21 +47,16 @@ protected override Releaseability GetSpecificAssessment(IExtractionResults extra
         ExtractDirectory = new ExtractionDirectory(_extractDir, Configuration).GetDirectoryForDataset(DataSet);
 
         var externalServerId = int.Parse(extractionResults.DestinationDescription.Split('|')[0]);
-        var externalServer = _repositoryLocator.CatalogueRepository.GetObjectByID<ExternalDatabaseServer>(externalServerId);
+        var externalServer =
+            _repositoryLocator.CatalogueRepository.GetObjectByID<ExternalDatabaseServer>(externalServerId);
         var dbName = extractionResults.DestinationDescription.Split('|')[1];
         var tblName = extractionResults.DestinationDescription.Split('|')[2];
-        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, setInitialDatabase: false);
+        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, false);
         var database = server.ExpectDatabase(dbName);
-        if (!database.Exists())
-        {
-            return Releaseability.ExtractFilesMissing;
-        }
+        if (!database.Exists()) return Releaseability.ExtractFilesMissing;
         var foundTable = database.ExpectTable(tblName);
-        if (!foundTable.Exists())
-        {
-            return Releaseability.ExtractFilesMissing;
-        }
-            
+        if (!foundTable.Exists()) return Releaseability.ExtractFilesMissing;
+
         return Releaseability.Undefined;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlGlobalsReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlGlobalsReleasePotential.cs
index 1ee1e304a4..24541eb57e 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlGlobalsReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/MsSqlGlobalsReleasePotential.cs
@@ -18,7 +18,8 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class MsSqlGlobalsReleasePotential : GlobalReleasePotential
 {
-    public MsSqlGlobalsReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
+    public MsSqlGlobalsReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
         : base(repositoryLocator, globalResult, globalToCheck)
     {
     }
@@ -26,16 +27,18 @@ public MsSqlGlobalsReleasePotential(IRDMPPlatformRepositoryServiceLocator reposi
     protected override void CheckDestination(ICheckNotifier notifier, ISupplementalExtractionResults globalResult)
     {
         var externalServerId = int.Parse(globalResult.DestinationDescription.Split('|')[0]);
-        var externalServer = RepositoryLocator.CatalogueRepository.GetObjectByID<ExternalDatabaseServer>(externalServerId);
+        var externalServer =
+            RepositoryLocator.CatalogueRepository.GetObjectByID<ExternalDatabaseServer>(externalServerId);
         var dbName = globalResult.DestinationDescription.Split('|')[1];
         var tblName = globalResult.DestinationDescription.Split('|')[2];
-        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, setInitialDatabase: false);
+        var server = DataAccessPortal.ExpectServer(externalServer, DataAccessContext.DataExport, false);
         var database = server.ExpectDatabase(dbName);
         if (!database.Exists())
         {
             notifier.OnCheckPerformed(new CheckEventArgs($"Database: {database} was not found", CheckResult.Fail));
             Releasability = Releaseability.ExtractFilesMissing;
         }
+
         var foundTable = database.ExpectTable(tblName);
         if (!foundTable.Exists())
         {
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/NoGlobalReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/NoGlobalReleasePotential.cs
index 5febcd2526..381d2de650 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/NoGlobalReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/NoGlobalReleasePotential.cs
@@ -17,7 +17,8 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class NoGlobalReleasePotential : GlobalReleasePotential
 {
-    public NoGlobalReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
+    public NoGlobalReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISupplementalExtractionResults globalResult, IMapsDirectlyToDatabaseTable globalToCheck)
         : base(repositoryLocator, globalResult, globalToCheck)
     {
     }
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/NoReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/NoReleasePotential.cs
index 80a5a23e9b..65ffb036bc 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/NoReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/NoReleasePotential.cs
@@ -16,19 +16,16 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// </summary>
 public class NoReleasePotential : ReleasePotential
 {
-    public NoReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet): base(repositoryLocator, selectedDataSet)
+    public NoReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet) : base(repositoryLocator, selectedDataSet)
     {
     }
 
-    protected override Releaseability GetSupplementalSpecificAssessment(IExtractionResults supplementalExtractionResults)
-    {
-        return Releaseability.NeverBeenSuccessfullyExecuted;
-    }
+    protected override Releaseability GetSupplementalSpecificAssessment(
+        IExtractionResults supplementalExtractionResults) => Releaseability.NeverBeenSuccessfullyExecuted;
 
-    protected override Releaseability GetSpecificAssessment(IExtractionResults extractionResults)
-    {
-        return Releaseability.NeverBeenSuccessfullyExecuted;
-    }
+    protected override Releaseability GetSpecificAssessment(IExtractionResults extractionResults) =>
+        Releaseability.NeverBeenSuccessfullyExecuted;
 
     public override void Check(ICheckNotifier notifier)
     {
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/ReleasePotential.cs b/Rdmp.Core/DataExport/DataRelease/Potential/ReleasePotential.cs
index 97ac5ec6f9..4372519e16 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/ReleasePotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/ReleasePotential.cs
@@ -26,7 +26,7 @@ namespace Rdmp.Core.DataExport.DataRelease.Potential;
 /// Extraction Destinations will return an implementation of this class which will run checks on the releasaility of the extracted datasets
 /// based on the extraction method used.
 /// </summary>
-public abstract class ReleasePotential:ICheckable
+public abstract class ReleasePotential : ICheckable
 {
     protected readonly IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
     private readonly IRepository _repository;
@@ -36,7 +36,11 @@ public abstract class ReleasePotential:ICheckable
     public IExtractionConfiguration Configuration { get; private set; }
     public IExtractableDataSet DataSet { get; private set; }
 
-    public Dictionary<ExtractableColumn, ExtractionInformation> ColumnsThatAreDifferentFromCatalogue { get; private set; }
+    public Dictionary<ExtractableColumn, ExtractionInformation> ColumnsThatAreDifferentFromCatalogue
+    {
+        get;
+        private set;
+    }
 
     public Exception Exception { get; private set; }
     public ICumulativeExtractionResults DatasetExtractionResult { get; protected set; }
@@ -64,7 +68,8 @@ public abstract class ReleasePotential:ICheckable
 
     public Dictionary<IExtractionResults, Releaseability> Assessments { get; protected set; }
 
-    protected ReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ISelectedDataSets selectedDataSet)
+    protected ReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ISelectedDataSets selectedDataSet)
     {
         _repositoryLocator = repositoryLocator;
         _repository = selectedDataSet.Repository;
@@ -74,7 +79,8 @@ protected ReleasePotential(IRDMPPlatformRepositoryServiceLocator repositoryLocat
         Assessments = new Dictionary<IExtractionResults, Releaseability>();
 
         //see what has been extracted before
-        DatasetExtractionResult = Configuration.CumulativeExtractionResults.FirstOrDefault(r => r.ExtractableDataSet_ID == DataSet.ID);
+        DatasetExtractionResult =
+            Configuration.CumulativeExtractionResults.FirstOrDefault(r => r.ExtractableDataSet_ID == DataSet.ID);
     }
 
     private Releaseability MakeAssesment(ICumulativeExtractionResults extractionResults)
@@ -109,21 +115,21 @@ private Releaseability MakeAssesment(ICumulativeExtractionResults extractionResu
     private bool ExtractionProgressIsIncomplete(ICheckNotifier notifier)
     {
         var progress = SelectedDataSet.ExtractionProgressIfAny;
-            
-        if (progress == null)
-        {
-            return false;
-        }
+
+        if (progress == null) return false;
 
         if (progress.ProgressDate == null)
         {
-            notifier?.OnCheckPerformed(new CheckEventArgs($"ExtractionProgress ProgressDate is null for '{SelectedDataSet}'.", CheckResult.Warning));
+            notifier?.OnCheckPerformed(new CheckEventArgs(
+                $"ExtractionProgress ProgressDate is null for '{SelectedDataSet}'.", CheckResult.Warning));
             return true;
         }
 
         if (progress.ProgressDate < progress.EndDate)
         {
-            notifier?.OnCheckPerformed(new CheckEventArgs($"ExtractionProgress is incomplete for '{SelectedDataSet}'.  ProgressDate is {progress.ProgressDate} but EndDate is {progress.EndDate}", CheckResult.Warning));
+            notifier?.OnCheckPerformed(new CheckEventArgs(
+                $"ExtractionProgress is incomplete for '{SelectedDataSet}'.  ProgressDate is {progress.ProgressDate} but EndDate is {progress.EndDate}",
+                CheckResult.Warning));
             return true;
         }
 
@@ -139,10 +145,8 @@ private Releaseability MakeSupplementalAssesment(ISupplementalExtractionResults
             return Releaseability.Undefined;
 
         if (extractedObject is SupportingSQLTable table)
-        {
             if (table.SQL != supplementalExtractionResults.SQLExecuted)
                 return Releaseability.ExtractionSQLDesynchronisation;
-        }
 
         var finalAssessment = GetSupplementalSpecificAssessment(supplementalExtractionResults);
 
@@ -154,7 +158,8 @@ private Releaseability MakeSupplementalAssesment(ISupplementalExtractionResults
         return finalAssessment;
     }
 
-    protected abstract Releaseability GetSupplementalSpecificAssessment(IExtractionResults supplementalExtractionResults);
+    protected abstract Releaseability GetSupplementalSpecificAssessment(
+        IExtractionResults supplementalExtractionResults);
 
     protected abstract Releaseability GetSpecificAssessment(IExtractionResults extractionResults);
 
@@ -164,9 +169,9 @@ private bool SqlDifferencesVsLiveCatalogue()
 
         foreach (ExtractableColumn extractableColumn in _columnsToExtract)
         {
-            if(extractableColumn.HasOriginalExtractionInformationVanished())
+            if (extractableColumn.HasOriginalExtractionInformationVanished())
             {
-                ColumnsThatAreDifferentFromCatalogue.Add(extractableColumn,null);
+                ColumnsThatAreDifferentFromCatalogue.Add(extractableColumn, null);
                 continue;
             }
 
@@ -193,8 +198,9 @@ private string GetCurrentConfigurationSQL()
         var salt = new HICProjectSalt(project);
 
         //create a request for an empty bundle - only the dataset
-        var request = new ExtractDatasetCommand( Configuration, cohort, new ExtractableDatasetBundle(DataSet), _columnsToExtract, salt, null);
-            
+        var request = new ExtractDatasetCommand(Configuration, cohort, new ExtractableDatasetBundle(DataSet),
+            _columnsToExtract, salt, null);
+
         request.GenerateQueryBuilder();
 
         //Generated the SQL as it would exist today for this extraction
@@ -206,15 +212,13 @@ private string GetCurrentConfigurationSQL()
     private bool SqlOutOfSyncWithDataExportManagerConfiguration(IExtractionResults extractionResults)
     {
         if (extractionResults.SQLExecuted == null)
-            throw new Exception("Cumulative Extraction Results for the extraction in which this dataset was involved in does not have any SQLExecuted recorded for it.");
-            
+            throw new Exception(
+                "Cumulative Extraction Results for the extraction in which this dataset was involved in does not have any SQLExecuted recorded for it.");
+
         // When using extraction progress the SQL can be whatever you want
         // if the progress date says End then we blindly assume that whatever you
         // executed was legit
-        if(SelectedDataSet.ExtractionProgressIfAny != null)
-        {
-            return false;
-        }
+        if (SelectedDataSet.ExtractionProgressIfAny != null) return false;
 
         //if the SQL today is different to the SQL that was run when the user last extracted the data then there is a desync in the SQL (someone has changed something in the catalogue/data export manager configuration since the data was extracted)
         return !SqlCurrentConfiguration.Equals(extractionResults.SQLExecuted);
@@ -248,27 +252,30 @@ public virtual void Check(ICheckNotifier notifier)
 
         if (DatasetExtractionResult.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyWasDeleted)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Release potential relates to expired (stale) extraction; you or someone else has executed another data extraction since you added this dataset to the release.Offending dataset was ({DataSet}).  You can probably fix this problem by reloading/refreshing the Releaseability window. If you have already added them to a planned Release you will need to add the newly recalculated one instead.", CheckResult.Fail));
+                $"Release potential relates to expired (stale) extraction; you or someone else has executed another data extraction since you added this dataset to the release.Offending dataset was ({DataSet}).  You can probably fix this problem by reloading/refreshing the Releaseability window. If you have already added them to a planned Release you will need to add the newly recalculated one instead.",
+                CheckResult.Fail));
 
         var existingReleaseLog = DatasetExtractionResult.GetReleaseLogEntryIfAny();
         if (existingReleaseLog != null)
-        {
-            if (notifier.OnCheckPerformed(new CheckEventArgs(string.Format("Dataset {0} has probably already been released as per {1}!",
+            if (notifier.OnCheckPerformed(new CheckEventArgs(string.Format(
+                        "Dataset {0} has probably already been released as per {1}!",
                         DataSet, existingReleaseLog),
                     CheckResult.Warning,
                     null,
                     "Do you want to delete the old release Log? You should check the values first.")))
                 existingReleaseLog.DeleteInDatabase();
-        }
 
         var cols = Configuration.GetAllExtractableColumnsFor(DataSet)
             .OfType<ExtractableColumn>()
             .Select(c => c.CatalogueExtractionInformation)
             .ToArray();
 
-        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier,Configuration, DataSet, cols,ErrorCodes.ExtractionContainsSpecialApprovalRequired, ExtractionCategory.SpecialApprovalRequired);
-        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier, Configuration, DataSet, cols, ErrorCodes.ExtractionContainsInternal, ExtractionCategory.Internal);
-        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier, Configuration, DataSet, cols, ErrorCodes.ExtractionContainsDeprecated, ExtractionCategory.Deprecated);
+        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier, Configuration, DataSet, cols,
+            ErrorCodes.ExtractionContainsSpecialApprovalRequired, ExtractionCategory.SpecialApprovalRequired);
+        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier, Configuration, DataSet, cols,
+            ErrorCodes.ExtractionContainsInternal, ExtractionCategory.Internal);
+        SelectedDataSetsChecker.WarnAboutExtractionCategory(notifier, Configuration, DataSet, cols,
+            ErrorCodes.ExtractionContainsDeprecated, ExtractionCategory.Deprecated);
 
         if (!Assessments.ContainsKey(DatasetExtractionResult))
             try
@@ -282,7 +289,6 @@ public virtual void Check(ICheckNotifier notifier)
             }
 
         foreach (var supplementalResult in DatasetExtractionResult.SupplementalExtractionResults)
-        {
             if (!Assessments.ContainsKey(supplementalResult))
                 try
                 {
@@ -293,7 +299,6 @@ public virtual void Check(ICheckNotifier notifier)
                     Assessments.Add(supplementalResult, Releaseability.ExceptionOccurredWhileEvaluatingReleaseability);
                     notifier.OnCheckPerformed(new CheckEventArgs($"FAILURE: {e.Message}", CheckResult.Fail, e));
                 }
-        }
 
         foreach (var kvp in Assessments)
         {
@@ -307,5 +312,4 @@ public virtual void Check(ICheckNotifier notifier)
             notifier.OnCheckPerformed(new CheckEventArgs($"{kvp.Key} is {kvp.Value}", checkResult));
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/Potential/Releaseability.cs b/Rdmp.Core/DataExport/DataRelease/Potential/Releaseability.cs
index 0892516376..1942c451ca 100644
--- a/Rdmp.Core/DataExport/DataRelease/Potential/Releaseability.cs
+++ b/Rdmp.Core/DataExport/DataRelease/Potential/Releaseability.cs
@@ -20,18 +20,18 @@ public enum Releaseability
     /// Something went wrong while RDMP was trying to determine the releasability of the dataset (figuring out if the files and current configuration match.)
     /// </summary>
     ExceptionOccurredWhileEvaluatingReleaseability,
-        
+
     /// <summary>
     /// The RDMP has no record of an extraction having taken place on the dataset (including a failed one)
     /// </summary>
     NeverBeenSuccessfullyExecuted,
-        
+
     /// <summary>
     /// The RDMP has a record of the dataset being extracted but either the extracted data file or accompanying metadata file(s) was
     /// not found in the correct location on disk (either it was moved or the extraction crashed halfway through)
     /// </summary>
     ExtractFilesMissing,
-        
+
     /// <summary>
     /// Because project extractions can take some time to do it is possible that another data analyst (or you without realising it) makes a change to a dataset
     /// in the project which has already been extracted (e.g. selecting an additional column for extraction).  If this happens your extracted file will be wrong
diff --git a/Rdmp.Core/DataExport/DataRelease/ReleaseEngine.cs b/Rdmp.Core/DataExport/DataRelease/ReleaseEngine.cs
index 3a44aac536..70248dad77 100644
--- a/Rdmp.Core/DataExport/DataRelease/ReleaseEngine.cs
+++ b/Rdmp.Core/DataExport/DataRelease/ReleaseEngine.cs
@@ -38,10 +38,11 @@ public class ReleaseEngine
     public Dictionary<IExtractionConfiguration, List<ReleasePotential>> ConfigurationsToRelease { get; private set; }
 
     public ReleaseEngineSettings ReleaseSettings { get; set; }
-        
+
     public ReleaseAudit ReleaseAudit { get; set; }
 
-    public ReleaseEngine(Project project, ReleaseEngineSettings settings, IDataLoadEventListener listener, ReleaseAudit releaseAudit)
+    public ReleaseEngine(Project project, ReleaseEngineSettings settings, IDataLoadEventListener listener,
+        ReleaseAudit releaseAudit)
     {
         _repository = project.DataExportRepository;
         Project = project;
@@ -54,7 +55,8 @@ public ReleaseEngine(Project project, ReleaseEngineSettings settings, IDataLoadE
         ReleaseAudit = releaseAudit;
     }
 
-    public virtual void DoRelease(Dictionary<IExtractionConfiguration, List<ReleasePotential>> toRelease, Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential> environments, bool isPatch)
+    public virtual void DoRelease(Dictionary<IExtractionConfiguration, List<ReleasePotential>> toRelease,
+        Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential> environments, bool isPatch)
     {
         ConfigurationsToRelease = toRelease;
 
@@ -76,10 +78,10 @@ public virtual void DoRelease(Dictionary<IExtractionConfiguration, List<ReleaseP
             sw.Flush();
             sw.Close();
         }
-            
+
         ReleaseSuccessful = true;
     }
-        
+
     protected virtual StreamWriter PrepareAuditFile()
     {
         var sw = new StreamWriter(Path.Combine(ReleaseAudit.ReleaseFolder.FullName, "contents.txt"));
@@ -100,12 +102,15 @@ protected virtual void ReleaseGlobalFolder()
         //if we found at least one global folder and all the global folders we did find had the same contents
         if (ReleaseAudit.SourceGlobalFolder != null)
         {
-            var destination = new DirectoryInfo(Path.Combine(ReleaseAudit.ReleaseFolder.FullName, ReleaseAudit.SourceGlobalFolder.Name));
+            var destination = new DirectoryInfo(Path.Combine(ReleaseAudit.ReleaseFolder.FullName,
+                ReleaseAudit.SourceGlobalFolder.Name));
             ReleaseAudit.SourceGlobalFolder.CopyAll(destination);
         }
     }
 
-    protected virtual void ReleaseAllExtractionConfigurations(Dictionary<IExtractionConfiguration, List<ReleasePotential>> toRelease, StreamWriter sw, Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential> environments, bool isPatch)
+    protected virtual void ReleaseAllExtractionConfigurations(
+        Dictionary<IExtractionConfiguration, List<ReleasePotential>> toRelease, StreamWriter sw,
+        Dictionary<IExtractionConfiguration, ReleaseEnvironmentPotential> environments, bool isPatch)
     {
         //for each configuration, all the release potentials can be released
         foreach (var kvp in toRelease)
@@ -154,7 +159,8 @@ protected virtual void ReleaseAllExtractionConfigurations(Dictionary<IExtraction
         }
     }
 
-    protected virtual DirectoryInfo ReleaseCustomData(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, DirectoryInfo configurationSubDirectory)
+    protected virtual DirectoryInfo ReleaseCustomData(
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, DirectoryInfo configurationSubDirectory)
     {
         //if there is custom data copy that across for the specific cohort
         var fromCustomData = ThrowIfCustomDataConflictElseReturnFirstCustomDataFolder(kvp);
@@ -163,22 +169,27 @@ protected virtual DirectoryInfo ReleaseCustomData(KeyValuePair<IExtractionConfig
             var destination = new DirectoryInfo(Path.Combine(configurationSubDirectory.FullName, fromCustomData.Name));
             fromCustomData.CopyAll(destination);
         }
+
         return fromCustomData;
     }
 
-    protected virtual DirectoryInfo ReleaseMasterData(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, DirectoryInfo configurationSubDirectory)
+    protected virtual DirectoryInfo ReleaseMasterData(
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, DirectoryInfo configurationSubDirectory)
     {
         //if there is custom data copy that across for the specific cohort
         var fromMasterData = ThrowIfMasterDataConflictElseReturnFirstOtherDataFolder(kvp);
         if (fromMasterData != null)
         {
-            var destination = new DirectoryInfo(Path.Combine(configurationSubDirectory.Parent.FullName, fromMasterData.Name));
+            var destination =
+                new DirectoryInfo(Path.Combine(configurationSubDirectory.Parent.FullName, fromMasterData.Name));
             fromMasterData.CopyAll(destination);
         }
+
         return fromMasterData;
     }
 
-    protected virtual DirectoryInfo ReleaseMetadata(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, DirectoryInfo configurationSubDirectory)
+    protected virtual DirectoryInfo ReleaseMetadata(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp,
+        DirectoryInfo configurationSubDirectory)
     {
         //if there is custom data copy that across for the specific cohort
         var folderFound = GetAllFoldersCalled(ExtractionDirectory.METADATA_FOLDER_NAME, kvp);
@@ -189,10 +200,12 @@ protected virtual DirectoryInfo ReleaseMetadata(KeyValuePair<IExtractionConfigur
             var destination = new DirectoryInfo(Path.Combine(configurationSubDirectory.Parent.FullName, source.Name));
             source.CopyAll(destination);
         }
+
         return source;
     }
 
-    protected virtual void AuditExtractionConfigurationDetails(StreamWriter sw, DirectoryInfo configurationSubDirectory, KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, string extractionIdentifier)
+    protected virtual void AuditExtractionConfigurationDetails(StreamWriter sw, DirectoryInfo configurationSubDirectory,
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> kvp, string extractionIdentifier)
     {
         //audit in contents.txt
         sw.WriteLine($"Folder:{configurationSubDirectory.Name}");
@@ -206,38 +219,40 @@ protected virtual void AuditExtractionConfigurationDetails(StreamWriter sw, Dire
         sw.WriteLine($"CohortID:{kvp.Key.Cohort_ID}");
     }
 
-    protected void AuditProperRelease(ReleasePotential rp, ReleaseEnvironmentPotential environment, DirectoryInfo rpDirectory, bool isPatch)
+    protected void AuditProperRelease(ReleasePotential rp, ReleaseEnvironmentPotential environment,
+        DirectoryInfo rpDirectory, bool isPatch)
     {
         FileInfo datasetFile = null;
-            
+
         if (rp.ExtractFile != null)
         {
             var expectedFilename = rp.ExtractFile.Name;
             datasetFile = rpDirectory.EnumerateFiles().SingleOrDefault(f => f.Name.Equals(expectedFilename));
             if (datasetFile == null)
-            {
                 throw new Exception(
                     $"Expected to find file called {expectedFilename} in directory {rpDirectory.FullName}, but could not");
-            }
         }
 
         //creates a new one in the database
-        new ReleaseLog(_repository,rp, environment,isPatch, rpDirectory, datasetFile);
+        new ReleaseLog(_repository, rp, environment, isPatch, rpDirectory, datasetFile);
     }
 
-    protected static DirectoryInfo ThrowIfCustomDataConflictElseReturnFirstCustomDataFolder(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
+    protected static DirectoryInfo ThrowIfCustomDataConflictElseReturnFirstCustomDataFolder(
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
     {
         var customDirectoriesFound = GetAllFoldersCalled(ExtractionDirectory.CUSTOM_COHORT_DATA_FOLDER_NAME, toRelease);
         return GetUniqueDirectoryFrom(customDirectoriesFound.Distinct(new DirectoryInfoComparer()).ToList());
     }
 
-    protected static DirectoryInfo ThrowIfMasterDataConflictElseReturnFirstOtherDataFolder(KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
+    protected static DirectoryInfo ThrowIfMasterDataConflictElseReturnFirstOtherDataFolder(
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
     {
         var masterDataDirectoriesFound = GetAllFoldersCalled(ExtractionDirectory.MASTER_DATA_FOLDER_NAME, toRelease);
         return GetUniqueDirectoryFrom(masterDataDirectoriesFound.Distinct(new DirectoryInfoComparer()).ToList());
     }
 
-    protected static IEnumerable<DirectoryInfo> GetAllFoldersCalled(string folderName, KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
+    protected static IEnumerable<DirectoryInfo> GetAllFoldersCalled(string folderName,
+        KeyValuePair<IExtractionConfiguration, List<ReleasePotential>> toRelease)
     {
         return toRelease.Value.Where(releasePotential => releasePotential.ExtractDirectory?.Parent != null)
             .Select(releasePotential => releasePotential.ExtractDirectory.Parent
@@ -256,8 +271,10 @@ protected static DirectoryInfo GetUniqueDirectoryFrom(List<DirectoryInfo> direct
 
         foreach (var directoryInfo in directoryInfos)
         {
-            ConfirmValidityOfGlobalsOrCustomDataDirectory(directoryInfo); //check there are no pollution in globals directories
-            UsefulStuff.ConfirmContentsOfDirectoryAreTheSame(first, directoryInfo); //this checks first against first then first against second, then first against third etc
+            ConfirmValidityOfGlobalsOrCustomDataDirectory(
+                directoryInfo); //check there are no pollution in globals directories
+            UsefulStuff.ConfirmContentsOfDirectoryAreTheSame(first,
+                directoryInfo); //this checks first against first then first against second, then first against third etc
         }
 
         return first;
@@ -269,7 +286,7 @@ protected static void ConfirmValidityOfGlobalsOrCustomDataDirectory(DirectoryInf
             throw new Exception(
                 $"Folder \"{globalsDirectoryInfo.FullName}\" contains subdirectories, this is not permitted");
     }
-        
+
     protected void CutTreeRecursive(DirectoryInfo from, DirectoryInfo into, StreamWriter audit, int tabDepth)
     {
         //found files in current directory
@@ -282,7 +299,6 @@ protected void CutTreeRecursive(DirectoryInfo from, DirectoryInfo into, StreamWr
 
         //found subdirectory
         foreach (var dir in from.GetDirectories())
-        {
             //if it is not completely empty, copy it across
             if (dir.GetFiles().Any() || dir.GetDirectories().Any())
             {
@@ -290,7 +306,6 @@ protected void CutTreeRecursive(DirectoryInfo from, DirectoryInfo into, StreamWr
                 AuditDirectoryCreation(dir.Name, audit, tabDepth);
                 CutTreeRecursive(dir, into.CreateSubdirectory(dir.Name), audit, tabDepth + 1);
             }
-        }
     }
 
     protected static void AuditFileCreation(string name, StreamWriter audit, int tabDepth)
@@ -307,6 +322,5 @@ protected static void AuditDirectoryCreation(string dir, StreamWriter audit, int
             audit.Write("\t");
 
         audit.WriteLine($"+{dir}");
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/ReleaseEngineSettings.cs b/Rdmp.Core/DataExport/DataRelease/ReleaseEngineSettings.cs
index 270b96c823..174a2713ae 100644
--- a/Rdmp.Core/DataExport/DataRelease/ReleaseEngineSettings.cs
+++ b/Rdmp.Core/DataExport/DataRelease/ReleaseEngineSettings.cs
@@ -12,9 +12,10 @@ namespace Rdmp.Core.DataExport.DataRelease;
 /// <summary>
 /// Options for configuring ReleaseEngine behaviour (To change where files are released to etc)
 /// </summary>
-public class ReleaseEngineSettings:ICheckable
+public class ReleaseEngineSettings : ICheckable
 {
-    [DemandsInitialization("Delete the released files from the origin location if release is succesful", DefaultValue = true)]
+    [DemandsInitialization("Delete the released files from the origin location if release is succesful",
+        DefaultValue = true)]
     public bool DeleteFilesOnSuccess { get; set; }
 
     public ReleaseEngineSettings()
@@ -24,6 +25,6 @@ public ReleaseEngineSettings()
 
     public void Check(ICheckNotifier notifier)
     {
-        notifier.OnCheckPerformed(new CheckEventArgs("All green!",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs("All green!", CheckResult.Success));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataExport/DataRelease/ReleaseEnvironmentPotential.cs b/Rdmp.Core/DataExport/DataRelease/ReleaseEnvironmentPotential.cs
index fd12c1ad53..9d9c100122 100644
--- a/Rdmp.Core/DataExport/DataRelease/ReleaseEnvironmentPotential.cs
+++ b/Rdmp.Core/DataExport/DataRelease/ReleaseEnvironmentPotential.cs
@@ -29,19 +29,20 @@ public class ReleaseEnvironmentPotential : ICheckable
     public TicketingReleaseabilityEvaluation Assesment { get; private set; }
     public string Reason { get; private set; }
 
-        
+
     public ReleaseEnvironmentPotential(IExtractionConfiguration configuration)
     {
         _repository = configuration.DataExportRepository;
         Configuration = configuration;
         Project = configuration.Project;
     }
-        
+
     private void MakeAssessment()
     {
         Assesment = TicketingReleaseabilityEvaluation.TicketingLibraryMissingOrNotConfiguredCorrectly;
 
-        var configuration = _repository.CatalogueRepository.GetAllObjectsWhere<TicketingSystemConfiguration>("IsActive",1).SingleOrDefault();
+        var configuration = _repository.CatalogueRepository
+            .GetAllObjectsWhere<TicketingSystemConfiguration>("IsActive", 1).SingleOrDefault();
         if (configuration == null) return;
 
         var factory = new TicketingSystemFactory(_repository.CatalogueRepository);
@@ -58,8 +59,8 @@ private void MakeAssessment()
             Exception = e;
             return;
         }
-            
-        if (ticketingSystem == null) 
+
+        if (ticketingSystem == null)
             return;
 
         try
diff --git a/Rdmp.Core/DataExport/DataRelease/ReleaseFolderSettings.cs b/Rdmp.Core/DataExport/DataRelease/ReleaseFolderSettings.cs
index f5ed25d76a..36564cd443 100644
--- a/Rdmp.Core/DataExport/DataRelease/ReleaseFolderSettings.cs
+++ b/Rdmp.Core/DataExport/DataRelease/ReleaseFolderSettings.cs
@@ -13,12 +13,13 @@ namespace Rdmp.Core.DataExport.DataRelease;
 /// <summary>
 /// Options for configuring ReleaseEngine behaviour (To change where files are released to etc)
 /// </summary>
-public class ReleaseFolderSettings:ICheckable
+public class ReleaseFolderSettings : ICheckable
 {
     [DemandsInitialization("Specify a custom Release folder, will use the Project Extraction Folder if left empty")]
     public DirectoryInfo CustomReleaseFolder { get; set; }
 
-    [DemandsInitialization("If unchecked, it will report an error if the destination folder does not exists", DefaultValue = true)]
+    [DemandsInitialization("If unchecked, it will report an error if the destination folder does not exists",
+        DefaultValue = true)]
     public bool CreateReleaseDirectoryIfNotFound { get; set; }
 
     public ReleaseFolderSettings()
diff --git a/Rdmp.Core/DataExport/ProjectNumberException.cs b/Rdmp.Core/DataExport/ProjectNumberException.cs
index 22c1794a3f..b7c595412d 100644
--- a/Rdmp.Core/DataExport/ProjectNumberException.cs
+++ b/Rdmp.Core/DataExport/ProjectNumberException.cs
@@ -15,8 +15,7 @@ namespace Rdmp.Core.DataExport;
 /// </summary>
 public class ProjectNumberException : Exception
 {
-    public ProjectNumberException(string s):base(s)
+    public ProjectNumberException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngine.cs b/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngine.cs
index 52aef6d76e..d4807ddd2f 100644
--- a/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngine.cs
+++ b/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngine.cs
@@ -33,7 +33,8 @@ public class DataFlowPipelineEngine<T> : IDataFlowPipelineEngine
     /// <summary>
     /// Readonly cast of <see cref="ComponentObjects"/>. If you need to add components, add them to <see cref="ComponentObjects"/> instead.
     /// </summary>
-    public ReadOnlyCollection<IDataFlowComponent<T>> Components => ComponentObjects.Cast<IDataFlowComponent<T>>().ToList().AsReadOnly();
+    public ReadOnlyCollection<IDataFlowComponent<T>> Components =>
+        ComponentObjects.Cast<IDataFlowComponent<T>>().ToList().AsReadOnly();
 
     /// <summary>
     /// The last component in the pipeline, responsible for writing the chunks (of type {T}) to somewhere (E.g. to disk, to database etc)
@@ -64,7 +65,7 @@ public class DataFlowPipelineEngine<T> : IDataFlowPipelineEngine
     /// <param name="destination"></param>
     /// <param name="listener"></param>
     /// <param name="pipelineSource"></param>
-    public DataFlowPipelineEngine(DataFlowPipelineContext<T> context,IDataFlowSource<T> source,
+    public DataFlowPipelineEngine(DataFlowPipelineContext<T> context, IDataFlowSource<T> source,
         IDataFlowDestination<T> destination, IDataLoadEventListener listener,
         IPipeline pipelineSource = null)
     {
@@ -80,13 +81,13 @@ public DataFlowPipelineEngine(DataFlowPipelineContext<T> context,IDataFlowSource
     /// <inheritdoc/>
     public void Initialize(params object[] initializationObjects)
     {
-        _context.PreInitialize(_listener,Source,initializationObjects);
+        _context.PreInitialize(_listener, Source, initializationObjects);
 
         foreach (var component in Components)
             _context.PreInitialize(_listener, component, initializationObjects);
 
-        _context.PreInitialize(_listener,Destination,initializationObjects);
-            
+        _context.PreInitialize(_listener, Destination, initializationObjects);
+
         initialized = true;
     }
 
@@ -123,11 +124,13 @@ public void ExecutePipeline(GracefulCancellationToken cancellationToken)
         catch (Exception e)
         {
             exception = e;
-            _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, e.Message,e));
+            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, e.Message, e));
         }
         finally
         {
-            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Debug, "Preparing to Dispose of DataFlowPipelineEngine components"));
+            _listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Debug,
+                    "Preparing to Dispose of DataFlowPipelineEngine components"));
 
             _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Trace, $"About to Dispose {Source}"));
             try
@@ -140,7 +143,8 @@ public void ExecutePipeline(GracefulCancellationToken cancellationToken)
                 if (exception == null)
                     throw;
 
-                _listener.OnNotify(Source, new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Source Component", e));
+                _listener.OnNotify(Source,
+                    new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Source Component", e));
             }
 
             foreach (var dataLoadComponent in Components)
@@ -157,7 +161,8 @@ public void ExecutePipeline(GracefulCancellationToken cancellationToken)
                     if (exception == null)
                         throw;
 
-                    _listener.OnNotify(dataLoadComponent,new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Component",e));
+                    _listener.OnNotify(dataLoadComponent,
+                        new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Component", e));
                 }
             }
 
@@ -172,19 +177,21 @@ public void ExecutePipeline(GracefulCancellationToken cancellationToken)
                 if (exception == null)
                     throw;
 
-                _listener.OnNotify(Destination, new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Destination Component", e));
+                _listener.OnNotify(Destination,
+                    new NotifyEventArgs(ProgressEventType.Error, "Error Disposing Destination Component", e));
             }
         }
 
         if (exception != null)
-            throw new PipelineCrashedException("Data Flow Pipeline Crashed",exception);
+            throw new PipelineCrashedException("Data Flow Pipeline Crashed", exception);
     }
 
     /// <inheritdoc/>
     public bool ExecuteSinglePass(GracefulCancellationToken cancellationToken)
     {
         if (!initialized)
-            throw new Exception("Engine has not been initialized, call Initialize(DataFlowPipelineContext context, params object[] initializationObjects");
+            throw new Exception(
+                "Engine has not been initialized, call Initialize(DataFlowPipelineContext context, params object[] initializationObjects");
 
         T currentChunk;
         try
@@ -203,14 +210,16 @@ public bool ExecuteSinglePass(GracefulCancellationToken cancellationToken)
 
         if (currentChunk == null)
         {
-            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Debug, "Received null chunk from the Source component, stopping engine"));
+            _listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Debug,
+                    "Received null chunk from the Source component, stopping engine"));
             return false;
         }
 
         foreach (var component in Components)
         {
             if (cancellationToken.IsAbortRequested) break;
-            currentChunk = component.ProcessPipelineData( currentChunk, _listener, cancellationToken);
+            currentChunk = component.ProcessPipelineData(currentChunk, _listener, cancellationToken);
         }
 
         if (cancellationToken.IsAbortRequested) return true;
@@ -221,7 +230,7 @@ public bool ExecuteSinglePass(GracefulCancellationToken cancellationToken)
         //if it is a DataTable call .Clear() because Dispose doesn't actually free up any memory
         if (typeof(DataTable).IsAssignableFrom(typeof(T)))
             ((DataTable)(object)currentChunk).Clear();
-            
+
 
         //if the chunk is something that can be disposed, dispose it (e.g. DataTable - to free up memory)
         if (typeof(IDisposable).IsAssignableFrom(typeof(T)))
@@ -246,24 +255,27 @@ public void Check(ICheckNotifier notifier)
                 checkableSource.Check(notifier);
             }
             else
+            {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
                         $"Source component {Source} does not support ICheckable so skipping checking it",
                         CheckResult.Warning));
+            }
 
             foreach (var component in Components)
-            {
                 if (component is ICheckable checkable)
                 {
-                    notifier.OnCheckPerformed(new CheckEventArgs($"About to start checking component {component}", CheckResult.Success));
+                    notifier.OnCheckPerformed(new CheckEventArgs($"About to start checking component {component}",
+                        CheckResult.Success));
                     checkable.Check(notifier);
                 }
                 else
+                {
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
                             $"Component {component} does not support ICheckable so skipping checking it",
                             CheckResult.Warning));
-            }
+                }
 
             if (Destination is ICheckable checkableDestination)
             {
@@ -273,11 +285,12 @@ public void Check(ICheckNotifier notifier)
                 checkableDestination.Check(notifier);
             }
             else
+            {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
                         $"Destination component {Destination} does not support ICheckable so skipping checking it",
                         CheckResult.Warning));
-
+            }
         }
         catch (Exception e)
         {
@@ -288,13 +301,9 @@ public void Check(ICheckNotifier notifier)
         }
 
 
-        notifier.OnCheckPerformed(new CheckEventArgs("Finished checking all components",CheckResult.Success));
-                 
+        notifier.OnCheckPerformed(new CheckEventArgs("Finished checking all components", CheckResult.Success));
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return _name;
-    }
+    public override string ToString() => _name;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngineFactory.cs b/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngineFactory.cs
index 5d7d156185..84f0b2e37e 100644
--- a/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngineFactory.cs
+++ b/Rdmp.Core/DataFlowPipeline/DataFlowPipelineEngineFactory.cs
@@ -44,7 +44,7 @@ public class DataFlowPipelineEngineFactory : IDataFlowPipelineEngineFactory
     /// </summary>
     /// <param name="useCase">The use case which describes which <see cref="IPipeline"/> are compatible, which objects are available for hydration/preinitialization etc</param>
     /// <param name="mefPlugins">Class for generating Types by name, use <see cref="ICatalogueRepository.MEF"/> to get this </param>
-    public DataFlowPipelineEngineFactory(IPipelineUseCase useCase,MEF mefPlugins)
+    public DataFlowPipelineEngineFactory(IPipelineUseCase useCase, MEF mefPlugins)
     {
         _mefPlugins = mefPlugins;
         _context = useCase.GetContext();
@@ -53,13 +53,13 @@ public DataFlowPipelineEngineFactory(IPipelineUseCase useCase,MEF mefPlugins)
 
         _constructor = new ObjectConstructor();
 
-        _engineType = typeof (DataFlowPipelineEngine<>).MakeGenericType(_flowType);
+        _engineType = typeof(DataFlowPipelineEngine<>).MakeGenericType(_flowType);
     }
 
     /// <inheritdoc/>
-    public DataFlowPipelineEngineFactory(IPipelineUseCase useCase, IPipeline pipeline): this(useCase,((ICatalogueRepository)pipeline.Repository).MEF)
+    public DataFlowPipelineEngineFactory(IPipelineUseCase useCase, IPipeline pipeline) : this(useCase,
+        ((ICatalogueRepository)pipeline.Repository).MEF)
     {
-            
     }
 
     /// <inheritdoc/>
@@ -68,14 +68,16 @@ public IDataFlowPipelineEngine Create(IPipeline pipeline, IDataLoadEventListener
         if (!_context.IsAllowable(pipeline, out var reason))
             throw new Exception($"Cannot create pipeline because: {reason}");
 
-        var destination = GetBest(_useCase.ExplicitDestination, CreateDestinationIfExists(pipeline),"destination");
+        var destination = GetBest(_useCase.ExplicitDestination, CreateDestinationIfExists(pipeline), "destination");
         var source = GetBest(_useCase.ExplicitSource, CreateSourceIfExists(pipeline), "source");
 
 
         //new DataFlowPipelineEngine<T>(_context, source, destination, listener, pipeline);
 
         //engine (this is the source, target is the destination)
-        var dataFlowEngine = (IDataFlowPipelineEngine)ObjectConstructor.ConstructIfPossible(_engineType, _context, source, destination, listener, pipeline); 
+        var dataFlowEngine =
+            (IDataFlowPipelineEngine)ObjectConstructor.ConstructIfPossible(_engineType, _context, source, destination,
+                listener, pipeline);
 
         //now go fetch everything that the user has configured for this particular pipeline
         foreach (PipelineComponent toBuild in pipeline.PipelineComponents)
@@ -110,13 +112,17 @@ private static T2 GetBest<T2>(T2 explicitThing, T2 pipelineConfigurationThing, s
     {
         // if explicitThing and pipelineConfigurationThing are both null
         //Means: xplicitThing == null && pipelineConfigurationThing == null
-        if (EqualityComparer<T2>.Default.Equals(explicitThing, default) && EqualityComparer<T2>.Default.Equals(pipelineConfigurationThing, default))
+        if (EqualityComparer<T2>.Default.Equals(explicitThing, default) &&
+            EqualityComparer<T2>.Default.Equals(pipelineConfigurationThing, default))
             throw new Exception(
                 $"No explicit {descriptionOfWhatThingIs} was specified and there is no fixed {descriptionOfWhatThingIs} defined in the Pipeline configuration in the Catalogue");
 
         //if one of them only is null - XOR
-        if(EqualityComparer<T2>.Default.Equals(explicitThing, default) ^ EqualityComparer<T2>.Default.Equals(pipelineConfigurationThing, default))
-            return EqualityComparer<T2>.Default.Equals(explicitThing, default) ? pipelineConfigurationThing : explicitThing; //return the not null one
+        if (EqualityComparer<T2>.Default.Equals(explicitThing, default) ^
+            EqualityComparer<T2>.Default.Equals(pipelineConfigurationThing, default))
+            return EqualityComparer<T2>.Default.Equals(explicitThing, default)
+                ? pipelineConfigurationThing
+                : explicitThing; //return the not null one
 
         //both of them are populated
         throw new Exception(
@@ -156,7 +162,7 @@ private static object CreateComponent(IPipelineComponent toBuild)
         //get all possible properties that we could set on the underlying class
         foreach (var propertyInfo in toReturn.GetType().GetProperties())
         {
-            SetPropertyIfDemanded(toBuild,toReturn,propertyInfo,allArguments);
+            SetPropertyIfDemanded(toBuild, toReturn, propertyInfo, allArguments);
 
             //see if any demand nested initialization
             var nestedInit =
@@ -188,7 +194,8 @@ private static object CreateComponent(IPipelineComponent toBuild)
     /// <param name="propertyInfo">The specific property you are trying to populate on toBuild</param>
     /// <param name="arguments">IArguments of toBuild (the values to populate toReturn with)</param>
     /// <param name="nestedProperty">If you are populating a sub property of the class then pass the instance of the sub property as toBuild and pass the nesting property as nestedProperty</param>
-    private static void SetPropertyIfDemanded(IPipelineComponent toBuild,object toReturn, PropertyInfo propertyInfo, IArgument[] arguments, PropertyInfo nestedProperty = null)
+    private static void SetPropertyIfDemanded(IPipelineComponent toBuild, object toReturn, PropertyInfo propertyInfo,
+        IArgument[] arguments, PropertyInfo nestedProperty = null)
     {
         //see if any demand initialization
         var initialization =
@@ -198,12 +205,13 @@ private static void SetPropertyIfDemanded(IPipelineComponent toBuild,object toRe
 
         //this one does
         if (initialization != null)
-        {
             try
             {
                 //look for 'DeleteUsers' if not nested
                 //look for 'Settings.DeleteUsers' if nested in a property called Settings on class
-                var expectedArgumentName = nestedProperty != null ? $"{nestedProperty.Name}.{propertyInfo.Name}" : propertyInfo.Name;
+                var expectedArgumentName = nestedProperty != null
+                    ? $"{nestedProperty.Name}.{propertyInfo.Name}"
+                    : propertyInfo.Name;
 
                 //get the appropriate value from arguments
                 var argument = arguments.SingleOrDefault(n => n.Name.Equals(expectedArgumentName));
@@ -212,12 +220,13 @@ private static void SetPropertyIfDemanded(IPipelineComponent toBuild,object toRe
                 if (argument == null)
                     if (initialization.DefaultValue == null && initialization.Mandatory)
                     {
-                        var msg = string.Format("Class {0} has a property {1} marked with DemandsInitialization but no corresponding argument was found in the arguments (PipelineComponentArgument) of the PipelineComponent called {2}",
-                            toReturn.GetType().Name ,
-                            propertyInfo.Name ,
+                        var msg = string.Format(
+                            "Class {0} has a property {1} marked with DemandsInitialization but no corresponding argument was found in the arguments (PipelineComponentArgument) of the PipelineComponent called {2}",
+                            toReturn.GetType().Name,
+                            propertyInfo.Name,
                             toBuild.Name);
 
-                        throw new PropertyDemandNotMetException(msg, toBuild,propertyInfo);
+                        throw new PropertyDemandNotMetException(msg, toBuild, propertyInfo);
                     }
                     else
                     {
@@ -225,19 +234,15 @@ private static void SetPropertyIfDemanded(IPipelineComponent toBuild,object toRe
                         propertyInfo.SetValue(toReturn, initialization.DefaultValue, null);
                     }
                 else
-                {
                     //use reflection to set the value
                     propertyInfo.SetValue(toReturn, argument.GetValueAsSystemType(), null);
-                }
-
-
             }
             catch (NotSupportedException e)
             {
                 throw new Exception(
-                    $"Class {toReturn.GetType().Name} has a property {propertyInfo.Name} but is of unexpected/unsupported type {propertyInfo.GetType()}", e);
+                    $"Class {toReturn.GetType().Name} has a property {propertyInfo.Name} but is of unexpected/unsupported type {propertyInfo.GetType()}",
+                    e);
             }
-        }
     }
 
     /// <summary>
@@ -288,7 +293,8 @@ public void Check(IPipeline pipeline, ICheckNotifier checkNotifier, object[] ini
         try
         {
             dataFlowPipelineEngine = Create(pipeline, new FromCheckNotifierToDataLoadEventListener(checkNotifier));
-            checkNotifier.OnCheckPerformed(new CheckEventArgs("Pipeline successfully constructed in memory", CheckResult.Success));
+            checkNotifier.OnCheckPerformed(new CheckEventArgs("Pipeline successfully constructed in memory",
+                CheckResult.Success));
         }
         catch (Exception exception)
         {
@@ -299,15 +305,15 @@ public void Check(IPipeline pipeline, ICheckNotifier checkNotifier, object[] ini
 
         if (initizationObjects == null)
         {
-            checkNotifier.OnCheckPerformed(new CheckEventArgs("initizationObjects parameter has not been set (this is a programmer error most likely ask your developer to fix it - this parameter should be empty not null)",
+            checkNotifier.OnCheckPerformed(new CheckEventArgs(
+                "initizationObjects parameter has not been set (this is a programmer error most likely ask your developer to fix it - this parameter should be empty not null)",
                 CheckResult.Fail));
             return;
         }
-            
+
         //Initialize each component with the initialization objects so that they can check themselves (note that this should be preview data, hopefully the components don't run off and start nuking stuff just because they got their GO objects)
-        if(dataFlowPipelineEngine != null)
+        if (dataFlowPipelineEngine != null)
         {
-
             try
             {
                 dataFlowPipelineEngine.Initialize(initizationObjects);
@@ -320,7 +326,8 @@ public void Check(IPipeline pipeline, ICheckNotifier checkNotifier, object[] ini
             {
                 checkNotifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Pipeline initialization failed, there were {initizationObjects.Length} objects for use in initialization ({string.Join(",", initizationObjects.Select(o => o.ToString()))})", CheckResult.Fail,
+                        $"Pipeline initialization failed, there were {initizationObjects.Length} objects for use in initialization ({string.Join(",", initizationObjects.Select(o => o.ToString()))})",
+                        CheckResult.Fail,
                         exception));
             }
 
diff --git a/Rdmp.Core/DataFlowPipeline/GracefulCancellationToken.cs b/Rdmp.Core/DataFlowPipeline/GracefulCancellationToken.cs
index 12306da772..dd3e41cf1a 100644
--- a/Rdmp.Core/DataFlowPipeline/GracefulCancellationToken.cs
+++ b/Rdmp.Core/DataFlowPipeline/GracefulCancellationToken.cs
@@ -32,7 +32,7 @@ public class GracefulCancellationToken
     public GracefulCancellationToken() : this(default, default)
     {
     }
-         
+
     /// <summary>
     /// Creates a new <see cref="GracefulCancellationToken"/> using the provided stop and abort tokens.  You can pass
     /// the same CancellationToken for both parameters if you only want to support abort.
@@ -68,6 +68,7 @@ public void ThrowIfCancellationRequested()
         ThrowIfAbortRequested();
         ThrowIfStopRequested();
     }
+
     /// <summary>
     /// Throws OperationCanceledException if <see cref="AbortToken"/> has been set
     /// </summary>
@@ -88,8 +89,6 @@ public void ThrowIfStopRequested()
     /// Creates a single CancellationTokenSource which will be triggered if either <see cref="StopToken"/> or <see cref="AbortToken"/> is set
     /// </summary>
     /// <returns></returns>
-    public CancellationTokenSource CreateLinkedSource()
-    {
-        return CancellationTokenSource.CreateLinkedTokenSource(StopToken, AbortToken);
-    }
+    public CancellationTokenSource CreateLinkedSource() =>
+        CancellationTokenSource.CreateLinkedTokenSource(StopToken, AbortToken);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/IDataFlowComponent.cs b/Rdmp.Core/DataFlowPipeline/IDataFlowComponent.cs
index 447a47dee5..a738c95f67 100644
--- a/Rdmp.Core/DataFlowPipeline/IDataFlowComponent.cs
+++ b/Rdmp.Core/DataFlowPipeline/IDataFlowComponent.cs
@@ -29,7 +29,7 @@ public interface IDataFlowComponent<T>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     T ProcessPipelineData(T toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken);
-        
+
     /// <summary>
     /// Called after your pipeline has been fully executed (even if it resulted in a crash).  If the pipeline crashed then the Exception will be populated.
     /// </summary>
diff --git a/Rdmp.Core/DataFlowPipeline/IDataFlowDestination.cs b/Rdmp.Core/DataFlowPipeline/IDataFlowDestination.cs
index ba56732288..0609eff335 100644
--- a/Rdmp.Core/DataFlowPipeline/IDataFlowDestination.cs
+++ b/Rdmp.Core/DataFlowPipeline/IDataFlowDestination.cs
@@ -13,5 +13,4 @@ namespace Rdmp.Core.DataFlowPipeline;
 /// <typeparam name="T"></typeparam>
 public interface IDataFlowDestination<T> : IDataFlowComponent<T>
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/IPluginDataFlowComponent.cs b/Rdmp.Core/DataFlowPipeline/IPluginDataFlowComponent.cs
index 307c3ab19b..3e4a776f2b 100644
--- a/Rdmp.Core/DataFlowPipeline/IPluginDataFlowComponent.cs
+++ b/Rdmp.Core/DataFlowPipeline/IPluginDataFlowComponent.cs
@@ -13,7 +13,6 @@ namespace Rdmp.Core.DataFlowPipeline;
 /// state.
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public interface IPluginDataFlowComponent<T>:IDataFlowComponent<T>,ICheckable
+public interface IPluginDataFlowComponent<T> : IDataFlowComponent<T>, ICheckable
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/IPluginDataFlowSource.cs b/Rdmp.Core/DataFlowPipeline/IPluginDataFlowSource.cs
index 53e57f7ed9..88f7d63c91 100644
--- a/Rdmp.Core/DataFlowPipeline/IPluginDataFlowSource.cs
+++ b/Rdmp.Core/DataFlowPipeline/IPluginDataFlowSource.cs
@@ -12,7 +12,6 @@ namespace Rdmp.Core.DataFlowPipeline;
 /// MEF discoverable version of IDataFlowSource
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public interface IPluginDataFlowSource<T>:IDataFlowSource<T>,ICheckable
+public interface IPluginDataFlowSource<T> : IDataFlowSource<T>, ICheckable
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/PipelineCrashedException.cs b/Rdmp.Core/DataFlowPipeline/PipelineCrashedException.cs
index 2ca81eadd9..c9572b60f2 100644
--- a/Rdmp.Core/DataFlowPipeline/PipelineCrashedException.cs
+++ b/Rdmp.Core/DataFlowPipeline/PipelineCrashedException.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.DataFlowPipeline;
 /// </summary>
 public class PipelineCrashedException : Exception
 {
-    public PipelineCrashedException(string msg, Exception innerException):base(msg,innerException)
+    public PipelineCrashedException(string msg, Exception innerException) : base(msg, innerException)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContext.cs b/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContext.cs
index 8d1b315da0..89a83500be 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContext.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContext.cs
@@ -27,9 +27,8 @@ namespace Rdmp.Core.DataFlowPipeline.Requirements;
 /// the IPipelineUseCase also has the specific objects that will be used for initialization, fixed source instances etc (as well the context).</para>
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public class DataFlowPipelineContext<T>: IDataFlowPipelineContext
+public class DataFlowPipelineContext<T> : IDataFlowPipelineContext
 {
-
     /// <summary>
     /// Optional.  Specifies that in order for an <see cref="IPipeline"/> to be compatible with the context, its <see cref="IPipeline.Source"/> must inherit/implement the given Type
     /// </summary>
@@ -56,10 +55,7 @@ public DataFlowPipelineContext()
     /// </summary>
     /// <param name="t"></param>
     /// <returns></returns>
-    public bool IsAllowable(Type t)
-    {
-        return IsAllowable(t, out string whoCares);
-    }
+    public bool IsAllowable(Type t) => IsAllowable(t, out string whoCares);
 
     /// <inheritdoc/>
     public bool IsAllowable(Type t, out string reason)
@@ -115,7 +111,8 @@ public bool IsAllowable(Type t, out string reason)
                 &&
                 forbiddenType.IsGenericType
                 &&
-                forbiddenType.GenericTypeArguments.Any(subtype => subtype.IsAssignableFrom(t))) //and t is TableInfo (generic <T> == t)
+                forbiddenType.GenericTypeArguments.Any(subtype =>
+                    subtype.IsAssignableFrom(t))) //and t is TableInfo (generic <T> == t)
             {
                 reason =
                     $"Type {GetFullName(t)} is a generic parameter of forbidden type {GetFullName(forbiddenType)}(Forbidden within the current context)";
@@ -138,14 +135,12 @@ private bool IsAllowable(Type t, out Type forbiddenType)
     public bool IsAllowable(IPipeline pipeline, out string reason)
     {
         foreach (var component in pipeline.PipelineComponents)
-        {
             if (!IsAllowable(component.GetClassAsSystemType(), out Type forbiddenType))
             {
                 reason =
                     $"Component {component.Name} implements a forbidden type ({GetFullName(forbiddenType)}) under the pipeline usage context";
                 return false;
             }
-        }
 
         reason = MustHave(MustHaveDestination, pipeline.Destination, "destination");
         if (reason != null)
@@ -153,16 +148,17 @@ public bool IsAllowable(IPipeline pipeline, out string reason)
 
         reason = MustHave(MustHaveSource, pipeline.Source, "source");
         return reason == null;
-
-
     }
 
-    private static string MustHave(Type mustHaveType, IPipelineComponent component, string descriptionOfThingBeingChecked)
+    private static string MustHave(Type mustHaveType, IPipelineComponent component,
+        string descriptionOfThingBeingChecked)
     {
         //it must have destination
         if (mustHaveType != null)
             if (component == null)
+            {
                 return $"An explicit {descriptionOfThingBeingChecked} must be chosen";
+            }
             else
             {
                 var pipelineComponentType = component.GetClassAsSystemType();
@@ -172,10 +168,8 @@ private static string MustHave(Type mustHaveType, IPipelineComponent component,
                         $"PipelineComponent {component.Class} could not be created, check MEF assembly loading in the Diagnostics menu";
 
                 if (!mustHaveType.IsAssignableFrom(pipelineComponentType))
-                {
                     return
                         $"The pipeline requires a {descriptionOfThingBeingChecked} of type {GetFullName(mustHaveType)} but the currently configured {descriptionOfThingBeingChecked}{GetFullName(pipelineComponentType)} is not of the same type or a derrived type";
-                }
             }
         else
             //it cannot have destination
@@ -187,10 +181,7 @@ private static string MustHave(Type mustHaveType, IPipelineComponent component,
     }
 
     /// <inheritdoc/>
-    public bool IsAllowable(IPipeline pipeline)
-    {
-        return IsAllowable(pipeline, out string whocares);
-    }
+    public bool IsAllowable(IPipeline pipeline) => IsAllowable(pipeline, out var whocares);
 
 
     /// <summary>
@@ -200,7 +191,8 @@ public bool IsAllowable(IPipeline pipeline)
     /// <param name="listener"></param>
     /// <param name="component"></param>
     /// <param name="parameters"></param>
-    public void PreInitialize(IDataLoadEventListener listener, IDataFlowComponent<T> component, params object[] parameters)
+    public void PreInitialize(IDataLoadEventListener listener, IDataFlowComponent<T> component,
+        params object[] parameters)
     {
         PreInitializeComponentWithAllObjects(listener, component, parameters);
     }
@@ -215,7 +207,8 @@ public void PreInitialize(IDataLoadEventListener listener, IDataFlowSource<T> co
     }
 
 
-    private void PreInitializeComponentWithAllObjects(IDataLoadEventListener listener, object component, params object[] parameters)
+    private void PreInitializeComponentWithAllObjects(IDataLoadEventListener listener, object component,
+        params object[] parameters)
     {
         //these are all the interfaces like IPipelineRequirement<TableInfo> etc
         var requirements = component.GetType().GetInterfaces().Where(i =>
@@ -223,7 +216,7 @@ private void PreInitializeComponentWithAllObjects(IDataLoadEventListener listene
             i.GetGenericTypeDefinition()
             == typeof(IPipelineRequirement<>)).ToArray();
 
-        Satisfy(requirements, false, listener, component,parameters);
+        Satisfy(requirements, false, listener, component, parameters);
 
         // satisfy optional requirements
         //these are all the interfaces like IPipelineOptionalRequirement<TableInfo> etc
@@ -235,13 +228,14 @@ private void PreInitializeComponentWithAllObjects(IDataLoadEventListener listene
         Satisfy(optionals, true, listener, component, parameters);
     }
 
-    private void Satisfy(Type[] requirements, bool isOptional, IDataLoadEventListener listener, object component, params object[] parameters)
+    private void Satisfy(Type[] requirements, bool isOptional, IDataLoadEventListener listener, object component,
+        params object[] parameters)
     {
         var initializedComponents = new Dictionary<object, Dictionary<MethodInfo, object>>();
 
         //these are the T tokens in the above interfaces
         var typesRequired = requirements.Select(i => i.GenericTypeArguments[0]).ToList();
-                   
+
         //now initialize all the parameters
         foreach (var parameter in parameters)
         {
@@ -254,7 +248,8 @@ private void Satisfy(Type[] requirements, bool isOptional, IDataLoadEventListene
                 throw new Exception(
                     $"Type {GetFullName(parameter.GetType())} is not an allowable PreInitialize parameters type under the current DataFlowPipelineContext (check which flags you passed to the DataFlowPipelineContextFactory and the interfaces IPipelineRequirement<> that your components implement) ");
 
-            var toRemove = PreInitializeComponentWithSingleObject(listener, component, parameter, initializedComponents);
+            var toRemove =
+                PreInitializeComponentWithSingleObject(listener, component, parameter, initializedComponents);
 
             if (toRemove != null)
                 typesRequired.Remove(toRemove);
@@ -266,11 +261,13 @@ private void Satisfy(Type[] requirements, bool isOptional, IDataLoadEventListene
             );
     }
 
-    private static Type PreInitializeComponentWithSingleObject(IDataLoadEventListener listener, object component, object value, Dictionary<object, Dictionary<MethodInfo, object>> initializedComponents)
+    private static Type PreInitializeComponentWithSingleObject(IDataLoadEventListener listener, object component,
+        object value, Dictionary<object, Dictionary<MethodInfo, object>> initializedComponents)
     {
         var compatibleInterfaces = component.GetType()
             .GetInterfaces().Where(i =>
-                i.IsGenericType && (i.GenericTypeArguments[0] == value.GetType() || i.GenericTypeArguments[0].IsInstanceOfType(value))
+                i.IsGenericType && (i.GenericTypeArguments[0] == value.GetType() ||
+                                    i.GenericTypeArguments[0].IsInstanceOfType(value))
             ).ToArray();
 
         switch (compatibleInterfaces.Length)
@@ -289,16 +286,16 @@ private static Type PreInitializeComponentWithSingleObject(IDataLoadEventListene
             var preInit = interfaceToInvokeIfAny.GetMethod("PreInitialize");
 
             //but first document the fact that we have found it
-            if (!initializedComponents.TryGetValue(component,out var dict))
-                initializedComponents.Add(component, dict=new Dictionary<MethodInfo, object>());
+            if (!initializedComponents.TryGetValue(component, out var dict))
+                initializedComponents.Add(component, dict = new Dictionary<MethodInfo, object>());
 
-            if (dict.TryGetValue(preInit,out var existing))
+            if (dict.TryGetValue(preInit, out var existing))
                 throw new MultipleMatchingImplmentationException(
                     $"Interface {GetFullName(interfaceToInvokeIfAny)} matches both input objects '{existing}' ('{existing.GetType().Name}') and '{value}' ('{value.GetType().Name}')");
             initializedComponents[component].Add(preInit, value);
 
             //invoke it
-            preInit.Invoke(component, new[] {value, listener});
+            preInit.Invoke(component, new[] { value, listener });
 
             //return the type of T for IPipelineRequirement<T> interface that was called
             return interfaceToInvokeIfAny.GenericTypeArguments[0];
@@ -308,7 +305,8 @@ private static Type PreInitializeComponentWithSingleObject(IDataLoadEventListene
     }
 
     /// <inheritdoc/>
-    public void PreInitializeGeneric(IDataLoadEventListener listener, object component, params object[] initializationObjects)
+    public void PreInitializeGeneric(IDataLoadEventListener listener, object component,
+        params object[] initializationObjects)
     {
         switch (component)
         {
@@ -343,12 +341,11 @@ private static string GetFullName(Type t)
     /// <inheritdoc/>
     public IEnumerable<Type> GetIPipelineRequirementsForType(Type t)
     {
-        return t.GetInterfaces().Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPipelineRequirement<>)).Select(r=>r.GetGenericArguments()[0]);
+        return t.GetInterfaces()
+            .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IPipelineRequirement<>))
+            .Select(r => r.GetGenericArguments()[0]);
     }
 
     /// <inheritdoc/>
-    public Type GetFlowType()
-    {
-        return typeof (T);
-    }
+    public Type GetFlowType() => typeof(T);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContextFactory.cs b/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContextFactory.cs
index 47b94adde9..22ca482be7 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContextFactory.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/DataFlowPipelineContextFactory.cs
@@ -34,7 +34,10 @@ public DataFlowPipelineContext<T> Create(PipelineUsage flags)
             toReturn.CannotHave.Add(typeof(IDataFlowDestination<T>));
         }
         else
-            toReturn.MustHaveDestination = typeof(IDataFlowDestination<T>);//context does not have a fixed destination so the pipeline configuration must specify the destination itself
+        {
+            toReturn.MustHaveDestination =
+                typeof(IDataFlowDestination<T>); //context does not have a fixed destination so the pipeline configuration must specify the destination itself
+        }
 
         if (flags.HasFlag(PipelineUsage.FixedSource))
         {
@@ -42,8 +45,11 @@ public DataFlowPipelineContext<T> Create(PipelineUsage flags)
             toReturn.CannotHave.Add(typeof(IDataFlowSource<T>));
         }
         else
-            toReturn.MustHaveSource = typeof(IDataFlowSource<T>);//context does not have a fixed source so the pipeline configuration must specify the source itself
-            
+        {
+            toReturn.MustHaveSource =
+                typeof(IDataFlowSource<T>); //context does not have a fixed source so the pipeline configuration must specify the source itself
+        }
+
         if (!flags.HasFlag(PipelineUsage.LoadsSingleTableInfo))
             toReturn.CannotHave.Add(typeof(IPipelineRequirement<TableInfo>));
 
@@ -51,9 +57,8 @@ public DataFlowPipelineContext<T> Create(PipelineUsage flags)
             toReturn.CannotHave.Add(typeof(IPipelineRequirement<TableLoadInfo>));
 
         if (flags.HasFlag(PipelineUsage.LoadsSingleFlatFile))
-            toReturn.MustHaveSource = typeof (IPipelineRequirement<FlatFileToLoad>);
+            toReturn.MustHaveSource = typeof(IPipelineRequirement<FlatFileToLoad>);
 
         return toReturn;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/MultipleMatchingImplmentationException.cs b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/MultipleMatchingImplmentationException.cs
index 8d2d86a6b7..16fa5d5bcb 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/MultipleMatchingImplmentationException.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/MultipleMatchingImplmentationException.cs
@@ -17,7 +17,7 @@ public class MultipleMatchingImplmentationException : Exception
     /// Creates a new Exception with the provided message
     /// </summary>
     /// <param name="s"></param>
-    public MultipleMatchingImplmentationException(string s) : base (s)
+    public MultipleMatchingImplmentationException(string s) : base(s)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/OverlappingImplementationsException.cs b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/OverlappingImplementationsException.cs
index b049304654..c641c7501c 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/OverlappingImplementationsException.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/OverlappingImplementationsException.cs
@@ -17,7 +17,7 @@ public class OverlappingImplementationsException : Exception
     /// Creates a new Exception with the provided message
     /// </summary>
     /// <param name="s"></param>
-    public OverlappingImplementationsException(string s) : base (s)
+    public OverlappingImplementationsException(string s) : base(s)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/PropertyDemandNotMetException.cs b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/PropertyDemandNotMetException.cs
index b880165150..fbb8b3c745 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/PropertyDemandNotMetException.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/Exceptions/PropertyDemandNotMetException.cs
@@ -19,7 +19,8 @@ internal class PropertyDemandNotMetException : Exception
     public IPipelineComponent PipelineComponent { get; private set; }
     public PropertyInfo PropertyInfo { get; private set; }
 
-    public PropertyDemandNotMetException(string message, IPipelineComponent pipelineComponent, PropertyInfo propertyInfo)
+    public PropertyDemandNotMetException(string message, IPipelineComponent pipelineComponent,
+        PropertyInfo propertyInfo)
         : base(message)
     {
         PipelineComponent = pipelineComponent;
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/FlatFileToLoad.cs b/Rdmp.Core/DataFlowPipeline/Requirements/FlatFileToLoad.cs
index 26d6bb3f3b..2e642e2f26 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/FlatFileToLoad.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/FlatFileToLoad.cs
@@ -28,7 +28,7 @@ public FlatFileToLoad(FileInfo file)
     /// The file you are trying to load
     /// </summary>
     public FileInfo File { get; set; }
-        
+
     /// <summary>
     /// Returns the filename of the file you are trying to load
     /// </summary>
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/IDataFlowPipelineContext.cs b/Rdmp.Core/DataFlowPipeline/Requirements/IDataFlowPipelineContext.cs
index c98afd5311..c7eddff36b 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/IDataFlowPipelineContext.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/IDataFlowPipelineContext.cs
@@ -36,7 +36,7 @@ public interface IDataFlowPipelineContext
     /// <param name="pipeline"></param>
     /// <param name="reason"></param>
     /// <returns></returns>
-    bool IsAllowable(IPipeline pipeline,out string reason);
+    bool IsAllowable(IPipeline pipeline, out string reason);
 
 
     /// <summary>
@@ -45,7 +45,7 @@ public interface IDataFlowPipelineContext
     /// <param name="t">The Type of an IDataFlowComponent</param>
     /// <returns>true if the component is compatible with the context</returns>
     bool IsAllowable(Type t);
-        
+
     /// <summary>
     /// Determines whether a given IDataFlowComponent Type is compatible with the current context
     /// </summary>
@@ -74,5 +74,5 @@ public interface IDataFlowPipelineContext
     /// <param name="listener"></param>
     /// <param name="component"></param>
     /// <param name="initializationObjects"></param>
-    void PreInitializeGeneric(IDataLoadEventListener listener, object component,params object[] initializationObjects);
+    void PreInitializeGeneric(IDataLoadEventListener listener, object component, params object[] initializationObjects);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataFlowPipeline/Requirements/PipelineUsage.cs b/Rdmp.Core/DataFlowPipeline/Requirements/PipelineUsage.cs
index 112665cfca..8c52c3c352 100644
--- a/Rdmp.Core/DataFlowPipeline/Requirements/PipelineUsage.cs
+++ b/Rdmp.Core/DataFlowPipeline/Requirements/PipelineUsage.cs
@@ -26,7 +26,7 @@ public enum PipelineUsage
     /// destination. When used in DataFlowPipelineContextFactory this prevents the addition of IDataFlowDestination components
     /// </summary>
     FixedDestination = 1,
-        
+
     /// <summary>
     /// Pipeline puts data into a single <see cref="TableInfo"/>
     /// </summary>
diff --git a/Rdmp.Core/DataLoad/Engine/Attachers/Attacher.cs b/Rdmp.Core/DataLoad/Engine/Attachers/Attacher.cs
index db363e5dc1..adba0ed7c3 100644
--- a/Rdmp.Core/DataLoad/Engine/Attachers/Attacher.cs
+++ b/Rdmp.Core/DataLoad/Engine/Attachers/Attacher.cs
@@ -21,10 +21,14 @@ namespace Rdmp.Core.DataLoad.Engine.Attachers;
 /// </summary>
 public abstract class Attacher : IAttacher
 {
-    public const string Culture_DemandDescription = "Culture to use for bulk insert operations (determines date formats etc)";
-    public const string ExplicitDateTimeFormat_DemandDescription =  "Optional - explicit format for all date columns e.g. yyyy-MM-dd. See https://docs.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings";
+    public const string Culture_DemandDescription =
+        "Culture to use for bulk insert operations (determines date formats etc)";
+
+    public const string ExplicitDateTimeFormat_DemandDescription =
+        "Optional - explicit format for all date columns e.g. yyyy-MM-dd. See https://docs.microsoft.com/en-us/dotnet/standard/base-types/custom-date-and-time-format-strings";
 
     private CultureInfo _culture;
+
     [DemandsInitialization(Culture_DemandDescription)]
     public virtual CultureInfo Culture
     {
@@ -33,17 +37,20 @@ public virtual CultureInfo Culture
     }
 
     private string _explicitDateTimeFormat;
+
     [DemandsInitialization(ExplicitDateTimeFormat_DemandDescription)]
-    public virtual string ExplicitDateTimeFormat{
+    public virtual string ExplicitDateTimeFormat
+    {
         get => _explicitDateTimeFormat;
-        set => _explicitDateTimeFormat = value; }
+        set => _explicitDateTimeFormat = value;
+    }
 
     protected DiscoveredDatabase _dbInfo;
 
     public abstract ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken);
 
     public ILoadDirectory LoadDirectory { get; set; }
-        
+
     public bool RequestsExternalDatabaseCreation { get; private set; }
 
     public virtual void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
@@ -51,7 +58,7 @@ public virtual void Initialize(ILoadDirectory directory, DiscoveredDatabase dbIn
         LoadDirectory = directory;
         _dbInfo = dbInfo;
     }
-        
+
     protected Attacher(bool requestsExternalDatabaseCreation)
     {
         RequestsExternalDatabaseCreation = requestsExternalDatabaseCreation;
@@ -59,6 +66,6 @@ protected Attacher(bool requestsExternalDatabaseCreation)
 
     public abstract void Check(ICheckNotifier notifier);
 
-        
-    public abstract void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener);
+
+    public abstract void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Attachers/IAttacher.cs b/Rdmp.Core/DataLoad/Engine/Attachers/IAttacher.cs
index 534631972b..82bd7254dd 100644
--- a/Rdmp.Core/DataLoad/Engine/Attachers/IAttacher.cs
+++ b/Rdmp.Core/DataLoad/Engine/Attachers/IAttacher.cs
@@ -15,11 +15,11 @@ namespace Rdmp.Core.DataLoad.Engine.Attachers;
 /// <summary>
 /// See Attacher
 /// </summary>
-public interface IAttacher: IDisposeAfterDataLoad, ICheckable
+public interface IAttacher : IDisposeAfterDataLoad, ICheckable
 {
     ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken);
     void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo);
-        
+
     ILoadDirectory LoadDirectory { get; set; }
     bool RequestsExternalDatabaseCreation { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Attachers/IPluginAttacher.cs b/Rdmp.Core/DataLoad/Engine/Attachers/IPluginAttacher.cs
index 2e05d9a894..4dc2ffb39e 100644
--- a/Rdmp.Core/DataLoad/Engine/Attachers/IPluginAttacher.cs
+++ b/Rdmp.Core/DataLoad/Engine/Attachers/IPluginAttacher.cs
@@ -11,5 +11,4 @@ namespace Rdmp.Core.DataLoad.Engine.Attachers;
 /// </summary>
 public interface IPluginAttacher : IAttacher
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/CheckEntireDataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/Checks/CheckEntireDataLoadProcess.cs
index 32462e16ab..3802fdf10d 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/CheckEntireDataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/CheckEntireDataLoadProcess.cs
@@ -19,25 +19,26 @@ namespace Rdmp.Core.DataLoad.Engine.Checks;
 /// <summary>
 /// Checks a LoadMetadata it is in a fit state to be executed (does it have primary keys, backup trigger etc).
 /// </summary>
-public class CheckEntireDataLoadProcess :  ICheckable
+public class CheckEntireDataLoadProcess : ICheckable
 {
     private readonly HICDatabaseConfiguration _databaseConfiguration;
     private readonly HICLoadConfigurationFlags _loadConfigurationFlags;
     private readonly MEF _mef;
     public ILoadMetadata LoadMetadata { get; set; }
 
-    public CheckEntireDataLoadProcess(ILoadMetadata loadMetadata, HICDatabaseConfiguration databaseConfiguration, HICLoadConfigurationFlags loadConfigurationFlags, MEF mef)
+    public CheckEntireDataLoadProcess(ILoadMetadata loadMetadata, HICDatabaseConfiguration databaseConfiguration,
+        HICLoadConfigurationFlags loadConfigurationFlags, MEF mef)
     {
         _databaseConfiguration = databaseConfiguration;
         _loadConfigurationFlags = loadConfigurationFlags;
         _mef = mef;
         LoadMetadata = loadMetadata;
-
     }
-        
+
     public void Check(ICheckNotifier notifier)
     {
-        var catalogueLoadChecks = new CatalogueLoadChecks(LoadMetadata, _loadConfigurationFlags, _databaseConfiguration);
+        var catalogueLoadChecks =
+            new CatalogueLoadChecks(LoadMetadata, _loadConfigurationFlags, _databaseConfiguration);
         var metadataLoggingConfigurationChecks = new MetadataLoggingConfigurationChecks(LoadMetadata);
         var processTaskChecks = new ProcessTaskChecks(LoadMetadata);
         var preExecutionChecks = new PreExecutionChecker(LoadMetadata, _databaseConfiguration);
@@ -50,39 +51,37 @@ public void Check(ICheckNotifier notifier)
             loadProgress.Check(notifier);
 
             var cp = loadProgress.CacheProgress;
-            if(cp != null)
-            {
+            if (cp != null)
                 try
                 {
                     var f = new CacheLayoutFactory();
-                    CacheLayoutFactory.CreateCacheLayout(loadProgress,LoadMetadata);
+                    CacheLayoutFactory.CreateCacheLayout(loadProgress, LoadMetadata);
                 }
                 catch (Exception e)
                 {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Load contains a CacheProgress '{cp}' but we were unable to generate an ICacheLayout, see Inner Exception for details",CheckResult.Fail,e));
+                        $"Load contains a CacheProgress '{cp}' but we were unable to generate an ICacheLayout, see Inner Exception for details",
+                        CheckResult.Fail, e));
                 }
-            }
         }
 
         //Make sure there are some load tasks and they are valid
         processTaskChecks.Check(notifier);
-            
-            
+
+
         try
         {
             metadataLoggingConfigurationChecks.Check(notifier);
 
             preExecutionChecks.Check(notifier);
-                
-            if(!preExecutionChecks.HardFail)
-                catalogueLoadChecks.Check(notifier);
 
+            if (!preExecutionChecks.HardFail)
+                catalogueLoadChecks.Check(notifier);
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Entire check process crashed in an unexpected way", CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs("Entire check process crashed in an unexpected way",
+                CheckResult.Fail, e));
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/AnonymisationChecks.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/AnonymisationChecks.cs
index 5bd57ea379..aab9029822 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/AnonymisationChecks.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/AnonymisationChecks.cs
@@ -26,7 +26,8 @@ public AnonymisationChecks(TableInfo tableInfo)
     public void Check(ICheckNotifier notifier)
     {
         //check ANO stuff is synchronized
-        notifier.OnCheckPerformed(new CheckEventArgs("Preparing to synchronize ANO configuration", CheckResult.Success, null));
+        notifier.OnCheckPerformed(new CheckEventArgs("Preparing to synchronize ANO configuration", CheckResult.Success,
+            null));
 
         var synchronizer = new ANOTableInfoSynchronizer(_tableInfo);
 
@@ -37,10 +38,11 @@ public void Check(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Synchronization of Anonymsiation configurations of table {_tableInfo.GetRuntimeName()} failed with Exception", CheckResult.Fail, e, null));
+                $"Synchronization of Anonymsiation configurations of table {_tableInfo.GetRuntimeName()} failed with Exception",
+                CheckResult.Fail, e, null));
         }
 
-        if(_tableInfo.IdentifierDumpServer_ID != null)
+        if (_tableInfo.IdentifierDumpServer_ID != null)
         {
             var identifierDumper = new IdentifierDumper(_tableInfo);
             identifierDumper.Check(notifier);
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CatalogueLoadChecks.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CatalogueLoadChecks.cs
index 8fe53fbe7b..1a33170433 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CatalogueLoadChecks.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CatalogueLoadChecks.cs
@@ -20,13 +20,14 @@
 
 namespace Rdmp.Core.DataLoad.Engine.Checks.Checkers;
 
-internal class CatalogueLoadChecks:ICheckable
+internal class CatalogueLoadChecks : ICheckable
 {
     private readonly ILoadMetadata _loadMetadata;
     private readonly HICLoadConfigurationFlags _loadConfigurationFlags;
     private readonly HICDatabaseConfiguration _databaseConfiguration;
 
-    public CatalogueLoadChecks(ILoadMetadata loadMetadata, HICLoadConfigurationFlags loadConfigurationFlags, HICDatabaseConfiguration databaseConfiguration)
+    public CatalogueLoadChecks(ILoadMetadata loadMetadata, HICLoadConfigurationFlags loadConfigurationFlags,
+        HICDatabaseConfiguration databaseConfiguration)
     {
         _loadMetadata = loadMetadata;
         _loadConfigurationFlags = loadConfigurationFlags;
@@ -44,17 +45,17 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs( "Crashed trying to fetch Catalogues for metadata",
+            notifier.OnCheckPerformed(new CheckEventArgs("Crashed trying to fetch Catalogues for metadata",
                 CheckResult.Fail, e));
             return;
         }
 
         //there no catalogues
         if (catalogueMetadatas.Length == 0)
-            notifier.OnCheckPerformed(new CheckEventArgs( "There are no Catalogues associated with this metadata",
+            notifier.OnCheckPerformed(new CheckEventArgs("There are no Catalogues associated with this metadata",
                 CheckResult.Fail, null));
 
-        var tablesFound  = new List<ITableInfo>();
+        var tablesFound = new List<ITableInfo>();
 
         //check each catalogue is sufficiently configured to perform a migration
         foreach (var catalogue in catalogueMetadatas)
@@ -74,7 +75,8 @@ public void Check(ICheckNotifier notifier)
         //check regular tables
         foreach (TableInfo regularTable in tablesFound)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"About To check configuration of TableInfo:{regularTable}", CheckResult.Success, null));
+            notifier.OnCheckPerformed(new CheckEventArgs($"About To check configuration of TableInfo:{regularTable}",
+                CheckResult.Success, null));
             CheckTableInfo(regularTable, notifier);
 
             //check anonymisation
@@ -94,28 +96,31 @@ private void CheckTableInfo(TableInfo tableInfo, ICheckNotifier notifier)
         var staging = _databaseConfiguration.DeployInfo[LoadBubble.Staging];
         var live = DataAccessPortal.ExpectDatabase(tableInfo, DataAccessContext.DataLoad);
 
-        var liveTable = live.ExpectTable(tableInfo.GetRuntimeName(LoadBubble.Live,_databaseConfiguration.DatabaseNamer),tableInfo.Schema);
+        var liveTable =
+            live.ExpectTable(tableInfo.GetRuntimeName(LoadBubble.Live, _databaseConfiguration.DatabaseNamer),
+                tableInfo.Schema);
         var liveCols = liveTable.DiscoverColumns();
 
-        CheckTableInfoSynchronization(tableInfo,notifier);
+        CheckTableInfoSynchronization(tableInfo, notifier);
 
-        CheckTableHasColumnInfosAndPrimaryKeys(live, tableInfo, out ColumnInfo[] columnInfos, out ColumnInfo[] columnInfosWhichArePrimaryKeys,notifier);
+        CheckTableHasColumnInfosAndPrimaryKeys(live, tableInfo, out var columnInfos,
+            out var columnInfosWhichArePrimaryKeys, notifier);
 
         //check for trying to ignore primary keys
         foreach (var col in tableInfo.ColumnInfos)
-        {
-            if(col.IgnoreInLoads && col.IsPrimaryKey)
-                notifier.OnCheckPerformed(new CheckEventArgs($"ColumnInfo {col} is marked both IgnoreInLoads and IsPrimaryKey",CheckResult.Fail));
-        }
+            if (col.IgnoreInLoads && col.IsPrimaryKey)
+                notifier.OnCheckPerformed(
+                    new CheckEventArgs($"ColumnInfo {col} is marked both IgnoreInLoads and IsPrimaryKey",
+                        CheckResult.Fail));
 
         try
         {
-            if(!_loadMetadata.IgnoreTrigger)
+            if (!_loadMetadata.IgnoreTrigger)
             {
                 //if trigger is created as part of this check then it is likely to have resulted in changes to the underlying table (e.g. added hic_validFrom field) in which case we should resynch the TableInfo to pickup these new columns
-                CheckTriggerIntact(liveTable,notifier,out var runSynchronizationAgain);
+                CheckTriggerIntact(liveTable, notifier, out var runSynchronizationAgain);
 
-                if(runSynchronizationAgain)
+                if (runSynchronizationAgain)
                     CheckTableInfoSynchronization(tableInfo, notifier);
             }
 
@@ -127,17 +132,21 @@ private void CheckTableInfo(TableInfo tableInfo, ICheckNotifier notifier)
                 //fair bit of work if you want to realise such a monstrosity (for one cleanup on each run probably cleans up STAGING on exit)
 
                 //live can have additional hic_ columns which do not appear in staging (lookups cannot)
-                var stagingTable = staging.ExpectTable(tableInfo.GetRuntimeName(LoadBubble.Staging, _databaseConfiguration.DatabaseNamer));
+                var stagingTable =
+                    staging.ExpectTable(tableInfo.GetRuntimeName(LoadBubble.Staging,
+                        _databaseConfiguration.DatabaseNamer));
 
                 if (!stagingTable.Exists())
-                    notifier.OnCheckPerformed(new CheckEventArgs("RequiresStagingTableCreation is false but staging does not exist, this flag should indicate that you anticipate STAGING to be already setup before you kick off the load", CheckResult.Fail));
+                    notifier.OnCheckPerformed(new CheckEventArgs(
+                        "RequiresStagingTableCreation is false but staging does not exist, this flag should indicate that you anticipate STAGING to be already setup before you kick off the load",
+                        CheckResult.Fail));
 
                 var stagingCols = stagingTable.DiscoverColumns();
 
-                ConfirmStagingAndLiveHaveSameColumns(tableInfo.GetRuntimeName(), stagingCols, liveCols, false,notifier);
-
-                CheckStagingToLiveMigrationForTable(stagingTable, stagingCols, liveTable, liveCols,notifier);
+                ConfirmStagingAndLiveHaveSameColumns(tableInfo.GetRuntimeName(), stagingCols, liveCols, false,
+                    notifier);
 
+                CheckStagingToLiveMigrationForTable(stagingTable, stagingCols, liveTable, liveCols, notifier);
             }
         }
         catch (Exception e)
@@ -156,13 +165,15 @@ private static void CheckTableInfoSynchronization(TableInfo tableInfo, ICheckNot
         //synchronize but refuse to apply all fixes, problems are instead added to problemList
         if (tableInfoSynchronizer.Synchronize(notifier))
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"TableInfo {tableInfo} passed Synchronization check", CheckResult.Success, null)); //passed synchronization
+            notifier.OnCheckPerformed(new CheckEventArgs($"TableInfo {tableInfo} passed Synchronization check",
+                CheckResult.Success, null)); //passed synchronization
         }
         else
         {
             var launchSyncFixer = notifier.OnCheckPerformed(new CheckEventArgs(
-                $"TableInfo {tableInfo} failed Synchronization check with following problems:{problemList}", CheckResult.Fail,
-                null,"Launch Synchronization Fixing")); //failed syncronization
+                $"TableInfo {tableInfo} failed Synchronization check with following problems:{problemList}",
+                CheckResult.Fail,
+                null, "Launch Synchronization Fixing")); //failed syncronization
 
             if (launchSyncFixer)
             {
@@ -170,14 +181,16 @@ private static void CheckTableInfoSynchronization(TableInfo tableInfo, ICheckNot
                     //if silent running accept all changes
                     tableInfoSynchronizer.Synchronize(notifier);
 
-                if(!userFixed)
+                if (!userFixed)
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"TableInfo {tableInfo} still failed Synchronization check", CheckResult.Fail, null)); //passed synchronization
+                        $"TableInfo {tableInfo} still failed Synchronization check", CheckResult.Fail,
+                        null)); //passed synchronization
             }
         }
     }
 
-    private static void CheckTableHasColumnInfosAndPrimaryKeys(DiscoveredDatabase live, TableInfo tableInfo, out ColumnInfo[] columnInfos, out ColumnInfo[] columnInfosWhichArePrimaryKeys, ICheckNotifier notifier)
+    private static void CheckTableHasColumnInfosAndPrimaryKeys(DiscoveredDatabase live, TableInfo tableInfo,
+        out ColumnInfo[] columnInfos, out ColumnInfo[] columnInfosWhichArePrimaryKeys, ICheckNotifier notifier)
     {
         columnInfos = tableInfo.ColumnInfos.ToArray();
         columnInfosWhichArePrimaryKeys = columnInfos.Where(col => col.IsPrimaryKey).ToArray();
@@ -193,34 +206,38 @@ private static void CheckTableHasColumnInfosAndPrimaryKeys(DiscoveredDatabase li
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"TableInfo {tableInfo.Name} has no IsPrimaryKey columns", CheckResult.Fail, null));
 
-        var primaryKeys = live.ExpectTable(tableInfo.GetRuntimeName(),tableInfo.Schema).DiscoverColumns().Where(c => c.IsPrimaryKey).ToArray();
+        var primaryKeys = live.ExpectTable(tableInfo.GetRuntimeName(), tableInfo.Schema).DiscoverColumns()
+            .Where(c => c.IsPrimaryKey).ToArray();
 
-        if(primaryKeys.Any(k=>k.IsAutoIncrement))
+        if (primaryKeys.Any(k => k.IsAutoIncrement))
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"AutoIncrement columns {string.Join(",", primaryKeys.Where(k => k.IsAutoIncrement))} are not allowed as Primary Keys for your table because there is no way to differentiate new data being loaded from duplicate old data being loaded (the entire purpose of the RDMP DLE)",CheckResult.Fail));
+                $"AutoIncrement columns {string.Join(",", primaryKeys.Where(k => k.IsAutoIncrement))} are not allowed as Primary Keys for your table because there is no way to differentiate new data being loaded from duplicate old data being loaded (the entire purpose of the RDMP DLE)",
+                CheckResult.Fail));
 
         //confirm primary keys match underlying table
         //sort pks alphabetically and confirm they match the underlying live system table
-        var actualPks = primaryKeys.Select(c=>c.GetRuntimeName()).OrderBy(s => s).ToArray();
+        var actualPks = primaryKeys.Select(c => c.GetRuntimeName()).OrderBy(s => s).ToArray();
         var pksWeExpect = columnInfosWhichArePrimaryKeys.Select(c => c.GetRuntimeName()).OrderBy(s => s).ToArray();
 
 
         if (actualPks.Length != pksWeExpect.Length)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Primary keys in Catalogue for database table {tableInfo.GetRuntimeName()} does not match Catalogue entry (difference in number of keys)", CheckResult.Fail, null));
+                $"Primary keys in Catalogue for database table {tableInfo.GetRuntimeName()} does not match Catalogue entry (difference in number of keys)",
+                CheckResult.Fail, null));
         else
             for (var i = 0; i < pksWeExpect.Length; i++)
                 if (!pksWeExpect[i].Equals(actualPks[i]))
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Mismatch between primary key defined in Catalogue {pksWeExpect[i]} and one found in live table {tableInfo.GetRuntimeName()}", CheckResult.Fail, null));
+                        $"Mismatch between primary key defined in Catalogue {pksWeExpect[i]} and one found in live table {tableInfo.GetRuntimeName()}",
+                        CheckResult.Fail, null));
                 else
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Found primary key {pksWeExpect[i]} in LIVE table {tableInfo.GetRuntimeName()}", CheckResult.Success, null));
-
-
+                        $"Found primary key {pksWeExpect[i]} in LIVE table {tableInfo.GetRuntimeName()}",
+                        CheckResult.Success, null));
     }
 
-    private static void CheckTriggerIntact(DiscoveredTable table, ICheckNotifier notifier, out bool runSynchronizationAgain)
+    private static void CheckTriggerIntact(DiscoveredTable table, ICheckNotifier notifier,
+        out bool runSynchronizationAgain)
     {
         var checker = new TriggerChecks(table);
         checker.Check(notifier);
@@ -229,10 +246,12 @@ private static void CheckTriggerIntact(DiscoveredTable table, ICheckNotifier not
     }
 
 
-    private static void ConfirmStagingAndLiveHaveSameColumns(string tableName, DiscoveredColumn[] stagingCols, DiscoveredColumn[] liveCols, bool requireSameNumberAndOrder, ICheckNotifier notifier)
+    private static void ConfirmStagingAndLiveHaveSameColumns(string tableName, DiscoveredColumn[] stagingCols,
+        DiscoveredColumn[] liveCols, bool requireSameNumberAndOrder, ICheckNotifier notifier)
     {
         //in LIVE but not STAGING
-        foreach (var missingColumn in liveCols.Select(c=>c.GetRuntimeName()).Except(stagingCols.Select(c=>c.GetRuntimeName())))
+        foreach (var missingColumn in liveCols.Select(c => c.GetRuntimeName())
+                     .Except(stagingCols.Select(c => c.GetRuntimeName())))
             //column is in live but not in staging, but it is hic_
             if (SpecialFieldNames.IsHicPrefixed(missingColumn)) //this is permitted
                 continue;
@@ -246,7 +265,6 @@ private static void ConfirmStagingAndLiveHaveSameColumns(string tableName, Disco
                 $"Column {missingColumn} is in STAGING but not LIVE", CheckResult.Fail, null));
 
 
-
         if (requireSameNumberAndOrder)
         {
             var passedColumnOrderCheck = true;
@@ -259,26 +277,31 @@ private static void ConfirmStagingAndLiveHaveSameColumns(string tableName, Disco
             }
             else
                 //check they are in the same order
+            {
                 for (var i = 0; i < stagingCols.Length; i++)
                     if (!stagingCols[i].Equals(liveCols[i]))
                     {
                         notifier.OnCheckPerformed(new CheckEventArgs(
-                            $"Column name/order mismatch between staging and live in table {tableName}, column {i} is {stagingCols[i]} in staging but is {liveCols[i]} in live.", CheckResult.Fail, null));
+                            $"Column name/order mismatch between staging and live in table {tableName}, column {i} is {stagingCols[i]} in staging but is {liveCols[i]} in live.",
+                            CheckResult.Fail, null));
                         passedColumnOrderCheck = false;
                         break;
                     }
+            }
 
             if (passedColumnOrderCheck)
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Column order match confirmed between staging and live on table {tableName}", CheckResult.Success, null));
+                    $"Column order match confirmed between staging and live on table {tableName}", CheckResult.Success,
+                    null));
         }
     }
 
-    private void CheckStagingToLiveMigrationForTable(DiscoveredTable stagingTable, DiscoveredColumn[] stagingCols, DiscoveredTable liveTable, DiscoveredColumn[] liveCols, ICheckNotifier notifier)
+    private void CheckStagingToLiveMigrationForTable(DiscoveredTable stagingTable, DiscoveredColumn[] stagingCols,
+        DiscoveredTable liveTable, DiscoveredColumn[] liveCols, ICheckNotifier notifier)
     {
         try
         {
-            new MigrationColumnSet(stagingTable,liveTable,new StagingToLiveMigrationFieldProcessor
+            new MigrationColumnSet(stagingTable, liveTable, new StagingToLiveMigrationFieldProcessor
             {
                 NoBackupTrigger = _loadMetadata.IgnoreTrigger
             });
@@ -287,22 +310,25 @@ private void CheckStagingToLiveMigrationForTable(DiscoveredTable stagingTable, D
         }
         catch (Exception e)
         {
-
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"{nameof(MigrationColumnSet)} reports a problem with the configuration of columns on STAGING/LIVE or in the ColumnInfos for TableInfo {liveTable}", CheckResult.Fail, e));
+                $"{nameof(MigrationColumnSet)} reports a problem with the configuration of columns on STAGING/LIVE or in the ColumnInfos for TableInfo {liveTable}",
+                CheckResult.Fail, e));
         }
 
         //live columns
         foreach (var col in liveCols)
-            if (!SpecialFieldNames.IsHicPrefixed(col) && col.IsAutoIncrement)    //must start hic_ if they are identities
+            if (!SpecialFieldNames.IsHicPrefixed(col) && col.IsAutoIncrement) //must start hic_ if they are identities
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Column {col} is an identity column in the LIVE database but does not start with hic_", CheckResult.Fail, null));//this one does not
+                    $"Column {col} is an identity column in the LIVE database but does not start with hic_",
+                    CheckResult.Fail, null)); //this one does not
 
         //staging columns
         foreach (var col in stagingCols) //staging columns
             if (col.IsAutoIncrement) //if there are any auto increments
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Column {col} is an identity column and is in STAGING, the identity flag must be removed from the STAGING table", CheckResult.Fail, null));//complain since don't want a mismatch between IDs in staging and live or complaints about identity insert from SQL server
+                    $"Column {col} is an identity column and is in STAGING, the identity flag must be removed from the STAGING table",
+                    CheckResult.Fail,
+                    null)); //complain since don't want a mismatch between IDs in staging and live or complaints about identity insert from SQL server
 
         //staging must allow null dataloadrunids and validfroms
         ConfirmNullability(stagingTable.DiscoverColumn(SpecialFieldNames.DataLoadRunID), true, notifier);
@@ -316,7 +342,9 @@ private static void ConfirmNullability(DiscoveredColumn column, bool expectedNul
     {
         var nullability = column.AllowNulls;
         notifier.OnCheckPerformed(new CheckEventArgs(
-            $"Nullability of {column} is AllowNulls={nullability}, (expected {expectedNullability})", nullability == expectedNullability ? CheckResult.Success : CheckResult.Fail, null));
+            $"Nullability of {column} is AllowNulls={nullability}, (expected {expectedNullability})",
+            nullability == expectedNullability ? CheckResult.Success : CheckResult.Fail, null));
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CommandLineParser.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CommandLineParser.cs
index 485ffe2724..0941f3ec84 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CommandLineParser.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/CommandLineParser.cs
@@ -34,11 +34,14 @@ public IEnumerable<string> Parse(string commandLine)
         {
             var ch = cmd[i];
 
-            if (char.IsWhiteSpace(ch)) { throw new InvalidOperationException(); }
+            if (char.IsWhiteSpace(ch)) throw new InvalidOperationException();
 
-            if (ch == '\\') { ParseEscapeSequence(); }
-            else if (ch == '"') { ParseQuotedWord(); }
-            else { ParseBareWord(); }
+            if (ch == '\\')
+                ParseEscapeSequence();
+            else if (ch == '"')
+                ParseQuotedWord();
+            else
+                ParseBareWord();
 
             if (i >= cmd.Length || char.IsWhiteSpace(cmd[i]))
             {
@@ -57,7 +60,6 @@ public IEnumerable<string> Parse(string commandLine)
     /// </summary>
     private void ParseQuotedWord()
     {
-
         // scan over the lead-in quotation mark w/o adding it to the buffer
         ++i;
 
@@ -65,15 +67,19 @@ private void ParseQuotedWord()
         while (i < cmd.Length && cmd[i] != '"')
         {
             var ch = cmd[i];
-            if (ch == '\\') { ParseEscapeSequence(); }
-            else { buf.Append(ch); ++i; }
+            if (ch == '\\')
+            {
+                ParseEscapeSequence();
+            }
+            else
+            {
+                buf.Append(ch);
+                ++i;
+            }
         }
 
         // scan over the lead-out quotation mark w/o adding it to the buffer
-        if (i < cmd.Length)
-        {
-            ++i;
-        }
+        if (i < cmd.Length) ++i;
         return;
     }
 
@@ -93,6 +99,7 @@ private void ParseBareWord()
 
             ++i;
         }
+
         return;
     }
 
@@ -147,6 +154,7 @@ private void ParseEscapeSequence()
                 ++i;
             }
         }
+
         return;
     }
 
@@ -155,10 +163,7 @@ private void ParseEscapeSequence()
     /// </summary>
     private void ConsumeWhitespace()
     {
-        while (i < cmd.Length && char.IsWhiteSpace(cmd[i]))
-        {
-            ++i;
-        }
+        while (i < cmd.Length && char.IsWhiteSpace(cmd[i])) ++i;
         return;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/MetadataLoggingConfigurationChecks.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/MetadataLoggingConfigurationChecks.cs
index f29434faaf..60df6325d0 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/MetadataLoggingConfigurationChecks.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/MetadataLoggingConfigurationChecks.cs
@@ -24,21 +24,19 @@ public MetadataLoggingConfigurationChecks(ILoadMetadata loadMetadata)
         _loadMetadata = loadMetadata;
     }
 
-        
 
     public void Check(ICheckNotifier notifier)
     {
-
         var catalogues = _loadMetadata.GetAllCatalogues().ToArray();
 
         //if there are no logging tasks defined on any Catalogues
         if (catalogues.Any() && catalogues.All(c => string.IsNullOrWhiteSpace(c.LoggingDataTask)))
         {
             string proposedName;
-                
+
             bool fix;
 
-            if(catalogues.Length == 1)
+            if (catalogues.Length == 1)
             {
                 proposedName = $"Loading '{catalogues[0]}'";
                 fix = notifier.OnCheckPerformed(
@@ -48,56 +46,58 @@ public void Check(ICheckNotifier notifier)
             }
             else
             {
-                proposedName =  _loadMetadata.Name;
+                proposedName = _loadMetadata.Name;
 
                 fix =
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
                             $"Catalogues {string.Join(",", catalogues.Select(c => c.Name))} do not have a logging task specified",
                             CheckResult.Fail, null, $"Create a new Logging Task called '{proposedName}'?"));
-                    
             }
 
             if (fix)
-                CreateNewLoggingTaskFor(notifier,catalogues, proposedName);
+                CreateNewLoggingTaskFor(notifier, catalogues, proposedName);
             else
                 return;
         }
 
         #region Fix missing LoggingDataTask
-        var missingTasks = catalogues.Where(c=>string.IsNullOrWhiteSpace(c.LoggingDataTask)).ToArray();
-        var potentialTasks = catalogues.Except(missingTasks).Select(c=>c.LoggingDataTask).Distinct().ToArray();
+
+        var missingTasks = catalogues.Where(c => string.IsNullOrWhiteSpace(c.LoggingDataTask)).ToArray();
+        var potentialTasks = catalogues.Except(missingTasks).Select(c => c.LoggingDataTask).Distinct().ToArray();
 
         //If any Catalogues are missing tasks
-        if(missingTasks.Any())
-        {
+        if (missingTasks.Any())
             //but there is consensus for those that are not missing tasks
-            if(potentialTasks.Length == 1)
+            if (potentialTasks.Length == 1)
             {
-                var fix = notifier.OnCheckPerformed(new CheckEventArgs("Some catalogues have NULL LoggingDataTasks",CheckResult.Fail,null, $"Set task to {potentialTasks.Single()}"));
+                var fix = notifier.OnCheckPerformed(new CheckEventArgs("Some catalogues have NULL LoggingDataTasks",
+                    CheckResult.Fail, null, $"Set task to {potentialTasks.Single()}"));
 
-                if(fix)
-                    foreach(var cata in missingTasks)
+                if (fix)
+                    foreach (var cata in missingTasks)
                     {
                         cata.LoggingDataTask = potentialTasks.Single();
                         cata.SaveToDatabase();
                     }
             }
-        }
+
         #endregion
 
         #region Fix missing LiveLoggingServer_ID
-        var missingServer = catalogues.Where(c=>c.LiveLoggingServer_ID == null).ToArray();
-        var potentialServer = catalogues.Except(missingServer).Select(c=>c.LiveLoggingServer_ID).Distinct().ToArray();
 
-        if(missingServer.Any())
+        var missingServer = catalogues.Where(c => c.LiveLoggingServer_ID == null).ToArray();
+        var potentialServer = catalogues.Except(missingServer).Select(c => c.LiveLoggingServer_ID).Distinct().ToArray();
+
+        if (missingServer.Any())
         {
-            if(potentialServer.Length == 1)
+            if (potentialServer.Length == 1)
             {
-                var fix = notifier.OnCheckPerformed(new CheckEventArgs("Some catalogues have NULL LiveLoggingServer_ID",CheckResult.Fail,null, $"Set LiveLoggingServer_ID to {potentialServer.Single()}"));
+                var fix = notifier.OnCheckPerformed(new CheckEventArgs("Some catalogues have NULL LiveLoggingServer_ID",
+                    CheckResult.Fail, null, $"Set LiveLoggingServer_ID to {potentialServer.Single()}"));
 
-                if(fix)
-                    foreach(var cata in missingServer)
+                if (fix)
+                    foreach (var cata in missingServer)
                     {
                         cata.LiveLoggingServer_ID = potentialServer.Single();
                         cata.SaveToDatabase();
@@ -105,28 +105,28 @@ public void Check(ICheckNotifier notifier)
             }
             else
             {
-
                 var defaults = _loadMetadata.CatalogueRepository;
                 var defaultLoggingServer = defaults.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
 
-                if(defaultLoggingServer != null)
+                if (defaultLoggingServer != null)
                 {
-                    var fix = notifier.OnCheckPerformed(new CheckEventArgs("Some catalogues have NULL LiveLoggingServer_ID",CheckResult.Fail,null, $"Set LiveLoggingServer_ID to '{defaultLoggingServer}' (the default)"));
+                    var fix = notifier.OnCheckPerformed(new CheckEventArgs(
+                        "Some catalogues have NULL LiveLoggingServer_ID", CheckResult.Fail, null,
+                        $"Set LiveLoggingServer_ID to '{defaultLoggingServer}' (the default)"));
 
-                    if(fix)
-                        foreach(var cata in missingServer)
+                    if (fix)
+                        foreach (var cata in missingServer)
                         {
                             cata.LiveLoggingServer_ID = defaultLoggingServer.ID;
                             cata.SaveToDatabase();
                         }
-
                 }
-
             }
         }
+
         #endregion
 
-        string distinctLoggingTask = null; 
+        string distinctLoggingTask = null;
         try
         {
             distinctLoggingTask = _loadMetadata.GetDistinctLoggingTask();
@@ -135,55 +135,58 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Catalogues could not agreed on a single Logging Task", CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs("Catalogues could not agreed on a single Logging Task",
+                CheckResult.Fail, e));
         }
-               
+
 
         try
         {
             var settings = _loadMetadata.GetDistinctLoggingDatabase();
             settings.TestConnection();
-            notifier.OnCheckPerformed(new CheckEventArgs("Connected to logging architecture successfully", CheckResult.Success, null));
+            notifier.OnCheckPerformed(new CheckEventArgs("Connected to logging architecture successfully",
+                CheckResult.Success, null));
 
 
-            if(distinctLoggingTask != null)
+            if (distinctLoggingTask != null)
             {
                 var lm = new LogManager(settings);
                 var dataTasks = lm.ListDataTasks();
 
                 if (dataTasks.Contains(distinctLoggingTask))
+                {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Found Logging Task {distinctLoggingTask} in Logging database",CheckResult.Success, null));
+                        $"Found Logging Task {distinctLoggingTask} in Logging database", CheckResult.Success, null));
+                }
                 else
                 {
                     var fix = notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Could not find Logging Task {distinctLoggingTask} in Logging database", CheckResult.Fail, null,
+                        $"Could not find Logging Task {distinctLoggingTask} in Logging database", CheckResult.Fail,
+                        null,
                         $"Create Logging Task '{distinctLoggingTask}'"));
-                    if(fix)
+                    if (fix)
                         lm.CreateNewLoggingTaskIfNotExists(distinctLoggingTask);
                 }
             }
-
         }
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs("Could reach default logging server", CheckResult.Fail, e));
         }
-        
     }
 
-    private void CreateNewLoggingTaskFor(ICheckNotifier notifier,ICatalogue[] catalogues, string proposedName)
+    private void CreateNewLoggingTaskFor(ICheckNotifier notifier, ICatalogue[] catalogues, string proposedName)
     {
-        var catarepo =  _loadMetadata.CatalogueRepository;
+        var catarepo = _loadMetadata.CatalogueRepository;
 
-        var serverIds = catalogues.Select(c => c.LiveLoggingServer_ID).Where(i=>i.HasValue).Distinct().ToArray();
+        var serverIds = catalogues.Select(c => c.LiveLoggingServer_ID).Where(i => i.HasValue).Distinct().ToArray();
 
         IExternalDatabaseServer loggingServer;
 
         if (serverIds.Any())
         {
             //a server is specified
-            if(serverIds.Length != 1)
+            if (serverIds.Length != 1)
                 throw new Exception("Catalogues do not agree on a single logging server");
 
             //we checked for HasValue above see the WHERE in the linq
@@ -192,14 +195,14 @@ private void CreateNewLoggingTaskFor(ICheckNotifier notifier,ICatalogue[] catalo
         else
         {
             loggingServer = catarepo.GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID);
-                
-            if(loggingServer == null)
+
+            if (loggingServer == null)
                 throw new Exception("There is no default logging server!");
         }
 
         var logManager = new LogManager(loggingServer);
         logManager.CreateNewLoggingTaskIfNotExists(proposedName);
-        notifier.OnCheckPerformed(new CheckEventArgs($"Created Logging Task '{proposedName}'",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"Created Logging Task '{proposedName}'", CheckResult.Success));
 
         foreach (var catalogue in catalogues.Cast<Catalogue>())
         {
@@ -207,7 +210,5 @@ private void CreateNewLoggingTaskFor(ICheckNotifier notifier,ICatalogue[] catalo
             catalogue.LoggingDataTask = proposedName;
             catalogue.SaveToDatabase();
         }
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/PreExecutionChecker.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/PreExecutionChecker.cs
index fb9fa55058..e3b5e9d759 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/PreExecutionChecker.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/PreExecutionChecker.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.DataLoad.Engine.Checks.Checkers;
 /// <summary>
 /// Checks DLE databases (RAW, STAGING, LIVE) are in a correct state ahead of running a data load (See LoadMetadata).
 /// </summary>
-public class PreExecutionChecker :  ICheckable
+public class PreExecutionChecker : ICheckable
 {
     private readonly ILoadMetadata _loadMetadata;
     private readonly IList<ICatalogue> _cataloguesToLoad;
@@ -41,7 +41,8 @@ public PreExecutionChecker(ILoadMetadata loadMetadata, HICDatabaseConfiguration
 
     private void PreExecutionStagingDatabaseCheck(bool skipLookups)
     {
-        var allTableInfos = _cataloguesToLoad.SelectMany(catalogue => catalogue.GetTableInfoList(!skipLookups)).Distinct().ToList();
+        var allTableInfos = _cataloguesToLoad.SelectMany(catalogue => catalogue.GetTableInfoList(!skipLookups))
+            .Distinct().ToList();
         CheckDatabaseExistsForStage(LoadBubble.Staging, "STAGING database found", "STAGING database not found");
 
         if (_databaseConfiguration.RequiresStagingTableCreation)
@@ -61,7 +62,8 @@ private void CheckDatabaseExistsForStage(LoadBubble deploymentStage, string succ
 
         if (!dbInfo.Exists())
         {
-            var createDatabase = _notifier.OnCheckPerformed(new CheckEventArgs($"{failureMessage}: {dbInfo}", CheckResult.Fail, null,
+            var createDatabase = _notifier.OnCheckPerformed(new CheckEventArgs($"{failureMessage}: {dbInfo}",
+                CheckResult.Fail, null,
                 $"Create {dbInfo.GetRuntimeName()} on {dbInfo.Server.Name}"));
 
 
@@ -69,7 +71,9 @@ private void CheckDatabaseExistsForStage(LoadBubble deploymentStage, string succ
                 dbInfo.Server.CreateDatabase(dbInfo.GetRuntimeName());
         }
         else
+        {
             _notifier.OnCheckPerformed(new CheckEventArgs($"{successMessage}: {dbInfo}", CheckResult.Success, null));
+        }
     }
 
     private void CheckTablesDoNotExistOnStaging(IEnumerable<ITableInfo> allTableInfos)
@@ -77,12 +81,11 @@ private void CheckTablesDoNotExistOnStaging(IEnumerable<ITableInfo> allTableInfo
         var stagingDbInfo = _databaseConfiguration.DeployInfo[LoadBubble.Staging];
         var alreadyExistingTableInfosThatShouldntBeThere = new List<string>();
 
-        var tableNames = allTableInfos.Select(info => info.GetRuntimeName(LoadBubble.Staging, _databaseConfiguration.DatabaseNamer));
+        var tableNames = allTableInfos.Select(info =>
+            info.GetRuntimeName(LoadBubble.Staging, _databaseConfiguration.DatabaseNamer));
         foreach (var tableName in tableNames)
-        {
             if (stagingDbInfo.ExpectTable(tableName).Exists())
                 alreadyExistingTableInfosThatShouldntBeThere.Add(tableName);
-        }
 
         if (alreadyExistingTableInfosThatShouldntBeThere.Any())
         {
@@ -91,10 +94,12 @@ private void CheckTablesDoNotExistOnStaging(IEnumerable<ITableInfo> allTableInfo
                 CheckResult.Fail, null, "Drop the tables"));
 
             if (nukeTables)
-                RemoveTablesFromDatabase(alreadyExistingTableInfosThatShouldntBeThere,stagingDbInfo);
+                RemoveTablesFromDatabase(alreadyExistingTableInfosThatShouldntBeThere, stagingDbInfo);
         }
         else
+        {
             _notifier.OnCheckPerformed(new CheckEventArgs("Staging table is clear", CheckResult.Success, null));
+        }
     }
 
     private void CheckTablesAreEmptyInDatabaseOnServer()
@@ -102,18 +107,18 @@ private void CheckTablesAreEmptyInDatabaseOnServer()
         var stagingDbInfo = _databaseConfiguration.DeployInfo[LoadBubble.Staging];
 
         foreach (var table in stagingDbInfo.DiscoverTables(false))
-        {
-            if(!table.IsEmpty())
+            if (!table.IsEmpty())
                 _notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Table {table} in staging database '{stagingDbInfo.GetRuntimeName()}' is not empty on {stagingDbInfo.Server.Name}", CheckResult.Fail));
+                    $"Table {table} in staging database '{stagingDbInfo.GetRuntimeName()}' is not empty on {stagingDbInfo.Server.Name}",
+                    CheckResult.Fail));
             else
-                _notifier.OnCheckPerformed(new CheckEventArgs($"Staging database is empty ({stagingDbInfo})", CheckResult.Success, null));
-        }
-            
+                _notifier.OnCheckPerformed(new CheckEventArgs($"Staging database is empty ({stagingDbInfo})",
+                    CheckResult.Success, null));
     }
 
     // Check that the column infos from the catalogue match up with what is actually in the staging databases
-    private void CheckColumnInfosMatchWithWhatIsInDatabaseAtStage(IEnumerable<ITableInfo> allTableInfos, LoadBubble deploymentStage)
+    private void CheckColumnInfosMatchWithWhatIsInDatabaseAtStage(IEnumerable<ITableInfo> allTableInfos,
+        LoadBubble deploymentStage)
     {
         var dbInfo = _databaseConfiguration.DeployInfo[deploymentStage];
         foreach (var tableInfo in allTableInfos)
@@ -127,7 +132,7 @@ private void CheckColumnInfosMatchWithWhatIsInDatabaseAtStage(IEnumerable<ITable
             var tableName = tableInfo.GetRuntimeName(deploymentStage, _databaseConfiguration.DatabaseNamer);
             var table = dbInfo.ExpectTable(tableName);
 
-            if(!table.Exists())
+            if (!table.Exists())
                 throw new Exception(
                     $"PreExecutionChecker spotted that table does not exist:{table} it was about to check whether the TableInfo matched the columns or not");
         }
@@ -135,11 +140,12 @@ private void CheckColumnInfosMatchWithWhatIsInDatabaseAtStage(IEnumerable<ITable
 
     private void PreExecutionDatabaseCheck()
     {
-        var allNonLookups = _cataloguesToLoad.SelectMany(catalogue => catalogue.GetTableInfoList(false)).Distinct().ToList();
+        var allNonLookups = _cataloguesToLoad.SelectMany(catalogue => catalogue.GetTableInfoList(false)).Distinct()
+            .ToList();
         CheckDatabaseExistsForStage(LoadBubble.Live, "LIVE database found", "LIVE database not found");
         CheckColumnInfosMatchWithWhatIsInDatabaseAtStage(allNonLookups, LoadBubble.Live);
-            
-        if(!_loadMetadata.IgnoreTrigger)
+
+        if (!_loadMetadata.IgnoreTrigger)
             CheckUpdateTriggers(allNonLookups);
 
         CheckRAWDatabaseIsNotPresent();
@@ -154,37 +160,38 @@ private void CheckRAWDatabaseIsNotPresent()
         if (!rawDbInfo.Exists())
         {
             // RAW db does not exist thats usually good unless...
-            if(persistentRaw)
+            if (persistentRaw)
             {
                 var shouldCreate = _notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"RAW database '{rawDbInfo}' does not exist but load is persistentRaw", CheckResult.Fail, null, $"Create RAW database?"));
-                if(shouldCreate)
-                {
-                    rawDbInfo.Create();
-                }
+                    $"RAW database '{rawDbInfo}' does not exist but load is persistentRaw", CheckResult.Fail, null,
+                    $"Create RAW database?"));
+                if (shouldCreate) rawDbInfo.Create();
             }
 
             return;
         }
 
 
-        var shouldDrop = _notifier.OnCheckPerformed(new CheckEventArgs($"RAW database '{rawDbInfo}' exists", CheckResult.Fail, null,
+        var shouldDrop = _notifier.OnCheckPerformed(new CheckEventArgs($"RAW database '{rawDbInfo}' exists",
+            CheckResult.Fail, null,
             $"Drop {(persistentRaw ? "table(s)" : "database")} {rawDbInfo}"));
-            
-        if(!rawDbInfo.GetRuntimeName().EndsWith("_RAW",StringComparison.CurrentCultureIgnoreCase))
+
+        if (!rawDbInfo.GetRuntimeName().EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase))
             throw new Exception(
                 $"rawDbInfo database name did not end with _RAW! It was:{rawDbInfo.GetRuntimeName()} (Why is the system trying to drop this database?)");
         if (shouldDrop)
         {
             foreach (var t in rawDbInfo.DiscoverTables(true))
             {
-                _notifier.OnCheckPerformed(new CheckEventArgs($"Dropping table {t.GetFullyQualifiedName()}...", CheckResult.Success));
+                _notifier.OnCheckPerformed(new CheckEventArgs($"Dropping table {t.GetFullyQualifiedName()}...",
+                    CheckResult.Success));
                 t.Drop();
             }
 
-            if(!persistentRaw)
+            if (!persistentRaw)
             {
-                _notifier.OnCheckPerformed(new CheckEventArgs($"Finally dropping database{rawDbInfo}...", CheckResult.Success));
+                _notifier.OnCheckPerformed(new CheckEventArgs($"Finally dropping database{rawDbInfo}...",
+                    CheckResult.Success));
                 rawDbInfo.Drop();
             }
         }
@@ -195,7 +202,8 @@ private void CheckUpdateTriggers(IEnumerable<ITableInfo> allTableInfos)
         // Check that the update triggers are present/enabled
         foreach (var tableInfo in allTableInfos)
         {
-            var checker = new TriggerChecks(_databaseConfiguration.DeployInfo[LoadBubble.Live].ExpectTable(tableInfo.GetRuntimeName(),tableInfo.Schema));
+            var checker = new TriggerChecks(_databaseConfiguration.DeployInfo[LoadBubble.Live]
+                .ExpectTable(tableInfo.GetRuntimeName(), tableInfo.Schema));
             checker.Check(_notifier);
         }
     }
@@ -219,7 +227,8 @@ public void Check(ICheckNotifier notifier)
             catch (Exception e)
             {
                 HardFail = true;
-                notifier.OnCheckPerformed(new CheckEventArgs($"Could not reach table in load '{ti.Name}'",CheckResult.Fail,e));
+                notifier.OnCheckPerformed(new CheckEventArgs($"Could not reach table in load '{ti.Name}'",
+                    CheckResult.Fail, e));
                 return;
             }
 
@@ -232,22 +241,20 @@ public void Check(ICheckNotifier notifier)
             if (tbl.TableType != TableType.Table)
             {
                 HardFail = true;
-                notifier.OnCheckPerformed(new CheckEventArgs($"Table '{ti}' is a {tbl.TableType}",CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs($"Table '{ti}' is a {tbl.TableType}", CheckResult.Fail));
             }
         }
 
-        if(HardFail)
+        if (HardFail)
             return;
-            
+
         AtLeastOneTaskCheck();
 
         PreExecutionStagingDatabaseCheck(false);
         PreExecutionDatabaseCheck();
-            
     }
 
 
-
     private void AtLeastOneTaskCheck()
     {
         if (_loadMetadata.ProcessTasks.All(p => p.IsDisabled))
@@ -260,14 +267,14 @@ private void AtLeastOneTaskCheck()
     public static void RemoveTablesFromDatabase(IEnumerable<string> tableNames, DiscoveredDatabase dbInfo)
     {
         if (!IsNukable(dbInfo))
-            throw new Exception("This method loops through every table in a database and nukes it! for obvious reasons this is only allowed on databases with a suffix _STAGING/_RAW");
+            throw new Exception(
+                "This method loops through every table in a database and nukes it! for obvious reasons this is only allowed on databases with a suffix _STAGING/_RAW");
 
         foreach (var tableName in tableNames)
             dbInfo.ExpectTable(tableName).Drop();
     }
 
-    private static bool IsNukable(DiscoveredDatabase dbInfo)
-    {
-        return dbInfo.GetRuntimeName().EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) || dbInfo.GetRuntimeName().EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase);
-    }
+    private static bool IsNukable(DiscoveredDatabase dbInfo) =>
+        dbInfo.GetRuntimeName().EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) ||
+        dbInfo.GetRuntimeName().EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/ProcessTaskChecks.cs b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/ProcessTaskChecks.cs
index b79eae1315..f5d8169a42 100644
--- a/Rdmp.Core/DataLoad/Engine/Checks/Checkers/ProcessTaskChecks.cs
+++ b/Rdmp.Core/DataLoad/Engine/Checks/Checkers/ProcessTaskChecks.cs
@@ -31,10 +31,10 @@ public ProcessTaskChecks(ILoadMetadata loadMetadata)
     public void Check(ProcessTask processTask, ICheckNotifier notifier)
     {
         if (dictionary == null)
-        {
             try
             {
-                dictionary = new LoadArgsDictionary(_loadMetadata, new HICDatabaseConfiguration(_loadMetadata).DeployInfo);
+                dictionary =
+                    new LoadArgsDictionary(_loadMetadata, new HICDatabaseConfiguration(_loadMetadata).DeployInfo);
             }
             catch (Exception e)
             {
@@ -43,7 +43,6 @@ public void Check(ProcessTask processTask, ICheckNotifier notifier)
                         CheckResult.Fail, e));
                 return;
             }
-        }
 
 
         var factory = new RuntimeTaskFactory(_loadMetadata.CatalogueRepository);
@@ -54,7 +53,7 @@ public void Check(ProcessTask processTask, ICheckNotifier notifier)
 
     public void Check(ICheckNotifier notifier)
     {
-        foreach (ProcessTask processTask in _loadMetadata.ProcessTasks.Where(pt=>!pt.IsDisabled))
+        foreach (ProcessTask processTask in _loadMetadata.ProcessTasks.Where(pt => !pt.IsDisabled))
             Check(processTask, notifier);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/ArchiveExtractor.cs b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/ArchiveExtractor.cs
index 5e0f21b854..b6bc12ea57 100644
--- a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/ArchiveExtractor.cs
+++ b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/ArchiveExtractor.cs
@@ -14,20 +14,24 @@ namespace Rdmp.Core.DataLoad.Engine.DataProvider.FromCache;
 
 internal interface IArchivedFileExtractor
 {
-    void Extract(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory, IDataLoadEventListener dataLoadJob);
+    void Extract(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory,
+        IDataLoadEventListener dataLoadJob);
 }
 
 internal abstract class ArchiveExtractor : IArchivedFileExtractor
 {
     private readonly string _extension;
-    protected abstract void DoExtraction(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory, IDataLoadEventListener dataLoadJob);
+
+    protected abstract void DoExtraction(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory,
+        IDataLoadEventListener dataLoadJob);
 
     protected ArchiveExtractor(string extension)
     {
         _extension = extension;
     }
 
-    public void Extract(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory, IDataLoadEventListener dataLoadJob)
+    public void Extract(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory,
+        IDataLoadEventListener dataLoadJob)
     {
         //ensure it is a legit zip file
         if (!job.Value.Extension.Equals(_extension))
@@ -56,7 +60,8 @@ public ZipExtractor() : base(".zip")
     }
 
 
-    protected override void DoExtraction(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory, IDataLoadEventListener dataLoadEventListener)
+    protected override void DoExtraction(KeyValuePair<DateTime, FileInfo> job, DirectoryInfo destinationDirectory,
+        IDataLoadEventListener dataLoadEventListener)
     {
         var archive = new ZipArchive(new FileStream(job.Value.FullName, FileMode.Open));
         archive.ExtractToDirectory(destinationDirectory.FullName);
diff --git a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/BasicCacheDataProvider.cs b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/BasicCacheDataProvider.cs
index 6e27608b9c..b62a8abf7c 100644
--- a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/BasicCacheDataProvider.cs
+++ b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/BasicCacheDataProvider.cs
@@ -19,7 +19,6 @@ public class BasicCacheDataProvider : CachedFileRetriever
 {
     public override void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public override ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
diff --git a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/CachedFileRetriever.cs b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/CachedFileRetriever.cs
index bc706b0073..18b9a7014f 100644
--- a/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/CachedFileRetriever.cs
+++ b/Rdmp.Core/DataLoad/Engine/DataProvider/FromCache/CachedFileRetriever.cs
@@ -30,7 +30,9 @@ namespace Rdmp.Core.DataLoad.Engine.DataProvider.FromCache;
 /// </summary>
 public abstract class CachedFileRetriever : ICachedDataProvider
 {
-    [DemandsInitialization("The LoadProgress (which must also have a CacheProgress with a valid Caching Pipeline associated with it)",mandatory:true)]
+    [DemandsInitialization(
+        "The LoadProgress (which must also have a CacheProgress with a valid Caching Pipeline associated with it)",
+        mandatory: true)]
     public ILoadProgress LoadProgress { get; set; }
 
     [DemandsInitialization("Whether to unarchive the files into the ForLoading folder, or just copy them as is")]
@@ -40,21 +42,25 @@ public abstract class CachedFileRetriever : ICachedDataProvider
     public abstract ExitCodeType Fetch(IDataLoadJob dataLoadJob, GracefulCancellationToken cancellationToken);
 
     #region Events
+
     public event CacheFileNotFoundHandler CacheFileNotFound;
+
     protected virtual void OnCacheFileNotFound(string message, Exception ex)
     {
         var handler = CacheFileNotFound;
         handler?.Invoke(this, message, ex);
     }
+
     #endregion
 
-    protected  ICacheLayout CreateCacheLayout(ScheduledDataLoadJob job)
+    protected ICacheLayout CreateCacheLayout(ScheduledDataLoadJob job)
     {
-        var cacheProgress = job.LoadProgress.CacheProgress ?? throw new NullReferenceException("cacheProgress cannot be null");
+        var cacheProgress = job.LoadProgress.CacheProgress ??
+                            throw new NullReferenceException("cacheProgress cannot be null");
         return CreateCacheLayout(cacheProgress, job);
     }
 
-    protected virtual ICacheLayout CreateCacheLayout(ICacheProgress cacheProgress,IDataLoadEventListener listener)
+    protected virtual ICacheLayout CreateCacheLayout(ICacheProgress cacheProgress, IDataLoadEventListener listener)
     {
         var pipelineFactory = new CachingPipelineUseCase(cacheProgress);
         var destination = pipelineFactory.CreateDestinationOnly(listener);
@@ -77,15 +83,16 @@ protected Dictionary<DateTime, FileInfo> GetDataLoadWorkload(ScheduledDataLoadJo
         _workload = new Dictionary<DateTime, FileInfo>();
         foreach (var date in job.DatesToRetrieve)
         {
-            var fileInfo = cacheLayout.GetArchiveFileInfoForDate(date,job);
+            var fileInfo = cacheLayout.GetArchiveFileInfoForDate(date, job);
 
             if (fileInfo == null)
                 OnCacheFileNotFound(
-                    $"Could not find cached file for date '{date}' for CacheLayout.ArchiveType {cacheLayout.ArchiveType} in cache at {job.LoadDirectory.Cache.FullName}", null);
-            else
-            if (!fileInfo.Exists)
+                    $"Could not find cached file for date '{date}' for CacheLayout.ArchiveType {cacheLayout.ArchiveType} in cache at {job.LoadDirectory.Cache.FullName}",
+                    null);
+            else if (!fileInfo.Exists)
                 OnCacheFileNotFound(
-                    $"Could not find cached file '{fileInfo.FullName}' for date {date} in cache at {job.LoadDirectory.Cache.FullName}", null);
+                    $"Could not find cached file '{fileInfo.FullName}' for date {date} in cache at {job.LoadDirectory.Cache.FullName}",
+                    null);
 
             _workload.Add(date, fileInfo);
         }
@@ -112,7 +119,8 @@ private static string[] GetPathsRelativeToDirectory(FileInfo[] absoluteFilePaths
 
     private bool FilesInForLoadingMatchWorkload(ILoadDirectory directory)
     {
-        var filesInForLoading = GetPathsRelativeToDirectory(directory.ForLoading.EnumerateFiles("*", SearchOption.AllDirectories).ToArray(), directory.ForLoading);
+        var filesInForLoading = GetPathsRelativeToDirectory(
+            directory.ForLoading.EnumerateFiles("*", SearchOption.AllDirectories).ToArray(), directory.ForLoading);
         var filesFromCache = GetPathsRelativeToDirectory(_workload.Values.ToArray(), directory.Cache);
 
         return filesInForLoading.OrderBy(t => t).SequenceEqual(filesFromCache.OrderBy(t => t));
@@ -127,12 +135,15 @@ protected void ExtractJobs(IDataLoadJob dataLoadJob)
             // There are files in ForLoading, but do they match what we would expect to find? Need to make sure that they aren't from a different dataset and/or there is the expected number of files
             // We should already have a _workload
             if (_workload == null)
-                throw new InvalidOperationException("The workload has not been initialised, don't know what files are to be retrieved from the cache");
+                throw new InvalidOperationException(
+                    "The workload has not been initialised, don't know what files are to be retrieved from the cache");
 
             if (!FilesInForLoadingMatchWorkload(dataLoadJob.LoadDirectory))
-                throw new InvalidOperationException("The files in ForLoading do not match what this job expects to be loading from the cache. Please delete the files in ForLoading before re-attempting the data load.");
+                throw new InvalidOperationException(
+                    "The files in ForLoading do not match what this job expects to be loading from the cache. Please delete the files in ForLoading before re-attempting the data load.");
 
-            dataLoadJob.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "ForLoading already has files, skipping extraction"));
+            dataLoadJob.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning, "ForLoading already has files, skipping extraction"));
             return;
         }
 
@@ -166,10 +177,8 @@ protected void ExtractJobs(IDataLoadJob dataLoadJob)
         }
     }
 
-    private static string GetPathRelativeToCacheRoot(DirectoryInfo cacheRoot, FileInfo fileInCache)
-    {
-        return fileInCache.Directory.FullName.Replace(cacheRoot.FullName, "").TrimStart(Path.DirectorySeparatorChar);
-    }
+    private static string GetPathRelativeToCacheRoot(DirectoryInfo cacheRoot, FileInfo fileInCache) => fileInCache
+        .Directory.FullName.Replace(cacheRoot.FullName, "").TrimStart(Path.DirectorySeparatorChar);
 
     private static IArchivedFileExtractor CreateExtractor(CacheArchiveType cacheArchiveType)
     {
@@ -194,7 +203,6 @@ public static bool Validate(ILoadDirectory destination)
     }
 
 
-
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
@@ -205,13 +213,14 @@ public void Check(ICheckNotifier notifier)
         {
             if (LoadProgress == null)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("A LoadProgress must be selected for a Cache to run",CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs("A LoadProgress must be selected for a Cache to run",
+                    CheckResult.Fail));
                 return;
             }
 
             var cp = LoadProgress.CacheProgress;
 
-            if(cp == null)
+            if (cp == null)
             {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
@@ -228,32 +237,33 @@ public void Check(ICheckNotifier notifier)
                 return;
             }
 
-            notifier.OnCheckPerformed(new CheckEventArgs($"Archive type is:{layout.ArchiveType}",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Archive type is:{layout.ArchiveType}", CheckResult.Success));
             notifier.OnCheckPerformed(new CheckEventArgs($"DateFormat is:{layout.DateFormat}", CheckResult.Success));
-            notifier.OnCheckPerformed(new CheckEventArgs($"Granularity is:{layout.CacheFileGranularity}", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Granularity is:{layout.CacheFileGranularity}",
+                CheckResult.Success));
 
             notifier.OnCheckPerformed(new CheckEventArgs($"CacheLayout is:{layout}", CheckResult.Success));
 
             var filesFound = layout.CheckCacheFilesAvailability(new FromCheckNotifierToDataLoadEventListener(notifier));
 
-            notifier.OnCheckPerformed(new CheckEventArgs($"Files Found In Cache:{filesFound}",filesFound ? CheckResult.Success : CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Files Found In Cache:{filesFound}",
+                filesFound ? CheckResult.Success : CheckResult.Warning));
 
             var d = layout.GetLoadCacheDirectory(new FromCheckNotifierToDataLoadEventListener(notifier));
 
-            if(d == null)
+            if (d == null)
             {
                 notifier.OnCheckPerformed(new CheckEventArgs("Cache Directory was null!", CheckResult.Fail));
                 return;
             }
 
-            notifier.OnCheckPerformed(new CheckEventArgs($"Cache Directory Is:{d.FullName}",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Cache Directory Is:{d.FullName}", CheckResult.Success));
         }
         catch (Exception ex)
         {
             notifier.OnCheckPerformed(new CheckEventArgs($"Checking failed on {this}", CheckResult.Fail, ex));
         }
     }
-
 }
 
 public delegate void CacheFileNotFoundHandler(object sender, string message, Exception ex);
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/DataProvider/IDataProvider.cs b/Rdmp.Core/DataLoad/Engine/DataProvider/IDataProvider.cs
index 89e7b0c631..1942359e6f 100644
--- a/Rdmp.Core/DataLoad/Engine/DataProvider/IDataProvider.cs
+++ b/Rdmp.Core/DataLoad/Engine/DataProvider/IDataProvider.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.DataLoad.Engine.DataProvider;
 /// DLE component ostensibly responsible for 'fetching data'.  This typically involves fetching data and saving it into the ILoadDirectory (e.g. into 
 /// ForLoading) ready for loading by later components.
 /// </summary>
-public interface IDataProvider : IDisposeAfterDataLoad,ICheckable
+public interface IDataProvider : IDisposeAfterDataLoad, ICheckable
 {
     void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo);
     ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken);
diff --git a/Rdmp.Core/DataLoad/Engine/DataProvider/IPluginDataProvider.cs b/Rdmp.Core/DataLoad/Engine/DataProvider/IPluginDataProvider.cs
index 8bbbf6790a..69d548db35 100644
--- a/Rdmp.Core/DataLoad/Engine/DataProvider/IPluginDataProvider.cs
+++ b/Rdmp.Core/DataLoad/Engine/DataProvider/IPluginDataProvider.cs
@@ -11,5 +11,4 @@ namespace Rdmp.Core.DataLoad.Engine.DataProvider;
 /// </summary>
 public interface IPluginDataProvider : IDataProvider
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfiguration.cs b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfiguration.cs
index ee0ec9e674..325df4f7b8 100644
--- a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfiguration.cs
+++ b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/EntityNaming/HICDatabaseConfiguration.cs
@@ -54,19 +54,19 @@ public class HICDatabaseConfiguration
     /// </summary>
     /// <param name="lmd"></param>
     /// <param name="namer"></param>
-    public HICDatabaseConfiguration(ILoadMetadata lmd, INameDatabasesAndTablesDuringLoads namer = null):
-        this(lmd.GetDistinctLiveDatabaseServer(), namer, lmd.CatalogueRepository,lmd.OverrideRAWServer)
+    public HICDatabaseConfiguration(ILoadMetadata lmd, INameDatabasesAndTablesDuringLoads namer = null) :
+        this(lmd.GetDistinctLiveDatabaseServer(), namer, lmd.CatalogueRepository, lmd.OverrideRAWServer)
     {
         var globalIgnorePattern = GetGlobalIgnorePatternIfAny(lmd.CatalogueRepository);
 
-        if(globalIgnorePattern != null && !string.IsNullOrWhiteSpace(globalIgnorePattern.Regex))
+        if (globalIgnorePattern != null && !string.IsNullOrWhiteSpace(globalIgnorePattern.Regex))
             IgnoreColumns = new Regex(globalIgnorePattern.Regex);
-
     }
 
     public static StandardRegex GetGlobalIgnorePatternIfAny(ICatalogueRepository repository)
     {
-        return repository.GetAllObjects<StandardRegex>().OrderBy(r=>r.ID).FirstOrDefault(r=>r.ConceptName == StandardRegex.DataLoadEngineGlobalIgnorePattern);
+        return repository.GetAllObjects<StandardRegex>().OrderBy(r => r.ID)
+            .FirstOrDefault(r => r.ConceptName == StandardRegex.DataLoadEngineGlobalIgnorePattern);
     }
 
     /// <summary>
@@ -76,10 +76,12 @@ public static StandardRegex GetGlobalIgnorePatternIfAny(ICatalogueRepository rep
     /// <param name="namer">optionally lets you specify how to pick database names for the temporary bubbles STAGING and RAW</param>
     /// <param name="defaults">optionally specifies the location to get RAW default server from</param>
     /// <param name="overrideRAWServer">optionally specifies an explicit server to use for RAW</param>
-    public HICDatabaseConfiguration(DiscoveredServer liveServer, INameDatabasesAndTablesDuringLoads namer = null, IServerDefaults defaults = null, IExternalDatabaseServer overrideRAWServer = null)
+    public HICDatabaseConfiguration(DiscoveredServer liveServer, INameDatabasesAndTablesDuringLoads namer = null,
+        IServerDefaults defaults = null, IExternalDatabaseServer overrideRAWServer = null)
     {
         //respects the override of LIVE server
-        var liveDatabase = liveServer.GetCurrentDatabase() ?? throw new Exception("Cannot load live without having a unique live named database");
+        var liveDatabase = liveServer.GetCurrentDatabase() ??
+                           throw new Exception("Cannot load live without having a unique live named database");
 
         // Default namer
         //create the DLE tables on the live database because postgres can't handle cross database references
@@ -89,15 +91,18 @@ public HICDatabaseConfiguration(DiscoveredServer liveServer, INameDatabasesAndTa
 
         //if there are defaults
         if (overrideRAWServer == null && defaults != null)
-            overrideRAWServer = defaults.GetDefaultFor(PermissableDefaults.RAWDataLoadServer);//get the raw default if there is one
+            overrideRAWServer =
+                defaults.GetDefaultFor(PermissableDefaults.RAWDataLoadServer); //get the raw default if there is one
 
         DiscoveredServer rawServer;
         //if there was defaults and a raw default server
-        rawServer = overrideRAWServer != null ? DataAccessPortal.ExpectServer(overrideRAWServer, DataAccessContext.DataLoad, false) : //get the raw server connection
+        rawServer = overrideRAWServer != null
+            ? DataAccessPortal.ExpectServer(overrideRAWServer, DataAccessContext.DataLoad, false)
+            : //get the raw server connection
             liveServer; //there is no raw override so we will have to use the live server for RAW too.
 
         //populates the servers -- note that an empty rawServer value passed to this method makes it the localhost
-        DeployInfo = new StandardDatabaseHelper(liveServer.GetCurrentDatabase(), namer,rawServer);
+        DeployInfo = new StandardDatabaseHelper(liveServer.GetCurrentDatabase(), namer, rawServer);
 
         RequiresStagingTableCreation = true;
     }
@@ -117,7 +122,7 @@ public IEnumerable<DiscoveredTable> ExpectTables(IDataLoadJob job, LoadBubble st
         foreach (var t in job.RegularTablesToLoad)
             yield return db.ExpectTable(t.GetRuntimeName(stage, DatabaseNamer));
 
-        if(includeLookups)
+        if (includeLookups)
             foreach (var t in job.LookupTablesToLoad)
                 yield return db.ExpectTable(t.GetRuntimeName(stage, DatabaseNamer));
     }
diff --git a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/DatabaseCloner.cs b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/DatabaseCloner.cs
index 6e1cc01bd4..f63a2ba654 100644
--- a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/DatabaseCloner.cs
+++ b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/DatabaseCloner.cs
@@ -45,23 +45,26 @@ public DiscoveredDatabase CreateDatabaseForStage(LoadBubble stageToCreateDatabas
         return dbInfo;
     }
 
-    public void CreateTablesInDatabaseFromCatalogueInfo(IDataLoadEventListener listener, TableInfo tableInfo, LoadBubble copyToStage)
+    public void CreateTablesInDatabaseFromCatalogueInfo(IDataLoadEventListener listener, TableInfo tableInfo,
+        LoadBubble copyToStage)
     {
         if (copyToStage == LoadBubble.Live)
             throw new Exception("Please don't try to create tables in the live database");
 
         var destDbInfo = _hicDatabaseConfiguration.DeployInfo[copyToStage];
 
-        var cloneOperation = new TableInfoCloneOperation(_hicDatabaseConfiguration,tableInfo, copyToStage,listener)
+        var cloneOperation = new TableInfoCloneOperation(_hicDatabaseConfiguration, tableInfo, copyToStage, listener)
         {
-            DropHICColumns = copyToStage == LoadBubble.Raw,//don't drop columns like hic_sourceID, these are optional for population (and don't get Diff'ed) but should still be there
+            DropHICColumns =
+                copyToStage ==
+                LoadBubble.Raw, //don't drop columns like hic_sourceID, these are optional for population (and don't get Diff'ed) but should still be there
             AllowNulls = copyToStage == LoadBubble.Raw
         };
 
         cloneOperation.Execute();
         _tablesCreated.Add(cloneOperation);
 
-            
+
         if (copyToStage == LoadBubble.Raw)
         {
             var tableName = tableInfo.GetRuntimeName(copyToStage, _hicDatabaseConfiguration.DatabaseNamer);
@@ -76,17 +79,18 @@ public void CreateTablesInDatabaseFromCatalogueInfo(IDataLoadEventListener liste
                 if (preLoadDiscardedColumn.Destination == DiscardedColumnDestination.Dilute)
                     continue;
 
-                if (existingColumns.Any(e=>e.Equals(preLoadDiscardedColumn.GetRuntimeName(LoadStage.AdjustRaw))))
+                if (existingColumns.Any(e => e.Equals(preLoadDiscardedColumn.GetRuntimeName(LoadStage.AdjustRaw))))
                     throw new Exception(
                         $"There is a column called {preLoadDiscardedColumn.GetRuntimeName(LoadStage.AdjustRaw)} as both a PreLoadDiscardedColumn and in the TableInfo (live table), you should either drop the column from the live table or remove it as a PreLoadDiscarded column");
 
                 //add all the preload discarded columns because they could be routed to ANO store or sent to oblivion
-                AddColumnToTable(table, preLoadDiscardedColumn.RuntimeColumnName, preLoadDiscardedColumn.SqlDataType, listener);
+                AddColumnToTable(table, preLoadDiscardedColumn.RuntimeColumnName, preLoadDiscardedColumn.SqlDataType,
+                    listener);
             }
 
             //deal with anonymisation transforms e.g. ANOCHI of datatype varchar(12) would have to become a column called CHI of datatype varchar(10) on creation in RAW
             var columnInfosWithANOTransforms = tableInfo.ColumnInfos.Where(c => c.ANOTable_ID != null).ToArray();
-            if(columnInfosWithANOTransforms.Any())
+            if (columnInfosWithANOTransforms.Any())
                 foreach (var col in columnInfosWithANOTransforms)
                 {
                     var liveName = col.GetRuntimeName(LoadStage.PostLoad);
@@ -94,13 +98,14 @@ public void CreateTablesInDatabaseFromCatalogueInfo(IDataLoadEventListener liste
 
                     var rawDataType = col.GetRuntimeDataType(LoadStage.AdjustRaw);
 
-                    DropColumnFromTable(table, liveName,listener);
+                    DropColumnFromTable(table, liveName, listener);
                     AddColumnToTable(table, rawName, rawDataType, listener);
                 }
         }
     }
 
-    private void AddColumnToTable(DiscoveredTable table, string desiredColumnName, string desiredColumnType, IDataLoadEventListener listener)
+    private void AddColumnToTable(DiscoveredTable table, string desiredColumnName, string desiredColumnType,
+        IDataLoadEventListener listener)
     {
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Adding column '{desiredColumnName}' with datatype '{desiredColumnType}' to table '{table.GetFullyQualifiedName()}'"));
@@ -116,21 +121,16 @@ private void DropColumnFromTable(DiscoveredTable table, string columnName, IData
     }
 
 
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
         //don't bother cleaning up if it bombed
-        if (exitCode == ExitCodeType.Error )
+        if (exitCode == ExitCodeType.Error)
             return;
 
         //it's Abort,Success or LoadNotRequired
-        foreach (var cloneOperation in _tablesCreated)
-        {
-            cloneOperation.Undo();
-        }
+        foreach (var cloneOperation in _tablesCreated) cloneOperation.Undo();
 
         foreach (var dbInfo in _databasesCreated)
             dbInfo.Drop();
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/TableInfoCloneOperation.cs b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/TableInfoCloneOperation.cs
index f5668af7fb..f28acb5572 100644
--- a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/TableInfoCloneOperation.cs
+++ b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/Operations/TableInfoCloneOperation.cs
@@ -37,7 +37,8 @@ public class TableInfoCloneOperation
 
     private bool _operationSucceeded = false;
 
-    public TableInfoCloneOperation(HICDatabaseConfiguration hicDatabaseConfiguration, TableInfo tableInfo, LoadBubble copyToBubble, IDataLoadEventListener listener)
+    public TableInfoCloneOperation(HICDatabaseConfiguration hicDatabaseConfiguration, TableInfo tableInfo,
+        LoadBubble copyToBubble, IDataLoadEventListener listener)
     {
         _hicDatabaseConfiguration = hicDatabaseConfiguration;
         _tableInfo = tableInfo;
@@ -49,47 +50,54 @@ public TableInfoCloneOperation(HICDatabaseConfiguration hicDatabaseConfiguration
 
     public void Execute()
     {
-        if(_operationSucceeded)
+        if (_operationSucceeded)
             throw new Exception("Operation already executed once");
 
         var liveDb = DataAccessPortal.ExpectDatabase(_tableInfo, DataAccessContext.DataLoad);
         var destTableName = _tableInfo.GetRuntimeName(_copyToBubble, _hicDatabaseConfiguration.DatabaseNamer);
 
 
-        var discardedColumns = _tableInfo.PreLoadDiscardedColumns.Where(c => c.Destination == DiscardedColumnDestination.Dilute).ToArray();
+        var discardedColumns = _tableInfo.PreLoadDiscardedColumns
+            .Where(c => c.Destination == DiscardedColumnDestination.Dilute).ToArray();
+
+        CloneTable(liveDb, _hicDatabaseConfiguration.DeployInfo[_copyToBubble],
+            _tableInfo.Discover(DataAccessContext.DataLoad), destTableName, DropHICColumns, DropIdentityColumns,
+            AllowNulls, discardedColumns);
 
-        CloneTable(liveDb, _hicDatabaseConfiguration.DeployInfo[_copyToBubble], _tableInfo.Discover(DataAccessContext.DataLoad), destTableName, DropHICColumns, DropIdentityColumns, AllowNulls, discardedColumns);
-            
         _operationSucceeded = true;
     }
 
 
     public void Undo()
     {
-        if(!_operationSucceeded)
+        if (!_operationSucceeded)
             throw new Exception("Cannot undo operation because it has not yet been executed");
 
         var tableToRemove = _tableInfo.GetRuntimeName(_copyToBubble, _hicDatabaseConfiguration.DatabaseNamer);
         RemoveTableFromDatabase(tableToRemove, _hicDatabaseConfiguration.DeployInfo[_copyToBubble]);
     }
 
-        
+
     public static void RemoveTableFromDatabase(string tableName, DiscoveredDatabase dbInfo)
     {
-        if (!IsNukable(dbInfo,tableName))
-            throw new Exception("This method nukes a table in a database! for obvious reasons this is only allowed on databases with a suffix _STAGING/_RAW");
+        if (!IsNukable(dbInfo, tableName))
+            throw new Exception(
+                "This method nukes a table in a database! for obvious reasons this is only allowed on databases with a suffix _STAGING/_RAW");
 
         dbInfo.ExpectTable(tableName).Drop();
     }
 
-        
-    private static bool IsNukable(DiscoveredDatabase dbInfo, string tableName)
-    {
-        return tableName.EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) || tableName.EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase) 
-            ||
-            dbInfo.GetRuntimeName().EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) || dbInfo.GetRuntimeName().EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase);
-    }
-    public void CloneTable(DiscoveredDatabase srcDatabaseInfo, DiscoveredDatabase destDatabaseInfo, DiscoveredTable sourceTable, string destTableName, bool dropHICColumns, bool dropIdentityColumns, bool allowNulls, PreLoadDiscardedColumn[] dilutionColumns)
+
+    private static bool IsNukable(DiscoveredDatabase dbInfo, string tableName) =>
+        tableName.EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) ||
+        tableName.EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase)
+        ||
+        dbInfo.GetRuntimeName().EndsWith("_STAGING", StringComparison.CurrentCultureIgnoreCase) ||
+        dbInfo.GetRuntimeName().EndsWith("_RAW", StringComparison.CurrentCultureIgnoreCase);
+
+    public void CloneTable(DiscoveredDatabase srcDatabaseInfo, DiscoveredDatabase destDatabaseInfo,
+        DiscoveredTable sourceTable, string destTableName, bool dropHICColumns, bool dropIdentityColumns,
+        bool allowNulls, PreLoadDiscardedColumn[] dilutionColumns)
     {
         if (!sourceTable.Exists())
             throw new Exception($"Table {sourceTable} does not exist on {srcDatabaseInfo}");
@@ -98,21 +106,24 @@ public void CloneTable(DiscoveredDatabase srcDatabaseInfo, DiscoveredDatabase de
         //new table will start with the same name as the as the old scripted one
         var newTable = destDatabaseInfo.ExpectTable(destTableName);
 
-        var sql = sourceTable.ScriptTableCreation(allowNulls, allowNulls, false /*False because we want to drop these columns entirely not just flip to int*/,newTable); 
-            
-        _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, $"Creating table with SQL:{sql}"));
+        var sql = sourceTable.ScriptTableCreation(allowNulls, allowNulls,
+            false /*False because we want to drop these columns entirely not just flip to int*/, newTable);
+
+        _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Creating table with SQL:{sql}"));
 
         using (var con = destDatabaseInfo.Server.GetConnection())
         {
             con.Open();
-            using(var cmd = destDatabaseInfo.Server.GetCommand(sql, con))
+            using (var cmd = destDatabaseInfo.Server.GetCommand(sql, con))
+            {
                 cmd.ExecuteNonQuery();
+            }
         }
 
         if (!newTable.Exists())
             throw new Exception(
                 $"Table '{newTable}' not found in {destDatabaseInfo} despite running table creation SQL!");
-            
+
         foreach (var column in newTable.DiscoverColumns())
         {
             var drop = false;
@@ -124,19 +135,25 @@ public void CloneTable(DiscoveredDatabase srcDatabaseInfo, DiscoveredDatabase de
             //drop hic_ columns
             if (SpecialFieldNames.IsHicPrefixed(colName) && dropHICColumns)
                 drop = true;
-                
+
             //if the ColumnInfo is explicitly marked to be ignored
-            if(_tableInfo.ColumnInfos.Any(c=>c.IgnoreInLoads && c.GetRuntimeName(_copyToBubble.ToLoadStage()).Equals(colName)))
+            if (_tableInfo.ColumnInfos.Any(c =>
+                    c.IgnoreInLoads && c.GetRuntimeName(_copyToBubble.ToLoadStage()).Equals(colName)))
             {
-                _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"{colName} will be dropped because it is marked IgnoreInLoads"));
+                _listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"{colName} will be dropped because it is marked IgnoreInLoads"));
                 drop = true;
             }
-                    
+
 
             //also drop any columns we have specifically been told to ignore in the DLE configuration
-            if(_hicDatabaseConfiguration.IgnoreColumns != null && _hicDatabaseConfiguration.IgnoreColumns.IsMatch(colName))
+            if (_hicDatabaseConfiguration.IgnoreColumns != null &&
+                _hicDatabaseConfiguration.IgnoreColumns.IsMatch(colName))
             {
-                _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"{colName} will be dropped because it is matches the gloabl ignores pattern ({_hicDatabaseConfiguration.IgnoreColumns})"));
+                _listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"{colName} will be dropped because it is matches the gloabl ignores pattern ({_hicDatabaseConfiguration.IgnoreColumns})"));
                 drop = true;
             }
 
@@ -148,11 +165,13 @@ public void CloneTable(DiscoveredDatabase srcDatabaseInfo, DiscoveredDatabase de
 
             if (dilution != null)
             {
-                _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,$"Altering diluted column {colName} to {dilution.Data_type}"));
+                _listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        $"Altering diluted column {colName} to {dilution.Data_type}"));
                 column.DataType.AlterTypeTo(dilution.Data_type);
             }
 
-            if(drop)
+            if (drop)
                 newTable.DropColumn(column);
         }
     }
diff --git a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/StandardDatabaseHelper.cs b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/StandardDatabaseHelper.cs
index 2868d3588d..57a13fd198 100644
--- a/Rdmp.Core/DataLoad/Engine/DatabaseManagement/StandardDatabaseHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/DatabaseManagement/StandardDatabaseHelper.cs
@@ -21,17 +21,19 @@ public class StandardDatabaseHelper
     public Dictionary<LoadBubble, DiscoveredDatabase> DatabaseInfoList = new();
 
     //Constructor
-    internal StandardDatabaseHelper(DiscoveredDatabase liveDatabase, INameDatabasesAndTablesDuringLoads namer,DiscoveredServer rawServer)
+    internal StandardDatabaseHelper(DiscoveredDatabase liveDatabase, INameDatabasesAndTablesDuringLoads namer,
+        DiscoveredServer rawServer)
     {
         DatabaseNamer = namer;
 
-            
 
-        foreach (var stage in new[] {LoadBubble.Raw, LoadBubble.Staging, LoadBubble.Live })
+        foreach (var stage in new[] { LoadBubble.Raw, LoadBubble.Staging, LoadBubble.Live })
         {
             var stageName = DatabaseNamer.GetDatabaseName(liveDatabase.GetRuntimeName(), stage);
-            DatabaseInfoList.Add(stage, stage == LoadBubble.Raw ? rawServer.ExpectDatabase(stageName) : liveDatabase.Server.ExpectDatabase(stageName));
-                
+            DatabaseInfoList.Add(stage,
+                stage == LoadBubble.Raw
+                    ? rawServer.ExpectDatabase(stageName)
+                    : liveDatabase.Server.ExpectDatabase(stageName));
         }
     }
 
diff --git a/Rdmp.Core/DataLoad/Engine/Job/DataLoadJob.cs b/Rdmp.Core/DataLoad/Engine/Job/DataLoadJob.cs
index ea8e05cc13..67347db432 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/DataLoadJob.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/DataLoadJob.cs
@@ -53,7 +53,9 @@ public class DataLoadJob : IDataLoadJob
 
     private string _loggingTask;
 
-    public DataLoadJob(IRDMPPlatformRepositoryServiceLocator repositoryLocator, string description, ILogManager logManager, ILoadMetadata loadMetadata, ILoadDirectory directory, IDataLoadEventListener listener, HICDatabaseConfiguration configuration)
+    public DataLoadJob(IRDMPPlatformRepositoryServiceLocator repositoryLocator, string description,
+        ILogManager logManager, ILoadMetadata loadMetadata, ILoadDirectory directory, IDataLoadEventListener listener,
+        HICDatabaseConfiguration configuration)
     {
         _logManager = logManager;
         RepositoryLocator = repositoryLocator;
@@ -89,7 +91,8 @@ private string GetLoggingTask(IEnumerable<ICatalogue> cataloguesToLoad)
     private void CreateDataLoadInfo()
     {
         if (string.IsNullOrWhiteSpace(Description))
-            throw new Exception("The data load description (for the DataLoadInfo object) must not be empty, please provide a relevant description");
+            throw new Exception(
+                "The data load description (for the DataLoadInfo object) must not be empty, please provide a relevant description");
 
         DataLoadInfo = _logManager.CreateDataLoadInfo(_loggingTask, nameof(DataLoadProcess), Description, "", false);
 
@@ -114,7 +117,8 @@ public void LogError(string message, Exception exception)
         if (DataLoadInfo == null)
             CreateDataLoadInfo();
 
-        DataLoadInfo.LogFatalError(nameof(DataLoadProcess), message + Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(exception, true));
+        DataLoadInfo.LogFatalError(nameof(DataLoadProcess),
+            message + Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(exception, true));
         DataLoadInfo.CloseAndMarkComplete();
     }
 
@@ -133,7 +137,7 @@ public void LogInformation(string senderName, string message)
         if (DataLoadInfo == null)
             throw new Exception("Logging hasn't been started for this job (call StartLogging first)");
 
-        if(!DataLoadInfo.IsClosed)
+        if (!DataLoadInfo.IsClosed)
             DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnInformation, senderName, message);
     }
 
@@ -149,7 +153,7 @@ public void LogWarning(string senderName, string message)
     public void CreateTablesInStage(DatabaseCloner cloner, LoadBubble stage)
     {
         foreach (TableInfo regularTableInfo in RegularTablesToLoad)
-            cloner.CreateTablesInDatabaseFromCatalogueInfo(_listener,regularTableInfo, stage);
+            cloner.CreateTablesInDatabaseFromCatalogueInfo(_listener, regularTableInfo, stage);
 
         foreach (TableInfo lookupTableInfo in LookupTablesToLoad)
             cloner.CreateTablesInDatabaseFromCatalogueInfo(_listener, lookupTableInfo, stage);
@@ -164,33 +168,42 @@ public void PushForDisposal(IDisposeAfterDataLoad disposeable)
 
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-        if(DataLoadInfo != null)
+        if (DataLoadInfo != null)
             switch (e.ProgressEventType)
             {
                 case ProgressEventType.Trace:
                 case ProgressEventType.Debug:
                     break;
                 case ProgressEventType.Information:
-                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnInformation, sender.GetType().Name, e.Message + (e.Exception != null ? $"Exception={ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true)}"
-                        : ""));
+                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnInformation,
+                        sender.GetType().Name, e.Message + (e.Exception != null
+                            ? $"Exception={ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true)}"
+                            : ""));
                     break;
                 case ProgressEventType.Warning:
-                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnWarning, sender.GetType().Name, e.Message + (e.Exception != null ? $"Exception={ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true)}"
-                        : ""));
+                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnWarning, sender.GetType().Name,
+                        e.Message + (e.Exception != null
+                            ? $"Exception={ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true)}"
+                            : ""));
                     break;
                 case ProgressEventType.Error:
-                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnTaskFailed, sender.GetType().Name, e.Message);
-                    DataLoadInfo.LogFatalError(sender.GetType().Name, e.Exception != null ? ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true) : e.Message);
+                    DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnTaskFailed, sender.GetType().Name,
+                        e.Message);
+                    DataLoadInfo.LogFatalError(sender.GetType().Name,
+                        e.Exception != null
+                            ? ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true)
+                            : e.Message);
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
-        _listener.OnNotify(sender,e);
+
+        _listener.OnNotify(sender, e);
     }
 
     public void OnProgress(object sender, ProgressEventArgs e)
     {
-        _listener.OnProgress(sender,e);
+        _listener.OnProgress(sender, e);
     }
 
     public string ArchiveFilepath => Path.Combine(LoadDirectory.ForArchiving.FullName, $"{DataLoadInfo.ID}.zip");
@@ -206,7 +219,8 @@ public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener
 
     public ColumnInfo[] GetAllColumns()
     {
-        return RegularTablesToLoad.SelectMany(t=>t.ColumnInfos).Union(LookupTablesToLoad.SelectMany(t=>t.ColumnInfos)).Distinct().ToArray();
+        return RegularTablesToLoad.SelectMany(t => t.ColumnInfos)
+            .Union(LookupTablesToLoad.SelectMany(t => t.ColumnInfos)).Distinct().ToArray();
     }
 
     public void CrashAtEnd(NotifyEventArgs because)
diff --git a/Rdmp.Core/DataLoad/Engine/Job/IDataLoadJob.cs b/Rdmp.Core/DataLoad/Engine/Job/IDataLoadJob.cs
index 8b3d0aa939..53e2035d82 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/IDataLoadJob.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/IDataLoadJob.cs
@@ -41,6 +41,7 @@ public interface IDataLoadJob : IDataLoadEventListener, IDisposeAfterDataLoad
     /// returned (but otherwise the load will complete normally).
     /// </summary>
     IReadOnlyCollection<NotifyEventArgs> CrashAtEndMessages { get; }
+
     List<ITableInfo> RegularTablesToLoad { get; }
     List<ITableInfo> LookupTablesToLoad { get; }
 
@@ -50,7 +51,7 @@ public interface IDataLoadJob : IDataLoadEventListener, IDisposeAfterDataLoad
     void CloseLogging();
 
     HICDatabaseConfiguration Configuration { get; }
-        
+
     /// <summary>
     /// True to automatically skip creating/dropping the RAW database
     /// </summary>
@@ -62,10 +63,10 @@ public interface IDataLoadJob : IDataLoadEventListener, IDisposeAfterDataLoad
     /// </summary>
     /// <param name="cloner"></param>
     /// <param name="stage"></param>
-    void CreateTablesInStage(DatabaseCloner cloner,LoadBubble stage);
+    void CreateTablesInStage(DatabaseCloner cloner, LoadBubble stage);
 
     void PushForDisposal(IDisposeAfterDataLoad disposeable);
-        
+
     /// <summary>
     /// Returns all <see cref="ColumnInfo"/> in <see cref="RegularTablesToLoad "/> and <see cref="LookupTablesToLoad"/>
     /// </summary>
diff --git a/Rdmp.Core/DataLoad/Engine/Job/IJobFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/IJobFactory.cs
index 3fdcc48d46..4d24bd4f15 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/IJobFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/IJobFactory.cs
@@ -15,5 +15,6 @@ namespace Rdmp.Core.DataLoad.Engine.Job;
 /// </summary>
 public interface IJobFactory
 {
-    IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator,IDataLoadEventListener listener,HICDatabaseConfiguration configuration);
+    IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        HICDatabaseConfiguration configuration);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/JobFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/JobFactory.cs
index 943e967589..381b9bc7ac 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/JobFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/JobFactory.cs
@@ -27,10 +27,12 @@ public JobFactory(ILoadMetadata loadMetadata, ILogManager logManager)
         _logManager = logManager;
     }
 
-    public IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, HICDatabaseConfiguration configuration)
+    public IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        HICDatabaseConfiguration configuration)
     {
         var description = _loadMetadata.Name;
         var LoadDirectory = new LoadDirectory(_loadMetadata.LocationOfFlatFiles);
-        return new DataLoadJob(repositoryLocator,description, _logManager, _loadMetadata, LoadDirectory, listener,configuration);
+        return new DataLoadJob(repositoryLocator, description, _logManager, _loadMetadata, LoadDirectory, listener,
+            configuration);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/DataLoadProgressUpdateException.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/DataLoadProgressUpdateException.cs
index 9956545a71..34a953ae78 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/DataLoadProgressUpdateException.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/DataLoadProgressUpdateException.cs
@@ -13,12 +13,11 @@ namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
 /// </summary>
 public class DataLoadProgressUpdateException : Exception
 {
-    public DataLoadProgressUpdateException(string msg):base(msg)
+    public DataLoadProgressUpdateException(string msg) : base(msg)
     {
-            
     }
-    public DataLoadProgressUpdateException(string msg,Exception ex): base(msg,ex)
-    {
 
+    public DataLoadProgressUpdateException(string msg, Exception ex) : base(msg, ex)
+    {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/CacheDataProviderFindingException.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/CacheDataProviderFindingException.cs
index af00caf1aa..29eea4262e 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/CacheDataProviderFindingException.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/CacheDataProviderFindingException.cs
@@ -14,8 +14,7 @@ namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling.Exceptions;
 /// </summary>
 public class CacheDataProviderFindingException : Exception
 {
-    public CacheDataProviderFindingException(string msg):base(msg)
+    public CacheDataProviderFindingException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/LoadOrCacheProgressUnclearException.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/LoadOrCacheProgressUnclearException.cs
index b645c61b13..1c591679b7 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/LoadOrCacheProgressUnclearException.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/Exceptions/LoadOrCacheProgressUnclearException.cs
@@ -16,6 +16,5 @@ public class LoadOrCacheProgressUnclearException : Exception
 {
     public LoadOrCacheProgressUnclearException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/IUpdateLoadProgress.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/IUpdateLoadProgress.cs
index cd49c0fd0b..fe1039f7b2 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/IUpdateLoadProgress.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/IUpdateLoadProgress.cs
@@ -9,6 +9,6 @@ namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
 /// <summary>
 /// See UpdateProgressIfLoadsuccessful
 /// </summary>
-public interface IUpdateLoadProgress:IDisposeAfterDataLoad
+public interface IUpdateLoadProgress : IDisposeAfterDataLoad
 {
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/JobDateGenerationStrategyFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/JobDateGenerationStrategyFactory.cs
index 7646d63169..7b6963509b 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/JobDateGenerationStrategyFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/JobDateGenerationStrategyFactory.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
 public class JobDateGenerationStrategyFactory
 {
     private readonly Type _typeToCreate;
-        
+
     /// <summary>
     /// Always respects the LoadProgress dates and crashes if there arent any load progresses associated with the given load metadata
     /// Uses SingleScheduleCacheDateTrackingStrategy if there is a cache associated with any of the load progresses otherwise uses SingleScheduleConsecutiveDateStrategy (meaning for example each day for the next 5 days)
@@ -29,9 +29,11 @@ public JobDateGenerationStrategyFactory(ILoadProgressSelectionStrategy strategy)
 
     {
         _typeToCreate =
-            strategy.GetAllLoadProgresses().Any(p => p.CacheProgress != null)//if any of the strategies you plan to use (without locking btw) have a cache progress
-                ? typeof (SingleScheduleCacheDateTrackingStrategy) //then we should use a cache progress based strategy
-                : typeof (SingleScheduleConsecutiveDateStrategy);//otherwise we should probably use consecutive days strategy;
+            strategy.GetAllLoadProgresses()
+                .Any(p => p.CacheProgress !=
+                          null) //if any of the strategies you plan to use (without locking btw) have a cache progress
+                ? typeof(SingleScheduleCacheDateTrackingStrategy) //then we should use a cache progress based strategy
+                : typeof(SingleScheduleConsecutiveDateStrategy); //otherwise we should probably use consecutive days strategy;
     }
 
     public IJobDateGenerationStrategy Create(ILoadProgress loadProgress, IDataLoadEventListener listener)
@@ -44,7 +46,8 @@ public IJobDateGenerationStrategy Create(ILoadProgress loadProgress, IDataLoadEv
         var factory = new CacheLayoutFactory();
 
         if (_typeToCreate == typeof(SingleScheduleCacheDateTrackingStrategy))
-            return new SingleScheduleCacheDateTrackingStrategy(CacheLayoutFactory.CreateCacheLayout(loadProgress, loadMetadata), loadProgress,listener);
+            return new SingleScheduleCacheDateTrackingStrategy(
+                CacheLayoutFactory.CreateCacheLayout(loadProgress, loadMetadata), loadProgress, listener);
 
         throw new Exception("Factory has been configured to supply an unknown type");
     }
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/MultipleScheduleJobFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/MultipleScheduleJobFactory.cs
index 144799be65..881c3277e0 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/MultipleScheduleJobFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/MultipleScheduleJobFactory.cs
@@ -28,11 +28,12 @@ public class MultipleScheduleJobFactory : ScheduledJobFactory
     private readonly List<ILoadProgress> _scheduleList;
     private int _lastScheduleId;
 
-    public MultipleScheduleJobFactory(Dictionary<ILoadProgress, IJobDateGenerationStrategy> availableSchedules, int? overrideNumberOfDaysToLoad , ILoadMetadata loadMetadata, ILogManager logManager)
+    public MultipleScheduleJobFactory(Dictionary<ILoadProgress, IJobDateGenerationStrategy> availableSchedules,
+        int? overrideNumberOfDaysToLoad, ILoadMetadata loadMetadata, ILogManager logManager)
         : base(overrideNumberOfDaysToLoad, loadMetadata, logManager)
     {
         _availableSchedules = availableSchedules;
-            
+
         _scheduleList = _availableSchedules.Keys.ToList();
 
         _lastScheduleId = 0;
@@ -44,18 +45,25 @@ public MultipleScheduleJobFactory(Dictionary<ILoadProgress, IJobDateGenerationSt
     /// <returns></returns>
     public override bool HasJobs()
     {
-        return _scheduleList.Any(loadProgress => _availableSchedules[loadProgress].GetTotalNumberOfJobs(OverrideNumberOfDaysToLoad??loadProgress.DefaultNumberOfDaysToLoadEachTime, false) > 0);
+        return _scheduleList.Any(loadProgress =>
+            _availableSchedules[loadProgress]
+                .GetTotalNumberOfJobs(OverrideNumberOfDaysToLoad ?? loadProgress.DefaultNumberOfDaysToLoadEachTime,
+                    false) > 0);
     }
 
-    protected override ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator,IDataLoadEventListener listener,HICDatabaseConfiguration configuration)
+    protected override ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IDataLoadEventListener listener, HICDatabaseConfiguration configuration)
     {
         var loadProgress = _scheduleList[_lastScheduleId];
-        var datesToRetrieve = _availableSchedules[loadProgress].GetDates(OverrideNumberOfDaysToLoad??_scheduleList[_lastScheduleId].DefaultNumberOfDaysToLoadEachTime, false);
+        var datesToRetrieve = _availableSchedules[loadProgress]
+            .GetDates(OverrideNumberOfDaysToLoad ?? _scheduleList[_lastScheduleId].DefaultNumberOfDaysToLoadEachTime,
+                false);
         if (!datesToRetrieve.Any())
             return null;
 
         var LoadDirectory = new LoadDirectory(LoadMetadata.LocationOfFlatFiles);
-        var job = new ScheduledDataLoadJob(repositoryLocator,JobDescription, LogManager, LoadMetadata, LoadDirectory, listener,configuration)
+        var job = new ScheduledDataLoadJob(repositoryLocator, JobDescription, LogManager, LoadMetadata, LoadDirectory,
+            listener, configuration)
         {
             LoadProgress = loadProgress,
             DatesToRetrieve = datesToRetrieve
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledDataLoadJob.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledDataLoadJob.cs
index ae6b9fa81b..6cab46a497 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledDataLoadJob.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledDataLoadJob.cs
@@ -24,8 +24,10 @@ public class ScheduledDataLoadJob : DataLoadJob
 {
     public ILoadProgress LoadProgress { get; set; }
     public List<DateTime> DatesToRetrieve { get; set; }
-        
-    public ScheduledDataLoadJob(IRDMPPlatformRepositoryServiceLocator repositoryLocator, string description, ILogManager logManager, ILoadMetadata loadMetadata, ILoadDirectory directory, IDataLoadEventListener listener,HICDatabaseConfiguration configuration)
+
+    public ScheduledDataLoadJob(IRDMPPlatformRepositoryServiceLocator repositoryLocator, string description,
+        ILogManager logManager, ILoadMetadata loadMetadata, ILoadDirectory directory, IDataLoadEventListener listener,
+        HICDatabaseConfiguration configuration)
         : base(repositoryLocator, description, logManager, loadMetadata, directory, listener, configuration)
     {
     }
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledJobFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledJobFactory.cs
index 2f8330b6a3..e49bfd7a3e 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledJobFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/ScheduledJobFactory.cs
@@ -28,13 +28,14 @@ protected ScheduledJobFactory(int? overrideNumberOfDaysToLoad, ILoadMetadata loa
         LogManager = logManager;
     }
 
-        
+
     public abstract bool HasJobs();
 
 
-    public IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,HICDatabaseConfiguration configuration)
+    public IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        HICDatabaseConfiguration configuration)
     {
-        var job = CreateImpl(repositoryLocator,listener,configuration);
+        var job = CreateImpl(repositoryLocator, listener, configuration);
 
         if (job == null || job.DatesToRetrieve == null || !job.DatesToRetrieve.Any())
             return null; // No dates to load
@@ -42,5 +43,6 @@ public IDataLoadJob Create(IRDMPPlatformRepositoryServiceLocator repositoryLocat
         return job;
     }
 
-    protected abstract ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, HICDatabaseConfiguration configuration);
+    protected abstract ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IDataLoadEventListener listener, HICDatabaseConfiguration configuration);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleCacheDateTrackingStrategy.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleCacheDateTrackingStrategy.cs
index 1688b137a5..1d66bafc03 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleCacheDateTrackingStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleCacheDateTrackingStrategy.cs
@@ -24,7 +24,8 @@ public class SingleScheduleCacheDateTrackingStrategy : IJobDateGenerationStrateg
     private readonly Queue<DateTime> _availableDates = new();
     private readonly DateTime _lastDateForLoading;
 
-    public SingleScheduleCacheDateTrackingStrategy(ICacheLayout cacheLayout, ILoadProgress loadProgress,IDataLoadEventListener listener)
+    public SingleScheduleCacheDateTrackingStrategy(ICacheLayout cacheLayout, ILoadProgress loadProgress,
+        IDataLoadEventListener listener)
     {
         // no null check needed as the contract ensures that both DataLoadProgress and OriginDate can't simultaneously be null
         var lastAssignedLoadDate = loadProgress.DataLoadProgress ?? loadProgress.OriginDate.Value;
@@ -32,10 +33,10 @@ public SingleScheduleCacheDateTrackingStrategy(ICacheLayout cacheLayout, ILoadPr
         // This is all the dates in the cache, but we want to start from _lastAssignedLoadDate
         // todo: must be efficient, revisit
         _availableDates = cacheLayout.GetSortedDateQueue(listener);
-          
-        while (_availableDates.Any() &&  _availableDates.Peek() <= lastAssignedLoadDate)
+
+        while (_availableDates.Any() && _availableDates.Peek() <= lastAssignedLoadDate)
             _availableDates.Dequeue();
-            
+
 
         _lastDateForLoading = CalculateLastLoadDate(loadProgress);
     }
@@ -51,7 +52,7 @@ public static DateTime CalculateLastLoadDate(ILoadProgress loadProgress)
         // Compute the last cache date from the CacheFillProgress date
         // CacheFillProgress is the date up to which caching has been performed, and is therefore the date from which caching will next begin.
         var cacheProgress = loadProgress.CacheProgress ?? throw new InvalidOperationException(
-                $"Could not retrieve the CacheProgress from LoadProgress {loadProgress.ID} (ensure caching is configured on this load before using this strategy)");
+            $"Could not retrieve the CacheProgress from LoadProgress {loadProgress.ID} (ensure caching is configured on this load before using this strategy)");
         if (cacheProgress.CacheFillProgress == null)
             throw new InvalidOperationException(
                 $"Caching has not begun for this CacheProgress ({cacheProgress.ID}), so there is nothing to load and this strategy should not be used.");
@@ -73,11 +74,12 @@ public static DateTime CalculateLastLoadDate(ILoadProgress loadProgress)
     private static ICacheFileSystemDestination GetCacheDestinationPipelineComponent(ICacheProgress cacheProgress)
     {
         if (cacheProgress.Pipeline_ID == null)
-            throw new InvalidOperationException("This CacheProgress does not have a caching pipeline, please configure one.");
+            throw new InvalidOperationException(
+                "This CacheProgress does not have a caching pipeline, please configure one.");
 
         var factory = new CachingPipelineUseCase(cacheProgress);
         ICacheFileSystemDestination destination;
-            
+
         try
         {
             destination = factory.CreateDestinationOnly(new ThrowImmediatelyDataLoadEventListener());
@@ -85,7 +87,8 @@ private static ICacheFileSystemDestination GetCacheDestinationPipelineComponent(
         catch (Exception e)
         {
             throw new Exception(
-                $"We identified that your cache uses pipeline {cacheProgress.Pipeline} but we could not instantiate the Pipeline's Destination instance, make sure the pipeline is intact in PipelineDiagramUI.  See inner exception for details",e );
+                $"We identified that your cache uses pipeline {cacheProgress.Pipeline} but we could not instantiate the Pipeline's Destination instance, make sure the pipeline is intact in PipelineDiagramUI.  See inner exception for details",
+                e);
         }
 
         return destination;
@@ -102,7 +105,8 @@ public static DateTime CalculateLastLoadDate(CacheFileGranularity cacheFileGranu
                 // Get the beginning of the day prior to nextDateToBeCached
                 return nextDateToBeCached.AddDays(-1).Date;
             default:
-                throw new ArgumentOutOfRangeException(nameof(cacheFileGranularity), cacheFileGranularity, "CacheFileGranularity must either be Hour or Day.");
+                throw new ArgumentOutOfRangeException(nameof(cacheFileGranularity), cacheFileGranularity,
+                    "CacheFileGranularity must either be Hour or Day.");
         }
     }
 
@@ -129,8 +133,8 @@ public List<DateTime> GetDates(int batchSize, bool allowLoadingFutureDates)
     public int GetTotalNumberOfJobs(int batchSize, bool allowLoadingFutureDates)
     {
         var totalNumberOfValidDates = _availableDates.Count(time => time <= _lastDateForLoading);
-        var totalNumberOfJobs = totalNumberOfValidDates/batchSize;
-        if (totalNumberOfValidDates%batchSize > 0) ++totalNumberOfJobs;
+        var totalNumberOfJobs = totalNumberOfValidDates / batchSize;
+        if (totalNumberOfValidDates % batchSize > 0) ++totalNumberOfJobs;
         return totalNumberOfJobs;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleConsecutiveDateStrategy.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleConsecutiveDateStrategy.cs
index 02199fc6b8..9f3005431d 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleConsecutiveDateStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduleConsecutiveDateStrategy.cs
@@ -24,12 +24,15 @@ public SingleScheduleConsecutiveDateStrategy(ILoadProgress loadProgress)
         if (loadProgress.DataLoadProgress == null)
         {
             if (loadProgress.OriginDate == null)
-                throw new LoadOrCacheProgressUnclearException("Don't know when to start the data load, both DataLoadProgress and OriginDate are null");
+                throw new LoadOrCacheProgressUnclearException(
+                    "Don't know when to start the data load, both DataLoadProgress and OriginDate are null");
 
             _lastAssignedLoadDate = loadProgress.OriginDate.Value;
         }
         else
+        {
             _lastAssignedLoadDate = loadProgress.DataLoadProgress.Value;
+        }
     }
 
     /// <summary>
@@ -41,16 +44,16 @@ public SingleScheduleConsecutiveDateStrategy(ILoadProgress loadProgress)
     public List<DateTime> GetDates(int batchSize, bool allowLoadingFutureDates)
     {
         var dates = new List<DateTime>();
-            
+
         for (var i = 0; i < batchSize; i++)
         {
             _lastAssignedLoadDate = _lastAssignedLoadDate.Add(new TimeSpan(1, 0, 0, 0));
 
             //if we are about to order the loading of today or any later day
             if (_lastAssignedLoadDate.Date >= DateTime.Now.Date)
-                if (!allowLoadingFutureDates)//if user does not want to load future dates
-                    return dates;//he is done
-                
+                if (!allowLoadingFutureDates) //if user does not want to load future dates
+                    return dates; //he is done
+
             //it is not a future date or user wants to allow loading of future dates
             dates.Add(_lastAssignedLoadDate);
         }
@@ -64,8 +67,8 @@ public int GetTotalNumberOfJobs(int batchSize, bool allowLoadingFutureDates)
             throw new NotImplementedException();
 
         var numberOfDays = DateTime.Now.Date.Subtract(_lastAssignedLoadDate.Date).Days;
-        var totalNumberOfJobs = numberOfDays/batchSize;
-        if (numberOfDays%batchSize > 0) ++totalNumberOfJobs;
+        var totalNumberOfJobs = numberOfDays / batchSize;
+        if (numberOfDays % batchSize > 0) ++totalNumberOfJobs;
         return totalNumberOfJobs;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduledJobFactory.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduledJobFactory.cs
index 6d87a6526b..9260b1a37c 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduledJobFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/SingleScheduledJobFactory.cs
@@ -23,24 +23,29 @@ public class SingleScheduledJobFactory : ScheduledJobFactory
     private readonly ILoadProgress _loadProgress;
     private readonly IJobDateGenerationStrategy _jobDateGenerationStrategy;
 
-    public SingleScheduledJobFactory(ILoadProgress loadProgress, IJobDateGenerationStrategy jobDateGenerationStrategy, int overrideNumberOfDaysToLoad , ILoadMetadata loadMetadata, ILogManager logManager) : base(overrideNumberOfDaysToLoad, loadMetadata, logManager)
+    public SingleScheduledJobFactory(ILoadProgress loadProgress, IJobDateGenerationStrategy jobDateGenerationStrategy,
+        int overrideNumberOfDaysToLoad, ILoadMetadata loadMetadata, ILogManager logManager) : base(
+        overrideNumberOfDaysToLoad, loadMetadata, logManager)
     {
         _loadProgress = loadProgress;
         _jobDateGenerationStrategy = jobDateGenerationStrategy;
     }
 
-    public override bool HasJobs()
-    {
-        return _jobDateGenerationStrategy.GetTotalNumberOfJobs(OverrideNumberOfDaysToLoad??_loadProgress.DefaultNumberOfDaysToLoadEachTime, false) > 0;
-    }
+    public override bool HasJobs() =>
+        _jobDateGenerationStrategy.GetTotalNumberOfJobs(
+            OverrideNumberOfDaysToLoad ?? _loadProgress.DefaultNumberOfDaysToLoadEachTime, false) > 0;
 
-    protected override ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator,IDataLoadEventListener listener,HICDatabaseConfiguration configuration)
+    protected override ScheduledDataLoadJob CreateImpl(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IDataLoadEventListener listener, HICDatabaseConfiguration configuration)
     {
         var LoadDirectory = new LoadDirectory(LoadMetadata.LocationOfFlatFiles);
-        return new ScheduledDataLoadJob(repositoryLocator,JobDescription, LogManager, LoadMetadata, LoadDirectory, listener,configuration)
+        return new ScheduledDataLoadJob(repositoryLocator, JobDescription, LogManager, LoadMetadata, LoadDirectory,
+            listener, configuration)
         {
             LoadProgress = _loadProgress,
-            DatesToRetrieve = _jobDateGenerationStrategy.GetDates(OverrideNumberOfDaysToLoad??_loadProgress.DefaultNumberOfDaysToLoadEachTime, false)
+            DatesToRetrieve =
+                _jobDateGenerationStrategy.GetDates(
+                    OverrideNumberOfDaysToLoad ?? _loadProgress.DefaultNumberOfDaysToLoadEachTime, false)
         };
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/UpdateProgressIfLoadsuccessful.cs b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/UpdateProgressIfLoadsuccessful.cs
index 4287ec3a1f..4938cc31ef 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/Scheduling/UpdateProgressIfLoadsuccessful.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/Scheduling/UpdateProgressIfLoadsuccessful.cs
@@ -17,9 +17,9 @@ namespace Rdmp.Core.DataLoad.Engine.Job.Scheduling;
 /// days on teh assumption that more data will appear later to fill that gap.
 /// </summary>
 public class UpdateProgressIfLoadsuccessful : IUpdateLoadProgress
-{ 
+{
     protected readonly ScheduledDataLoadJob Job;
-        
+
 
     public DateTime DateToSetProgressTo;
 
@@ -28,7 +28,8 @@ public UpdateProgressIfLoadsuccessful(ScheduledDataLoadJob job)
         Job = job;
 
         if (Job.DatesToRetrieve == null || !Job.DatesToRetrieve.Any())
-            throw new DataLoadProgressUpdateException("Job does not have any DatesToRetrieve! collection was null or empty");
+            throw new DataLoadProgressUpdateException(
+                "Job does not have any DatesToRetrieve! collection was null or empty");
 
         DateToSetProgressTo = Job.DatesToRetrieve.Max();
     }
@@ -47,7 +48,7 @@ public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEvent
         postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Updating DataLoadProgress of '{progress}' to {DateToSetProgressTo}"));
         progress.DataLoadProgress = DateToSetProgressTo;
-            
+
         progress.SaveToDatabase();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Job/ThrowImmediatelyDataLoadJob.cs b/Rdmp.Core/DataLoad/Engine/Job/ThrowImmediatelyDataLoadJob.cs
index 3983da95fe..b718304543 100644
--- a/Rdmp.Core/DataLoad/Engine/Job/ThrowImmediatelyDataLoadJob.cs
+++ b/Rdmp.Core/DataLoad/Engine/Job/ThrowImmediatelyDataLoadJob.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.DataLoad.Engine.Job;
 /// <summary>
 /// Empty implementation of IDataLoadJob that can be used during Checking / Tests etc 
 /// </summary>
-public class ThrowImmediatelyDataLoadJob: IDataLoadJob
+public class ThrowImmediatelyDataLoadJob : IDataLoadJob
 {
     private readonly IDataLoadEventListener _listener;
 
@@ -40,6 +40,7 @@ public ThrowImmediatelyDataLoadJob(IDataLoadEventListener listener)
     {
         _listener = listener;
     }
+
     public ThrowImmediatelyDataLoadJob(HICDatabaseConfiguration configuration, params ITableInfo[] regularTablesToLoad)
     {
         _listener = new ThrowImmediatelyDataLoadEventListener();
@@ -54,8 +55,8 @@ public ThrowImmediatelyDataLoadJob(HICDatabaseConfiguration configuration, param
     public ILoadMetadata LoadMetadata { get; set; }
     public bool DisposeImmediately { get; private set; }
     public string ArchiveFilepath { get; private set; }
-    public List<ITableInfo> RegularTablesToLoad { get; set; } = new List<ITableInfo>();
-    public List<ITableInfo> LookupTablesToLoad { get; set; } = new List<ITableInfo>();
+    public List<ITableInfo> RegularTablesToLoad { get; set; } = new();
+    public List<ITableInfo> LookupTablesToLoad { get; set; } = new();
     public IRDMPPlatformRepositoryServiceLocator RepositoryLocator => null;
 
     public void StartLogging()
@@ -80,6 +81,7 @@ public void CloseLogging()
     public static void AddForDisposalAfterCompletion(IDisposeAfterDataLoad disposable)
     {
     }
+
     public void CreateTablesInStage(DatabaseCloner cloner, LoadBubble stage)
     {
     }
@@ -90,21 +92,22 @@ public void PushForDisposal(IDisposeAfterDataLoad disposeable)
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-        _listener.OnNotify(sender,e);
+        _listener.OnNotify(sender, e);
     }
 
     public void OnProgress(object sender, ProgressEventArgs e)
     {
-        _listener.OnProgress(sender,e);
+        _listener.OnProgress(sender, e);
     }
+
     public ColumnInfo[] GetAllColumns()
     {
-        return RegularTablesToLoad.SelectMany(t=>t.ColumnInfos).Union(LookupTablesToLoad.SelectMany(t=>t.ColumnInfos)).Distinct().ToArray();
+        return RegularTablesToLoad.SelectMany(t => t.ColumnInfos)
+            .Union(LookupTablesToLoad.SelectMany(t => t.ColumnInfos)).Distinct().ToArray();
     }
 
     /// <inheritdoc/>
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/CommandLineHelper.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/CommandLineHelper.cs
index 4fd1f35877..53b55e854b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/CommandLineHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/CommandLineHelper.cs
@@ -44,39 +44,30 @@ public static string CreateArgString(string name, object value)
             return CreateArgString(name, value.ToString());
 
         if (value is DiscoveredDatabase dbInfo)
-        {
             return
                 $"{CreateArgString("DatabaseName", dbInfo.GetRuntimeName())} {CreateArgString("DatabaseServer", dbInfo.Server.Name)}";
-        }
-                        
+
         return $"-{ConvertArgNameToString(name)}={GetValueString(value)}";
     }
 
-    public static string ConvertArgNameToString(string name)
-    {
+    public static string ConvertArgNameToString(string name) =>
         // Will split on capitals without breaking up capital sequences
         // e.g. 'TestArg' => 'test-arg' and 'TestTLAArg' => 'test-tla-arg'
-        return Regex.Replace(name, @"((?<=[a-z])[A-Z]|[A-Z](?=[a-z]))", @"-$1").ToLower();
-    }
+        Regex.Replace(name, @"((?<=[a-z])[A-Z]|[A-Z](?=[a-z]))", @"-$1").ToLower();
 
     public static string GetValueString(object value)
     {
         if (value is string s)
             if (s.ToString().Contains(' '))
-                return $@"""{value}""";//<- looks like a snake (or a golf club? GM)
+                return $@"""{value}"""; //<- looks like a snake (or a golf club? GM)
             else
                 return s;
 
         if (value is DateTime dt)
-        {
             return
                 $"\"{(dt.TimeOfDay.TotalSeconds.Equals(0) ? dt.ToString("yyyy-MM-dd") : dt.ToString("yyyy-MM-dd HH:mm:ss"))}\"";
-        }
 
-        if (value is FileInfo fi)
-        {
-            return $"\"{fi.FullName}\"";
-        }
+        if (value is FileInfo fi) return $"\"{fi.FullName}\"";
 
         throw new ArgumentException($"Cannot create a value string from an object of type {value.GetType().FullName}");
     }
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/IStageArgs.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/IStageArgs.cs
index 2597f6703f..c79d25d31e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/IStageArgs.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/IStageArgs.cs
@@ -16,9 +16,9 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Arguments;
 /// </summary>
 public interface IStageArgs
 {
-    DiscoveredDatabase DbInfo { get;}
+    DiscoveredDatabase DbInfo { get; }
     Dictionary<string, object> ToDictionary();
 
     ILoadDirectory RootDir { get; }
-    LoadStage LoadStage { get;}
+    LoadStage LoadStage { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/LoadArgsDictionary.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/LoadArgsDictionary.cs
index b988acb210..d2317eeee9 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/LoadArgsDictionary.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/LoadArgsDictionary.cs
@@ -21,12 +21,12 @@ public class LoadArgsDictionary
 {
     private readonly ILoadMetadata _loadMetadata;
     private readonly StandardDatabaseHelper _dbDeployInfo;
-        
+
     public Dictionary<LoadStage, IStageArgs> LoadArgs { get; private set; }
 
     public LoadArgsDictionary(ILoadMetadata loadMetadata, StandardDatabaseHelper dbDeployInfo)
     {
-        if(string.IsNullOrWhiteSpace(loadMetadata.LocationOfFlatFiles))
+        if (string.IsNullOrWhiteSpace(loadMetadata.LocationOfFlatFiles))
             throw new Exception(
                 $@"No Project Directory (LocationOfFlatFiles) has been configured on LoadMetadata {loadMetadata.Name}");
 
@@ -35,9 +35,7 @@ public LoadArgsDictionary(ILoadMetadata loadMetadata, StandardDatabaseHelper dbD
 
         LoadArgs = new Dictionary<LoadStage, IStageArgs>();
         foreach (LoadStage loadStage in Enum.GetValues(typeof(LoadStage)))
-        {
             LoadArgs.Add(loadStage, CreateLoadArgs(loadStage));
-        }
     }
 
     protected IStageArgs CreateLoadArgs(LoadStage loadStage)
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/RuntimeArgumentCollection.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/RuntimeArgumentCollection.cs
index 358762e77c..75c24834e1 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/RuntimeArgumentCollection.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/RuntimeArgumentCollection.cs
@@ -22,11 +22,7 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Arguments;
 /// </summary>
 public class RuntimeArgumentCollection
 {
-    public IStageArgs StageSpecificArguments
-    {
-        get;
-        set;
-    }
+    public IStageArgs StageSpecificArguments { get; set; }
 
     public HashSet<IArgument> Arguments { get; private set; }
 
@@ -47,11 +43,8 @@ public RuntimeArgumentCollection(IArgument[] args, IStageArgs stageSpecificArgs)
 
     public void IterateAllArguments(Func<string, object, bool> func)
     {
-        foreach (var arg in Arguments)
-        {
-            func(arg.Name, arg.GetValueAsSystemType());
-        }
-            
+        foreach (var arg in Arguments) func(arg.Name, arg.GetValueAsSystemType());
+
         if (StageSpecificArguments == null)
             return;
 
@@ -66,7 +59,8 @@ public void AddArgument(IArgument processTaskArgument)
 
     public object GetCustomArgumentValue(string name)
     {
-        var first = Arguments.SingleOrDefault(a => a.Name.Equals(name)) ?? throw new KeyNotFoundException($"Argument {name} was missing");
+        var first = Arguments.SingleOrDefault(a => a.Name.Equals(name)) ??
+                    throw new KeyNotFoundException($"Argument {name} was missing");
         try
         {
             return first.GetValueAsSystemType();
@@ -74,13 +68,14 @@ public object GetCustomArgumentValue(string name)
         catch (Exception e)
         {
             throw new Exception(
-                $"Could not convert value '{first.Value}' into a {first.GetSystemType().FullName} for argument '{first.Name}'", e);
+                $"Could not convert value '{first.Value}' into a {first.GetSystemType().FullName} for argument '{first.Name}'",
+                e);
         }
     }
 
-    public IEnumerable<KeyValuePair<string,object>>  GetAllArguments()
+    public IEnumerable<KeyValuePair<string, object>> GetAllArguments()
     {
-        if(StageSpecificArguments != null)
+        if (StageSpecificArguments != null)
             foreach (var kvp in StageSpecificArguments.ToDictionary())
                 yield return kvp;
 
@@ -92,12 +87,11 @@ public IEnumerable<KeyValuePair<string, T>> GetAllArgumentsOfType<T>()
     {
         if (StageSpecificArguments != null)
             foreach (var kvp in StageSpecificArguments.ToDictionary())
-                if(kvp.Value.GetType() == typeof(T))
-                    yield return new KeyValuePair<string, T>(kvp.Key,(T)kvp.Value);
+                if (kvp.Value.GetType() == typeof(T))
+                    yield return new KeyValuePair<string, T>(kvp.Key, (T)kvp.Value);
 
         foreach (var argument in Arguments)
-            if(argument.GetSystemType() == typeof(T))
+            if (argument.GetSystemType() == typeof(T))
                 yield return new KeyValuePair<string, T>(argument.Name, (T)argument.GetValueAsSystemType());
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/StageArgs.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/StageArgs.cs
index 79affe60c6..748a20d139 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/StageArgs.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Arguments/StageArgs.cs
@@ -20,11 +20,11 @@ public class StageArgs : IStageArgs
 {
     public DiscoveredDatabase DbInfo { get; private set; }
     public ILoadDirectory RootDir { get; private set; }
-        
+
     //Mandatory
     public LoadStage LoadStage { get; private set; }
 
-    public StageArgs(LoadStage loadStage,DiscoveredDatabase database, ILoadDirectory projectDirectory)
+    public StageArgs(LoadStage loadStage, DiscoveredDatabase database, ILoadDirectory projectDirectory)
     {
         LoadStage = loadStage;
         DbInfo = database;
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/CompositeDataLoadComponent.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/CompositeDataLoadComponent.cs
index 19f928d822..7fc8089ffc 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/CompositeDataLoadComponent.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/CompositeDataLoadComponent.cs
@@ -16,11 +16,11 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
 /// </summary>
 public class CompositeDataLoadComponent : DataLoadComponent
 {
-    public IList<IDataLoadComponent> Components {get;private set;}
+    public IList<IDataLoadComponent> Components { get; private set; }
 
     public CompositeDataLoadComponent(IList<IDataLoadComponent> components)
     {
-        Components = components?? new List<IDataLoadComponent>();
+        Components = components ?? new List<IDataLoadComponent>();
     }
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -31,9 +31,9 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         foreach (var component in Components)
         {
             var result = component.Run(job, cancellationToken);
-                
+
             job.PushForDisposal(component);
-                
+
             if (result != ExitCodeType.Success)
                 return result;
         }
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DataLoadComponent.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DataLoadComponent.cs
index a7aa1e45ff..aa426e6b54 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DataLoadComponent.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DataLoadComponent.cs
@@ -14,7 +14,7 @@ public abstract class DataLoadComponent : IDataLoadComponent
 {
     public bool SkipComponent { get; set; }
     public string Description { get; set; }
-        
+
     public abstract ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken);
 
     protected DataLoadComponent()
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DeleteForLoadingFilesOperation.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DeleteForLoadingFilesOperation.cs
index 1f4aefa99c..8e27b1f883 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DeleteForLoadingFilesOperation.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/DeleteForLoadingFilesOperation.cs
@@ -24,8 +24,8 @@ public DeleteForLoadingFilesOperation(IDataLoadJob job)
         _job = job;
     }
 
-        
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
         // We only delete ForLoading files after a successful load
         if (exitCode == ExitCodeType.Success)
@@ -36,27 +36,32 @@ public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener
             if (!LoadDirectory.ForLoading.GetFiles().Any() && !LoadDirectory.ForLoading.GetDirectories().Any())
             {
                 //just skip it but tell user you are skipping it
-                postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "No files found in ForLoading so not bothering to try and delete."));
-                return;  
+                postLoadEventListener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information,
+                        "No files found in ForLoading so not bothering to try and delete."));
+                return;
             }
 
             // Check if the attacher has communicated its intent to handle archiving
-            var archivingHandledByAttacher = File.Exists(Path.Combine(LoadDirectory.ForLoading.FullName, "attacher_is_handling_archiving"));
-                    
+            var archivingHandledByAttacher =
+                File.Exists(Path.Combine(LoadDirectory.ForLoading.FullName, "attacher_is_handling_archiving"));
+
             if (!archivingHandledByAttacher && !ArchiveHasBeenCreated())
             {
                 postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                     $"Refusing to delete files in ForLoading: the load has reported success but there is no archive of this dataset (was expecting the archive to be called '{_job.ArchiveFilepath}', check LoadMetadata.CacheArchiveType if the file extension is not what you expect)"));
-                return;   
+                return;
             }
 
             _job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Deleting files in ForLoading ({LoadDirectory.ForLoading.FullName})"));
-                
+
             if (archivingHandledByAttacher)
             {
-                LoadDirectory.ForLoading.EnumerateFiles().Where(info => info.Name != "attacher_is_handling_archiving").ToList().ForEach(info => info.Delete());
-                LoadDirectory.ForLoading.EnumerateDirectories().Where(info => info.Name != "__hidden_from_archiver__").ToList().ForEach(info => info.Delete(true));
+                LoadDirectory.ForLoading.EnumerateFiles().Where(info => info.Name != "attacher_is_handling_archiving")
+                    .ToList().ForEach(info => info.Delete());
+                LoadDirectory.ForLoading.EnumerateDirectories().Where(info => info.Name != "__hidden_from_archiver__")
+                    .ToList().ForEach(info => info.Delete(true));
             }
             else
             {
@@ -66,8 +71,5 @@ public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener
         }
     }
 
-    private bool ArchiveHasBeenCreated()
-    {
-        return new FileInfo(_job.ArchiveFilepath).Exists;
-    }
+    private bool ArchiveHasBeenCreated() => new FileInfo(_job.ArchiveFilepath).Exists;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/LoadFiles.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/LoadFiles.cs
index 7a4c52e303..7398dfac4e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/LoadFiles.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/LoadFiles.cs
@@ -21,25 +21,25 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
 /// </summary>
 public class LoadFiles : CompositeDataLoadComponent
 {
-    public LoadFiles(List<IRuntimeTask> collection):base(collection.Cast<IDataLoadComponent>().ToList())
+    public LoadFiles(List<IRuntimeTask> collection) : base(collection.Cast<IDataLoadComponent>().ToList())
     {
         Description = Description = "LoadFiles";
     }
-        
+
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        if (Skip(job)) 
+        if (Skip(job))
             return ExitCodeType.Error;
 
-        var toReturn = ExitCodeType.Success; //This default will be returned unless there is an explicit DataProvider or collection of runtime tasks to run which return a different result (See below)
+        var
+            toReturn = ExitCodeType
+                .Success; //This default will be returned unless there is an explicit DataProvider or collection of runtime tasks to run which return a different result (See below)
 
         // Figure out where we are getting the source files from
         try
         {
             if (Components.Any())
-            {
                 toReturn = base.Run(job, cancellationToken);
-            }
             else if (job.LoadDirectory.ForLoading.EnumerateFileSystemInfos().Any())
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"Using existing files in '{job.LoadDirectory.ForLoading.FullName}', there are no GetFiles processes or DataProviders configured"));
@@ -51,7 +51,6 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         {
             // We can only clean up ForLoading after the job is finished, so give it the necessary disposal operation
             job.PushForDisposal(new DeleteForLoadingFilesOperation(job));
-                
         }
 
         return toReturn;
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/PopulateRAW.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/PopulateRAW.cs
index acddd1d0ad..562092328a 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/PopulateRAW.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/PopulateRAW.cs
@@ -24,8 +24,9 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components;
 public class PopulateRAW : CompositeDataLoadComponent
 {
     private readonly HICDatabaseConfiguration _databaseConfiguration;
-        
-    public PopulateRAW(List<IRuntimeTask> collection,HICDatabaseConfiguration databaseConfiguration):base(collection.Cast<IDataLoadComponent>().ToList())
+
+    public PopulateRAW(List<IRuntimeTask> collection, HICDatabaseConfiguration databaseConfiguration) : base(
+        collection.Cast<IDataLoadComponent>().ToList())
     {
         _databaseConfiguration = databaseConfiguration;
         Description = "Populate RAW";
@@ -40,7 +41,7 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         CreateRawDatabaseIfRequired(job);
 
         var toReturn = base.Run(job, cancellationToken);
-            
+
         if (toReturn == ExitCodeType.Success)
             // Verify that we have put something into the database
             VerifyExistenceOfRawData(job);
@@ -60,7 +61,8 @@ private bool MustCreateRawDatabase()
         {
             // if there are multiple attachers, ensure that they all agree on whether or not they require external database creation
             var attachers = attachingProcesses.Select(runtime => runtime.Attacher).ToList();
-            var numAttachersRequiringDbCreation = attachers.Count(attacher => attacher.RequestsExternalDatabaseCreation);
+            var numAttachersRequiringDbCreation =
+                attachers.Count(attacher => attacher.RequestsExternalDatabaseCreation);
 
             if (numAttachersRequiringDbCreation > 0 && numAttachersRequiringDbCreation < attachingProcesses.Length)
                 throw new Exception(
@@ -75,17 +77,16 @@ private void CreateRawDatabaseIfRequired(IDataLoadJob job)
         // Ask the runtime process host if we need to create the RAW database
         if (!MustCreateRawDatabase()) return;
 
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Determined that we must create the RAW database tables..."));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                "Determined that we must create the RAW database tables..."));
 
         var cloner = new DatabaseCloner(_databaseConfiguration);
 
-        if(!job.PersistentRaw)
-        {
-            cloner.CreateDatabaseForStage(LoadBubble.Raw);
-        }
-                
+        if (!job.PersistentRaw) cloner.CreateDatabaseForStage(LoadBubble.Raw);
 
-        job.CreateTablesInStage(cloner,LoadBubble.Raw);
+
+        job.CreateTablesInStage(cloner, LoadBubble.Raw);
     }
 
     // Check that either Raw database exists and is populated, or that 'forLoading' is not empty
@@ -98,14 +99,12 @@ private void VerifyExistenceOfRawData(IDataLoadJob job)
                 $"The Mounting stage has not created the {raw.GetRuntimeName()} database."));
 
         var rawDbInfo = _databaseConfiguration.DeployInfo[LoadBubble.Raw];
-            
-        if (_databaseConfiguration.ExpectTables(job,LoadBubble.Raw,true).All(t=>t.IsEmpty()))
+
+        if (_databaseConfiguration.ExpectTables(job, LoadBubble.Raw, true).All(t => t.IsEmpty()))
         {
             var message = $"The Mounting stage has not populated the RAW database ({rawDbInfo}) with any data";
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, message));
             throw new Exception(message);
-                
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/AttacherRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/AttacherRuntimeTask.cs
index 47423e52fd..9ef87e295f 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/AttacherRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/AttacherRuntimeTask.cs
@@ -30,7 +30,7 @@ public AttacherRuntimeTask(IProcessTask task, RuntimeArgumentCollection args, ME
         : base(task, args)
     {
         //All attachers must be marked as mounting stages, and therefore we can pull out the RAW Server and Name
-        var mountingStageArgs = args.StageSpecificArguments ;
+        var mountingStageArgs = args.StageSpecificArguments;
         if (mountingStageArgs.LoadStage != LoadStage.Mounting)
             throw new Exception("AttacherRuntimeTask can only be called as a Mounting stage process");
 
@@ -46,14 +46,14 @@ public AttacherRuntimeTask(IProcessTask task, RuntimeArgumentCollection args, ME
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-
         var beforeServer = RuntimeArguments.StageSpecificArguments.DbInfo.Server.Name;
-        var beforeDatabase = RuntimeArguments.StageSpecificArguments.DbInfo.Server.GetCurrentDatabase().GetRuntimeName();
+        var beforeDatabase =
+            RuntimeArguments.StageSpecificArguments.DbInfo.Server.GetCurrentDatabase().GetRuntimeName();
         var beforeDatabaseType = RuntimeArguments.StageSpecificArguments.DbInfo.Server.DatabaseType;
 
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"About to run Task '{ProcessTask.Name}'"));
-        job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Attacher class is:{Attacher.GetType().FullName}"));
 
         try
@@ -63,25 +63,27 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         catch (Exception e)
         {
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
-                $"Attach failed on job {job} Attacher was of type {Attacher.GetType().Name} see InnerException for specifics",e));
+                $"Attach failed on job {job} Attacher was of type {Attacher.GetType().Name} see InnerException for specifics",
+                e));
             return ExitCodeType.Error;
         }
         finally
         {
             var afterServer = RuntimeArguments.StageSpecificArguments.DbInfo.Server.Name;
-            var afterDatabase = RuntimeArguments.StageSpecificArguments.DbInfo.Server.GetCurrentDatabase().GetRuntimeName();
+            var afterDatabase = RuntimeArguments.StageSpecificArguments.DbInfo.Server.GetCurrentDatabase()
+                .GetRuntimeName();
             var afterDatabaseType = RuntimeArguments.StageSpecificArguments.DbInfo.Server.DatabaseType;
 
-            if(!(beforeServer.Equals(afterServer) && beforeDatabase.Equals(afterDatabase) && beforeDatabaseType == afterDatabaseType))
+            if (!(beforeServer.Equals(afterServer) && beforeDatabase.Equals(afterDatabase) &&
+                  beforeDatabaseType == afterDatabaseType))
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                     $"Attacher {Attacher.GetType().Name} modified the ConnectionString during attaching"));
-
         }
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-        Attacher.LoadCompletedSoDispose(exitCode,postLoadEventListener);
+        Attacher.LoadCompletedSoDispose(exitCode, postLoadEventListener);
     }
 
 
@@ -101,7 +103,7 @@ public override bool Exists()
 
     public override void Abort(IDataLoadEventListener postLoadEventListener)
     {
-        LoadCompletedSoDispose(ExitCodeType.Abort,postLoadEventListener);
+        LoadCompletedSoDispose(ExitCodeType.Abort, postLoadEventListener);
     }
 
     public override void Check(ICheckNotifier checker)
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/DataProviderRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/DataProviderRuntimeTask.cs
index fdc0dfe1ad..16e07eb532 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/DataProviderRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/DataProviderRuntimeTask.cs
@@ -50,7 +50,8 @@ public DataProviderRuntimeTask(IProcessTask task, RuntimeArgumentCollection args
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
 
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"About to fetch data using class {Provider.GetType().FullName}"));
@@ -58,18 +59,15 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         return Provider.Fetch(job, cancellationToken);
     }
 
-    public override bool Exists()
-    {
-        return true;
-    }
+    public override bool Exists() => true;
 
     public override void Abort(IDataLoadEventListener postLoadEventListener)
     {
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-        Provider.LoadCompletedSoDispose(exitCode,postLoadEventListener);
+        Provider.LoadCompletedSoDispose(exitCode, postLoadEventListener);
     }
 
     public override void Check(ICheckNotifier checker)
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecutableRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecutableRuntimeTask.cs
index 13e3082d8e..4bb38c1b94 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecutableRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecutableRuntimeTask.cs
@@ -37,7 +37,8 @@ public ExecutableRuntimeTask(IProcessTask processTask, RuntimeArgumentCollection
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
 
         var info = new ProcessStartInfo
         {
@@ -52,8 +53,9 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Starting '{info.FileName}' with args '{info.Arguments}'"));
 
-        _currentProcess = new Process {StartInfo = info};
-        _currentProcess.OutputDataReceived += (sender, eventArgs) => job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, eventArgs.Data));
+        _currentProcess = new Process { StartInfo = info };
+        _currentProcess.OutputDataReceived += (sender, eventArgs) =>
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, eventArgs.Data));
 
         try
         {
@@ -67,7 +69,8 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         _currentProcess.BeginOutputReadLine();
         var reader = _currentProcess.StandardError;
 
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Executable has been started successfully"));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, "Executable has been started successfully"));
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Waiting for executable to complete"));
 
         try
@@ -77,34 +80,35 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         catch (Exception e)
         {
             ErrorText = reader.ReadToEnd();
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, e.ToString(),e));
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, e.ToString(), e));
             throw new Exception($"Exception whilst waiting for the executable process to finish: {e}");
         }
 
         var exitCode = ParseExitCode(_currentProcess.ExitCode);
-        job.OnNotify(this, 
-            new NotifyEventArgs(exitCode != ExitCodeType.Error ? ProgressEventType.Information : ProgressEventType.Error,
+        job.OnNotify(this,
+            new NotifyEventArgs(
+                exitCode != ExitCodeType.Error ? ProgressEventType.Information : ProgressEventType.Error,
                 $"Executable has exited with state '{exitCode}'"));
 
         if (exitCode == ExitCodeType.Error)
         {
             ErrorText = reader.ReadToEnd();
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, ErrorText));
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, ErrorText));
             throw new Exception($"Executable process '{info.FileName} {info.Arguments}' failed: {ErrorText}");
         }
+
         _currentProcess = null;
 
         return exitCode;
     }
 
 
-
     public string CreateArgString()
     {
         var args = new List<string>();
         RuntimeArguments.IterateAllArguments((name, value) =>
         {
-            if(value != null)
+            if (value != null)
                 args.Add(CommandLineHelper.CreateArgString(name, value));
             return true;
         });
@@ -119,10 +123,7 @@ private static ExitCodeType ParseExitCode(int value)
         return exitCode;
     }
 
-    public override bool Exists()
-    {
-        return File.Exists(ExeFilepath);
-    }
+    public override bool Exists() => File.Exists(ExeFilepath);
 
     public override void Abort(IDataLoadEventListener postDataLoadEventListener)
     {
@@ -139,9 +140,8 @@ public override void Abort(IDataLoadEventListener postDataLoadEventListener)
         }
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-            
     }
 
     public override void Check(ICheckNotifier notifier)
@@ -180,17 +180,12 @@ public override void Check(ICheckNotifier notifier)
         else
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Process Task called {ProcessTask.Name} references a file called {exeParsed[0]} which does not exist at this time.", CheckResult.Warning));
-
+                    $"Process Task called {ProcessTask.Name} references a file called {exeParsed[0]} which does not exist at this time.",
+                    CheckResult.Warning));
     }
 
-    public override string ToString()
-    {
-        return string.IsNullOrEmpty(ExeFilepath) ? "No executable" : $"{ExeFilepath} {CreateArgString()}";
-    }
+    public override string ToString() =>
+        string.IsNullOrEmpty(ExeFilepath) ? "No executable" : $"{ExeFilepath} {CreateArgString()}";
 
-    public static XmlSchema GetSchema()
-    {
-        return null;
-    }
+    public static XmlSchema GetSchema() => null;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTask.cs
index cd3482b5a7..bba90e5e71 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTask.cs
@@ -22,7 +22,7 @@ public class ExecuteSqlFileRuntimeTask : RuntimeTask
 {
     public string Filepath;
     private IProcessTask _task;
-                
+
     private LoadStage _loadStage;
 
     public ExecuteSqlFileRuntimeTask(IProcessTask task, RuntimeArgumentCollection args) : base(task, args)
@@ -30,7 +30,7 @@ public ExecuteSqlFileRuntimeTask(IProcessTask task, RuntimeArgumentCollection ar
         _task = task;
         Filepath = task.Path;
     }
-        
+
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
         var db = RuntimeArguments.StageSpecificArguments.DbInfo;
@@ -48,13 +48,15 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
             foreach (var kvp in RuntimeArguments.GetAllArgumentsOfType<string>())
             {
                 var value = kvp.Value;
-                    
+
                 if (value.Contains("<DatabaseServer>"))
-                    value = value.Replace("<DatabaseServer>", RuntimeArguments.StageSpecificArguments.DbInfo.Server.Name);
+                    value = value.Replace("<DatabaseServer>",
+                        RuntimeArguments.StageSpecificArguments.DbInfo.Server.Name);
 
                 if (value.Contains("<DatabaseName>"))
-                    value = value.Replace("<DatabaseName>", RuntimeArguments.StageSpecificArguments.DbInfo.GetRuntimeName());
-                    
+                    value = value.Replace("<DatabaseName>",
+                        RuntimeArguments.StageSpecificArguments.DbInfo.GetRuntimeName());
+
                 commandText = commandText.Replace($"##{kvp.Key}##", value);
             }
         }
@@ -62,27 +64,22 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         {
             throw new Exception($"Could not read the sql file at {Filepath}: {e}");
         }
-            
+
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Executing script {Filepath} ( against {db})"));
-        var executer = new ExecuteSqlInDleStage(job,_loadStage);
-        return executer.Execute(commandText,db);
+        var executer = new ExecuteSqlInDleStage(job, _loadStage);
+        return executer.Execute(commandText, db);
     }
 
-        
 
-    public override bool Exists()
-    {
-        return File.Exists(Filepath);
-    }
-        
+    public override bool Exists() => File.Exists(Filepath);
+
     public override void Abort(IDataLoadEventListener postLoadEventListener)
     {
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-            
     }
 
     public override void Check(ICheckNotifier notifier)
@@ -94,7 +91,7 @@ public override void Check(ICheckNotifier notifier)
                     CheckResult.Fail));
             return;
         }
-            
+
         if (!File.Exists(Filepath))
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTaskException.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTaskException.cs
index 8b764997c2..008f1a718b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTaskException.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlFileRuntimeTaskException.cs
@@ -14,12 +14,11 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Runtime;
 /// </summary>
 public class ExecuteSqlFileRuntimeTaskException : Exception
 {
-    public ExecuteSqlFileRuntimeTaskException(string message):base(message)
+    public ExecuteSqlFileRuntimeTaskException(string message) : base(message)
     {
-            
     }
-    public ExecuteSqlFileRuntimeTaskException(string message, Exception innerException): base(message, innerException)
+
+    public ExecuteSqlFileRuntimeTaskException(string message, Exception innerException) : base(message, innerException)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlInDleStage.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlInDleStage.cs
index 334713aaf1..43ca15059e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlInDleStage.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/ExecuteSqlInDleStage.cs
@@ -22,7 +22,7 @@ internal class ExecuteSqlInDleStage
 {
     private readonly IDataLoadJob _job;
     private readonly LoadStage _loadStage;
-    private Regex _regexEntity = new(@"{([CT]):(\d+)}",RegexOptions.IgnoreCase);
+    private Regex _regexEntity = new(@"{([CT]):(\d+)}", RegexOptions.IgnoreCase);
 
     public ExecuteSqlInDleStage(IDataLoadJob job, LoadStage loadStage)
     {
@@ -33,11 +33,11 @@ public ExecuteSqlInDleStage(IDataLoadJob job, LoadStage loadStage)
     public ExitCodeType Execute(string commandText, DiscoveredDatabase db)
     {
         var syntax = db.Server.GetQuerySyntaxHelper();
-        commandText = _regexEntity.Replace(commandText, m=>GetEntityForMatch(m,syntax));
+        commandText = _regexEntity.Replace(commandText, m => GetEntityForMatch(m, syntax));
 
         try
         {
-            Dictionary<int,Stopwatch> performance;
+            Dictionary<int, Stopwatch> performance;
 
 
             using (var con = db.Server.GetConnection())
@@ -58,7 +58,8 @@ public ExitCodeType Execute(string commandText, DiscoveredDatabase db)
 
         return ExitCodeType.Success;
     }
-    private string GetEntityForMatch(Match match,IQuerySyntaxHelper syntaxHelper)
+
+    private string GetEntityForMatch(Match match, IQuerySyntaxHelper syntaxHelper)
     {
         if (match.Groups.Count != 3)
             throw new ExecuteSqlFileRuntimeTaskException(
@@ -74,7 +75,8 @@ private string GetEntityForMatch(Match match,IQuerySyntaxHelper syntaxHelper)
         catch (Exception e)
         {
             throw new ExecuteSqlFileRuntimeTaskException(
-                $"Error performing substitution in Sql File, Failed to replace match {match.Value} due to parse expectations",e);
+                $"Error performing substitution in Sql File, Failed to replace match {match.Value} due to parse expectations",
+                e);
         }
 
         var tables = _job.RegularTablesToLoad.Union(_job.LookupTablesToLoad);
@@ -84,24 +86,25 @@ private string GetEntityForMatch(Match match,IQuerySyntaxHelper syntaxHelper)
         switch (entity)
         {
             case 'T':
-                var toReturnTable = tables.SingleOrDefault(t => t.ID == id) ?? throw new ExecuteSqlFileRuntimeTaskException(
-                        $"Failed to find a TableInfo in the load with ID {id}.  All TableInfo IDs referenced in script must be part of the LoadMetadata");
+                var toReturnTable = tables.SingleOrDefault(t => t.ID == id) ??
+                                    throw new ExecuteSqlFileRuntimeTaskException(
+                                        $"Failed to find a TableInfo in the load with ID {id}.  All TableInfo IDs referenced in script must be part of the LoadMetadata");
                 return toReturnTable.GetRuntimeName(_loadStage, namer);
 
             case 'C':
 
-                var toReturnColumn = tables.SelectMany(t=>t.ColumnInfos).SingleOrDefault(t => t.ID == id) ?? throw new ExecuteSqlFileRuntimeTaskException(
-                        $"Failed to find a ColumnInfo in the load with ID {id}.  All ColumnInfo IDs referenced in script must be part of the LoadMetadata");
+                var toReturnColumn = tables.SelectMany(t => t.ColumnInfos).SingleOrDefault(t => t.ID == id) ??
+                                     throw new ExecuteSqlFileRuntimeTaskException(
+                                         $"Failed to find a ColumnInfo in the load with ID {id}.  All ColumnInfo IDs referenced in script must be part of the LoadMetadata");
                 var db = toReturnColumn.TableInfo.GetDatabaseRuntimeName(_loadStage, namer);
                 var tbl = toReturnColumn.TableInfo.GetRuntimeName(_loadStage, namer);
                 var col = toReturnColumn.GetRuntimeName(_loadStage);
 
                 return syntaxHelper.EnsureFullyQualified(db, null, tbl, col);
 
-            default :
+            default:
                 throw new ExecuteSqlFileRuntimeTaskException(
                     $"Error performing substitution in Sql File, Unexpected Type char in regex:{entity}");
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/IRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/IRuntimeTask.cs
index d8bdab749e..9248f17c2e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/IRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/IRuntimeTask.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Runtime;
 /// <summary>
 /// See RuntimeTask
 /// </summary>
-public interface IRuntimeTask : IDataLoadComponent,ICheckable
+public interface IRuntimeTask : IDataLoadComponent, ICheckable
 {
     bool Exists();
     void Abort(IDataLoadEventListener postLoadEventListener);
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MandatoryPropertyChecker.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MandatoryPropertyChecker.cs
index c3446f0762..a26d3c2bf3 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MandatoryPropertyChecker.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MandatoryPropertyChecker.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Runtime;
 /// Checks that all Properties on the supplied classInstanceToCheck that are decorated with a [DemandsInitialization] where the Mandatory flag is true have 
 /// a value.
 /// </summary>
-public class MandatoryPropertyChecker:ICheckable
+public class MandatoryPropertyChecker : ICheckable
 {
     private readonly object _classInstanceToCheck;
 
@@ -29,20 +29,19 @@ public void Check(ICheckNotifier notifier)
         foreach (var propertyInfo in _classInstanceToCheck.GetType().GetProperties())
         {
             //see if any demand initialization
-            var demand = System.Attribute.GetCustomAttributes(propertyInfo).OfType<DemandsInitializationAttribute>().FirstOrDefault();
+            var demand = System.Attribute.GetCustomAttributes(propertyInfo).OfType<DemandsInitializationAttribute>()
+                .FirstOrDefault();
 
             //this one does
             if (demand != null)
-            {
-                if(demand.Mandatory)
+                if (demand.Mandatory)
                 {
                     var value = propertyInfo.GetValue(_classInstanceToCheck);
                     if (value == null || string.IsNullOrEmpty(value.ToString()))
                         notifier.OnCheckPerformed(new CheckEventArgs(
-                            $"DemandsInitialization Property '{propertyInfo.Name}' is marked Mandatory but does not have a value", CheckResult.Fail));
-
+                            $"DemandsInitialization Property '{propertyInfo.Name}' is marked Mandatory but does not have a value",
+                            CheckResult.Fail));
                 }
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MutilateDataTablesRuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MutilateDataTablesRuntimeTask.cs
index 18ac2ec184..ea04047aef 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MutilateDataTablesRuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/MutilateDataTablesRuntimeTask.cs
@@ -32,9 +32,10 @@ public MutilateDataTablesRuntimeTask(IProcessTask task, RuntimeArgumentCollectio
         //All attachers must be marked as mounting stages, and therefore we can pull out the RAW Server and Name
         var stageArgs = args.StageSpecificArguments ?? throw new NullReferenceException("Stage args was null");
         if (stageArgs.DbInfo == null)
-            throw new NullReferenceException("Stage args had no DbInfo, unable to mutilate tables without a database - mutilator is sad");
+            throw new NullReferenceException(
+                "Stage args had no DbInfo, unable to mutilate tables without a database - mutilator is sad");
 
-        if(string.IsNullOrWhiteSpace(task.Path))
+        if (string.IsNullOrWhiteSpace(task.Path))
             throw new ArgumentException(
                 $"Path is blank for ProcessTask '{task}' - it should be a class name of type {nameof(IMutilateDataTables)}");
 
@@ -44,10 +45,10 @@ public MutilateDataTablesRuntimeTask(IProcessTask task, RuntimeArgumentCollectio
     }
 
 
-
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"About to run Task '{ProcessTask.Name}'"));
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Mutilate class is{MutilateDataTables.GetType().FullName}"));
 
@@ -58,16 +59,13 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         catch (Exception e)
         {
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
-                $"Mutilate failed on job {job} Mutilator was of type {MutilateDataTables.GetType().Name} see InnerException for specifics", e));
+                $"Mutilate failed on job {job} Mutilator was of type {MutilateDataTables.GetType().Name} see InnerException for specifics",
+                e));
             return ExitCodeType.Error;
         }
-
     }
 
-    public override bool Exists()
-    {
-        return true;
-    }
+    public override bool Exists() => true;
 
     public override void Abort(IDataLoadEventListener postLoadEventListener)
     {
@@ -85,6 +83,4 @@ public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEven
     {
         MutilateDataTables.LoadCompletedSoDispose(exitCode, postDataLoadEventListener);
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/RuntimeTask.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/RuntimeTask.cs
index 63939c379f..ce858aca5b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/RuntimeTask.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Runtime/RuntimeTask.cs
@@ -27,11 +27,11 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution.Components.Runtime;
 /// <para>The second are those that do not have a MEF class powering them.  This includes ProcessTaskTypes like Executable and SQLFile where the ProcessTask.Path
 /// is simply the location of the exe/sql file to run at runtime. </para>
 /// </summary>
-public abstract class RuntimeTask : DataLoadComponent, IRuntimeTask,ICheckable
+public abstract class RuntimeTask : DataLoadComponent, IRuntimeTask, ICheckable
 {
     public RuntimeArgumentCollection RuntimeArguments { get; set; }
     public IProcessTask ProcessTask { get; set; }
-        
+
     public abstract bool Exists();
 
     public abstract void Abort(IDataLoadEventListener postLoadEventListener);
@@ -47,8 +47,8 @@ public void SetPropertiesForClass(RuntimeArgumentCollection args, object toSetPr
         if (toSetPropertiesOf == null)
             throw new NullReferenceException(
                 $"{ProcessTask.Path} instance has not been created yet! Call SetProperties after the factory has created the instance.");
-            
-        if (UsefulStuff.IsAssignableToGenericType(toSetPropertiesOf.GetType(),typeof (IPipelineRequirement<>)))
+
+        if (UsefulStuff.IsAssignableToGenericType(toSetPropertiesOf.GetType(), typeof(IPipelineRequirement<>)))
             throw new Exception(
                 $"ProcessTask '{ProcessTask.Name}' was was an instance of Class '{ProcessTask.Path}' which declared an IPipelineRequirement<>.  RuntimeTask classes are not the same as IDataFlowComponents, IDataFlowComponents can make IPipelineRequirement requests but RuntimeTasks cannot");
 
@@ -61,11 +61,11 @@ public void SetPropertiesForClass(RuntimeArgumentCollection args, object toSetPr
         foreach (var propertyInfo in toSetPropertiesOf.GetType().GetProperties())
         {
             //see if any demand initialization
-            var initialization = (DemandsInitializationAttribute)Attribute.GetCustomAttributes(propertyInfo).FirstOrDefault(a => a is DemandsInitializationAttribute) ;
+            var initialization = (DemandsInitializationAttribute)Attribute.GetCustomAttributes(propertyInfo)
+                .FirstOrDefault(a => a is DemandsInitializationAttribute);
 
             //this one does
             if (initialization != null)
-            {
                 try
                 {
                     //get the approrpriate value from arguments
@@ -77,15 +77,16 @@ public void SetPropertiesForClass(RuntimeArgumentCollection args, object toSetPr
                 catch (NotSupportedException e)
                 {
                     throw new Exception(
-                        $"Class {toSetPropertiesOf.GetType().Name} has a property {propertyInfo.Name} but is of unexpected type {propertyInfo.GetType()}", e);
+                        $"Class {toSetPropertiesOf.GetType().Name} has a property {propertyInfo.Name} but is of unexpected type {propertyInfo.GetType()}",
+                        e);
                 }
                 catch (KeyNotFoundException e)
                 {
-                    if(initialization.Mandatory)
+                    if (initialization.Mandatory)
                         throw new ArgumentException(
-                            $"Class {toSetPropertiesOf.GetType().Name} has a Mandatory property '{propertyInfo.Name}' marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection", e);
+                            $"Class {toSetPropertiesOf.GetType().Name} has a Mandatory property '{propertyInfo.Name}' marked with DemandsInitialization but no corresponding argument was provided in ArgumentCollection",
+                            e);
                 }
-            }
         }
     }
 
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/RuntimeTaskPackager.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/RuntimeTaskPackager.cs
index db3c4b867b..790dc27b9b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/RuntimeTaskPackager.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/RuntimeTaskPackager.cs
@@ -28,7 +28,9 @@ public class RuntimeTaskPackager
     private readonly IEnumerable<ICatalogue> _cataloguesToLoad;
     private readonly ICatalogueRepository _repository;
 
-    public RuntimeTaskPackager(IEnumerable<IProcessTask> processTasks, Dictionary<LoadStage, IStageArgs> loadArgsDictionary, IEnumerable<ICatalogue> cataloguesToLoad, ICatalogueRepository repository)
+    public RuntimeTaskPackager(IEnumerable<IProcessTask> processTasks,
+        Dictionary<LoadStage, IStageArgs> loadArgsDictionary, IEnumerable<ICatalogue> cataloguesToLoad,
+        ICatalogueRepository repository)
     {
         ProcessTasks = processTasks;
         _loadArgsDictionary = loadArgsDictionary;
@@ -47,7 +49,7 @@ public List<IRuntimeTask> GetRuntimeTasksForStage(LoadStage loadStage)
         var factory = new RuntimeTaskFactory(_repository);
         foreach (var processTask in tasksForThisLoadStage)
             runtimeTasks.Add(factory.Create(processTask, _loadArgsDictionary[processTask.LoadStage]));
-            
+
 
         runtimeTasks = runtimeTasks.OrderBy(task => task.ProcessTask.Order).ToList();
         return runtimeTasks;
@@ -57,13 +59,14 @@ public IEnumerable<IRuntimeTask> GetAllRuntimeTasks()
     {
         var runtimeTasks = new List<IRuntimeTask>();
 
-        foreach (LoadStage loadStage in Enum.GetValues(typeof (LoadStage)))
+        foreach (LoadStage loadStage in Enum.GetValues(typeof(LoadStage)))
             runtimeTasks.AddRange(GetRuntimeTasksForStage(loadStage));
 
         return runtimeTasks;
     }
 
-    public CompositeDataLoadComponent CreateCompositeDataLoadComponentFor(LoadStage loadStage,string descriptionForComponent)
+    public CompositeDataLoadComponent CreateCompositeDataLoadComponentFor(LoadStage loadStage,
+        string descriptionForComponent)
     {
         var factory = new RuntimeTaskFactory(_repository);
 
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/ArchiveFiles.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/ArchiveFiles.cs
index f64b8b47d9..410231a589 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/ArchiveFiles.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/ArchiveFiles.cs
@@ -32,12 +32,12 @@ public ArchiveFiles(HICLoadConfigurationFlags loadConfigurationFlags)
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        if (Skip(job)) 
+        if (Skip(job))
             return ExitCodeType.Success;
 
         var datasetID = job.DataLoadInfo.ID;
         var destFile = Path.Combine(job.LoadDirectory.ForArchiving.FullName, $"{datasetID}.zip");
-            
+
         // If there is nothing in the forLoadingDirectory then 
         // There may be a HiddenFromArchiver directory with data that may be processed by another component, but this component should *always* archive *something* even if it is just some metadata about the load (if, for example, imaging data is being loaded which is too large to archive)
         if (!FoundFilesOrDirsToArchive(job))
@@ -77,7 +77,8 @@ private static bool FoundFilesOrDirsToArchive(IDataLoadJob job)
 
     private static void MoveDirectories(IDataLoadJob job, DirectoryInfo zipDir)
     {
-        var dirsToMove = job.LoadDirectory.ForLoading.EnumerateDirectories().Where(info => !DirsToIgnore.Contains(info.Name)).ToList();
+        var dirsToMove = job.LoadDirectory.ForLoading.EnumerateDirectories()
+            .Where(info => !DirsToIgnore.Contains(info.Name)).ToList();
         foreach (var toMove in dirsToMove)
             toMove.MoveTo(Path.Combine(zipDir.FullName, toMove.Name));
     }
@@ -89,7 +90,7 @@ private static void MoveFiles(IDataLoadJob job, DirectoryInfo zipDir)
             toMove.MoveTo(Path.Combine(zipDir.FullName, toMove.Name));
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWTableToStaging.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWTableToStaging.cs
index 9cbd53ba46..9818cf243b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWTableToStaging.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWTableToStaging.cs
@@ -35,7 +35,8 @@ public class MigrateRAWTableToStaging : DataLoadComponent
     private readonly bool _isLookupTable;
     private readonly HICDatabaseConfiguration _databaseConfiguration;
 
-    public MigrateRAWTableToStaging(ITableInfo tableInfo, bool isLookupTable, HICDatabaseConfiguration databaseConfiguration)
+    public MigrateRAWTableToStaging(ITableInfo tableInfo, bool isLookupTable,
+        HICDatabaseConfiguration databaseConfiguration)
     {
         _tableInfo = tableInfo;
         _isLookupTable = isLookupTable;
@@ -43,13 +44,15 @@ public MigrateRAWTableToStaging(ITableInfo tableInfo, bool isLookupTable, HICDat
     }
 
     private DataFlowPipelineEngine<DataTable> _pipeline;
+
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        if(_pipeline != null)
+        if (_pipeline != null)
             throw new Exception("Pipeline already executed once");
 
         var contextFactory = new DataFlowPipelineContextFactory<DataTable>();
-        var context = contextFactory.Create(PipelineUsage.LoadsSingleTableInfo | PipelineUsage.FixedDestination | PipelineUsage.LogsToTableLoadInfo);
+        var context = contextFactory.Create(PipelineUsage.LoadsSingleTableInfo | PipelineUsage.FixedDestination |
+                                            PipelineUsage.LogsToTableLoadInfo);
 
         //where we are coming from (source)
         var sourceConvention = LoadBubble.Raw;
@@ -66,24 +69,27 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
                 return ExitCodeType.Success;
             }
             else
+            {
                 job.OnNotify(this,
                     new NotifyEventArgs(ProgressEventType.Error,
                         $"Table {sourceTableName} did not exist in RAW database {sourceDatabase} when it came time to migrate RAW to STAGING (and the table is not a lookup)"));
+            }
 
 
         // where we are going to (destination)
         // ignore any columns that are marked for discard
         var destinationConvention = LoadBubble.Staging;
         var destinationDatabase = _databaseConfiguration.DeployInfo[LoadBubble.Staging];
-        var destinationTableName = _tableInfo.GetRuntimeName(destinationConvention, _databaseConfiguration.DatabaseNamer);
-        
-        DeleteFullyNullRecords(sourceTableName, sourceDatabase,job);
+        var destinationTableName =
+            _tableInfo.GetRuntimeName(destinationConvention, _databaseConfiguration.DatabaseNamer);
+
+        DeleteFullyNullRecords(sourceTableName, sourceDatabase, job);
 
         //audit
         var tableLoadInfo = job.DataLoadInfo.CreateTableLoadInfo(
             "None required, if fails then simply drop Staging database and reload dataset",
             $"STAGING:{destinationTableName}",
-            new DataSource[] { new DataSource($"RAW:{sourceTableName}", DateTime.Now) }, -1);
+            new DataSource[] { new($"RAW:{sourceTableName}", DateTime.Now) }, -1);
 
         var syntax = sourceDatabase.Server.GetQuerySyntaxHelper();
 
@@ -94,11 +100,14 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
             sourceDatabase.Server.Builder, 50000);
 
         //ignore those that are pre load discarded columns (unless they are dilution in which case they get passed through in a decrepid state instead of dumped entirely - these fields will still bein ANODump in pristene state btw)
-        var columnNamesToIgnoreForBulkInsert = _tableInfo.PreLoadDiscardedColumns.Where(c => c.Destination != DiscardedColumnDestination.Dilute).Select(column => column.RuntimeColumnName).ToList();
+        var columnNamesToIgnoreForBulkInsert = _tableInfo.PreLoadDiscardedColumns
+            .Where(c => c.Destination != DiscardedColumnDestination.Dilute).Select(column => column.RuntimeColumnName)
+            .ToList();
 
         //pass pre load discard
-        var destination = new SqlBulkInsertDestination(destinationDatabase, destinationTableName, columnNamesToIgnoreForBulkInsert);
-            
+        var destination = new SqlBulkInsertDestination(destinationDatabase, destinationTableName,
+            columnNamesToIgnoreForBulkInsert);
+
         //engine that will move data
         _pipeline = new DataFlowPipelineEngine<DataTable>(context, source, destination, job);
 
@@ -107,8 +116,8 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
 
         //add dropping of preload discard columns
         _pipeline.ComponentObjects.Add(new BasicAnonymisationEngine());
-            
-        _pipeline.Initialize(tableLoadInfo,_tableInfo);
+
+        _pipeline.Initialize(tableLoadInfo, _tableInfo);
 
         //tell it to move data
         _pipeline.ExecutePipeline(cancellationToken);
@@ -116,8 +125,8 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         return ExitCodeType.Success;
     }
 
-    
-    private void DeleteFullyNullRecords(string sourceTableName, DiscoveredDatabase dbInfo,IDataLoadJob job)
+
+    private void DeleteFullyNullRecords(string sourceTableName, DiscoveredDatabase dbInfo, IDataLoadJob job)
     {
         try
         {
@@ -127,7 +136,6 @@ private void DeleteFullyNullRecords(string sourceTableName, DiscoveredDatabase d
             {
                 con.Open();
                 using (var cmd = dbInfo.Server.GetCommand(
-
                            //Magical code that nukes blank/null rows - where all rows are blank/null
                            string.Format(@"delete from {0} WHERE {1}",
                                sourceTableName,
@@ -149,12 +157,14 @@ private void DeleteFullyNullRecords(string sourceTableName, DiscoveredDatabase d
         }
         catch (Exception e)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning, "Could not delete fully null records, this will not prevent the data load ocurring",e));
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    "Could not delete fully null records, this will not prevent the data load ocurring", e));
         }
     }
 
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
 
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWToStaging.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWToStaging.cs
index 85a86d00b3..19b185092e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWToStaging.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateRAWToStaging.cs
@@ -26,8 +26,9 @@ public class MigrateRAWToStaging : DataLoadComponent
     private readonly HICLoadConfigurationFlags _loadConfigurationFlags;
 
     private readonly Stack<IDisposeAfterDataLoad> _toDispose = new();
-                
-    public MigrateRAWToStaging(HICDatabaseConfiguration databaseConfiguration, HICLoadConfigurationFlags loadConfigurationFlags)
+
+    public MigrateRAWToStaging(HICDatabaseConfiguration databaseConfiguration,
+        HICLoadConfigurationFlags loadConfigurationFlags)
     {
         _databaseConfiguration = databaseConfiguration;
         _loadConfigurationFlags = loadConfigurationFlags;
@@ -38,20 +39,20 @@ public MigrateRAWToStaging(HICDatabaseConfiguration databaseConfiguration, HICLo
 
     public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        if (Skip(job)) 
+        if (Skip(job))
             return ExitCodeType.Error;
 
 
         // To be on the safe side, we will create/destroy the staging tables on a per-load basis
         if (_databaseConfiguration.RequiresStagingTableCreation)
             CreateStagingTables(job);
-            
+
         DoMigration(job, cancellationToken);
 
         return ExitCodeType.Success;
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
         while (_toDispose.Any())
             _toDispose.Pop().LoadCompletedSoDispose(exitCode, postLoadEventListener);
@@ -61,13 +62,14 @@ private void DoMigration(IDataLoadJob job, GracefulCancellationToken cancellatio
     {
         foreach (var regularTableInfo in job.RegularTablesToLoad)
             MigrateRAWTableToStaging(job, regularTableInfo, false, cancellationToken);
-            
+
         foreach (var lookupTableInfo in job.LookupTablesToLoad)
             MigrateRAWTableToStaging(job, lookupTableInfo, true, cancellationToken);
     }
 
 
-    private void MigrateRAWTableToStaging(IDataLoadJob job, ITableInfo tableInfo, bool isLookupTable, GracefulCancellationToken cancellationToken)
+    private void MigrateRAWTableToStaging(IDataLoadJob job, ITableInfo tableInfo, bool isLookupTable,
+        GracefulCancellationToken cancellationToken)
     {
         var component = new MigrateRAWTableToStaging(tableInfo, isLookupTable, _databaseConfiguration);
         component.Run(job, cancellationToken);
@@ -77,6 +79,5 @@ private void CreateStagingTables(IDataLoadJob job)
     {
         var cloner = new DatabaseCloner(_databaseConfiguration);
         job.CreateTablesInStage(cloner, LoadBubble.Staging);
-         
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateStagingToLive.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateStagingToLive.cs
index a23092a3fa..d53bf50821 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateStagingToLive.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/Components/Standard/MigrateStagingToLive.cs
@@ -22,12 +22,13 @@ public class MigrateStagingToLive : DataLoadComponent
 {
     private readonly HICDatabaseConfiguration _databaseConfiguration;
     private readonly HICLoadConfigurationFlags _loadConfigurationFlags;
-        
-    public MigrateStagingToLive(HICDatabaseConfiguration databaseConfiguration, HICLoadConfigurationFlags loadConfigurationFlags)
+
+    public MigrateStagingToLive(HICDatabaseConfiguration databaseConfiguration,
+        HICLoadConfigurationFlags loadConfigurationFlags)
     {
         _databaseConfiguration = databaseConfiguration;
         _loadConfigurationFlags = loadConfigurationFlags;
-            
+
         Description = "Migrate Staging to Live";
         SkipComponent = !_loadConfigurationFlags.DoMigrateFromStagingToLive;
     }
@@ -42,18 +43,19 @@ public override ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken can
         // After the user-defined load process, the framework handles the insert into staging and resolves any conflicts
         var stagingDbInfo = _databaseConfiguration.DeployInfo[LoadBubble.Staging];
         var liveDbInfo = _databaseConfiguration.DeployInfo[LoadBubble.Live];
-            
-        job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+
+        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Migrating '{stagingDbInfo}' to '{liveDbInfo}'"));
 
-        var migrationConfig = new MigrationConfiguration(stagingDbInfo, LoadBubble.Staging, LoadBubble.Live, _databaseConfiguration.DatabaseNamer);
+        var migrationConfig = new MigrationConfiguration(stagingDbInfo, LoadBubble.Staging, LoadBubble.Live,
+            _databaseConfiguration.DatabaseNamer);
         var migrationHost = new MigrationHost(stagingDbInfo, liveDbInfo, migrationConfig, _databaseConfiguration);
         migrationHost.Migrate(job, cancellationToken);
 
         return ExitCodeType.Success;
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/HICDataLoadFactory.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/HICDataLoadFactory.cs
index 64a04179d3..3dea974f5c 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/HICDataLoadFactory.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/HICDataLoadFactory.cs
@@ -33,7 +33,8 @@ public class HICDataLoadFactory
 
     public ILoadMetadata LoadMetadata { get; private set; }
 
-    public HICDataLoadFactory(ILoadMetadata loadMetadata, HICDatabaseConfiguration databaseConfiguration, HICLoadConfigurationFlags loadConfigurationFlags, ICatalogueRepository repository, ILogManager logManager)
+    public HICDataLoadFactory(ILoadMetadata loadMetadata, HICDatabaseConfiguration databaseConfiguration,
+        HICLoadConfigurationFlags loadConfigurationFlags, ICatalogueRepository repository, ILogManager logManager)
     {
         _databaseConfiguration = databaseConfiguration;
         _loadConfigurationFlags = loadConfigurationFlags;
@@ -60,7 +61,8 @@ public IDataLoadExecution Create(IDataLoadEventListener postLoadEventListener)
                 new NotifyEventArgs(ProgressEventType.Warning, $"Found disabled ProcessTask{task}"));
 
         //Get all the runtime tasks which are not disabled
-        var factory = new RuntimeTaskPackager(processTasks.Where(p => !p.IsDisabled), loadArgsDictionary.LoadArgs, _cataloguesToLoad, _repository);
+        var factory = new RuntimeTaskPackager(processTasks.Where(p => !p.IsDisabled), loadArgsDictionary.LoadArgs,
+            _cataloguesToLoad, _repository);
 
         var getFiles = new LoadFiles(factory.GetRuntimeTasksForStage(LoadStage.GetFiles));
 
@@ -72,7 +74,7 @@ public IDataLoadExecution Create(IDataLoadEventListener postLoadEventListener)
 
         var adjustStaging = factory.CreateCompositeDataLoadComponentFor(LoadStage.AdjustStaging, "Adjust Staging");
 
-        var migrateStagingToLive = new MigrateStagingToLive(_databaseConfiguration,_loadConfigurationFlags);
+        var migrateStagingToLive = new MigrateStagingToLive(_databaseConfiguration, _loadConfigurationFlags);
 
         var postLoad = factory.CreateCompositeDataLoadComponentFor(LoadStage.PostLoad, "Post Load");
 
@@ -99,8 +101,7 @@ public IDataLoadExecution Create(IDataLoadEventListener postLoadEventListener)
             adjustStagingAndMigrateToLive,
             archiveFiles
         };
-            
-        return new SingleJobExecution(components);
 
+        return new SingleJobExecution(components);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadExecution/SingleJobExecution.cs b/Rdmp.Core/DataLoad/Engine/LoadExecution/SingleJobExecution.cs
index d55610d132..4f06b5d656 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadExecution/SingleJobExecution.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadExecution/SingleJobExecution.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.DataLoad.Engine.LoadExecution;
 public class SingleJobExecution : IDataLoadExecution
 {
     public List<IDataLoadComponent> Components { get; set; }
-   
+
 
     public SingleJobExecution(List<IDataLoadComponent> components)
     {
@@ -51,7 +51,7 @@ public ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellation
 
                     //run current component
                     var exitCodeType = component.Run(job, cancellationToken);
-                        
+
                     //current component failed so jump out, either because load not nessesary or crash
                     if (exitCodeType == ExitCodeType.OperationNotRequired)
                     {
@@ -82,20 +82,19 @@ public ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellation
             TryDispose(ExitCodeType.Success, job);
 
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Completed job {job.JobID}"));
-                
-            if(job.CrashAtEndMessages.Count > 0)
+
+            if (job.CrashAtEndMessages.Count > 0)
             {
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"There were {job.CrashAtEndMessages.Count} {nameof(IDataLoadJob.CrashAtEndMessages)} registered for job {job.JobID}"));
 
                 // pop the messages into the handler
-                foreach (var m in job.CrashAtEndMessages)
-                {
-                    job.OnNotify(job, m);  // depending on the listener these may break flow of control (e.g. 
-                }
+                foreach (var m in
+                         job.CrashAtEndMessages)
+                    job.OnNotify(job, m); // depending on the listener these may break flow of control (e.g. 
 
                 // return failed (even if the messages are all warnings)
-                return ExitCodeType.Error;                    
+                return ExitCodeType.Error;
             }
 
             return ExitCodeType.Success;
@@ -111,7 +110,7 @@ public ExitCodeType Run(IDataLoadJob job, GracefulCancellationToken cancellation
         }
     }
 
-    private void TryDispose(ExitCodeType exitCode,IDataLoadJob job)
+    private void TryDispose(ExitCodeType exitCode, IDataLoadJob job)
     {
         try
         {
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs
index 4e6a1a70a1..0604b8d25b 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs
@@ -43,8 +43,10 @@ public class DataLoadProcess : IDataLoadProcess, IDataLoadOperation
     protected readonly ILogManager LogManager;
 
     private readonly ICheckable _preExecutionChecker;
-        
-    public DataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,ILoadMetadata loadMetadata, ICheckable preExecutionChecker, ILogManager logManager, IDataLoadEventListener dataLoadEventListener, IDataLoadExecution loadExecution,HICDatabaseConfiguration configuration)
+
+    public DataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ILoadMetadata loadMetadata,
+        ICheckable preExecutionChecker, ILogManager logManager, IDataLoadEventListener dataLoadEventListener,
+        IDataLoadExecution loadExecution, HICDatabaseConfiguration configuration)
     {
         _repositoryLocator = repositoryLocator;
         LoadMetadata = loadMetadata;
@@ -55,7 +57,7 @@ public DataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,I
         LogManager = logManager;
         ExitCode = ExitCodeType.Success;
 
-        JobProvider = new JobFactory(loadMetadata,logManager);
+        JobProvider = new JobFactory(loadMetadata, logManager);
     }
 
     public virtual ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
@@ -63,7 +65,7 @@ public virtual ExitCodeType Run(GracefulCancellationToken loadCancellationToken,
         PerformPreExecutionChecks();
 
         // create job
-        var job = JobProvider.Create(_repositoryLocator,DataLoadEventListener,_configuration);
+        var job = JobProvider.Create(_repositoryLocator, DataLoadEventListener, _configuration);
 
         // if job is null, there are no more jobs to submit
         if (job == null)
@@ -79,8 +81,9 @@ private void PerformPreExecutionChecks()
     {
         try
         {
-            DataLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Performing pre-execution checks"));
-            var thrower = new ThrowImmediatelyCheckNotifier {WriteToConsole = false};
+            DataLoadEventListener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, "Performing pre-execution checks"));
+            var thrower = new ThrowImmediatelyCheckNotifier { WriteToConsole = false };
             _preExecutionChecker.Check(thrower);
         }
         catch (Exception e)
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/IDataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/IDataLoadProcess.cs
index 0418106917..b8235ddcb5 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/IDataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/IDataLoadProcess.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.DataLoad.Engine.LoadProcess;
 /// <summary>
 /// See DataLoadProcess
 /// </summary>
-public interface IDataLoadProcess 
+public interface IDataLoadProcess
 {
     ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null);
     IDataLoadExecution LoadExecution { get; }
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/IterativeScheduledDataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/IterativeScheduledDataLoadProcess.cs
index ac5e3f6197..2741609db2 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/IterativeScheduledDataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/IterativeScheduledDataLoadProcess.cs
@@ -27,10 +27,15 @@ namespace Rdmp.Core.DataLoad.Engine.LoadProcess.Scheduling;
 public class IterativeScheduledDataLoadProcess : ScheduledDataLoadProcess
 {
     // todo: refactor to cut down on ctor params
-    public IterativeScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution, JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory, ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad, ILogManager logManager, IDataLoadEventListener dataLoadEventsreceiver,HICDatabaseConfiguration configuration)
-        : base(repositoryLocator,loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory, loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventsreceiver,configuration)
+    public IterativeScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution,
+        JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory,
+        ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad,
+        ILogManager logManager, IDataLoadEventListener dataLoadEventsreceiver, HICDatabaseConfiguration configuration)
+        : base(repositoryLocator, loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory,
+            loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventsreceiver,
+            configuration)
     {
-            
     }
 
     public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
@@ -41,8 +46,10 @@ public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken
             return ExitCodeType.OperationNotRequired;
 
         // create job factory
-        var progresses = loadProgresses.ToDictionary(loadProgress => loadProgress, loadProgress => JobDateGenerationStrategyFactory.Create(loadProgress, DataLoadEventListener));
-        var jobProvider = new MultipleScheduleJobFactory(progresses, OverrideNumberOfDaysToLoad, LoadMetadata, LogManager);
+        var progresses = loadProgresses.ToDictionary(loadProgress => loadProgress,
+            loadProgress => JobDateGenerationStrategyFactory.Create(loadProgress, DataLoadEventListener));
+        var jobProvider =
+            new MultipleScheduleJobFactory(progresses, OverrideNumberOfDaysToLoad, LoadMetadata, LogManager);
 
         // check if the factory will produce any jobs, if not we can stop here
         if (!jobProvider.HasJobs())
@@ -50,16 +57,17 @@ public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken
 
         // Run the data load process
         JobProvider = jobProvider;
-            
+
         //Do a data load 
         ExitCodeType result;
-        while((result = base.Run(loadCancellationToken,payload)) == ExitCodeType.Success) //stop if it said not required
+        while ((result = base.Run(loadCancellationToken, payload)) ==
+               ExitCodeType.Success) //stop if it said not required
         {
             //or if between executions the token is set
-            if(loadCancellationToken.IsAbortRequested)
+            if (loadCancellationToken.IsAbortRequested)
                 return ExitCodeType.Abort;
 
-            if(loadCancellationToken.IsCancellationRequested)
+            if (loadCancellationToken.IsCancellationRequested)
                 return ExitCodeType.Success;
         }
 
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/ScheduledDataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/ScheduledDataLoadProcess.cs
index 281d01c836..748dc17065 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/ScheduledDataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/ScheduledDataLoadProcess.cs
@@ -26,8 +26,13 @@ public abstract class ScheduledDataLoadProcess : DataLoadProcess
     protected readonly ILoadProgressSelectionStrategy LoadProgressSelectionStrategy;
     protected readonly int? OverrideNumberOfDaysToLoad;
 
-    protected ScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution, JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory, ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad, ILogManager logManager, IDataLoadEventListener dataLoadEventListener,HICDatabaseConfiguration configuration)
-        : base(repositoryLocator,loadMetadata, preExecutionChecker, logManager, dataLoadEventListener, loadExecution,configuration)
+    protected ScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution,
+        JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory,
+        ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad,
+        ILogManager logManager, IDataLoadEventListener dataLoadEventListener, HICDatabaseConfiguration configuration)
+        : base(repositoryLocator, loadMetadata, preExecutionChecker, logManager, dataLoadEventListener, loadExecution,
+            configuration)
     {
         JobDateGenerationStrategyFactory = jobDateGenerationStrategyFactory;
         LoadProgressSelectionStrategy = loadProgressSelectionStrategy;
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/SingleJobScheduledDataLoadProcess.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/SingleJobScheduledDataLoadProcess.cs
index a4ee321530..64bb8a4d7e 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/SingleJobScheduledDataLoadProcess.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/SingleJobScheduledDataLoadProcess.cs
@@ -29,8 +29,13 @@ public class SingleJobScheduledDataLoadProcess : ScheduledDataLoadProcess
     private SingleScheduledJobFactory _scheduledJobFactory;
 
     // todo: refactor to cut down on ctor params
-    public SingleJobScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution, JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory, ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad, ILogManager logManager, IDataLoadEventListener dataLoadEventListener,HICDatabaseConfiguration configuration) :
-        base(repositoryLocator,loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory, loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventListener,configuration)
+    public SingleJobScheduledDataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ILoadMetadata loadMetadata, ICheckable preExecutionChecker, IDataLoadExecution loadExecution,
+        JobDateGenerationStrategyFactory jobDateGenerationStrategyFactory,
+        ILoadProgressSelectionStrategy loadProgressSelectionStrategy, int? overrideNumberOfDaysToLoad,
+        ILogManager logManager, IDataLoadEventListener dataLoadEventListener, HICDatabaseConfiguration configuration) :
+        base(repositoryLocator, loadMetadata, preExecutionChecker, loadExecution, jobDateGenerationStrategyFactory,
+            loadProgressSelectionStrategy, overrideNumberOfDaysToLoad, logManager, dataLoadEventListener, configuration)
     {
     }
 
@@ -50,8 +55,10 @@ public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken
         if (_scheduledJobFactory != null)
             throw new Exception("Job factory should only be created once");
 
-        _scheduledJobFactory = new SingleScheduledJobFactory(loadProgress, JobDateGenerationStrategyFactory.Create(loadProgress,DataLoadEventListener), OverrideNumberOfDaysToLoad??loadProgress.DefaultNumberOfDaysToLoadEachTime, LoadMetadata, LogManager);
-            
+        _scheduledJobFactory = new SingleScheduledJobFactory(loadProgress,
+            JobDateGenerationStrategyFactory.Create(loadProgress, DataLoadEventListener),
+            OverrideNumberOfDaysToLoad ?? loadProgress.DefaultNumberOfDaysToLoadEachTime, LoadMetadata, LogManager);
+
         // If the job factory won't produce any jobs we can bail out here
         if (!_scheduledJobFactory.HasJobs())
             return ExitCodeType.OperationNotRequired;
@@ -59,6 +66,6 @@ public override ExitCodeType Run(GracefulCancellationToken loadCancellationToken
         // Run the data load
         JobProvider = _scheduledJobFactory;
 
-        return base.Run(loadCancellationToken,payload);
+        return base.Run(loadCancellationToken, payload);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/AnyAvailableLoadProgressSelectionStrategy.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/AnyAvailableLoadProgressSelectionStrategy.cs
index 2ab75f37b5..fb2b3e4f70 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/AnyAvailableLoadProgressSelectionStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/AnyAvailableLoadProgressSelectionStrategy.cs
@@ -23,8 +23,5 @@ public AnyAvailableLoadProgressSelectionStrategy(ILoadMetadata loadMetadata)
         _loadMetadata = loadMetadata;
     }
 
-    public List<ILoadProgress> GetAllLoadProgresses()
-    {
-        return _loadMetadata.LoadProgresses.ToList();
-    }
+    public List<ILoadProgress> GetAllLoadProgresses() => _loadMetadata.LoadProgresses.ToList();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/SingleLoadProgressSelectionStrategy.cs b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/SingleLoadProgressSelectionStrategy.cs
index a081649b2c..3633fe26b2 100644
--- a/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/SingleLoadProgressSelectionStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/LoadProcess/Scheduling/Strategy/SingleLoadProgressSelectionStrategy.cs
@@ -18,13 +18,10 @@ public class SingleLoadProgressSelectionStrategy : ILoadProgressSelectionStrateg
 
     public SingleLoadProgressSelectionStrategy(ILoadProgress loadProgress)
     {
-            
         _loadProgress = loadProgress;
     }
 
-    public List<ILoadProgress> GetAllLoadProgresses()
-    {
+    public List<ILoadProgress> GetAllLoadProgresses() =>
         //here are the load progresses that exist
-        return new List<ILoadProgress> { _loadProgress };
-    }
+        new() { _loadProgress };
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/BackfillMigrationFieldProcessor.cs b/Rdmp.Core/DataLoad/Engine/Migration/BackfillMigrationFieldProcessor.cs
index d23a3df520..0582dccb1d 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/BackfillMigrationFieldProcessor.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/BackfillMigrationFieldProcessor.cs
@@ -17,31 +17,36 @@ namespace Rdmp.Core.DataLoad.Engine.Migration;
 /// </summary>
 public class BackfillMigrationFieldProcessor : IMigrationFieldProcessor
 {
-    public bool NoBackupTrigger 
-    { 
+    public bool NoBackupTrigger
+    {
         get => false;
-        set 
+        set
         {
-            if(!value)
+            if (!value)
                 throw new NotSupportedException("NoBackupTrigger must be false to perform this migration");
         }
     }
 
     public void ValidateFields(DiscoveredColumn[] sourceFields, DiscoveredColumn[] destinationFields)
     {
-        if (!sourceFields.Any(c=>c.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID,StringComparison.CurrentCultureIgnoreCase)))
+        if (!sourceFields.Any(c =>
+                c.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID, StringComparison.CurrentCultureIgnoreCase)))
             throw new MissingFieldException(SpecialFieldNames.DataLoadRunID);
 
 
-        if (!sourceFields.Any(c => c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase)))
+        if (!sourceFields.Any(c =>
+                c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase)))
             throw new MissingFieldException(SpecialFieldNames.ValidFrom);
     }
 
-    public void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff, List<DiscoveredColumn> fieldsToUpdate)
+    public void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff,
+        List<DiscoveredColumn> fieldsToUpdate)
     {
         //it is a hic internal field but not one of the overwritten, standard ones
         if (SpecialFieldNames.IsHicPrefixed(field))
+        {
             fieldsToUpdate.Add(field);
+        }
         else
         {
             //it is not a hic internal field
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/DatabaseMigrationStrategy.cs b/Rdmp.Core/DataLoad/Engine/Migration/DatabaseMigrationStrategy.cs
index 65c0f62224..a053f2b334 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/DatabaseMigrationStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/DatabaseMigrationStrategy.cs
@@ -24,27 +24,32 @@ public abstract class DatabaseMigrationStrategy
     protected IManagedConnection _managedConnection;
     protected const int Timeout = 60000;
 
-    public abstract void MigrateTable(IDataLoadJob toMigrate, MigrationColumnSet columnsToMigrate, int dataLoadInfoID, GracefulCancellationToken cancellationToken, ref int inserts, ref int updates);
+    public abstract void MigrateTable(IDataLoadJob toMigrate, MigrationColumnSet columnsToMigrate, int dataLoadInfoID,
+        GracefulCancellationToken cancellationToken, ref int inserts, ref int updates);
 
     protected DatabaseMigrationStrategy(IManagedConnection connection)
     {
         _managedConnection = connection;
     }
 
-    public void Execute(IDataLoadJob job, IEnumerable<MigrationColumnSet> toMigrate, IDataLoadInfo dataLoadInfo, GracefulCancellationToken cancellationToken)
+    public void Execute(IDataLoadJob job, IEnumerable<MigrationColumnSet> toMigrate, IDataLoadInfo dataLoadInfo,
+        GracefulCancellationToken cancellationToken)
     {
         _dataLoadInfo = dataLoadInfo;
-            
+
         // Column set for each table we are migrating
         foreach (var columnsToMigrate in toMigrate)
         {
             var inserts = 0;
             var updates = 0;
-            var tableLoadInfo = dataLoadInfo.CreateTableLoadInfo("", columnsToMigrate.DestinationTable.GetFullyQualifiedName(), new[] { new DataSource(columnsToMigrate.SourceTable.GetFullyQualifiedName(), DateTime.Now) }, 0);
+            var tableLoadInfo = dataLoadInfo.CreateTableLoadInfo("",
+                columnsToMigrate.DestinationTable.GetFullyQualifiedName(),
+                new[] { new DataSource(columnsToMigrate.SourceTable.GetFullyQualifiedName(), DateTime.Now) }, 0);
             try
             {
-                MigrateTable(job,columnsToMigrate, dataLoadInfo.ID, cancellationToken, ref inserts, ref updates);
-                OnTableMigrationCompleteHandler(columnsToMigrate.DestinationTable.GetFullyQualifiedName(), inserts, updates);
+                MigrateTable(job, columnsToMigrate, dataLoadInfo.ID, cancellationToken, ref inserts, ref updates);
+                OnTableMigrationCompleteHandler(columnsToMigrate.DestinationTable.GetFullyQualifiedName(), inserts,
+                    updates);
                 tableLoadInfo.Inserts = inserts;
                 tableLoadInfo.Updates = updates;
                 tableLoadInfo.Notes = "Part of Transaction";
@@ -57,7 +62,7 @@ public void Execute(IDataLoadJob job, IEnumerable<MigrationColumnSet> toMigrate,
             cancellationToken.ThrowIfCancellationRequested();
         }
     }
-        
+
     public event TableMigrationComplete TableMigrationCompleteHandler;
 
     protected virtual void OnTableMigrationCompleteHandler(string tableName, int numInserts, int numUpdates)
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/IMigrationFieldProcessor.cs b/Rdmp.Core/DataLoad/Engine/Migration/IMigrationFieldProcessor.cs
index 5c9e7e36f0..3166317e24 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/IMigrationFieldProcessor.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/IMigrationFieldProcessor.cs
@@ -20,7 +20,7 @@ public interface IMigrationFieldProcessor
     /// <summary>
     /// True if there is not expected to be any backup trigger on the table i.e. <see cref="SpecialFieldNames"/> are not going to be there
     /// </summary>
-    bool NoBackupTrigger {get;set;}
+    bool NoBackupTrigger { get; set; }
 
     void ValidateFields(DiscoveredColumn[] fromColumns, DiscoveredColumn[] toColumns);
 
@@ -32,5 +32,6 @@ public interface IMigrationFieldProcessor
     /// (some fields might not matter if they are different e.g. dataLoadRunID)</param>
     /// <param name="fieldsToUpdate">Fields that will have their values copied across to the new table (this is usually a superset of fields to diff, and also
     /// includes all primary keys).</param>
-    void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff, List<DiscoveredColumn> fieldsToUpdate);
+    void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff,
+        List<DiscoveredColumn> fieldsToUpdate);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/MigrationColumnSet.cs b/Rdmp.Core/DataLoad/Engine/Migration/MigrationColumnSet.cs
index 4e3087b918..ad48dae288 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/MigrationColumnSet.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/MigrationColumnSet.cs
@@ -26,10 +26,8 @@ public class MigrationColumnSet
 
     public DiscoveredColumn[] PrimaryKeys { get; private set; }
 
-    public static List<string> GetStandardColumnNames()
-    {
-        return new List<string> { SpecialFieldNames.DataLoadRunID, SpecialFieldNames.ValidFrom};
-    }
+    public static List<string> GetStandardColumnNames() =>
+        new() { SpecialFieldNames.DataLoadRunID, SpecialFieldNames.ValidFrom };
 
     /// <summary>
     /// Fields that will have their values compared for change, to decide whether to overwrite destination data with source data. (some fields might not matter
@@ -43,7 +41,8 @@ public static List<string> GetStandardColumnNames()
     /// </summary>
     public List<DiscoveredColumn> FieldsToUpdate { get; set; }
 
-    public MigrationColumnSet(DiscoveredTable from, DiscoveredTable to, IMigrationFieldProcessor migrationFieldProcessor)
+    public MigrationColumnSet(DiscoveredTable from, DiscoveredTable to,
+        IMigrationFieldProcessor migrationFieldProcessor)
     {
         var fromCols = from.DiscoverColumns();
         var toCols = to.DiscoverColumns();
@@ -53,26 +52,29 @@ public MigrationColumnSet(DiscoveredTable from, DiscoveredTable to, IMigrationFi
         SourceTable = from;
         DestinationTable = to;
 
-        PrimaryKeys = fromCols.Where(c=>c.IsPrimaryKey).ToArray();
+        PrimaryKeys = fromCols.Where(c => c.IsPrimaryKey).ToArray();
         FieldsToDiff = new List<DiscoveredColumn>();
         FieldsToUpdate = new List<DiscoveredColumn>();
 
         foreach (var pk in PrimaryKeys)
-            if(!toCols.Any(f=>f.GetRuntimeName().Equals(pk.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase)))
+            if (!toCols.Any(f =>
+                    f.GetRuntimeName().Equals(pk.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)))
                 throw new MissingFieldException($"Column {pk} is missing from either the destination table");
 
-        if(!PrimaryKeys.Any())
+        if (!PrimaryKeys.Any())
             throw new Exception($"There are no primary keys declared in table {from}");
-            
+
         //figure out things to migrate and whether they matter to diffing
         foreach (var field in fromCols)
         {
             if (
-                field.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID,StringComparison.CurrentCultureIgnoreCase) ||
-                field.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom,StringComparison.CurrentCultureIgnoreCase))
+                field.GetRuntimeName()
+                    .Equals(SpecialFieldNames.DataLoadRunID, StringComparison.CurrentCultureIgnoreCase) ||
+                field.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase))
                 continue;
 
-            if (!toCols.Any(c=>c.GetRuntimeName().Equals(field.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase)))
+            if (!toCols.Any(c =>
+                    c.GetRuntimeName().Equals(field.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)))
                 throw new MissingFieldException($"Field {field} is missing from destination table");
 
             migrationFieldProcessor.AssignFieldsForProcessing(field, FieldsToDiff, FieldsToUpdate);
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/MigrationConfiguration.cs b/Rdmp.Core/DataLoad/Engine/Migration/MigrationConfiguration.cs
index 4aaeeae058..a0aa956ee4 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/MigrationConfiguration.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/MigrationConfiguration.cs
@@ -26,7 +26,8 @@ public class MigrationConfiguration
     private readonly LoadBubble _toBubble;
     private readonly INameDatabasesAndTablesDuringLoads _namer;
 
-    public MigrationConfiguration(DiscoveredDatabase fromDatabaseInfo, LoadBubble fromBubble, LoadBubble toBubble, INameDatabasesAndTablesDuringLoads namer)
+    public MigrationConfiguration(DiscoveredDatabase fromDatabaseInfo, LoadBubble fromBubble, LoadBubble toBubble,
+        INameDatabasesAndTablesDuringLoads namer)
     {
         _fromDatabaseInfo = fromDatabaseInfo;
         _fromBubble = fromBubble;
@@ -34,7 +35,8 @@ public MigrationConfiguration(DiscoveredDatabase fromDatabaseInfo, LoadBubble fr
         _namer = namer;
     }
 
-    public IList<MigrationColumnSet> CreateMigrationColumnSetFromTableInfos(List<ITableInfo> tableInfos, List<ITableInfo> lookupTableInfos, IMigrationFieldProcessor migrationFieldProcessor)
+    public IList<MigrationColumnSet> CreateMigrationColumnSetFromTableInfos(List<ITableInfo> tableInfos,
+        List<ITableInfo> lookupTableInfos, IMigrationFieldProcessor migrationFieldProcessor)
     {
         //treat null values as empty
         tableInfos ??= new List<ITableInfo>();
@@ -47,24 +49,29 @@ public IList<MigrationColumnSet> CreateMigrationColumnSetFromTableInfos(List<ITa
             var fromTableName = tableInfo.GetRuntimeName(_fromBubble, _namer);
             var toTableName = tableInfo.GetRuntimeName(_toBubble, _namer);
 
-            var fromTable = _fromDatabaseInfo.ExpectTable(fromTableName); //Staging doesn't have schema e.g. even if live schema is not dbo STAGING will be
+            var fromTable =
+                _fromDatabaseInfo
+                    .ExpectTable(
+                        fromTableName); //Staging doesn't have schema e.g. even if live schema is not dbo STAGING will be
 
             var toTable = DataAccessPortal
                 .ExpectDatabase(tableInfo, DataAccessContext.DataLoad)
-                .ExpectTable(toTableName,tableInfo.Schema);
+                .ExpectTable(toTableName, tableInfo.Schema);
 
-            if(!fromTable.Exists())
-                if(lookupTableInfos.Contains(tableInfo))//its a lookup table which doesn't exist in from (Staging) - nevermind
+            if (!fromTable.Exists())
+                if (lookupTableInfos
+                    .Contains(tableInfo)) //its a lookup table which doesn't exist in from (Staging) - nevermind
                     continue;
                 else
                     throw new Exception(
                         $"Table {fromTableName} was not found on on server {_fromDatabaseInfo.Server} (Database {_fromDatabaseInfo})"); //its not a lookup table if it isn't in STAGING thats a problem!
 
-            columnSet.Add(new MigrationColumnSet(fromTable,toTable, migrationFieldProcessor));
+            columnSet.Add(new MigrationColumnSet(fromTable, toTable, migrationFieldProcessor));
         }
 
         var sorter = new RelationshipTopologicalSort(columnSet.Select(c => c.DestinationTable));
-        columnSet = columnSet.OrderBy(s => ((ReadOnlyCollection<DiscoveredTable>)sorter.Order).IndexOf(s.DestinationTable)).ToList();
+        columnSet = columnSet
+            .OrderBy(s => ((ReadOnlyCollection<DiscoveredTable>)sorter.Order).IndexOf(s.DestinationTable)).ToList();
 
         return columnSet;
     }
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/MigrationHost.cs b/Rdmp.Core/DataLoad/Engine/Migration/MigrationHost.cs
index 775c0d7beb..e163138c83 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/MigrationHost.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/MigrationHost.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.DataLoad.Engine.Migration;
 /// Migrates records from STAGING database tables to LIVE database tables by applying the OverwriteMigrationStrategy (MERGE statement - colloquially known
 /// as UPSERT) using a shared database transaction for all tables (if one fails they will all rollback).
 /// </summary>
-public class MigrationHost 
+public class MigrationHost
 {
     private readonly DiscoveredDatabase _sourceDbInfo;
     private readonly DiscoveredDatabase _destinationDbInfo;
@@ -27,7 +27,8 @@ public class MigrationHost
     private readonly HICDatabaseConfiguration _databaseConfiguration;
     private OverwriteMigrationStrategy _migrationStrategy;
 
-    public MigrationHost(DiscoveredDatabase sourceDbInfo, DiscoveredDatabase destinationDbInfo, MigrationConfiguration migrationConfig, HICDatabaseConfiguration databaseConfiguration)
+    public MigrationHost(DiscoveredDatabase sourceDbInfo, DiscoveredDatabase destinationDbInfo,
+        MigrationConfiguration migrationConfig, HICDatabaseConfiguration databaseConfiguration)
     {
         _sourceDbInfo = sourceDbInfo;
         _destinationDbInfo = destinationDbInfo;
@@ -37,7 +38,7 @@ public MigrationHost(DiscoveredDatabase sourceDbInfo, DiscoveredDatabase destina
 
     public void Migrate(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        if (_sourceDbInfo.DiscoverTables(false).All(t=>t.IsEmpty()))
+        if (_sourceDbInfo.DiscoverTables(false).All(t => t.IsEmpty()))
             throw new Exception(
                 $"The source database '{_sourceDbInfo.GetRuntimeName()}' on {_sourceDbInfo.Server.Name} is empty. There is nothing to migrate.");
 
@@ -52,17 +53,18 @@ public void Migrate(IDataLoadJob job, GracefulCancellationToken cancellationToke
                         $"Migrate table {name} from STAGING to {_destinationDbInfo.GetRuntimeName()}: {inserts} inserts, {updates} updates"));
 
                 //migrate all tables (both lookups and live tables in the same way)
-                var dataColsToMigrate = _migrationConfig.CreateMigrationColumnSetFromTableInfos(job.RegularTablesToLoad, job.LookupTablesToLoad,
+                var dataColsToMigrate = _migrationConfig.CreateMigrationColumnSetFromTableInfos(job.RegularTablesToLoad,
+                    job.LookupTablesToLoad,
                     new StagingToLiveMigrationFieldProcessor(
                         _databaseConfiguration.UpdateButDoNotDiff,
                         _databaseConfiguration.IgnoreColumns,
-                        job.GetAllColumns().Where(c=>c.IgnoreInLoads).ToArray())
+                        job.GetAllColumns().Where(c => c.IgnoreInLoads).ToArray())
                     {
                         NoBackupTrigger = job.LoadMetadata.IgnoreTrigger
                     });
 
                 // Migrate the data columns
-                _migrationStrategy.Execute(job,dataColsToMigrate, job.DataLoadInfo, cancellationToken);
+                _migrationStrategy.Execute(job, dataColsToMigrate, job.DataLoadInfo, cancellationToken);
 
                 managedConnectionToDestination.ManagedTransaction.CommitAndCloseConnection();
                 job.DataLoadInfo.CloseAndMarkComplete();
@@ -79,8 +81,10 @@ public void Migrate(IDataLoadJob job, GracefulCancellationToken cancellationToke
                 }
                 catch (Exception)
                 {
-                    throw new Exception("Failed to rollback after exception, see inner exception for details of original problem",ex);
+                    throw new Exception(
+                        "Failed to rollback after exception, see inner exception for details of original problem", ex);
                 }
+
                 throw;
             }
         }
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/LiveMigrationQueryHelper.cs b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/LiveMigrationQueryHelper.cs
index 1f695751a6..1cca098cd2 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/LiveMigrationQueryHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/LiveMigrationQueryHelper.cs
@@ -18,14 +18,15 @@ public class LiveMigrationQueryHelper : MigrationQueryHelper
 {
     private readonly int _dataLoadRunID;
 
-    public LiveMigrationQueryHelper(MigrationColumnSet columnsToMigrate, int dataLoadRunID) : base (columnsToMigrate)
+    public LiveMigrationQueryHelper(MigrationColumnSet columnsToMigrate, int dataLoadRunID) : base(columnsToMigrate)
     {
         _dataLoadRunID = dataLoadRunID;
     }
 
     public override string BuildUpdateClauseForRow(string sourceAlias, string destAlias)
     {
-        var parts = ColumnsToMigrate.FieldsToUpdate.Select(name => $"{destAlias}.[{name}] = {sourceAlias}.[{name}]").ToList();
+        var parts = ColumnsToMigrate.FieldsToUpdate.Select(name => $"{destAlias}.[{name}] = {sourceAlias}.[{name}]")
+            .ToList();
         parts.Add($"{destAlias}.{SpecialFieldNames.DataLoadRunID} = {_dataLoadRunID}");
 
         return string.Join(", ", parts);
@@ -37,7 +38,8 @@ public override string BuildInsertClause()
         throw new NotImplementedException();
     }
 
-    public static List<KeyValuePair<string, string>> GetListOfInsertColumnFields(MigrationColumnSet columnsToMigrate, int dataLoadRunID)
+    public static List<KeyValuePair<string, string>> GetListOfInsertColumnFields(MigrationColumnSet columnsToMigrate,
+        int dataLoadRunID)
     {
         var inserts = new List<KeyValuePair<string, string>>();
 
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationColumnSetQueryHelper.cs b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationColumnSetQueryHelper.cs
index 2896580a59..eed6221ea5 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationColumnSetQueryHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationColumnSetQueryHelper.cs
@@ -31,7 +31,7 @@ public string BuildSelectListForAllColumnsExceptStandard(string tableAlias = "")
         foreach (var col in _migrationColumnSet.FieldsToDiff)
         {
             //if it is hic_ or identity specification
-            if(SpecialFieldNames.IsHicPrefixed(col) || col.IsAutoIncrement)
+            if (SpecialFieldNames.IsHicPrefixed(col) || col.IsAutoIncrement)
                 continue;
 
             sql += $"{tableAlias}[{col.GetRuntimeName()}],";
@@ -40,17 +40,11 @@ public string BuildSelectListForAllColumnsExceptStandard(string tableAlias = "")
         return sql.TrimEnd(',');
     }
 
-    public string BuildPrimaryKeyNotNullTest(string columnPrefix)
-    {
-        return BuildPrimaryKeyCondition(columnPrefix, "NOT NULL");
-    }
+    public string BuildPrimaryKeyNotNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NOT NULL");
 
-    public string BuildPrimaryKeyNullTest(string columnPrefix)
-    {
-        return BuildPrimaryKeyCondition(columnPrefix, "NULL");
-    }
+    public string BuildPrimaryKeyNullTest(string columnPrefix) => BuildPrimaryKeyCondition(columnPrefix, "NULL");
 
-    private string BuildPrimaryKeyCondition(string columnPrefix,string condition)
+    private string BuildPrimaryKeyCondition(string columnPrefix, string condition)
     {
         // Allow either 'prefix' or 'prefix.' to be passed through
         if (!columnPrefix.EndsWith("."))
@@ -63,7 +57,8 @@ private string BuildPrimaryKeyCondition(string columnPrefix,string condition)
     public string BuildJoinClause(string sourceAlias = "source", string destAlias = "dest")
     {
         if (!_migrationColumnSet.PrimaryKeys.Any())
-            throw new InvalidOperationException("None of the columns to be migrated are configured as a Primary Key, the JOIN clause for migration cannot be created. Please ensure that at least one of the columns in the MigrationColumnSet is configured as a Primary Key.");
+            throw new InvalidOperationException(
+                "None of the columns to be migrated are configured as a Primary Key, the JOIN clause for migration cannot be created. Please ensure that at least one of the columns in the MigrationColumnSet is configured as a Primary Key.");
 
         return
             $"ON ({string.Join(" AND ", _migrationColumnSet.PrimaryKeys.Select(pk => string.Format(sourceAlias + ".[{0}] = " + destAlias + ".[{0}]", pk.GetRuntimeName())))})";
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationQueryHelper.cs b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationQueryHelper.cs
index 9f451e2ebb..31f9455aaf 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationQueryHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/MigrationQueryHelper.cs
@@ -50,7 +50,7 @@ public string CreateUpdateClause()
             McsQueryHelper.BuildJoinClause(joinTableName, "prod"));
     }
 
-        
+
     public abstract string BuildUpdateClauseForRow(string sourceAlias, string destAlias);
     public abstract string BuildInsertClause();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/OverwriteMigrationStrategy.cs b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/OverwriteMigrationStrategy.cs
index ded8675af1..c404034ef4 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/OverwriteMigrationStrategy.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/OverwriteMigrationStrategy.cs
@@ -31,7 +31,8 @@ public OverwriteMigrationStrategy(IManagedConnection managedConnection)
     {
     }
 
-    public override void MigrateTable(IDataLoadJob job, MigrationColumnSet columnsToMigrate, int dataLoadInfoID, GracefulCancellationToken cancellationToken, ref int inserts, ref int updates)
+    public override void MigrateTable(IDataLoadJob job, MigrationColumnSet columnsToMigrate, int dataLoadInfoID,
+        GracefulCancellationToken cancellationToken, ref int inserts, ref int updates)
     {
         var server = columnsToMigrate.DestinationTable.Database.Server;
 
@@ -39,35 +40,35 @@ public override void MigrateTable(IDataLoadJob job, MigrationColumnSet columnsTo
 
         /*          ------------MIGRATE NEW RECORDS (novel by primary key)--------
          *
-        
-INSERT INTO CrossDatabaseMergeCommandTo..ToTable (Name,Age,Postcode,hic_dataLoadRunID)  
-SELECT 
+
+INSERT INTO CrossDatabaseMergeCommandTo..ToTable (Name,Age,Postcode,hic_dataLoadRunID)
+SELECT
 [CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Name,
 [CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Age,
 [CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Postcode,
-1 
-FROM 
-[CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING 
+1
+FROM
+[CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING
 left join
 CrossDatabaseMergeCommandTo..ToTable
 on
-[CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Age = CrossDatabaseMergeCommandTo..ToTable.Age 
+[CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Age = CrossDatabaseMergeCommandTo..ToTable.Age
 AND
 [CrossDatabaseMergeCommandFrom]..CrossDatabaseMergeCommandTo_ToTable_STAGING.Name = CrossDatabaseMergeCommandTo..ToTable.Name
-WHERE 
+WHERE
 CrossDatabaseMergeCommandTo..ToTable.Age is null
 */
 
         var sbInsert = new StringBuilder();
         var syntax = server.GetQuerySyntaxHelper();
-            
+
 
         sbInsert.AppendLine(string.Format("INSERT INTO {0} ({1}",
             columnsToMigrate.DestinationTable.GetFullyQualifiedName(),
             string.Join(",", columnsToMigrate.FieldsToUpdate.Select(c => syntax.EnsureWrapped(c.GetRuntimeName())))));
 
         //if we are not ignoring the trigger then we should record the data load run ID
-        if(!job.LoadMetadata.IgnoreTrigger)
+        if (!job.LoadMetadata.IgnoreTrigger)
             sbInsert.AppendLine($",{syntax.EnsureWrapped(SpecialFieldNames.DataLoadRunID)}");
 
         sbInsert.AppendLine(")");
@@ -75,10 +76,11 @@ CrossDatabaseMergeCommandTo..ToTable.Age is null
         sbInsert.AppendLine("SELECT");
 
         // Add the columns we are migrating
-        sbInsert.AppendLine(string.Join($",{Environment.NewLine}",columnsToMigrate.FieldsToUpdate.Select(c=>c.GetFullyQualifiedName())));
-            
+        sbInsert.AppendLine(string.Join($",{Environment.NewLine}",
+            columnsToMigrate.FieldsToUpdate.Select(c => c.GetFullyQualifiedName())));
+
         // If we are using trigger also add the run ID e.g. ",50"
-        if(!job.LoadMetadata.IgnoreTrigger)
+        if (!job.LoadMetadata.IgnoreTrigger)
             sbInsert.AppendLine($",{dataLoadInfoID}");
 
         sbInsert.AppendLine("FROM");
@@ -86,19 +88,20 @@ CrossDatabaseMergeCommandTo..ToTable.Age is null
         sbInsert.AppendLine("LEFT JOIN");
         sbInsert.AppendLine(columnsToMigrate.DestinationTable.GetFullyQualifiedName());
         sbInsert.AppendLine("ON");
-            
+
         sbInsert.AppendLine(
             string.Join($" AND {Environment.NewLine}",
                 columnsToMigrate.PrimaryKeys.Select(
                     pk =>
                         string.Format("{0}.{1}={2}.{1}", columnsToMigrate.SourceTable.GetFullyQualifiedName(),
-                            syntax.EnsureWrapped(pk.GetRuntimeName()), columnsToMigrate.DestinationTable.GetFullyQualifiedName()))));
+                            syntax.EnsureWrapped(pk.GetRuntimeName()),
+                            columnsToMigrate.DestinationTable.GetFullyQualifiedName()))));
 
         sbInsert.AppendLine("WHERE");
         sbInsert.AppendLine(string.Format("{0}.{1} IS NULL",
             columnsToMigrate.DestinationTable.GetFullyQualifiedName(),
             syntax.EnsureWrapped(columnsToMigrate.PrimaryKeys.First().GetRuntimeName())));
-            
+
         //right at the end of the SELECT
         if (columnsToMigrate.DestinationTable.Database.Server.DatabaseType == DatabaseType.MySql)
             sbInsert.Append(" FOR UPDATE");
@@ -120,11 +123,12 @@ CrossDatabaseMergeCommandTo..ToTable.Age is null
 
             var sqlLines = new List<CustomLine>();
 
-            var toSet = columnsToMigrate.FieldsToUpdate.Where(c => !c.IsPrimaryKey).Select(c => string.Format("t1.{0} = t2.{0}", syntax.EnsureWrapped(c.GetRuntimeName()))).ToArray();
+            var toSet = columnsToMigrate.FieldsToUpdate.Where(c => !c.IsPrimaryKey).Select(c =>
+                string.Format("t1.{0} = t2.{0}", syntax.EnsureWrapped(c.GetRuntimeName()))).ToArray();
 
-            if(!toSet.Any())
+            if (!toSet.Any())
             {
-                job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"Table {columnsToMigrate.DestinationTable} is entirely composed of PrimaryKey columns or hic_ columns so UPDATE will NOT take place"));
                 return;
             }
@@ -139,19 +143,22 @@ CrossDatabaseMergeCommandTo..ToTable.Age is null
             }
 
             //t1.Name = t2.Name, t1.Age=T2.Age etc
-            sqlLines.Add(new CustomLine(string.Join(",",toSet), QueryComponent.SET));
-                
+            sqlLines.Add(new CustomLine(string.Join(",", toSet), QueryComponent.SET));
+
             //also update the hic_dataLoadRunID field                
-            if(!job.LoadMetadata.IgnoreTrigger)
-                sqlLines.Add(new CustomLine(string.Format("t1.{0}={1}", 
+            if (!job.LoadMetadata.IgnoreTrigger)
+                sqlLines.Add(new CustomLine(string.Format("t1.{0}={1}",
                     syntax.EnsureWrapped(SpecialFieldNames.DataLoadRunID)
-                    ,dataLoadInfoID),QueryComponent.SET));
+                    , dataLoadInfoID), QueryComponent.SET));
 
             //t1.Name <> t2.Name AND t1.Age <> t2.Age etc
-            sqlLines.Add(new CustomLine(string.Join(" OR ", toDiff.Select(c=> GetORLine(c,syntax))), QueryComponent.WHERE));
-                
+            sqlLines.Add(new CustomLine(string.Join(" OR ", toDiff.Select(c => GetORLine(c, syntax))),
+                QueryComponent.WHERE));
+
             //the join
-            sqlLines.AddRange(columnsToMigrate.PrimaryKeys.Select(p => new CustomLine(string.Format("t1.{0} = t2.{0}", syntax.EnsureWrapped(p.GetRuntimeName())), QueryComponent.JoinInfoJoin)));
+            sqlLines.AddRange(columnsToMigrate.PrimaryKeys.Select(p =>
+                new CustomLine(string.Format("t1.{0} = t2.{0}", syntax.EnsureWrapped(p.GetRuntimeName())),
+                    QueryComponent.JoinInfoJoin)));
 
             var updateHelper = columnsToMigrate.DestinationTable.Database.Server.GetQuerySyntaxHelper().UpdateHelper;
 
@@ -191,8 +198,7 @@ CrossDatabaseMergeCommandTo..ToTable.Age is null
         }
     }
 
-    private static string GetORLine(DiscoveredColumn c, IQuerySyntaxHelper syntax)
-    {
-        return string.Format("(t1.{0} <> t2.{0} OR (t1.{0} is null AND t2.{0} is not null) OR (t2.{0} is null AND t1.{0} is not null))", syntax.EnsureWrapped(c.GetRuntimeName()));
-    }
+    private static string GetORLine(DiscoveredColumn c, IQuerySyntaxHelper syntax) => string.Format(
+        "(t1.{0} <> t2.{0} OR (t1.{0} is null AND t2.{0} is not null) OR (t2.{0} is null AND t1.{0} is not null))",
+        syntax.EnsureWrapped(c.GetRuntimeName()));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/ReverseMigrationQueryHelper.cs b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/ReverseMigrationQueryHelper.cs
index 336933e028..69b7c13afc 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/ReverseMigrationQueryHelper.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/QueryBuilding/ReverseMigrationQueryHelper.cs
@@ -21,12 +21,10 @@ public ReverseMigrationQueryHelper(MigrationColumnSet columnsToMigrate) : base(c
 
     public override string BuildUpdateClauseForRow(string sourceAlias, string destAlias)
     {
-        return string.Join(", ", ColumnsToMigrate.FieldsToUpdate.Select(col => 
-            string.Format(destAlias + ".[" + col + "] = " + sourceAlias + ".[" + col + "]",col.GetRuntimeName())));
-    }
-        
-    public override string BuildInsertClause()
-    {
-        throw new NotImplementedException("Do not attempt to insert data into staging from live, this query helper is purely for updating the destination.");
+        return string.Join(", ", ColumnsToMigrate.FieldsToUpdate.Select(col =>
+            string.Format(destAlias + ".[" + col + "] = " + sourceAlias + ".[" + col + "]", col.GetRuntimeName())));
     }
+
+    public override string BuildInsertClause() => throw new NotImplementedException(
+        "Do not attempt to insert data into staging from live, this query helper is purely for updating the destination.");
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Migration/StagingToLiveMigrationFieldProcessor.cs b/Rdmp.Core/DataLoad/Engine/Migration/StagingToLiveMigrationFieldProcessor.cs
index a8556ff712..57f7d2acec 100644
--- a/Rdmp.Core/DataLoad/Engine/Migration/StagingToLiveMigrationFieldProcessor.cs
+++ b/Rdmp.Core/DataLoad/Engine/Migration/StagingToLiveMigrationFieldProcessor.cs
@@ -27,9 +27,10 @@ public class StagingToLiveMigrationFieldProcessor : IMigrationFieldProcessor
     private readonly ColumnInfo[] _alsoIgnore;
 
     /// <inheritdoc/>
-    public bool NoBackupTrigger {get;set;}
+    public bool NoBackupTrigger { get; set; }
 
-    public StagingToLiveMigrationFieldProcessor(Regex updateButDoNotDiff = null, Regex ignore=null, ColumnInfo[] alsoIgnore = null)
+    public StagingToLiveMigrationFieldProcessor(Regex updateButDoNotDiff = null, Regex ignore = null,
+        ColumnInfo[] alsoIgnore = null)
     {
         _updateButDoNotDiffExtended = updateButDoNotDiff;
         _ignore = ignore;
@@ -38,32 +39,37 @@ public StagingToLiveMigrationFieldProcessor(Regex updateButDoNotDiff = null, Reg
 
     public void ValidateFields(DiscoveredColumn[] sourceFields, DiscoveredColumn[] destinationFields)
     {
-        if(NoBackupTrigger)
+        if (NoBackupTrigger)
             return;
 
-        if (!destinationFields.Any(f => f.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID, StringComparison.CurrentCultureIgnoreCase)))
+        if (!destinationFields.Any(f =>
+                f.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID, StringComparison.CurrentCultureIgnoreCase)))
             throw new MissingFieldException(
                 $"Destination (Live) database table is missing field:{SpecialFieldNames.DataLoadRunID}");
 
-        if (!destinationFields.Any(f=>f.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom,StringComparison.CurrentCultureIgnoreCase)))
+        if (!destinationFields.Any(f =>
+                f.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase)))
             throw new MissingFieldException(
                 $"Destination (Live) database table is missing field:{SpecialFieldNames.ValidFrom}");
     }
 
-    public void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff, List<DiscoveredColumn> fieldsToUpdate)
+    public void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredColumn> fieldsToDiff,
+        List<DiscoveredColumn> fieldsToUpdate)
     {
-        if(IgnoreColumnInfo(field))
+        if (IgnoreColumnInfo(field))
             return;
 
-        if(Ignore(field))
+        if (Ignore(field))
             return;
 
         //it is a hic internal field but not one of the overwritten, standard ones
         if (SpecialFieldNames.IsHicPrefixed(field)
-            || 
+            ||
             UpdateOnly(field))
-            
+
+        {
             fieldsToUpdate.Add(field);
+        }
         else
         {
             //it is not a hic internal field
@@ -74,32 +80,33 @@ public void AssignFieldsForProcessing(DiscoveredColumn field, List<DiscoveredCol
 
     private bool IgnoreColumnInfo(DiscoveredColumn field)
     {
-        if(_alsoIgnore == null)
+        if (_alsoIgnore == null)
             return false;
 
         // TODO: if a load targets 2 tables with the same name in different databases and one has a column marked ignore it could be ignored in both during load.  Note that `field` parameter is the from column not the to column
 
         //its a column we were told to ignore
-        var match = _alsoIgnore.FirstOrDefault(c=>
-            c.GetRuntimeName().Equals(field.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase) &&
-            c.TableInfo.GetRuntimeName().Equals(field.Table.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase)
+        var match = _alsoIgnore.FirstOrDefault(c =>
+            c.GetRuntimeName().Equals(field.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase) &&
+            c.TableInfo.GetRuntimeName().Equals(field.Table.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)
         );
 
-        if(match != null && field.IsPrimaryKey)
-            throw new NotSupportedException($"ColumnInfo {match} is marked {nameof(ColumnInfo.IgnoreInLoads)} but is a Primary Key column this is not permitted");
+        if (match != null && field.IsPrimaryKey)
+            throw new NotSupportedException(
+                $"ColumnInfo {match} is marked {nameof(ColumnInfo.IgnoreInLoads)} but is a Primary Key column this is not permitted");
 
         return match != null;
     }
 
     private bool Ignore(DiscoveredColumn field)
     {
-        if(_ignore == null)
+        if (_ignore == null)
             return false;
 
         //its a global ignore based on regex ignore pattern?
         var match = _ignore.IsMatch(field.GetRuntimeName());
 
-        if(match && field.IsPrimaryKey)
+        if (match && field.IsPrimaryKey)
             throw new NotSupportedException(
                 $"Ignore Pattern {_ignore} matched Primary Key column '{field.GetRuntimeName()}' this is not permitted");
 
@@ -108,13 +115,13 @@ private bool Ignore(DiscoveredColumn field)
 
     private bool UpdateOnly(DiscoveredColumn field)
     {
-        if(_updateButDoNotDiffExtended == null)
+        if (_updateButDoNotDiffExtended == null)
             return false;
 
         //its a supplemental ignore e.g. MessageGuid
         var match = _updateButDoNotDiffExtended.IsMatch(field.GetRuntimeName());
 
-        if(match && field.IsPrimaryKey)
+        if (match && field.IsPrimaryKey)
             throw new NotSupportedException(
                 $"UpdateButDoNotDiff Pattern {_updateButDoNotDiffExtended} matched Primary Key column '{field.GetRuntimeName()}' this is not permitted");
 
diff --git a/Rdmp.Core/DataLoad/Engine/Mutilators/IMutilateDataTables.cs b/Rdmp.Core/DataLoad/Engine/Mutilators/IMutilateDataTables.cs
index 921b4bb72c..89c3ac856a 100644
--- a/Rdmp.Core/DataLoad/Engine/Mutilators/IMutilateDataTables.cs
+++ b/Rdmp.Core/DataLoad/Engine/Mutilators/IMutilateDataTables.cs
@@ -24,5 +24,6 @@ public interface IMutilateDataTables : ICheckable, IDisposeAfterDataLoad
     /// <param name="dbInfo"></param>
     /// <param name="loadStage"></param>
     void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage);
+
     ExitCodeType Mutilate(IDataLoadJob job);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOConfigurationException.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOConfigurationException.cs
index 67c8b2d938..9a4495a63b 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOConfigurationException.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOConfigurationException.cs
@@ -16,11 +16,9 @@ public class ANOConfigurationException : Exception
 {
     public ANOConfigurationException(string message) : base(message)
     {
-            
     }
 
     public ANOConfigurationException(string message, Exception innerException) : base(message, innerException)
-    { 
-            
+    {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTableInfoSynchronizer.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTableInfoSynchronizer.cs
index 186c078966..fe867dc545 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTableInfoSynchronizer.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTableInfoSynchronizer.cs
@@ -38,19 +38,20 @@ public void Synchronize(ICheckNotifier notifier)
                 new CheckEventArgs(
                     "There are no ANOTables configured for this table so skipping ANOTable checking",
                     CheckResult.Success));
-            
+
         foreach (var columnInfoWithANOTransform in columnInfosWithANOTransforms)
         {
             var anoTable = columnInfoWithANOTransform.ANOTable;
             anoTable.Check(new ThrowImmediatelyCheckNotifier());
-                
-            if(!anoTable.GetRuntimeDataType(LoadStage.PostLoad).Equals(columnInfoWithANOTransform.Data_type))
+
+            if (!anoTable.GetRuntimeDataType(LoadStage.PostLoad).Equals(columnInfoWithANOTransform.Data_type))
                 throw new ANOConfigurationException(
                     $"Mismatch between anoTable.GetRuntimeDataType(LoadStage.PostLoad) = {anoTable.GetRuntimeDataType(LoadStage.PostLoad)} and column {columnInfoWithANOTransform} datatype = {columnInfoWithANOTransform.Data_type}");
-                
+
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"ANOTable {anoTable} has shared compatible datatype {columnInfoWithANOTransform.Data_type} with ColumnInfo {columnInfoWithANOTransform}", CheckResult.Success));
+                    $"ANOTable {anoTable} has shared compatible datatype {columnInfoWithANOTransform.Data_type} with ColumnInfo {columnInfoWithANOTransform}",
+                    CheckResult.Success));
         }
     }
 
@@ -63,6 +64,5 @@ private void CheckForDuplicateANOVsRegularNames()
         if (duplicates.Any())
             throw new ANOConfigurationException(
                 $"The following columns exist both in their identifiable state and ANO state in TableInfo {_tableToSync} (this is not allowed).  The offending column(s) are:{string.Join(",", duplicates.Select(s => $"'{s}' & '{ANOTable.ANOPrefix}{s}'"))}");
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTransformer.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTransformer.cs
index 47e3c69b7d..b3ca99a919 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTransformer.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ANOTransformer.cs
@@ -35,26 +35,27 @@ public class ANOTransformer
 
     private const string SubstitutionStoredprocedure = "sp_substituteANOIdentifiers";
 
-    public ANOTransformer(ANOTable anoTable, IDataLoadEventListener listener= null)
+    public ANOTransformer(ANOTable anoTable, IDataLoadEventListener listener = null)
     {
         _externalDatabaseServer = anoTable.Server;
 
         _server = DataAccessPortal.ExpectServer(_externalDatabaseServer, DataAccessContext.DataLoad);
-            
+
         _anoTable = anoTable;
         _listener = listener;
     }
 
     public void Transform(DataTable table, DataColumn srcColumn, DataColumn destColumn, bool previewOnly = false)
     {
-        var tableOfIdentifiersRequiringSubstitution = ColumnToDataTable(srcColumn,true);
+        var tableOfIdentifiersRequiringSubstitution = ColumnToDataTable(srcColumn, true);
 
         if (!destColumn.ColumnName.Equals(ANOTable.ANOPrefix + srcColumn.ColumnName))
             throw new Exception(
                 $"Expected destination column {destColumn.ColumnName} to be {ANOTable.ANOPrefix}{srcColumn.ColumnName}");
 
-        if(tableOfIdentifiersRequiringSubstitution.Columns.Count != 1)
-            throw new Exception("Expected only a single columns to be dispatched to SubstituteIdentifiersForANOEquivalents");
+        if (tableOfIdentifiersRequiringSubstitution.Columns.Count != 1)
+            throw new Exception(
+                "Expected only a single columns to be dispatched to SubstituteIdentifiersForANOEquivalents");
 
         //if there is no data to transform, don't bother
         if (table.Rows.Count == 0 || tableOfIdentifiersRequiringSubstitution.Rows.Count == 0)
@@ -62,17 +63,18 @@ public void Transform(DataTable table, DataColumn srcColumn, DataColumn destColu
 
         //translate all values into ANO equivalents
         var substitutionTable = GetSubstitutionsForANOEquivalents(tableOfIdentifiersRequiringSubstitution, previewOnly);
-          
+
         //give the substitution table a primary key to make it faster.
-        substitutionTable.PrimaryKey = new[] {substitutionTable.Columns[0]};
+        substitutionTable.PrimaryKey = new[] { substitutionTable.Columns[0] };
+
+        if (substitutionTable.Columns.Count != 2)
+            throw new Exception(
+                "Expected only a two columns to be returned by SubstituteIdentifiersForANOEquivalents, the original primary key and the substitution identifier");
 
-        if(substitutionTable.Columns.Count != 2)
-            throw new Exception("Expected only a two columns to be returned by SubstituteIdentifiersForANOEquivalents, the original primary key and the substitution identifier");
-            
         if (substitutionTable.Columns[0].ColumnName.StartsWith(ANOTable.ANOPrefix))
             throw new Exception(
                 $"Expected first column returned by SubstituteIdentifiersForANOEquivalents to be a primary key (not start with {ANOTable.ANOPrefix}) but it was:{substitutionTable.Columns[0].ColumnName}");
-            
+
         if (!substitutionTable.Columns[1].ColumnName.StartsWith(ANOTable.ANOPrefix))
             throw new Exception(
                 $"Expected second column returned by SubstituteIdentifiersForANOEquivalents to be an ANO identifier(start with {ANOTable.ANOPrefix}) but it was:{substitutionTable.Columns[1].ColumnName}");
@@ -88,15 +90,15 @@ public void Transform(DataTable table, DataColumn srcColumn, DataColumn destColu
 
             //its not null so look up the mapped value
             var substitutionRow = substitutionTable.Rows.Find(valueToReplace) ?? throw new Exception(
-                    $"Substitution table returned by {SubstitutionStoredprocedure} did not contain a mapping for identifier {valueToReplace}(Substitution Table had {substitutionTable.Rows.Count} rows)");
-            var substitutionValue = substitutionRow[1];//substitution value
+                $"Substitution table returned by {SubstitutionStoredprocedure} did not contain a mapping for identifier {valueToReplace}(Substitution Table had {substitutionTable.Rows.Count} rows)");
+            var substitutionValue = substitutionRow[1]; //substitution value
 
             //overwrite the value with the substitution
             destColumn.Table.Rows[i][destColumn.ColumnName] = substitutionValue;
         }
     }
 
-    private static DataTable ColumnToDataTable(DataColumn column,bool discardNulls)
+    private static DataTable ColumnToDataTable(DataColumn column, bool discardNulls)
     {
         var table = new DataTable();
 
@@ -107,7 +109,7 @@ private static DataTable ColumnToDataTable(DataColumn column,bool discardNulls)
             var o = r[column.ColumnName];
 
             //if we are discarding nulls we choose to not add them to the return table
-            if(discardNulls && (o == null || o == DBNull.Value))
+            if (discardNulls && (o == null || o == DBNull.Value))
                 continue;
 
             table.Rows.Add(new[] { r[column.ColumnName] });
@@ -118,9 +120,9 @@ private static DataTable ColumnToDataTable(DataColumn column,bool discardNulls)
 
     private DataTable GetSubstitutionsForANOEquivalents(DataTable table, bool previewOnly)
     {
-        using(var con = (SqlConnection)_server.GetConnection())
+        using (var con = (SqlConnection)_server.GetConnection())
         {
-            con.InfoMessage+=_con_InfoMessage;
+            con.InfoMessage += _con_InfoMessage;
 
             if (table.Rows.Count == 0)
                 return table;
@@ -133,7 +135,8 @@ private DataTable GetSubstitutionsForANOEquivalents(DataTable table, bool previe
                     var mustPush = !_anoTable.IsTablePushed();
 
                     con.Open();
-                    transaction = con.BeginTransaction();//if it is preview only we will use a transaction which we will then rollback
+                    transaction =
+                        con.BeginTransaction(); //if it is preview only we will use a transaction which we will then rollback
 
                     if (mustPush)
                     {
@@ -164,17 +167,21 @@ private DataTable GetSubstitutionsForANOEquivalents(DataTable table, bool previe
 
                 cmdSubstituteIdentifiers.Parameters.Add("@batch", SqlDbType.Structured);
                 cmdSubstituteIdentifiers.Parameters.Add("@tableName", SqlDbType.VarChar, 500);
-                cmdSubstituteIdentifiers.Parameters.Add("@numberOfIntegersToUseInAnonymousRepresentation", SqlDbType.Int);
-                cmdSubstituteIdentifiers.Parameters.Add("@numberOfCharactersToUseInAnonymousRepresentation", SqlDbType.Int);
-                cmdSubstituteIdentifiers.Parameters.Add("@suffix", SqlDbType.VarChar,10);
+                cmdSubstituteIdentifiers.Parameters.Add("@numberOfIntegersToUseInAnonymousRepresentation",
+                    SqlDbType.Int);
+                cmdSubstituteIdentifiers.Parameters.Add("@numberOfCharactersToUseInAnonymousRepresentation",
+                    SqlDbType.Int);
+                cmdSubstituteIdentifiers.Parameters.Add("@suffix", SqlDbType.VarChar, 10);
 
                 //table valued parameter
                 cmdSubstituteIdentifiers.Parameters["@batch"].TypeName = "dbo.Batch";
                 cmdSubstituteIdentifiers.Parameters["@batch"].Value = table;
 
                 cmdSubstituteIdentifiers.Parameters["@tableName"].Value = _anoTable.TableName;
-                cmdSubstituteIdentifiers.Parameters["@numberOfIntegersToUseInAnonymousRepresentation"].Value = _anoTable.NumberOfIntegersToUseInAnonymousRepresentation;
-                cmdSubstituteIdentifiers.Parameters["@numberOfCharactersToUseInAnonymousRepresentation"].Value = _anoTable.NumberOfCharactersToUseInAnonymousRepresentation;
+                cmdSubstituteIdentifiers.Parameters["@numberOfIntegersToUseInAnonymousRepresentation"].Value =
+                    _anoTable.NumberOfIntegersToUseInAnonymousRepresentation;
+                cmdSubstituteIdentifiers.Parameters["@numberOfCharactersToUseInAnonymousRepresentation"].Value =
+                    _anoTable.NumberOfCharactersToUseInAnonymousRepresentation;
                 cmdSubstituteIdentifiers.Parameters["@suffix"].Value = _anoTable.Suffix;
 
                 var da = new SqlDataAdapter(cmdSubstituteIdentifiers);
@@ -200,31 +207,27 @@ private DataTable GetSubstitutionsForANOEquivalents(DataTable table, bool previe
 
     private void _con_InfoMessage(object sender, SqlInfoMessageEventArgs e)
     {
-        if(string.IsNullOrWhiteSpace(e.Message))
+        if (string.IsNullOrWhiteSpace(e.Message))
             return;
-            
+
         if (e.Message.Equals(lastMessage))
             return;
 
         lastMessage = e.Message;
 
-        if(_listener != null)
-            _listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,e.Message));
+        if (_listener != null)
+            _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, e.Message));
         else
             Console.WriteLine(e.Message);
     }
 
-    public string GetDestinationColumnExpectedDataType()
-    {
-        return _anoTable.GetRuntimeDataType(LoadStage.PostLoad);
-    }
+    public string GetDestinationColumnExpectedDataType() => _anoTable.GetRuntimeDataType(LoadStage.PostLoad);
 
 
-    public static void ConfirmDependencies(DiscoveredDatabase database,ICheckNotifier notifier)
+    public static void ConfirmDependencies(DiscoveredDatabase database, ICheckNotifier notifier)
     {
         try
         {
-
             if (database.DiscoverStoredprocedures().Any(p => p.Name.Equals(SubstitutionStoredprocedure)))
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"successfully found {SubstitutionStoredprocedure} on {database}", CheckResult.Success, null));
@@ -235,7 +238,8 @@ public static void ConfirmDependencies(DiscoveredDatabase database,ICheckNotifie
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Exception occurred when trying to find stored procedure {SubstitutionStoredprocedure} on {database}", CheckResult.Fail, e));
+                $"Exception occurred when trying to find stored procedure {SubstitutionStoredprocedure} on {database}",
+                CheckResult.Fail, e));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/BasicAnonymisationEngine.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/BasicAnonymisationEngine.cs
index 52dd90b58d..dbcfea5dad 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/BasicAnonymisationEngine.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/BasicAnonymisationEngine.cs
@@ -22,16 +22,16 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline.Components.Anonymisation;
 /// Pipeline component for anonymising DataTable batches in memory according to the configuration of ANOTables / PreLoadDiscardedColumn(s) in the TableInfo.
 /// Actual functionality is implemented in IdentifierDumper and ANOTransformer(s).
 /// </summary>
-public class BasicAnonymisationEngine :IPluginDataFlowComponent<DataTable>,IPipelineRequirement<TableInfo>
+public class BasicAnonymisationEngine : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<TableInfo>
 {
     private bool _bInitialized = false;
 
     private Dictionary<string, ANOTransformer> columnsToAnonymise = new();
     private IdentifierDumper _dumper;
-        
+
     public TableInfo TableToLoad { get; set; }
 
-    public void PreInitialize(TableInfo target,IDataLoadEventListener listener)
+    public void PreInitialize(TableInfo target, IDataLoadEventListener listener)
     {
         TableToLoad = target;
         _bInitialized = true;
@@ -62,34 +62,40 @@ public void PreInitialize(TableInfo target,IDataLoadEventListener listener)
     private Stopwatch stopwatch_TimeSpentTransforming = new();
     private Stopwatch stopwatch_TimeSpentDumping = new();
 
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var didAno = false;
 
         stopwatch_TimeSpentTransforming.Start();
-            
-        if(!_bInitialized)
+
+        if (!_bInitialized)
             throw new Exception("Not Initialized yet");
-            
+
         recordsProcessedSoFar += toProcess.Rows.Count;
 
-        var missingColumns = columnsToAnonymise.Keys.Where(k => !toProcess.Columns.Cast<DataColumn>().Any(c => c.ColumnName.Equals(k))).ToArray();
+        var missingColumns = columnsToAnonymise.Keys
+            .Where(k => !toProcess.Columns.Cast<DataColumn>().Any(c => c.ColumnName.Equals(k))).ToArray();
 
-        if(missingColumns.Any())
+        if (missingColumns.Any())
             throw new KeyNotFoundException(
                 $"The following columns (which have ANO Transforms on them) were missing from the DataTable:{Environment.NewLine}{string.Join(Environment.NewLine, missingColumns)}{Environment.NewLine}The columns found in the DataTable were:{Environment.NewLine}{string.Join(Environment.NewLine, toProcess.Columns.Cast<DataColumn>().Select(c => c.ColumnName))}");
 
         //Dump Identifiers
         stopwatch_TimeSpentDumping.Start();
-        _dumper.DumpAllIdentifiersInTable(toProcess); //do the dumping of all the rest of the columns (those that must disapear from pipeline as opposed to those above which were substituted for ANO versions)
+        _dumper.DumpAllIdentifiersInTable(
+            toProcess); //do the dumping of all the rest of the columns (those that must disapear from pipeline as opposed to those above which were substituted for ANO versions)
         stopwatch_TimeSpentDumping.Stop();
-            
-        if(_dumper.HaveDumpedRecords)
-            listener.OnProgress(this, new ProgressEventArgs("Dump Identifiers", new ProgressMeasurement(recordsProcessedSoFar, ProgressType.Records), stopwatch_TimeSpentDumping.Elapsed));//time taken to dump identifiers
-           
+
+        if (_dumper.HaveDumpedRecords)
+            listener.OnProgress(this,
+                new ProgressEventArgs("Dump Identifiers",
+                    new ProgressMeasurement(recordsProcessedSoFar, ProgressType.Records),
+                    stopwatch_TimeSpentDumping.Elapsed)); //time taken to dump identifiers
+
         //Process ANO Identifier Substitutions
         //for each column with an ANOTrasformer
-        foreach ((var column, var transformer) in columnsToAnonymise)
+        foreach (var (column, transformer) in columnsToAnonymise)
         {
             didAno = true;
 
@@ -98,7 +104,7 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
             toProcess.Columns.Add(ANOColumn);
 
             //populate ANO version
-            transformer.Transform(toProcess,toProcess.Columns[column], ANOColumn);
+            transformer.Transform(toProcess, toProcess.Columns[column], ANOColumn);
 
             //drop the non ANO version
             toProcess.Columns.Remove(column);
@@ -106,9 +112,12 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
 
         stopwatch_TimeSpentTransforming.Stop();
 
-        if(didAno)
-            listener.OnProgress(this, new ProgressEventArgs("Anonymise Identifiers", new ProgressMeasurement(recordsProcessedSoFar, ProgressType.Records), stopwatch_TimeSpentTransforming.Elapsed)); //time taken to swap ANO identifiers
-            
+        if (didAno)
+            listener.OnProgress(this,
+                new ProgressEventArgs("Anonymise Identifiers",
+                    new ProgressMeasurement(recordsProcessedSoFar, ProgressType.Records),
+                    stopwatch_TimeSpentTransforming.Elapsed)); //time taken to swap ANO identifiers
+
         return toProcess;
     }
 
@@ -123,8 +132,8 @@ public void Abort(IDataLoadEventListener listener)
     }
 
     public bool SilentRunning { get; set; }
+
     public void Check(ICheckNotifier notifier)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ColumnInfoToANOTableConverter.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ColumnInfoToANOTableConverter.cs
index b8608eaa4f..04bbe5c782 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ColumnInfoToANOTableConverter.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/ColumnInfoToANOTableConverter.cs
@@ -40,12 +40,11 @@ public ColumnInfoToANOTableConverter(ColumnInfo colToNuke, ANOTable toConformTo)
 
     public bool ConvertEmptyColumnInfo(Func<string, bool> shouldApplySql, ICheckNotifier notifier)
     {
-
         var tbl = _tableInfo.Discover(DataAccessContext.DataLoad);
 
         var rowcount = tbl.GetRowCount();
-            
-        if(rowcount>0)
+
+        if (rowcount > 0)
             throw new NotSupportedException(
                 $"Table {_tableInfo} contains {rowcount} rows of data, you cannot use ColumnInfoToANOTableConverter.ConvertEmptyColumnInfo on this table");
 
@@ -60,7 +59,7 @@ public bool ConvertEmptyColumnInfo(Func<string, bool> shouldApplySql, ICheckNoti
 
             AddNewANOColumnInfo(shouldApplySql, con, notifier);
 
-            DropOldColumn(shouldApplySql, con,null);
+            DropOldColumn(shouldApplySql, con, null);
 
 
             //synchronize again
@@ -69,6 +68,7 @@ public bool ConvertEmptyColumnInfo(Func<string, bool> shouldApplySql, ICheckNoti
 
         return true;
     }
+
     public bool ConvertFullColumnInfo(Func<string, bool> shouldApplySql, ICheckNotifier notifier)
     {
         var tbl = _tableInfo.Discover(DataAccessContext.DataLoad);
@@ -84,9 +84,9 @@ public bool ConvertFullColumnInfo(Func<string, bool> shouldApplySql, ICheckNotif
 
             AddNewANOColumnInfo(shouldApplySql, con, notifier);
 
-            MigrateExistingData(shouldApplySql,con, notifier,tbl);
+            MigrateExistingData(shouldApplySql, con, notifier, tbl);
 
-            DropOldColumn(shouldApplySql, con,null);
+            DropOldColumn(shouldApplySql, con, null);
 
             //synchronize again
             new TableInfoSynchronizer(_tableInfo).Synchronize(notifier);
@@ -106,18 +106,19 @@ private void EnsureNoTriggerOnTable(DiscoveredTable tbl)
                 $"Table {_tableInfo} has a backup trigger on it, this will destroy performance and break when we add the ANOColumn, dropping the trigger is not an option because of the _Archive table still containing identifiable data (and other reasons)");
     }
 
-    private void MigrateExistingData(Func<string, bool> shouldApplySql, DbConnection con, ICheckNotifier notifier,DiscoveredTable tbl)
+    private void MigrateExistingData(Func<string, bool> shouldApplySql, DbConnection con, ICheckNotifier notifier,
+        DiscoveredTable tbl)
     {
         var from = _colToNuke.GetRuntimeName(LoadStage.PostLoad);
         var to = _newANOColumnInfo.GetRuntimeName(LoadStage.PostLoad);
-            
+
 
         //create an empty table for the anonymised data
         using (var cmdCreateTempMap = DatabaseCommandHelper.GetCommand(
                    $"SELECT top 0 {from},{to} into TempANOMap from {tbl.GetFullyQualifiedName()}",
                    con))
         {
-            if(!shouldApplySql(cmdCreateTempMap.CommandText))
+            if (!shouldApplySql(cmdCreateTempMap.CommandText))
                 throw new Exception("User decided not to create the TempANOMap table");
 
             cmdCreateTempMap.ExecuteNonQuery();
@@ -134,15 +135,16 @@ private void MigrateExistingData(Func<string, bool> shouldApplySql, DbConnection
                 {
                     using (var da = DatabaseCommandHelper.GetDataAdapter(cmdGetExistingData))
                     {
-                        da.Fill(dt);//into memory
+                        da.Fill(dt); //into memory
 
                         //transform it in memory
-                        var transformer = new ANOTransformer(_toConformTo, new FromCheckNotifierToDataLoadEventListener(notifier));
-                        transformer.Transform(dt,dt.Columns[0],dt.Columns[1]);
+                        var transformer = new ANOTransformer(_toConformTo,
+                            new FromCheckNotifierToDataLoadEventListener(notifier));
+                        transformer.Transform(dt, dt.Columns[0], dt.Columns[1]);
 
                         var tempAnoMapTbl = tbl.Database.ExpectTable("TempANOMap");
 
-                        using(var insert = tempAnoMapTbl.BeginBulkInsert())
+                        using (var insert = tempAnoMapTbl.BeginBulkInsert())
                         {
                             insert.Upload(dt);
                         }
@@ -161,31 +163,29 @@ private void MigrateExistingData(Func<string, bool> shouldApplySql, DbConnection
                     throw new Exception("User decided not to perform update on table");
                 cmdUpdateMainTable.ExecuteNonQuery();
             }
-
         }
         finally
         {
             //always drop the temp anomap
-            using(var dropMappingTable = DatabaseCommandHelper.GetCommand("DROP TABLE TempANOMap", con))
+            using (var dropMappingTable = DatabaseCommandHelper.GetCommand("DROP TABLE TempANOMap", con))
+            {
                 dropMappingTable.ExecuteNonQuery();
+            }
         }
     }
 
 
-
     private void DropOldColumn(Func<string, bool> shouldApplySql, DbConnection con, DbTransaction transaction)
     {
         var alterSql = $"ALTER TABLE {_tableInfo.Name} Drop column {_colToNuke.GetRuntimeName(LoadStage.PostLoad)}";
 
         if (shouldApplySql(alterSql))
-        {
-            using(var cmd = DatabaseCommandHelper.GetCommand(alterSql, con,transaction))
+            using (var cmd = DatabaseCommandHelper.GetCommand(alterSql, con, transaction))
+            {
                 cmd.ExecuteNonQuery();
-        }
+            }
         else
-        {
             throw new Exception($"User chose not to drop the old column {_colToNuke}");
-        }
     }
 
 
@@ -223,8 +223,10 @@ private void AddNewANOColumnInfo(Func<string, bool> shouldApplySql, DbConnection
 
         if (shouldApplySql(alterSql))
         {
-            using(var cmd = DatabaseCommandHelper.GetCommand(alterSql, con))
+            using (var cmd = DatabaseCommandHelper.GetCommand(alterSql, con))
+            {
                 cmd.ExecuteNonQuery();
+            }
 
             var synchronizer = new TableInfoSynchronizer(_tableInfo);
             synchronizer.Synchronize(notifier);
@@ -235,8 +237,8 @@ private void AddNewANOColumnInfo(Func<string, bool> shouldApplySql, DbConnection
             _newANOColumnInfo.SaveToDatabase();
         }
         else
+        {
             throw new Exception("User chose not to apply part of the operation");
-
-
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumper.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumper.cs
index 236c771e2d..a5557c94fe 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumper.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumper.cs
@@ -26,7 +26,7 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline.Components.Anonymisation;
 /// on the TableInfo.  Depending on the PreLoadDiscardedColumn.Destination the dropped values may be stored in an 'identifier dump' database.  This is
 /// usually done to seperate identifiable data (patient name, dob etc) from data (prescription of drug X on date Y) or drop sensitive data entirely.
 /// </summary>
-public class IdentifierDumper :IHasRuntimeName, IDisposeAfterDataLoad,ICheckable
+public class IdentifierDumper : IHasRuntimeName, IDisposeAfterDataLoad, ICheckable
 {
     public ITableInfo TableInfo
     {
@@ -51,14 +51,16 @@ public IdentifierDumper(ITableInfo tableInfo)
     {
         TableInfo = tableInfo;
         var columnsToDump = tableInfo.PreLoadDiscardedColumns;
-            
+
         //something is destined for the identifier dump
         HasAtLeastOneColumnToStoreInDump = columnsToDump.Any(c => c.GoesIntoIdentifierDump());
-            
+
         if (HasAtLeastOneColumnToStoreInDump)
-            if (tableInfo.IdentifierDumpServer_ID == null)//id dump server is missing
+            if (tableInfo.IdentifierDumpServer_ID == null) //id dump server is missing
+            {
                 throw new ArgumentException(
                     $"TableInfo {tableInfo.Name} does not have a listed IdentifierDump ExternalDatabaseServer but has some columns configured as  DiscardedColumnDestination.StoreInIdentifiersDump or DiscardedColumnDestination.Dilute, go into the PreLoadDiscarded columns configuration window and select a Server to dump identifiers into");
+            }
             else
             {
                 //the place to store identifiers (at least those that are StoreInIdentifiersDump)
@@ -77,7 +79,7 @@ public void DumpAllIdentifiersInTable(DataTable inDataTable)
             //bulk insert into STAGING
             using (var con = (SqlConnection)_dumpDatabase.Server.GetConnection())
             {
-                if(con.State != ConnectionState.Open)
+                if (con.State != ConnectionState.Open)
                     con.Open();
 
                 var bulkCopy = new SqlBulkCopy(con)
@@ -90,7 +92,8 @@ public void DumpAllIdentifiersInTable(DataTable inDataTable)
                 //wire up the identifiers
                 foreach (var column in ColumnsToRouteToSomewhereElse.Where(c => c.GoesIntoIdentifierDump()))
                 {
-                    bulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(column.RuntimeColumnName,column.RuntimeColumnName));
+                    bulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(column.RuntimeColumnName,
+                        column.RuntimeColumnName));
                     uniqueNamesAdded.Add(column.RuntimeColumnName);
                 }
 
@@ -106,9 +109,7 @@ public void DumpAllIdentifiersInTable(DataTable inDataTable)
                         continue;
 
                     uniqueNamesAdded.Add(pkName);
-                    bulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(pkName,pkName));
-
-
+                    bulkCopy.ColumnMappings.Add(new SqlBulkCopyColumnMapping(pkName, pkName));
                 }
 
                 try
@@ -118,14 +119,16 @@ public void DumpAllIdentifiersInTable(DataTable inDataTable)
                 catch (Exception e)
                 {
                     throw new Exception(
-                        $"IdentifierDumper STAGING insert ({bulkCopy.DestinationTableName}) failed, make sure you have called CreateSTAGINGTable() before trying to Dump identifiers (also you should call DropStagging() when you are done)",e);
+                        $"IdentifierDumper STAGING insert ({bulkCopy.DestinationTableName}) failed, make sure you have called CreateSTAGINGTable() before trying to Dump identifiers (also you should call DropStagging() when you are done)",
+                        e);
                 }
+
                 MergeStagingWithLive(pks.Select(col => col.GetRuntimeName(LoadStage.AdjustRaw)).ToArray());
             }
 
             HaveDumpedRecords = true;
         }
-            
+
         //now drop the columns
         foreach (var preLoadDiscardedColumn in ColumnsToRouteToSomewhereElse)
             if (inDataTable.Columns.Contains(preLoadDiscardedColumn.RuntimeColumnName))
@@ -136,15 +139,15 @@ public void DumpAllIdentifiersInTable(DataTable inDataTable)
                 HaveDumpedRecords = true;
             }
             else
+            {
                 throw new Exception(
                     $"Could not find {preLoadDiscardedColumn.RuntimeColumnName} in pipeline column collection");
+            }
     }
 
 
-
     private void MergeStagingWithLive(string[] pks)
     {
-
         using (var con = _dumpDatabase.Server.GetConnection())
         {
             con.Open();
@@ -163,11 +166,14 @@ private void MergeStagingWithLive(string[] pks)
             mergeSql += $"{GetRuntimeName()} AS dest {Environment.NewLine}";
             mergeSql += $"USING {GetStagingRuntimeName()} AS source {Environment.NewLine}";
             mergeSql += $"ON  ({Environment.NewLine}";
-            mergeSql = pks.Aggregate(mergeSql,(s,n)=> $"{s} source.[{n}]=dest.[{n}] AND").TrimEnd(new []{'A','N','D',' '}) + Environment.NewLine;
+            mergeSql = pks.Aggregate(mergeSql, (s, n) => $"{s} source.[{n}]=dest.[{n}] AND")
+                .TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
             mergeSql += $") WHEN NOT MATCHED BY TARGET THEN INSERT ({Environment.NewLine}";
-            mergeSql = allColumns.Aggregate(mergeSql, (s, n) => $"{s}[{n}],").TrimEnd(new[] { ',', ' '}) + Environment.NewLine;
+            mergeSql = allColumns.Aggregate(mergeSql, (s, n) => $"{s}[{n}],").TrimEnd(new[] { ',', ' ' }) +
+                       Environment.NewLine;
             mergeSql += $") VALUES ({Environment.NewLine}";
-            mergeSql = allColumns.Aggregate(mergeSql, (s, n) => $"{s} source.[{n}],").TrimEnd(new[] { ',', ' ' }) + Environment.NewLine;
+            mergeSql = allColumns.Aggregate(mergeSql, (s, n) => $"{s} source.[{n}],").TrimEnd(new[] { ',', ' ' }) +
+                       Environment.NewLine;
             mergeSql += $");{Environment.NewLine}";
 
             using (var cmdInsert = _dumpDatabase.Server.GetCommand(mergeSql, con))
@@ -182,27 +188,33 @@ private void MergeStagingWithLive(string[] pks)
             updateSql += $"LEFT OUTER JOIN {GetRuntimeName()} AS prod{Environment.NewLine}";
             updateSql += $"ON ( {Environment.NewLine}";
             updateSql += $"/*Primary Keys JOIN*/{Environment.NewLine}";
-            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}]=prod.[{n}] AND").TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
+            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}]=prod.[{n}] AND")
+                .TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
             updateSql += $") WHERE{Environment.NewLine}";
             updateSql += $"/*Primary Keys not null*/{Environment.NewLine}";
-            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}] IS NOT NULL AND").TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
+            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}] IS NOT NULL AND")
+                .TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
             updateSql += $"AND EXISTS (SELECT {Environment.NewLine}";
             updateSql += $"/*All columns in stag*/{Environment.NewLine}";
-            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}],").TrimEnd(new[] { ',', ' ' }) + Environment.NewLine;
+            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} stag.[{n}],").TrimEnd(new[] { ',', ' ' }) +
+                        Environment.NewLine;
             updateSql += $"EXCEPT SELECT{Environment.NewLine}";
-            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}],").TrimEnd(new[] { ',', ' ' }) + Environment.NewLine;
+            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}],").TrimEnd(new[] { ',', ' ' }) +
+                        Environment.NewLine;
             updateSql += $")){Environment.NewLine}";
 
             updateSql += Environment.NewLine;
             updateSql += $"UPDATE prod SET{Environment.NewLine}";
-            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}]=ToUpdate.[{n}],").TrimEnd(new[] { ',' }) + Environment.NewLine;
+            updateSql = allColumns.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}]=ToUpdate.[{n}],")
+                .TrimEnd(new[] { ',' }) + Environment.NewLine;
             updateSql += $"FROM {GetRuntimeName()} AS prod {Environment.NewLine}";
             updateSql += $"INNER JOIN ToUpdate ON {Environment.NewLine}";
             updateSql += $"({Environment.NewLine}";
-            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}]=ToUpdate.[{n}] AND").TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
+            updateSql = pks.Aggregate(updateSql, (s, n) => $"{s} prod.[{n}]=ToUpdate.[{n}] AND")
+                .TrimEnd(new[] { 'A', 'N', 'D', ' ' }) + Environment.NewLine;
             updateSql += $"){Environment.NewLine}";
 
-            using(var updateCommand = _dumpDatabase.Server.GetCommand(updateSql,con))
+            using (var updateCommand = _dumpDatabase.Server.GetCommand(updateSql, con))
             {
                 updateCommand.CommandTimeout = Timeout;
                 updateCommand.ExecuteNonQuery();
@@ -211,7 +223,7 @@ private void MergeStagingWithLive(string[] pks)
             using (var cmdtruncateIdentifiersArchive =
                    _dumpDatabase.Server.GetCommand($"TRUNCATE TABLE {GetStagingRuntimeName()}", con))
             {
-                if(!cmdtruncateIdentifiersArchive.CommandText.Contains("_STAGING"))
+                if (!cmdtruncateIdentifiersArchive.CommandText.Contains("_STAGING"))
                     throw new Exception("Were about to run a command that TRUNCATED a non staging table!");
                 //clear the table now
                 cmdtruncateIdentifiersArchive.ExecuteNonQuery();
@@ -222,7 +234,7 @@ private void MergeStagingWithLive(string[] pks)
     public void CreateSTAGINGTable()
     {
         //don't bother if there are no fields going to identifier dump - some could still be going to oblivion
-        if(!HasAtLeastOneColumnToStoreInDump)
+        if (!HasAtLeastOneColumnToStoreInDump)
             return;
 
         using var con = _dumpDatabase.Server.GetConnection();
@@ -232,9 +244,9 @@ public void CreateSTAGINGTable()
         cmdCreateSTAGING.ExecuteNonQuery();
     }
 
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-        if(exitCode == ExitCodeType.Error)
+        if (exitCode == ExitCodeType.Error)
             return;
 
         DropStaging();
@@ -242,45 +254,49 @@ public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener
 
     public void Check(ICheckNotifier notifier)
     {
-
         var columnsToDump = TableInfo.PreLoadDiscardedColumns;
         var duplicates = columnsToDump.GroupBy(k => k.GetRuntimeName()).Where(c => c.Count() > 1).ToArray();
 
         foreach (var duplicate in duplicates)
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"There are {duplicate.Count()} PreLoadDiscardedColumns called '{duplicate.Key}' for TableInfo '{TableInfo}'", CheckResult.Fail));
+                    $"There are {duplicate.Count()} PreLoadDiscardedColumns called '{duplicate.Key}' for TableInfo '{TableInfo}'",
+                    CheckResult.Fail));
 
         //columns that exist in live but are supposedly dropped during load
         var liveColumns = TableInfo.ColumnInfos.ToArray();
 
-            
+
         foreach (var preLoadDiscardedColumn in columnsToDump)
         {
-            var match = liveColumns.FirstOrDefault(c => c.GetRuntimeName().Equals(preLoadDiscardedColumn.GetRuntimeName()));
+            var match = liveColumns.FirstOrDefault(c =>
+                c.GetRuntimeName().Equals(preLoadDiscardedColumn.GetRuntimeName()));
 
-            if(match != null)
+            if (match != null)
             {
-                if(preLoadDiscardedColumn.Destination != DiscardedColumnDestination.Dilute)
+                if (preLoadDiscardedColumn.Destination != DiscardedColumnDestination.Dilute)
                 {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"TableInfo {TableInfo} declares both a PreLoadDiscardedColumn '{preLoadDiscardedColumn}' and a ColumnInfo with the same name", CheckResult.Fail));
+                        $"TableInfo {TableInfo} declares both a PreLoadDiscardedColumn '{preLoadDiscardedColumn}' and a ColumnInfo with the same name",
+                        CheckResult.Fail));
                     return;
                 }
 
                 if (match.IsPrimaryKey && preLoadDiscardedColumn.Destination == DiscardedColumnDestination.Dilute)
                 {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"TableInfo {TableInfo} declares a PreLoadDiscardedColumn '{preLoadDiscardedColumn}' but there is a matching ColumnInfo of the same name which IsPrimaryKey", CheckResult.Fail));
+                        $"TableInfo {TableInfo} declares a PreLoadDiscardedColumn '{preLoadDiscardedColumn}' but there is a matching ColumnInfo of the same name which IsPrimaryKey",
+                        CheckResult.Fail));
                     return;
                 }
             }
         }
-            
-        if(!HasAtLeastOneColumnToStoreInDump)
+
+        if (!HasAtLeastOneColumnToStoreInDump)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"No columns require dumping from TableInfo {_tableInfo} so checking is not needed", CheckResult.Success, null));
+                $"No columns require dumping from TableInfo {_tableInfo} so checking is not needed",
+                CheckResult.Success, null));
             return;
         }
 
@@ -297,31 +313,36 @@ public void Check(ICheckNotifier notifier)
                 $"STAGING table found {GetStagingRuntimeName()} in ANO database",
                 CheckResult.Fail, null, $"Drop table {GetStagingRuntimeName()}"));
 
-            if(shouldDrop)
+            if (shouldDrop)
                 DropStaging();
         }
         else
+        {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Confirmed absence of Table  {GetStagingRuntimeName()}(this will be created during load)",CheckResult.Success, null));
+                $"Confirmed absence of Table  {GetStagingRuntimeName()}(this will be created during load)",
+                CheckResult.Success, null));
+        }
 
         //confirm that there is a ColumnInfo for every Dilute column
         var columnInfos = _tableInfo.ColumnInfos.ToArray();
-        foreach (var dilutedColumn in ColumnsToRouteToSomewhereElse.Where(c=>c.Destination == DiscardedColumnDestination.Dilute))
-        {
-            if(!columnInfos.Any(c=>c.GetRuntimeName().Equals(dilutedColumn.RuntimeColumnName)))
+        foreach (var dilutedColumn in ColumnsToRouteToSomewhereElse.Where(c =>
+                     c.Destination == DiscardedColumnDestination.Dilute))
+            if (!columnInfos.Any(c => c.GetRuntimeName().Equals(dilutedColumn.RuntimeColumnName)))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"PreLoadDiscardedColumn called {dilutedColumn.GetRuntimeName()} is marked for Dilution but does not appear in the TableInfo object's ColumnInfo collection.  Diluted columns must appear both in the LIVE database (in diluted state) and in IdentifierDump (in pristene state) which means that for every PreLoadDiscardedColumn which has the destination Dilution, there must be a ColumnInfo with the same name in LIVE",CheckResult.Fail, null));
-        }
+                    $"PreLoadDiscardedColumn called {dilutedColumn.GetRuntimeName()} is marked for Dilution but does not appear in the TableInfo object's ColumnInfo collection.  Diluted columns must appear both in the LIVE database (in diluted state) and in IdentifierDump (in pristene state) which means that for every PreLoadDiscardedColumn which has the destination Dilution, there must be a ColumnInfo with the same name in LIVE",
+                    CheckResult.Fail, null));
 
         //if there are any columns due to be stored in the Identifier dump
-        if(ColumnsToRouteToSomewhereElse.Any(c=>c.GoesIntoIdentifierDump()))
+        if (ColumnsToRouteToSomewhereElse.Any(c => c.GoesIntoIdentifierDump()))
         {
             //see if table exists
-            var synchronizer = new IdentifierDumperSynchronizer(this,_externalDatabaseServer);
+            var synchronizer = new IdentifierDumperSynchronizer(this, _externalDatabaseServer);
             synchronizer.Synchronize(notifier);
 
             //make sure there is a backup trigger enabled on the Identifier dump so that we version updates
-            var triggerChecker = new TriggerChecks(_dumpDatabase.ExpectTable( GetRuntimeName())); // primary keys - ignoring transforms for ANO
+            var triggerChecker =
+                new TriggerChecks(
+                    _dumpDatabase.ExpectTable(GetRuntimeName())); // primary keys - ignoring transforms for ANO
             triggerChecker.Check(notifier);
         }
     }
@@ -329,7 +350,7 @@ public void Check(ICheckNotifier notifier)
     public void DropStaging()
     {
         //if we weren't asked to dump anything then we wouldn't have created a staging table in the first place
-        if(!HasAtLeastOneColumnToStoreInDump)
+        if (!HasAtLeastOneColumnToStoreInDump)
             return;
 
         using (var con = _dumpDatabase.Server.GetConnection())
@@ -347,19 +368,12 @@ public void DropStaging()
         }
     }
 
-    private string GetStagingRuntimeName()
-    {
-        return $"ID_{_tableInfo.GetRuntimeName()}_STAGING";
-    }
+    private string GetStagingRuntimeName() => $"ID_{_tableInfo.GetRuntimeName()}_STAGING";
 
-    public string GetRuntimeName()
-    {
-        return $"ID_{_tableInfo.GetRuntimeName()}";
-    }
+    public string GetRuntimeName() => $"ID_{_tableInfo.GetRuntimeName()}";
 
     public void CreateIdentifierDumpTable(ColumnInfo[] primaryKeyColumnInfos)
     {
-
         using (var con = (SqlConnection)_dumpDatabase.Server.GetConnection())
         {
             con.Open();
@@ -380,25 +394,25 @@ public void CreateIdentifierDumpTable(ColumnInfo[] primaryKeyColumnInfos)
             dumpColumns.Columns.Add("RuntimeName");
             dumpColumns.Columns.Add("DataType");
 
-            foreach (var discardedColumn in _tableInfo.PreLoadDiscardedColumns.Where(d=>d.GoesIntoIdentifierDump()))
+            foreach (var discardedColumn in _tableInfo.PreLoadDiscardedColumns.Where(d => d.GoesIntoIdentifierDump()))
             {
-                if(discardedColumn.RuntimeColumnName.StartsWith("ANO"))
+                if (discardedColumn.RuntimeColumnName.StartsWith("ANO"))
                     throw new Exception(
                         $"Why are you trying to discard column {discardedColumn.RuntimeColumnName}, it looks like an ANO column in which case it should have an ANOTable transform rather than being a dump field.");
 
-                if(discardedColumn.SqlDataType == null)
+                if (discardedColumn.SqlDataType == null)
                     throw new Exception(
                         $"{discardedColumn.GetType().Name} called {discardedColumn.RuntimeColumnName} does not have an assigned type");
 
-                dumpColumns.Rows.Add(new object[] { discardedColumn.RuntimeColumnName, discardedColumn.SqlDataType});
+                dumpColumns.Rows.Add(new object[] { discardedColumn.RuntimeColumnName, discardedColumn.SqlDataType });
             }
 
 
-            if(dumpColumns.Rows.Count == 0)
+            if (dumpColumns.Rows.Count == 0)
                 throw new Exception("Cannot create an identifier dump with no dump columns");
 
             var cmdCreate = new SqlCommand(
-                $"EXEC {IdentifierDumpCreatorStoredprocedure} @liveTableName,@primaryKeys,@dumpColumns",con);
+                $"EXEC {IdentifierDumpCreatorStoredprocedure} @liveTableName,@primaryKeys,@dumpColumns", con);
 
             cmdCreate.Parameters.AddWithValue("@liveTableName", _tableInfo.GetRuntimeName());
 
@@ -411,40 +425,40 @@ public void CreateIdentifierDumpTable(ColumnInfo[] primaryKeyColumnInfos)
             cmdCreate.Parameters["@dumpColumns"].TypeName = "dbo.ColumnInfo";
 
             cmdCreate.ExecuteNonQuery();
-
         }
-            
     }
 
 
     public void Synchronize(ICheckNotifier notifier)
     {
-
         //there are no columns going to dump (because constructor didnt give us a server)
-        if(_externalDatabaseServer == null)
+        if (_externalDatabaseServer == null)
             return;
 
-        var synchronizer = new IdentifierDumperSynchronizer(this,_externalDatabaseServer);
+        var synchronizer = new IdentifierDumperSynchronizer(this, _externalDatabaseServer);
         synchronizer.Synchronize(notifier);
     }
 
-    public static void ConfirmDependencies(DiscoveredDatabase dbInfo,ICheckNotifier notifier)
+    public static void ConfirmDependencies(DiscoveredDatabase dbInfo, ICheckNotifier notifier)
     {
         try
         {
             var procedures = dbInfo.DiscoverStoredprocedures();
 
-            if (procedures.Any(p=>p.Name.Equals(IdentifierDumpCreatorStoredprocedure)))
+            if (procedures.Any(p => p.Name.Equals(IdentifierDumpCreatorStoredprocedure)))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Found stored procedure {IdentifierDumpCreatorStoredprocedure} on {dbInfo}", CheckResult.Success, null));
+                    $"Found stored procedure {IdentifierDumpCreatorStoredprocedure} on {dbInfo}", CheckResult.Success,
+                    null));
             else
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Connected successfully to server {dbInfo} but did not find the stored procedure {IdentifierDumpCreatorStoredprocedure} in the database (Possibly the ExternalDatabaseServer is not an IdentifierDump database?)",CheckResult.Fail, null));
+                    $"Connected successfully to server {dbInfo} but did not find the stored procedure {IdentifierDumpCreatorStoredprocedure} in the database (Possibly the ExternalDatabaseServer is not an IdentifierDump database?)",
+                    CheckResult.Fail, null));
         }
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Exception occurred when trying to find stored procedure {IdentifierDumpCreatorStoredprocedure} on {dbInfo}", CheckResult.Fail, e));
+                $"Exception occurred when trying to find stored procedure {IdentifierDumpCreatorStoredprocedure} on {dbInfo}",
+                CheckResult.Fail, e));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumperSynchronizer.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumperSynchronizer.cs
index 5b67c17826..b22b841e40 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumperSynchronizer.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/Anonymisation/IdentifierDumperSynchronizer.cs
@@ -34,7 +34,7 @@ public IdentifierDumperSynchronizer(IdentifierDumper dumper, ExternalDatabaseSer
     public void Synchronize(ICheckNotifier notifier)
     {
         //no need to check dump because it probably doesn't even have one
-        if(!_parent.HasAtLeastOneColumnToStoreInDump)
+        if (!_parent.HasAtLeastOneColumnToStoreInDump)
             return;
 
 
@@ -53,7 +53,7 @@ public void Synchronize(ICheckNotifier notifier)
                 throw new ANOConfigurationException("Anonymisation database is not accessible", e);
             }
 
-            var identifiersTable = _parent.GetRuntimeName();//gets the dump table runtime name
+            var identifiersTable = _parent.GetRuntimeName(); //gets the dump table runtime name
 
             //find primary keys
             var primaryKeyColumnInfos = _parent.TableInfo.ColumnInfos.Where(col => col.IsPrimaryKey).ToArray();
@@ -64,19 +64,18 @@ public void Synchronize(ICheckNotifier notifier)
                     $"No primary keys are defined on TableInfo called {_parent.TableInfo.GetRuntimeName()} (ID={_parent.TableInfo.ID})");
 
             //make sure there is an _Identifiers table for the dataset
-            if (!tables.Any(t=>t.GetRuntimeName().Equals(identifiersTable)))
+            if (!tables.Any(t => t.GetRuntimeName().Equals(identifiersTable)))
                 if (notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Table {identifiersTable} was not found in IdentifierDump {_dump}",CheckResult.Fail,null,
+                        $"Table {identifiersTable} was not found in IdentifierDump {_dump}", CheckResult.Fail, null,
                         $"Create new identifier dump called {identifiersTable} using the current primary key ColumnInfos ({string.Join(",", primaryKeyColumnInfos.Select(c => c.GetRuntimeName()))}) and currently configured dump columns")))
-                {
                     _parent.CreateIdentifierDumpTable(primaryKeyColumnInfos);
-                }
                 else
                     throw new ANOConfigurationException(
                         $"User rejected change to fix Identifier dump {identifiersTable} not being found on server");
 
 
-            var columnsInTheIdentifiersDumpTable = server.ExpectDatabase(_dump.Database).ExpectTable(identifiersTable).DiscoverColumns();
+            var columnsInTheIdentifiersDumpTable =
+                server.ExpectDatabase(_dump.Database).ExpectTable(identifiersTable).DiscoverColumns();
 
             #region Pk Mismatches between dump and live
 
@@ -85,7 +84,9 @@ public void Synchronize(ICheckNotifier notifier)
             {
                 var expectedColName = originPk.GetRuntimeName(LoadStage.AdjustRaw);
 
-                var match = columnsInTheIdentifiersDumpTable.SingleOrDefault(c => c.GetRuntimeName().Equals(expectedColName)) ?? throw new ANOConfigurationException(
+                var match =
+                    columnsInTheIdentifiersDumpTable.SingleOrDefault(c => c.GetRuntimeName().Equals(expectedColName)) ??
+                    throw new ANOConfigurationException(
                         $"Column {originPk} is a primary key column but is not in Identifier dump table {identifiersTable}");
                 if (!match.IsPrimaryKey)
                     throw new ANOConfigurationException(
@@ -93,38 +94,47 @@ public void Synchronize(ICheckNotifier notifier)
             }
 
             foreach (var dumpPk in columnsInTheIdentifiersDumpTable.Where(c => c.IsPrimaryKey))
-                if (!primaryKeyColumnInfos.Any(p => p.GetRuntimeName(LoadStage.AdjustRaw).Equals(dumpPk.GetRuntimeName())))
+                if (!primaryKeyColumnInfos.Any(p =>
+                        p.GetRuntimeName(LoadStage.AdjustRaw).Equals(dumpPk.GetRuntimeName())))
                     throw new ANOConfigurationException(
                         $"Column {dumpPk.GetFullyQualifiedName()} in Identifier dump {identifiersTable} is part of the primary key but the LIVE table primary key columns does not include it");
 
             #endregion
 
             #region missing columns
+
             //fetch all the columns in the _Identifiers table - so we can make sure the correct columns exist for all PreLoadDiscardedColumns
             var missingColumns = new List<string>();
 
             //extra columns
-            foreach (var columnNameInDump in columnsInTheIdentifiersDumpTable.Select(c=>c.GetRuntimeName()))
+            foreach (var columnNameInDump in columnsInTheIdentifiersDumpTable.Select(c => c.GetRuntimeName()))
             {
-                if (primaryKeyColumnInfos.Any(pk => pk.GetRuntimeName(LoadStage.AdjustRaw).Equals(columnNameInDump)))//its a primary key so expected
+                if (primaryKeyColumnInfos.Any(pk =>
+                        pk.GetRuntimeName(LoadStage.AdjustRaw)
+                            .Equals(columnNameInDump))) //its a primary key so expected
                     continue;
 
-                if(_parent.ColumnsToRouteToSomewhereElse.Any(d=>d.GetRuntimeName().Equals(columnNameInDump)))//it's something we were expecting to dump
+                if (_parent.ColumnsToRouteToSomewhereElse.Any(d =>
+                        d.GetRuntimeName().Equals(columnNameInDump))) //it's something we were expecting to dump
                     continue;
 
                 //these are also expected don't warn user about them
-                if (columnNameInDump == SpecialFieldNames.ValidFrom || columnNameInDump == SpecialFieldNames.DataLoadRunID)
+                if (columnNameInDump == SpecialFieldNames.ValidFrom ||
+                    columnNameInDump == SpecialFieldNames.DataLoadRunID)
                     continue;
 
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Column {columnNameInDump} was found in the IdentifierDump table {identifiersTable} but was not one of the primary keys or a PreLoadDiscardedColumn", CheckResult.Warning));
+                        $"Column {columnNameInDump} was found in the IdentifierDump table {identifiersTable} but was not one of the primary keys or a PreLoadDiscardedColumn",
+                        CheckResult.Warning));
             }
 
             //for each column that we are supposed to dump, make sure it is actually in the dump table
-            foreach (var column in _parent.ColumnsToRouteToSomewhereElse.Where(c=>c.GoesIntoIdentifierDump()))
+            foreach (var column in _parent.ColumnsToRouteToSomewhereElse.Where(c => c.GoesIntoIdentifierDump()))
             {
-                var colInIdentifierDumpDatabase = columnsInTheIdentifiersDumpTable.SingleOrDefault(c => c.GetRuntimeName().Equals(column.RuntimeColumnName));
+                var colInIdentifierDumpDatabase =
+                    columnsInTheIdentifiersDumpTable.SingleOrDefault(c =>
+                        c.GetRuntimeName().Equals(column.RuntimeColumnName));
 
                 //if there are not any columns in the dump that have the same runtime name as the current preloaddiscarded column
                 if (colInIdentifierDumpDatabase == null)
@@ -143,12 +153,13 @@ public void Synchronize(ICheckNotifier notifier)
                     if (string.IsNullOrWhiteSpace(column.Data_type))
                         notifier.OnCheckPerformed(
                             new CheckEventArgs(
-                                $"PreLoadDiscardedColumn {column} does not have a data type recorded in the Catalogue!", CheckResult.Fail));
+                                $"PreLoadDiscardedColumn {column} does not have a data type recorded in the Catalogue!",
+                                CheckResult.Fail));
                     else if (!column.Data_type.Equals(colInIdentifierDumpDatabase.DataType.SQLType))
                         notifier.OnCheckPerformed(
                             new CheckEventArgs(
-                                $"PreLoadDiscardedColumn{column} has data type {column.Data_type} in the Catalogue but appears as {colInIdentifierDumpDatabase.DataType.SQLType} in the actual IdentifierDump",CheckResult.Fail));
-
+                                $"PreLoadDiscardedColumn{column} has data type {column.Data_type} in the Catalogue but appears as {colInIdentifierDumpDatabase.DataType.SQLType} in the actual IdentifierDump",
+                                CheckResult.Fail));
                 }
             }
 
@@ -157,7 +168,7 @@ public void Synchronize(ICheckNotifier notifier)
                 if (
                     //if there are not any columns in the dump with the same name as the current primary key
                     !columnsInTheIdentifiersDumpTable.Any(
-                        c=>c.GetRuntimeName().Equals(primaryKeyName)))
+                        c => c.GetRuntimeName().Equals(primaryKeyName)))
                     missingColumns.Add(primaryKeyName);
 
             if (missingColumns.Any())
@@ -196,15 +207,15 @@ var columnThatShouldHaveTheSameType
                     $"Fields have unexpected types in table {identifiersTable} :{typeMismatchesMessages.Aggregate(Environment.NewLine, (s, v) => s + Environment.NewLine + v)}");
 
             #endregion
-
         }
-
     }
 
     private void AddColumnToDump(PreLoadDiscardedColumn column, DbConnection con)
     {
-        using(var cmdAlter = DatabaseCommandHelper.GetCommand(
-                  $"Alter table {_parent.GetRuntimeName()} ADD {column.RuntimeColumnName} {column.SqlDataType}", con))
+        using (var cmdAlter = DatabaseCommandHelper.GetCommand(
+                   $"Alter table {_parent.GetRuntimeName()} ADD {column.RuntimeColumnName} {column.SqlDataType}", con))
+        {
             cmdAlter.ExecuteNonQuery();
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/CleanStrings.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/CleanStrings.cs
index 83ea0a82fc..6808f81680 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/CleanStrings.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/CleanStrings.cs
@@ -27,7 +27,8 @@ public class CleanStrings : IPluginDataFlowComponent<DataTable>, IPipelineRequir
     private string _taskDescription;
     private Stopwatch timer = new();
 
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener job, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener job,
+        GracefulCancellationToken cancellationToken)
     {
         timer.Start();
 
@@ -42,10 +43,10 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
                 {
                     var o = row[toClean];
 
-                    if(o == DBNull.Value || o == null)
+                    if (o == DBNull.Value || o == null)
                         continue;
 
-                    if(o is not string s)
+                    if (o is not string s)
                         throw new ArgumentException(
                             $"Despite being marked as a string column, object found in column {toClean} was of type {o.GetType()}");
 
@@ -53,7 +54,8 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
                 }
                 catch (ArgumentException e)
                 {
-                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,e.Message)); //column could not be found
+                    job.OnNotify(this,
+                        new NotifyEventArgs(ProgressEventType.Warning, e.Message)); //column could not be found
                     columnsToClean.Remove(columnsToClean[i]);
                     goto StartAgain;
                 }
@@ -61,7 +63,9 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
 
                 //it is empty
                 if (string.IsNullOrWhiteSpace(val))
+                {
                     row[toClean] = DBNull.Value;
+                }
                 else
                 {
                     //trim it
@@ -72,11 +76,15 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
                         row[toClean] = valAfterClean;
                 }
             }
+
             _rowsProcessed++;
         }
+
         timer.Stop();
 
-        job.OnProgress(this,new ProgressEventArgs(_taskDescription,new ProgressMeasurement(_rowsProcessed, ProgressType.Records),timer.Elapsed));
+        job.OnProgress(this,
+            new ProgressEventArgs(_taskDescription, new ProgressMeasurement(_rowsProcessed, ProgressType.Records),
+                timer.Elapsed));
 
         return toProcess;
     }
@@ -89,10 +97,9 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
-    public void PreInitialize(TableInfo target,IDataLoadEventListener listener)
+    public void PreInitialize(TableInfo target, IDataLoadEventListener listener)
     {
         if (target == null)
             throw new Exception("Without TableInfo we cannot figure out what columns to clean");
@@ -113,6 +120,5 @@ public void PreInitialize(TableInfo target,IDataLoadEventListener listener)
 
     public void Check(ICheckNotifier notifier)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/RemoveDuplicates.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/RemoveDuplicates.cs
index 8f8fc7842e..4c5ba743ac 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Components/RemoveDuplicates.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Components/RemoveDuplicates.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline.Components;
 /// <summary>
 /// PipelineComponent which removes 100% duplicate rows from a DataTable during Pipeline execution based on row hashes.
 /// </summary>
-public class RemoveDuplicates :IPluginDataFlowComponent<DataTable>
+public class RemoveDuplicates : IPluginDataFlowComponent<DataTable>
 {
     private Stopwatch sw = new();
     private int totalRecordsProcessed = 0;
@@ -30,7 +30,8 @@ public class RemoveDuplicates :IPluginDataFlowComponent<DataTable>
     /// </summary>
     public bool NoLogging { get; set; }
 
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         sw.Start();
 
@@ -42,7 +43,7 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
             totalRecordsProcessed++;
             var hashOfItems = GetHashCode(row.ItemArray);
 
-            if (_uniqueHashesSeen.TryGetValue(hashOfItems,out var collisions))
+            if (_uniqueHashesSeen.TryGetValue(hashOfItems, out var collisions))
             {
                 //GetHashCode on ItemArray of row has been seen before but it could be a collision so call Enumerable.SequenceEqual just in case.
                 if (collisions.Any(r => r.ItemArray.SequenceEqual(row.ItemArray)))
@@ -64,11 +65,16 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
 
         sw.Stop();
 
-        if(!NoLogging)
+        if (!NoLogging)
         {
-            listener.OnProgress(this, new ProgressEventArgs("Evaluating For Duplicates", new ProgressMeasurement(totalRecordsProcessed, ProgressType.Records), sw.Elapsed));
-            listener.OnProgress(this,new ProgressEventArgs("Discarding Duplicates",new ProgressMeasurement(totalDuplicatesFound, ProgressType.Records),sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Evaluating For Duplicates",
+                    new ProgressMeasurement(totalRecordsProcessed, ProgressType.Records), sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Discarding Duplicates",
+                    new ProgressMeasurement(totalDuplicatesFound, ProgressType.Records), sw.Elapsed));
         }
+
         return toReturn;
     }
 
@@ -78,12 +84,10 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
 
     public void Abort(IDataLoadEventListener listener)
     {
-
     }
 
     public void Check(ICheckNotifier notifier)
     {
-
     }
 
     /// <summary>
@@ -100,23 +104,17 @@ public static int GetHashCode(object[] array)
     {
         // if non-null array then go into unchecked block to avoid overflow
         if (array != null)
-        {
             unchecked
             {
                 var hash = 17;
 
                 // get hash code for all items in array
-                foreach (var item in array)
-                {
-                    hash = hash * 23 + (item != null ? item.GetHashCode() : 0);
-                }
+                foreach (var item in array) hash = hash * 23 + (item != null ? item.GetHashCode() : 0);
 
                 return hash;
             }
-        }
 
         // if null, hash code is zero
         return 0;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/DataTableUploadDestination.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/DataTableUploadDestination.cs
index 60ce6098fe..ea78b534dc 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/DataTableUploadDestination.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/DataTableUploadDestination.cs
@@ -35,29 +35,39 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline.Destinations;
 /// name of the DataTable being processed.  If a matching table already exists you can choose to load it anyway in which case a basic bulk insert will take 
 /// place.
 /// </summary>
-public class DataTableUploadDestination : IPluginDataFlowComponent<DataTable>, IDataFlowDestination<DataTable>, IPipelineRequirement<DiscoveredDatabase>
+public class DataTableUploadDestination : IPluginDataFlowComponent<DataTable>, IDataFlowDestination<DataTable>,
+    IPipelineRequirement<DiscoveredDatabase>
 {
-    public const string LoggingServer_Description = "The logging server to log the upload to (leave blank to not bother auditing)";
-    public const string AllowResizingColumnsAtUploadTime_Description = "If the target table being loaded has columns that are too small the destination will attempt to resize them";
-    public const string AllowLoadingPopulatedTables_Description = "Normally when DataTableUploadDestination encounters a table that already contains records it will abandon the insertion attempt.  Set this to true to instead continue with the load.";
-    public const string AlterTimeout_Description = "Timeout to perform all ALTER TABLE operations (column resize and PK creation)";
+    public const string LoggingServer_Description =
+        "The logging server to log the upload to (leave blank to not bother auditing)";
+
+    public const string AllowResizingColumnsAtUploadTime_Description =
+        "If the target table being loaded has columns that are too small the destination will attempt to resize them";
+
+    public const string AllowLoadingPopulatedTables_Description =
+        "Normally when DataTableUploadDestination encounters a table that already contains records it will abandon the insertion attempt.  Set this to true to instead continue with the load.";
+
+    public const string AlterTimeout_Description =
+        "Timeout to perform all ALTER TABLE operations (column resize and PK creation)";
 
     [DemandsInitialization(LoggingServer_Description)]
     public ExternalDatabaseServer LoggingServer { get; set; }
 
     [DemandsInitialization(AllowResizingColumnsAtUploadTime_Description, DefaultValue = true)]
     public bool AllowResizingColumnsAtUploadTime { get; set; }
-        
+
     [DemandsInitialization(AllowLoadingPopulatedTables_Description, DefaultValue = false)]
     public bool AllowLoadingPopulatedTables { get; set; }
-        
+
     [DemandsInitialization(AlterTimeout_Description, DefaultValue = 300)]
     public int AlterTimeout { get; set; }
 
-    [DemandsInitialization("Optional - Change system behaviour when a new table is being created by the component", TypeOf = typeof(IDatabaseColumnRequestAdjuster))]
+    [DemandsInitialization("Optional - Change system behaviour when a new table is being created by the component",
+        TypeOf = typeof(IDatabaseColumnRequestAdjuster))]
     public Type Adjuster { get; set; }
 
     private CultureInfo _culture;
+
     [DemandsInitialization("The culture to use for uploading (determines date format etc)")]
     public CultureInfo Culture
     {
@@ -72,7 +82,7 @@ public CultureInfo Culture
     /// the table already existed e.g. data was simply added
     /// </summary>
     public bool CreatedTable { get; private set; }
-        
+
     private IBulkCopy _bulkcopy;
     private int _affectedRows = 0;
     private Stopwatch swTimeSpentWriting = new();
@@ -108,7 +118,8 @@ public DataTableUploadDestination()
         ExplicitTypes = new List<DatabaseColumnRequest>();
     }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (toProcess == null)
             return null;
@@ -128,18 +139,22 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             if (TableNamerDelegate != null)
             {
                 TargetTableName = TableNamerDelegate();
-                if(string.IsNullOrWhiteSpace(TargetTableName))
+                if (string.IsNullOrWhiteSpace(TargetTableName))
                     throw new Exception("No table name specified (TableNamerDelegate returned null)");
             }
+            else if (string.IsNullOrWhiteSpace(toProcess.TableName))
+            {
+                throw new Exception(
+                    "Chunk did not have a TableName, did not know what to call the newly created table");
+            }
             else
-            if (string.IsNullOrWhiteSpace(toProcess.TableName))
-                throw new Exception("Chunk did not have a TableName, did not know what to call the newly created table");
-            else                
+            {
                 TargetTableName = QuerySyntaxHelper.MakeHeaderNameSensible(toProcess.TableName);
+            }
         }
 
         ClearPrimaryKeyFromDataTableAndExplicitWriteTypes(toProcess);
-            
+
         StartAuditIfExists(TargetTableName);
 
         if (_loggingDatabaseListener != null)
@@ -148,7 +163,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
         EnsureTableHasDataInIt(toProcess);
 
         CreatedTable = false;
-            
+
         if (_firstTime)
         {
             var tableAlreadyExistsButEmpty = false;
@@ -162,29 +177,33 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             if (_discoveredTable.Exists())
             {
                 tableAlreadyExistsButEmpty = true;
-                    
-                if(!AllowLoadingPopulatedTables)
+
+                if (!AllowLoadingPopulatedTables)
                     if (_discoveredTable.IsEmpty())
                         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                             $"Found table {TargetTableName} already, normally this would forbid you from loading it (data duplication / no primary key etc) but it is empty so we are happy to load it, it will not be created"));
                     else
                         throw new Exception(
                             $"There is already a table called {TargetTableName} at the destination {_database}");
-                    
+
                 if (AllowResizingColumnsAtUploadTime)
-                    _dataTypeDictionary = _discoveredTable.DiscoverColumns().ToDictionary(k => k.GetRuntimeName(), v => v.GetGuesser(),StringComparer.CurrentCultureIgnoreCase);
+                    _dataTypeDictionary = _discoveredTable.DiscoverColumns().ToDictionary(k => k.GetRuntimeName(),
+                        v => v.GetGuesser(), StringComparer.CurrentCultureIgnoreCase);
             }
             else
+            {
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"Determined that the table name {TargetTableName} is unique at destination {_database}"));
-                
+            }
+
             //create connection to destination
             if (!tableAlreadyExistsButEmpty)
             {
                 CreatedTable = true;
 
                 if (AllowResizingColumnsAtUploadTime)
-                    _database.CreateTable(out _dataTypeDictionary, TargetTableName, toProcess, ExplicitTypes.ToArray(), true, adjuster);
+                    _database.CreateTable(out _dataTypeDictionary, TargetTableName, toProcess, ExplicitTypes.ToArray(),
+                        true, adjuster);
                 else
                     _database.CreateTable(TargetTableName, toProcess, ExplicitTypes.ToArray(), true, adjuster);
 
@@ -193,8 +212,8 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             }
 
             _managedConnection = _server.BeginNewTransactedConnection();
-            _bulkcopy = _discoveredTable.BeginBulkInsert(Culture,_managedConnection.ManagedTransaction);
-                
+            _bulkcopy = _discoveredTable.BeginBulkInsert(Culture, _managedConnection.ManagedTransaction);
+
             _firstTime = false;
         }
 
@@ -207,9 +226,11 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             swTimeSpentWriting.Start();
 
             _affectedRows += _bulkcopy.Upload(toProcess);
-                    
+
             swTimeSpentWriting.Stop();
-            listener.OnProgress(this, new ProgressEventArgs($"Uploading to {TargetTableName}", new ProgressMeasurement(_affectedRows, ProgressType.Records), swTimeSpentWriting.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs($"Uploading to {TargetTableName}",
+                    new ProgressMeasurement(_affectedRows, ProgressType.Records), swTimeSpentWriting.Elapsed));
         }
         catch (Exception e)
         {
@@ -226,26 +247,16 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     private static void RemoveInvalidCharactersInSchema(DataTable toProcess)
     {
-        var invalidSymbols = new[] { '.'} ;
+        var invalidSymbols = new[] { '.' };
 
-        if(!string.IsNullOrWhiteSpace(toProcess.TableName) && invalidSymbols.Any(c=>toProcess.TableName.Contains(c)))
-        {
+        if (!string.IsNullOrWhiteSpace(toProcess.TableName) && invalidSymbols.Any(c => toProcess.TableName.Contains(c)))
             foreach (var symbol in invalidSymbols)
-            {
                 toProcess.TableName = toProcess.TableName.Replace(symbol.ToString(), "");
-            }   
-        }
 
-        foreach(DataColumn col in toProcess.Columns)
-        {
+        foreach (DataColumn col in toProcess.Columns)
             if (!string.IsNullOrWhiteSpace(col.ColumnName) && invalidSymbols.Any(c => col.ColumnName.Contains(c)))
-            {
                 foreach (var symbol in invalidSymbols)
-                {
                     col.ColumnName = col.ColumnName.Replace(symbol.ToString(), "");
-                }
-            }
-        }
     }
 
 
@@ -272,7 +283,7 @@ private void ClearPrimaryKeyFromDataTableAndExplicitWriteTypes(DataTable toProce
 
     private static void EnsureTableHasDataInIt(DataTable toProcess)
     {
-        if(toProcess.Columns.Count == 0)
+        if (toProcess.Columns.Count == 0)
             throw new Exception($"DataTable '{toProcess}' had no Columns!");
 
         if (toProcess.Rows.Count == 0)
@@ -287,7 +298,8 @@ private void ResizeColumnsIfRequired(DataTable toProcess, IDataLoadEventListener
         var typeTranslater = tbl.GetQuerySyntaxHelper().TypeTranslater;
 
         //Get the current estimates from the datatype computer
-        var oldTypes = _dataTypeDictionary.ToDictionary(k => k.Key, v => typeTranslater.GetSQLDBTypeForCSharpType(v.Value.Guess),StringComparer.CurrentCultureIgnoreCase);
+        var oldTypes = _dataTypeDictionary.ToDictionary(k => k.Key,
+            v => typeTranslater.GetSQLDBTypeForCSharpType(v.Value.Guess), StringComparer.CurrentCultureIgnoreCase);
 
         //columns in 
         var sharedColumns = new List<string>();
@@ -298,8 +310,7 @@ private void ResizeColumnsIfRequired(DataTable toProcess, IDataLoadEventListener
             if (toProcess.Columns.Contains(col))
                 sharedColumns.Add(col); //it is a shared column
 
-            
-            
+
         //adjust the computer to 
         //for each shared column adjust the corresponding computer for all rows
         Parallel.ForEach(sharedColumns, col =>
@@ -307,7 +318,7 @@ private void ResizeColumnsIfRequired(DataTable toProcess, IDataLoadEventListener
             var guesser = _dataTypeDictionary[col];
             foreach (DataRow row in toProcess.Rows)
                 guesser.AdjustToCompensateForValue(row[col]);
-        });            
+        });
 
         //see if any have changed
         foreach (DataColumn column in toProcess.Columns)
@@ -319,32 +330,37 @@ private void ResizeColumnsIfRequired(DataTable toProcess, IDataLoadEventListener
             var changesMade = false;
 
             //if the SQL data type has degraded e.g. varchar(10) to varchar(50) or datetime to varchar(20)
-            if(oldSqlType != newSqlType)
+            if (oldSqlType != newSqlType)
             {
-                var col = tbl.DiscoverColumn(column.ColumnName,_managedConnection.ManagedTransaction);
+                var col = tbl.DiscoverColumn(column.ColumnName, _managedConnection.ManagedTransaction);
 
 
-                if(AbandonAlter(col.DataType.SQLType,newSqlType, out var reason))
+                if (AbandonAlter(col.DataType.SQLType, newSqlType, out var reason))
                 {
-                    listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, $"Considered resizing column '{column}' from '{col.DataType.SQLType }' to '{ newSqlType }' but decided not to because:{reason}"));
+                    listener.OnNotify(this,
+                        new NotifyEventArgs(ProgressEventType.Warning,
+                            $"Considered resizing column '{column}' from '{col.DataType.SQLType}' to '{newSqlType}' but decided not to because:{reason}"));
                     continue;
                 }
-                    
+
                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"Resizing column '{column}' from '{col.DataType.SQLType}' to '{newSqlType}'"));
 
                 //try changing the Type to the legit type
                 col.DataType.AlterTypeTo(newSqlType, _managedConnection.ManagedTransaction, AlterTimeout);
-                    
+
                 changesMade = true;
             }
 
-            if(changesMade)
+            if (changesMade)
                 _bulkcopy.InvalidateTableSchema();
         }
-            
+
         swMeasuringStrings.Stop();
-        listener.OnProgress(this,new ProgressEventArgs("Measuring DataType Sizes",new ProgressMeasurement(_affectedRows + toProcess.Rows.Count,ProgressType.Records),swMeasuringStrings.Elapsed));
+        listener.OnProgress(this,
+            new ProgressEventArgs("Measuring DataType Sizes",
+                new ProgressMeasurement(_affectedRows + toProcess.Rows.Count, ProgressType.Records),
+                swMeasuringStrings.Elapsed));
     }
 
     /// <summary>
@@ -356,11 +372,12 @@ private void ResizeColumnsIfRequired(DataTable toProcess, IDataLoadEventListener
     /// <returns>True if the proposed alter is a bad idea and shouldn't be attempted</returns>
     protected virtual bool AbandonAlter(string oldSqlType, string newSqlType, out string reason)
     {
-        var basicallyDecimalAlready = new List<string> { "real","double","float","single"};
+        var basicallyDecimalAlready = new List<string> { "real", "double", "float", "single" };
 
-        var first = basicallyDecimalAlready.FirstOrDefault(c=>oldSqlType.Contains(c,StringComparison.InvariantCultureIgnoreCase));
+        var first = basicallyDecimalAlready.FirstOrDefault(c =>
+            oldSqlType.Contains(c, StringComparison.InvariantCultureIgnoreCase));
 
-        if(first != null && newSqlType.Contains("decimal",StringComparison.InvariantCultureIgnoreCase))
+        if (first != null && newSqlType.Contains("decimal", StringComparison.InvariantCultureIgnoreCase))
         {
             reason = $"Resizing from {first} to decimal is a bad idea and likely to fail";
             return true;
@@ -385,8 +402,9 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
                 if (pipelineFailureExceptionIfAny != null)
                 {
                     _managedConnection.ManagedTransaction.AbandonAndCloseConnection();
-                        
-                    listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Transaction rolled back sucessfully"));
+
+                    listener.OnNotify(this,
+                        new NotifyEventArgs(ProgressEventType.Information, "Transaction rolled back sucessfully"));
 
                     _bulkcopy?.Dispose();
                 }
@@ -396,29 +414,35 @@ public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureEx
 
                     _bulkcopy?.Dispose();
 
-                    listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Transaction committed sucessfully"));
+                    listener.OnNotify(this,
+                        new NotifyEventArgs(ProgressEventType.Information, "Transaction committed sucessfully"));
                 }
             }
         }
         catch (Exception e)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Commit failed on transaction (probably there was a previous error?)", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error,
+                    "Commit failed on transaction (probably there was a previous error?)", e));
         }
 
         //if we have a primary key to create
-        if (pipelineFailureExceptionIfAny == null && _primaryKey != null && _primaryKey.Any() && _discoveredTable != null && _discoveredTable.Exists())
+        if (pipelineFailureExceptionIfAny == null && _primaryKey != null && _primaryKey.Any() &&
+            _discoveredTable != null && _discoveredTable.Exists())
         {
             //Find the columns in the destination
             var allColumns = _discoveredTable.DiscoverColumns();
-                
+
             //if there are not yet any primary keys
-            if(allColumns.All(c=>!c.IsPrimaryKey))
+            if (allColumns.All(c => !c.IsPrimaryKey))
             {
                 //find the columns the user decorated in his DataTable
-                var pkColumnsToCreate = allColumns.Where(c => _primaryKey.Any(pk => pk.Equals(c.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase))).ToArray();
+                var pkColumnsToCreate = allColumns.Where(c =>
+                        _primaryKey.Any(pk => pk.Equals(c.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase)))
+                    .ToArray();
 
                 //make sure we found all of them
-                if(pkColumnsToCreate.Length != _primaryKey.Count)
+                if (pkColumnsToCreate.Length != _primaryKey.Count)
                     throw new Exception(
                         $"Could not find primary key column(s) {string.Join(",", _primaryKey)} in table {_discoveredTable}");
 
@@ -439,16 +463,12 @@ private void EndAuditIfExists()
     public void Check(ICheckNotifier notifier)
     {
         if (LoggingServer != null)
-        {
             new LoggingDatabaseChecker(LoggingServer).Check(notifier);
-        }
         else
-        {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     "There is no logging server so there will be no audit of this destinations activities",
                     CheckResult.Success));
-        }
     }
 
     private void StartAuditIfExists(string tableName)
@@ -459,7 +479,7 @@ private void StartAuditIfExists(string tableName)
             var logManager = new LogManager(_loggingDatabaseSettings);
             logManager.CreateNewLoggingTaskIfNotExists("Internal");
 
-            _dataLoadInfo = (DataLoadInfo) logManager.CreateDataLoadInfo("Internal", GetType().Name,
+            _dataLoadInfo = (DataLoadInfo)logManager.CreateDataLoadInfo("Internal", GetType().Name,
                 $"Loading table {tableName}", "", false);
             _loggingDatabaseListener = new ToLoggingDatabaseDataLoadEventListener(logManager, _dataLoadInfo);
         }
@@ -470,7 +490,7 @@ public void PreInitialize(DiscoveredDatabase value, IDataLoadEventListener liste
         _database = value;
         _server = value.Server;
     }
-        
+
     /// <summary>
     /// Declare that the column of name columnName (which might or might not appear in DataTables being uploaded) should always have the associated database type (e.g. varchar(59))
     /// The columnName is Case insensitive.  Note that if AllowResizingColumnsAtUploadTime is true then these datatypes are only the starting types and might get changed later to
@@ -480,10 +500,11 @@ public void PreInitialize(DiscoveredDatabase value, IDataLoadEventListener liste
     /// <param name="explicitType"></param>
     /// <param name="columnFlags"></param>
     /// <returns>The Column Request that has been added to the array</returns>
-    public DatabaseColumnRequest AddExplicitWriteType(string columnName, string explicitType, ISupplementalColumnInformation columnFlags = null)
+    public DatabaseColumnRequest AddExplicitWriteType(string columnName, string explicitType,
+        ISupplementalColumnInformation columnFlags = null)
     {
         DatabaseColumnRequest columnRequest;
-            
+
         if (columnFlags == null)
         {
             columnRequest = new DatabaseColumnRequest(columnName, explicitType, true);
@@ -491,7 +512,8 @@ public DatabaseColumnRequest AddExplicitWriteType(string columnName, string expl
             return columnRequest;
         }
 
-        columnRequest = new DatabaseColumnRequest(columnName, explicitType, !columnFlags.IsPrimaryKey && !columnFlags.IsAutoIncrement)
+        columnRequest = new DatabaseColumnRequest(columnName, explicitType,
+            !columnFlags.IsPrimaryKey && !columnFlags.IsAutoIncrement)
         {
             IsPrimaryKey = columnFlags.IsPrimaryKey,
             IsAutoIncrement = columnFlags.IsAutoIncrement,
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/SqlBulkInsertDestination.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/SqlBulkInsertDestination.cs
index 50461054e1..44f0a52cbc 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/SqlBulkInsertDestination.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Destinations/SqlBulkInsertDestination.cs
@@ -37,11 +37,12 @@ public class SqlBulkInsertDestination : IDataFlowDestination<DataTable>, IPipeli
 
     private DiscoveredTable _table;
 
-    public SqlBulkInsertDestination(DiscoveredDatabase dbInfo, string tableName, IEnumerable<string> columnNamesToIgnore)
+    public SqlBulkInsertDestination(DiscoveredDatabase dbInfo, string tableName,
+        IEnumerable<string> columnNamesToIgnore)
     {
         _dbInfo = dbInfo;
-            
-        if(string.IsNullOrWhiteSpace(tableName))
+
+        if (string.IsNullOrWhiteSpace(tableName))
             throw new Exception("Parameter tableName is not specified for SqlBulkInsertDestination");
 
         Table = _dbInfo.Server.GetQuerySyntaxHelper().EnsureWrapped(tableName);
@@ -56,16 +57,16 @@ public SqlBulkInsertDestination(DiscoveredDatabase dbInfo, string tableName, IEn
     public virtual void SubmitChunk(DataTable chunk, IDataLoadEventListener job)
     {
         _timer.Start();
-        if(_copy == null)
+        if (_copy == null)
         {
-            _copy = InitializeBulkCopy(chunk,job);
-            AssessMissingAndIgnoredColumns(chunk,job);
+            _copy = InitializeBulkCopy(chunk, job);
+            AssessMissingAndIgnoredColumns(chunk, job);
         }
 
         _copy.Upload(chunk);
-       
+
         _timer.Stop();
-        RaiseEvents(chunk,job);
+        RaiseEvents(chunk, job);
     }
 
     protected void AssessMissingAndIgnoredColumns(DataTable chunk, IDataLoadEventListener job)
@@ -74,47 +75,61 @@ protected void AssessMissingAndIgnoredColumns(DataTable chunk, IDataLoadEventLis
         var problemsWithColumnSets = false;
 
         foreach (DataColumn colInSource in chunk.Columns)
-            if (!listColumns.Any(c=>c.GetRuntimeName().Equals(colInSource.ColumnName,StringComparison.CurrentCultureIgnoreCase)))//there is something wicked this way coming, down the pipeline but not in the target table
+            if (!listColumns.Any(c =>
+                    c.GetRuntimeName()
+                        .Equals(colInSource.ColumnName,
+                            StringComparison
+                                .CurrentCultureIgnoreCase))) //there is something wicked this way coming, down the pipeline but not in the target table
             {
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                     $"Column {colInSource.ColumnName} appears in pipeline but not destination table ({Table}) which is on (Database={_dbInfo.GetRuntimeName()},Server={_dbInfo.Server})"));
 
                 problemsWithColumnSets = true;
             }
+
         foreach (var columnInDestination in listColumns)
             if (columnInDestination.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID) ||
                 columnInDestination.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom))
                 //its fine if validFrom/DataLoadRunID columns are missing
-                continue;//its fine
-            else
-            if (!chunk.Columns.Contains(columnInDestination.GetRuntimeName()))//its not fine if there are other columns missing (at the very least we should warn the user.
+            {
+                continue; //its fine
+            }
+            else if
+                (!chunk.Columns.Contains(columnInDestination
+                    .GetRuntimeName())) //its not fine if there are other columns missing (at the very least we should warn the user.
             {
                 var isBigProblem = !SpecialFieldNames.IsHicPrefixed(columnInDestination);
 
-                job.OnNotify(this, 
-                    new NotifyEventArgs(isBigProblem?ProgressEventType.Error:ProgressEventType.Warning, //hic_ columns could be ok if missing so only warning, otherwise go error
+                job.OnNotify(this,
+                    new NotifyEventArgs(
+                        isBigProblem
+                            ? ProgressEventType.Error
+                            : ProgressEventType
+                                .Warning, //hic_ columns could be ok if missing so only warning, otherwise go error
                         $"Column {columnInDestination.GetRuntimeName()} appears in destination table ({Table}) but is not in the pipeline (will probably be left as NULL)"));
 
                 if (isBigProblem)
                     problemsWithColumnSets = true;
             }
 
-        if(problemsWithColumnSets)
-            throw new Exception("There was a mismatch between the columns in the pipeline and the destination table, check earlier progress messages for details on the missing columns");
+        if (problemsWithColumnSets)
+            throw new Exception(
+                "There was a mismatch between the columns in the pipeline and the destination table, check earlier progress messages for details on the missing columns");
     }
 
     private void RaiseEvents(DataTable chunk, IDataLoadEventListener job)
     {
         if (chunk != null)
         {
-
             _recordsWritten += chunk.Rows.Count;
-                
+
             if (TableLoadInfo != null)
                 TableLoadInfo.Inserts = _recordsWritten;
         }
 
-        job.OnProgress(this,new ProgressEventArgs(_taskBeingPerformed,new ProgressMeasurement(_recordsWritten,ProgressType.Records),_timer.Elapsed));
+        job.OnProgress(this,
+            new ProgressEventArgs(_taskBeingPerformed, new ProgressMeasurement(_recordsWritten, ProgressType.Records),
+                _timer.Elapsed));
     }
 
     private IBulkCopy InitializeBulkCopy(DataTable dt, IDataLoadEventListener job)
@@ -140,11 +155,11 @@ public void Abort(IDataLoadEventListener listener)
     }
 
     private bool _isDisposed = false;
-        
+
 
     private void CloseConnection(IDataLoadEventListener listener)
     {
-        if(_isDisposed)
+        if (_isDisposed)
             return;
 
         _isDisposed = true;
@@ -160,16 +175,18 @@ private void CloseConnection(IDataLoadEventListener listener)
         }
         catch (Exception e)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Could not close connection to server", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning, "Could not close connection to server", e));
         }
 
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"SqlBulkCopy closed after writing {_recordsWritten} rows to the server.  Total time spent writing to server:{_timer.Elapsed}"));
     }
 
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        SubmitChunk(toProcess,listener);
+        SubmitChunk(toProcess, listener);
         return null;
     }
 
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/DbDataCommandDataFlowSource.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/DbDataCommandDataFlowSource.cs
index 842b429f65..755e94ddd5 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/DbDataCommandDataFlowSource.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/DbDataCommandDataFlowSource.cs
@@ -15,7 +15,7 @@
 namespace Rdmp.Core.DataLoad.Engine.Pipeline.Sources;
 
 /// <inheritdoc/>
-public class DbDataCommandDataFlowSource :  IDbDataCommandDataFlowSource
+public class DbDataCommandDataFlowSource : IDbDataCommandDataFlowSource
 {
     public string Sql { get; }
     private DbDataReader _reader;
@@ -38,7 +38,8 @@ public class DbDataCommandDataFlowSource :  IDbDataCommandDataFlowSource
     /// </summary>
     public Action<DbCommand> CommandAdjuster { get; set; }
 
-    public DbDataCommandDataFlowSource(string sql,string taskBeingPerformed, DbConnectionStringBuilder builder, int timeout)
+    public DbDataCommandDataFlowSource(string sql, string taskBeingPerformed, DbConnectionStringBuilder builder,
+        int timeout)
     {
         Sql = sql;
         _taskBeingPerformed = taskBeingPerformed;
@@ -81,7 +82,7 @@ public DataTable GetChunk(IDataLoadEventListener job, GracefulCancellationToken
                 cancellationToken.ThrowIfCancellationRequested();
 
                 AddRowToDataTable(chunk, _reader);
-                readThisBatch ++;
+                readThisBatch++;
 
                 //we reached batch limit
                 if (readThisBatch == BatchSize)
@@ -96,22 +97,23 @@ public DataTable GetChunk(IDataLoadEventListener job, GracefulCancellationToken
 
             //if data was exhausted on first read and we are allowing empty result sets
             if (firstChunk && AllowEmptyResultSets)
-                return chunk;//return the empty chunk
+                return chunk; //return the empty chunk
 
             //data exhausted
             return null;
         }
         catch (Exception e)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, "Source read failed",e));
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Source read failed", e));
             throw;
         }
         finally
         {
             firstChunk = false;
             timer.Stop();
-            job.OnProgress(this, new ProgressEventArgs(_taskBeingPerformed, new ProgressMeasurement(TotalRowsRead, ProgressType.Records), timer.Elapsed));
-
+            job.OnProgress(this,
+                new ProgressEventArgs(_taskBeingPerformed, new ProgressMeasurement(TotalRowsRead, ProgressType.Records),
+                    timer.Elapsed));
         }
     }
 
@@ -125,32 +127,32 @@ private DataRow AddRowToDataTable(DataTable chunk, DbDataReader reader)
     }
 
     /// <inheritdoc/>
-    public DataRow ReadOneRow()
-    {
+    public DataRow ReadOneRow() =>
         //return null if there are no more records to read
-        return _reader.Read() ? AddRowToDataTable(GetChunkSchema(_reader), _reader) : null;
-    }
+        _reader.Read() ? AddRowToDataTable(GetChunkSchema(_reader), _reader) : null;
 
     private static DataTable GetChunkSchema(DbDataReader reader)
     {
         var toReturn = new DataTable("dt");
 
         //Retrieve column schema into a DataTable.
-        var schemaTable = reader.GetSchemaTable() ?? throw new InvalidOperationException("Could not retrieve schema information from the DbDataReader");
+        var schemaTable = reader.GetSchemaTable() ??
+                          throw new InvalidOperationException(
+                              "Could not retrieve schema information from the DbDataReader");
         Debug.Assert(schemaTable.Columns[0].ColumnName.ToLower().Contains("name"));
 
         //For each field in the table...
         foreach (DataRow myField in schemaTable.Rows)
         {
-
-            var t = Type.GetType(myField["DataType"].ToString()) ?? throw new NotSupportedException($"Type.GetType failed on SQL DataType:{myField["DataType"]}");
+            var t = Type.GetType(myField["DataType"].ToString()) ??
+                    throw new NotSupportedException($"Type.GetType failed on SQL DataType:{myField["DataType"]}");
 
             //let's not mess around with floats, make everything a double please
-            if (t == typeof (float))
-                t = typeof (double);
+            if (t == typeof(float))
+                t = typeof(double);
 
 
-            toReturn.Columns.Add(myField[0].ToString(), t);//0 should always be the column name
+            toReturn.Columns.Add(myField[0].ToString(), t); //0 should always be the column name
         }
 
         return toReturn;
@@ -184,7 +186,8 @@ private void CloseReader(IDataLoadEventListener listener)
         }
         catch (Exception e)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Could not close Reader / Connection", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning, "Could not close Reader / Connection", e));
         }
     }
 
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/IDbDataCommandDataFlowSource.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/IDbDataCommandDataFlowSource.cs
index efdfcf1a2d..c9d91e8eb7 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/IDbDataCommandDataFlowSource.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/Sources/IDbDataCommandDataFlowSource.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline.Sources;
 /// <summary>
 /// Reads records in Batches (of size BatchSize) from the remote database (DbConnectionStringBuilder builder) by executing the specified _sql.
 /// </summary>
-public interface IDbDataCommandDataFlowSource:IDataFlowSource<DataTable>
+public interface IDbDataCommandDataFlowSource : IDataFlowSource<DataTable>
 {
     /// <summary>
     /// Reads and returns a single row.  GetChunk must have been called at least once to function
diff --git a/Rdmp.Core/DataLoad/Engine/Pipeline/UploadFileUseCase.cs b/Rdmp.Core/DataLoad/Engine/Pipeline/UploadFileUseCase.cs
index 284563ee4f..26e94f5570 100644
--- a/Rdmp.Core/DataLoad/Engine/Pipeline/UploadFileUseCase.cs
+++ b/Rdmp.Core/DataLoad/Engine/Pipeline/UploadFileUseCase.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.DataLoad.Engine.Pipeline;
 /// Describes the use case of uploading a <see cref="FileInfo"/> to a target database server.  Compatible pipelines for achieving this must have a destination
 /// of (or inheriting from) <see cref="DataTableUploadDestination"/> and a source that implements IPipelineRequirement&lt;FlatFileToLoad&gt;.
 /// </summary>
-public sealed class UploadFileUseCase:PipelineUseCase
+public sealed class UploadFileUseCase : PipelineUseCase
 {
     public UploadFileUseCase(FileInfo file, DiscoveredDatabase targetDatabase, IBasicActivateItems activator)
     {
@@ -35,19 +35,16 @@ protected override IDataFlowPipelineContext GenerateContextImpl()
         context.MustHaveDestination = typeof(DataTableUploadDestination);
         return context;
     }
-        
-    private UploadFileUseCase():base(new []
+
+    private UploadFileUseCase() : base(new[]
     {
-        typeof (FlatFileToLoad),
-        typeof (DiscoveredDatabase),
-        typeof (IBasicActivateItems)
+        typeof(FlatFileToLoad),
+        typeof(DiscoveredDatabase),
+        typeof(IBasicActivateItems)
     })
     {
         GenerateContext();
     }
 
-    public static PipelineUseCase DesignTime()
-    {
-        return new UploadFileUseCase();
-    }
+    public static PipelineUseCase DesignTime() => new UploadFileUseCase();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/AnySeparatorFileAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/AnySeparatorFileAttacher.cs
index 8841c49837..2f0fdcb2ae 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/AnySeparatorFileAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/AnySeparatorFileAttacher.cs
@@ -28,7 +28,7 @@ public string Separator
     public AnySeparatorFileAttacher() : base('A')
     {
     }
-        
+
     public override void Check(ICheckNotifier notifier)
     {
         base.Check(notifier);
@@ -39,6 +39,5 @@ public override void Check(ICheckNotifier notifier)
                 new CheckEventArgs(
                     "Separator has not been set yet, this is the character or sequence which seperates cells in your flat file.  For example in the case of a CSV (comma seperated values) file the Separator argument should be set to ','",
                     CheckResult.Fail));
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/DelimitedFlatFileAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/DelimitedFlatFileAttacher.cs
index d197830aa7..9b0ec30e0f 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/DelimitedFlatFileAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/DelimitedFlatFileAttacher.cs
@@ -25,13 +25,14 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 public abstract class DelimitedFlatFileAttacher : FlatFileAttacher
 {
     protected DelimitedFlatFileDataFlowSource _source;
-        
+
     [DemandsInitialization(DelimitedFlatFileDataFlowSource.ForceHeaders_DemandDescription)]
-    public string ForceHeaders {
+    public string ForceHeaders
+    {
         get => _source.ForceHeaders;
         set => _source.ForceHeaders = value;
     }
-        
+
     [DemandsInitialization(DelimitedFlatFileDataFlowSource.IgnoreQuotes_DemandDescription)]
     public bool IgnoreQuotes
     {
@@ -40,7 +41,8 @@ public bool IgnoreQuotes
     }
 
     [DemandsInitialization(DelimitedFlatFileDataFlowSource.IgnoreBlankLines_DemandDescription)]
-    public bool IgnoreBlankLines {
+    public bool IgnoreBlankLines
+    {
         get => _source.IgnoreBlankLines;
         set => _source.IgnoreBlankLines = value;
     }
@@ -59,7 +61,8 @@ public string IgnoreColumns
         set => _source.IgnoreColumns = value;
     }
 
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.BadDataHandlingStrategy_DemandDescription,DefaultValue = BadDataHandlingStrategy.ThrowException)]
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.BadDataHandlingStrategy_DemandDescription,
+        DefaultValue = BadDataHandlingStrategy.ThrowException)]
     public BadDataHandlingStrategy BadDataHandlingStrategy
     {
         get => _source.BadDataHandlingStrategy;
@@ -72,22 +75,23 @@ public bool IgnoreBadReads
         get => _source.IgnoreBadReads;
         set => _source.IgnoreBadReads = value;
     }
-        
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.ThrowOnEmptyFiles_DemandDescription,DefaultValue = true)]
+
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.ThrowOnEmptyFiles_DemandDescription, DefaultValue = true)]
     public bool ThrowOnEmptyFiles
     {
         get => _source.ThrowOnEmptyFiles;
         set => _source.ThrowOnEmptyFiles = value;
     }
 
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.AttemptToResolveNewLinesInRecords_DemandDescription, DefaultValue = false)]
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.AttemptToResolveNewLinesInRecords_DemandDescription,
+        DefaultValue = false)]
     public bool AttemptToResolveNewLinesInRecords
     {
         get => _source.AttemptToResolveNewLinesInRecords;
         set => _source.AttemptToResolveNewLinesInRecords = value;
     }
 
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MaximumErrorsToReport_DemandDescription,DefaultValue = 100)]
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MaximumErrorsToReport_DemandDescription, DefaultValue = 100)]
     public int MaximumErrorsToReport
     {
         get => _source.MaximumErrorsToReport;
@@ -98,16 +102,23 @@ public int MaximumErrorsToReport
     public string AddFilenameColumnNamed { get; set; }
 
     [DemandsInitialization(Culture_DemandDescription)]
-    public override CultureInfo Culture { get => _source.Culture; set => _source.Culture = value; }
+    public override CultureInfo Culture
+    {
+        get => _source.Culture;
+        set => _source.Culture = value;
+    }
 
     [DemandsInitialization(ExplicitDateTimeFormat_DemandDescription)]
-    public override string ExplicitDateTimeFormat {get => _source.ExplicitDateTimeFormat; set => _source.ExplicitDateTimeFormat = value; }
+    public override string ExplicitDateTimeFormat
+    {
+        get => _source.ExplicitDateTimeFormat;
+        set => _source.ExplicitDateTimeFormat = value;
+    }
 
 
     protected DelimitedFlatFileAttacher(char separator)
     {
         SetupSource(separator);
-
     }
 
     private void SetupSource(char separator)
@@ -123,7 +134,8 @@ private void SetupSource(char separator)
     private IDataLoadEventListener _listener;
     private FileInfo _currentFile;
 
-    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,GracefulCancellationToken cancellationToken)
+    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,
+        GracefulCancellationToken cancellationToken)
     {
         _source.MaxBatchSize = maxBatchSize;
         _source.SetDataTable(dt);
@@ -132,19 +144,20 @@ protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int m
         //if we are adding a column to the data read which contains the file path
         if (!string.IsNullOrWhiteSpace(AddFilenameColumnNamed))
         {
-            if(!dt.Columns.Contains(AddFilenameColumnNamed))
+            if (!dt.Columns.Contains(AddFilenameColumnNamed))
                 throw new FlatFileLoadException(
                     $"AddFilenameColumnNamed is set to '{AddFilenameColumnNamed}' but the column did not exist in RAW");
 
             foreach (DataRow row in dt.Rows)
                 if (row[AddFilenameColumnNamed] == DBNull.Value)
                     row[AddFilenameColumnNamed] = _currentFile.FullName;
-                
         }
+
         return dt.Rows.Count;
     }
 
-    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         _source.StronglyTypeInput = false;
         _source.StronglyTypeInputBatchSize = 0;
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs
index 1e5c0e9dc2..31e7c4e444 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/ExcelAttacher.cs
@@ -23,7 +23,7 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// Data load component for loading Microsoft Excel files into RAW tables.  This class relies on pipeline source component ExcelDataFlowSource for the actual
 /// reading and handles only the rationalisation of columns read vs RAW columns available.
 /// </summary>
-public class ExcelAttacher:FlatFileAttacher
+public class ExcelAttacher : FlatFileAttacher
 {
     private ExcelDataFlowSource _hostedSource;
     private DataTable _dataTable;
@@ -34,16 +34,19 @@ public class ExcelAttacher:FlatFileAttacher
 
     [DemandsInitialization(ExcelDataFlowSource.AddFilenameColumnNamed_DemandDescription)]
     public string AddFilenameColumnNamed { get; set; }
-        
-    [DemandsInitialization("Forces specific overridden headers to be for columns, this is a comma separated string that will effectively replace the column headers found in the excel file.  The number of headers MUST match the number in the original file.  This option should be used when you have a excel file with stupid names that you want to rationalise into sensible database column names")]
+
+    [DemandsInitialization(
+        "Forces specific overridden headers to be for columns, this is a comma separated string that will effectively replace the column headers found in the excel file.  The number of headers MUST match the number in the original file.  This option should be used when you have a excel file with stupid names that you want to rationalise into sensible database column names")]
     public string ForceReplacementHeaders { get; set; }
 
-    [DemandsInitialization("By default ALL columns in the source MUST match exactly (by name) the set of all columns in the destination table.  If you enable this option then it is allowable for there to be extra columns in the destination that are not populated (because they are not found in the flat file).  This does not let you discard columns from the source! (all source columns must have mappings but destination columns with no matching source are left null)")]
+    [DemandsInitialization(
+        "By default ALL columns in the source MUST match exactly (by name) the set of all columns in the destination table.  If you enable this option then it is allowable for there to be extra columns in the destination that are not populated (because they are not found in the flat file).  This does not let you discard columns from the source! (all source columns must have mappings but destination columns with no matching source are left null)")]
     public bool AllowExtraColumnsInTargetWithoutComplainingOfColumnMismatch { get; set; }
 
     private bool _haveServedData = false;
 
-    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         _haveServedData = false;
         _fileToLoad = fileToLoad;
@@ -53,7 +56,7 @@ protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener lis
             AddFilenameColumnNamed = AddFilenameColumnNamed
         };
 
-        _hostedSource.PreInitialize(new FlatFileToLoad(fileToLoad),listener);
+        _hostedSource.PreInitialize(new FlatFileToLoad(fileToLoad), listener);
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"About to start processing {fileToLoad.FullName}"));
 
@@ -62,26 +65,30 @@ protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener lis
         if (!string.IsNullOrEmpty(ForceReplacementHeaders))
         {
             //split headers by , (and trim leading/trailing whitespace).
-            var replacementHeadersSplit = ForceReplacementHeaders.Split(',').Select(h=>string.IsNullOrWhiteSpace(h)?h:h.Trim()).ToArray();
+            var replacementHeadersSplit = ForceReplacementHeaders.Split(',')
+                .Select(h => string.IsNullOrWhiteSpace(h) ? h : h.Trim()).ToArray();
 
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Force headers will make the following header changes:{GenerateASCIIArtOfSubstitutions(replacementHeadersSplit, _dataTable.Columns)}"));
-                
+
             if (replacementHeadersSplit.Length != _dataTable.Columns.Count)
                 listener.OnNotify(this,
                     new NotifyEventArgs(ProgressEventType.Error,
                         $"ForceReplacementHeaders was set but it had {replacementHeadersSplit.Length} column header names while the file had {_dataTable.Columns.Count} (there must be the same number of replacement headers as headers in the excel file)"));
             else
                 for (var i = 0; i < replacementHeadersSplit.Length; i++)
-                    _dataTable.Columns[i].ColumnName = replacementHeadersSplit[i];//rename the columns to match the forced replacments
+                    _dataTable.Columns[i].ColumnName =
+                        replacementHeadersSplit[i]; //rename the columns to match the forced replacments
         }
 
         //all data should now be exhausted
-        if(_hostedSource.GetChunk(listener,cancellationToken)!= null)
-            throw new Exception("Hosted source served more than 1 chunk, expected all the data to be read from the Excel file in one go");
+        if (_hostedSource.GetChunk(listener, cancellationToken) != null)
+            throw new Exception(
+                "Hosted source served more than 1 chunk, expected all the data to be read from the Excel file in one go");
     }
 
-    private static string GenerateASCIIArtOfSubstitutions(string[] replacementHeadersSplit, DataColumnCollection columns)
+    private static string GenerateASCIIArtOfSubstitutions(string[] replacementHeadersSplit,
+        DataColumnCollection columns)
     {
         var sb = new StringBuilder("");
 
@@ -98,7 +105,8 @@ private static string GenerateASCIIArtOfSubstitutions(string[] replacementHeader
         return sb.ToString();
     }
 
-    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable loadTarget, int maxBatchSize,GracefulCancellationToken cancellationToken)
+    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable loadTarget, int maxBatchSize,
+        GracefulCancellationToken cancellationToken)
     {
         if (!_haveServedData)
         {
@@ -109,26 +117,30 @@ protected override int IterativelyBatchLoadDataIntoDataTable(DataTable loadTarge
 
                     //column names must be the same!
                     foreach (DataColumn column in loadTarget.Columns)
-                    {
                         if (_dataTable.Columns.Contains(column.ColumnName))
                         {
-                            if (dr[column.ColumnName] == null || string.IsNullOrWhiteSpace(dr[column.ColumnName].ToString()))
+                            if (dr[column.ColumnName] == null ||
+                                string.IsNullOrWhiteSpace(dr[column.ColumnName].ToString()))
                                 targetRow[column.ColumnName] = DBNull.Value;
                             else
-                                targetRow[column.ColumnName] = dr[column.ColumnName];//copy values into the destination
+                                targetRow[column.ColumnName] = dr[column.ColumnName]; //copy values into the destination
                         }
-                        else 
-                        if (AllowExtraColumnsInTargetWithoutComplainingOfColumnMismatch)//it is an extra destination column, see if that is allowed
+                        else if
+                            (AllowExtraColumnsInTargetWithoutComplainingOfColumnMismatch) //it is an extra destination column, see if that is allowed
+                        {
                             targetRow[column.ColumnName] = DBNull.Value;
+                        }
                         else
+                        {
                             throw new Exception(
                                 $"Could not find column {column.ColumnName} in the source table we loaded from Excel, this should have been picked up earlier in GenerateColumnNameMismatchErrors");
-                    }
+                        }
                 }
                 catch (Exception e)
                 {
                     throw new Exception(
-                        $"Could not import values into RAW DataTable structure (from Excel DataTable structure):{string.Join(",", dr.ItemArray)}",e);
+                        $"Could not import values into RAW DataTable structure (from Excel DataTable structure):{string.Join(",", dr.ItemArray)}",
+                        e);
                 }
 
             _haveServedData = true;
@@ -137,17 +149,17 @@ protected override int IterativelyBatchLoadDataIntoDataTable(DataTable loadTarge
         }
 
         return 0;
-
     }
 
 
-    private void GenerateColumnNameMismatchErrors(List<string> columnsExcelButNotInDataTable, List<string> columnsInDataTableButNotInExcel)
+    private void GenerateColumnNameMismatchErrors(List<string> columnsExcelButNotInDataTable,
+        List<string> columnsInDataTableButNotInExcel)
     {
         //if there are unmatched columns in the flat file
-        if (columnsExcelButNotInDataTable.Any() || 
-                
+        if (columnsExcelButNotInDataTable.Any() ||
+
             //or there are unmatched columns in the destination (and we are not happy just leaving those as null)
-            (columnsInDataTableButNotInExcel.Any() && ! AllowExtraColumnsInTargetWithoutComplainingOfColumnMismatch))
+            (columnsInDataTableButNotInExcel.Any() && !AllowExtraColumnsInTargetWithoutComplainingOfColumnMismatch))
             throw new Exception(
                 $"Mismatch between RAW table {TableName} and Excel file \"{_fileToLoad.FullName}\":{Environment.NewLine}Columns in Excel file but not in DataTable {TableName}:{Environment.NewLine}{columnsExcelButNotInDataTable.Aggregate("", (s, n) => $"{s}{n},").TrimEnd(',')}{Environment.NewLine}Columns in DataTable but not in Excel file \"{_fileToLoad.FullName}\":{Environment.NewLine}{columnsInDataTableButNotInExcel.Aggregate("", (s, n) => $"{s}{n},").TrimEnd(',')}{Environment.NewLine}{Environment.NewLine}"
             );
@@ -155,7 +167,6 @@ private void GenerateColumnNameMismatchErrors(List<string> columnsExcelButNotInD
 
     protected override void CloseFile()
     {
-            
     }
 
 
@@ -169,5 +180,4 @@ protected override void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTar
             colsInSource.Except(colsInTarget).ToList(),
             colsInTarget.Except(colsInSource).ToList());
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthAttacher.cs
index c5f9be8841..52254915c2 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthAttacher.cs
@@ -28,14 +28,15 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// </summary>
 public class FixedWidthAttacher : FlatFileAttacher
 {
-
     [DemandsInitialization(
         @"The location of a HIC formatted Fixed width file descriptor, e.g. \\ares\unit\HIC Data\DATA Sets\z_TEMPLATE_data_folder\Data\ExampleFixedWidthFormatFile.csv"
     )]
     public FileInfo PathToFormatFile { get; set; }
 
     private DataTable _flatFile;
-    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+
+    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         bHaveAlreadySubmittedData = false;
 
@@ -47,10 +48,12 @@ protected override void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTar
     {
         //complain about unmatched columns
         foreach (DataColumn col in _flatFile.Columns)
-            if (!loadTarget.Columns.Contains(col.ColumnName))//We use notify error here rather than throwing an Exception because there could be many dodgy /misnamed columns so tell the user about all of them
+            if (!loadTarget.Columns
+                    .Contains(col
+                        .ColumnName)) //We use notify error here rather than throwing an Exception because there could be many dodgy /misnamed columns so tell the user about all of them
                 job.OnNotify(this,
                     new NotifyEventArgs(ProgressEventType.Error,
-                        $"Format file ({PathToFormatFile.FullName}) indicated there would be a header called '{col.ColumnName}' but the column did not appear in the RAW database table (Columns in RAW were {string.Join(",", loadTarget.Columns.Cast<DataColumn>().Select(c => c.ColumnName))})")); 
+                        $"Format file ({PathToFormatFile.FullName}) indicated there would be a header called '{col.ColumnName}' but the column did not appear in the RAW database table (Columns in RAW were {string.Join(",", loadTarget.Columns.Cast<DataColumn>().Select(c => c.ColumnName))})"));
     }
 
     private bool bHaveAlreadySubmittedData;
@@ -63,7 +66,8 @@ protected override void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTar
     /// <param name="maxBatchSize"></param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
-    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable destination, int maxBatchSize,GracefulCancellationToken cancellationToken)
+    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable destination, int maxBatchSize,
+        GracefulCancellationToken cancellationToken)
     {
         if (bHaveAlreadySubmittedData)
             return 0;
@@ -79,21 +83,19 @@ protected override int IterativelyBatchLoadDataIntoDataTable(DataTable destinati
 
         //there is no more data to read, return the number of rows read but set bHaveAlreadySubmittedData to true so that we return 0 next time this method is called
         bHaveAlreadySubmittedData = true;
-           
+
         return destination.Rows.Count;
     }
 
     protected override void CloseFile()
     {
-            
     }
 
     public override void Check(ICheckNotifier notifier)
     {
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthColumn.cs b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthColumn.cs
index 3e4e48e42f..0f7f445914 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthColumn.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthColumn.cs
@@ -22,7 +22,7 @@ public struct FixedWidthColumn
     /// are the same number then a 1 character is allotted for that column
     /// </summary>
     public int To;
-        
+
     /// <summary>
     /// The column name to ascribe to the column
     /// </summary>
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthFormatFile.cs b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthFormatFile.cs
index 3fb91c313b..ce3d1ddc8d 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthFormatFile.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/FixedWidthFormatFile.cs
@@ -33,7 +33,7 @@ public FixedWidthFormatFile(FileInfo pathToFormatFile)
 
         //get rid of blank lines
         readAllLines = readAllLines.Where(l => !string.IsNullOrWhiteSpace(l)).ToArray();
-            
+
         //create a format field for each line in the format file
         FormatColumns = new FixedWidthColumn[readAllLines.Length - 1];
 
@@ -49,10 +49,13 @@ public FixedWidthFormatFile(FileInfo pathToFormatFile)
             FormatColumns[index].Size = int.Parse(cellsOnRowAsSplitString[3]);
 
             //It's ok to ommmit this column for specific rows (that aren't dates)
-            if (cellsOnRowAsSplitString.Length >4)
-                FormatColumns[index].DateFormat = cellsOnRowAsSplitString[4].Replace("ccyy","yyyy"); //some people think that ccyy is a valid way of expressing year formats... they are wrong 
+            if (cellsOnRowAsSplitString.Length > 4)
+                FormatColumns[index].DateFormat =
+                    cellsOnRowAsSplitString[4]
+                        .Replace("ccyy",
+                            "yyyy"); //some people think that ccyy is a valid way of expressing year formats... they are wrong 
 
-            if (FormatColumns[index].From + FormatColumns[index].Size -1 != FormatColumns[index].To)
+            if (FormatColumns[index].From + FormatColumns[index].Size - 1 != FormatColumns[index].To)
                 throw new FlatFileLoadException(
                     $"Problem with format of field {FormatColumns[index].Field} From + Size -1 does not equal To");
 
@@ -64,7 +67,8 @@ public FixedWidthFormatFile(FileInfo pathToFormatFile)
                 catch (Exception e)
                 {
                     throw new FlatFileLoadException(
-                        $"Problem with flat file format which announced the date format as {FormatColumns[index].DateFormat} which C# says isn't a valid format",e);
+                        $"Problem with flat file format which announced the date format as {FormatColumns[index].DateFormat} which C# says isn't a valid format",
+                        e);
                 }
         }
     }
@@ -81,10 +85,9 @@ public DataTable GetDataTableFromFlatFile(FileInfo f)
             var dataColumn = toReturn.Columns.Add(fixedWidthColumn.Field);
 
             if (!string.IsNullOrWhiteSpace(fixedWidthColumn.DateFormat))
-                dataColumn.DataType = typeof (DateTime);
+                dataColumn.DataType = typeof(DateTime);
 
             dataColumn.AllowDBNull = true;
-
         }
 
         var lineNumber = 0;
@@ -101,13 +104,13 @@ public DataTable GetDataTableFromFlatFile(FileInfo f)
             //foreach expected fixed width column
             foreach (var fixedWidthColumn in FormatColumns)
             {
-                if(readAllLine.Length < fixedWidthColumn.To)
+                if (readAllLine.Length < fixedWidthColumn.To)
                     throw new FlatFileLoadException(
                         $"Error on line {lineNumber} of file {f.Name}, the format file ({_pathToFormatFile.FullName}) specified that a column {fixedWidthColumn.Field} would be found between character positions {fixedWidthColumn.From} and {fixedWidthColumn.To} but the current line is only {readAllLine.Length} characters long");
 
                 //substring in order to get cell data
-                var value = readAllLine.Substring(fixedWidthColumn.From-1, fixedWidthColumn.Size);
-                      
+                var value = readAllLine.Substring(fixedWidthColumn.From - 1, fixedWidthColumn.Size);
+
                 //if its a null
                 if (string.IsNullOrWhiteSpace(value))
                     dataRow[fixedWidthColumn.Field] = DBNull.Value;
@@ -116,13 +119,13 @@ public DataTable GetDataTableFromFlatFile(FileInfo f)
                 if (!string.IsNullOrWhiteSpace(fixedWidthColumn.DateFormat))
                     try
                     {
-                        dataRow[fixedWidthColumn.Field] = DateTime.ParseExact(value, fixedWidthColumn.DateFormat,null);
+                        dataRow[fixedWidthColumn.Field] = DateTime.ParseExact(value, fixedWidthColumn.DateFormat, null);
                     }
                     catch (Exception e)
                     {
-                            
                         throw new Exception(
-                            $"The value '{value}' was rejected by DateTime.ParseExact using the listed date time format '{fixedWidthColumn.DateFormat}'",e);
+                            $"The value '{value}' was rejected by DateTime.ParseExact using the listed date time format '{fixedWidthColumn.DateFormat}'",
+                            e);
                     }
                 else //its not a date
                     dataRow[fixedWidthColumn.Field] = value.Trim();
@@ -134,15 +137,11 @@ public DataTable GetDataTableFromFlatFile(FileInfo f)
 
     private void EnsureHeaderIntact(string header)
     {
-
         //From	To	Field	Size	DateFormat
-        var expected = string.Join(",",typeof(FixedWidthColumn).GetFields().Select(f=>f.Name));
+        var expected = string.Join(",", typeof(FixedWidthColumn).GetFields().Select(f => f.Name));
 
-        if(!header.TrimEnd().Equals(expected))
+        if (!header.TrimEnd().Equals(expected))
             throw new FlatFileLoadException(
                 $"Format file headers in file {_pathToFormatFile.FullName} WAS: {header} WE EXPECTED: {expected}");
-
-
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/FlatFileAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/FlatFileAttacher.cs
index 9fd661c3bd..7f6909e43e 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/FlatFileAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/FlatFileAttacher.cs
@@ -31,21 +31,24 @@ public abstract class FlatFileAttacher : Attacher, IPluginAttacher
     [DemandsInitialization("The file to attach, e.g. \"*hic*.csv\" - this is NOT a Regex", Mandatory = true)]
     public string FilePattern { get; set; }
 
-    [DemandsInitialization("The table name to load with data from the file (this will be the RAW version of the table)")]
+    [DemandsInitialization(
+        "The table name to load with data from the file (this will be the RAW version of the table)")]
     public ITableInfo TableToLoad { get; set; }
 
-    [DemandsInitialization("Alternative to `TableToLoad`, type table name in if you want to load a custom table e.g. one created by another load component (that doesn't exist in LIVE).  The table name should should not contain wrappers such as square brackets (e.g. \"My Table1\")")]
+    [DemandsInitialization(
+        "Alternative to `TableToLoad`, type table name in if you want to load a custom table e.g. one created by another load component (that doesn't exist in LIVE).  The table name should should not contain wrappers such as square brackets (e.g. \"My Table1\")")]
     public string TableName { get; set; }
 
-    [DemandsInitialization("Determines the behaviour of the system when no files are matched by FilePattern.  If true the entire data load process immediately stops with exit code LoadNotRequired, if false then the load proceeds as normal (useful if for example if you have multiple Attachers and some files are optional)")]
+    [DemandsInitialization(
+        "Determines the behaviour of the system when no files are matched by FilePattern.  If true the entire data load process immediately stops with exit code LoadNotRequired, if false then the load proceeds as normal (useful if for example if you have multiple Attachers and some files are optional)")]
     public bool SendLoadNotRequiredIfFileNotFound { get; set; }
 
-    [DemandsInitialization("If enabled then file(s) that could not be loaded are reported as warnings and the load only marked as failed after completion (including archiving etc)")]
+    [DemandsInitialization(
+        "If enabled then file(s) that could not be loaded are reported as warnings and the load only marked as failed after completion (including archiving etc)")]
     public bool DelayLoadFailures { get; set; }
 
     public FlatFileAttacher() : base(true)
     {
-            
     }
 
     public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -55,7 +58,9 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
             var allTables = job.RegularTablesToLoad.Union(job.LookupTablesToLoad).Distinct().ToArray();
 
             if (!allTables.Contains(TableToLoad))
-                job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"FlatFileAttacher TableToLoad was '{TableToLoad}' (ID={TableToLoad.ID}) but that table was not one of the tables in the load:{string.Join(",", allTables.Select(t=> $"'{t.Name}'"))}"));
+                job.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning,
+                        $"FlatFileAttacher TableToLoad was '{TableToLoad}' (ID={TableToLoad.ID}) but that table was not one of the tables in the load:{string.Join(",", allTables.Select(t => $"'{t.Name}'"))}"));
 
             TableName = TableToLoad.GetRuntimeName(LoadBubble.Raw, job.Configuration.DatabaseNamer);
         }
@@ -67,39 +72,38 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
         timer.Start();
 
 
-        if(string.IsNullOrWhiteSpace(TableName))
+        if (string.IsNullOrWhiteSpace(TableName))
             throw new ArgumentNullException("TableName has not been set, set it in the DataCatalogue");
 
         var table = _dbInfo.ExpectTable(TableName);
 
         //table didn't exist!
         if (!table.Exists())
-            if (!_dbInfo.DiscoverTables(false).Any())//maybe no tables existed
+            if (!_dbInfo.DiscoverTables(false).Any()) //maybe no tables existed
                 throw new FlatFileLoadException("Raw database had 0 tables we could load");
-            else//no there are tables just not the one we were looking for
+            else //no there are tables just not the one we were looking for
                 throw new FlatFileLoadException($"RAW database did not have a table called:{TableName}");
 
 
         //load the flat file
         var filepattern = FilePattern ?? "*";
 
-        var filesToLoad = LoadDirectory.ForLoading.EnumerateFiles(filepattern).OrderBy(a=>a.Name,StringComparer.InvariantCultureIgnoreCase).ToList();
+        var filesToLoad = LoadDirectory.ForLoading.EnumerateFiles(filepattern)
+            .OrderBy(a => a.Name, StringComparer.InvariantCultureIgnoreCase).ToList();
 
         if (!filesToLoad.Any())
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Did not find any files matching pattern {filepattern} in forLoading directory"));
-                
-            if(SendLoadNotRequiredIfFileNotFound)
+
+            if (SendLoadNotRequiredIfFileNotFound)
                 return ExitCodeType.OperationNotRequired;
 
             return ExitCodeType.Success;
         }
 
         foreach (var fileToLoad in filesToLoad)
-        {
-            if(DelayLoadFailures)
-            {
+            if (DelayLoadFailures)
                 try
                 {
                     LoadFile(table, fileToLoad, _dbInfo, timer, job, cancellationToken);
@@ -108,20 +112,16 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
                 {
                     job.CrashAtEnd(new NotifyEventArgs(ProgressEventType.Warning, $"Failed to load {fileToLoad}", ex));
                 }
-
-            }
             else
-            {
                 LoadFile(table, fileToLoad, _dbInfo, timer, job, cancellationToken);
-            }
-        }
-            
+
         timer.Stop();
 
         return ExitCodeType.Success;
     }
 
-    private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, DiscoveredDatabase dbInfo, Stopwatch timer, IDataLoadJob job, GracefulCancellationToken token)
+    private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, DiscoveredDatabase dbInfo, Stopwatch timer,
+        IDataLoadJob job, GracefulCancellationToken token)
     {
         using (var con = dbInfo.Server.GetConnection())
         {
@@ -133,16 +133,16 @@ private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, Discover
                 insert.Timeout = 500000;
 
                 //if user wants to use a specific explicit format for datetimes
-                if(ExplicitDateTimeFormat != null)
-                    insert.DateTimeDecider.Settings.ExplicitDateFormats = new string[]{ExplicitDateTimeFormat};
+                if (ExplicitDateTimeFormat != null)
+                    insert.DateTimeDecider.Settings.ExplicitDateFormats = new string[] { ExplicitDateTimeFormat };
 
                 //bulk insert ito destination
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"About to open file {fileToLoad.FullName}"));
-                OpenFile(fileToLoad,job,token);
+                OpenFile(fileToLoad, job, token);
 
                 //confirm the validity of the headers
-                ConfirmFlatFileHeadersAgainstDataTable(dt,job);
+                ConfirmFlatFileHeadersAgainstDataTable(dt, job);
 
                 con.Open();
 
@@ -150,18 +150,18 @@ private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, Discover
                 var batchNumber = 1;
                 var maxBatchSize = 10000;
                 var recordsCreatedSoFar = 0;
-                
+
                 try
                 {
                     //while there is data to be loaded into table 
-                    while (IterativelyBatchLoadDataIntoDataTable(dt, maxBatchSize,token) != 0)
+                    while (IterativelyBatchLoadDataIntoDataTable(dt, maxBatchSize, token) != 0)
                     {
                         DropEmptyColumns(dt);
                         ConfirmFitToDestination(dt, tableToLoad, job);
                         try
                         {
-                            recordsCreatedSoFar += insert.Upload(dt); 
-                                
+                            recordsCreatedSoFar += insert.Upload(dt);
+
                             dt.Rows.Clear(); //very important otherwise we add more to the end of the table but still insert last batches records resulting in exponentially multiplying upload sizes of duplicate records!
 
                             job.OnProgress(this,
@@ -171,8 +171,8 @@ private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, Discover
                         catch (Exception e)
                         {
                             throw new Exception(
-                                $"Error processing batch number {batchNumber} (of batch size {maxBatchSize})",e);
-                        } 
+                                $"Error processing batch number {batchNumber} (of batch size {maxBatchSize})", e);
+                        }
                     }
                 }
                 catch (Exception e)
@@ -187,38 +187,42 @@ private void LoadFile(DiscoveredTable tableToLoad, FileInfo fileToLoad, Discover
         }
     }
 
-    protected abstract void OpenFile(FileInfo fileToLoad,IDataLoadEventListener listener,GracefulCancellationToken cancellationToken);
+    protected abstract void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken);
+
     protected abstract void CloseFile();
-        
+
     public override void Check(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(TableName) && TableToLoad == null)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Either argument TableName or TableToLoad must be set {this}, you should specify this value.",CheckResult.Fail));
+                $"Either argument TableName or TableToLoad must be set {this}, you should specify this value.",
+                CheckResult.Fail));
 
         if (string.IsNullOrWhiteSpace(FilePattern))
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Argument FilePattern has not been set on {this}, you should specify this value in the LoadMetadataUI", CheckResult.Fail));
+                $"Argument FilePattern has not been set on {this}, you should specify this value in the LoadMetadataUI",
+                CheckResult.Fail));
 
         if (!string.IsNullOrWhiteSpace(TableName) && TableToLoad != null)
-            notifier.OnCheckPerformed(new CheckEventArgs("You should only specify argument TableName or TableToLoad, not both", CheckResult.Fail));
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("You should only specify argument TableName or TableToLoad, not both",
+                    CheckResult.Fail));
     }
-        
-    private void ConfirmFitToDestination(DataTable dt, DiscoveredTable tableToLoad,IDataLoadJob job)
-    {
 
-        var columnsAtDestination = tableToLoad.DiscoverColumns().Select(c=>c.GetRuntimeName()).ToArray();
+    private void ConfirmFitToDestination(DataTable dt, DiscoveredTable tableToLoad, IDataLoadJob job)
+    {
+        var columnsAtDestination = tableToLoad.DiscoverColumns().Select(c => c.GetRuntimeName()).ToArray();
 
         //see if there is a shape problem between stuff that is on the server and stuff that is in the flat file
         if (dt.Columns.Count != columnsAtDestination.Length)
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"There was a mismatch between the number of columns in the flat file ({columnsAtDestination.Aggregate((s, n) => s + Environment.NewLine + n)}) and the number of columns in the RAW database table ({dt.Columns.Count})"));
-            
+
         foreach (DataColumn column in dt.Columns)
-            if (!columnsAtDestination.Contains(column.ColumnName,StringComparer.CurrentCultureIgnoreCase))
+            if (!columnsAtDestination.Contains(column.ColumnName, StringComparer.CurrentCultureIgnoreCase))
                 throw new FlatFileLoadException(
                     $"Column in flat file called {column.ColumnName} does not appear in the RAW database table (after fixing potentially silly names)");
-
     }
 
 
@@ -226,7 +230,7 @@ private void ConfirmFitToDestination(DataTable dt, DiscoveredTable tableToLoad,I
     /// DataTable dt is a copy of what is in RAW, your job (if you choose to accept it) is to look in your file and work out what headers you can see
     /// and then complain to job (or throw) if what you see in the file does not match the RAW target
     /// </summary>
-    protected abstract void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTarget,IDataLoadJob job);
+    protected abstract void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTarget, IDataLoadJob job);
 
 
     /// <summary>
@@ -236,8 +240,9 @@ private void ConfirmFitToDestination(DataTable dt, DiscoveredTable tableToLoad,I
     /// <param name="maxBatchSize"></param>
     /// <param name="cancellationToken"></param>
     /// <returns>return the number of rows read, if you return >0 then you will be called again to get more data (if during this second or subsequent call there is no more data to read from source, return 0)</returns>
-    protected abstract int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,GracefulCancellationToken cancellationToken);
-        
+    protected abstract int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,
+        GracefulCancellationToken cancellationToken);
+
 
     private static void DropEmptyColumns(DataTable dt)
     {
@@ -245,8 +250,8 @@ private static void DropEmptyColumns(DataTable dt)
 
         //deal with any ending columns which have nothing but whitespace
         for (var i = dt.Columns.Count - 1; i >= 0; i--)
-        {
-            if (emptyColumnsSyntheticNames.IsMatch(dt.Columns[i].ColumnName) || string.IsNullOrWhiteSpace(dt.Columns[i].ColumnName)) //is synthetic column or blank, nuke it
+            if (emptyColumnsSyntheticNames.IsMatch(dt.Columns[i].ColumnName) ||
+                string.IsNullOrWhiteSpace(dt.Columns[i].ColumnName)) //is synthetic column or blank, nuke it
             {
                 var foundValue = false;
                 foreach (DataRow dr in dt.Rows)
@@ -260,20 +265,15 @@ private static void DropEmptyColumns(DataTable dt)
                     foundValue = true;
                     break;
                 }
+
                 if (!foundValue)
                     dt.Columns.Remove(dt.Columns[i]);
             }
-        }
-    }
-        
-    protected virtual object HackValueReadFromFile(string s)
-    {
-            
-        return s;
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    protected virtual object HackValueReadFromFile(string s) => s;
+
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacher.cs
index 416f30cc47..15a0753f7f 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacher.cs
@@ -29,46 +29,53 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// <para>Component converts each DataTable row into one or more rows in the format pk,key,value where pk are the column(s) which uniquely identify the source
 /// row (e.g. Labnumber).  See KVPAttacher.docx for a full explanation.</para>
 /// </summary>
-public class KVPAttacher :FlatFileAttacher, IDemandToUseAPipeline, IDataFlowDestination<DataTable>
+public class KVPAttacher : FlatFileAttacher, IDemandToUseAPipeline, IDataFlowDestination<DataTable>
 {
-    [DemandsInitialization("Pipeline for reading from the flat file",Mandatory = true)]
+    [DemandsInitialization("Pipeline for reading from the flat file", Mandatory = true)]
     public Pipeline PipelineForReadingFromFlatFile { get; set; }
 
     private List<DataTable> BatchesReadyForProcessing = new();
 
-    [DemandsInitialization("A comma separated list of column names that make up the primary key of the KVP table (in most cases this is only one column).  These must appear in the file",Mandatory = true)]
+    [DemandsInitialization(
+        "A comma separated list of column names that make up the primary key of the KVP table (in most cases this is only one column).  These must appear in the file",
+        Mandatory = true)]
     public string PrimaryKeyColumns { get; set; }
 
-    [DemandsInitialization("The name of the column in RAW which will store the Key component of the KeyValuePair relationship e.g. 'Key', 'Test' or 'Attribute' etc",Mandatory = true)]
+    [DemandsInitialization(
+        "The name of the column in RAW which will store the Key component of the KeyValuePair relationship e.g. 'Key', 'Test' or 'Attribute' etc",
+        Mandatory = true)]
     public string TargetDataTableKeyColumnName { get; set; }
 
-    [DemandsInitialization("The name of the column in RAW which will store the Value component of the KeyValuePair relationship e.g. 'Value', 'Result' or 'Val' etc",Mandatory = true)]
+    [DemandsInitialization(
+        "The name of the column in RAW which will store the Value component of the KeyValuePair relationship e.g. 'Value', 'Result' or 'Val' etc",
+        Mandatory = true)]
     public string TargetDataTableValueColumnName { get; set; }
 
     #region Attacher Functionality
-    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+
+    protected override void OpenFile(FileInfo fileToLoad, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        if(BatchesReadyForProcessing.Any())
-            throw new NotSupportedException("There are still batches awaiting dispatch to RAW, we cannot open a new file at this time");
+        if (BatchesReadyForProcessing.Any())
+            throw new NotSupportedException(
+                "There are still batches awaiting dispatch to RAW, we cannot open a new file at this time");
 
         var flatFileToLoad = new FlatFileToLoad(fileToLoad);
 
         //stamp out the pipeline into an instance
-        var dataFlow = new KVPAttacherPipelineUseCase(this, flatFileToLoad).GetEngine(PipelineForReadingFromFlatFile, listener);
+        var dataFlow =
+            new KVPAttacherPipelineUseCase(this, flatFileToLoad).GetEngine(PipelineForReadingFromFlatFile, listener);
 
         //will result in the opening and processing of the file and the passing of DataTables through the Pipeline finally arriving at the destination (us) in ProcessPipelineData
         dataFlow.ExecutePipeline(cancellationToken);
-
     }
 
     protected override void CloseFile()
     {
-            
     }
 
     protected override void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTarget, IDataLoadJob job)
     {
-
         var pks = GetPKs();
 
         //make sure the primary key columns are in all the relevant tables
@@ -91,10 +98,10 @@ protected override void ConfirmFlatFileHeadersAgainstDataTable(DataTable loadTar
         if (!loadTarget.Columns.Contains(TargetDataTableValueColumnName))
             throw new KeyNotFoundException(
                 $"Target destination table {TableName} did not contain a column called '{TargetDataTableValueColumnName}' which is where we were told to store the Value of the Key value pairs");
-
     }
-        
-    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,GracefulCancellationToken cancellationToken)
+
+    protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int maxBatchSize,
+        GracefulCancellationToken cancellationToken)
     {
         //there are no batches for processing
         if (!BatchesReadyForProcessing.Any())
@@ -110,14 +117,14 @@ protected override int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int m
         foreach (DataRow batchRow in currentBatch.Rows)
         {
             var pkValues = new Dictionary<string, object>();
-                
-            foreach(var pk in pks)
-                pkValues.Add(pk,batchRow[pk]);
+
+            foreach (var pk in pks)
+                pkValues.Add(pk, batchRow[pk]);
 
             foreach (DataColumn col in currentBatch.Columns)
             {
-                if(pks.Contains(col.ColumnName))
-                    continue;//it's a primary key column
+                if (pks.Contains(col.ColumnName))
+                    continue; //it's a primary key column
 
                 var k = col.ColumnName;
                 var val = batchRow[k];
@@ -148,8 +155,9 @@ private string[] GetPKs()
     #endregion
 
     #region IDataFlowDestination Members
-         
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         BatchesReadyForProcessing.Add(toProcess.Copy());
         return null;
@@ -157,13 +165,12 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
+
     #endregion
 
 
@@ -172,29 +179,32 @@ public override void Check(ICheckNotifier notifier)
         base.Check(notifier);
 
         if (string.IsNullOrWhiteSpace(PrimaryKeyColumns))
-            notifier.OnCheckPerformed(new CheckEventArgs("Argument PrimaryKeyColumns has not been set",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Argument PrimaryKeyColumns has not been set",
+                CheckResult.Fail));
 
         var pks = GetPKs();
-            
+
         if (string.IsNullOrWhiteSpace(TargetDataTableKeyColumnName))
-            notifier.OnCheckPerformed(new CheckEventArgs("Argument TargetDataTableKeyColumnName has not been set", CheckResult.Fail));
-            
+            notifier.OnCheckPerformed(new CheckEventArgs("Argument TargetDataTableKeyColumnName has not been set",
+                CheckResult.Fail));
+
         if (string.IsNullOrWhiteSpace(TargetDataTableValueColumnName))
-            notifier.OnCheckPerformed(new CheckEventArgs("Argument TargetDataTableValueColumnName has not been set", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Argument TargetDataTableValueColumnName has not been set",
+                CheckResult.Fail));
 
-        var duplicate = pks.FirstOrDefault(s => s.Equals(TargetDataTableKeyColumnName) || s.Equals(TargetDataTableValueColumnName));
+        var duplicate = pks.FirstOrDefault(s =>
+            s.Equals(TargetDataTableKeyColumnName) || s.Equals(TargetDataTableValueColumnName));
 
         if (duplicate != null)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Field '{duplicate}' is both a PrimaryKeyColumn and a TargetDataTable column, this is not allowed.  Your fields Pk1,Pk2,Pketc,Key,Value must all be mutually exclusive", CheckResult.Fail));
+                $"Field '{duplicate}' is both a PrimaryKeyColumn and a TargetDataTable column, this is not allowed.  Your fields Pk1,Pk2,Pketc,Key,Value must all be mutually exclusive",
+                CheckResult.Fail));
 
         if (TargetDataTableKeyColumnName != null && TargetDataTableKeyColumnName.Equals(TargetDataTableValueColumnName))
-            notifier.OnCheckPerformed(new CheckEventArgs("TargetDataTableKeyColumnName cannot be the same as TargetDataTableValueColumnName",CheckResult.Fail));
-
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "TargetDataTableKeyColumnName cannot be the same as TargetDataTableValueColumnName", CheckResult.Fail));
     }
 
-    public IPipelineUseCase GetDesignTimePipelineUseCase(RequiredPropertyInfo property)
-    {
-        return new KVPAttacherPipelineUseCase(this,new FlatFileToLoad(null));
-    }
+    public IPipelineUseCase GetDesignTimePipelineUseCase(RequiredPropertyInfo property) =>
+        new KVPAttacherPipelineUseCase(this, new FlatFileToLoad(null));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacherPipelineUseCase.cs b/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacherPipelineUseCase.cs
index d70a8ff8a8..bf93e4c20c 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacherPipelineUseCase.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/KVPAttacherPipelineUseCase.cs
@@ -17,11 +17,11 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// </summary>
 public sealed class KVPAttacherPipelineUseCase : PipelineUseCase
 {
-    public KVPAttacherPipelineUseCase(KVPAttacher kvpAttacher,FlatFileToLoad file)
+    public KVPAttacherPipelineUseCase(KVPAttacher kvpAttacher, FlatFileToLoad file)
     {
         ExplicitDestination = kvpAttacher;
         AddInitializationObject(file);
-            
+
         GenerateContext();
     }
 
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/MDFAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/MDFAttacher.cs
index 5813d66b22..27438e84b9 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/MDFAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/MDFAttacher.cs
@@ -26,7 +26,7 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// will function normally.  It is up to the user to ensure that the table names/columns in the attached MDF match expected LIVE tables on your server (or 
 /// write AdjustRAW scripts to harmonise).</para>
 /// </summary>
-public class MDFAttacher : Attacher,IPluginAttacher
+public class MDFAttacher : Attacher, IPluginAttacher
 {
     private const string GetDefaultSQLServerDatabaseDirectory = @"SELECT physical_name 
             FROM sys.master_files mf   
@@ -34,23 +34,26 @@ INNER JOIN sys.[databases] d
             ON mf.[database_id] = d.[database_id]   
             WHERE d.[name] = 'master' AND type = 0";
 
-    [DemandsInitialization("Set this only if your RAW server is NOT localhost.  This is the network path to the DATA directory of your RAW database server you can find the DATA directory by running 'select * FROM sys.master_files'")]
-    public string OverrideMDFFileCopyDestination{ get; set; }
+    [DemandsInitialization(
+        "Set this only if your RAW server is NOT localhost.  This is the network path to the DATA directory of your RAW database server you can find the DATA directory by running 'select * FROM sys.master_files'")]
+    public string OverrideMDFFileCopyDestination { get; set; }
 
-    [DemandsInitialization(@"There are multiple ways to attach a mdf files to an SQL server, the first stage is always to copy the mdf and ldf files to the DATA directory of your server but after that it gets flexible.  
+    [DemandsInitialization(
+        @"There are multiple ways to attach a mdf files to an SQL server, the first stage is always to copy the mdf and ldf files to the DATA directory of your server but after that it gets flexible.  
 1. AttachWithConnectionString attempts to do the attaching as part of connection by specifying the AttachDBFilename keyword in the connection string
 2. ExecuteCreateDatabaseForAttachSql attempts to connect to 'master' and execute CREATE DATABASE sql with the FILENAME property set to your mdf file in the DATA directory of your database server")]
     public MdfAttachStrategy AttachStrategy { get; set; }
 
-    [DemandsInitialization("Set this only if you encounter problems with the ATTACH stage path.  This is the local path to the .mdf file in the DATA directory from the perspective of SQL Server")]
+    [DemandsInitialization(
+        "Set this only if you encounter problems with the ATTACH stage path.  This is the local path to the .mdf file in the DATA directory from the perspective of SQL Server")]
     public string OverrideAttachMdfPath { get; set; }
 
-    [DemandsInitialization("Set this only if you encounter problems with the ATTACH stage path.  This is the local path to the .ldf file in the DATA directory from the perspective of SQL Server")]
+    [DemandsInitialization(
+        "Set this only if you encounter problems with the ATTACH stage path.  This is the local path to the .ldf file in the DATA directory from the perspective of SQL Server")]
     public string OverrideAttachLdfPath { get; set; }
-                
-    public MDFAttacher():base(false)
+
+    public MDFAttacher() : base(false)
     {
-             
     }
 
     private MdfFileAttachLocations _locations;
@@ -58,8 +61,10 @@ public MDFAttacher():base(false)
     public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
         //The location of .mdf files from the perspective of the database server
-        var databaseDirectory = FindDefaultSQLServerDatabaseDirectory(new FromDataLoadEventListenerToCheckNotifier(job));
-        _locations = new MdfFileAttachLocations(LoadDirectory.ForLoading, databaseDirectory, OverrideMDFFileCopyDestination);
+        var databaseDirectory =
+            FindDefaultSQLServerDatabaseDirectory(new FromDataLoadEventListenerToCheckNotifier(job));
+        _locations =
+            new MdfFileAttachLocations(LoadDirectory.ForLoading, databaseDirectory, OverrideMDFFileCopyDestination);
 
         if (!string.IsNullOrWhiteSpace(OverrideAttachMdfPath))
             _locations.AttachMdfPath = OverrideAttachMdfPath;
@@ -67,10 +72,11 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
         if (!string.IsNullOrWhiteSpace(OverrideAttachLdfPath))
             _locations.AttachLdfPath = OverrideAttachLdfPath;
 
-        job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Identified the MDF file:{_locations.OriginLocationMdf} and corresponding LDF file:{_locations.OriginLocationLdf}"));
 
-        AsyncCopyMDFFilesWithEvents(_locations.OriginLocationMdf,_locations.CopyToMdf,_locations.OriginLocationLdf,_locations.CopyToLdf,job);
+        AsyncCopyMDFFilesWithEvents(_locations.OriginLocationMdf, _locations.CopyToMdf, _locations.OriginLocationLdf,
+            _locations.CopyToLdf, job);
 
         return AttachStrategy switch
         {
@@ -92,7 +98,7 @@ private ExitCodeType ExecuteCreateDatabaseForAttachSql(IDataLoadEventListener li
         using var con = new SqlConnection(builder.ConnectionString);
         try
         {
-            if(_dbInfo.Exists())
+            if (_dbInfo.Exists())
                 throw new Exception(
                     $"Database {_dbInfo.GetRuntimeName()} already exists on server {builder.DataSource}");
 
@@ -105,8 +111,8 @@ private ExitCodeType ExecuteCreateDatabaseForAttachSql(IDataLoadEventListener li
             var cmd = new SqlCommand($@"  CREATE DATABASE {nameTheyWant}   
    ON (FILENAME = '{_locations.AttachMdfPath}'),   
    (FILENAME = '{_locations.AttachLdfPath}')   
-   FOR ATTACH;  ",con);
-                    
+   FOR ATTACH;  ", con);
+
 
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"About to execute SQL: {cmd.CommandText}"));
@@ -162,37 +168,35 @@ private ExitCodeType AttachWithConnectionString(IDataLoadEventListener listener)
         }
 
         return ExitCodeType.Success;
-
     }
 
-    public override void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
         //don't bother cleaning up if it bombed
         if (exitCode == ExitCodeType.Error)
             return;
-             
+
         //its Abort,Success or LoadNotRequired
-            
+
         // Detach database
         try
         {
             var dbToDropName = _dbInfo.GetRuntimeName();
 
-            if(!dbToDropName.EndsWith("_RAW"))
+            if (!dbToDropName.EndsWith("_RAW"))
                 throw new Exception(
                     $"We were in the cleanup phase and were about to drop the database that was created by MDFAttacher when we noticed its name didn't end with _RAW!, its name was:{dbToDropName} were we about to nuke your live database?");
 
             _dbInfo.Drop();
 
             // Only delete the copied file if we successfully extracted the content first, to save ChrisH lots of re-copying...
-            if (exitCode==ExitCodeType.Success)
+            if (exitCode == ExitCodeType.Success)
                 DeleteFilesIfExist();
         }
         catch (Exception e)
         {
             throw new Exception($"Could not detach database '{_dbInfo.GetRuntimeName()}': {e}");
         }
-
     }
 
     private void DeleteFilesIfExist()
@@ -223,8 +227,8 @@ private bool FilesSimilar(string pathA, string pathB, IDataLoadEventListener job
             if (a.LastWriteTimeUtc != b.LastWriteTimeUtc) return false;
             if (a.Length != b.Length) return false;
             if (a.Length < 8192) return false;
-            using var streamA =File.OpenRead(pathA);
-            using var streamB =File.OpenRead(pathB);
+            using var streamA = File.OpenRead(pathA);
+            using var streamB = File.OpenRead(pathB);
             if (streamA.Read(bufferA, 0, 4096) != 4096 || streamB.Read(bufferB, 0, 4096) != 4096) return false;
             if (!bufferA.SequenceEqual(bufferB)) return false;
             streamA.Seek(-4096, SeekOrigin.End);
@@ -235,55 +239,65 @@ private bool FilesSimilar(string pathA, string pathB, IDataLoadEventListener job
         }
         catch (Exception e)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Unable to compare files {pathA} and {pathB} due to {e.Message}",e));
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    $"Unable to compare files {pathA} and {pathB} due to {e.Message}", e));
             return false;
         }
     }
 
     private void CopyIfNeeded(string src, string dest, IDataLoadEventListener job)
     {
-        if (FilesSimilar(src, dest,job))
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Files {src} and {dest} match, skipping copy"));
+        if (FilesSimilar(src, dest, job))
+        {
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information, $"Files {src} and {dest} match, skipping copy"));
+        }
         else
         {
             if (File.Exists(dest))
-                job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,"Overwriting existing database file '{dest}'"));
+                job.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Warning, "Overwriting existing database file '{dest}'"));
             File.Copy(src, dest, true);
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Copied {src} to {dest}"));
         }
     }
 
-    private void AsyncCopyMDFFilesWithEvents(string MDFSource, string MDFDestination, string LDFSource, string LDFDestination,IDataLoadEventListener job)
+    private void AsyncCopyMDFFilesWithEvents(string MDFSource, string MDFDestination, string LDFSource,
+        string LDFDestination, IDataLoadEventListener job)
     {
         ArgumentNullException.ThrowIfNull(MDFDestination);
         ArgumentNullException.ThrowIfNull(LDFDestination);
 
-        CopyIfNeeded(MDFSource,MDFDestination,job);
-        CopyIfNeeded(LDFSource,LDFDestination,job);
+        CopyIfNeeded(MDFSource, MDFDestination, job);
+        CopyIfNeeded(LDFSource, LDFDestination, job);
     }
 
     public string FindDefaultSQLServerDatabaseDirectory(ICheckNotifier notifier)
     {
-        notifier.OnCheckPerformed(new CheckEventArgs("About to look up Sql Server DATA directory Path",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs("About to look up Sql Server DATA directory Path",
+            CheckResult.Success));
 
         try
         {
             //connect to master to run the data directory discovery SQL
             var builder = new SqlConnectionStringBuilder(_dbInfo.Server.Builder.ConnectionString)
-             {
-                 InitialCatalog = "master"
-             };
+            {
+                InitialCatalog = "master"
+            };
 
             using var connection = new SqlConnection(builder.ConnectionString);
             connection.Open();
 
-            notifier.OnCheckPerformed(new CheckEventArgs($"About to run:\r\n{GetDefaultSQLServerDatabaseDirectory}",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"About to run:\r\n{GetDefaultSQLServerDatabaseDirectory}",
+                CheckResult.Success));
 
             using var cmd = new SqlCommand(GetDefaultSQLServerDatabaseDirectory, connection);
             var result = cmd.ExecuteScalar() as string;
 
-            if(string.IsNullOrWhiteSpace(result))
-                throw new Exception("Looking up DATA directory on server returned null (user may not have permissions to read from relevant sys tables)");
+            if (string.IsNullOrWhiteSpace(result))
+                throw new Exception(
+                    "Looking up DATA directory on server returned null (user may not have permissions to read from relevant sys tables)");
 
             var end = result.LastIndexOfAny(@"\/".ToCharArray());
             if (end == -1)
@@ -309,17 +323,19 @@ public override void Check(ICheckNotifier notifier)
         if (Directory.Exists(localSqlServerDataDirectory))
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Found server DATA folder (that we will copy mdf/ldf files to at path:{localSqlServerDataDirectory}", CheckResult.Success));
+                    $"Found server DATA folder (that we will copy mdf/ldf files to at path:{localSqlServerDataDirectory}",
+                    CheckResult.Success));
         else
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Proposed server DATA folder (that we will copy mdf/ldf files to) was not found, proposed path was:{localSqlServerDataDirectory}", CheckResult.Fail));
+                    $"Proposed server DATA folder (that we will copy mdf/ldf files to) was not found, proposed path was:{localSqlServerDataDirectory}",
+                    CheckResult.Fail));
 
         if (File.Exists(Path.Combine(localSqlServerDataDirectory, mdfFilename)))
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"The database file '{mdfFilename}' exists in the local SQL server data directory '{localSqlServerDataDirectory}'. A database called '{_dbInfo.GetRuntimeName()}' may already be attached, which will cause the load process to fail. Delete this file to continue.",
                 CheckResult.Fail, null, "Delete file"));
-            
+
         if (File.Exists(Path.Combine(localSqlServerDataDirectory, ldfFilename)))
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"The database log file '{ldfFilename}' exists in the local SQL server data directory '{localSqlServerDataDirectory}'. A database called '{_dbInfo.GetRuntimeName()}'may already be attached, which will cause the load process to fail. Delete this file to continue.",
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/MdfFileAttachLocations.cs b/Rdmp.Core/DataLoad/Modules/Attachers/MdfFileAttachLocations.cs
index b91481ce9d..e8a72d3550 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/MdfFileAttachLocations.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/MdfFileAttachLocations.cs
@@ -16,11 +16,13 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// </summary>
 internal class MdfFileAttachLocations
 {
-    public MdfFileAttachLocations(DirectoryInfo originDirectory, string databaseDirectoryFromPerspectiveOfDatabaseServer, string copyToDirectoryOrNullIfDatabaseIsLocalhost)
+    public MdfFileAttachLocations(DirectoryInfo originDirectory,
+        string databaseDirectoryFromPerspectiveOfDatabaseServer, string copyToDirectoryOrNullIfDatabaseIsLocalhost)
     {
         ArgumentNullException.ThrowIfNull(databaseDirectoryFromPerspectiveOfDatabaseServer);
 
-        var copyToDirectory = copyToDirectoryOrNullIfDatabaseIsLocalhost ?? databaseDirectoryFromPerspectiveOfDatabaseServer;
+        var copyToDirectory = copyToDirectoryOrNullIfDatabaseIsLocalhost ??
+                              databaseDirectoryFromPerspectiveOfDatabaseServer;
 
         var filesThatWeCouldLoad = originDirectory.GetFiles("*.mdf").ToArray();
 
@@ -35,13 +37,14 @@ public MdfFileAttachLocations(DirectoryInfo originDirectory, string databaseDire
         }
 
         OriginLocationMdf = filesThatWeCouldLoad[0].FullName;
-       
+
         //verify log file exists
         OriginLocationLdf = Path.Combine(Path.GetDirectoryName(OriginLocationMdf),
             $"{Path.GetFileNameWithoutExtension(OriginLocationMdf)}_log.ldf");
 
         if (!File.Exists(OriginLocationLdf))
-            throw new FileNotFoundException($"Cannot attach database, LOG file was not found:{OriginLocationLdf}", OriginLocationLdf);
+            throw new FileNotFoundException($"Cannot attach database, LOG file was not found:{OriginLocationLdf}",
+                OriginLocationLdf);
 
         CopyToMdf = Path.Combine(copyToDirectory, Path.GetFileName(OriginLocationMdf));
         CopyToLdf = Path.Combine(copyToDirectory, Path.GetFileName(OriginLocationLdf));
@@ -49,18 +52,22 @@ public MdfFileAttachLocations(DirectoryInfo originDirectory, string databaseDire
         if (databaseDirectoryFromPerspectiveOfDatabaseServer.Contains('/'))
         {
             // Unix-style paths
-            AttachMdfPath = $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('/')}/{Path.GetFileName(OriginLocationMdf)}";
-            AttachLdfPath = $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('/')}/{Path.GetFileName(OriginLocationLdf)}";
+            AttachMdfPath =
+                $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('/')}/{Path.GetFileName(OriginLocationMdf)}";
+            AttachLdfPath =
+                $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('/')}/{Path.GetFileName(OriginLocationLdf)}";
         }
         else
         {
             // DOS-style paths
-            AttachMdfPath = $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('\\')}\\{Path.GetFileName(OriginLocationMdf)}";
-            AttachLdfPath = $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('\\')}\\{Path.GetFileName(OriginLocationLdf)}";
+            AttachMdfPath =
+                $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('\\')}\\{Path.GetFileName(OriginLocationMdf)}";
+            AttachLdfPath =
+                $"{databaseDirectoryFromPerspectiveOfDatabaseServer.TrimEnd('\\')}\\{Path.GetFileName(OriginLocationLdf)}";
         }
     }
 
-    public string OriginLocationMdf {get; set; }
+    public string OriginLocationMdf { get; set; }
     public string OriginLocationLdf { get; set; }
 
     public string CopyToMdf { get; set; }
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteDatabaseAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteDatabaseAttacher.cs
index 30f4639db3..6a58f3f28e 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteDatabaseAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteDatabaseAttacher.cs
@@ -27,24 +27,28 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// Data load component for loading RAW tables with records read from a remote database server.
 /// Fetches all table from the specified database to load all catalogues specified.
 /// </summary>
-public class RemoteDatabaseAttacher: Attacher, IPluginAttacher
+public class RemoteDatabaseAttacher : Attacher, IPluginAttacher
 {
-    public RemoteDatabaseAttacher(): base(true)
-    {   
+    public RemoteDatabaseAttacher() : base(true)
+    {
     }
 
-    [DemandsInitialization("The DataSource to connect to in order to read data.", Mandatory=true)]
+    [DemandsInitialization("The DataSource to connect to in order to read data.", Mandatory = true)]
     public ExternalDatabaseServer RemoteSource { get; set; }
 
-    [DemandsInitialization("The length of time in seconds to allow for data to be completely read from the destination before giving up (0 for no timeout)")]
+    [DemandsInitialization(
+        "The length of time in seconds to allow for data to be completely read from the destination before giving up (0 for no timeout)")]
     public int Timeout { get; set; }
 
-    [DemandsInitialization(@"Determines how columns in the remote database are fetched and used to populate RAW tables of the same name.
+    [DemandsInitialization(
+        @"Determines how columns in the remote database are fetched and used to populate RAW tables of the same name.
 True - Fetch only the default columns that appear in RAW (e.g. skip hic_ columns)
-False - Fetch all columns in the remote table.  To use this option you will need ALTER statements in RAW scripts to make table(s) match the remote schema", DefaultValue=true)]
+False - Fetch all columns in the remote table.  To use this option you will need ALTER statements in RAW scripts to make table(s) match the remote schema",
+        DefaultValue = true)]
     public bool LoadRawColumnsOnly { get; set; }
 
-    [DemandsInitialization(@"By default RemoteDatabaseAttacher expects all tables in the load to exist in the remote database at the time the load is run.  Enabling this option will ignore missing tables:
+    [DemandsInitialization(
+        @"By default RemoteDatabaseAttacher expects all tables in the load to exist in the remote database at the time the load is run.  Enabling this option will ignore missing tables:
 True - Ignore the fact that some tables do not exist and skip them
 False - Trigger an error reporting the missing table(s)
 ")]
@@ -57,7 +61,7 @@ public override void Check(ICheckNotifier notifier)
     }
 
     public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
-    {   
+    {
     }
 
     public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -67,7 +71,8 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
         var dbFrom = RemoteSource.Discover(DataAccessContext.DataLoad);
 
-        var remoteTables = new HashSet<string>(dbFrom.DiscoverTables(true).Select(t => t.GetRuntimeName()),StringComparer.CurrentCultureIgnoreCase);
+        var remoteTables = new HashSet<string>(dbFrom.DiscoverTables(true).Select(t => t.GetRuntimeName()),
+            StringComparer.CurrentCultureIgnoreCase);
         var loadables = job.RegularTablesToLoad.Union(job.LookupTablesToLoad).ToArray();
 
         var syntaxFrom = dbFrom.Server.GetQuerySyntaxHelper();
@@ -79,22 +84,27 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
             // A table in the load does not exist on the remote db
             if (!remoteTables.Contains(table))
             {
-                if(IgnoreMissingTables)
+                if (IgnoreMissingTables)
                 {
-                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"Table {table} was NOT found on the remote DB but {nameof(IgnoreMissingTables)} is enabled so table will be skipped"));
+                    job.OnNotify(this,
+                        new NotifyEventArgs(ProgressEventType.Information,
+                            $"Table {table} was NOT found on the remote DB but {nameof(IgnoreMissingTables)} is enabled so table will be skipped"));
 
                     //skip it
                     continue;
                 }
+
                 throw new Exception(
                     $"Loadable table {table} was NOT found on the remote DB and IgnoreMissingTables is false");
             }
 
 
             string sql;
-            if(LoadRawColumnsOnly)
+            if (LoadRawColumnsOnly)
             {
-                var rawColumns = LoadRawColumnsOnly ? tableInfo.GetColumnsAtStage(LoadStage.AdjustRaw) : tableInfo.ColumnInfos;
+                var rawColumns = LoadRawColumnsOnly
+                    ? tableInfo.GetColumnsAtStage(LoadStage.AdjustRaw)
+                    : tableInfo.ColumnInfos;
                 sql =
                     $"SELECT {string.Join(",", rawColumns.Select(c => syntaxFrom.EnsureWrapped(c.GetRuntimeName(LoadStage.AdjustRaw))))} FROM {syntaxFrom.EnsureWrapped(table)}";
             }
@@ -106,7 +116,8 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"About to execute SQL:{Environment.NewLine}{sql}"));
 
-            var source = new DbDataCommandDataFlowSource(sql, $"Fetch data from {dbFrom} to populate RAW table {table}", dbFrom.Server.Builder, Timeout == 0 ? 50000 : Timeout);
+            var source = new DbDataCommandDataFlowSource(sql, $"Fetch data from {dbFrom} to populate RAW table {table}",
+                dbFrom.Server.Builder, Timeout == 0 ? 50000 : Timeout);
 
             var destination = new SqlBulkInsertDestination(_dbInfo, table, Enumerable.Empty<string>());
 
@@ -120,19 +131,19 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
                 new[]
                 {
                     new DataSource(
-                        $"Remote SqlServer Servername={dbFrom.Server};Database={_dbInfo.GetRuntimeName()}{(table != null ? $" Table={table}" : $" Query = {sql}")}", DateTime.Now)
+                        $"Remote SqlServer Servername={dbFrom.Server};Database={_dbInfo.GetRuntimeName()}{(table != null ? $" Table={table}" : $" Query = {sql}")}",
+                        DateTime.Now)
                 }, -1);
 
             engine.Initialize(loadInfo);
             engine.ExecutePipeline(cancellationToken);
 
             if (source.TotalRowsRead == 0)
-            {
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"No rows were read from the remote table {table}."));
-            }
 
-            job.OnNotify(this, new NotifyEventArgs(source.TotalRowsRead > 0 ? ProgressEventType.Information : ProgressEventType.Warning,
+            job.OnNotify(this, new NotifyEventArgs(
+                source.TotalRowsRead > 0 ? ProgressEventType.Information : ProgressEventType.Warning,
                 $"Finished after reading {source.TotalRowsRead} rows"));
         }
 
diff --git a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs
index 9cca16ab86..b0d48f4b79 100644
--- a/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs
+++ b/Rdmp.Core/DataLoad/Modules/Attachers/RemoteTableAttacher.cs
@@ -34,20 +34,21 @@ namespace Rdmp.Core.DataLoad.Modules.Attachers;
 /// Data load component for loading RAW tables with records read from a remote database server.  Runs the specified query (which can include a date parameter)
 /// and inserts the results of the query into RAW.
 /// </summary>
-public class RemoteTableAttacher: Attacher, IPluginAttacher
+public class RemoteTableAttacher : Attacher, IPluginAttacher
 {
     private const string FutureLoadMessage = "Cannot load data from the future";
 
-    public RemoteTableAttacher(): base(true)
+    public RemoteTableAttacher() : base(true)
     {
-
     }
 
-    [DemandsInitialization("The server to connect to (this replaces all other settings e.g. RemoteServer, RemoteDatabaseName etc")]
+    [DemandsInitialization(
+        "The server to connect to (this replaces all other settings e.g. RemoteServer, RemoteDatabaseName etc")]
     public ExternalDatabaseServer RemoteServerReference { get; set; }
 
 
-    [DemandsInitialization("The DataSource (Server) connect to in order to read data.  Note that this may be MyFriendlyServer (SqlServer) or something like '192.168.56.101:1521/TRAININGDB'(Oracle)")]
+    [DemandsInitialization(
+        "The DataSource (Server) connect to in order to read data.  Note that this may be MyFriendlyServer (SqlServer) or something like '192.168.56.101:1521/TRAININGDB'(Oracle)")]
     public string RemoteServer { get; set; }
 
     [DemandsInitialization("The database on the remote host containg the table we will read data from")]
@@ -57,10 +58,13 @@ public RemoteTableAttacher(): base(true)
     public string RemoteTableName { get; set; }
 
     [Sql]
-    [DemandsInitialization("When provided this OVERIDES RemoteTableName and is intended for running a complicated query on the remote machine in order to pull data in a suitable format.",DemandType.SQL)]
+    [DemandsInitialization(
+        "When provided this OVERIDES RemoteTableName and is intended for running a complicated query on the remote machine in order to pull data in a suitable format.",
+        DemandType.SQL)]
     public string RemoteSelectSQL { get; set; }
 
-    [DemandsInitialization("The table in RAW that you want to load the remote database data into.  This must (currently) match the TableInfo you are ultimately going to load exactly including having the same number of columns - if you need to run CREATE and ALTER scripts to accommodate dodgy source data formats then you should do that in either Mounting or AdjustRAW")]
+    [DemandsInitialization(
+        "The table in RAW that you want to load the remote database data into.  This must (currently) match the TableInfo you are ultimately going to load exactly including having the same number of columns - if you need to run CREATE and ALTER scripts to accommodate dodgy source data formats then you should do that in either Mounting or AdjustRAW")]
     public string RAWTableName { get; set; }
 
     [DemandsInitialization("Overrides RAWTableName with a specific named table")]
@@ -70,19 +74,24 @@ public RemoteTableAttacher(): base(true)
         $"Optionally gives you access to two parameters {StartDateParameter} and {EndDateParameter} for use in your RemoteSelectSQL.  This requires that you create a load schedule specifically associated with the LoadMetadata, this ties you contractually to actually respect the dates correctly in your query.")]
     public LoadProgress Progress { get; set; }
 
-    [DemandsInitialization("Indicates how you want to update the Progress.DataLoadProgress value on successful load batches (only required if you have a LoadProgress)")]
-    public DataLoadProgressUpdateInfo ProgressUpdateStrategy{ get; set; }
+    [DemandsInitialization(
+        "Indicates how you want to update the Progress.DataLoadProgress value on successful load batches (only required if you have a LoadProgress)")]
+    public DataLoadProgressUpdateInfo ProgressUpdateStrategy { get; set; }
 
-    [DemandsInitialization("The length of time in seconds to allow for data to be completely read from the destination before giving up (0 for no timeout)")]
+    [DemandsInitialization(
+        "The length of time in seconds to allow for data to be completely read from the destination before giving up (0 for no timeout)")]
     public int Timeout { get; set; }
 
-    [DemandsInitialization("Terminates the currently executing data load with LoadNotRequired if the remote table is empty / RemoteSelectSQL returns no rows")]
+    [DemandsInitialization(
+        "Terminates the currently executing data load with LoadNotRequired if the remote table is empty / RemoteSelectSQL returns no rows")]
     public bool LoadNotRequiredIfNoRowsRead { get; set; }
 
-    [DemandsInitialization("Username and password to use when connecting to fetch data from the remote table (e.g. sql user account).  If not provided then 'Integrated Security' (Windows user account) will be used to authenticate")]
+    [DemandsInitialization(
+        "Username and password to use when connecting to fetch data from the remote table (e.g. sql user account).  If not provided then 'Integrated Security' (Windows user account) will be used to authenticate")]
     public DataAccessCredentials RemoteTableAccessCredentials { get; set; }
 
-    [DemandsInitialization("The database type you are attempting to connect to",DefaultValue=DatabaseType.MicrosoftSQLServer)]
+    [DemandsInitialization("The database type you are attempting to connect to",
+        DefaultValue = DatabaseType.MicrosoftSQLServer)]
     public DatabaseType DatabaseType { get; set; }
 
     private const string StartDateParameter = "@startDate";
@@ -94,19 +103,21 @@ public RemoteTableAttacher(): base(true)
     /// If parameters are not supported in SQL and have to be injected as DbParameter objects
     /// </summary>
     private DateTime? _minDateParam;
+
     private DateTime? _maxDateParam;
 
     protected void ThrowIfInvalidRemoteTableName()
     {
         //this overrides the remote table
-        if(!string.IsNullOrWhiteSpace(RemoteSelectSQL))
+        if (!string.IsNullOrWhiteSpace(RemoteSelectSQL))
             return;
 
         const string patternForValidTableNames = "^[0-9A-Za-z_ ]+$";
 
 
         if (string.IsNullOrWhiteSpace(RemoteTableName))
-            throw new Exception("RemoteTableName is null, you need to give ProcessTaskArgument a value of a table on the remote server");
+            throw new Exception(
+                "RemoteTableName is null, you need to give ProcessTaskArgument a value of a table on the remote server");
 
 
         if (!Regex.IsMatch(RemoteTableName, patternForValidTableNames))
@@ -131,28 +142,37 @@ public override void Initialize(ILoadDirectory directory, DiscoveredDatabase dbI
 
     public override void Check(ICheckNotifier notifier)
     {
-
         if (RemoteServerReference != null)
         {
             if (!string.IsNullOrWhiteSpace(RemoteServer))
-                notifier.OnCheckPerformed(new CheckEventArgs("RemoteServer must be blank when you have specified a RemoteServerReference", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "RemoteServer must be blank when you have specified a RemoteServerReference", CheckResult.Fail));
 
             if (!string.IsNullOrWhiteSpace(RemoteDatabaseName))
-                notifier.OnCheckPerformed(new CheckEventArgs("RemoteDatabaseName must be blank when you have specified a RemoteServerReference", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "RemoteDatabaseName must be blank when you have specified a RemoteServerReference",
+                    CheckResult.Fail));
 
-            if(RemoteTableAccessCredentials != null)
-                notifier.OnCheckPerformed(new CheckEventArgs("RemoteTableAccessCredentials must be blank when you have specified a RemoteServerReference", CheckResult.Fail));
+            if (RemoteTableAccessCredentials != null)
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "RemoteTableAccessCredentials must be blank when you have specified a RemoteServerReference",
+                    CheckResult.Fail));
 
             if (string.IsNullOrWhiteSpace(RemoteServerReference.Database))
-                notifier.OnCheckPerformed(new CheckEventArgs($"RemoteServerReference {RemoteServerReference} had no listed database to connect to", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    $"RemoteServerReference {RemoteServerReference} had no listed database to connect to",
+                    CheckResult.Fail));
         }
         else
         {
             if (string.IsNullOrWhiteSpace(RemoteServer))
-                notifier.OnCheckPerformed(new CheckEventArgs("RemoteServer is a Required field (unless you specify a RemoteServerReference)", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "RemoteServer is a Required field (unless you specify a RemoteServerReference)", CheckResult.Fail));
 
             if (string.IsNullOrWhiteSpace(RemoteDatabaseName))
-                notifier.OnCheckPerformed(new CheckEventArgs("RemoteDatabaseName is a Required field (unless you specify a RemoteServerReference)", CheckResult.Fail));
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "RemoteDatabaseName is a Required field (unless you specify a RemoteServerReference)",
+                    CheckResult.Fail));
         }
 
         //if we have been initialized
@@ -164,20 +184,22 @@ public override void Check(ICheckNotifier notifier)
             }
             catch (Exception e)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Failed to find username and password for RemoteTableAttacher",
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "Failed to find username and password for RemoteTableAttacher",
                     CheckResult.Fail, e));
             }
 
             try
             {
-
                 try
                 {
                     Setup();
                 }
                 catch (Exception e)
                 {
-                    notifier.OnCheckPerformed(new CheckEventArgs("Failed to setup username/password - proceeding with Integrated Security", CheckResult.Warning, e));
+                    notifier.OnCheckPerformed(new CheckEventArgs(
+                        "Failed to setup username/password - proceeding with Integrated Security", CheckResult.Warning,
+                        e));
                 }
 
                 CheckTablesExist(notifier);
@@ -188,38 +210,44 @@ public override void Check(ICheckNotifier notifier)
                     $"Program crashed while trying to inspect remote server {RemoteServerReference ?? (object)RemoteServer}  for presence of tables/databases specified in the load configuration.",
                     CheckResult.Fail, e));
             }
-
         }
         else
+        {
             notifier.OnCheckPerformed(new CheckEventArgs(
                 "LoadDirectory was null in Check() for class RemoteTableAttacher",
                 CheckResult.Warning, null));
+        }
 
 
         if (Progress != null)
         {
             if (!Progress.DataLoadProgress.HasValue)
             {
-
                 if (Progress.OriginDate.HasValue)
                 {
                     var fixDate = Progress.OriginDate.Value.AddDays(-1);
 
                     var setDataLoadProgressDateToOriginDate = notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"LoadProgress '{Progress}' does not have a DataLoadProgress value, you must set this to something to start loading data from that date", CheckResult.Fail, null,
+                        $"LoadProgress '{Progress}' does not have a DataLoadProgress value, you must set this to something to start loading data from that date",
+                        CheckResult.Fail, null,
                         $"Set the data load progress date to the OriginDate minus one Day? {Environment.NewLine}Set DataLoadProgress = {Progress.OriginDate} -1 day = {fixDate}"));
-                    if(setDataLoadProgressDateToOriginDate)
+                    if (setDataLoadProgressDateToOriginDate)
                     {
                         Progress.DataLoadProgress = fixDate;
                         Progress.SaveToDatabase();
                     }
                     else
-                        notifier.OnCheckPerformed(new CheckEventArgs("User decided not to apply suggested fix so stopping checking",CheckResult.Fail, null));
+                    {
+                        notifier.OnCheckPerformed(new CheckEventArgs(
+                            "User decided not to apply suggested fix so stopping checking", CheckResult.Fail, null));
+                    }
                 }
                 else
+                {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"LoadProgress '{Progress}' does not have a DataLoadProgress value, you must set this to something to start loading data from that date",CheckResult.Fail, null));
-
+                        $"LoadProgress '{Progress}' does not have a DataLoadProgress value, you must set this to something to start loading data from that date",
+                        CheckResult.Fail, null));
+                }
             }
 
             if (ProgressUpdateStrategy == null)
@@ -232,37 +260,39 @@ public override void Check(ICheckNotifier notifier)
 
             if (!LoadNotRequiredIfNoRowsRead)
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"LoadNotRequiredIfNoRowsRead is false but you have a Progress '{Progress}', this means that when the data being loaded is fully exhausted for a given range of days you will probably get an error instead of a clean shutdown",CheckResult.Warning));
+                    $"LoadNotRequiredIfNoRowsRead is false but you have a Progress '{Progress}', this means that when the data being loaded is fully exhausted for a given range of days you will probably get an error instead of a clean shutdown",
+                    CheckResult.Warning));
 
-            if(string.IsNullOrWhiteSpace(RemoteSelectSQL))
-                notifier.OnCheckPerformed(new CheckEventArgs("A LoadProgress has been configured but the RemoteSelectSQL is empty, how are you respecting the schedule without tailoring your query?", CheckResult.Fail, null));
+            if (string.IsNullOrWhiteSpace(RemoteSelectSQL))
+                notifier.OnCheckPerformed(new CheckEventArgs(
+                    "A LoadProgress has been configured but the RemoteSelectSQL is empty, how are you respecting the schedule without tailoring your query?",
+                    CheckResult.Fail, null));
             else
-            {
-                foreach (var expectedParameter in new[] {StartDateParameter, EndDateParameter})
+                foreach (var expectedParameter in new[] { StartDateParameter, EndDateParameter })
                     if (RemoteSelectSQL.Contains(expectedParameter))
                         notifier.OnCheckPerformed(new CheckEventArgs(
                             $"Found {expectedParameter} in the RemoteSelectSQL",
                             CheckResult.Success, null));
                     else
                         notifier.OnCheckPerformed(new CheckEventArgs(
-                            $"Could not find any reference to parameter {expectedParameter} in the RemoteSelectSQL, how do you expect to respect the LoadProgress you have configured without a reference to this date?", CheckResult.Fail, null));
-            }
+                            $"Could not find any reference to parameter {expectedParameter} in the RemoteSelectSQL, how do you expect to respect the LoadProgress you have configured without a reference to this date?",
+                            CheckResult.Fail, null));
         }
 
         // If user hasn't picked a table to load (either explicit or free text)
         if (string.IsNullOrWhiteSpace(RAWTableName) && RAWTableToLoad == null)
-            notifier.OnCheckPerformed(new CheckEventArgs($"RAWTableName has not been set for {GetType().Name}", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs($"RAWTableName has not been set for {GetType().Name}",
+                CheckResult.Fail));
 
         // user shouldn't really set both since RAWTableToLoad overrides the string value
         if (!string.IsNullOrWhiteSpace(RAWTableName) && RAWTableToLoad != null)
-        {
-            notifier.OnCheckPerformed(new CheckEventArgs($"{nameof(RAWTableName)}('{RAWTableName}') will be ignored because {nameof(RAWTableToLoad)} has been set", CheckResult.Warning));
-        }
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                $"{nameof(RAWTableName)}('{RAWTableName}') will be ignored because {nameof(RAWTableToLoad)} has been set",
+                CheckResult.Warning));
     }
 
     public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-
     }
 
     protected void CheckTablesExist(ICheckNotifier notifier)
@@ -292,7 +322,8 @@ protected void CheckTablesExist(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Problem occurred when trying to enumerate tables on server {_remoteDatabase.Server} on database {_remoteDatabase}", CheckResult.Fail, e));
+                $"Problem occurred when trying to enumerate tables on server {_remoteDatabase.Server} on database {_remoteDatabase}",
+                CheckResult.Fail, e));
         }
     }
 
@@ -308,15 +339,18 @@ private void Setup()
             string remoteUsername = null;
             string remotePassword = null;
 
-            if(RemoteTableAccessCredentials != null)
+            if (RemoteTableAccessCredentials != null)
             {
                 remoteUsername = RemoteTableAccessCredentials.Username;
                 remotePassword = RemoteTableAccessCredentials.GetDecryptedPassword();
             }
 
-            _remoteDatabase = new DiscoveredServer(RemoteServer, RemoteDatabaseName,DatabaseType, remoteUsername, remotePassword).GetCurrentDatabase();
+            _remoteDatabase =
+                new DiscoveredServer(RemoteServer, RemoteDatabaseName, DatabaseType, remoteUsername, remotePassword)
+                    .GetCurrentDatabase();
         }
     }
+
     public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
         if (job == null)
@@ -326,7 +360,9 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
         var syntax = _remoteDatabase.Server.GetQuerySyntaxHelper();
 
-        var sql = !string.IsNullOrWhiteSpace(RemoteSelectSQL) ? RemoteSelectSQL : $"Select * from {syntax.EnsureWrapped(RemoteTableName)}";
+        var sql = !string.IsNullOrWhiteSpace(RemoteSelectSQL)
+            ? RemoteSelectSQL
+            : $"Select * from {syntax.EnsureWrapped(RemoteTableName)}";
 
         var scheduleMismatch = false;
 
@@ -340,11 +376,12 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
             catch (Exception e)
             {
                 //if the date range is in the future then GetScheduleParameterDeclarations will throw Exception about future dates
-                if(e.Message.StartsWith(FutureLoadMessage))
-                    return ExitCodeType.OperationNotRequired;//if this is the case then don't bother with the data load
+                if (e.Message.StartsWith(FutureLoadMessage))
+                    return ExitCodeType.OperationNotRequired; //if this is the case then don't bother with the data load
 
                 throw;
             }
+
         if (scheduleMismatch)
         {
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
@@ -356,11 +393,11 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
             $"About to execute SQL:{Environment.NewLine}{sql}"));
 
         var source = new DbDataCommandDataFlowSource(sql,
-            $"Fetch data from {_remoteDatabase.Server} to populate RAW table {RemoteTableName}", _remoteDatabase.Server.Builder, Timeout == 0 ? 50000 : Timeout);
+            $"Fetch data from {_remoteDatabase.Server} to populate RAW table {RemoteTableName}",
+            _remoteDatabase.Server.Builder, Timeout == 0 ? 50000 : Timeout);
 
         //For Oracle / Postgres we have to add the parameters to the DbCommand directly
         if (_minDateParam.HasValue && _maxDateParam.HasValue && !syntax.SupportsEmbeddedParameters())
-        {
             source.CommandAdjuster = cmd =>
             {
                 var pmin = cmd.CreateParameter();
@@ -373,9 +410,10 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
                 pmax.ParameterName = EndDateParameter;
                 cmd.Parameters.Add(pmax);
             };
-        }
 
-        var rawTableName = RAWTableToLoad != null ? RAWTableToLoad.GetRuntimeName(LoadStage.AdjustRaw, job.Configuration.DatabaseNamer) : RAWTableName;
+        var rawTableName = RAWTableToLoad != null
+            ? RAWTableToLoad.GetRuntimeName(LoadStage.AdjustRaw, job.Configuration.DatabaseNamer)
+            : RAWTableName;
 
         var destination = new SqlBulkInsertDestination(_dbInfo, rawTableName, Enumerable.Empty<string>());
 
@@ -388,10 +426,11 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
         var loadInfo = job.DataLoadInfo.CreateTableLoadInfo($"Truncate RAW table {rawTableName}",
             $"{rawSyntax.EnsureFullyQualified(_dbInfo.GetRuntimeName(), null, rawTableName)} ({_dbInfo.Server.Name})",
-            new []
+            new[]
             {
                 new DataSource(
-                    $"Remote SqlServer Servername={_remoteDatabase.Server}Database={_dbInfo.GetRuntimeName()}{(RemoteTableName != null ? $" Table={RemoteTableName}" : $" Query = {sql}")}", DateTime.Now)
+                    $"Remote SqlServer Servername={_remoteDatabase.Server}Database={_dbInfo.GetRuntimeName()}{(RemoteTableName != null ? $" Table={RemoteTableName}" : $" Query = {sql}")}",
+                    DateTime.Now)
             }, -1);
 
         engine.Initialize(loadInfo);
@@ -399,21 +438,23 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
         if (source.TotalRowsRead == 0 && LoadNotRequiredIfNoRowsRead)
         {
-            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "No rows were read from the remote table and LoadNotRequiredIfNoRowsRead is true so returning ExitCodeType.LoadNotRequired"));
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "No rows were read from the remote table and LoadNotRequiredIfNoRowsRead is true so returning ExitCodeType.LoadNotRequired"));
             return ExitCodeType.OperationNotRequired;
         }
 
-        job.OnNotify(this, new NotifyEventArgs(source.TotalRowsRead  > 0 ? ProgressEventType.Information:ProgressEventType.Warning,
+        job.OnNotify(this, new NotifyEventArgs(
+            source.TotalRowsRead > 0 ? ProgressEventType.Information : ProgressEventType.Warning,
             $"Finished after reading {source.TotalRowsRead} rows"));
 
 
         if (Progress != null)
         {
-            if(ProgressUpdateStrategy == null)
+            if (ProgressUpdateStrategy == null)
                 throw new Exception("ProgressUpdateStrategy is null but there is a Progress");
 
-            ProgressUpdateStrategy.AddAppropriateDisposeStep((ScheduledDataLoadJob) job,_dbInfo);
-
+            ProgressUpdateStrategy.AddAppropriateDisposeStep((ScheduledDataLoadJob)job, _dbInfo);
         }
 
 
@@ -422,7 +463,7 @@ public override ExitCodeType Attach(IDataLoadJob job, GracefulCancellationToken
 
     private string GetScheduleParameterDeclarations(IDataLoadJob job, out bool scheduleMismatch)
     {
-        if(job is not ScheduledDataLoadJob jobAsScheduledJob)
+        if (job is not ScheduledDataLoadJob jobAsScheduledJob)
             throw new NotSupportedException(
                 $"Job must be of type {nameof(ScheduledDataLoadJob)} because you have specified a LoadProgress");
 
@@ -433,14 +474,14 @@ private string GetScheduleParameterDeclarations(IDataLoadJob job, out bool sched
         var max = jobAsScheduledJob.DatesToRetrieve.Max();
 
         //since it's a date time and fetch list is Dates then we should set the max to the last second of the day (23:59:59) but leave the min as the first second of the day (00:00:00).  This allows for single day loads too
-        if(max.Hour == 0  && max.Minute == 0 && max.Second ==0)
+        if (max.Hour == 0 && max.Minute == 0 && max.Second == 0)
         {
             max = max.AddHours(23);
             max = max.AddMinutes(59);
             max = max.AddSeconds(59);
         }
 
-        if(min >= max)
+        if (min >= max)
             throw new Exception($"Problematic max and min dates({max} and {min} respectively)");
 
         var syntaxHelper = _remoteDatabase.Server.Helper.GetQuerySyntaxHelper();
@@ -452,8 +493,10 @@ private string GetScheduleParameterDeclarations(IDataLoadJob job, out bool sched
             return "";
         }
 
-        var declareStartDateParameter = syntaxHelper.GetParameterDeclaration(StartDateParameter, new DatabaseTypeRequest(typeof (DateTime)));
-        var declareEndDateParameter = syntaxHelper.GetParameterDeclaration(EndDateParameter,new DatabaseTypeRequest(typeof (DateTime)));
+        var declareStartDateParameter =
+            syntaxHelper.GetParameterDeclaration(StartDateParameter, new DatabaseTypeRequest(typeof(DateTime)));
+        var declareEndDateParameter =
+            syntaxHelper.GetParameterDeclaration(EndDateParameter, new DatabaseTypeRequest(typeof(DateTime)));
 
         var startSql = declareStartDateParameter + Environment.NewLine;
         startSql += $"SET {StartDateParameter} = '{min:yyyy-MM-dd HH:mm:ss}';{Environment.NewLine}";
@@ -461,7 +504,7 @@ private string GetScheduleParameterDeclarations(IDataLoadJob job, out bool sched
         var endSQL = declareEndDateParameter + Environment.NewLine;
         endSQL += $"SET {EndDateParameter} = '{max:yyyy-MM-dd HH:mm:ss}';{Environment.NewLine}";
 
-        if(min > DateTime.Now)
+        if (min > DateTime.Now)
             throw new Exception($"{FutureLoadMessage} (min is {min})");
 
         return startSql + endSQL + Environment.NewLine;
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowDestinations/DoNothingCacheDestination.cs b/Rdmp.Core/DataLoad/Modules/DataFlowDestinations/DoNothingCacheDestination.cs
index eb3547d9c0..3812993769 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowDestinations/DoNothingCacheDestination.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowDestinations/DoNothingCacheDestination.cs
@@ -24,21 +24,20 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowDestinations;
 /// </summary>
 public class DoNothingCacheDestination : CacheFilesystemDestination
 {
-    public override ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    public override ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         //if(toProcess != null)
         //    throw new NotSupportedException("Expected only to be passed null chunks or never to get called, this destination is not valid for use when sources are actually sending/reading data");
 
 
         var run = 0;
-        if (toProcess is DoNothingCacheChunk chunk)
-        {
-            run = chunk.RunIteration;
-        }
+        if (toProcess is DoNothingCacheChunk chunk) run = chunk.RunIteration;
 
         for (var i = 0; i < 10; i++)
         {
-            File.WriteAllText(Path.Combine(CacheDirectory.FullName, $"run {run} - loop {i}.txt"), DateTime.Now.ToString("O"));
+            File.WriteAllText(Path.Combine(CacheDirectory.FullName, $"run {run} - loop {i}.txt"),
+                DateTime.Now.ToString("O"));
             if (cancellationToken.IsCancellationRequested)
                 return null;
 
@@ -48,13 +47,9 @@ public override ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoad
         return null;
     }
 
-    public override ICacheLayout CreateCacheLayout()
-    {
-        return new BasicCacheLayout(CacheDirectory);
-    }
+    public override ICacheLayout CreateCacheLayout() => new BasicCacheLayout(CacheDirectory);
 
     public override void Abort(IDataLoadEventListener listener)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/AliasHandler.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/AliasHandler.cs
index eac2aaa48b..146a81e66f 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/AliasHandler.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/AliasHandler.cs
@@ -23,25 +23,34 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations.Aliases;
 /// </summary>
 public class AliasHandler : IPluginDataFlowComponent<DataTable>
 {
-    [DemandsInitialization("The server that will be connected to to fetch the alias resolution table", Mandatory = true)]
+    [DemandsInitialization("The server that will be connected to to fetch the alias resolution table",
+        Mandatory = true)]
     public ExternalDatabaseServer ServerToExecuteQueryOn { get; set; }
 
-    [DemandsInitialization("The context under which to connect to the server, if unsure just select DataAccessContext.DataLoad (this only matters if you have encrypted logon credentials configured on a per context level)", DemandType.Unspecified, DataAccessContext.DataLoad)]
+    [DemandsInitialization(
+        "The context under which to connect to the server, if unsure just select DataAccessContext.DataLoad (this only matters if you have encrypted logon credentials configured on a per context level)",
+        DemandType.Unspecified, DataAccessContext.DataLoad)]
     public DataAccessContext DataAccessContext { get; set; }
 
-    [DemandsInitialization("A fully specified SQL Select query to execute on ServerToExecuteQueryOn, this should result in the alias table.  The alias table must have only 2 columns.  The first column must match a column name in the input DataTable.  The second column must contain a known aliases which is different from the first column value.", DemandType.SQL, Mandatory = true)]
+    [DemandsInitialization(
+        "A fully specified SQL Select query to execute on ServerToExecuteQueryOn, this should result in the alias table.  The alias table must have only 2 columns.  The first column must match a column name in the input DataTable.  The second column must contain a known aliases which is different from the first column value.",
+        DemandType.SQL, Mandatory = true)]
     public string AliasTableSQL { get; set; }
 
-    [DemandsInitialization("Maximum amount of time in seconds to let the AliasTableSQL execute for before giving up",DemandType.Unspecified,120)]
+    [DemandsInitialization("Maximum amount of time in seconds to let the AliasTableSQL execute for before giving up",
+        DemandType.Unspecified, 120)]
     public int TimeoutForAssemblingAliasTable { get; set; }
 
     [DemandsInitialization("Strategy for dealing with aliases in DataTables")]
     public AliasResolutionStrategy ResolutionStrategy { get; set; }
 
-    [DemandsInitialization("The name of the input column name in pipeline data (which must exist!) which contains the aliasable values.  This is probably your patient identifier column.", Mandatory = true)]
+    [DemandsInitialization(
+        "The name of the input column name in pipeline data (which must exist!) which contains the aliasable values.  This is probably your patient identifier column.",
+        Mandatory = true)]
     public string AliasColumnInInputDataTables { get; set; }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var newRows = new List<object[]>();
 
@@ -49,7 +58,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
         var idx = toProcess.Columns.IndexOf(AliasColumnInInputDataTables);
 
-        if(idx == -1)
+        if (idx == -1)
             throw new KeyNotFoundException(
                 $"You asked to resolve aliases on a column called '{AliasColumnInInputDataTables}' but no column by that name appeared in the DataTable being processed.  Columns in that table were:{string.Join(",", toProcess.Columns.Cast<DataColumn>().Select(c => c.ColumnName))}");
 
@@ -58,8 +67,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
         var matchesFound = 0;
 
         foreach (DataRow r in toProcess.Rows)
-        {
-            if(_aliasDictionary.TryGetValue(r[AliasColumnInInputDataTables],out var aliases))
+            if (_aliasDictionary.TryGetValue(r[AliasColumnInInputDataTables], out var aliases))
             {
                 matchesFound++;
                 switch (ResolutionStrategy)
@@ -75,7 +83,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                         {
                             //Create a copy of the input row
                             var newRow = new object[elements];
-                            r.ItemArray.CopyTo(newRow,0);
+                            r.ItemArray.CopyTo(newRow, 0);
 
                             //Set the aliasable element to the alias
                             newRow[idx] = alias;
@@ -89,7 +97,6 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                         throw new ArgumentOutOfRangeException();
                 }
             }
-        }
 
         if (newRows.Any())
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
@@ -106,12 +113,11 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-        _aliasDictionary?.Clear();//Free up memory
+        _aliasDictionary?.Clear(); //Free up memory
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-
     }
 
     public void Check(ICheckNotifier notifier)
@@ -120,21 +126,22 @@ public void Check(ICheckNotifier notifier)
         try
         {
             var result = GenerateAliasTable(timeout);
-            notifier.OnCheckPerformed(new CheckEventArgs($"Found {result.Count} aliases",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Found {result.Count} aliases", CheckResult.Success));
         }
         catch (Exception e)
         {
             var isTimeout = e.Message.ToLower().Contains("timeout");
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to generate alias table after {timeout}s",isTimeout ? CheckResult.Warning : CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to generate alias table after {timeout}s",
+                isTimeout ? CheckResult.Warning : CheckResult.Fail, e));
         }
-
     }
 
     private Dictionary<object, List<object>> _aliasDictionary;
 
     private Dictionary<object, List<object>> GenerateAliasTable(int timeoutInSeconds)
     {
-        const string expectation = "(expected the query to return 2 columns, the first one being the input column the second being known aliases)";
+        const string expectation =
+            "(expected the query to return 2 columns, the first one being the input column the second being known aliases)";
 
         var toReturn = new Dictionary<object, List<object>>();
 
@@ -148,7 +155,7 @@ private Dictionary<object, List<object>> GenerateAliasTable(int timeoutInSeconds
             {
                 cmd.CommandTimeout = timeoutInSeconds;
 
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
                 {
                     var haveCheckedColumns = false;
 
@@ -168,17 +175,15 @@ private Dictionary<object, List<object>> GenerateAliasTable(int timeoutInSeconds
                                     $"Alias table did not contain a column called '{AliasColumnInInputDataTables}' {expectation}");
                             }
 
-                            if(idx == -1)
-                            {
+                            if (idx == -1)
                                 throw new AliasTableFetchException(
                                     $"Alias table did not contain a column called '{AliasColumnInInputDataTables}' {expectation}");
-                            }
 
-                            if(idx != 0)
+                            if (idx != 0)
                                 throw new AliasTableFetchException(
                                     $"Alias table DID contain column '{AliasColumnInInputDataTables}' but it was not the first column in the result set {expectation}");
 
-                            if(r.FieldCount != 2)
+                            if (r.FieldCount != 2)
                                 throw new AliasTableFetchException(
                                     $"Alias table SQL resulted in {r.FieldCount} fields being returned, we expect exactly 2 {expectation}");
 
@@ -188,11 +193,12 @@ private Dictionary<object, List<object>> GenerateAliasTable(int timeoutInSeconds
                         var input = r[0];
                         var alias = r[1];
 
-                        if(input == null || input == DBNull.Value || alias == null || alias == DBNull.Value)
+                        if (input == null || input == DBNull.Value || alias == null || alias == DBNull.Value)
                             throw new AliasTableFetchException("Alias table contained nulls");
 
-                        if(input.Equals(alias))
-                            throw new AliasTableFetchException("Alias table SQL should only return aliases not exact matches e.g. in the case of a simple alias X is Y, do not return 4 rows {X=X AND Y=Y AND Y=X AND X=Y}, only return 2 rows {X=Y and Y=X}");
+                        if (input.Equals(alias))
+                            throw new AliasTableFetchException(
+                                "Alias table SQL should only return aliases not exact matches e.g. in the case of a simple alias X is Y, do not return 4 rows {X=X AND Y=Y AND Y=X AND X=Y}, only return 2 rows {X=Y and Y=X}");
 
                         if (!toReturn.ContainsKey(input))
                             toReturn.Add(input, new List<object>());
@@ -205,5 +211,4 @@ private Dictionary<object, List<object>> GenerateAliasTable(int timeoutInSeconds
 
         return toReturn;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasException.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasException.cs
index 28cda9f3e8..56c64adaf3 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasException.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasException.cs
@@ -11,10 +11,9 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations.Aliases.Exceptions;
 /// <summary>
 /// Exception thrown by pipeline component AliasHandler when the AliasResolutionStrategy is CrashIfAliasesFound and Aliases exist for one or more records
 /// </summary>
-public class AliasException:Exception
+public class AliasException : Exception
 {
     public AliasException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasTableFetchException.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasTableFetchException.cs
index fe4d335d36..2a0ea7da64 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasTableFetchException.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Aliases/Exceptions/AliasTableFetchException.cs
@@ -15,6 +15,5 @@ public class AliasTableFetchException : Exception
 {
     public AliasTableFetchException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/CohortSampler.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/CohortSampler.cs
index f53ee29943..f08fb7de23 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/CohortSampler.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/CohortSampler.cs
@@ -28,13 +28,17 @@ public class CohortSampler : IPluginDataFlowComponent<DataTable>, IPipelineRequi
     private IProject _project;
     private bool _firstBatch = true;
 
-    [DemandsInitialization("The number of unique patient identifiers you want returned from the input data",DefaultValue = 100)]
+    [DemandsInitialization("The number of unique patient identifiers you want returned from the input data",
+        DefaultValue = 100)]
     public int SampleSize { get; set; } = 100;
 
-    [DemandsInitialization("Determines components behaviour if not enough unique identifiers are being comitted.  True to crash.  False to pass on however many records there are.",DefaultValue = true)]
+    [DemandsInitialization(
+        "Determines components behaviour if not enough unique identifiers are being comitted.  True to crash.  False to pass on however many records there are.",
+        DefaultValue = true)]
     public bool FailIfNotEnoughIdentifiers { get; set; } = true;
 
-    [DemandsInitialization("Optional.  The name of the identifier column that you are submitting.  Set this if it is different than the destination cohort private identifier field")]
+    [DemandsInitialization(
+        "Optional.  The name of the identifier column that you are submitting.  Set this if it is different than the destination cohort private identifier field")]
     public string PrivateIdentifierColumnName { get; set; }
 
     public void Abort(IDataLoadEventListener listener)
@@ -55,32 +59,35 @@ public void PreInitialize(CohortCreationRequest value, IDataLoadEventListener li
         _project = value.Project;
     }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (!_firstBatch)
-            throw new Exception("Expected to get the whole cohort at once but got multiple batches.  This component only works if the Source returns all data at once");
+            throw new Exception(
+                "Expected to get the whole cohort at once but got multiple batches.  This component only works if the Source returns all data at once");
 
         if (_project.ProjectNumber == null)
-            throw new Exception("Project must have a ProjectNumber so that it can be used as a seed in random cohort sampling");
+            throw new Exception(
+                "Project must have a ProjectNumber so that it can be used as a seed in random cohort sampling");
 
         var expectedFieldName = GetPrivateFieldName();
-            
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,$"Looking for column called '{expectedFieldName}' in the data in order to produce a sample"));
+
+        listener.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information,
+                $"Looking for column called '{expectedFieldName}' in the data in order to produce a sample"));
 
         if (!toProcess.Columns.Contains(expectedFieldName))
-            throw new Exception($"CohortSampler was unable to find a column called '{expectedFieldName}' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.");
+            throw new Exception(
+                $"CohortSampler was unable to find a column called '{expectedFieldName}' in the data passed in.  This is the expected private identifier column name of the cohort you are committing.");
 
         // get all the unique values
         var uniques = new HashSet<object>();
 
-        foreach(DataRow row in toProcess.Rows)
+        foreach (DataRow row in toProcess.Rows)
         {
             var val = row[expectedFieldName];
 
-            if(val != DBNull.Value)
-            {
-                uniques.Add(val);
-            }
+            if (val != DBNull.Value) uniques.Add(val);
         }
 
         _firstBatch = false;
@@ -96,18 +103,14 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
         var chosen = sorted.OrderBy(v => r.Next()).Take(SampleSize).ToList();
 #pragma warning restore SCS0005 // Weak random number generator.
 
-        if(chosen.Count < SampleSize && FailIfNotEnoughIdentifiers)
-        {
-            throw new Exception($"Cohort only contains {chosen.Count} unique identifiers.  This is less than the requested sample size of {SampleSize} and {nameof(FailIfNotEnoughIdentifiers)} is true");
-        }
+        if (chosen.Count < SampleSize && FailIfNotEnoughIdentifiers)
+            throw new Exception(
+                $"Cohort only contains {chosen.Count} unique identifiers.  This is less than the requested sample size of {SampleSize} and {nameof(FailIfNotEnoughIdentifiers)} is true");
 
         var dtToReturn = new DataTable();
         dtToReturn.Columns.Add(expectedFieldName);
 
-        foreach(var val in chosen)
-        {
-            dtToReturn.Rows.Add(val);
-        }
+        foreach (var val in chosen) dtToReturn.Rows.Add(val);
 
         return dtToReturn;
     }
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnDropper.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnDropper.cs
index 475bc08fd5..b860aa3f30 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnDropper.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnDropper.cs
@@ -23,12 +23,14 @@ public class ColumnDropper : IPluginDataFlowComponent<DataTable>
     public string ColumnNameToDrop { get; set; }
 
 
-    [DemandsInitialization("In relaxed mode the pipeline will not be crashed if the column does not appear.  Default is false i.e. the column MUST appear.", Mandatory = true, DefaultValue = false)]
+    [DemandsInitialization(
+        "In relaxed mode the pipeline will not be crashed if the column does not appear.  Default is false i.e. the column MUST appear.",
+        Mandatory = true, DefaultValue = false)]
     public bool RelaxedMode { get; set; }
 
 
-
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (!toProcess.Columns.Contains(ColumnNameToDrop))
             if (RelaxedMode)
@@ -44,17 +46,16 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(ColumnNameToDrop))
-            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ColumnNameToDrop",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ColumnNameToDrop",
+                CheckResult.Fail));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnForbidder.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnForbidder.cs
index 1aa406a60e..dea8e91405 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnForbidder.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnForbidder.cs
@@ -28,19 +28,22 @@ public class ColumnForbidder : IPluginDataFlowComponent<DataTable>
     [DemandsInitialization("Crashes the load if any column name matches this regex")]
     public Regex CrashIfAnyColumnMatches { get; set; }
 
-    [DemandsInitialization("Alternative to specifying a Regex pattern in CrashIfAnyColumnMatches.  Select an existing StandardRegex.  This has the advantage of centralising the concept.  See StandardRegexUI for configuring StandardRegexes")]
+    [DemandsInitialization(
+        "Alternative to specifying a Regex pattern in CrashIfAnyColumnMatches.  Select an existing StandardRegex.  This has the advantage of centralising the concept.  See StandardRegexUI for configuring StandardRegexes")]
     public StandardRegex StandardRegex { get; set; }
-        
-    [DemandsInitialization("Crash message (if any) to explain why columns matching the Regex are a problem e.g. 'Patient telephone numbers should never be extracted!'")]
+
+    [DemandsInitialization(
+        "Crash message (if any) to explain why columns matching the Regex are a problem e.g. 'Patient telephone numbers should never be extracted!'")]
     public string Rationale { get; set; }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var checkPattern = new Regex(GetPattern(), RegexOptions.IgnoreCase);
 
         foreach (var c in toProcess.Columns.Cast<DataColumn>().Select(c => c.ColumnName))
             if (checkPattern.IsMatch(c))
-                if(string.IsNullOrWhiteSpace(Rationale))
+                if (string.IsNullOrWhiteSpace(Rationale))
                     throw new Exception($"Column {c} matches forbidlist regex");
                 else
                     throw new Exception(
@@ -51,12 +54,10 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
@@ -68,7 +69,8 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Problem occurred getting Regex pattern for forbidlist",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs("Problem occurred getting Regex pattern for forbidlist",
+                CheckResult.Fail, e));
         }
     }
 
@@ -83,7 +85,8 @@ private string GetPattern()
 
 
         if (string.IsNullOrWhiteSpace(pattern))
-            throw new Exception("You must specify either a pattern in CrashIfAnyColumnMatches or pick an existing StandardRegex with a pattern to match on");
+            throw new Exception(
+                "You must specify either a pattern in CrashIfAnyColumnMatches or pick an existing StandardRegex with a pattern to match on");
 
         return pattern;
     }
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnRenamer.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnRenamer.cs
index 4c111af2b8..58f9a1c766 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnRenamer.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ColumnRenamer.cs
@@ -26,12 +26,14 @@ public class ColumnRenamer : IPluginDataFlowComponent<DataTable>
     public string ReplacementName { get; set; }
 
 
-    [DemandsInitialization("In relaxed mode the pipeline will not be crashed if the column does not appear.  Default is false i.e. the column MUST appear.", Mandatory = true, DefaultValue = false)]
+    [DemandsInitialization(
+        "In relaxed mode the pipeline will not be crashed if the column does not appear.  Default is false i.e. the column MUST appear.",
+        Mandatory = true, DefaultValue = false)]
     public bool RelaxedMode { get; set; }
 
 
-
-    public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (!toProcess.Columns.Contains(ColumnNameToFind))
             if (RelaxedMode)
@@ -47,20 +49,20 @@ public DataTable ProcessPipelineData( DataTable toProcess, IDataLoadEventListene
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(ColumnNameToFind))
-            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ColumnNameToFind",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ColumnNameToFind",
+                CheckResult.Fail));
 
         if (string.IsNullOrWhiteSpace(ReplacementName))
-            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ReplacementName", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("No value specified for argument ReplacementName",
+                CheckResult.Fail));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ExtractCatalogueMetadata.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ExtractCatalogueMetadata.cs
index 2c79102137..63e6fab31f 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ExtractCatalogueMetadata.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ExtractCatalogueMetadata.cs
@@ -24,7 +24,8 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;
 /// 
 /// <para>The Metadata Naming Pattern will also override the table name in the DataTable flow object.</para>
 /// </summary>
-public class ExtractCatalogueMetadata : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IExtractCommand>, IPipelineRequirement<IBasicActivateItems>
+public class ExtractCatalogueMetadata : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<IExtractCommand>,
+    IPipelineRequirement<IBasicActivateItems>
 {
     private IExtractCommand _request;
     private IBasicActivateItems _activator;
@@ -41,7 +42,8 @@ THIS WILL OVERRIDE THE TableNamingPattern at the destination!
          ", Mandatory = true, DefaultValue = "$d")]
     public string MetadataNamingPattern { get; set; }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         toProcess.TableName = GetTableName();
         toProcess.ExtendedProperties.Add("ProperlyNamed", true);
@@ -50,7 +52,9 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
         {
             var catalogue = extractDatasetCommand.Catalogue;
 
-            var sourceFolder = _request.GetExtractionDirectory() ?? throw new Exception("Could not find Source Folder. Does the project have an Extraction Directory defined?");
+            var sourceFolder = _request.GetExtractionDirectory() ??
+                               throw new Exception(
+                                   "Could not find Source Folder. Does the project have an Extraction Directory defined?");
             var outputFolder = sourceFolder.Parent.CreateSubdirectory(ExtractionDirectory.METADATA_FOLDER_NAME);
             var outputFile = new FileInfo(Path.Combine(outputFolder.FullName, $"{toProcess.TableName}.sd"));
 
@@ -58,8 +62,8 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             var cmd = new ExecuteCommandExportObjectsToFile(_activator, catalogue, outputFile);
             cmd.Execute();
             catalogue.RevertToDatabaseState();
-
         }
+
         return toProcess;
     }
 
@@ -89,22 +93,19 @@ public string GetTableName()
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (MetadataNamingPattern != null && MetadataNamingPattern.Contains("$a"))
-        {
             if (_request is ExtractDatasetCommand dsRequest && string.IsNullOrWhiteSpace(dsRequest.Catalogue.Acronym))
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but MetadataNamingPattern contains $a", CheckResult.Fail));
-        }
+                    $"Catalogue '{dsRequest.Catalogue}' does not have an Acronym but MetadataNamingPattern contains $a",
+                    CheckResult.Fail));
     }
 
     public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ReleaseMetadata.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ReleaseMetadata.cs
index 87cb024be4..f44bac0302 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ReleaseMetadata.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/ReleaseMetadata.cs
@@ -28,12 +28,14 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;
 /// <para>This serialization includes the allocation of SharingUIDs to allow for later updates and to prevent duplicate loading in the destination.  In addition it handles
 /// system boundaries e.g. it doesn't serialize <see cref="LoadMetadata"/> of the <see cref="Catalogue"/> or other deployment specific objects</para>
 /// </summary>
-public class ReleaseMetadata : IPluginDataFlowComponent<ReleaseAudit>, IPipelineRequirement<ReleaseData>, IPipelineRequirement<IBasicActivateItems>
+public class ReleaseMetadata : IPluginDataFlowComponent<ReleaseAudit>, IPipelineRequirement<ReleaseData>,
+    IPipelineRequirement<IBasicActivateItems>
 {
     private ReleaseData _releaseData;
     private IBasicActivateItems _activator;
 
-    public ReleaseAudit ProcessPipelineData(ReleaseAudit toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public ReleaseAudit ProcessPipelineData(ReleaseAudit toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var allCatalogues =
             _releaseData.SelectedDatasets.Values.SelectMany(sd => sd.ToList())
@@ -41,19 +43,22 @@ public ReleaseAudit ProcessPipelineData(ReleaseAudit toProcess, IDataLoadEventLi
                 .Distinct()
                 .Cast<IMapsDirectlyToDatabaseTable>()
                 .ToArray();
-            
-        if(!allCatalogues.Any())
+
+        if (!allCatalogues.Any())
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning, "No Catalogues are selected for release"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning, "No Catalogues are selected for release"));
             return toProcess;
         }
 
-        var sourceFolder = _releaseData.ConfigurationsForRelease.First().Value.First().ExtractDirectory.Parent ?? throw new Exception("Could not find Source Folder. DOes the project have an Extraction Directory defined?");
+        var sourceFolder = _releaseData.ConfigurationsForRelease.First().Value.First().ExtractDirectory.Parent ??
+                           throw new Exception(
+                               "Could not find Source Folder. DOes the project have an Extraction Directory defined?");
         var outputFolder = sourceFolder.CreateSubdirectory(ExtractionDirectory.METADATA_FOLDER_NAME);
 
         var cmd = new ExecuteCommandExportObjectsToFile(_activator, allCatalogues, outputFolder);
         cmd.Execute();
-            
+
         return toProcess;
     }
 
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/RowDeleter.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/RowDeleter.cs
index 3b25f5e25b..05b3dc4298 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/RowDeleter.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/RowDeleter.cs
@@ -15,12 +15,13 @@
 
 namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;
 
-internal class RowDeleter: IPluginDataFlowComponent<DataTable>
+internal class RowDeleter : IPluginDataFlowComponent<DataTable>
 {
     [DemandsInitialization("Looks for a column with exactly this name", Mandatory = true)]
     public string ColumnNameToFind { get; set; }
 
-    [DemandsInitialization("Deletes all rows where the values in the specified ColumnNameToFind match the StandardRegex")]
+    [DemandsInitialization(
+        "Deletes all rows where the values in the specified ColumnNameToFind match the StandardRegex")]
     public StandardRegex DeleteRowsWhereValuesMatchStandard { get; set; }
 
     [DemandsInitialization("Deletes all rows where the values in the specified ColumnNameToFind match the Regex")]
@@ -29,7 +30,8 @@ internal class RowDeleter: IPluginDataFlowComponent<DataTable>
     private int _deleted;
     private Stopwatch _sw = new();
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         _sw.Start();
         var outputTable = new DataTable();
@@ -50,7 +52,9 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                 _deleted++;
         }
 
-        listener.OnProgress(this,new ProgressEventArgs("Deleting Rows",new ProgressMeasurement(_deleted,ProgressType.Records),_sw.Elapsed ));
+        listener.OnProgress(this,
+            new ProgressEventArgs("Deleting Rows", new ProgressMeasurement(_deleted, ProgressType.Records),
+                _sw.Elapsed));
 
         _sw.Stop();
         return outputTable;
@@ -58,12 +62,13 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-        listener.OnNotify(this,new NotifyEventArgs(_deleted > 0 ? ProgressEventType.Warning : ProgressEventType.Information,$"Total RowDeleted operations for ColumnNameToFind '{ColumnNameToFind}' was {_deleted}"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(_deleted > 0 ? ProgressEventType.Warning : ProgressEventType.Information,
+                $"Total RowDeleted operations for ColumnNameToFind '{ColumnNameToFind}' was {_deleted}"));
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/SetNull.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/SetNull.cs
index 85d19c22b8..09a2cf71cc 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/SetNull.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/SetNull.cs
@@ -21,7 +21,8 @@ internal class SetNull : IPluginDataFlowComponent<DataTable>
     [DemandsInitialization("Looks for a column with exactly this name", Mandatory = true)]
     public string ColumnNameToFind { get; set; }
 
-    [DemandsInitialization("Deletes all rows where the values in the specified ColumnNameToFind match the StandardRegex")]
+    [DemandsInitialization(
+        "Deletes all rows where the values in the specified ColumnNameToFind match the StandardRegex")]
     public StandardRegex NullCellsWhereValuesMatchStandard { get; set; }
 
     [DemandsInitialization("Deletes all rows where the values in the specified ColumnNameToFind match the Regex")]
@@ -30,7 +31,8 @@ internal class SetNull : IPluginDataFlowComponent<DataTable>
     private int _changes;
     private Stopwatch _sw = new();
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         _sw.Start();
 
@@ -46,10 +48,11 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                 row[ColumnNameToFind] = DBNull.Value;
                 _changes++;
             }
-                
         }
 
-        listener.OnProgress(this,new ProgressEventArgs("SetNull Rows",new ProgressMeasurement(_changes,ProgressType.Records),_sw.Elapsed ));
+        listener.OnProgress(this,
+            new ProgressEventArgs("SetNull Rows", new ProgressMeasurement(_changes, ProgressType.Records),
+                _sw.Elapsed));
 
         _sw.Stop();
         return toProcess;
@@ -57,18 +60,19 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-
-        listener.OnNotify(this,new NotifyEventArgs(_changes > 0 ? ProgressEventType.Warning : ProgressEventType.Information,$"Total SetNull operations for ColumnNameToFind '{ColumnNameToFind}' was {_changes}"));
+        listener.OnNotify(this,
+            new NotifyEventArgs(_changes > 0 ? ProgressEventType.Warning : ProgressEventType.Information,
+                $"Total SetNull operations for ColumnNameToFind '{ColumnNameToFind}' was {_changes}"));
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (NullCellsWhereValuesMatch == null && NullCellsWhereValuesMatchStandard == null)
-            notifier.OnCheckPerformed(new CheckEventArgs("You must specify a Regex for value selection", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("You must specify a Regex for value selection",
+                CheckResult.Fail));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Swapping/ColumnSwapper.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Swapping/ColumnSwapper.cs
index 544e67ca89..ecdccaf44d 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Swapping/ColumnSwapper.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Swapping/ColumnSwapper.cs
@@ -31,18 +31,23 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations.Swapping;
 /// <summary>
 /// Swaps values stored in a given column for values found in a mapping table (e.g. swap ReleaseID for PrivateID)
 /// </summary>
-internal class ColumnSwapper:IPluginDataFlowComponent<DataTable>, IPipelineOptionalRequirement<IExtractCommand>, IPipelineOptionalRequirement<ICohortCreationRequest>
+internal class ColumnSwapper : IPluginDataFlowComponent<DataTable>, IPipelineOptionalRequirement<IExtractCommand>,
+    IPipelineOptionalRequirement<ICohortCreationRequest>
 {
-    [DemandsInitialization("The column in your pipeline containing input values you want swapped.  Leave null to use the same name as the MappingFromColumn")]
+    [DemandsInitialization(
+        "The column in your pipeline containing input values you want swapped.  Leave null to use the same name as the MappingFromColumn")]
     public string InputFromColumn { get; set; }
 
-    [DemandsInitialization("Name for the column you want to create in the output stream of this component containing the mapped values.  Leave null to use the same name as the MappingToColumn")]
+    [DemandsInitialization(
+        "Name for the column you want to create in the output stream of this component containing the mapped values.  Leave null to use the same name as the MappingToColumn")]
     public string OutputToColumn { get; set; }
 
-    [DemandsInitialization("The column in your database which stores the input values you want mapped", Mandatory = true)]
+    [DemandsInitialization("The column in your database which stores the input values you want mapped",
+        Mandatory = true)]
     public ColumnInfo MappingFromColumn { get; set; }
 
-    [DemandsInitialization("The column in your database which stores the output values you want emitted", Mandatory = true)]
+    [DemandsInitialization("The column in your database which stores the output values you want emitted",
+        Mandatory = true)]
     public ColumnInfo MappingToColumn { get; set; }
 
     [DemandsInitialization(@"Optional text to add when generating the mapping table. Should not start with WHERE.
@@ -57,21 +62,25 @@ internal class ColumnSwapper:IPluginDataFlowComponent<DataTable>, IPipelineOptio
     $l - Release Ticket (e.g. 'LINK-1234')", DemandType = DemandType.SQL, ContextText = "WHERE")]
     public virtual string WHERELogic { get; set; }
 
-    [DemandsInitialization("Determines behaviour when the same input value maps to multiple output values", DefaultValue = AliasResolutionStrategy.CrashIfAliasesFound)]
+    [DemandsInitialization("Determines behaviour when the same input value maps to multiple output values",
+        DefaultValue = AliasResolutionStrategy.CrashIfAliasesFound)]
     public AliasResolutionStrategy AliasResolutionStrategy { get; set; }
 
     [DemandsInitialization(@"Determines behaviour when no mapping is found for an input value:
 True - Crash the load
-False - Drop the row from the DataTable (and issue a warning)",DefaultValue=true)]
+False - Drop the row from the DataTable (and issue a warning)", DefaultValue = true)]
     public bool CrashIfNoMappingsFound { get; set; }
 
-    [DemandsInitialization("Timeout to set on fetching the mapping table",DefaultValue=30)]
+    [DemandsInitialization("Timeout to set on fetching the mapping table", DefaultValue = 30)]
     public int Timeout { get; set; }
 
-    [DemandsInitialization(@"Setting this to true will leave the original input column in your DataTable (so your table will have both input and output columns instead of a substitution)", DefaultValue = true)]
+    [DemandsInitialization(
+        @"Setting this to true will leave the original input column in your DataTable (so your table will have both input and output columns instead of a substitution)",
+        DefaultValue = true)]
     public bool KeepInputColumnToo { get; set; }
-                
+
     private CultureInfo _culture;
+
     [DemandsInitialization("The culture to use e.g. when Type translations are required")]
     public CultureInfo Culture
     {
@@ -79,7 +88,7 @@ public CultureInfo Culture
         set => _culture = value;
     }
 
-    private Dictionary<object,List<object>> _mappingTable;
+    private Dictionary<object, List<object>> _mappingTable;
 
     /// <summary>
     /// The Type of objects that are stored in the Keys of <see cref="_mappingTable"/>.  For use when input types do not match the mapping table types
@@ -90,28 +99,33 @@ public CultureInfo Culture
     protected IProject _project;
     protected IExtractionConfiguration _configuration;
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
-        var fromColumnName = string.IsNullOrWhiteSpace(InputFromColumn) ? MappingFromColumn.GetRuntimeName() : InputFromColumn;
-        var toColumnName = string.IsNullOrWhiteSpace(OutputToColumn) ? MappingToColumn.GetRuntimeName() : OutputToColumn;
+        var fromColumnName = string.IsNullOrWhiteSpace(InputFromColumn)
+            ? MappingFromColumn.GetRuntimeName()
+            : InputFromColumn;
+        var toColumnName = string.IsNullOrWhiteSpace(OutputToColumn)
+            ? MappingToColumn.GetRuntimeName()
+            : OutputToColumn;
 
         var inPlace = string.Equals(fromColumnName, toColumnName);
 
-        listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, "About to build mapping table"));
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "About to build mapping table"));
 
-        if(!toProcess.Columns.Contains(fromColumnName))
+        if (!toProcess.Columns.Contains(fromColumnName))
             throw new Exception($"DataTable did not contain a field called '{fromColumnName}'");
 
         if (!inPlace && toProcess.Columns.Contains(toColumnName))
             throw new Exception($"DataTable already contained a field '{toColumnName}'");
 
-        if(_mappingTable == null)
+        if (_mappingTable == null)
             BuildMappingTable(listener);
 
-        if(!_mappingTable.Any())
+        if (!_mappingTable.Any())
             throw new Exception("Mapping table was empty");
 
-        if(_keyType == null)
+        if (_keyType == null)
             throw new Exception("Unable to determine key datatype for mapping table");
 
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
@@ -122,10 +136,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             $"Mapping table Key is of Type {_keyType}"));
 
         //add the new column (the output column).  Unless we are just updating the same input column
-        if (!inPlace)
-        {
-            toProcess.Columns.Add(toColumnName);
-        }
+        if (!inPlace) toProcess.Columns.Add(toColumnName);
 
 
         var idxFrom = toProcess.Columns.IndexOf(fromColumnName);
@@ -138,59 +149,59 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
         // Flag and anonymous method for converting between input data type and mapping table datatype
         var doTypeConversion = false;
-        Func<object,object> typeConversion=null;
+        Func<object, object> typeConversion = null;
 
         //if there is a difference between the input column datatype and the mapping table datatatype
-        if(toProcess.Columns[idxFrom].DataType != _keyType)
+        if (toProcess.Columns[idxFrom].DataType != _keyType)
         {
             //tell the user
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Input DataTable column {fromColumnName} is of data type {toProcess.Columns[idxFrom].DataType}, this differs from mapping table which is {_keyType}.  Type conversion will take place between these two Types when performing lookup"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    $"Input DataTable column {fromColumnName} is of data type {toProcess.Columns[idxFrom].DataType}, this differs from mapping table which is {_keyType}.  Type conversion will take place between these two Types when performing lookup"));
             doTypeConversion = true;
 
             //work out a suitable anonymous method for converting between the Types
-            if(_keyType == typeof(string))
-                typeConversion = a=>a.ToString();
+            if (_keyType == typeof(string))
+                typeConversion = a => a.ToString();
             else
-            {
                 try
                 {
                     var deciderFactory = new TypeDeciderFactory(Culture);
                     var decider = deciderFactory.Create(_keyType);
-                    typeConversion = a=>decider.Parse(a.ToString());
+                    typeConversion = a => decider.Parse(a.ToString());
                 }
                 catch (Exception ex)
                 {
-                    throw new Exception($"Error building Type convertion decider for the mapping table key type {_keyType}",ex);
-                }   
-            }
-                    
+                    throw new Exception(
+                        $"Error building Type convertion decider for the mapping table key type {_keyType}", ex);
+                }
         }
-                
+
         foreach (DataRow row in toProcess.Rows)
         {
             var fromValue = row[idxFrom];
-                
+
             //ignore null inputs, pass them straight through
-            if(fromValue == DBNull.Value)
+            if (fromValue == DBNull.Value)
             {
                 row[idxTo] = DBNull.Value;
                 continue;
             }
 
             //if we have to do a Type conversion
-            if(doTypeConversion)
-            {
+            if (doTypeConversion)
                 // convert the input value to the mapping table key Type
                 fromValue = typeConversion(fromValue);
-            }
 
             //if we don't have the key value
-            if(!_mappingTable.ContainsKey(fromValue))
-                if(CrashIfNoMappingsFound)
+            if (!_mappingTable.ContainsKey(fromValue))
+                if (CrashIfNoMappingsFound)
+                {
                     throw new KeyNotFoundException($"Could not find mapping for {fromValue}");
+                }
                 else
                 {
-                    listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+                    listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"No mapping for '{fromValue}' dropping row"));
                     toDrop.Add(row);
                     continue;
@@ -203,7 +214,6 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             if (results.Count == 1)
                 row[idxTo] = results.Single();
             else
-            {
                 //great we have multiple mappings, bob=>Frank and bob=>Jesus.  What does the user want to do about that
                 switch (AliasResolutionStrategy)
                 {
@@ -212,7 +222,7 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                             $"The value '{fromValue}' maps to mulitple ouptut values:{string.Join(",", results.Select(v => $"'{v}'"))}");
 
                     case AliasResolutionStrategy.MultiplyInputDataRowsByAliases:
-                            
+
                         //substitute for the first alias (bob=>Frank)
                         row[idxTo] = results.First();
 
@@ -234,9 +244,8 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
                     default:
                         throw new ArgumentOutOfRangeException();
                 }
-            }
         }
-            
+
         //add any alias multiplication rows
         foreach (var newRow in newRows)
             toProcess.Rows.Add(newRow);
@@ -246,9 +255,9 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
             toProcess.Rows.Remove(dropRow);
 
         // drop column unless it is an inplace (no new columns) update or user wants to keep both
-        if(!inPlace && !KeepInputColumnToo)
+        if (!inPlace && !KeepInputColumnToo)
             toProcess.Columns.Remove(fromColumnName);
-            
+
         return toProcess;
     }
 
@@ -282,14 +291,17 @@ private void BuildMappingTable(IDataLoadEventListener listener)
                     {
                         var keyVal = r[fromColumnName];
 
-                        if(keyVal != DBNull.Value)
+                        if (keyVal != DBNull.Value)
                         {
-                            if(_keyType == null)
+                            if (_keyType == null)
+                            {
                                 _keyType = keyVal.GetType();
+                            }
                             else
                             {
-                                if(_keyType != keyVal.GetType())
-                                    throw new Exception($"Database mapping table Keys were of mixed Types {_keyType} and {keyVal.GetType()}");
+                                if (_keyType != keyVal.GetType())
+                                    throw new Exception(
+                                        $"Database mapping table Keys were of mixed Types {_keyType} and {keyVal.GetType()}");
                             }
                         }
                         else
@@ -298,8 +310,8 @@ private void BuildMappingTable(IDataLoadEventListener listener)
                             continue;
                         }
 
-                        if(!_mappingTable.ContainsKey(keyVal))
-                            _mappingTable.Add(keyVal,new List<object>());
+                        if (!_mappingTable.ContainsKey(keyVal))
+                            _mappingTable.Add(keyVal, new List<object>());
 
                         _mappingTable[keyVal].Add(r[toColumnName]);
                     }
@@ -307,8 +319,10 @@ private void BuildMappingTable(IDataLoadEventListener listener)
             }
         }
 
-        if(nulls > 0)
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,$"Discarded {nulls} Null key values read from mapping table"));
+        if (nulls > 0)
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    $"Discarded {nulls} Null key values read from mapping table"));
     }
 
     protected virtual string GetMappingTableSql()
@@ -316,13 +330,13 @@ protected virtual string GetMappingTableSql()
         var repo = new MemoryCatalogueRepository();
 
         var qb = new QueryBuilder("DISTINCT", null, null);
-        qb.AddColumn(new ColumnInfoToIColumn(repo,MappingFromColumn));
-        qb.AddColumn(new ColumnInfoToIColumn(repo,MappingToColumn));
+        qb.AddColumn(new ColumnInfoToIColumn(repo, MappingFromColumn));
+        qb.AddColumn(new ColumnInfoToIColumn(repo, MappingToColumn));
 
         if (!string.IsNullOrWhiteSpace(WHERELogic))
         {
-            var container = new SpontaneouslyInventedFilterContainer(repo,null, null, FilterContainerOperation.AND);
-            var filter = new SpontaneouslyInventedFilter(repo,container, WHERELogic, "WHERELogic", null, null);
+            var container = new SpontaneouslyInventedFilterContainer(repo, null, null, FilterContainerOperation.AND);
+            var filter = new SpontaneouslyInventedFilter(repo, container, WHERELogic, "WHERELogic", null, null);
             container.AddChild(filter);
 
             qb.RootFilterContainer = container;
@@ -335,10 +349,8 @@ private string AdjustForProjectTokens(string mappingTableSql)
     {
         if (mappingTableSql.Contains("$p"))
         {
-            if(_project == null)
-            {
+            if (_project == null)
                 throw new Exception("You cannot use $p in contexts where there is no Project available");
-            }
 
             mappingTableSql = mappingTableSql.Replace("$p",
                 _project.Name?.ToString() ?? throw new Exception("Project didn't have a Project Name"));
@@ -346,51 +358,46 @@ private string AdjustForProjectTokens(string mappingTableSql)
 
         if (mappingTableSql.Contains("$n"))
         {
-
             if (_project == null)
-            {
                 throw new Exception("You cannot use $n in contexts where there is no Project available");
-            }
 
             mappingTableSql = mappingTableSql.Replace("$n",
-                _project.ProjectNumber?.ToString() ?? throw new Exception($"Project '{_project.Name}' didn't have a Project Number"));
+                _project.ProjectNumber?.ToString() ??
+                throw new Exception($"Project '{_project.Name}' didn't have a Project Number"));
         }
 
         if (mappingTableSql.Contains("$t"))
         {
-
             if (_project == null)
-            {
                 throw new Exception("You cannot use $t in contexts where there is no Project available");
-            }
 
             mappingTableSql = mappingTableSql.Replace("$t",
-                _project.MasterTicket?.ToString() ?? throw new Exception($"Project '{_project.Name}' didn't have a Master Ticket"));
+                _project.MasterTicket?.ToString() ??
+                throw new Exception($"Project '{_project.Name}' didn't have a Master Ticket"));
         }
 
         if (mappingTableSql.Contains("$r"))
         {
-
             if (_configuration == null)
-            {
-                throw new Exception("You cannot use $r in contexts where there is no ExtractionConfiguration available");
-            }
+                throw new Exception(
+                    "You cannot use $r in contexts where there is no ExtractionConfiguration available");
 
             mappingTableSql = mappingTableSql.Replace("$r",
-                _configuration.RequestTicket?.ToString() ?? throw new Exception($"Extraction Configuration '{_configuration.Name}' didn't have a Request Ticket"));
+                _configuration.RequestTicket?.ToString() ??
+                throw new Exception($"Extraction Configuration '{_configuration.Name}' didn't have a Request Ticket"));
         }
 
         if (mappingTableSql.Contains("$l"))
         {
             if (_configuration == null)
-            {
-                throw new Exception("You cannot use $l in contexts where there is no ExtractionConfiguration available");
-            }
+                throw new Exception(
+                    "You cannot use $l in contexts where there is no ExtractionConfiguration available");
 
             mappingTableSql = mappingTableSql.Replace("$l",
-                _configuration.ReleaseTicket?.ToString() ?? throw new Exception($"Extraction Configuration '{_configuration.Name}' didn't have a Release Ticket"));
+                _configuration.ReleaseTicket?.ToString() ??
+                throw new Exception($"Extraction Configuration '{_configuration.Name}' didn't have a Release Ticket"));
         }
-            
+
 
         return mappingTableSql;
     }
@@ -411,18 +418,18 @@ public void Abort(IDataLoadEventListener listener)
 
     public virtual void Check(ICheckNotifier notifier)
     {
-        if(!string.IsNullOrWhiteSpace(WHERELogic))
-            if(WHERELogic.StartsWith("WHERE"))
+        if (!string.IsNullOrWhiteSpace(WHERELogic))
+            if (WHERELogic.StartsWith("WHERE"))
                 throw new Exception("WHERE logic should not start with WHERE");
 
-        if(MappingFromColumn == null || MappingToColumn == null)
+        if (MappingFromColumn == null || MappingToColumn == null)
             throw new Exception("Mapping From/To Column missing, these are Mandatory");
 
-        if(MappingFromColumn.TableInfo_ID != MappingToColumn.TableInfo_ID)
+        if (MappingFromColumn.TableInfo_ID != MappingToColumn.TableInfo_ID)
             throw new Exception("MappingFromColumn and MappingToColumn must belong to the same table");
 
         notifier.OnCheckPerformed(new CheckEventArgs(
-            $"Mapping table SQL is:{Environment.NewLine}{GetMappingTableSql()}",CheckResult.Success));
+            $"Mapping table SQL is:{Environment.NewLine}{GetMappingTableSql()}", CheckResult.Success));
     }
 
     public void PreInitialize(IExtractCommand value, IDataLoadEventListener listener)
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/TableVersionNamer.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/TableVersionNamer.cs
index 4e06b9e859..dc3e6df59d 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/TableVersionNamer.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/TableVersionNamer.cs
@@ -19,17 +19,20 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowOperations;
 /// <summary>
 /// Renames DataTables in the pipeline so that they do not collide with any tables at the destination database.  This is done by appending V1,V2,V3 etc to the table
 /// </summary>
-public class TableVersionNamer : IPluginDataFlowComponent<DataTable>,IPipelineRequirement<DiscoveredDatabase>
+public class TableVersionNamer : IPluginDataFlowComponent<DataTable>, IPipelineRequirement<DiscoveredDatabase>
 {
     private string[] _tableNamesAtDestination;
 
-    [DemandsInitialization("Suffix pattern, $v is the version, default is _V$v as in MyTable_V1, MyTable_V2 etc",DemandType.Unspecified,"_V$v")]
+    [DemandsInitialization("Suffix pattern, $v is the version, default is _V$v as in MyTable_V1, MyTable_V2 etc",
+        DemandType.Unspecified, "_V$v")]
     public string Suffix { get; set; }
 
-    [DemandsInitialization("The maximum number of tables to allow, defaults to 1000 so MyTable_V1 up to MyTable_V1000", DemandType.Unspecified, 1000)]
+    [DemandsInitialization("The maximum number of tables to allow, defaults to 1000 so MyTable_V1 up to MyTable_V1000",
+        DemandType.Unspecified, 1000)]
     public int MaximumNumberOfVersionsAllowed { get; set; }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         toProcess.TableName = GetVersionedTableName(toProcess.TableName);
         return toProcess;
@@ -50,18 +53,17 @@ private string GetVersionedTableName(string tableName)
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (MaximumNumberOfVersionsAllowed == 0)
-            notifier.OnCheckPerformed(new CheckEventArgs("MaximumNumberOfVersionsAllowed cannot be 0",CheckResult.Fail));
+            notifier.OnCheckPerformed(
+                new CheckEventArgs("MaximumNumberOfVersionsAllowed cannot be 0", CheckResult.Fail));
     }
 
     public void PreInitialize(DiscoveredDatabase value, IDataLoadEventListener listener)
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Transposer.cs b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Transposer.cs
index 21c9d98a8d..80458c62fb 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Transposer.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowOperations/Transposer.cs
@@ -28,18 +28,21 @@ public class Transposer : IPluginDataFlowComponent<DataTable>
 {
     private bool _haveServedResult = false;
 
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MakeHeaderNamesSane_DemandDescription,DemandType.Unspecified,true)]
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MakeHeaderNamesSane_DemandDescription,
+        DemandType.Unspecified, true)]
     public bool MakeHeaderNamesSane { get; set; }
 
-    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         if (toProcess == null)
             return null;
-            
-        if(_haveServedResult)
-            throw new NotSupportedException("Error, we received multiple batches, Transposer only works when all the data arrives in a single DataTable");
-            
-        if(toProcess.Rows.Count == 0 || toProcess.Columns.Count == 0)
+
+        if (_haveServedResult)
+            throw new NotSupportedException(
+                "Error, we received multiple batches, Transposer only works when all the data arrives in a single DataTable");
+
+        if (toProcess.Rows.Count == 0 || toProcess.Columns.Count == 0)
             throw new NotSupportedException(
                 $"DataTable toProcess had {toProcess.Rows.Count} rows and {toProcess.Columns.Count} columns, thus it cannot be transposed");
 
@@ -50,17 +53,14 @@ public DataTable ProcessPipelineData(DataTable toProcess, IDataLoadEventListener
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-
     }
 
     public void Check(ICheckNotifier notifier)
     {
-
     }
 
     private DataTable GenerateTransposedTable(DataTable inputTable)
@@ -95,6 +95,7 @@ private DataTable GenerateTransposedTable(DataTable inputTable)
                 var colValue = inputTable.Rows[cCount][rCount].ToString();
                 newRow[cCount + 1] = colValue;
             }
+
             outputTable.Rows.Add(newRow);
         }
 
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/DelimitedFlatFileDataFlowSource.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/DelimitedFlatFileDataFlowSource.cs
index ae8e6d00e5..7548c3c50c 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/DelimitedFlatFileDataFlowSource.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/DelimitedFlatFileDataFlowSource.cs
@@ -42,11 +42,20 @@ public class DelimitedFlatFileDataFlowSource : IPluginDataFlowSource<DataTable>,
     public const int MinimumStronglyTypeInputBatchSize = 500;
 
     #region User viewable descriptions of what properties do (used to help wrapper classes have consistent definitions
-    public const string ForceHeaders_DemandDescription = "Forces specific headers to be interpreted for columns, this is a string that will effectively be appended to the front of the file when it is read.  WARNING: Use this argument only when the file does not have any headers (Note that you must use the appropriate separator for your file)";
-    public const string ForceHeadersReplacesFirstLineInFile_Description = "Only used when ForceHeaders is specified, if true then the line will replace the first line of the file.  If left as false (default) then the line will be appended to the file.  Use true if you want to replace existing headers in the file and false if hte file doesn't have any headers in it at all.";
-    public const string IgnoreQuotes_DemandDescription = "True if the parser should treat double quotes as normal characters";
+
+    public const string ForceHeaders_DemandDescription =
+        "Forces specific headers to be interpreted for columns, this is a string that will effectively be appended to the front of the file when it is read.  WARNING: Use this argument only when the file does not have any headers (Note that you must use the appropriate separator for your file)";
+
+    public const string ForceHeadersReplacesFirstLineInFile_Description =
+        "Only used when ForceHeaders is specified, if true then the line will replace the first line of the file.  If left as false (default) then the line will be appended to the file.  Use true if you want to replace existing headers in the file and false if hte file doesn't have any headers in it at all.";
+
+    public const string IgnoreQuotes_DemandDescription =
+        "True if the parser should treat double quotes as normal characters";
+
     public const string IgnoreBlankLines_DemandDescription = "True if the parser should skip over blank lines";
-    public const string MakeHeaderNamesSane_DemandDescription = "True (recommended) if you want to fix columns that have crazy names e.g. 'my column #1' would become 'mycolumn1'";
+
+    public const string MakeHeaderNamesSane_DemandDescription =
+        "True (recommended) if you want to fix columns that have crazy names e.g. 'my column #1' would become 'mycolumn1'";
 
     public const string BadDataHandlingStrategy_DemandDescription =
         @"Determines system behaviour when unprocessable rows are found in the file being loaded:
@@ -58,26 +67,32 @@ public class DelimitedFlatFileDataFlowSource : IPluginDataFlowSource<DataTable>,
         @"True - Ignore read warnings from CSVHelper (e.g. when a quote appears in the middle of a cell)
 False - Treat read warnings from CSVHelper according to the BadDataHandlingStrategy";
 
-    public const string ThrowOnEmptyFiles_DemandDescription = @"Determines system behaviour when a file is empty or has only a header row";
+    public const string ThrowOnEmptyFiles_DemandDescription =
+        @"Determines system behaviour when a file is empty or has only a header row";
 
     public const string AttemptToResolveNewLinesInRecords_DemandDescription =
         @"Determines system behaviour when a line has too few cells compared to the header count.  
 True - Attempt to read more lines to make a complete record
 False - Treat the line as bad data (See BadDataHandlingStrategy)";
 
-    public const string MaximumErrorsToReport_DemandDescription = "The maximum number of file report before suppressing logging.  This is important if you have a large file e.g. 80 million rows and you have a bug/configuration problem that results in lots of bad rows.  Specify 0 for no limit.  Negatives also result in no limit";
+    public const string MaximumErrorsToReport_DemandDescription =
+        "The maximum number of file report before suppressing logging.  This is important if you have a large file e.g. 80 million rows and you have a bug/configuration problem that results in lots of bad rows.  Specify 0 for no limit.  Negatives also result in no limit";
 
     public const string IgnoreColumns_Description =
         @"By default all columns from the source (file) will be read.  Set this to a list of headers (separated with the correct separator for your file) to ignore the specified columns.
 
 This will not help you avoid bad data as the full file structure must still be read regardless.";
+
     #endregion
 
     [DemandsInitialization("The separator that delimits the file", Mandatory = true)]
     public string Separator
     {
         get => _separator;
-        set => _separator = value == "\\t"?"\t":value; //automatically switch \\t into \t (user inputs \t it turns to whitespace tab when executing)
+        set => _separator =
+            value == "\\t"
+                ? "\t"
+                : value; //automatically switch \\t into \t (user inputs \t it turns to whitespace tab when executing)
     }
 
     [DemandsInitialization(ForceHeaders_DemandDescription)]
@@ -92,22 +107,29 @@ public string Separator
     [DemandsInitialization(IgnoreQuotes_DemandDescription)]
     public bool IgnoreBlankLines { get; set; }
 
-    [DemandsInitialization(MakeHeaderNamesSane_DemandDescription,DemandType.Unspecified,true)]
+    [DemandsInitialization(MakeHeaderNamesSane_DemandDescription, DemandType.Unspecified, true)]
     public bool MakeHeaderNamesSane { get; set; }
 
-    [DemandsInitialization("True (recommended) if you want to impute the datatypes from the data being loaded, False if you want to load everything as strings", DemandType.Unspecified,true)]
+    [DemandsInitialization(
+        "True (recommended) if you want to impute the datatypes from the data being loaded, False if you want to load everything as strings",
+        DemandType.Unspecified, true)]
     public bool StronglyTypeInput { get; set; }
 
-    [DemandsInitialization("BatchSize to use when predicting datatypes i.e. if you set this to 1000 then the first 1000 rows have int field then the 5000th row has a string you will get an error.  Set to 0 to use MaxBatchSize.  Set to -1 to load the entire file before computing datatypes (can result in out of memory for super large files)")]
+    [DemandsInitialization(
+        "BatchSize to use when predicting datatypes i.e. if you set this to 1000 then the first 1000 rows have int field then the 5000th row has a string you will get an error.  Set to 0 to use MaxBatchSize.  Set to -1 to load the entire file before computing datatypes (can result in out of memory for super large files)")]
     public int StronglyTypeInputBatchSize { get; set; }
 
-    [DemandsInitialization("Number of rows to read at once from the input file in each go (after the first - See StronglyTypeInputBatchSize)",DefaultValue=100000)]
-    public int MaxBatchSize {get;set;}
+    [DemandsInitialization(
+        "Number of rows to read at once from the input file in each go (after the first - See StronglyTypeInputBatchSize)",
+        DefaultValue = 100000)]
+    public int MaxBatchSize { get; set; }
 
-    [DemandsInitialization("A collection of column names that are expected to be found in the input file which you want to specify as explicit types (e.g. you load barcodes like 0110 and 1111 and want these all loaded as char(4) instead of int)")]
+    [DemandsInitialization(
+        "A collection of column names that are expected to be found in the input file which you want to specify as explicit types (e.g. you load barcodes like 0110 and 1111 and want these all loaded as char(4) instead of int)")]
     public ExplicitTypingCollection ExplicitlyTypedColumns { get; set; }
 
-    [DemandsInitialization(BadDataHandlingStrategy_DemandDescription, DefaultValue=BadDataHandlingStrategy.ThrowException)]
+    [DemandsInitialization(BadDataHandlingStrategy_DemandDescription,
+        DefaultValue = BadDataHandlingStrategy.ThrowException)]
     public BadDataHandlingStrategy BadDataHandlingStrategy { get; set; }
 
     [DemandsInitialization(IgnoreBadReads_DemandDescription, DefaultValue = true)]
@@ -126,6 +148,7 @@ public string Separator
     public string IgnoreColumns { get; set; }
 
     private CultureInfo _culture;
+
     [DemandsInitialization("The culture to use for dates")]
     public CultureInfo Culture
     {
@@ -134,7 +157,7 @@ public CultureInfo Culture
     }
 
     [DemandsInitialization(Attacher.ExplicitDateTimeFormat_DemandDescription)]
-    public string ExplicitDateTimeFormat {get;set;}
+    public string ExplicitDateTimeFormat { get; set; }
 
     /// <summary>
     /// The database table we are trying to load
@@ -155,7 +178,7 @@ public CultureInfo Culture
     /// </summary>
     private string[] _prohibitedExtensions =
     {
-        ".xls",".xlsx",".doc",".docx"
+        ".xls", ".xlsx", ".doc", ".docx"
     };
 
     private string _separator;
@@ -168,9 +191,12 @@ public CultureInfo Culture
 
     private void InitializeComponents()
     {
-        Headers = new FlatFileColumnCollection(_fileToLoad, MakeHeaderNamesSane, ExplicitlyTypedColumns, ForceHeaders, ForceHeadersReplacesFirstLineInFile, IgnoreColumns);
-        DataPusher = new FlatFileToDataTablePusher(_fileToLoad, Headers, HackValueReadFromFile, AttemptToResolveNewLinesInRecords,Culture,ExplicitDateTimeFormat);
-        EventHandlers = new FlatFileEventHandlers(_fileToLoad, DataPusher, ThrowOnEmptyFiles, BadDataHandlingStrategy, _listener, MaximumErrorsToReport <= 0 ? int.MaxValue:MaximumErrorsToReport,IgnoreBadReads);
+        Headers = new FlatFileColumnCollection(_fileToLoad, MakeHeaderNamesSane, ExplicitlyTypedColumns, ForceHeaders,
+            ForceHeadersReplacesFirstLineInFile, IgnoreColumns);
+        DataPusher = new FlatFileToDataTablePusher(_fileToLoad, Headers, HackValueReadFromFile,
+            AttemptToResolveNewLinesInRecords, Culture, ExplicitDateTimeFormat);
+        EventHandlers = new FlatFileEventHandlers(_fileToLoad, DataPusher, ThrowOnEmptyFiles, BadDataHandlingStrategy,
+            _listener, MaximumErrorsToReport <= 0 ? int.MaxValue : MaximumErrorsToReport, IgnoreBadReads);
     }
 
 
@@ -193,7 +219,7 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
                 //open the file
                 OpenFile(_fileToLoad.File);
 
-                if(Headers.FileIsEmpty)
+                if (Headers.FileIsEmpty)
                 {
                     EventHandlers.FileIsEmpty();
                     return null;
@@ -205,7 +231,8 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
             {
                 //create a table with the name of the file
                 _workingTable = Headers.GetDataTableWithHeaders(_listener);
-                _workingTable.TableName = QuerySyntaxHelper.MakeHeaderNameSensible(Path.GetFileNameWithoutExtension(_fileToLoad.File.Name));
+                _workingTable.TableName =
+                    QuerySyntaxHelper.MakeHeaderNameSensible(Path.GetFileNameWithoutExtension(_fileToLoad.File.Name));
 
                 //set the data table to the new untyped but correctly headered table
                 SetDataTable(_workingTable);
@@ -217,20 +244,23 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
                         ? int.MaxValue
                         : StronglyTypeInputBatchSize;
 
-                    if(batchSizeToLoad < MinimumStronglyTypeInputBatchSize)
+                    if (batchSizeToLoad < MinimumStronglyTypeInputBatchSize)
                         listener.OnNotify(this,
                             new NotifyEventArgs(ProgressEventType.Warning,
-                                $"You set StronglyTypeInputBatchSize to {batchSizeToLoad} this may be too small!", null));
+                                $"You set StronglyTypeInputBatchSize to {batchSizeToLoad} this may be too small!",
+                                null));
 
                     //user want's to strongly type input with a custom batch size
                     rowsRead = IterativelyBatchLoadDataIntoDataTable(_workingTable, batchSizeToLoad);
                 }
                 else
                     //user does not want to strongly type or is strongly typing with regular batch size
+                {
                     rowsRead = IterativelyBatchLoadDataIntoDataTable(_workingTable, MaxBatchSize);
+                }
 
                 if (StronglyTypeInput)
-                    _workingTable = DataPusher.StronglyTypeTable(_workingTable,ExplicitlyTypedColumns);
+                    _workingTable = DataPusher.StronglyTypeTable(_workingTable, ExplicitlyTypedColumns);
 
                 if (rowsRead == 0)
                     EventHandlers.FileIsEmpty();
@@ -251,23 +281,22 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
 
             //if rows were not read
             if (rowsRead == 0)
-                return null;//we are done
+                return null; //we are done
 
             //rows were read so return a copy of the DataTable, because we will continually reload the same DataTable schema throughout the file we don't want to give up our reference to good headers incase someone mutlates it
-            var copy =  _workingTable.Copy();
+            var copy = _workingTable.Copy();
 
             foreach (var unamed in Headers.UnamedColumns)
                 copy.Columns.Remove(unamed.ColumnName);
 
             return copy;
         }
-        catch (Exception )
+        catch (Exception)
         {
             //make sure file is closed if it crashes
             _reader?.Dispose();
             throw;
         }
-
     }
 
 
@@ -289,6 +318,7 @@ private void CloseReader()
             _reader = null;
         }
     }
+
     public DataTable TryGetPreview()
     {
         //there is already a data table in memory
@@ -296,7 +326,7 @@ public DataTable TryGetPreview()
             return _workingTable;
 
         //we have not loaded anything yet
-        if(Headers == null)
+        if (Headers == null)
         {
             //get a chunk
             var toReturn = GetChunk(new ThrowImmediatelyDataLoadEventListener(), new GracefulCancellationToken());
@@ -314,7 +344,8 @@ public DataTable TryGetPreview()
             return toReturn;
         }
 
-        throw new NotSupportedException("Cannot generate preview because _headers has already been set which likely means it is already loading / didn't cleanup properly after last preview attempt?");
+        throw new NotSupportedException(
+            "Cannot generate preview because _headers has already been set which likely means it is already loading / didn't cleanup properly after last preview attempt?");
     }
 
     public void Check(ICheckNotifier notifier)
@@ -325,11 +356,13 @@ public void Check(ICheckNotifier notifier)
 
         if (!StronglyTypeInput)
             notifier.OnCheckPerformed(
-                new CheckEventArgs("StronglyTypeInput is false, this feature is highly recommended",CheckResult.Warning));
+                new CheckEventArgs("StronglyTypeInput is false, this feature is highly recommended",
+                    CheckResult.Warning));
 
         if (StronglyTypeInput && StronglyTypeInputBatchSize < 500)
             notifier.OnCheckPerformed(
-                new CheckEventArgs("StronglyTypeInputBatchSize is less than the recommended 500: this may cause errors when determining the best data type from the source file.",
+                new CheckEventArgs(
+                    "StronglyTypeInputBatchSize is less than the recommended 500: this may cause errors when determining the best data type from the source file.",
                     CheckResult.Warning));
 
         if (_fileToLoad.File == null)
@@ -342,8 +375,7 @@ public void Check(ICheckNotifier notifier)
         }
 
         if (_fileToLoad != null)
-            CheckExpectedFileExtensions(notifier,_fileToLoad.File.Extension);
-
+            CheckExpectedFileExtensions(notifier, _fileToLoad.File.Extension);
     }
 
     private void CheckExpectedFileExtensions(ICheckNotifier notifier, string extension)
@@ -358,7 +390,7 @@ private void CheckExpectedFileExtensions(ICheckNotifier notifier, string extensi
         }
 
         if (Separator == ",")
-            ExpectFileExtension(notifier, ".csv",extension);
+            ExpectFileExtension(notifier, ".csv", extension);
 
         if (Separator == "\t")
             ExpectFileExtension(notifier, ".tsv", extension);
@@ -367,7 +399,8 @@ private void CheckExpectedFileExtensions(ICheckNotifier notifier, string extensi
     private static void ExpectFileExtension(ICheckNotifier notifier, string expectedExtension, string actualExtension)
     {
         if (expectedExtension.Equals(actualExtension))
-            notifier.OnCheckPerformed(new CheckEventArgs($"File extension matched expectations ({expectedExtension})",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"File extension matched expectations ({expectedExtension})",
+                CheckResult.Success));
         else
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"Unexpected file extension '{actualExtension}' (expected {expectedExtension}) ", CheckResult.Warning));
@@ -379,7 +412,7 @@ protected void OpenFile(FileInfo fileToLoad)
         _lineNumberBatch = 0;
 
         //if it is blank or null (although tab is allowed)
-        if(string.IsNullOrWhiteSpace(Separator)  && Separator != "\t")
+        if (string.IsNullOrWhiteSpace(Separator) && Separator != "\t")
             throw new Exception(
                 $"Could not open file {fileToLoad.FullName} because the file Separator has not been set yet, make sure to set all relevant [DemandsInitialization] properties");
 
@@ -399,7 +432,6 @@ protected void OpenFile(FileInfo fileToLoad)
     }
 
 
-
     private bool ShouldSkipRecord(ShouldSkipRecordArgs args)
     {
         if (_reader.Context.Parser.RawRow == 1 //first line of file
@@ -427,7 +459,10 @@ protected int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int batchSize)
         _lineNumberBatch = 0;
 
         //read from the peek first if there is anything otherwise read from the reader
-        while (_dataAvailable = DataPusher.PeekedRecord != null || _reader.Read()) //while we can read data -- also record whether the data was exhausted by this Read() because  CSVReader blows up if you ask it to Read() after Read() has already returned a false once
+        while
+            (_dataAvailable =
+             DataPusher.PeekedRecord != null ||
+             _reader.Read()) //while we can read data -- also record whether the data was exhausted by this Read() because  CSVReader blows up if you ask it to Read() after Read() has already returned a false once
         {
             FlatFileLine currentRow;
 
@@ -445,7 +480,7 @@ protected int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int batchSize)
                     continue;
             }
 
-            _lineNumberBatch += DataPusher.PushCurrentLine(_reader,currentRow, dt,_listener,EventHandlers);
+            _lineNumberBatch += DataPusher.PushCurrentLine(_reader, currentRow, dt, _listener, EventHandlers);
 
             if (!_dataAvailable)
                 break;
@@ -456,7 +491,6 @@ protected int IterativelyBatchLoadDataIntoDataTable(DataTable dt, int batchSize)
         }
 
         return _lineNumberBatch;
-
     }
 
 
@@ -474,10 +508,7 @@ public void PreInitialize(FlatFileToLoad value, IDataLoadEventListener listener)
     /// </summary>
     /// <param name="s"></param>
     /// <returns></returns>
-    protected virtual object HackValueReadFromFile(string s)
-    {
-        return s;
-    }
+    protected virtual object HackValueReadFromFile(string s) => s;
 
     /// <summary>
     /// Sets the target DataTable that we are loading from the csv/tsv etc
@@ -485,12 +516,12 @@ protected virtual object HackValueReadFromFile(string s)
     /// <param name="dt"></param>
     public void SetDataTable(DataTable dt)
     {
-        if(Headers == null)
+        if (Headers == null)
         {
             InitializeComponents();
             OpenFile(_fileToLoad.File);
 
-            Headers.MakeDataTableFitHeaders(dt,_listener);
+            Headers.MakeDataTableFitHeaders(dt, _listener);
         }
 
         _workingTable = dt;
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/DoNothingCacheSource.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/DoNothingCacheSource.cs
index 9ad12f1853..97fb5a76d9 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/DoNothingCacheSource.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/DoNothingCacheSource.cs
@@ -18,17 +18,18 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowSources;
 /// you have some bespoke process for populating / updating the cache progress and you only want a caching pipeline to exist for validation reasons not to
 /// actually run it.
 /// </summary>
-public class DoNothingCacheSource:CacheSource<ICacheChunk>
+public class DoNothingCacheSource : CacheSource<ICacheChunk>
 {
     private int runs;
 
-    public override ICacheChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public override ICacheChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         //Data is never available for download
         if (runs < 10)
         {
             runs++;
-                
+
             return new DoNothingCacheChunk(CatalogueRepository)
             {
                 RunIteration = runs
@@ -40,18 +41,13 @@ public override ICacheChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEven
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public override void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
-    public override ICacheChunk TryGetPreview()
-    {
-        return null;
-    }
+    public override ICacheChunk TryGetPreview() => null;
 
     public override void Check(ICheckNotifier notifier)
     {
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
index b6007daa4a..37f95769b4 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExcelDataFlowSource.cs
@@ -35,12 +35,14 @@ public class ExcelDataFlowSource : IPluginDataFlowSource<DataTable>, IPipelineRe
     public const string WorkSheetName_DemandDescription =
         "Name of the worksheet to load data from (single sheet name only).  If this is empty then the first sheet in the spreadsheet will be loaded instead";
 
-    public const string AddFilenameColumnNamed_DemandDescription = "Optional - Set to the name of a column in your RAW database (e.g. Filename).  If set this named column will be populated with the path to the file being read (e.g. c:\\myproj\\Data\\ForLoading\\MyFile.csv)";
+    public const string AddFilenameColumnNamed_DemandDescription =
+        "Optional - Set to the name of a column in your RAW database (e.g. Filename).  If set this named column will be populated with the path to the file being read (e.g. c:\\myproj\\Data\\ForLoading\\MyFile.csv)";
 
     [DemandsInitialization(WorkSheetName_DemandDescription)]
     public string WorkSheetName { get; set; }
 
-    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MakeHeaderNamesSane_DemandDescription,DemandType.Unspecified,true)]
+    [DemandsInitialization(DelimitedFlatFileDataFlowSource.MakeHeaderNamesSane_DemandDescription,
+        DemandType.Unspecified, true)]
     public bool MakeHeaderNamesSane { get; set; }
 
     [DemandsInitialization(AddFilenameColumnNamed_DemandDescription)]
@@ -58,7 +60,7 @@ public DataTable GetChunk(IDataLoadEventListener listener, GracefulCancellationT
             return null;
 
         haveDispatchedDataTable = true;
-            
+
         return dataReadFromFile;
     }
 
@@ -66,7 +68,7 @@ private DataTable GetAllData(IDataLoadEventListener listener, GracefulCancellati
     {
         var sw = new Stopwatch();
         sw.Start();
-        if(_fileToLoad == null)
+        if (_fileToLoad == null)
             throw new Exception("_fileToLoad has not been set yet, possibly component has not been Initialized yet");
 
         if (!IsAcceptableFileExtension())
@@ -86,12 +88,14 @@ private DataTable GetAllData(IDataLoadEventListener listener, GracefulCancellati
             {
                 var worksheet =
                     //if the user hasn't picked one, use the first
-                    (string.IsNullOrWhiteSpace(WorkSheetName) ? wb.GetSheetAt(0) : wb.GetSheet(WorkSheetName)) ?? throw new FlatFileLoadException(
+                    (string.IsNullOrWhiteSpace(WorkSheetName) ? wb.GetSheetAt(0) : wb.GetSheet(WorkSheetName)) ??
+                    throw new FlatFileLoadException(
                         $"The Excel sheet '{WorkSheetName}' was not found in workbook '{_fileToLoad.File.Name}'");
                 toReturn = GetAllData(worksheet, listener);
 
                 //set the table name the file name
-                toReturn.TableName = QuerySyntaxHelper.MakeHeaderNameSensible(Path.GetFileNameWithoutExtension(_fileToLoad.File.Name));
+                toReturn.TableName =
+                    QuerySyntaxHelper.MakeHeaderNameSensible(Path.GetFileNameWithoutExtension(_fileToLoad.File.Name));
 
                 if (toReturn.Columns.Count == 0)
                     throw new FlatFileLoadException(
@@ -184,10 +188,10 @@ public DataTable GetAllData(ISheet worksheet, IDataLoadEventListener listener)
             }
 
             //if we didn't get any values at all for the row throw it away
-            if(!gotAtLeastOneGoodValue)
+            if (!gotAtLeastOneGoodValue)
                 toReturn.Rows.Remove(r);
         }
-            
+
         return toReturn;
     }
 
@@ -207,7 +211,7 @@ private object GetCellValue(ICell cell, CellType treatAs = CellType.Unknown)
 
         if (treatAs == CellType.Unknown)
             treatAs = cell.CellType;
-            
+
         switch (treatAs)
         {
             case CellType.Unknown:
@@ -223,7 +227,7 @@ private object GetCellValue(ICell cell, CellType treatAs = CellType.Unknown)
                     if (IsDateWithoutTime(format))
                         return cell.DateCellValue.ToString("yyyy-MM-dd");
 
-                    if(IsDateWithTime(format))
+                    if (IsDateWithTime(format))
                         return cell.DateCellValue.ToString("yyyy-MM-dd HH:mm:ss");
 
                     if (IsTimeWithoutDate(format))
@@ -257,19 +261,13 @@ private object GetCellValue(ICell cell, CellType treatAs = CellType.Unknown)
         }
     }
 
-    private static bool IsDateWithTime(string formatString)
-    {
-        return formatString.Contains('h') && formatString.Contains('y');
-    }
-    private static bool IsDateWithoutTime(string formatString)
-    {
-        return formatString.Contains('y') && !formatString.Contains('h');
-    }
+    private static bool IsDateWithTime(string formatString) => formatString.Contains('h') && formatString.Contains('y');
 
-    private static bool IsTimeWithoutDate(string formatString)
-    {
-        return !formatString.Contains('y') && formatString.Contains('h');
-    }
+    private static bool IsDateWithoutTime(string formatString) =>
+        formatString.Contains('y') && !formatString.Contains('h');
+
+    private static bool IsTimeWithoutDate(string formatString) =>
+        !formatString.Contains('y') && formatString.Contains('h');
 
     private static bool IsDateFormat(string formatString)
     {
@@ -317,10 +315,7 @@ private object MakeTimeRelatedDecision(double value, Range cells, string type, d
         ".xls"
     };
 
-    private bool IsAcceptableFileExtension()
-    {
-        return acceptedFileExtensions.Contains(_fileToLoad.File.Extension.ToLower());
-    }
+    private bool IsAcceptableFileExtension() => acceptedFileExtensions.Contains(_fileToLoad.File.Extension.ToLower());
 
     private static bool IsNull(object o)
     {
@@ -351,12 +346,10 @@ public void Check(ICheckNotifier notifier)
 
     public void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public DataTable TryGetPreview()
@@ -364,17 +357,19 @@ public DataTable TryGetPreview()
         var timeoutToken = new CancellationTokenSource();
         timeoutToken.CancelAfter(10000);
 
-        var token = new GracefulCancellationToken(timeoutToken.Token,timeoutToken.Token );
+        var token = new GracefulCancellationToken(timeoutToken.Token, timeoutToken.Token);
 
         DataTable dt;
         try
         {
-            dt = GetAllData(new ThrowImmediatelyDataLoadEventListener(),token);
+            dt = GetAllData(new ThrowImmediatelyDataLoadEventListener(), token);
         }
         catch (Exception e)
         {
-            if(timeoutToken.IsCancellationRequested)
-                throw new Exception("Failed to generate preview in 10 seconds or less, giving up trying to load a preview (this doesn't mean that the source is broken, more likely you just have a big file or something)",e);
+            if (timeoutToken.IsCancellationRequested)
+                throw new Exception(
+                    "Failed to generate preview in 10 seconds or less, giving up trying to load a preview (this doesn't mean that the source is broken, more likely you just have a big file or something)",
+                    e);
 
             throw;
         }
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExplicitTypingCollection.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExplicitTypingCollection.cs
index c2d12cdcde..e030fabfa1 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExplicitTypingCollection.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/ExplicitTypingCollection.cs
@@ -20,17 +20,17 @@ namespace Rdmp.Core.DataLoad.Modules.DataFlowSources;
 /// 
 /// <para>This class can be used by [DemandsInitialization] properties and it will launch its custom UI: ExplicitTypingCollectionUI</para>
 /// </summary>
-public class ExplicitTypingCollection:ICustomUIDrivenClass
+public class ExplicitTypingCollection : ICustomUIDrivenClass
 {
     /// <summary>
     /// A dictionary of names (e.g. column names) which must have specific C# data types
     /// </summary>
     public Dictionary<string, Type> ExplicitTypesCSharp = new();
-        
+
     /// <inheritdoc/>
     public void RestoreStateFrom(string value)
-    { 
-        if(value == null)
+    {
+        if (value == null)
             return;
 
         var doc = new XmlDocument();
@@ -41,12 +41,10 @@ public void RestoreStateFrom(string value)
         var typesNode = doc.GetElementsByTagName("ExplicitTypesCSharp").Cast<XmlNode>().Single();
         var dictionary = typesNode.InnerText;
 
-        var lines = dictionary.Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
+        var lines = dictionary.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries);
 
         for (var i = 0; i < lines.Length; i += 2)
             ExplicitTypesCSharp.Add(lines[i], Type.GetType(lines[i + 1]));
-
-
     }
 
     /// <inheritdoc/>
@@ -62,6 +60,7 @@ public string SaveStateToString()
             sb.AppendLine(kvp.Key);
             sb.AppendLine(kvp.Value.FullName);
         }
+
         sb.AppendLine("</ExplicitTypesCSharp>");
 
         return sb.ToString();
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileColumnCollection.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileColumnCollection.cs
index a10d729f22..dcb477cf14 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileColumnCollection.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileColumnCollection.cs
@@ -47,7 +47,9 @@ public class FlatFileColumnCollection
     /// </summary>
     public HashSet<string> IgnoreColumnsList { get; private set; }
 
-    public FlatFileColumnCollection(FlatFileToLoad toLoad, bool makeHeaderNamesSane, ExplicitTypingCollection explicitlyTypedColumns, string forceHeaders, bool forceHeadersReplacesFirstLineInFile, string ignoreColumns)
+    public FlatFileColumnCollection(FlatFileToLoad toLoad, bool makeHeaderNamesSane,
+        ExplicitTypingCollection explicitlyTypedColumns, string forceHeaders, bool forceHeadersReplacesFirstLineInFile,
+        string ignoreColumns)
     {
         _toLoad = toLoad;
         _makeHeaderNamesSane = makeHeaderNamesSane;
@@ -90,7 +92,10 @@ private enum State
     /// <summary>
     /// Counts the number of headers that are not null
     /// </summary>
-    public int CountNotNull { get { return _headers.Except(IgnoreColumnsList).Count(h => !h.IsBasicallyNull()); } }
+    public int CountNotNull
+    {
+        get { return _headers.Except(IgnoreColumnsList).Count(h => !h.IsBasicallyNull()); }
+    }
 
     /// <summary>
     /// The number of headers including null ones (but not trailing null headers)
@@ -132,7 +137,7 @@ public void GetHeadersFromFile(CsvReader r)
         //ignore these columns (trimmed and ignoring case)
         if (!string.IsNullOrWhiteSpace(_ignoreColumns))
             IgnoreColumnsList = new HashSet<string>(
-                _ignoreColumns.Split(new[] {r.Configuration.Delimiter}, StringSplitOptions.None)
+                _ignoreColumns.Split(new[] { r.Configuration.Delimiter }, StringSplitOptions.None)
                     .Select(h => h.Trim())
                 , StringComparer.CurrentCultureIgnoreCase);
         else
@@ -146,7 +151,7 @@ public void GetHeadersFromFile(CsvReader r)
                 _headers[i] = _headers[i].Trim();
 
         //throw away trailing null headers e.g. the header line "Name,Date,,,"
-        var trailingNullHeaders = _headers.Reverse().TakeWhile(s=>s.IsBasicallyNull()).Count();
+        var trailingNullHeaders = _headers.Reverse().TakeWhile(s => s.IsBasicallyNull()).Count();
 
         if (trailingNullHeaders > 0)
             _headers = _headers.Take(_headers.Length - trailingNullHeaders).ToArray();
@@ -158,7 +163,6 @@ public void GetHeadersFromFile(CsvReader r)
     }
 
 
-
     /// <summary>
     /// Creates a new empty DataTable has only the columns found in the headers that were read during <see cref="GetHeadersFromFile"/>
     /// </summary>
@@ -182,13 +186,15 @@ public DataTable GetDataTableWithHeaders(IDataLoadEventListener listener)
             var h = header;
 
             //if we are ignoring this column
-            if(h != null && IgnoreColumnsList.Contains(h.Trim()))
+            if (h != null && IgnoreColumnsList.Contains(h.Trim()))
                 continue; //skip adding to dt
 
             //watch for duplicate columns
             if (dt.Columns.Contains(header))
                 if (_makeHeaderNamesSane)
+                {
                     h = MakeHeaderUnique(header, dt.Columns, listener, this);
+                }
                 else
                 {
                     duplicateHeaders.Add(header);
@@ -196,19 +202,23 @@ public DataTable GetDataTableWithHeaders(IDataLoadEventListener listener)
                 }
 
             if (h.IsBasicallyNull())
+            {
                 unamedColumns.Add(dt.Columns.Add(h));
+            }
             else
                 //override type
-            if (_explicitlyTypedColumns?.ExplicitTypesCSharp.TryGetValue(h,out var t) == true)
+            if (_explicitlyTypedColumns?.ExplicitTypesCSharp.TryGetValue(h, out var t) == true)
             {
                 var c = dt.Columns.Add(h, t);
 
                 //if the user wants a string don't let downstream components pick a different Type (by assuming it is is untyped)
-                if(c.DataType == typeof(string))
+                if (c.DataType == typeof(string))
                     c.SetDoNotReType(true);
             }
             else
+            {
                 dt.Columns.Add(h);
+            }
         }
 
         UnamedColumns = new ReadOnlyCollection<DataColumn>(unamedColumns);
@@ -242,7 +252,7 @@ public void MakeDataTableFitHeaders(DataTable dt, IDataLoadEventListener listene
         {
             ASCIIArt.Append($"[{index}]");
 
-            if (dt.Columns.Contains(_headers[index]))    //exact match
+            if (dt.Columns.Contains(_headers[index])) //exact match
             {
                 ASCIIArt.AppendLine($"{_headers[index]}>>>{_headers[index]}");
                 continue;
@@ -250,7 +260,7 @@ public void MakeDataTableFitHeaders(DataTable dt, IDataLoadEventListener listene
 
             if (string.IsNullOrWhiteSpace(_headers[index])) //Empty column header, ignore it
             {
-                ASCIIArt.AppendLine("Blank Column>>>IGNORED" );
+                ASCIIArt.AppendLine("Blank Column>>>IGNORED");
                 continue;
             }
 
@@ -288,7 +298,10 @@ public void MakeDataTableFitHeaders(DataTable dt, IDataLoadEventListener listene
         //now that we have adjusted the header names
         var unmatchedColumns =
             dt.Columns.Cast<DataColumn>()
-                .Where(c => !_headers.Any(h => h != null && h.ToLower().Equals(c.ColumnName.ToLower())))//get all columns in data table where there are not any with the same name
+                .Where(c => !_headers.Any(h =>
+                    h != null &&
+                    h.ToLower().Equals(c.ColumnName
+                        .ToLower()))) //get all columns in data table where there are not any with the same name
                 .Select(c => c.ColumnName)
                 .ToArray();
 
@@ -299,21 +312,24 @@ public void MakeDataTableFitHeaders(DataTable dt, IDataLoadEventListener listene
         //if there is exactly 1 column found by the program and there are unmatched columns it is likely the user has selected the wrong separator
         if (_headers.Length == 1 && unmatchedColumns.Any())
             foreach (var commonSeparator in _commonSeparators)
-                if(_headers[0].Contains(commonSeparator))
+                if (_headers[0].Contains(commonSeparator))
                     listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                         $"Your separator does not appear in the headers line of your file ({_toLoad.File.Name}) but the separator '{commonSeparator}' does... did you mean to set the Separator to '{commonSeparator}'? The headers line is:\"{_headers[0]}\""));
 
         listener.OnNotify(this, new NotifyEventArgs(
-            headersNotFound.Any()?ProgressEventType.Error : ProgressEventType.Information, //information or warning if there are unrecognised field names
+            headersNotFound.Any()
+                ? ProgressEventType.Error
+                : ProgressEventType.Information, //information or warning if there are unrecognised field names
             $"I will now tell you about how the columns in your file do or do not match the columns in your database, Matching flat file columns (or forced replacement headers) against database headers resulted in:{Environment.NewLine}{ASCIIArt}")); //tell them about what columns match what
 
 
-        if(headersNotFound.Any())
+        if (headersNotFound.Any())
             throw new Exception(
                 $"Could not find a suitable target column for flat file columns {string.Join(",", headersNotFound)} amongst database data table columns ({string.Join(",", from DataColumn col in dt.Columns select col.ColumnName)})");
     }
 
-    public static string MakeHeaderUnique(string newColumnName, DataColumnCollection columnsSoFar, IDataLoadEventListener listener, object sender)
+    public static string MakeHeaderUnique(string newColumnName, DataColumnCollection columnsSoFar,
+        IDataLoadEventListener listener, object sender)
     {
         //if it is already unique then that's fine
         if (!columnsSoFar.Contains(newColumnName))
@@ -338,15 +354,15 @@ public static string MakeHeaderUnique(string newColumnName, DataColumnCollection
     /// </summary>
     /// <param name="row"></param>
     /// <param name="listener"></param>
-    public void ShowForceHeadersAsciiArt(IReaderRow row,IDataLoadEventListener listener)
+    public void ShowForceHeadersAsciiArt(IReaderRow row, IDataLoadEventListener listener)
     {
-        if(_state < State.AfterHeadersRead)
+        if (_state < State.AfterHeadersRead)
             throw new Exception($"Illegal state:{_state}");
 
-        if(string.IsNullOrWhiteSpace(_forceHeaders))
+        if (string.IsNullOrWhiteSpace(_forceHeaders))
             throw new Exception("There are no force headers! how did we get here");
 
-        if(!_forceHeadersReplacesFirstLineInFile)
+        if (!_forceHeadersReplacesFirstLineInFile)
             throw new Exception("Headers do not replace the first line in the file, how did we get here!");
 
         //create an ascii art representation of the headers being replaced in the format
@@ -365,7 +381,9 @@ public void ShowForceHeadersAsciiArt(IReaderRow row,IDataLoadEventListener liste
             $"Your attacher has ForceHeaders and ForceHeadersReplacesFirstLineInFile=true, I will now tell you about the first line of data in the file that you skipped (and how it related to your forced headers).  Replacement headers are {Environment.NewLine}{Environment.NewLine}{asciiArt}"));
 
         if (row.ColumnCount != _headers.Length)
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "The number of ForceHeader replacement headers specified does not match the number of headers in the file (being replaced)"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning,
+                    "The number of ForceHeader replacement headers specified does not match the number of headers in the file (being replaced)"));
 
         var discarded = new StringBuilder();
         for (var i = 0; i < row.ColumnCount; i++)
@@ -374,6 +392,7 @@ public void ShowForceHeadersAsciiArt(IReaderRow row,IDataLoadEventListener liste
                 discarded.Append(',');
             discarded.Append(row[i]);
         }
+
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Skipped first line of file because there are forced replacement headers, we discarded: {discarded}"));
     }
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileEventHandlers.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileEventHandlers.cs
index 01305cfb3d..3e87b7cedd 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileEventHandlers.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileEventHandlers.cs
@@ -32,7 +32,9 @@ public class FlatFileEventHandlers
     /// </summary>
     public FileInfo DivertErrorsFile;
 
-    public FlatFileEventHandlers(FlatFileToLoad fileToLoad, FlatFileToDataTablePusher dataPusher, bool throwOnEmptyFiles, BadDataHandlingStrategy strategy, IDataLoadEventListener listener, int maximumErrorsToReport, bool ignoreBadDataEvents)
+    public FlatFileEventHandlers(FlatFileToLoad fileToLoad, FlatFileToDataTablePusher dataPusher,
+        bool throwOnEmptyFiles, BadDataHandlingStrategy strategy, IDataLoadEventListener listener,
+        int maximumErrorsToReport, bool ignoreBadDataEvents)
     {
         _fileToLoad = fileToLoad;
         _dataPusher = dataPusher;
@@ -50,7 +52,7 @@ public void FileIsEmpty()
 
         _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, $"File {_fileToLoad} is empty"));
     }
-        
+
     public bool ReadingExceptionOccurred(ReadingExceptionOccurredArgs args)
     {
         var line = new FlatFileLine(args.Exception.Context);
@@ -58,7 +60,7 @@ public bool ReadingExceptionOccurred(ReadingExceptionOccurredArgs args)
         switch (_strategy)
         {
             case BadDataHandlingStrategy.IgnoreRows:
-                if (_maximumErrorsToReport-- >0)
+                if (_maximumErrorsToReport-- > 0)
                     _listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"Ignored ReadingException on {line.GetLineDescription()}", args.Exception));
 
@@ -82,7 +84,7 @@ public bool ReadingExceptionOccurred(ReadingExceptionOccurredArgs args)
         return true;
     }
 
-    public void BadDataFound(FlatFileLine line, bool isFromCsvHelper=false)
+    public void BadDataFound(FlatFileLine line, bool isFromCsvHelper = false)
     {
         if (_ignoreBadDataEvents && isFromCsvHelper)
             if (_maximumErrorsToReport-- > 0)
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileLine.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileLine.cs
index f2ca236f74..897ea2d1f3 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileLine.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileLine.cs
@@ -56,8 +56,5 @@ public FlatFileLine(BadDataFoundArgs bad)
 
     public string this[int i] => Cells[i];
 
-    public string GetLineDescription()
-    {
-        return $"line {LineNumber}";
-    }
+    public string GetLineDescription() => $"line {LineNumber}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileToDataTablePusher.cs b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileToDataTablePusher.cs
index 67f7044469..4665ffa1ef 100644
--- a/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileToDataTablePusher.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataFlowSources/SubComponents/FlatFileToDataTablePusher.cs
@@ -57,7 +57,9 @@ public class FlatFileToDataTablePusher
     /// </summary>
     private bool _haveComplainedAboutColumnMismatch;
 
-    public FlatFileToDataTablePusher(FlatFileToLoad fileToLoad, FlatFileColumnCollection headers, Func<string, object> hackValuesFunc, bool attemptToResolveNewlinesInRecords,CultureInfo culture, string explicitDateTimeFormat)
+    public FlatFileToDataTablePusher(FlatFileToLoad fileToLoad, FlatFileColumnCollection headers,
+        Func<string, object> hackValuesFunc, bool attemptToResolveNewlinesInRecords, CultureInfo culture,
+        string explicitDateTimeFormat)
     {
         _fileToLoad = fileToLoad;
         _headers = headers;
@@ -66,19 +68,20 @@ public FlatFileToDataTablePusher(FlatFileToLoad fileToLoad, FlatFileColumnCollec
         _culture = culture ?? CultureInfo.CurrentCulture;
         _explicitDateTimeFormat = explicitDateTimeFormat;
         typeDeciderFactory = new TypeDeciderFactory(_culture);
-            
-        if(!string.IsNullOrWhiteSpace(explicitDateTimeFormat))
-            typeDeciderFactory.Settings.ExplicitDateFormats = new []{ explicitDateTimeFormat};
+
+        if (!string.IsNullOrWhiteSpace(explicitDateTimeFormat))
+            typeDeciderFactory.Settings.ExplicitDateFormats = new[] { explicitDateTimeFormat };
     }
 
-    public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable dt,IDataLoadEventListener listener, FlatFileEventHandlers eventHandlers)
+    public int PushCurrentLine(CsvReader reader, FlatFileLine lineToPush, DataTable dt, IDataLoadEventListener listener,
+        FlatFileEventHandlers eventHandlers)
     {
         //skip the blank lines
         if (lineToPush.Cells.Length == 0 || lineToPush.Cells.All(h => h.IsBasicallyNull()))
             return 0;
 
         var headerCount = _headers.CountNotNull;
-            
+
         //if the number of not empty headers doesn't match the headers in the data table
         if (dt.Columns.Count != headerCount)
             if (!_haveComplainedAboutColumnMismatch)
@@ -113,7 +116,8 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
                 }
                 else
                 {
-                    var errorMessage = string.Format("Column mismatch on line {0} of file '{1}', it has too many columns (expected {2} columns but line had  {3})",
+                    var errorMessage = string.Format(
+                        "Column mismatch on line {0} of file '{1}', it has too many columns (expected {2} columns but line had  {3})",
                         reader.Context.Parser.RawRow,
                         dt.TableName,
                         _headers.Length,
@@ -129,7 +133,7 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
                 }
 
             //if we are ignoring this header
-            if(_headers.IgnoreColumnsList.Contains(_headers[i]))
+            if (_headers.IgnoreColumnsList.Contains(_headers[i]))
                 continue;
 
             //its an empty header, don't bother populating it
@@ -142,7 +146,9 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
 
             //sometimes flat files have ,NULL,NULL,"bob" in instead of ,,"bob"
             if (lineToPush[i].IsBasicallyNull())
+            {
                 rowValues.Add(_headers[i], DBNull.Value);
+            }
             else
             {
                 var hackedValue = _hackValuesFunc(lineToPush[i]);
@@ -152,7 +158,8 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
 
                 try
                 {
-                    if (hackedValue is string s && typeDeciderFactory.Dictionary.TryGetValue(dt.Columns[_headers[i]].DataType,out var decider))
+                    if (hackedValue is string s &&
+                        typeDeciderFactory.Dictionary.TryGetValue(dt.Columns[_headers[i]].DataType, out var decider))
                         hackedValue = decider.Parse(s);
 
                     rowValues.Add(_headers[i], hackedValue);
@@ -160,12 +167,13 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
                 catch (Exception e)
                 {
                     throw new FileLoadException(
-                        $"Error reading file '{dt.TableName}'.  Problem loading value {lineToPush[i]} into data table (on Line number {reader.Context.Parser.RawRow}) the header we were trying to populate was {_headers[i]} and was of datatype {dt.Columns[_headers[i]].DataType}", e);
+                        $"Error reading file '{dt.TableName}'.  Problem loading value {lineToPush[i]} into data table (on Line number {reader.Context.Parser.RawRow}) the header we were trying to populate was {_headers[i]} and was of datatype {dt.Columns[_headers[i]].DataType}",
+                        e);
                 }
             }
         }
 
-        if(!BadLines.Contains(reader.Context.Parser.RawRow))
+        if (!BadLines.Contains(reader.Context.Parser.RawRow))
         {
             var currentRow = dt.Rows.Add();
             foreach (var kvp in rowValues)
@@ -177,9 +185,10 @@ public int PushCurrentLine(CsvReader reader,FlatFileLine lineToPush, DataTable d
         return 0;
     }
 
-    private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lineToPush, IDataLoadEventListener listener,FlatFileEventHandlers eventHandlers)
+    private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lineToPush,
+        IDataLoadEventListener listener, FlatFileEventHandlers eventHandlers)
     {
-        if(!_attemptToResolveNewlinesInRecords)
+        if (!_attemptToResolveNewlinesInRecords)
         {
             //we read too little cell count but we don't want to solve the problem
             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
@@ -214,7 +223,7 @@ private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lin
                     PeekedRecord = peekedLine;
 
                     //and mark everything else as bad
-                    AllBad(lineToPush, allPeekedLines,eventHandlers);
+                    AllBad(lineToPush, allPeekedLines, eventHandlers);
                     return false;
                 }
 
@@ -224,7 +233,7 @@ private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lin
             else
             {
                 //Ran out of space in the file without fixing the problem so it's all bad
-                AllBad(lineToPush, allPeekedLines,eventHandlers);
+                AllBad(lineToPush, allPeekedLines, eventHandlers);
 
                 //couldn't fix the problem
                 return false;
@@ -239,14 +248,13 @@ private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lin
 
             //add any further cells on after that
             newCells.AddRange(peekedLine.Cells.Skip(1));
-
         } while (newCells.Count < _headers.Length);
 
 
         //if we read too much or reached the end of the file
         if (newCells.Count > _headers.Length)
         {
-            AllBadExceptLastSoRequeueThatOne(lineToPush,allPeekedLines,eventHandlers);
+            AllBadExceptLastSoRequeueThatOne(lineToPush, allPeekedLines, eventHandlers);
             return false;
         }
 
@@ -261,14 +269,13 @@ private bool DealWithTooFewCellsOnCurrentLine(CsvReader reader, FlatFileLine lin
     }
 
 
-
     public DataTable StronglyTypeTable(DataTable workingTable, ExplicitTypingCollection explicitTypingCollection)
     {
         var deciders = new Dictionary<int, IDecideTypesForStrings>();
         var factory = new TypeDeciderFactory(_culture);
-            
-        if(!string.IsNullOrWhiteSpace(_explicitDateTimeFormat))
-            factory.Settings.ExplicitDateFormats = new []{ _explicitDateTimeFormat};
+
+        if (!string.IsNullOrWhiteSpace(_explicitDateTimeFormat))
+            factory.Settings.ExplicitDateFormats = new[] { _explicitDateTimeFormat };
 
         var dtCloned = workingTable.Clone();
 
@@ -277,7 +284,8 @@ public DataTable StronglyTypeTable(DataTable workingTable, ExplicitTypingCollect
         foreach (DataColumn col in workingTable.Columns)
         {
             //if we have already handled it
-            if (explicitTypingCollection != null && explicitTypingCollection.ExplicitTypesCSharp.ContainsKey(col.ColumnName))
+            if (explicitTypingCollection != null &&
+                explicitTypingCollection.ExplicitTypesCSharp.ContainsKey(col.ColumnName))
                 continue;
 
             //let's make a decision about the data type to use based on the contents
@@ -290,8 +298,9 @@ public DataTable StronglyTypeTable(DataTable workingTable, ExplicitTypingCollect
                 dtCloned.Columns[col.ColumnName].DataType = computedType.Guess.CSharpType;
 
                 //if we have a type decider to parse this data type
-                if(factory.IsSupported(computedType.Guess.CSharpType))
-                    deciders.Add(col.Ordinal,factory.Create(computedType.Guess.CSharpType)); //record column index and parser
+                if (factory.IsSupported(computedType.Guess.CSharpType))
+                    deciders.Add(col.Ordinal,
+                        factory.Create(computedType.Guess.CSharpType)); //record column index and parser
 
                 typeChangeNeeded = true;
             }
@@ -300,19 +309,17 @@ public DataTable StronglyTypeTable(DataTable workingTable, ExplicitTypingCollect
         if (typeChangeNeeded)
         {
             foreach (DataRow row in workingTable.Rows)
-                dtCloned.Rows.Add(row.ItemArray.Select((v,idx)=>
-
-                    deciders.TryGetValue(idx,out var decider) && v is string s?
-                        decider.Parse(s) :
-                        v).ToArray());
+                dtCloned.Rows.Add(row.ItemArray.Select((v, idx) =>
+                    deciders.TryGetValue(idx, out var decider) && v is string s ? decider.Parse(s) : v).ToArray());
 
             return dtCloned;
         }
 
-        return workingTable;            
+        return workingTable;
     }
 
-    private void AllBadExceptLastSoRequeueThatOne(FlatFileLine lineToPush, List<FlatFileLine> allPeekedLines, FlatFileEventHandlers eventHandlers)
+    private void AllBadExceptLastSoRequeueThatOne(FlatFileLine lineToPush, List<FlatFileLine> allPeekedLines,
+        FlatFileEventHandlers eventHandlers)
     {
         //the current line is bad
         eventHandlers.BadDataFound(lineToPush);
@@ -325,7 +332,8 @@ private void AllBadExceptLastSoRequeueThatOne(FlatFileLine lineToPush, List<Flat
             eventHandlers.BadDataFound(line);
     }
 
-    private static void AllBad(FlatFileLine lineToPush, List<FlatFileLine> allPeekedLines, FlatFileEventHandlers eventHandlers)
+    private static void AllBad(FlatFileLine lineToPush, List<FlatFileLine> allPeekedLines,
+        FlatFileEventHandlers eventHandlers)
     {
         //the current line is bad
         eventHandlers.BadDataFound(lineToPush);
diff --git a/Rdmp.Core/DataLoad/Modules/DataProvider/DoNothingDataProvider.cs b/Rdmp.Core/DataLoad/Modules/DataProvider/DoNothingDataProvider.cs
index e143e6bbe2..883117f4b7 100644
--- a/Rdmp.Core/DataLoad/Modules/DataProvider/DoNothingDataProvider.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataProvider/DoNothingDataProvider.cs
@@ -21,23 +21,20 @@ public class DoNothingDataProvider : IDataProvider
 {
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,"DoNothingDataProvider did nothing!"));
+        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "DoNothingDataProvider did nothing!"));
         return ExitCodeType.Success;
-            
     }
-        
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
 
-        
+
     public void Check(ICheckNotifier notifier)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataProvider/FlatFileManipulation/ExcelToCSVFilesConverter.cs b/Rdmp.Core/DataLoad/Modules/DataProvider/FlatFileManipulation/ExcelToCSVFilesConverter.cs
index 64545b951a..a89203cc6f 100644
--- a/Rdmp.Core/DataLoad/Modules/DataProvider/FlatFileManipulation/ExcelToCSVFilesConverter.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataProvider/FlatFileManipulation/ExcelToCSVFilesConverter.cs
@@ -29,31 +29,33 @@ namespace Rdmp.Core.DataLoad.Modules.DataProvider.FlatFileManipulation;
 /// DLE component which converts Microsoft Excel Workbooks into CSV files.  Workbooks can have multiple worksheets in which case 1 csv will be created for
 /// each worksheet.  Supports both .xls and .xlsx by using NPOI (i.e. not Interop).
 /// </summary>
-public class ExcelToCSVFilesConverter: IPluginDataProvider
+public class ExcelToCSVFilesConverter : IPluginDataProvider
 {
     [DemandsInitialization("Pattern to match Excel files in forLoading directory", Mandatory = true)]
     public string ExcelFilePattern { get; set; }
 
-    [DemandsInitialization("Optional,if populated will only extract sheets that match the pattern e.g. '.*data$' will only extract worksheets whose names end with data")]
+    [DemandsInitialization(
+        "Optional,if populated will only extract sheets that match the pattern e.g. '.*data$' will only extract worksheets whose names end with data")]
     public Regex WorksheetPattern { get; set; }
 
-    [DemandsInitialization("Normally a workbook called 'mywb.xlsx' with 2 worksheets 'sheet1' and 'sheet2' will produce csv files called 'sheet1.csv' and 'sheet2.csv'.  Setting this to true will add the workbook name as a prefix 'mywb_sheet1.csv' and 'mywb_sheet2.csv'",defaultValue:false)]
+    [DemandsInitialization(
+        "Normally a workbook called 'mywb.xlsx' with 2 worksheets 'sheet1' and 'sheet2' will produce csv files called 'sheet1.csv' and 'sheet2.csv'.  Setting this to true will add the workbook name as a prefix 'mywb_sheet1.csv' and 'mywb_sheet2.csv'",
+        defaultValue: false)]
     public bool PrefixWithWorkbookName { get; set; }
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
         if (string.IsNullOrWhiteSpace(ExcelFilePattern))
-            notifier.OnCheckPerformed(new CheckEventArgs("Argument ExcelFilePattern has not been specified", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("Argument ExcelFilePattern has not been specified",
+                CheckResult.Fail));
     }
 
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -63,11 +65,11 @@ public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellati
         foreach (var f in job.LoadDirectory.ForLoading.GetFiles(ExcelFilePattern))
         {
             foundAtLeastOne = true;
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information, $"About to process file {f.Name}"));
-            ProcessFile(f,job);
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to process file {f.Name}"));
+            ProcessFile(f, job);
         }
 
-        if(!foundAtLeastOne)
+        if (!foundAtLeastOne)
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Did not find any files matching Pattern '{ExcelFilePattern}' in directory '{job.LoadDirectory.ForLoading.FullName}'"));
 
@@ -82,7 +84,7 @@ private void ProcessFile(FileInfo fileInfo, IDataLoadJob job)
             wb = new HSSFWorkbook(fs);
         else
             wb = new XSSFWorkbook(fs);
-                
+
         try
         {
             var source = new ExcelDataFlowSource();
@@ -113,14 +115,14 @@ private void ProcessFile(FileInfo fileInfo, IDataLoadJob job)
 
                     job.OnNotify(this,
                         new NotifyEventArgs(ProgressEventType.Information, $"Saved worksheet as {newName}"));
-
                 }
                 else
+                {
                     job.OnNotify(this,
                         new NotifyEventArgs(ProgressEventType.Information,
                             $"Ignoring worksheet:{sheet.SheetName}"));
+                }
             }
-
         }
         finally
         {
@@ -128,8 +130,5 @@ private void ProcessFile(FileInfo fileInfo, IDataLoadJob job)
         }
     }
 
-    private bool IsWorksheetNameMatch(string name)
-    {
-        return WorksheetPattern?.IsMatch(name)!=false;
-    }
+    private bool IsWorksheetNameMatch(string name) => WorksheetPattern?.IsMatch(name) != false;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/DataProvider/ImportFilesDataProvider.cs b/Rdmp.Core/DataLoad/Modules/DataProvider/ImportFilesDataProvider.cs
index 179334a400..867a3736f7 100644
--- a/Rdmp.Core/DataLoad/Modules/DataProvider/ImportFilesDataProvider.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataProvider/ImportFilesDataProvider.cs
@@ -33,17 +33,21 @@ public class ImportFilesDataProvider : IPluginDataProvider
     [DemandsInitialization("The file pattern to match on the DirectoryPath", Mandatory = true)]
     public string FilePattern { get; set; }
 
-    [DemandsInitialization("If true then at the end of a successful data load the files that were originally matched and copied to forLoading will be deleted from the remote DirectoryPath.  Note that only the files copied will be deleted, any new files that appear during the load will not be deleted")]
+    [DemandsInitialization(
+        "If true then at the end of a successful data load the files that were originally matched and copied to forLoading will be deleted from the remote DirectoryPath.  Note that only the files copied will be deleted, any new files that appear during the load will not be deleted")]
     public bool DeleteFilesOnsuccessfulLoad { get; set; }
 
     public void Check(ICheckNotifier notifier)
     {
-
         if (string.IsNullOrWhiteSpace(DirectoryPath))
-            notifier.OnCheckPerformed(new CheckEventArgs("No DirectoryPath has been specified, this should be set to the remote folder you want to copy files out of",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "No DirectoryPath has been specified, this should be set to the remote folder you want to copy files out of",
+                CheckResult.Fail));
 
         if (string.IsNullOrWhiteSpace(FilePattern))
-            notifier.OnCheckPerformed(new CheckEventArgs("No FilePattern has been specified, this should be a pattern that matches files in the remote folder you want to copy files out of e.g. *.*", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "No FilePattern has been specified, this should be a pattern that matches files in the remote folder you want to copy files out of e.g. *.*",
+                CheckResult.Fail));
 
         notifier.OnCheckPerformed(new DirectoryInfo(DirectoryPath).Exists
             ? new CheckEventArgs($"Path {DirectoryPath} was found", CheckResult.Success)
@@ -52,7 +56,6 @@ public void Check(ICheckNotifier notifier)
 
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -62,9 +65,9 @@ public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellati
         foreach (var f in _files)
         {
             var to = Path.Combine(job.LoadDirectory.ForLoading.FullName, f.Name);
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Copying file {f.FullName} to directory {to}"));
-            f.CopyTo(to,true);
+            f.CopyTo(to, true);
         }
 
         return ExitCodeType.Success;
diff --git a/Rdmp.Core/DataLoad/Modules/DataProvider/ShareDefinitionImporter.cs b/Rdmp.Core/DataLoad/Modules/DataProvider/ShareDefinitionImporter.cs
index c88751e12d..5ed00b0e19 100644
--- a/Rdmp.Core/DataLoad/Modules/DataProvider/ShareDefinitionImporter.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataProvider/ShareDefinitionImporter.cs
@@ -19,21 +19,18 @@ namespace Rdmp.Core.DataLoad.Modules.DataProvider;
 /// <summary>
 /// Data Provider Process Task for DLE which will look for *.sd files and import them into RDMP
 /// </summary>
-public class ShareDefinitionImporter: IPluginDataProvider
+public class ShareDefinitionImporter : IPluginDataProvider
 {
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public void Check(ICheckNotifier notifier)
     {
-            
     }
 
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
@@ -45,10 +42,12 @@ public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellati
 
             foreach (var shareDefinitionFile in job.LoadDirectory.ForLoading.EnumerateFiles("*.sd"))
             {
-                job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"Found '{shareDefinitionFile.Name}'"));
                 using (var stream = File.Open(shareDefinitionFile.FullName, FileMode.Open))
+                {
                     shareManager.ImportSharedObject(stream);
+                }
 
                 imported++;
                 job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
@@ -57,10 +56,12 @@ public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellati
         }
         catch (SharingException ex)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning, "Error occured importing ShareDefinitions",ex));
+            job.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Warning, "Error occured importing ShareDefinitions", ex));
         }
 
-        job.OnNotify(this, new NotifyEventArgs(imported == 0 ? ProgressEventType.Warning : ProgressEventType.Information,
+        job.OnNotify(this, new NotifyEventArgs(
+            imported == 0 ? ProgressEventType.Warning : ProgressEventType.Information,
             $"Imported {imported} ShareDefinition files"));
 
         return ExitCodeType.Success;
diff --git a/Rdmp.Core/DataLoad/Modules/DataProvider/WebServiceConfiguration.cs b/Rdmp.Core/DataLoad/Modules/DataProvider/WebServiceConfiguration.cs
index 6b18736b95..1562b96f0d 100644
--- a/Rdmp.Core/DataLoad/Modules/DataProvider/WebServiceConfiguration.cs
+++ b/Rdmp.Core/DataLoad/Modules/DataProvider/WebServiceConfiguration.cs
@@ -74,15 +74,15 @@ public string SaveStateToString()
         var serializer = new XmlSerializer(GetType());
 
         using (var sw = XmlWriter.Create(sb, new XmlWriterSettings { Indent = true }))
+        {
             serializer.Serialize(sw, this);
+        }
 
         return sb.ToString();
     }
 
-    public bool IsValid()
-    {
-        return !string.IsNullOrWhiteSpace(Endpoint) &&
-               !string.IsNullOrWhiteSpace(Username) &&
-               !string.IsNullOrWhiteSpace(Password);
-    }
+    public bool IsValid() =>
+        !string.IsNullOrWhiteSpace(Endpoint) &&
+        !string.IsNullOrWhiteSpace(Username) &&
+        !string.IsNullOrWhiteSpace(Password);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Exceptions/FlatFileLoadException.cs b/Rdmp.Core/DataLoad/Modules/Exceptions/FlatFileLoadException.cs
index a04ef28a6d..d4cb284bd2 100644
--- a/Rdmp.Core/DataLoad/Modules/Exceptions/FlatFileLoadException.cs
+++ b/Rdmp.Core/DataLoad/Modules/Exceptions/FlatFileLoadException.cs
@@ -12,14 +12,15 @@ namespace Rdmp.Core.DataLoad.Modules.Exceptions;
 /// Thrown by flat file reading components (e.g. DelimitedFlatFileDataFlowSource) when there is a structural problem with the file (e.g. 3 headers and 3 cells
 /// per line but suddenly 4 cells appear on line 30).
 /// </summary>
-public class FlatFileLoadException:Exception
+public class FlatFileLoadException : Exception
 {
     public FlatFileLoadException(string message)
         : base(message)
     {
     }
-    public FlatFileLoadException(string message,Exception e)
-        : base(message,e)
+
+    public FlatFileLoadException(string message, Exception e)
+        : base(message, e)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Exceptions/MultipleMatchingFilesException.cs b/Rdmp.Core/DataLoad/Modules/Exceptions/MultipleMatchingFilesException.cs
index ad8ef11cff..8535174e2b 100644
--- a/Rdmp.Core/DataLoad/Modules/Exceptions/MultipleMatchingFilesException.cs
+++ b/Rdmp.Core/DataLoad/Modules/Exceptions/MultipleMatchingFilesException.cs
@@ -13,8 +13,7 @@ namespace Rdmp.Core.DataLoad.Modules.Exceptions;
 /// </summary>
 public class MultipleMatchingFilesException : Exception
 {
-    public MultipleMatchingFilesException(string s):base(s)
+    public MultipleMatchingFilesException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/FTP/FTPDownloader.cs b/Rdmp.Core/DataLoad/Modules/FTP/FTPDownloader.cs
index 7a85914642..04e50ba230 100644
--- a/Rdmp.Core/DataLoad/Modules/FTP/FTPDownloader.cs
+++ b/Rdmp.Core/DataLoad/Modules/FTP/FTPDownloader.cs
@@ -42,19 +42,24 @@ public class FTPDownloader : IPluginDataProvider
     protected List<string> _filesRetrieved = new();
     private ILoadDirectory _directory;
 
-    [DemandsInitialization("Determines the behaviour of the system when no files are found on the server.  If true the entire data load process immediately stops with exit code LoadNotRequired, if false then the load proceeds as normal (useful if for example if you have multiple Attachers and some files are optional)")]
+    [DemandsInitialization(
+        "Determines the behaviour of the system when no files are found on the server.  If true the entire data load process immediately stops with exit code LoadNotRequired, if false then the load proceeds as normal (useful if for example if you have multiple Attachers and some files are optional)")]
     public bool SendLoadNotRequiredIfFileNotFound { get; set; }
 
-    [DemandsInitialization("The Regex expression to validate files on the FTP server against, only files matching the expression will be downloaded")]
+    [DemandsInitialization(
+        "The Regex expression to validate files on the FTP server against, only files matching the expression will be downloaded")]
     public Regex FilePattern { get; set; }
 
     [DemandsInitialization("The timeout to use when connecting to the FTP server in SECONDS")]
     public int TimeoutInSeconds { get; set; }
 
-    [DemandsInitialization("Tick to delete files from the FTP server when the load is succesful (ends with .Success not .OperationNotRequired - which happens when LoadNotRequired state).  This will only delete the files if they were actually fetched from the FTP server.  If the files were already in forLoading then the remote files are not deleted")]
+    [DemandsInitialization(
+        "Tick to delete files from the FTP server when the load is succesful (ends with .Success not .OperationNotRequired - which happens when LoadNotRequired state).  This will only delete the files if they were actually fetched from the FTP server.  If the files were already in forLoading then the remote files are not deleted")]
     public bool DeleteFilesOffFTPServerAfterSuccesfulDataLoad { get; set; }
 
-    [DemandsInitialization("The FTP server to connect to.  Server should be specified with only IP:Port e.g. 127.0.0.1:20.  You do not have to specify ftp:// at the start",Mandatory=true)]
+    [DemandsInitialization(
+        "The FTP server to connect to.  Server should be specified with only IP:Port e.g. 127.0.0.1:20.  You do not have to specify ftp:// at the start",
+        Mandatory = true)]
     public ExternalDatabaseServer FTPServer { get; set; }
 
     [DemandsInitialization("The directory on the FTP server that you want to download files from")]
@@ -75,15 +80,9 @@ public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellati
         return DownloadFilesOnFTP(_directory, job);
     }
 
-    public static string GetDescription()
-    {
-        return "See Description attribute of class";
-    }
+    public static string GetDescription() => "See Description attribute of class";
 
-    public static IDataProvider Clone()
-    {
-        return new FTPDownloader();
-    }
+    public static IDataProvider Clone() => new FTPDownloader();
 
     public bool Validate(ILoadDirectory destination)
     {
@@ -97,7 +96,7 @@ private void SetupFTP()
         _username = FTPServer.Username ?? "anonymous";
         _password = string.IsNullOrWhiteSpace(FTPServer.Password) ? "guest" : FTPServer.GetDecryptedPassword();
 
-        if(string.IsNullOrWhiteSpace(_host))
+        if (string.IsNullOrWhiteSpace(_host))
             throw new NullReferenceException(
                 $"FTPServer is not set up correctly it must have Server property filled in{FTPServer}");
     }
@@ -106,8 +105,9 @@ private ExitCodeType DownloadFilesOnFTP(ILoadDirectory destination, IDataLoadEve
     {
         var files = GetFileList();
 
-        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, files.Aggregate("Identified the following files on the FTP server:", (s, f) =>
-            $"{f},").TrimEnd(',')));
+        listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, files.Aggregate(
+            "Identified the following files on the FTP server:", (s, f) =>
+                $"{f},").TrimEnd(',')));
 
         var forLoadingContainedCachedFiles = false;
 
@@ -115,11 +115,12 @@ private ExitCodeType DownloadFilesOnFTP(ILoadDirectory destination, IDataLoadEve
         {
             var action = GetSkipActionForFile(file, destination);
 
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"File {file} was evaluated as {action}"));
-            if(action == SkipReason.DoNotSkip)
+            if (action == SkipReason.DoNotSkip)
             {
-                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to download {file}"));
+                listener.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information, $"About to download {file}"));
                 Download(file, destination, listener);
             }
 
@@ -130,7 +131,9 @@ private ExitCodeType DownloadFilesOnFTP(ILoadDirectory destination, IDataLoadEve
         //if no files were downloaded (and there were none skiped because they were in forLoading) and in that eventuality we have our flag set to return LoadNotRequired then do so
         if (!forLoadingContainedCachedFiles && !_filesRetrieved.Any() && SendLoadNotRequiredIfFileNotFound)
         {
-            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "Could not find any files on the remote server worth downloading, so returning LoadNotRequired"));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Information,
+                    "Could not find any files on the remote server worth downloading, so returning LoadNotRequired"));
             return ExitCodeType.OperationNotRequired;
         }
 
@@ -152,8 +155,8 @@ protected SkipReason GetSkipActionForFile(string file, ILoadDirectory destinatio
             return SkipReason.IsImaginaryFile;
 
         //if there is a regex pattern
-        if(FilePattern != null)
-            if (!FilePattern.IsMatch(file))//and it does not match
+        if (FilePattern != null)
+            if (!FilePattern.IsMatch(file)) //and it does not match
                 return SkipReason.DidNotMatchPattern; //skip because it did not match pattern
 
         //if the file on the FTP already exists in the forLoading directory, skip it
@@ -165,10 +168,8 @@ protected SkipReason GetSkipActionForFile(string file, ILoadDirectory destinatio
     }
 
 
-    private bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslpolicyerrors)
-    {
-        return true;//any cert will do! yay
-    }
+    private bool ValidateServerCertificate(object sender, X509Certificate certificate, X509Chain chain,
+        SslPolicyErrors sslpolicyerrors) => true; //any cert will do! yay
 
 
     protected virtual string[] GetFileList()
@@ -178,7 +179,9 @@ protected virtual string[] GetFileList()
         StreamReader reader = null;
         try
         {
-            var uri = !string.IsNullOrWhiteSpace(RemoteDirectory) ? $"ftp://{_host}/{RemoteDirectory}" : $"ftp://{_host}";
+            var uri = !string.IsNullOrWhiteSpace(RemoteDirectory)
+                ? $"ftp://{_host}/{RemoteDirectory}"
+                : $"ftp://{_host}";
 
 #pragma warning disable SYSLIB0014 // Type or member is obsolete
             var reqFTP = (FtpWebRequest)WebRequest.Create(new Uri(uri));
@@ -186,7 +189,7 @@ protected virtual string[] GetFileList()
             reqFTP.UseBinary = true;
             reqFTP.Credentials = new NetworkCredential(_username, _password);
             reqFTP.Method = WebRequestMethods.Ftp.ListDirectory;
-            reqFTP.Timeout = TimeoutInSeconds*1000;
+            reqFTP.Timeout = TimeoutInSeconds * 1000;
             reqFTP.KeepAlive = KeepAlive;
 
             reqFTP.Proxy = null;
@@ -206,6 +209,7 @@ protected virtual string[] GetFileList()
                 result.Append('\n');
                 line = reader.ReadLine();
             }
+
             // to remove the trailing '\n'
             result.Remove(result.ToString().LastIndexOf('\n'), 1);
             return result.ToString().Split('\n');
@@ -218,9 +222,8 @@ protected virtual string[] GetFileList()
         }
     }
 
-    protected virtual void Download(string file, ILoadDirectory destination,IDataLoadEventListener job)
+    protected virtual void Download(string file, ILoadDirectory destination, IDataLoadEventListener job)
     {
-
         var s = new Stopwatch();
         s.Start();
 
@@ -232,10 +235,7 @@ protected virtual void Download(string file, ILoadDirectory destination,IDataLoa
             uri = $"s{uri}";
 
         var serverUri = new Uri(uri);
-        if (serverUri.Scheme != Uri.UriSchemeFtp)
-        {
-            return;
-        }
+        if (serverUri.Scheme != Uri.UriSchemeFtp) return;
 
 #pragma warning disable SYSLIB0014 // Type or member is obsolete
         var reqFTP = (FtpWebRequest)WebRequest.Create(new Uri(uri));
@@ -247,7 +247,7 @@ protected virtual void Download(string file, ILoadDirectory destination,IDataLoa
         reqFTP.Proxy = null;
         reqFTP.UsePassive = true;
         reqFTP.EnableSsl = _useSSL;
-        reqFTP.Timeout = TimeoutInSeconds*1000;
+        reqFTP.Timeout = TimeoutInSeconds * 1000;
 
         var response = (FtpWebResponse)reqFTP.GetResponse();
         var responseStream = response.GetResponseStream();
@@ -268,8 +268,11 @@ protected virtual void Download(string file, ILoadDirectory destination,IDataLoa
 
                 //notify whoever is listening of how far along the process we are
                 totalBytesReadSoFar += bytesRead;
-                job.OnProgress(this, new ProgressEventArgs(destinationFileName, new ProgressMeasurement(totalBytesReadSoFar / 1024, ProgressType.Kilobytes), s.Elapsed));
+                job.OnProgress(this,
+                    new ProgressEventArgs(destinationFileName,
+                        new ProgressMeasurement(totalBytesReadSoFar / 1024, ProgressType.Kilobytes), s.Elapsed));
             }
+
             writeStream.Close();
         }
 
@@ -279,17 +282,17 @@ protected virtual void Download(string file, ILoadDirectory destination,IDataLoa
         s.Stop();
     }
 
-    public virtual void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-
         if (exitCode == ExitCodeType.Success && DeleteFilesOffFTPServerAfterSuccesfulDataLoad)
-        {
             foreach (var file in _filesRetrieved)
             {
                 FtpWebRequest reqFTP;
-#pragma warning disable SYSLIB0014 // Type or member is obsolete
+#pragma warning disable SYSLIB0014
+                // Type or member is obsolete
                 reqFTP = (FtpWebRequest)WebRequest.Create(new Uri(file));
-#pragma warning restore SYSLIB0014 // Type or member is obsolete
+#pragma warning restore SYSLIB0014
+                // Type or member is obsolete
                 reqFTP.Credentials = new NetworkCredential(_username, _password);
                 reqFTP.KeepAlive = false;
                 reqFTP.Method = WebRequestMethods.Ftp.DeleteFile;
@@ -300,7 +303,7 @@ public virtual void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventL
 
                 var response = (FtpWebResponse)reqFTP.GetResponse();
 
-                if(response.StatusCode != FtpStatusCode.FileActionOK)
+                if (response.StatusCode != FtpStatusCode.FileActionOK)
                     postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"Attempt to delete file at URI {file} resulted in response with StatusCode = {response.StatusCode}"));
                 else
@@ -309,7 +312,6 @@ public virtual void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventL
 
                 response.Close();
             }
-        }
     }
 
 
diff --git a/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs b/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs
index dc73128701..8ae5e5af9f 100644
--- a/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs
+++ b/Rdmp.Core/DataLoad/Modules/FTP/SFTPDownloader.cs
@@ -21,26 +21,23 @@ namespace Rdmp.Core.DataLoad.Modules.FTP;
 /// <para>Operates in the same way as <see cref="FTPDownloader"/> except that it uses SSH.  In addition this
 /// class will not bother downloading any files that already exist in the forLoading directory (have the same name - file size is NOT checked)</para>
 /// </summary>
-public class SFTPDownloader:FTPDownloader
+public class SFTPDownloader : FTPDownloader
 {
-
     [DemandsInitialization("The keep-alive interval.  In milliseconds.  Requires KeepAlive to be set to take effect.")]
     public int KeepAliveIntervalMilliseconds { get; set; }
 
-    protected override void Download(string file, ILoadDirectory destination,IDataLoadEventListener job)
+    protected override void Download(string file, ILoadDirectory destination, IDataLoadEventListener job)
     {
         if (file.Contains('/') || file.Contains('\\'))
             throw new Exception("Was not expecting a relative path here");
 
         var s = new Stopwatch();
         s.Start();
-            
-        using(var sftp = new SftpClient(_host,_username,_password))
+
+        using (var sftp = new SftpClient(_host, _username, _password))
         {
             if (KeepAlive && KeepAliveIntervalMilliseconds > 0)
-            {
-                sftp.KeepAliveInterval =   TimeSpan.FromMilliseconds(KeepAliveIntervalMilliseconds);
-            }
+                sftp.KeepAliveInterval = TimeSpan.FromMilliseconds(KeepAliveIntervalMilliseconds);
 
             sftp.ConnectionInfo.Timeout = new TimeSpan(0, 0, 0, TimeoutInSeconds);
             sftp.Connect();
@@ -51,7 +48,9 @@ protected override void Download(string file, ILoadDirectory destination,IDataLo
             var destinationFilePath = Path.Combine(destination.ForLoading.FullName, file);
 
             //register for events
-            void callback(ulong totalBytes) => job.OnProgress(this, new ProgressEventArgs(destinationFilePath, new ProgressMeasurement((int)(totalBytes * 0.001), ProgressType.Kilobytes), s.Elapsed));
+            void callback(ulong totalBytes) => job.OnProgress(this,
+                new ProgressEventArgs(destinationFilePath,
+                    new ProgressMeasurement((int)(totalBytes * 0.001), ProgressType.Kilobytes), s.Elapsed));
 
             using (var fs = new FileStream(destinationFilePath, FileMode.CreateNew))
             {
@@ -59,17 +58,17 @@ protected override void Download(string file, ILoadDirectory destination,IDataLo
                 sftp.DownloadFile(fullFilePath, fs, callback);
                 fs.Close();
             }
-            _filesRetrieved.Add(fullFilePath);
 
+            _filesRetrieved.Add(fullFilePath);
         }
+
         s.Stop();
     }
 
 
     public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
-        if(exitCode == ExitCodeType.Success)
-        {
+        if (exitCode == ExitCodeType.Success)
             using (var sftp = new SftpClient(_host, _username, _password))
             {
                 sftp.ConnectionInfo.Timeout = new TimeSpan(0, 0, 0, TimeoutInSeconds);
@@ -88,8 +87,6 @@ public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEven
                             $"Could not delete SFTP file {retrievedFiles} from SFTP server", e));
                     }
             }
-
-        }
     }
 
 
@@ -105,8 +102,7 @@ protected override string[] GetFileList()
             if (string.IsNullOrWhiteSpace(directory))
                 directory = ".";
 
-            return sftp.ListDirectory(directory).Select(d=>d.Name).ToArray();
+            return sftp.ListDirectory(directory).Select(d => d.Name).ToArray();
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/FileOperations/FileUnzipper.cs b/Rdmp.Core/DataLoad/Modules/FileOperations/FileUnzipper.cs
index 004ee9ec6e..07da06d1d0 100644
--- a/Rdmp.Core/DataLoad/Modules/FileOperations/FileUnzipper.cs
+++ b/Rdmp.Core/DataLoad/Modules/FileOperations/FileUnzipper.cs
@@ -31,51 +31,53 @@ namespace Rdmp.Core.DataLoad.Modules.FileOperations;
 /// </summary>
 public class FileUnzipper : IPluginDataProvider
 {
-    [DemandsInitialization("Leave blank to extract all zip archives or populate with a REGULAR EXPRESSION to extract only specific zip filenames e.g. \"nhs_readv2*\\.zip\" - notice the escaped dot to match absoltely the dot bit")]
+    [DemandsInitialization(
+        "Leave blank to extract all zip archives or populate with a REGULAR EXPRESSION to extract only specific zip filenames e.g. \"nhs_readv2*\\.zip\" - notice the escaped dot to match absoltely the dot bit")]
     public Regex ZipArchivePattern { get; set; }
-        
-    [DemandsInitialization("Leave blank to extract all files or populate with a REGULAR EXPRESSION to extract only specific files e.g. \".*\\.txt\" to extract all .txt files - notice how the pattern is a regular expression, so the dot must be escaped to prevent matching anything")]
+
+    [DemandsInitialization(
+        "Leave blank to extract all files or populate with a REGULAR EXPRESSION to extract only specific files e.g. \".*\\.txt\" to extract all .txt files - notice how the pattern is a regular expression, so the dot must be escaped to prevent matching anything")]
     public Regex ZipEntryPattern { get; set; }
 
     private readonly List<FileInfo> _entriesUnzipped = new();
 
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
         foreach (var fileInfo in job.LoadDirectory.ForLoading.GetFiles("*.zip"))
-        {
             //do it as regex rather than in GetFiles above because that method probably doesn't do regex
-            if (ZipArchivePattern == null || string.IsNullOrWhiteSpace(ZipArchivePattern.ToString()) || ZipArchivePattern.IsMatch(fileInfo.Name))
-                using (var zipFile = ZipFile.Open(fileInfo.FullName,ZipArchiveMode.Read))
+            if (ZipArchivePattern == null || string.IsNullOrWhiteSpace(ZipArchivePattern.ToString()) ||
+                ZipArchivePattern.IsMatch(fileInfo.Name))
+                using (var zipFile = ZipFile.Open(fileInfo.FullName, ZipArchiveMode.Read))
                 {
                     //fire event telling user we found some files in the zip file 
-                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, zipFile.Entries.Aggregate("Identified the following zip entries:",(s,n)=>
-                        $"{n.Name},").TrimEnd(',')));
+                    job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, zipFile.Entries.Aggregate(
+                        "Identified the following zip entries:", (s, n) =>
+                            $"{n.Name},").TrimEnd(',')));
 
 
                     foreach (var entry in zipFile.Entries)
                     {
-                        if(entry.Length == 0)
+                        if (entry.Length == 0)
                             continue;
-                            
+
                         //if we are matching everything or we are matching on a regex that matches the entry name
-                        if (ZipEntryPattern == null || string.IsNullOrWhiteSpace(ZipEntryPattern.ToString()) || ZipEntryPattern.IsMatch(entry.Name))
+                        if (ZipEntryPattern == null || string.IsNullOrWhiteSpace(ZipEntryPattern.ToString()) ||
+                            ZipEntryPattern.IsMatch(entry.Name))
                         {
                             //extract it
                             var existingFile = job.LoadDirectory.ForLoading.GetFiles(entry.Name).FirstOrDefault();
-                        
-                            if(existingFile != null && existingFile.Length == entry.Length)
+
+                            if (existingFile != null && existingFile.Length == entry.Length)
                                 continue;
 
-                            UnzipWithEvents(entry, job.LoadDirectory,job);
+                            UnzipWithEvents(entry, job.LoadDirectory, job);
                         }
                     }
                 }
-        }
 
         return ExitCodeType.Success;
     }
@@ -98,33 +100,28 @@ private void UnzipWithEvents(ZipArchiveEntry entry, ILoadDirectory destination,
         while (!unzipJob.IsCompleted)
         {
             Thread.Sleep(200);
-            if(f.Exists)
-                job.OnProgress(this,new ProgressEventArgs(entryDestination,new ProgressMeasurement((int)(f.Length / 1000),ProgressType.Kilobytes), s.Elapsed));
+            if (f.Exists)
+                job.OnProgress(this,
+                    new ProgressEventArgs(entryDestination,
+                        new ProgressMeasurement((int)(f.Length / 1000), ProgressType.Kilobytes), s.Elapsed));
         }
-        s.Stop();
-
 
+        s.Stop();
     }
 
-    public string GetDescription()
-    {
-        throw new NotImplementedException();
-    }
+    public string GetDescription() => throw new NotImplementedException();
+
+    public static IDataProvider Clone() => new FileUnzipper();
 
-    public static IDataProvider Clone()
-    {
-        return new FileUnzipper();
-    }
-        
 
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
         if (exitCode == ExitCodeType.Success || exitCode == ExitCodeType.OperationNotRequired)
         {
-            var countOfEntriesThatDisapeared = _entriesUnzipped.Count(e=>!e.Exists);
+            var countOfEntriesThatDisapeared = _entriesUnzipped.Count(e => !e.Exists);
 
             if (countOfEntriesThatDisapeared != 0)
-                postLoadEventListener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+                postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"{countOfEntriesThatDisapeared} of {_entriesUnzipped.Count} entries were created by {GetType().Name} during unzip phase but had disapeared at cleanup time - following successful data load"));
 
             //cleanup required
@@ -135,19 +132,21 @@ public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener
                 }
                 catch (Exception e)
                 {
-                    postLoadEventListener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+                    postLoadEventListener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                         $"Could not delete file {f.FullName}", e));
                 }
         }
     }
 
-        
+
     public void Check(ICheckNotifier notifier)
     {
         if (ZipArchivePattern != null)
-            notifier.OnCheckPerformed(new CheckEventArgs($"Found ZipArchivePattern {ZipArchivePattern}",CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Found ZipArchivePattern {ZipArchivePattern}",
+                CheckResult.Success));
 
         if (ZipEntryPattern != null)
-            notifier.OnCheckPerformed(new CheckEventArgs($"Found ZipEntryPattern {ZipEntryPattern}", CheckResult.Success));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Found ZipEntryPattern {ZipEntryPattern}",
+                CheckResult.Success));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/DataLoadProgressUpdateInfo.cs b/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/DataLoadProgressUpdateInfo.cs
index a2f5860e0f..2b691d78f3 100644
--- a/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/DataLoadProgressUpdateInfo.cs
+++ b/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/DataLoadProgressUpdateInfo.cs
@@ -32,12 +32,13 @@ public class DataLoadProgressUpdateInfo : ICustomUIDrivenClass, ICheckable
     public int Timeout { get; set; }
 
     #region Serialization
+
     public void RestoreStateFrom(string value)
     {
-        if(string.IsNullOrWhiteSpace(value))
+        if (string.IsNullOrWhiteSpace(value))
             return;
 
-        var lines = value.Split(new []{'\n','\r'},StringSplitOptions.RemoveEmptyEntries);
+        var lines = value.Split(new[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
 
         if (lines.Length > 0)
         {
@@ -60,10 +61,11 @@ public string SaveStateToString()
     {
         var sb = new StringBuilder();
         sb.AppendLine($"{Strategy};{Timeout}");
-        sb.AppendLine(ExecuteScalarSQL??"");
-            
+        sb.AppendLine(ExecuteScalarSQL ?? "");
+
         return sb.ToString();
     }
+
     #endregion
 
 
@@ -89,7 +91,7 @@ public IUpdateLoadProgress AddAppropriateDisposeStep(ScheduledDataLoadJob job, D
             case DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW:
                 try
                 {
-                    var dt = GetMaxDate(rawDatabase.Server,job);
+                    var dt = GetMaxDate(rawDatabase.Server, job);
                     added = new UpdateProgressToSpecificValueIfLoadsuccessful(job, dt);
                 }
                 catch (SqlException e)
@@ -97,6 +99,7 @@ public IUpdateLoadProgress AddAppropriateDisposeStep(ScheduledDataLoadJob job, D
                     throw new DataLoadProgressUpdateException(
                         $"Failed to execute the following SQL in the RAW database:{ExecuteScalarSQL}", e);
                 }
+
                 break;
             case DataLoadProgressUpdateStrategy.DoNothing:
                 //Do not add any post load update i.e. do nothing
@@ -109,10 +112,8 @@ public IUpdateLoadProgress AddAppropriateDisposeStep(ScheduledDataLoadJob job, D
         return added;
     }
 
-    private static DiscoveredServer GetLiveServer(ScheduledDataLoadJob job)
-    {
-        return DataAccessPortal.ExpectDistinctServer(job.RegularTablesToLoad.ToArray(), DataAccessContext.DataLoad, false);
-    }
+    private static DiscoveredServer GetLiveServer(ScheduledDataLoadJob job) =>
+        DataAccessPortal.ExpectDistinctServer(job.RegularTablesToLoad.ToArray(), DataAccessContext.DataLoad, false);
 
     private DateTime GetMaxDate(DiscoveredServer server, IDataLoadEventListener listener)
     {
@@ -124,12 +125,13 @@ private DateTime GetMaxDate(DiscoveredServer server, IDataLoadEventListener list
                 $"About to execute SQL to determine the maximum date for data loaded:{ExecuteScalarSQL}"));
 
             DateTime dt;
-            using(var cmd = server.GetCommand(ExecuteScalarSQL, con))
+            using (var cmd = server.GetCommand(ExecuteScalarSQL, con))
             {
                 var scalarValue = cmd.ExecuteScalar();
 
                 if (scalarValue == null || scalarValue == DBNull.Value)
-                    throw new DataLoadProgressUpdateException("ExecuteScalarSQL specified for determining the maximum date of data loaded returned null when executed");
+                    throw new DataLoadProgressUpdateException(
+                        "ExecuteScalarSQL specified for determining the maximum date of data loaded returned null when executed");
 
                 try
                 {
@@ -138,7 +140,8 @@ private DateTime GetMaxDate(DiscoveredServer server, IDataLoadEventListener list
                 catch (Exception e)
                 {
                     throw new DataLoadProgressUpdateException(
-                        $"ExecuteScalarSQL specified for determining the maximum date of data loaded returned a value that was not a Date:{scalarValue}", e);
+                        $"ExecuteScalarSQL specified for determining the maximum date of data loaded returned a value that was not a Date:{scalarValue}",
+                        e);
                 }
             }
 
@@ -149,7 +152,8 @@ private DateTime GetMaxDate(DiscoveredServer server, IDataLoadEventListener list
 
     public void Check(ICheckNotifier notifier)
     {
-        if(Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInLIVE  || Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW)
+        if (Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInLIVE ||
+            Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW)
             if (string.IsNullOrWhiteSpace(ExecuteScalarSQL))
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
@@ -158,19 +162,20 @@ public void Check(ICheckNotifier notifier)
 
         // TODO: These checks are VERY Sql Server specific!
 
-        if(Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW)
-            if (ExecuteScalarSQL.Contains("..") || ExecuteScalarSQL.Contains(".[dbo].") || ExecuteScalarSQL.Contains(".dbo."))
+        if (Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW)
+            if (ExecuteScalarSQL.Contains("..") || ExecuteScalarSQL.Contains(".[dbo].") ||
+                ExecuteScalarSQL.Contains(".dbo."))
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
                         $"Strategy is {Strategy} but the SQL looks like it references explicit tables, In general RAW queries should use unqualified table names i.e. 'Select MAX(dt) FROM MyTable' NOT 'Select MAX(dt) FROM [MyLIVEDatabase]..[MyTable]'",
                         CheckResult.Warning));
 
         if (Strategy == DataLoadProgressUpdateStrategy.ExecuteScalarSQLInLIVE)
-            if (!(ExecuteScalarSQL.Contains("..") || ExecuteScalarSQL.Contains(".[dbo].") || ExecuteScalarSQL.Contains(".dbo.")))
+            if (!(ExecuteScalarSQL.Contains("..") || ExecuteScalarSQL.Contains(".[dbo].") ||
+                  ExecuteScalarSQL.Contains(".dbo.")))
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
                         $"Strategy is {Strategy} but the SQL does not contain '..' or '.[dbo].' or '.dbo.', LIVE update queries should use fully table names i.e. 'Select MAX(dt) FROM [MyLIVEDatabase]..[MyTable]' NOT 'Select MAX(dt) FROM MyTable'",
                         CheckResult.Warning));
-                        
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/UpdateProgressToResultOfDelegate.cs b/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/UpdateProgressToResultOfDelegate.cs
index 5ec5480e8c..cdef3c6a58 100644
--- a/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/UpdateProgressToResultOfDelegate.cs
+++ b/Rdmp.Core/DataLoad/Modules/LoadProgressUpdating/UpdateProgressToResultOfDelegate.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.DataLoad.Modules.LoadProgressUpdating;
 public class UpdateProgressToResultOfDelegate : UpdateProgressIfLoadsuccessful
 {
     private readonly Func<DateTime> _delegateToRun;
-        
+
     public UpdateProgressToResultOfDelegate(ScheduledDataLoadJob job, Func<DateTime> delegateToRun) : base(job)
     {
         _delegateToRun = delegateToRun;
@@ -30,6 +30,5 @@ public override void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEven
             DateToSetProgressTo = _delegateToRun();
 
         base.LoadCompletedSoDispose(exitCode, postLoadEventListener);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/BackupDatabaseMutilation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/BackupDatabaseMutilation.cs
index 856f86ae65..a96220cab7 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/BackupDatabaseMutilation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/BackupDatabaseMutilation.cs
@@ -22,9 +22,11 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators;
 ///
 /// <para>This mutilation should only be put into AdjustStaging otherwise it will fill up your backup storage as debug load errors in RAW and Migration to STAGING</para>
 /// </summary>
-public class BackupDatabaseMutilation:IMutilateDataTables
+public class BackupDatabaseMutilation : IMutilateDataTables
 {
-    [DemandsInitialization("The database to backup, just select any TableInfo that is part of your load and the entire database will be backed up", Mandatory = true)]
+    [DemandsInitialization(
+        "The database to backup, just select any TableInfo that is part of your load and the entire database will be backed up",
+        Mandatory = true)]
     public TableInfo DatabaseToBackup { get; set; }
 
     [DemandsInitialization("The number of months the backup will expire after", Mandatory = true)]
@@ -34,18 +36,18 @@ public class BackupDatabaseMutilation:IMutilateDataTables
     public void Check(ICheckNotifier notifier)
     {
         if (DatabaseToBackup == null)
-            notifier.OnCheckPerformed(new CheckEventArgs("No TableInfo is set, don't know what to backup", CheckResult.Fail, null));
+            notifier.OnCheckPerformed(new CheckEventArgs("No TableInfo is set, don't know what to backup",
+                CheckResult.Fail, null));
     }
 
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-
     }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
     {
-        if(loadStage != LoadStage.AdjustStaging && loadStage != LoadStage.PostLoad)
+        if (loadStage != LoadStage.AdjustStaging && loadStage != LoadStage.PostLoad)
             throw new Exception(
                 $"{nameof(BackupDatabaseMutilation)} can only be done in AdjustStaging or PostLoad (this minimises redundant backups that would otherwise be created while you attempt to fix RAW / constraint related load errors)");
     }
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Coalescer.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Coalescer.cs
index 18a5c8eb12..665aa12548 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Coalescer.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Coalescer.cs
@@ -22,19 +22,21 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators;
 /// </summary>
 public class Coalescer : MatchingTablesMutilator
 {
-    [DemandsInitialization("Pass true to create an index on the primary keys which are joined together (can improve performance)",DefaultValue=false)]
+    [DemandsInitialization(
+        "Pass true to create an index on the primary keys which are joined together (can improve performance)",
+        DefaultValue = false)]
     public bool CreateIndex { get; set; }
 
-    public Coalescer():base(LoadStage.AdjustRaw)
+    public Coalescer() : base(LoadStage.AdjustRaw)
     {
-            
     }
-        
+
     protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tableInfo, DiscoveredTable table)
     {
         var server = table.Database.Server;
 
-        job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, $"About to run Coalese on table {table}"));
+        job.OnNotify(this,
+            new NotifyEventArgs(ProgressEventType.Information, $"About to run Coalese on table {table}"));
 
         var allCols = table.DiscoverColumns();
 
@@ -59,7 +61,6 @@ protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tab
             con.Open();
 
             if (CreateIndex)
-            {
                 using (var idxCmd =
                        server.GetCommand(
                            string.Format(@"CREATE INDEX IX_PK_{0} ON {0}({1});", table.GetRuntimeName(),
@@ -67,8 +68,7 @@ protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tab
                 {
                     idxCmd.CommandTimeout = Timeout;
                     idxCmd.ExecuteNonQuery();
-                }                    
-            }
+                }
 
             //Get an update command for each non primary key column
             foreach (var nonPk in nonPks)
@@ -80,7 +80,7 @@ protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tab
                 affectedRows += cmd.ExecuteNonQuery();
             }
         }
-            
+
         job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Coalesce on table '{table}' completed ({affectedRows} rows affected)"));
     }
@@ -89,10 +89,11 @@ private static string GetCommand(DiscoveredTable table, DiscoveredColumn[] pks,
     {
         var sqlLines = new List<CustomLine>
         {
-            new CustomLine(string.Format("(t1.{0} is null AND t2.{0} is not null)", nonPk.GetRuntimeName()), QueryComponent.WHERE),
-            new CustomLine(string.Format("t1.{0} = COALESCE(t1.{0},t2.{0})", nonPk.GetRuntimeName()), QueryComponent.SET)
+            new(string.Format("(t1.{0} is null AND t2.{0} is not null)", nonPk.GetRuntimeName()), QueryComponent.WHERE),
+            new(string.Format("t1.{0} = COALESCE(t1.{0},t2.{0})", nonPk.GetRuntimeName()), QueryComponent.SET)
         };
-        sqlLines.AddRange(pks.Select(p=>new CustomLine(string.Format("t1.{0} = t2.{0}", p.GetRuntimeName()),QueryComponent.JoinInfoJoin)));
+        sqlLines.AddRange(pks.Select(p =>
+            new CustomLine(string.Format("t1.{0} = t2.{0}", p.GetRuntimeName()), QueryComponent.JoinInfoJoin)));
 
         var updateHelper = table.Database.Server.GetQuerySyntaxHelper().UpdateHelper;
 
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Dilution.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Dilution.cs
index d699f562a4..c041c37718 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Dilution.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Dilution.cs
@@ -33,16 +33,20 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators.Dilution;
 /// </summary>
 public class Dilution : IPluginMutilateDataTables
 {
-
-    [DemandsInitialization("Column which is to be diluted, must have Destination=Dilution - i.e. not Destination=Oblivion or StoreInIdentifierDump", Mandatory = true)]
+    [DemandsInitialization(
+        "Column which is to be diluted, must have Destination=Dilution - i.e. not Destination=Oblivion or StoreInIdentifierDump",
+        Mandatory = true)]
     public PreLoadDiscardedColumn ColumnToDilute { get; set; }
 
-    [DemandsInitialization("Dilution Operation to be performed on the column", DemandType.Unspecified, null, typeof(IDilutionOperation), Mandatory = true)]
+    [DemandsInitialization("Dilution Operation to be performed on the column", DemandType.Unspecified, null,
+        typeof(IDilutionOperation), Mandatory = true)]
     public Type Operation { get; set; }
 
-    [DemandsInitialization("The number of seconds to wait before Timming out when executing the Operation.  This will be running an UPDATE on every record in STAGING so should be quite high depending on how many records your load loads at once (e.g. 5000)", DemandType.Unspecified,5000)]
+    [DemandsInitialization(
+        "The number of seconds to wait before Timming out when executing the Operation.  This will be running an UPDATE on every record in STAGING so should be quite high depending on how many records your load loads at once (e.g. 5000)",
+        DemandType.Unspecified, 5000)]
     public int Timeout { get; set; }
-        
+
     public void Check(ICheckNotifier notifier)
     {
         if (ColumnToDilute == null)
@@ -50,13 +54,14 @@ public void Check(ICheckNotifier notifier)
             notifier.OnCheckPerformed(new CheckEventArgs("ColumnToDilute is null", CheckResult.Fail, null));
             return;
         }
-            
+
         if (ColumnToDilute.Destination != DiscardedColumnDestination.Dilute)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"ColumnToDilute '{ColumnToDilute.GetRuntimeName()}' is not marked as DiscardedColumnDestination.Dilute", CheckResult.Fail, null));
+                $"ColumnToDilute '{ColumnToDilute.GetRuntimeName()}' is not marked as DiscardedColumnDestination.Dilute",
+                CheckResult.Fail, null));
 
         //Stamp out the type
-        IDilutionOperation instance = null; 
+        IDilutionOperation instance = null;
         try
         {
             var factory = new DilutionOperationFactory(ColumnToDilute);
@@ -66,22 +71,23 @@ public void Check(ICheckNotifier notifier)
         {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Could not create DilutionOperation of Type {Operation} using DilutionOperationFactory, see inner Exception for details", CheckResult.Fail, e));
+                    $"Could not create DilutionOperation of Type {Operation} using DilutionOperationFactory, see inner Exception for details",
+                    CheckResult.Fail, e));
         }
 
-        if(_loadStage  != LoadStage.AdjustStaging)
+        if (_loadStage != LoadStage.AdjustStaging)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Dilution can ONLY occur in load stage AdjustStaging, it is currently configured as load stage: {_loadStage}", CheckResult.Fail));
+                $"Dilution can ONLY occur in load stage AdjustStaging, it is currently configured as load stage: {_loadStage}",
+                CheckResult.Fail));
 
         instance?.Check(notifier);
     }
 
-        
+
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
-        
+
     private DiscoveredDatabase _dbInfo;
     private LoadStage _loadStage;
 
@@ -112,5 +118,4 @@ private string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer)
         var factory = new DilutionOperationFactory(ColumnToDilute);
         return factory.Create(Operation).GetMutilationSql(namer);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/DilutionOperationFactory.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/DilutionOperationFactory.cs
index c710163078..044692564d 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/DilutionOperationFactory.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/DilutionOperationFactory.cs
@@ -21,7 +21,7 @@ public class DilutionOperationFactory
 
     public DilutionOperationFactory(IPreLoadDiscardedColumn targetColumn)
     {
-        if(targetColumn == null)
+        if (targetColumn == null)
             throw new ArgumentNullException(nameof(targetColumn));
 
         _targetColumn = targetColumn;
@@ -30,15 +30,15 @@ public DilutionOperationFactory(IPreLoadDiscardedColumn targetColumn)
 
     public IDilutionOperation Create(Type operation)
     {
-        if(operation == null)
+        if (operation == null)
             throw new ArgumentNullException(nameof(operation));
 
-        if(!typeof(IDilutionOperation).IsAssignableFrom(operation))
+        if (!typeof(IDilutionOperation).IsAssignableFrom(operation))
             throw new ArgumentException($"Requested operation Type {operation} did was not an IDilutionOperation");
 
         var instance = _mef.CreateA<IDilutionOperation>(operation.FullName);
         instance.ColumnToDilute = _targetColumn;
-            
+
         return instance;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Exceptions/DilutionColumnNotSetException.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Exceptions/DilutionColumnNotSetException.cs
index 11d5b94e59..83c4d95091 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Exceptions/DilutionColumnNotSetException.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Exceptions/DilutionColumnNotSetException.cs
@@ -13,9 +13,8 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators.Dilution.Exceptions;
 /// </summary>
 public class DilutionColumnNotSetException : Exception
 {
-    public DilutionColumnNotSetException(string s):base(s)
+    public DilutionColumnNotSetException(string s) : base(s)
     {
-            
     }
 
     public DilutionColumnNotSetException()
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/CrushToBitFlag.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/CrushToBitFlag.cs
index e933b50aeb..93dac0d12a 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/CrushToBitFlag.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/CrushToBitFlag.cs
@@ -22,12 +22,9 @@ public CrushToBitFlag() :
     {
     }
 
-    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer)
-    {
-            
-        return
-            string.Format(
-                @"
+    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer) =>
+        string.Format(
+            @"
   ALTER TABLE {0} Add {1}_bit bit 
   GO
 
@@ -40,5 +37,4 @@ ALTER TABLE {0} DROP column {1}
   EXEC sp_rename '{0}.{1}_bit', '{1}' , 'COLUMN'
   GO
 ", ColumnToDilute.TableInfo.GetRuntimeName(LoadStage.AdjustStaging, namer), ColumnToDilute.GetRuntimeName());
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/DilutionOperation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/DilutionOperation.cs
index 6607d52597..ec3edc1446 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/DilutionOperation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/DilutionOperation.cs
@@ -29,19 +29,16 @@ protected DilutionOperation(DatabaseTypeRequest expectedDestinationType)
 
     public virtual void Check(ICheckNotifier notifier)
     {
-        if(ColumnToDilute == null)
-            throw new DilutionColumnNotSetException("ColumnToDilute has not been set yet, this is the column which will be diluted and is usually set by the DilutionOperationFactory but it is null");
+        if (ColumnToDilute == null)
+            throw new DilutionColumnNotSetException(
+                "ColumnToDilute has not been set yet, this is the column which will be diluted and is usually set by the DilutionOperationFactory but it is null");
 
         if (string.IsNullOrWhiteSpace(ColumnToDilute.SqlDataType))
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"IPreLoadDiscardedColumn {ColumnToDilute} is of unknown datatype", CheckResult.Fail));
     }
 
-    public override string ToString()
-    {
-        return GetType().Name;
-    }
+    public override string ToString() => GetType().Name;
 
     public abstract string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer);
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/ExcludeRight3OfUKPostcodes.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/ExcludeRight3OfUKPostcodes.cs
index 16bba8161e..35996a529f 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/ExcludeRight3OfUKPostcodes.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/ExcludeRight3OfUKPostcodes.cs
@@ -15,10 +15,10 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators.Dilution.Operations;
 /// Dilutes data in the ColumnToDilute which is expected to contain postcodes by replacing stripping the last 3 digits such that DD3 7LX becomes DD3.
 /// See TestExcludeRight3OfUKPostcodes for expected inputs/outputs.
 /// </summary>
-public class ExcludeRight3OfUKPostcodes: DilutionOperation
+public class ExcludeRight3OfUKPostcodes : DilutionOperation
 {
-    public ExcludeRight3OfUKPostcodes() : 
-        base(new DatabaseTypeRequest(typeof(string),4))
+    public ExcludeRight3OfUKPostcodes() :
+        base(new DatabaseTypeRequest(typeof(string), 4))
     {
     }
 
@@ -26,16 +26,14 @@ public override void Check(ICheckNotifier notifier)
     {
         base.Check(notifier);
 
-        if(!ColumnToDilute.SqlDataType.ToLower().Contains("char"))
+        if (!ColumnToDilute.SqlDataType.ToLower().Contains("char"))
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"IPreLoadDiscardedColumn {ColumnToDilute} is of datatype {ColumnToDilute.SqlDataType} which is incompatible with this dilution operation (it must be char/varchar)", CheckResult.Fail));
+                $"IPreLoadDiscardedColumn {ColumnToDilute} is of datatype {ColumnToDilute.SqlDataType} which is incompatible with this dilution operation (it must be char/varchar)",
+                CheckResult.Fail));
     }
-        
-    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer)
-    {
-        return 
 
-            string.Format(@"
+    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer) =>
+        string.Format(@"
 
 IF OBJECT_ID('dbo.RemoveDodgyCharacters') IS NOT NULL
   DROP FUNCTION RemoveDodgyCharacters
@@ -102,5 +100,4 @@ RETURN SUBSTRING(@hackedStr,1,LEN(@hackedStr)-3)
 
 UPDATE {0} SET {1}=dbo.Left4OfPostcodes({1})
 GO", ColumnToDilute.TableInfo.GetRuntimeName(LoadStage.AdjustStaging, namer), ColumnToDilute.GetRuntimeName());
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/IPluginDilutionOperation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/IPluginDilutionOperation.cs
index 161bfe94b9..19658a8b44 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/IPluginDilutionOperation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/IPluginDilutionOperation.cs
@@ -11,6 +11,6 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators.Dilution.Operations;
 /// <summary>
 /// MEF discoverable version of IDilutionOperation
 /// </summary>
-public interface IPluginDilutionOperation:IDilutionOperation
+public interface IPluginDilutionOperation : IDilutionOperation
 {
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/RoundDateToMiddleOfQuarter.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/RoundDateToMiddleOfQuarter.cs
index 36502dec0f..a2b4310547 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/RoundDateToMiddleOfQuarter.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Dilution/Operations/RoundDateToMiddleOfQuarter.cs
@@ -30,12 +30,12 @@ public override void Check(ICheckNotifier notifier)
         //confirm type safety
         if (!ColumnToDilute.SqlDataType.ToLower().Contains("date"))
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"ColumnToDilute '{ColumnToDilute.RuntimeColumnName}' has operation RoundDateToMiddleOfQuarter configured but its datatype is {ColumnToDilute.SqlDataType}", CheckResult.Fail, null));
+                $"ColumnToDilute '{ColumnToDilute.RuntimeColumnName}' has operation RoundDateToMiddleOfQuarter configured but its datatype is {ColumnToDilute.SqlDataType}",
+                CheckResult.Fail, null));
     }
-        
-    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer)
-    {
-        return string.Format(@"IF OBJECT_ID('dbo.RoundDateToMiddleOfQuarter') IS NOT NULL
+
+    public override string GetMutilationSql(INameDatabasesAndTablesDuringLoads namer) =>
+        string.Format(@"IF OBJECT_ID('dbo.RoundDateToMiddleOfQuarter') IS NOT NULL
   DROP FUNCTION RoundDateToMiddleOfQuarter
 GO
 
@@ -69,5 +69,4 @@ RETURN @anonDOB
 UPDATE {0} SET {1}=dbo.RoundDateToMiddleOfQuarter({1})
 GO",
             ColumnToDilute.TableInfo.GetRuntimeName(LoadStage.AdjustStaging, namer), ColumnToDilute.GetRuntimeName());
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/Distincter.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/Distincter.cs
index ff1234ecff..75ffb642b6 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/Distincter.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/Distincter.cs
@@ -20,10 +20,10 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators;
 /// </summary>
 public class Distincter : MatchingTablesMutilator
 {
-    public Distincter():base(LoadStage.AdjustRaw)
+    public Distincter() : base(LoadStage.AdjustRaw)
     {
-            
     }
+
     protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tableInfo, DiscoveredTable table)
     {
         table.MakeDistinct(Timeout);
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/ExecuteSqlMutilation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/ExecuteSqlMutilation.cs
index 5cb9c793a8..499a37ee62 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/ExecuteSqlMutilation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/ExecuteSqlMutilation.cs
@@ -24,12 +24,12 @@ public class ExecuteSqlMutilation : IPluginMutilateDataTables
     private DiscoveredDatabase _db;
     private LoadStage _loadStage;
 
-    [DemandsInitialization("Run the following SQL when this component is run in the DLE",DemandType = DemandType.SQL,Mandatory =true)]
-    public string Sql{get;set;}
+    [DemandsInitialization("Run the following SQL when this component is run in the DLE", DemandType = DemandType.SQL,
+        Mandatory = true)]
+    public string Sql { get; set; }
 
     public void Check(ICheckNotifier notifier)
     {
-            
     }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
@@ -40,12 +40,11 @@ public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public ExitCodeType Mutilate(IDataLoadJob job)
     {
-        var sql = new ExecuteSqlInDleStage(job,_loadStage);
-        return sql.Execute(Sql,_db);
+        var sql = new ExecuteSqlInDleStage(job, _loadStage);
+        return sql.Execute(Sql, _db);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/MatchingTablesMutilator.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/MatchingTablesMutilator.cs
index d38ff85eaf..e8383f313a 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/MatchingTablesMutilator.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/MatchingTablesMutilator.cs
@@ -22,10 +22,13 @@ public abstract class MatchingTablesMutilator : IPluginMutilateDataTables
 {
     private readonly LoadStage[] _allowedStages;
 
-    [DemandsInitialization("All tables matching this pattern which have a TableInfo defined in the load will be affected by this mutilation", DefaultValue = ".*")]
+    [DemandsInitialization(
+        "All tables matching this pattern which have a TableInfo defined in the load will be affected by this mutilation",
+        DefaultValue = ".*")]
     public Regex TableRegexPattern { get; set; }
 
-    [DemandsInitialization("Overrides TableRegexPattern.  If this is set then the tables chosen will be mutilated instead")]
+    [DemandsInitialization(
+        "Overrides TableRegexPattern.  If this is set then the tables chosen will be mutilated instead")]
     public TableInfo[] OnlyTables { get; set; }
 
     [DemandsInitialization("How long to allow for each command to execute in seconds", DefaultValue = 600)]
@@ -41,12 +44,11 @@ protected MatchingTablesMutilator(params LoadStage[] allowedStages)
 
     public virtual void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
     {
-        if(_allowedStages!= null && !_allowedStages.Contains(loadStage))
+        if (_allowedStages != null && !_allowedStages.Contains(loadStage))
             throw new NotSupportedException($"Mutilation {GetType()} is not allowed at stage {loadStage}");
 
         _loadStage = loadStage;
@@ -55,22 +57,24 @@ public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
 
     public ExitCodeType Mutilate(IDataLoadJob job)
     {
-        if(TableRegexPattern != null)
-            TableRegexPattern = new Regex(TableRegexPattern.ToString(),RegexOptions.IgnoreCase);
+        if (TableRegexPattern != null)
+            TableRegexPattern = new Regex(TableRegexPattern.ToString(), RegexOptions.IgnoreCase);
 
         foreach (var tableInfo in job.RegularTablesToLoad)
             if (OnlyTables != null && OnlyTables.Any())
             {
                 if (OnlyTables.Contains(tableInfo))
-                    FireMutilate(tableInfo,job);
+                    FireMutilate(tableInfo, job);
             }
-            else
-            if (TableRegexPattern == null)
+            else if (TableRegexPattern == null)
+            {
                 throw new Exception("You must specify either TableRegexPattern or OnlyTables");
-            else
-            if( TableRegexPattern.IsMatch(tableInfo.GetRuntimeName()))
+            }
+            else if (TableRegexPattern.IsMatch(tableInfo.GetRuntimeName()))
+            {
                 FireMutilate(tableInfo, job);
-            
+            }
+
         return ExitCodeType.Success;
     }
 
@@ -79,8 +83,10 @@ private void FireMutilate(ITableInfo tableInfo, IDataLoadJob job)
         var tbl = DbInfo.ExpectTable(tableInfo.GetRuntimeName(_loadStage, job.Configuration.DatabaseNamer));
 
         if (!tbl.Exists())
+        {
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                 $"Expected table {tbl} did not exist in RAW"));
+        }
         else
         {
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
@@ -99,7 +105,8 @@ private void FireMutilate(ITableInfo tableInfo, IDataLoadJob job)
     public virtual void Check(ICheckNotifier notifier)
     {
         if (TableRegexPattern == null && (OnlyTables == null || OnlyTables.Length == 0))
-            notifier.OnCheckPerformed(new CheckEventArgs("You must specify either a regex pattern (TableRegexPattern) or set OnlyTables for identifying tables which need to be processed", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "You must specify either a regex pattern (TableRegexPattern) or set OnlyTables for identifying tables which need to be processed",
+                CheckResult.Fail));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/PrematureLoadEnder.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/PrematureLoadEnder.cs
index 1d8f500338..9c96d556ce 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/PrematureLoadEnder.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/PrematureLoadEnder.cs
@@ -25,25 +25,30 @@ public class PrematureLoadEnder : IPluginMutilateDataTables
 {
     private DiscoveredDatabase _databaseInfo;
 
-    [DemandsInitialization("An exit code that reflects the nature off the stop.  Do not set Success because loads do not stop halfway through Successfully.  If you do not want an error use LoadNotRequired")]
+    [DemandsInitialization(
+        "An exit code that reflects the nature off the stop.  Do not set Success because loads do not stop halfway through Successfully.  If you do not want an error use LoadNotRequired")]
     public ExitCodeType ExitCodeToReturnIfConditionMet { get; set; }
-   
-    [DemandsInitialization("Condition under which to return the exit code.  Use cases for Always are few and far between I guess if you have a big configuration but you want to stop it running ever you could put an Always abort step in")]
+
+    [DemandsInitialization(
+        "Condition under which to return the exit code.  Use cases for Always are few and far between I guess if you have a big configuration but you want to stop it running ever you could put an Always abort step in")]
     public PrematureLoadEndCondition ConditionsToTerminateUnder { get; set; }
 
     public void Check(ICheckNotifier notifier)
     {
         if (ExitCodeToReturnIfConditionMet == ExitCodeType.Success)
-            notifier.OnCheckPerformed(new CheckEventArgs("You cannot return Success if you are anticipating terminating the load early, you must choose LoadNotRequired or Error",CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "You cannot return Success if you are anticipating terminating the load early, you must choose LoadNotRequired or Error",
+                CheckResult.Fail));
 
         if (ConditionsToTerminateUnder == PrematureLoadEndCondition.Always)
-            notifier.OnCheckPerformed(new CheckEventArgs("ConditionsToTerminateUnder is Always.  This means that the load will not complete if executed",CheckResult.Warning));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "ConditionsToTerminateUnder is Always.  This means that the load will not complete if executed",
+                CheckResult.Warning));
     }
 
-        
+
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-
     }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
@@ -60,19 +65,19 @@ public ExitCodeType Mutilate(IDataLoadJob job)
             return ExitCodeToReturnIfConditionMet;
         }
 
-        if(ConditionsToTerminateUnder == PrematureLoadEndCondition.NoRecordsInAnyTablesInDatabase)
+        if (ConditionsToTerminateUnder == PrematureLoadEndCondition.NoRecordsInAnyTablesInDatabase)
         {
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"About to inspect what tables have rows in them in database {_databaseInfo.GetRuntimeName()}"));
 
             foreach (var t in _databaseInfo.DiscoverTables(false))
             {
                 var rowCount = t.GetRowCount();
 
-                job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"Found table {t.GetRuntimeName()} with row count {rowCount}"));
 
-                if(rowCount > 0)
+                if (rowCount > 0)
                 {
                     job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                         $"Found at least 1 record in 1 table so condition {ConditionsToTerminateUnder} is not met.  Therefore returning Success so the load can continue normally."));
@@ -80,14 +85,14 @@ public ExitCodeType Mutilate(IDataLoadJob job)
                 }
             }
 
-            job.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"No tables had any rows in them so returning {ExitCodeToReturnIfConditionMet} which should terminate the load here"));
             return ExitCodeToReturnIfConditionMet;
         }
 
         if (ConditionsToTerminateUnder == PrematureLoadEndCondition.NoFilesInForLoading)
         {
-            if(job is not IDataLoadJob dataLoadJob)
+            if (job is not IDataLoadJob dataLoadJob)
                 throw new Exception($"IDataLoadEventListener {job} was not an IDataLoadJob (very unexpected)");
 
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
@@ -104,11 +109,11 @@ public ExitCodeType Mutilate(IDataLoadJob job)
 
             job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Found {files.Length} files in ForLoading so not terminating ({string.Join(",", files.Select(f => f.Name))})"));
-                
+
             //There were 
             return ExitCodeType.Success;
         }
-                
+
         throw new Exception($"Didn't know how to handle condition:{ConditionsToTerminateUnder}");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/PrimaryKeyCollisionResolverMutilation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/PrimaryKeyCollisionResolverMutilation.cs
index 822a781473..e69d15f2b5 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/PrimaryKeyCollisionResolverMutilation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/PrimaryKeyCollisionResolverMutilation.cs
@@ -34,16 +34,17 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators;
 /// </summary>
 public class PrimaryKeyCollisionResolverMutilation : IPluginMutilateDataTables
 {
-
-    [DemandsInitialization("The table on which to resolve primary key collisions, must have PrimaryKeyCollision resolution setup for it in the Data Catalogue", Mandatory = true)]
+    [DemandsInitialization(
+        "The table on which to resolve primary key collisions, must have PrimaryKeyCollision resolution setup for it in the Data Catalogue",
+        Mandatory = true)]
     public TableInfo TargetTable { get; set; }
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-
     }
 
     private DiscoveredDatabase _dbInfo;
+
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
     {
         if (loadStage != LoadStage.AdjustRaw)
@@ -62,8 +63,7 @@ public ExitCodeType Mutilate(IDataLoadJob job)
 
     private void ResolvePrimaryKeyConflicts(IDataLoadEventListener job)
     {
-
-        using (var con = (SqlConnection) _dbInfo.Server.GetConnection())
+        using (var con = (SqlConnection)_dbInfo.Server.GetConnection())
         {
             con.Open();
 
@@ -76,7 +76,8 @@ private void ResolvePrimaryKeyConflicts(IDataLoadEventListener job)
             //if there are no primary key collisions
             if (cmdAreTherePrimaryKeyCollisions.ExecuteScalar().ToString().Equals("0"))
             {
-                job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information, "No primary key collisions detected"));
+                job.OnNotify(this,
+                    new NotifyEventArgs(ProgressEventType.Information, "No primary key collisions detected"));
                 return;
             }
 
@@ -97,7 +98,6 @@ private void ResolvePrimaryKeyConflicts(IDataLoadEventListener job)
 
     public void Check(ICheckNotifier notifier)
     {
-     
         if (TargetTable == null)
             notifier.OnCheckPerformed(new CheckEventArgs(
                 "Target table is null, a table must be specified upon which to resolve primary key duplication (that TableInfo must have a primary key collision resolution order)",
@@ -111,8 +111,7 @@ public void Check(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Failed to check PrimaryKeyCollisionResolver on {TargetTable}",CheckResult.Fail, e));
+                $"Failed to check PrimaryKeyCollisionResolver on {TargetTable}", CheckResult.Fail, e));
         }
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/QueryBuilders/BackfillSqlHelper.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/QueryBuilders/BackfillSqlHelper.cs
index 2dd6735939..1204dd941d 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/QueryBuilders/BackfillSqlHelper.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/QueryBuilders/BackfillSqlHelper.cs
@@ -22,7 +22,8 @@ public class BackfillSqlHelper
     private readonly DiscoveredDatabase _liveDbInfo;
     private readonly TableInfo _tiWithTimeColumn;
 
-    public BackfillSqlHelper(ColumnInfo timePeriodicityField, DiscoveredDatabase stagingDbInfo, DiscoveredDatabase liveDbInfo)
+    public BackfillSqlHelper(ColumnInfo timePeriodicityField, DiscoveredDatabase stagingDbInfo,
+        DiscoveredDatabase liveDbInfo)
     {
         _timePeriodicityField = timePeriodicityField;
         _stagingDbInfo = stagingDbInfo;
@@ -39,10 +40,12 @@ public BackfillSqlHelper(ColumnInfo timePeriodicityField, DiscoveredDatabase sta
     /// <param name="dbInfo"></param>
     /// <param name="joinPath"></param>
     /// <returns></returns>
-    public string CreateSqlForJoinToTimePeriodicityTable(string tableAlias, ITableInfo tableInfo, string timePeriodTableAlias, DiscoveredDatabase dbInfo, List<JoinInfo> joinPath)
+    public string CreateSqlForJoinToTimePeriodicityTable(string tableAlias, ITableInfo tableInfo,
+        string timePeriodTableAlias, DiscoveredDatabase dbInfo, List<JoinInfo> joinPath)
     {
         if (tableInfo.ID == _timePeriodicityField.TableInfo_ID && joinPath.Count > 0)
-            throw new InvalidOperationException("You have asked for a join where the original table *is* the TimePeriodicityTable but a non-empty join path has been provided. There should be no path when dealing directly with the TimePeriodicity table");
+            throw new InvalidOperationException(
+                "You have asked for a join where the original table *is* the TimePeriodicityTable but a non-empty join path has been provided. There should be no path when dealing directly with the TimePeriodicity table");
 
         // Simple case, there is no join so we are just selecting the row and aliasing the TimePeriodicityField for the provided table
         if (!joinPath.Any())
@@ -51,11 +54,14 @@ public string CreateSqlForJoinToTimePeriodicityTable(string tableAlias, ITableIn
                 $"[{dbInfo.GetRuntimeName()}]..[{tableInfo.GetRuntimeName()}]");
 
         // Ensure that the TimePeriodicityTable is at the end of the path (to make constructing the join a bit easier)
-        if (joinPath[0].ForeignKey.TableInfo_ID == _tiWithTimeColumn.ID || joinPath[0].PrimaryKey.TableInfo_ID == _tiWithTimeColumn.ID)
+        if (joinPath[0].ForeignKey.TableInfo_ID == _tiWithTimeColumn.ID ||
+            joinPath[0].PrimaryKey.TableInfo_ID == _tiWithTimeColumn.ID)
             joinPath.Reverse();
 
-        if (joinPath[^1].ForeignKey.TableInfo_ID != _tiWithTimeColumn.ID && joinPath[^1].PrimaryKey.TableInfo_ID != _tiWithTimeColumn.ID)
-            throw new InvalidOperationException("The TimePeriodicity table is not at the beginning or end of the join path.");
+        if (joinPath[^1].ForeignKey.TableInfo_ID != _tiWithTimeColumn.ID &&
+            joinPath[^1].PrimaryKey.TableInfo_ID != _tiWithTimeColumn.ID)
+            throw new InvalidOperationException(
+                "The TimePeriodicity table is not at the beginning or end of the join path.");
 
         var sql = string.Format(@"SELECT {0}.*, {1}.{2} AS TimePeriodicityField 
 FROM {3} {4}",
@@ -98,7 +104,6 @@ public string CreateSqlForJoinToTimePeriodicityTable(string tableAlias, ITableIn
                     join.PrimaryKey.GetRuntimeName(),
                     join.ForeignKey.GetRuntimeName());
             }
-
         }
 
         return sql;
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/SafePrimaryKeyCollisionResolverMutilation.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/SafePrimaryKeyCollisionResolverMutilation.cs
index 2ac73dc20f..295b3abeaa 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/SafePrimaryKeyCollisionResolverMutilation.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/SafePrimaryKeyCollisionResolverMutilation.cs
@@ -23,10 +23,12 @@ public class SafePrimaryKeyCollisionResolverMutilation : IPluginMutilateDataTabl
     private DiscoveredDatabase _database;
     private LoadStage _loadStage;
 
-    [DemandsInitialization("The non primary key column to be used for deduplication.  This must contain different values for the same primary key and you must only want to keep one e.g. DataAge")]
+    [DemandsInitialization(
+        "The non primary key column to be used for deduplication.  This must contain different values for the same primary key and you must only want to keep one e.g. DataAge")]
     public ColumnInfo ColumnToResolveOn { get; set; }
 
-    [DemandsInitialization(@"Determines behaviour when a primary key collision is the result of one record having null and another not.
+    [DemandsInitialization(
+        @"Determines behaviour when a primary key collision is the result of one record having null and another not.
 True - Delete the non null record
 False - Delete the null record")]
     public bool PreferNulls { get; set; }
@@ -36,10 +38,10 @@ public class SafePrimaryKeyCollisionResolverMutilation : IPluginMutilateDataTabl
 False - Delete the larger value")]
     public bool PreferLargerValues { get; set; }
 
-    [DemandsInitialization("Timeout in seconds to allow the operation to run for",DefaultValue=600)]
+    [DemandsInitialization("Timeout in seconds to allow the operation to run for", DefaultValue = 600)]
     public int Timeout { get; set; }
 
-    public void DeleteRows(DiscoveredTable tbl,ColumnInfo[] primaryKeys,IDataLoadEventListener listener)
+    public void DeleteRows(DiscoveredTable tbl, ColumnInfo[] primaryKeys, IDataLoadEventListener listener)
     {
         var join = string.Join(" AND ", primaryKeys.Select(k => $"t1.{k.GetRuntimeName()}=t2.{k.GetRuntimeName()}"));
 
@@ -50,11 +52,11 @@ public void DeleteRows(DiscoveredTable tbl,ColumnInfo[] primaryKeys,IDataLoadEve
         //FYI - we are considering whether to delete records from table {0}
 
         var deleteConditional =
-            PreferNulls?
+            PreferNulls
+                ?
                 //delete rows {0} where {0} is not null and {1} is null - leaving only the null records {1}
                 $"({t1DotColumn} IS NOT NULL AND {t2DotColumn} IS NULL)"
-                :
-                string.Format("({1} IS NOT NULL AND {0} IS NULL)",t1DotColumn,t2DotColumn);
+                : string.Format("({1} IS NOT NULL AND {0} IS NULL)", t1DotColumn, t2DotColumn);
 
         deleteConditional += " OR ";
 
@@ -64,14 +66,13 @@ public void DeleteRows(DiscoveredTable tbl,ColumnInfo[] primaryKeys,IDataLoadEve
             : string.Format("({0} <> {1} AND {1} < {0})", t1DotColumn, t2DotColumn);
 
 
-
         var sql = string.Format(@"DELETE t1 FROM {0} t1
   JOIN {0} t2
   ON {1}
   AND ({2})",
-            tbl.GetRuntimeName(),join,deleteConditional);
+            tbl.GetRuntimeName(), join, deleteConditional);
 
-        using(var con = tbl.Database.Server.GetConnection())
+        using (var con = tbl.Database.Server.GetConnection())
         {
             con.Open();
             using (var cmd = tbl.Database.Server.GetCommand(sql, con))
@@ -79,7 +80,7 @@ public void DeleteRows(DiscoveredTable tbl,ColumnInfo[] primaryKeys,IDataLoadEve
                 cmd.CommandTimeout = Timeout;
 
                 var affectedRows = cmd.ExecuteNonQuery();
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                     $"Deleted {affectedRows} rows"));
             }
         }
@@ -87,14 +88,14 @@ public void DeleteRows(DiscoveredTable tbl,ColumnInfo[] primaryKeys,IDataLoadEve
 
     public void Check(ICheckNotifier notifier)
     {
-        if(ColumnToResolveOn != null && ColumnToResolveOn.IsPrimaryKey)
+        if (ColumnToResolveOn != null && ColumnToResolveOn.IsPrimaryKey)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"You cannot use {ColumnToResolveOn} to resolve primary key collisions because it is part of the primary key",CheckResult.Fail));
+                $"You cannot use {ColumnToResolveOn} to resolve primary key collisions because it is part of the primary key",
+                CheckResult.Fail));
     }
 
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
-            
     }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
@@ -105,10 +106,11 @@ public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
 
     public ExitCodeType Mutilate(IDataLoadJob job)
     {
-        var tbl = _database.ExpectTable(ColumnToResolveOn.TableInfo.GetRuntimeName(_loadStage,job.Configuration.DatabaseNamer));
+        var tbl = _database.ExpectTable(
+            ColumnToResolveOn.TableInfo.GetRuntimeName(_loadStage, job.Configuration.DatabaseNamer));
         var pks = ColumnToResolveOn.TableInfo.ColumnInfos.Where(ci => ci.IsPrimaryKey).ToArray();
-            
-        DeleteRows(tbl,pks,job);
+
+        DeleteRows(tbl, pks, job);
 
         return ExitCodeType.Success;
     }
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/StagingBackfillMutilator.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/StagingBackfillMutilator.cs
index 040c73bada..9e40f2edd9 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/StagingBackfillMutilator.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/StagingBackfillMutilator.cs
@@ -64,16 +64,20 @@ public ExitCodeType Mutilate(IDataLoadJob listener)
         {
             // If we are operating inside a test, the client is responsible for providing a TableNamingScheme
             if (TableNamingScheme == null)
-                throw new InvalidOperationException("Executing within test context but no TableNamingScheme has been provided");
+                throw new InvalidOperationException(
+                    "Executing within test context but no TableNamingScheme has been provided");
         }
         else
             // If we are not operating inside a Test, hardwire the TableNamingScheme
+        {
             TableNamingScheme = new FixedStagingDatabaseNamer(liveDatabaseInfo.GetRuntimeName());
+        }
 
         // create invariant helpers
         _sqlHelper = new BackfillSqlHelper(TimePeriodicityField, _dbInfo, liveDatabaseInfo);
-        _migrationConfiguration = new MigrationConfiguration(liveDatabaseInfo, LoadBubble.Live, LoadBubble.Staging, TableNamingScheme);
-            
+        _migrationConfiguration =
+            new MigrationConfiguration(liveDatabaseInfo, LoadBubble.Live, LoadBubble.Staging, TableNamingScheme);
+
         // starting with the TimePeriodicity table, we descend the join relationships to the leaf tables then ascend back up to the TimePeriodicity table
         // at each step we determine the effective date of the record by joining back to the TimePeriodicity table
         // this allows us to remove updates that are older than the corresponding record in live
@@ -112,7 +116,8 @@ private void ProcessPredecessors(TableInfo tiCurrent, List<JoinInfo> joinPathToT
 
         // Find all parents of this table
         var allJoinInfos = repository.GetAllObjects<JoinInfo>();
-        var joinsWithThisTableAsChild = allJoinInfos.Where(info => info.ForeignKey.TableInfo_ID == tiCurrent.ID).ToList();
+        var joinsWithThisTableAsChild =
+            allJoinInfos.Where(info => info.ForeignKey.TableInfo_ID == tiCurrent.ID).ToList();
 
         // Infinite recursion check
         var seenBefore = joinPathToTimeTable.Intersect(joinsWithThisTableAsChild).ToList();
@@ -121,9 +126,10 @@ private void ProcessPredecessors(TableInfo tiCurrent, List<JoinInfo> joinPathToT
                 $"Join loop: I've seen join(s) {string.Join(",", seenBefore.Select(j => $"{j.PrimaryKey} -> {j.ForeignKey}"))} before so we must have hit a loop (and will never complete the recursion).");
 
         // Process this table and its children (we need info about the children in order to join and detect childless rows)
-        var joinsWithThisTableAsParent = allJoinInfos.Where(info => info.PrimaryKey.TableInfo_ID == tiCurrent.ID).ToList();
+        var joinsWithThisTableAsParent =
+            allJoinInfos.Where(info => info.PrimaryKey.TableInfo_ID == tiCurrent.ID).ToList();
         ProcessTable(tiCurrent, joinPathToTimeTable, joinsWithThisTableAsParent);
-            
+
         // Ascend into parent tables once this table has been processed
         foreach (var join in joinsWithThisTableAsChild)
         {
@@ -133,9 +139,8 @@ private void ProcessPredecessors(TableInfo tiCurrent, List<JoinInfo> joinPathToT
             if (tiParent == null)
                 continue;
 
-            ProcessPredecessors(tiParent, new List<JoinInfo>(joinPathToTimeTable){join});
+            ProcessPredecessors(tiParent, new List<JoinInfo>(joinPathToTimeTable) { join });
         }
-            
     }
 
     /// <summary>
@@ -154,7 +159,7 @@ private void ProcessOldUpdatesInTable(TableInfo tiCurrent, List<JoinInfo> joinPa
         foreach (var join in joinsToProcess)
         {
             var tiChild = join.ForeignKey.TableInfo;
-            ProcessOldUpdatesInTable(tiChild, new List<JoinInfo>(joinPathToTimeTable){join});
+            ProcessOldUpdatesInTable(tiChild, new List<JoinInfo>(joinPathToTimeTable) { join });
         }
 
         ProcessTable(tiCurrent, joinPathToTimeTable, joinsToProcess);
@@ -169,7 +174,9 @@ private void ProcessOldUpdatesInTable(TableInfo tiCurrent, List<JoinInfo> joinPa
     /// <param name="childJoins"></param>
     private void ProcessTable(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable, List<JoinInfo> childJoins)
     {
-        var columnSetsToMigrate = _migrationConfiguration.CreateMigrationColumnSetFromTableInfos(new[] {tiCurrent}.ToList(),null, new BackfillMigrationFieldProcessor());
+        var columnSetsToMigrate =
+            _migrationConfiguration.CreateMigrationColumnSetFromTableInfos(new[] { tiCurrent }.ToList(), null,
+                new BackfillMigrationFieldProcessor());
         var columnSet = columnSetsToMigrate.Single();
         var queryHelper = new ReverseMigrationQueryHelper(columnSet);
         var mcsQueryHelper = new MigrationColumnSetQueryHelper(columnSet);
@@ -181,7 +188,8 @@ private void ProcessTable(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTab
         UpdateOldParentsThatHaveNewChildren(tiCurrent, joinPathToTimeTable, queryHelper, mcsQueryHelper);
     }
 
-    private void UpdateOldParentsThatHaveNewChildren(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable, ReverseMigrationQueryHelper queryHelper, MigrationColumnSetQueryHelper mcsQueryHelper)
+    private void UpdateOldParentsThatHaveNewChildren(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable,
+        ReverseMigrationQueryHelper queryHelper, MigrationColumnSetQueryHelper mcsQueryHelper)
     {
         var update = $@"WITH 
 {GetLiveDataToUpdateStaging(tiCurrent, joinPathToTimeTable)}
@@ -198,7 +206,8 @@ UPDATE CurrentTable
         }
     }
 
-    private void DeleteEntriesHavingNoChildren(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable, List<JoinInfo> joinsToProcess, MigrationColumnSetQueryHelper mcsQueryHelper)
+    private void DeleteEntriesHavingNoChildren(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable,
+        List<JoinInfo> joinsToProcess, MigrationColumnSetQueryHelper mcsQueryHelper)
     {
         // If there are no joins then we should delete any old updates at this level
         string deleteSql;
@@ -250,15 +259,13 @@ DELETE CurrentTable
     /// <param name="tiCurrent"></param>
     /// <param name="joinPathToTimeTable"></param>
     /// <returns></returns>
-    private string GetCurrentOldEntriesSQL(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable)
-    {
-        return $@"
+    private string GetCurrentOldEntriesSQL(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable) =>
+        $@"
 CurrentOldEntries AS (
 SELECT ToLoadWithTime.* FROM 
 
 {_sqlHelper.GetSQLComparingStagingAndLiveTables(tiCurrent, joinPathToTimeTable)} 
 ";
-    }
 
     /// <summary>
     /// This and GetCurrentOldEntriesSQL are ugly in that they just reflect modifications to the comparison CTE. Leaving for now as a more thorough refactoring may be required once the full test suite is available.
@@ -266,14 +273,12 @@ SELECT ToLoadWithTime.* FROM
     /// <param name="tiCurrent"></param>
     /// <param name="joinPathToTimeTable"></param>
     /// <returns></returns>
-    private string GetLiveDataToUpdateStaging(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable)
-    {
-        return $@"
+    private string GetLiveDataToUpdateStaging(ITableInfo tiCurrent, List<JoinInfo> joinPathToTimeTable) =>
+        $@"
 LiveDataForUpdating AS (
 SELECT LoadedWithTime.* FROM
 
 {_sqlHelper.GetSQLComparingStagingAndLiveTables(tiCurrent, joinPathToTimeTable)}";
-    }
 
     public void Initialize(DiscoveredDatabase dbInfo, LoadStage loadStage)
     {
@@ -284,15 +289,13 @@ public void Check(ICheckNotifier notifier)
     {
         // if we're not executing in a test context, fail the whole component: it doesn't yet have sufficient test coverage
         if (!TestContext)
-        {
             notifier.OnCheckPerformed(
-                new CheckEventArgs("Don't use the StagingBackfillMutilator component for now! Does not yet have sufficient test coverage.",
+                new CheckEventArgs(
+                    "Don't use the StagingBackfillMutilator component for now! Does not yet have sufficient test coverage.",
                     CheckResult.Fail));
-        }
     }
 
 
-
     public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventsListener)
     {
     }
diff --git a/Rdmp.Core/DataLoad/Modules/Mutilators/TableVarcharMaxer.cs b/Rdmp.Core/DataLoad/Modules/Mutilators/TableVarcharMaxer.cs
index 489ef80d7e..c2c3b49841 100644
--- a/Rdmp.Core/DataLoad/Modules/Mutilators/TableVarcharMaxer.cs
+++ b/Rdmp.Core/DataLoad/Modules/Mutilators/TableVarcharMaxer.cs
@@ -25,15 +25,17 @@ namespace Rdmp.Core.DataLoad.Modules.Mutilators;
 /// </summary>
 public class TableVarcharMaxer : MatchingTablesMutilator
 {
-    [DemandsInitialization("By default (false) the mutilator will only expand columns with an SQL Type containing 'char', if set to true then this will do all columns including decimals, dates etc", defaultValue: false)]
+    [DemandsInitialization(
+        "By default (false) the mutilator will only expand columns with an SQL Type containing 'char', if set to true then this will do all columns including decimals, dates etc",
+        defaultValue: false)]
     public bool AllDataTypes { get; set; }
 
-    [DemandsInitialization(description: "The type that all matching columns will be converted into", defaultValue: "varchar(max)", typeOf: null, mandatory: true)]
+    [DemandsInitialization("The type that all matching columns will be converted into", defaultValue: "varchar(max)",
+        typeOf: null, mandatory: true)]
     public string DestinationType { get; set; }
 
-    public TableVarcharMaxer() :base(LoadStage.Mounting,LoadStage.AdjustRaw)
+    public TableVarcharMaxer() : base(LoadStage.Mounting, LoadStage.AdjustRaw)
     {
-            
     }
 
     public override void Check(ICheckNotifier notifier)
@@ -41,7 +43,6 @@ public override void Check(ICheckNotifier notifier)
         base.Check(notifier);
 
         if (DbInfo != null)
-        {
             try
             {
                 DbInfo.Server.GetQuerySyntaxHelper().TypeTranslater.GetCSharpTypeForSQLDBType(DestinationType);
@@ -49,17 +50,15 @@ public override void Check(ICheckNotifier notifier)
             }
             catch (Exception e)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs($"DestinationType ({DestinationType}) is not supported", CheckResult.Warning,e));
+                notifier.OnCheckPerformed(new CheckEventArgs($"DestinationType ({DestinationType}) is not supported",
+                    CheckResult.Warning, e));
             }
-        }
     }
 
     protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tableInfo, DiscoveredTable table)
     {
         foreach (var col in table.DiscoverColumns())
-        {
             if (AllDataTypes || col.DataType.GetLengthIfString() >= 1)
-            {
                 try
                 {
                     col.DataType.AlterTypeTo(DestinationType);
@@ -69,9 +68,8 @@ protected override void MutilateTable(IDataLoadEventListener job, ITableInfo tab
                 catch (Exception e)
                 {
                     job.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
-                        $"Failed to convert column {col} of data type {col.DataType} to destination type {DestinationType}", e));
+                        $"Failed to convert column {col} of data type {col.DataType} to destination type {DestinationType}",
+                        e));
                 }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Modules/Web/WebFileDownloader.cs b/Rdmp.Core/DataLoad/Modules/Web/WebFileDownloader.cs
index a3d4e1cedf..eeb5e2e60a 100644
--- a/Rdmp.Core/DataLoad/Modules/Web/WebFileDownloader.cs
+++ b/Rdmp.Core/DataLoad/Modules/Web/WebFileDownloader.cs
@@ -29,46 +29,51 @@ namespace Rdmp.Core.DataLoad.Modules.Web;
 /// </summary>
 public class WebFileDownloader : IPluginDataProvider
 {
-
-    [DemandsInitialization("The full URI to a file that will be downloaded into project ForLoading directory, must be a valid Uri", Mandatory = true)]
+    [DemandsInitialization(
+        "The full URI to a file that will be downloaded into project ForLoading directory, must be a valid Uri",
+        Mandatory = true)]
     public Uri UriToFile { get; set; }
-        
-    [DemandsInitialization("Optional Username/password to use for network Websense challenges, these will be provided to the WebRequest as a NetworkCredential")]
+
+    [DemandsInitialization(
+        "Optional Username/password to use for network Websense challenges, these will be provided to the WebRequest as a NetworkCredential")]
     public DataAccessCredentials WebsenseCredentials { get; set; }
 
     public void Initialize(ILoadDirectory directory, DiscoveredDatabase dbInfo)
     {
-            
     }
 
     public ExitCodeType Fetch(IDataLoadJob job, GracefulCancellationToken cancellationToken)
     {
         var t = Stopwatch.StartNew();
-        var destinationFile = new FileInfo(Path.Combine(job.LoadDirectory.ForLoading.FullName, Path.GetFileName(UriToFile.LocalPath)));
-        DownloadFileWhilstPretendingToBeFirefox(destinationFile,job);
-        job.OnProgress(this,new ProgressEventArgs(destinationFile.FullName, new ProgressMeasurement((int)(destinationFile.Length / 1000),ProgressType.Kilobytes), t.Elapsed));
+        var destinationFile =
+            new FileInfo(Path.Combine(job.LoadDirectory.ForLoading.FullName, Path.GetFileName(UriToFile.LocalPath)));
+        DownloadFileWhilstPretendingToBeFirefox(destinationFile, job);
+        job.OnProgress(this,
+            new ProgressEventArgs(destinationFile.FullName,
+                new ProgressMeasurement((int)(destinationFile.Length / 1000), ProgressType.Kilobytes), t.Elapsed));
         return ExitCodeType.Success;
-
     }
 
-    private void DownloadFileWhilstPretendingToBeFirefox(FileInfo destinationFile,IDataLoadJob job)
+    private void DownloadFileWhilstPretendingToBeFirefox(FileInfo destinationFile, IDataLoadJob job)
     {
         NetworkCredential credentials;
         try
         {
-            credentials = new NetworkCredential(WebsenseCredentials.Username, WebsenseCredentials.GetDecryptedPassword());
+            credentials =
+                new NetworkCredential(WebsenseCredentials.Username, WebsenseCredentials.GetDecryptedPassword());
         }
         catch (Exception)
         {
             credentials = null;
         }
-        using var response = CreateNewRequest(UriToFile.AbsoluteUri,credentials);
+
+        using var response = CreateNewRequest(UriToFile.AbsoluteUri, credentials);
         using var writer = File.Create(destinationFile.FullName);
         //download the file 
-        response.CopyTo(writer,1<<20);
+        response.CopyTo(writer, 1 << 20);
     }
 
-    private static Stream CreateNewRequest(string url,ICredentials credentials=null,bool useCredentials=false)
+    private static Stream CreateNewRequest(string url, ICredentials credentials = null, bool useCredentials = false)
     {
         using var httpClientHandler = new HttpClientHandler();
         if (useCredentials && credentials is not null)
@@ -77,46 +82,40 @@ private static Stream CreateNewRequest(string url,ICredentials credentials=null,
         {
             Timeout = TimeSpan.FromSeconds(5)
         };
-        httpClient.DefaultRequestHeaders.Add("User-Agent", "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36");
+        httpClient.DefaultRequestHeaders.Add("User-Agent",
+            "Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36");
         using var response = httpClient.GetAsync(url).Result;
         if (response.IsSuccessStatusCode)
             return response.Content.ReadAsStreamAsync().Result;
-        if (!useCredentials && response.Headers.WwwAuthenticate.Any(h => h.Scheme.Equals("basic", StringComparison.OrdinalIgnoreCase) && h.Parameter?.Equals("realm=\"Websense\"",StringComparison.OrdinalIgnoreCase)==true))
-        {
+        if (!useCredentials && response.Headers.WwwAuthenticate.Any(h =>
+                h.Scheme.Equals("basic", StringComparison.OrdinalIgnoreCase) &&
+                h.Parameter?.Equals("realm=\"Websense\"", StringComparison.OrdinalIgnoreCase) == true))
             return CreateNewRequest(response.Headers.Location?.AbsoluteUri, credentials, true);
-        }
         throw new Exception($"Could not get response from {url} - {response.StatusCode} - {response.ReasonPhrase}");
     }
 
-    public string GetDescription()
-    {
-        throw new NotImplementedException();
-    }
+    public string GetDescription() => throw new NotImplementedException();
 
-    public IDataProvider Clone()
-    {
-        throw new NotImplementedException();
-    }
+    public IDataProvider Clone() => throw new NotImplementedException();
 
     public bool Validate(ILoadDirectory _)
     {
         if (string.IsNullOrWhiteSpace(UriToFile?.PathAndQuery))
-            throw new MissingFieldException("PathToFile is null or white space - should be populated externally as a parameter");
+            throw new MissingFieldException(
+                "PathToFile is null or white space - should be populated externally as a parameter");
         return true;
     }
 
-        
 
-    public void LoadCompletedSoDispose(ExitCodeType exitCode,IDataLoadEventListener postLoadEventListener)
+    public void LoadCompletedSoDispose(ExitCodeType exitCode, IDataLoadEventListener postLoadEventListener)
     {
     }
 
-        
+
     public void Check(ICheckNotifier notifier)
     {
         notifier.OnCheckPerformed(UriToFile == null
             ? new CheckEventArgs("No URI has been specified", CheckResult.Fail)
             : new CheckEventArgs($"URI is:{UriToFile}", CheckResult.Success));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/DiffDatabaseDataFetcher.cs b/Rdmp.Core/DataLoad/Triggers/DiffDatabaseDataFetcher.cs
index ef36bbb983..9716a266d7 100644
--- a/Rdmp.Core/DataLoad/Triggers/DiffDatabaseDataFetcher.cs
+++ b/Rdmp.Core/DataLoad/Triggers/DiffDatabaseDataFetcher.cs
@@ -60,22 +60,25 @@ public void FetchData(ICheckNotifier checkNotifier)
             catch (Exception ex)
             {
                 checkNotifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Could not connect to data access point TableInfo {_tableInfo}", CheckResult.Fail,ex));
+                    $"Could not connect to data access point TableInfo {_tableInfo}", CheckResult.Fail, ex));
                 return;
             }
 
 
             if (database.Exists())
-                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified database exists {database}", CheckResult.Success));
+                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified database exists {database}",
+                    CheckResult.Success));
 
             var liveTable = _tableInfo.Discover(DataAccessContext.InternalDataProcessing);
             var archiveTable = database.ExpectTable($"{_tableInfo.GetRuntimeName()}_Archive", liveTable.Schema);
 
             if (liveTable.Exists())
-                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified table exists {_tableInfo}", CheckResult.Success));
+                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified table exists {_tableInfo}",
+                    CheckResult.Success));
 
             if (archiveTable.Exists())
-                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified Archive table exists {archiveTable}", CheckResult.Success));
+                checkNotifier.OnCheckPerformed(new CheckEventArgs($"Verified Archive table exists {archiveTable}",
+                    CheckResult.Success));
             else
                 checkNotifier.OnCheckPerformed(new CheckEventArgs(
                     $"Did not find an Archive table called {archiveTable}", CheckResult.Fail));
@@ -87,29 +90,34 @@ public void FetchData(ICheckNotifier checkNotifier)
 
             if (_pks.Any())
                 checkNotifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Found the following primary keys:{string.Join(",", _pks.Select(p => p.GetRuntimeName()))}",CheckResult.Success));
+                    $"Found the following primary keys:{string.Join(",", _pks.Select(p => p.GetRuntimeName()))}",
+                    CheckResult.Success));
             else
-                checkNotifier.OnCheckPerformed(new CheckEventArgs("Table does not have any ColumnInfos marked with IsPrimaryKey (try synchronizing the TableInfo if you are sure you have some", CheckResult.Fail));
+                checkNotifier.OnCheckPerformed(new CheckEventArgs(
+                    "Table does not have any ColumnInfos marked with IsPrimaryKey (try synchronizing the TableInfo if you are sure you have some",
+                    CheckResult.Fail));
 
             _sharedColumns =
                 allCols.Where( //from all columns take all columns where
-                    c =>allArchiveCols.Any(
+                    c => allArchiveCols.Any(
                         //there is a column with the same name in the archive columns (ignoring case)
-                        archiveCol=>c.GetRuntimeName().Equals(archiveCol.GetRuntimeName(), StringComparison.InvariantCultureIgnoreCase)
+                        archiveCol => c.GetRuntimeName().Equals(archiveCol.GetRuntimeName(),
+                                          StringComparison.InvariantCultureIgnoreCase)
 
-                                    //but don't care about differences in these columns (e.g. the actual data load run id will obviously be different!)
-                                    && !SpecialFieldNames.IsHicPrefixed(c)
+                                      //but don't care about differences in these columns (e.g. the actual data load run id will obviously be different!)
+                                      && !SpecialFieldNames.IsHicPrefixed(c)
                     )).ToArray();
 
             checkNotifier.OnCheckPerformed(new CheckEventArgs(
-                $"Shared columns between the archive and the live table are {string.Join(",", _sharedColumns.Select(c => c.GetRuntimeName()))}",CheckResult.Success));
+                $"Shared columns between the archive and the live table are {string.Join(",", _sharedColumns.Select(c => c.GetRuntimeName()))}",
+                CheckResult.Success));
 
-            GetInsertData(server,database,checkNotifier);
-            GetUpdatetData(server,database, checkNotifier);
+            GetInsertData(server, database, checkNotifier);
+            GetUpdatetData(server, database, checkNotifier);
         }
         catch (Exception e)
         {
-            checkNotifier.OnCheckPerformed(new CheckEventArgs("Fatal error trying to fetch data", CheckResult.Fail,e));
+            checkNotifier.OnCheckPerformed(new CheckEventArgs("Fatal error trying to fetch data", CheckResult.Fail, e));
         }
     }
 
@@ -119,7 +127,7 @@ private void GetInsertData(DiscoveredServer server, DiscoveredDatabase database,
 
         var syntaxHelper = server.GetQuerySyntaxHelper();
         var tableName = _tableInfo.Name;
-        var archiveTableName = syntaxHelper.EnsureFullyQualified(database.GetRuntimeName(),_tableInfo.Schema,
+        var archiveTableName = syntaxHelper.EnsureFullyQualified(database.GetRuntimeName(), _tableInfo.Schema,
             $"{_tableInfo.GetRuntimeName()}_Archive");
 
         var whereStatement = "";
@@ -130,23 +138,25 @@ private void GetInsertData(DiscoveredServer server, DiscoveredDatabase database,
                 syntaxHelper.EnsureWrapped(pk.GetRuntimeName()),
                 archiveTableName);
 
-        var qb = new QueryBuilder(null, null, new[] {_tableInfo})
+        var qb = new QueryBuilder(null, null, new[] { _tableInfo })
         {
             TopX = _batchSize
         };
-        qb.AddColumnRange(_tableInfo.ColumnInfos.Select(c => new ColumnInfoToIColumn(memoryRepository,c)).ToArray());
+        qb.AddColumnRange(_tableInfo.ColumnInfos.Select(c => new ColumnInfoToIColumn(memoryRepository, c)).ToArray());
 
         //where
-        var filter1 = new SpontaneouslyInventedFilter(memoryRepository,null,
-            $"{syntaxHelper.EnsureWrapped(SpecialFieldNames.DataLoadRunID)} = {_dataLoadRunID}", "DataLoadRunID matches", null, null);
+        var filter1 = new SpontaneouslyInventedFilter(memoryRepository, null,
+            $"{syntaxHelper.EnsureWrapped(SpecialFieldNames.DataLoadRunID)} = {_dataLoadRunID}",
+            "DataLoadRunID matches", null, null);
         var filter2 =
-            new SpontaneouslyInventedFilter(memoryRepository,null,
+            new SpontaneouslyInventedFilter(memoryRepository, null,
                 $@" not exists (
 select 1 from {archiveTableName} where {whereStatement} {syntaxHelper.EnsureWrapped(SpecialFieldNames.DataLoadRunID)} < {_dataLoadRunID}
 )",
-                "Record doesn't exist in archive",null,null);
+                "Record doesn't exist in archive", null, null);
 
-        qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,null,new []{filter1,filter2},FilterContainerOperation.AND);
+        qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepository, null,
+            new[] { filter1, filter2 }, FilterContainerOperation.AND);
 
         Inserts = new DataTable();
         FillTableWithQueryIfUserConsents(Inserts, qb.SQL, checkNotifier, server);
@@ -161,10 +171,11 @@ private void GetUpdatetData(DiscoveredServer server, DiscoveredDatabase database
         var syntaxHelper = server.GetQuerySyntaxHelper();
 
         var tableName = _tableInfo.Name;
-        var archiveTableName = syntaxHelper.EnsureFullyQualified(database.GetRuntimeName(),_tableInfo.Schema,
+        var archiveTableName = syntaxHelper.EnsureFullyQualified(database.GetRuntimeName(), _tableInfo.Schema,
             $"{_tableInfo.GetRuntimeName()}_Archive");
 
-        var whereStatement = string.Join(" AND ",_pks.Select(pk=>string.Format("{0}.{1} = {2}.{1} ", tableName, pk.GetRuntimeName(),archiveTableName)));
+        var whereStatement = string.Join(" AND ",
+            _pks.Select(pk => string.Format("{0}.{1} = {2}.{1} ", tableName, pk.GetRuntimeName(), archiveTableName)));
 
         //hold onto your hats ladies and gentlemen, we start by selecting every column twice with a cross apply:
         //once from the main table e.g. Col1,Col2,Col3
@@ -222,27 +233,27 @@ SELECT  TOP 1 {{2}}.*
 
 
         sql = string.Format(sql,
-            _batchSize,                         //{0}
-            tableName,                          //{1}
-            archiveTableName,                   //{2}
-            whereStatement,                     //{3}
-            syntaxHelper.EnsureWrapped(SpecialFieldNames.DataLoadRunID),    //{4}
-            _dataLoadRunID,                     //{5}
-            GetSharedColumnsSQL(tableName),     //{6}
-            GetSharedColumnsSQLWithColumnAliasPrefix(archive, zzArchive),   //{7}
+            _batchSize, //{0}
+            tableName, //{1}
+            archiveTableName, //{2}
+            whereStatement, //{3}
+            syntaxHelper.EnsureWrapped(SpecialFieldNames.DataLoadRunID), //{4}
+            _dataLoadRunID, //{5}
+            GetSharedColumnsSQL(tableName), //{6}
+            GetSharedColumnsSQLWithColumnAliasPrefix(archive, zzArchive), //{7}
             archive, //{8}
             syntaxHelper.EnsureWrapped(SpecialFieldNames.ValidFrom)
         );
 
         var dtComboTable = new DataTable();
-        FillTableWithQueryIfUserConsents(dtComboTable, sql,checkNotifier,server);
+        FillTableWithQueryIfUserConsents(dtComboTable, sql, checkNotifier, server);
 
         Updates_New = new DataTable();
         Updates_Replaced = new DataTable();
 
         //add the columns from the combo table to both views
         foreach (DataColumn col in dtComboTable.Columns)
-            if (!col.ColumnName.StartsWith(zzArchive,StringComparison.InvariantCultureIgnoreCase))
+            if (!col.ColumnName.StartsWith(zzArchive, StringComparison.InvariantCultureIgnoreCase))
             {
                 Updates_New.Columns.Add(col.ColumnName, col.DataType);
                 Updates_Replaced.Columns.Add(col.ColumnName, col.DataType);
@@ -254,12 +265,10 @@ SELECT  TOP 1 {{2}}.*
             var replacedRow = Updates_Replaced.Rows.Add();
 
             foreach (DataColumn column in dtComboTable.Columns)
-            {
-                if (column.ColumnName.StartsWith(zzArchive,StringComparison.InvariantCultureIgnoreCase))
+                if (column.ColumnName.StartsWith(zzArchive, StringComparison.InvariantCultureIgnoreCase))
                     replacedRow[column.ColumnName[zzArchive.Length..]] = fromRow[column];
                 else
                     newRow[column.ColumnName] = fromRow[column];
-            }
         }
     }
 
@@ -270,7 +279,8 @@ private string GetSharedColumnsSQLWithColumnAliasPrefix(string tableName, string
         foreach (var sharedColumn in _sharedColumns)
         {
             sb.AppendLine();
-            sb.Append($"{tableName}.{sharedColumn.GetRuntimeName()} {columnAliasPrefix}{sharedColumn.GetRuntimeName()}");
+            sb.Append(
+                $"{tableName}.{sharedColumn.GetRuntimeName()} {columnAliasPrefix}{sharedColumn.GetRuntimeName()}");
             sb.Append(',');
         }
 
@@ -292,13 +302,14 @@ private string GetSharedColumnsSQL(string tableName)
     }
 
 
-
-    private void FillTableWithQueryIfUserConsents(DataTable dt, string sql,ICheckNotifier checkNotifier,DiscoveredServer server)
+    private void FillTableWithQueryIfUserConsents(DataTable dt, string sql, ICheckNotifier checkNotifier,
+        DiscoveredServer server)
     {
-        var execute = checkNotifier.OnCheckPerformed(new CheckEventArgs("About to fetch data, confirming user is happy with SQL", CheckResult.Warning, null, sql));
+        var execute = checkNotifier.OnCheckPerformed(
+            new CheckEventArgs("About to fetch data, confirming user is happy with SQL", CheckResult.Warning, null,
+                sql));
 
         if (execute)
-        {
             using (var con = server.GetConnection())
             {
                 con.Open();
@@ -306,11 +317,12 @@ private void FillTableWithQueryIfUserConsents(DataTable dt, string sql,ICheckNot
                 using (var cmd = server.GetCommand(sql, con))
                 {
                     cmd.CommandTimeout = _timeout;
-                    using(var da = server.GetDataAdapter(cmd))
+                    using (var da = server.GetDataAdapter(cmd))
+                    {
                         da.Fill(dt);
+                    }
                 }
             }
-        }
         else
             checkNotifier.OnCheckPerformed(new CheckEventArgs("User decided not to execute the SQL", CheckResult.Fail));
     }
diff --git a/Rdmp.Core/DataLoad/Triggers/Exceptions/IrreconcilableColumnDifferencesInArchiveException.cs b/Rdmp.Core/DataLoad/Triggers/Exceptions/IrreconcilableColumnDifferencesInArchiveException.cs
index b2c49ac0a3..c820dcbb77 100644
--- a/Rdmp.Core/DataLoad/Triggers/Exceptions/IrreconcilableColumnDifferencesInArchiveException.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Exceptions/IrreconcilableColumnDifferencesInArchiveException.cs
@@ -11,8 +11,7 @@ namespace Rdmp.Core.DataLoad.Triggers.Exceptions;
 /// </summary>
 public class IrreconcilableColumnDifferencesInArchiveException : TriggerException
 {
-    public IrreconcilableColumnDifferencesInArchiveException(string s):base(s)
+    public IrreconcilableColumnDifferencesInArchiveException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerException.cs b/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerException.cs
index dae66b047c..8d7cf53c35 100644
--- a/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerException.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerException.cs
@@ -11,10 +11,9 @@ namespace Rdmp.Core.DataLoad.Triggers.Exceptions;
 /// <summary>
 /// Exception describing a problem with a backup trigger <see cref="ITriggerImplementer"/> or a problem that prevents one being created etc.
 /// </summary>
-public class TriggerException:Exception
+public class TriggerException : Exception
 {
     public TriggerException(string str) : base(str)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerMissingException.cs b/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerMissingException.cs
index f50f9fcf7f..2013432637 100644
--- a/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerMissingException.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Exceptions/TriggerMissingException.cs
@@ -12,8 +12,7 @@ namespace Rdmp.Core.DataLoad.Triggers.Exceptions;
 /// </summary>
 public class TriggerMissingException : TriggerException
 {
-    public TriggerMissingException(string s):base(s)
+    public TriggerMissingException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Implementations/MicrosoftSQLTriggerImplementer.cs b/Rdmp.Core/DataLoad/Triggers/Implementations/MicrosoftSQLTriggerImplementer.cs
index 47e2d5f9da..764ded3f10 100644
--- a/Rdmp.Core/DataLoad/Triggers/Implementations/MicrosoftSQLTriggerImplementer.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Implementations/MicrosoftSQLTriggerImplementer.cs
@@ -31,15 +31,16 @@ namespace Rdmp.Core.DataLoad.Triggers.Implementations;
 /// <para>Also contains methods for confirming that a trigger exists on a given table, that the primary keys still match when it was created and the _Archive table hasn't
 /// got a different schema to the live table (e.g. if you made a change to the live table this would pick up that the _Archive wasn't updated).</para>
 /// </summary>
-public class MicrosoftSQLTriggerImplementer:TriggerImplementer
+public class MicrosoftSQLTriggerImplementer : TriggerImplementer
 {
     private string _schema;
     private string _triggerName;
 
     /// <inheritdoc cref="TriggerImplementer(DiscoveredTable,bool)"/>
-    public MicrosoftSQLTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table, createDataLoadRunIDAlso)
+    public MicrosoftSQLTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table,
+        createDataLoadRunIDAlso)
     {
-        _schema = string.IsNullOrWhiteSpace(_table.Schema) ? "dbo":_table.Schema;
+        _schema = string.IsNullOrWhiteSpace(_table.Schema) ? "dbo" : _table.Schema;
         _triggerName = $"{_schema}.{GetTriggerName()}";
     }
 
@@ -48,11 +49,12 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
         using (var con = _server.GetConnection())
         {
             con.Open();
-                
+
             problemsDroppingTrigger = "";
             thingsThatWorkedDroppingTrigger = "";
 
-            using(var cmdDropTrigger = _server.GetCommand($"DROP TRIGGER {_triggerName}", con))
+            using (var cmdDropTrigger = _server.GetCommand($"DROP TRIGGER {_triggerName}", con))
+            {
                 try
                 {
                     cmdDropTrigger.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
@@ -64,9 +66,11 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
                     //this is not a problem really since it is likely that DLE chose to recreate the trigger because it was FUBARed or missing, this is just belt and braces try and drop anything that is lingering, whether or not it is there
                     problemsDroppingTrigger += $"Failed to drop Trigger:{exception.Message}{Environment.NewLine}";
                 }
+            }
 
-            using(var cmdDropArchiveIndex = _server.GetCommand(
-                      $"DROP INDEX PKsIndex ON {_archiveTable.GetRuntimeName()}", con))
+            using (var cmdDropArchiveIndex = _server.GetCommand(
+                       $"DROP INDEX PKsIndex ON {_archiveTable.GetRuntimeName()}", con))
+            {
                 try
                 {
                     cmdDropArchiveIndex.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
@@ -79,8 +83,11 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
                 {
                     problemsDroppingTrigger += $"Failed to drop Archive Index:{exception.Message}{Environment.NewLine}";
                 }
+            }
 
-            using(var cmdDropArchiveLegacyView = _server.GetCommand($"DROP FUNCTION {_table.GetRuntimeName()}_Legacy", con))
+            using (var cmdDropArchiveLegacyView =
+                   _server.GetCommand($"DROP FUNCTION {_table.GetRuntimeName()}_Legacy", con))
+            {
                 try
                 {
                     cmdDropArchiveLegacyView.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
@@ -92,6 +99,7 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
                     problemsDroppingTrigger +=
                         $"Failed to drop Legacy Table View:{exception.Message}{Environment.NewLine}";
                 }
+            }
         }
     }
 
@@ -99,12 +107,12 @@ public override string CreateTrigger(ICheckNotifier notifier)
     {
         var createArchiveTableSQL = base.CreateTrigger(notifier);
 
-        using(var con = _server.GetConnection())
+        using (var con = _server.GetConnection())
         {
             con.Open();
 
             var trigger = GetCreateTriggerSQL();
-                
+
             using (var cmdAddTrigger = _server.GetCommand(trigger, con))
             {
                 cmdAddTrigger.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
@@ -123,7 +131,8 @@ public override string CreateTrigger(ICheckNotifier notifier)
 
             var createIndexSQL =
                 $@"CREATE NONCLUSTERED INDEX [PKsIndex] ON {_archiveTable.GetFullyQualifiedName()} ({idxCompositeKeyBody})";
-            using(var cmdCreateIndex = _server.GetCommand(createIndexSQL, con))
+            using (var cmdCreateIndex = _server.GetCommand(createIndexSQL, con))
+            {
                 try
                 {
                     cmdCreateIndex.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
@@ -134,11 +143,12 @@ public override string CreateTrigger(ICheckNotifier notifier)
                     notifier.OnCheckPerformed(new CheckEventArgs(
                         "Could not create index on archive table because of timeout, possibly your _Archive table has a lot of data in it",
                         CheckResult.Fail, e));
-                                
+
                     return null;
                 }
+            }
 
-            CreateViewOldVersionsTableValuedFunction( createArchiveTableSQL,con);
+            CreateViewOldVersionsTableValuedFunction(createArchiveTableSQL, con);
         }
 
         return createArchiveTableSQL;
@@ -163,18 +173,18 @@ private string GetCreateTriggerSQL()
         var InsertedToDeletedJoin = "JOIN inserted i ON ";
         InsertedToDeletedJoin += GetTableToTableEqualsSqlWithPrimaryKeys("i", "d");
 
-        var equalsSqlTableToInserted = GetTableToTableEqualsSqlWithPrimaryKeys(_table.GetRuntimeName(),"inserted");
+        var equalsSqlTableToInserted = GetTableToTableEqualsSqlWithPrimaryKeys(_table.GetRuntimeName(), "inserted");
         var equalsSqlTableToDeleted = GetTableToTableEqualsSqlWithPrimaryKeys(_table.GetRuntimeName(), "deleted");
 
         var columnNames = _columns.Select(c => c.GetRuntimeName()).ToList();
 
-        if(!columnNames.Contains(SpecialFieldNames.DataLoadRunID,StringComparer.CurrentCultureIgnoreCase))
+        if (!columnNames.Contains(SpecialFieldNames.DataLoadRunID, StringComparer.CurrentCultureIgnoreCase))
             columnNames.Add(SpecialFieldNames.DataLoadRunID);
 
-        if(!columnNames.Contains(SpecialFieldNames.ValidFrom,StringComparer.CurrentCultureIgnoreCase))
+        if (!columnNames.Contains(SpecialFieldNames.ValidFrom, StringComparer.CurrentCultureIgnoreCase))
             columnNames.Add(SpecialFieldNames.ValidFrom);
 
-        var colList = string.Join(",",columnNames.Select(c=> $"[{c}]") );
+        var colList = string.Join(",", columnNames.Select(c => $"[{c}]"));
         var dDotColList = string.Join(",", columnNames.Select(c => $"d.[{c}]"));
 
         return
@@ -221,11 +231,11 @@ private string GetTableToTableEqualsSqlWithPrimaryKeys(string table1, string tab
 
         //trim off last AND
         toReturn = toReturn[..^"AND ".Length];
-            
+
         return toReturn;
     }
 
-    private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArchiveTableSQL,DbConnection con)
+    private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArchiveTableSQL, DbConnection con)
     {
         var columnsInArchive = "";
 
@@ -241,9 +251,10 @@ private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArch
         columnsInArchive = sqlUsedToCreateArchiveTableSQL[startExtractingColumnsAt..];
 
         //trim off excess crud at the end
-        columnsInArchive = columnsInArchive.Trim(new[] {')', '\r', '\n'});
+        columnsInArchive = columnsInArchive.Trim(new[] { ')', '\r', '\n' });
 
-        var sqlToRun = string.Format("CREATE FUNCTION [" + _schema + "].[{0}_Legacy]", QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName()));
+        var sqlToRun = string.Format("CREATE FUNCTION [" + _schema + "].[{0}_Legacy]",
+            QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName()));
         sqlToRun += Environment.NewLine;
         sqlToRun += $"({Environment.NewLine}";
         sqlToRun += $"\t@index DATETIME{Environment.NewLine}";
@@ -266,16 +277,19 @@ private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArch
         sqlToRun += $"BEGIN{Environment.NewLine}";
         sqlToRun += Environment.NewLine;
 
-        var liveCols = _columns.Select(c => $"[{c.GetRuntimeName()}]").Union(new string[] {
+        var liveCols = _columns.Select(c => $"[{c.GetRuntimeName()}]").Union(new string[]
+        {
             $"[{SpecialFieldNames.DataLoadRunID}]", $"[{SpecialFieldNames.ValidFrom}]"
         }).ToArray();
 
         var archiveCols = $"{string.Join(",", liveCols)},hic_validTo,hic_userID,hic_status";
-        var cDotArchiveCols = string.Join(",", liveCols.Select(s => $"c.{s}")); 
+        var cDotArchiveCols = string.Join(",", liveCols.Select(s => $"c.{s}"));
 
 
         sqlToRun += $"\tINSERT @returntable{Environment.NewLine}";
-        sqlToRun += string.Format("\tSELECT "+archiveCols+" FROM [{0}] WHERE @index BETWEEN ISNULL(" + SpecialFieldNames.ValidFrom + ", '1899/01/01') AND hic_validTo" + Environment.NewLine, _archiveTable);
+        sqlToRun += string.Format(
+            "\tSELECT " + archiveCols + " FROM [{0}] WHERE @index BETWEEN ISNULL(" + SpecialFieldNames.ValidFrom +
+            ", '1899/01/01') AND hic_validTo" + Environment.NewLine, _archiveTable);
         sqlToRun += Environment.NewLine;
 
         sqlToRun += $"\tINSERT @returntable{Environment.NewLine}";
@@ -286,21 +300,22 @@ private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArch
 
         for (var index = 0; index < _primaryKeys.Length; index++)
         {
-            sqlToRun += string.Format("\ta.{0}=c.{0} " + Environment.NewLine, 
+            sqlToRun += string.Format("\ta.{0}=c.{0} " + Environment.NewLine,
                 syntaxHelper.EnsureWrapped(_primaryKeys[index].GetRuntimeName())); //add the primary key joins
 
             if (index + 1 < _primaryKeys.Length)
                 sqlToRun += $"\tAND{Environment.NewLine}"; //add an AND because there are more coming
         }
 
-        sqlToRun += string.Format("\tWHERE a.[{0}] IS NULL -- where archive record doesn't exist" + Environment.NewLine, _primaryKeys.First().GetRuntimeName());
+        sqlToRun += string.Format("\tWHERE a.[{0}] IS NULL -- where archive record doesn't exist" + Environment.NewLine,
+            _primaryKeys.First().GetRuntimeName());
         sqlToRun += $"\tAND @index > ISNULL(c.{SpecialFieldNames.ValidFrom}, '1899/01/01'){Environment.NewLine}";
 
         sqlToRun += Environment.NewLine;
         sqlToRun += $"RETURN{Environment.NewLine}";
         sqlToRun += $"END{Environment.NewLine}";
 
-        using(var cmd = _server.GetCommand(sqlToRun, con))
+        using (var cmd = _server.GetCommand(sqlToRun, con))
         {
             cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
             cmd.ExecuteNonQuery();
@@ -309,12 +324,11 @@ private void CreateViewOldVersionsTableValuedFunction(string sqlUsedToCreateArch
 
     public override TriggerStatus GetTriggerStatus()
     {
-
         var updateTriggerName = GetTriggerName();
 
         var queryTriggerIsItDisabledOrMissing =
             $"USE [{_table.Database.GetRuntimeName()}]; \r\nif exists (select 1 from sys.triggers WHERE name=@triggerName) SELECT is_disabled  FROM sys.triggers WHERE name=@triggerName else select -1 is_disabled";
-            
+
         try
         {
             using (var conn = _server.GetConnection())
@@ -323,7 +337,7 @@ public override TriggerStatus GetTriggerStatus()
                 using (var cmd = _server.GetCommand(queryTriggerIsItDisabledOrMissing, conn))
                 {
                     cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
-                    cmd.Parameters.Add(new SqlParameter("@triggerName",SqlDbType.VarChar));
+                    cmd.Parameters.Add(new SqlParameter("@triggerName", SqlDbType.VarChar));
                     cmd.Parameters["@triggerName"].Value = updateTriggerName;
 
                     var result = Convert.ToInt32(cmd.ExecuteScalar());
@@ -344,10 +358,7 @@ public override TriggerStatus GetTriggerStatus()
         }
     }
 
-    private string GetTriggerName()
-    {
-        return $"{QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName())}_OnUpdate";
-    }
+    private string GetTriggerName() => $"{QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName())}_OnUpdate";
 
     public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
     {
@@ -368,12 +379,12 @@ public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
                 string result;
 
                 con.Open();
-                using(var cmd = _server.GetCommand(query, con))
+                using (var cmd = _server.GetCommand(query, con))
                 {
                     cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                     result = cmd.ExecuteScalar() as string;
                 }
-                        
+
 
                 if (string.IsNullOrWhiteSpace(result))
                     throw new TriggerMissingException(
@@ -400,11 +411,9 @@ public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
         catch (Exception e)
         {
             throw new Exception(
-                $"Failed to check if trigger {updateTriggerName} is enabled.  See InnerException for details",e);
+                $"Failed to check if trigger {updateTriggerName} is enabled.  See InnerException for details", e);
         }
 
         return true;
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Implementations/MySqlTriggerImplementer.cs b/Rdmp.Core/DataLoad/Triggers/Implementations/MySqlTriggerImplementer.cs
index 1ca9e2e948..135594204b 100644
--- a/Rdmp.Core/DataLoad/Triggers/Implementations/MySqlTriggerImplementer.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Implementations/MySqlTriggerImplementer.cs
@@ -16,10 +16,11 @@
 namespace Rdmp.Core.DataLoad.Triggers.Implementations;
 
 /// <inheritdoc/>
-internal class MySqlTriggerImplementer:TriggerImplementer
+internal class MySqlTriggerImplementer : TriggerImplementer
 {
     /// <inheritdoc cref="TriggerImplementer(DiscoveredTable,bool)"/>
-    public MySqlTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table, createDataLoadRunIDAlso)
+    public MySqlTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table,
+        createDataLoadRunIDAlso)
     {
     }
 
@@ -34,7 +35,7 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
             {
                 con.Open();
 
-                using(var cmd = _server.GetCommand($"DROP TRIGGER {GetTriggerName()}", con))
+                using (var cmd = _server.GetCommand($"DROP TRIGGER {GetTriggerName()}", con))
                 {
                     cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                     cmd.ExecuteNonQuery();
@@ -61,7 +62,7 @@ public override string CreateTrigger(ICheckNotifier notifier)
         {
             con.Open();
 
-            using(var cmd = _server.GetCommand(sql, con))
+            using (var cmd = _server.GetCommand(sql, con))
             {
                 cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                 cmd.ExecuteNonQuery();
@@ -89,7 +90,6 @@ public static bool UseOldDateTimeDefaultMethod(DiscoveredTable table)
             con.Open();
             return UseOldDateTimeDefaultMethod(table.GetCommand("SELECT VERSION()", con).ExecuteScalar()?.ToString());
         }
-
     }
 
     public static bool UseOldDateTimeDefaultMethod(string version)
@@ -97,7 +97,7 @@ public static bool UseOldDateTimeDefaultMethod(string version)
         if (string.IsNullOrWhiteSpace(version))
             return false;
 
-        var match = Regex.Match(version,@"(\d+)\.(\d+)");
+        var match = Regex.Match(version, @"(\d+)\.(\d+)");
 
         //If the version string doesn't start with numbers we have bigger problems than creating a default constraint
         if (!match.Success)
@@ -121,10 +121,8 @@ protected virtual string CreateTriggerBody()
   END";
     }
 
-    public override TriggerStatus GetTriggerStatus()
-    {
-        return string.IsNullOrWhiteSpace(GetTriggerBody())? TriggerStatus.Missing : TriggerStatus.Enabled;
-    }
+    public override TriggerStatus GetTriggerStatus() =>
+        string.IsNullOrWhiteSpace(GetTriggerBody()) ? TriggerStatus.Missing : TriggerStatus.Enabled;
 
     protected virtual string GetTriggerBody()
     {
@@ -132,22 +130,20 @@ protected virtual string GetTriggerBody()
         {
             con.Open();
 
-            using(var cmd = _server.GetCommand($"show triggers like '{_table.GetRuntimeName()}'", con))
-            using(var r = cmd.ExecuteReader())
+            using (var cmd = _server.GetCommand($"show triggers like '{_table.GetRuntimeName()}'", con))
+            using (var r = cmd.ExecuteReader())
+            {
                 while (r.Read())
-                {
                     if (r["Trigger"].Equals(GetTriggerName()))
-                        return (string) r["Statement"];
-                }
+                        return (string)r["Statement"];
+            }
         }
 
         return null;
     }
 
-    protected virtual object GetTriggerName()
-    {
-        return $"{QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName())}_onupdate";
-    }
+    protected virtual object GetTriggerName() =>
+        $"{QuerySyntaxHelper.MakeHeaderNameSensible(_table.GetRuntimeName())}_onupdate";
 
     public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
     {
@@ -157,14 +153,15 @@ public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
         var sqlThen = GetTriggerBody();
         var sqlNow = CreateTriggerBody();
 
-        AssertTriggerBodiesAreEqual(sqlThen,sqlNow);
+        AssertTriggerBodiesAreEqual(sqlThen, sqlNow);
 
         return true;
     }
 
     protected virtual void AssertTriggerBodiesAreEqual(string sqlThen, string sqlNow)
     {
-        if(!sqlNow.Equals(sqlThen))
-            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql",sqlNow,sqlThen);
+        if (!sqlNow.Equals(sqlThen))
+            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql", sqlNow,
+                sqlThen);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Implementations/OracleTriggerImplementer.cs b/Rdmp.Core/DataLoad/Triggers/Implementations/OracleTriggerImplementer.cs
index 27d807a353..25d9368d6a 100644
--- a/Rdmp.Core/DataLoad/Triggers/Implementations/OracleTriggerImplementer.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Implementations/OracleTriggerImplementer.cs
@@ -14,10 +14,11 @@
 namespace Rdmp.Core.DataLoad.Triggers.Implementations;
 
 /// <inheritdoc/>
-internal class OracleTriggerImplementer:MySqlTriggerImplementer
+internal class OracleTriggerImplementer : MySqlTriggerImplementer
 {
     /// <inheritdoc cref="TriggerImplementer(DiscoveredTable,bool)"/>
-    public OracleTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table, createDataLoadRunIDAlso)
+    public OracleTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso = true) : base(table,
+        createDataLoadRunIDAlso)
     {
     }
 
@@ -35,7 +36,7 @@ protected override string GetTriggerBody()
                 var r = cmd.ExecuteReader();
 
                 while (r.Read())
-                    return (string) r["trigger_body"];
+                    return (string)r["trigger_body"];
             }
         }
 
@@ -44,7 +45,8 @@ protected override string GetTriggerBody()
 
     protected override void AddValidFrom(DiscoveredTable table, IQuerySyntaxHelper syntaxHelper)
     {
-        _table.AddColumn(SpecialFieldNames.ValidFrom, " DATE DEFAULT CURRENT_TIMESTAMP", true, UserSettings.ArchiveTriggerTimeout);
+        _table.AddColumn(SpecialFieldNames.ValidFrom, " DATE DEFAULT CURRENT_TIMESTAMP", true,
+            UserSettings.ArchiveTriggerTimeout);
     }
 
     protected override string CreateTriggerBody()
@@ -65,7 +67,8 @@ protected override void AssertTriggerBodiesAreEqual(string sqlThen, string sqlNo
         sqlNow ??= "";
         sqlThen ??= "";
 
-        if(!sqlNow.Trim(';',' ','\t').Equals(sqlThen.Trim(';',' ','\t')))
-            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql",sqlThen,sqlNow);
+        if (!sqlNow.Trim(';', ' ', '\t').Equals(sqlThen.Trim(';', ' ', '\t')))
+            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql", sqlThen,
+                sqlNow);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Implementations/PostgreSqlTriggerImplementer.cs b/Rdmp.Core/DataLoad/Triggers/Implementations/PostgreSqlTriggerImplementer.cs
index 66be1e6529..39422dfb3e 100644
--- a/Rdmp.Core/DataLoad/Triggers/Implementations/PostgreSqlTriggerImplementer.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Implementations/PostgreSqlTriggerImplementer.cs
@@ -25,11 +25,14 @@ public class PostgreSqlTriggerImplementer : TriggerImplementer
     private string _procedureRuntimeName;
 
     /// <inheritdoc cref="TriggerImplementer(DiscoveredTable,bool)"/>
-    public PostgreSqlTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso):base(table,createDataLoadRunIDAlso)
+    public PostgreSqlTriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso) : base(table,
+        createDataLoadRunIDAlso)
     {
-        _schema = string.IsNullOrWhiteSpace(_table.Schema) ? table.GetQuerySyntaxHelper().GetDefaultSchemaIfAny():_table.Schema;
+        _schema = string.IsNullOrWhiteSpace(_table.Schema)
+            ? table.GetQuerySyntaxHelper().GetDefaultSchemaIfAny()
+            : _table.Schema;
         _triggerRuntimeName = $"{_table.GetRuntimeName()}_OnUpdate";
-            
+
         _procedureRuntimeName = $"{_table.GetRuntimeName()}_OnUpdateProc";
         _procedureNameFullyQualified = $"{_schema}.\"{_procedureRuntimeName}\"";
     }
@@ -45,14 +48,15 @@ public override void DropTrigger(out string problemsDroppingTrigger, out string
             {
                 con.Open();
 
-                using(var cmd = _server.GetCommand(
-                          $"DROP TRIGGER IF EXISTS \"{_triggerRuntimeName}\" ON {_table.GetFullyQualifiedName()}", con))
+                using (var cmd = _server.GetCommand(
+                           $"DROP TRIGGER IF EXISTS \"{_triggerRuntimeName}\" ON {_table.GetFullyQualifiedName()}",
+                           con))
                 {
                     cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                     cmd.ExecuteNonQuery();
                 }
 
-                using(var cmd = _server.GetCommand($"DROP FUNCTION IF EXISTS  {_procedureNameFullyQualified}", con))
+                using (var cmd = _server.GetCommand($"DROP FUNCTION IF EXISTS  {_procedureNameFullyQualified}", con))
                 {
                     cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                     cmd.ExecuteNonQuery();
@@ -75,7 +79,7 @@ public override string CreateTrigger(ICheckNotifier notifier)
         CreateProcedure(notifier);
 
         var sql = string.Format(@"CREATE TRIGGER ""{0}"" BEFORE UPDATE ON {1} FOR EACH ROW
-EXECUTE PROCEDURE {2}();", 
+EXECUTE PROCEDURE {2}();",
             _triggerRuntimeName,
             _table.GetFullyQualifiedName(),
             _procedureNameFullyQualified);
@@ -84,12 +88,11 @@ public override string CreateTrigger(ICheckNotifier notifier)
         {
             con.Open();
 
-            using(var cmd = _server.GetCommand(sql, con))
+            using (var cmd = _server.GetCommand(sql, con))
             {
                 cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                 cmd.ExecuteNonQuery();
             }
-                    
         }
 
         return creationSql;
@@ -103,7 +106,7 @@ RETURNS trigger AS
 {1}
 $$
 LANGUAGE 'plpgsql';"
-            ,_procedureNameFullyQualified
+            , _procedureNameFullyQualified
             , CreateTriggerBody()
         );
 
@@ -111,12 +114,11 @@ RETURNS trigger AS
         {
             con.Open();
 
-            using(var cmd = _server.GetCommand(sql, con))
+            using (var cmd = _server.GetCommand(sql, con))
             {
                 cmd.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                 cmd.ExecuteNonQuery();
             }
-                    
         }
     }
 
@@ -126,9 +128,12 @@ protected string GetTriggerBody()
         {
             con.Open();
 
-            using(var cmd = _server.GetCommand($"select proname,prosrc from pg_proc where proname= '{_procedureRuntimeName}';", con))
+            using (var cmd = _server.GetCommand(
+                       $"select proname,prosrc from pg_proc where proname= '{_procedureRuntimeName}';", con))
             using (var r = cmd.ExecuteReader())
-                return r.Read() ? r["prosrc"] as string:null;
+            {
+                return r.Read() ? r["prosrc"] as string : null;
+            }
         }
     }
 
@@ -139,21 +144,22 @@ public override bool CheckUpdateTriggerIsEnabledAndHasExpectedBody()
         var sqlThen = GetTriggerBody();
         var sqlNow = CreateTriggerBody();
 
-        if(sqlThen != null)
-            sqlThen = Regex.Replace(sqlThen,@"\s+", " ").Trim();
+        if (sqlThen != null)
+            sqlThen = Regex.Replace(sqlThen, @"\s+", " ").Trim();
 
-        if(sqlNow != null)
-            sqlNow = Regex.Replace(sqlNow,@"\s+", " ").Trim();
+        if (sqlNow != null)
+            sqlNow = Regex.Replace(sqlNow, @"\s+", " ").Trim();
 
-        AssertTriggerBodiesAreEqual(sqlThen,sqlNow);
+        AssertTriggerBodiesAreEqual(sqlThen, sqlNow);
 
         return true;
     }
 
     private static void AssertTriggerBodiesAreEqual(string sqlThen, string sqlNow)
     {
-        if(!sqlNow.Equals(sqlThen))
-            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql",sqlNow,sqlThen);
+        if (!sqlNow.Equals(sqlThen))
+            throw new ExpectedIdenticalStringsException("Sql body for trigger doesn't match expcted sql", sqlNow,
+                sqlThen);
     }
 
     private string CreateTriggerBody()
@@ -169,15 +175,12 @@ private string CreateTriggerBody()
  
             RETURN NEW;
             END;",
-                _archiveTable.GetFullyQualifiedName()                                                                          
-                , string.Join(",", _columns.Select(c => syntax.EnsureWrapped(c.GetRuntimeName()))),         
+                _archiveTable.GetFullyQualifiedName()
+                , string.Join(",", _columns.Select(c => syntax.EnsureWrapped(c.GetRuntimeName()))),
                 string.Join(",", _columns.Select(c => $"OLD.{syntax.EnsureWrapped(c.GetRuntimeName())}")),
                 syntax.EnsureWrapped(SpecialFieldNames.ValidFrom));
-
     }
 
-    public override TriggerStatus GetTriggerStatus()
-    {
-        return string.IsNullOrWhiteSpace(GetTriggerBody()) ? TriggerStatus.Missing : TriggerStatus.Enabled;
-    }
+    public override TriggerStatus GetTriggerStatus() =>
+        string.IsNullOrWhiteSpace(GetTriggerBody()) ? TriggerStatus.Missing : TriggerStatus.Enabled;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementer.cs b/Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementer.cs
index 852b7c5e39..7bea08d8a9 100644
--- a/Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementer.cs
+++ b/Rdmp.Core/DataLoad/Triggers/Implementations/TriggerImplementer.cs
@@ -21,7 +21,7 @@ namespace Rdmp.Core.DataLoad.Triggers.Implementations;
 /// Trigger implementer for that creates archive triggers on tables.  This is a prerequisite for the RDMP DLE and ensures that
 /// when updates in a load replace live records the old state is persisted.
 /// </summary>
-public abstract class TriggerImplementer:ITriggerImplementer
+public abstract class TriggerImplementer : ITriggerImplementer
 {
     protected readonly bool _createDataLoadRunIdAlso;
 
@@ -41,10 +41,10 @@ protected TriggerImplementer(DiscoveredTable table, bool createDataLoadRunIDAlso
     {
         _server = table.Database.Server;
         _table = table;
-        _archiveTable = _table.Database.ExpectTable($"{table.GetRuntimeName()}_Archive",table.Schema);
+        _archiveTable = _table.Database.ExpectTable($"{table.GetRuntimeName()}_Archive", table.Schema);
         _columns = table.DiscoverColumns();
         _primaryKeys = _columns.Where(c => c.IsPrimaryKey).ToArray();
-            
+
         _createDataLoadRunIdAlso = createDataLoadRunIDAlso;
     }
 
@@ -60,12 +60,18 @@ public virtual string CreateTrigger(ICheckNotifier notifier)
 
         //check _Archive does not already exist
         foreach (var forbiddenColumnName in new[] { "hic_validTo", "hic_userID", "hic_status" })
-            if (_columns.Any(c => c.GetRuntimeName().Equals(forbiddenColumnName, StringComparison.CurrentCultureIgnoreCase)))
+            if (_columns.Any(c =>
+                    c.GetRuntimeName().Equals(forbiddenColumnName, StringComparison.CurrentCultureIgnoreCase)))
                 throw new TriggerException(
                     $"Table {_table} already contains a column called {forbiddenColumnName} this column is reserved for Archiving");
 
-        var b_mustCreate_validFrom = !_columns.Any(c => c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase));
-        var b_mustCreate_dataloadRunId = !_columns.Any(c => c.GetRuntimeName().Equals(SpecialFieldNames.DataLoadRunID,StringComparison.CurrentCultureIgnoreCase)) && _createDataLoadRunIdAlso;
+        var b_mustCreate_validFrom = !_columns.Any(c =>
+            c.GetRuntimeName().Equals(SpecialFieldNames.ValidFrom, StringComparison.CurrentCultureIgnoreCase));
+        var b_mustCreate_dataloadRunId =
+            !_columns.Any(c =>
+                c.GetRuntimeName()
+                    .Equals(SpecialFieldNames.DataLoadRunID, StringComparison.CurrentCultureIgnoreCase)) &&
+            _createDataLoadRunIdAlso;
 
         //forces column order dataloadrunID then valid from (doesnt prevent these being in the wrong place in the record but hey ho - possibly not an issue anyway since probably the 3 values in the archive are what matters for order - see the Trigger which populates *,X,Y,Z where * is all columns in mane table
         if (b_mustCreate_dataloadRunId && !b_mustCreate_validFrom)
@@ -74,10 +80,11 @@ public virtual string CreateTrigger(ICheckNotifier notifier)
 
         //must add validFrom outside of transaction if we want SMO to pick it up
         if (b_mustCreate_dataloadRunId)
-            _table.AddColumn(SpecialFieldNames.DataLoadRunID, new DatabaseTypeRequest(typeof(int)), true, UserSettings.ArchiveTriggerTimeout);
+            _table.AddColumn(SpecialFieldNames.DataLoadRunID, new DatabaseTypeRequest(typeof(int)), true,
+                UserSettings.ArchiveTriggerTimeout);
 
         var syntaxHelper = _server.GetQuerySyntaxHelper();
-            
+
 
         //must add validFrom outside of transaction if we want SMO to pick it up
         if (b_mustCreate_validFrom)
@@ -87,23 +94,26 @@ public virtual string CreateTrigger(ICheckNotifier notifier)
         if (b_mustCreate_dataloadRunId || b_mustCreate_validFrom)
             _columns = _table.DiscoverColumns();
 
-        var sql = WorkOutArchiveTableCreationSQL(); 
-            
+        var sql = WorkOutArchiveTableCreationSQL();
+
         if (!skipCreatingArchive)
-            using(var con = _server.GetConnection())
+            using (var con = _server.GetConnection())
             {
                 con.Open();
 
-                using(var cmdCreateArchive = _server.GetCommand(sql, con))
+                using (var cmdCreateArchive = _server.GetCommand(sql, con))
                 {
                     cmdCreateArchive.CommandTimeout = UserSettings.ArchiveTriggerTimeout;
                     cmdCreateArchive.ExecuteNonQuery();
                 }
 
 
-                _archiveTable.AddColumn("hic_validTo", new DatabaseTypeRequest(typeof(DateTime)), true, UserSettings.ArchiveTriggerTimeout);
-                _archiveTable.AddColumn("hic_userID", new DatabaseTypeRequest(typeof(string), 128), true, UserSettings.ArchiveTriggerTimeout);
-                _archiveTable.AddColumn("hic_status", new DatabaseTypeRequest(typeof(string), 1), true, UserSettings.ArchiveTriggerTimeout);
+                _archiveTable.AddColumn("hic_validTo", new DatabaseTypeRequest(typeof(DateTime)), true,
+                    UserSettings.ArchiveTriggerTimeout);
+                _archiveTable.AddColumn("hic_userID", new DatabaseTypeRequest(typeof(string), 128), true,
+                    UserSettings.ArchiveTriggerTimeout);
+                _archiveTable.AddColumn("hic_status", new DatabaseTypeRequest(typeof(string), 1), true,
+                    UserSettings.ArchiveTriggerTimeout);
             }
 
         return sql;
@@ -111,10 +121,12 @@ public virtual string CreateTrigger(ICheckNotifier notifier)
 
     protected virtual void AddValidFrom(DiscoveredTable table, IQuerySyntaxHelper syntaxHelper)
     {
-        var dateTimeDatatype = syntaxHelper.TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof (DateTime)));
+        var dateTimeDatatype =
+            syntaxHelper.TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(DateTime)));
         var nowFunction = syntaxHelper.GetScalarFunctionSql(MandatoryScalarFunctions.GetTodaysDate);
-            
-        _table.AddColumn(SpecialFieldNames.ValidFrom, $" {dateTimeDatatype} DEFAULT {nowFunction}", true, UserSettings.ArchiveTriggerTimeout);
+
+        _table.AddColumn(SpecialFieldNames.ValidFrom, $" {dateTimeDatatype} DEFAULT {nowFunction}", true,
+            UserSettings.ArchiveTriggerTimeout);
     }
 
 
@@ -139,6 +151,7 @@ private string WorkOutArchiveTableCreationSQL()
 
         return createTableSQL;
     }
+
     public abstract TriggerStatus GetTriggerStatus();
 
     /// <summary>
@@ -175,8 +188,7 @@ private void CheckColumnDefinitionsMatchArchive()
             if (colInArchive == null)
                 errors.Add(
                     $"Column {col.GetRuntimeName()} appears in Table '{_table}' but not in archive table '{_archiveTable}'");
-            else
-            if (!AreCompatibleDatatypes(col.DataType, colInArchive.DataType))
+            else if (!AreCompatibleDatatypes(col.DataType, colInArchive.DataType))
                 errors.Add(
                     $"Column {col.GetRuntimeName()} has data type '{col.DataType}' in '{_table}' but in Archive table '{_archiveTable}' it is defined as '{colInArchive.DataType}'");
         }
@@ -199,5 +211,4 @@ private static bool AreCompatibleDatatypes(DiscoveredDataType mainDataType, Disc
 
         return false;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/SpecialFieldNames.cs b/Rdmp.Core/DataLoad/Triggers/SpecialFieldNames.cs
index 5dd33f5f9f..2242c9fc74 100644
--- a/Rdmp.Core/DataLoad/Triggers/SpecialFieldNames.cs
+++ b/Rdmp.Core/DataLoad/Triggers/SpecialFieldNames.cs
@@ -17,13 +17,8 @@ public class SpecialFieldNames
     public const string ValidFrom = "hic_validFrom";
     public const string DataLoadRunID = "hic_dataLoadRunID";
 
-    public static bool IsHicPrefixed(IHasRuntimeName col)
-    {
-        return IsHicPrefixed(col.GetRuntimeName());
-    }
+    public static bool IsHicPrefixed(IHasRuntimeName col) => IsHicPrefixed(col.GetRuntimeName());
 
-    public static bool IsHicPrefixed(string runtimeName)
-    {
-        return runtimeName.StartsWith("hic_",StringComparison.CurrentCultureIgnoreCase);
-    }
+    public static bool IsHicPrefixed(string runtimeName) =>
+        runtimeName.StartsWith("hic_", StringComparison.CurrentCultureIgnoreCase);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataLoad/Triggers/TriggerChecks.cs b/Rdmp.Core/DataLoad/Triggers/TriggerChecks.cs
index b77410dcd5..54bd817c6d 100644
--- a/Rdmp.Core/DataLoad/Triggers/TriggerChecks.cs
+++ b/Rdmp.Core/DataLoad/Triggers/TriggerChecks.cs
@@ -29,7 +29,7 @@ public TriggerChecks(DiscoveredTable table)
     {
         _server = table.Database.Server;
         _table = table;
-        _archiveTable = table.Database.ExpectTable($"{_table.GetRuntimeName()}_Archive",_table.Schema);
+        _archiveTable = table.Database.ExpectTable($"{_table.GetRuntimeName()}_Archive", _table.Schema);
     }
 
     ///<inheritdoc/>
@@ -42,7 +42,7 @@ public void Check(ICheckNotifier notifier)
 
             var passed = CheckColumnOrderInTablesAndArchiveMatch(liveCols, archiveCols, notifier);
 
-            if(!passed)
+            if (!passed)
                 return;
         }
 
@@ -66,7 +66,6 @@ public void Check(ICheckNotifier notifier)
                 present = false;
             }
         else
-        {
             try
             {
                 //we do know the primary keys
@@ -76,7 +75,8 @@ public void Check(ICheckNotifier notifier)
             {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Archive table for table {_table} is corrupt, see inner Exception for specific errors", CheckResult.Fail, e));
+                        $"Archive table for table {_table} is corrupt, see inner Exception for specific errors",
+                        CheckResult.Fail, e));
                 return;
             }
             catch (Exception e)
@@ -84,25 +84,24 @@ public void Check(ICheckNotifier notifier)
                 NotifyFail(e, notifier, implementer);
                 return;
             }
-        }
 
-        if(present)
+        if (present)
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Trigger presence/intactness for table {_table} matched expected presence",CheckResult.Success, null));
+                $"Trigger presence/intactness for table {_table} matched expected presence", CheckResult.Success,
+                null));
         else
             NotifyFail(null, notifier, implementer); //try creating it
-            
     }
 
 
-    private bool CheckColumnOrderInTablesAndArchiveMatch(string[] liveCols, string[] archiveCols, ICheckNotifier notifier)
+    private bool CheckColumnOrderInTablesAndArchiveMatch(string[] liveCols, string[] archiveCols,
+        ICheckNotifier notifier)
     {
         var passed = true;
 
         foreach (var requiredArchiveColumns in new[] { "hic_validTo", "hic_userID", "hic_status" })
-            if (!archiveCols.Any(c=>c.Equals(requiredArchiveColumns,StringComparison.CurrentCultureIgnoreCase)))
+            if (!archiveCols.Any(c => c.Equals(requiredArchiveColumns, StringComparison.CurrentCultureIgnoreCase)))
             {
-
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
                         $"Column {requiredArchiveColumns} was not found in {_archiveTable}",
@@ -113,7 +112,6 @@ private bool CheckColumnOrderInTablesAndArchiveMatch(string[] liveCols, string[]
 
         foreach (var missingColumn in liveCols.Except(archiveCols))
         {
-
             notifier.OnCheckPerformed(new CheckEventArgs(
                 $"Column {missingColumn} in table {_table} was not found in the  _Archive table",
                 CheckResult.Fail, null));
@@ -123,7 +121,7 @@ private bool CheckColumnOrderInTablesAndArchiveMatch(string[] liveCols, string[]
         return passed;
     }
 
-    private void NotifyFail(Exception e, ICheckNotifier notifier,ITriggerImplementer microsoftSQLTrigger)
+    private void NotifyFail(Exception e, ICheckNotifier notifier, ITriggerImplementer microsoftSQLTrigger)
     {
         var shouldCreate = notifier.OnCheckPerformed(new CheckEventArgs(
             $"Trigger error encountered when checking integrity of table {_table}",
@@ -134,7 +132,8 @@ private void NotifyFail(Exception e, ICheckNotifier notifier,ITriggerImplementer
             microsoftSQLTrigger.DropTrigger(out var problemsDroppingTrigger, out var thingsThatWorkedDroppingTrigger);
 
             if (!string.IsNullOrWhiteSpace(thingsThatWorkedDroppingTrigger))
-                notifier.OnCheckPerformed(new CheckEventArgs(thingsThatWorkedDroppingTrigger, CheckResult.Success, null));
+                notifier.OnCheckPerformed(
+                    new CheckEventArgs(thingsThatWorkedDroppingTrigger, CheckResult.Success, null));
 
             if (!string.IsNullOrWhiteSpace(problemsDroppingTrigger))
                 notifier.OnCheckPerformed(new CheckEventArgs(problemsDroppingTrigger, CheckResult.Warning, null));
diff --git a/Rdmp.Core/DataQualityEngine/Data/ColumnState.cs b/Rdmp.Core/DataQualityEngine/Data/ColumnState.cs
index bfe3a720c8..c06f483c13 100644
--- a/Rdmp.Core/DataQualityEngine/Data/ColumnState.cs
+++ b/Rdmp.Core/DataQualityEngine/Data/ColumnState.cs
@@ -25,8 +25,8 @@ public class ColumnState
     public int DataLoadRunID { get; set; }
 
     public int? ID { get; private set; }
-    public int? Evaluation_ID { get;private set; }
-        
+    public int? Evaluation_ID { get; private set; }
+
     public string ItemValidatorXML { get; set; }
 
     public int CountMissing
@@ -35,7 +35,8 @@ public int CountMissing
         set
         {
             if (IsCommitted)
-                throw new NotSupportedException("Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
+                throw new NotSupportedException(
+                    "Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
             _countMissing = value;
         }
     }
@@ -46,9 +47,9 @@ public int CountWrong
         set
         {
             if (IsCommitted)
-                throw new NotSupportedException("Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
+                throw new NotSupportedException(
+                    "Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
             _countWrong = value;
-                
         }
     }
 
@@ -58,7 +59,8 @@ public int CountInvalidatesRow
         set
         {
             if (IsCommitted)
-                throw new NotSupportedException("Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
+                throw new NotSupportedException(
+                    "Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
             _countInvalidatesRow = value;
         }
     }
@@ -69,9 +71,10 @@ public int CountCorrect
         set
         {
             if (IsCommitted)
-                throw new NotSupportedException("Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
+                throw new NotSupportedException(
+                    "Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
 
-            _countCorrect = value; 
+            _countCorrect = value;
         }
     }
 
@@ -80,16 +83,18 @@ public int CountDBNull
         get => _countDbNull;
         set
         {
-            if(IsCommitted)
-                throw new NotSupportedException("Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
+            if (IsCommitted)
+                throw new NotSupportedException(
+                    "Can only edit these values while the ColumnState is being computed in memory, this ColumnState came from the database and was committed long ago");
 
             _countDbNull = value;
         }
     }
-        
+
     public string PivotCategory { get; private set; }
 
     public bool IsCommitted { get; private set; }
+
     public ColumnState(string targetProperty, int dataLoadRunID, string itemValidatorXML)
     {
         TargetProperty = targetProperty;
@@ -116,7 +121,6 @@ public ColumnState(DbDataReader r)
         PivotCategory = (string)r["PivotCategory"];
 
         IsCommitted = true;
-
     }
 
     /// <summary>
@@ -124,25 +128,24 @@ public ColumnState(DbDataReader r)
     /// </summary>
     protected ColumnState()
     {
-
     }
 
-    public void Commit(Evaluation evaluation,string pivotCategory, DbConnection con, DbTransaction transaction)
+    public void Commit(Evaluation evaluation, string pivotCategory, DbConnection con, DbTransaction transaction)
     {
-        if(IsCommitted)
+        if (IsCommitted)
             throw new NotSupportedException("ColumnState was already committed");
 
         var sql = string.Format(
             "INSERT INTO ColumnState(TargetProperty,DataLoadRunID,Evaluation_ID,CountCorrect,CountDBNull,ItemValidatorXML,CountMissing,CountWrong,CountInvalidatesRow,PivotCategory)VALUES({0},{1},{2},{3},{4},{5},{6},{7},{8},{9})",
             "@TargetProperty",
             DataLoadRunID
-            ,evaluation.ID
-            ,CountCorrect
-            ,CountDBNull
-            ,"@ItemValidatorXML"
-            ,CountMissing
-            ,CountWrong
-            ,CountInvalidatesRow
+            , evaluation.ID
+            , CountCorrect
+            , CountDBNull
+            , "@ItemValidatorXML"
+            , CountMissing
+            , CountWrong
+            , CountInvalidatesRow
             , "@PivotCategory"
         );
 
@@ -153,10 +156,8 @@ public void Commit(Evaluation evaluation,string pivotCategory, DbConnection con,
             DatabaseCommandHelper.AddParameterWithValueToCommand("@PivotCategory", cmd, pivotCategory);
             cmd.ExecuteNonQuery();
         }
-            
+
 
         IsCommitted = true;
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Data/DQEGraphAnnotation.cs b/Rdmp.Core/DataQualityEngine/Data/DQEGraphAnnotation.cs
index f2ccbf0de9..15e340c7c8 100644
--- a/Rdmp.Core/DataQualityEngine/Data/DQEGraphAnnotation.cs
+++ b/Rdmp.Core/DataQualityEngine/Data/DQEGraphAnnotation.cs
@@ -30,15 +30,15 @@ public class DQEGraphAnnotation : DatabaseEntity
     public string Username { get; set; }
     public DateTime CreationDate { get; set; }
     public DQEGraphType AnnotationIsForGraph { get; set; }
-        
+
     public string PivotCategory { get; set; }
 
     public DQEGraphAnnotation()
     {
-
     }
 
-    public DQEGraphAnnotation(DQERepository repository, double startX, double startY, double endX, double endY, string text, Evaluation evaluation, DQEGraphType annotationIsForGraphType, string pivotCategory)
+    public DQEGraphAnnotation(DQERepository repository, double startX, double startY, double endX, double endY,
+        string text, Evaluation evaluation, DQEGraphType annotationIsForGraphType, string pivotCategory)
     {
         Repository = repository;
 
@@ -46,35 +46,35 @@ public DQEGraphAnnotation(DQERepository repository, double startX, double startY
 
         Repository.InsertAndHydrate(this, new Dictionary<string, object>
         {
-            {"StartX", startX},
-            {"StartY", startY},
-            {"EndX", endX},
-            {"EndY", endY},
-            {"Text", text},
-            {"Evaluation_ID", evaluation.ID},
-            {"Username", username},
-            {"CreationDate", DateTime.Now},
-            {"AnnotationIsForGraph", annotationIsForGraphType},
-            {"PivotCategory", pivotCategory}
-        });  
+            { "StartX", startX },
+            { "StartY", startY },
+            { "EndX", endX },
+            { "EndY", endY },
+            { "Text", text },
+            { "Evaluation_ID", evaluation.ID },
+            { "Username", username },
+            { "CreationDate", DateTime.Now },
+            { "AnnotationIsForGraph", annotationIsForGraphType },
+            { "PivotCategory", pivotCategory }
+        });
     }
 
-    public DQEGraphAnnotation(DQERepository repository, DbDataReader r): base(repository, r)
+    public DQEGraphAnnotation(DQERepository repository, DbDataReader r) : base(repository, r)
     {
         Repository = repository;
 
         //coordinates of the annotation
-        StartX          = double.Parse(r["StartX"].ToString());
-        StartY          = double.Parse(r["StartY"].ToString());
-        EndX            = double.Parse(r["EndX"].ToString());
-        EndY            = double.Parse(r["EndY"].ToString());
-            
+        StartX = double.Parse(r["StartX"].ToString());
+        StartY = double.Parse(r["StartY"].ToString());
+        EndX = double.Parse(r["EndX"].ToString());
+        EndY = double.Parse(r["EndY"].ToString());
+
         Text = r["Text"].ToString();
-        Evaluation_ID =  int.Parse(r["Evaluation_ID"].ToString());
-        Username =  r["Username"].ToString();
+        Evaluation_ID = int.Parse(r["Evaluation_ID"].ToString());
+        Username = r["Username"].ToString();
         CreationDate = (DateTime)r["CreationDate"];
-        PivotCategory = (string) r["PivotCategory"];
-        AnnotationIsForGraph = (DQEGraphType) Enum.Parse(typeof (DQEGraphType), r["AnnotationIsForGraph"].ToString());
+        PivotCategory = (string)r["PivotCategory"];
+        AnnotationIsForGraph = (DQEGraphType)Enum.Parse(typeof(DQEGraphType), r["AnnotationIsForGraph"].ToString());
     }
 }
 
diff --git a/Rdmp.Core/DataQualityEngine/Data/Evaluation.cs b/Rdmp.Core/DataQualityEngine/Data/Evaluation.cs
index d8c5ac2a4d..7ca802daf2 100644
--- a/Rdmp.Core/DataQualityEngine/Data/Evaluation.cs
+++ b/Rdmp.Core/DataQualityEngine/Data/Evaluation.cs
@@ -24,8 +24,7 @@ public class Evaluation : DatabaseEntity
     public DateTime DateOfEvaluation { get; private set; }
     public int CatalogueID { get; set; }
 
-    [NoMappingToDatabase]
-    public ICatalogue Catalogue { get; private set; }
+    [NoMappingToDatabase] public ICatalogue Catalogue { get; private set; }
 
     private RowState[] rowStates;
 
@@ -43,7 +42,7 @@ public RowState[] RowStates
         set => rowStates = value;
     }
 
-        
+
     private ColumnState[] columnStates;
 
     [NoMappingToDatabase]
@@ -51,7 +50,7 @@ public ColumnState[] ColumnStates
     {
         get
         {
-            if(columnStates == null)
+            if (columnStates == null)
                 LoadRowAndColumnStates();
 
             return columnStates;
@@ -60,17 +59,16 @@ public ColumnState[] ColumnStates
         set => columnStates = value;
     }
 
-    [NoMappingToDatabase]
-    public DQERepository DQERepository { get; set; }
+    [NoMappingToDatabase] public DQERepository DQERepository { get; set; }
 
     public Evaluation()
     {
-
     }
+
     public IEnumerable<DQEGraphAnnotation> GetAllDQEGraphAnnotations(string pivotCategory = null)
     {
-        return DQERepository.GetAllObjects<DQEGraphAnnotation>().
-            Where(a => a.Evaluation_ID == ID && a.PivotCategory.Equals(pivotCategory ?? "ALL"));
+        return DQERepository.GetAllObjects<DQEGraphAnnotation>()
+            .Where(a => a.Evaluation_ID == ID && a.PivotCategory.Equals(pivotCategory ?? "ALL"));
     }
 
     /// <summary>
@@ -78,7 +76,7 @@ public IEnumerable<DQEGraphAnnotation> GetAllDQEGraphAnnotations(string pivotCat
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="r"></param>
-    internal Evaluation(DQERepository repository,DbDataReader r):base(repository,r)
+    internal Evaluation(DQERepository repository, DbDataReader r) : base(repository, r)
     {
         DQERepository = repository;
 
@@ -92,15 +90,15 @@ internal Evaluation(DQERepository repository,DbDataReader r):base(repository,r)
         catch (Exception e)
         {
             throw new Exception(
-                $"Could not create a DataQualityEngine.Evaluation for Evaluation with ID {ID} because it is a report of an old Catalogue that has been deleted or otherwise does not exist/could not be retrieved (CatalogueID was:{CatalogueID}).  See inner exception for full details",e);
+                $"Could not create a DataQualityEngine.Evaluation for Evaluation with ID {ID} because it is a report of an old Catalogue that has been deleted or otherwise does not exist/could not be retrieved (CatalogueID was:{CatalogueID}).  See inner exception for full details",
+                e);
         }
-            
     }
 
     /// <summary>
     /// Starts a new evaluation with the given transaction
     /// </summary>
-    internal Evaluation(DQERepository dqeRepository,ICatalogue c)
+    internal Evaluation(DQERepository dqeRepository, ICatalogue c)
     {
         DQERepository = dqeRepository;
         Catalogue = c;
@@ -108,15 +106,17 @@ internal Evaluation(DQERepository dqeRepository,ICatalogue c)
         dqeRepository.InsertAndHydrate(this,
             new Dictionary<string, object>
             {
-                {"CatalogueID",c.ID},
-                {"DateOfEvaluation" , DateTime.Now}
+                { "CatalogueID", c.ID },
+                { "DateOfEvaluation", DateTime.Now }
             });
     }
-        
 
-    internal void AddRowState( int dataLoadRunID, int correct, int missing, int wrong, int invalid, string validatorXml,string pivotCategory,DbConnection con, DbTransaction transaction)
+
+    internal void AddRowState(int dataLoadRunID, int correct, int missing, int wrong, int invalid, string validatorXml,
+        string pivotCategory, DbConnection con, DbTransaction transaction)
     {
-        new RowState(this, dataLoadRunID, correct, missing, wrong, invalid, validatorXml, pivotCategory, con, transaction);
+        new RowState(this, dataLoadRunID, correct, missing, wrong, invalid, validatorXml, pivotCategory, con,
+            transaction);
     }
 
     public string[] GetPivotCategoryValues()
@@ -126,23 +126,22 @@ public string[] GetPivotCategoryValues()
 
         using (var con = DQERepository.GetConnection())
         {
-            using(var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
+            using (var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
             using (var r = cmd.ExecuteReader())
             {
                 while (r.Read())
-                    toReturn.Add((string) r["PivotCategory"]);
+                    toReturn.Add((string)r["PivotCategory"]);
             }
         }
 
         return toReturn.ToArray();
-            
     }
 
     public override void DeleteInDatabase()
     {
         var affectedRows = DQERepository.Delete($"DELETE FROM Evaluation where ID = {ID}");
 
-        if(affectedRows == 0)
+        if (affectedRows == 0)
             throw new Exception($"Delete statement resulted in {affectedRows} affected rows");
     }
 
@@ -154,10 +153,7 @@ public override void DeleteInDatabase()
     {
         var state = ColumnStates?.FirstOrDefault();
 
-        if (state == null)
-        {
-            return null;
-        }
+        if (state == null) return null;
 
         return state.CountCorrect + state.CountMissing + state.CountWrong + state.CountInvalidatesRow;
     }
@@ -166,7 +162,8 @@ private void LoadRowAndColumnStates()
     {
         var states = new List<RowState>();
         if (Repository is not TableRepository repo)
-            throw new Exception($"Repository was not a {nameof(TableRepository)}.  Evaluation class requires a database back repository to fetch RowStates/ColumnStates.  Repository was of Type '{Repository.GetType().Name}'");
+            throw new Exception(
+                $"Repository was not a {nameof(TableRepository)}.  Evaluation class requires a database back repository to fetch RowStates/ColumnStates.  Repository was of Type '{Repository.GetType().Name}'");
 
         using var con = repo.GetConnection();
         //get all the row level data
diff --git a/Rdmp.Core/DataQualityEngine/Data/PeriodicityState.cs b/Rdmp.Core/DataQualityEngine/Data/PeriodicityState.cs
index 51b5b4c3a2..8c261baa52 100644
--- a/Rdmp.Core/DataQualityEngine/Data/PeriodicityState.cs
+++ b/Rdmp.Core/DataQualityEngine/Data/PeriodicityState.cs
@@ -29,9 +29,10 @@ public int CountOfRecords
         get => _countOfRecords;
         set
         {
-            if(IsCommitted )
-                throw new NotSupportedException("Can only edit these values while the PeriodicityState is being computed in memory, this PeriodicityState came from the database and was committed long ago");
-            _countOfRecords = value; 
+            if (IsCommitted)
+                throw new NotSupportedException(
+                    "Can only edit these values while the PeriodicityState is being computed in memory, this PeriodicityState came from the database and was committed long ago");
+            _countOfRecords = value;
         }
     }
 
@@ -39,17 +40,17 @@ public int CountOfRecords
 
     public bool IsCommitted { get; private set; }
 
-    public PeriodicityState(int year, int month, Consequence? consequence )
+    public PeriodicityState(int year, int month, Consequence? consequence)
     {
         IsCommitted = false;
         Year = year;
         Month = month;
 
         RowEvaluation = consequence == null ? "Correct" : consequence.ToString();
-
     }
 
-    public static Dictionary<DateTime, ArchivalPeriodicityCount> GetPeriodicityCountsForEvaluation(Evaluation evaluation,bool discardOutliers)
+    public static Dictionary<DateTime, ArchivalPeriodicityCount> GetPeriodicityCountsForEvaluation(
+        Evaluation evaluation, bool discardOutliers)
     {
         var toReturn = new Dictionary<DateTime, ArchivalPeriodicityCount>();
 
@@ -70,25 +71,19 @@ FROM [PeriodicityState]
     where
   Evaluation_ID = ${evaluation.ID} and PivotCategory = 'ALL' ORDER BY {t.Wrap("Year")},{t.Wrap("Month")}";
 
-            using(var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
+            using (var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
             {
                 using (var r = cmd.ExecuteReader())
                 {
                     while (r.Read())
                     {
-                        var date = new DateTime((int) r["Year"], (int) r["Month"], 1);
+                        var date = new DateTime((int)r["Year"], (int)r["Month"], 1);
 
                         //discard outliers before start
-                        if(discardOutliers && result.Item1.HasValue && date < result.Item1.Value)
-                        {
-                            continue;
-                        }
+                        if (discardOutliers && result.Item1.HasValue && date < result.Item1.Value) continue;
 
                         //discard outliers after end
-                        if (discardOutliers && result.Item2.HasValue && date > result.Item2.Value)
-                        {
-                            continue;
-                        }
+                        if (discardOutliers && result.Item2.HasValue && date > result.Item2.Value) continue;
 
                         toReturn.TryAdd(date, new ArchivalPeriodicityCount());
 
@@ -105,17 +100,21 @@ FROM [PeriodicityState]
                         switch ((string)r["RowEvaluation"])
                         {
                             case "Correct":
-                                toIncrement.CountGood += (int) r["CountOfRecords"];
+                                toIncrement.CountGood += (int)r["CountOfRecords"];
                                 toIncrement.Total += (int)r["CountOfRecords"];
                                 break;
-                            case "InvalidatesRow": toIncrement.Total += (int)r["CountOfRecords"];
+                            case "InvalidatesRow":
+                                toIncrement.Total += (int)r["CountOfRecords"];
                                 break;
-                            case "Missing": toIncrement.Total += (int)r["CountOfRecords"];
+                            case "Missing":
+                                toIncrement.Total += (int)r["CountOfRecords"];
                                 break;
-                            case "Wrong": toIncrement.Total += (int)r["CountOfRecords"];
+                            case "Wrong":
+                                toIncrement.Total += (int)r["CountOfRecords"];
                                 break;
-                            default:throw new ArgumentOutOfRangeException(
-                                $"Unexpected RowEvaluation '{r["RowEvaluation"]}'");
+                            default:
+                                throw new ArgumentOutOfRangeException(
+                                    $"Unexpected RowEvaluation '{r["RowEvaluation"]}'");
                         }
                     }
                 }
@@ -134,29 +133,29 @@ FROM [PeriodicityState]
     /// <param name="pivotCategoryValue"></param>
     /// <param name="pivot"></param>
     /// <returns></returns>
-    public static DataTable GetPeriodicityForDataTableForEvaluation(Evaluation evaluation, string pivotCategoryValue, bool pivot)
+    public static DataTable GetPeriodicityForDataTableForEvaluation(Evaluation evaluation, string pivotCategoryValue,
+        bool pivot)
     {
         using (var con = evaluation.DQERepository.GetConnection())
         {
-            var sql = pivot ? string.Format(PeriodicityPivotSql, evaluation.ID, pivotCategoryValue) : $@"Select [Evaluation_ID]
+            var sql = pivot
+                ? string.Format(PeriodicityPivotSql, evaluation.ID, pivotCategoryValue)
+                : $@"Select [Evaluation_ID]
       ,CAST([Year] as varchar(4)) + '-' + datename(month,dateadd(month, [Month] - 1, 0)) as YearMonth
       ,[CountOfRecords]
       ,[RowEvaluation] from PeriodicityState where Evaluation_ID={evaluation.ID} AND PivotCategory = '{pivotCategoryValue}'";
 
 
-            using(var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
+            using (var cmd = DatabaseCommandHelper.GetCommand(sql, con.Connection, con.Transaction))
             using (var da = DatabaseCommandHelper.GetDataAdapter(cmd))
             {
                 var dt = new DataTable();
                 da.Fill(dt);
 
                 // if there are no rows (table is empty) return null instead
-                if(dt.Columns.Count == 0 || dt.Rows.Count == 0)
-                {
-                    return null;
-                }
+                if (dt.Columns.Count == 0 || dt.Rows.Count == 0) return null;
 
-                if(pivot)
+                if (pivot)
                 {
                     dt.Columns["Correct"].SetOrdinal(3);
                     dt.Columns["Wrong"].SetOrdinal(4);
diff --git a/Rdmp.Core/DataQualityEngine/Data/RowState.cs b/Rdmp.Core/DataQualityEngine/Data/RowState.cs
index 59bc808935..f5ce35d762 100644
--- a/Rdmp.Core/DataQualityEngine/Data/RowState.cs
+++ b/Rdmp.Core/DataQualityEngine/Data/RowState.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.DataQualityEngine.Data;
 /// </summary>
 public class RowState
 {
-
     public int Correct { get; private set; }
     public int Missing { get; private set; }
     public int Wrong { get; private set; }
@@ -30,18 +29,17 @@ public RowState(DbDataReader r)
     {
         Correct = Convert.ToInt32(r["Correct"]);
         Missing = Convert.ToInt32(r["Missing"]);
-        Wrong   = Convert.ToInt32(r["Wrong"]);
+        Wrong = Convert.ToInt32(r["Wrong"]);
         Invalid = Convert.ToInt32(r["Invalid"]);
         PivotCategory = (string)r["PivotCategory"];
         DataLoadRunID = Convert.ToInt32(r["DataLoadRunID"]);
         ValidatorXML = r["ValidatorXML"].ToString();
     }
 
-        
 
-    public RowState(Evaluation evaluation, int dataLoadRunID, int correct, int missing, int wrong,int invalid, string validatorXml,string pivotCategory, DbConnection con, DbTransaction transaction)
+    public RowState(Evaluation evaluation, int dataLoadRunID, int correct, int missing, int wrong, int invalid,
+        string validatorXml, string pivotCategory, DbConnection con, DbTransaction transaction)
     {
-
         var sql = string.Format(
             "INSERT INTO RowState(Evaluation_ID,Correct,Missing,Wrong,Invalid,DataLoadRunID,ValidatorXML,PivotCategory)VALUES({0},{1},{2},{3},{4},{5},@validatorXML,{6})",
             evaluation.ID,
@@ -55,7 +53,7 @@ public RowState(Evaluation evaluation, int dataLoadRunID, int correct, int missi
 
         using (var cmd = DatabaseCommandHelper.GetCommand(sql, con, transaction))
         {
-            DatabaseCommandHelper.AddParameterWithValueToCommand("@validatorXML",cmd,validatorXml);
+            DatabaseCommandHelper.AddParameterWithValueToCommand("@validatorXML", cmd, validatorXml);
             DatabaseCommandHelper.AddParameterWithValueToCommand("@pivotCategory", cmd, pivotCategory);
             cmd.ExecuteNonQuery();
         }
diff --git a/Rdmp.Core/DataQualityEngine/DatasetTimespanCalculator.cs b/Rdmp.Core/DataQualityEngine/DatasetTimespanCalculator.cs
index 50e09e4502..c7cedeff99 100644
--- a/Rdmp.Core/DataQualityEngine/DatasetTimespanCalculator.cs
+++ b/Rdmp.Core/DataQualityEngine/DatasetTimespanCalculator.cs
@@ -24,9 +24,9 @@ namespace Rdmp.Core.DataQualityEngine;
 public class DatasetTimespanCalculator : IDetermineDatasetTimespan
 {
     /// <inheritdoc/>
-    public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue,bool discardOutliers, out DateTime? accurateAsOf)
+    public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue, bool discardOutliers,
+        out DateTime? accurateAsOf)
     {
-
         var result = GetMachineReadableTimespanIfKnownOf(catalogue, discardOutliers, out accurateAsOf);
 
         if (result.Item1 == null || result.Item2 == null)
@@ -35,7 +35,8 @@ public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue,bool discard
         return $"{result.Item1.Value:yyyy-MMM} To {result.Item2.Value:yyyy-MMM}";
     }
 
-    public static Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Evaluation evaluation, bool discardOutliers)
+    public static Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Evaluation evaluation,
+        bool discardOutliers)
     {
         var dt = PeriodicityState.GetPeriodicityForDataTableForEvaluation(evaluation, "ALL", false);
 
@@ -46,23 +47,19 @@ public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue,bool discard
 
         DateTime? minMonth = null;
         for (var i = 0; i < dt.Rows.Count; i++)
-        {
             if (Convert.ToInt32(dt.Rows[i]["CountOfRecords"]) > discardThreshold)
             {
                 minMonth = DateTime.Parse(dt.Rows[i][1].ToString());
                 break;
             }
-        }
 
         DateTime? maxMonth = null;
         for (var i = dt.Rows.Count - 1; i >= 0; i--)
-        {
             if (Convert.ToInt32(dt.Rows[i]["CountOfRecords"]) > discardThreshold)
             {
                 maxMonth = DateTime.Parse(dt.Rows[i][1].ToString());
                 break;
             }
-        }
 
         if (maxMonth == null || minMonth == null)
             return Unknown();
@@ -70,7 +67,8 @@ public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue,bool discard
         return Tuple.Create(minMonth, maxMonth);
     }
 
-    public Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Catalogue catalogue, bool discardOutliers, out DateTime? accurateAsOf)
+    public Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Catalogue catalogue, bool discardOutliers,
+        out DateTime? accurateAsOf)
     {
         accurateAsOf = null;
         Evaluation mostRecentEvaluation;
@@ -93,10 +91,7 @@ public string GetHumanReadableTimespanIfKnownOf(Catalogue catalogue,bool discard
         return GetMachineReadableTimespanIfKnownOf(mostRecentEvaluation, discardOutliers);
     }
 
-    private static Tuple<DateTime?, DateTime?> Unknown()
-    {
-        return Tuple.Create<DateTime?, DateTime?>(null, null);
-    }
+    private static Tuple<DateTime?, DateTime?> Unknown() => Tuple.Create<DateTime?, DateTime?>(null, null);
 
     private static int GetDiscardThreshold(DataTable dt)
     {
@@ -106,16 +101,16 @@ private static int GetDiscardThreshold(DataTable dt)
         foreach (DataRow row in dt.Rows)
         {
             var currentValue = Convert.ToInt32(row["CountOfRecords"]);
-                
-            if(currentValue == 0)
+
+            if (currentValue == 0)
                 continue;
 
             total += currentValue;
             counted++;
         }
 
-        var nonZeroAverage = total/(double)counted;
+        var nonZeroAverage = total / (double)counted;
 
-        return (int)(nonZeroAverage/1000);
+        return (int)(nonZeroAverage / 1000);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Reports/CatalogueConstraintReport.cs b/Rdmp.Core/DataQualityEngine/Reports/CatalogueConstraintReport.cs
index 5349e1225f..8038df6f9e 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/CatalogueConstraintReport.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/CatalogueConstraintReport.cs
@@ -35,6 +35,7 @@ namespace Rdmp.Core.DataQualityEngine.Reports;
 public class CatalogueConstraintReport : DataQualityReport
 {
     private readonly string _dataLoadRunFieldName;
+
     //where the data is located 
     private DiscoveredServer _server;
     private QueryBuilder _queryBuilder;
@@ -43,8 +44,8 @@ public class CatalogueConstraintReport : DataQualityReport
 
     public static int MaximumPivotValues = 5000;
 
-    private Dictionary<string,DQEStateOverDataLoadRunId> byPivotRowStatesOverDataLoadRunId = new();
-    private Dictionary<string,PeriodicityCubesOverTime> byPivotCategoryCubesOverTime = new();
+    private Dictionary<string, DQEStateOverDataLoadRunId> byPivotRowStatesOverDataLoadRunId = new();
+    private Dictionary<string, PeriodicityCubesOverTime> byPivotCategoryCubesOverTime = new();
 
     private IExternalDatabaseServer _loggingServer;
     private string _loggingTask;
@@ -60,7 +61,6 @@ public CatalogueConstraintReport(ICatalogue catalogue, string dataLoadRunFieldNa
     {
         _dataLoadRunFieldName = dataLoadRunFieldName;
         _catalogue = catalogue;
-            
     }
 
     private void SetupLogging(ICatalogueRepository repository)
@@ -83,13 +83,16 @@ private void SetupLogging(ICatalogueRepository repository)
             }
         }
         else
+        {
             throw new NotSupportedException(
                 "You must set a Default LiveLoggingServer so we can audit the DQE run, do this through the ManageExternalServers dialog");
+        }
     }
 
     private bool haveComplainedAboutNullCategories = false;
 
-    public override void GenerateReport(ICatalogue c, IDataLoadEventListener listener, CancellationToken cancellationToken)
+    public override void GenerateReport(ICatalogue c, IDataLoadEventListener listener,
+        CancellationToken cancellationToken)
     {
         SetupLogging(c.CatalogueRepository);
 
@@ -142,7 +145,7 @@ public override void GenerateReport(ICatalogue c, IDataLoadEventListener listene
 
                         //if it has a value use it (otherwise it is null so use 0 - ugh I know, it's a primary key constraint issue)
                         if (runID != null)
-                            dataLoadRunIDOfCurrentRecord = (int) runID;
+                            dataLoadRunIDOfCurrentRecord = (int)runID;
                     }
 
                     string pivotValue = null;
@@ -181,7 +184,6 @@ public override void GenerateReport(ICatalogue c, IDataLoadEventListener listene
                             byPivotRowStatesOverDataLoadRunId.Add(pivotValue,
                                 new DQEStateOverDataLoadRunId(pivotValue));
                             byPivotCategoryCubesOverTime.Add(pivotValue, new PeriodicityCubesOverTime(pivotValue));
-
                         }
 
                         //now we are sure that the dictionaries have the category field we can increment it
@@ -189,18 +191,19 @@ public override void GenerateReport(ICatalogue c, IDataLoadEventListener listene
                             byPivotCategoryCubesOverTime[pivotValue], byPivotRowStatesOverDataLoadRunId[pivotValue]);
                     }
 
-                    if (progress%5000 == 0)
+                    if (progress % 5000 == 0)
                         forker.OnProgress(this,
                             new ProgressEventArgs($"Processing {_catalogue}",
                                 new ProgressMeasurement(progress, ProgressType.Records), sw.Elapsed));
-
                 }
+
                 //final value
                 forker.OnProgress(this,
                     new ProgressEventArgs($"Processing {_catalogue}",
                         new ProgressMeasurement(progress, ProgressType.Records), sw.Elapsed));
                 con.Close();
             }
+
             sw.Stop();
 
             foreach (var state in byPivotRowStatesOverDataLoadRunId.Values)
@@ -222,7 +225,6 @@ public override void GenerateReport(ICatalogue c, IDataLoadEventListener listene
                             periodicity.CommitToDatabase(evaluation);
 
                     dqeRepository.EndTransactedConnection(true);
-
                 }
                 catch (Exception)
                 {
@@ -234,7 +236,6 @@ public override void GenerateReport(ICatalogue c, IDataLoadEventListener listene
             forker.OnNotify(this,
                 new NotifyEventArgs(ProgressEventType.Information,
                     "CatalogueConstraintReport completed successfully  and committed results to DQE server"));
-
         }
         catch (Exception e)
         {
@@ -261,8 +262,7 @@ private string GetStringValueForPivotField(object o, IDataLoadEventListener list
 
         if (!_haveComplainedAboutTrailingWhitespaces && stringValue != trimmedValue)
         {
-
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                 $"Found trailing/leading whitespace in value in Pivot field, this will be trimmed off:'{o}'"));
             _haveComplainedAboutTrailingWhitespaces = true;
         }
@@ -272,18 +272,19 @@ private string GetStringValueForPivotField(object o, IDataLoadEventListener list
 
     private string _timePeriodicityField;
     private string _pivotCategory;
-        
 
 
     public override void Check(ICheckNotifier notifier)
     {
-            
         //there is a catalogue
         if (_catalogue == null)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Catalogue has not been set, either use the constructor with Catalogue parameter or use the blank constructor and call CatalogueSupportsReport instead", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Catalogue has not been set, either use the constructor with Catalogue parameter or use the blank constructor and call CatalogueSupportsReport instead",
+                CheckResult.Fail));
             return;
         }
+
         try
         {
             var dqeRepository = ExplicitDQERepository ?? new DQERepository(_catalogue.CatalogueRepository);
@@ -295,7 +296,7 @@ public override void Check(ICheckNotifier notifier)
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     "Failed to create DQE Repository, possibly there is no DataQualityEngine Reporting Server (ExternalDatabaseServer).  You will need to create/set one in CatalogueManager by using 'Locations=>Manage External Servers...'",
-                    CheckResult.Fail,e));
+                    CheckResult.Fail, e));
         }
 
         try
@@ -312,12 +313,15 @@ public override void Check(ICheckNotifier notifier)
         if (string.IsNullOrWhiteSpace(_catalogue.ValidatorXML))
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"There is no ValidatorXML specified for the Catalogue {_catalogue}, you must configure validation rules",CheckResult.Fail));
+                $"There is no ValidatorXML specified for the Catalogue {_catalogue}, you must configure validation rules",
+                CheckResult.Fail));
             return;
         }
+
         notifier.OnCheckPerformed(new CheckEventArgs(
-            $"Found ValidatorXML specified for the Catalogue {_catalogue}:{Environment.NewLine}{_catalogue.ValidatorXML}", CheckResult.Success));
-            
+            $"Found ValidatorXML specified for the Catalogue {_catalogue}:{Environment.NewLine}{_catalogue.ValidatorXML}",
+            CheckResult.Success));
+
         //the XML is legit
         try
         {
@@ -326,7 +330,8 @@ public override void Check(ICheckNotifier notifier)
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"ValidatorXML for Catalogue {_catalogue} could not be deserialized into a Validator",CheckResult.Fail,e));
+                $"ValidatorXML for Catalogue {_catalogue} could not be deserialized into a Validator", CheckResult.Fail,
+                e));
             return;
         }
 
@@ -339,10 +344,13 @@ public override void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not get connection to Catalogue {_catalogue}",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not get connection to Catalogue {_catalogue}",
+                CheckResult.Fail, e));
             return;
         }
-        notifier.OnCheckPerformed(new CheckEventArgs($"Found connection string for Catalogue {_catalogue}", CheckResult.Success));
+
+        notifier.OnCheckPerformed(new CheckEventArgs($"Found connection string for Catalogue {_catalogue}",
+            CheckResult.Success));
 
         //we can connect to the server
         try
@@ -351,7 +359,8 @@ public override void Check(ICheckNotifier notifier)
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to server for Catalogue {_catalogue}",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Could not connect to server for Catalogue {_catalogue}",
+                CheckResult.Fail, e));
         }
 
         //there is extraction SQL
@@ -360,31 +369,29 @@ public override void Check(ICheckNotifier notifier)
             _queryBuilder = new QueryBuilder("", "");
             _queryBuilder.AddColumnRange(_catalogue.GetAllExtractionInformation(ExtractionCategory.Any));
 
-            var duplicates = _queryBuilder.SelectColumns.GroupBy(c => c.IColumn.GetRuntimeName()).SelectMany(grp=>grp.Skip(1)).ToArray();
+            var duplicates = _queryBuilder.SelectColumns.GroupBy(c => c.IColumn.GetRuntimeName())
+                .SelectMany(grp => grp.Skip(1)).ToArray();
 
-            if(duplicates.Any())
+            if (duplicates.Any())
                 foreach (var column in duplicates)
-                {
                     notifier.OnCheckPerformed(
                         new CheckEventArgs(
                             $"The column name {column.IColumn.GetRuntimeName()} is duplicated in the SELECT command, column names must be unique!  Most likely you have 2+ columns with the same name (from different tables) or duplicate named CatalogueItem/Aliases for the same underlying ColumnInfo",
                             CheckResult.Fail));
-                }
 
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Query Builder decided the extraction SQL was:{Environment.NewLine}{_queryBuilder.SQL}",CheckResult.Success));
+                $"Query Builder decided the extraction SQL was:{Environment.NewLine}{_queryBuilder.SQL}",
+                CheckResult.Success));
 
             SetupAdditionalValidationRules(notifier);
-
         }
         catch (Exception e)
         {
             notifier.OnCheckPerformed(new CheckEventArgs("Failed to generate extraction SQL", CheckResult.Fail, e));
         }
-            
+
         //for each thing we are about to try and validate
         foreach (var itemValidator in _validator.ItemValidators)
-        {
             //is there a column in the query builder that matches it
             if (
                 //there isnt!
@@ -392,13 +399,14 @@ public override void Check(ICheckNotifier notifier)
                     c => c.IColumn.GetRuntimeName().Equals(itemValidator.TargetProperty)))
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Could not find a column in the extraction SQL that would match TargetProperty {itemValidator.TargetProperty}", CheckResult.Fail));
+                        $"Could not find a column in the extraction SQL that would match TargetProperty {itemValidator.TargetProperty}",
+                        CheckResult.Fail));
             else
                 //there is that is good
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Found column in query builder columns which matches TargetProperty {itemValidator.TargetProperty}", CheckResult.Success));
-        }
+                        $"Found column in query builder columns which matches TargetProperty {itemValidator.TargetProperty}",
+                        CheckResult.Success));
 
         _containsDataLoadID =
             _queryBuilder.SelectColumns.Any(
@@ -410,19 +418,19 @@ public override void Check(ICheckNotifier notifier)
                     $"Found {_dataLoadRunFieldName} field in ExtractionInformation",
                     CheckResult.Success));
         else
-        {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     $"Did not find ExtractionInformation for a column called {_dataLoadRunFieldName}, this will prevent you from viewing the resulting report subdivided by data load batch (make sure you have this column and that it is marked as extractable)",
                     CheckResult.Warning));
-        }
 
 
         if (_catalogue.PivotCategory_ExtractionInformation_ID == null)
+        {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     "Catalogue does not have a pivot category so all records will appear as PivotCategory 'ALL'",
                     CheckResult.Warning));
+        }
         else
         {
             _pivotCategory = _catalogue.PivotCategory_ExtractionInformation.GetRuntimeName();
@@ -436,13 +444,16 @@ public override void Check(ICheckNotifier notifier)
         if (tblValuedFunctions.Any())
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
-                    $"Catalogue contains 1+ table valued function in its TableInfos ({string.Join(",", tblValuedFunctions.Select(t => t.ToString()))}", CheckResult.Fail));
+                    $"Catalogue contains 1+ table valued function in its TableInfos ({string.Join(",", tblValuedFunctions.Select(t => t.ToString()))}",
+                    CheckResult.Fail));
 
         if (_catalogue.TimeCoverage_ExtractionInformation_ID == null)
+        {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     "Catalogue does not have a time coverage field set",
                     CheckResult.Fail));
+        }
         else
         {
             var periodicityExtractionInformation = _catalogue.TimeCoverage_ExtractionInformation;
@@ -470,11 +481,11 @@ private void SetupAdditionalValidationRules(ICheckNotifier notifier)
     {
         //for each description
         foreach (var descQtc in _queryBuilder.SelectColumns.Where(qtc => qtc.IsLookupDescription))
-        {
             try
             {
                 //if we have a the foreign key too
-                foreach(var foreignQtc in _queryBuilder.SelectColumns.Where(fk => fk.IsLookupForeignKey && fk.LookupTable.ID == descQtc.LookupTable.ID))
+                foreach (var foreignQtc in _queryBuilder.SelectColumns.Where(fk =>
+                             fk.IsLookupForeignKey && fk.LookupTable.ID == descQtc.LookupTable.ID))
                 {
                     var descriptionFieldName = descQtc.IColumn.GetRuntimeName();
                     var foreignKeyFieldName = foreignQtc.IColumn.GetRuntimeName();
@@ -489,43 +500,46 @@ private void SetupAdditionalValidationRules(ICheckNotifier notifier)
                     }
 
                     //if it doesn't already have a prediction
-                    if (itemValidator.SecondaryConstraints.All(constraint => constraint.GetType() != typeof(Prediction)))
+                    if (itemValidator.SecondaryConstraints.All(constraint =>
+                            constraint.GetType() != typeof(Prediction)))
                     {
                         //Add an item validator onto the fk column that targets the description column with a nullness prediction
                         var newRule = new Prediction(new ValuePredictsOtherValueNullness(), foreignKeyFieldName)
-                            {
-                                Consequence = Consequence.Missing
-                            };
+                        {
+                            Consequence = Consequence.Missing
+                        };
 
                         //add one that says 'if I am null my fk should also be null'
                         itemValidator.SecondaryConstraints.Add(newRule);
-                        
+
                         notifier.OnCheckPerformed(
                             new CheckEventArgs(
-                                $"Dynamically added value->value Nullnes constraint with consequence Missing onto columns {foreignKeyFieldName} and {descriptionFieldName} because they have a configured Lookup relationship in the Catalogue", CheckResult.Success));
+                                $"Dynamically added value->value Nullnes constraint with consequence Missing onto columns {foreignKeyFieldName} and {descriptionFieldName} because they have a configured Lookup relationship in the Catalogue",
+                                CheckResult.Success));
                     }
-           
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 notifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Failed to add new lookup validation rule for column {descQtc.IColumn.GetRuntimeName()}", CheckResult.Warning, ex));
+                        $"Failed to add new lookup validation rule for column {descQtc.IColumn.GetRuntimeName()}",
+                        CheckResult.Warning, ex));
             }
-        }
     }
 
-    private void ProcessRecord(DQERepository dqeRepository, int dataLoadRunIDOfCurrentRecord, DbDataReader r, PeriodicityCubesOverTime periodicity, DQEStateOverDataLoadRunId states)
+    private void ProcessRecord(DQERepository dqeRepository, int dataLoadRunIDOfCurrentRecord, DbDataReader r,
+        PeriodicityCubesOverTime periodicity, DQEStateOverDataLoadRunId states)
     {
         //make sure all the results dictionaries
         states.AddKeyToDictionaries(dataLoadRunIDOfCurrentRecord, _validator, _queryBuilder);
 
         //ask the validator to validate! 
         _validator.ValidateVerboseAdditive(
-            r,//validate the data reader
-            states.ColumnValidationFailuresByDataLoadRunID[dataLoadRunIDOfCurrentRecord],//additively adjust the validation failures dictionary
-            out var worstConsequence);//and tell us what the worst consequence in the row was 
+            r, //validate the data reader
+            states.ColumnValidationFailuresByDataLoadRunID[
+                dataLoadRunIDOfCurrentRecord], //additively adjust the validation failures dictionary
+            out var worstConsequence); //and tell us what the worst consequence in the row was 
 
 
         //increment the time periodicity hypercube!
@@ -540,8 +554,10 @@ private void ProcessRecord(DQERepository dqeRepository, int dataLoadRunIDOfCurre
             catch (InvalidCastException e)
             {
                 throw new Exception(
-                    $"Found value {r[_timePeriodicityField]} of type {r[_timePeriodicityField].GetType().Name} in your time periodicity field which was not a valid date time, make sure your time periodicity field is a datetime datatype",e);
+                    $"Found value {r[_timePeriodicityField]} of type {r[_timePeriodicityField].GetType().Name} in your time periodicity field which was not a valid date time, make sure your time periodicity field is a datetime datatype",
+                    e);
             }
+
             if (dt != null)
                 periodicity.IncrementHyperCube(dt.Value.Year, dt.Value.Month, worstConsequence);
         }
diff --git a/Rdmp.Core/DataQualityEngine/Reports/DQEStateOverDataLoadRunId.cs b/Rdmp.Core/DataQualityEngine/Reports/DQEStateOverDataLoadRunId.cs
index aa950d28ac..94f8fa4681 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/DQEStateOverDataLoadRunId.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/DQEStateOverDataLoadRunId.cs
@@ -57,7 +57,8 @@ public void AddKeyToDictionaries(int dataLoadRunID, Validator validator, QueryBu
         //column level
         //ensure validation failures contain it
         if (!ColumnValidationFailuresByDataLoadRunID.ContainsKey(dataLoadRunID))
-            ColumnValidationFailuresByDataLoadRunID.Add(dataLoadRunID, new VerboseValidationResults(validator.ItemValidators.ToArray()));
+            ColumnValidationFailuresByDataLoadRunID.Add(dataLoadRunID,
+                new VerboseValidationResults(validator.ItemValidators.ToArray()));
 
         //ensure unconstrained columns have it
         if (!AllColumnStates.ContainsKey(dataLoadRunID))
@@ -66,11 +67,11 @@ public void AddKeyToDictionaries(int dataLoadRunID, Validator validator, QueryBu
 
             foreach (var col in queryBuilder.SelectColumns.Select(s => s.IColumn))
             {
-
                 var runtimeName = col.GetRuntimeName();
                 var validationXML = "";
 
-                var itemValidator = validator.ItemValidators.SingleOrDefault(iv => iv.TargetProperty.Equals(runtimeName));
+                var itemValidator =
+                    validator.ItemValidators.SingleOrDefault(iv => iv.TargetProperty.Equals(runtimeName));
 
                 //if it is a constrained column it is likely to have child ColumnConstraints results but whatever - the important thing is we should document the state of the ItemValidator for this col
                 if (itemValidator != null)
@@ -103,7 +104,7 @@ public void AddKeyToDictionaries(int dataLoadRunID, Validator validator, QueryBu
     }
 
     private bool _correctValuesCalculated = false;
-        
+
     /// <summary>
     /// Calculates the final counts for each Column based on the validation failures documented to date.  You can only call this method once and it
     /// must be called before committing to database.
@@ -119,31 +120,27 @@ public void CalculateFinalValues()
         //adjust the counts for each data load run id \ column according to the dictionary of validation failures
         //per run id
         foreach (var dataLoadRunID in AllColumnStates.Keys)
-        {
             //per column
-            foreach (var column in AllColumnStates[dataLoadRunID])
+        foreach (var column in AllColumnStates[dataLoadRunID])
+            //if it is a constrained column
+            if (ColumnValidationFailuresByDataLoadRunID[dataLoadRunID]
+                .DictionaryOfFailure.TryGetValue(column.TargetProperty, out var kvp))
             {
-                //if it is a constrained column
-                if (ColumnValidationFailuresByDataLoadRunID[dataLoadRunID]
-                    .DictionaryOfFailure.TryGetValue(column.TargetProperty, out var kvp))
-                {
-                    //adjust our correct value downwards according to the results of the dictionary of failure
-
-                    column.CountMissing = kvp[Consequence.Missing];
-                    column.CountWrong = kvp[Consequence.Wrong];
-                    column.CountInvalidatesRow = kvp[Consequence.InvalidatesRow];
-
-                    column.CountCorrect -= kvp[Consequence.Missing];
-                    column.CountCorrect -= kvp[Consequence.Wrong];
-                    column.CountCorrect -= kvp[Consequence.InvalidatesRow];
-                }
+                //adjust our correct value downwards according to the results of the dictionary of failure
+                column.CountMissing = kvp[Consequence.Missing];
+                column.CountWrong = kvp[Consequence.Wrong];
+                column.CountInvalidatesRow = kvp[Consequence.InvalidatesRow];
+
+                column.CountCorrect -= kvp[Consequence.Missing];
+                column.CountCorrect -= kvp[Consequence.Wrong];
+                column.CountCorrect -= kvp[Consequence.InvalidatesRow];
             }
-        }
     }
 
-    public void CommitToDatabase(Evaluation evaluation, ICatalogue catalogue, DbConnection con, DbTransaction transaction)
+    public void CommitToDatabase(Evaluation evaluation, ICatalogue catalogue, DbConnection con,
+        DbTransaction transaction)
     {
-        if(!_correctValuesCalculated)
+        if (!_correctValuesCalculated)
             throw new Exception("You must call CalculateFinalValues before committing to the database");
 
         IEnumerable<int> novelDataLoadRunIDs = RowsPassingValidationByDataLoadRunID.Keys;
@@ -165,8 +162,7 @@ public void CommitToDatabase(Evaluation evaluation, ICatalogue catalogue, DbConn
 
             //record the column states calculations (how many total values in column x are good/bad/ugly etc)
             foreach (var columnState in AllColumnStates[dataLoadRunID])
-                columnState.Commit(evaluation,_pivotCategory, con, transaction);
+                columnState.Commit(evaluation, _pivotCategory, con, transaction);
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Reports/DataQualityReport.cs b/Rdmp.Core/DataQualityEngine/Reports/DataQualityReport.cs
index ca4c4648ae..9a83b52c2f 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/DataQualityReport.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/DataQualityReport.cs
@@ -24,7 +24,8 @@ public virtual bool CatalogueSupportsReport(ICatalogue c)
         Check(checkNotifier);
 
         return checkNotifier.GetWorst() <= CheckResult.Warning;
-
     }
-    public abstract void GenerateReport(ICatalogue c, IDataLoadEventListener listener, CancellationToken cancellationToken);
+
+    public abstract void GenerateReport(ICatalogue c, IDataLoadEventListener listener,
+        CancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Reports/IDataQualityReport.cs b/Rdmp.Core/DataQualityEngine/Reports/IDataQualityReport.cs
index d82aaac507..1d2f18e8af 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/IDataQualityReport.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/IDataQualityReport.cs
@@ -15,8 +15,8 @@ namespace Rdmp.Core.DataQualityEngine.Reports;
 /// Shared interface for any DQE run implementation (currently only CatalogueConstraintReport).  Supports confirming that the report can be run on a given
 /// Catalogue and running it.
 /// </summary>
-public interface IDataQualityReport: ICheckable
+public interface IDataQualityReport : ICheckable
 {
     bool CatalogueSupportsReport(ICatalogue c);
-    void GenerateReport(ICatalogue c, IDataLoadEventListener listener,CancellationToken cancellationToken);
+    void GenerateReport(ICatalogue c, IDataLoadEventListener listener, CancellationToken cancellationToken);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Reports/LoadProgressSummaryReport.cs b/Rdmp.Core/DataQualityEngine/Reports/LoadProgressSummaryReport.cs
index 2ca517bff7..825c5c2c0c 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/LoadProgressSummaryReport.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/LoadProgressSummaryReport.cs
@@ -26,7 +26,7 @@ namespace Rdmp.Core.DataQualityEngine.Reports;
 /// intended to assist the user in rapidly determining how much of a given dataset collection based on a cache fetch/load DLE job has currently been loaded
 /// (according to the DQE).  See LoadProgressDiagram
 /// </summary>
-public class LoadProgressSummaryReport:ICheckable
+public class LoadProgressSummaryReport : ICheckable
 {
     private readonly ILoadProgress _loadProgress;
     private readonly ILoadMetadata _loadMetadata;
@@ -43,7 +43,7 @@ public class LoadProgressSummaryReport:ICheckable
     public HashSet<Catalogue> CataloguesMissingDQERuns { get; private set; }
     private ICacheProgress _cacheProgress;
 
-    public Dictionary<Catalogue,Evaluation> CataloguesWithDQERuns { get; private set; }
+    public Dictionary<Catalogue, Evaluation> CataloguesWithDQERuns { get; private set; }
 
     public LoadProgressSummaryReport(LoadProgress loadProgress)
     {
@@ -83,9 +83,8 @@ public void FetchDataFromDQE(ICheckNotifier notifier)
             }
             else
             {
-                CataloguesWithDQERuns.Add(catalogue,evaluation);
+                CataloguesWithDQERuns.Add(catalogue, evaluation);
             }
-
         }
         //The following code uses an epic pivot to produce something like:
         /*YearMonth	Year	Month	 6429	 6430
@@ -96,10 +95,9 @@ public void FetchDataFromDQE(ICheckNotifier notifier)
             1970-6	1970	    6	    2	    0*/
 
 
-
         if (!CataloguesWithDQERuns.Any())
             throw new Exception("There are no Catalogues that have had DQE run on them in this LoadMetadata");
-            
+
         if (notifier != null)
             foreach (var catalogue in CataloguesWithDQERuns)
                 notifier.OnCheckPerformed(
@@ -111,17 +109,16 @@ public void FetchDataFromDQE(ICheckNotifier notifier)
         {
             CataloguesPeriodictiyData = new DataTable();
 
-            var cmd = dqeRepository.DiscoveredServer.GetCommand(GetTotalsByMonthSQL(CataloguesWithDQERuns.Keys.ToArray()), con);
+            var cmd = dqeRepository.DiscoveredServer.GetCommand(
+                GetTotalsByMonthSQL(CataloguesWithDQERuns.Keys.ToArray()), con);
             var da = dqeRepository.DiscoveredServer.GetDataAdapter(cmd);
             da.Fill(CataloguesPeriodictiyData);
         }
 
         //Now rename the columns from ID to the catalogue name
         foreach (DataColumn col in CataloguesPeriodictiyData.Columns)
-        {
-            if (int.TryParse(col.ColumnName, out int cataId))
+            if (int.TryParse(col.ColumnName, out var cataId))
                 col.ColumnName = CataloguesWithDQERuns.Keys.Single(c => c.ID == cataId).Name;
-        }
 
         //Now extend the X axis up to the cache fill location
         var cacheProgress = _loadProgress.CacheProgress;
@@ -130,7 +127,6 @@ public void FetchDataFromDQE(ICheckNotifier notifier)
     }
 
 
-
     private void ExtendXAxisTill(DateTime value)
     {
         var targetYear = value.Year;
@@ -163,9 +159,9 @@ private void ExtendXAxisTill(DateTime value)
                 newRow[i] = 0;
         }
     }
+
     private void ExtendXAxisBackwardsTill(DateTime value)
     {
-
         var targetYear = value.Year;
         var targetMonth = value.Month;
 
@@ -208,14 +204,13 @@ public void Check(ICheckNotifier notifier)
         }
         catch (Exception ex)
         {
-
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     "Could not contact DQE server to check the 'real' coverage of the datasets linked to this LoadProgress, possibly because there isn't a DQE server yet.  You should create one in ManageExternalServers",
-                    CheckResult.Fail,ex));
+                    CheckResult.Fail, ex));
             return;
         }
-            
+
         if (CataloguesPeriodictiyData == null)
             FetchDataFromDQE(notifier);
 
@@ -227,7 +222,6 @@ public void Check(ICheckNotifier notifier)
                 new CheckEventArgs(
                     $"Catalogue '{cataloguesMissingDQERun}' is associated with the load '{_loadMetadata}' but has never had a DQE run executed on it, you should configure some basic validation on it and choose a time periodicity column and execute a DQE run on it.",
                     CheckResult.Fail));
-            
     }
 
     private void FetchCacheData(ICheckNotifier notifier)
@@ -238,11 +232,14 @@ private void FetchCacheData(ICheckNotifier notifier)
 
             try
             {
-                var cacheFileSystem = new CachingPipelineUseCase(_cacheProgress).CreateDestinationOnly(new FromCheckNotifierToDataLoadEventListener(notifier));
+                var cacheFileSystem =
+                    new CachingPipelineUseCase(_cacheProgress).CreateDestinationOnly(
+                        new FromCheckNotifierToDataLoadEventListener(notifier));
 
                 var layout = cacheFileSystem.CreateCacheLayout();
                 availableFiles = layout.GetSortedDateQueue(new ThrowImmediatelyDataLoadEventListener()).ToArray();
-                ResolvedCachePath = layout.GetLoadCacheDirectory(new FromCheckNotifierToDataLoadEventListener(notifier));
+                ResolvedCachePath =
+                    layout.GetLoadCacheDirectory(new FromCheckNotifierToDataLoadEventListener(notifier));
             }
             catch (Exception e)
             {
@@ -254,11 +251,11 @@ private void FetchCacheData(ICheckNotifier notifier)
             CachePeriodictiyData = new DataTable();
 
             CachePeriodictiyData.Columns.Add("YearMonth");
-            CachePeriodictiyData.Columns.Add("Year", typeof (int));
-            CachePeriodictiyData.Columns.Add("Month", typeof (int));
+            CachePeriodictiyData.Columns.Add("Year", typeof(int));
+            CachePeriodictiyData.Columns.Add("Month", typeof(int));
 
-            CachePeriodictiyData.Columns.Add("Fetch Failures", typeof (int));
-            CachePeriodictiyData.Columns.Add("Files In Cache", typeof (int));
+            CachePeriodictiyData.Columns.Add("Fetch Failures", typeof(int));
+            CachePeriodictiyData.Columns.Add("Files In Cache", typeof(int));
 
             var allFailures =
                 _cacheProgress.CacheFetchFailures
@@ -273,14 +270,12 @@ private void FetchCacheData(ICheckNotifier notifier)
             //Make sure main data table has room on its X axis for the cache failures and loaded files
             if (anyFailures)
             {
-
                 ExtendXAxisTill(allFailures.Max());
                 ExtendXAxisBackwardsTill(allFailures.Min());
             }
 
             if (anySuccesses)
             {
-
                 ExtendXAxisTill(availableFiles.Max());
                 ExtendXAxisBackwardsTill(availableFiles.Min());
             }
@@ -309,18 +304,19 @@ private void FetchCacheData(ICheckNotifier notifier)
             }
         }
         else
+        {
             notifier.OnCheckPerformed(
                 new CheckEventArgs(
                     $"There is no Cache configured for LoadProgress '{_loadProgress}' (Not nessesarily a problem e.g. if you have a RemoteTableAttacher or some other load module that uses LoadProgress directly, short cutting the need for a cache)",
                     CheckResult.Warning));
+        }
     }
 
 
-
     private static string GetTotalsByMonthSQL(Catalogue[] catalogues)
     {
-
-        return string.Format(GetTotalRecordsPerYearCountPivotByCatalogueSQL, string.Join(",", catalogues.Select(c=>c.ID)));
+        return string.Format(GetTotalRecordsPerYearCountPivotByCatalogueSQL,
+            string.Join(",", catalogues.Select(c => c.ID)));
     }
 
     private const string GetTotalRecordsPerYearCountPivotByCatalogueSQL =
@@ -417,5 +413,4 @@ ORDER BY
 Month'
 
 EXECUTE(@Query)";
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCube.cs b/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCube.cs
index 808069bc63..7567e7b8cb 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCube.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCube.cs
@@ -27,8 +27,8 @@ public PeriodicityCube(int year, int month)
         _consequenceCube.Add(Consequence.Missing, new PeriodicityState(year, month, Consequence.Missing));
         _consequenceCube.Add(Consequence.Wrong, new PeriodicityState(year, month, Consequence.Wrong));
         _consequenceCube.Add(Consequence.InvalidatesRow, new PeriodicityState(year, month, Consequence.InvalidatesRow));
-
     }
+
     public PeriodicityState GetStateForConsequence(Consequence? consequence)
     {
         if (consequence == null)
diff --git a/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCubesOverTime.cs b/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCubesOverTime.cs
index 2349020f02..c8fc2e2ff9 100644
--- a/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCubesOverTime.cs
+++ b/Rdmp.Core/DataQualityEngine/Reports/PeriodicityHelpers/PeriodicityCubesOverTime.cs
@@ -24,7 +24,7 @@ public class PeriodicityCubesOverTime
 {
     private readonly string _pivotCategory;
     private List<PeriodicityCube> allCubes = new();
-    private Dictionary<int,Dictionary<int,PeriodicityCube>>  hyperCube = new();
+    private Dictionary<int, Dictionary<int, PeriodicityCube>> hyperCube = new();
 
     public PeriodicityCubesOverTime(string pivotCategory)
     {
@@ -33,7 +33,6 @@ public PeriodicityCubesOverTime(string pivotCategory)
 
     public static void PeriodicityCube()
     {
-            
     }
 
     public void IncrementHyperCube(int year, int month, Consequence? worstConsequenceInRow)
@@ -41,7 +40,7 @@ public void IncrementHyperCube(int year, int month, Consequence? worstConsequenc
         PeriodicityCube newCube = null;
 
         //if year is missing
-        if(!hyperCube.ContainsKey(year))
+        if (!hyperCube.ContainsKey(year))
         {
             //create month dictionary
             var perMonth = new Dictionary<int, PeriodicityCube>
@@ -51,19 +50,19 @@ public void IncrementHyperCube(int year, int month, Consequence? worstConsequenc
             };
 
             //add month dictionary to year dictionary
-            hyperCube.Add(year,perMonth);
+            hyperCube.Add(year, perMonth);
         }
 
         //if month is missing
         if (!hyperCube[year].ContainsKey(month))
-            hyperCube[year].Add(month, newCube = new PeriodicityCube(year, month));//add the month to the year dictionary
+            hyperCube[year]
+                .Add(month, newCube = new PeriodicityCube(year, month)); //add the month to the year dictionary
 
         //increment the cell
         hyperCube[year][month].GetStateForConsequence(worstConsequenceInRow).CountOfRecords++;
 
-        if(newCube != null)
+        if (newCube != null)
             allCubes.Add(newCube);
-
     }
 
     public void CommitToDatabase(Evaluation evaluation)
diff --git a/Rdmp.Core/DataViewing/ArbitraryTableExtractionUICollection.cs b/Rdmp.Core/DataViewing/ArbitraryTableExtractionUICollection.cs
index b0ef5c6e5d..3c85d09098 100644
--- a/Rdmp.Core/DataViewing/ArbitraryTableExtractionUICollection.cs
+++ b/Rdmp.Core/DataViewing/ArbitraryTableExtractionUICollection.cs
@@ -18,7 +18,8 @@ namespace Rdmp.Core.DataViewing;
 /// <summary>
 /// <see cref="IViewSQLAndResultsCollection"/> for querying samples of arbitrary tables / columns
 /// </summary>
-public class ArbitraryTableExtractionUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection, IDataAccessPoint, IDataAccessCredentials
+public class ArbitraryTableExtractionUICollection : PersistableObjectCollection, IViewSQLAndResultsCollection,
+    IDataAccessPoint, IDataAccessCredentials
 {
     private DiscoveredTable _table;
 
@@ -32,10 +33,7 @@ public class ArbitraryTableExtractionUICollection : PersistableObjectCollection,
 
     public string Username { get; set; }
     public string Password { get; set; }
-    public string GetDecryptedPassword()
-    {
-        return Password ?? "";
-    }
+    public string GetDecryptedPassword() => Password ?? "";
 
     public string OverrideSql { get; set; }
 
@@ -44,7 +42,6 @@ public string GetDecryptedPassword()
     /// </summary>
     public ArbitraryTableExtractionUICollection()
     {
-
     }
 
     public ArbitraryTableExtractionUICollection(DiscoveredTable table) : this()
@@ -61,11 +58,9 @@ public ArbitraryTableExtractionUICollection(DiscoveredTable table) : this()
         Username = table.Database.Server.ExplicitUsernameIfAny;
         Password = table.Database.Server.ExplicitPasswordIfAny;
     }
+
     /// <nheritdoc/>
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(_arguments);
-    }
+    public override string SaveExtraText() => PersistStringHelper.SaveDictionaryToString(_arguments);
 
     public override void LoadExtraText(string s)
     {
@@ -82,10 +77,7 @@ public IEnumerable<DatabaseEntity> GetToolStripObjects()
         yield break;
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return this;
-    }
+    public IDataAccessPoint GetDataAccessPoint() => this;
 
     public string GetSql()
     {
@@ -107,10 +99,7 @@ public string GetSql()
         }
     }
 
-    public string GetTabName()
-    {
-        return $"View {_table.GetRuntimeName()}";
-    }
+    public string GetTabName() => $"View {_table.GetRuntimeName()}";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
@@ -122,6 +111,7 @@ public string Server
         get => _arguments[ServerKey];
         set => _arguments[ServerKey] = value;
     }
+
     public string Database
     {
         get => _arguments[DatabaseKey];
@@ -129,17 +119,11 @@ public string Database
     }
 
 
-
-    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context)
-    {
+    public IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context) =>
         //we have our own credentials if we do
-        return string.IsNullOrWhiteSpace(Username) ? null : this;
-    }
+        string.IsNullOrWhiteSpace(Username) ? null : this;
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _table.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => _table.GetQuerySyntaxHelper();
 
     public bool DiscoverExistence(DataAccessContext context, out string reason)
     {
@@ -151,6 +135,5 @@ public bool DiscoverExistence(DataAccessContext context, out string reason)
 
         reason = $"Table {_table} did not exist";
         return false;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataViewing/IAutoCompleteProvider.cs b/Rdmp.Core/DataViewing/IAutoCompleteProvider.cs
index 9e79348d23..1c710b9821 100644
--- a/Rdmp.Core/DataViewing/IAutoCompleteProvider.cs
+++ b/Rdmp.Core/DataViewing/IAutoCompleteProvider.cs
@@ -20,19 +20,19 @@ public interface IAutoCompleteProvider
     /// </summary>
     /// <param name="tableInfo"></param>
     void Add(ITableInfo tableInfo);
-        
+
     /// <summary>
     /// Add autocomplete strings/controls that represent <paramref name="aggregateConfiguration"/> to the user interface
     /// </summary>
     /// <param name="aggregateConfiguration"></param>
     void Add(AggregateConfiguration aggregateConfiguration);
-        
+
     /// <summary>
     /// Add autocomplete strings/controls that represent <paramref name="table"/> to the user interface
     /// </summary>
     /// <param name="table"></param>
     void Add(DiscoveredTable table);
-        
+
     /// <summary>
     /// Add autocomplete strings/controls that represent <paramref name="columnInfo"/> to the user interface
     /// </summary>
diff --git a/Rdmp.Core/DataViewing/ViewAggregateExtractUICollection.cs b/Rdmp.Core/DataViewing/ViewAggregateExtractUICollection.cs
index 9423e176e1..5cf493f38b 100644
--- a/Rdmp.Core/DataViewing/ViewAggregateExtractUICollection.cs
+++ b/Rdmp.Core/DataViewing/ViewAggregateExtractUICollection.cs
@@ -59,19 +59,15 @@ public IDataAccessPoint GetDataAccessPoint()
         //the aggregate has no dimensions
         if (dim != null) return dim.ColumnInfo.TableInfo;
         var table = AggregateConfiguration.ForcedJoins.FirstOrDefault() ?? throw new Exception(
-                $"AggregateConfiguration '{AggregateConfiguration}' has no AggregateDimensions and no TableInfo forced joins, we do not know where/what table to run the query on");
+            $"AggregateConfiguration '{AggregateConfiguration}' has no AggregateDimensions and no TableInfo forced joins, we do not know where/what table to run the query on");
         return table;
-
     }
 
     public string GetSql()
     {
         var ac = AggregateConfiguration;
 
-        if (!ac.IsCohortIdentificationAggregate)
-        {
-            return ac.GetQueryBuilder().SQL;
-        }
+        if (!ac.IsCohortIdentificationAggregate) return ac.GetQueryBuilder().SQL;
 
         var cic = ac.GetCohortIdentificationConfigurationIfAny();
         var globals = cic.GetAllParameters();
@@ -84,10 +80,7 @@ public string GetSql()
         return TopX.HasValue ? builder.GetDatasetSampleSQL(TopX.Value) : builder.SQL;
     }
 
-    public string GetTabName()
-    {
-        return $"View Top 100 {AggregateConfiguration}";
-    }
+    public string GetTabName() => $"View Top 100 {AggregateConfiguration}";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
@@ -95,10 +88,8 @@ public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
             autoComplete.Add(AggregateConfiguration);
     }
 
-    private AggregateConfiguration AggregateConfiguration => DatabaseObjects.OfType<AggregateConfiguration>().SingleOrDefault();
+    private AggregateConfiguration AggregateConfiguration =>
+        DatabaseObjects.OfType<AggregateConfiguration>().SingleOrDefault();
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return AggregateConfiguration?.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => AggregateConfiguration?.GetQuerySyntaxHelper();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataViewing/ViewCatalogueDataCollection.cs b/Rdmp.Core/DataViewing/ViewCatalogueDataCollection.cs
index 8fb610008e..0b899b2dc1 100644
--- a/Rdmp.Core/DataViewing/ViewCatalogueDataCollection.cs
+++ b/Rdmp.Core/DataViewing/ViewCatalogueDataCollection.cs
@@ -44,29 +44,26 @@ public ViewCatalogueDataCollection(Catalogue catalogue)
     /// </summary>
     public ViewCatalogueDataCollection()
     {
-
     }
 
     private void BuildBuilder()
     {
-        if(builder != null)
+        if (builder != null)
             return;
 
-        builder = new QueryBuilder(null,null);
-            
-        if(TopX.HasValue)
+        builder = new QueryBuilder(null, null);
+
+        if (TopX.HasValue)
             builder.TopX = TopX.Value;
 
         var cols = ExtractionInformations;
 
         // if there are no explicit columns use all
         if (!cols.Any())
-        {
             cols =
                 Catalogue.GetAllExtractionInformation(ExtractionCategory.Core)
                     .Union(Catalogue.GetAllExtractionInformation(ExtractionCategory.ProjectSpecific))
                     .ToArray();
-        }
 
         builder.AddColumnRange(cols);
 
@@ -75,7 +72,8 @@ private void BuildBuilder()
         foreach (ExtractionFilter f in Filters)
             filters.Add(f);
 
-        builder.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,filters.ToArray(),FilterContainerOperation.AND);
+        builder.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,
+            filters.ToArray(), FilterContainerOperation.AND);
         builder.RegenerateSQL();
     }
 
@@ -83,7 +81,7 @@ public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
         BuildBuilder();
 
-        foreach(var t in builder.TablesUsedInQuery)
+        foreach (var t in builder.TablesUsedInQuery)
             autoComplete.Add(t);
     }
 
@@ -105,10 +103,7 @@ public string GetSql()
         return builder.SQL;
     }
 
-    public string GetTabName()
-    {
-        return Catalogue.Name;
-    }
+    public string GetTabName() => Catalogue.Name;
 
     public IEnumerable<DatabaseEntity> GetToolStripObjects()
     {
diff --git a/Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs b/Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs
index 41653c55fe..7105054f8f 100644
--- a/Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs
+++ b/Rdmp.Core/DataViewing/ViewCohortExtractionUICollection.cs
@@ -22,7 +22,7 @@ public class ViewCohortExtractionUICollection : PersistableObjectCollection, IVi
 {
     public int Top
     {
-        get => _arguments.TryGetValue(TopKey,out var value) ? int.Parse(value) : 100;
+        get => _arguments.TryGetValue(TopKey, out var value) ? int.Parse(value) : 100;
         set => _arguments[TopKey] = value.ToString();
     }
 
@@ -36,7 +36,7 @@ public int Top
     /// </summary>
     public bool IncludeCohortID
     {
-        get => !_arguments.TryGetValue(IncludeCohortIDKey,out var value) || bool.Parse(value);
+        get => !_arguments.TryGetValue(IncludeCohortIDKey, out var value) || bool.Parse(value);
         set => _arguments[IncludeCohortIDKey] = value.ToString();
     }
 
@@ -49,10 +49,8 @@ public ViewCohortExtractionUICollection(ExtractableCohort cohort) : this()
         DatabaseObjects.Add(cohort);
     }
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(_arguments);
-    }
+    public override string SaveExtraText() => PersistStringHelper.SaveDictionaryToString(_arguments);
+
     public override void LoadExtraText(string s)
     {
         _arguments = PersistStringHelper.LoadDictionaryFromString(s);
@@ -66,10 +64,7 @@ public IEnumerable<DatabaseEntity> GetToolStripObjects()
         yield return Cohort;
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return Cohort.ExternalCohortTable;
-    }
+    public IDataAccessPoint GetDataAccessPoint() => Cohort.ExternalCohortTable;
 
     public string GetSql()
     {
@@ -84,15 +79,12 @@ public string GetSql()
         var selectSql = GetSelectList(ect);
 
         // Don't bother with top/limit SQL if theres none set
-        if (Top <= 0)
-        {
-            response.SQL = "";
-        }
+        if (Top <= 0) response.SQL = "";
 
         return response.Location switch
         {
-            QueryComponent.SELECT  => $"Select {response.SQL} {selectSql} from {tableName} WHERE {Cohort.WhereSQL()}",
-            QueryComponent.WHERE   => $"Select {selectSql} from {tableName} WHERE {response.SQL} AND {Cohort.WhereSQL()}",
+            QueryComponent.SELECT => $"Select {response.SQL} {selectSql} from {tableName} WHERE {Cohort.WhereSQL()}",
+            QueryComponent.WHERE => $"Select {selectSql} from {tableName} WHERE {response.SQL} AND {Cohort.WhereSQL()}",
             QueryComponent.Postfix => $"Select {selectSql} from {tableName} WHERE {Cohort.WhereSQL()} {response.SQL}",
             _ => throw new ArgumentOutOfRangeException()
         };
@@ -114,23 +106,15 @@ private string GetSelectList(IExternalCohortTable ect)
 
         // if it is not an identifiable extraction
         if (!string.Equals(ect.PrivateIdentifierField, ect.ReleaseIdentifierField))
-        {
             // add the release identifier too
             selectList.Add(ect.ReleaseIdentifierField);
-        }
 
-        if (IncludeCohortID)
-        {
-            selectList.Add(ect.DefinitionTableForeignKeyField);
-        }
+        if (IncludeCohortID) selectList.Add(ect.DefinitionTableForeignKeyField);
 
         return Environment.NewLine + string.Join($",{Environment.NewLine}", selectList) + Environment.NewLine;
     }
 
-    public string GetTabName()
-    {
-        return $"View {Cohort}(V{Cohort.ExternalVersion})";
-    }
+    public string GetTabName() => $"View {Cohort}(V{Cohort.ExternalVersion})";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
@@ -142,8 +126,5 @@ public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
         autoComplete.Add(table);
     }
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return Cohort?.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => Cohort?.GetQuerySyntaxHelper();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataViewing/ViewCohortIdentificationConfigurationSqlCollection.cs b/Rdmp.Core/DataViewing/ViewCohortIdentificationConfigurationSqlCollection.cs
index b73f1681cd..38af37406b 100644
--- a/Rdmp.Core/DataViewing/ViewCohortIdentificationConfigurationSqlCollection.cs
+++ b/Rdmp.Core/DataViewing/ViewCohortIdentificationConfigurationSqlCollection.cs
@@ -16,7 +16,8 @@
 
 namespace Rdmp.Core.DataViewing;
 
-internal class ViewCohortIdentificationConfigurationSqlCollection : PersistableObjectCollection, IViewSQLAndResultsCollection
+internal class ViewCohortIdentificationConfigurationSqlCollection : PersistableObjectCollection,
+    IViewSQLAndResultsCollection
 {
     public bool UseQueryCache { get; set; }
 
@@ -41,7 +42,8 @@ public IEnumerable<DatabaseEntity> GetToolStripObjects()
 
     private ExternalDatabaseServer GetCacheServer()
     {
-        if (CohortIdentificationConfiguration != null && CohortIdentificationConfiguration.QueryCachingServer_ID != null)
+        if (CohortIdentificationConfiguration != null &&
+            CohortIdentificationConfiguration.QueryCachingServer_ID != null)
             return CohortIdentificationConfiguration.QueryCachingServer;
 
         return null;
@@ -52,10 +54,7 @@ public IDataAccessPoint GetDataAccessPoint()
     {
         var cache = GetCacheServer();
 
-        if (UseQueryCache && cache != null)
-        {
-            return cache;
-        }
+        if (UseQueryCache && cache != null) return cache;
 
         var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);
         builder.RegenerateSQL();
@@ -65,27 +64,22 @@ public IDataAccessPoint GetDataAccessPoint()
     public string GetSql()
     {
         var builder = new CohortQueryBuilder(CohortIdentificationConfiguration, null);
-            
+
         if (!UseQueryCache && CohortIdentificationConfiguration.QueryCachingServer_ID.HasValue)
             builder.CacheServer = null;
-            
+
 
         return builder.SQL;
     }
 
-    public string GetTabName()
-    {
-        return $"View {CohortIdentificationConfiguration}";
-    }
+    public string GetTabName() => $"View {CohortIdentificationConfiguration}";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
     }
 
-    private CohortIdentificationConfiguration CohortIdentificationConfiguration => DatabaseObjects.OfType<CohortIdentificationConfiguration>().SingleOrDefault();
+    private CohortIdentificationConfiguration CohortIdentificationConfiguration =>
+        DatabaseObjects.OfType<CohortIdentificationConfiguration>().SingleOrDefault();
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return GetDataAccessPoint()?.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => GetDataAccessPoint()?.GetQuerySyntaxHelper();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/DataViewing/ViewColumnExtractCollection.cs b/Rdmp.Core/DataViewing/ViewColumnExtractCollection.cs
index 2747829cdc..ffa3ef2cbe 100644
--- a/Rdmp.Core/DataViewing/ViewColumnExtractCollection.cs
+++ b/Rdmp.Core/DataViewing/ViewColumnExtractCollection.cs
@@ -29,7 +29,8 @@ public class ViewColumnExtractCollection : PersistableObjectCollection, IViewSQL
     /// <summary>
     /// The SELECT column (can be null if this instance was constructed using a <see cref="ColumnInfo"/>)
     /// </summary>
-    public ExtractionInformation ExtractionInformation => DatabaseObjects.OfType<ExtractionInformation>().SingleOrDefault();
+    public ExtractionInformation ExtractionInformation =>
+        DatabaseObjects.OfType<ExtractionInformation>().SingleOrDefault();
 
     /// <summary>
     /// The SELECT column (can be null if this instance was constructed using a <see cref="ExtractionInformation"/>)
@@ -38,6 +39,7 @@ public class ViewColumnExtractCollection : PersistableObjectCollection, IViewSQL
 
 
     #region Constructors
+
     /// <summary>
     /// for persistence, do not use
     /// </summary>
@@ -52,6 +54,7 @@ public ViewColumnExtractCollection(ColumnInfo c, ViewType viewType, IFilter filt
             DatabaseObjects.Add(filter);
         ViewType = viewType;
     }
+
     public ViewColumnExtractCollection(ColumnInfo c, ViewType viewType, IContainer container) : this()
     {
         DatabaseObjects.Add(c);
@@ -59,6 +62,7 @@ public ViewColumnExtractCollection(ColumnInfo c, ViewType viewType, IContainer c
             DatabaseObjects.Add(container);
         ViewType = viewType;
     }
+
     public ViewColumnExtractCollection(ExtractionInformation ei, ViewType viewType, IFilter filter = null) : this()
     {
         DatabaseObjects.Add(ei);
@@ -66,6 +70,7 @@ public ViewColumnExtractCollection(ExtractionInformation ei, ViewType viewType,
             DatabaseObjects.Add(filter);
         ViewType = viewType;
     }
+
     public ViewColumnExtractCollection(ExtractionInformation ei, ViewType viewType, IContainer container) : this()
     {
         DatabaseObjects.Add(ei);
@@ -73,12 +78,11 @@ public ViewColumnExtractCollection(ExtractionInformation ei, ViewType viewType,
             DatabaseObjects.Add(container);
         ViewType = viewType;
     }
+
     #endregion
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string> { { "ViewType", ViewType.ToString() } });
-    }
+    public override string SaveExtraText() => PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
+        { { "ViewType", ViewType.ToString() } });
 
     public override void LoadExtraText(string s)
     {
@@ -97,24 +101,18 @@ public IEnumerable<DatabaseEntity> GetToolStripObjects()
         yield return GetTableInfo() as TableInfo;
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return GetTableInfo();
-    }
+    public IDataAccessPoint GetDataAccessPoint() => GetTableInfo();
 
     private ITableInfo GetTableInfo()
     {
-        if (ExtractionInformation != null)
-        {
-            return ExtractionInformation.ColumnInfo?.TableInfo;
-        }
+        if (ExtractionInformation != null) return ExtractionInformation.ColumnInfo?.TableInfo;
 
         return ColumnInfo?.TableInfo;
     }
 
     public string GetSql()
     {
-        var qb = new QueryBuilder(null, null, new[] { GetTableInfo()});
+        var qb = new QueryBuilder(null, null, new[] { GetTableInfo() });
 
         if (ViewType == ViewType.TOP_100)
             qb.TopX = 100;
@@ -127,17 +125,13 @@ public string GetSql()
         var filter = GetFilterIfAny();
         var container = GetContainerIfAny();
 
-        if(filter != null && container != null)
+        if (filter != null && container != null)
             throw new Exception("Cannot generate SQL with both filter and container");
 
         if (filter != null && !string.IsNullOrWhiteSpace(filter.WhereSQL))
-        {
-            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null, new[] { filter }, FilterContainerOperation.AND);
-        }
-        else if(container != null)
-        {
-            qb.RootFilterContainer = container;
-        }
+            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(), null,
+                new[] { filter }, FilterContainerOperation.AND);
+        else if (container != null) qb.RootFilterContainer = container;
 
         if (ViewType == ViewType.Aggregate)
             qb.AddCustomLine("count(*) as Count,", QueryComponent.QueryTimeColumn);
@@ -155,14 +149,8 @@ public string GetSql()
 
     private IColumn GetIColumn()
     {
-        if(ExtractionInformation != null)
-        {
-            return ExtractionInformation;
-        }
-        if(ColumnInfo != null)
-        {
-            return new ColumnInfoToIColumn(new MemoryRepository(), ColumnInfo);
-        }
+        if (ExtractionInformation != null) return ExtractionInformation;
+        if (ColumnInfo != null) return new ColumnInfoToIColumn(new MemoryRepository(), ColumnInfo);
 
         return null;
     }
@@ -193,35 +181,26 @@ private void AddDistributionColumns(QueryBuilder qb)
         }
 
         qb.AddColumn(new SpontaneouslyInventedColumn(repo, "avg", $"avg({GetColumnSelectSql()})"));
-
     }
 
     /// <summary>
     /// Returns the column Select SQL (without alias) for use in query building
     /// </summary>
     /// <returns></returns>
-    private string GetColumnSelectSql()
-    {
-        return GetIColumn().SelectSQL;
-    }
+    private string GetColumnSelectSql() => GetIColumn().SelectSQL;
 
-    public string GetTabName()
-    {
-        return $"{GetIColumn()}({ViewType})";
-    }
+    public string GetTabName() => $"{GetIColumn()}({ViewType})";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
-        if(ColumnInfo != null)
-        {
-            autoComplete.Add(ColumnInfo);
-        }   
+        if (ColumnInfo != null) autoComplete.Add(ColumnInfo);
     }
 
     private IFilter GetFilterIfAny()
     {
         return (IFilter)DatabaseObjects.SingleOrDefault(o => o is IFilter);
     }
+
     private IContainer GetContainerIfAny()
     {
         return (IContainer)DatabaseObjects.SingleOrDefault(o => o is IContainer);
diff --git a/Rdmp.Core/DataViewing/ViewLogsCollection.cs b/Rdmp.Core/DataViewing/ViewLogsCollection.cs
index bc5e622545..03bc680207 100644
--- a/Rdmp.Core/DataViewing/ViewLogsCollection.cs
+++ b/Rdmp.Core/DataViewing/ViewLogsCollection.cs
@@ -29,30 +29,18 @@ public ViewLogsCollection(ExternalDatabaseServer loggingServer, LogViewerFilter
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
-
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return _loggingServer;
-    }
+    public IDataAccessPoint GetDataAccessPoint() => _loggingServer;
 
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _loggingServer.GetQuerySyntaxHelper();
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => _loggingServer.GetQuerySyntaxHelper();
 
-    public string GetSql()
-    {
-        return $@"Select * from {_filter.LoggingTable }
+    public string GetSql() =>
+        $@"Select * from {_filter.LoggingTable}
 
-{_filter.GetWhereSql() }";
-    }
+{_filter.GetWhereSql()}";
 
-    public string GetTabName()
-    {
-        return _filter.ToString();
-    }
+    public string GetTabName() => _filter.ToString();
 
     public IEnumerable<DatabaseEntity> GetToolStripObjects()
     {
diff --git a/Rdmp.Core/DataViewing/ViewSelectedDatasetExtractionUICollection.cs b/Rdmp.Core/DataViewing/ViewSelectedDatasetExtractionUICollection.cs
index 42d7c5ce81..6b111788d1 100644
--- a/Rdmp.Core/DataViewing/ViewSelectedDatasetExtractionUICollection.cs
+++ b/Rdmp.Core/DataViewing/ViewSelectedDatasetExtractionUICollection.cs
@@ -42,16 +42,16 @@ public string GetSql()
 
     private void BuildRequest()
     {
-        if(_request != null)
+        if (_request != null)
             return;
 
         var ec = SelectedDataset.ExtractionConfiguration;
 
-        if(ec.Cohort_ID == null)
+        if (ec.Cohort_ID == null)
             throw new Exception("No cohort has been defined for this ExtractionConfiguration");
 
         //We are generating what the extraction SQL will be like, that only requires the dataset so empty bundle is fine
-        _request = new ExtractDatasetCommand(ec,new ExtractableDatasetBundle(SelectedDataset.ExtractableDataSet));
+        _request = new ExtractDatasetCommand(ec, new ExtractableDatasetBundle(SelectedDataset.ExtractableDataSet));
         _request.GenerateQueryBuilder();
         _request.QueryBuilder.RegenerateSQL();
     }
@@ -68,14 +68,10 @@ public IEnumerable<DatabaseEntity> GetToolStripObjects()
         yield return (DatabaseEntity)SelectedDataset;
     }
 
-    public string GetTabName()
-    {
-        return $"Extract {SelectedDataset}";
-    }
+    public string GetTabName() => $"Extract {SelectedDataset}";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
-            
     }
 
     public IQuerySyntaxHelper GetQuerySyntaxHelper()
diff --git a/Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs b/Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs
index 207f380493..7c56d209c3 100644
--- a/Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs
+++ b/Rdmp.Core/DataViewing/ViewSupportingSqlCollection.cs
@@ -15,7 +15,6 @@ namespace Rdmp.Core.DataViewing;
 
 internal class ViewSupportingSqlCollection : PersistableObjectCollection, IViewSQLAndResultsCollection
 {
-
     public SupportingSQLTable SupportingSQLTable => DatabaseObjects.OfType<SupportingSQLTable>().FirstOrDefault();
 
     public ViewSupportingSqlCollection(SupportingSQLTable supportingSql)
@@ -28,17 +27,13 @@ public ViewSupportingSqlCollection(SupportingSQLTable supportingSql)
     /// </summary>
     public ViewSupportingSqlCollection()
     {
-
     }
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return SupportingSQLTable.ExternalDatabaseServer;
-    }
+    public IDataAccessPoint GetDataAccessPoint() => SupportingSQLTable.ExternalDatabaseServer;
 
     public IQuerySyntaxHelper GetQuerySyntaxHelper()
     {
@@ -46,15 +41,9 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
         return new QuerySyntaxHelperFactory().Create(syntax);
     }
 
-    public string GetSql()
-    {
-        return SupportingSQLTable.SQL;
-    }
+    public string GetSql() => SupportingSQLTable.SQL;
 
-    public string GetTabName()
-    {
-        return SupportingSQLTable.Name;
-    }
+    public string GetTabName() => SupportingSQLTable.Name;
 
     public IEnumerable<DatabaseEntity> GetToolStripObjects()
     {
diff --git a/Rdmp.Core/DataViewing/ViewTableInfoExtractUICollection.cs b/Rdmp.Core/DataViewing/ViewTableInfoExtractUICollection.cs
index 5d2d55ea30..4e171fedb1 100644
--- a/Rdmp.Core/DataViewing/ViewTableInfoExtractUICollection.cs
+++ b/Rdmp.Core/DataViewing/ViewTableInfoExtractUICollection.cs
@@ -41,10 +41,8 @@ public ViewTableInfoExtractUICollection(ITableInfo t, ViewType viewType, IFilter
         ViewType = viewType;
     }
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string> { { "ViewType", ViewType.ToString() } });
-    }
+    public override string SaveExtraText() => PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
+        { { "ViewType", ViewType.ToString() } });
 
     public override void LoadExtraText(string s)
     {
@@ -61,16 +59,14 @@ public IFilter GetFilterIfAny()
     {
         return (IFilter)DatabaseObjects.SingleOrDefault(o => o is IFilter);
     }
+
     public IEnumerable<DatabaseEntity> GetToolStripObjects()
     {
         if (GetFilterIfAny() is ConcreteFilter filter)
             yield return filter;
     }
 
-    public IDataAccessPoint GetDataAccessPoint()
-    {
-        return TableInfo;
-    }
+    public IDataAccessPoint GetDataAccessPoint() => TableInfo;
 
     public string GetSql()
     {
@@ -85,7 +81,8 @@ public string GetSql()
 
         var filter = GetFilterIfAny();
         if (filter != null)
-            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepository, null, new[] { filter }, FilterContainerOperation.AND);
+            qb.RootFilterContainer = new SpontaneouslyInventedFilterContainer(memoryRepository, null, new[] { filter },
+                FilterContainerOperation.AND);
 
         var sql = qb.SQL;
 
@@ -93,13 +90,9 @@ public string GetSql()
             throw new NotSupportedException("ViewType.Aggregate can only be applied to ColumnInfos not TableInfos");
 
         return sql;
-
     }
 
-    public string GetTabName()
-    {
-        return $"{TableInfo}({ViewType})";
-    }
+    public string GetTabName() => $"{TableInfo}({ViewType})";
 
     public void AdjustAutocomplete(IAutoCompleteProvider autoComplete)
     {
diff --git a/Rdmp.Core/Databases/DataQualityEnginePatcher.cs b/Rdmp.Core/Databases/DataQualityEnginePatcher.cs
index f57bc350aa..7dca6206ca 100644
--- a/Rdmp.Core/Databases/DataQualityEnginePatcher.cs
+++ b/Rdmp.Core/Databases/DataQualityEnginePatcher.cs
@@ -20,13 +20,14 @@ public DataQualityEnginePatcher() : base(2, "Databases.DataQualityEngineDatabase
         LegacyName = "DataQualityEngine.Database";
         SqlServerOnly = false;
     }
+
     public override Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
     {
-        var header = GetHeader(db.Server.DatabaseType,InitialScriptName, new Version(1, 0, 0));
+        var header = GetHeader(db.Server.DatabaseType, InitialScriptName, new Version(1, 0, 0));
 
         var sql = new StringBuilder();
 
-        sql.AppendLine (
+        sql.AppendLine(
             $"{db.Helper.GetCreateTableSql(db, "Evaluation", new[] { new DatabaseColumnRequest("DateOfEvaluation", new DatabaseTypeRequest(typeof(DateTime))), new DatabaseColumnRequest("CatalogueID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = false }, new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, IsPrimaryKey = true } }, null, false, null).TrimEnd()};");
 
         // foreign keys
@@ -56,7 +57,8 @@ public override SortedDictionary<string, Patch> GetAllPatchesInAssembly(Discover
     {
         var basePatches = base.GetAllPatchesInAssembly(db);
         if (basePatches.Count > 4)
-            throw new NotImplementedException("Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/QueryCachingDatabase/up' please");
+            throw new NotImplementedException(
+                "Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/QueryCachingDatabase/up' please");
 
         //this is empty because the only patch is already accounted for
         return new SortedDictionary<string, Patch>();
diff --git a/Rdmp.Core/Databases/LoggingDatabasePatcher.cs b/Rdmp.Core/Databases/LoggingDatabasePatcher.cs
index 296f445444..333e12e205 100644
--- a/Rdmp.Core/Databases/LoggingDatabasePatcher.cs
+++ b/Rdmp.Core/Databases/LoggingDatabasePatcher.cs
@@ -13,9 +13,9 @@
 
 namespace Rdmp.Core.Databases;
 
-public sealed class LoggingDatabasePatcher:Patcher
+public sealed class LoggingDatabasePatcher : Patcher
 {
-    public LoggingDatabasePatcher():base(2,"Databases.LoggingDatabase")
+    public LoggingDatabasePatcher() : base(2, "Databases.LoggingDatabase")
     {
         LegacyName = "HIC.Logging.Database";
         SqlServerOnly = false;
@@ -49,7 +49,6 @@ public override Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
             $"{db.Helper.GetCreateTableSql(db, "DataLoadTask", new[] { /*This is not an auto increment (see `GetMaxTaskID` method).  Not sure why it isn't but whatever */ new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = false, IsPrimaryKey = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("name", new DatabaseTypeRequest(typeof(string), 1000) { Unicode = true }), new DatabaseColumnRequest("createTime", new DatabaseTypeRequest(typeof(DateTime))) { Default = FAnsi.Discovery.QuerySyntax.MandatoryScalarFunctions.GetTodaysDate }, /* TODO: does this have a default on it? */ new DatabaseColumnRequest("userAccount", new DatabaseTypeRequest(typeof(string), 500) { Unicode = true }), new DatabaseColumnRequest("statusID", new DatabaseTypeRequest(typeof(int))), new DatabaseColumnRequest("isTest", new DatabaseTypeRequest(typeof(bool))), dataLoadTask_datasetID = new DatabaseColumnRequest("dataSetID", new DatabaseTypeRequest(typeof(string), 150) { Unicode = true }) }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { dataLoadTask_datasetID, datasetId } }, true, null).TrimEnd()};");
 
 
-
         sql.AppendLine(
             $"{db.Helper.GetCreateTableSql(db, "DataLoadRun", new[] { new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, AllowNulls = false, IsPrimaryKey = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("startTime", new DatabaseTypeRequest(typeof(DateTime))) { Default = FAnsi.Discovery.QuerySyntax.MandatoryScalarFunctions.GetTodaysDate }, new DatabaseColumnRequest("endTime", new DatabaseTypeRequest(typeof(DateTime))) { AllowNulls = true }, dataLoadRun_dataLoadTaskID = new DatabaseColumnRequest("dataLoadTaskID", new DatabaseTypeRequest(typeof(int))), new DatabaseColumnRequest("isTest", new DatabaseTypeRequest(typeof(bool))), new DatabaseColumnRequest("packageName", new DatabaseTypeRequest(typeof(string), 750) { Unicode = true }), /* TODO: does this have a default on it? */ new DatabaseColumnRequest("userAccount", new DatabaseTypeRequest(typeof(string), 500) { Unicode = true }), new DatabaseColumnRequest("suggestedRollbackCommand", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) { AllowNulls = true } }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { dataLoadRun_dataLoadTaskID, dataLoadTask_ID } }, true, null).TrimEnd()};");
 
@@ -60,7 +59,6 @@ public override Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
             $"{db.Helper.GetCreateTableSql(db, "DataSource", new[] { new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, AllowNulls = false, IsPrimaryKey = true }, new DatabaseColumnRequest("source", new DatabaseTypeRequest(typeof(string), int.MaxValue)), dataSource_tableLoadRunID = new DatabaseColumnRequest("tableLoadRunID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = true }, new DatabaseColumnRequest("archive", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) { AllowNulls = true }, new DatabaseColumnRequest("originDate", new DatabaseTypeRequest(typeof(DateTime))) { Default = FAnsi.Discovery.QuerySyntax.MandatoryScalarFunctions.GetTodaysDate }, /*in old script this was binary(128) but I think string should be ok*/ new DatabaseColumnRequest("MD5", new DatabaseTypeRequest(typeof(string), 128)) { AllowNulls = true } }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { dataSource_tableLoadRunID, tableLoadRun_ID } }, true, null).TrimEnd()};");
 
 
-
         sql.AppendLine(
             $"{db.Helper.GetCreateTableSql(db, "FatalError", new[] { new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, AllowNulls = false, IsPrimaryKey = true }, new DatabaseColumnRequest("time", new DatabaseTypeRequest(typeof(DateTime))) { Default = FAnsi.Discovery.QuerySyntax.MandatoryScalarFunctions.GetTodaysDate }, new DatabaseColumnRequest("source", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) { AllowNulls = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("explanation", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) { AllowNulls = true }, fatalError_dataLoadRunID = new DatabaseColumnRequest("dataLoadRunID", new DatabaseTypeRequest(typeof(int))), new DatabaseColumnRequest("statusID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = true }, new DatabaseColumnRequest("interestingToOthers", new DatabaseTypeRequest(typeof(bool))) { AllowNulls = true } }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { fatalError_dataLoadRunID, dataLoadRun_ID } }, true, null).TrimEnd()};");
 
@@ -69,12 +67,10 @@ public override Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
             $"{db.Helper.GetCreateTableSql(db, "ProgressLog", new[] { progressLog_dataLoadRunID = new DatabaseColumnRequest("dataLoadRunID", new DatabaseTypeRequest(typeof(int))), new DatabaseColumnRequest("eventType", new DatabaseTypeRequest(typeof(string), 50) { Unicode = true }) { AllowNulls = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("source", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) { AllowNulls = true }, new DatabaseColumnRequest("time", new DatabaseTypeRequest(typeof(DateTime))) { Default = FAnsi.Discovery.QuerySyntax.MandatoryScalarFunctions.GetTodaysDate }, new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, AllowNulls = false, IsPrimaryKey = true } }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { progressLog_dataLoadRunID, dataLoadRun_ID } }, true, null).TrimEnd()};");
 
 
-
         sql.AppendLine(
             $"{db.Helper.GetCreateTableSql(db, "RowError", new[] { new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { IsAutoIncrement = true, AllowNulls = false, IsPrimaryKey = true }, rowError_tableLoadRunID = new DatabaseColumnRequest("tableLoadRunID", new DatabaseTypeRequest(typeof(int))), new DatabaseColumnRequest("rowErrorTypeID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("locationOfRow", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }), new DatabaseColumnRequest("requiresReloading", new DatabaseTypeRequest(typeof(bool))) { AllowNulls = true }, new DatabaseColumnRequest("columnName", new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }) }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn> { { rowError_tableLoadRunID, tableLoadRun_ID } }, true, null).TrimEnd()};");
 
 
-
         sql.AppendLine(
             $"{db.Helper.GetCreateTableSql(db, "z_DataLoadTaskStatus", new[] { new DatabaseColumnRequest("ID", new DatabaseTypeRequest(typeof(int))) { AllowNulls = false, IsPrimaryKey = true }, new DatabaseColumnRequest("status", new DatabaseTypeRequest(typeof(string), 50) { Unicode = true }) { AllowNulls = true }, new DatabaseColumnRequest("description", new DatabaseTypeRequest(typeof(string), int.MaxValue)) { AllowNulls = true } }, null, true).TrimEnd()};");
 
@@ -118,7 +114,8 @@ public override SortedDictionary<string, Patch> GetAllPatchesInAssembly(Discover
     {
         var basePatches = base.GetAllPatchesInAssembly(db);
         if (basePatches.Count > 3)
-            throw new NotImplementedException("Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/LoggingDatabase/up' please");
+            throw new NotImplementedException(
+                "Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/LoggingDatabase/up' please");
 
         //this is empty because the only patch is already accounted for
         return new SortedDictionary<string, Patch>();
diff --git a/Rdmp.Core/Databases/PatcherManager.cs b/Rdmp.Core/Databases/PatcherManager.cs
index bf4520126d..c651fad756 100644
--- a/Rdmp.Core/Databases/PatcherManager.cs
+++ b/Rdmp.Core/Databases/PatcherManager.cs
@@ -40,26 +40,28 @@ public PatcherManager()
         };
     }
 
-    public IEnumerable<PluginPatcher> GetTier3Patchers(MEF mef,PluginPatcherFoundHandler events)
+    public IEnumerable<PluginPatcher> GetTier3Patchers(MEF mef, PluginPatcherFoundHandler events)
     {
         var constructor = new ObjectConstructor();
-            
+
         foreach (var patcherType in mef.GetTypes<PluginPatcher>().Where(type => type.IsPublic))
         {
             PluginPatcher instance = null;
-                
+
             try
             {
                 instance = (PluginPatcher)ObjectConstructor.Construct(patcherType);
 
-                events?.Invoke(this, new PluginPatcherFoundEventArgs(patcherType, instance, PluginPatcherStatus.Healthy));
+                events?.Invoke(this,
+                    new PluginPatcherFoundEventArgs(patcherType, instance, PluginPatcherStatus.Healthy));
             }
             catch (Exception e)
             {
-                events?.Invoke(this, new PluginPatcherFoundEventArgs(patcherType, null, PluginPatcherStatus.CouldNotConstruct, e));
+                events?.Invoke(this,
+                    new PluginPatcherFoundEventArgs(patcherType, null, PluginPatcherStatus.CouldNotConstruct, e));
             }
 
-            if(instance != null)
+            if (instance != null)
                 yield return instance;
         }
     }
@@ -69,8 +71,5 @@ public IEnumerable<PluginPatcher> GetTier3Patchers(MEF mef,PluginPatcherFoundHan
     /// </summary>
     /// <param name="mef"></param>
     /// <returns></returns>
-    public IEnumerable<IPatcher> GetAllPatchers(MEF mef)
-    {
-        return Tier2Patchers.Union(GetTier3Patchers(mef,null));
-    }
+    public IEnumerable<IPatcher> GetAllPatchers(MEF mef) => Tier2Patchers.Union(GetTier3Patchers(mef, null));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Databases/PlatformDatabase.cs b/Rdmp.Core/Databases/PlatformDatabase.cs
index 753c03f805..a601b3da4d 100644
--- a/Rdmp.Core/Databases/PlatformDatabase.cs
+++ b/Rdmp.Core/Databases/PlatformDatabase.cs
@@ -8,33 +8,32 @@
 
 namespace Rdmp.Core.Databases;
 
-public sealed class ANOStorePatcher:Patcher
+public sealed class ANOStorePatcher : Patcher
 {
-    public ANOStorePatcher():base(2,"Databases.ANOStoreDatabase")
+    public ANOStorePatcher() : base(2, "Databases.ANOStoreDatabase")
     {
         LegacyName = "ANOStore.Database";
     }
 }
 
-public sealed class IdentifierDumpDatabasePatcher:Patcher
+public sealed class IdentifierDumpDatabasePatcher : Patcher
 {
-    public IdentifierDumpDatabasePatcher():base(2,"Databases.IdentifierDumpDatabase")
+    public IdentifierDumpDatabasePatcher() : base(2, "Databases.IdentifierDumpDatabase")
     {
         LegacyName = "IdentifierDump.Database";
     }
 }
 
-public sealed class DataExportPatcher:Patcher
+public sealed class DataExportPatcher : Patcher
 {
-    public DataExportPatcher():base(1,"Databases.DataExportDatabase")
+    public DataExportPatcher() : base(1, "Databases.DataExportDatabase")
     {
-            
     }
 }
 
-public sealed class CataloguePatcher:Patcher
+public sealed class CataloguePatcher : Patcher
 {
-    public CataloguePatcher():base(1,"Databases.CatalogueDatabase")
+    public CataloguePatcher() : base(1, "Databases.CatalogueDatabase")
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Databases/QueryCachingPatcher.cs b/Rdmp.Core/Databases/QueryCachingPatcher.cs
index 5c64bd7b34..4c3d0dcc5e 100644
--- a/Rdmp.Core/Databases/QueryCachingPatcher.cs
+++ b/Rdmp.Core/Databases/QueryCachingPatcher.cs
@@ -13,9 +13,9 @@
 
 namespace Rdmp.Core.Databases;
 
-public sealed class QueryCachingPatcher:Patcher
+public sealed class QueryCachingPatcher : Patcher
 {
-    public QueryCachingPatcher():base(2,"Databases.QueryCachingDatabase")
+    public QueryCachingPatcher() : base(2, "Databases.QueryCachingDatabase")
     {
         LegacyName = "QueryCaching.Database";
         SqlServerOnly = false;
@@ -23,28 +23,32 @@ public QueryCachingPatcher():base(2,"Databases.QueryCachingDatabase")
 
     public override Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
     {
-        var header = GetHeader(db.Server.DatabaseType, InitialScriptName, new Version(1,0,0));
+        var header = GetHeader(db.Server.DatabaseType, InitialScriptName, new Version(1, 0, 0));
 
         var body = db.Helper.GetCreateTableSql(db, "CachedAggregateConfigurationResults", new[]
         {
-            new DatabaseColumnRequest("Committer",new DatabaseTypeRequest(typeof(string),500)),
-            new DatabaseColumnRequest("Date",new DatabaseTypeRequest(typeof(DateTime))){Default = MandatoryScalarFunctions.GetTodaysDate},
-            new DatabaseColumnRequest("AggregateConfiguration_ID",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey = true},
-            new DatabaseColumnRequest("SqlExecuted",new DatabaseTypeRequest(typeof(string),int.MaxValue){Unicode = true}),
-            new DatabaseColumnRequest("Operation",new DatabaseTypeRequest(typeof(string),50)){IsPrimaryKey = true},
-
-            new DatabaseColumnRequest("TableName",new DatabaseTypeRequest(typeof(string),500){Unicode = true})
-        },null,false,null);
-
-        return new Patch(InitialScriptName,header + body);
+            new DatabaseColumnRequest("Committer", new DatabaseTypeRequest(typeof(string), 500)),
+            new DatabaseColumnRequest("Date", new DatabaseTypeRequest(typeof(DateTime)))
+                { Default = MandatoryScalarFunctions.GetTodaysDate },
+            new DatabaseColumnRequest("AggregateConfiguration_ID", new DatabaseTypeRequest(typeof(int)))
+                { IsPrimaryKey = true },
+            new DatabaseColumnRequest("SqlExecuted",
+                new DatabaseTypeRequest(typeof(string), int.MaxValue) { Unicode = true }),
+            new DatabaseColumnRequest("Operation", new DatabaseTypeRequest(typeof(string), 50)) { IsPrimaryKey = true },
+
+            new DatabaseColumnRequest("TableName", new DatabaseTypeRequest(typeof(string), 500) { Unicode = true })
+        }, null, false, null);
+
+        return new Patch(InitialScriptName, header + body);
     }
 
     public override SortedDictionary<string, Patch> GetAllPatchesInAssembly(DiscoveredDatabase db)
     {
         var basePatches = base.GetAllPatchesInAssembly(db);
-        if(basePatches.Count > 1)
-            throw new NotImplementedException("Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/QueryCachingDatabase/up' please");
-            
+        if (basePatches.Count > 1)
+            throw new NotImplementedException(
+                "Someone has added some patches, we need to think about how we handle those in MySql and Oracle! i.e. don't add them in '/QueryCachingDatabase/up' please");
+
         //this is empty because the only patch is already accounted for
         return new SortedDictionary<string, Patch>();
     }
diff --git a/Rdmp.Core/EnumExtensions.cs b/Rdmp.Core/EnumExtensions.cs
index 03ed2436ca..37725fb30a 100644
--- a/Rdmp.Core/EnumExtensions.cs
+++ b/Rdmp.Core/EnumExtensions.cs
@@ -31,6 +31,5 @@ public static string S(this Enum e)
             TriggerStatus.Missing => GlobalStrings.Missing,
             _ => throw new ArgumentOutOfRangeException(nameof(e))
         };
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/GlobalStrings.Designer.cs b/Rdmp.Core/GlobalStrings.Designer.cs
index e1fca39b39..65aba0e271 100644
--- a/Rdmp.Core/GlobalStrings.Designer.cs
+++ b/Rdmp.Core/GlobalStrings.Designer.cs
@@ -250,6 +250,12 @@ public static string ClearSettings {
         public static string ClearUserSettingsTooltip {
             get {
                 return ResourceManager.GetString("ClearUserSettingsTooltip");
+			}
+		}
+		
+        public static string CreateALoggingServer {
+            get {
+                return ResourceManager.GetString("CreateALoggingServer");
             }
         }
     }
diff --git a/Rdmp.Core/GlobalStrings.resx b/Rdmp.Core/GlobalStrings.resx
index 78b4f4fedb..36a4eece14 100644
--- a/Rdmp.Core/GlobalStrings.resx
+++ b/Rdmp.Core/GlobalStrings.resx
@@ -186,4 +186,7 @@
   <data name="FromFile" xml:space="preserve">
     <value>Catalogue from File...</value>
   </data>
+   <data name="CreateALoggingServer" xml:space="preserve">
+    <value>Create a logging server</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconOverlays/IconOverlayProvider.cs b/Rdmp.Core/Icons/IconOverlays/IconOverlayProvider.cs
index a70d175a45..175bb114e8 100644
--- a/Rdmp.Core/Icons/IconOverlays/IconOverlayProvider.cs
+++ b/Rdmp.Core/Icons/IconOverlays/IconOverlayProvider.cs
@@ -16,10 +16,12 @@ namespace Rdmp.Core.Icons.IconOverlays;
 
 public class IconOverlayProvider
 {
-    private readonly ConcurrentDictionary<ValueTuple<Image<Rgba32>,OverlayKind>,Image<Rgba32>> _cache=
+    private readonly ConcurrentDictionary<ValueTuple<Image<Rgba32>, OverlayKind>, Image<Rgba32>> _cache =
         new();
-    private readonly ConcurrentDictionary<ValueTuple<Image<Rgba32>,Image<Rgba32>>, Image<Rgba32>>  _resultCacheCustom =
+
+    private readonly ConcurrentDictionary<ValueTuple<Image<Rgba32>, Image<Rgba32>>, Image<Rgba32>> _resultCacheCustom =
         new();
+
     private readonly ConcurrentDictionary<Image<Rgba32>, Image<Rgba32>> _greyscaleCache =
         new();
 
@@ -39,7 +41,7 @@ public Image<Rgba32> GetOverlay(Image<Rgba32> forImage, OverlayKind overlayKind)
             return hit;
 
         var clone = GetOverlayNoCache(forImage, overlayKind);
-        _cache.TryAdd(key,clone);
+        _cache.TryAdd(key, clone);
 
         return clone;
     }
@@ -50,10 +52,10 @@ public Image<Rgba32> GetOverlay(Image<Rgba32> forImage, Image<Rgba32> customOver
         if (_resultCacheCustom.TryGetValue((forImage, customOverlay), out var hit))
             return hit;
 
-        var clone = forImage.Clone<Rgba32>(x=>x.DrawImage(customOverlay,1.0f));
+        var clone = forImage.Clone<Rgba32>(x => x.DrawImage(customOverlay, 1.0f));
 
         //and cache it
-        _resultCacheCustom.TryAdd((forImage,customOverlay),clone);
+        _resultCacheCustom.TryAdd((forImage, customOverlay), clone);
         return clone;
     }
 
@@ -71,14 +73,14 @@ public Image<Rgba32> GetGrayscale(Image<Rgba32> forImage)
     /// <returns></returns>
     private static Image<Rgba32> MakeGrayscale(Image<Rgba32> original)
     {
-        return original.Clone(x=>x.Grayscale());
+        return original.Clone(x => x.Grayscale());
     }
 
     public Image<Rgba32> GetOverlayNoCache(Image<Rgba32> forImage, OverlayKind overlayKind)
     {
         //cached result does not exist so we must draw it
         var overlay = _images[overlayKind];
-        var clone = forImage.Clone<Rgba32>(x=>x.DrawImage(overlay,1.0f));
+        var clone = forImage.Clone<Rgba32>(x => x.DrawImage(overlay, 1.0f));
         return clone;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs b/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs
index 455ccc9a14..f43263578b 100644
--- a/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/CatalogueIconProvider.cs
@@ -48,7 +48,8 @@ public CatalogueIconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLoc
         OverlayProvider = new IconOverlayProvider();
         ImagesCollection = new EnumImageCollection<RDMPConcept>(CatalogueIcons.ResourceManager);
 
-        StateBasedIconProviders.Add(CatalogueStateBasedIconProvider = new CatalogueStateBasedIconProvider(repositoryLocator.DataExportRepository, OverlayProvider));
+        StateBasedIconProviders.Add(CatalogueStateBasedIconProvider =
+            new CatalogueStateBasedIconProvider(repositoryLocator.DataExportRepository, OverlayProvider));
         StateBasedIconProviders.Add(new ExtractionInformationStateBasedIconProvider());
         StateBasedIconProviders.Add(new ExtractableColumnStateBasedIconProvider(OverlayProvider));
         StateBasedIconProviders.Add(new CheckResultStateBasedIconProvider());
@@ -95,7 +96,7 @@ protected virtual Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
                 return null; //it's a string but an unhandled one so give them null back
         }
 
-        if(concept.GetType().IsGenericType && concept.GetType().GetGenericTypeDefinition() == typeof(FolderNode<>))
+        if (concept.GetType().IsGenericType && concept.GetType().GetGenericTypeDefinition() == typeof(FolderNode<>))
             return GetImage(RDMPConcept.CatalogueFolder, kind);
 
         //if they already passed in an image just return it back (optionally with the overlay).
@@ -165,10 +166,9 @@ protected virtual Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
         if (ReferenceEquals(concept, typeof(PipelineCompatibleWithUseCaseNode)))
             return GetImageImpl(RDMPConcept.Pipeline);
 
-        foreach (var bmp in StateBasedIconProviders.Select(stateBasedIconProvider => stateBasedIconProvider.GetImageIfSupportedObject(concept)).Where(bmp => bmp != null))
-        {
-            return GetImageImpl(bmp, kind);
-        }
+        foreach (var bmp in StateBasedIconProviders
+                     .Select(stateBasedIconProvider => stateBasedIconProvider.GetImageIfSupportedObject(concept))
+                     .Where(bmp => bmp != null)) return GetImageImpl(bmp, kind);
 
         var conceptTypeName = concept.GetType().Name;
 
@@ -176,7 +176,7 @@ protected virtual Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
 
         //It is a System.Type, get the name and see if there's a corresponding image
         if (concept is Type type)
-            if (TryParseTypeNameToRdmpConcept(type,out t))
+            if (TryParseTypeNameToRdmpConcept(type, out t))
                 return GetImageImpl(ImagesCollection[t], kind);
 
         //It is an instance of something, get the System.Type and see if there's a corresponding image
@@ -188,8 +188,8 @@ protected virtual Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
             //if the object is masquerading as something else
             case IMasqueradeAs @as:
             {
-                    //get what it's masquerading as
-                    var masqueradingAs = @as.MasqueradingAs();
+                //get what it's masquerading as
+                var masqueradingAs = @as.MasqueradingAs();
 
                 //provided we don't have a circular reference here!
                 if (masqueradingAs is not IMasqueradeAs)
@@ -202,32 +202,22 @@ protected virtual Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
 
 
         return ImageUnknown;
-
     }
 
     private static bool TryParseTypeNameToRdmpConcept(Type type, out RDMPConcept t)
     {
         // is it a known Type like Project
-        if(Enum.TryParse(type.Name, out t))
-        {
-            return true;
-        }
+        if (Enum.TryParse(type.Name, out t)) return true;
 
         // try trimming the I off of IProject
-        if(type.IsInterface && Enum.TryParse(type.Name[1..], out t))
-        {
-            return true;
-        }
+        if (type.IsInterface && Enum.TryParse(type.Name[1..], out t)) return true;
 
         // we don't have a known icon for the Type yet
         return false;
     }
 
     /// <inheritdoc/>
-    public bool HasIcon(object o)
-    {
-        return GetImage(o) != ImagesCollection[RDMPConcept.NoIconAvailable];
-    }
+    public bool HasIcon(object o) => GetImage(o) != ImagesCollection[RDMPConcept.NoIconAvailable];
 
     public static RDMPConcept GetConceptForCollection(RDMPCollection rdmpCollection)
     {
diff --git a/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs b/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs
index ce65fb74ec..2b6156986c 100644
--- a/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/DataExportIconProvider.cs
@@ -17,10 +17,12 @@ namespace Rdmp.Core.Icons.IconProvision;
 
 public class DataExportIconProvider : CatalogueIconProvider
 {
-    public DataExportIconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IIconProvider[] pluginIconProviders) : base(repositoryLocator, pluginIconProviders)
+    public DataExportIconProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IIconProvider[] pluginIconProviders) : base(repositoryLocator, pluginIconProviders)
     {
         //Calls to the Resource manager cause file I/O (I think or at the least CPU use anyway) so cache them all at once
-        StateBasedIconProviders.Add(new ExtractableDataSetStateBasedIconProvider(OverlayProvider,CatalogueStateBasedIconProvider));
+        StateBasedIconProviders.Add(
+            new ExtractableDataSetStateBasedIconProvider(OverlayProvider, CatalogueStateBasedIconProvider));
         StateBasedIconProviders.Add(new ExtractionConfigurationStateBasedIconProvider(this));
     }
 
@@ -42,7 +44,9 @@ protected override Image<Rgba32> GetImageImpl(object concept, OverlayKind kind =
         {
             var cic = association.CohortIdentificationConfiguration;
             //return image based on cic (will include frozen graphic if frozen)
-            return cic != null ? GetImageImpl(cic, OverlayKind.Link) :
+            return cic != null
+                ? GetImageImpl(cic, OverlayKind.Link)
+                :
                 //it's an orphan or user cannot fetch the cic for some reason
                 GetImageImpl(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link);
         }
diff --git a/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs b/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs
index 169e955dcb..085a065bf2 100644
--- a/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs
+++ b/Rdmp.Core/Icons/IconProvision/EnumImageCollection.cs
@@ -16,18 +16,16 @@ namespace Rdmp.Core.Icons.IconProvision;
 
 public class EnumImageCollection<T> where T : struct, Enum, IConvertible
 {
-    private readonly Dictionary<T,Image<Rgba32>> _images = new();
+    private readonly Dictionary<T, Image<Rgba32>> _images = new();
 
-    private static Image<Rgba32> LoadImage(byte [] ba)
-    {
-        return ba == null ? null : Image.Load<Rgba32>(ba);
-    }
+    private static Image<Rgba32> LoadImage(byte[] ba) => ba == null ? null : Image.Load<Rgba32>(ba);
 
     public EnumImageCollection(ResourceManager resourceManager)
     {
-        _images=Enum.GetValues<T>().ToDictionary(s=>s,s=>LoadImage(resourceManager.GetObject(s.ToString()) as byte[]));
+        _images = Enum.GetValues<T>()
+            .ToDictionary(s => s, s => LoadImage(resourceManager.GetObject(s.ToString()) as byte[]));
         var missingImages = _images.Where(i => i.Value is null).Select(p => p.Key).ToList();
-        if(missingImages.Any())
+        if (missingImages.Any())
             throw new IconProvisionException(
                 $"The following expected images were missing from {resourceManager.BaseName}.resx{Environment.NewLine}{string.Join($",{Environment.NewLine}", missingImages)}");
     }
@@ -38,7 +36,6 @@ public Dictionary<string, Image<Rgba32>> ToStringDictionary(int newSizeInPixels
     {
         return _images.ToDictionary(
             k => k.Key.ToString(),
-            v => newSizeInPixels==-1 ? v.Value : v.Value.Clone(x=>x.Resize(newSizeInPixels,newSizeInPixels)));
+            v => newSizeInPixels == -1 ? v.Value : v.Value.Clone(x => x.Resize(newSizeInPixels, newSizeInPixels)));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs b/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs
index 75cd9892f6..3b8353d10a 100644
--- a/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs
+++ b/Rdmp.Core/Icons/IconProvision/IconProvisionException.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Icons.IconProvision;
 /// Exception thrown when an icon cannot be properly provided for an object or setting up an icon
 /// cache fails
 /// </summary>
-public class IconProvisionException:Exception
+public class IconProvisionException : Exception
 {
     /// <summary>
     /// Creates a new instance with the given message
@@ -20,15 +20,14 @@ public class IconProvisionException:Exception
     /// <param name="msg">Text of the error</param>
     public IconProvisionException(string msg) : base(msg)
     {
-            
     }
+
     /// <summary>
     /// Creates a new instance with the given message and inner exception
     /// </summary>
     /// <param name="msg">Text of the error</param>
     /// <param name="ex">Inner exception triggering the situation</param>
-    public IconProvisionException(string msg, Exception ex):base(msg,ex)
+    public IconProvisionException(string msg, Exception ex) : base(msg, ex)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs b/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
index f770d53be6..5cb50fae58 100644
--- a/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
+++ b/Rdmp.Core/Icons/IconProvision/RDMPConcept.cs
@@ -10,7 +10,7 @@ namespace Rdmp.Core.Icons.IconProvision;
 /// <summary>
 /// Describes all the objects that exist in RDMP.  Serves as an index into <see cref="CatalogueIcons"/> 
 /// </summary>
-public enum RDMPConcept 
+public enum RDMPConcept
 {
     Database,
     SQL,
@@ -19,7 +19,7 @@ public enum RDMPConcept
     DQE,
     TimeCoverageField,
     Clipboard,
-        
+
     //catalogue database objects
     AllAutomationServerSlotsNode,
     AutomationServiceSlot,
@@ -51,7 +51,7 @@ public enum RDMPConcept
 
     AllDataAccessCredentialsNode,
     DataAccessCredentials,
-        
+
     AllANOTablesNode,
     ANOTable,
 
@@ -64,7 +64,7 @@ public enum RDMPConcept
 
     DashboardLayout,
     DashboardControl,
-        
+
     FilterContainer,
     Filter,
     ExtractionFilterParameterSet,
@@ -93,16 +93,16 @@ public enum RDMPConcept
     ExtractableDataSetPackage,
     ExternalCohortTable,
     ExtractableCohort,
-        
+
     StandardRegex,
-        
+
     AllCohortsNode,
     ProjectsNode,
     ProjectCohortIdentificationConfigurationAssociationsNode,
     ProjectSavedCohortsNode,
     ExtractableDataSetsNode,
     ExtractionDirectoryNode,
-        
+
     CohortIdentificationConfiguration,
 
     AggregateDimension,
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs
index f5734d1ec1..d09ff32497 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/AggregateConfigurationStateBasedIconProvider.cs
@@ -30,7 +30,7 @@ public AggregateConfigurationStateBasedIconProvider(IconOverlayProvider overlayP
 
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
-        if (o is Type && o.Equals(typeof (AggregateConfiguration)))
+        if (o is Type && o.Equals(typeof(AggregateConfiguration)))
             return _aggregates;
 
         if (o is not AggregateConfiguration ac)
@@ -45,7 +45,7 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
             img = _overlayProvider.GetOverlay(img, OverlayKind.Extractable);
 
         if (ac.OverrideFiltersByUsingParentAggregateConfigurationInstead_ID != null)
-            img =_overlayProvider.GetOverlay(img, OverlayKind.Shortcut);
+            img = _overlayProvider.GetOverlay(img, OverlayKind.Shortcut);
 
         if (ac.Catalogue.IsApiCall())
             img = _overlayProvider.GetOverlay(img, OverlayKind.Cloud);
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs
index 81fe0111de..6a1c3e70ca 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueItemStateBasedIconProvider.cs
@@ -32,17 +32,17 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
             return null;
 
         var ei = ci.ExtractionInformation;
-        var toReturn = ei?.IsProperTransform() ?? false ? transformImage: basicImage;
+        var toReturn = ei?.IsProperTransform() ?? false ? transformImage : basicImage;
 
         //it's not extractable:
         if (ei == null) return toReturn;
 
-        if (ei.HashOnDataRelease) 
+        if (ei.HashOnDataRelease)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);
 
         if (ei.IsExtractionIdentifier)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);
-                
+
         if (ei.IsPrimaryKey)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.Key);
 
@@ -70,7 +70,6 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
         }
 
 
-
         return toReturn;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs
index a92e86014c..3bbbaed74a 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CatalogueStateBasedIconProvider.cs
@@ -44,10 +44,10 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
 
         if (c.IsDeprecated)
             img = _overlayProvider.GetOverlay(img, OverlayKind.Deprecated);
-            
+
         if (c.IsInternalDataset)
             img = _overlayProvider.GetOverlay(img, OverlayKind.Internal);
-            
+
         if (status != null && status.IsExtractable)
             img = _overlayProvider.GetOverlay(img, OverlayKind.Extractable);
 
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs
index f936c837fe..29dd4673a8 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CheckResultStateBasedIconProvider.cs
@@ -23,7 +23,7 @@ public CheckResultStateBasedIconProvider()
         _warning = Image.Load<Rgba32>(CatalogueIcons.TinyYellow);
         _tick = Image.Load<Rgba32>(CatalogueIcons.TinyGreen);
     }
-        
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not CheckResult result)
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs
index 2e1a3f37e0..1076b98587 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortAggregateContainerStateBasedIconProvider.cs
@@ -21,8 +21,9 @@ public CohortAggregateContainerStateBasedIconProvider()
     {
         _union = Image.Load<Rgba32>(CatalogueIcons.UNION);
         _intersect = Image.Load<Rgba32>(CatalogueIcons.INTERSECT);
-        _except = Image.Load<Rgba32>(CatalogueIcons.EXCEPT);            
+        _except = Image.Load<Rgba32>(CatalogueIcons.EXCEPT);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         return o switch
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs
index f25d1455f0..5eb7b85a73 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/CohortIdentificationConfigurationStateBasedIconProvider.cs
@@ -18,14 +18,15 @@ public class CohortIdentificationConfigurationStateBasedIconProvider : IObjectSt
     public CohortIdentificationConfigurationStateBasedIconProvider()
     {
         _cohortIdentificationConfiguration = Image.Load<Rgba32>(CatalogueIcons.CohortIdentificationConfiguration);
-        _frozenCohortIdentificationConfiguration = Image.Load<Rgba32>(CatalogueIcons.FrozenCohortIdentificationConfiguration);   
+        _frozenCohortIdentificationConfiguration =
+            Image.Load<Rgba32>(CatalogueIcons.FrozenCohortIdentificationConfiguration);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not CohortIdentificationConfiguration cic)
             return null;
 
         return cic.Frozen ? _frozenCohortIdentificationConfiguration : _cohortIdentificationConfiguration;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs
index bfac665a0a..3e271a793b 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ColumnInfoStateBasedIconProvider.cs
@@ -24,6 +24,7 @@ public ColumnInfoStateBasedIconProvider(IconOverlayProvider overlayProvider)
         _columnInfo = Image.Load<Rgba32>(CatalogueIcons.ColumnInfo);
         _columnInfoWithANO = Image.Load<Rgba32>(CatalogueIcons.ANOColumnInfo);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not ColumnInfo columnInfo)
@@ -33,7 +34,7 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
 
         if (columnInfo.IsPrimaryKey)
             return _overlayProvider.GetOverlay(basicIcon, OverlayKind.Key);
-            
+
         return basicIcon;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs
index 223260844e..72a905657e 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExternalDatabaseServerStateBasedIconProvider.cs
@@ -20,20 +20,27 @@ public class ExternalDatabaseServerStateBasedIconProvider : IObjectStateBasedIco
 {
     private readonly IconOverlayProvider _overlayProvider;
     private readonly Image<Rgba32> _default;
-    private readonly Dictionary<string,Image<Rgba32>> _assemblyToIconDictionary =
+
+    private readonly Dictionary<string, Image<Rgba32>> _assemblyToIconDictionary =
         new();
+
     private DatabaseTypeIconProvider _typeSpecificIconsProvider;
-        
+
     public ExternalDatabaseServerStateBasedIconProvider(IconOverlayProvider overlayProvider)
     {
         _overlayProvider = overlayProvider;
         _default = Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer);
-            
-        _assemblyToIconDictionary.Add(new DataQualityEnginePatcher().Name,Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_DQE));
-        _assemblyToIconDictionary.Add(new ANOStorePatcher().Name, Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_ANO));
-        _assemblyToIconDictionary.Add(new IdentifierDumpDatabasePatcher().Name, Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_IdentifierDump));
-        _assemblyToIconDictionary.Add(new QueryCachingPatcher().Name, Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache));
-        _assemblyToIconDictionary.Add(new LoggingDatabasePatcher().Name, Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Logging));
+
+        _assemblyToIconDictionary.Add(new DataQualityEnginePatcher().Name,
+            Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_DQE));
+        _assemblyToIconDictionary.Add(new ANOStorePatcher().Name,
+            Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_ANO));
+        _assemblyToIconDictionary.Add(new IdentifierDumpDatabasePatcher().Name,
+            Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_IdentifierDump));
+        _assemblyToIconDictionary.Add(new QueryCachingPatcher().Name,
+            Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Cache));
+        _assemblyToIconDictionary.Add(new LoggingDatabasePatcher().Name,
+            Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_Logging));
 
         _typeSpecificIconsProvider = new DatabaseTypeIconProvider();
     }
@@ -63,9 +70,10 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
         var toReturn = _default;
 
         //if it is a .Database assembly managed database then use the appropriate icon instead (ANO, LOG, IDD etc)
-        if (!string.IsNullOrWhiteSpace(server.CreatedByAssembly) && _assemblyToIconDictionary.TryGetValue(server.CreatedByAssembly, out var value))
+        if (!string.IsNullOrWhiteSpace(server.CreatedByAssembly) &&
+            _assemblyToIconDictionary.TryGetValue(server.CreatedByAssembly, out var value))
             toReturn = value;
-                
+
         //add the database type overlay
         toReturn = _overlayProvider.GetOverlay(toReturn, _typeSpecificIconsProvider.GetOverlay(server.DatabaseType));
 
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs
index 5dfb66e665..97ef6625a4 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractCommandStateBasedIconProvider.cs
@@ -27,6 +27,7 @@ public ExtractCommandStateBasedIconProvider()
         _failed = Image.Load<Rgba32>(CatalogueIcons.Failed);
         _tick = Image.Load<Rgba32>(CatalogueIcons.Tick);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not ExtractCommandState ecs)
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs
index 0020d8e2b3..a1544637fb 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableColumnStateBasedIconProvider.cs
@@ -31,9 +31,9 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
             return null;
 
         var toReturn = _basicImage;
-            
+
         //if the current state is to hash add the overlay
-        if (col.HashOnDataRelease) 
+        if (col.HashOnDataRelease)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);
 
         if (col.CatalogueExtractionInformation?.IsPrimaryKey ?? false)
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs
index e5a26b7610..e9a6f653a3 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractableDataSetStateBasedIconProvider.cs
@@ -18,7 +18,8 @@ public class ExtractableDataSetStateBasedIconProvider : IObjectStateBasedIconPro
     private readonly CatalogueStateBasedIconProvider _catalogueIconProvider;
     private readonly Image<Rgba32> _disabled;
 
-    public ExtractableDataSetStateBasedIconProvider(IconOverlayProvider overlayProvider, CatalogueStateBasedIconProvider catalogueIconProvider)
+    public ExtractableDataSetStateBasedIconProvider(IconOverlayProvider overlayProvider,
+        CatalogueStateBasedIconProvider catalogueIconProvider)
     {
         _catalogueIconProvider = catalogueIconProvider;
         _disabled = Image.Load<Rgba32>(CatalogueIcons.ExtractableDataSetDisabled);
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs
index b1d535cdf3..f793d38916 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionConfigurationStateBasedIconProvider.cs
@@ -14,12 +14,11 @@ public class ExtractionConfigurationStateBasedIconProvider : IObjectStateBasedIc
 {
     private readonly Image<Rgba32> _normal;
     private readonly Image<Rgba32> _frozen;
-        
+
     public ExtractionConfigurationStateBasedIconProvider(DataExportIconProvider iconProvider)
     {
         _normal = Image.Load<Rgba32>(CatalogueIcons.ExtractionConfiguration);
         _frozen = Image.Load<Rgba32>(CatalogueIcons.FrozenExtractionConfiguration);
-
     }
 
     public Image<Rgba32> GetImageIfSupportedObject(object o)
@@ -29,6 +28,6 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
 
         var basicImage = ec.IsReleased ? _frozen : _normal;
 
-        return basicImage;//it's all fine and green
+        return basicImage; //it's all fine and green
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs
index 6e03231705..a2238e5dcd 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ExtractionInformationStateBasedIconProvider.cs
@@ -28,36 +28,38 @@ public ExtractionInformationStateBasedIconProvider()
     {
         _extractionInformation_Core = Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation);
         _extractionInformation_Supplemental = Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_Supplemental);
-        _extractionInformation_SpecialApproval = Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval);
-        _extractionInformation_ProjectSpecific = Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_ProjectSpecific);
+        _extractionInformation_SpecialApproval =
+            Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval);
+        _extractionInformation_ProjectSpecific =
+            Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_ProjectSpecific);
         _overlayProvider = new IconOverlayProvider();
-        _extractionInformation_InternalOnly = _overlayProvider.GetOverlayNoCache(_extractionInformation_SpecialApproval, OverlayKind.Internal);
-        _extractionInformation_Deprecated = _overlayProvider.GetOverlayNoCache(_extractionInformation_Core,OverlayKind.Deprecated);
+        _extractionInformation_InternalOnly =
+            _overlayProvider.GetOverlayNoCache(_extractionInformation_SpecialApproval, OverlayKind.Internal);
+        _extractionInformation_Deprecated =
+            _overlayProvider.GetOverlayNoCache(_extractionInformation_Core, OverlayKind.Deprecated);
 
         _noIconAvailable = Image.Load<Rgba32>(CatalogueIcons.NoIconAvailable);
     }
-        
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
-            
-        if(o is ExtractionCategory cat)
+        if (o is ExtractionCategory cat)
             return GetImage(cat);
 
         if (o is not ExtractionInformation ei) return null;
 
         var toReturn = GetImage(ei.ExtractionCategory);
-                
+
         if (ei.IsExtractionIdentifier)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.IsExtractionIdentifier);
 
         if (ei.IsPrimaryKey)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.Key);
 
-        if (ei.HashOnDataRelease) 
+        if (ei.HashOnDataRelease)
             toReturn = _overlayProvider.GetOverlay(toReturn, OverlayKind.Hashed);
 
         return toReturn;
-
     }
 
     private Image<Rgba32> GetImage(ExtractionCategory category)
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs
index 49f756f8a7..6a4e5173b0 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/FilterStateBasedIconProvider.cs
@@ -23,15 +23,14 @@ public FilterStateBasedIconProvider(IconOverlayProvider overlayProvider)
         _basicIcon = Image.Load<Rgba32>(CatalogueIcons.Filter);
         _overlayProvider = overlayProvider;
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is ExtractionFilter f)
         {
             // has known parameter values?
-            if(f.ExtractionFilterParameterSets.Any())
-            {
+            if (f.ExtractionFilterParameterSets.Any())
                 return _overlayProvider.GetOverlay(_basicIcon, OverlayKind.Parameter);
-            }
 
             // just a regular filter then
             return _basicIcon;
@@ -41,6 +40,5 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
             return _basicIcon;
 
         return null;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs
index c94691766b..1a87436bbe 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/LoadStageNodeStateBasedIconProvider.cs
@@ -22,6 +22,7 @@ public LoadStageNodeStateBasedIconProvider(ICoreIconProvider iconProvider)
     {
         _iconProvider = iconProvider;
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         return o switch
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs
index e36134700b..59098781b8 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/PipelineComponentStateBasedIconProvider.cs
@@ -22,6 +22,7 @@ public PipelineComponentStateBasedIconProvider()
         _source = Image.Load<Rgba32>(CatalogueIcons.PipelineComponentSource);
         _destination = Image.Load<Rgba32>(CatalogueIcons.PipelineComponentDestination);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not PipelineComponent pc) return null;
@@ -32,6 +33,5 @@ public Image<Rgba32> GetImageIfSupportedObject(object o)
             return _destination;
 
         return _component;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs
index acd76aedae..281b80c19c 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/ReleaseabilityStateBasedIconProvider.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
 
 public class ReleaseabilityStateBasedIconProvider : IObjectStateBasedIconProvider
 {
-    private readonly Dictionary<Releaseability,Image<Rgba32>> _images;
+    private readonly Dictionary<Releaseability, Image<Rgba32>> _images;
     private readonly Dictionary<TicketingReleaseabilityEvaluation, Image<Rgba32>> _environmentImages;
 
     public ReleaseabilityStateBasedIconProvider()
@@ -23,7 +23,10 @@ public ReleaseabilityStateBasedIconProvider()
         {
             { Releaseability.Undefined, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
 
-            { Releaseability.ExceptionOccurredWhileEvaluatingReleaseability, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
+            {
+                Releaseability.ExceptionOccurredWhileEvaluatingReleaseability,
+                Image.Load<Rgba32>(CatalogueIcons.TinyRed)
+            },
             { Releaseability.NeverBeenSuccessfullyExecuted, Image.Load<Rgba32>(CatalogueIcons.Failed) },
             { Releaseability.ExtractFilesMissing, Image.Load<Rgba32>(CatalogueIcons.FileMissing) },
             { Releaseability.ExtractionSQLDesynchronisation, Image.Load<Rgba32>(CatalogueIcons.Diff) },
@@ -34,12 +37,21 @@ public ReleaseabilityStateBasedIconProvider()
 
         _environmentImages = new Dictionary<TicketingReleaseabilityEvaluation, Image<Rgba32>>
         {
-            { TicketingReleaseabilityEvaluation.CouldNotAuthenticateAgainstServer, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
-            { TicketingReleaseabilityEvaluation.CouldNotReachTicketingServer, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
+            {
+                TicketingReleaseabilityEvaluation.CouldNotAuthenticateAgainstServer,
+                Image.Load<Rgba32>(CatalogueIcons.TinyRed)
+            },
+            {
+                TicketingReleaseabilityEvaluation.CouldNotReachTicketingServer,
+                Image.Load<Rgba32>(CatalogueIcons.TinyRed)
+            },
             { TicketingReleaseabilityEvaluation.NotReleaseable, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
             { TicketingReleaseabilityEvaluation.Releaseable, Image.Load<Rgba32>(CatalogueIcons.TinyGreen) },
             { TicketingReleaseabilityEvaluation.TicketingLibraryCrashed, Image.Load<Rgba32>(CatalogueIcons.TinyRed) },
-            { TicketingReleaseabilityEvaluation.TicketingLibraryMissingOrNotConfiguredCorrectly, Image.Load<Rgba32>(CatalogueIcons.TinyYellow) }
+            {
+                TicketingReleaseabilityEvaluation.TicketingLibraryMissingOrNotConfiguredCorrectly,
+                Image.Load<Rgba32>(CatalogueIcons.TinyYellow)
+            }
         };
     }
 
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs
index ccbc6fcfa9..ba06a688bd 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/SupportingObjectStateBasedIconProvider.cs
@@ -12,7 +12,6 @@ namespace Rdmp.Core.Icons.IconProvision.StateBasedIconProviders;
 
 public class SupportingObjectStateBasedIconProvider : IObjectStateBasedIconProvider
 {
-
     private readonly Image<Rgba32> _supportingDocument;
     private readonly Image<Rgba32> _supportingDocumentGlobal;
     private readonly Image<Rgba32> _supportingDocumentExtractable;
@@ -34,8 +33,8 @@ public SupportingObjectStateBasedIconProvider()
         _supportingSqlGlobal = Image.Load<Rgba32>(CatalogueIcons.SupportingSqlGlobal);
         _supportingSqlExtractable = Image.Load<Rgba32>(CatalogueIcons.SupportingSqlExtractable);
         _supportingSqlExtractableGlobal = Image.Load<Rgba32>(CatalogueIcons.SupportingSqlExtractableGlobal);
-
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         return o switch
diff --git a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs
index 0ff9eff67e..fa05c158e4 100644
--- a/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs
+++ b/Rdmp.Core/Icons/IconProvision/StateBasedIconProviders/TableInfoStateBasedIconProvider.cs
@@ -20,6 +20,7 @@ public TableInfoStateBasedIconProvider()
         _tableInfo = Image.Load<Rgba32>(CatalogueIcons.TableInfo);
         _tableInfoTableValuedFunction = Image.Load<Rgba32>(CatalogueIcons.TableInfoTableValuedFunction);
     }
+
     public Image<Rgba32> GetImageIfSupportedObject(object o)
     {
         if (o is not TableInfo tableInfo)
diff --git a/Rdmp.Core/Logging/DataLoadInfo.cs b/Rdmp.Core/Logging/DataLoadInfo.cs
index 3bf4aaa617..d065a11b10 100644
--- a/Rdmp.Core/Logging/DataLoadInfo.cs
+++ b/Rdmp.Core/Logging/DataLoadInfo.cs
@@ -21,7 +21,6 @@ namespace Rdmp.Core.Logging;
 /// </summary>
 public class DataLoadInfo : IDataLoadInfo
 {
-        
     private bool _isClosed = false;
     private readonly string _packageName;
     private readonly string _userAccount;
@@ -33,17 +32,14 @@ public class DataLoadInfo : IDataLoadInfo
     private bool _isTest;
 
 
-
-    private DiscoveredServer _server ;
+    private DiscoveredServer _server;
 
     public DiscoveredServer DatabaseSettings => _server;
 
     private object oLock = new();
-        
-        
-    #region Property setup (these throw exceptions if you try to read them after the record is closed)
 
-       
+
+    #region Property setup (these throw exceptions if you try to read them after the record is closed)
 
     public string PackageName => _packageName;
 
@@ -83,9 +79,10 @@ public class DataLoadInfo : IDataLoadInfo
     /// <param name="suggestedRollbackCommand"></param>
     /// <param name="isTest">If true then the database record will be marked as Test=1</param>
     /// <param name="settings"></param>
-    public DataLoadInfo(string dataLoadTaskName, string packageName, string description,string suggestedRollbackCommand,bool isTest,DiscoveredServer settings)
+    public DataLoadInfo(string dataLoadTaskName, string packageName, string description,
+        string suggestedRollbackCommand, bool isTest, DiscoveredServer settings)
     {
-        if(settings != null)
+        if (settings != null)
             _server = settings;
 
         _packageName = packageName;
@@ -93,7 +90,7 @@ public DataLoadInfo(string dataLoadTaskName, string packageName, string descript
         _description = description;
         _startTime = DateTime.Now;
         _suggestedRollbackCommand = suggestedRollbackCommand;
-            
+
         _id = -1;
         _isTest = isTest;
 
@@ -107,7 +104,7 @@ private void RecordNewDataLoadInDatabase(string dataLoadTaskName)
             con.Open();
 
             var cmd = _server.GetCommand("SELECT ID FROM DataLoadTask WHERE name=@name", con);
-            _server.AddParameterWithValueToCommand("@name",cmd, dataLoadTaskName);
+            _server.AddParameterWithValueToCommand("@name", cmd, dataLoadTaskName);
 
 
             var result = cmd.ExecuteScalar();
@@ -117,7 +114,7 @@ private void RecordNewDataLoadInDatabase(string dataLoadTaskName)
 
             //ID can come back as a decimal or an Int32 or an Int64 so whatever, just turn it into a string and then parse it
             var parentTaskID = int.Parse(result.ToString());
-                                
+
             cmd = _server.GetCommand(
                 @"INSERT INTO DataLoadRun (description,startTime,dataLoadTaskID,isTest,packageName,userAccount,suggestedRollbackCommand) VALUES (@description,@startTime,@dataLoadTaskID,@isTest,@packageName,@userAccount,@suggestedRollbackCommand);
 SELECT @@IDENTITY;", con);
@@ -125,16 +122,16 @@ private void RecordNewDataLoadInDatabase(string dataLoadTaskName)
             _server.AddParameterWithValueToCommand("@description", cmd, _description);
             _server.AddParameterWithValueToCommand("@startTime", cmd, _startTime);
             _server.AddParameterWithValueToCommand("@dataLoadTaskID", cmd, parentTaskID);
-            _server.AddParameterWithValueToCommand("@isTest",cmd, _isTest);
+            _server.AddParameterWithValueToCommand("@isTest", cmd, _isTest);
             _server.AddParameterWithValueToCommand("@packageName", cmd, _packageName);
             _server.AddParameterWithValueToCommand("@userAccount", cmd, _userAccount);
-            _server.AddParameterWithValueToCommand("@suggestedRollbackCommand", cmd, _suggestedRollbackCommand ?? string.Empty);
+            _server.AddParameterWithValueToCommand("@suggestedRollbackCommand", cmd,
+                _suggestedRollbackCommand ?? string.Empty);
 
 
             //ID can come back as a decimal or an Int32 or an Int64 so whatever, just turn it into a string and then parse it
             _id = int.Parse(cmd.ExecuteScalar().ToString());
         }
-
     }
 
     /// <summary>
@@ -146,20 +143,19 @@ public void CloseAndMarkComplete()
         {
             //prevent double closing
             if (_isClosed)
-                return; 
-            
+                return;
+
             _endTime = DateTime.Now;
 
             using (var con = _server.BeginNewTransactedConnection())
             {
                 try
                 {
-
                     var cmdUpdateToClosed =
                         _server.GetCommand("UPDATE DataLoadRun SET endTime=@endTime WHERE ID=@ID",
                             con);
 
-                    _server.AddParameterWithValueToCommand("@endTime", cmdUpdateToClosed,DateTime.Now);
+                    _server.AddParameterWithValueToCommand("@endTime", cmdUpdateToClosed, DateTime.Now);
                     _server.AddParameterWithValueToCommand("@ID", cmdUpdateToClosed, ID);
 
                     var rowsAffected = cmdUpdateToClosed.ExecuteNonQuery();
@@ -182,11 +178,9 @@ public void CloseAndMarkComplete()
 
                 //once a record has been committed to the database it is redundant and no further attempts to read/change it should be made by anyone
                 foreach (var t in TableLoads.Values)
-                {
                     //close any table loads that have not yet completed
                     if (!t.IsClosed)
                         t.CloseAndArchive();
-                }
             }
         }
     }
@@ -196,12 +190,11 @@ public void CloseAndMarkComplete()
 
     public Dictionary<int, TableLoadInfo> TableLoads => _TableLoads;
 
-    public ITableLoadInfo CreateTableLoadInfo(string suggestedRollbackCommand, string destinationTable, DataSource[] sources, int expectedInserts)
-    {
-        return new TableLoadInfo(this, suggestedRollbackCommand, destinationTable, sources, expectedInserts);
-    }
+    public ITableLoadInfo CreateTableLoadInfo(string suggestedRollbackCommand, string destinationTable,
+        DataSource[] sources, int expectedInserts) => new TableLoadInfo(this, suggestedRollbackCommand,
+        destinationTable, sources, expectedInserts);
 
-    public static DataLoadInfo Empty= new();
+    public static DataLoadInfo Empty = new();
 
     private DataLoadInfo()
     {
@@ -238,12 +231,13 @@ public void LogFatalError(string errorSource, string errorDescription)
 
 
             var cmdLookupStatusID = _server.GetCommand("SELECT ID from z_FatalErrorStatus WHERE status=@status", con);
-            _server.AddParameterWithValueToCommand("@status",cmdLookupStatusID, initialErrorStatus);
+            _server.AddParameterWithValueToCommand("@status", cmdLookupStatusID, initialErrorStatus);
 
             var statusID = int.Parse(cmdLookupStatusID.ExecuteScalar().ToString());
 
             var cmdRecordFatalError = _server.GetCommand(
-                @"INSERT INTO FatalError (time,source,description,statusID,dataLoadRunID) VALUES (@time,@source,@description,@statusID,@dataLoadRunID);", con);
+                @"INSERT INTO FatalError (time,source,description,statusID,dataLoadRunID) VALUES (@time,@source,@description,@statusID,@dataLoadRunID);",
+                con);
             _server.AddParameterWithValueToCommand("@time", cmdRecordFatalError, DateTime.Now);
             _server.AddParameterWithValueToCommand("@source", cmdRecordFatalError, errorSource);
             _server.AddParameterWithValueToCommand("@description", cmdRecordFatalError, errorDescription);
@@ -255,7 +249,6 @@ public void LogFatalError(string errorSource, string errorDescription)
             //this might get called multiple times (many errors in rapid succession as the program crashes) but only close the dataLoadInfo once
             if (!IsClosed)
                 CloseAndMarkComplete();
-
         }
     }
 
@@ -273,11 +266,12 @@ public void LogProgress(ProgressEventType pevent, string Source, string Descript
         using (var con = DatabaseSettings.GetConnection())
         using (var cmdRecordProgress = _server.GetCommand("INSERT INTO ProgressLog " +
                                                           "(dataLoadRunID,eventType,source,description,time) " +
-                                                          "VALUES (@dataLoadRunID,@eventType,@source,@description,@time);", con))
+                                                          "VALUES (@dataLoadRunID,@eventType,@source,@description,@time);",
+                   con))
         {
             con.Open();
 
-            _server.AddParameterWithValueToCommand("@dataLoadRunID",cmdRecordProgress, ID);
+            _server.AddParameterWithValueToCommand("@dataLoadRunID", cmdRecordProgress, ID);
             _server.AddParameterWithValueToCommand("@eventType", cmdRecordProgress, pevent.ToString());
             _server.AddParameterWithValueToCommand("@source", cmdRecordProgress, Source);
             _server.AddParameterWithValueToCommand("@description", cmdRecordProgress, Description);
diff --git a/Rdmp.Core/Logging/DataSource.cs b/Rdmp.Core/Logging/DataSource.cs
index 73cb985c64..206fe984bd 100644
--- a/Rdmp.Core/Logging/DataSource.cs
+++ b/Rdmp.Core/Logging/DataSource.cs
@@ -31,10 +31,12 @@ public DataSource(string source)
     public string Source { get; set; }
     public string Archive { get; set; }
     public DateTime OriginDate { get; internal set; }
-    public bool UnknownOriginDate { get; internal set;}
+    public bool UnknownOriginDate { get; internal set; }
 
     private byte[] _md5;
-    public byte[] MD5 {
+
+    public byte[] MD5
+    {
         get => _md5;
         set => _md5 = value;
     }
diff --git a/Rdmp.Core/Logging/IDataLoadInfo.cs b/Rdmp.Core/Logging/IDataLoadInfo.cs
index 8647f1f087..b3cd81d98f 100644
--- a/Rdmp.Core/Logging/IDataLoadInfo.cs
+++ b/Rdmp.Core/Logging/IDataLoadInfo.cs
@@ -14,13 +14,15 @@ namespace Rdmp.Core.Logging;
 /// </summary>
 public interface IDataLoadInfo
 {
-    ITableLoadInfo CreateTableLoadInfo(string suggestedRollbackCommand, string destinationTable, DataSource[] sources, int expectedInserts);
+    ITableLoadInfo CreateTableLoadInfo(string suggestedRollbackCommand, string destinationTable, DataSource[] sources,
+        int expectedInserts);
+
     void LogFatalError(string errorSource, string errorDescription);
     void LogProgress(DataLoadInfo.ProgressEventType pevent, string Source, string Description);
 
     void CloseAndMarkComplete();
     int ID { get; }
     DiscoveredServer DatabaseSettings { get; }
-        
+
     bool IsClosed { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/ILogManager.cs b/Rdmp.Core/Logging/ILogManager.cs
index d192381f66..090192fb10 100644
--- a/Rdmp.Core/Logging/ILogManager.cs
+++ b/Rdmp.Core/Logging/ILogManager.cs
@@ -11,6 +11,8 @@ namespace Rdmp.Core.Logging;
 /// </summary>
 public interface ILogManager
 {
-    string[] ListDataTasks(bool hideTests=false);
-    IDataLoadInfo CreateDataLoadInfo(string dataLoadTaskName, string packageName, string description, string suggestedRollbackCommand, bool isTest);
+    string[] ListDataTasks(bool hideTests = false);
+
+    IDataLoadInfo CreateDataLoadInfo(string dataLoadTaskName, string packageName, string description,
+        string suggestedRollbackCommand, bool isTest);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogICheckNotifier.cs b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogICheckNotifier.cs
index d0982d37b0..d4f0e24070 100644
--- a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogICheckNotifier.cs
+++ b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogICheckNotifier.cs
@@ -13,25 +13,26 @@ namespace Rdmp.Core.Logging.Listeners.NLogListeners;
 /// <summary>
 /// <see cref="ICheckNotifier"/> that passes all events to an <see cref="NLog.LogManager"/>.  Optionally throws on Errors (after logging).
 /// </summary>
-public class NLogICheckNotifier : NLogListener,ICheckNotifier
+public class NLogICheckNotifier : NLogListener, ICheckNotifier
 {
     public bool AcceptFixes { get; set; }
 
-    public NLogICheckNotifier(bool acceptFixes, bool throwOnError): base(throwOnError)
+    public NLogICheckNotifier(bool acceptFixes, bool throwOnError) : base(throwOnError)
     {
         AcceptFixes = acceptFixes;
     }
+
     public bool OnCheckPerformed(CheckEventArgs args)
     {
         var level = args.ToLogLevel();
-            
+
         if (args.ProposedFix != null && AcceptFixes)
             //downgrade it to warning if we are accepting the fix
             if (level > LogLevel.Warn)
                 level = LogLevel.Warn;
-            
-        Log("Checks",level,args.Ex,args.Message);
-            
+
+        Log("Checks", level, args.Ex, args.Message);
+
         return AcceptFixes;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogIDataLoadEventListener.cs b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogIDataLoadEventListener.cs
index 565bd1e12d..4c8c12d14a 100644
--- a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogIDataLoadEventListener.cs
+++ b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogIDataLoadEventListener.cs
@@ -13,16 +13,15 @@ namespace Rdmp.Core.Logging.Listeners.NLogListeners;
 /// <summary>
 /// <see cref="IDataLoadEventListener"/> that passes all events to an <see cref="NLog.LogManager"/>.  Optionally throws on Errors (after logging).
 /// </summary>
-public class NLogIDataLoadEventListener : NLogListener,IDataLoadEventListener
+public class NLogIDataLoadEventListener : NLogListener, IDataLoadEventListener
 {
-    public NLogIDataLoadEventListener(bool throwOnError):base(throwOnError)
+    public NLogIDataLoadEventListener(bool throwOnError) : base(throwOnError)
     {
-            
     }
 
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-        Log(sender,e.ToLogLevel(), e.Exception, e.Message);
+        Log(sender, e.ToLogLevel(), e.Exception, e.Message);
     }
 
     public void OnProgress(object sender, ProgressEventArgs e)
diff --git a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogListener.cs b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogListener.cs
index 346fb3bc5e..f742d363d1 100644
--- a/Rdmp.Core/Logging/Listeners/NLogListeners/NLogListener.cs
+++ b/Rdmp.Core/Logging/Listeners/NLogListeners/NLogListener.cs
@@ -22,15 +22,15 @@ public NLogListener(bool throwOnError)
         ThrowOnError = throwOnError;
         Worst = LogLevel.Info;
     }
-        
+
     protected void Log(object sender, LogLevel level, Exception exception, string message)
     {
         if (level > Worst)
             Worst = level;
 
         NLog.LogManager.GetLogger((sender ?? "Null").ToString()).Log(level, exception, message);
-            
+
         if (ThrowOnError && level >= LogLevel.Error)
-            throw exception??new Exception(message);
+            throw exception ?? new Exception(message);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/Listeners/OverrideSenderIDataLoadEventListener.cs b/Rdmp.Core/Logging/Listeners/OverrideSenderIDataLoadEventListener.cs
index f5816b390f..6260a3a8a3 100644
--- a/Rdmp.Core/Logging/Listeners/OverrideSenderIDataLoadEventListener.cs
+++ b/Rdmp.Core/Logging/Listeners/OverrideSenderIDataLoadEventListener.cs
@@ -25,11 +25,11 @@ public OverrideSenderIDataLoadEventListener(string overridingSender, IDataLoadEv
 
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-        _child.OnNotify(_overridingSender,e);
+        _child.OnNotify(_overridingSender, e);
     }
 
     public void OnProgress(object sender, ProgressEventArgs e)
     {
-        _child.OnProgress(_overridingSender,e);
+        _child.OnProgress(_overridingSender, e);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/Listeners/ToFileDataLoadEventListener.cs b/Rdmp.Core/Logging/Listeners/ToFileDataLoadEventListener.cs
index 3312fd2319..e1166546fb 100644
--- a/Rdmp.Core/Logging/Listeners/ToFileDataLoadEventListener.cs
+++ b/Rdmp.Core/Logging/Listeners/ToFileDataLoadEventListener.cs
@@ -24,14 +24,16 @@ public ToFileDataLoadEventListener(string logger)
         _logger = NLog.LogManager.GetLogger(logger);
     }
 
-    public ToFileDataLoadEventListener(Type logger) 
+    public ToFileDataLoadEventListener(Type logger)
         : this(logger.FullName)
-    { }
+    {
+    }
 
     public ToFileDataLoadEventListener(object logger)
         : this(logger.GetType())
-    { }
-        
+    {
+    }
+
     public void OnNotify(object sender, NotifyEventArgs e)
     {
         _logger = NLog.LogManager.GetLogger(sender.GetType().FullName);
@@ -41,6 +43,5 @@ public void OnNotify(object sender, NotifyEventArgs e)
     public void OnProgress(object sender, ProgressEventArgs e)
     {
         _logger = NLog.LogManager.GetLogger(sender.GetType().FullName);
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/Listeners/ToLoggingDatabaseDataLoadEventListener.cs b/Rdmp.Core/Logging/Listeners/ToLoggingDatabaseDataLoadEventListener.cs
index 7fbdf2ac19..937c463f72 100644
--- a/Rdmp.Core/Logging/Listeners/ToLoggingDatabaseDataLoadEventListener.cs
+++ b/Rdmp.Core/Logging/Listeners/ToLoggingDatabaseDataLoadEventListener.cs
@@ -35,7 +35,8 @@ public class ToLoggingDatabaseDataLoadEventListener : IDataLoadEventListener
     /// </summary>
     public IDataLoadInfo DataLoadInfo { get; private set; }
 
-    public ToLoggingDatabaseDataLoadEventListener(object hostingApplication, LogManager logManager, string loggingTask, string runDescription)
+    public ToLoggingDatabaseDataLoadEventListener(object hostingApplication, LogManager logManager, string loggingTask,
+        string runDescription)
     {
         _hostingApplication = hostingApplication;
         _logManager = logManager;
@@ -54,7 +55,8 @@ public virtual void StartLogging()
     {
         _logManager.CreateNewLoggingTaskIfNotExists(_loggingTask);
 
-        DataLoadInfo = _logManager.CreateDataLoadInfo(_loggingTask, _hostingApplication.ToString(), _runDescription, "", false);
+        DataLoadInfo =
+            _logManager.CreateDataLoadInfo(_loggingTask, _hostingApplication.ToString(), _runDescription, "", false);
     }
 
     public virtual void OnNotify(object sender, NotifyEventArgs e)
@@ -68,15 +70,20 @@ public virtual void OnNotify(object sender, NotifyEventArgs e)
             case ProgressEventType.Debug:
                 break;
             case ProgressEventType.Information:
-                DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnInformation, sender.ToString(), e.Message);
+                DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnInformation, sender.ToString(),
+                    e.Message);
                 break;
             case ProgressEventType.Warning:
-                var msg = e.Message + (e.Exception == null?"": Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception,true));
-                DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnWarning,sender.ToString(), msg);
+                var msg = e.Message + (e.Exception == null
+                    ? ""
+                    : Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true));
+                DataLoadInfo.LogProgress(Logging.DataLoadInfo.ProgressEventType.OnWarning, sender.ToString(), msg);
                 break;
             case ProgressEventType.Error:
-                var err = e.Message + (e.Exception == null ? "" : Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true));
-                DataLoadInfo.LogFatalError(sender.ToString(),err);
+                var err = e.Message + (e.Exception == null
+                    ? ""
+                    : Environment.NewLine + ExceptionHelper.ExceptionToListOfInnerMessages(e.Exception, true));
+                DataLoadInfo.LogFatalError(sender.ToString(), err);
                 break;
             default:
                 throw new ArgumentOutOfRangeException();
@@ -87,16 +94,17 @@ public virtual void OnProgress(object sender, ProgressEventArgs e)
     {
         if (DataLoadInfo == null)
             StartLogging();
-            
+
         Debug.Assert(DataLoadInfo != null, "DataLoadInfo != null");
 
         if (e.Progress.UnitOfMeasurement == ProgressType.Records)
         {
             //if(!tableLoads.Any(tbl=>tbl.))
-            if(!TableLoads.ContainsKey(e.TaskDescription))
+            if (!TableLoads.ContainsKey(e.TaskDescription))
             {
-                var t = DataLoadInfo.CreateTableLoadInfo("", e.TaskDescription, new[] {new DataSource(sender.ToString())},e.Progress.KnownTargetValue);
-                TableLoads.Add(e.TaskDescription,t);
+                var t = DataLoadInfo.CreateTableLoadInfo("", e.TaskDescription,
+                    new[] { new DataSource(sender.ToString()) }, e.Progress.KnownTargetValue);
+                TableLoads.Add(e.TaskDescription, t);
             }
 
             TableLoads[e.TaskDescription].Inserts = e.Progress.Value;
@@ -108,7 +116,7 @@ public virtual void FinalizeTableLoadInfos()
         foreach (var tableLoadInfo in TableLoads.Values)
             tableLoadInfo.CloseAndArchive();
 
-        if(!_wasAlreadyOpen)
+        if (!_wasAlreadyOpen)
             DataLoadInfo.CloseAndMarkComplete();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/LogManager.cs b/Rdmp.Core/Logging/LogManager.cs
index 4cb68d4291..9fd25d453b 100644
--- a/Rdmp.Core/Logging/LogManager.cs
+++ b/Rdmp.Core/Logging/LogManager.cs
@@ -52,12 +52,13 @@ public LogManager(DiscoveredServer server)
         Server = server;
     }
 
-    public LogManager(IDataAccessPoint loggingServer) : this(DataAccessPortal.ExpectServer(loggingServer, DataAccessContext.Logging))
+    public LogManager(IDataAccessPoint loggingServer) : this(
+        DataAccessPortal.ExpectServer(loggingServer, DataAccessContext.Logging))
     {
         DataAccessPointIfAny = loggingServer;
     }
 
-    public string[] ListDataTasks(bool hideTests=false)
+    public string[] ListDataTasks(bool hideTests = false)
     {
         var tasks = new List<string>();
 
@@ -66,18 +67,20 @@ public string[] ListDataTasks(bool hideTests=false)
             con.Open();
             using (var cmd = Server.GetCommand("SELECT * FROM DataLoadTask", con))
             {
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     while (r.Read())
-                    {
                         if (hideTests)
                         {
-                            if(!(bool)r["isTest"])
+                            if (!(bool)r["isTest"])
                                 tasks.Add(r["name"].ToString());
                             //else it is a test, and we are hidding them
                         }
                         else
+                        {
                             tasks.Add(r["name"].ToString()); //we are not hiding tests
-                    }
+                        }
+                }
             }
 
             return tasks.ToArray();
@@ -94,25 +97,29 @@ public string[] ListDataTasks(bool hideTests=false)
     public DataTable GetTable(LogViewerFilter filter, int? topX, bool sortDesc)
     {
         var prefix = "";
-        var where = filter == null ? "": filter.GetWhereSql();
+        var where = filter == null ? "" : filter.GetWhereSql();
 
         if (topX.HasValue)
             prefix = $"TOP {topX.Value}";
-            
-        return GetAsTable(string.Format("SELECT {0} * FROM " + filter.LoggingTable + " {1} ORDER BY ID " + (sortDesc? "Desc":"Asc"), prefix, where));
+
+        return GetAsTable(string.Format(
+            "SELECT {0} * FROM " + filter.LoggingTable + " {1} ORDER BY ID " + (sortDesc ? "Desc" : "Asc"), prefix,
+            where));
     }
 
     private DataTable GetAsTable(string sql)
     {
         var dt = new DataTable();
-            
+
         using (var con = Server.GetConnection())
         {
             con.Open();
 
-            using(var cmd = Server.GetCommand(sql, con))
-            using(var da = Server.GetDataAdapter(cmd))
+            using (var cmd = Server.GetCommand(sql, con))
+            using (var da = Server.GetDataAdapter(cmd))
+            {
                 da.Fill(dt);
+            }
 
             return dt;
         }
@@ -126,10 +133,12 @@ public string[] ListDataSets()
         {
             con.Open();
 
-            using(var cmd = Server.GetCommand("SELECT * FROM DataSet", con))
-            using(var r = cmd.ExecuteReader())
+            using (var cmd = Server.GetCommand("SELECT * FROM DataSet", con))
+            using (var r = cmd.ExecuteReader())
+            {
                 while (r.Read())
                     tasks.Add(r["dataSetID"].ToString());
+            }
 
             return tasks.ToArray();
         }
@@ -143,22 +152,25 @@ public string[] ListDataSets()
     /// <param name="specificDataLoadRunIDOnly"></param>
     /// <param name="topX"></param>
     /// <returns></returns>
-    public IEnumerable<ArchivalDataLoadInfo> GetArchivalDataLoadInfos(string dataTask, CancellationToken? token = null, int? specificDataLoadRunIDOnly = null, int? topX = null)
+    public IEnumerable<ArchivalDataLoadInfo> GetArchivalDataLoadInfos(string dataTask, CancellationToken? token = null,
+        int? specificDataLoadRunIDOnly = null, int? topX = null)
     {
         var db = Server.GetCurrentDatabase();
         var run = db.ExpectTable("DataLoadRun");
-            
+
         using (var con = Server.GetConnection())
         {
             con.Open();
 
-            var dataTaskId = GetDataTaskId(dataTask,Server, con);
+            var dataTaskId = GetDataTaskId(dataTask, Server, con);
 
             using (var cmd = Server.GetCommand("", con))
             {
                 var where = "";
                 if (specificDataLoadRunIDOnly != null)
+                {
                     where = $"WHERE ID={specificDataLoadRunIDOnly.Value}";
+                }
                 else
                 {
                     where = "WHERE dataLoadTaskID = @dataTaskId";
@@ -178,33 +190,31 @@ public IEnumerable<ArchivalDataLoadInfo> GetArchivalDataLoadInfos(string dataTas
 
                 sb.Append("SELECT ");
 
-                if(top?.Location == QueryComponent.SELECT)
-                {
-                    sb.AppendLine(top.SQL);
-                }
+                if (top?.Location == QueryComponent.SELECT) sb.AppendLine(top.SQL);
 
                 sb.Append(" *");
 
 
                 sb.AppendLine($" FROM {run.GetFullyQualifiedName()}  {where} ORDER BY ID desc");
 
-                if(top?.Location == QueryComponent.Postfix)
-                {
-                    sb.AppendLine(top.SQL);
-                }
+                if (top?.Location == QueryComponent.Postfix) sb.AppendLine(top.SQL);
 
                 cmd.CommandText = sb.ToString();
 
                 DbDataReader r;
                 if (token == null)
+                {
                     r = cmd.ExecuteReader();
+                }
                 else
                 {
                     var rTask = cmd.ExecuteReaderAsync(token.Value);
                     rTask.Wait(token.Value);
 
                     if (rTask.IsCompleted)
+                    {
                         r = rTask.Result;
+                    }
                     else
                     {
                         cmd.Cancel();
@@ -216,9 +226,11 @@ public IEnumerable<ArchivalDataLoadInfo> GetArchivalDataLoadInfos(string dataTas
                     }
                 }
 
-                using(r)
+                using (r)
+                {
                     while (r.Read())
                         yield return new ArchivalDataLoadInfo(r, db);
+                }
             }
         }
     }
@@ -237,17 +249,18 @@ private static int GetDataTaskId(string dataTask, DiscoveredServer server, DbCon
     }
 
 
-
-    public IDataLoadInfo CreateDataLoadInfo(string dataLoadTaskName, string packageName, string description, string suggestedRollbackCommand, bool isTest)
+    public IDataLoadInfo CreateDataLoadInfo(string dataLoadTaskName, string packageName, string description,
+        string suggestedRollbackCommand, bool isTest)
     {
-        var task = ListDataTasks().FirstOrDefault(t=>t.Equals(dataLoadTaskName,StringComparison.CurrentCultureIgnoreCase)) ?? throw new KeyNotFoundException(
-                $"DataLoadTask called '{dataLoadTaskName}' was not found in the logging database {Server}");
+        var task = ListDataTasks()
+                       .FirstOrDefault(t => t.Equals(dataLoadTaskName, StringComparison.CurrentCultureIgnoreCase)) ??
+                   throw new KeyNotFoundException(
+                       $"DataLoadTask called '{dataLoadTaskName}' was not found in the logging database {Server}");
         var toReturn = new DataLoadInfo(task, packageName, description, suggestedRollbackCommand, isTest, Server);
 
-        DataLoadInfoCreated?.Invoke(this,toReturn);
+        DataLoadInfoCreated?.Invoke(this, toReturn);
 
         return toReturn;
-
     }
 
     /// <summary>
@@ -266,9 +279,9 @@ public void CreateNewLoggingTask(int id, string dataSetID)
 
                 using (var cmd = Server.GetCommand(sql, conn))
                 {
-                    Server.AddParameterWithValueToCommand("@date", cmd,DateTime.Now);
-                    Server.AddParameterWithValueToCommand("@dataSetID",cmd,dataSetID);
-                    Server.AddParameterWithValueToCommand("@username",cmd,Environment.UserName);
+                    Server.AddParameterWithValueToCommand("@date", cmd, DateTime.Now);
+                    Server.AddParameterWithValueToCommand("@dataSetID", cmd, dataSetID);
+                    Server.AddParameterWithValueToCommand("@username", cmd, Environment.UserName);
 
                     cmd.ExecuteNonQuery();
                 }
@@ -289,7 +302,7 @@ private void CreateNewDataSet(string datasetName)
 
                 using (var cmd = Server.GetCommand(sql, conn))
                 {
-                    Server.AddParameterWithValueToCommand("@datasetName",cmd,datasetName);
+                    Server.AddParameterWithValueToCommand("@datasetName", cmd, datasetName);
                     cmd.ExecuteNonQuery();
                 }
             }
@@ -297,14 +310,13 @@ private void CreateNewDataSet(string datasetName)
     }
 
 
-
     public void CreateNewLoggingTaskIfNotExists(string toCreate)
     {
-        if(!ListDataSets().Contains(toCreate,StringComparer.CurrentCultureIgnoreCase))
+        if (!ListDataSets().Contains(toCreate, StringComparer.CurrentCultureIgnoreCase))
             CreateNewDataSet(toCreate);
 
-        if(!ListDataTasks().Contains(toCreate,StringComparer.CurrentCultureIgnoreCase))
-            CreateNewLoggingTask(GetMaxTaskID()+1,toCreate);
+        if (!ListDataTasks().Contains(toCreate, StringComparer.CurrentCultureIgnoreCase))
+            CreateNewLoggingTask(GetMaxTaskID() + 1, toCreate);
     }
 
     private int GetMaxTaskID()
@@ -346,11 +358,10 @@ public void ResolveFatalErrors(int[] ids, DataLoadInfo.FatalErrorStates newState
                     affectedRows = cmd.ExecuteNonQuery();
                 }
 
-                if(affectedRows != ids.Length)
+                if (affectedRows != ids.Length)
                     throw new Exception(
                         $"Query {sql} resulted in {affectedRows}, we were expecting there to be {ids.Length} updates because that is how many FatalError IDs that were passed to this method");
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/LogViewerFilter.cs b/Rdmp.Core/Logging/LogViewerFilter.cs
index 2eacf8dad3..9dcc9bdfe3 100644
--- a/Rdmp.Core/Logging/LogViewerFilter.cs
+++ b/Rdmp.Core/Logging/LogViewerFilter.cs
@@ -50,7 +50,8 @@ public LogViewerFilter(LoggingTables loggingTable, int? id)
                 throw new ArgumentOutOfRangeException(nameof(loggingTable), loggingTable, null);
         }
     }
-    public LoggingTables LoggingTable {get;set;}
+
+    public LoggingTables LoggingTable { get; set; }
 
     public bool IsEmpty => Run == null && Table == null && Task == null;
 
@@ -63,13 +64,13 @@ public LogViewerFilter(LoggingTables loggingTable, int? id)
     /// <summary>
     /// An object that contains data about the filter or supplementary information.  The default is null.
     /// </summary>
-    public object Tag {get;set;}
+    public object Tag { get; set; }
 
     public override string ToString()
     {
         var sb = new StringBuilder();
 
-        if(Task != null)
+        if (Task != null)
             sb.Append($"DataLoadTask={Task}");
 
         if (Run != null)
@@ -91,7 +92,7 @@ public string GetWhereSql()
             case LoggingTables.None:
                 return "";
             case LoggingTables.DataLoadTask:
-                return Task.HasValue ? $"WHERE ID ={Task.Value}" :"";
+                return Task.HasValue ? $"WHERE ID ={Task.Value}" : "";
             case LoggingTables.DataLoadRun:
                 if (Run.HasValue)
                     return $"WHERE ID ={Run.Value}";
diff --git a/Rdmp.Core/Logging/LoggingDatabaseChecker.cs b/Rdmp.Core/Logging/LoggingDatabaseChecker.cs
index 45c48330e8..dcaa52ec4e 100644
--- a/Rdmp.Core/Logging/LoggingDatabaseChecker.cs
+++ b/Rdmp.Core/Logging/LoggingDatabaseChecker.cs
@@ -59,7 +59,7 @@ private void CheckDataLoadTaskStatusTable(ICheckNotifier notifier)
         };
 
 
-        CheckLookupTableIsCorrectlyPopulated(notifier, "status","z_DataLoadTaskStatus",desired);
+        CheckLookupTableIsCorrectlyPopulated(notifier, "status", "z_DataLoadTaskStatus", desired);
     }
 
     private void CheckFatalErrorStatusTable(ICheckNotifier notifier)
@@ -70,9 +70,9 @@ private void CheckFatalErrorStatusTable(ICheckNotifier notifier)
 
         var expectedFatalErrorStatusRows = new Dictionary<int, string>
         {
-            {1, "Outstanding"},
-            {2, "Resolved"},
-            {3, "Blocked"}
+            { 1, "Outstanding" },
+            { 2, "Resolved" },
+            { 3, "Blocked" }
         };
         CheckLookupTableIsCorrectlyPopulated(notifier, "status", "z_FatalErrorStatus", expectedFatalErrorStatusRows);
     }
@@ -81,11 +81,11 @@ private void CheckRowErrorTypeTable(ICheckNotifier notifier)
     {
         var expectedRowErrorTypes = new Dictionary<int, string>
         {
-            {1, "LoadRow"},
-            {2, "Duplication"},
-            {3, "Validation"},
-            {4, "DatabaseOperation"},
-            {5, "Unknown"}
+            { 1, "LoadRow" },
+            { 2, "Duplication" },
+            { 3, "Validation" },
+            { 4, "DatabaseOperation" },
+            { 5, "Unknown" }
         };
         CheckLookupTableIsCorrectlyPopulated(notifier, "type", "z_RowErrorType", expectedRowErrorTypes);
     }
@@ -116,16 +116,15 @@ private void CheckDatasetExists(ICheckNotifier notifier, string dataSetID)
                 }
             }
 
-            if (notifier.OnCheckPerformed(new CheckEventArgs($"Did not find default dataset '{dataSetID}'.", CheckResult.Fail, null,
+            if (notifier.OnCheckPerformed(new CheckEventArgs($"Did not find default dataset '{dataSetID}'.",
+                    CheckResult.Fail, null,
                     $"Create the dataset '{dataSetID}'")))
-            {
                 using (var cmd =
                        _server.GetCommand("INSERT INTO DataSet (dataSetID, name) VALUES (@dsID, @dsID)", conn))
                 {
                     _server.AddParameterWithValueToCommand("@dsID", cmd, dataSetID);
                     cmd.ExecuteNonQuery();
                 }
-            }
         }
     }
 
@@ -137,13 +136,15 @@ private void CheckDefaultDataLoadTasksExist(ICheckNotifier notifier)
 
     private void CheckDataLoadTaskExists(ICheckNotifier notifier, int id, string dataSetID)
     {
-
         var lm = new LogManager(_server);
 
 
         if (lm.ListDataTasks().Contains(dataSetID))
-            notifier.OnCheckPerformed(new CheckEventArgs($"Found default DataLoadTask for '{dataSetID}'", CheckResult.Success,
+        {
+            notifier.OnCheckPerformed(new CheckEventArgs($"Found default DataLoadTask for '{dataSetID}'",
+                CheckResult.Success,
                 null));
+        }
         else
         {
             var shouldCreate =
@@ -151,12 +152,13 @@ private void CheckDataLoadTaskExists(ICheckNotifier notifier, int id, string dat
                     CheckResult.Fail,
                     null, $"Create a DataLoadTask for '{dataSetID}'"));
 
-            if(shouldCreate)
+            if (shouldCreate)
                 lm.CreateNewLoggingTask(id, dataSetID);
         }
     }
 
-    private void CheckLookupTableIsCorrectlyPopulated(ICheckNotifier notifier, string valueColumnName, string tableName, Dictionary<int, string> expected)
+    private void CheckLookupTableIsCorrectlyPopulated(ICheckNotifier notifier, string valueColumnName, string tableName,
+        Dictionary<int, string> expected)
     {
         //see what is in the database
         var actual = new Dictionary<int, string>();
@@ -164,68 +166,67 @@ private void CheckLookupTableIsCorrectlyPopulated(ICheckNotifier notifier, strin
         {
             conn.Open();
 
-            using(var cmd = _server.GetCommand($"SELECT ID, {valueColumnName} FROM {tableName}", conn))
-            using(var reader = cmd.ExecuteReader())
+            using (var cmd = _server.GetCommand($"SELECT ID, {valueColumnName} FROM {tableName}", conn))
+            using (var reader = cmd.ExecuteReader())
+            {
                 while (reader.Read())
                     actual.Add(Convert.ToInt32(reader["ID"]), reader[valueColumnName].ToString().Trim());
+            }
         }
 
         //now reconcile what is in the database with what we expect
 
         ExpectedLookupsValuesArePresent(expected, actual, out var missing, out var collisions, out var misnomers);
 
-        if(!missing.Any() && !collisions.Any() && !misnomers.Any())
+        if (!missing.Any() && !collisions.Any() && !misnomers.Any())
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"{tableName} contains the correct lookup values", CheckResult.Success, null));
+            notifier.OnCheckPerformed(new CheckEventArgs($"{tableName} contains the correct lookup values",
+                CheckResult.Success, null));
             return;
         }
 
         //collisions cannot be resolved without manual intervention
         if (collisions.Any())
         {
-
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"{tableName} there is a key collision between what we require and what is in the database, the mismatches are:{Environment.NewLine}{collisions.Aggregate("", (s, n) => $"{s}Desired:({n.Key},'{n.Value}') VS Found:({n.Key},'{actual[n.Key]}'){Environment.NewLine}")}{collisions}",CheckResult.Fail, null));
+                $"{tableName} there is a key collision between what we require and what is in the database, the mismatches are:{Environment.NewLine}{collisions.Aggregate("", (s, n) => $"{s}Desired:({n.Key},'{n.Value}') VS Found:({n.Key},'{actual[n.Key]}'){Environment.NewLine}")}{collisions}",
+                CheckResult.Fail, null));
             return;
         }
 
         //misnomers cannot be resolved without manual intervention either
         if (misnomers.Any())
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"{tableName} the following ID conflicts were found:{misnomers.Aggregate("", (s, n) => s + Environment.NewLine + n)}", CheckResult.Fail, null));
+                $"{tableName} the following ID conflicts were found:{misnomers.Aggregate("", (s, n) => s + Environment.NewLine + n)}",
+                CheckResult.Fail, null));
 
 
-
-        if(missing.Any())
-        {
-
+        if (missing.Any())
             //add missing values
             if (notifier.OnCheckPerformed(new CheckEventArgs(
                     $"{tableName} does not contain all the required lookup statuses",
                     CheckResult.Fail, null,
                     $"Insert the missing lookups ({missing.Aggregate("", (s, pair) => $"{s}, {pair.Value}")})")))
-            {
-                using(var c = _server.BeginNewTransactedConnection())
+                using (var c = _server.BeginNewTransactedConnection())
                 {
                     _server.GetCommand($"SET IDENTITY_INSERT {tableName} ON ", c).ExecuteNonQuery();
 
                     foreach (var kvp in missing)
                         _server.GetCommand(
-                            $"INSERT INTO {tableName}(ID,{valueColumnName}) VALUES ({kvp.Key},'{kvp.Value}')", c).ExecuteNonQuery();
+                                $"INSERT INTO {tableName}(ID,{valueColumnName}) VALUES ({kvp.Key},'{kvp.Value}')", c)
+                            .ExecuteNonQuery();
 
                     _server.GetCommand($"SET IDENTITY_INSERT {tableName} OFF ", c).ExecuteNonQuery();
 
                     c.ManagedTransaction.CommitAndCloseConnection();
                 }
-            }
-        }
-
     }
 
 
-    private static void ExpectedLookupsValuesArePresent(Dictionary<int, string> expected, Dictionary<int, string> actual, out Dictionary<int, string> missing, out Dictionary<int, string> collisions, out List<string> misnomers)
+    private static void ExpectedLookupsValuesArePresent(Dictionary<int, string> expected,
+        Dictionary<int, string> actual, out Dictionary<int, string> missing, out Dictionary<int, string> collisions,
+        out List<string> misnomers)
     {
-
         collisions = new Dictionary<int, string>();
         missing = new Dictionary<int, string>();
         misnomers = new List<string>();
@@ -233,12 +234,14 @@ private static void ExpectedLookupsValuesArePresent(Dictionary<int, string> expe
         //for each desired kvp
         foreach (var kvp in expected)
         {
-
             //make sure it is not a misnomer
-            if (actual.Any(m => m.Value.Equals(kvp.Value) && m.Key != kvp.Key)) //if there are any actuals that have different keys
+            if (actual.Any(m =>
+                    m.Value.Equals(kvp.Value) && m.Key != kvp.Key)) //if there are any actuals that have different keys
             {
                 //see if it is a misnomer e.g. 1,'MyFunkyStatus' vs 2,'MyFunkyStatus'
-                var misnomer = actual.Where(m => m.Value.Equals(kvp.Value)).Select(p => p.Key).ToArray(); //get ALL the keys that correspond to this value including exact matching key=key (to deal with schitzophrenia)
+                var misnomer =
+                    actual.Where(m => m.Value.Equals(kvp.Value)).Select(p => p.Key)
+                        .ToArray(); //get ALL the keys that correspond to this value including exact matching key=key (to deal with schitzophrenia)
 
                 misnomers.Add(
                     misnomer.Length == 1
@@ -248,18 +251,15 @@ private static void ExpectedLookupsValuesArePresent(Dictionary<int, string> expe
 
 
             //there is a required ID that does not exist e.g. 99,'MyFunkyStatus'
-            if(!actual.ContainsKey(kvp.Key))
+            if (!actual.ContainsKey(kvp.Key))
             {
-
-                missing.Add(kvp.Key,kvp.Value);
+                missing.Add(kvp.Key, kvp.Value);
                 continue;
             }
 
             //there is an ID but they are different values e.g. 1,'Outstanding' in one and 1,'Resolved' in the other
-            if(!actual[kvp.Key].Equals(kvp.Value))
-                collisions.Add(kvp.Key,kvp.Value);
-
-
+            if (!actual[kvp.Key].Equals(kvp.Value))
+                collisions.Add(kvp.Key, kvp.Value);
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/PastEvents/ArchivalDataLoadInfo.cs b/Rdmp.Core/Logging/PastEvents/ArchivalDataLoadInfo.cs
index 9f1592f1de..9c25ac107d 100644
--- a/Rdmp.Core/Logging/PastEvents/ArchivalDataLoadInfo.cs
+++ b/Rdmp.Core/Logging/PastEvents/ArchivalDataLoadInfo.cs
@@ -52,11 +52,11 @@ public override string ToString()
             $"{Description}(ID={ID}) - {StartTime} - {(EndTime != null ? EndTime.ToString() : "<DidNotFinish>")}{elapsed}";
     }
 
-    
+
     /// <summary>
     /// All tables loaded during the run
     /// </summary>
-    public List<ArchivalTableLoadInfo>  TableLoadInfos => _knownTableInfos.Value;
+    public List<ArchivalTableLoadInfo> TableLoadInfos => _knownTableInfos.Value;
 
     /// <summary>
     /// All errors that occured during the run
@@ -71,7 +71,7 @@ public override string ToString()
     private readonly Lazy<List<ArchivalTableLoadInfo>> _knownTableInfos;
     private readonly Lazy<List<ArchivalFatalError>> _knownErrors;
     private readonly Lazy<List<ArchivalProgressLog>> _knownProgress;
-        
+
     public string Description { get; set; }
 
     /// <summary>
@@ -80,15 +80,14 @@ public override string ToString()
     /// </summary>
     internal ArchivalDataLoadInfo()
     {
-
     }
-        
-    internal ArchivalDataLoadInfo(DbDataReader r,DiscoveredDatabase loggingDatabase)
+
+    internal ArchivalDataLoadInfo(DbDataReader r, DiscoveredDatabase loggingDatabase)
     {
         _loggingDatabase = loggingDatabase;
         ID = Convert.ToInt32(r["ID"]);
         DataLoadTaskID = Convert.ToInt32(r["dataLoadTaskID"]);
-            
+
         //populate basic facts from the table
         StartTime = (DateTime)r["startTime"];
         if (r["endTime"] == null || r["endTime"] == DBNull.Value)
@@ -123,19 +122,20 @@ private List<ArchivalTableLoadInfo> GetTableInfos()
         {
             con.Open();
 
-            using(var cmd =  _loggingDatabase.Server.GetCommand($"SELECT * FROM TableLoadRun WHERE dataLoadRunID={ID}", con))
-            using(var r = cmd.ExecuteReader())
-                while(r.Read())
+            using (var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM TableLoadRun WHERE dataLoadRunID={ID}",
+                       con))
+            using (var r = cmd.ExecuteReader())
+            {
+                while (r.Read())
                 {
                     var audit = new ArchivalTableLoadInfo(this, r, _loggingDatabase);
-                        
-                    if((audit.Inserts??0) <= 0 && (audit.Updates??0) <= 0 && (audit.Deletes??0) <= 0 && UserSettings.HideEmptyTableLoadRunAudits)
-                    {
-                        continue;
-                    }
+
+                    if ((audit.Inserts ?? 0) <= 0 && (audit.Updates ?? 0) <= 0 && (audit.Deletes ?? 0) <= 0 &&
+                        UserSettings.HideEmptyTableLoadRunAudits) continue;
 
                     toReturn.Add(audit);
-                }   
+                }
+            }
         }
 
         return toReturn;
@@ -149,10 +149,13 @@ private List<ArchivalProgressLog> GetProgress()
         {
             con.Open();
 
-            using (var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM ProgressLog WHERE dataLoadRunID={ID}", con))
+            using (var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM ProgressLog WHERE dataLoadRunID={ID}",
+                       con))
             using (var r = cmd.ExecuteReader())
+            {
                 while (r.Read())
                     toReturn.Add(new ArchivalProgressLog(r));
+            }
         }
 
         return toReturn;
@@ -166,10 +169,13 @@ private List<ArchivalFatalError> GetErrors()
         {
             con.Open();
 
-            using(var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM FatalError WHERE dataLoadRunID={ID}", con))
-            using(var r = cmd.ExecuteReader())
+            using (var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM FatalError WHERE dataLoadRunID={ID}",
+                       con))
+            using (var r = cmd.ExecuteReader())
+            {
                 while (r.Read())
                     toReturn.Add(new ArchivalFatalError(r));
+            }
         }
 
         return toReturn;
diff --git a/Rdmp.Core/Logging/PastEvents/ArchivalDataSource.cs b/Rdmp.Core/Logging/PastEvents/ArchivalDataSource.cs
index bd8386d4e2..8111db5b5c 100644
--- a/Rdmp.Core/Logging/PastEvents/ArchivalDataSource.cs
+++ b/Rdmp.Core/Logging/PastEvents/ArchivalDataSource.cs
@@ -15,7 +15,6 @@ namespace Rdmp.Core.Logging.PastEvents;
 /// </summary>
 public class ArchivalDataSource : IArchivalLoggingRecordOfPastEvent, IComparable
 {
-
     public string MD5 { get; internal set; }
     public string Source { get; internal set; }
     public string Archive { get; internal set; }
@@ -24,7 +23,6 @@ public class ArchivalDataSource : IArchivalLoggingRecordOfPastEvent, IComparable
 
     public ArchivalDataSource(DbDataReader r)
     {
-            
         ID = Convert.ToInt32(r["ID"]);
         var od = r["originDate"];
 
@@ -37,37 +35,33 @@ public ArchivalDataSource(DbDataReader r)
         Archive = r["archive"] as string;
         MD5 = r["MD5"] as string;
     }
-        
+
     public string ToShortString()
     {
-
         var s = ToString();
         if (s.Length > ArchivalDataLoadInfo.MaxDescriptionLength)
             return $"{s[..ArchivalDataLoadInfo.MaxDescriptionLength]}...";
         return s;
     }
 
-    public override string ToString()
-    {
-        return $"Source:{Source}{(string.IsNullOrWhiteSpace(MD5) ? "" : $"(MD5={MD5})")}";
-    }
+    public override string ToString() => $"Source:{Source}{(string.IsNullOrWhiteSpace(MD5) ? "" : $"(MD5={MD5})")}";
 
     public int CompareTo(object obj)
     {
         if (obj is ArchivalDataSource other)
             if (OriginDate == other.OriginDate)
+            {
                 return 0;
+            }
             else
             {
-
                 if (!OriginDate.HasValue)
                     return -1;
 
                 if (!other.OriginDate.HasValue)
                     return 1;
-                    
-                return OriginDate > other.OriginDate ? 1 : -1;
 
+                return OriginDate > other.OriginDate ? 1 : -1;
             }
 
         return string.Compare(ToString(), obj.ToString(), StringComparison.Ordinal);
diff --git a/Rdmp.Core/Logging/PastEvents/ArchivalFatalError.cs b/Rdmp.Core/Logging/PastEvents/ArchivalFatalError.cs
index a36e4dc4cf..7514b5cb73 100644
--- a/Rdmp.Core/Logging/PastEvents/ArchivalFatalError.cs
+++ b/Rdmp.Core/Logging/PastEvents/ArchivalFatalError.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.Logging.PastEvents;
 /// <summary>
 /// Readonly audit of a historical error which resulted in the failure of the logged activity (which is also a past / readonly event).
 /// </summary>
-public class ArchivalFatalError : IArchivalLoggingRecordOfPastEvent,IHasSummary
+public class ArchivalFatalError : IArchivalLoggingRecordOfPastEvent, IHasSummary
 {
     public int ID { get; private set; }
     public DateTime Date { get; internal set; }
@@ -30,6 +30,7 @@ public ArchivalFatalError(DbDataReader r)
         Description = r["description"] as string;
         Explanation = r["explanation"] as string;
     }
+
     public string ToShortString()
     {
         var s = ToString();
@@ -37,11 +38,10 @@ public string ToShortString()
             return $"{s[..ArchivalDataLoadInfo.MaxDescriptionLength]}...";
         return s;
     }
-    public override string ToString()
-    {
-        return
-            $"{Source} - {Description}{(string.IsNullOrWhiteSpace(Explanation) ? "(UNRESOLVED)" : $"(RESOLVED:{Explanation})")}";
-    }
+
+    public override string ToString() =>
+        $"{Source} - {Description}{(string.IsNullOrWhiteSpace(Explanation) ? "(UNRESOLVED)" : $"(RESOLVED:{Explanation})")}";
+
     public int CompareTo(object obj)
     {
         if (obj is ArchivalFatalError other)
@@ -52,6 +52,7 @@ public int CompareTo(object obj)
 
         return string.Compare(ToString(), obj.ToString(), StringComparison.Ordinal);
     }
+
     public void GetSummary(out string title, out string body, out string stackTrace, out CheckResult level)
     {
         title = $"{Source} ({Date})";
diff --git a/Rdmp.Core/Logging/PastEvents/ArchivalProgressLog.cs b/Rdmp.Core/Logging/PastEvents/ArchivalProgressLog.cs
index 8af4a54a1c..ca2ca49c67 100644
--- a/Rdmp.Core/Logging/PastEvents/ArchivalProgressLog.cs
+++ b/Rdmp.Core/Logging/PastEvents/ArchivalProgressLog.cs
@@ -31,10 +31,8 @@ public ArchivalProgressLog(DbDataReader r)
         EventType = r["eventType"] as string;
         Description = r["description"] as string;
     }
-    public override string ToString()
-    {
-        return $"{Date} - {Description}";
-    }
+
+    public override string ToString() => $"{Date} - {Description}";
 
     public int CompareTo(object obj)
     {
@@ -47,9 +45,9 @@ public int CompareTo(object obj)
         return string.Compare(ToString(), obj.ToString(), StringComparison.Ordinal);
     }
 
-    public void GetSummary(out string title, out string body,out string stackTrace, out CheckResult level)
+    public void GetSummary(out string title, out string body, out string stackTrace, out CheckResult level)
     {
-        level = EventType == "OnWarning"? CheckResult.Warning : CheckResult.Success;
+        level = EventType == "OnWarning" ? CheckResult.Warning : CheckResult.Success;
         title = Date.ToString();
         body = Description;
         stackTrace = null;
diff --git a/Rdmp.Core/Logging/PastEvents/ArchivalTableLoadInfo.cs b/Rdmp.Core/Logging/PastEvents/ArchivalTableLoadInfo.cs
index 12af5bcaac..69ac8bdcad 100644
--- a/Rdmp.Core/Logging/PastEvents/ArchivalTableLoadInfo.cs
+++ b/Rdmp.Core/Logging/PastEvents/ArchivalTableLoadInfo.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Logging.PastEvents;
 /// <summary>
 /// Readonly audit of a table that was loaded as part of a historical data load (See HIC.Logging.ArchivalDataLoadInfo).
 /// </summary>
-public class ArchivalTableLoadInfo : IArchivalLoggingRecordOfPastEvent, IComparable,IHasSummary
+public class ArchivalTableLoadInfo : IArchivalLoggingRecordOfPastEvent, IComparable, IHasSummary
 {
     public ArchivalDataLoadInfo Parent { get; private set; }
 
@@ -35,7 +35,7 @@ public class ArchivalTableLoadInfo : IArchivalLoggingRecordOfPastEvent, ICompara
 
     private readonly Lazy<List<ArchivalDataSource>> _knownDataSource;
 
-    public ArchivalTableLoadInfo(ArchivalDataLoadInfo parent, DbDataReader r,DiscoveredDatabase loggingDatabase)
+    public ArchivalTableLoadInfo(ArchivalDataLoadInfo parent, DbDataReader r, DiscoveredDatabase loggingDatabase)
     {
         Parent = parent;
         _loggingDatabase = loggingDatabase;
@@ -58,6 +58,7 @@ public ArchivalTableLoadInfo(ArchivalDataLoadInfo parent, DbDataReader r,Discove
 
         _knownDataSource = new Lazy<List<ArchivalDataSource>>(GetDataSources);
     }
+
     private List<ArchivalDataSource> GetDataSources()
     {
         var toReturn = new List<ArchivalDataSource>();
@@ -66,28 +67,29 @@ private List<ArchivalDataSource> GetDataSources()
         {
             con.Open();
 
-            using(var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM DataSource WHERE tableLoadRunID={ID}", con))
-            using(var r = cmd.ExecuteReader())
+            using (var cmd = _loggingDatabase.Server.GetCommand($"SELECT * FROM DataSource WHERE tableLoadRunID={ID}",
+                       con))
+            using (var r = cmd.ExecuteReader())
+            {
                 while (r.Read())
                     toReturn.Add(new ArchivalDataSource(r));
+            }
         }
 
         return toReturn;
     }
+
     private static int? ToNullableInt(object i)
     {
         if (i == null || i == DBNull.Value)
             return null;
 
         return Convert.ToInt32(i);
-
-    }
-        
-    public override string ToString()
-    {
-        return $"{Start} - {TargetTable} (Inserts={Inserts},Updates={Updates},Deletes={Deletes})";
     }
 
+    public override string ToString() =>
+        $"{Start} - {TargetTable} (Inserts={Inserts},Updates={Updates},Deletes={Deletes})";
+
     public int CompareTo(object obj)
     {
         if (obj is ArchivalTableLoadInfo other)
@@ -98,11 +100,12 @@ public int CompareTo(object obj)
 
         return string.Compare(ToString(), obj.ToString(), StringComparison.Ordinal);
     }
+
     public void GetSummary(out string title, out string body, out string stackTrace, out CheckResult level)
     {
         title = $"{TargetTable} ({Start})";
-        body =  $"Start:{Start}\r\nEnd:{End}\r\nINSERTS:{Inserts}\r\nUPDATES:{Updates}\r\nDELETES:{Deletes}";
+        body = $"Start:{Start}\r\nEnd:{End}\r\nINSERTS:{Inserts}\r\nUPDATES:{Updates}\r\nDELETES:{Deletes}";
         stackTrace = null;
-        level = CheckResult.Success;                
+        level = CheckResult.Success;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/PastEvents/IArchivalLoggingRecordOfPastEvent.cs b/Rdmp.Core/Logging/PastEvents/IArchivalLoggingRecordOfPastEvent.cs
index e2e989648c..40717a4b90 100644
--- a/Rdmp.Core/Logging/PastEvents/IArchivalLoggingRecordOfPastEvent.cs
+++ b/Rdmp.Core/Logging/PastEvents/IArchivalLoggingRecordOfPastEvent.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Logging.PastEvents;
 /// of new messages/objects e.g. TableLoadInfo and fetching archival history objects of old runs logged in the past ArchivalTableLoadInfo.  All archival 
 /// history objects are immutable (cannot be edited) and inherit from IArchivalLoggingRecordOfPastEvent
 /// </summary>
-public interface IArchivalLoggingRecordOfPastEvent: IComparable
+public interface IArchivalLoggingRecordOfPastEvent : IComparable
 {
     int ID { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Logging/TableLoadInfo.cs b/Rdmp.Core/Logging/TableLoadInfo.cs
index 4e77eb397a..059aebbe04 100644
--- a/Rdmp.Core/Logging/TableLoadInfo.cs
+++ b/Rdmp.Core/Logging/TableLoadInfo.cs
@@ -37,6 +37,7 @@ public class TableLoadInfo : ITableLoadInfo
 
 
     #region Database Connection Setup
+
     private DiscoveredServer _databaseSettings;
     private string _notes;
 
@@ -49,7 +50,8 @@ public class TableLoadInfo : ITableLoadInfo
     /// <param name="destinationTable"></param>
     /// <param name="sources"></param>
     /// <param name="expectedInserts"></param>
-    public TableLoadInfo(DataLoadInfo parent,string suggestedRollbackCommand,string destinationTable, DataSource[] sources, int expectedInserts)
+    public TableLoadInfo(DataLoadInfo parent, string suggestedRollbackCommand, string destinationTable,
+        DataSource[] sources, int expectedInserts)
     {
         _databaseSettings = parent.DatabaseSettings;
 
@@ -59,7 +61,7 @@ public TableLoadInfo(DataLoadInfo parent,string suggestedRollbackCommand,string
         Deletes = 0;
         DiscardedDuplicates = 0;
         _errorRows = 0;
-            
+
         _suggestedRollbackCommand = suggestedRollbackCommand;
 
         DataLoadInfoParent = parent;
@@ -68,18 +70,20 @@ public TableLoadInfo(DataLoadInfo parent,string suggestedRollbackCommand,string
 
         IsLegacyLoggingSchema = md5Col.DataType.SQLType.Contains("binary");
 
-        RecordNewTableLoadInDatabase(parent,destinationTable, sources, expectedInserts);
+        RecordNewTableLoadInDatabase(parent, destinationTable, sources, expectedInserts);
 
         parent.AddTableLoad(this);
     }
 
-    private void RecordNewTableLoadInDatabase(DataLoadInfo parent,string destinationTable, DataSource[] sources, int expectedInserts)
+    private void RecordNewTableLoadInDatabase(DataLoadInfo parent, string destinationTable, DataSource[] sources,
+        int expectedInserts)
     {
         using (var con = _databaseSettings.GetConnection())
         {
-            using (var cmd = _databaseSettings.GetCommand("INSERT INTO TableLoadRun (startTime,dataLoadRunID,targetTable,expectedInserts,suggestedRollbackCommand) " +
-                                                          "VALUES (@startTime,@dataLoadRunID,@targetTable,@expectedInserts,@suggestedRollbackCommand); " +
-                                                          "SELECT @@IDENTITY;", con))
+            using (var cmd = _databaseSettings.GetCommand(
+                       "INSERT INTO TableLoadRun (startTime,dataLoadRunID,targetTable,expectedInserts,suggestedRollbackCommand) " +
+                       "VALUES (@startTime,@dataLoadRunID,@targetTable,@expectedInserts,@suggestedRollbackCommand); " +
+                       "SELECT @@IDENTITY;", con))
             {
                 con.Open();
 
@@ -87,7 +91,8 @@ private void RecordNewTableLoadInDatabase(DataLoadInfo parent,string destination
                 _databaseSettings.AddParameterWithValueToCommand("@dataLoadRunID", cmd, parent.ID);
                 _databaseSettings.AddParameterWithValueToCommand("@targetTable", cmd, destinationTable);
                 _databaseSettings.AddParameterWithValueToCommand("@expectedInserts", cmd, expectedInserts);
-                _databaseSettings.AddParameterWithValueToCommand("@suggestedRollbackCommand", cmd, _suggestedRollbackCommand);
+                _databaseSettings.AddParameterWithValueToCommand("@suggestedRollbackCommand", cmd,
+                    _suggestedRollbackCommand);
 
 
                 //get the ID, can come back as a decimal or an Int32 or an Int64 so whatever, just turn it into a string and then parse it
@@ -98,14 +103,14 @@ private void RecordNewTableLoadInDatabase(DataLoadInfo parent,string destination
 
                 //for each of the sources, create them in the DataSource table
                 foreach (var s in DataSources)
-                {
-                    using (var cmdInsertDs = _databaseSettings.GetCommand("INSERT INTO DataSource (source,tableLoadRunID,originDate,MD5) " +
-                                                                          "VALUES (@source,@tableLoadRunID,@originDate,@MD5); SELECT @@IDENTITY;", con))
+                    using (var cmdInsertDs = _databaseSettings.GetCommand(
+                               "INSERT INTO DataSource (source,tableLoadRunID,originDate,MD5) " +
+                               "VALUES (@source,@tableLoadRunID,@originDate,@MD5); SELECT @@IDENTITY;", con))
                     {
-
                         _databaseSettings.AddParameterWithValueToCommand("@source", cmdInsertDs, s.Source);
                         _databaseSettings.AddParameterWithValueToCommand("@tableLoadRunID", cmdInsertDs, _id);
-                        _databaseSettings.AddParameterWithValueToCommand("@originDate", cmdInsertDs, s.UnknownOriginDate ? DBNull.Value : s.OriginDate);
+                        _databaseSettings.AddParameterWithValueToCommand("@originDate", cmdInsertDs,
+                            s.UnknownOriginDate ? DBNull.Value : s.OriginDate);
 
                         // old logging schema used binary[128] for the MD5 column
                         if (IsLegacyLoggingSchema)
@@ -120,38 +125,38 @@ private void RecordNewTableLoadInDatabase(DataLoadInfo parent,string destination
                         else
                         {
                             // now logging schema uses string for easier usability and FAnsiSql compatibility
-                            _databaseSettings.AddParameterWithValueToCommand("@MD5", cmdInsertDs, s.MD5 != null ? s.MD5 : DBNull.Value);
+                            _databaseSettings.AddParameterWithValueToCommand("@MD5", cmdInsertDs,
+                                s.MD5 != null ? s.MD5 : DBNull.Value);
                         }
 
                         s.ID = int.Parse(cmdInsertDs.ExecuteScalar().ToString());
                     }
-                }
             }
         }
     }
 
-    #region Property setup 
+    #region Property setup
 
     /// <summary>
     /// Increases or Gets the number of Updated records, use += instead of trying to set a specific value.  Important:Make sure you increment with Affected Rows, not just UPDATE commands sent)
     /// </summary>
-    public int Updates {get;set;}
+    public int Updates { get; set; }
 
 
     /// <summary>
     /// Increases or Gets the number of Deleted records, use += instead of trying to set a specific value.  Important:Make sure you increment with Affected Rows, not just DELETE commands sent)
     /// </summary>
-    public int Deletes {get;set;}
+    public int Deletes { get; set; }
 
     /// <summary>
     /// Increases or Gets the number of Inserted records, use += instead of trying to set a specific value
     /// </summary>
-    public int Inserts {get;set;}
+    public int Inserts { get; set; }
 
     /// <summary>
     /// Increases or Gets the number of Discarded Duplicate records, use += instead of trying to set a specific value
     /// </summary>
-    public int DiscardedDuplicates {get;set;}
+    public int DiscardedDuplicates { get; set; }
 
     /// <summary>
     /// Gets the number of ErrorRows during this data run so far, this is automatically increased by the RowErrorLogging class
@@ -182,22 +187,26 @@ public void CloseAndArchive()
     {
         using (var con = _databaseSettings.BeginNewTransactedConnection())
         {
-            using (var cmdCloseRecord = _databaseSettings.GetCommand("UPDATE TableLoadRun SET endTime=@endTime,inserts=@inserts,updates=@updates,deletes=@deletes,errorRows=@errorRows,duplicates=@duplicates, notes=@notes WHERE ID=@ID", con.Connection, con.ManagedTransaction))
+            using (var cmdCloseRecord = _databaseSettings.GetCommand(
+                       "UPDATE TableLoadRun SET endTime=@endTime,inserts=@inserts,updates=@updates,deletes=@deletes,errorRows=@errorRows,duplicates=@duplicates, notes=@notes WHERE ID=@ID",
+                       con.Connection, con.ManagedTransaction))
             {
                 try
                 {
-                    _databaseSettings.AddParameterWithValueToCommand("@endTime",cmdCloseRecord, DateTime.Now);
+                    _databaseSettings.AddParameterWithValueToCommand("@endTime", cmdCloseRecord, DateTime.Now);
                     _databaseSettings.AddParameterWithValueToCommand("@inserts", cmdCloseRecord, Inserts);
                     _databaseSettings.AddParameterWithValueToCommand("@updates", cmdCloseRecord, Updates);
                     _databaseSettings.AddParameterWithValueToCommand("@deletes", cmdCloseRecord, Deletes);
                     _databaseSettings.AddParameterWithValueToCommand("@errorRows", cmdCloseRecord, ErrorRows);
-                    _databaseSettings.AddParameterWithValueToCommand("@duplicates", cmdCloseRecord, DiscardedDuplicates);
-                    _databaseSettings.AddParameterWithValueToCommand("@notes", cmdCloseRecord, string.IsNullOrWhiteSpace(Notes) ? DBNull.Value : Notes);
+                    _databaseSettings.AddParameterWithValueToCommand("@duplicates", cmdCloseRecord,
+                        DiscardedDuplicates);
+                    _databaseSettings.AddParameterWithValueToCommand("@notes", cmdCloseRecord,
+                        string.IsNullOrWhiteSpace(Notes) ? DBNull.Value : Notes);
                     _databaseSettings.AddParameterWithValueToCommand("@ID", cmdCloseRecord, ID);
 
                     var affectedRows = cmdCloseRecord.ExecuteNonQuery();
 
-                    if(affectedRows != 1)
+                    if (affectedRows != 1)
                         throw new Exception(
                             $"Error closing TableLoadInfo in database, the UPDATE command affected {affectedRows} when we expected 1 (will attempt to rollback transaction)");
 
@@ -224,10 +233,11 @@ private void MarkDataSourceAsArchived(DataSource ds, IManagedConnection con)
         if (string.IsNullOrEmpty(ds.Archive))
             return;
 
-        using (var cmdSetArchived = _databaseSettings.GetCommand("UPDATE DataSource SET archive=@archive, source = @source WHERE ID=@ID", con.Connection, con.ManagedTransaction))
+        using (var cmdSetArchived = _databaseSettings.GetCommand(
+                   "UPDATE DataSource SET archive=@archive, source = @source WHERE ID=@ID", con.Connection,
+                   con.ManagedTransaction))
         {
-
-            _databaseSettings.AddParameterWithValueToCommand("@archive", cmdSetArchived,ds.Archive);
+            _databaseSettings.AddParameterWithValueToCommand("@archive", cmdSetArchived, ds.Archive);
             _databaseSettings.AddParameterWithValueToCommand("@source", cmdSetArchived, ds.Source);
             _databaseSettings.AddParameterWithValueToCommand("@ID", cmdSetArchived, ds.ID);
 
@@ -245,5 +255,4 @@ public void IncrementErrorRows()
     }
 
     #endregion
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/AttributePropertyFinder.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/AttributePropertyFinder.cs
index d8d8f40b3b..f108a11b4c 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/AttributePropertyFinder.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/AttributePropertyFinder.cs
@@ -20,30 +20,27 @@ public class AttributePropertyFinder<T> : IAttributePropertyFinder where T : Att
 {
     private readonly Dictionary<Type, HashSet<PropertyInfo>> _properties = new();
 
-    public AttributePropertyFinder(IEnumerable<IMapsDirectlyToDatabaseTable> objects) 
+    public AttributePropertyFinder(IEnumerable<IMapsDirectlyToDatabaseTable> objects)
     {
         foreach (var type in objects.Select(o => o.GetType()).Distinct())
         {
             var propertyInfos = type.GetProperties();
 
             foreach (var property in propertyInfos)
-            {
                 //if property has sql flag
                 if (property.GetCustomAttributes(typeof(T), true).Any())
                 {
-                    if(!_properties.ContainsKey(type))
+                    if (!_properties.ContainsKey(type))
                         _properties.Add(type, new HashSet<PropertyInfo>());
 
-                    if(!_properties[type].Contains(property))
+                    if (!_properties[type].Contains(property))
                         _properties[type].Add(property);
                 }
-            }
         }
     }
 
-    public AttributePropertyFinder(IMapsDirectlyToDatabaseTable o): this(new[] { o})
+    public AttributePropertyFinder(IMapsDirectlyToDatabaseTable o) : this(new[] { o })
     {
-            
     }
 
     public IEnumerable<PropertyInfo> GetProperties(IMapsDirectlyToDatabaseTable o)
@@ -61,13 +58,7 @@ public IEnumerable<PropertyInfo> GetProperties(IMapsDirectlyToDatabaseTable o)
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    public bool ObjectContainsProperty(IMapsDirectlyToDatabaseTable arg)
-    {
-        return _properties.ContainsKey(arg.GetType());
-    }
+    public bool ObjectContainsProperty(IMapsDirectlyToDatabaseTable arg) => _properties.ContainsKey(arg.GetType());
 
-    public T GetAttribute(PropertyInfo property)
-    {
-        return (T) property.GetCustomAttributes(typeof (T), true).SingleOrDefault();
-    }
+    public T GetAttribute(PropertyInfo property) => (T)property.GetCustomAttributes(typeof(T), true).SingleOrDefault();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipAttribute.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipAttribute.cs
index e178b0eb54..787f95b12d 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipAttribute.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipAttribute.cs
@@ -40,7 +40,7 @@ public class RelationshipAttribute : Attribute
     /// <param name="cref"></param>
     /// <param name="type"></param>
     /// <param name="propertyName"></param>
-    public RelationshipAttribute(Type cref,RelationshipType type,[CallerMemberName] string propertyName=null)
+    public RelationshipAttribute(Type cref, RelationshipType type, [CallerMemberName] string propertyName = null)
     {
         Cref = cref;
         Type = type;
@@ -48,22 +48,19 @@ public RelationshipAttribute(Type cref,RelationshipType type,[CallerMemberName]
     }
 
     #region Equality Members
-    protected bool Equals(RelationshipAttribute other)
-    {
-        return base.Equals(other) && Equals(Cref, other.Cref) && string.Equals(PropertyName, other.PropertyName);
-    }
+
+    protected bool Equals(RelationshipAttribute other) => base.Equals(other) && Equals(Cref, other.Cref) &&
+                                                          string.Equals(PropertyName, other.PropertyName);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((RelationshipAttribute) obj);
+        return Equals((RelationshipAttribute)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(base.GetHashCode(), Cref, PropertyName);
-    }
+    public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), Cref, PropertyName);
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipType.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipType.cs
index 7e9a8043c4..a5bd76805b 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipType.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Attributes/RelationshipType.cs
@@ -26,7 +26,7 @@ public enum RelationshipType
     /// LoadMetadata is irrelevant and should not be shared (it should be left as null in the imported destination).
     /// </summary>
     IgnoreableLocalReference,
-        
+
     /// <summary>
     /// The decorated property reflects a reference to another shared object which may or may not be supplied as part of the gathered objects (Optional).
     /// If no shared object is included in a share then the marked property is ignored (i.e. behaves like a <see cref="IgnoreableLocalReference"/>).
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/DatabaseConnectionConfiguration.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/DatabaseConnectionConfiguration.cs
index 352d1b96f2..57fb1bdcf3 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/DatabaseConnectionConfiguration.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/DatabaseConnectionConfiguration.cs
@@ -4,4 +4,4 @@
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
-namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
+namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/IDisableable.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/IDisableable.cs
index 3fe7daaaf2..bf5c27a06f 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/IDisableable.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/IDisableable.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
 /// Class supports a disabled state which should be consulted before running the component
 /// e.g. in a data load.
 /// </summary>
-public interface IDisableable: IRevertable
+public interface IDisableable : IRevertable
 {
     /// <summary>
     /// True to skip the component when executing (but still show it at design time).
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/IMapsDirectlyToDatabaseTable.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/IMapsDirectlyToDatabaseTable.cs
index e968a8d63b..bc67c0c6e0 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/IMapsDirectlyToDatabaseTable.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/IMapsDirectlyToDatabaseTable.cs
@@ -23,7 +23,7 @@ public interface IMapsDirectlyToDatabaseTable : IDeleteable, INotifyPropertyChan
     /// Therefore for a given <see cref="IRepository"/> this uniquely identifies a given object.
     /// </summary>
     int ID { get; set; }
-        
+
     /// <summary>
     /// The persistence database that stores the object.  For example a <see cref="TableRepository"/>.
     /// </summary>
@@ -36,7 +36,7 @@ public interface IMapsDirectlyToDatabaseTable : IDeleteable, INotifyPropertyChan
     void SetReadOnly();
 
     //you must have a Property for each thing in your database table (With the same name)
-        
+
     //use MapsDirectlyToDatabaseTableRepository to fully utilise this interface
 
     //ensure you have a the same class name as the table name DIRECTLY
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/IMightBeDeprecated.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/IMightBeDeprecated.cs
index 6c46e916a2..bd0485c354 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/IMightBeDeprecated.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/IMightBeDeprecated.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
 /// <summary>
 /// Interface for database object classes with a deprecated status flag
 /// </summary>
-public interface IMightBeDeprecated:IRevertable
+public interface IMightBeDeprecated : IRevertable
 {
     /// <summary>
     /// Bit flag indicating whether the object should be considered Deprecated (i.e. do not use anymore).  This is preferred to deleting it.  The implications
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/INamed.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/INamed.cs
index 1fa43c9722..9a77a57290 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/INamed.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/INamed.cs
@@ -16,7 +16,6 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
 /// </summary>
 public interface INamed : IRevertable, INotifyPropertyChanged
 {
-        
     /// <summary>
     /// A user meaningful name for describing the entity, this should be suitable for display in minimal screen space.
     /// </summary>
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/IRepository.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/IRepository.cs
index e38a4b6f8c..73a0ab51c7 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/IRepository.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/IRepository.cs
@@ -56,15 +56,16 @@ public interface IRepository
     /// <param name="toCreate"></param>
     /// <param name="constructorParameters"></param>
     /// <returns></returns>
-    void InsertAndHydrate<T>(T toCreate, Dictionary<string,object> constructorParameters) where T : IMapsDirectlyToDatabaseTable;
-        
+    void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> constructorParameters)
+        where T : IMapsDirectlyToDatabaseTable;
+
     /// <summary>
     /// Get object with the given id, all implementations of this method should set the Repository field on T for you (automatically)
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="id"></param>
     /// <returns></returns>
-    T GetObjectByID<T>(int id) where T:IMapsDirectlyToDatabaseTable;
+    T GetObjectByID<T>(int id) where T : IMapsDirectlyToDatabaseTable;
 
     /// <summary>
     /// Gets all objects of the given Type from the database, optionally fetches only those that match SQL WHERE statement
@@ -86,7 +87,8 @@ public interface IRepository
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
-    T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2,object value2) where T : IMapsDirectlyToDatabaseTable;
+    T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2, object value2)
+        where T : IMapsDirectlyToDatabaseTable;
 
     /// <summary>
     /// Gets all objects of type <paramref name="t"/>
@@ -94,7 +96,7 @@ public interface IRepository
     /// <param name="t"></param>
     /// <returns></returns>
     IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t);
-        
+
     /// <summary>
     /// Returns child objects of type T which belong to parent.  If the repository does not think the parent type and T types are 
     /// related you should throw an Exception
@@ -113,7 +115,8 @@ public interface IRepository
     /// <typeparam name="T2">Type of the parent</typeparam>
     /// <param name="parent"></param>
     /// <returns></returns>
-    T[] GetAllObjectsWithParent<T,T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2> where T2:IMapsDirectlyToDatabaseTable;
+    T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2>
+        where T2 : IMapsDirectlyToDatabaseTable;
 
 
     /// <summary>
@@ -128,7 +131,7 @@ public interface IRepository
     /// </summary>
     /// <param name="oTableWrapperObject"></param>
     void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject);
-        
+
     /// <summary>
     /// Repopulates all properties of the object to match the values currently stored in the database
     /// </summary>
@@ -141,7 +144,7 @@ public interface IRepository
     /// <param name="mapsDirectlyToDatabaseTable"></param>
     /// <returns></returns>
     RevertableObjectReport HasLocalChanges(IMapsDirectlyToDatabaseTable mapsDirectlyToDatabaseTable);
-        
+
     /// <summary>
     /// Returns true if the two supplied objects are the same Type of <see cref="IMapsDirectlyToDatabaseTable"/> with the same <see cref="IMapsDirectlyToDatabaseTable.ID"/>.
     /// </summary>
@@ -169,13 +172,15 @@ public interface IRepository
     /// <param name="objectId"></param>
     /// <returns></returns>
     bool StillExists(Type objectType, int objectId);
+
     IMapsDirectlyToDatabaseTable GetObjectByID(Type objectType, int objectId);
 
 
     IEnumerable<T> GetAllObjectsInIDList<T>(IEnumerable<int> ids) where T : IMapsDirectlyToDatabaseTable;
     IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjectsInIDList(Type elementType, IEnumerable<int> ids);
 
-    void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName,object propertyValue);
+    void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName,
+        object propertyValue);
 
     /// <summary>
     /// Returns all objects held in the repository.  This method is likely to be slow for large databases
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/ITableRepository.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/ITableRepository.cs
index 1909c3c149..aedd8c02c2 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/ITableRepository.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/ITableRepository.cs
@@ -18,7 +18,6 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable;
 /// </summary>
 public interface ITableRepository : IRepository
 {
-        
     string ConnectionString { get; }
     DbConnectionStringBuilder ConnectionStringBuilder { get; }
     DiscoveredServer DiscoveredServer { get; }
@@ -29,8 +28,9 @@ public interface ITableRepository : IRepository
     void ClearUpdateCommandCache();
     int? ObjectToNullableInt(object o);
     DateTime? ObjectToNullableDateTime(object o);
-        
-    IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID = null) where T : IMapsDirectlyToDatabaseTable;
+
+    IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID = null)
+        where T : IMapsDirectlyToDatabaseTable;
 
     int Insert(string sql, Dictionary<string, object> parameters);
     int Delete(string deleteQuery, Dictionary<string, object> parameters = null, bool throwOnZeroAffectedRows = true);
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Injection/IInjectKnown.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Injection/IInjectKnown.cs
index 855b03868d..0f9eaa70db 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Injection/IInjectKnown.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Injection/IInjectKnown.cs
@@ -47,7 +47,7 @@ public interface IInjectKnown
 /// 
 /// </code></example>
 /// <typeparam name="T"></typeparam>
-public interface IInjectKnown<T>:IInjectKnown
+public interface IInjectKnown<T> : IInjectKnown
 {
     /// <summary>
     /// Records the known state of T so that it doesn't have to be fetched by an expensive operation e.g. going to the database and fetching it.
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/MemoryRepository.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/MemoryRepository.cs
index bbddfed94a..b484eab527 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/MemoryRepository.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/MemoryRepository.cs
@@ -28,19 +28,22 @@ public class MemoryRepository : IRepository
     /// <summary>
     /// This is a concurrent hashset.  See https://stackoverflow.com/a/18923091
     /// </summary>
-    protected readonly ConcurrentDictionary<IMapsDirectlyToDatabaseTable,byte> Objects =
+    protected readonly ConcurrentDictionary<IMapsDirectlyToDatabaseTable, byte> Objects =
         new();
-    private readonly ConcurrentDictionary<IMapsDirectlyToDatabaseTable, HashSet<PropertyChangedExtendedEventArgs>> _propertyChanges = new();
+
+    private readonly ConcurrentDictionary<IMapsDirectlyToDatabaseTable, HashSet<PropertyChangedExtendedEventArgs>>
+        _propertyChanges = new();
 
     public event EventHandler<SaveEventArgs> Saving;
     public event EventHandler<IMapsDirectlyToDatabaseTableEventArgs> Inserting;
     public event EventHandler<IMapsDirectlyToDatabaseTableEventArgs> Deleting;
 
-    public virtual void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> constructorParameters) where T : IMapsDirectlyToDatabaseTable
+    public virtual void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> constructorParameters)
+        where T : IMapsDirectlyToDatabaseTable
     {
         NextObjectId++;
         toCreate.ID = NextObjectId;
-            
+
         foreach (var kvp in constructorParameters)
         {
             var val = kvp.Value;
@@ -57,8 +60,8 @@ public virtual void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> c
         }
 
         toCreate.Repository = this;
-            
-        Objects.TryAdd(toCreate,0);
+
+        Objects.TryAdd(toCreate, 0);
 
         toCreate.PropertyChanged += toCreate_PropertyChanged;
 
@@ -67,11 +70,12 @@ public virtual void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> c
         Inserting?.Invoke(this, new IMapsDirectlyToDatabaseTableEventArgs(toCreate));
     }
 
-    protected virtual void SetValue<T>(T toCreate, PropertyInfo prop, string strVal, object val) where T : IMapsDirectlyToDatabaseTable
+    protected virtual void SetValue<T>(T toCreate, PropertyInfo prop, string strVal, object val)
+        where T : IMapsDirectlyToDatabaseTable
     {
-        if(val == null)
+        if (val == null)
         {
-            prop.SetValue(toCreate,val);
+            prop.SetValue(toCreate, val);
             return;
         }
 
@@ -113,25 +117,26 @@ public T GetObjectByID<T>(int id) where T : IMapsDirectlyToDatabaseTable
         {
             return Objects.Keys.OfType<T>().Single(o => o.ID == id);
         }
-        catch(InvalidOperationException e)
+        catch (InvalidOperationException e)
         {
-            throw new KeyNotFoundException($"Could not find {typeof(T).Name} with ID {id}",e);
+            throw new KeyNotFoundException($"Could not find {typeof(T).Name} with ID {id}", e);
         }
     }
 
     public T[] GetAllObjects<T>() where T : IMapsDirectlyToDatabaseTable
     {
-        return Objects.Keys.OfType<T>().OrderBy(o=>o.ID).ToArray();
+        return Objects.Keys.OfType<T>().OrderBy(o => o.ID).ToArray();
     }
 
     public T[] GetAllObjectsWhere<T>(string property, object value1) where T : IMapsDirectlyToDatabaseTable
     {
-        var prop = typeof (T).GetProperty(property);
+        var prop = typeof(T).GetProperty(property);
 
         return GetAllObjects<T>().Where(o => Equals(prop.GetValue(o), value1)).ToArray();
     }
 
-    public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2, object value2) where T : IMapsDirectlyToDatabaseTable
+    public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2,
+        object value2) where T : IMapsDirectlyToDatabaseTable
     {
         var prop1 = typeof(T).GetProperty(property1);
         var prop2 = typeof(T).GetProperty(property2);
@@ -139,9 +144,11 @@ public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType
         switch (operand)
         {
             case ExpressionType.AndAlso:
-                return GetAllObjects<T>().Where(o => Equals(prop1.GetValue(o), value1) && Equals(prop2.GetValue(o), value2)).ToArray();
+                return GetAllObjects<T>()
+                    .Where(o => Equals(prop1.GetValue(o), value1) && Equals(prop2.GetValue(o), value2)).ToArray();
             case ExpressionType.OrElse:
-                return GetAllObjects<T>().Where(o => Equals(prop1.GetValue(o), value1) || Equals(prop2.GetValue(o), value2)).ToArray();
+                return GetAllObjects<T>()
+                    .Where(o => Equals(prop1.GetValue(o), value1) || Equals(prop2.GetValue(o), value2)).ToArray();
             default:
                 throw new NotSupportedException("operand");
         }
@@ -149,7 +156,7 @@ public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType
 
     public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t)
     {
-        return Objects.Keys.Where(o=>o.GetType() == t);
+        return Objects.Keys.Where(o => o.GetType() == t);
     }
 
     public T[] GetAllObjectsWithParent<T>(IMapsDirectlyToDatabaseTable parent) where T : IMapsDirectlyToDatabaseTable
@@ -158,28 +165,30 @@ public T[] GetAllObjectsWithParent<T>(IMapsDirectlyToDatabaseTable parent) where
         var propertyName = $"{parent.GetType().Name}_ID";
 
         var prop = typeof(T).GetProperty(propertyName);
-        return Objects.Keys.OfType<T>().Where(o => prop.GetValue(o) as int? == parent.ID).Cast<T>().OrderBy(o => o.ID).ToArray();
+        return Objects.Keys.OfType<T>().Where(o => prop.GetValue(o) as int? == parent.ID).Cast<T>().OrderBy(o => o.ID)
+            .ToArray();
     }
 
-    public T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2> where T2 : IMapsDirectlyToDatabaseTable
+    public T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2>
+        where T2 : IMapsDirectlyToDatabaseTable
     {
         //e.g. Catalogue_ID
         var propertyName = $"{typeof(T2).Name}_ID";
 
-        var prop = typeof (T).GetProperty(propertyName);
-        return Objects.Keys.OfType<T>().Where(o => prop.GetValue(o) as int? == parent.ID).Cast<T>().OrderBy(o => o.ID).ToArray();
-
+        var prop = typeof(T).GetProperty(propertyName);
+        return Objects.Keys.OfType<T>().Where(o => prop.GetValue(o) as int? == parent.ID).Cast<T>().OrderBy(o => o.ID)
+            .ToArray();
     }
 
     public virtual void SaveToDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         Saving?.Invoke(this, new SaveEventArgs(oTableWrapperObject));
 
-        var existing = Objects.Keys.FirstOrDefault(k=>k.Equals(oTableWrapperObject));
+        var existing = Objects.Keys.FirstOrDefault(k => k.Equals(oTableWrapperObject));
 
         // If saving a new reference to an existing object then we should update our tracked
         // objects to the latest reference since the old one is stale
-        if(!ReferenceEquals(existing,oTableWrapperObject))
+        if (!ReferenceEquals(existing, oTableWrapperObject))
         {
             Objects.TryRemove(oTableWrapperObject, out _);
             Objects.TryAdd(oTableWrapperObject, 0);
@@ -192,7 +201,7 @@ public virtual void SaveToDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObj
     public virtual void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         CascadeDeletes(oTableWrapperObject);
-        
+
         Objects.TryRemove(oTableWrapperObject, out _);
 
         //forget about property changes (since it's been deleted)
@@ -208,7 +217,6 @@ public virtual void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrappe
     /// <param name="oTableWrapperObject"></param>
     protected virtual void CascadeDeletes(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
-            
     }
 
     public void RevertToDatabaseState(IMapsDirectlyToDatabaseTable mapsDirectlyToDatabaseTable)
@@ -222,26 +230,27 @@ public void RevertToDatabaseState(IMapsDirectlyToDatabaseTable mapsDirectlyToDat
 
         var type = mapsDirectlyToDatabaseTable.GetType();
 
-        foreach (var e in _propertyChanges[mapsDirectlyToDatabaseTable].ToArray()) //call ToArray to avoid cyclical events on SetValue
+        foreach (var e in
+                 _propertyChanges[mapsDirectlyToDatabaseTable]
+                     .ToArray()) //call ToArray to avoid cyclical events on SetValue
         {
             var prop = type.GetProperty(e.PropertyName);
-            prop.SetValue(mapsDirectlyToDatabaseTable,e.OldValue);//reset the old values
+            prop.SetValue(mapsDirectlyToDatabaseTable, e.OldValue); //reset the old values
         }
 
         //forget about all changes now
         _propertyChanges.TryRemove(mapsDirectlyToDatabaseTable, out _);
-            
     }
 
     public RevertableObjectReport HasLocalChanges(IMapsDirectlyToDatabaseTable mapsDirectlyToDatabaseTable)
     {
         //if we don't know about it then it was deleted
-        if(!Objects.ContainsKey(mapsDirectlyToDatabaseTable))
-            return new RevertableObjectReport {Evaluation = ChangeDescription.DatabaseCopyWasDeleted};
+        if (!Objects.ContainsKey(mapsDirectlyToDatabaseTable))
+            return new RevertableObjectReport { Evaluation = ChangeDescription.DatabaseCopyWasDeleted };
 
         //if it has no changes (since a save)
         if (!_propertyChanges.ContainsKey(mapsDirectlyToDatabaseTable))
-            return new RevertableObjectReport {Evaluation = ChangeDescription.NoChanges};
+            return new RevertableObjectReport { Evaluation = ChangeDescription.NoChanges };
 
         //we have local 'unsaved' changes
         var type = mapsDirectlyToDatabaseTable.GetType();
@@ -249,7 +258,7 @@ public RevertableObjectReport HasLocalChanges(IMapsDirectlyToDatabaseTable mapsD
                 d => new RevertablePropertyDifference(type.GetProperty(d.PropertyName), d.NewValue, d.OldValue))
             .ToList();
 
-        return new RevertableObjectReport(differences){Evaluation = ChangeDescription.DatabaseCopyDifferent};
+        return new RevertableObjectReport(differences) { Evaluation = ChangeDescription.DatabaseCopyDifferent };
     }
 
     /// <inheritdoc/>
@@ -262,26 +271,19 @@ public bool AreEqual(IMapsDirectlyToDatabaseTable obj1, object obj2)
             return false;
 
         if (obj1 == null && obj2 == null)
-            throw new NotSupportedException("Why are you comparing two null things against one another with this method?");
+            throw new NotSupportedException(
+                "Why are you comparing two null things against one another with this method?");
 
         if (obj1.GetType() == obj2.GetType())
-        {
             return ((IMapsDirectlyToDatabaseTable)obj1).ID == ((IMapsDirectlyToDatabaseTable)obj2).ID;
-        }
 
         return false;
     }
 
     /// <inheritdoc/>
-    public int GetHashCode(IMapsDirectlyToDatabaseTable obj1)
-    {
-        return obj1.GetType().GetHashCode() * obj1.ID;
-    }
+    public int GetHashCode(IMapsDirectlyToDatabaseTable obj1) => obj1.GetType().GetHashCode() * obj1.ID;
 
-    public Version GetVersion()
-    {
-        return GetType().Assembly.GetName().Version;
-    }
+    public Version GetVersion() => GetType().Assembly.GetName().Version;
 
 
     public bool StillExists<T>(int allegedParent) where T : IMapsDirectlyToDatabaseTable
@@ -289,10 +291,7 @@ public bool StillExists<T>(int allegedParent) where T : IMapsDirectlyToDatabaseT
         return Objects.Keys.OfType<T>().Any(o => o.ID == allegedParent);
     }
 
-    public bool StillExists(IMapsDirectlyToDatabaseTable o)
-    {
-        return Objects.ContainsKey(o);
-    }
+    public bool StillExists(IMapsDirectlyToDatabaseTable o) => Objects.ContainsKey(o);
 
     public bool StillExists(Type objectType, int objectId)
     {
@@ -302,7 +301,8 @@ public bool StillExists(Type objectType, int objectId)
     public IMapsDirectlyToDatabaseTable GetObjectByID(Type objectType, int objectId)
     {
         return Objects.Keys.SingleOrDefault(o => o.GetType() == objectType && objectId == o.ID)
-               ?? throw new KeyNotFoundException($"Could not find object of Type '{objectType}' with ID '{objectId}' in {nameof(MemoryRepository)}");
+               ?? throw new KeyNotFoundException(
+                   $"Could not find object of Type '{objectType}' with ID '{objectId}' in {nameof(MemoryRepository)}");
     }
 
     public IEnumerable<T> GetAllObjectsInIDList<T>(IEnumerable<int> ids) where T : IMapsDirectlyToDatabaseTable
@@ -317,10 +317,11 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjectsInIDList(Type elem
         return GetAllObjects(elementType).Where(o => hs.Contains(o.ID));
     }
 
-    public void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName, object propertyValue)
+    public void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName,
+        object propertyValue)
     {
         var prop = entity.GetType().GetProperty(propertyName);
-        prop.SetValue(entity,propertyValue);
+        prop.SetValue(entity, propertyValue);
         SaveToDatabase(entity);
     }
 
@@ -330,14 +331,10 @@ public IMapsDirectlyToDatabaseTable[] GetAllObjectsInDatabase()
         return Objects.Keys.OrderBy(o => o.ID).ToArray();
     }
 
-    public bool SupportsObjectType(Type type)
-    {
-        return typeof (IMapsDirectlyToDatabaseTable).IsAssignableFrom(type);
-    }
+    public bool SupportsObjectType(Type type) => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(type);
 
     public void TestConnection()
     {
-            
     }
 
     public virtual void Clear()
@@ -360,18 +357,13 @@ public Type[] GetCompatibleTypes()
 
                         //or with a spontaneous base class
                         && (t.BaseType == null || !t.BaseType.Name.Contains("Spontaneous"))
-
                 ).ToArray();
     }
 
 
-    public IDisposable BeginNewTransaction()
-    {
-        return new EmptyDisposeable();
-    }
+    public IDisposable BeginNewTransaction() => new EmptyDisposeable();
 
     public void EndTransaction(bool commit)
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/NewObjectPool.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/NewObjectPool.cs
index 5fa145da66..e28e362589 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/NewObjectPool.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/NewObjectPool.cs
@@ -17,7 +17,7 @@ public static class NewObjectPool
 
     public static void Add(IMapsDirectlyToDatabaseTable toCreate)
     {
-        lock(currentScopeLock)
+        lock (currentScopeLock)
         {
             CurrentScope?.Objects.Add(toCreate);
         }
@@ -68,7 +68,7 @@ private static void EndSession()
 
     private class Scope : IDisposable
     {
-        public List<IMapsDirectlyToDatabaseTable> Objects { get; set; } = new List<IMapsDirectlyToDatabaseTable>();
+        public List<IMapsDirectlyToDatabaseTable> Objects { get; set; } = new();
 
 
         public void Dispose()
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/IRevertable.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/IRevertable.cs
index b7c2142dff..9492e624cd 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/IRevertable.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/IRevertable.cs
@@ -16,14 +16,14 @@ public interface IRevertable : IMapsDirectlyToDatabaseTable, ISaveable
     /// Resets all public properties on the class to match the values stored in the <see cref="IRepository"/>
     /// </summary>
     void RevertToDatabaseState();
-        
+
     /// <summary>
     /// Connects to the database <see cref="IRepository"/> and checks the values of public properties against the currently held (in memory)
     /// version of the class.
     /// </summary>
     /// <returns>Report about the differences if any to the class</returns>
     RevertableObjectReport HasLocalChanges();
-        
+
     /// <summary>
     /// Connects to the database <see cref="IRepository"/> and returns true if the object (in memory) still exists in the database.
     /// </summary>
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/RevertablePropertyDifference.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/RevertablePropertyDifference.cs
index 201be3828c..b0cc75aac2 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/RevertablePropertyDifference.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Revertable/RevertablePropertyDifference.cs
@@ -15,14 +15,14 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable.Revertable;
 /// </summary>
 public class RevertablePropertyDifference
 {
-    public RevertablePropertyDifference(PropertyInfo property,object localValue,object databaseValue)
+    public RevertablePropertyDifference(PropertyInfo property, object localValue, object databaseValue)
     {
         Property = property;
         LocalValue = localValue;
         DatabaseValue = databaseValue;
     }
 
-    public PropertyInfo Property { get;private set; }
+    public PropertyInfo Property { get; private set; }
     public object LocalValue { get; private set; }
-    public object DatabaseValue { get;private set; }
+    public object DatabaseValue { get; private set; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/SaveEventArgs.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/SaveEventArgs.cs
index 34667a2499..67a36e0bff 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/SaveEventArgs.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/SaveEventArgs.cs
@@ -22,11 +22,10 @@ public class SaveEventArgs : EventArgs
     /// <summary>
     /// The object that is about to be saved to database/disk
     /// </summary>
-    public IMapsDirectlyToDatabaseTable BeingSaved { get;}
+    public IMapsDirectlyToDatabaseTable BeingSaved { get; }
 
     public SaveEventArgs(IMapsDirectlyToDatabaseTable o)
     {
         BeingSaved = o;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/TableRepository.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/TableRepository.cs
index 4700eb700e..68d82850ed 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/TableRepository.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/TableRepository.cs
@@ -55,10 +55,11 @@ public abstract class TableRepository : ITableRepository
     //If you are calling this constructor then make sure to set the connection strings in your derived class constructor
     public TableRepository()
     {
-        _tables = new Lazy<DiscoveredTable[]>(()=>DiscoveredServer.GetCurrentDatabase().DiscoverTables(false));
+        _tables = new Lazy<DiscoveredTable[]>(() => DiscoveredServer.GetCurrentDatabase().DiscoverTables(false));
     }
 
-    public TableRepository(IObscureDependencyFinder obscureDependencyFinder, DbConnectionStringBuilder connectionStringBuilder):this()
+    public TableRepository(IObscureDependencyFinder obscureDependencyFinder,
+        DbConnectionStringBuilder connectionStringBuilder) : this()
     {
         ObscureDependencyFinder = obscureDependencyFinder;
         _connectionStringBuilder = connectionStringBuilder;
@@ -69,14 +70,16 @@ public TableRepository(IObscureDependencyFinder obscureDependencyFinder, DbConne
     public void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         //do not log information about access credentials
-        if(oTableWrapperObject is not IDataAccessCredentials)
+        if (oTableWrapperObject is not IDataAccessCredentials)
             _logger.Debug(
                 $"Deleted,{oTableWrapperObject.GetType().Name},{oTableWrapperObject.ID},{oTableWrapperObject}");
-            
+
         lock (_oLockUpdateCommands)
         {
             //if the repository has obscure dependencies
-            ObscureDependencyFinder?.ThrowIfDeleteDisallowed(oTableWrapperObject);//confirm that deleting the object is allowed by the dependencies
+            ObscureDependencyFinder
+                ?.ThrowIfDeleteDisallowed(
+                    oTableWrapperObject); //confirm that deleting the object is allowed by the dependencies
 
             using var con = GetConnection();
             using (var cmd = DatabaseCommandHelper.GetCommand(
@@ -86,7 +89,7 @@ public void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
                 DatabaseCommandHelper.AddParameterWithValueToCommand("@ID", cmd, oTableWrapperObject.ID);
                 cmd.ExecuteNonQuery();
             }
-                    
+
             //likewise if there are obscure dependency handlers let them handle cascading this delete into the mists of their obscure functionality (e.g. deleting a Catalogue in CatalogueRepository would delete all Evaluations of that Catalogue in the DQE repository because they would then be orphans)
             ObscureDependencyFinder?.HandleCascadeDeletesForDeletedObject(oTableWrapperObject);
         }
@@ -95,7 +98,8 @@ public void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     }
 
     /// <inheritdoc/>
-    public T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2> where T2 : IMapsDirectlyToDatabaseTable
+    public T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDatabaseTable, IInjectKnown<T2>
+        where T2 : IMapsDirectlyToDatabaseTable
     {
         var toReturn = GetAllObjectsWithParent<T>(parent);
         foreach (var v in toReturn)
@@ -104,19 +108,18 @@ public T[] GetAllObjectsWithParent<T, T2>(T2 parent) where T : IMapsDirectlyToDa
         return toReturn;
     }
 
-        
 
     /// <inheritdoc/>
     public void SaveToDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
-        var r = (IRevertable) oTableWrapperObject;
+        var r = (IRevertable)oTableWrapperObject;
         var changes = r.HasLocalChanges();
-            
-        if(changes.Evaluation == ChangeDescription.NoChanges)
+
+        if (changes.Evaluation == ChangeDescription.NoChanges)
             return;
 
-        var e =new SaveEventArgs(oTableWrapperObject);
-        Saving?.Invoke(this,e);
+        var e = new SaveEventArgs(oTableWrapperObject);
+        Saving?.Invoke(this, e);
 
         if (e.Cancel)
             return;
@@ -130,8 +133,8 @@ public void SaveToDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
             using var managedConnection = GetConnection();
             var cmd = GetUpdateCommandFromStore(oTableWrapperObject.GetType(), managedConnection);
 
-            PopulateUpdateCommandValuesWithCurrentState(cmd,oTableWrapperObject);
-                    
+            PopulateUpdateCommandValuesWithCurrentState(cmd, oTableWrapperObject);
+
             cmd.Connection = managedConnection.Connection;
 
             //change the transaction of the update comand to the specified transaction but only long enough to run it
@@ -147,29 +150,28 @@ public void SaveToDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
             finally
             {
                 //reset the transaction to whatever it was before
-                cmd.Transaction = transactionBefore;    
+                cmd.Transaction = transactionBefore;
             }
-                    
-                    
+
+
             if (affectedRows != 1)
-            {
                 throw new Exception(
                     $"Attempted to update {oTableWrapperObject.GetType().Name} with ID {oTableWrapperObject.ID} but the UPDATE command resulted in {affectedRows} affected rows");
-            }
         }
     }
 
-    protected static void PopulateUpdateCommandValuesWithCurrentState(DbCommand cmd, IMapsDirectlyToDatabaseTable oTableWrapperObject)
+    protected static void PopulateUpdateCommandValuesWithCurrentState(DbCommand cmd,
+        IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         foreach (DbParameter p in cmd.Parameters)
         {
             var prop = oTableWrapperObject.GetType().GetProperty(p.ParameterName.Trim('@'));
 
             var propValue = prop.GetValue(oTableWrapperObject, null);
-                
+
             //if it is a complex type but IConvertible e.g. CatalogueFolder
-            if(!prop.PropertyType.IsValueType && propValue is IConvertible c)
-                if(c.GetTypeCode() == TypeCode.String)
+            if (!prop.PropertyType.IsValueType && propValue is IConvertible c)
+                if (c.GetTypeCode() == TypeCode.String)
                     propValue = c.ToString();
 
             SetParameterToValue(p, propValue);
@@ -190,23 +192,18 @@ string value when string.IsNullOrWhiteSpace(value) => DBNull.Value,
             _ => propValue
         };
     }
-        
-    public bool StillExists<T>(int id) where T : IMapsDirectlyToDatabaseTable
-    {
-        return StillExists(typeof(T),id);
-    }
 
-    public bool StillExists(IMapsDirectlyToDatabaseTable o)
-    {
-        return StillExists(o.GetType(), o.ID);
-    }
+    public bool StillExists<T>(int id) where T : IMapsDirectlyToDatabaseTable => StillExists(typeof(T), id);
+
+    public bool StillExists(IMapsDirectlyToDatabaseTable o) => StillExists(o.GetType(), o.ID);
 
     public bool StillExists(Type type, int id)
     {
         //go to database to see if it exists
         using var connection = GetConnection();
         using var selectCommand = DatabaseCommandHelper.GetCommand(
-            $"SELECT case when exists(select * FROM {Wrap(type.Name)} WHERE ID= {id}) then 1 else 0 end", connection.Connection, connection.Transaction);
+            $"SELECT case when exists(select * FROM {Wrap(type.Name)} WHERE ID= {id}) then 1 else 0 end",
+            connection.Connection, connection.Transaction);
         return Convert.ToBoolean(selectCommand.ExecuteScalar());
     }
 
@@ -216,18 +213,17 @@ public bool StillExists(Type type, int id)
     /// <typeparam name="T"></typeparam>
     /// <param name="parent"></param>
     /// <returns></returns>
-    public T[] GetAllObjectsWithParent<T>(IMapsDirectlyToDatabaseTable parent) where T : IMapsDirectlyToDatabaseTable
-    {
+    public T[] GetAllObjectsWithParent<T>(IMapsDirectlyToDatabaseTable parent) where T : IMapsDirectlyToDatabaseTable =>
         //no cached result so fallback on regular method
-        return GetAllObjectsWhere<T>($"{parent.GetType().Name}_ID", parent.ID );
-    }
+        GetAllObjectsWhere<T>($"{parent.GetType().Name}_ID", parent.ID);
 
-    public T GetObjectByID<T>(int id) where T:IMapsDirectlyToDatabaseTable
+    public T GetObjectByID<T>(int id) where T : IMapsDirectlyToDatabaseTable
     {
         if (typeof(T).IsInterface)
-            throw new Exception("GetObjectByID<T> requires a proper class not an interface so that it can access the correct table");
+            throw new Exception(
+                "GetObjectByID<T> requires a proper class not an interface so that it can access the correct table");
 
-        return (T) GetObjectByID(typeof (T), id);
+        return (T)GetObjectByID(typeof(T), id);
     }
 
     public IMapsDirectlyToDatabaseTable GetObjectByID(Type type, int id)
@@ -238,18 +234,16 @@ public IMapsDirectlyToDatabaseTable GetObjectByID(Type type, int id)
         var typename = Wrap(type.Name);
 
         using var connection = GetConnection();
-        using var selectCommand = DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename} WHERE ID={id}", connection.Connection, connection.Transaction);
+        using var selectCommand = DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename} WHERE ID={id}",
+            connection.Connection, connection.Transaction);
         using var r = selectCommand.ExecuteReader();
         if (!r.HasRows)
             throw new KeyNotFoundException($"Could not find {type.Name} with ID {id}");
         r.Read();
-        return ConstructEntity(type,r);
+        return ConstructEntity(type, r);
     }
 
-    public string Wrap(string name)
-    {
-        return DiscoveredServer.GetQuerySyntaxHelper().EnsureWrapped(name);
-    }
+    public string Wrap(string name) => DiscoveredServer.GetQuerySyntaxHelper().EnsureWrapped(name);
 
     protected abstract IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader);
 
@@ -259,32 +253,30 @@ private T ConstructEntity<T>(DbDataReader reader) where T : IMapsDirectlyToDatab
 
         try
         {
-            return (T) ConstructEntity(typeof (T), reader);
+            return (T)ConstructEntity(typeof(T), reader);
         }
         catch (Exception e)
         {
-            throw new Exception($"Could not construct '{typeof(T).Name}' with ID={reader["ID"]}",e);
+            throw new Exception($"Could not construct '{typeof(T).Name}' with ID={reader["ID"]}", e);
         }
     }
 
-    public virtual T[] GetAllObjects<T>() where T : IMapsDirectlyToDatabaseTable
-    {
-        return GetAllObjects<T>(null);
-    }
+    public virtual T[] GetAllObjects<T>() where T : IMapsDirectlyToDatabaseTable => GetAllObjects<T>(null);
 
     public T[] GetAllObjects<T>(string whereSQL) where T : IMapsDirectlyToDatabaseTable
     {
-        var typename = Wrap(typeof (T).Name);
+        var typename = Wrap(typeof(T).Name);
 
         //if there is whereSQL make sure it is a legit SQL where
         if (!string.IsNullOrWhiteSpace(whereSQL))
-            if(!whereSQL.Trim().ToUpper().StartsWith("WHERE"))
+            if (!whereSQL.Trim().ToUpper().StartsWith("WHERE"))
                 throw new ArgumentException($"whereSQL did not start with the word 'WHERE', it was:{whereSQL}");
 
         var toReturn = new List<T>();
 
         using var opener = GetConnection();
-        var selectCommand = DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename} {whereSQL??""}", opener.Connection, opener.Transaction);
+        var selectCommand = DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename} {whereSQL ?? ""}",
+            opener.Connection, opener.Transaction);
 
         using var r = selectCommand.ExecuteReader();
         while (r.Read())
@@ -292,16 +284,14 @@ public T[] GetAllObjects<T>(string whereSQL) where T : IMapsDirectlyToDatabaseTa
         return toReturn.ToArray();
     }
 
-    public T[] GetAllObjectsWhere<T>(string whereSQL, Dictionary<string, object> parameters = null) where T : IMapsDirectlyToDatabaseTable
-    {
-        return GetAllObjects(typeof(T), whereSQL, parameters).Cast<T>().ToArray();
-    }
-    public T[] GetAllObjectsWhere<T>(string property, object value1) where T : IMapsDirectlyToDatabaseTable
-    {
-        return GetAllObjectsWhere<T>($"WHERE {property} = @val",new Dictionary<string, object> {{"@val",value1}} );
-    }
+    public T[] GetAllObjectsWhere<T>(string whereSQL, Dictionary<string, object> parameters = null)
+        where T : IMapsDirectlyToDatabaseTable => GetAllObjects(typeof(T), whereSQL, parameters).Cast<T>().ToArray();
+
+    public T[] GetAllObjectsWhere<T>(string property, object value1) where T : IMapsDirectlyToDatabaseTable =>
+        GetAllObjectsWhere<T>($"WHERE {property} = @val", new Dictionary<string, object> { { "@val", value1 } });
 
-    public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2,object value2) where T : IMapsDirectlyToDatabaseTable
+    public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType operand, string property2,
+        object value2) where T : IMapsDirectlyToDatabaseTable
     {
         var @operator = operand switch
         {
@@ -318,7 +308,8 @@ public T[] GetAllObjectsWhere<T>(string property1, object value1, ExpressionType
             });
     }
 
-    public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t, string whereSQL, Dictionary<string, object> parameters = null)
+    public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t, string whereSQL,
+        Dictionary<string, object> parameters = null)
     {
         var typename = Wrap(t.Name);
 
@@ -328,14 +319,16 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t, string wh
 
         var toReturn = new List<IMapsDirectlyToDatabaseTable>();
         using var opener = GetConnection();
-        var selectCommand = PrepareCommand($"SELECT * FROM {typename} {whereSQL}", parameters, opener.Connection, opener.Transaction);
+        var selectCommand = PrepareCommand($"SELECT * FROM {typename} {whereSQL}", parameters, opener.Connection,
+            opener.Transaction);
 
         using var r = selectCommand.ExecuteReader();
         while (r.Read())
-            toReturn.Add(ConstructEntity(t,r));
+            toReturn.Add(ConstructEntity(t, r));
 
         return toReturn.ToArray();
     }
+
     public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t)
     {
         var typename = Wrap(t.Name);
@@ -343,7 +336,8 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t)
         var toReturn = new List<IMapsDirectlyToDatabaseTable>();
 
         using var opener = GetConnection();
-        var selectCommand = DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename}", opener.Connection, opener.Transaction);
+        var selectCommand =
+            DatabaseCommandHelper.GetCommand($"SELECT * FROM {typename}", opener.Connection, opener.Transaction);
 
         using var r = selectCommand.ExecuteReader();
         while (r.Read())
@@ -355,20 +349,17 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type t)
     private DbCommand GetUpdateCommandFromStore(Type type, IManagedConnection managedConnection)
     {
         if (!_updateCommandStore.ContainsKey(type))
-            _updateCommandStore.Add(type, _connectionStringBuilder, managedConnection.Connection, managedConnection.Transaction);
+            _updateCommandStore.Add(type, _connectionStringBuilder, managedConnection.Connection,
+                managedConnection.Transaction);
 
         return _updateCommandStore[type];
     }
 
-    public Version GetVersion()
-    {
-        return DatabaseVersionProvider.GetVersionFromDatabase(DiscoveredServer.GetCurrentDatabase());
-    }
+    public Version GetVersion() =>
+        DatabaseVersionProvider.GetVersionFromDatabase(DiscoveredServer.GetCurrentDatabase());
 
-    public IEnumerable<T> GetAllObjectsInIDList<T>(IEnumerable<int> ids) where T : IMapsDirectlyToDatabaseTable
-    {
-        return GetAllObjectsInIDList(typeof (T), ids).Cast<T>();
-    }
+    public IEnumerable<T> GetAllObjectsInIDList<T>(IEnumerable<int> ids) where T : IMapsDirectlyToDatabaseTable =>
+        GetAllObjectsInIDList(typeof(T), ids).Cast<T>();
 
     public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjectsInIDList(Type elementType, IEnumerable<int> ids)
     {
@@ -389,22 +380,19 @@ public bool AreEqual(IMapsDirectlyToDatabaseTable obj1, object obj2)
         if (obj2 == null && obj1 != null)
             return false;
 
-        if(obj1 == null && obj2 == null)
-            throw new NotSupportedException("Why are you comparing two null things against one another with this method?");
+        if (obj1 == null && obj2 == null)
+            throw new NotSupportedException(
+                "Why are you comparing two null things against one another with this method?");
 
         if (obj1.GetType() == obj2.GetType())
-        {
-            return obj1.ID == ((IMapsDirectlyToDatabaseTable)obj2).ID && obj1.Repository == ((IMapsDirectlyToDatabaseTable)obj2).Repository;
-        }
+            return obj1.ID == ((IMapsDirectlyToDatabaseTable)obj2).ID &&
+                   obj1.Repository == ((IMapsDirectlyToDatabaseTable)obj2).Repository;
 
         return false;
     }
 
     /// <inheritdoc/>
-    public int GetHashCode(IMapsDirectlyToDatabaseTable obj1)
-    {
-        return obj1.GetType().GetHashCode()*obj1.ID;
-    }
+    public int GetHashCode(IMapsDirectlyToDatabaseTable obj1) => obj1.GetType().GetHashCode() * obj1.ID;
 
     /// <summary>
     /// Gets all public properties of the class that are not decorated with [<see cref="NoMappingToDatabase"/>]
@@ -413,14 +401,14 @@ public int GetHashCode(IMapsDirectlyToDatabaseTable obj1)
     /// <returns></returns>
     public static PropertyInfo[] GetPropertyInfos(Type type)
     {
-        return type.GetProperties().Where(prop =>!Attribute.IsDefined(prop, typeof (NoMappingToDatabase))).ToArray();
+        return type.GetProperties().Where(prop => !Attribute.IsDefined(prop, typeof(NoMappingToDatabase))).ToArray();
     }
 
     /// <inheritdoc/>
     public void RevertToDatabaseState(IMapsDirectlyToDatabaseTable localCopy)
     {
         //get new copy out of database
-        var databaseState = GetObjectByID(localCopy.GetType(),localCopy.ID);
+        var databaseState = GetObjectByID(localCopy.GetType(), localCopy.ID);
 
         Debug.Assert(localCopy.GetType() == databaseState.GetType());
 
@@ -433,9 +421,9 @@ public void RevertToDatabaseState(IMapsDirectlyToDatabaseTable localCopy)
 
             propertyInfo.SetValue(localCopy, propertyInfo.GetValue(databaseState));
         }
-            
+
         //Mark any cached data as out of date
-        if(localCopy is IInjectKnown inject) 
+        if (localCopy is IInjectKnown inject)
             inject.ClearAllInjections();
     }
 
@@ -473,7 +461,7 @@ public RevertableObjectReport HasLocalChanges(IMapsDirectlyToDatabaseTable local
 
             if (!Equals(local, db))
             {
-                toReturn.Differences.Add(new RevertablePropertyDifference(propertyInfo,local,db));
+                toReturn.Differences.Add(new RevertablePropertyDifference(propertyInfo, local, db));
                 toReturn.Evaluation = ChangeDescription.DatabaseCopyDifferent;
             }
         }
@@ -483,8 +471,7 @@ public RevertableObjectReport HasLocalChanges(IMapsDirectlyToDatabaseTable local
 
 
     #region new
-        
-        
+
     public void TestConnection()
     {
         try
@@ -495,19 +482,19 @@ public void TestConnection()
         }
         catch (Exception e)
         {
-
             var msg = _connectionStringBuilder.ConnectionString;
 
             var pass = DiscoveredServer.Helper.GetExplicitPasswordIfAny(_connectionStringBuilder);
 
-            if(!string.IsNullOrWhiteSpace(pass))
-                msg = msg.Replace(pass,"****");
-                
+            if (!string.IsNullOrWhiteSpace(pass))
+                msg = msg.Replace(pass, "****");
+
             throw new Exception($"Testing connection failed, connection string was '{msg}'", e);
         }
     }
 
-    public IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID= null) where T : IMapsDirectlyToDatabaseTable
+    public IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID = null)
+        where T : IMapsDirectlyToDatabaseTable
     {
         columnWithObjectID ??= $"{typeof(T).Name}_ID";
 
@@ -518,10 +505,7 @@ public IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID
             {
                 using (var r = cmd.ExecuteReader())
                 {
-                    while (r.Read())
-                    {
-                        idsToReturn.Add(Convert.ToInt32(r[columnWithObjectID]));
-                    }
+                    while (r.Read()) idsToReturn.Add(Convert.ToInt32(r[columnWithObjectID]));
                 }
             }
 
@@ -531,6 +515,7 @@ public IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID
             return GetAllObjects<T>($"WHERE ID in ({string.Join(",", idsToReturn)})");
         }
     }
+
     /// <summary>
     /// Runs the selectQuery (which must be a FULL QUERY) and uses @parameters for each of the kvps in the dictionary.  It expects the query result set to include
     /// a field which is named whatever your value in parameter columnWithObjectID is.  If you hate life you can pass a dbNullSubstition (which must also be of type
@@ -544,7 +529,9 @@ public IEnumerable<T> SelectAll<T>(string selectQuery, string columnWithObjectID
     /// <param name="columnWithObjectID"></param>
     /// <param name="dbNullSubstition"></param>
     /// <returns></returns>
-    public IEnumerable<T> SelectAllWhere<T>(string selectQuery, string columnWithObjectID = null, Dictionary<string, object> parameters = null, T dbNullSubstition = default) where T : IMapsDirectlyToDatabaseTable
+    public IEnumerable<T> SelectAllWhere<T>(string selectQuery, string columnWithObjectID = null,
+        Dictionary<string, object> parameters = null, T dbNullSubstition = default)
+        where T : IMapsDirectlyToDatabaseTable
     {
         columnWithObjectID ??= $"{typeof(T).Name}_ID";
 
@@ -575,21 +562,20 @@ public IEnumerable<T> SelectAllWhere<T>(string selectQuery, string columnWithObj
                 return Enumerable.Empty<T>();
 
 
-            var toReturn =  GetAllObjects<T>($"WHERE ID in ({string.Join(",", idsToReturn)})").ToList();
+            var toReturn = GetAllObjects<T>($"WHERE ID in ({string.Join(",", idsToReturn)})").ToList();
 
             //this bit of hackery is if your a crazy person who hates transparency and wants something like ColumnInfo.Missing to appear in the return list instead of an empty return list
-            if(dbNullSubstition != null)
+            if (dbNullSubstition != null)
                 for (var i = 0; i < nullsFound; i++)
                     toReturn.Add(dbNullSubstition);
 
             return toReturn;
         }
     }
-        
-        
 
-        
-    private int InsertAndReturnID<T>(Dictionary<string, object> parameters = null) where T : IMapsDirectlyToDatabaseTable
+
+    private int InsertAndReturnID<T>(Dictionary<string, object> parameters = null)
+        where T : IMapsDirectlyToDatabaseTable
     {
         using (var opener = GetConnection())
         {
@@ -602,7 +588,8 @@ private int InsertAndReturnID<T>(Dictionary<string, object> parameters = null) w
         }
     }
 
-    private string CreateInsertStatement<T>(Dictionary<string, object> parameters) where T : IMapsDirectlyToDatabaseTable
+    private string CreateInsertStatement<T>(Dictionary<string, object> parameters)
+        where T : IMapsDirectlyToDatabaseTable
     {
         _logger.Info($"Created New,{typeof(T).Name}");
 
@@ -618,20 +605,22 @@ private string CreateInsertStatement<T>(Dictionary<string, object> parameters) w
             query += $"({columnString}) VALUES ({parameterString})";
         }
         else
+        {
             query += " DEFAULT VALUES";
-            
+        }
+
         return query;
     }
 
-        
 
-    public int Delete(string deleteQuery, Dictionary<string, object> parameters = null, bool throwOnZeroAffectedRows = true)
+    public int Delete(string deleteQuery, Dictionary<string, object> parameters = null,
+        bool throwOnZeroAffectedRows = true)
     {
         using (var opener = GetConnection())
         {
             var cmd = PrepareCommand(deleteQuery, parameters, opener.Connection, opener.Transaction);
             var affectedRows = cmd.ExecuteNonQuery();
-                
+
             if (affectedRows == 0 && throwOnZeroAffectedRows)
                 throw new Exception($"Deleted failed, resulted in {affectedRows} affected rows");
 
@@ -648,7 +637,8 @@ public int Update(string updateQuery, Dictionary<string, object> parameters)
         }
     }
 
-    public static DbCommand PrepareCommand(string sql, Dictionary<string, object> parameters, DbConnection con, DbTransaction transaction = null)
+    public static DbCommand PrepareCommand(string sql, Dictionary<string, object> parameters, DbConnection con,
+        DbTransaction transaction = null)
     {
         var cmd = DatabaseCommandHelper.GetCommand(sql, con, transaction);
         if (parameters == null) return cmd;
@@ -674,19 +664,21 @@ public static DbCommand PrepareCommand(DbCommand cmd, Dictionary<string, object>
             //set its value
             SetParameterToValue(cmd.Parameters[paramName], kvp.Value);
         }
+
         return cmd;
     }
 
     #endregion
-        
-    public void InsertAndHydrate<T>(T toCreate, Dictionary<string,object> constructorParameters) where T : IMapsDirectlyToDatabaseTable
+
+    public void InsertAndHydrate<T>(T toCreate, Dictionary<string, object> constructorParameters)
+        where T : IMapsDirectlyToDatabaseTable
     {
         var id = InsertAndReturnID<T>(constructorParameters);
 
         var actual = GetObjectByID<T>(id);
-            
+
         //.Repository does not get included in this list because it is [NoMappingToDatabase]
-        foreach (var prop in GetPropertyInfos(typeof (T)))
+        foreach (var prop in GetPropertyInfos(typeof(T)))
             prop.SetValue(toCreate, prop.GetValue(actual));
 
         toCreate.Repository = actual.Repository;
@@ -697,7 +689,7 @@ public void InsertAndHydrate<T>(T toCreate, Dictionary<string,object> constructo
     }
 
     private object ongoingConnectionsLock = new();
-    private readonly Dictionary<Thread,IManagedConnection> ongoingConnections = new();
+    private readonly Dictionary<Thread, IManagedConnection> ongoingConnections = new();
     private readonly Dictionary<Thread, IManagedTransaction> ongoingTransactions = new();
 
 
@@ -705,9 +697,11 @@ public IManagedConnection GetConnection()
     {
         //any existing ongoing connection found on this Thread
         GetOngoingActivitiesFromThreadsDictionary(out var ongoingConnection, out var ongoingTransaction);
-            
+
         //if we are in the middle of doing stuff we can just reuse the ongoing one
-        if (ongoingConnection != null && ongoingConnection.Connection.State == ConnectionState.Open)//as long as it hasn't timed out or been disposed etc
+        if (ongoingConnection != null &&
+            ongoingConnection.Connection.State ==
+            ConnectionState.Open) //as long as it hasn't timed out or been disposed etc
             if (ongoingConnection.CloseOnDispose)
             {
                 var clone = ongoingConnection.Clone();
@@ -715,7 +709,9 @@ public IManagedConnection GetConnection()
                 return clone;
             }
             else
+            {
                 return ongoingConnection;
+            }
 
         ongoingConnection = DiscoveredServer.GetManagedConnection(ongoingTransaction);
 
@@ -725,13 +721,16 @@ public IManagedConnection GetConnection()
         return ongoingConnection;
     }
 
-    private void GetOngoingActivitiesFromThreadsDictionary(out IManagedConnection ongoingConnection, out IManagedTransaction ongoingTransaction)
+    private void GetOngoingActivitiesFromThreadsDictionary(out IManagedConnection ongoingConnection,
+        out IManagedTransaction ongoingTransaction)
     {
         lock (ongoingConnectionsLock)
         {
             //see if Thread dictionary has it
             if (ongoingConnections.TryGetValue(Thread.CurrentThread, out var connection))
+            {
                 ongoingConnection = connection;
+            }
             else
             {
                 ongoingConnections.Add(Thread.CurrentThread, null);
@@ -741,7 +740,9 @@ private void GetOngoingActivitiesFromThreadsDictionary(out IManagedConnection on
 
             //see if Thread dictionary has it
             if (ongoingTransactions.TryGetValue(Thread.CurrentThread, out var transaction))
+            {
                 ongoingTransaction = transaction;
+            }
             else
             {
                 ongoingTransactions.Add(Thread.CurrentThread, null);
@@ -755,14 +756,15 @@ public IManagedConnection BeginNewTransactedConnection()
         GetOngoingActivitiesFromThreadsDictionary(out _, out var ongoingTransaction);
 
         if (ongoingTransaction != null)
-            throw new NotSupportedException("There is already an ongoing transaction on this Thread! Call EndTransactedConnection on the last one first");
+            throw new NotSupportedException(
+                "There is already an ongoing transaction on this Thread! Call EndTransactedConnection on the last one first");
 
-        var toReturn =  DiscoveredServer.BeginNewTransactedConnection();
+        var toReturn = DiscoveredServer.BeginNewTransactedConnection();
         ongoingTransaction = toReturn.ManagedTransaction;
         ongoingTransactions[Thread.CurrentThread] = ongoingTransaction;
 
         if (!ongoingConnections.ContainsKey(Thread.CurrentThread))
-            ongoingConnections.Add(Thread.CurrentThread,toReturn);
+            ongoingConnections.Add(Thread.CurrentThread, toReturn);
         else
             ongoingConnections[Thread.CurrentThread] = toReturn;
         if (DiscoveredServer.DatabaseType == DatabaseType.MicrosoftSQLServer)
@@ -772,6 +774,7 @@ public IManagedConnection BeginNewTransactedConnection()
             cmd.CommandText = "SET TRANSACTION ISOLATION LEVEL READ COMMITTED";
             cmd.ExecuteNonQuery();
         }
+
         return toReturn;
     }
 
@@ -783,8 +786,9 @@ public void EndTransactedConnection(bool commit)
     {
         GetOngoingActivitiesFromThreadsDictionary(out _, out var ongoingTransaction);
 
-        if(ongoingTransaction == null)
-            throw new NotSupportedException("There is no ongoing transaction on this Thread, did you try to close the Transaction from another Thread? or did you maybe never start one in the first place?");
+        if (ongoingTransaction == null)
+            throw new NotSupportedException(
+                "There is no ongoing transaction on this Thread, did you try to close the Transaction from another Thread? or did you maybe never start one in the first place?");
 
         if (commit)
             ongoingTransaction.CommitAndCloseConnection();
@@ -820,25 +824,27 @@ public void ClearUpdateCommandCache()
         return (DateTime)o;
     }
 
-    private Dictionary<Type,bool> _knownSupportedTypes = new();
+    private Dictionary<Type, bool> _knownSupportedTypes = new();
     private object oLockKnownTypes = new();
 
     public bool SupportsObjectType(Type type)
     {
         if (!typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(type))
-            throw new NotSupportedException("This method can only be passed Types derrived from IMapsDirectlyToDatabaseTable");
-            
+            throw new NotSupportedException(
+                "This method can only be passed Types derrived from IMapsDirectlyToDatabaseTable");
+
         lock (oLockKnownTypes)
         {
             if (!_knownSupportedTypes.ContainsKey(type))
-                _knownSupportedTypes.Add(type,DiscoveredServer.GetCurrentDatabase().ExpectTable(type.Name).Exists());
-            
+                _knownSupportedTypes.Add(type, DiscoveredServer.GetCurrentDatabase().ExpectTable(type.Name).Exists());
+
             return _knownSupportedTypes[type];
         }
     }
 
 
-    public void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName, object propertyValue)
+    public void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable entity, string propertyName,
+        object propertyValue)
     {
         var prop = entity.GetType().GetProperty(propertyName);
         prop.SetValue(entity, propertyValue);
@@ -847,10 +853,11 @@ public void SaveSpecificPropertyOnlyToDatabase(IMapsDirectlyToDatabaseTable enti
         if (prop.PropertyType.IsEnum)
             propertyValue = propertyValue.ToString();
 
-        Update($"UPDATE {Wrap(entity.GetType().Name)} SET {propertyName}=@val WHERE ID = {entity.ID}", new Dictionary<string, object>
-        {
-            {"@val", propertyValue??DBNull.Value}
-        });
+        Update($"UPDATE {Wrap(entity.GetType().Name)} SET {propertyName}=@val WHERE ID = {entity.ID}",
+            new Dictionary<string, object>
+            {
+                { "@val", propertyValue ?? DBNull.Value }
+            });
     }
 
     public int Insert(string sql, Dictionary<string, object> parameters)
@@ -869,6 +876,7 @@ public int Insert(string sql, Dictionary<string, object> parameters)
     public event EventHandler<SaveEventArgs> Saving;
     public event EventHandler<IMapsDirectlyToDatabaseTableEventArgs> Inserting;
     public event EventHandler<IMapsDirectlyToDatabaseTableEventArgs> Deleting;
+
     public IMapsDirectlyToDatabaseTable[] GetAllObjectsInDatabase()
     {
         var toReturn = new List<IMapsDirectlyToDatabaseTable>();
@@ -882,13 +890,12 @@ public IMapsDirectlyToDatabaseTable[] GetAllObjectsInDatabase()
             }
             catch (Exception e)
             {
-                throw new Exception($"Failed to GetAllObjects of Type '{type}'",e);
+                throw new Exception($"Failed to GetAllObjects of Type '{type}'", e);
             }
 
         return toReturn.ToArray();
     }
 
-        
 
     /// <inheritdoc/>
     public Type[] GetCompatibleTypes()
@@ -898,18 +905,15 @@ public Type[] GetCompatibleTypes()
                 .Where(
                     t =>
                         typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t)
-                        && !t.IsAbstract 
-                        && !t.IsInterface 
-                            
+                        && !t.IsAbstract
+                        && !t.IsInterface
+
                         //nothing called spontaneous
-                        && !t.Name.Contains("Spontaneous") 
-                            
+                        && !t.Name.Contains("Spontaneous")
+
                         //or with a spontaneous base class
-                        &&(t.BaseType == null || !t.BaseType.Name.Contains("Spontaneous"))
+                        && (t.BaseType == null || !t.BaseType.Name.Contains("Spontaneous"))
                         && IsCompatibleType(t)
-                            
-                            
-                            
                 ).ToArray();
     }
 
@@ -922,18 +926,12 @@ public Type[] GetCompatibleTypes()
     /// <returns></returns>
     protected virtual bool IsCompatibleType(Type type)
     {
-        return _tables.Value.Any(t=>t.GetRuntimeName().Equals(type.Name));
+        return _tables.Value.Any(t => t.GetRuntimeName().Equals(type.Name));
     }
 
-    public virtual T[] GetAllObjectsNoCache<T>() where T : IMapsDirectlyToDatabaseTable
-    {
-        return GetAllObjects<T>();
-    }
+    public virtual T[] GetAllObjectsNoCache<T>() where T : IMapsDirectlyToDatabaseTable => GetAllObjects<T>();
 
-    public IDisposable BeginNewTransaction()
-    {
-        return BeginNewTransactedConnection();
-    }
+    public IDisposable BeginNewTransaction() => BeginNewTransactedConnection();
 
     public void EndTransaction(bool commit)
     {
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/UpdateCommandStore.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/UpdateCommandStore.cs
index 2bb1635764..abebafdcec 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/UpdateCommandStore.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/UpdateCommandStore.cs
@@ -38,26 +38,23 @@ public void Add(Type o, DbConnectionStringBuilder builder, DbConnection connecti
     {
         var syntax = ImplementationManager.GetImplementation(builder).GetQuerySyntaxHelper();
 
-        var command = DatabaseCommandHelper.GetCommand($"UPDATE {syntax.EnsureWrapped(o.Name)} SET {{0}} WHERE ID=@ID;", connection, transaction);
+        var command = DatabaseCommandHelper.GetCommand($"UPDATE {syntax.EnsureWrapped(o.Name)} SET {{0}} WHERE ID=@ID;",
+            connection, transaction);
 
         var props = TableRepository.GetPropertyInfos(o);
 
-        foreach(var p in props)
-            command.Parameters.Add(DatabaseCommandHelper.GetParameter($"@{p.Name}",command));
+        foreach (var p in props)
+            command.Parameters.Add(DatabaseCommandHelper.GetParameter($"@{p.Name}", command));
+
+        command.CommandText = string.Format(command.CommandText,
+            string.Join(",",
+                props.Where(p => p.Name != "ID").Select(p => $"{syntax.EnsureWrapped(p.Name)}=@{p.Name}")));
 
-        command.CommandText = string.Format(command.CommandText,string.Join(",",props.Where(p=>p.Name != "ID").Select(p=> $"{syntax.EnsureWrapped(p.Name)}=@{p.Name}")));
-            
         UpdateCommands.Add(o, command);
     }
 
-    public bool ContainsKey(IMapsDirectlyToDatabaseTable toCreate)
-    {
-        return UpdateCommands.ContainsKey(toCreate.GetType());
-    }
-    public bool ContainsKey(Type toCreate)
-    {
-        return UpdateCommands.ContainsKey(toCreate);
-    }
+    public bool ContainsKey(IMapsDirectlyToDatabaseTable toCreate) => UpdateCommands.ContainsKey(toCreate.GetType());
+    public bool ContainsKey(Type toCreate) => UpdateCommands.ContainsKey(toCreate);
 
     public void Clear()
     {
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/InvalidPatchException.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/InvalidPatchException.cs
index 7fea722f7e..a4ce89f636 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/InvalidPatchException.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/InvalidPatchException.cs
@@ -15,9 +15,9 @@ public class InvalidPatchException : Exception
 {
     public string ScriptName { get; set; }
 
-    public InvalidPatchException(string scriptName, string message, Exception exception=null):base(message,exception)
+    public InvalidPatchException(string scriptName, string message, Exception exception = null) : base(message,
+        exception)
     {
         ScriptName = scriptName;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/MasterDatabaseScriptExecutor.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/MasterDatabaseScriptExecutor.cs
index 11f3027370..2c55e577dd 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/MasterDatabaseScriptExecutor.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/MasterDatabaseScriptExecutor.cs
@@ -32,10 +32,8 @@ public class MasterDatabaseScriptExecutor
     /// </summary>
     public string RoundhouseSchemaName => GetRoundhouseSchemaName(Database);
 
-    public static string GetRoundhouseSchemaName(DiscoveredDatabase database)
-    {
-        return database.Server.DatabaseType == DatabaseType.MicrosoftSQLServer ? "RoundhousE" : null;
-    }
+    public static string GetRoundhouseSchemaName(DiscoveredDatabase database) =>
+        database.Server.DatabaseType == DatabaseType.MicrosoftSQLServer ? "RoundhousE" : null;
 
     public const string RoundhouseVersionTable = "Version";
     public const string RoundhouseScriptsRunTable = "ScriptsRun";
@@ -53,18 +51,19 @@ public bool CreateDatabase(Patch initialCreationPatch, ICheckNotifier notifier)
     {
         try
         {
-            if (Database.Exists())//make sure database does not already exist
+            if (Database.Exists()) //make sure database does not already exist
             {
                 if (Database.DiscoverTables(false).Any(t => t.GetRuntimeName().Equals(RoundhouseScriptsRunTable)))
-                {
-                    throw new Exception($"The database '{Database}' is already set up as a platform database for another schema (it has the '{RoundhouseScriptsRunTable}' table)");
-                }
+                    throw new Exception(
+                        $"The database '{Database}' is already set up as a platform database for another schema (it has the '{RoundhouseScriptsRunTable}' table)");
 
                 // it doesn't look like this database already contains RDMP curated schemas (hopefully it is blank but if not - meh).
                 // ask the user if they want to create it in this db even though it already exists and might not be empty
-                var createAnyway = notifier.OnCheckPerformed(new CheckEventArgs($"Database {Database.GetRuntimeName()} already exists", CheckResult.Warning, null,"Attempt to create database inside existing database (will cause problems if the database is not empty)?"));
+                var createAnyway = notifier.OnCheckPerformed(new CheckEventArgs(
+                    $"Database {Database.GetRuntimeName()} already exists", CheckResult.Warning, null,
+                    "Attempt to create database inside existing database (will cause problems if the database is not empty)?"));
 
-                if(!createAnyway)
+                if (!createAnyway)
                     throw new Exception("User chose not continue");
             }
             else
@@ -79,42 +78,46 @@ public bool CreateDatabase(Patch initialCreationPatch, ICheckNotifier notifier)
                     cmd.ExecuteNonQuery();
                 }
                 else
+                {
                     Database.Create();
+                }
 
                 if (!Database.Exists())
                     throw new Exception(
                         "Create database failed without Exception! (It did not Exist after creation)");
 
-                notifier.OnCheckPerformed(new CheckEventArgs($"Database {Database} created", CheckResult.Success, null));
+                notifier.OnCheckPerformed(new CheckEventArgs($"Database {Database} created", CheckResult.Success,
+                    null));
             }
 
-            if(Database.Server.DatabaseType == DatabaseType.MicrosoftSQLServer)
+            if (Database.Server.DatabaseType == DatabaseType.MicrosoftSQLServer)
                 Database.CreateSchema(RoundhouseSchemaName);
 
-            Database.CreateTable("ScriptsRun",new []
+            Database.CreateTable("ScriptsRun", new[]
             {
-                new DatabaseColumnRequest("id",new DatabaseTypeRequest(typeof(int))){IsAutoIncrement = true, IsPrimaryKey = true},
-                new DatabaseColumnRequest("version_id",new DatabaseTypeRequest(typeof(int))),
-                new DatabaseColumnRequest("script_name",new DatabaseTypeRequest(typeof(string),255)),
-                new DatabaseColumnRequest("text_of_script",new DatabaseTypeRequest(typeof(string),int.MaxValue)),
-                new DatabaseColumnRequest("text_hash",new DatabaseTypeRequest(typeof(string),512){Unicode = true}),
-                new DatabaseColumnRequest("one_time_script",new DatabaseTypeRequest(typeof(bool))),
-                new DatabaseColumnRequest("entry_date",new DatabaseTypeRequest(typeof(DateTime))),
-                new DatabaseColumnRequest("modified_date",new DatabaseTypeRequest(typeof(DateTime))),
-                new DatabaseColumnRequest("entered_by",new DatabaseTypeRequest(typeof(string),50))
-
+                new DatabaseColumnRequest("id", new DatabaseTypeRequest(typeof(int)))
+                    { IsAutoIncrement = true, IsPrimaryKey = true },
+                new DatabaseColumnRequest("version_id", new DatabaseTypeRequest(typeof(int))),
+                new DatabaseColumnRequest("script_name", new DatabaseTypeRequest(typeof(string), 255)),
+                new DatabaseColumnRequest("text_of_script", new DatabaseTypeRequest(typeof(string), int.MaxValue)),
+                new DatabaseColumnRequest("text_hash", new DatabaseTypeRequest(typeof(string), 512) { Unicode = true }),
+                new DatabaseColumnRequest("one_time_script", new DatabaseTypeRequest(typeof(bool))),
+                new DatabaseColumnRequest("entry_date", new DatabaseTypeRequest(typeof(DateTime))),
+                new DatabaseColumnRequest("modified_date", new DatabaseTypeRequest(typeof(DateTime))),
+                new DatabaseColumnRequest("entered_by", new DatabaseTypeRequest(typeof(string), 50))
             }, RoundhouseSchemaName);
 
 
             Database.CreateTable("Version", new[]
             {
-                new DatabaseColumnRequest("id",new DatabaseTypeRequest(typeof(int))){IsAutoIncrement = true, IsPrimaryKey = true},
-                new DatabaseColumnRequest("repository_path",new DatabaseTypeRequest(typeof(string),255){Unicode = true}),
-                new DatabaseColumnRequest("version",new DatabaseTypeRequest(typeof(string),50){Unicode = true}),
-                new DatabaseColumnRequest("entry_date",new DatabaseTypeRequest(typeof(DateTime))),
-                new DatabaseColumnRequest("modified_date",new DatabaseTypeRequest(typeof(DateTime))),
-                new DatabaseColumnRequest("entered_by",new DatabaseTypeRequest(typeof(string),50))
-
+                new DatabaseColumnRequest("id", new DatabaseTypeRequest(typeof(int)))
+                    { IsAutoIncrement = true, IsPrimaryKey = true },
+                new DatabaseColumnRequest("repository_path",
+                    new DatabaseTypeRequest(typeof(string), 255) { Unicode = true }),
+                new DatabaseColumnRequest("version", new DatabaseTypeRequest(typeof(string), 50) { Unicode = true }),
+                new DatabaseColumnRequest("entry_date", new DatabaseTypeRequest(typeof(DateTime))),
+                new DatabaseColumnRequest("modified_date", new DatabaseTypeRequest(typeof(DateTime))),
+                new DatabaseColumnRequest("entered_by", new DatabaseTypeRequest(typeof(string), 50))
             }, RoundhouseSchemaName);
 
 
@@ -133,12 +136,13 @@ public bool CreateDatabase(Patch initialCreationPatch, ICheckNotifier notifier)
         }
     }
 
-    private void RunSQL(KeyValuePair<string,Patch> kvp)
+    private void RunSQL(KeyValuePair<string, Patch> kvp)
     {
         using (var con = Database.Server.GetConnection())
         {
             con.Open();
-            UsefulStuff.ExecuteBatchNonQuery(kvp.Value.GetScriptBody(), con,null, DiscoveredServerHelper.CreateDatabaseTimeoutInSeconds);
+            UsefulStuff.ExecuteBatchNonQuery(kvp.Value.GetScriptBody(), con, null,
+                DiscoveredServerHelper.CreateDatabaseTimeoutInSeconds);
         }
 
         var now = DateTime.Now;
@@ -146,18 +150,16 @@ private void RunSQL(KeyValuePair<string,Patch> kvp)
         Database.ExpectTable(RoundhouseScriptsRunTable, RoundhouseSchemaName)
             .Insert(new Dictionary<string, object>
             {
-                {"script_name", kvp.Key},
-                {"text_of_script", kvp.Value.EntireScript},
-                {"text_hash", CalculateHash(kvp.Value.EntireScript)},
-
-                {"entry_date", now},
-                {"modified_date", now},
-                {"entered_by", Environment.UserName}
+                { "script_name", kvp.Key },
+                { "text_of_script", kvp.Value.EntireScript },
+                { "text_hash", CalculateHash(kvp.Value.EntireScript) },
 
+                { "entry_date", now },
+                { "modified_date", now },
+                { "entered_by", Environment.UserName }
             });
 
-        SetVersion(kvp.Key,kvp.Value.DatabaseVersionNumber.ToString());
-            
+        SetVersion(kvp.Key, kvp.Value.DatabaseVersionNumber.ToString());
     }
 
     public static string CalculateHash(string input)
@@ -174,10 +176,9 @@ public static string CalculateHash(string input)
     }
 
 
-
     private void SetVersion(string name, string version)
     {
-        var versionTable = Database.ExpectTable(RoundhouseVersionTable,RoundhouseSchemaName);
+        var versionTable = Database.ExpectTable(RoundhouseVersionTable, RoundhouseSchemaName);
         versionTable.Truncate();
 
         //repository_path	version	entry_date	modified_date	entered_by
@@ -187,27 +188,28 @@ private void SetVersion(string name, string version)
 
         versionTable.Insert(new Dictionary<string, object>
         {
-            {"repository_path", name},
-            {"version", version},
+            { "repository_path", name },
+            { "version", version },
 
-            {"entry_date", now},
-            {"modified_date", now},
-            {"entered_by", Environment.UserName}
+            { "entry_date", now },
+            { "modified_date", now },
+            { "entered_by", Environment.UserName }
         });
     }
 
-    public bool PatchDatabase(SortedDictionary<string, Patch> patches, ICheckNotifier notifier, Func<Patch, bool> patchPreviewShouldIRunIt, bool backupDatabase = true)
+    public bool PatchDatabase(SortedDictionary<string, Patch> patches, ICheckNotifier notifier,
+        Func<Patch, bool> patchPreviewShouldIRunIt, bool backupDatabase = true)
     {
-        if(!patches.Any())
+        if (!patches.Any())
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("There are no patches to apply so skipping patching", CheckResult.Success,null));
+            notifier.OnCheckPerformed(new CheckEventArgs("There are no patches to apply so skipping patching",
+                CheckResult.Success, null));
             return true;
         }
 
         var maxPatchVersion = patches.Values.Max(pat => pat.DatabaseVersionNumber);
 
         if (backupDatabase && SupportsBackup(Database))
-        {
             try
             {
                 notifier.OnCheckPerformed(new CheckEventArgs("About to backup database", CheckResult.Success, null));
@@ -215,7 +217,6 @@ public bool PatchDatabase(SortedDictionary<string, Patch> patches, ICheckNotifie
                 Database.CreateBackup($"Full backup of {Database}");
 
                 notifier.OnCheckPerformed(new CheckEventArgs("Database backed up", CheckResult.Success, null));
-
             }
             catch (Exception e)
             {
@@ -224,8 +225,7 @@ public bool PatchDatabase(SortedDictionary<string, Patch> patches, ICheckNotifie
                     CheckResult.Fail, e));
                 return false;
             }
-        }
-            
+
 
         try
         {
@@ -238,31 +238,34 @@ public bool PatchDatabase(SortedDictionary<string, Patch> patches, ICheckNotifie
 
                 if (shouldRun)
                 {
-
                     try
                     {
                         RunSQL(patch);
                     }
-                    catch(Exception e)
+                    catch (Exception e)
                     {
-                        throw new Exception($"Failed to apply patch '{ patch.Key }'",e);
+                        throw new Exception($"Failed to apply patch '{patch.Key}'", e);
                     }
 
 
-                    notifier.OnCheckPerformed(new CheckEventArgs($"Executed patch {patch.Value}", CheckResult.Success, null));
+                    notifier.OnCheckPerformed(new CheckEventArgs($"Executed patch {patch.Value}", CheckResult.Success,
+                        null));
                 }
                 else
+                {
                     throw new Exception($"User decided not to execute patch {patch.Key} - aborting ");
+                }
             }
 
-            SetVersion("Patching",maxPatchVersion.ToString());
-            notifier.OnCheckPerformed(new CheckEventArgs($"Updated database version to {maxPatchVersion}", CheckResult.Success, null));
+            SetVersion("Patching", maxPatchVersion.ToString());
+            notifier.OnCheckPerformed(new CheckEventArgs($"Updated database version to {maxPatchVersion}",
+                CheckResult.Success, null));
 
             //all went fine
-            notifier.OnCheckPerformed(new CheckEventArgs("All patches applied, transaction committed", CheckResult.Success, null));
+            notifier.OnCheckPerformed(new CheckEventArgs("All patches applied, transaction committed",
+                CheckResult.Success, null));
 
             return true;
-
         }
         catch (Exception e)
         {
@@ -290,11 +293,13 @@ private static bool SupportsBackup(DiscoveredDatabase database)
     /// <param name="patchPreviewShouldIRunIt"></param>
     /// <param name="backupDatabaseFunc"></param>
     /// <returns></returns>
-    public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch, bool> patchPreviewShouldIRunIt, Func<bool> backupDatabaseFunc)
+    public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch, bool> patchPreviewShouldIRunIt,
+        Func<bool> backupDatabaseFunc)
     {
-        var status = Patch.IsPatchingRequired(Database,patcher, out var databaseVersion, out var patchesInDatabase, out var allPatchesInAssembly);
+        var status = Patch.IsPatchingRequired(Database, patcher, out var databaseVersion, out var patchesInDatabase,
+            out var allPatchesInAssembly);
 
-        if(status != Patch.PatchingState.Required)
+        if (status != Patch.PatchingState.Required)
             return false;
 
         var stop = false;
@@ -314,13 +319,15 @@ public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch,
                 if (!allPatchesInAssembly.Any(a => a.Value.Equals(patch)))
                 {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"The database contains an unexplained patch called {patch.locationInAssembly} (it is not in {patcher.GetDbAssembly().FullName} ) so how did it get there?", CheckResult.Warning,
+                        $"The database contains an unexplained patch called {patch.locationInAssembly} (it is not in {patcher.GetDbAssembly().FullName} ) so how did it get there?",
+                        CheckResult.Warning,
                         null));
                 }
                 else if (!allPatchesInAssembly[patch.locationInAssembly].GetScriptBody().Equals(patch.GetScriptBody()))
                 {
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"The contents of patch {patch.locationInAssembly} are different between live database and the database patching assembly", CheckResult.Warning,
+                        $"The contents of patch {patch.locationInAssembly} are different between live database and the database patching assembly",
+                        CheckResult.Warning,
                         null));
 
                     //do not apply this patch
@@ -330,11 +337,11 @@ public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch,
                 {
                     //we found it and it was intact
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Patch {patch.locationInAssembly} was previously installed successfully so no need to touch it",CheckResult.Success, null));
+                        $"Patch {patch.locationInAssembly} was previously installed successfully so no need to touch it",
+                        CheckResult.Success, null));
 
                     //do not apply this patch
                     toApply.Remove(patch.locationInAssembly);
-
                 }
         }
         catch (Exception exception)
@@ -344,7 +351,8 @@ public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch,
         }
 
         //if any of the patches we are trying to apply are earlier than the latest in the database
-        var missedOpportunities = toApply.Values.Where(p => p.DatabaseVersionNumber < patchesInDatabase.Max(p2 => p2.DatabaseVersionNumber));
+        var missedOpportunities = toApply.Values.Where(p =>
+            p.DatabaseVersionNumber < patchesInDatabase.Max(p2 => p2.DatabaseVersionNumber));
         foreach (var missedOpportunity in missedOpportunities)
         {
             stop = true;
@@ -357,14 +365,16 @@ public bool PatchDatabase(IPatcher patcher, ICheckNotifier notifier, Func<Patch,
         foreach (var futurePatch in toApply.Values.Where(patch => patch.DatabaseVersionNumber > hostAssemblyVersion))
         {
             notifier.OnCheckPerformed(new CheckEventArgs(
-                $"Cannot apply patch {futurePatch.locationInAssembly} because its database version number is {futurePatch.DatabaseVersionNumber} which is higher than the currently loaded host assembly ({patcher.GetDbAssembly().FullName}). ", CheckResult.Fail, null));
+                $"Cannot apply patch {futurePatch.locationInAssembly} because its database version number is {futurePatch.DatabaseVersionNumber} which is higher than the currently loaded host assembly ({patcher.GetDbAssembly().FullName}). ",
+                CheckResult.Fail, null));
             stop = true;
-
         }
 
         if (stop)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs("Abandoning patching process (no patches have been applied) because of one or more previous errors",CheckResult.Fail, null));
+            notifier.OnCheckPerformed(new CheckEventArgs(
+                "Abandoning patching process (no patches have been applied) because of one or more previous errors",
+                CheckResult.Fail, null));
             return false;
         }
 
@@ -384,7 +394,7 @@ public Patch[] GetPatchesRun()
 
         var dt = scriptsRun.GetDataTable();
 
-        foreach(DataRow r in dt.Rows)
+        foreach (DataRow r in dt.Rows)
         {
             var text_of_script = r["text_of_script"] as string;
             var script_name = r["script_name"] as string;
@@ -416,6 +426,6 @@ public void CreateAndPatchDatabase(IPatcher patcher, ICheckNotifier notifier)
 
         //get everything in the /up/ folder that is .sql
         var patches = patcher.GetAllPatchesInAssembly(Database);
-        PatchDatabase(patches,notifier,p=>true);//apply all patches without question
+        PatchDatabase(patches, notifier, p => true); //apply all patches without question
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patch.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patch.cs
index 5c36fc4a53..36adbe32d1 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patch.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patch.cs
@@ -41,23 +41,22 @@ public override string ToString()
         if (string.IsNullOrWhiteSpace(Description))
             return $"Patch {DatabaseVersionNumber}";
 
-        if(Description.Length> 100)
+        if (Description.Length > 100)
             return $"Patch {DatabaseVersionNumber}({Description[..100]}...)";
 
         return $"Patch {DatabaseVersionNumber}({Description})";
-
     }
 
     private void ExtractDescriptionAndVersionFromScriptContents()
     {
-        var lines = EntireScript.Split(new []{'\r', '\n'},StringSplitOptions.RemoveEmptyEntries);
+        var lines = EntireScript.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries);
 
         var idx = lines[0].IndexOf(VersionKey);
 
         if (idx == -1)
             throw new InvalidPatchException(locationInAssembly, $"Script does not start with {VersionKey}");
 
-        var versionNumber = lines[0][(idx + VersionKey.Length)..].Trim(':',' ','\n','\r','/','*');
+        var versionNumber = lines[0][(idx + VersionKey.Length)..].Trim(':', ' ', '\n', '\r', '/', '*');
 
         try
         {
@@ -66,20 +65,21 @@ private void ExtractDescriptionAndVersionFromScriptContents()
         catch (Exception e)
         {
             throw new InvalidPatchException(locationInAssembly,
-                $"Could not process the scripts --Version: entry ('{versionNumber}') into a valid C# Version object",e);
+                $"Could not process the scripts --Version: entry ('{versionNumber}') into a valid C# Version object",
+                e);
         }
 
-        if(lines.Length >=2)
+        if (lines.Length >= 2)
         {
             idx = lines[1].IndexOf(DescriptionKey);
 
-            if (idx == -1 )
+            if (idx == -1)
                 throw new InvalidPatchException(locationInAssembly,
                     $"Second line of patch scripts must start with {DescriptionKey}");
 
             var description = lines[1][(idx + DescriptionKey.Length)..].Trim(':', ' ', '\n', '\r', '/', '*');
             Description = description;
-        } 
+        }
     }
 
     /// <summary>
@@ -92,10 +92,8 @@ public string GetScriptBody()
             EntireScript.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries).Skip(2));
     }
 
-    public override int GetHashCode()
-    {
-        return locationInAssembly.GetHashCode();
-    }
+    public override int GetHashCode() => locationInAssembly.GetHashCode();
+
     public override bool Equals(object obj)
     {
         var x = this;
@@ -112,14 +110,15 @@ public override bool Equals(object obj)
         if (x.DatabaseVersionNumber.Equals(y.DatabaseVersionNumber))
             return true;
         throw new InvalidPatchException(x.locationInAssembly,
-            $"Patches x and y are being compared and they have the same location in assembly ({x.locationInAssembly})  but different Verison numbers", null);
+            $"Patches x and y are being compared and they have the same location in assembly ({x.locationInAssembly})  but different Verison numbers",
+            null);
     }
+
     public int CompareTo(object obj)
     {
         if (obj is Patch patch)
-        {
-            return -string.Compare(patch.locationInAssembly, locationInAssembly, StringComparison.Ordinal); //sort alphabetically (reverse)
-        }
+            return -string.Compare(patch.locationInAssembly, locationInAssembly,
+                StringComparison.Ordinal); //sort alphabetically (reverse)
 
         throw new Exception($"Cannot compare {GetType().Name} to {obj.GetType().Name}");
     }
@@ -148,7 +147,9 @@ public enum PatchingState
         SoftwareBehindDatabase
     }
 
-    public static PatchingState IsPatchingRequired(DiscoveredDatabase database, IPatcher patcher, out Version databaseVersion, out Patch[] patchesInDatabase, out SortedDictionary<string, Patch> allPatchesInAssembly)
+    public static PatchingState IsPatchingRequired(DiscoveredDatabase database, IPatcher patcher,
+        out Version databaseVersion, out Patch[] patchesInDatabase,
+        out SortedDictionary<string, Patch> allPatchesInAssembly)
     {
         databaseVersion = DatabaseVersionProvider.GetVersionFromDatabase(database);
 
@@ -158,7 +159,7 @@ public static PatchingState IsPatchingRequired(DiscoveredDatabase database, IPat
         allPatchesInAssembly = patcher.GetAllPatchesInAssembly(database);
 
         var databaseAssemblyName = patcher.GetDbAssembly().GetName();
-            
+
         if (databaseAssemblyName.Version < databaseVersion)
             return PatchingState.SoftwareBehindDatabase;
 
@@ -166,6 +167,8 @@ public static PatchingState IsPatchingRequired(DiscoveredDatabase database, IPat
         return
             allPatchesInAssembly.Values
                 .Except(patchesInDatabase)
-                .Any() ? PatchingState.Required:PatchingState.NotRequired;
+                .Any()
+                ? PatchingState.Required
+                : PatchingState.NotRequired;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patcher.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patcher.cs
index 0e1f07ccd7..46cdc8b580 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patcher.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/Patcher.cs
@@ -16,12 +16,12 @@
 namespace Rdmp.Core.MapsDirectlyToDatabaseTable.Versioning;
 
 /// <inheritdoc/>
-public abstract class Patcher:IPatcher
+public abstract class Patcher : IPatcher
 {
     public const string InitialScriptName = "Initial Create";
 
     /// <inheritdoc/>
-    public bool SqlServerOnly { get; protected init; }= true;
+    public bool SqlServerOnly { get; protected init; } = true;
 
     /// <inheritdoc/>
     public virtual Assembly GetDbAssembly() => GetType().Assembly;
@@ -34,9 +34,10 @@ public abstract class Patcher:IPatcher
 
     public string Name =>
         $"{GetDbAssembly().GetName().Name}{(string.IsNullOrEmpty(ResourceSubdirectory) ? "" : $"/{ResourceSubdirectory}")}";
+
     public string LegacyName { get; protected set; }
 
-    protected Patcher(int tier,string resourceSubdirectory)
+    protected Patcher(int tier, string resourceSubdirectory)
     {
         Tier = tier;
         ResourceSubdirectory = resourceSubdirectory;
@@ -49,7 +50,8 @@ protected Patcher(int tier,string resourceSubdirectory)
     /// <param name="description"></param>
     /// <param name="version"></param>
     /// <returns></returns>
-    protected static string GetHeader(DatabaseType dbType, string description,Version version) => $"{CommentFor(dbType, Patch.VersionKey + version.ToString())}{Environment.NewLine}{CommentFor(dbType, Patch.DescriptionKey + description)}{Environment.NewLine}";
+    protected static string GetHeader(DatabaseType dbType, string description, Version version) =>
+        $"{CommentFor(dbType, Patch.VersionKey + version.ToString())}{Environment.NewLine}{CommentFor(dbType, Patch.DescriptionKey + description)}{Environment.NewLine}";
 
     // some DBMS don't like the -- notation so we need to wrap with C style comments
     private static string CommentFor(DatabaseType dbType, string sql) =>
@@ -74,15 +76,15 @@ public virtual Patch GetInitialCreateScriptContents(DiscoveredDatabase db)
         {
             case 1:
             {
-                    var sr = new StreamReader(assembly.GetManifestResourceStream(candidates[0]));
+                var sr = new StreamReader(assembly.GetManifestResourceStream(candidates[0]));
 
-                    var sql = sr.ReadToEnd();
+                var sql = sr.ReadToEnd();
 
                 if (!sql.Contains(Patch.VersionKey))
                     sql = GetHeader(db.Server.DatabaseType, InitialScriptName, new Version(1, 0, 0)) + sql;
 
 
-                return new Patch(InitialScriptName,  sql);
+                return new Patch(InitialScriptName, sql);
             }
             case 0:
                 throw new FileNotFoundException(
diff --git a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/PluginPatcher.cs b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/PluginPatcher.cs
index 4c8857a3f8..6b4f8eb379 100644
--- a/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/PluginPatcher.cs
+++ b/Rdmp.Core/MapsDirectlyToDatabaseTable/Versioning/PluginPatcher.cs
@@ -11,13 +11,11 @@ namespace Rdmp.Core.MapsDirectlyToDatabaseTable.Versioning;
 /// </summary>
 public class PluginPatcher : Patcher
 {
-    public PluginPatcher():base(3,null)
+    public PluginPatcher() : base(3, null)
     {
-            
     }
 
-    public PluginPatcher(string subdirectory):base(3,subdirectory)
+    public PluginPatcher(string subdirectory) : base(3, subdirectory)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/MissingColumnInfoException.cs b/Rdmp.Core/MissingColumnInfoException.cs
index d404f4b43b..1e16f332d4 100644
--- a/Rdmp.Core/MissingColumnInfoException.cs
+++ b/Rdmp.Core/MissingColumnInfoException.cs
@@ -15,13 +15,11 @@ namespace Rdmp.Core;
 /// </summary>
 public class MissingColumnInfoException : Exception
 {
-    public MissingColumnInfoException(string message): base(message)
+    public MissingColumnInfoException(string message) : base(message)
     {
-            
     }
 
-    public MissingColumnInfoException(string message,Exception innerException):base(message,innerException)
+    public MissingColumnInfoException(string message, Exception innerException) : base(message, innerException)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/OrderableComparer.cs b/Rdmp.Core/OrderableComparer.cs
index 135eea77f4..e296e256eb 100644
--- a/Rdmp.Core/OrderableComparer.cs
+++ b/Rdmp.Core/OrderableComparer.cs
@@ -62,13 +62,10 @@ public int Compare(object x, object y)
 
     private static int? GetOrderIfAny(object o)
     {
-        if(o is IOrderable orderable)
+        if (o is IOrderable orderable)
             return orderable.Order;
 
-        if(o is ISqlParameter)
-        {
-            return -5000;
-        }
+        if (o is ISqlParameter) return -5000;
 
         return null;
     }
@@ -78,8 +75,5 @@ public int Compare(object x, object y)
     /// </summary>
     /// <param name="x"></param>
     /// <returns></returns>
-    private static bool ShouldSortByName(object x)
-    {
-        return x is INamed && x is not IProject;
-    }
+    private static bool ShouldSortByName(object x) => x is INamed && x is not IProject;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/PluginUserInterface.cs b/Rdmp.Core/PluginUserInterface.cs
index 81fc8de346..77dc53559c 100644
--- a/Rdmp.Core/PluginUserInterface.cs
+++ b/Rdmp.Core/PluginUserInterface.cs
@@ -30,10 +30,7 @@ protected PluginUserInterface(IBasicActivateItems itemActivator)
         BasicActivator = itemActivator;
     }
 
-    public virtual object[] GetChildren(object model)
-    {
-        return null;
-    }
+    public virtual object[] GetChildren(object model) => null;
 
     /// <summary>
     /// Override to return a custom set of commands for some objects
@@ -46,13 +43,8 @@ public virtual IEnumerable<IAtomicCommand> GetAdditionalRightClickMenuItems(obje
         yield break;
     }
 
-    public virtual Image<Rgba32> GetImage(object concept, OverlayKind kind = OverlayKind.None)
-    {
-        return null;
-    }
+    public virtual Image<Rgba32> GetImage(object concept, OverlayKind kind = OverlayKind.None) => null;
+
     /// <inheritdoc/>
-    public virtual bool CustomActivate(IMapsDirectlyToDatabaseTable o)
-    {
-        return false;
-    }
+    public virtual bool CustomActivate(IMapsDirectlyToDatabaseTable o) => false;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/CatalogueChildProvider.cs b/Rdmp.Core/Providers/CatalogueChildProvider.cs
index 65a8cef635..29e2a5808f 100644
--- a/Rdmp.Core/Providers/CatalogueChildProvider.cs
+++ b/Rdmp.Core/Providers/CatalogueChildProvider.cs
@@ -191,17 +191,15 @@ public class CatalogueChildProvider : ICoreChildProvider
     public Curation.Data.Plugin[] AllPlugins { get; private set; }
     public Curation.Data.Plugin[] AllCompatiblePlugins { get; private set; }
 
-    public HashSet<StandardPipelineUseCaseNode> PipelineUseCases { get; set; } = new HashSet<StandardPipelineUseCaseNode>();
+    public HashSet<StandardPipelineUseCaseNode> PipelineUseCases { get; set; } = new();
 
     /// <summary>
     /// Lock for changes to Child provider
     /// </summary>
     protected object WriteLock = new();
 
-    public AllOrphanAggregateConfigurationsNode OrphanAggregateConfigurationsNode { get; set; } =
-        new AllOrphanAggregateConfigurationsNode();
-    public AllTemplateAggregateConfigurationsNode TemplateAggregateConfigurationsNode { get; set; } =
-        new AllTemplateAggregateConfigurationsNode();
+    public AllOrphanAggregateConfigurationsNode OrphanAggregateConfigurationsNode { get; set; } = new();
+    public AllTemplateAggregateConfigurationsNode TemplateAggregateConfigurationsNode { get; set; } = new();
     public FolderNode<Catalogue> CatalogueRootFolder { get; private set; }
 
     public HashSet<AggregateConfiguration> OrphanAggregateConfigurations;
@@ -218,7 +216,8 @@ public class CatalogueChildProvider : ICoreChildProvider
     /// <param name="pluginChildProviders"></param>
     /// <param name="errorsCheckNotifier">Where to report errors building the hierarchy e.g. when <paramref name="pluginChildProviders"/> crash.  Set to null for <see cref="IgnoreAllErrorsCheckNotifier"/></param>
     /// <param name="previousStateIfKnown">Previous child provider state if you know it otherwise null</param>
-    public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier, CatalogueChildProvider previousStateIfKnown)
+    public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[] pluginChildProviders,
+        ICheckNotifier errorsCheckNotifier, CatalogueChildProvider previousStateIfKnown)
     {
         _commentStore = repository.CommentStore;
         _catalogueRepository = repository;
@@ -267,19 +266,26 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
 
         AllConnectionStringKeywordsNode = new AllConnectionStringKeywordsNode();
         AllConnectionStringKeywords = GetAllObjects<ConnectionStringKeyword>(repository).ToArray();
-        AddToDictionaries(new HashSet<object>(AllConnectionStringKeywords), new DescendancyList(AllConnectionStringKeywordsNode));
+        AddToDictionaries(new HashSet<object>(AllConnectionStringKeywords),
+            new DescendancyList(AllConnectionStringKeywordsNode));
 
         ReportProgress("after basic object fetches");
 
         Task.WaitAll(
             //which TableInfos use which Credentials under which DataAccessContexts
-            Task.Factory.StartNew(() => { AllDataAccessCredentialUsages = repository.TableInfoCredentialsManager.GetAllCredentialUsagesBy(AllDataAccessCredentials, AllTableInfos); }),
+            Task.Factory.StartNew(() =>
+            {
+                AllDataAccessCredentialUsages =
+                    repository.TableInfoCredentialsManager.GetAllCredentialUsagesBy(AllDataAccessCredentials,
+                        AllTableInfos);
+            }),
             Task.Factory.StartNew(() => { AllColumnInfos = GetAllObjects<ColumnInfo>(repository); })
         );
 
         ReportProgress("After credentials");
 
-        TableInfosToColumnInfos = AllColumnInfos.GroupBy(c => c.TableInfo_ID).ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
+        TableInfosToColumnInfos = AllColumnInfos.GroupBy(c => c.TableInfo_ID)
+            .ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
 
         ReportProgress("After TableInfo to ColumnInfo mapping");
 
@@ -316,7 +322,8 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
         AllLookups = GetAllObjects<Lookup>(repository);
 
         foreach (var l in AllLookups)
-            l.SetKnownColumns(_allColumnInfos[l.PrimaryKey_ID], _allColumnInfos[l.ForeignKey_ID], _allColumnInfos[l.Description_ID]);
+            l.SetKnownColumns(_allColumnInfos[l.PrimaryKey_ID], _allColumnInfos[l.ForeignKey_ID],
+                _allColumnInfos[l.Description_ID]);
 
         AllJoinInfos = repository.GetAllObjects<JoinInfo>();
 
@@ -379,8 +386,10 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
         AddChildren(LoadMetadataRootFolder, new DescendancyList(LoadMetadataRootFolder));
 
 
-        CohortIdentificationConfigurationRootFolder = FolderHelper.BuildFolderTree(AllCohortIdentificationConfigurations);
-        AddChildren(CohortIdentificationConfigurationRootFolder, new DescendancyList(CohortIdentificationConfigurationRootFolder));
+        CohortIdentificationConfigurationRootFolder =
+            FolderHelper.BuildFolderTree(AllCohortIdentificationConfigurations);
+        AddChildren(CohortIdentificationConfigurationRootFolder,
+            new DescendancyList(CohortIdentificationConfigurationRootFolder));
 
         var templateAggregateConfigurationIds =
             new HashSet<int>(
@@ -388,10 +397,12 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
                     .Where(p => p.ReferencedObjectType.Equals(nameof(AggregateConfiguration)))
                     .Select(r => r.ReferencedObjectID));
 
-        TemplateAggregateConfigurations = AllAggregateConfigurations.Where(ac => templateAggregateConfigurationIds.Contains(ac.ID)).ToArray();
+        TemplateAggregateConfigurations = AllAggregateConfigurations
+            .Where(ac => templateAggregateConfigurationIds.Contains(ac.ID)).ToArray();
 
         //add the orphans under the orphan folder
-        AddToDictionaries(new HashSet<object>(OrphanAggregateConfigurations), new DescendancyList(OrphanAggregateConfigurationsNode));
+        AddToDictionaries(new HashSet<object>(OrphanAggregateConfigurations),
+            new DescendancyList(OrphanAggregateConfigurationsNode));
 
         var dec = new DescendancyList(TemplateAggregateConfigurationsNode);
         dec.SetBetterRouteExists();
@@ -400,14 +411,15 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
 
         //Some AggregateConfigurations are 'Patient Index Tables', this happens when there is an existing JoinableCohortAggregateConfiguration declared where
         //the AggregateConfiguration_ID is the AggregateConfiguration.ID.  We can inject this knowledge now so to avoid database lookups later (e.g. at icon provision time)
-        var joinableDictionaryByAggregateConfigurationId = AllJoinables.ToDictionaryEx(j => j.AggregateConfiguration_ID, v => v);
+        var joinableDictionaryByAggregateConfigurationId =
+            AllJoinables.ToDictionaryEx(j => j.AggregateConfiguration_ID, v => v);
 
         foreach (var ac in AllAggregateConfigurations)
-        {
-            ac.InjectKnown(joinableDictionaryByAggregateConfigurationId.TryGetValue(ac.ID, out var joinable) //if there's a joinable
-                ? joinable //inject that we know the joinable (and what it is)
-                : null); //otherwise inject that it is not a joinable (suppresses database checking later)
-        }
+            ac.InjectKnown(
+                joinableDictionaryByAggregateConfigurationId.TryGetValue(ac.ID,
+                    out var joinable) //if there's a joinable
+                    ? joinable //inject that we know the joinable (and what it is)
+                    : null); //otherwise inject that it is not a joinable (suppresses database checking later)
 
         ReportProgress("After AggregateConfiguration injection");
 
@@ -445,7 +457,8 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
             if (!searchables.ContainsKey(e.ReferencedObjectID))
                 continue;
 
-            var known = searchables[e.ReferencedObjectID].FirstOrDefault(s => e.ReferencedObjectType == s.GetType().FullName);
+            var known = searchables[e.ReferencedObjectID]
+                .FirstOrDefault(s => e.ReferencedObjectType == s.GetType().FullName);
 
             if (known != null)
                 e.InjectKnown(known);
@@ -457,11 +470,13 @@ public CatalogueChildProvider(ICatalogueRepository repository, IChildProvider[]
 
     private void FetchCatalogueItems()
     {
-        AllCatalogueItemsDictionary = GetAllObjects<CatalogueItem>(_catalogueRepository).ToDictionaryEx(i => i.ID, o => o);
+        AllCatalogueItemsDictionary =
+            GetAllObjects<CatalogueItem>(_catalogueRepository).ToDictionaryEx(i => i.ID, o => o);
 
         ReportProgress("After CatalogueItem getting");
 
-        _catalogueToCatalogueItems = AllCatalogueItems.GroupBy(c => c.Catalogue_ID).ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
+        _catalogueToCatalogueItems = AllCatalogueItems.GroupBy(c => c.Catalogue_ID)
+            .ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
         _allColumnInfos = AllColumnInfos.ToDictionaryEx(i => i.ID, o => o);
 
         ReportProgress("After CatalogueItem Dictionary building");
@@ -474,24 +489,24 @@ private void FetchCatalogueItems()
             else
                 ci.InjectKnown((ColumnInfo)null);
         });
-
     }
 
     private void FetchExtractionInformations()
     {
-        AllExtractionInformationsDictionary = GetAllObjects<ExtractionInformation>(_catalogueRepository).ToDictionaryEx(i => i.ID, o => o);
-        _extractionInformationsByCatalogueItem = AllExtractionInformationsDictionary.Values.ToDictionaryEx(k => k.CatalogueItem_ID, v => v);
+        AllExtractionInformationsDictionary = GetAllObjects<ExtractionInformation>(_catalogueRepository)
+            .ToDictionaryEx(i => i.ID, o => o);
+        _extractionInformationsByCatalogueItem =
+            AllExtractionInformationsDictionary.Values.ToDictionaryEx(k => k.CatalogueItem_ID, v => v);
 
         //Inject known CatalogueItems into ExtractionInformations
         foreach (var ei in AllExtractionInformationsDictionary.Values)
-        {
             if (AllCatalogueItemsDictionary.TryGetValue(ei.CatalogueItem_ID, out var ci))
             {
                 ei.InjectKnown(ci.ColumnInfo);
                 ei.InjectKnown(ci);
             }
-        }
     }
+
     private void BuildCohortCohortAggregateContainers()
     {
         AllCohortAggregateContainers = GetAllObjects<CohortAggregateContainer>(_catalogueRepository);
@@ -507,18 +522,22 @@ private void BuildCohortCohortAggregateContainers()
 
     private void BuildAggregateConfigurations()
     {
-        AllJoinableCohortAggregateConfigurationUse = GetAllObjects<JoinableCohortAggregateConfigurationUse>(_catalogueRepository);
+        AllJoinableCohortAggregateConfigurationUse =
+            GetAllObjects<JoinableCohortAggregateConfigurationUse>(_catalogueRepository);
         AllAggregateConfigurations = GetAllObjects<AggregateConfiguration>(_catalogueRepository);
 
         BuildAggregateDimensions();
 
         //to start with all aggregates are orphans (we prune this as we determine descendency in AddChildren methods
-        OrphanAggregateConfigurations = new HashSet<AggregateConfiguration>(AllAggregateConfigurations.Where(ac => ac.IsCohortIdentificationAggregate));
+        OrphanAggregateConfigurations =
+            new HashSet<AggregateConfiguration>(
+                AllAggregateConfigurations.Where(ac => ac.IsCohortIdentificationAggregate));
 
         foreach (var configuration in AllAggregateConfigurations)
         {
             configuration.InjectKnown(AllCataloguesDictionary[configuration.Catalogue_ID]);
-            configuration.InjectKnown(AllAggregateDimensions.Where(d => d.AggregateConfiguration_ID == configuration.ID).ToArray());
+            configuration.InjectKnown(AllAggregateDimensions.Where(d => d.AggregateConfiguration_ID == configuration.ID)
+                .ToArray());
         }
 
         foreach (var d in AllAggregateDimensions)
@@ -537,7 +556,8 @@ private void BuildAggregateDimensions()
 
     private void BuildAggregateFilterContainers()
     {
-        AllAggregateContainersDictionary = GetAllObjects<AggregateFilterContainer>(_catalogueRepository).ToDictionaryEx(o => o.ID, o2 => o2);
+        AllAggregateContainersDictionary = GetAllObjects<AggregateFilterContainer>(_catalogueRepository)
+            .ToDictionaryEx(o => o.ID, o2 => o2);
         AllAggregateFilters = GetAllObjects<AggregateFilter>(_catalogueRepository);
         AllAggregateFilterParameters = GetAllObjects<AggregateFilterParameter>(_catalogueRepository);
 
@@ -549,12 +569,13 @@ private void BuildAggregateFilterContainers()
 
     protected void ReportProgress(string desc)
     {
-        if(UserSettings.DebugPerformance)
+        if (UserSettings.DebugPerformance)
         {
-            _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs($"ChildProvider Stage {_progress++} ({desc}):{  ProgressStopwatch.ElapsedMilliseconds }ms",CheckResult.Success));
+            _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs(
+                $"ChildProvider Stage {_progress++} ({desc}):{ProgressStopwatch.ElapsedMilliseconds}ms",
+                CheckResult.Success));
             ProgressStopwatch.Restart();
         }
-
     }
 
     private void AddChildren(AllPluginsNode allPluginsNode)
@@ -567,7 +588,7 @@ private void AddChildren(AllPluginsNode allPluginsNode)
 
         var expiredPluginsNode = new AllExpiredPluginsNode();
         children.Add(expiredPluginsNode);
-        AddChildren(expiredPluginsNode,descendancy.Add(expiredPluginsNode));
+        AddChildren(expiredPluginsNode, descendancy.Add(expiredPluginsNode));
 
         AddToDictionaries(children, descendancy);
     }
@@ -600,7 +621,7 @@ private void AddChildren(GovernancePeriod governancePeriod, DescendancyList desc
     {
         var children = new HashSet<object>();
 
-        foreach (var doc in AllGovernanceDocuments.Where(d=>d.GovernancePeriod_ID == governancePeriod.ID))
+        foreach (var doc in AllGovernanceDocuments.Where(d => d.GovernancePeriod_ID == governancePeriod.ID))
             children.Add(doc);
 
         AddToDictionaries(children, descendancy);
@@ -615,7 +636,7 @@ private void AddChildren(AllPermissionWindowsNode allPermissionWindowsNode)
             AddChildren(permissionWindow, descendancy.Add(permissionWindow));
 
 
-        AddToDictionaries(new HashSet<object>(AllPermissionWindows),descendancy);
+        AddToDictionaries(new HashSet<object>(AllPermissionWindows), descendancy);
     }
 
     private void AddChildren(PermissionWindow permissionWindow, DescendancyList descendancy)
@@ -626,7 +647,7 @@ private void AddChildren(PermissionWindow permissionWindow, DescendancyList desc
             if (cacheProgress.PermissionWindow_ID == permissionWindow.ID)
                 children.Add(new PermissionWindowUsedByCacheProgressNode(cacheProgress, permissionWindow, false));
 
-        AddToDictionaries(children,descendancy);
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(AllExternalServersNode allExternalServersNode)
@@ -661,7 +682,7 @@ private void AddChildren(AllObjectSharingNode allObjectSharingNode)
     /// <summary>
     /// Creates new <see cref="StandardPipelineUseCaseNode"/>s and fills it with all compatible Pipelines - do not call this method more than once
     /// </summary>
-    protected void AddPipelineUseCases(Dictionary<string,PipelineUseCase> useCases)
+    protected void AddPipelineUseCases(Dictionary<string, PipelineUseCase> useCases)
     {
         var descendancy = new DescendancyList(AllPipelinesNode);
         var children = new HashSet<object>();
@@ -684,11 +705,10 @@ protected void AddPipelineUseCases(Dictionary<string,PipelineUseCase> useCases)
 
         children.Add(OtherPipelinesNode);
         OtherPipelinesNode.Pipelines.AddRange(unknownPipelines.Cast<Pipeline>());
-        AddToDictionaries(unknownPipelines,descendancy.Add(OtherPipelinesNode));
+        AddToDictionaries(unknownPipelines, descendancy.Add(OtherPipelinesNode));
 
         //it is the first standard use case
         AddToDictionaries(children, descendancy);
-
     }
 
     private IEnumerable<Pipeline> AddChildren(StandardPipelineUseCaseNode node, DescendancyList descendancy)
@@ -720,7 +740,8 @@ private IEnumerable<Pipeline> AddChildren(StandardPipelineUseCaseNode node, Desc
 
     private void AddChildren(PipelineCompatibleWithUseCaseNode pipelineNode, DescendancyList descendancy)
     {
-        var components = AllPipelineComponents.Where(c => c.Pipeline_ID == pipelineNode.Pipeline.ID).OrderBy(o => o.Order)
+        var components = AllPipelineComponents.Where(c => c.Pipeline_ID == pipelineNode.Pipeline.ID)
+            .OrderBy(o => o.Order)
             .ToArray();
 
         foreach (var component in components)
@@ -733,7 +754,8 @@ private void AddChildren(PipelineCompatibleWithUseCaseNode pipelineNode, Descend
 
     private void AddChildren(PipelineComponent pipelineComponent, DescendancyList descendancy)
     {
-        var components = AllPipelineComponentsArguments.Where(c => c.PipelineComponent_ID == pipelineComponent.ID).ToArray();
+        var components = AllPipelineComponentsArguments.Where(c => c.PipelineComponent_ID == pipelineComponent.ID)
+            .ToArray();
 
         var children = new HashSet<object>(components);
 
@@ -754,8 +776,8 @@ private void BuildServerNodes()
             IEnumerable<TableInfo> tables = typeGroup;
 
             var serversByName = tables
-                .GroupBy(c => c.Server ?? TableInfoServerNode.NullServerNode,StringComparer.CurrentCultureIgnoreCase)
-                .Select(s => new TableInfoServerNode(s.Key,dbType, s));
+                .GroupBy(c => c.Server ?? TableInfoServerNode.NullServerNode, StringComparer.CurrentCultureIgnoreCase)
+                .Select(s => new TableInfoServerNode(s.Key, dbType, s));
 
 
             foreach (var server in serversByName)
@@ -769,7 +791,7 @@ private void BuildServerNodes()
         AllServers = allServers.ToArray();
 
         //record the fact that all the servers are children of the all servers node
-        AddToDictionaries(new HashSet<object>(AllServers),descendancy);
+        AddToDictionaries(new HashSet<object>(AllServers), descendancy);
     }
 
 
@@ -797,66 +819,54 @@ private void AddChildren(AllANOTablesNode anoTablesNode)
 
     private void AddChildren(FolderNode<Catalogue> folder, DescendancyList descendancy)
     {
-        foreach(var child in folder.ChildFolders)
-        {
+        foreach (var child in folder.ChildFolders)
             //add subfolder children
             AddChildren(child, descendancy.Add(child));
-        }
 
         //add catalogues in folder
-        foreach(var c in folder.ChildObjects)
-        {
-            AddChildren(c, descendancy.Add(c));
-        }
+        foreach (var c in folder.ChildObjects) AddChildren(c, descendancy.Add(c));
 
         // Children are the folders + objects
         AddToDictionaries(new HashSet<object>(
                 folder.ChildFolders.Cast<object>()
-                    .Union(folder.ChildObjects)),descendancy
+                    .Union(folder.ChildObjects)), descendancy
         );
     }
+
     private void AddChildren(FolderNode<LoadMetadata> folder, DescendancyList descendancy)
     {
-        foreach(var child in folder.ChildFolders)
-        {
+        foreach (var child in folder.ChildFolders)
             //add subfolder children
             AddChildren(child, descendancy.Add(child));
-        }
 
         //add loads in folder
-        foreach(var lmd in folder.ChildObjects)
-        {
-            AddChildren(lmd, descendancy.Add(lmd));
-        }
+        foreach (var lmd in folder.ChildObjects) AddChildren(lmd, descendancy.Add(lmd));
 
         // Children are the folders + objects
         AddToDictionaries(new HashSet<object>(
                 folder.ChildFolders.Cast<object>()
-                    .Union(folder.ChildObjects)),descendancy
+                    .Union(folder.ChildObjects)), descendancy
         );
     }
+
     private void AddChildren(FolderNode<CohortIdentificationConfiguration> folder, DescendancyList descendancy)
     {
-        foreach(var child in folder.ChildFolders)
-        {
+        foreach (var child in folder.ChildFolders)
             //add subfolder children
             AddChildren(child, descendancy.Add(child));
-        }
 
         //add cics in folder
-        foreach(var cic in folder.ChildObjects)
-        {
-            AddChildren(cic, descendancy.Add(cic));
-        }
+        foreach (var cic in folder.ChildObjects) AddChildren(cic, descendancy.Add(cic));
 
         // Children are the folders + objects
         AddToDictionaries(new HashSet<object>(
                 folder.ChildFolders.Cast<object>()
-                    .Union(folder.ChildObjects)),descendancy
+                    .Union(folder.ChildObjects)), descendancy
         );
     }
 
     #region Load Metadata
+
     private void AddChildren(LoadMetadata lmd, DescendancyList descendancy)
     {
         var childObjects = new List<object>();
@@ -869,7 +879,7 @@ private void AddChildren(LoadMetadata lmd, DescendancyList descendancy)
         }
 
         var allSchedulesNode = new LoadMetadataScheduleNode(lmd);
-        AddChildren(allSchedulesNode,descendancy.Add(allSchedulesNode));
+        AddChildren(allSchedulesNode, descendancy.Add(allSchedulesNode));
         childObjects.Add(allSchedulesNode);
 
         var allCataloguesNode = new AllCataloguesUsedByLoadMetadataNode(lmd);
@@ -893,12 +903,12 @@ private void AddChildren(LoadMetadataScheduleNode allSchedulesNode, DescendancyL
 
         foreach (var lp in AllLoadProgresses.Where(p => p.LoadMetadata_ID == lmd.ID))
         {
-            AddChildren(lp,descendancy.Add(lp));
+            AddChildren(lp, descendancy.Add(lp));
             childObjects.Add(lp);
         }
 
-        if(childObjects.Any())
-            AddToDictionaries(childObjects,descendancy);
+        if (childObjects.Any())
+            AddToDictionaries(childObjects, descendancy);
     }
 
     private void AddChildren(LoadProgress loadProgress, DescendancyList descendancy)
@@ -909,53 +919,54 @@ private void AddChildren(LoadProgress loadProgress, DescendancyList descendancy)
             AddChildren(cacheProgress, descendancy.Add(cacheProgress));
 
         if (cacheProgresses.Any())
-            AddToDictionaries(new HashSet<object>(cacheProgresses),descendancy);
+            AddToDictionaries(new HashSet<object>(cacheProgresses), descendancy);
     }
 
     private void AddChildren(CacheProgress cacheProgress, DescendancyList descendancy)
     {
         var children = new HashSet<object>();
 
-        if(cacheProgress.PermissionWindow_ID != null)
+        if (cacheProgress.PermissionWindow_ID != null)
         {
             var window = AllPermissionWindows.Single(w => w.ID == cacheProgress.PermissionWindow_ID);
-            var windowNode = new PermissionWindowUsedByCacheProgressNode(cacheProgress, window,true);
+            var windowNode = new PermissionWindowUsedByCacheProgressNode(cacheProgress, window, true);
 
             children.Add(windowNode);
         }
 
-        if(children.Any())
+        if (children.Any())
             AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(AllProcessTasksUsedByLoadMetadataNode allProcessTasksUsedByLoadMetadataNode, DescendancyList descendancy)
+    private void AddChildren(AllProcessTasksUsedByLoadMetadataNode allProcessTasksUsedByLoadMetadataNode,
+        DescendancyList descendancy)
     {
         var childObjects = new HashSet<object>();
 
         var lmd = allProcessTasksUsedByLoadMetadataNode.LoadMetadata;
-        childObjects.Add(new LoadStageNode(lmd,LoadStage.GetFiles));
+        childObjects.Add(new LoadStageNode(lmd, LoadStage.GetFiles));
         childObjects.Add(new LoadStageNode(lmd, LoadStage.Mounting));
         childObjects.Add(new LoadStageNode(lmd, LoadStage.AdjustRaw));
         childObjects.Add(new LoadStageNode(lmd, LoadStage.AdjustStaging));
         childObjects.Add(new LoadStageNode(lmd, LoadStage.PostLoad));
 
         foreach (LoadStageNode node in childObjects)
-            AddChildren(node,descendancy.Add(node));
+            AddChildren(node, descendancy.Add(node));
 
-        AddToDictionaries(childObjects,descendancy);
+        AddToDictionaries(childObjects, descendancy);
     }
 
     private void AddChildren(LoadStageNode loadStageNode, DescendancyList descendancy)
     {
         var tasks = AllProcessTasks.Where(
                 p => p.LoadMetadata_ID == loadStageNode.LoadMetadata.ID && p.LoadStage == loadStageNode.LoadStage)
-            .OrderBy(o=>o.Order).ToArray();
+            .OrderBy(o => o.Order).ToArray();
 
         foreach (var processTask in tasks)
             AddChildren(processTask, descendancy.Add(processTask));
 
-        if(tasks.Any())
-            AddToDictionaries(new HashSet<object>(tasks),descendancy);
+        if (tasks.Any())
+            AddToDictionaries(new HashSet<object>(tasks), descendancy);
     }
 
     private void AddChildren(ProcessTask procesTask, DescendancyList descendancy)
@@ -963,22 +974,26 @@ private void AddChildren(ProcessTask procesTask, DescendancyList descendancy)
         var args = AllProcessTasksArguments.Where(
             a => a.ProcessTask_ID == procesTask.ID).ToArray();
 
-        if(args.Any())
-            AddToDictionaries(new HashSet<object>(args),descendancy);
+        if (args.Any())
+            AddToDictionaries(new HashSet<object>(args), descendancy);
     }
-    private void AddChildren(AllCataloguesUsedByLoadMetadataNode allCataloguesUsedByLoadMetadataNode, DescendancyList descendancy)
+
+    private void AddChildren(AllCataloguesUsedByLoadMetadataNode allCataloguesUsedByLoadMetadataNode,
+        DescendancyList descendancy)
     {
         var chilObjects = new HashSet<object>();
 
-        var usedCatalogues = AllCatalogues.Where(c => c.LoadMetadata_ID == allCataloguesUsedByLoadMetadataNode.LoadMetadata.ID).ToList();
+        var usedCatalogues = AllCatalogues
+            .Where(c => c.LoadMetadata_ID == allCataloguesUsedByLoadMetadataNode.LoadMetadata.ID).ToList();
 
 
         foreach (var catalogue in usedCatalogues)
-            chilObjects.Add(new CatalogueUsedByLoadMetadataNode(allCataloguesUsedByLoadMetadataNode.LoadMetadata,catalogue));
+            chilObjects.Add(new CatalogueUsedByLoadMetadataNode(allCataloguesUsedByLoadMetadataNode.LoadMetadata,
+                catalogue));
 
         allCataloguesUsedByLoadMetadataNode.UsedCatalogues = usedCatalogues;
 
-        AddToDictionaries(chilObjects,descendancy);
+        AddToDictionaries(chilObjects, descendancy);
     }
 
     #endregion
@@ -1008,17 +1023,25 @@ protected void AddChildren(Catalogue c, DescendancyList descendancy)
 
         c.InjectKnown(cis);
 
-        var deprecated = new CatalogueItemsNode(c, cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Deprecated), ExtractionCategory.Deprecated);
-        var special = new CatalogueItemsNode(c, cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.SpecialApprovalRequired), ExtractionCategory.SpecialApprovalRequired);
-        var intern = new CatalogueItemsNode(c, cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Internal), ExtractionCategory.Internal);
-        var supplemental = new CatalogueItemsNode(c, cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Supplemental), ExtractionCategory.Supplemental);
+        var deprecated = new CatalogueItemsNode(c,
+            cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Deprecated),
+            ExtractionCategory.Deprecated);
+        var special = new CatalogueItemsNode(c,
+            cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.SpecialApprovalRequired),
+            ExtractionCategory.SpecialApprovalRequired);
+        var intern = new CatalogueItemsNode(c,
+            cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Internal),
+            ExtractionCategory.Internal);
+        var supplemental = new CatalogueItemsNode(c,
+            cis.Where(ci => ci.ExtractionInformation?.ExtractionCategory == ExtractionCategory.Supplemental),
+            ExtractionCategory.Supplemental);
         var notExtractable = new CatalogueItemsNode(c, cis.Where(ci => ci.ExtractionInformation == null), null);
 
         AddChildren(core, descendancy.Add(core));
         childObjects.Add(core);
 
-        foreach(var optional in new[] { deprecated,special,intern,supplemental,notExtractable})
-            if(optional.CatalogueItems.Any())
+        foreach (var optional in new[] { deprecated, special, intern, supplemental, notExtractable })
+            if (optional.CatalogueItems.Any())
             {
                 AddChildren(optional, descendancy.Add(optional));
                 childObjects.Add(optional);
@@ -1039,7 +1062,7 @@ protected void AddChildren(Catalogue c, DescendancyList descendancy)
             childObjects.Add(documentationNode);
 
             //record the children
-            AddToDictionaries(new HashSet<object>(docs.Cast<object>().Union(sql)),descendancy.Add(documentationNode));
+            AddToDictionaries(new HashSet<object>(docs.Cast<object>().Union(sql)), descendancy.Add(documentationNode));
         }
 
         if (lookups.Any())
@@ -1050,7 +1073,7 @@ protected void AddChildren(Catalogue c, DescendancyList descendancy)
 
 
             //record the children
-            AddToDictionaries(new HashSet<object>(lookups.Select(l=>new CatalogueLookupUsageNode(c,l))),
+            AddToDictionaries(new HashSet<object>(lookups.Select(l => new CatalogueLookupUsageNode(c, l))),
                 descendancy.Add(lookupsNode));
         }
 
@@ -1060,25 +1083,23 @@ protected void AddChildren(Catalogue c, DescendancyList descendancy)
             childObjects.Add(aggregatesNode);
 
             var nodeDescendancy = descendancy.Add(aggregatesNode);
-            AddToDictionaries(new HashSet<object>(regularAggregates),nodeDescendancy);
+            AddToDictionaries(new HashSet<object>(regularAggregates), nodeDescendancy);
 
             foreach (var regularAggregate in regularAggregates)
                 AddChildren(regularAggregate, nodeDescendancy.Add(regularAggregate));
         }
 
         //finalise
-        AddToDictionaries(new HashSet<object>(childObjects),descendancy);
+        AddToDictionaries(new HashSet<object>(childObjects), descendancy);
     }
 
     private void InjectCatalogueItems()
     {
-        foreach(var ci in AllCatalogueItems)
-        {
+        foreach (var ci in AllCatalogueItems)
             if (_extractionInformationsByCatalogueItem.TryGetValue(ci.ID, out var ei))
                 ci.InjectKnown(ei);
             else
                 ci.InjectKnown((ExtractionInformation)null);
-        }
     }
 
     private void AddChildren(CatalogueItemsNode node, DescendancyList descendancyList)
@@ -1093,31 +1114,28 @@ private void AddChildren(AggregateConfiguration aggregateConfiguration, Descenda
     {
         var childrenObjects = new HashSet<object>();
 
-        var parameters = AllAnyTableParameters.Where(p => p.IsReferenceTo(aggregateConfiguration)).Cast<ISqlParameter>().ToArray();
+        var parameters = AllAnyTableParameters.Where(p => p.IsReferenceTo(aggregateConfiguration)).Cast<ISqlParameter>()
+            .ToArray();
 
         foreach (var p in parameters)
             childrenObjects.Add(p);
 
         // show the dimensions in the tree
-        foreach (var dim in aggregateConfiguration.AggregateDimensions)
-        {
-            childrenObjects.Add(dim);
-        }
+        foreach (var dim in aggregateConfiguration.AggregateDimensions) childrenObjects.Add(dim);
 
         // show the axis (if any) in the tree.  If there are multiple axis in this tree then that is bad but maybe the user can delete one of them to fix the situation
-        foreach(var axis in AllAggregateContinuousDateAxis.Where(a => aggregateConfiguration.AggregateDimensions.Any(d => d.ID == a.AggregateDimension_ID)))
-        {
+        foreach (var axis in AllAggregateContinuousDateAxis.Where(a =>
+                     aggregateConfiguration.AggregateDimensions.Any(d => d.ID == a.AggregateDimension_ID)))
             childrenObjects.Add(axis);
-        }
 
         //we can step into this twice, once via Catalogue children and once via CohortIdentificationConfiguration children
         //if we get in via Catalogue children then descendancy will be Ignore=true we don't end up emphasising into CatalogueCollectionUI when
         //really user wants to see it in CohortIdentificationCollectionUI
         if (aggregateConfiguration.RootFilterContainer_ID != null)
         {
-            var container = AllAggregateContainersDictionary[(int) aggregateConfiguration.RootFilterContainer_ID];
+            var container = AllAggregateContainersDictionary[(int)aggregateConfiguration.RootFilterContainer_ID];
 
-            AddChildren(container,descendancy.Add(container));
+            AddChildren(container, descendancy.Add(container));
             childrenObjects.Add(container);
         }
 
@@ -1137,11 +1155,11 @@ private void AddChildren(AggregateFilterContainer container, DescendancyList des
             childrenObjects.Add(subcontainer);
 
             //but also document its children
-            AddChildren(subcontainer,descendancy.Add(subcontainer));
+            AddChildren(subcontainer, descendancy.Add(subcontainer));
         }
 
         //also add the filters for the container
-        foreach(var f in filters)
+        foreach (var f in filters)
         {
             // for filters add the parameters under them
             AddChildren((AggregateFilter)f, descendancy.Add(f));
@@ -1149,12 +1167,13 @@ private void AddChildren(AggregateFilterContainer container, DescendancyList des
         }
 
         //add our children to the dictionary
-        AddToDictionaries(new HashSet<object>(childrenObjects),descendancy);
+        AddToDictionaries(new HashSet<object>(childrenObjects), descendancy);
     }
 
     private void AddChildren(AggregateFilter f, DescendancyList descendancy)
     {
-        AddToDictionaries(new HashSet<object>(AllAggregateFilterParameters.Where(p => p.AggregateFilter_ID == f.ID)), descendancy);
+        AddToDictionaries(new HashSet<object>(AllAggregateFilterParameters.Where(p => p.AggregateFilter_ID == f.ID)),
+            descendancy);
     }
 
     private void AddChildren(CatalogueItem ci, DescendancyList descendancy)
@@ -1168,12 +1187,15 @@ private void AddChildren(CatalogueItem ci, DescendancyList descendancy)
             AddChildren(ei, descendancy.Add(ei));
         }
         else
-            ci.InjectKnown((ExtractionInformation)null); // we know the CatalogueItem has no ExtractionInformation child because it's not in the dictionary
+        {
+            ci.InjectKnown(
+                (ExtractionInformation)null); // we know the CatalogueItem has no ExtractionInformation child because it's not in the dictionary
+        }
 
         if (ci.ColumnInfo_ID.HasValue && _allColumnInfos.TryGetValue(ci.ColumnInfo_ID.Value, out var col))
-            childObjects.Add(new LinkedColumnInfoNode(ci,col));
+            childObjects.Add(new LinkedColumnInfoNode(ci, col));
 
-        AddToDictionaries(new HashSet<object>(childObjects),descendancy);
+        AddToDictionaries(new HashSet<object>(childObjects), descendancy);
     }
 
     private void AddChildren(ExtractionInformation extractionInformation, DescendancyList descendancy)
@@ -1184,10 +1206,10 @@ private void AddChildren(ExtractionInformation extractionInformation, Descendanc
         {
             //add the filter as a child of the
             children.Add(filter);
-            AddChildren(filter,descendancy.Add(filter));
+            AddChildren(filter, descendancy.Add(filter));
         }
 
-        AddToDictionaries(children,descendancy);
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(ExtractionFilter filter, DescendancyList descendancy)
@@ -1207,11 +1229,12 @@ private void AddChildren(ExtractionFilter filter, DescendancyList descendancy)
             AddChildren(set, descendancy.Add(set), parameters);
         }
 
-        if(children.Any())
-            AddToDictionaries(children,descendancy);
+        if (children.Any())
+            AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(ExtractionFilterParameterSet set, DescendancyList descendancy, ExtractionFilterParameter[] filterParameters)
+    private void AddChildren(ExtractionFilterParameterSet set, DescendancyList descendancy,
+        ExtractionFilterParameter[] filterParameters)
     {
         var children = new HashSet<object>();
 
@@ -1230,13 +1253,11 @@ private void AddChildren(CohortIdentificationConfiguration cic, DescendancyList
 
         //it has an associated query cache
         if (cic.QueryCachingServer_ID != null)
-            children.Add(new QueryCacheUsedByCohortIdentificationNode(cic, AllExternalServers.Single(s => s.ID == cic.QueryCachingServer_ID)));
+            children.Add(new QueryCacheUsedByCohortIdentificationNode(cic,
+                AllExternalServers.Single(s => s.ID == cic.QueryCachingServer_ID)));
 
         var parameters = AllAnyTableParameters.Where(p => p.IsReferenceTo(cic)).Cast<ISqlParameter>().ToArray();
-        foreach(var p in parameters)
-        {
-            children.Add(p);
-        }
+        foreach (var p in parameters) children.Add(p);
 
         //if it has a root container
         if (cic.RootCohortAggregateContainer_ID != null)
@@ -1247,7 +1268,8 @@ private void AddChildren(CohortIdentificationConfiguration cic, DescendancyList
         }
 
         //get the patient index tables
-        var joinableNode = new JoinableCollectionNode(cic, AllJoinables.Where(j => j.CohortIdentificationConfiguration_ID == cic.ID).ToArray());
+        var joinableNode = new JoinableCollectionNode(cic,
+            AllJoinables.Where(j => j.CohortIdentificationConfiguration_ID == cic.ID).ToArray());
         AddChildren(joinableNode, descendancy.Add(joinableNode).SetBetterRouteExists());
         children.Add(joinableNode);
 
@@ -1259,24 +1281,23 @@ private void AddChildren(JoinableCollectionNode joinablesNode, DescendancyList d
         var children = new HashSet<object>();
 
         foreach (var joinable in joinablesNode.Joinables)
-        {
             try
             {
                 var agg = AllAggregateConfigurations.Single(ac => ac.ID == joinable.AggregateConfiguration_ID);
-                ForceAggregateNaming(agg,descendancy);
+                ForceAggregateNaming(agg, descendancy);
                 children.Add(agg);
 
                 //it's no longer an orphan because it's in a known cic (as a patient index table)
                 OrphanAggregateConfigurations.Remove(agg);
 
-                AddChildren(agg,descendancy.Add(agg));
+                AddChildren(agg, descendancy.Add(agg));
             }
             catch (Exception e)
             {
                 throw new Exception(
-                    $"JoinableCohortAggregateConfiguration (patient index table) object (ID={joinable.ID}) references AggregateConfiguration_ID {joinable.AggregateConfiguration_ID} but that AggregateConfiguration was not found",e);
+                    $"JoinableCohortAggregateConfiguration (patient index table) object (ID={joinable.ID}) references AggregateConfiguration_ID {joinable.AggregateConfiguration_ID} but that AggregateConfiguration was not found",
+                    e);
             }
-        }
 
         AddToDictionaries(children, descendancy);
     }
@@ -1290,7 +1311,7 @@ private void AddChildren(CohortAggregateContainer container, DescendancyList des
 
         //if there are subcontainers
         foreach (var subcontainer in subcontainers)
-            AddChildren(subcontainer,descendancy.Add(subcontainer));
+            AddChildren(subcontainer, descendancy.Add(subcontainer));
 
         //get our configurations
         var configurations = _cohortContainerManager.GetChildren(container).OfType<AggregateConfiguration>().ToList();
@@ -1308,7 +1329,7 @@ private void AddChildren(CohortAggregateContainer container, DescendancyList des
         //children are all aggregates and containers at the current hierarchy level in order
         var children = subcontainers.Union(configurations.Cast<IOrderable>()).OrderBy(o => o.Order).ToList();
 
-        AddToDictionaries(new HashSet<object>(children),descendancy);
+        AddToDictionaries(new HashSet<object>(children), descendancy);
     }
 
     private void ForceAggregateNaming(AggregateConfiguration configuration, DescendancyList descendancy)
@@ -1317,8 +1338,10 @@ private void ForceAggregateNaming(AggregateConfiguration configuration, Descenda
         if (!configuration.IsCohortIdentificationAggregate)
         {
             _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs(
-                $"Had to fix naming of configuration '{configuration}' because it didn't start with correct cic prefix",CheckResult.Warning));
-            descendancy.Parents.OfType<CohortIdentificationConfiguration>().Single().EnsureNamingConvention(configuration);
+                $"Had to fix naming of configuration '{configuration}' because it didn't start with correct cic prefix",
+                CheckResult.Warning));
+            descendancy.Parents.OfType<CohortIdentificationConfiguration>().Single()
+                .EnsureNamingConvention(configuration);
             configuration.SaveToDatabase();
         }
     }
@@ -1329,10 +1352,9 @@ private void AddChildren(TableInfoServerNode serverNode, DescendancyList descend
         var children = new HashSet<object>();
 
         var databases =
-
             serverNode.Tables.GroupBy(
                     k => k.Database ?? TableInfoDatabaseNode.NullDatabaseNode, StringComparer.CurrentCultureIgnoreCase)
-                .Select(g=> new TableInfoDatabaseNode(g.Key, serverNode, g));
+                .Select(g => new TableInfoDatabaseNode(g.Key, serverNode, g));
 
         foreach (var db in databases)
         {
@@ -1349,7 +1371,7 @@ private void AddChildren(TableInfoDatabaseNode dbNode, DescendancyList descendan
         //add empty hashset
         var children = new HashSet<object>();
 
-        foreach(var t in dbNode.Tables)
+        foreach (var t in dbNode.Tables)
         {
             //record the children of the table infos (mostly column infos)
             children.Add(t);
@@ -1362,10 +1384,10 @@ private void AddChildren(TableInfoDatabaseNode dbNode, DescendancyList descendan
         AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(TableInfo tableInfo,DescendancyList descendancy)
+    private void AddChildren(TableInfo tableInfo, DescendancyList descendancy)
     {
         //add empty hashset
-        var children =  new HashSet<object>();
+        var children = new HashSet<object>();
 
         //if the table has an identifier dump listed
         if (tableInfo.IdentifierDumpServer_ID != null)
@@ -1401,19 +1423,16 @@ private void AddChildren(TableInfo tableInfo,DescendancyList descendancy)
             //that has parameters
             var parameters = tableInfo.GetAllParameters();
 
-            foreach(var p in parameters)
-            {
-                children.Add(p);
-            }
+            foreach (var p in parameters) children.Add(p);
         }
 
         //next add the column infos
-        if( TableInfosToColumnInfos.TryGetValue(tableInfo.ID,out var result))
+        if (TableInfosToColumnInfos.TryGetValue(tableInfo.ID, out var result))
             foreach (var c in result)
             {
                 children.Add(c);
                 c.InjectKnown(tableInfo);
-                AddChildren(c,descendancy.Add(c).SetBetterRouteExists());
+                AddChildren(c, descendancy.Add(c).SetBetterRouteExists());
             }
 
         //finally add any credentials objects
@@ -1422,7 +1441,7 @@ private void AddChildren(TableInfo tableInfo,DescendancyList descendancy)
                 children.Add(node);
 
         //now we have recorded all the children add them with descendancy via the TableInfo descendancy
-        AddToDictionaries(children,descendancy);
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(ColumnInfo columnInfo, DescendancyList descendancy)
@@ -1439,13 +1458,13 @@ private void AddChildren(ColumnInfo columnInfo, DescendancyList descendancy)
             children.Add(j);
 
         if (children.Any())
-            AddToDictionaries(children,descendancy);
+            AddToDictionaries(children, descendancy);
     }
 
     protected void AddToDictionaries(HashSet<object> children, DescendancyList list)
     {
-        if(list.IsEmpty)
-            throw new ArgumentException("DescendancyList cannot be empty",nameof(list));
+        if (list.IsEmpty)
+            throw new ArgumentException("DescendancyList cannot be empty", nameof(list));
 
         //document that the last parent has these as children
         var parent = list.Last();
@@ -1455,7 +1474,7 @@ protected void AddToDictionaries(HashSet<object> children, DescendancyList list)
 
         //now document the entire parent order to reach each child object i.e. 'Root=>Grandparent=>Parent'  is how you get to 'Child'
         foreach (var o in children)
-            _descendancyDictionary.AddOrUpdate(o, list,(k,v)=> HandleDescendancyCollision(k,v,list));
+            _descendancyDictionary.AddOrUpdate(o, list, (k, v) => HandleDescendancyCollision(k, v, list));
 
 
         foreach (var masquerader in children.OfType<IMasqueradeAs>())
@@ -1465,13 +1484,15 @@ protected void AddToDictionaries(HashSet<object> children, DescendancyList list)
             if (!AllMasqueraders.ContainsKey(key))
                 AllMasqueraders.AddOrUpdate(key, new HashSet<IMasqueradeAs>(), (o, set) => set);
 
-            lock(AllMasqueraders)
+            lock (AllMasqueraders)
+            {
                 AllMasqueraders[key].Add(masquerader);
+            }
         }
-
     }
 
-    private static DescendancyList HandleDescendancyCollision(object key, DescendancyList oldRoute, DescendancyList newRoute)
+    private static DescendancyList HandleDescendancyCollision(object key, DescendancyList oldRoute,
+        DescendancyList newRoute)
     {
         //if the new route is the best best
         if (newRoute.NewBestRoute && !oldRoute.NewBestRoute)
@@ -1490,36 +1511,30 @@ private HashSet<object> GetAllObjects()
 
     public virtual object[] GetChildren(object model)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             //if we don't have a record of any children in the child dictionary for the parent model object
             if (!_childDictionary.ContainsKey(model))
             {
                 //if they want the children of a Pipeline (which we don't track) just serve the components
-                if (model is Pipeline p)
-                {
-                    return p.PipelineComponents.ToArray();
-                }
+                if (model is Pipeline p) return p.PipelineComponents.ToArray();
                 //if they want the children of a PipelineComponent (which we don't track) just serve the arguments
-                if (model is PipelineComponent pc)
-                {
-                    return pc.PipelineComponentArguments.ToArray();
-                }
+                if (model is PipelineComponent pc) return pc.PipelineComponentArguments.ToArray();
 
-                return Array.Empty<object>();//return none
+                return Array.Empty<object>(); //return none
             }
 
 
-            return _childDictionary[model].OrderBy(o=>o.ToString()).ToArray();
+            return _childDictionary[model].OrderBy(o => o.ToString()).ToArray();
         }
     }
 
     public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type type, bool unwrapMasqueraders)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             //things that are a match on Type but not IMasqueradeAs
-            var exactMatches = GetAllSearchables().Keys.Where(t=>t is not IMasqueradeAs).Where(type.IsInstanceOfType);
+            var exactMatches = GetAllSearchables().Keys.Where(t => t is not IMasqueradeAs).Where(type.IsInstanceOfType);
 
             //Union the unwrapped masqueraders
             if (unwrapMasqueraders)
@@ -1536,8 +1551,7 @@ public IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type type, bool u
 
     public DescendancyList GetDescendancyListIfAnyFor(object model)
     {
-
-        lock(WriteLock)
+        lock (WriteLock)
         {
             return _descendancyDictionary.TryGetValue(model, out var result) ? result : null;
         }
@@ -1546,7 +1560,7 @@ public DescendancyList GetDescendancyListIfAnyFor(object model)
 
     public object GetRootObjectOrSelf(object objectToEmphasise)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var descendancy = GetDescendancyListIfAnyFor(objectToEmphasise);
 
@@ -1560,12 +1574,12 @@ public object GetRootObjectOrSelf(object objectToEmphasise)
 
     public virtual Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> GetAllSearchables()
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var toReturn = new Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList>();
 
             foreach (var kvp in _descendancyDictionary.Where(kvp => kvp.Key is IMapsDirectlyToDatabaseTable))
-                toReturn.Add((IMapsDirectlyToDatabaseTable) kvp.Key, kvp.Value);
+                toReturn.Add((IMapsDirectlyToDatabaseTable)kvp.Key, kvp.Value);
 
             return toReturn;
         }
@@ -1573,7 +1587,7 @@ public virtual Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> GetAllS
 
     public IEnumerable<object> GetAllChildrenRecursively(object o)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var toReturn = new List<object>();
 
@@ -1594,7 +1608,7 @@ public IEnumerable<object> GetAllChildrenRecursively(object o)
     /// <param name="objectsToAskAbout"></param>
     protected void GetPluginChildren(HashSet<object> objectsToAskAbout = null)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var newObjectsFound = new HashSet<object>();
 
@@ -1603,88 +1617,92 @@ protected void GetPluginChildren(HashSet<object> objectsToAskAbout = null)
             var providers = _pluginChildProviders.Except(_blockedPlugins).ToArray();
 
             //for every object found so far
-            if(providers.Any())
-                foreach (var o in objectsToAskAbout?? GetAllObjects())
-                {
+            if (providers.Any())
+                foreach (var o in objectsToAskAbout ?? GetAllObjects())
                     //for every plugin loaded (that is not forbidlisted)
-                    foreach (var plugin in providers)
+                foreach (var plugin in providers)
+                    //ask about the children
+                    try
                     {
-                        //ask about the children
-                        try
-                        {
-                            sw.Restart();
-                            //otherwise ask plugin what its children are
-                            var pluginChildren = plugin.GetChildren(o);
+                        sw.Restart();
+                        //otherwise ask plugin what its children are
+                        var pluginChildren = plugin.GetChildren(o);
 
-                            //if the plugin takes too long to respond we need to stop
-                            if (sw.ElapsedMilliseconds > 1000)
-                            {
-                                _blockedPlugins.Add(plugin);
-                                throw new Exception(
-                                    $"Plugin '{plugin}' was forbidlisted for taking too long to respond to GetChildren(o) where o was a '{o.GetType().Name}' ('{o}')");
-                            }
+                        //if the plugin takes too long to respond we need to stop
+                        if (sw.ElapsedMilliseconds > 1000)
+                        {
+                            _blockedPlugins.Add(plugin);
+                            throw new Exception(
+                                $"Plugin '{plugin}' was forbidlisted for taking too long to respond to GetChildren(o) where o was a '{o.GetType().Name}' ('{o}')");
+                        }
 
-                            //it has children
-                            if (pluginChildren != null && pluginChildren.Any())
-                            {
-                                //get the descendancy of the parent
-                                var parentDescendancy = GetDescendancyListIfAnyFor(o);
+                        //it has children
+                        if (pluginChildren != null && pluginChildren.Any())
+                        {
+                            //get the descendancy of the parent
+                            var parentDescendancy = GetDescendancyListIfAnyFor(o);
 
-                                var newDescendancy = parentDescendancy == null ? new DescendancyList(new[] {o}) : //if the parent is a root level object start a new descendancy list from it
-                                    parentDescendancy.Add(o); //otherwise keep going down, returns a new DescendancyList so doesn't corrupt the dictionary one
+                            var newDescendancy = parentDescendancy == null
+                                ? new DescendancyList(new[] { o })
+                                : //if the parent is a root level object start a new descendancy list from it
+                                parentDescendancy
+                                    .Add(o); //otherwise keep going down, returns a new DescendancyList so doesn't corrupt the dictionary one
 
-                                //record that
-                                foreach (var pluginChild in pluginChildren)
-                                {
-                                    //if the parent didn't have any children before
-                                    if (!_childDictionary.ContainsKey(o))
-                                        _childDictionary.AddOrUpdate(o,new HashSet<object>(),(o1, set) => set);//it does now
+                            //record that
+                            foreach (var pluginChild in pluginChildren)
+                            {
+                                //if the parent didn't have any children before
+                                if (!_childDictionary.ContainsKey(o))
+                                    _childDictionary.AddOrUpdate(o, new HashSet<object>(),
+                                        (o1, set) => set); //it does now
 
 
-                                    //add us to the parent objects child collection
-                                    _childDictionary[o].Add(pluginChild);
+                                //add us to the parent objects child collection
+                                _childDictionary[o].Add(pluginChild);
 
-                                    //add to the child collection of the parent object kvp.Key
-                                    _descendancyDictionary.AddOrUpdate(pluginChild, newDescendancy,(s,e)=>newDescendancy);
+                                //add to the child collection of the parent object kvp.Key
+                                _descendancyDictionary.AddOrUpdate(pluginChild, newDescendancy,
+                                    (s, e) => newDescendancy);
 
-                                    //we have found a new object so we must ask other plugins about it (chances are a plugin will have a whole tree of sub objects)
-                                    newObjectsFound.Add(pluginChild);
-                                }
+                                //we have found a new object so we must ask other plugins about it (chances are a plugin will have a whole tree of sub objects)
+                                newObjectsFound.Add(pluginChild);
                             }
                         }
-                        catch (Exception e)
-                        {
-                            _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs(e.Message, CheckResult.Fail, e));
-                        }
                     }
-                }
+                    catch (Exception e)
+                    {
+                        _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs(e.Message, CheckResult.Fail, e));
+                    }
 
-            if(newObjectsFound.Any())
+            if (newObjectsFound.Any())
                 GetPluginChildren(newObjectsFound);
         }
     }
 
     public IEnumerable<IMasqueradeAs> GetMasqueradersOf(object o)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
-            return AllMasqueraders.TryGetValue(o,out var result) ?
-                (IEnumerable<IMasqueradeAs>) result:Array.Empty<IMasqueradeAs>();
+            return AllMasqueraders.TryGetValue(o, out var result)
+                ? (IEnumerable<IMasqueradeAs>)result
+                : Array.Empty<IMasqueradeAs>();
         }
     }
 
     protected T[] GetAllObjects<T>(IRepository repository) where T : IMapsDirectlyToDatabaseTable
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             return repository.GetAllObjects<T>();
         }
     }
 
 
-    protected void AddToReturnSearchablesWithNoDecendancy(Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> toReturn, IEnumerable<IMapsDirectlyToDatabaseTable> toAdd)
+    protected void AddToReturnSearchablesWithNoDecendancy(
+        Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> toReturn,
+        IEnumerable<IMapsDirectlyToDatabaseTable> toAdd)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             foreach (var m in toAdd)
                 toReturn.Add(m, null);
@@ -1695,7 +1713,7 @@ public virtual void UpdateTo(ICoreChildProvider other)
     {
         ArgumentNullException.ThrowIfNull(other);
 
-        if(other is not CatalogueChildProvider otherCat)
+        if (other is not CatalogueChildProvider otherCat)
             throw new NotSupportedException(
                 $"Did not know how to UpdateTo ICoreChildProvider of type {other.GetType().Name}");
 
@@ -1712,38 +1730,38 @@ public virtual void UpdateTo(ICoreChildProvider other)
         _childDictionary = otherCat._childDictionary;
         _descendancyDictionary = otherCat._descendancyDictionary;
         _catalogueToCatalogueItems = otherCat._catalogueToCatalogueItems;
-        AllCatalogueItemsDictionary= otherCat.AllCatalogueItemsDictionary;
+        AllCatalogueItemsDictionary = otherCat.AllCatalogueItemsDictionary;
         _allColumnInfos = otherCat._allColumnInfos;
-        AllAggregateConfigurations= otherCat.AllAggregateConfigurations;
-        AllAggregateDimensions= otherCat.AllAggregateDimensions;
+        AllAggregateConfigurations = otherCat.AllAggregateConfigurations;
+        AllAggregateDimensions = otherCat.AllAggregateDimensions;
         AllAggregateContinuousDateAxis = otherCat.AllAggregateContinuousDateAxis;
         AllRDMPRemotesNode = otherCat.AllRDMPRemotesNode;
         AllRemoteRDMPs = otherCat.AllRemoteRDMPs;
         AllDashboardsNode = otherCat.AllDashboardsNode;
         AllDashboards = otherCat.AllDashboards;
-        AllObjectSharingNode= otherCat.AllObjectSharingNode;
+        AllObjectSharingNode = otherCat.AllObjectSharingNode;
         AllImports = otherCat.AllImports;
         AllExports = otherCat.AllExports;
-        AllStandardRegexesNode= otherCat.AllStandardRegexesNode;
-        AllPipelinesNode= otherCat.AllPipelinesNode;
+        AllStandardRegexesNode = otherCat.AllStandardRegexesNode;
+        AllPipelinesNode = otherCat.AllPipelinesNode;
         OtherPipelinesNode = otherCat.OtherPipelinesNode;
         AllPipelines = otherCat.AllPipelines;
         AllPipelineComponents = otherCat.AllPipelineComponents;
         AllPipelineComponentsArguments = otherCat.AllPipelineComponentsArguments;
         AllStandardRegexes = otherCat.AllStandardRegexes;
-        AllANOTablesNode= otherCat.AllANOTablesNode;
+        AllANOTablesNode = otherCat.AllANOTablesNode;
         AllANOTables = otherCat.AllANOTables;
-        AllExternalServers= otherCat.AllExternalServers;
+        AllExternalServers = otherCat.AllExternalServers;
         AllServers = otherCat.AllServers;
         AllTableInfos = otherCat.AllTableInfos;
         AllDataAccessCredentialsNode = otherCat.AllDataAccessCredentialsNode;
-        AllExternalServersNode= otherCat.AllExternalServersNode;
-        AllServersNode= otherCat.AllServersNode;
+        AllExternalServersNode = otherCat.AllExternalServersNode;
+        AllServersNode = otherCat.AllServersNode;
         AllDataAccessCredentials = otherCat.AllDataAccessCredentials;
         AllDataAccessCredentialUsages = otherCat.AllDataAccessCredentialUsages;
         TableInfosToColumnInfos = otherCat.TableInfosToColumnInfos;
-        AllColumnInfos= otherCat.AllColumnInfos;
-        AllPreLoadDiscardedColumns= otherCat.AllPreLoadDiscardedColumns;
+        AllColumnInfos = otherCat.AllColumnInfos;
+        AllPreLoadDiscardedColumns = otherCat.AllPreLoadDiscardedColumns;
         AllLookups = otherCat.AllLookups;
         AllJoinInfos = otherCat.AllJoinInfos;
         AllAnyTableParameters = otherCat.AllAnyTableParameters;
@@ -1776,7 +1794,7 @@ public virtual void UpdateTo(ICoreChildProvider other)
         TemplateAggregateConfigurationsNode = otherCat.TemplateAggregateConfigurationsNode;
         AllCatalogueParameters = otherCat.AllCatalogueParameters;
         AllCatalogueValueSets = otherCat.AllCatalogueValueSets;
-        AllCatalogueValueSetValues = otherCat.AllCatalogueValueSetValues ;
+        AllCatalogueValueSetValues = otherCat.AllCatalogueValueSetValues;
         OrphanAggregateConfigurations = otherCat.OrphanAggregateConfigurations;
     }
 
@@ -1823,10 +1841,7 @@ public bool SelectiveRefresh(ExtractionInformation ei)
 
         FetchCatalogueItems();
 
-        foreach(var ci in AllCatalogueItems.Where(ci=>ci.ID == ei.CatalogueItem_ID))
-        {
-            ci.ClearAllInjections();
-        }
+        foreach (var ci in AllCatalogueItems.Where(ci => ci.ID == ei.CatalogueItem_ID)) ci.ClearAllInjections();
 
         // property changes or deleting the ExtractionInformation
         FetchExtractionInformations();
@@ -1835,14 +1850,15 @@ public bool SelectiveRefresh(ExtractionInformation ei)
         AddChildren(cata, cataDescendancy.Add(cata));
         return true;
     }
+
     public bool SelectiveRefresh(CohortAggregateContainer container)
     {
         var parentContainer = container.GetParentContainerIfAny();
-        if(parentContainer != null)
+        if (parentContainer != null)
         {
             var descendancy = GetDescendancyListIfAnyFor(parentContainer);
 
-            if(descendancy != null)
+            if (descendancy != null)
             {
                 BuildAggregateConfigurations();
 
@@ -1862,13 +1878,14 @@ public bool SelectiveRefresh(CohortAggregateContainer container)
             {
                 BuildAggregateConfigurations();
                 BuildCohortCohortAggregateContainers();
-                AddChildren(cic,descendancy.Add(cic));
+                AddChildren(cic, descendancy.Add(cic));
                 return true;
             }
         }
 
         return false;
     }
+
     public bool SelectiveRefresh(AggregateFilter f)
     {
         var knownContainer = GetDescendancyListIfAnyFor(f.FilterContainer);
@@ -1877,16 +1894,13 @@ public bool SelectiveRefresh(AggregateFilter f)
         BuildAggregateFilterContainers();
         AddChildren((AggregateFilterContainer)f.FilterContainer, knownContainer.Add(f.FilterContainer));
         return true;
-
     }
+
     public bool SelectiveRefresh(AggregateFilterContainer container)
     {
         var aggregate = container.GetAggregate();
 
-        if(aggregate == null)
-        {
-            return false;
-        }
+        if (aggregate == null) return false;
 
         var descendancy = GetDescendancyListIfAnyFor(aggregate);
 
diff --git a/Rdmp.Core/Providers/CatalogueProblemProvider.cs b/Rdmp.Core/Providers/CatalogueProblemProvider.cs
index 956d8e32bc..081b996a13 100644
--- a/Rdmp.Core/Providers/CatalogueProblemProvider.cs
+++ b/Rdmp.Core/Providers/CatalogueProblemProvider.cs
@@ -44,13 +44,13 @@ public override void RefreshProblems(ICoreChildProvider childProvider)
 
         //Take all the catalogue items which DON'T have an associated ColumnInfo (should hopefully be quite rare)
         var orphans = _childProvider.AllCatalogueItems.Where(ci => ci.ColumnInfo_ID == null);
-            
+
         //now identify those which have an ExtractionInformation (that's a problem! they are extractable but orphaned)
         _orphanCatalogueItems = new HashSet<int>(
             orphans.Where(o => _childProvider.AllExtractionInformations.Any(ei => ei.CatalogueItem_ID == o.ID))
 
                 //store just the ID for performance
-                .Select(i=>i.ID));
+                .Select(i => i.ID));
 
         _usedJoinables = new HashSet<int>(
             childProvider.AllJoinableCohortAggregateConfigurationUse.Select(
@@ -109,7 +109,7 @@ public static string DescribeProblem(AllCataloguesUsedByLoadMetadataNode allCata
     {
         if (!allCataloguesUsedByLoadMetadataNode.UsedCatalogues.Any())
             return "Load has no Catalogues therefore loads no tables";
-            
+
         return null;
     }
 
@@ -126,10 +126,7 @@ public string DescribeProblem(ISqlParameter parameter)
             if (desc != null && parameter is ExtractionFilterParameter)
             {
                 var filter = desc.Parents.OfType<ExtractionFilter>().FirstOrDefault();
-                if (filter != null && filter.ExtractionFilterParameterSets.Any())
-                {
-                    return null;
-                }
+                if (filter != null && filter.ExtractionFilterParameterSets.Any()) return null;
             }
 
             return "No value defined";
@@ -138,21 +135,17 @@ public string DescribeProblem(ISqlParameter parameter)
         var v = parameter.Value;
 
         var g = new Guesser();
-                
-        if(Culture != null)
+
+        if (Culture != null)
             g.Culture = Culture;
 
         g.AdjustToCompensateForValue(v);
 
         // if user has entered a date as the value
         if (g.Guess.CSharpType == typeof(DateTime))
-        {
             // and there are no delimiters
-            if(v.All(c=>c != '\'' && c != '"'))
-            {
+            if (v.All(c => c != '\'' && c != '"'))
                 return "Parameter value looks like a date but is not surrounded by quotes";
-            }
-        }
 
         return null;
     }
@@ -171,10 +164,9 @@ public string DescribeProblem(AggregateConfiguration aggregateConfiguration)
             if (!_usedJoinables.Contains(aggregateConfiguration.JoinableCohortAggregateConfiguration.ID))
                 return "Patient Index Table is not joined to any cohort sets";
 
-        if(!aggregateConfiguration.Catalogue.IsApiCall() && !aggregateConfiguration.AggregateDimensions.Any())
-        {
-            return "Aggregate has no dimensions.  Set an AggregateDimension to specify which column is fetched by the query.";
-        }
+        if (!aggregateConfiguration.Catalogue.IsApiCall() && !aggregateConfiguration.AggregateDimensions.Any())
+            return
+                "Aggregate has no dimensions.  Set an AggregateDimension to specify which column is fetched by the query.";
 
         return null;
     }
@@ -224,7 +216,8 @@ private string DescribeProblem(AllGovernanceNode allGovernanceNode)
                     expiredCatalogueIds.Remove(i);
         }
 
-        var expiredCatalogues = expiredCatalogueIds.Select(id => _childProvider.AllCataloguesDictionary[id]).Where(c => !c.IsDeprecated /* || c.IsColdStorage || c.IsInternal*/).ToArray();
+        var expiredCatalogues = expiredCatalogueIds.Select(id => _childProvider.AllCataloguesDictionary[id])
+            .Where(c => !c.IsDeprecated /* || c.IsColdStorage || c.IsInternal*/).ToArray();
 
         if (expiredCatalogues.Any())
             return
@@ -248,13 +241,15 @@ private string DescribeProblem(ExtractionInformation extractionInformation)
 
             if (catalogue.IsProjectSpecific(null))
             {
-                if(extractionInformation.ExtractionCategory != ExtractionCategory.ProjectSpecific)
+                if (extractionInformation.ExtractionCategory != ExtractionCategory.ProjectSpecific)
                     return
                         $"Catalogue {catalogue} is Project Specific Catalogue so all ExtractionCategory should be {ExtractionCategory.ProjectSpecific}";
             }
-            else if( extractionInformation.ExtractionCategory == ExtractionCategory.ProjectSpecific)
+            else if (extractionInformation.ExtractionCategory == ExtractionCategory.ProjectSpecific)
+            {
                 return
                     $"ExtractionCategory is only valid when the Catalogue ('{catalogue}') is also ProjectSpecific";
+            }
         }
 
         return null;
@@ -288,23 +283,22 @@ public string DescribeProblem(CohortAggregateContainer container)
         // Make sure if the user has the default configuration (Root, Inclusion, Exclusion) that they do not mess up the ordering and get very confused
 
         // if the container is inclusion make sure the user hasn't reordered the container to make it act as exclusion instead!
-        if (container.Name?.Contains(ExecuteCommandCreateNewCohortIdentificationConfiguration.InclusionCriteriaName) ?? false)
+        if (container.Name?.Contains(ExecuteCommandCreateNewCohortIdentificationConfiguration.InclusionCriteriaName) ??
+            false)
         {
             // if there is a parent container
             var parents = _childProvider.GetDescendancyListIfAnyFor(container);
             if (parents != null && parents.Last() is CohortAggregateContainer parentContainer)
-            {
                 // which is EXCEPT
                 if (parentContainer.Operation == SetOperation.EXCEPT)
                 {
                     // then something called 'inclusion criteria' should be the first among them
-                    var first = _childProvider.GetChildren(parentContainer).OfType<IOrderable>().OrderBy(o => o.Order).FirstOrDefault();
+                    var first = _childProvider.GetChildren(parentContainer).OfType<IOrderable>().OrderBy(o => o.Order)
+                        .FirstOrDefault();
                     if (first != null && !first.Equals(container))
-                    {
-                        return $"{container.Name} must be the first container in the parent set.  Please re-order it to be the first";
-                    }
+                        return
+                            $"{container.Name} must be the first container in the parent set.  Please re-order it to be the first";
                 }
-            }
         }
 
         //count children that are not disabled
@@ -325,8 +319,10 @@ public string DescribeProblem(CohortAggregateContainer container)
                 return "You must have at least one element in the root container";
 
             //Excepts and Intersects must have at least 2
-            if (enabledChildren.Length < 2 && (container.Operation == SetOperation.EXCEPT || container.Operation == SetOperation.INTERSECT))
-                return "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required";
+            if (enabledChildren.Length < 2 && (container.Operation == SetOperation.EXCEPT ||
+                                               container.Operation == SetOperation.INTERSECT))
+                return
+                    "EXCEPT/INTERSECT containers must have at least two elements within. Either Add a Catalogue or Disable/Delete this container if not required";
         }
         else
         {
@@ -334,11 +330,13 @@ public string DescribeProblem(CohortAggregateContainer container)
             {
                 //if it's not a root, then there should be at least 2
                 if (enabledChildren.Length == 0)
-                    return "SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required";
+                    return
+                        "SET containers cannot be empty. Either Add a Catalogue or Disable/Delete this container if not required";
 
 
                 if (enabledChildren.Length == 1)
-                    return "SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required";
+                    return
+                        "SET containers have no effect if there is only one child within. Either Add a Catalogue or Disable/Delete this container if not required";
             }
         }
 
diff --git a/Rdmp.Core/Providers/DataExportChildProvider.cs b/Rdmp.Core/Providers/DataExportChildProvider.cs
index dd2418773f..e40a51084b 100644
--- a/Rdmp.Core/Providers/DataExportChildProvider.cs
+++ b/Rdmp.Core/Providers/DataExportChildProvider.cs
@@ -47,14 +47,14 @@ public class DataExportChildProvider : CatalogueChildProvider
     public ExtractableDataSet[] ExtractableDataSets { get; private set; }
 
     public SelectedDataSets[] SelectedDataSets { get; private set; }
-    public Dictionary<int,ExtractionProgress> _extractionProgressesBySelectedDataSetID { get; private set; }
+    public Dictionary<int, ExtractionProgress> _extractionProgressesBySelectedDataSetID { get; private set; }
 
     public ExtractableDataSetPackage[] AllPackages { get; set; }
 
-    public FolderNode<Project> ProjectRootFolder { get; private set;}
+    public FolderNode<Project> ProjectRootFolder { get; private set; }
     public Project[] Projects { get; set; }
 
-    private Dictionary<int,HashSet<ExtractableCohort>> _cohortsByOriginId;
+    private Dictionary<int, HashSet<ExtractableCohort>> _cohortsByOriginId;
     public ExtractableCohort[] Cohorts { get; private set; }
 
     public ExtractionConfiguration[] ExtractionConfigurations { get; private set; }
@@ -65,12 +65,14 @@ public class DataExportChildProvider : CatalogueChildProvider
 
     public List<ExternalCohortTable> ForbidListedSources { get; private set; }
 
-    public List<IObjectUsedByOtherObjectNode<Project,IMapsDirectlyToDatabaseTable>> DuplicatesByProject = new();
-    public List<IObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode>> DuplicatesByCohortSourceUsedByProjectNode = new();
+    public List<IObjectUsedByOtherObjectNode<Project, IMapsDirectlyToDatabaseTable>> DuplicatesByProject = new();
+
+    public List<IObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode>> DuplicatesByCohortSourceUsedByProjectNode =
+        new();
 
 
     private readonly object _oProjectNumberToCohortsDictionary = new();
-    public Dictionary<int,List<ExtractableCohort>> ProjectNumberToCohortsDictionary = new();
+    public Dictionary<int, List<ExtractableCohort>> ProjectNumberToCohortsDictionary = new();
 
     public ProjectCohortIdentificationConfigurationAssociation[] AllProjectAssociatedCics;
 
@@ -92,19 +94,25 @@ public class DataExportChildProvider : CatalogueChildProvider
     /// All data export filters that existed when this child provider was constructed
     /// </summary>
     public DeployedExtractionFilter[] AllDeployedExtractionFilters { get; private set; }
+
     private DeployedExtractionFilterParameter[] _allParameters;
 
     private IDataExportRepository dataExportRepository;
 
-    public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IChildProvider[] pluginChildProviders,ICheckNotifier errorsCheckNotifier, DataExportChildProvider previousStateIfKnown) : base(repositoryLocator.CatalogueRepository, pluginChildProviders,errorsCheckNotifier,previousStateIfKnown)
+    public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier,
+        DataExportChildProvider previousStateIfKnown) : base(repositoryLocator.CatalogueRepository,
+        pluginChildProviders, errorsCheckNotifier, previousStateIfKnown)
     {
         ForbidListedSources = previousStateIfKnown?.ForbidListedSources ?? new List<ExternalCohortTable>();
         _errorsCheckNotifier = errorsCheckNotifier;
         dataExportRepository = repositoryLocator.DataExportRepository;
 
-        AllProjectAssociatedCics = GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>(dataExportRepository);
+        AllProjectAssociatedCics =
+            GetAllObjects<ProjectCohortIdentificationConfigurationAssociation>(dataExportRepository);
 
-        _cicAssociations = new HashSet<int>(AllProjectAssociatedCics.Select(a => a.CohortIdentificationConfiguration_ID));
+        _cicAssociations =
+            new HashSet<int>(AllProjectAssociatedCics.Select(a => a.CohortIdentificationConfiguration_ID));
 
         CohortSources = GetAllObjects<ExternalCohortTable>(dataExportRepository);
         ExtractableDataSets = GetAllObjects<ExtractableDataSet>(dataExportRepository);
@@ -112,37 +120,38 @@ public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryL
         //This means that the ToString method in ExtractableDataSet doesn't need to go lookup catalogue info
         var catalogueIdDict = AllCatalogues.ToDictionaryEx(c => c.ID, c2 => c2);
         foreach (var ds in ExtractableDataSets)
-            if(catalogueIdDict.TryGetValue(ds.Catalogue_ID, out var cata))
+            if (catalogueIdDict.TryGetValue(ds.Catalogue_ID, out var cata))
                 ds.InjectKnown(cata);
-             
+
         ReportProgress("Injecting ExtractableDataSet");
-            
+
         AllPackages = GetAllObjects<ExtractableDataSetPackage>(dataExportRepository);
-            
+
         Projects = GetAllObjects<Project>(dataExportRepository);
         ExtractionConfigurations = GetAllObjects<ExtractionConfiguration>(dataExportRepository);
-                        
+
         ReportProgress("Get Projects and Configurations");
 
-        ExtractionConfigurationsByProject = ExtractionConfigurations.GroupBy(k => k.Project_ID).ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
+        ExtractionConfigurationsByProject = ExtractionConfigurations.GroupBy(k => k.Project_ID)
+            .ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
 
         ReportProgress("Grouping Extractions by Project");
 
         BuildSelectedDatasets();
 
         AllGlobalExtractionFilterParameters = GetAllObjects<GlobalExtractionFilterParameter>(dataExportRepository);
-                        
+
         BuildExtractionFilters();
-             
+
         ReportProgress("Building FilterManager");
 
         Cohorts = GetAllObjects<ExtractableCohort>(dataExportRepository);
-        _cohortsByOriginId = new Dictionary<int,HashSet<ExtractableCohort>>();
+        _cohortsByOriginId = new Dictionary<int, HashSet<ExtractableCohort>>();
 
         foreach (var c in Cohorts)
         {
-            if(!_cohortsByOriginId.ContainsKey(c.OriginID))
-                _cohortsByOriginId.Add(c.OriginID,new HashSet<ExtractableCohort>());
+            if (!_cohortsByOriginId.ContainsKey(c.OriginID))
+                _cohortsByOriginId.Add(c.OriginID, new HashSet<ExtractableCohort>());
 
             _cohortsByOriginId[c.OriginID].Add(c);
         }
@@ -153,25 +162,25 @@ public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryL
         GetCohortAvailability();
 
         ReportProgress("GetCohortAvailability");
-            
-            
+
+
         ReportProgress("Mapping configurations to datasets");
 
         RootCohortsNode = new AllCohortsNode();
-        AddChildren(RootCohortsNode,new DescendancyList(RootCohortsNode));
+        AddChildren(RootCohortsNode, new DescendancyList(RootCohortsNode));
 
         foreach (var package in AllPackages)
             AddChildren(package, new DescendancyList(package));
-            
+
         ReportProgress("Packages and Cohorts");
 
         ProjectRootFolder = FolderHelper.BuildFolderTree(Projects);
         AddChildren(ProjectRootFolder, new DescendancyList(ProjectRootFolder));
-            
+
         ReportProgress("Projects");
 
         //work out all the Catalogues that are extractable (Catalogues are extractable if there is an ExtractableDataSet with the Catalogue_ID that matches them)
-        var cataToEds = new Dictionary<int,ExtractableDataSet>(ExtractableDataSets.ToDictionary(k => k.Catalogue_ID));
+        var cataToEds = new Dictionary<int, ExtractableDataSet>(ExtractableDataSets.ToDictionary(k => k.Catalogue_ID));
 
         //inject extractability into Catalogues
         foreach (var catalogue in AllCatalogues)
@@ -185,17 +194,21 @@ public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryL
         {
             AddPipelineUseCases(new Dictionary<string, PipelineUseCase>
             {
-                {"File Import", UploadFileUseCase.DesignTime()},
-                {"Extraction",ExtractionPipelineUseCase.DesignTime()},
-                {"Release",ReleaseUseCase.DesignTime()},
-                {"Cohort Creation",CohortCreationRequest.DesignTime()},
-                {"Caching",CachingPipelineUseCase.DesignTime()},
-                {"Aggregate Committing",CreateTableFromAggregateUseCase.DesignTime(repositoryLocator.CatalogueRepository)}
+                { "File Import", UploadFileUseCase.DesignTime() },
+                { "Extraction", ExtractionPipelineUseCase.DesignTime() },
+                { "Release", ReleaseUseCase.DesignTime() },
+                { "Cohort Creation", CohortCreationRequest.DesignTime() },
+                { "Caching", CachingPipelineUseCase.DesignTime() },
+                {
+                    "Aggregate Committing",
+                    CreateTableFromAggregateUseCase.DesignTime(repositoryLocator.CatalogueRepository)
+                }
             });
         }
         catch (Exception ex)
         {
-            _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs("Failed to build DesignTime PipelineUseCases",CheckResult.Fail,ex));
+            _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs("Failed to build DesignTime PipelineUseCases",
+                CheckResult.Fail, ex));
         }
 
         ReportProgress("Pipeline adding");
@@ -207,16 +220,11 @@ public DataExportChildProvider(IRDMPPlatformRepositoryServiceLocator repositoryL
     private void AddChildren(FolderNode<Project> folder, DescendancyList descendancy)
     {
         foreach (var child in folder.ChildFolders)
-        {
             //add subfolder children
             AddChildren(child, descendancy.Add(child));
-        }
 
         //add catalogues in folder
-        foreach (var project in folder.ChildObjects)
-        {
-            AddChildren(project, descendancy.Add(project));
-        }
+        foreach (var project in folder.ChildObjects) AddChildren(project, descendancy.Add(project));
 
         // Children are the folders + objects
         AddToDictionaries(new HashSet<object>(
@@ -227,12 +235,14 @@ private void AddChildren(FolderNode<Project> folder, DescendancyList descendancy
 
     private void BuildSelectedDatasets()
     {
-        _selectedDataSetsWithNoIsExtractionIdentifier = new HashSet<ISelectedDataSets>(dataExportRepository.GetSelectedDatasetsWithNoExtractionIdentifiers());
+        _selectedDataSetsWithNoIsExtractionIdentifier =
+            new HashSet<ISelectedDataSets>(dataExportRepository.GetSelectedDatasetsWithNoExtractionIdentifiers());
 
         SelectedDataSets = GetAllObjects<SelectedDataSets>(dataExportRepository);
         ReportProgress("Fetching data export objects");
 
-        _extractionProgressesBySelectedDataSetID = GetAllObjects<ExtractionProgress>(dataExportRepository).ToDictionaryEx(ds => ds.SelectedDataSets_ID, d => d);
+        _extractionProgressesBySelectedDataSetID = GetAllObjects<ExtractionProgress>(dataExportRepository)
+            .ToDictionaryEx(ds => ds.SelectedDataSets_ID, d => d);
 
         var dsDictionary = ExtractableDataSets.ToDictionaryEx(ds => ds.ID, d => d);
         foreach (var s in SelectedDataSets)
@@ -242,7 +252,8 @@ private void BuildSelectedDatasets()
 
         _configurationToDatasetMapping = new Dictionary<IExtractionConfiguration, List<SelectedDataSets>>();
 
-        var configToSds = SelectedDataSets.GroupBy(k => k.ExtractionConfiguration_ID).ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
+        var configToSds = SelectedDataSets.GroupBy(k => k.ExtractionConfiguration_ID)
+            .ToDictionaryEx(gdc => gdc.Key, gdc => gdc.ToList());
 
         foreach (var configuration in ExtractionConfigurations)
             if (configToSds.TryGetValue(configuration.ID, out var result))
@@ -270,7 +281,6 @@ private void AddChildren(IExtractableDataSetPackage package, DescendancyList des
             .Select(ds => new PackageContentNode(package, ds, dataExportRepository)));
 
         AddToDictionaries(children, descendancy);
-
     }
 
     private void AddChildren(Project project, DescendancyList descendancy)
@@ -279,7 +289,7 @@ private void AddChildren(Project project, DescendancyList descendancy)
 
         var projectCohortNode = new ProjectCohortsNode(project);
         children.Add(projectCohortNode);
-        AddChildren(projectCohortNode,descendancy.Add(projectCohortNode));
+        AddChildren(projectCohortNode, descendancy.Add(projectCohortNode));
 
         var projectCataloguesNode = new ProjectCataloguesNode(project);
         children.Add(projectCataloguesNode);
@@ -288,31 +298,30 @@ private void AddChildren(Project project, DescendancyList descendancy)
         var extractionConfigurationsNode = new ExtractionConfigurationsNode(project);
         children.Add(extractionConfigurationsNode);
 
-        AddChildren(extractionConfigurationsNode,descendancy.Add(extractionConfigurationsNode));
+        AddChildren(extractionConfigurationsNode, descendancy.Add(extractionConfigurationsNode));
 
         var folder = new ExtractionDirectoryNode(project);
         children.Add(folder);
-        AddToDictionaries(children,descendancy);
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(ProjectCataloguesNode projectCataloguesNode, DescendancyList descendancy)
     {
         var children = new HashSet<object>();
 
-        foreach (var projectSpecificEds in ExtractableDataSets.Where(eds=>eds.Project_ID == projectCataloguesNode.Project.ID))
+        foreach (var projectSpecificEds in ExtractableDataSets.Where(eds =>
+                     eds.Project_ID == projectCataloguesNode.Project.ID))
         {
-
             var cata = (Catalogue)projectSpecificEds.Catalogue;
 
             // cata will be null if it has been deleted from the database
-            if(cata != null)
+            if (cata != null)
             {
                 children.Add(cata);
                 AddChildren(cata, descendancy.Add(projectSpecificEds.Catalogue));
             }
-
         }
-            
+
         AddToDictionaries(children, descendancy);
     }
 
@@ -345,19 +354,25 @@ private void AddChildren(ProjectSavedCohortsNode savedCohortsNode, DescendancyLi
         AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(ProjectCohortIdentificationConfigurationAssociationsNode projectCiCsNode, DescendancyList descendancy)
+    private void AddChildren(ProjectCohortIdentificationConfigurationAssociationsNode projectCiCsNode,
+        DescendancyList descendancy)
     {
         //add the associations
         var children = new HashSet<object>();
-        foreach (var association in AllProjectAssociatedCics.Where(assoc => assoc.Project_ID == projectCiCsNode.Project.ID))
+        foreach (var association in AllProjectAssociatedCics.Where(assoc =>
+                     assoc.Project_ID == projectCiCsNode.Project.ID))
         {
-
-            var matchingCic = AllCohortIdentificationConfigurations.SingleOrDefault(cic => cic.ID == association.CohortIdentificationConfiguration_ID);
+            var matchingCic = AllCohortIdentificationConfigurations.SingleOrDefault(cic =>
+                cic.ID == association.CohortIdentificationConfiguration_ID);
 
             if (matchingCic == null)
+            {
                 _errorsCheckNotifier.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Failed to find Associated Cohort Identification Configuration with ID {association.CohortIdentificationConfiguration_ID} which was supposed to be associated with {association.Project}", CheckResult.Fail));//inject knowledge of what the cic is so it doesn't have to be fetched during ToString
+                        $"Failed to find Associated Cohort Identification Configuration with ID {association.CohortIdentificationConfiguration_ID} which was supposed to be associated with {association.Project}",
+                        CheckResult
+                            .Fail)); //inject knowledge of what the cic is so it doesn't have to be fetched during ToString
+            }
             else
             {
                 association.InjectKnown(matchingCic);
@@ -381,11 +396,11 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
         children.Add(frozenConfigurationsNode);
 
         //Add children to the frozen folder
-        AddChildren(frozenConfigurationsNode,descendancy.Add(frozenConfigurationsNode));
+        AddChildren(frozenConfigurationsNode, descendancy.Add(frozenConfigurationsNode));
 
         //Add ExtractionConfigurations which are not released (frozen)
-        if(ExtractionConfigurationsByProject.TryGetValue(extractionConfigurationsNode.Project.ID, out var result))
-            foreach (var config in result.Where(c=>!c.IsReleased))
+        if (ExtractionConfigurationsByProject.TryGetValue(extractionConfigurationsNode.Project.ID, out var result))
+            foreach (var config in result.Where(c => !c.IsReleased))
             {
                 AddChildren(config, descendancy.Add(config));
                 children.Add(config);
@@ -394,29 +409,32 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
         AddToDictionaries(children, descendancy);
     }
 
-    private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConfigurationsNode, DescendancyList descendancy)
+    private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConfigurationsNode,
+        DescendancyList descendancy)
     {
         var children = new HashSet<object>();
 
         //Add ExtractionConfigurations which are not released (frozen)
-        if(ExtractionConfigurationsByProject.TryGetValue(frozenExtractionConfigurationsNode.Project.ID, out var result))
+        if (ExtractionConfigurationsByProject.TryGetValue(frozenExtractionConfigurationsNode.Project.ID,
+                out var result))
             foreach (var config in result.Where(c => c.IsReleased))
             {
                 AddChildren(config, descendancy.Add(config));
                 children.Add(config);
             }
 
-        AddToDictionaries(children,descendancy);
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(IExtractionConfiguration extractionConfiguration, DescendancyList descendancy)
     {
         var children = new HashSet<object>();
 
-        var parameters = AllGlobalExtractionFilterParameters.Where(p => p.ExtractionConfiguration_ID == extractionConfiguration.ID)
+        var parameters = AllGlobalExtractionFilterParameters
+            .Where(p => p.ExtractionConfiguration_ID == extractionConfiguration.ID)
             .ToArray();
 
-        foreach(var p in parameters)
+        foreach (var p in parameters)
             children.Add(p);
 
         //if it has a cohort
@@ -430,11 +448,10 @@ private void AddChildren(IExtractionConfiguration extractionConfiguration, Desce
         foreach (var ds in GetDatasets(extractionConfiguration))
         {
             children.Add(ds);
-            AddChildren(ds,descendancy.Add(ds));
+            AddChildren(ds, descendancy.Add(ds));
         }
-            
-        AddToDictionaries(children,descendancy);
-            
+
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(SelectedDataSets selectedDataSets, DescendancyList descendancy)
@@ -442,16 +459,14 @@ private void AddChildren(SelectedDataSets selectedDataSets, DescendancyList desc
         var children = new HashSet<object>();
 
         if (_extractionProgressesBySelectedDataSetID.TryGetValue(selectedDataSets.ID, out var value))
-        {
             children.Add(value);
-        }
 
         if (selectedDataSets.RootFilterContainer_ID != null)
         {
             var rootContainer = AllContainers[selectedDataSets.RootFilterContainer_ID.Value];
             children.Add(rootContainer);
 
-            AddChildren(rootContainer,descendancy.Add(rootContainer));
+            AddChildren(rootContainer, descendancy.Add(rootContainer));
         }
 
         AddToDictionaries(children, descendancy);
@@ -464,28 +479,29 @@ private void AddChildren(FilterContainer filterContainer, DescendancyList descen
 
         foreach (FilterContainer subcontainer in _dataExportFilterManager.GetSubContainers(filterContainer))
         {
-            AddChildren(subcontainer,descendancy.Add(subcontainer));
+            AddChildren(subcontainer, descendancy.Add(subcontainer));
             children.Add(subcontainer);
         }
 
         foreach (DeployedExtractionFilter filter in _dataExportFilterManager.GetFilters(filterContainer))
         {
-            AddChildren(filter,descendancy.Add(filter));
+            AddChildren(filter, descendancy.Add(filter));
             children.Add(filter);
         }
-                
 
-        AddToDictionaries(children,descendancy);
+
+        AddToDictionaries(children, descendancy);
     }
 
     private void AddChildren(DeployedExtractionFilter filter, DescendancyList descendancyList)
     {
-        AddToDictionaries(new HashSet<object>(_allParameters.Where(p => p.ExtractionFilter_ID == filter.ID)),descendancyList);
+        AddToDictionaries(new HashSet<object>(_allParameters.Where(p => p.ExtractionFilter_ID == filter.ID)),
+            descendancyList);
     }
 
     private void AddChildren(CohortSourceUsedByProjectNode cohortSourceUsedByProjectNode, DescendancyList descendancy)
     {
-        AddToDictionaries(new HashSet<object>(cohortSourceUsedByProjectNode.CohortsUsed),descendancy);
+        AddToDictionaries(new HashSet<object>(cohortSourceUsedByProjectNode.CohortsUsed), descendancy);
     }
 
     private void AddChildren(AllCohortsNode cohortsNode, DescendancyList descendancy)
@@ -500,7 +516,7 @@ private void AddChildren(AllCohortsNode cohortsNode, DescendancyList descendancy
     private void AddChildren(ExternalCohortTable externalCohortTable, DescendancyList descendancy)
     {
         var cohorts = Cohorts.Where(c => c.ExternalCohortTable_ID == externalCohortTable.ID).ToArray();
-            
+
         foreach (var cohort in cohorts)
             cohort.InjectKnown(externalCohortTable);
 
@@ -521,7 +537,7 @@ private void GetCohortAvailability(ExternalCohortTable source)
         //it obviously hasn't been initialised properly yet
         if (string.IsNullOrWhiteSpace(source.Server) || string.IsNullOrWhiteSpace(source.Database))
             return;
-            
+
         try
         {
             server = DataAccessPortal.ExpectDatabase(source, DataAccessContext.DataExport).Server;
@@ -533,7 +549,7 @@ private void GetCohortAvailability(ExternalCohortTable source)
 
         if (server == null || !server.RespondsWithinTime(3, out ex) || !source.IsFullyPopulated())
         {
-            ForbidList(source,ex);
+            ForbidList(source, ex);
             return;
         }
 
@@ -551,12 +567,10 @@ private void GetCohortAvailability(ExternalCohortTable source)
                     using (var r = cmd.ExecuteReader())
                     {
                         while (r.Read())
-                        {
                             //really should be only one here but still they might for some reason have 2 references to the same external cohort
-
-                            if(_cohortsByOriginId.TryGetValue(Convert.ToInt32(r["OriginID"]),out var result))
+                            if (_cohortsByOriginId.TryGetValue(Convert.ToInt32(r["OriginID"]), out var result))
                                 //Tell the cohorts what their external data values are so they don't have to fetch them themselves individually
-                                foreach (var c in result.Where(c=> c.ExternalCohortTable_ID == source.ID))
+                                foreach (var c in result.Where(c => c.ExternalCohortTable_ID == source.ID))
                                 {
                                     //load external data from the result set
                                     var externalData = new ExternalCohortDefinitionData(r, source.Name);
@@ -567,20 +581,21 @@ private void GetCohortAvailability(ExternalCohortTable source)
                                     lock (_oProjectNumberToCohortsDictionary)
                                     {
                                         //for performance also keep a dictionary of project number => compatible cohorts
-                                        if (!ProjectNumberToCohortsDictionary.ContainsKey(externalData.ExternalProjectNumber))
-                                            ProjectNumberToCohortsDictionary.Add(externalData.ExternalProjectNumber, new List<ExtractableCohort>());
+                                        if (!ProjectNumberToCohortsDictionary.ContainsKey(externalData
+                                                .ExternalProjectNumber))
+                                            ProjectNumberToCohortsDictionary.Add(externalData.ExternalProjectNumber,
+                                                new List<ExtractableCohort>());
 
                                         ProjectNumberToCohortsDictionary[externalData.ExternalProjectNumber].Add(c);
                                     }
                                 }
-                        }
                     }
                 }
             }
         }
         catch (Exception e)
         {
-            ForbidList(source,e);
+            ForbidList(source, e);
         }
     }
 
@@ -591,12 +606,12 @@ private void GetCohortAvailability(ExternalCohortTable source)
     /// </summary>
     /// <param name="source"></param>
     /// <param name="ex"></param>
-    private void ForbidList(ExternalCohortTable source,Exception ex)
+    private void ForbidList(ExternalCohortTable source, Exception ex)
     {
         ForbidListedSources.Add(source);
 
         // notify being unable to reach cohorts unless user has supressed this
-        if(UserSettings.GetErrorReportingLevelFor(ErrorCodes.CouldNotReachCohort) != CheckResult.Success)
+        if (UserSettings.GetErrorReportingLevelFor(ErrorCodes.CouldNotReachCohort) != CheckResult.Success)
             _errorsCheckNotifier.OnCheckPerformed(new CheckEventArgs(ErrorCodes.CouldNotReachCohort, ex, source));
 
         //tell them not to bother looking for the cohort data because its inaccessible
@@ -635,7 +650,8 @@ public List<CohortSourceUsedByProjectNode> GetAllCohortProjectUsageNodesFor(Proj
             }
 
             //add the cohort to the list of known cohorts from this source (a project can have lots of cohorts and even cohorts from different sources)
-            var cohortUsedByProject = new ObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode,ExtractableCohort>(existing,cohort);
+            var cohortUsedByProject =
+                new ObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode, ExtractableCohort>(existing, cohort);
             existing.CohortsUsed.Add(cohortUsedByProject);
 
             DuplicatesByCohortSourceUsedByProjectNode.Add(cohortUsedByProject);
@@ -644,15 +660,15 @@ public List<CohortSourceUsedByProjectNode> GetAllCohortProjectUsageNodesFor(Proj
         DuplicatesByProject.AddRange(toReturn);
 
         //if the project has no cohorts then add a ??? node
-        if(!toReturn.Any())
-            toReturn.Add(new CohortSourceUsedByProjectNode(project,null));
+        if (!toReturn.Any())
+            toReturn.Add(new CohortSourceUsedByProjectNode(project, null));
 
         return toReturn;
     }
 
     public IEnumerable<ExtractionConfiguration> GetActiveConfigurationsOnly(Project project)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             return GetConfigurations(project).Where(ec => !ec.IsReleased);
         }
@@ -660,30 +676,33 @@ public IEnumerable<ExtractionConfiguration> GetActiveConfigurationsOnly(Project
 
     public IEnumerable<SelectedDataSets> GetDatasets(IExtractionConfiguration extractionConfiguration)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
-            return _configurationToDatasetMapping.TryGetValue(extractionConfiguration,out var result)?
-                (IEnumerable<SelectedDataSets>) result :Array.Empty<SelectedDataSets>();
+            return _configurationToDatasetMapping.TryGetValue(extractionConfiguration, out var result)
+                ? (IEnumerable<SelectedDataSets>)result
+                : Array.Empty<SelectedDataSets>();
         }
     }
 
     public IEnumerable<ExtractionConfiguration> GetConfigurations(IProject project)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             //Get the extraction configurations node of the project
             var configurationsNode = GetChildren(project).OfType<ExtractionConfigurationsNode>().Single();
 
-            var frozenConfigurationsNode = GetChildren(configurationsNode).OfType<FrozenExtractionConfigurationsNode>().Single();
+            var frozenConfigurationsNode =
+                GetChildren(configurationsNode).OfType<FrozenExtractionConfigurationsNode>().Single();
 
             //then add all the children extraction configurations
-            return GetChildren(configurationsNode).OfType<ExtractionConfiguration>().Union(GetChildren(frozenConfigurationsNode).OfType<ExtractionConfiguration>());
+            return GetChildren(configurationsNode).OfType<ExtractionConfiguration>()
+                .Union(GetChildren(frozenConfigurationsNode).OfType<ExtractionConfiguration>());
         }
     }
 
     public IEnumerable<IExtractableDataSet> GetDatasets(ExtractableDataSetPackage package)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             return dataExportRepository.GetAllDataSets(package, ExtractableDataSets);
         }
@@ -691,7 +710,7 @@ public IEnumerable<IExtractableDataSet> GetDatasets(ExtractableDataSetPackage pa
 
     public bool ProjectHasNoSavedCohorts(Project project)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             //get the projects cohort umbrella folder
             var projectCohortsNode = GetChildren(project).OfType<ProjectCohortsNode>().Single();
@@ -706,18 +725,17 @@ public bool ProjectHasNoSavedCohorts(Project project)
 
     public override Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> GetAllSearchables()
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var toReturn = base.GetAllSearchables();
             AddToReturnSearchablesWithNoDecendancy(toReturn, AllPackages);
             return toReturn;
         }
-            
     }
 
     public bool IsMissingExtractionIdentifier(SelectedDataSets selectedDataSets)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             return _selectedDataSetsWithNoIsExtractionIdentifier.Contains(selectedDataSets);
         }
@@ -730,19 +748,20 @@ public bool IsMissingExtractionIdentifier(SelectedDataSets selectedDataSets)
     /// <returns></returns>
     public ExtractableColumn[] GetAllExtractableColumns(IDataExportRepository repository)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             var toReturn = repository.GetAllObjects<ExtractableColumn>();
             foreach (var c in toReturn)
-            {
                 if (c.CatalogueExtractionInformation_ID == null)
+                {
                     c.InjectKnown((ExtractionInformation)null);
+                }
                 else
                 {
-                    if (AllExtractionInformationsDictionary.TryGetValue(c.CatalogueExtractionInformation_ID.Value,out var ei))
+                    if (AllExtractionInformationsDictionary.TryGetValue(c.CatalogueExtractionInformation_ID.Value,
+                            out var ei))
                         c.InjectKnown(ei);
                 }
-            }
 
             return toReturn;
         }
@@ -750,15 +769,13 @@ public ExtractableColumn[] GetAllExtractableColumns(IDataExportRepository reposi
 
     public override void UpdateTo(ICoreChildProvider other)
     {
-        lock(WriteLock)
+        lock (WriteLock)
         {
             base.UpdateTo(other);
 
-            if(other is not DataExportChildProvider dxOther)
-            {
+            if (other is not DataExportChildProvider dxOther)
                 throw new NotSupportedException(
                     $"Did not know how to UpdateTo ICoreChildProvider of type {other.GetType().Name}");
-            }
 
             //That's one way to avoid memory leaks... anyone holding onto a stale one of these is going to have a bad day
             RootCohortsNode = dxOther.RootCohortsNode;
@@ -789,7 +806,6 @@ public override void UpdateTo(ICoreChildProvider other)
             _extractionProgressesBySelectedDataSetID = dxOther._extractionProgressesBySelectedDataSetID;
             ProjectRootFolder = dxOther.ProjectRootFolder;
         }
-            
     }
 
     public override bool SelectiveRefresh(IMapsDirectlyToDatabaseTable databaseEntity)
@@ -816,10 +832,11 @@ private bool SelectiveRefresh(DeployedExtractionFilter f)
         AddChildren((FilterContainer)f.FilterContainer, knownContainer.Add(f.FilterContainer));
         return true;
     }
+
     public bool SelectiveRefresh(FilterContainer container)
     {
         var descendancy = GetDescendancyListIfAnyFor(container);
-            
+
         if (descendancy == null)
             return false;
 
@@ -842,6 +859,7 @@ public bool SelectiveRefresh(FilterContainer container)
 
         return false;
     }
+
     public bool SelectiveRefresh(SelectedDataSets sds)
     {
         var ec = sds.ExtractionConfiguration;
@@ -863,6 +881,7 @@ public bool SelectiveRefresh(SelectedDataSets sds)
 
         return false;
     }
+
     public bool SelectiveRefresh(IExtractionConfiguration ec)
     {
         // don't try to selectively refresh when deleting
diff --git a/Rdmp.Core/Providers/DataExportProblemProvider.cs b/Rdmp.Core/Providers/DataExportProblemProvider.cs
index cd89411f46..a2577e6325 100644
--- a/Rdmp.Core/Providers/DataExportProblemProvider.cs
+++ b/Rdmp.Core/Providers/DataExportProblemProvider.cs
@@ -14,10 +14,10 @@ namespace Rdmp.Core.Providers;
 /// <summary>
 /// Identifies all rapidly detectable problems with the configurations of Data Export items
 /// </summary>
-public class DataExportProblemProvider:ProblemProvider
+public class DataExportProblemProvider : ProblemProvider
 {
     private DataExportChildProvider _exportChildProvider;
-        
+
     /// <inheritdoc/>
     public override void RefreshProblems(ICoreChildProvider childProvider)
     {
@@ -56,7 +56,8 @@ private string DescribeProblem(ExtractionConfiguration extractionConfiguration)
 
         if (_exportChildProvider != null)
             if (!_exportChildProvider.GetDatasets(extractionConfiguration).Any()) //there are no selected datasets!
-                return "Configuration has no selected datasets. Add existing Datasets or Packages to enable extraction.";
+                return
+                    "Configuration has no selected datasets. Add existing Datasets or Packages to enable extraction.";
 
         return null;
     }
@@ -76,7 +77,8 @@ private string DescribeProblem(ExtractionConfigurationsNode extractionConfigurat
     {
         if (_exportChildProvider.Projects.Contains(extractionConfigurationsNode.Project))
             if (!_exportChildProvider.GetConfigurations(extractionConfigurationsNode.Project).Any())
-                return "Project has no ExtractionConfigurations. Add a new ExtractionConfiguration to define how data is extracted for this Project.";
+                return
+                    "Project has no ExtractionConfigurations. Add a new ExtractionConfiguration to define how data is extracted for this Project.";
 
         return null;
     }
@@ -84,7 +86,8 @@ private string DescribeProblem(ExtractionConfigurationsNode extractionConfigurat
     private string DescribeProblem(ProjectSavedCohortsNode projectSavedCohortsNode)
     {
         if (_exportChildProvider.ProjectHasNoSavedCohorts(projectSavedCohortsNode.Project))
-            return "Project has no Cohorts. Commit new Cohort(s) from File/Cohort Query Builder to use with this Project's ExtractionConfigurations";
+            return
+                "Project has no Cohorts. Commit new Cohort(s) from File/Cohort Query Builder to use with this Project's ExtractionConfigurations";
 
         return null;
     }
@@ -92,13 +95,11 @@ private string DescribeProblem(ProjectSavedCohortsNode projectSavedCohortsNode)
 
     private static string DescribeProblem(ExtractionDirectoryNode edn)
     {
-        if(edn.GetDirectoryInfoIfAny() == null)
-        {
-            return "No Extraction Directory has been specified";
-        }
+        if (edn.GetDirectoryInfoIfAny() == null) return "No Extraction Directory has been specified";
 
         return null;
     }
+
     private static string DescribeProblem(Project project)
     {
         if (project.ProjectNumber == null)
diff --git a/Rdmp.Core/Providers/DecryptionPrivateKeyNode.cs b/Rdmp.Core/Providers/DecryptionPrivateKeyNode.cs
index 14732cafe6..9b0b1962ef 100644
--- a/Rdmp.Core/Providers/DecryptionPrivateKeyNode.cs
+++ b/Rdmp.Core/Providers/DecryptionPrivateKeyNode.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.Providers;
 /// <summary>
 /// Tree node for showing the single Private Key location in TableInfoCollectionUI (See PasswordEncryptionKeyLocationUI)
 /// </summary>
-public class DecryptionPrivateKeyNode:SingletonNode
+public class DecryptionPrivateKeyNode : SingletonNode
 {
     public bool KeyNotSpecified { get; private set; }
 
diff --git a/Rdmp.Core/Providers/DescendancyList.cs b/Rdmp.Core/Providers/DescendancyList.cs
index 20efce2ffa..30b632c3ec 100644
--- a/Rdmp.Core/Providers/DescendancyList.cs
+++ b/Rdmp.Core/Providers/DescendancyList.cs
@@ -29,7 +29,7 @@ public class DescendancyList
     /// For use with <see cref="GetMostDescriptiveParent"/> these objects will be skipped when finding a descriptive parent
     /// </summary>
     private static HashSet<Type> TypesThatAreNotUsefulParents = new(
-        new []
+        new[]
         {
             typeof(CatalogueItemsNode),
             typeof(DocumentationNode),
@@ -41,7 +41,6 @@ public class DescendancyList
             typeof(PreLoadDiscardedColumnsNode),
             typeof(ProjectCataloguesNode),
             typeof(ProjectCohortIdentificationConfigurationAssociationsNode)
-
         });
 
     /// <summary>
@@ -83,7 +82,7 @@ public DescendancyList(params object[] parents)
     /// <returns></returns>
     public DescendancyList Add(object anotherKnownParent)
     {
-        if(Parents.Contains(anotherKnownParent))
+        if (Parents.Contains(anotherKnownParent))
             throw new ArgumentException($"DecendancyList already contains '{anotherKnownParent}'");
 
         var list = new List<object>(Parents)
@@ -134,19 +133,14 @@ public DescendancyList SetNewBestRoute()
 
         return toReturn;
     }
-    public override string ToString()
-    {
-        return $"<<{string.Join("=>", Parents)}>>";
-    }
+
+    public override string ToString() => $"<<{string.Join("=>", Parents)}>>";
 
     /// <summary>
     /// returns the last object in the chain, for example Root=>GrandParent=>Parent would return 'Parent'
     /// </summary>
     /// <returns></returns>
-    public object Last()
-    {
-        return Parents.Last();
-    }
+    public object Last() => Parents.Last();
 
     /// <summary>
     /// Returns the first <see cref="Parents"/> which is meaningful to the user in locating the object within
@@ -155,12 +149,13 @@ public object Last()
     /// <returns></returns>
     public object GetMostDescriptiveParent()
     {
-        return Parents.LastOrDefault(parent => 
+        return Parents.LastOrDefault(parent =>
             !TypesThatAreNotUsefulParents.Contains(parent.GetType())
             &&
             parent is not IContainer
         );
     }
+
     /// <summary>
     /// Returns all <see cref="Parents"/> which are meaningful to the user in locating the object within
     /// a hierarchy 
diff --git a/Rdmp.Core/Providers/ExamplePluginCohortCompilerUI.cs b/Rdmp.Core/Providers/ExamplePluginCohortCompilerUI.cs
index d03a5438cf..0d4e654615 100644
--- a/Rdmp.Core/Providers/ExamplePluginCohortCompilerUI.cs
+++ b/Rdmp.Core/Providers/ExamplePluginCohortCompilerUI.cs
@@ -24,32 +24,23 @@ public override bool CustomActivate(IMapsDirectlyToDatabaseTable o)
     {
         // we only care about responding to opening AggregateConfiguration objects
         // and then only if the aggregate being edited is one of the ones that our API handles
-        if (o is not AggregateConfiguration ac || !compiler.ShouldRun(ac))
-        {
-            return false;
-        }
+        if (o is not AggregateConfiguration ac || !compiler.ShouldRun(ac)) return false;
 
         // Look at the Description property for a number (your API could use a complex XML or YAML syntax if you want)
         // You could also store some info at the Catalogue level for reuse in other Aggregates
 
-        if (!int.TryParse(ac.Description, out var number))
-        {
-            number = 5;
-        }
+        if (!int.TryParse(ac.Description, out var number)) number = 5;
 
         // Launch a UI that prompts a new value to be entered
         if (BasicActivator.TypeText("Generate random CHIs", "Number of Chis:", 100, number.ToString(),
                 out var result, false))
-        {
             if (int.TryParse(result, out var newCount))
             {
                 ac.Description = newCount.ToString();
                 ac.SaveToDatabase();
             }
-        }
 
         // we handled this, don't launch the default user interface
         return true;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/FavouritesProvider.cs b/Rdmp.Core/Providers/FavouritesProvider.cs
index 079be67476..c18a355768 100644
--- a/Rdmp.Core/Providers/FavouritesProvider.cs
+++ b/Rdmp.Core/Providers/FavouritesProvider.cs
@@ -27,7 +27,8 @@ public FavouritesProvider(IBasicActivateItems activator)
     {
         _activator = activator;
         _catalogueRepository = _activator.RepositoryLocator.CatalogueRepository;
-        CurrentFavourites = _catalogueRepository.GetAllObjectsWhere<Favourite>("Username", Environment.UserName).ToList();
+        CurrentFavourites = _catalogueRepository.GetAllObjectsWhere<Favourite>("Username", Environment.UserName)
+            .ToList();
     }
 
     public void AddFavourite(object sender, IMapsDirectlyToDatabaseTable o)
@@ -55,10 +56,7 @@ public void RemoveFavourite(object sender, IMapsDirectlyToDatabaseTable o)
         //it wasn't a favourite anyway
     }
 
-    public bool IsFavourite(IMapsDirectlyToDatabaseTable o)
-    {
-        return GetFavouriteIfAny(o) != null;
-    }
+    public bool IsFavourite(IMapsDirectlyToDatabaseTable o) => GetFavouriteIfAny(o) != null;
 
     public Favourite GetFavouriteIfAny(IMapsDirectlyToDatabaseTable o)
     {
diff --git a/Rdmp.Core/Providers/ICoreChildProvider.cs b/Rdmp.Core/Providers/ICoreChildProvider.cs
index 713a870fdd..8f09ab92da 100644
--- a/Rdmp.Core/Providers/ICoreChildProvider.cs
+++ b/Rdmp.Core/Providers/ICoreChildProvider.cs
@@ -31,15 +31,14 @@ namespace Rdmp.Core.Providers;
 /// property you can just look at the array AllPermissionWindows (especially since you might get lots of spam requests for the icon - you don't want to lookup
 /// the PermissionWindow from the database every time).
 /// </summary>
-public interface ICoreChildProvider:IChildProvider
+public interface ICoreChildProvider : IChildProvider
 {
-
-    JoinInfo[] AllJoinInfos { get;}
+    JoinInfo[] AllJoinInfos { get; }
     LoadMetadata[] AllLoadMetadatas { get; }
     TableInfoServerNode[] AllServers { get; }
-    TableInfo[] AllTableInfos { get;}
+    TableInfo[] AllTableInfos { get; }
     Dictionary<int, List<ColumnInfo>> TableInfosToColumnInfos { get; }
-    CohortIdentificationConfiguration [] AllCohortIdentificationConfigurations { get; }
+    CohortIdentificationConfiguration[] AllCohortIdentificationConfigurations { get; }
     CohortAggregateContainer[] AllCohortAggregateContainers { get; set; }
     JoinableCohortAggregateConfiguration[] AllJoinables { get; set; }
     JoinableCohortAggregateConfigurationUse[] AllJoinUses { get; set; }
@@ -56,7 +55,7 @@ public interface ICoreChildProvider:IChildProvider
     AllANOTablesNode AllANOTablesNode { get; }
     ANOTable[] AllANOTables { get; }
     AllDataAccessCredentialsNode AllDataAccessCredentialsNode { get; }
-    AllServersNode AllServersNode { get;}
+    AllServersNode AllServersNode { get; }
     ColumnInfo[] AllColumnInfos { get; }
     Lookup[] AllLookups { get; }
     AllExternalServersNode AllExternalServersNode { get; }
@@ -70,20 +69,20 @@ public interface ICoreChildProvider:IChildProvider
     /// <returns></returns>
     object GetRootObjectOrSelf(object model);
 
-    PermissionWindow[] AllPermissionWindows { get;}
+    PermissionWindow[] AllPermissionWindows { get; }
     IEnumerable<CatalogueItem> AllCatalogueItems { get; }
     Dictionary<int, CatalogueItem> AllCatalogueItemsDictionary { get; }
-    AggregateConfiguration[] AllAggregateConfigurations { get;}
+    AggregateConfiguration[] AllAggregateConfigurations { get; }
     AllRDMPRemotesNode AllRDMPRemotesNode { get; }
 
     AllDashboardsNode AllDashboardsNode { get; }
-    DashboardLayout[] AllDashboards { get;  }
+    DashboardLayout[] AllDashboards { get; }
 
     AllObjectSharingNode AllObjectSharingNode { get; }
     ObjectImport[] AllImports { get; }
     ObjectExport[] AllExports { get; }
 
-    AllPluginsNode AllPluginsNode {get;}
+    AllPluginsNode AllPluginsNode { get; }
 
     Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> GetAllSearchables();
     IEnumerable<object> GetAllChildrenRecursively(object o);
@@ -93,22 +92,22 @@ public interface ICoreChildProvider:IChildProvider
 
     AllPermissionWindowsNode AllPermissionWindowsNode { get; set; }
     AllConnectionStringKeywordsNode AllConnectionStringKeywordsNode { get; set; }
-    AllStandardRegexesNode AllStandardRegexesNode { get;}
+    AllStandardRegexesNode AllStandardRegexesNode { get; }
     AllPipelinesNode AllPipelinesNode { get; }
-        
+
     AllGovernanceNode AllGovernanceNode { get; }
     GovernancePeriod[] AllGovernancePeriods { get; }
-    GovernanceDocument[] AllGovernanceDocuments { get;}
+    GovernanceDocument[] AllGovernanceDocuments { get; }
 
     Dictionary<int, AggregateFilterContainer> AllAggregateContainersDictionary { get; }
     AggregateFilter[] AllAggregateFilters { get; }
 
     /// <inheritdoc cref="IGovernanceManager.GetAllGovernedCataloguesForAllGovernancePeriods"/>
-    Dictionary<int, HashSet<int>> GovernanceCoverage { get;}
+    Dictionary<int, HashSet<int>> GovernanceCoverage { get; }
 
     JoinableCohortAggregateConfigurationUse[] AllJoinableCohortAggregateConfigurationUse { get; }
 
-        
+
     /// <summary>
     /// Copy updated values for all properties from the <paramref name="other"/>
     /// </summary>
@@ -122,16 +121,16 @@ public interface ICoreChildProvider:IChildProvider
     /// <returns></returns>
     IEnumerable<IMasqueradeAs> GetMasqueradersOf(object o);
 
-        
+
     AllOrphanAggregateConfigurationsNode OrphanAggregateConfigurationsNode { get; }
     AllTemplateAggregateConfigurationsNode TemplateAggregateConfigurationsNode { get; }
 
     /// <summary>
     /// All standard (i.e. not plugin) use cases for editting <see cref="IPipeline"/> under.
     /// </summary>
-    HashSet<StandardPipelineUseCaseNode> PipelineUseCases {get; }
+    HashSet<StandardPipelineUseCaseNode> PipelineUseCases { get; }
+
 
-        
     /// <summary>
     /// All components within all <see cref="Pipeline"/>
     /// </summary>
@@ -146,9 +145,9 @@ public interface ICoreChildProvider:IChildProvider
     /// All process
     /// </summary>
     ProcessTask[] AllProcessTasks { get; }
-        
+
     ProcessTaskArgument[] AllProcessTasksArguments { get; }
-        
+
 
     /// <summary>
     /// Returns all objects in the tree hierarchy that are assignable to the supplied <paramref name="type"/>
@@ -156,7 +155,7 @@ public interface ICoreChildProvider:IChildProvider
     /// <param name="type"></param>
     /// <param name="unwrapMasqueraders">true to unwrap and return matching underlying objects from <see cref="IMasqueradeAs"/> objects</param>
     /// <returns></returns>
-    IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type type,bool unwrapMasqueraders);
+    IEnumerable<IMapsDirectlyToDatabaseTable> GetAllObjects(Type type, bool unwrapMasqueraders);
 
     /// <summary>
     /// Performs a partial refresh assuming that only the hierarchy of <paramref name="databaseEntity"/> has
diff --git a/Rdmp.Core/Providers/IProblemProvider.cs b/Rdmp.Core/Providers/IProblemProvider.cs
index 836024fb7a..1fc06a35bc 100644
--- a/Rdmp.Core/Providers/IProblemProvider.cs
+++ b/Rdmp.Core/Providers/IProblemProvider.cs
@@ -19,7 +19,7 @@ public interface IProblemProvider
     /// </summary>
     /// <param name="childProvider"></param>
     void RefreshProblems(ICoreChildProvider childProvider);
-        
+
     /// <summary>
     /// True if the supplied object has problems with it
     /// </summary>
@@ -33,5 +33,4 @@ public interface IProblemProvider
     /// <param name="o"></param>
     /// <returns></returns>
     string DescribeProblem(object o);
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AggregatesNode.cs b/Rdmp.Core/Providers/Nodes/AggregatesNode.cs
index b8b98f4655..168a29ad8d 100644
--- a/Rdmp.Core/Providers/Nodes/AggregatesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AggregatesNode.cs
@@ -12,9 +12,8 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all <see cref="AggregateConfiguration"/> graphs for visualising data in the <see cref="Curation.Data.Catalogue"/>.
 /// </summary>
-public class AggregatesNode:Node
+public class AggregatesNode : Node
 {
-
     /// <summary>
     /// The <see cref="Curation.Data.Catalogue"/> to which all the <see cref="AggregateConfiguration"/> belong
     /// </summary>
@@ -25,26 +24,17 @@ public AggregatesNode(Catalogue c, AggregateConfiguration[] regularAggregates)
         Catalogue = c;
     }
 
-    public override string ToString()
-    {
-        return "Aggregate Graphs";
-    }
+    public override string ToString() => "Aggregate Graphs";
 
-    protected bool Equals(AggregatesNode other)
-    {
-        return Catalogue.Equals(other.Catalogue);
-    }
+    protected bool Equals(AggregatesNode other) => Catalogue.Equals(other.Catalogue);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((AggregatesNode) obj);
+        return Equals((AggregatesNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Catalogue.GetHashCode() * GetType().GetHashCode();
-    }
+    public override int GetHashCode() => Catalogue.GetHashCode() * GetType().GetHashCode();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllANOTablesNode.cs b/Rdmp.Core/Providers/Nodes/AllANOTablesNode.cs
index dab10c37b0..599034369e 100644
--- a/Rdmp.Core/Providers/Nodes/AllANOTablesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllANOTablesNode.cs
@@ -9,10 +9,9 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all ANOTable objects.  These define how column level anonymisation happens in the data load engine
 /// </summary>
-public class AllANOTablesNode:SingletonNode
+public class AllANOTablesNode : SingletonNode
 {
-    public AllANOTablesNode():base("Anonymisation Tables")
+    public AllANOTablesNode() : base("Anonymisation Tables")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllCohortsNode.cs b/Rdmp.Core/Providers/Nodes/AllCohortsNode.cs
index f096b7365f..7e24359dc7 100644
--- a/Rdmp.Core/Providers/Nodes/AllCohortsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllCohortsNode.cs
@@ -11,11 +11,10 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all saved cohort lists (See <see cref="ExtractableCohort"/>).  These are divided by sources (<see cref="ExternalCohortTable"/>)
 /// </summary>
-public class AllCohortsNode: SingletonNode
+public class AllCohortsNode : SingletonNode
 {
     public AllCohortsNode()
         : base("ALL Saved Cohorts")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllConnectionStringKeywordsNode.cs b/Rdmp.Core/Providers/Nodes/AllConnectionStringKeywordsNode.cs
index 7017e87d79..04ca434a6c 100644
--- a/Rdmp.Core/Providers/Nodes/AllConnectionStringKeywordsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllConnectionStringKeywordsNode.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Collection of all currently configured <see cref="ConnectionStringKeyword"/>.  These allow you to use custom keywords in your
 /// connection strings (e.g. change Port).
 /// </summary>
-public class AllConnectionStringKeywordsNode:SingletonNode
+public class AllConnectionStringKeywordsNode : SingletonNode
 {
     public AllConnectionStringKeywordsNode() : base("Connection String Keywords")
     {
diff --git a/Rdmp.Core/Providers/Nodes/AllDashboardsNode.cs b/Rdmp.Core/Providers/Nodes/AllDashboardsNode.cs
index e453e07c50..cb90badfc3 100644
--- a/Rdmp.Core/Providers/Nodes/AllDashboardsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllDashboardsNode.cs
@@ -15,6 +15,5 @@ public class AllDashboardsNode : SingletonNode
 {
     public AllDashboardsNode() : base("Dashboards")
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllDataAccessCredentialsNode.cs b/Rdmp.Core/Providers/Nodes/AllDataAccessCredentialsNode.cs
index de3c0499f4..2624d4a9a1 100644
--- a/Rdmp.Core/Providers/Nodes/AllDataAccessCredentialsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllDataAccessCredentialsNode.cs
@@ -12,10 +12,9 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Collection of all encrypted <see cref="DataAccessCredentials"/> used to access tables in your database.  This will be empty if you 
 /// connect with integrated security / windows authentication. 
 /// </summary>
-public class AllDataAccessCredentialsNode:SingletonNode
+public class AllDataAccessCredentialsNode : SingletonNode
 {
-    public AllDataAccessCredentialsNode(): base("Data Access Credentials")
+    public AllDataAccessCredentialsNode() : base("Data Access Credentials")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllExpiredPluginsNode.cs b/Rdmp.Core/Providers/Nodes/AllExpiredPluginsNode.cs
index c1f4bd4fe8..edc10e3967 100644
--- a/Rdmp.Core/Providers/Nodes/AllExpiredPluginsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllExpiredPluginsNode.cs
@@ -6,9 +6,9 @@
 
 namespace Rdmp.Core.Providers.Nodes;
 
-internal class AllExpiredPluginsNode :SingletonNode
+internal class AllExpiredPluginsNode : SingletonNode
 {
-    public AllExpiredPluginsNode():base("Old Plugins")
+    public AllExpiredPluginsNode() : base("Old Plugins")
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllExternalServersNode.cs b/Rdmp.Core/Providers/Nodes/AllExternalServersNode.cs
index bc1192f04e..3048434a51 100644
--- a/Rdmp.Core/Providers/Nodes/AllExternalServersNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllExternalServersNode.cs
@@ -17,6 +17,5 @@ public class AllExternalServersNode : SingletonNode
 {
     public AllExternalServersNode() : base("External Servers (Including Platform Databases)")
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllGovernanceNode.cs b/Rdmp.Core/Providers/Nodes/AllGovernanceNode.cs
index 98bdbf91c4..43b5e29d7c 100644
--- a/Rdmp.Core/Providers/Nodes/AllGovernanceNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllGovernanceNode.cs
@@ -12,10 +12,13 @@ namespace Rdmp.Core.Providers.Nodes;
 /// The RDMP is designed to store sensitive clinical datasets and make them available in research ready (anonymous) form.  This usually requires governance approval from the data
 /// provider.  This node lets you create periods of governance for your datasets (See GovernancePeriodUI).
 /// </summary>
-public class AllGovernanceNode:SingletonNode,IOrderable
+public class AllGovernanceNode : SingletonNode, IOrderable
 {
-    public int Order { get => -5000;
-        set{}}
+    public int Order
+    {
+        get => -5000;
+        set { }
+    }
 
     public AllGovernanceNode() : base("Governance")
     {
diff --git a/Rdmp.Core/Providers/Nodes/AllPermissionWindowsNode.cs b/Rdmp.Core/Providers/Nodes/AllPermissionWindowsNode.cs
index 0bf26ad817..5df72d7084 100644
--- a/Rdmp.Core/Providers/Nodes/AllPermissionWindowsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllPermissionWindowsNode.cs
@@ -12,12 +12,15 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all <see cref="PermissionWindow"/> objects.  These are windows of time in which operations are permitted / forbidden.
 /// </summary>
-public class AllPermissionWindowsNode:SingletonNode,IOrderable
+public class AllPermissionWindowsNode : SingletonNode, IOrderable
 {
     public AllPermissionWindowsNode() : base("Permission Windows")
     {
     }
 
-    public int Order { get => 0;
-        set{} }
+    public int Order
+    {
+        get => 0;
+        set { }
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllPluginsNode.cs b/Rdmp.Core/Providers/Nodes/AllPluginsNode.cs
index f1735848a3..5253fffd00 100644
--- a/Rdmp.Core/Providers/Nodes/AllPluginsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllPluginsNode.cs
@@ -10,10 +10,9 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Container node for all <see cref="Rdmp.Core.Curation.Data.Plugin"/> loaded in RDMP including all historic versions of plugins (which
 /// may not be loaded)
 /// </summary>
-public class AllPluginsNode:SingletonNode
+public class AllPluginsNode : SingletonNode
 {
-    public AllPluginsNode():base("Plugins")
+    public AllPluginsNode() : base("Plugins")
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllServersNode.cs b/Rdmp.Core/Providers/Nodes/AllServersNode.cs
index 82f4e7e3f5..6d79a399d1 100644
--- a/Rdmp.Core/Providers/Nodes/AllServersNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllServersNode.cs
@@ -11,10 +11,9 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Dynamically created collection of 'servers' produced from all currently configured <see cref="TableInfo"/>.
 /// </summary>
-public class AllServersNode:SingletonNode
+public class AllServersNode : SingletonNode
 {
-    public AllServersNode():base("Data Repository Servers")
+    public AllServersNode() : base("Data Repository Servers")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/AllStandardRegexesNode.cs b/Rdmp.Core/Providers/Nodes/AllStandardRegexesNode.cs
index 70b8c56c53..f8d1d53da4 100644
--- a/Rdmp.Core/Providers/Nodes/AllStandardRegexesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/AllStandardRegexesNode.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Collection of all centrally defined <see cref="StandardRegex"/>.  These are documented regular expressions which
 /// can be shared and reused between components (e.g. PipelineComponents).
 /// </summary>
-public class AllStandardRegexesNode:SingletonNode
+public class AllStandardRegexesNode : SingletonNode
 {
     public AllStandardRegexesNode() : base("Standard Regexes")
     {
diff --git a/Rdmp.Core/Providers/Nodes/ArbitraryFolderNode.cs b/Rdmp.Core/Providers/Nodes/ArbitraryFolderNode.cs
index 7a45d16d81..ccdba65ead 100644
--- a/Rdmp.Core/Providers/Nodes/ArbitraryFolderNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ArbitraryFolderNode.cs
@@ -14,14 +14,14 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Folder Node that can be added to TreeListViews.  You can only add one folder of each name because they inherit from <see cref="SingletonNode"/>.
 /// </summary>
-public class ArbitraryFolderNode:SingletonNode,IOrderable
+public class ArbitraryFolderNode : SingletonNode, IOrderable
 {
     public int Order { get; set; }
 
     /// <summary>
     /// Commands to be created when/if the node is right clicked.  Null if no commands are required
     /// </summary>
-    public Func<IEnumerable<IAtomicCommand>> CommandGetter { get;set;}
+    public Func<IEnumerable<IAtomicCommand>> CommandGetter { get; set; }
 
     public ArbitraryFolderNode(string caption, int order) : base(caption)
     {
diff --git a/Rdmp.Core/Providers/Nodes/CatalogueItemsNode.cs b/Rdmp.Core/Providers/Nodes/CatalogueItemsNode.cs
index 6e73191441..57c27429d5 100644
--- a/Rdmp.Core/Providers/Nodes/CatalogueItemsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/CatalogueItemsNode.cs
@@ -20,9 +20,10 @@ public class CatalogueItemsNode : Node, IOrderable
     public CatalogueItem[] CatalogueItems { get; }
 
     public ExtractionCategory? Category { get; }
+
     public int Order
     {
-        get => Category.HasValue ? (int)Category +1: 20;
+        get => Category.HasValue ? (int)Category + 1 : 20;
         set { } // no setter, we are orderable to enforce specific order in tree
     }
 
@@ -35,7 +36,7 @@ public CatalogueItemsNode(Catalogue catalogue, IEnumerable<CatalogueItem> cis, E
 
     public override string ToString()
     {
-        if(Category == null)
+        if (Category == null)
             return "Non Extractable";
 
         return Category switch
@@ -49,17 +50,15 @@ public override string ToString()
         };
     }
 
-    protected bool Equals(CatalogueItemsNode other)
-    {
-        return Catalogue.Equals(other.Catalogue) && Equals(Category,other.Category);
-    }
+    protected bool Equals(CatalogueItemsNode other) =>
+        Catalogue.Equals(other.Catalogue) && Equals(Category, other.Category);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
-        if (obj.GetType() != typeof (CatalogueItemsNode)) return false;
-        return Equals((CatalogueItemsNode) obj);
+        if (obj.GetType() != typeof(CatalogueItemsNode)) return false;
+        return Equals((CatalogueItemsNode)obj);
     }
 
     public override int GetHashCode()
diff --git a/Rdmp.Core/Providers/Nodes/CatalogueLookupUsageNode.cs b/Rdmp.Core/Providers/Nodes/CatalogueLookupUsageNode.cs
index 26b7f4d1f3..b6bfca0ec1 100644
--- a/Rdmp.Core/Providers/Nodes/CatalogueLookupUsageNode.cs
+++ b/Rdmp.Core/Providers/Nodes/CatalogueLookupUsageNode.cs
@@ -23,13 +23,7 @@ public CatalogueLookupUsageNode(Catalogue c, Lookup l)
         Lookup = l;
     }
 
-    public override string ToString()
-    {
-        return Lookup.ToString();
-    }
+    public override string ToString() => Lookup.ToString();
 
-    public object MasqueradingAs()
-    {
-        return Lookup;
-    }
+    public object MasqueradingAs() => Lookup;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/CatalogueLookupsNode.cs b/Rdmp.Core/Providers/Nodes/CatalogueLookupsNode.cs
index d7609f00ce..b1b6baae48 100644
--- a/Rdmp.Core/Providers/Nodes/CatalogueLookupsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/CatalogueLookupsNode.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection node for all <see cref="Lookup"/> that exist under a <see cref="Catalogue"/>
 /// </summary>
-public class CatalogueLookupsNode:Node
+public class CatalogueLookupsNode : Node
 {
     public Catalogue Catalogue { get; set; }
     public Lookup[] Lookups { get; set; }
@@ -22,15 +22,9 @@ public CatalogueLookupsNode(Catalogue catalogue, Lookup[] lookups)
         Lookups = lookups;
     }
 
-    public override string ToString()
-    {
-        return "Lookups";
-    }
+    public override string ToString() => "Lookups";
 
-    protected bool Equals(CatalogueLookupsNode other)
-    {
-        return Equals(Catalogue, other.Catalogue);
-    }
+    protected bool Equals(CatalogueLookupsNode other) => Equals(Catalogue, other.Catalogue);
 
     public override bool Equals(object obj)
     {
@@ -40,8 +34,5 @@ public override bool Equals(object obj)
         return Equals((CatalogueLookupsNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Catalogue != null ? Catalogue.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => Catalogue != null ? Catalogue.GetHashCode() : 0;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/CohortNodes/AllOrphanAggregateConfigurationsNode.cs b/Rdmp.Core/Providers/Nodes/CohortNodes/AllOrphanAggregateConfigurationsNode.cs
index f0ae8f6fd8..76d70894bb 100644
--- a/Rdmp.Core/Providers/Nodes/CohortNodes/AllOrphanAggregateConfigurationsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/CohortNodes/AllOrphanAggregateConfigurationsNode.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Providers.Nodes.CohortNodes;
 /// Collection of all <see cref="AggregateConfiguration"/> which are <see cref="AggregateConfiguration.IsCohortIdentificationAggregate"/> but
 /// not associated with any <see cref="CohortIdentificationConfiguration"/>
 /// </summary>
-public class AllOrphanAggregateConfigurationsNode:SingletonNode
+public class AllOrphanAggregateConfigurationsNode : SingletonNode
 {
     /// <summary>
     /// Creates a new instance of the singleton node
diff --git a/Rdmp.Core/Providers/Nodes/CohortNodes/QueryCacheUsedByCohortIdentificationNode.cs b/Rdmp.Core/Providers/Nodes/CohortNodes/QueryCacheUsedByCohortIdentificationNode.cs
index 5e4994ef0d..cf1293868f 100644
--- a/Rdmp.Core/Providers/Nodes/CohortNodes/QueryCacheUsedByCohortIdentificationNode.cs
+++ b/Rdmp.Core/Providers/Nodes/CohortNodes/QueryCacheUsedByCohortIdentificationNode.cs
@@ -17,9 +17,11 @@ namespace Rdmp.Core.Providers.Nodes.CohortNodes;
 /// 
 /// <para>Cache invalidation automatically occurs when subcomponents are changed</para>
 /// </summary>
-internal class QueryCacheUsedByCohortIdentificationNode : ObjectUsedByOtherObjectNode<CohortIdentificationConfiguration, ExternalDatabaseServer>, IDeletableWithCustomMessage
+internal class QueryCacheUsedByCohortIdentificationNode :
+    ObjectUsedByOtherObjectNode<CohortIdentificationConfiguration, ExternalDatabaseServer>, IDeletableWithCustomMessage
 {
-    public QueryCacheUsedByCohortIdentificationNode(CohortIdentificationConfiguration cic, ExternalDatabaseServer cacheServer)
+    public QueryCacheUsedByCohortIdentificationNode(CohortIdentificationConfiguration cic,
+        ExternalDatabaseServer cacheServer)
         : base(cic, cacheServer)
     {
     }
@@ -31,14 +33,8 @@ public void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public string GetDeleteMessage()
-    {
-        return "remove cache database use";
-    }
+    public string GetDeleteMessage() => "remove cache database use";
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/DataAccessCredentialUsageNode.cs b/Rdmp.Core/Providers/Nodes/DataAccessCredentialUsageNode.cs
index 832def3c40..f2a0678428 100644
--- a/Rdmp.Core/Providers/Nodes/DataAccessCredentialUsageNode.cs
+++ b/Rdmp.Core/Providers/Nodes/DataAccessCredentialUsageNode.cs
@@ -13,41 +13,35 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Tree Node for documenting the allowed usage of a specific DataAccessCredentials (username / password) under a given DataAccessContext (loading, extracting etc).
 /// </summary>
-public class DataAccessCredentialUsageNode:Node, IDeleteable
+public class DataAccessCredentialUsageNode : Node, IDeleteable
 {
     public DataAccessCredentials Credentials { get; private set; }
     public ITableInfo TableInfo { get; private set; }
     public DataAccessContext Context { get; private set; }
 
-    public DataAccessCredentialUsageNode(DataAccessCredentials credentials,ITableInfo tableInfo,DataAccessContext context)
+    public DataAccessCredentialUsageNode(DataAccessCredentials credentials, ITableInfo tableInfo,
+        DataAccessContext context)
     {
         Credentials = credentials;
         TableInfo = tableInfo;
         Context = context;
     }
 
-    public override string ToString()
-    {
-        return $"{Credentials} (Under Context:{Context})";
-    }
+    public override string ToString() => $"{Credentials} (Under Context:{Context})";
 
-    protected bool Equals(DataAccessCredentialUsageNode other)
-    {
-        return Equals(Credentials, other.Credentials) && Equals(TableInfo, other.TableInfo) && Context == other.Context;
-    }
+    protected bool Equals(DataAccessCredentialUsageNode other) => Equals(Credentials, other.Credentials) &&
+                                                                  Equals(TableInfo, other.TableInfo) &&
+                                                                  Context == other.Context;
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((DataAccessCredentialUsageNode) obj);
+        return Equals((DataAccessCredentialUsageNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return System.HashCode.Combine(Credentials, TableInfo, Context);
-    }
+    public override int GetHashCode() => System.HashCode.Combine(Credentials, TableInfo, Context);
 
     public void DeleteInDatabase()
     {
diff --git a/Rdmp.Core/Providers/Nodes/DocumentationNode.cs b/Rdmp.Core/Providers/Nodes/DocumentationNode.cs
index 5abebc164d..325770f30a 100644
--- a/Rdmp.Core/Providers/Nodes/DocumentationNode.cs
+++ b/Rdmp.Core/Providers/Nodes/DocumentationNode.cs
@@ -11,39 +11,31 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Container tree node for all the documentation bits of a Catalogue including SupportingDocuments and SupportingSQLTables
 /// </summary>
-public class DocumentationNode:Node
+public class DocumentationNode : Node
 {
     public Catalogue Catalogue { get; set; }
     public SupportingDocument[] SupportingDocuments { get; set; }
     public SupportingSQLTable[] SupportingSQLTables { get; set; }
 
-    public DocumentationNode(Catalogue catalogue, SupportingDocument[] supportingDocuments, SupportingSQLTable[] supportingSQLTables)
+    public DocumentationNode(Catalogue catalogue, SupportingDocument[] supportingDocuments,
+        SupportingSQLTable[] supportingSQLTables)
     {
         Catalogue = catalogue;
         SupportingDocuments = supportingDocuments;
         SupportingSQLTables = supportingSQLTables;
     }
 
-    public override string ToString()
-    {
-        return "Documentation";
-    }
+    public override string ToString() => "Documentation";
 
-    protected bool Equals(DocumentationNode other)
-    {
-        return Equals(Catalogue, other.Catalogue);
-    }
+    protected bool Equals(DocumentationNode other) => Equals(Catalogue, other.Catalogue);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
-        if (obj.GetType() != typeof (DocumentationNode)) return false;
-        return Equals((DocumentationNode) obj);
+        if (obj.GetType() != typeof(DocumentationNode)) return false;
+        return Equals((DocumentationNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Catalogue != null ? Catalogue.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => Catalogue != null ? Catalogue.GetHashCode() : 0;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ExtractionArbitraryFolderNode.cs b/Rdmp.Core/Providers/Nodes/ExtractionArbitraryFolderNode.cs
index b2aa44b14e..3f9c98f426 100644
--- a/Rdmp.Core/Providers/Nodes/ExtractionArbitraryFolderNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ExtractionArbitraryFolderNode.cs
@@ -15,8 +15,7 @@ public class ExtractionArbitraryFolderNode : ArbitraryFolderNode
 {
     public ExtractionConfiguration Configuration { get; set; }
 
-    public ExtractionArbitraryFolderNode(string caption, int order) : base(caption,order)
+    public ExtractionArbitraryFolderNode(string caption, int order) : base(caption, order)
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ExtractionConfigurationsNode.cs b/Rdmp.Core/Providers/Nodes/ExtractionConfigurationsNode.cs
index 4e16856455..c34d08fc5c 100644
--- a/Rdmp.Core/Providers/Nodes/ExtractionConfigurationsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ExtractionConfigurationsNode.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all <see cref="ExtractionConfiguration"/> in a given <see cref="Project"/>
 /// </summary>
-public class ExtractionConfigurationsNode:Node,IOrderable
+public class ExtractionConfigurationsNode : Node, IOrderable
 {
     public Project Project { get; set; }
 
@@ -21,30 +21,23 @@ public ExtractionConfigurationsNode(Project project)
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Extraction Configurations";
-    }
+    public override string ToString() => "Extraction Configurations";
 
-    protected bool Equals(ExtractionConfigurationsNode other)
-    {
-        return Equals(Project, other.Project);
-    }
+    protected bool Equals(ExtractionConfigurationsNode other) => Equals(Project, other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ExtractionConfigurationsNode) obj);
+        return Equals((ExtractionConfigurationsNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => Project != null ? Project.GetHashCode() : 0;
+
+    public int Order
     {
-        return Project != null ? Project.GetHashCode() : 0;
+        get => 3;
+        set { }
     }
-
-    public int Order { get => 3;
-        set{} }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ExtractionDirectoryNode.cs b/Rdmp.Core/Providers/Nodes/ExtractionDirectoryNode.cs
index 9eed3f553d..b66ad261f0 100644
--- a/Rdmp.Core/Providers/Nodes/ExtractionDirectoryNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ExtractionDirectoryNode.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Location on disk in which linked project extracts are generated for a given <see cref="Project"/> (assuming you are extracting to disk
 /// e.g. with an <see cref="ExecuteDatasetExtractionFlatFileDestination"/>).
 /// </summary>
-public class ExtractionDirectoryNode : Node,IDirectoryInfoNode, IOrderable
+public class ExtractionDirectoryNode : Node, IDirectoryInfoNode, IOrderable
 {
     public Project Project { get; private set; }
 
@@ -33,23 +33,17 @@ public override string ToString()
         return Project.ExtractionDirectory;
     }
 
-    protected bool Equals(ExtractionDirectoryNode other)
-    {
-        return Equals(Project, other.Project);
-    }
+    protected bool Equals(ExtractionDirectoryNode other) => Equals(Project, other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ExtractionDirectoryNode) obj);
+        return Equals((ExtractionDirectoryNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Project != null ? Project.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => Project != null ? Project.GetHashCode() : 0;
 
     public DirectoryInfo GetDirectoryInfoIfAny()
     {
@@ -59,6 +53,9 @@ public DirectoryInfo GetDirectoryInfoIfAny()
         return new DirectoryInfo(Project.ExtractionDirectory);
     }
 
-    public int Order{ get => 4;
-        set { }}
+    public int Order
+    {
+        get => 4;
+        set { }
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/FrozenExtractionConfigurationsNode.cs b/Rdmp.Core/Providers/Nodes/FrozenExtractionConfigurationsNode.cs
index 4a298cdec7..5be1671a53 100644
--- a/Rdmp.Core/Providers/Nodes/FrozenExtractionConfigurationsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/FrozenExtractionConfigurationsNode.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all previously extracted (and now readonly) <see cref="ExtractionConfiguration"/>s in a given <see cref="Project"/>
 /// </summary>
-internal class FrozenExtractionConfigurationsNode:Node , IOrderable
+internal class FrozenExtractionConfigurationsNode : Node, IOrderable
 {
     public Project Project { get; set; }
 
@@ -21,29 +21,23 @@ public FrozenExtractionConfigurationsNode(Project project)
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Frozen Extraction Configurations";
-    }
+    public override string ToString() => "Frozen Extraction Configurations";
 
-    protected bool Equals(FrozenExtractionConfigurationsNode other)
-    {
-        return Equals(Project, other.Project);
-    }
+    protected bool Equals(FrozenExtractionConfigurationsNode other) => Equals(Project, other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((FrozenExtractionConfigurationsNode) obj);
+        return Equals((FrozenExtractionConfigurationsNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => Project != null ? Project.GetHashCode() : 0;
+
+    public int Order
     {
-        return Project != null ? Project.GetHashCode() : 0;
+        get => 6000;
+        set { }
     }
-
-    public int Order { get => 6000;
-        set{} }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/IdentifierDumpServerUsageNode.cs b/Rdmp.Core/Providers/Nodes/IdentifierDumpServerUsageNode.cs
index cb1e21effd..ce9994314b 100644
--- a/Rdmp.Core/Providers/Nodes/IdentifierDumpServerUsageNode.cs
+++ b/Rdmp.Core/Providers/Nodes/IdentifierDumpServerUsageNode.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Identifies a database which is used to 'split off' identifiable data (columns) during a data load instead of loading it into the LIVE database (from which you
 /// execute data extractions).
 /// </summary>
-public class IdentifierDumpServerUsageNode:Node,IDeleteable
+public class IdentifierDumpServerUsageNode : Node, IDeleteable
 {
     public TableInfo TableInfo { get; private set; }
     public ExternalDatabaseServer IdentifierDumpServer { get; private set; }
@@ -24,28 +24,19 @@ public IdentifierDumpServerUsageNode(TableInfo tableInfo, ExternalDatabaseServer
         IdentifierDumpServer = identifierDumpServer;
     }
 
-    public override string ToString()
-    {
-        return $"Usage of:{IdentifierDumpServer.Name}";
-    }
+    public override string ToString() => $"Usage of:{IdentifierDumpServer.Name}";
 
-    protected bool Equals(IdentifierDumpServerUsageNode other)
-    {
-        return Equals(TableInfo, other.TableInfo);
-    }
+    protected bool Equals(IdentifierDumpServerUsageNode other) => Equals(TableInfo, other.TableInfo);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((IdentifierDumpServerUsageNode) obj);
+        return Equals((IdentifierDumpServerUsageNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return TableInfo != null ? TableInfo.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => TableInfo != null ? TableInfo.GetHashCode() : 0;
 
     public void DeleteInDatabase()
     {
diff --git a/Rdmp.Core/Providers/Nodes/JoinableCollectionNode.cs b/Rdmp.Core/Providers/Nodes/JoinableCollectionNode.cs
index d4504c3cf4..de8cf5deb6 100644
--- a/Rdmp.Core/Providers/Nodes/JoinableCollectionNode.cs
+++ b/Rdmp.Core/Providers/Nodes/JoinableCollectionNode.cs
@@ -15,84 +15,56 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Collection of queries which can be joined against when building cohorts (e.g. to find all hospital admissions within 6
 /// months of a prescription for drug X).  See <see cref="JoinableCohortAggregateConfiguration"/>.
 /// </summary>
-public class JoinableCollectionNode:Node,IOrderable
+public class JoinableCollectionNode : Node, IOrderable
 {
     public CohortIdentificationConfiguration Configuration { get; set; }
     public JoinableCohortAggregateConfiguration[] Joinables { get; set; }
 
-    public JoinableCollectionNode(CohortIdentificationConfiguration configuration, JoinableCohortAggregateConfiguration[] joinables)
+    public JoinableCollectionNode(CohortIdentificationConfiguration configuration,
+        JoinableCohortAggregateConfiguration[] joinables)
     {
         Configuration = configuration;
         Joinables = joinables;
     }
 
-    public static string GetCatalogueName()
-    {
-        return "";
-    }
+    public static string GetCatalogueName() => "";
 
     public static IMapsDirectlyToDatabaseTable Child => null;
 
-    public static IDataAccessPoint[] GetDataAccessPoints()
-    {
-        return null;
-    }
+    public static IDataAccessPoint[] GetDataAccessPoints() => null;
 
-    public override string ToString()
-    {
-        return "Patient Index Table(s)";
-    }
+    public override string ToString() => "Patient Index Table(s)";
 
-    public static string FinalRowCount()
-    {
-        return "";
-    }
+    public static string FinalRowCount() => "";
     public int? CumulativeRowCount { set; get; }
 
 
-    public static string GetStateDescription()
-    {
-        return "";
-    }
+    public static string GetStateDescription() => "";
 
-    public static string Order()
-    {
-        return "";
-    }
+    public static string Order() => "";
 
     public string ElapsedTime = "";
 
-    public static string GetCachedQueryUseCount()
-    {
-        return "";
-    }
-
-    public static string DescribePurpose()
-    {
+    public static string GetCachedQueryUseCount() => "";
 
-        return @"Drop Aggregates (datasets) here to create patient index tables (Tables with interesting
+    public static string DescribePurpose() =>
+        @"Drop Aggregates (datasets) here to create patient index tables (Tables with interesting
 patient specific dates/fields which you need to use in other datasets). For example if you are
 interested in studying hospitalisations for condition X and all other patient identification 
 criteria are 'in the 6 months' / 'in the 12 months' post hospitalisation date per patient)";
-    }
 
-    protected bool Equals(JoinableCollectionNode other)
-    {
-        return Equals(Configuration, other.Configuration);
-    }
+    protected bool Equals(JoinableCollectionNode other) => Equals(Configuration, other.Configuration);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((JoinableCollectionNode) obj);
+        return Equals((JoinableCollectionNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return (Configuration != null ? Configuration.GetHashCode() : 0) * GetType().GetHashCode();
-    }
+    public override int GetHashCode() =>
+        (Configuration != null ? Configuration.GetHashCode() : 0) * GetType().GetHashCode();
 
     int IOrderable.Order
     {
diff --git a/Rdmp.Core/Providers/Nodes/LinkedCohortNode.cs b/Rdmp.Core/Providers/Nodes/LinkedCohortNode.cs
index feb4c6f0d0..a3a7c085c7 100644
--- a/Rdmp.Core/Providers/Nodes/LinkedCohortNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LinkedCohortNode.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// The saved cohort (list of patient identifiers) which will be linked with the datasets in the associated <see cref="ExtractionConfiguration"/>
 /// </summary>
-public class LinkedCohortNode : Node,IMasqueradeAs, IDeletableWithCustomMessage
+public class LinkedCohortNode : Node, IMasqueradeAs, IDeletableWithCustomMessage
 {
     public IExtractionConfiguration Configuration { get; set; }
     public IExtractableCohort Cohort { get; set; }
@@ -24,34 +24,27 @@ public LinkedCohortNode(IExtractionConfiguration configuration, IExtractableCoho
         Cohort = cohort;
     }
 
-    public override string ToString()
-    {
-        return Cohort.ToString();
-    }
+    public override string ToString() => Cohort.ToString();
 
-    public object MasqueradingAs()
-    {
-        return Cohort;
-    }
+    public object MasqueradingAs() => Cohort;
 
-    protected bool Equals(LinkedCohortNode other)
-    {
-        return Equals(Configuration, other.Configuration) && Equals(Cohort, other.Cohort);
-    }
+    protected bool Equals(LinkedCohortNode other) =>
+        Equals(Configuration, other.Configuration) && Equals(Cohort, other.Cohort);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LinkedCohortNode) obj);
+        return Equals((LinkedCohortNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((Configuration != null ? Configuration.GetHashCode() : 0)*397) ^ (Cohort != null ? Cohort.GetHashCode() : 0);
+            return ((Configuration != null ? Configuration.GetHashCode() : 0) * 397) ^
+                   (Cohort != null ? Cohort.GetHashCode() : 0);
         }
     }
 
@@ -61,14 +54,8 @@ public void DeleteInDatabase()
         Configuration.SaveToDatabase();
     }
 
-    public string GetDeleteMessage()
-    {
-        return $"remove cohort from ExtractionConfiguration '{Configuration}'";
-    }
+    public string GetDeleteMessage() => $"remove cohort from ExtractionConfiguration '{Configuration}'";
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LinkedColumnInfoNode.cs b/Rdmp.Core/Providers/Nodes/LinkedColumnInfoNode.cs
index a08a02a81c..1db00ad7b2 100644
--- a/Rdmp.Core/Providers/Nodes/LinkedColumnInfoNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LinkedColumnInfoNode.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.Providers.Nodes;
 
-public class LinkedColumnInfoNode : Node,IDeleteable, IMasqueradeAs
+public class LinkedColumnInfoNode : Node, IDeleteable, IMasqueradeAs
 {
     public CatalogueItem CatalogueItem { get; set; }
     public ColumnInfo ColumnInfo { get; set; }
@@ -20,36 +20,29 @@ public LinkedColumnInfoNode(CatalogueItem catalogueItem, ColumnInfo columnInfo)
         ColumnInfo = columnInfo;
     }
 
-    public override string ToString()
-    {
-        return ColumnInfo.ToString();
-    }
+    public override string ToString() => ColumnInfo.ToString();
 
-    protected bool Equals(LinkedColumnInfoNode other)
-    {
-        return Equals(CatalogueItem, other.CatalogueItem) && Equals(ColumnInfo, other.ColumnInfo);
-    }
+    protected bool Equals(LinkedColumnInfoNode other) =>
+        Equals(CatalogueItem, other.CatalogueItem) && Equals(ColumnInfo, other.ColumnInfo);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LinkedColumnInfoNode) obj);
+        return Equals((LinkedColumnInfoNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((CatalogueItem != null ? CatalogueItem.GetHashCode() : 0)*397) ^ (ColumnInfo != null ? ColumnInfo.GetHashCode() : 0);
+            return ((CatalogueItem != null ? CatalogueItem.GetHashCode() : 0) * 397) ^
+                   (ColumnInfo != null ? ColumnInfo.GetHashCode() : 0);
         }
     }
 
-    public object MasqueradingAs()
-    {
-        return ColumnInfo;
-    }
+    public object MasqueradingAs() => ColumnInfo;
 
     public void DeleteInDatabase()
     {
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllCataloguesUsedByLoadMetadataNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllCataloguesUsedByLoadMetadataNode.cs
index c58b91e461..212cd4e833 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllCataloguesUsedByLoadMetadataNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllCataloguesUsedByLoadMetadataNode.cs
@@ -18,8 +18,13 @@ namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 public class AllCataloguesUsedByLoadMetadataNode : Node, IOrderable
 {
     public LoadMetadata LoadMetadata { get; private set; }
-    public int Order { get => 1;
-        set { } }
+
+    public int Order
+    {
+        get => 1;
+        set { }
+    }
+
     public List<Catalogue> UsedCatalogues { get; set; }
 
     public AllCataloguesUsedByLoadMetadataNode(LoadMetadata lmd)
@@ -27,26 +32,17 @@ public AllCataloguesUsedByLoadMetadataNode(LoadMetadata lmd)
         LoadMetadata = lmd;
     }
 
-    public override string ToString()
-    {
-        return "Catalogues";
-    }
+    public override string ToString() => "Catalogues";
 
-    protected bool Equals(AllCataloguesUsedByLoadMetadataNode other)
-    {
-        return Equals(LoadMetadata, other.LoadMetadata);
-    }
+    protected bool Equals(AllCataloguesUsedByLoadMetadataNode other) => Equals(LoadMetadata, other.LoadMetadata);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((AllCataloguesUsedByLoadMetadataNode) obj);
+        return Equals((AllCataloguesUsedByLoadMetadataNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllProcessTasksUsedByLoadMetadataNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllProcessTasksUsedByLoadMetadataNode.cs
index 2bfc60d2c9..519c140dbc 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllProcessTasksUsedByLoadMetadataNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/AllProcessTasksUsedByLoadMetadataNode.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class AllProcessTasksUsedByLoadMetadataNode : Node,IOrderable
+public class AllProcessTasksUsedByLoadMetadataNode : Node, IOrderable
 {
     public LoadMetadata LoadMetadata { get; private set; }
 
@@ -18,29 +18,23 @@ public AllProcessTasksUsedByLoadMetadataNode(LoadMetadata loadMetadata)
         LoadMetadata = loadMetadata;
     }
 
-    public override string ToString()
-    {
-        return "Process Tasks";
-    }
+    public override string ToString() => "Process Tasks";
 
-    protected bool Equals(AllProcessTasksUsedByLoadMetadataNode other)
-    {
-        return Equals(LoadMetadata, other.LoadMetadata);
-    }
+    protected bool Equals(AllProcessTasksUsedByLoadMetadataNode other) => Equals(LoadMetadata, other.LoadMetadata);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((AllProcessTasksUsedByLoadMetadataNode) obj);
+        return Equals((AllProcessTasksUsedByLoadMetadataNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+
+    public int Order
     {
-        return LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+        get => 2;
+        set { }
     }
-
-    public int Order { get => 2;
-        set{} }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/CatalogueUsedByLoadMetadataNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/CatalogueUsedByLoadMetadataNode.cs
index 89dfc730ec..7809d329ce 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/CatalogueUsedByLoadMetadataNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/CatalogueUsedByLoadMetadataNode.cs
@@ -11,10 +11,11 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class CatalogueUsedByLoadMetadataNode:ObjectUsedByOtherObjectNode<LoadMetadata,Catalogue>,IDeletableWithCustomMessage
+public class CatalogueUsedByLoadMetadataNode : ObjectUsedByOtherObjectNode<LoadMetadata, Catalogue>,
+    IDeletableWithCustomMessage
 {
-
-    public CatalogueUsedByLoadMetadataNode(LoadMetadata loadMetadata, Catalogue catalogue):base(loadMetadata,catalogue)
+    public CatalogueUsedByLoadMetadataNode(LoadMetadata loadMetadata, Catalogue catalogue) : base(loadMetadata,
+        catalogue)
     {
     }
 
@@ -25,14 +26,8 @@ public void DeleteInDatabase()
         ObjectBeingUsed.SaveToDatabase();
     }
 
-    public string GetDeleteMessage()
-    {
-        return $"remove Catalogue '{ObjectBeingUsed}' from Load";
-    }
+    public string GetDeleteMessage() => $"remove Catalogue '{ObjectBeingUsed}' from Load";
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadDirectoryNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadDirectoryNode.cs
index eafc3a5838..b68a97900e 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadDirectoryNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadDirectoryNode.cs
@@ -10,7 +10,7 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class LoadDirectoryNode: Node,IDirectoryInfoNode, IOrderable
+public class LoadDirectoryNode : Node, IDirectoryInfoNode, IOrderable
 {
     public LoadMetadata LoadMetadata { get; set; }
 
@@ -22,37 +22,33 @@ public LoadDirectoryNode(LoadMetadata loadMetadata)
     public bool IsEmpty => string.IsNullOrWhiteSpace(LoadMetadata.LocationOfFlatFiles);
 
 
-    public override string ToString()
-    {
-        return string.IsNullOrWhiteSpace(LoadMetadata.LocationOfFlatFiles) ? "???" : LoadMetadata.LocationOfFlatFiles;
-    }
+    public override string ToString() => string.IsNullOrWhiteSpace(LoadMetadata.LocationOfFlatFiles)
+        ? "???"
+        : LoadMetadata.LocationOfFlatFiles;
 
     public DirectoryInfo GetDirectoryInfoIfAny()
     {
-        if (string.IsNullOrWhiteSpace(LoadMetadata.LocationOfFlatFiles ))
+        if (string.IsNullOrWhiteSpace(LoadMetadata.LocationOfFlatFiles))
             return null;
 
         return new DirectoryInfo(LoadMetadata.LocationOfFlatFiles);
     }
 
-    protected bool Equals(LoadDirectoryNode other)
-    {
-        return Equals(LoadMetadata, other.LoadMetadata);
-    }
+    protected bool Equals(LoadDirectoryNode other) => Equals(LoadMetadata, other.LoadMetadata);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadDirectoryNode) obj);
+        return Equals((LoadDirectoryNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+
+    public int Order
     {
-        return LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+        get => 3;
+        set { }
     }
-
-    public int Order { get => 3;
-        set{} }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadMetadataScheduleNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadMetadataScheduleNode.cs
index c2320a38fa..d71953ad10 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadMetadataScheduleNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadMetadataScheduleNode.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class LoadMetadataScheduleNode : Node,IOrderable
+public class LoadMetadataScheduleNode : Node, IOrderable
 {
     public LoadMetadata LoadMetadata { get; private set; }
 
@@ -18,29 +18,23 @@ public LoadMetadataScheduleNode(LoadMetadata loadMetadata)
         LoadMetadata = loadMetadata;
     }
 
-    public override string ToString()
-    {
-        return "Scheduling";
-    }
+    public override string ToString() => "Scheduling";
 
-    protected bool Equals(LoadMetadataScheduleNode other)
-    {
-        return Equals(LoadMetadata, other.LoadMetadata);
-    }
+    protected bool Equals(LoadMetadataScheduleNode other) => Equals(LoadMetadata, other.LoadMetadata);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadMetadataScheduleNode) obj);
+        return Equals((LoadMetadataScheduleNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+
+    public int Order
     {
-        return LoadMetadata != null ? LoadMetadata.GetHashCode() : 0;
+        get => 0;
+        set { }
     }
-
-    public int Order { get => 0;
-        set{} }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadStageNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadStageNode.cs
index 0c407dcc65..db3110d1a1 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadStageNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/LoadStageNode.cs
@@ -9,14 +9,17 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class LoadStageNode : Node,IOrderable
+public class LoadStageNode : Node, IOrderable
 {
     public LoadMetadata LoadMetadata { get; private set; }
     public LoadStage LoadStage { get; private set; }
 
     //prevent reordering
-    public int Order { get => (int)LoadStage;
-        set { } }
+    public int Order
+    {
+        get => (int)LoadStage;
+        set { }
+    }
 
     public LoadStageNode(LoadMetadata loadMetadata, LoadStage loadStage)
     {
@@ -24,29 +27,24 @@ public LoadStageNode(LoadMetadata loadMetadata, LoadStage loadStage)
         LoadStage = loadStage;
     }
 
-    public override string ToString()
-    {
-        return LoadStage.ToString();
-    }
+    public override string ToString() => LoadStage.ToString();
 
-    protected bool Equals(LoadStageNode other)
-    {
-        return Equals(LoadMetadata, other.LoadMetadata) && LoadStage == other.LoadStage;
-    }
+    protected bool Equals(LoadStageNode other) =>
+        Equals(LoadMetadata, other.LoadMetadata) && LoadStage == other.LoadStage;
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadStageNode) obj);
+        return Equals((LoadStageNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((LoadMetadata != null ? LoadMetadata.GetHashCode() : 0)*397) ^ (int) LoadStage;
+            return ((LoadMetadata != null ? LoadMetadata.GetHashCode() : 0) * 397) ^ (int)LoadStage;
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/OverrideRawServerNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/OverrideRawServerNode.cs
index e9decca054..451c4f06e5 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/OverrideRawServerNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/OverrideRawServerNode.cs
@@ -11,11 +11,12 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-internal class OverrideRawServerNode:ObjectUsedByOtherObjectNode<LoadMetadata,ExternalDatabaseServer>,IDeletableWithCustomMessage
+internal class OverrideRawServerNode : ObjectUsedByOtherObjectNode<LoadMetadata, ExternalDatabaseServer>,
+    IDeletableWithCustomMessage
 {
-    public OverrideRawServerNode(LoadMetadata user, ExternalDatabaseServer objectBeingUsed) : base(user, objectBeingUsed)
+    public OverrideRawServerNode(LoadMetadata user, ExternalDatabaseServer objectBeingUsed) : base(user,
+        objectBeingUsed)
     {
-
     }
 
     public void DeleteInDatabase()
@@ -24,18 +25,10 @@ public void DeleteInDatabase()
         User.SaveToDatabase();
     }
 
-    public override string ToString()
-    {
-        return $"Override RAW:{ObjectBeingUsed.Name}";
-    }
+    public override string ToString() => $"Override RAW:{ObjectBeingUsed.Name}";
+
+    public string GetDeleteMessage() => "remove explicit RAW server";
 
-    public string GetDeleteMessage()
-    {
-        return "remove explicit RAW server";
-    }
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/PermissionWindowUsedByCacheProgressNode.cs b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/PermissionWindowUsedByCacheProgressNode.cs
index 3f87dd8ecd..8eb25e4ee4 100644
--- a/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/PermissionWindowUsedByCacheProgressNode.cs
+++ b/Rdmp.Core/Providers/Nodes/LoadMetadataNodes/PermissionWindowUsedByCacheProgressNode.cs
@@ -10,23 +10,22 @@
 
 namespace Rdmp.Core.Providers.Nodes.LoadMetadataNodes;
 
-public class PermissionWindowUsedByCacheProgressNode: Node,IDeletableWithCustomMessage
+public class PermissionWindowUsedByCacheProgressNode : Node, IDeletableWithCustomMessage
 {
     public CacheProgress CacheProgress { get; set; }
     public PermissionWindow PermissionWindow { get; private set; }
     public bool DirectionIsCacheToPermissionWindow { get; set; }
 
-    public PermissionWindowUsedByCacheProgressNode(CacheProgress cacheProgress, PermissionWindow permissionWindow, bool directionIsCacheToPermissionWindow)
+    public PermissionWindowUsedByCacheProgressNode(CacheProgress cacheProgress, PermissionWindow permissionWindow,
+        bool directionIsCacheToPermissionWindow)
     {
         CacheProgress = cacheProgress;
         PermissionWindow = permissionWindow;
         DirectionIsCacheToPermissionWindow = directionIsCacheToPermissionWindow;
     }
 
-    public override string ToString()
-    {
-        return DirectionIsCacheToPermissionWindow ? PermissionWindow.Name : CacheProgress.ToString();
-    }
+    public override string ToString() =>
+        DirectionIsCacheToPermissionWindow ? PermissionWindow.Name : CacheProgress.ToString();
 
     public void DeleteInDatabase()
     {
@@ -35,38 +34,32 @@ public void DeleteInDatabase()
     }
 
     /// <inheritdoc/>
-    public string GetDeleteMessage()
-    {
-        return "remove PermissionWindow from CacheProgress";
-    }
+    public string GetDeleteMessage() => "remove PermissionWindow from CacheProgress";
+
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 
     #region Equality Members
-    protected bool Equals(PermissionWindowUsedByCacheProgressNode other)
-    {
-        return CacheProgress.Equals(other.CacheProgress) && PermissionWindow.Equals(other.PermissionWindow) && DirectionIsCacheToPermissionWindow.Equals(other.DirectionIsCacheToPermissionWindow);
-    }
+
+    protected bool Equals(PermissionWindowUsedByCacheProgressNode other) => CacheProgress.Equals(other.CacheProgress) &&
+                                                                            PermissionWindow.Equals(
+                                                                                other.PermissionWindow) &&
+                                                                            DirectionIsCacheToPermissionWindow.Equals(
+                                                                                other
+                                                                                    .DirectionIsCacheToPermissionWindow);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((PermissionWindowUsedByCacheProgressNode) obj);
+        return Equals((PermissionWindowUsedByCacheProgressNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return System.HashCode.Combine(CacheProgress, PermissionWindow, DirectionIsCacheToPermissionWindow);
-    }
+    public override int GetHashCode() =>
+        System.HashCode.Combine(CacheProgress, PermissionWindow, DirectionIsCacheToPermissionWindow);
+
     #endregion
 
-    public object GetImageObject()
-    {
-        return DirectionIsCacheToPermissionWindow ? PermissionWindow : (object)CacheProgress;
-    }
+    public object GetImageObject() => DirectionIsCacheToPermissionWindow ? PermissionWindow : (object)CacheProgress;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/PackageContentNode.cs b/Rdmp.Core/Providers/Nodes/PackageContentNode.cs
index ce9b22067f..c4609ff51c 100644
--- a/Rdmp.Core/Providers/Nodes/PackageContentNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PackageContentNode.cs
@@ -15,42 +15,38 @@ namespace Rdmp.Core.Providers.Nodes;
 /// Collection of all datasets in a given <see cref="Package"/>.  This lets you define template sets of datasets which all get extracted together
 /// e.g. 'Core Datasets'.
 /// </summary>
-public class PackageContentNode:Node,IDeletableWithCustomMessage, IMasqueradeAs
+public class PackageContentNode : Node, IDeletableWithCustomMessage, IMasqueradeAs
 {
     private readonly IExtractableDataSetPackageManager _contents;
     public IExtractableDataSetPackage Package { get; set; }
     public IExtractableDataSet DataSet { get; set; }
 
-    public PackageContentNode(IExtractableDataSetPackage package, IExtractableDataSet dataSet, IExtractableDataSetPackageManager contents)
+    public PackageContentNode(IExtractableDataSetPackage package, IExtractableDataSet dataSet,
+        IExtractableDataSetPackageManager contents)
     {
         _contents = contents;
         Package = package;
         DataSet = dataSet;
     }
 
-    public override string ToString()
-    {
-        return DataSet.ToString();
-    }
+    public override string ToString() => DataSet.ToString();
 
-    protected bool Equals(PackageContentNode other)
-    {
-        return Equals(Package, other.Package) && Equals(DataSet, other.DataSet);
-    }
+    protected bool Equals(PackageContentNode other) => Equals(Package, other.Package) && Equals(DataSet, other.DataSet);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((PackageContentNode) obj);
+        return Equals((PackageContentNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((Package != null ? Package.GetHashCode() : 0)*397) ^ (DataSet != null ? DataSet.GetHashCode() : 0);
+            return ((Package != null ? Package.GetHashCode() : 0) * 397) ^
+                   (DataSet != null ? DataSet.GetHashCode() : 0);
         }
     }
 
@@ -59,20 +55,11 @@ public void DeleteInDatabase()
         _contents.RemoveDataSetFromPackage(Package, DataSet);
     }
 
-    public object MasqueradingAs()
-    {
-        return DataSet;
-    }
+    public object MasqueradingAs() => DataSet;
 
     /// <inheritdoc/>
-    public string GetDeleteMessage()
-    {
-        return $"remove '{DataSet}' from Pacakge";
-    }
+    public string GetDeleteMessage() => $"remove '{DataSet}' from Pacakge";
 
     /// <inheritdoc/>
-    public string GetDeleteVerb()
-    {
-        return "Remove";
-    }
+    public string GetDeleteVerb() => "Remove";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/PipelineNodes/AllPipelinesNode.cs b/Rdmp.Core/Providers/Nodes/PipelineNodes/AllPipelinesNode.cs
index e06790d909..44b2c26e5f 100644
--- a/Rdmp.Core/Providers/Nodes/PipelineNodes/AllPipelinesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PipelineNodes/AllPipelinesNode.cs
@@ -10,10 +10,9 @@ namespace Rdmp.Core.Providers.Nodes.PipelineNodes;
 /// Pipelines are sequences of tailorable components which achieve a given goal (e.g. load a cohort).  This node is a collection of all
 /// common use cases for pipelines.
 /// </summary>
-public class AllPipelinesNode:SingletonNode
+public class AllPipelinesNode : SingletonNode
 {
     public AllPipelinesNode() : base("Pipelines")
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/PipelineNodes/OtherPipelinesNode.cs b/Rdmp.Core/Providers/Nodes/PipelineNodes/OtherPipelinesNode.cs
index 2a758e93ed..293cd131e0 100644
--- a/Rdmp.Core/Providers/Nodes/PipelineNodes/OtherPipelinesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PipelineNodes/OtherPipelinesNode.cs
@@ -14,12 +14,11 @@ namespace Rdmp.Core.Providers.Nodes.PipelineNodes;
 /// pipelines for which are not compatible with core RDMP use cases (these might be broken or designed for plugin code / custom goals - 
 /// e.g. loading imaging data).
 /// </summary>
-public class OtherPipelinesNode:SingletonNode
+public class OtherPipelinesNode : SingletonNode
 {
-    public List<Pipeline> Pipelines { get; } = new List<Pipeline>();
+    public List<Pipeline> Pipelines { get; } = new();
 
-    public OtherPipelinesNode():base("Other Pipelines")
+    public OtherPipelinesNode() : base("Other Pipelines")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/PipelineNodes/PipelineCompatibleWithUseCaseNode.cs b/Rdmp.Core/Providers/Nodes/PipelineNodes/PipelineCompatibleWithUseCaseNode.cs
index 3598420941..2a8d518b7f 100644
--- a/Rdmp.Core/Providers/Nodes/PipelineNodes/PipelineCompatibleWithUseCaseNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PipelineNodes/PipelineCompatibleWithUseCaseNode.cs
@@ -24,7 +24,8 @@ public class PipelineCompatibleWithUseCaseNode : SpontaneousObject, IMasqueradeA
     public PipelineUseCase UseCase { get; set; }
     private Type _useCaseType;
 
-    public PipelineCompatibleWithUseCaseNode(MemoryRepository repo, Pipeline pipeline, PipelineUseCase useCase):base(null)
+    public PipelineCompatibleWithUseCaseNode(MemoryRepository repo, Pipeline pipeline, PipelineUseCase useCase) :
+        base(null)
     {
         Pipeline = pipeline;
         UseCase = useCase;
@@ -32,46 +33,37 @@ public PipelineCompatibleWithUseCaseNode(MemoryRepository repo, Pipeline pipelin
         _useCaseType = UseCase.GetType();
     }
 
-    public object MasqueradingAs()
-    {
-        return Pipeline;
-    }
+    public object MasqueradingAs() => Pipeline;
 
-    public override string ToString()
-    {
-        return Pipeline.Name;
-    }
+    public override string ToString() => Pipeline.Name;
 
     public override void DeleteInDatabase()
     {
         Pipeline.DeleteInDatabase();
     }
 
-    public override bool Exists()
-    {
-        return Pipeline.Exists();
-    }
+    public override bool Exists() => Pipeline.Exists();
 
     #region Equality
-    protected bool Equals(PipelineCompatibleWithUseCaseNode other)
-    {
-        return _useCaseType == other._useCaseType && Pipeline.Equals(other.Pipeline);
-    }
+
+    protected bool Equals(PipelineCompatibleWithUseCaseNode other) =>
+        _useCaseType == other._useCaseType && Pipeline.Equals(other.Pipeline);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((PipelineCompatibleWithUseCaseNode) obj);
+        return Equals((PipelineCompatibleWithUseCaseNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return (_useCaseType.GetHashCode()*397) ^ Pipeline.GetHashCode();
+            return (_useCaseType.GetHashCode() * 397) ^ Pipeline.GetHashCode();
         }
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/PipelineNodes/StandardPipelineUseCaseNode.cs b/Rdmp.Core/Providers/Nodes/PipelineNodes/StandardPipelineUseCaseNode.cs
index 8af25fec91..9c03235a5f 100644
--- a/Rdmp.Core/Providers/Nodes/PipelineNodes/StandardPipelineUseCaseNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PipelineNodes/StandardPipelineUseCaseNode.cs
@@ -15,18 +15,19 @@ namespace Rdmp.Core.Providers.Nodes.PipelineNodes;
 /// <summary>
 /// Collection of all the Pipelines compatible with a given use case. 
 /// </summary>
-public class StandardPipelineUseCaseNode : SingletonNode,IKnowWhatIAm
+public class StandardPipelineUseCaseNode : SingletonNode, IKnowWhatIAm
 {
     private readonly CommentStore _commentStore;
     public PipelineUseCase UseCase { get; set; }
-    public List<Pipeline> Pipelines { get; } = new List<Pipeline>();
+    public List<Pipeline> Pipelines { get; } = new();
 
-    public StandardPipelineUseCaseNode(string caption, PipelineUseCase useCase,CommentStore commentStore) : base(caption)
+    public StandardPipelineUseCaseNode(string caption, PipelineUseCase useCase, CommentStore commentStore) :
+        base(caption)
     {
         _commentStore = commentStore;
         UseCase = useCase;
     }
-        
+
     public string WhatIsThis()
     {
         var useCaseType = UseCase.GetType();
diff --git a/Rdmp.Core/Providers/Nodes/PreLoadDiscardedColumnsNode.cs b/Rdmp.Core/Providers/Nodes/PreLoadDiscardedColumnsNode.cs
index 4235345ccd..ce21bc895b 100644
--- a/Rdmp.Core/Providers/Nodes/PreLoadDiscardedColumnsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/PreLoadDiscardedColumnsNode.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// All virtual columns in this <see cref="Curation.Data.TableInfo"/> which appear in the data load (RAW) but do not exist in the live database (or are diluted).  This enables
 /// anonymisation or dropping of columns during the data load (See <see cref="PreLoadDiscardedColumn"/>)
 /// </summary>
-public class PreLoadDiscardedColumnsNode:Node
+public class PreLoadDiscardedColumnsNode : Node
 {
     public TableInfo TableInfo { get; private set; }
 
@@ -22,28 +22,17 @@ public PreLoadDiscardedColumnsNode(TableInfo tableInfo)
         TableInfo = tableInfo;
     }
 
-    public override string ToString()
-    {
-        return "Discarded Columns";
-    }
+    public override string ToString() => "Discarded Columns";
 
-    protected bool Equals(PreLoadDiscardedColumnsNode other)
-    {
-        return Equals(TableInfo, other.TableInfo);
-    }
+    protected bool Equals(PreLoadDiscardedColumnsNode other) => Equals(TableInfo, other.TableInfo);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((PreLoadDiscardedColumnsNode) obj);
+        return Equals((PreLoadDiscardedColumnsNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return TableInfo != null ? TableInfo.GetHashCode() : 0;
-    }
-
-
+    public override int GetHashCode() => TableInfo != null ? TableInfo.GetHashCode() : 0;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ProjectCataloguesNode.cs b/Rdmp.Core/Providers/Nodes/ProjectCataloguesNode.cs
index bf992ac79c..0b31696c82 100644
--- a/Rdmp.Core/Providers/Nodes/ProjectCataloguesNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ProjectCataloguesNode.cs
@@ -13,36 +13,32 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <summary>
 /// Collection of all project specific datasets (<see cref="Catalogue"/>s which can only be used with this <see cref="Project"/>).
 /// </summary>
-public class ProjectCataloguesNode:Node, IOrderable
+public class ProjectCataloguesNode : Node, IOrderable
 {
     public Project Project { get; set; }
-    public int Order { get => 5; set{ } }
 
-    public ProjectCataloguesNode(Project project)
+    public int Order
     {
-        Project = project;
+        get => 5;
+        set { }
     }
 
-    public override string ToString()
+    public ProjectCataloguesNode(Project project)
     {
-        return "Project Specific Catalogues";
+        Project = project;
     }
 
-    protected bool Equals(ProjectCataloguesNode other)
-    {
-        return Project.Equals(other.Project);
-    }
+    public override string ToString() => "Project Specific Catalogues";
+
+    protected bool Equals(ProjectCataloguesNode other) => Project.Equals(other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ProjectCataloguesNode) obj);
+        return Equals((ProjectCataloguesNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Project.GetHashCode();
-    }
+    public override int GetHashCode() => Project.GetHashCode();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortIdentificationConfigurationAssociationsNode.cs b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortIdentificationConfigurationAssociationsNode.cs
index 65ee1d13a1..cfb221481d 100644
--- a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortIdentificationConfigurationAssociationsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortIdentificationConfigurationAssociationsNode.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.Providers.Nodes.ProjectCohortNodes;
 /// 
 /// <para>A <see cref="CohortIdentificationConfiguration"/> can be associated with multiple Projects</para>
 /// </summary>
-public class ProjectCohortIdentificationConfigurationAssociationsNode:Node,IOrderable
+public class ProjectCohortIdentificationConfigurationAssociationsNode : Node, IOrderable
 {
     public Project Project { get; set; }
 
@@ -24,29 +24,24 @@ public ProjectCohortIdentificationConfigurationAssociationsNode(Project project)
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Cohort Builder Queries";
-    }
+    public override string ToString() => "Cohort Builder Queries";
 
-    protected bool Equals(ProjectCohortIdentificationConfigurationAssociationsNode other)
-    {
-        return Equals(Project, other.Project);
-    }
+    protected bool Equals(ProjectCohortIdentificationConfigurationAssociationsNode other) =>
+        Equals(Project, other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ProjectCohortIdentificationConfigurationAssociationsNode) obj);
+        return Equals((ProjectCohortIdentificationConfigurationAssociationsNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => Project != null ? Project.GetHashCode() : 0;
+
+    public int Order
     {
-        return Project != null ? Project.GetHashCode() : 0;
+        get => 1;
+        set { }
     }
-
-    public int Order { get => 1;
-        set{} }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortsNode.cs b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortsNode.cs
index 9686c35ab4..d84adf267c 100644
--- a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectCohortsNode.cs
@@ -9,7 +9,7 @@
 
 namespace Rdmp.Core.Providers.Nodes.ProjectCohortNodes;
 
-public class ProjectCohortsNode:Node,IOrderable
+public class ProjectCohortsNode : Node, IOrderable
 {
     public Project Project { get; set; }
 
@@ -18,39 +18,27 @@ public ProjectCohortsNode(Project project)
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Project Cohorts";
-    }
-
-    public int Order { get => 1;
-        set { } }
+    public override string ToString() => "Project Cohorts";
 
-    protected bool Equals(ProjectCohortsNode other)
+    public int Order
     {
-        return Project.Equals(other.Project);
+        get => 1;
+        set { }
     }
 
+    protected bool Equals(ProjectCohortsNode other) => Project.Equals(other.Project);
+
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ProjectCohortsNode) obj);
+        return Equals((ProjectCohortsNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Project.GetHashCode();
-    }
+    public override int GetHashCode() => Project.GetHashCode();
 
-    public static bool operator ==(ProjectCohortsNode left, ProjectCohortsNode right)
-    {
-        return Equals(left, right);
-    }
+    public static bool operator ==(ProjectCohortsNode left, ProjectCohortsNode right) => Equals(left, right);
 
-    public static bool operator !=(ProjectCohortsNode left, ProjectCohortsNode right)
-    {
-        return !Equals(left, right);
-    }
+    public static bool operator !=(ProjectCohortsNode left, ProjectCohortsNode right) => !Equals(left, right);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectSavedCohortsNode.cs b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectSavedCohortsNode.cs
index 9a0dba69a2..e8adf9f2ff 100644
--- a/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectSavedCohortsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/ProjectCohortNodes/ProjectSavedCohortsNode.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Providers.Nodes.ProjectCohortNodes;
 /// Collection of all saved cohort lists (<see cref="ExtractableCohort"/>) which were saved against a <see cref="Project"/>.  Cohorts are
 /// associated with the <see cref="Project"/> via the project number.
 /// </summary>
-public class ProjectSavedCohortsNode:Node,IOrderable
+public class ProjectSavedCohortsNode : Node, IOrderable
 {
     public Project Project { get; set; }
 
@@ -22,29 +22,23 @@ public ProjectSavedCohortsNode(Project project)
         Project = project;
     }
 
-    public override string ToString()
-    {
-        return "Saved Cohorts";
-    }
+    public override string ToString() => "Saved Cohorts";
 
-    protected bool Equals(ProjectSavedCohortsNode other)
-    {
-        return Equals(Project, other.Project);
-    }
+    protected bool Equals(ProjectSavedCohortsNode other) => Equals(Project, other.Project);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ProjectSavedCohortsNode) obj);
+        return Equals((ProjectSavedCohortsNode)obj);
     }
 
-    public override int GetHashCode()
+    public override int GetHashCode() => Project != null ? Project.GetHashCode() : 0;
+
+    public int Order
     {
-        return Project != null ? Project.GetHashCode() : 0;
+        get => 2;
+        set { }
     }
-
-    public int Order { get => 2;
-        set{}}
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectExportsNode.cs b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectExportsNode.cs
index 4287b7f898..c666ed701f 100644
--- a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectExportsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectExportsNode.cs
@@ -9,7 +9,7 @@ namespace Rdmp.Core.Providers.Nodes.SharingNodes;
 /// <summary>
 /// Collection of ObjectExport records which document RDMP metadata objects which you have exported (ready for sharing with another RDMP user).
 /// </summary>
-public class AllObjectExportsNode:SingletonNode
+public class AllObjectExportsNode : SingletonNode
 {
     public AllObjectExportsNode() : base("All Exports")
     {
diff --git a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectImportsNode.cs b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectImportsNode.cs
index de73371c11..8354dc7f98 100644
--- a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectImportsNode.cs
+++ b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectImportsNode.cs
@@ -9,10 +9,9 @@ namespace Rdmp.Core.Providers.Nodes.SharingNodes;
 /// <summary>
 /// Collection of ObjectImport records which document RDMP metadata objects which you have imported (from another RDMP instance).
 /// </summary>
-public class AllObjectImportsNode:SingletonNode
+public class AllObjectImportsNode : SingletonNode
 {
-    public AllObjectImportsNode():base("All Imports")
+    public AllObjectImportsNode() : base("All Imports")
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectSharingNode.cs b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectSharingNode.cs
index bab5138cb9..e31d50bb38 100644
--- a/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectSharingNode.cs
+++ b/Rdmp.Core/Providers/Nodes/SharingNodes/AllObjectSharingNode.cs
@@ -9,7 +9,7 @@ namespace Rdmp.Core.Providers.Nodes.SharingNodes;
 /// <summary>
 /// Collection of all ObjectExport and ObjectImport references (for sharing RDMP objects with other remote deployment instances of RDMP).
 /// </summary>
-public class AllObjectSharingNode:SingletonNode
+public class AllObjectSharingNode : SingletonNode
 {
     public AllObjectSharingNode() : base("Object Sharing")
     {
diff --git a/Rdmp.Core/Providers/Nodes/SingletonNode.cs b/Rdmp.Core/Providers/Nodes/SingletonNode.cs
index ccbffcf5d7..be5ea87056 100644
--- a/Rdmp.Core/Providers/Nodes/SingletonNode.cs
+++ b/Rdmp.Core/Providers/Nodes/SingletonNode.cs
@@ -10,7 +10,7 @@ namespace Rdmp.Core.Providers.Nodes;
 /// <see cref="Node"/> of which there can only ever be one in the RDMP object hierarchy e.g. <see cref="AllCohortsNode"/>.  By convention
 /// these classes should normally start with the prefix "All"
 /// </summary>
-public abstract class SingletonNode:Node
+public abstract class SingletonNode : Node
 {
     protected readonly string Caption;
 
@@ -19,15 +19,9 @@ protected SingletonNode(string caption)
         Caption = caption;
     }
 
-    public override string ToString()
-    {
-        return Caption;
-    }
+    public override string ToString() => Caption;
 
-    protected bool Equals(SingletonNode other)
-    {
-        return string.Equals(Caption, other.Caption);
-    }
+    protected bool Equals(SingletonNode other) => string.Equals(Caption, other.Caption);
 
     public override bool Equals(object obj)
     {
@@ -36,8 +30,5 @@ public override bool Equals(object obj)
         return obj is SingletonNode other && Equals(other);
     }
 
-    public override int GetHashCode()
-    {
-        return Caption.GetHashCode();
-    }
+    public override int GetHashCode() => Caption.GetHashCode();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/TableInfoDatabaseNode.cs b/Rdmp.Core/Providers/Nodes/TableInfoDatabaseNode.cs
index fb571a03ac..74ab1062d3 100644
--- a/Rdmp.Core/Providers/Nodes/TableInfoDatabaseNode.cs
+++ b/Rdmp.Core/Providers/Nodes/TableInfoDatabaseNode.cs
@@ -26,16 +26,11 @@ public TableInfoDatabaseNode(string databaseName, TableInfoServerNode server, IE
         DatabaseName = databaseName ?? NullDatabaseNode;
     }
 
-    public override string ToString()
-    {
-        return DatabaseName;
-    }
+    public override string ToString() => DatabaseName;
 
-    protected bool Equals(TableInfoDatabaseNode other)
-    {
-        return Server.Equals(other.Server) &&
-               string.Equals(DatabaseName, other.DatabaseName, StringComparison.CurrentCultureIgnoreCase);
-    }
+    protected bool Equals(TableInfoDatabaseNode other) =>
+        Server.Equals(other.Server) &&
+        string.Equals(DatabaseName, other.DatabaseName, StringComparison.CurrentCultureIgnoreCase);
 
     public override bool Equals(object obj)
     {
@@ -45,8 +40,5 @@ public override bool Equals(object obj)
         return Equals((TableInfoDatabaseNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(Server, DatabaseName);
-    }
+    public override int GetHashCode() => HashCode.Combine(Server, DatabaseName);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/TableInfoServerNode.cs b/Rdmp.Core/Providers/Nodes/TableInfoServerNode.cs
index 6432ebf139..6202169818 100644
--- a/Rdmp.Core/Providers/Nodes/TableInfoServerNode.cs
+++ b/Rdmp.Core/Providers/Nodes/TableInfoServerNode.cs
@@ -12,7 +12,7 @@
 
 namespace Rdmp.Core.Providers.Nodes;
 
-public class TableInfoServerNode:Node
+public class TableInfoServerNode : Node
 {
     public readonly DatabaseType DatabaseType;
     public string ServerName { get; private set; }
@@ -27,39 +27,31 @@ public TableInfoServerNode(string serverName, DatabaseType databaseType, IEnumer
         Tables = tables.ToArray();
     }
 
-    public override string ToString()
-    {
-        return ServerName;
-    }
+    public override string ToString() => ServerName;
 
-    protected bool Equals(TableInfoServerNode other)
-    {
-        return DatabaseType == other.DatabaseType && string.Equals(ServerName, other.ServerName,StringComparison.CurrentCultureIgnoreCase);
-    }
+    protected bool Equals(TableInfoServerNode other) => DatabaseType == other.DatabaseType &&
+                                                        string.Equals(ServerName, other.ServerName,
+                                                            StringComparison.CurrentCultureIgnoreCase);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((TableInfoServerNode) obj);
+        return Equals((TableInfoServerNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-
-            return ((int)DatabaseType * 397) ^ (ServerName != null ? StringComparer.CurrentCultureIgnoreCase.GetHashCode(ServerName) : 0);
+            return ((int)DatabaseType * 397) ^
+                   (ServerName != null ? StringComparer.CurrentCultureIgnoreCase.GetHashCode(ServerName) : 0);
         }
     }
 
-    public bool IsSameServer(TableInfo tableInfo)
-    {
-        return
-            ServerName.Equals(tableInfo.Server ?? NullServerNode,StringComparison.CurrentCultureIgnoreCase)
-            &&
-            DatabaseType == tableInfo.DatabaseType;
-
-    }
+    public bool IsSameServer(TableInfo tableInfo) =>
+        ServerName.Equals(tableInfo.Server ?? NullServerNode, StringComparison.CurrentCultureIgnoreCase)
+        &&
+        DatabaseType == tableInfo.DatabaseType;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/UsedByNodes/IObjectUsedByOtherObjectNode.cs b/Rdmp.Core/Providers/Nodes/UsedByNodes/IObjectUsedByOtherObjectNode.cs
index 7aea9ee476..e66511c1dd 100644
--- a/Rdmp.Core/Providers/Nodes/UsedByNodes/IObjectUsedByOtherObjectNode.cs
+++ b/Rdmp.Core/Providers/Nodes/UsedByNodes/IObjectUsedByOtherObjectNode.cs
@@ -8,14 +8,13 @@
 
 namespace Rdmp.Core.Providers.Nodes.UsedByNodes;
 
-public interface IObjectUsedByOtherObjectNode:IMasqueradeAs
+public interface IObjectUsedByOtherObjectNode : IMasqueradeAs
 {
-        
 }
 
 public interface IObjectUsedByOtherObjectNode<out T> : IObjectUsedByOtherObjectNode
 {
-    T User {get;}
+    T User { get; }
 }
 
 public interface IObjectUsedByOtherObjectNode<T, out T2> : IObjectUsedByOtherObjectNode<T>
diff --git a/Rdmp.Core/Providers/Nodes/UsedByNodes/ObjectUsedByOtherObjectNode.cs b/Rdmp.Core/Providers/Nodes/UsedByNodes/ObjectUsedByOtherObjectNode.cs
index ff6f50bd71..84ea37c389 100644
--- a/Rdmp.Core/Providers/Nodes/UsedByNodes/ObjectUsedByOtherObjectNode.cs
+++ b/Rdmp.Core/Providers/Nodes/UsedByNodes/ObjectUsedByOtherObjectNode.cs
@@ -16,9 +16,9 @@ namespace Rdmp.Core.Providers.Nodes.UsedByNodes;
 /// </summary>
 /// <typeparam name="T">The Type of the parent <see cref="User"/></typeparam>
 /// <typeparam name="T2">The type of <see cref="ObjectBeingUsed"/> by the parent</typeparam>
-public class ObjectUsedByOtherObjectNode<T, T2> : Node, IObjectUsedByOtherObjectNode<T,T2>
-    where T:class
-    where T2:class
+public class ObjectUsedByOtherObjectNode<T, T2> : Node, IObjectUsedByOtherObjectNode<T, T2>
+    where T : class
+    where T2 : class
 {
     /// <summary>
     /// The string representation of the <see cref="ObjectUsedByOtherObjectNode{T,T2}"/> when it <see cref="IsEmptyNode"/>
@@ -55,10 +55,7 @@ public ObjectUsedByOtherObjectNode(T user, T2 objectBeingUsed)
     /// Returns the <see cref="ObjectBeingUsed"/>
     /// </summary>
     /// <returns></returns>
-    public object MasqueradingAs()
-    {
-        return ObjectBeingUsed;
-    }
+    public object MasqueradingAs() => ObjectBeingUsed;
 
     /// <summary>
     /// Returns the string representation of <see cref="ObjectBeingUsed"/> or <see cref="EmptyRepresentation"/> if <see cref="IsEmptyNode"/>
@@ -73,15 +70,15 @@ public override string ToString()
     }
 
     #region Equality
+
     /// <summary>
     /// Equality based on <see cref="User"/> and <see cref="ObjectBeingUsed"/>
     /// </summary>
     /// <param name="other"></param>
     /// <returns></returns>
-    protected bool Equals(ObjectUsedByOtherObjectNode<T, T2> other)
-    {
-        return EqualityComparer<T>.Default.Equals(User, other.User) && EqualityComparer<T2>.Default.Equals(ObjectBeingUsed, other.ObjectBeingUsed);
-    }
+    protected bool Equals(ObjectUsedByOtherObjectNode<T, T2> other) =>
+        EqualityComparer<T>.Default.Equals(User, other.User) &&
+        EqualityComparer<T2>.Default.Equals(ObjectBeingUsed, other.ObjectBeingUsed);
 
     /// <inheritdoc/>
     public override bool Equals(object obj)
@@ -89,7 +86,7 @@ public override bool Equals(object obj)
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((ObjectUsedByOtherObjectNode<T, T2>) obj);
+        return Equals((ObjectUsedByOtherObjectNode<T, T2>)obj);
     }
 
     /// <inheritdoc/>
@@ -97,8 +94,10 @@ public override int GetHashCode()
     {
         unchecked
         {
-            return (EqualityComparer<T>.Default.GetHashCode(User)*397) ^ EqualityComparer<T2>.Default.GetHashCode(ObjectBeingUsed);
+            return (EqualityComparer<T>.Default.GetHashCode(User) * 397) ^
+                   EqualityComparer<T2>.Default.GetHashCode(ObjectBeingUsed);
         }
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Providers/Nodes/UsedByProject/CohortSourceUsedByProjectNode.cs b/Rdmp.Core/Providers/Nodes/UsedByProject/CohortSourceUsedByProjectNode.cs
index 84a72350d5..52a04fa7e1 100644
--- a/Rdmp.Core/Providers/Nodes/UsedByProject/CohortSourceUsedByProjectNode.cs
+++ b/Rdmp.Core/Providers/Nodes/UsedByProject/CohortSourceUsedByProjectNode.cs
@@ -13,11 +13,11 @@ namespace Rdmp.Core.Providers.Nodes.UsedByProject;
 /// <summary>
 /// Collection of all cohort databases which contain cohorts that can be used in a given <see cref="Project"/>
 /// </summary>
-public class CohortSourceUsedByProjectNode : ObjectUsedByOtherObjectNode<Project,ExternalCohortTable>
+public class CohortSourceUsedByProjectNode : ObjectUsedByOtherObjectNode<Project, ExternalCohortTable>
 {
-    public List<ObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode,ExtractableCohort>> CohortsUsed { get; set; }
+    public List<ObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode, ExtractableCohort>> CohortsUsed { get; set; }
 
-    public CohortSourceUsedByProjectNode(Project project,ExternalCohortTable source): base(project,source)
+    public CohortSourceUsedByProjectNode(Project project, ExternalCohortTable source) : base(project, source)
     {
         CohortsUsed = new List<ObjectUsedByOtherObjectNode<CohortSourceUsedByProjectNode, ExtractableCohort>>();
     }
diff --git a/Rdmp.Core/Providers/ProblemProvider.cs b/Rdmp.Core/Providers/ProblemProvider.cs
index d700976c83..103f48d52b 100644
--- a/Rdmp.Core/Providers/ProblemProvider.cs
+++ b/Rdmp.Core/Providers/ProblemProvider.cs
@@ -14,23 +14,22 @@
 
 namespace Rdmp.Core.Providers;
 
-public abstract class ProblemProvider:IProblemProvider
+public abstract class ProblemProvider : IProblemProvider
 {
-    public static HashSet<Type> IgnoreBadNamesFor = new(new[] { 
+    public static HashSet<Type> IgnoreBadNamesFor = new(new[]
+    {
         typeof(TableInfo),
         typeof(ColumnInfo),
         typeof(IFilter),
-        typeof(Pipeline)});
-        
+        typeof(Pipeline)
+    });
+
     /// <inheritdoc/>
-    public bool HasProblem(object o)
-    {
-        return DescribeProblem(o) != null;
-    }
+    public bool HasProblem(object o) => DescribeProblem(o) != null;
 
     public string DescribeProblem(object o)
     {
-        if(o is INamed n && !IgnoreBadNamesFor.Any(t=>t.IsInstanceOfType(o)) && UsefulStuff.IsBadName(n.Name))
+        if (o is INamed n && !IgnoreBadNamesFor.Any(t => t.IsInstanceOfType(o)) && UsefulStuff.IsBadName(n.Name))
             return "Name contains illegal characters";
 
         return DescribeProblemImpl(o);
diff --git a/Rdmp.Core/Providers/RdmpEnumerableExtensions.cs b/Rdmp.Core/Providers/RdmpEnumerableExtensions.cs
index 6afc21446f..46ed3690ed 100644
--- a/Rdmp.Core/Providers/RdmpEnumerableExtensions.cs
+++ b/Rdmp.Core/Providers/RdmpEnumerableExtensions.cs
@@ -12,27 +12,24 @@ namespace Rdmp.Core.Providers;
 
 public static class RdmpEnumerableExtensions
 {
-    public static Dictionary<TKey, TElement> ToDictionaryEx<TSource, TKey, TElement>(this IEnumerable<TSource> source, Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector) where TKey : notnull
+    public static Dictionary<TKey, TElement> ToDictionaryEx<TSource, TKey, TElement>(this IEnumerable<TSource> source,
+        Func<TSource, TKey> keySelector, Func<TSource, TElement> elementSelector) where TKey : notnull
     {
         var d = new Dictionary<TKey, TElement>();
         foreach (var element in source)
-        {
             try
             {
                 d.Add(keySelector(element), elementSelector(element));
             }
             catch (Exception ex)
             {
-                if(element is IMapsDirectlyToDatabaseTable m)
-                {
-                    throw new Exception($"Failed to add {element} ({m.GetType().Name}, ID={m.ID}) to Dictionary.  Repository was {m.Repository}", ex);
-                }
+                if (element is IMapsDirectlyToDatabaseTable m)
+                    throw new Exception(
+                        $"Failed to add {element} ({m.GetType().Name}, ID={m.ID}) to Dictionary.  Repository was {m.Repository}",
+                        ex);
 
                 throw new Exception($"Failed to add {element} to Dictionary", ex);
-
-
             }
-        }
 
         return d;
     }
diff --git a/Rdmp.Core/Providers/SearchablesMatchScorer.cs b/Rdmp.Core/Providers/SearchablesMatchScorer.cs
index 46779fbe93..6ddf3814a6 100644
--- a/Rdmp.Core/Providers/SearchablesMatchScorer.cs
+++ b/Rdmp.Core/Providers/SearchablesMatchScorer.cs
@@ -42,7 +42,7 @@ public class SearchablesMatchScorer
     /// <summary>
     /// List of objects which should be favoured slightly above others of equal match potential
     /// </summary>
-    public List<IMapsDirectlyToDatabaseTable> BumpMatches { get; set; } = new List<IMapsDirectlyToDatabaseTable>();
+    public List<IMapsDirectlyToDatabaseTable> BumpMatches { get; set; } = new();
 
     /// <summary>
     /// Only show objects with the given ID
@@ -70,22 +70,21 @@ public class SearchablesMatchScorer
     /// When the user types one of these they get a filter on the full Type
     /// </summary>
     public static Dictionary<string, Type> ShortCodes =
-        new(StringComparer.CurrentCultureIgnoreCase){
-
-            {"c",typeof (Catalogue)},
-            {"ci",typeof (CatalogueItem)},
-            {"sd",typeof (SupportingDocument)},
-            {"p",typeof (Project)},
-            {"ec",typeof (ExtractionConfiguration)},
-            {"co",typeof (ExtractableCohort)},
-            {"cic",typeof (CohortIdentificationConfiguration)},
-            {"t",typeof (TableInfo)},
-            {"col",typeof (ColumnInfo)},
-            {"lmd",typeof (LoadMetadata)},
-            {"pipe",typeof(Pipeline)},
-            {"sds",typeof(SelectedDataSets)},
-            {"eds",typeof(ExternalDatabaseServer)}
-
+        new(StringComparer.CurrentCultureIgnoreCase)
+        {
+            { "c", typeof(Catalogue) },
+            { "ci", typeof(CatalogueItem) },
+            { "sd", typeof(SupportingDocument) },
+            { "p", typeof(Project) },
+            { "ec", typeof(ExtractionConfiguration) },
+            { "co", typeof(ExtractableCohort) },
+            { "cic", typeof(CohortIdentificationConfiguration) },
+            { "t", typeof(TableInfo) },
+            { "col", typeof(ColumnInfo) },
+            { "lmd", typeof(LoadMetadata) },
+            { "pipe", typeof(Pipeline) },
+            { "sds", typeof(SelectedDataSets) },
+            { "eds", typeof(ExternalDatabaseServer) }
         };
 
     /// <summary>
@@ -94,10 +93,9 @@ public class SearchablesMatchScorer
     /// Key Type.
     /// </summary>
     public static Dictionary<string, Type[]> AlsoIncludes =
-        new(StringComparer.CurrentCultureIgnoreCase){
-
-            {"Pipeline",new Type[]{ typeof(PipelineCompatibleWithUseCaseNode)}}
-
+        new(StringComparer.CurrentCultureIgnoreCase)
+        {
+            { "Pipeline", new Type[] { typeof(PipelineCompatibleWithUseCaseNode) } }
         };
 
     public SearchablesMatchScorer()
@@ -105,7 +103,6 @@ public SearchablesMatchScorer()
         TypeNames = new HashSet<string>(StringComparer.CurrentCultureIgnoreCase);
 
         _scoreZeroForCohortAggregateContainers = UserSettings.ScoreZeroForCohortAggregateContainers;
-                
     }
 
     /// <summary>
@@ -117,58 +114,62 @@ public SearchablesMatchScorer()
     /// <param name="cancellationToken">Token for cancelling match scoring.  This method will return null if cancellation is detected</param>
     /// <param name="showOnlyTypes">Optional (can be null) list of types to return results from.  Not respected if <paramref name="searchText"/> includes type names</param>
     /// <returns></returns>
-    public Dictionary<KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList>, int> ScoreMatches(Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> searchables, string searchText, CancellationToken cancellationToken, List<Type> showOnlyTypes)
+    public Dictionary<KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList>, int> ScoreMatches(
+        Dictionary<IMapsDirectlyToDatabaseTable, DescendancyList> searchables, string searchText,
+        CancellationToken cancellationToken, List<Type> showOnlyTypes)
     {
         SetupRespectUserSettings();
 
         //do short code substitutions e.g. ti for TableInfo
         if (!string.IsNullOrWhiteSpace(searchText))
-            foreach(var kvp in ShortCodes)
-                searchText = Regex.Replace(searchText,$@"\b{kvp.Key}\b",kvp.Value.Name);
-            
+            foreach (var kvp in ShortCodes)
+                searchText = Regex.Replace(searchText, $@"\b{kvp.Key}\b", kvp.Value.Name);
+
         //if user hasn't typed any explicit Type filters
-        if(showOnlyTypes != null && TypeNames != null)
+        if (showOnlyTypes != null && TypeNames != null)
             //add the explicit types only if the search text does not contain any explicit type names
-            if(string.IsNullOrWhiteSpace(searchText) || !TypeNames.Intersect(searchText.Split(' '),StringComparer.CurrentCultureIgnoreCase).Any())
+            if (string.IsNullOrWhiteSpace(searchText) ||
+                !TypeNames.Intersect(searchText.Split(' '), StringComparer.CurrentCultureIgnoreCase).Any())
                 foreach (var showOnlyType in showOnlyTypes)
                     searchText = $"{searchText} {showOnlyType.Name}";
 
         //Search the tokens for also inclusions e.g. "Pipeline" becomes "Pipeline PipelineCompatibleWithUseCaseNode"
         if (!string.IsNullOrWhiteSpace(searchText))
-            foreach(var s in searchText.Split(' ').ToArray())
+            foreach (var s in searchText.Split(' ').ToArray())
                 if (AlsoIncludes.TryGetValue(s, out var include))
-                    foreach(var v in include)
+                    foreach (var v in include)
                         searchText += $" {v.Name}";
 
         //if we have nothing to search for return no results
         if (ReturnEmptyResultWhenNoSearchTerms && string.IsNullOrWhiteSpace(searchText) && ID == null)
             return new Dictionary<KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList>, int>();
 
-        var tokens = (searchText??"").Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
+        var tokens = (searchText ?? "").Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
 
         var regexes = new List<Regex>();
-            
+
         //any token that 100% matches a type name is an explicitly typed token
         string[] explicitTypesRequested;
 
         if (TypeNames != null)
         {
-            explicitTypesRequested = TypeNames.Intersect(tokens,StringComparer.CurrentCultureIgnoreCase).ToArray();
+            explicitTypesRequested = TypeNames.Intersect(tokens, StringComparer.CurrentCultureIgnoreCase).ToArray();
 
             //else it's a regex
-            foreach (var token in tokens.Except(TypeNames,StringComparer.CurrentCultureIgnoreCase))
+            foreach (var token in tokens.Except(TypeNames, StringComparer.CurrentCultureIgnoreCase))
                 regexes.Add(new Regex(Regex.Escape(token), RegexOptions.IgnoreCase));
-
         }
         else
+        {
             explicitTypesRequested = Array.Empty<string>();
+        }
 
         if (cancellationToken.IsCancellationRequested)
             return null;
-            
+
         return searchables.ToDictionary(
             s => s,
-            score => ScoreMatches(score, regexes,explicitTypesRequested, cancellationToken)
+            score => ScoreMatches(score, regexes, explicitTypesRequested, cancellationToken)
         );
     }
 
@@ -181,7 +182,8 @@ private void SetupRespectUserSettings()
         _showNonExtractableCatalogues = !RespectUserSettings || UserSettings.ShowNonExtractableCatalogues;
     }
 
-    private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp, List<Regex> regexes, string[] explicitTypeNames, CancellationToken cancellationToken)
+    private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp, List<Regex> regexes,
+        string[] explicitTypeNames, CancellationToken cancellationToken)
     {
         var score = 0;
 
@@ -194,20 +196,14 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
             var obj = kvp.Key;
 
             //If the object is masquerading as something else, better to check that
-            if (kvp.Key is IMasqueradeAs m)
-            {
-                obj = m.MasqueradingAs() as IMapsDirectlyToDatabaseTable ?? obj;
-            }
+            if (kvp.Key is IMasqueradeAs m) obj = m.MasqueradingAs() as IMapsDirectlyToDatabaseTable ?? obj;
 
             if (obj.ID != ID.Value)
                 return 0;
             score += 10;
         }
 
-        if(RespectUserSettings && ScoreZeroBecauseOfUserSettings(kvp))
-        {
-            return 0;
-        }
+        if (RespectUserSettings && ScoreZeroBecauseOfUserSettings(kvp)) return 0;
 
         // if user is searching for a specific Type of object and we ain't it
         if (explicitTypeNames.Any())
@@ -219,7 +215,8 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
             return 0;
 
         //don't suggest AND/OR containers it's not helpful to navigate to these (unless user is searching by Type explicitly)
-        if ( _scoreZeroForCohortAggregateContainers && explicitTypeNames.Length == 0 && kvp.Key is CohortAggregateContainer)
+        if (_scoreZeroForCohortAggregateContainers && explicitTypeNames.Length == 0 &&
+            kvp.Key is CohortAggregateContainer)
             return 0;
 
         //if there are no tokens
@@ -227,11 +224,11 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
             if (explicitTypeNames.Any()) //if they have so far just typed a TypeName
                 return 1;
             else
-                return 1;//no regexes AND no TypeName what did they type! whatever everyone scores the same
-            
+                return 1; //no regexes AND no TypeName what did they type! whatever everyone scores the same
+
         //make a new list so we can destructively read it
         regexes = new List<Regex>(regexes);
-            
+
         //match on the head vs the regex tokens
         score += Weights[0] * CountMatchToString(regexes, kvp.Key);
 
@@ -253,13 +250,11 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
                 var parent = parents[^i];
 
                 if (parent != null)
-                {
                     if (parent is not IContainer)
                     {
                         score += Weights[i] * CountMatchToString(regexes, parent);
                         score += Weights[i] * CountMatchType(regexes, parent);
                     }
-                }
             }
         }
 
@@ -270,8 +265,8 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
         var catalogueIfAny = GetCatalogueIfAnyInDescendancy(kvp);
 
         if (catalogueIfAny != null && catalogueIfAny.IsDeprecated)
-            return score /10;
-            
+            return score / 10;
+
         //if we are bumping up matches
         if (score > 0 && BumpMatches.Contains(kvp.Key))
             score += BumpWeight;
@@ -284,12 +279,12 @@ private int ScoreMatches(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyL
     /// </summary>
     /// <param name="kvp"></param>
     /// <returns></returns>
-    private bool ScoreZeroBecauseOfUserSettings(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp)
-    {
-        return !Filter(kvp.Key, kvp.Value, _showInternalCatalogues, _showDeprecatedCatalogues, _showColdStorageCatalogues, _showProjectSpecificCatalogues, _showNonExtractableCatalogues);
-    }
+    private bool ScoreZeroBecauseOfUserSettings(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp) =>
+        !Filter(kvp.Key, kvp.Value, _showInternalCatalogues, _showDeprecatedCatalogues, _showColdStorageCatalogues,
+            _showProjectSpecificCatalogues, _showNonExtractableCatalogues);
 
-    private static Catalogue GetCatalogueIfAnyInDescendancy(KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp)
+    private static Catalogue GetCatalogueIfAnyInDescendancy(
+        KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList> kvp)
     {
         if (kvp.Key is Catalogue key)
             return key;
@@ -297,28 +292,28 @@ private static Catalogue GetCatalogueIfAnyInDescendancy(KeyValuePair<IMapsDirect
         return (Catalogue)kvp.Value?.Parents.FirstOrDefault(p => p is Catalogue);
     }
 
-    private static int CountMatchType(List<Regex> regexes, object key)
-    {
-        return MatchCount(regexes, key.GetType().Name);
-    }
+    private static int CountMatchType(List<Regex> regexes, object key) => MatchCount(regexes, key.GetType().Name);
+
     private static int CountMatchToString(List<Regex> regexes, object key)
     {
         var matchOn = key is ICustomSearchString s ? s.GetSearchString() : key.ToString();
 
         return MatchCount(regexes, matchOn);
     }
+
     private static int MatchCount(List<Regex> regexes, string str)
     {
         var matches = 0;
 
         //exact matches
-        foreach (var match in regexes.Where(r => r.ToString().Equals(str,StringComparison.CurrentCultureIgnoreCase)).ToArray())
+        foreach (var match in regexes.Where(r => r.ToString().Equals(str, StringComparison.CurrentCultureIgnoreCase))
+                     .ToArray())
         {
             regexes.Remove(match);
             //score double for exact matches
-            matches+=2;
+            matches += 2;
         }
-            
+
         //contains matches
         foreach (var match in regexes.Where(r => r.IsMatch(str)).ToArray())
         {
@@ -341,7 +336,8 @@ private static int MatchCount(List<Regex> regexes, string str)
     /// <param name="includeProjectSpecific"></param>
     /// <param name="includeNonExtractable"></param>
     /// <returns>True if the item should be shown to the user based on filters</returns>
-    public static bool Filter(object modelObject, DescendancyList descendancy, bool includeInternal, bool includeDeprecated, bool includeColdStorage, bool includeProjectSpecific, bool includeNonExtractable)
+    public static bool Filter(object modelObject, DescendancyList descendancy, bool includeInternal,
+        bool includeDeprecated, bool includeColdStorage, bool includeProjectSpecific, bool includeNonExtractable)
     {
         //doesn't relate to us...
         if (modelObject is not ICatalogue cata)
@@ -359,15 +355,16 @@ public static bool Filter(object modelObject, DescendancyList descendancy, bool
         }
 
         var isProjectSpecific = cata.IsProjectSpecific(null);
-        var isExtractable = cata.GetExtractabilityStatus(null) != null && cata.GetExtractabilityStatus(null).IsExtractable;
+        var isExtractable = cata.GetExtractabilityStatus(null) != null &&
+                            cata.GetExtractabilityStatus(null).IsExtractable;
 
-        return (isExtractable && !cata.IsColdStorageDataset && !cata.IsDeprecated && !cata.IsInternalDataset && !isProjectSpecific) ||
+        return (isExtractable && !cata.IsColdStorageDataset && !cata.IsDeprecated && !cata.IsInternalDataset &&
+                !isProjectSpecific) ||
                (includeColdStorage && cata.IsColdStorageDataset) ||
                (includeDeprecated && cata.IsDeprecated) ||
                (includeInternal && cata.IsInternalDataset) ||
                (includeProjectSpecific && isProjectSpecific) ||
                (includeNonExtractable && !isExtractable);
-
     }
 
     /// <summary>
@@ -378,13 +375,15 @@ public static bool Filter(object modelObject, DescendancyList descendancy, bool
     /// <param name="take"></param>
     /// <param name="activator"></param>
     /// <returns></returns>
-    public static List<IMapsDirectlyToDatabaseTable> ShortList(Dictionary<KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList>, int> scores, int take, IBasicActivateItems activator)
+    public static List<IMapsDirectlyToDatabaseTable> ShortList(
+        Dictionary<KeyValuePair<IMapsDirectlyToDatabaseTable, DescendancyList>, int> scores, int take,
+        IBasicActivateItems activator)
     {
         var favourites = activator.FavouritesProvider.CurrentFavourites;
 
         return scores.Where(score => score.Value > 0)
             .OrderByDescending(score => score.Value)
-            .ThenByDescending(kvp => favourites.Any(f=>f.IsReferenceTo(kvp.Key.Key))) // favour favourites
+            .ThenByDescending(kvp => favourites.Any(f => f.IsReferenceTo(kvp.Key.Key))) // favour favourites
             .ThenBy(kvp => kvp.Key.Key.ToString()) // sort ties alphabetically
             .Take(take)
             .Select(score => score.Key.Key)
diff --git a/Rdmp.Core/QueryBuilding/AggregateBuilder.cs b/Rdmp.Core/QueryBuilding/AggregateBuilder.cs
index 579c933e8e..6caefb8cb4 100644
--- a/Rdmp.Core/QueryBuilding/AggregateBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/AggregateBuilder.cs
@@ -45,13 +45,16 @@ public class AggregateBuilder : ISqlQueryBuilder
     private readonly ITableInfo[] _forceJoinsToTheseTables;
 
     /// <inheritdoc/>
-    public string SQL { get
+    public string SQL
     {
-        if (SQLOutOfDate)
-            RegenerateSQL();
+        get
+        {
+            if (SQLOutOfDate)
+                RegenerateSQL();
 
-        return _sql;
-    } }
+            return _sql;
+        }
+    }
 
     /// <inheritdoc/>
     public string LimitationSQL { get; private set; }
@@ -104,7 +107,7 @@ public string SQL { get
     public CustomLine AddCustomLine(string text, QueryComponent positionToInsert)
     {
         SQLOutOfDate = true;
-        return SqlQueryBuilderHelper.AddCustomLine(this,text, positionToInsert);
+        return SqlQueryBuilderHelper.AddCustomLine(this, text, positionToInsert);
     }
 
     /// <inheritdoc/>
@@ -123,6 +126,7 @@ public CustomLine AddCustomLine(string text, QueryComponent positionToInsert)
     public ParameterManager ParameterManager { get; private set; }
 
     private string _sql;
+
     /// <inheritdoc/>
     public bool SQLOutOfDate { get; set; }
 
@@ -143,13 +147,13 @@ public bool DoNotWriteOutParameters
         set
         {
             //no change
-            if(value == _doNotWriteOutParameters)
+            if (value == _doNotWriteOutParameters)
                 return;
 
             _doNotWriteOutParameters = value;
 
             //if the user is telling us not to write out parameters we had better clear any knowledge we had of parameters from previous runs
-            if(value)
+            if (value)
                 ParameterManager.ClearNonGlobals();
 
             SQLOutOfDate = true;
@@ -167,7 +171,8 @@ public bool DoNotWriteOutParameters
     /// <param name="countSQL"></param>
     /// <param name="aggregateConfigurationIfAny"></param>
     /// <param name="forceJoinsToTheseTables">Tables you definetly want the query to join against in the FROM section (compatible <see cref="JoinInfo"/> must exist if there are multiple)</param>
-    public AggregateBuilder(string limitationSQL, string countSQL,AggregateConfiguration aggregateConfigurationIfAny,ITableInfo[] forceJoinsToTheseTables)
+    public AggregateBuilder(string limitationSQL, string countSQL, AggregateConfiguration aggregateConfigurationIfAny,
+        ITableInfo[] forceJoinsToTheseTables)
         : this(limitationSQL, countSQL, aggregateConfigurationIfAny)
     {
         _forceJoinsToTheseTables = forceJoinsToTheseTables;
@@ -189,7 +194,7 @@ public AggregateBuilder(string limitationSQL, string countSQL,AggregateConfigura
     /// <param name="aggregateConfigurationIfAny"><see cref="AggregateConfiguration"/> containing columns, filters, parameters etc for the GROUP BY</param>
     public AggregateBuilder(string limitationSQL, string countSQL, AggregateConfiguration aggregateConfigurationIfAny)
     {
-        if (limitationSQL != null && limitationSQL.Trim().StartsWith("top",StringComparison.CurrentCultureIgnoreCase))
+        if (limitationSQL != null && limitationSQL.Trim().StartsWith("top", StringComparison.CurrentCultureIgnoreCase))
             throw new Exception("Use AggregateTopX property instead of limitation SQL to acheive this");
 
         _aggregateConfigurationIfAny = aggregateConfigurationIfAny;
@@ -200,7 +205,7 @@ public AggregateBuilder(string limitationSQL, string countSQL, AggregateConfigur
 
         SelectColumns = new List<QueryTimeColumn>();
 
-        if(!string.IsNullOrWhiteSpace(countSQL))
+        if (!string.IsNullOrWhiteSpace(countSQL))
         {
             _countColumn = new AggregateCountColumn(countSQL)
             {
@@ -212,7 +217,7 @@ public AggregateBuilder(string limitationSQL, string countSQL, AggregateConfigur
         LabelWithComment = aggregateConfigurationIfAny != null ? aggregateConfigurationIfAny.Name : "";
 
         _queryLevelParameterProvider = aggregateConfigurationIfAny;
-            
+
         if (aggregateConfigurationIfAny != null)
         {
             HavingSQL = aggregateConfigurationIfAny.HavingSQL;
@@ -223,7 +228,7 @@ public AggregateBuilder(string limitationSQL, string countSQL, AggregateConfigur
     /// <inheritdoc/>
     public void AddColumn(IColumn col)
     {
-        AddColumn(col,true);
+        AddColumn(col, true);
     }
 
     /// <summary>
@@ -259,7 +264,7 @@ public void AddColumnRange(IColumn[] columnsToAdd, bool includeAsGroupBy)
         }
     }
 
-    private int _pivotID=-1;
+    private int _pivotID = -1;
     private bool _doNotWriteOutParameters;
     public IQuerySyntaxHelper QuerySyntaxHelper { get; set; }
     private readonly AggregateConfiguration _aggregateConfigurationIfAny;
@@ -296,8 +301,8 @@ public void RegenerateSQL()
 
         ParameterManager.ClearNonGlobals();
 
-        if(_queryLevelParameterProvider != null)
-            ParameterManager.AddParametersFor(_queryLevelParameterProvider,ParameterLevel.QueryLevel);
+        if (_queryLevelParameterProvider != null)
+            ParameterManager.AddParametersFor(_queryLevelParameterProvider, ParameterLevel.QueryLevel);
 
         TablesUsedInQuery = SqlQueryBuilderHelper.GetTablesUsedInQuery(this, out var primary, _forceJoinsToTheseTables);
 
@@ -306,7 +311,8 @@ public void RegenerateSQL()
             : TablesUsedInQuery;
 
         if (!tables.Any())
-            throw new QueryBuildingException("No tables could be identified for the query.  Try adding a column or a force join");
+            throw new QueryBuildingException(
+                "No tables could be identified for the query.  Try adding a column or a force join");
 
         //get the database language syntax based on the tables used in the query
         QuerySyntaxHelper = SqlQueryBuilderHelper.GetSyntaxHelper(tables);
@@ -315,16 +321,17 @@ public void RegenerateSQL()
         //tell the count column what language it is
         if (_countColumn != null)
         {
-            _isCohortIdentificationAggregate = _aggregateConfigurationIfAny != null && _aggregateConfigurationIfAny.IsCohortIdentificationAggregate;
+            _isCohortIdentificationAggregate = _aggregateConfigurationIfAny != null &&
+                                               _aggregateConfigurationIfAny.IsCohortIdentificationAggregate;
 
             //if it is not a cic aggregate then make sure it has an alias e.g. count(*) AS MyCount.  cic aggregates take extreme liberties with this field like passing in 'distinct chi' and '*' and other wacky stuff that is so not cool
-            _countColumn.SetQuerySyntaxHelper(QuerySyntaxHelper,!_isCohortIdentificationAggregate);
+            _countColumn.SetQuerySyntaxHelper(QuerySyntaxHelper, !_isCohortIdentificationAggregate);
         }
 
 
         var aggregateHelper = QuerySyntaxHelper.AggregateHelper;
 
-        if(_pivotID != -1)
+        if (_pivotID != -1)
             try
             {
                 _pivotDimension = SelectColumns.Single(
@@ -335,17 +342,20 @@ public void RegenerateSQL()
             catch (Exception e)
             {
                 throw new QueryBuildingException(
-                    $"Problem occurred when trying to find PivotDimension ID {_pivotID} in SelectColumns list",e);
+                    $"Problem occurred when trying to find PivotDimension ID {_pivotID} in SelectColumns list", e);
             }
 
-        foreach (AggregateDimension dimension in SelectColumns.Select(c=>c.IColumn).Where(e=>e is AggregateDimension))
+        foreach (AggregateDimension dimension in SelectColumns.Select(c => c.IColumn)
+                     .Where(e => e is AggregateDimension))
         {
-            var availableAxis =dimension.AggregateContinuousDateAxis;
+            var availableAxis = dimension.AggregateContinuousDateAxis;
 
-            if(availableAxis != null)
+            if (availableAxis != null)
                 if (_axis != null)
+                {
                     throw new QueryBuildingException(
                         $"Multiple dimensions have an AggregateContinuousDateAxis within the same configuration (Dimensions {_axisAppliesToDimension.GetRuntimeName()} and {dimension.GetRuntimeName()})");
+                }
                 else
                 {
                     _axis = availableAxis;
@@ -380,8 +390,9 @@ public void RegenerateSQL()
                 }
 
                 //if user has force joined to a primary extraction table
-                if(t.IsPrimaryExtractionTable)
-                    if (primary == null) //we don't currently know the primary (i.e. none of the SELECT columns were from primary tables so use this table as primary)
+                if (t.IsPrimaryExtractionTable)
+                    if (primary ==
+                        null) //we don't currently know the primary (i.e. none of the SELECT columns were from primary tables so use this table as primary)
                         primary = t;
                     else if (primary.ID == t.ID) //we know the primary already but it is the same table so thats fine
                         continue;
@@ -405,7 +416,8 @@ public void RegenerateSQL()
         //assuming we were not told to ignore the writing out of parameters!
         if (!DoNotWriteOutParameters)
             foreach (var parameter in ParameterManager.GetFinalResolvedParametersList())
-                queryLines.Add(new CustomLine(QueryBuilder.GetParameterDeclarationSQL(parameter),QueryComponent.VariableDeclaration));
+                queryLines.Add(new CustomLine(QueryBuilder.GetParameterDeclarationSQL(parameter),
+                    QueryComponent.VariableDeclaration));
 
         CompileCustomLinesInStageAndAddToList(QueryComponent.VariableDeclaration, queryLines);
 
@@ -415,11 +427,11 @@ public void RegenerateSQL()
         queryLines.Add(new CustomLine(SqlQueryBuilderHelper.GetFROMSQL(this), QueryComponent.FROM));
         CompileCustomLinesInStageAndAddToList(QueryComponent.JoinInfoJoin, queryLines);
 
-        queryLines.Add(new CustomLine(SqlQueryBuilderHelper.GetWHERESQL(this),QueryComponent.WHERE));
+        queryLines.Add(new CustomLine(SqlQueryBuilderHelper.GetWHERESQL(this), QueryComponent.WHERE));
 
-        CompileCustomLinesInStageAndAddToList(QueryComponent.WHERE,queryLines);
+        CompileCustomLinesInStageAndAddToList(QueryComponent.WHERE, queryLines);
 
-        GetGroupBySQL(queryLines,aggregateHelper);
+        GetGroupBySQL(queryLines, aggregateHelper);
 
         queryLines = queryLines.Where(l => !string.IsNullOrWhiteSpace(l.Text)).ToList();
 
@@ -429,32 +441,31 @@ public void RegenerateSQL()
     private void ValidateDimensions()
     {
         //axis but no pivot
-        if(_axis != null && _pivotDimension == null && SelectColumns.Count !=2 )
+        if (_axis != null && _pivotDimension == null && SelectColumns.Count != 2)
             throw new QueryBuildingException(
                 $"You must have two columns in an AggregateConfiguration that contains an axis.  These must be the axis column and the count/sum column.  Your query had {SelectColumns.Count} ({string.Join(",", SelectColumns.Select(c => $"'{c.IColumn}'"))})");
-            
+
         //axis and pivot
-        if(_axis != null && _pivotDimension != null && SelectColumns.Count !=3 )
+        if (_axis != null && _pivotDimension != null && SelectColumns.Count != 3)
             throw new QueryBuildingException(
                 $"You must have three columns in an AggregateConfiguration that contains a pivot.  These must be the axis column, the pivot column and the count/sum column.  Your query had {SelectColumns.Count} ({string.Join(",", SelectColumns.Select(c => $"'{c.IColumn}'"))})");
     }
 
-    private void CompileCustomLinesInStageAndAddToList( QueryComponent stage,List<CustomLine> list)
+    private void CompileCustomLinesInStageAndAddToList(QueryComponent stage, List<CustomLine> list)
     {
         list.AddRange(SqlQueryBuilderHelper.GetCustomLinesSQLForStage(this, stage));
     }
 
-    private void GetGroupBySQL(List<CustomLine> queryLines,IAggregateHelper aggregateHelper)
+    private void GetGroupBySQL(List<CustomLine> queryLines, IAggregateHelper aggregateHelper)
     {
         //now are there columns that...
         if (SelectColumns.Any(col =>
-                col.IColumn is not AggregateCountColumn  //are not count(*) style columns
+                col.IColumn is not AggregateCountColumn //are not count(*) style columns
                 &&
                 !_skipGroupByForThese.Contains(col.IColumn))) //and are not being skipped for GROUP BY
         {
-
             //yes there are! better group by then!
-            queryLines.Add(new CustomLine("group by ",QueryComponent.GroupBy));
+            queryLines.Add(new CustomLine("group by ", QueryComponent.GroupBy));
 
             foreach (var col in SelectColumns)
             {
@@ -465,31 +476,29 @@ private void GetGroupBySQL(List<CustomLine> queryLines,IAggregateHelper aggregat
                 if (_skipGroupByForThese.Contains(col.IColumn))
                     continue;
 
-                var line = new CustomLine($"{GetGroupOrOrderByCustomLineBasedOn(col)},",QueryComponent.GroupBy);
+                var line = new CustomLine($"{GetGroupOrOrderByCustomLineBasedOn(col)},", QueryComponent.GroupBy);
 
-                FlagLineBasedOnIcolumn(line,col.IColumn);
+                FlagLineBasedOnIcolumn(line, col.IColumn);
 
                 queryLines.Add(line);
-
             }
 
             //clear trailing last comma
             queryLines.Last().Text = queryLines.Last().Text.TrimEnd('\n', '\r', ',');
 
-            queryLines.Add(new CustomLine(GetHavingSql(),QueryComponent.Having));
+            queryLines.Add(new CustomLine(GetHavingSql(), QueryComponent.Having));
 
             CompileCustomLinesInStageAndAddToList(QueryComponent.GroupBy, queryLines);
 
             //order by only if we are not pivotting
             if (!DoNotWriteOutOrderBy)
             {
-                queryLines.Add(new CustomLine("order by " ,QueryComponent.OrderBy));
+                queryLines.Add(new CustomLine("order by ", QueryComponent.OrderBy));
 
                 //if there's a top X (with an explicit order by)
                 if (AggregateTopX != null)
-                {
-                    queryLines.Add(new CustomLine(GetOrderBySQL(AggregateTopX), QueryComponent.OrderBy) { Role = CustomLineRole.TopX });
-                }
+                    queryLines.Add(new CustomLine(GetOrderBySQL(AggregateTopX), QueryComponent.OrderBy)
+                        { Role = CustomLineRole.TopX });
                 else
                     foreach (var col in SelectColumns)
                     {
@@ -500,9 +509,10 @@ private void GetGroupBySQL(List<CustomLine> queryLines,IAggregateHelper aggregat
                         if (_skipGroupByForThese.Contains(col.IColumn))
                             continue;
 
-                        var line = new CustomLine($"{GetGroupOrOrderByCustomLineBasedOn(col)},", QueryComponent.OrderBy);
+                        var line = new CustomLine($"{GetGroupOrOrderByCustomLineBasedOn(col)},",
+                            QueryComponent.OrderBy);
 
-                        FlagLineBasedOnIcolumn(line,col.IColumn);
+                        FlagLineBasedOnIcolumn(line, col.IColumn);
 
                         queryLines.Add(line);
                     }
@@ -511,7 +521,9 @@ private void GetGroupBySQL(List<CustomLine> queryLines,IAggregateHelper aggregat
             }
         }
         else
-            queryLines.Add(new CustomLine(GetHavingSql(),QueryComponent.GroupBy));
+        {
+            queryLines.Add(new CustomLine(GetHavingSql(), QueryComponent.GroupBy));
+        }
 
         queryLines.Last().Text = queryLines.Last().Text.TrimEnd('\n', '\r', ',');
 
@@ -527,42 +539,43 @@ private void GetGroupBySQL(List<CustomLine> queryLines,IAggregateHelper aggregat
     private string GetGroupOrOrderByCustomLineBasedOn(QueryTimeColumn col)
     {
         /*            Background
-         * 
+         *
          * When using a transform as the SELECT column, different DBMS expect different values in the ORDER/GROUP by bit
-         * 
-         * For this explanation, consider the transform "UPPER(mycol) as mytransform".  This is a select line 
+         *
+         * For this explanation, consider the transform "UPPER(mycol) as mytransform".  This is a select line
          * composed of "UPPER(mycol)" and its alias "mytransform"
-         * 
+         *
          * Microsoft Sql Server expects:
-         *   select 
+         *   select
          *      (UPPER(mycol)) as mytransform,
          *      count(*)
-         *   from 
+         *   from
          *      bob
-         *   group by 
+         *   group by
          *      UPPER(mycol)
-         *   order by 
+         *   order by
          *      UPPER(mycol)
-         * 
+         *
          * MySql will NOT work with the above and instead expects:
-         *   select 
+         *   select
          *      UPPER(mycol) as mytransform,
          *      count(*)
-         *   from 
+         *   from
          *      bob
-         *   group by 
+         *   group by
          *      mytransform
-         *   order by 
+         *   order by
          *      mytransform
-         * 
+         *
          * */
 
-            
+
         // the sql bit of the transform (e.g. "UPPER(mycol)" in above example)
 
         // the column alias (e.g. "mytransform" in above example)
 
-        QuerySyntaxHelper.SplitLineIntoSelectSQLAndAlias(col.GetSelectSQL(null, null, QuerySyntaxHelper), out var select, out var alias);
+        QuerySyntaxHelper.SplitLineIntoSelectSQLAndAlias(col.GetSelectSQL(null, null, QuerySyntaxHelper),
+            out var select, out var alias);
 
         return GetGroupOrOrderByCustomLineBasedOn(select, alias);
     }
@@ -570,11 +583,10 @@ private string GetGroupOrOrderByCustomLineBasedOn(QueryTimeColumn col)
     private static string GetGroupOrOrderByCustomLineBasedOn(string select, string alias)
     {
         if (UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs)
-        {
-            return !string.IsNullOrWhiteSpace(alias) ?
-                alias :  // for MySql prefer using the alias if it has one
+            return !string.IsNullOrWhiteSpace(alias)
+                ? alias
+                : // for MySql prefer using the alias if it has one
                 select;
-        }
 
         // for everyone else just use the full SQL
         return select;
@@ -585,29 +597,29 @@ private void FlagLineBasedOnIcolumn(CustomLine line, IColumn column)
         //if it is an axis column tag it as an axis
         if (Equals(column, _axisAppliesToDimension))
             line.Role = CustomLineRole.Axis;
-            
+
         //if it is a count column then flag it as that (cic aggregates take extreme liberties with count columns like hijacking them in a most dispicable way so don't even bother with this flag for them)
         if (column is AggregateCountColumn && !_isCohortIdentificationAggregate)
             line.Role = CustomLineRole.CountFunction;
 
-        if(_pivotDimension != null)
-            if(Equals(column,_pivotDimension.IColumn))
+        if (_pivotDimension != null)
+            if (Equals(column, _pivotDimension.IColumn))
                 line.Role = CustomLineRole.Pivot;
     }
 
     private void GetSelectSQL(List<CustomLine> lines)
     {
-        lines.Add(new CustomLine($"/*{LabelWithComment}*/",QueryComponent.SELECT));
-        lines.Add(new CustomLine("SELECT ",QueryComponent.SELECT));
+        lines.Add(new CustomLine($"/*{LabelWithComment}*/", QueryComponent.SELECT));
+        lines.Add(new CustomLine("SELECT ", QueryComponent.SELECT));
 
         //if there is no top X or an axis is specified (in which case the TopX applies to the PIVOT if any not the axis)
         if (!string.IsNullOrWhiteSpace(LimitationSQL))
-            lines.Add(new CustomLine(LimitationSQL ,QueryComponent.SELECT));
-            
-        CompileCustomLinesInStageAndAddToList(QueryComponent.SELECT,lines);
+            lines.Add(new CustomLine(LimitationSQL, QueryComponent.SELECT));
+
+        CompileCustomLinesInStageAndAddToList(QueryComponent.SELECT, lines);
 
         CompileCustomLinesInStageAndAddToList(QueryComponent.QueryTimeColumn, lines);
-            
+
         //put in all the selected columns (which are not being skipped because they aren't a part of group by)
         foreach (var col in SelectColumns.Where(col => !_skipGroupByForThese.Contains(col.IColumn)))
         {
@@ -616,8 +628,9 @@ private void GetSelectSQL(List<CustomLine> lines)
                     $"Column {col.IColumn.GetRuntimeName()} is marked as HashOnDataRelease and therefore cannot be used as an Aggregate dimension");
 
 
-            var line = new CustomLine($"{col.GetSelectSQL(null, null, QuerySyntaxHelper)},", QueryComponent.QueryTimeColumn);
-            FlagLineBasedOnIcolumn(line,col.IColumn);
+            var line = new CustomLine($"{col.GetSelectSQL(null, null, QuerySyntaxHelper)},",
+                QueryComponent.QueryTimeColumn);
+            FlagLineBasedOnIcolumn(line, col.IColumn);
 
             //it's the axis dimension tag it with the axis tag
             lines.Add(line);
@@ -632,11 +645,11 @@ private string GetOrderBySQL(IAggregateTopX aggregateTopX)
     {
         var dimension = aggregateTopX.OrderByColumn;
         if (dimension == null)
-            return GetGroupOrOrderByCustomLineBasedOn(_countColumn.SelectSQL,_countColumn.Alias)
+            return GetGroupOrOrderByCustomLineBasedOn(_countColumn.SelectSQL, _countColumn.Alias)
                    + (aggregateTopX.OrderByDirection == AggregateTopXOrderByDirection.Ascending
                        ? " asc"
                        : " desc");
-        
+
         return GetGroupOrOrderByCustomLineBasedOn(dimension.SelectSQL, dimension.Alias)
                + (aggregateTopX.OrderByDirection == AggregateTopXOrderByDirection.Ascending
                    ? " asc"
@@ -654,6 +667,7 @@ private string GetHavingSql()
             toReturn += $"HAVING{Environment.NewLine}";
             toReturn += HavingSQL;
         }
+
         return toReturn;
     }
 
@@ -661,8 +675,5 @@ private string GetHavingSql()
     /// Throws <see cref="NotSupportedException"/> since <see cref="Lookup"/> canot be part of an aggregate GROUP BY
     /// </summary>
     /// <returns></returns>
-    public IEnumerable<Lookup> GetDistinctRequiredLookups()
-    {
-        throw new NotSupportedException();
-    }
+    public IEnumerable<Lookup> GetDistinctRequiredLookups() => throw new NotSupportedException();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/AggregateCountColumn.cs b/Rdmp.Core/QueryBuilding/AggregateCountColumn.cs
index 1bb1e87032..0efcf48b05 100644
--- a/Rdmp.Core/QueryBuilding/AggregateCountColumn.cs
+++ b/Rdmp.Core/QueryBuilding/AggregateCountColumn.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.QueryBuilding;
 /// <summary>
 /// The count(*) column in an AggregateConfiguration, this is used by AggregateBuilder.  This can be any aggregate function such as 'sum', 'avg' etc.
 /// </summary>
-public class AggregateCountColumn:SpontaneousObject,IColumn
+public class AggregateCountColumn : SpontaneousObject, IColumn
 {
     private IQuerySyntaxHelper _syntaxHelper;
     private readonly string _sql;
@@ -32,11 +32,11 @@ public class AggregateCountColumn:SpontaneousObject,IColumn
     /// <para>Can include aliases e.g. count(*) as MyCount</para>
     /// </summary>
     /// <param name="sql"></param>
-    public AggregateCountColumn(string sql): base(new MemoryRepository())
+    public AggregateCountColumn(string sql) : base(new MemoryRepository())
     {
         _sql = sql;
     }
-        
+
     /// <summary>
     /// Initializes the <see cref="IQuerySyntaxHelper"/> for the column and optionally ensures that it has an alias.  If no <see cref="Alias"/> has
     /// been specified or was found in the current sql then <see cref="DefaultAliasName"/> is set.
@@ -51,18 +51,18 @@ public void SetQuerySyntaxHelper(IQuerySyntaxHelper syntaxHelper, bool ensureAli
         if (_syntaxHelper.SplitLineIntoSelectSQLAndAlias(_sql, out var select, out var alias))
             Alias = alias; //use the users explicit alias
         else
-            Alias = ensureAliasExists ? DefaultAliasName : null;//set an alias of MyCount
+            Alias = ensureAliasExists ? DefaultAliasName : null; //set an alias of MyCount
 
         SelectSQL = select;
-
     }
+
     /// <inheritdoc/>
     public string GetRuntimeName()
     {
-        if(_syntaxHelper == null)
+        if (_syntaxHelper == null)
             throw new System.Exception("SyntaxHelper is null, call SetQuerySyntaxHelper first");
 
-        return string.IsNullOrWhiteSpace(Alias)?_syntaxHelper.GetRuntimeName(SelectSQL):Alias;
+        return string.IsNullOrWhiteSpace(Alias) ? _syntaxHelper.GetRuntimeName(SelectSQL) : Alias;
     }
 
     /// <summary>
@@ -86,9 +86,9 @@ public string GetFullSelectLineStringForSavingIntoAnAggregate()
     /// <inheritdoc/>
     [Sql]
     public string SelectSQL { get; set; }
-        
+
     /// <inheritdoc/>
-    public string Alias{get; private set; }
+    public string Alias { get; private set; }
 
     /// <inheritdoc/>
     public bool HashOnDataRelease => false;
diff --git a/Rdmp.Core/QueryBuilding/CohortQueryBuilder.cs b/Rdmp.Core/QueryBuilding/CohortQueryBuilder.cs
index 81fdeb3f89..565f4278e1 100644
--- a/Rdmp.Core/QueryBuilding/CohortQueryBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/CohortQueryBuilder.cs
@@ -74,6 +74,7 @@ public ExternalDatabaseServer CacheServer
     public CohortQueryBuilderResult Results { get; private set; }
 
     #region constructors
+
     //Constructors - This one is the base one called by all others
     private CohortQueryBuilder(IEnumerable<ISqlParameter> globals, ICoreChildProvider childProvider)
     {
@@ -81,14 +82,15 @@ private CohortQueryBuilder(IEnumerable<ISqlParameter> globals, ICoreChildProvide
         globals ??= Array.Empty<ISqlParameter>();
         _globals = globals.ToArray();
         TopX = -1;
-            
+
         SQLOutOfDate = true;
 
         foreach (var parameter in _globals)
             ParameterManager.AddGlobalParameter(parameter);
     }
 
-    public CohortQueryBuilder(CohortIdentificationConfiguration configuration, ICoreChildProvider childProvider):this(configuration.GetAllParameters(),childProvider)
+    public CohortQueryBuilder(CohortIdentificationConfiguration configuration, ICoreChildProvider childProvider) : this(
+        configuration.GetAllParameters(), childProvider)
     {
         if (configuration == null)
             throw new QueryBuildingException("Configuration has not been set yet");
@@ -104,44 +106,49 @@ public CohortQueryBuilder(CohortIdentificationConfiguration configuration, ICore
         container = configuration.RootCohortAggregateContainer;
 
         SetChildProviderIfNull();
-            
     }
 
-    public CohortQueryBuilder(CohortAggregateContainer c,IEnumerable<ISqlParameter> globals, ICoreChildProvider childProvider): this(globals,childProvider)
+    public CohortQueryBuilder(CohortAggregateContainer c, IEnumerable<ISqlParameter> globals,
+        ICoreChildProvider childProvider) : this(globals, childProvider)
     {
         //set ourselves up to run with the root container
         container = c;
 
         SetChildProviderIfNull();
     }
-    public CohortQueryBuilder(AggregateConfiguration config, IEnumerable<ISqlParameter> globals, ICoreChildProvider childProvider): this(globals,childProvider)
+
+    public CohortQueryBuilder(AggregateConfiguration config, IEnumerable<ISqlParameter> globals,
+        ICoreChildProvider childProvider) : this(globals, childProvider)
     {
         //set ourselves up to run with the root container
         configuration = config;
 
         SetChildProviderIfNull();
     }
+
     private void SetChildProviderIfNull()
     {
         _childProvider ??= new CatalogueChildProvider(
-                configuration?.CatalogueRepository ?? container.CatalogueRepository, null, null,null);
+            configuration?.CatalogueRepository ?? container.CatalogueRepository, null, null, null);
     }
 
-
     #endregion
 
-    public string GetDatasetSampleSQL(int topX = 1000,ICoreChildProvider childProvider = null)
+    public string GetDatasetSampleSQL(int topX = 1000, ICoreChildProvider childProvider = null)
     {
-        if(configuration == null)
-            throw new NotSupportedException("Can only generate select * statements when constructed for a single AggregateConfiguration, this was constructed with a container as the root entity (it may even reflect a UNION style query that spans datasets)");
+        if (configuration == null)
+            throw new NotSupportedException(
+                "Can only generate select * statements when constructed for a single AggregateConfiguration, this was constructed with a container as the root entity (it may even reflect a UNION style query that spans datasets)");
 
         //Show the user all the fields (*) unless there is a HAVING or it is a Patient Index Table.
         var selectList =
-            string.IsNullOrWhiteSpace(configuration.HavingSQL) && !configuration.IsJoinablePatientIndexTable() ? "*" : null;
+            string.IsNullOrWhiteSpace(configuration.HavingSQL) && !configuration.IsJoinablePatientIndexTable()
+                ? "*"
+                : null;
 
-        RecreateHelpers(new QueryBuilderCustomArgs(selectList, "" /*removes distinct*/, topX),CancellationToken.None);
+        RecreateHelpers(new QueryBuilderCustomArgs(selectList, "" /*removes distinct*/, topX), CancellationToken.None);
 
-        Results.BuildFor(configuration,ParameterManager);
+        Results.BuildFor(configuration, ParameterManager);
 
         var sampleSQL = Results.Sql;
 
@@ -152,7 +159,6 @@ public string GetDatasetSampleSQL(int topX = 1000,ICoreChildProvider childProvid
 
         var parameterSql = QueryBuilder.GetParameterDeclarationSQL(finalParams);
         return $"{parameterSql}{Environment.NewLine}{sampleSQL}";
-
     }
 
     public void RegenerateSQL()
@@ -162,23 +168,25 @@ public void RegenerateSQL()
 
     public void RegenerateSQL(CancellationToken cancellationToken)
     {
-        RecreateHelpers(null,cancellationToken);
+        RecreateHelpers(null, cancellationToken);
 
         ParameterManager.ClearNonGlobals();
 
         Results.StopContainerWhenYouReach = _stopContainerWhenYouReach;
 
         if (container != null)
-            Results.BuildFor(container,ParameterManager);    //user constructed us with a container (and possibly subcontainers even - any one of them chock full of aggregates)
+            Results.BuildFor(container,
+                ParameterManager); //user constructed us with a container (and possibly subcontainers even - any one of them chock full of aggregates)
         else
-            Results.BuildFor(configuration,ParameterManager);//user constructed us without a container, he only cares about 1 aggregate
+            Results.BuildFor(configuration,
+                ParameterManager); //user constructed us without a container, he only cares about 1 aggregate
 
         _sql = Results.Sql;
 
         //Still finalise the ParameterManager even if we are not writing out the parameters so that it is in the Finalized state
         var finalParameters = ParameterManager.GetFinalResolvedParametersList();
 
-        if(!DoNotWriteOutParameters)
+        if (!DoNotWriteOutParameters)
         {
             var parameterSql = "";
 
@@ -186,15 +194,16 @@ public void RegenerateSQL(CancellationToken cancellationToken)
             foreach (var param in finalParameters)
                 parameterSql += QueryBuilder.GetParameterDeclarationSQL(param);
 
-            _sql =  parameterSql + _sql;
+            _sql = parameterSql + _sql;
         }
+
         SQLOutOfDate = false;
     }
 
     private void RecreateHelpers(QueryBuilderCustomArgs customizations, CancellationToken cancellationToken)
     {
         helper = new CohortQueryBuilderHelper();
-        Results = new CohortQueryBuilderResult(CacheServer,_childProvider, helper,customizations,cancellationToken);
+        Results = new CohortQueryBuilderResult(CacheServer, _childProvider, helper, customizations, cancellationToken);
     }
 
     /// <summary>
diff --git a/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependency.cs b/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependency.cs
index e1ce46a061..7b7844003c 100644
--- a/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependency.cs
+++ b/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependency.cs
@@ -45,7 +45,7 @@ public class CohortQueryBuilderDependency
     /// <summary>
     /// The column in the <see cref="CohortSet"/> that is marked <see cref="IColumn.IsExtractionIdentifier"/>
     /// </summary>
-    public AggregateDimension ExtractionIdentifierColumn { get;}
+    public AggregateDimension ExtractionIdentifierColumn { get; }
 
     /// <summary>
     /// The aggregate (query) referenced by <see cref="PatientIndexTableIfAny"/>
@@ -64,12 +64,12 @@ public class CohortQueryBuilderDependency
     /// <summary>
     /// The raw SQL for the <see cref="CohortSet"/> with a join against the cached artifact for the <see cref="PatientIndexTableIfAny"/>
     /// </summary>
-    public CohortQueryBuilderDependencySql SqlPartiallyCached { get;  private set;}
+    public CohortQueryBuilderDependencySql SqlPartiallyCached { get; private set; }
 
     /// <summary>
     /// Sql for a single cache fetch  that pulls the cached result of the <see cref="CohortSet"/> joined to <see cref="PatientIndexTableIfAny"/> (if there was any)
     /// </summary>
-    public CohortQueryBuilderDependencySql SqlFullyCached { get;  private set;}
+    public CohortQueryBuilderDependencySql SqlFullyCached { get; private set; }
 
     public CohortQueryBuilderDependencySql SqlJoinableCacheless { get; private set; }
 
@@ -78,11 +78,12 @@ public class CohortQueryBuilderDependency
     /// <summary>
     /// Locks on aggregate by ID
     /// </summary>
-    private static readonly ConcurrentDictionary<int,object> AggregateLocks = new();
+    private static readonly ConcurrentDictionary<int, object> AggregateLocks = new();
 
 
     public CohortQueryBuilderDependency(AggregateConfiguration cohortSet,
-        JoinableCohortAggregateConfigurationUse patientIndexTableIfAny, ICoreChildProvider childProvider, IReadOnlyCollection<IPluginCohortCompiler> pluginCohortCompilers)
+        JoinableCohortAggregateConfigurationUse patientIndexTableIfAny, ICoreChildProvider childProvider,
+        IReadOnlyCollection<IPluginCohortCompiler> pluginCohortCompilers)
     {
         _childProvider = childProvider;
         _pluginCohortCompilers = pluginCohortCompilers;
@@ -91,31 +92,31 @@ public CohortQueryBuilderDependency(AggregateConfiguration cohortSet,
 
         //record the IsExtractionIdentifier column for the log (helps with debugging count issues)
         var eis = cohortSet?.AggregateDimensions?.Where(d => d.IsExtractionIdentifier).ToArray();
-            
+
         //Multiple IsExtractionIdentifier columns is a big problem but it's handled elsewhere
-        if(eis != null && eis.Length == 1)
+        if (eis != null && eis.Length == 1)
             ExtractionIdentifierColumn = eis[0];
-            
+
         if (PatientIndexTableIfAny != null)
         {
             var join = _childProvider.AllJoinables.SingleOrDefault(j =>
-                j.ID == PatientIndexTableIfAny.JoinableCohortAggregateConfiguration_ID) ?? throw new Exception("ICoreChildProvider did not know about the provided patient index table");
+                           j.ID == PatientIndexTableIfAny.JoinableCohortAggregateConfiguration_ID) ??
+                       throw new Exception("ICoreChildProvider did not know about the provided patient index table");
             JoinedTo = _childProvider.AllAggregateConfigurations.SingleOrDefault(ac =>
                 ac.ID == join.AggregateConfiguration_ID);
 
-            if(JoinedTo == null)
-                throw new Exception("ICoreChildProvider did not know about the provided patient index table AggregateConfiguration");
+            if (JoinedTo == null)
+                throw new Exception(
+                    "ICoreChildProvider did not know about the provided patient index table AggregateConfiguration");
         }
     }
 
-    public override string ToString()
-    {
-        return JoinedTo != null
+    public override string ToString() =>
+        JoinedTo != null
             ? $"{CohortSet.Name}{PatientIndexTableIfAny.JoinType} JOIN {JoinedTo.Name}"
             : CohortSet.Name;
-    }
 
-    public void Build(CohortQueryBuilderResult parent,ISqlParameter[] globals,CancellationToken cancellationToken)
+    public void Build(CohortQueryBuilderResult parent, ISqlParameter[] globals, CancellationToken cancellationToken)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
@@ -123,64 +124,64 @@ public void Build(CohortQueryBuilderResult parent,ISqlParameter[] globals,Cancel
 
         // if it is a plugin aggregate we only want to ever serve up the cached SQL
         var pluginCohortCompiler = _pluginCohortCompilers.FirstOrDefault(c => c.ShouldRun(CohortSet));
-        var joinedToPluginCohortCompiler = JoinedTo == null ? null : _pluginCohortCompilers.FirstOrDefault(c => c.ShouldRun(JoinedTo)); 
+        var joinedToPluginCohortCompiler =
+            JoinedTo == null ? null : _pluginCohortCompilers.FirstOrDefault(c => c.ShouldRun(JoinedTo));
 
         if (pluginCohortCompiler != null)
         {
             if (joinedToPluginCohortCompiler != null)
-            {
                 throw new Exception($"APIs cannot be joined together ('{CohortSet}' and '{JoinedTo}')");
-            }
 
             if (parent.CacheManager == null)
-            {
-                throw new Exception($"Aggregate '{CohortSet}' is a plugin aggregate (According to '{pluginCohortCompiler}') but no cache is configured on {CohortSet.GetCohortIdentificationConfigurationIfAny()}.  You must enable result caching to use plugin aggregates.");
-            }
+                throw new Exception(
+                    $"Aggregate '{CohortSet}' is a plugin aggregate (According to '{pluginCohortCompiler}') but no cache is configured on {CohortSet.GetCohortIdentificationConfigurationIfAny()}.  You must enable result caching to use plugin aggregates.");
 
             // It's a plugin aggregate so only ever run the cached SQL
-            SqlFullyCached = GetCacheFetchSqlIfPossible(parent, CohortSet, SqlCacheless, isSolitaryPatientIndexTable, pluginCohortCompiler,cancellationToken);
+            SqlFullyCached = GetCacheFetchSqlIfPossible(parent, CohortSet, SqlCacheless, isSolitaryPatientIndexTable,
+                pluginCohortCompiler, cancellationToken);
 
-            if(SqlFullyCached == null)
-            {
-                throw new Exception($"Aggregate '{CohortSet}' is a plugin aggregate (According to '{pluginCohortCompiler}') but no cached results were found after running.");
-            }
+            if (SqlFullyCached == null)
+                throw new Exception(
+                    $"Aggregate '{CohortSet}' is a plugin aggregate (According to '{pluginCohortCompiler}') but no cached results were found after running.");
             return;
         }
 
         //Includes the parameter declaration and no rename operations (i.e. couldn't be used for building the tree but can be used for cache hit testing).
         if (JoinedTo != null)
         {
-            if(joinedToPluginCohortCompiler == null)
+            if (joinedToPluginCohortCompiler == null)
             {
                 SqlJoinableCacheless = CohortQueryBuilderHelper.GetSQLForAggregate(JoinedTo,
-                    new QueryBuilderArgs(new QueryBuilderCustomArgs(), //don't respect customizations in the inception bit!
+                    new QueryBuilderArgs(
+                        new QueryBuilderCustomArgs(), //don't respect customizations in the inception bit!
                         globals));
-                SqlJoinableCached = GetCacheFetchSqlIfPossible(parent, JoinedTo, SqlJoinableCacheless, true, null, cancellationToken);
+                SqlJoinableCached = GetCacheFetchSqlIfPossible(parent, JoinedTo, SqlJoinableCacheless, true, null,
+                    cancellationToken);
             }
             else
             {
                 // It is not possible to do a cacheless query because an API is involved
-                SqlJoinableCached = GetCacheFetchSqlIfPossible(parent, JoinedTo, SqlJoinableCacheless, true, joinedToPluginCohortCompiler, cancellationToken);
+                SqlJoinableCached = GetCacheFetchSqlIfPossible(parent, JoinedTo, SqlJoinableCacheless, true,
+                    joinedToPluginCohortCompiler, cancellationToken);
 
-                if(SqlJoinableCached == null)
-                {
-                    throw new Exception($"Unable to build query for '{CohortSet}' because it joins to API cohort '{JoinedTo}' that did not exist in the cache");
-                }
+                if (SqlJoinableCached == null)
+                    throw new Exception(
+                        $"Unable to build query for '{CohortSet}' because it joins to API cohort '{JoinedTo}' that did not exist in the cache");
 
                 // Since the only way to query the dataset is using the cache we can pretend that it is the cacheless way
                 // of querying it too.
                 SqlJoinableCacheless = SqlJoinableCached;
             }
-
         }
-            
+
         if (isSolitaryPatientIndexTable)
         {
             //explicit execution of a patient index table on its own
             //the full uncached SQL for the query
-            SqlCacheless = CohortQueryBuilderHelper.GetSQLForAggregate(CohortSet,new QueryBuilderArgs(parent.Customise,globals));
+            SqlCacheless =
+                CohortQueryBuilderHelper.GetSQLForAggregate(CohortSet, new QueryBuilderArgs(parent.Customise, globals));
 
-            if(SqlJoinableCached != null)
+            if (SqlJoinableCached != null)
                 throw new QueryBuildingException("Patient index tables can't use other patient index tables!");
         }
         else
@@ -188,51 +189,55 @@ public void Build(CohortQueryBuilderResult parent,ISqlParameter[] globals,Cancel
             //the full uncached SQL for the query
             SqlCacheless = CohortQueryBuilderHelper.GetSQLForAggregate(CohortSet,
                 new QueryBuilderArgs(PatientIndexTableIfAny, JoinedTo,
-                    SqlJoinableCacheless,parent.Customise,globals));
+                    SqlJoinableCacheless, parent.Customise, globals));
 
 
             //if the joined to table is cached we can generate a partial too with full sql for the outer sql block and a cache fetch join
             if (SqlJoinableCached != null)
                 SqlPartiallyCached = CohortQueryBuilderHelper.GetSQLForAggregate(CohortSet,
                     new QueryBuilderArgs(PatientIndexTableIfAny, JoinedTo,
-                        SqlJoinableCached,parent.Customise,globals));
+                        SqlJoinableCached, parent.Customise, globals));
         }
-            
+
         //We would prefer a cache hit on the exact uncached SQL
-        SqlFullyCached = GetCacheFetchSqlIfPossible(parent, CohortSet, SqlCacheless, isSolitaryPatientIndexTable, pluginCohortCompiler,cancellationToken);
+        SqlFullyCached = GetCacheFetchSqlIfPossible(parent, CohortSet, SqlCacheless, isSolitaryPatientIndexTable,
+            pluginCohortCompiler, cancellationToken);
 
         // if we have a patient index table where the Sql is not fully cached then we should invalidate anyone using it
-        if(isSolitaryPatientIndexTable && SqlFullyCached == null && parent.CacheManager != null)
-        {
+        if (isSolitaryPatientIndexTable && SqlFullyCached == null && parent.CacheManager != null)
             ClearCacheForUsersOfPatientIndexTable(parent.CacheManager, CohortSet);
-        }
 
         //but if that misses we would take a cache hit of an execution of the SqlPartiallyCached
-        if(SqlFullyCached == null && SqlPartiallyCached != null)
-            SqlFullyCached = GetCacheFetchSqlIfPossible(parent,CohortSet,SqlPartiallyCached,isSolitaryPatientIndexTable, pluginCohortCompiler, cancellationToken);
+        if (SqlFullyCached == null && SqlPartiallyCached != null)
+            SqlFullyCached = GetCacheFetchSqlIfPossible(parent, CohortSet, SqlPartiallyCached,
+                isSolitaryPatientIndexTable, pluginCohortCompiler, cancellationToken);
     }
 
-    private void ClearCacheForUsersOfPatientIndexTable(CachedAggregateConfigurationResultsManager cacheManager, AggregateConfiguration cohortSet)
+    private void ClearCacheForUsersOfPatientIndexTable(CachedAggregateConfigurationResultsManager cacheManager,
+        AggregateConfiguration cohortSet)
     {
         if (cacheManager == null)
             return;
 
-        var join = CohortSet.JoinableCohortAggregateConfiguration ?? throw new Exception($"{nameof(AggregateConfiguration.JoinableCohortAggregateConfiguration)} was null for CohortSet {cohortSet} so we were unable to clear the joinable cache users");
+        var join = CohortSet.JoinableCohortAggregateConfiguration ?? throw new Exception(
+            $"{nameof(AggregateConfiguration.JoinableCohortAggregateConfiguration)} was null for CohortSet {cohortSet} so we were unable to clear the joinable cache users");
 
         // get each Aggregate Configuration that joins using this patient index table
         foreach (var user in join.Users.Select(j => j.AggregateConfiguration))
-        {
             cacheManager.DeleteCacheEntryIfAny(user, AggregateOperation.IndexedExtractionIdentifierList);
-        }
     }
 
-    private CohortQueryBuilderDependencySql GetCacheFetchSqlIfPossible(CohortQueryBuilderResult parent, AggregateConfiguration aggregate,
-        CohortQueryBuilderDependencySql sql, bool isPatientIndexTable, IPluginCohortCompiler pluginCohortCompiler, CancellationToken cancellationToken)
+    private CohortQueryBuilderDependencySql GetCacheFetchSqlIfPossible(CohortQueryBuilderResult parent,
+        AggregateConfiguration aggregate,
+        CohortQueryBuilderDependencySql sql, bool isPatientIndexTable, IPluginCohortCompiler pluginCohortCompiler,
+        CancellationToken cancellationToken)
     {
         if (parent.CacheManager == null)
             return null;
 
-        var aggregateType = isPatientIndexTable ? AggregateOperation.JoinableInceptionQuery : AggregateOperation.IndexedExtractionIdentifierList;
+        var aggregateType = isPatientIndexTable
+            ? AggregateOperation.JoinableInceptionQuery
+            : AggregateOperation.IndexedExtractionIdentifierList;
         IHasFullyQualifiedNameToo existingTable;
 
         // since we might make a plugin API run call we had better lock this to
@@ -242,18 +247,18 @@ private CohortQueryBuilderDependencySql GetCacheFetchSqlIfPossible(CohortQueryBu
             // unless it is a plugin driven aggregate we need to assemble the SQL to check if the cache is stale
             if (pluginCohortCompiler == null)
             {
-                var parameterSql = QueryBuilder.GetParameterDeclarationSQL(sql.ParametersUsed.Clone().GetFinalResolvedParametersList());
+                var parameterSql =
+                    QueryBuilder.GetParameterDeclarationSQL(sql.ParametersUsed.Clone()
+                        .GetFinalResolvedParametersList());
                 var hitTestSql = parameterSql + sql.Sql;
                 existingTable = parent.CacheManager.GetLatestResultsTable(aggregate, aggregateType, hitTestSql);
             }
             else
             {
-                existingTable = parent.CacheManager.GetLatestResultsTableUnsafe(aggregate, aggregateType, out var oldDescription);
+                existingTable =
+                    parent.CacheManager.GetLatestResultsTableUnsafe(aggregate, aggregateType, out var oldDescription);
 
-                if (pluginCohortCompiler.IsStale(aggregate, oldDescription))
-                {
-                    existingTable = null;
-                }
+                if (pluginCohortCompiler.IsStale(aggregate, oldDescription)) existingTable = null;
             }
 
             // if there are no cached results in the destination (and it's a plugin cohort) then we need to run the plugin API call
@@ -266,9 +271,8 @@ private CohortQueryBuilderDependencySql GetCacheFetchSqlIfPossible(CohortQueryBu
                 existingTable = parent.CacheManager.GetLatestResultsTableUnsafe(aggregate, aggregateType);
 
                 if (existingTable == null)
-                {
-                    throw new Exception($"Run method on {pluginCohortCompiler} failed to populate the Query Result Cache for {CohortSet}");
-                }
+                    throw new Exception(
+                        $"Run method on {pluginCohortCompiler} failed to populate the Query Result Cache for {CohortSet}");
             }
         }
 
@@ -279,10 +283,10 @@ private CohortQueryBuilderDependencySql GetCacheFetchSqlIfPossible(CohortQueryBu
                 $@"{CachedAggregateConfigurationResultsManager.CachingPrefix}{aggregate.Name}*/{Environment.NewLine}select * from {existingTable.GetFullyQualifiedName()}{Environment.NewLine}";
 
             //Cache fetch does not require any parameters
-            return new CohortQueryBuilderDependencySql(sqlCachFetch,new ParameterManager());
+            return new CohortQueryBuilderDependencySql(sqlCachFetch, new ParameterManager());
         }
-                    
-            
+
+
         return null;
     }
 
diff --git a/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependencySql.cs b/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependencySql.cs
index 70001d2ed5..83ef2282ed 100644
--- a/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependencySql.cs
+++ b/Rdmp.Core/QueryBuilding/CohortQueryBuilderDependencySql.cs
@@ -33,8 +33,8 @@ public CohortQueryBuilderDependencySql(string sql, ParameterManager parameterMan
     {
         Sql = sql;
         ParametersUsed = parameterManager;
-
     }
+
     /// <summary>
     /// Can only be called once, updates the <see cref="Sql"/> to resolve parameter naming collisions with the larger query
     /// (see <paramref name="compositeLevelParameterManager"/>.  Returns the updated <see cref="Sql"/> (for convenience)
@@ -46,16 +46,17 @@ public CohortQueryBuilderDependencySql(string sql, ParameterManager parameterMan
     /// <returns></returns>
     public string Use(ParameterManager compositeLevelParameterManager)
     {
-        if(_hasBeenUsed)
+        if (_hasBeenUsed)
             throw new InvalidOperationException("Block can only be used once");
 
         //import parameters unless caching was used
-        compositeLevelParameterManager.ImportAndElevateResolvedParametersFromSubquery(ParametersUsed, out var renameOperations);
+        compositeLevelParameterManager.ImportAndElevateResolvedParametersFromSubquery(ParametersUsed,
+            out var renameOperations);
 
         //rename in the SQL too!
         foreach (var kvp in renameOperations)
             Sql = ParameterCreator.RenameParameterInSQL(Sql, kvp.Key, kvp.Value);
-            
+
         _hasBeenUsed = true;
 
         return Sql;
diff --git a/Rdmp.Core/QueryBuilding/CohortQueryBuilderHelper.cs b/Rdmp.Core/QueryBuilding/CohortQueryBuilderHelper.cs
index a34f47a899..bd2ca5bd0c 100644
--- a/Rdmp.Core/QueryBuilding/CohortQueryBuilderHelper.cs
+++ b/Rdmp.Core/QueryBuilding/CohortQueryBuilderHelper.cs
@@ -33,7 +33,8 @@ public class CohortQueryBuilderHelper
     /// <param name="aggregate"></param>
     /// <param name="args"></param>
     /// <returns></returns>
-    public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfiguration aggregate, QueryBuilderArgs args)
+    public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfiguration aggregate,
+        QueryBuilderArgs args)
     {
         var isJoinAggregate = aggregate.IsCohortIdentificationAggregate;
 
@@ -55,12 +56,17 @@ public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfig
             string selectList;
 
             if (!isJoinAggregate)
-                selectList = extractionIdentifier.SelectSQL +  (extractionIdentifier.Alias != null ? $" {extractionIdentifier.Alias}"
+                selectList = extractionIdentifier.SelectSQL + (extractionIdentifier.Alias != null
+                    ? $" {extractionIdentifier.Alias}"
                     : "");
             else
                 //unless we are also including other columns because this is a patient index joinable inception query
                 selectList = string.Join($",{Environment.NewLine}",
-                    aggregate.AggregateDimensions.Select(e => e.SelectSQL + (e.Alias != null ? $" {e.Alias}" : ""))); //joinable patient index tables have patientIdentifier + 1 or more other columns
+                    aggregate.AggregateDimensions.Select(e =>
+                        e.SelectSQL +
+                        (e.Alias != null
+                            ? $" {e.Alias}"
+                            : ""))); //joinable patient index tables have patientIdentifier + 1 or more other columns
 
             if (args.OverrideSelectList != null)
                 selectList = args.OverrideSelectList;
@@ -71,7 +77,7 @@ public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfig
             builder = new AggregateBuilder(limitationSQL, selectList, aggregate, aggregate.ForcedJoins);
 
             //false makes it skip them in the SQL it generates (it uses them only in determining JOIN requirements etc but since we passed in the select SQL explicitly it should be the equivellent of telling the query builder to generate a regular select 
-            if(!isJoinAggregate)
+            if (!isJoinAggregate)
                 builder.AddColumn(extractionIdentifier, false);
             else
                 builder.AddColumnRange(aggregate.AggregateDimensions.ToArray(), false);
@@ -79,7 +85,8 @@ public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfig
         else
         {
             if (args.OverrideSelectList != null)
-                throw new NotSupportedException("Cannot override Select list on aggregates that have HAVING / Count SQL configured in them");
+                throw new NotSupportedException(
+                    "Cannot override Select list on aggregates that have HAVING / Count SQL configured in them");
 
             builder = new AggregateBuilder("distinct", aggregate.CountSQL, aggregate, aggregate.ForcedJoins);
 
@@ -87,22 +94,24 @@ public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfig
             if (!isJoinAggregate)
                 builder.AddColumn(extractionIdentifier, true);
             else
-                builder.AddColumnRange(aggregate.AggregateDimensions.ToArray(), true);//it's a joinable inception query (See JoinableCohortAggregateConfiguration) - these are allowed additional columns
+                builder.AddColumnRange(aggregate.AggregateDimensions.ToArray(),
+                    true); //it's a joinable inception query (See JoinableCohortAggregateConfiguration) - these are allowed additional columns
 
             builder.DoNotWriteOutOrderBy = true;
         }
 
         if (args.TopX != -1)
-            builder.AggregateTopX = new SpontaneouslyInventedAggregateTopX(new MemoryRepository(), args.TopX, AggregateTopXOrderByDirection.Descending, null);
+            builder.AggregateTopX = new SpontaneouslyInventedAggregateTopX(new MemoryRepository(), args.TopX,
+                AggregateTopXOrderByDirection.Descending, null);
 
         //make sure builder has globals
-        foreach(var global in args.Globals)
+        foreach (var global in args.Globals)
             builder.ParameterManager.AddGlobalParameter(global);
 
         //Add the inception join
         if (args.JoinIfAny != null)
-            AddJoinToBuilder(aggregate,extractionIdentifier,builder, args);
-            
+            AddJoinToBuilder(aggregate, extractionIdentifier, builder, args);
+
         //set the where container
         builder.RootFilterContainer = aggregate.RootFilterContainer;
 
@@ -113,19 +122,17 @@ public static CohortQueryBuilderDependencySql GetSQLForAggregate(AggregateConfig
         //get the SQL from the builder (for the current configuration) - without parameters
         var currentBlock = builderSqlWithoutParameters;
 
-        var toReturn = new CohortQueryBuilderDependencySql(currentBlock,builder.ParameterManager);
+        var toReturn = new CohortQueryBuilderDependencySql(currentBlock, builder.ParameterManager);
 
-        if (args.JoinSql != null)
-        {
-            toReturn.ParametersUsed.MergeWithoutRename(args.JoinSql.ParametersUsed);
-        }
+        if (args.JoinSql != null) toReturn.ParametersUsed.MergeWithoutRename(args.JoinSql.ParametersUsed);
 
         //we need to generate the full SQL with parameters (and no rename operations) so we can do cache hit tests
         //renaming is deferred to later
         return toReturn;
     }
 
-    public static void AddJoinToBuilder(AggregateConfiguration user,IColumn usersExtractionIdentifier,AggregateBuilder builder, QueryBuilderArgs args)
+    public static void AddJoinToBuilder(AggregateConfiguration user, IColumn usersExtractionIdentifier,
+        AggregateBuilder builder, QueryBuilderArgs args)
     {
         var joinableTableAlias = args.JoinIfAny.GetJoinTableAlias();
         var joinDirection = args.JoinIfAny.GetJoinDirectionSQL();
@@ -134,10 +141,9 @@ public static void AddJoinToBuilder(AggregateConfiguration user,IColumn usersExt
 
         if (args.JoinedTo.Catalogue.IsApiCall(out var plugin))
         {
-            if(plugin == null)
-            {
-                throw new Exception($"No IPluginCohortCompiler was found that supports API cohort set '{args.JoinedTo}'");
-            }
+            if (plugin == null)
+                throw new Exception(
+                    $"No IPluginCohortCompiler was found that supports API cohort set '{args.JoinedTo}'");
 
             joinOn = plugin.GetJoinColumnForPatientIndexTable(args.JoinedTo);
         }
@@ -154,9 +160,10 @@ public static void AddJoinToBuilder(AggregateConfiguration user,IColumn usersExt
         // LEFT Join (***INCEPTION QUERY***)ix51 on ["+TestDatabaseNames.Prefix+@"ScratchArea]..[BulkData].[patientIdentifier] = ix51.patientIdentifier
 
         builder.AddCustomLine(
-            $" {joinDirection} Join ({Environment.NewLine}{TabIn(args.JoinSql.Sql, 1)}{Environment.NewLine}){joinableTableAlias}{Environment.NewLine}on {usersExtractionIdentifier.SelectSQL} = {joinableTableAlias}.{joinOn.GetRuntimeName()}",QueryComponent.JoinInfoJoin);
+            $" {joinDirection} Join ({Environment.NewLine}{TabIn(args.JoinSql.Sql, 1)}{Environment.NewLine}){joinableTableAlias}{Environment.NewLine}on {usersExtractionIdentifier.SelectSQL} = {joinableTableAlias}.{joinOn.GetRuntimeName()}",
+            QueryComponent.JoinInfoJoin);
     }
-        
+
     public static string TabIn(string str, int numberOfTabs)
     {
         if (string.IsNullOrWhiteSpace(str))
@@ -165,5 +172,4 @@ public static string TabIn(string str, int numberOfTabs)
         var tabs = new string('\t', numberOfTabs);
         return tabs + str.Replace(Environment.NewLine, Environment.NewLine + tabs);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/CohortQueryBuilderResult.cs b/Rdmp.Core/QueryBuilding/CohortQueryBuilderResult.cs
index 009856bee7..6e908c6220 100644
--- a/Rdmp.Core/QueryBuilding/CohortQueryBuilderResult.cs
+++ b/Rdmp.Core/QueryBuilding/CohortQueryBuilderResult.cs
@@ -70,16 +70,18 @@ public class CohortQueryBuilderResult
     /// The final SQL that should be executed on the <see cref="TargetServer"/>
     /// </summary>
     public string Sql { get; private set; }
-        
+
     /// <summary>
     /// The location at which the <see cref="Sql"/> should be run (may be a data server or a cache server or they may be one and the same!)
     /// </summary>
     public DiscoveredServer TargetServer { get; set; }
 
-    public IOrderable StopContainerWhenYouReach { get;set; }
+    public IOrderable StopContainerWhenYouReach { get; set; }
     public int CountOfSubQueries => Dependencies.Count;
     public int CountOfCachedSubQueries { get; private set; }
-    public IReadOnlyCollection<IPluginCohortCompiler> PluginCohortCompilers { get; } = Array.Empty<PluginCohortCompiler>().ToList().AsReadOnly();
+
+    public IReadOnlyCollection<IPluginCohortCompiler> PluginCohortCompilers { get; } =
+        Array.Empty<PluginCohortCompiler>().ToList().AsReadOnly();
 
     /// <summary>
     /// Creates a new result for a single <see cref="AggregateConfiguration"/> or <see cref="CohortAggregateContainer"/>
@@ -89,7 +91,8 @@ public class CohortQueryBuilderResult
     /// <param name="helper"></param>
     /// <param name="customise"></param>
     /// <param name="cancellationToken"></param>
-    public CohortQueryBuilderResult(ExternalDatabaseServer cacheServer, ICoreChildProvider childProvider, CohortQueryBuilderHelper helper,QueryBuilderCustomArgs customise,CancellationToken cancellationToken)
+    public CohortQueryBuilderResult(ExternalDatabaseServer cacheServer, ICoreChildProvider childProvider,
+        CohortQueryBuilderHelper helper, QueryBuilderCustomArgs customise, CancellationToken cancellationToken)
     {
         CacheServer = cacheServer;
         ChildProvider = childProvider;
@@ -100,10 +103,11 @@ public CohortQueryBuilderResult(ExternalDatabaseServer cacheServer, ICoreChildPr
         if (cacheServer != null)
         {
             CacheManager = new CachedAggregateConfigurationResultsManager(CacheServer);
-                
+
             try
             {
-                PluginCohortCompilers = new PluginCohortCompilerFactory(cacheServer.CatalogueRepository.MEF).CreateAll();
+                PluginCohortCompilers =
+                    new PluginCohortCompilerFactory(cacheServer.CatalogueRepository.MEF).CreateAll();
             }
             catch (Exception ex)
             {
@@ -120,19 +124,21 @@ public void BuildFor(CohortAggregateContainer container, ParameterManager parame
 
         _log.AppendLine($"Starting Build for {container}");
         //gather dependencies
-        foreach(var cohortSet in ChildProvider.GetAllChildrenRecursively(container).OfType<AggregateConfiguration>().Where(IsEnabled).OrderBy(ac=>ac.Order))
+        foreach (var cohortSet in ChildProvider.GetAllChildrenRecursively(container).OfType<AggregateConfiguration>()
+                     .Where(IsEnabled).OrderBy(ac => ac.Order))
             AddDependency(cohortSet);
-            
-        if(!Dependencies.Any())
-            throw new QueryBuildingException($"There are no AggregateConfigurations under the SET container '{container}'");
+
+        if (!Dependencies.Any())
+            throw new QueryBuildingException(
+                $"There are no AggregateConfigurations under the SET container '{container}'");
 
         LogDependencies();
 
         BuildDependenciesSql(parameterManager.ParametersFoundSoFarInQueryGeneration[ParameterLevel.Global].ToArray());
 
         MakeCacheDecision();
-            
-        Sql = BuildSql(container,parameterManager);
+
+        Sql = BuildSql(container, parameterManager);
     }
 
     public void BuildFor(AggregateConfiguration configuration, ParameterManager parameterManager)
@@ -142,7 +148,7 @@ public void BuildFor(AggregateConfiguration configuration, ParameterManager para
 
         _log.AppendLine($"Starting Build for {configuration}");
         var d = AddDependency(configuration);
-            
+
         LogDependencies();
 
         BuildDependenciesSql(parameterManager.ParametersFoundSoFarInQueryGeneration[ParameterLevel.Global].ToArray());
@@ -150,22 +156,24 @@ public void BuildFor(AggregateConfiguration configuration, ParameterManager para
         MakeCacheDecision();
 
 
-        Sql = BuildSql(d,parameterManager);
+        Sql = BuildSql(d, parameterManager);
     }
-        
-    private string BuildSql(CohortAggregateContainer container,ParameterManager parameterManager)
+
+    private string BuildSql(CohortAggregateContainer container, ParameterManager parameterManager)
     {
         Dictionary<CohortQueryBuilderDependency, string> sqlDictionary;
-            
+
         //if we are fully cached on everything
         if (Dependencies.All(d => d.SqlFullyCached != null))
         {
-            SetTargetServer(GetCacheServer(),"all dependencies are fully cached"); //run on the cache server
-                
+            SetTargetServer(GetCacheServer(), "all dependencies are fully cached"); //run on the cache server
+
             //all are cached
             CountOfCachedSubQueries = CountOfSubQueries;
 
-            sqlDictionary = Dependencies.ToDictionary(k => k, v => v.SqlFullyCached.Use(parameterManager)); //run the fully cached sql
+            sqlDictionary =
+                Dependencies.ToDictionary(k => k,
+                    v => v.SqlFullyCached.Use(parameterManager)); //run the fully cached sql
         }
         else
         {
@@ -183,14 +191,14 @@ private string BuildSql(CohortAggregateContainer container,ParameterManager para
                     //The cache and dataset are on the same server so run it
                     SetTargetServer(DependenciesSingleServer.GetDistinctServer(),
                         $"not all dependencies are cached while {uncached}");
-                        
-                    CountOfCachedSubQueries = Dependencies.Count(d=>d.SqlFullyCached != null);
-                        
+
+                    CountOfCachedSubQueries = Dependencies.Count(d => d.SqlFullyCached != null);
+
                     sqlDictionary =
                         Dependencies.ToDictionary(k => k,
-                            v =>  v.SqlFullyCached?.Use(parameterManager) ??
-                                  v.SqlPartiallyCached?.Use(parameterManager) ??
-                                  v.SqlCacheless.Use(parameterManager)); //run the fully cached sql
+                            v => v.SqlFullyCached?.Use(parameterManager) ??
+                                 v.SqlPartiallyCached?.Use(parameterManager) ??
+                                 v.SqlCacheless.Use(parameterManager)); //run the fully cached sql
                     break;
 
                 case CacheUsage.AllOrNothing:
@@ -202,24 +210,24 @@ private string BuildSql(CohortAggregateContainer container,ParameterManager para
                     //cannot use any of the caches because it's all or nothing
                     CountOfCachedSubQueries = 0;
                     sqlDictionary =
-                        Dependencies.ToDictionary(k => k, v => v.SqlCacheless.Use(parameterManager)); //run the fully uncached sql
+                        Dependencies.ToDictionary(k => k,
+                            v => v.SqlCacheless.Use(parameterManager)); //run the fully uncached sql
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        return WriteContainers(container, TargetServer.GetQuerySyntaxHelper(), sqlDictionary,0);
+        return WriteContainers(container, TargetServer.GetQuerySyntaxHelper(), sqlDictionary, 0);
     }
 
     private void SetTargetServer(DiscoveredServer target, string reason)
     {
-        if(TargetServer != null)
+        if (TargetServer != null)
             throw new InvalidOperationException("You are only supposed to pick a target server once");
 
         TargetServer = target;
         _log.AppendLine($"Picked TargetServer as {target} because {reason}");
-
     }
 
     private string WriteContainers(CohortAggregateContainer container, IQuerySyntaxHelper syntaxHelper,
@@ -231,21 +239,22 @@ private string WriteContainers(CohortAggregateContainer container, IQuerySyntaxH
         var toWriteOut = container.GetOrderedContents().Where(IsEnabled).ToArray();
 
         if (toWriteOut.Any())
-            sql += Environment.NewLine + TabIn( "(",tabs) + Environment.NewLine;
+            sql += Environment.NewLine + TabIn("(", tabs) + Environment.NewLine;
         else
-        {
             throw new QueryBuildingException($"Container '{container}' is empty, Disable it if you don't want it run'");
-        }
 
         var firstEntityWritten = false;
         foreach (var toWrite in toWriteOut)
         {
             if (firstEntityWritten)
-                sql += Environment.NewLine + TabIn(GetSetOperationSql(container.Operation,syntaxHelper.DatabaseType) + Environment.NewLine + Environment.NewLine,tabs);
+                sql += Environment.NewLine +
+                       TabIn(
+                           GetSetOperationSql(container.Operation, syntaxHelper.DatabaseType) + Environment.NewLine +
+                           Environment.NewLine, tabs);
 
-            if(toWrite is AggregateConfiguration)
+            if (toWrite is AggregateConfiguration)
                 sql += TabIn(sqlDictionary.Single(kvp => Equals(kvp.Key.CohortSet, toWrite)).Value, tabs);
-                
+
             if (toWrite is CohortAggregateContainer sub)
                 sql += WriteContainers(sub, syntaxHelper, sqlDictionary, tabs + 1);
 
@@ -254,22 +263,20 @@ private string WriteContainers(CohortAggregateContainer container, IQuerySyntaxH
 
             if (StopContainerWhenYouReach != null && StopContainerWhenYouReach.Equals(toWrite))
                 if (tabs != 0)
-                    throw new NotSupportedException("Stopping prematurely only works when the aggregate to stop at is in the top level container");
+                    throw new NotSupportedException(
+                        "Stopping prematurely only works when the aggregate to stop at is in the top level container");
                 else
                     break;
         }
 
         //if we outputted anything
         if (toWriteOut.Any())
-            sql += Environment.NewLine + TabIn(")",tabs) + Environment.NewLine ;
+            sql += Environment.NewLine + TabIn(")", tabs) + Environment.NewLine;
 
         return sql;
     }
 
-    private bool IsEnabled(IOrderable arg)
-    {
-        return IsEnabled(arg, ChildProvider);
-    }
+    private bool IsEnabled(IOrderable arg) => IsEnabled(arg, ChildProvider);
 
     /// <summary>
     /// Objects are enabled if they do not support disabling (<see cref="IDisableable"/>) or are <see cref="IDisableable.IsDisabled"/> = false
@@ -277,19 +284,18 @@ private bool IsEnabled(IOrderable arg)
     /// <returns></returns>
     public static bool IsEnabled(IOrderable arg, ICoreChildProvider childProvider)
     {
-        var parentDisabled = childProvider.GetDescendancyListIfAnyFor(arg)?.Parents.Any(p => p is IDisableable d && d.IsDisabled);
+        var parentDisabled = childProvider.GetDescendancyListIfAnyFor(arg)?.Parents
+            .Any(p => p is IDisableable d && d.IsDisabled);
 
         //if a parent is disabled
         if (parentDisabled.HasValue && parentDisabled.Value)
             return false;
 
         // skip empty containers unless strict validation is enabled
-        if(arg is CohortAggregateContainer container &&
-           !UserSettings.StrictValidationForCohortBuilderContainers)
-        {
+        if (arg is CohortAggregateContainer container &&
+            !UserSettings.StrictValidationForCohortBuilderContainers)
             if (!container.GetOrderedContents().Any())
                 return false;
-        }
 
         //or you yourself are disabled
         return arg is not IDisableable dis || !dis.IsDisabled;
@@ -301,7 +307,7 @@ public static bool IsEnabled(IOrderable arg, ICoreChildProvider childProvider)
     /// <param name="currentContainerOperation"></param>
     /// <param name="dbType"></param>
     /// <returns></returns>
-    protected virtual string GetSetOperationSql(SetOperation currentContainerOperation,DatabaseType dbType)
+    protected virtual string GetSetOperationSql(SetOperation currentContainerOperation, DatabaseType dbType)
     {
         if (dbType == DatabaseType.MySql)
             throw new NotSupportedException("INTERSECT / UNION / EXCEPT are not supported by MySql caches");
@@ -318,16 +324,17 @@ protected virtual string GetSetOperationSql(SetOperation currentContainerOperati
 
                 return "EXCEPT";
             default:
-                throw new ArgumentOutOfRangeException(nameof(currentContainerOperation), currentContainerOperation, null);
+                throw new ArgumentOutOfRangeException(nameof(currentContainerOperation), currentContainerOperation,
+                    null);
         }
     }
 
-    private string BuildSql(CohortQueryBuilderDependency dependency,ParameterManager parameterManager)
+    private string BuildSql(CohortQueryBuilderDependency dependency, ParameterManager parameterManager)
     {
         //if we are fully cached on everything
         if (dependency.SqlFullyCached != null)
         {
-            SetTargetServer(GetCacheServer()," dependency is cached"); //run on the cache server
+            SetTargetServer(GetCacheServer(), " dependency is cached"); //run on the cache server
             CountOfCachedSubQueries++; //it is cached
             return dependency.SqlFullyCached.Use(parameterManager); //run the fully cached sql
         }
@@ -341,51 +348,48 @@ private string BuildSql(CohortQueryBuilderDependency dependency,ParameterManager
             case CacheUsage.Opportunistic:
 
                 //The cache and dataset are on the same server so run it
-                SetTargetServer(DependenciesSingleServer.GetDistinctServer(),"data and cache are on the same server");
-                return dependency.SqlPartiallyCached?.Use(parameterManager) ?? dependency.SqlCacheless.Use(parameterManager);
+                SetTargetServer(DependenciesSingleServer.GetDistinctServer(), "data and cache are on the same server");
+                return dependency.SqlPartiallyCached?.Use(parameterManager) ??
+                       dependency.SqlCacheless.Use(parameterManager);
             case CacheUsage.AllOrNothing:
 
                 //It's not fully cached so we have to run it entirely uncached
-                SetTargetServer(DependenciesSingleServer.GetDistinctServer(),"cache and data are on seperate servers / access credentials and not all datasets are in the cache");
+                SetTargetServer(DependenciesSingleServer.GetDistinctServer(),
+                    "cache and data are on seperate servers / access credentials and not all datasets are in the cache");
                 return dependency.SqlCacheless.Use(parameterManager);
             default:
                 throw new ArgumentOutOfRangeException();
         }
     }
 
-    private DiscoveredServer GetCacheServer()
-    {
-        return CacheServer.Discover(DataAccessContext.InternalDataProcessing).Server;
-    }
+    private DiscoveredServer GetCacheServer() => CacheServer.Discover(DataAccessContext.InternalDataProcessing).Server;
 
     private void BuildDependenciesSql(ISqlParameter[] globals)
     {
         foreach (var d in Dependencies)
-            d.Build(this,globals, CancellationToken);
+            d.Build(this, globals, CancellationToken);
     }
 
 
     private CohortQueryBuilderDependency AddDependency(AggregateConfiguration cohortSet)
     {
-        if(cohortSet.Catalogue.IsApiCall())
+        if (cohortSet.Catalogue.IsApiCall())
         {
-            if(CacheManager == null)
-            {
-                throw new Exception($"Caching must be enabled to execute API call '{cohortSet}'");
-            }
+            if (CacheManager == null) throw new Exception($"Caching must be enabled to execute API call '{cohortSet}'");
 
-            if (!PluginCohortCompilers.Any(c=>c.ShouldRun(cohortSet)))
-            {
-                throw new Exception($"No PluginCohortCompilers claimed to support '{cohortSet}' in their ShouldRun method");
-            }
+            if (!PluginCohortCompilers.Any(c => c.ShouldRun(cohortSet)))
+                throw new Exception(
+                    $"No PluginCohortCompilers claimed to support '{cohortSet}' in their ShouldRun method");
         }
 
         var join = ChildProvider.AllJoinUses.Where(j => j.AggregateConfiguration_ID == cohortSet.ID).ToArray();
 
-        if(join.Length > 1)
-            throw new NotSupportedException($"There are {join.Length} joins configured to AggregateConfiguration {cohortSet}");
+        if (join.Length > 1)
+            throw new NotSupportedException(
+                $"There are {join.Length} joins configured to AggregateConfiguration {cohortSet}");
 
-        var d = new CohortQueryBuilderDependency(cohortSet, join.SingleOrDefault(), ChildProvider, PluginCohortCompilers);
+        var d = new CohortQueryBuilderDependency(cohortSet, join.SingleOrDefault(), ChildProvider,
+            PluginCohortCompilers);
         _dependencies.Add(d);
 
         return d;
@@ -394,45 +398,49 @@ private CohortQueryBuilderDependency AddDependency(AggregateConfiguration cohort
     private void MakeCacheDecision()
     {
         if (CacheServer == null)
-            SetCacheUsage(CacheUsage.AllOrNothing,"there is no cache server");
+        {
+            SetCacheUsage(CacheUsage.AllOrNothing, "there is no cache server");
+        }
         else
         {
             _log.AppendLine($"Cache Server:{CacheServer.Server} (DatabaseType:{CacheServer.DatabaseType})");
             SetCacheUsage(CacheUsage.Opportunistic, "there is a cache server (so starting with Opportunistic)");
         }
-            
-        DependenciesSingleServer =  new DataAccessPointCollection(true);
+
+        DependenciesSingleServer = new DataAccessPointCollection(true);
 
         foreach (var dependency in Dependencies)
         {
-
             _log.AppendLine($"Evaluating '{dependency.CohortSet}'");
             foreach (var dependantTable in dependency.CohortSet.Catalogue.GetTableInfoList(false))
-                HandleDependency(dependency,false, dependantTable);
-                
+                HandleDependency(dependency, false, dependantTable);
+
             if (dependency.JoinedTo != null)
             {
                 _log.AppendLine($"Evaluating '{dependency.JoinedTo}'");
                 foreach (var dependantTable in dependency.JoinedTo.Catalogue.GetTableInfoList(false))
-                    HandleDependency(dependency,true,dependantTable);
+                    HandleDependency(dependency, true, dependantTable);
             }
         }
     }
 
-    private void HandleDependency(CohortQueryBuilderDependency dependency,bool isPatientIndexTable, ITableInfo dependantTable)
+    private void HandleDependency(CohortQueryBuilderDependency dependency, bool isPatientIndexTable,
+        ITableInfo dependantTable)
     {
-        _log.AppendLine($"Found dependant table '{dependantTable}' (Server:{dependantTable.Server} DatabaseType:{dependantTable.DatabaseType})");
-            
+        _log.AppendLine(
+            $"Found dependant table '{dependantTable}' (Server:{dependantTable.Server} DatabaseType:{dependantTable.DatabaseType})");
+
         //if dependencies are on different servers / access credentials
-        if(DependenciesSingleServer != null)
+        if (DependenciesSingleServer != null)
             if (!DependenciesSingleServer.TryAdd(dependantTable))
             {
                 //we can no longer establish a consistent connection to all the dependencies
                 _log.AppendLine($"Found problematic dependant table '{dependantTable}'");
 
                 //if there's no cache server that's a problem!
-                if(CacheServer == null)
-                    throw new QueryBuildingException($"Table {dependantTable} is on a different server (or uses different access credentials) from previously seen dependencies and no QueryCache is configured");
+                if (CacheServer == null)
+                    throw new QueryBuildingException(
+                        $"Table {dependantTable} is on a different server (or uses different access credentials) from previously seen dependencies and no QueryCache is configured");
 
                 //there is a cache server, perhaps we can dodge 'dependantTable' by going to cache instead
                 var canUseCacheForDependantTable =
@@ -449,8 +457,9 @@ private void HandleDependency(CohortQueryBuilderDependency dependency,bool isPat
                     DependenciesSingleServer = null;
 
                     //there IS a cache so we now Must use it
-                    if(CacheUsageDecision != CacheUsage.MustUse)
-                        SetCacheUsage(CacheUsage.MustUse,$"Table {dependantTable} is on a different server (or uses different access credentials) from previously seen dependencies.  Therefore the QueryCache MUST be used for all dependencies");
+                    if (CacheUsageDecision != CacheUsage.MustUse)
+                        SetCacheUsage(CacheUsage.MustUse,
+                            $"Table {dependantTable} is on a different server (or uses different access credentials) from previously seen dependencies.  Therefore the QueryCache MUST be used for all dependencies");
                 }
             }
 
@@ -461,35 +470,37 @@ private void HandleDependency(CohortQueryBuilderDependency dependency,bool isPat
             //We can only do opportunistic joins if the Cache and Data server are on the same server
             var canCombine = DependenciesSingleServer.AddWouldBePossible(CacheServer);
 
-            if(!canCombine)
-                SetCacheUsage(CacheUsage.AllOrNothing,"All datasets are on one server/access credentials while Cache is on a separate one");
+            if (!canCombine)
+                SetCacheUsage(CacheUsage.AllOrNothing,
+                    "All datasets are on one server/access credentials while Cache is on a separate one");
         }
-                
     }
+
     private void LogDependencies()
     {
         foreach (var d in Dependencies)
         {
             _log.AppendLine($"Dependency '{d}' is {d.DescribeCachedState()}");
-            _log.AppendLine($"Dependency '{d}' IsExtractionIdentifier column is {d.ExtractionIdentifierColumn?.GetRuntimeName() ?? "NULL"}");
-        }   
+            _log.AppendLine(
+                $"Dependency '{d}' IsExtractionIdentifier column is {d.ExtractionIdentifierColumn?.GetRuntimeName() ?? "NULL"}");
+        }
     }
 
-        
+
     private void SetCacheUsage(CacheUsage value, string thereIsNoCacheServer)
     {
         CacheUsageDecision = value;
         _log.AppendLine($"Setting {nameof(CacheUsageDecision)} to {value} because {thereIsNoCacheServer}");
     }
-        
+
     private void ThrowIfAlreadyBuilt()
     {
         if (_alreadyBuilt)
             throw new InvalidOperationException("Dependencies have already been built");
-            
+
         _alreadyBuilt = true;
     }
-        
+
     public static string TabIn(string str, int numberOfTabs)
     {
         if (string.IsNullOrWhiteSpace(str))
@@ -498,6 +509,4 @@ public static string TabIn(string str, int numberOfTabs)
         var tabs = new string('\t', numberOfTabs);
         return tabs + str.Replace(Environment.NewLine, Environment.NewLine + tabs);
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/CohortSummaryQueryBuilder.cs b/Rdmp.Core/QueryBuilding/CohortSummaryQueryBuilder.cs
index 6b3ddac7c6..56b5b3dbde 100644
--- a/Rdmp.Core/QueryBuilding/CohortSummaryQueryBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/CohortSummaryQueryBuilder.cs
@@ -38,13 +38,15 @@ public class CohortSummaryQueryBuilder
     /// <param name="summary">A basic aggregate that you want to restrict by cohort e.g. a pivot on drugs prescribed over time with an axis interval of year</param>
     /// <param name="cohort">A cohort aggregate that has a single AggregateDimension which must be an IsExtractionIdentifier and must follow the correct cohort aggregate naming conventions (See IsCohortIdentificationAggregate)</param>
     /// <param name="childProvider"></param>
-    public CohortSummaryQueryBuilder(AggregateConfiguration summary, AggregateConfiguration cohort, ICoreChildProvider childProvider)
+    public CohortSummaryQueryBuilder(AggregateConfiguration summary, AggregateConfiguration cohort,
+        ICoreChildProvider childProvider)
     {
         if (cohort == null)
-            throw new ArgumentException("cohort was null in CohortSummaryQueryBuilder constructor",nameof(cohort));
-            
-        if(summary.Equals(cohort))
-            throw new ArgumentException("Summary and Cohort should be different aggregates.  Summary should be a graphable useful aggregate while cohort should return a list of private identifiers");
+            throw new ArgumentException("cohort was null in CohortSummaryQueryBuilder constructor", nameof(cohort));
+
+        if (summary.Equals(cohort))
+            throw new ArgumentException(
+                "Summary and Cohort should be different aggregates.  Summary should be a graphable useful aggregate while cohort should return a list of private identifiers");
 
         ThrowIfNotValidGraph(summary);
 
@@ -55,10 +57,11 @@ public CohortSummaryQueryBuilder(AggregateConfiguration summary, AggregateConfig
         catch (Exception e)
         {
             throw new ArgumentException(
-                $"The second argument to constructor CohortSummaryQueryBuilder should be a cohort identification aggregate (i.e. have a single AggregateDimension marked IsExtractionIdentifier and have a name starting with {CohortIdentificationConfiguration.CICPrefix}) but the argument you passed ('{cohort}') was NOT a cohort identification configuration aggregate", e);
+                $"The second argument to constructor CohortSummaryQueryBuilder should be a cohort identification aggregate (i.e. have a single AggregateDimension marked IsExtractionIdentifier and have a name starting with {CohortIdentificationConfiguration.CICPrefix}) but the argument you passed ('{cohort}') was NOT a cohort identification configuration aggregate",
+                e);
         }
 
-        if(summary.Catalogue_ID != cohort.Catalogue_ID)
+        if (summary.Catalogue_ID != cohort.Catalogue_ID)
             throw new ArgumentException(
                 $"Constructor arguments to CohortSummaryQueryBuilder must belong to the same dataset (i.e. have the same underlying Catalogue), the first argument (the graphable aggregate) was called '{summary} and belonged to Catalogue ID {summary.Catalogue_ID} while the second argument (the cohort) was called '{cohort}' and belonged to Catalogue ID {cohort.Catalogue_ID}");
 
@@ -67,20 +70,20 @@ public CohortSummaryQueryBuilder(AggregateConfiguration summary, AggregateConfig
         _childProvider = childProvider;
 
         //here we take the identifier from the cohort because the dataset might have multiple identifiers e.g. birth record could have patient Id, parent Id, child Id etc.  The Aggregate will already have one of those selected and only one of them selected
-        _extractionIdentifierColumn = _cohort.AggregateDimensions.Single(d=>d.IsExtractionIdentifier);
+        _extractionIdentifierColumn = _cohort.AggregateDimensions.Single(d => d.IsExtractionIdentifier);
 
         var cic = _cohort.GetCohortIdentificationConfigurationIfAny() ?? throw new ArgumentException(
-                $"AggregateConfiguration {_cohort} looked like a cohort but did not belong to any CohortIdentificationConfiguration");
+            $"AggregateConfiguration {_cohort} looked like a cohort but did not belong to any CohortIdentificationConfiguration");
         _globals = cic.GetAllParameters();
     }
 
 
     public CohortSummaryQueryBuilder(AggregateConfiguration summary, CohortAggregateContainer cohortAggregateContainer)
     {
-
         ThrowIfNotValidGraph(summary);
 
-        var extractionIdentifiers = summary.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Where(e => e.IsExtractionIdentifier).ToArray();
+        var extractionIdentifiers = summary.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Where(e => e.IsExtractionIdentifier).ToArray();
 
         if (extractionIdentifiers.Length != 1)
             throw new Exception(
@@ -91,7 +94,7 @@ public CohortSummaryQueryBuilder(AggregateConfiguration summary, CohortAggregate
         _cohortContainer = cohortAggregateContainer;
 
         var cic = _cohortContainer.GetCohortIdentificationConfiguration() ?? throw new ArgumentException(
-                $"CohortAggregateContainer {cohortAggregateContainer} is an orphan? it does not belong to any CohortIdentificationConfiguration");
+            $"CohortAggregateContainer {cohortAggregateContainer} is an orphan? it does not belong to any CohortIdentificationConfiguration");
         _globals = cic.GetAllParameters();
     }
 
@@ -108,13 +111,15 @@ public CohortSummaryQueryBuilder(AggregateConfiguration summary, CohortAggregate
     /// and the cohort (resulting in a graphing of the RECORDS returned by the cohort set query instead of a master set of all those patients records - as above does).</para>
     /// </summary>
     /// <returns></returns>
-    public AggregateBuilder GetAdjustedAggregateBuilder(CohortSummaryAdjustment adjustment, IFilter singleFilterOnly = null)
+    public AggregateBuilder GetAdjustedAggregateBuilder(CohortSummaryAdjustment adjustment,
+        IFilter singleFilterOnly = null)
     {
         switch (adjustment)
         {
             case CohortSummaryAdjustment.WhereExtractionIdentifiersIn:
                 if (singleFilterOnly != null)
-                    throw new NotSupportedException("You cannot graph a single IFilter with CohortSummaryAdjustment.WhereExtractionIdentifiersIn");
+                    throw new NotSupportedException(
+                        "You cannot graph a single IFilter with CohortSummaryAdjustment.WhereExtractionIdentifiersIn");
 
                 return GetAdjustedForExtractionIdentifiersIn();
             case CohortSummaryAdjustment.WhereRecordsIn:
@@ -126,8 +131,9 @@ public AggregateBuilder GetAdjustedAggregateBuilder(CohortSummaryAdjustment adju
 
     private AggregateBuilder GetAdjustedForRecordsIn(IFilter singleFilterOnly = null)
     {
-        if(_cohort == null)
-            throw new NotSupportedException("This method only works when there is a cohort aggregate, it does not work for CohortAggregateContainers");
+        if (_cohort == null)
+            throw new NotSupportedException(
+                "This method only works when there is a cohort aggregate, it does not work for CohortAggregateContainers");
 
         var memoryRepository = new MemoryCatalogueRepository();
 
@@ -142,7 +148,8 @@ private AggregateBuilder GetAdjustedForRecordsIn(IFilter singleFilterOnly = null
 
         //if we are only graphing a single filter from the Cohort
         if (singleFilterOnly != null)
-            cohortRootContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,null, new [] { singleFilterOnly }, FilterContainerOperation.AND);
+            cohortRootContainer = new SpontaneouslyInventedFilterContainer(memoryRepository, null,
+                new[] { singleFilterOnly }, FilterContainerOperation.AND);
 
         var joinUse = _cohort.PatientIndexJoinablesUsed.SingleOrDefault();
         var joinTo = joinUse?.JoinableCohortAggregateConfiguration?.AggregateConfiguration;
@@ -159,11 +166,12 @@ private AggregateBuilder GetAdjustedForRecordsIn(IFilter singleFilterOnly = null
             var extractionIdentifierColumn = _summary.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
                 .Where(ei => ei.IsExtractionIdentifier).ToArray();
 
-            if(extractionIdentifierColumn.Length != 1)
+            if (extractionIdentifierColumn.Length != 1)
                 throw new Exception(
                     $"Catalogue behind {_summary} must have exactly 1 IsExtractionIdentifier column but it had {extractionIdentifierColumn.Length}");
 
-            CohortQueryBuilderHelper.AddJoinToBuilder(_summary,extractionIdentifierColumn[0],summaryBuilder,new QueryBuilderArgs(joinUse,joinTo,joinableSql,null,_globals));
+            CohortQueryBuilderHelper.AddJoinToBuilder(_summary, extractionIdentifierColumn[0], summaryBuilder,
+                new QueryBuilderArgs(joinUse, joinTo, joinableSql, null, _globals));
         }
 
         //if the cohort has no WHERE SQL
@@ -172,13 +180,16 @@ private AggregateBuilder GetAdjustedForRecordsIn(IFilter singleFilterOnly = null
 
         //the summary has no WHERE SQL
         if (summaryRootContainer == null)
-            summaryBuilder.RootFilterContainer = cohortRootContainer;//hijack the cohorts root container
+        {
+            summaryBuilder.RootFilterContainer = cohortRootContainer; //hijack the cohorts root container
+        }
         else
         {
             //they both have WHERE SQL
 
             //Create a new spontaneous container (virtual memory only container) that contains both subtrees
-            var spontContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,new[] { cohortRootContainer,summaryRootContainer }, null, FilterContainerOperation.AND);
+            var spontContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,
+                new[] { cohortRootContainer, summaryRootContainer }, null, FilterContainerOperation.AND);
             summaryBuilder.RootFilterContainer = spontContainer;
         }
 
@@ -191,7 +202,8 @@ private AggregateBuilder GetAdjustedForRecordsIn(IFilter singleFilterOnly = null
 
     private AggregateBuilder GetAdjustedForExtractionIdentifiersIn()
     {
-        var cachingServer = GetQueryCachingServer() ?? throw new NotSupportedException("No Query Caching Server configured");
+        var cachingServer = GetQueryCachingServer() ??
+                            throw new NotSupportedException("No Query Caching Server configured");
         var memoryRepository = new MemoryCatalogueRepository();
 
         //Get a builder for creating the basic aggregate graph
@@ -201,7 +213,8 @@ private AggregateBuilder GetAdjustedForExtractionIdentifiersIn()
         var oldRootContainer = builder.RootFilterContainer;
 
         //Create a new spontaneous container (virtual memory only container, this will include an in line filter that restricts the graph to match the cohort and then include a subcontainer with the old root container - if there was one)
-        var spontContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,oldRootContainer != null ? new[] { oldRootContainer } : null, null, FilterContainerOperation.AND);
+        var spontContainer = new SpontaneouslyInventedFilterContainer(memoryRepository,
+            oldRootContainer != null ? new[] { oldRootContainer } : null, null, FilterContainerOperation.AND);
 
         //work out a filter SQL that will restrict the graph generated only to the cohort
         var cohortQueryBuilder = GetBuilder();
@@ -212,7 +225,8 @@ private AggregateBuilder GetAdjustedForExtractionIdentifiersIn()
         //the basic cohort SQL select chi from dataset where ....
         var cohortSql = cohortQueryBuilder.SQL;
 
-        if (cohortQueryBuilder.Results.CountOfCachedSubQueries == 0 || cohortQueryBuilder.Results.CountOfSubQueries != cohortQueryBuilder.Results.CountOfCachedSubQueries)
+        if (cohortQueryBuilder.Results.CountOfCachedSubQueries == 0 || cohortQueryBuilder.Results.CountOfSubQueries !=
+            cohortQueryBuilder.Results.CountOfCachedSubQueries)
             throw new NotSupportedException(
                 $"Only works for 100% Cached queries, your query has {cohortQueryBuilder.Results.CountOfCachedSubQueries}/{cohortQueryBuilder.Results.CountOfSubQueries} queries cached");
 
@@ -220,7 +234,9 @@ private AggregateBuilder GetAdjustedForExtractionIdentifiersIn()
         var filterSql = $"{_extractionIdentifierColumn.SelectSQL} IN ({cohortSql})";
 
         //Add a filter which restricts the graph generated to the cohort only
-        spontContainer.AddChild(new SpontaneouslyInventedFilter(memoryRepository,spontContainer, filterSql, "Patient is in cohort", "Ensures the patients in the summary aggregate are also in the cohort aggregate (and only them)", null));
+        spontContainer.AddChild(new SpontaneouslyInventedFilter(memoryRepository, spontContainer, filterSql,
+            "Patient is in cohort",
+            "Ensures the patients in the summary aggregate are also in the cohort aggregate (and only them)", null));
 
         builder.RootFilterContainer = spontContainer;
 
@@ -240,11 +256,11 @@ private ExternalDatabaseServer GetQueryCachingServer()
 
     private CohortQueryBuilder GetBuilder()
     {
-        if(_cohort != null)
-            return new CohortQueryBuilder(_cohort, _globals,_childProvider);
-            
-        if(_cohortContainer != null)
-            return new CohortQueryBuilder(_cohortContainer,_globals,_childProvider);
+        if (_cohort != null)
+            return new CohortQueryBuilder(_cohort, _globals, _childProvider);
+
+        if (_cohortContainer != null)
+            return new CohortQueryBuilder(_cohortContainer, _globals, _childProvider);
 
         throw new NotSupportedException("Expected there to be either a _cohort or a _cohortContainer");
     }
@@ -263,7 +279,7 @@ private static void ThrowIfNotCohort(AggregateConfiguration cohort)
             throw new ArgumentException(
                 $"AggregateConfiguration {cohort} was a not a cohort identification configuration aggregate its name didn't start with '{CohortIdentificationConfiguration.CICPrefix}', this is not allowed, the second argument must always be a cohort specific aggregate with only a single column marked IsExtractionIdentifier etc");
 
-        if(cohort.AggregateDimensions.Count(d=>d.IsExtractionIdentifier) != 1)
+        if (cohort.AggregateDimensions.Count(d => d.IsExtractionIdentifier) != 1)
             throw new Exception(
                 $"Expected cohort {cohort} to have exactly 1 column which would be an IsExtractionIdentifier");
     }
diff --git a/Rdmp.Core/QueryBuilding/ColumnInfoToIColumn.cs b/Rdmp.Core/QueryBuilding/ColumnInfoToIColumn.cs
index 3d9120f16f..a069baa537 100644
--- a/Rdmp.Core/QueryBuilding/ColumnInfoToIColumn.cs
+++ b/Rdmp.Core/QueryBuilding/ColumnInfoToIColumn.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.QueryBuilding;
 /// (which is a reference to an existing column on your database only).  The alias will be null and the Order will be -1 meaning that ColumnInfoToIColumn will
 /// by default appear above other IColumns in order.
 /// </summary>
-public class ColumnInfoToIColumn :SpontaneousObject, IColumn
+public class ColumnInfoToIColumn : SpontaneousObject, IColumn
 {
     private static Random r = new();
 
@@ -28,7 +28,7 @@ public class ColumnInfoToIColumn :SpontaneousObject, IColumn
     /// </summary>
     /// <param name="repo"></param>
     /// <param name="column"></param>
-    public ColumnInfoToIColumn(MemoryRepository repo, ColumnInfo column):base(repo)
+    public ColumnInfoToIColumn(MemoryRepository repo, ColumnInfo column) : base(repo)
     {
         ColumnInfo = column;
         Order = -1;
@@ -38,13 +38,10 @@ public ColumnInfoToIColumn(MemoryRepository repo, ColumnInfo column):base(repo)
         IsExtractionIdentifier = false;
         IsPrimaryKey = false;
     }
-        
+
     /// <inheritdoc/>
-    public string GetRuntimeName()
-    {
-        return ColumnInfo.GetRuntimeName();
-    }
-        
+    public string GetRuntimeName() => ColumnInfo.GetRuntimeName();
+
     /// <inheritdoc/>
     public ColumnInfo ColumnInfo { get; private set; }
 
@@ -54,16 +51,19 @@ public string GetRuntimeName()
     /// <inheritdoc/>
     [Sql]
     public string SelectSQL { get; set; }
-        
+
     /// <inheritdoc/>
     public string Alias { get; set; }
+
     /// <inheritdoc/>
     public bool HashOnDataRelease { get; private set; }
+
     /// <inheritdoc/>
     public bool IsExtractionIdentifier { get; private set; }
+
     /// <inheritdoc/>
     public bool IsPrimaryKey { get; private set; }
-        
+
     /// <summary>
     /// Checks the syntax of the column
     /// </summary>
diff --git a/Rdmp.Core/QueryBuilding/ConstantParameter.cs b/Rdmp.Core/QueryBuilding/ConstantParameter.cs
index d13873d2aa..8f2d7e28fe 100644
--- a/Rdmp.Core/QueryBuilding/ConstantParameter.cs
+++ b/Rdmp.Core/QueryBuilding/ConstantParameter.cs
@@ -31,7 +31,7 @@ public class ConstantParameter : ISqlParameter
     /// <param name="value">The value to set the paramater e.g. 1</param>
     /// <param name="comment">Some text to appear above the parameter, explaining its purpose</param>
     /// <param name="syntaxHelper"></param>
-    public ConstantParameter(string parameterSQL,string value,string comment, IQuerySyntaxHelper syntaxHelper)
+    public ConstantParameter(string parameterSQL, string value, string comment, IQuerySyntaxHelper syntaxHelper)
     {
         _syntaxHelper = syntaxHelper;
         Value = value;
@@ -48,10 +48,7 @@ public void SaveToDatabase()
     }
 
     /// <inheritdoc/>
-    public override string ToString()
-    {
-        return $"{ParameterName} = {Value}";
-    }
+    public override string ToString() => $"{ParameterName} = {Value}";
 
     /// <summary>
     /// Checks the syntax of the parameter (See <see cref="ParameterSyntaxChecker"/>)
@@ -63,10 +60,7 @@ public void Check(ICheckNotifier notifier)
     }
 
     /// <inheritdoc/>
-    public IQuerySyntaxHelper GetQuerySyntaxHelper()
-    {
-        return _syntaxHelper;
-    }
+    public IQuerySyntaxHelper GetQuerySyntaxHelper() => _syntaxHelper;
 
     /// <inheritdoc/>
     public string ParameterName => QuerySyntaxHelper.GetParameterNameFromDeclarationSQL(ParameterSQL);
@@ -86,10 +80,7 @@ public IQuerySyntaxHelper GetQuerySyntaxHelper()
     /// Returns null, <see cref="ConstantParameter"/> are never owned by any objects
     /// </summary>
     /// <returns></returns>
-    public IMapsDirectlyToDatabaseTable GetOwnerIfAny()
-    {
-        return null;
-    }
+    public IMapsDirectlyToDatabaseTable GetOwnerIfAny() => null;
 
     /// <summary>
     /// Attempts to parse the provided <paramref name="sql"/> text into a <see cref="ConstantParameter"/>
@@ -118,7 +109,7 @@ public static ConstantParameter Parse(string sql, IQuerySyntaxHelper syntaxHelpe
 
         var valueLineSplit = valueLine.Split(new[] { '=' });
         var value = valueLineSplit[1].TrimEnd(new[] { ';', '\r' });
-            
+
         return new ConstantParameter(declaration.Trim(), value.Trim(), comment, syntaxHelper);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/DataAccessPointCollection.cs b/Rdmp.Core/QueryBuilding/DataAccessPointCollection.cs
index 7f115499d8..cb13efaa49 100644
--- a/Rdmp.Core/QueryBuilding/DataAccessPointCollection.cs
+++ b/Rdmp.Core/QueryBuilding/DataAccessPointCollection.cs
@@ -30,7 +30,7 @@ public class DataAccessPointCollection
     /// </summary>
     public IReadOnlyCollection<IDataAccessPoint> Points => _points;
 
-    public DataAccessContext DataAccessContext { get;}
+    public DataAccessContext DataAccessContext { get; }
 
     private HashSet<IDataAccessPoint> _points = new();
 
@@ -40,7 +40,8 @@ public class DataAccessPointCollection
     /// </summary>
     /// <param name="singleServer">True to require all <see cref="Points"/> to be on the same server (and type).</param>
     /// <param name="context"></param>
-    public DataAccessPointCollection(bool singleServer,DataAccessContext context = DataAccessContext.InternalDataProcessing)
+    public DataAccessPointCollection(bool singleServer,
+        DataAccessContext context = DataAccessContext.InternalDataProcessing)
     {
         SingleServer = singleServer;
         DataAccessContext = context;
@@ -64,7 +65,7 @@ public void Add(IDataAccessPoint point)
     /// <returns></returns>
     public bool TryAdd(IDataAccessPoint point)
     {
-        return TryAddRange(new []{ point});
+        return TryAddRange(new[] { point });
     }
 
     /// <summary>
@@ -97,7 +98,7 @@ public bool TryAddRange(IDataAccessPoint[] points)
     public void AddRange(IDataAccessPoint[] points)
     {
         //if we already have all the points then don't bother checking
-        if(points.All(p=>_points.Contains(p)))
+        if (points.All(p => _points.Contains(p)))
             return;
 
         if (SingleServer)
@@ -122,12 +123,13 @@ public void AddRange(IDataAccessPoint[] points)
                     throw;
 
                 throw new InvalidOperationException(
-                    $"Could not identify single set of server/credentials to use with points:{string.Join(Environment.NewLine, tempList)}", e);
+                    $"Could not identify single set of server/credentials to use with points:{string.Join(Environment.NewLine, tempList)}",
+                    e);
             }
         }
         else
         {
-            foreach(var p in points)
+            foreach (var p in points)
                 _points.Add(p);
         }
     }
@@ -146,7 +148,7 @@ public void Clear()
     /// <returns></returns>
     public override string ToString()
     {
-        return string.Join(",", Points.Select(p=>p.ToString()));
+        return string.Join(",", Points.Select(p => p.ToString()));
     }
 
     /// <summary>
@@ -157,7 +159,7 @@ public override string ToString()
     /// <returns></returns>
     public DiscoveredServer GetDistinctServer()
     {
-        if(!SingleServer)
+        if (!SingleServer)
             throw new NotSupportedException("Only valid when SingleServer flag is set");
 
         //they all have to be in the same server but do they also reside in the same database?
@@ -173,12 +175,11 @@ public DiscoveredServer GetDistinctServer()
     /// <returns></returns>
     public DataAccessPointCollection Clone()
     {
-        var col = new DataAccessPointCollection(SingleServer,DataAccessContext)
+        var col = new DataAccessPointCollection(SingleServer, DataAccessContext)
         {
             _points = new HashSet<IDataAccessPoint>(_points)
         };
         return col;
-
     }
 
     /// <summary>
@@ -187,8 +188,5 @@ public DataAccessPointCollection Clone()
     /// </summary>
     /// <param name="point"></param>
     /// <returns></returns>
-    public bool AddWouldBePossible(IDataAccessPoint point)
-    {
-        return Clone().TryAdd(point);
-    }
+    public bool AddWouldBePossible(IDataAccessPoint point) => Clone().TryAdd(point);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs b/Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs
index 51b58a7657..0cf052a915 100644
--- a/Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/ExtractionQueryBuilder.cs
@@ -38,19 +38,21 @@ public ExtractionQueryBuilder(IDataExportRepository repository)
     /// QueryBuilder and then it adds some custom lines for linking to the cohort</para>
     /// </summary>
     /// <returns></returns>
-    public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand request, out List<ReleaseIdentifierSubstitution> substitutions)
+    public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand request,
+        out List<ReleaseIdentifierSubstitution> substitutions)
     {
-        if(request.QueryBuilder != null)
-            throw new Exception("Creation of a QueryBuilder from a request can only happen once, to access the results of the creation use the cached answer in the request.QueryBuilder property");
+        if (request.QueryBuilder != null)
+            throw new Exception(
+                "Creation of a QueryBuilder from a request can only happen once, to access the results of the creation use the cached answer in the request.QueryBuilder property");
 
         if (!request.ColumnsToExtract.Any())
             throw new Exception("No columns are marked for extraction in this configuration");
 
-        if(request.ExtractableCohort == null)
+        if (request.ExtractableCohort == null)
             throw new NullReferenceException("No Cohort selected");
 
         var databaseType = request.Catalogue.GetDistinctLiveDatabaseServerType() ?? throw new NotSupportedException(
-                $"Catalogue {request.Catalogue} did not know what DatabaseType it hosted, how can we extract from it! does it have no TableInfos?");
+            $"Catalogue {request.Catalogue} did not know what DatabaseType it hosted, how can we extract from it! does it have no TableInfos?");
         var syntaxHelper = new QuerySyntaxHelperFactory().Create(databaseType);
 
         substitutions = new List<ReleaseIdentifierSubstitution>();
@@ -60,28 +62,36 @@ public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand requ
         switch (request.ColumnsToExtract.Count(c => c.IsExtractionIdentifier))
         {
             //no extraction identifiers
-            case 0: throw new Exception(
-                $"There are no Columns in this dataset ({request}) marked as IsExtractionIdentifier");
+            case 0:
+                throw new Exception(
+                    $"There are no Columns in this dataset ({request}) marked as IsExtractionIdentifier");
 
             //a single extraction identifier e.g. CHI X died on date Y with conditions a,b and c
-            case 1: substitutions.Add(new ReleaseIdentifierSubstitution(memoryRepository,request.ColumnsToExtract.FirstOrDefault(c => c.IsExtractionIdentifier), request.ExtractableCohort, false,syntaxHelper));
+            case 1:
+                substitutions.Add(new ReleaseIdentifierSubstitution(memoryRepository,
+                    request.ColumnsToExtract.FirstOrDefault(c => c.IsExtractionIdentifier), request.ExtractableCohort,
+                    false, syntaxHelper));
                 break;
 
             //multiple extraction identifiers e.g. Mother X had Babies A, B, C where A,B and C are all CHIs that must be subbed for ProCHIs
             default:
-                foreach (var columnToSubstituteForReleaseIdentifier in request.ColumnsToExtract.Where(c=>c.IsExtractionIdentifier))
-                    substitutions.Add(new ReleaseIdentifierSubstitution(memoryRepository, columnToSubstituteForReleaseIdentifier, request.ExtractableCohort, true,syntaxHelper));
+                foreach (var columnToSubstituteForReleaseIdentifier in request.ColumnsToExtract.Where(c =>
+                             c.IsExtractionIdentifier))
+                    substitutions.Add(new ReleaseIdentifierSubstitution(memoryRepository,
+                        columnToSubstituteForReleaseIdentifier, request.ExtractableCohort, true, syntaxHelper));
                 break;
         }
 
-        var hashingAlgorithm = _repository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern);
+        var hashingAlgorithm =
+            _repository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern);
         if (string.IsNullOrWhiteSpace(hashingAlgorithm))
             hashingAlgorithm = null;
 
         //identify any tables we are supposed to force join to
         var forcedJoins = request.SelectedDataSets.SelectedDataSetsForcedJoins;
 
-        var queryBuilder = new QueryBuilder("DISTINCT ", hashingAlgorithm, forcedJoins.Select(s => s.TableInfo).ToArray())
+        var queryBuilder =
+            new QueryBuilder("DISTINCT ", hashingAlgorithm, forcedJoins.Select(s => s.TableInfo).ToArray())
             {
                 TopX = request.TopX
             };
@@ -89,7 +99,7 @@ public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand requ
         queryBuilder.SetSalt(request.Salt.GetSalt());
 
         //add the constant parameters
-        foreach (var parameter in GetConstantParameters(syntaxHelper,request.Configuration, request.ExtractableCohort))
+        foreach (var parameter in GetConstantParameters(syntaxHelper, request.Configuration, request.ExtractableCohort))
             queryBuilder.ParameterManager.AddGlobalParameter(parameter);
 
         //add the global parameters
@@ -97,7 +107,7 @@ public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand requ
             queryBuilder.ParameterManager.AddGlobalParameter(globalExtractionFilterParameter);
 
         //remove the identification column from the query
-        request.ColumnsToExtract.RemoveAll(c=>c.IsExtractionIdentifier);
+        request.ColumnsToExtract.RemoveAll(c => c.IsExtractionIdentifier);
 
         //add in the ReleaseIdentifier in place of the identification column
         queryBuilder.AddColumnRange(substitutions.ToArray());
@@ -108,7 +118,8 @@ public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand requ
         //add the users selected filters
         queryBuilder.RootFilterContainer = request.Configuration.GetFilterContainerFor(request.DatasetBundle.DataSet);
 
-        var externalCohortTable = _repository.GetObjectByID<ExternalCohortTable>(request.ExtractableCohort.ExternalCohortTable_ID);
+        var externalCohortTable =
+            _repository.GetObjectByID<ExternalCohortTable>(request.ExtractableCohort.ExternalCohortTable_ID);
 
         if (request.ExtractableCohort != null)
         {
@@ -124,31 +135,29 @@ public QueryBuilder GetSQLCommandForFullExtractionSet(ExtractDatasetCommand requ
             queryBuilder.AddCustomLine(request.ExtractableCohort.WhereSQL(), QueryComponent.WHERE);
         }
 
-        HandleBatching(request,queryBuilder, syntaxHelper);
+        HandleBatching(request, queryBuilder, syntaxHelper);
 
         request.QueryBuilder = queryBuilder;
         return queryBuilder;
     }
 
-    private void HandleBatching(ExtractDatasetCommand request, QueryBuilder queryBuilder, IQuerySyntaxHelper syntaxHelper)
+    private void HandleBatching(ExtractDatasetCommand request, QueryBuilder queryBuilder,
+        IQuerySyntaxHelper syntaxHelper)
     {
-
         var batch = request.SelectedDataSets.ExtractionProgressIfAny;
         if (batch == null)
-        {
             // there is no batching going on
             return;
-        }
 
         // this is a batch resume if we have made some progress already
         request.IsBatchResume = batch.ProgressDate.HasValue;
 
-        var start = batch.ProgressDate ?? batch.StartDate ?? throw new QueryBuildingException($"It was not possible to build a batch extraction query for '{request}' because there is no {nameof(ExtractionProgress.StartDate)} or {nameof(ExtractionProgress.ProgressDate)} set on the {nameof(ExtractionProgress)}");
+        var start = batch.ProgressDate ?? batch.StartDate ?? throw new QueryBuildingException(
+            $"It was not possible to build a batch extraction query for '{request}' because there is no {nameof(ExtractionProgress.StartDate)} or {nameof(ExtractionProgress.ProgressDate)} set on the {nameof(ExtractionProgress)}");
 
-        if(batch.NumberOfDaysPerBatch <= 0)
-        {
-            throw new QueryBuildingException($"{ nameof(ExtractionProgress.NumberOfDaysPerBatch)} was {batch.NumberOfDaysPerBatch } for '{request}'");
-        }
+        if (batch.NumberOfDaysPerBatch <= 0)
+            throw new QueryBuildingException(
+                $"{nameof(ExtractionProgress.NumberOfDaysPerBatch)} was {batch.NumberOfDaysPerBatch} for '{request}'");
 
         var ei = batch.ExtractionInformation;
 
@@ -156,46 +165,47 @@ private void HandleBatching(ExtractDatasetCommand request, QueryBuilder queryBui
         var end = start.AddDays(batch.NumberOfDaysPerBatch);
 
         // Don't load into the future / past end of dataset
-        if(end > (batch.EndDate ?? DateTime.Now))
-        {
-            end = batch.EndDate ?? DateTime.Now;
-        }
+        if (end > (batch.EndDate ?? DateTime.Now)) end = batch.EndDate ?? DateTime.Now;
 
         request.BatchStart = start;
         request.BatchEnd = end;
 
         var line =
             // if it is a first batch, also pull the null dates
-            !request.IsBatchResume ? $"(({ei.SelectSQL} >= @batchStart AND {ei.SelectSQL} < @batchEnd) OR {ei.SelectSQL} is null)" :
-            // it is a subsequent batch
-            $"({ei.SelectSQL} >= @batchStart AND {ei.SelectSQL} < @batchEnd)";
+            !request.IsBatchResume
+                ? $"(({ei.SelectSQL} >= @batchStart AND {ei.SelectSQL} < @batchEnd) OR {ei.SelectSQL} is null)"
+                :
+                // it is a subsequent batch
+                $"({ei.SelectSQL} >= @batchStart AND {ei.SelectSQL} < @batchEnd)";
 
 
         queryBuilder.AddCustomLine(line, QueryComponent.WHERE);
 
-        var batchStartDeclaration = syntaxHelper.GetParameterDeclaration("@batchStart", new DatabaseTypeRequest(typeof(DateTime)));
-        var batchStartParameter = new ConstantParameter(batchStartDeclaration, FormatDateAsParameterValue(start), null, syntaxHelper);
+        var batchStartDeclaration =
+            syntaxHelper.GetParameterDeclaration("@batchStart", new DatabaseTypeRequest(typeof(DateTime)));
+        var batchStartParameter =
+            new ConstantParameter(batchStartDeclaration, FormatDateAsParameterValue(start), null, syntaxHelper);
         queryBuilder.ParameterManager.AddGlobalParameter(batchStartParameter);
 
-        var batchEndDeclaration = syntaxHelper.GetParameterDeclaration("@batchEnd", new DatabaseTypeRequest(typeof(DateTime)));
-        var batchEndParameter = new ConstantParameter(batchEndDeclaration, FormatDateAsParameterValue(end), null, syntaxHelper);
+        var batchEndDeclaration =
+            syntaxHelper.GetParameterDeclaration("@batchEnd", new DatabaseTypeRequest(typeof(DateTime)));
+        var batchEndParameter =
+            new ConstantParameter(batchEndDeclaration, FormatDateAsParameterValue(end), null, syntaxHelper);
         queryBuilder.ParameterManager.AddGlobalParameter(batchEndParameter);
     }
 
-    private static string FormatDateAsParameterValue(DateTime dt)
-    {
-        return $"'{dt.Year:D4}-{dt.Month:D2}-{dt.Day:D2}'";
-    }
+    private static string FormatDateAsParameterValue(DateTime dt) => $"'{dt.Year:D4}-{dt.Month:D2}-{dt.Day:D2}'";
 
-    public static List<ConstantParameter> GetConstantParameters(IQuerySyntaxHelper syntaxHelper, IExtractionConfiguration configuration, IExtractableCohort extractableCohort)
+    public static List<ConstantParameter> GetConstantParameters(IQuerySyntaxHelper syntaxHelper,
+        IExtractionConfiguration configuration, IExtractableCohort extractableCohort)
     {
         //if the server doesn't support parameters then don't try to add them
-        if(!syntaxHelper.SupportsEmbeddedParameters())
+        if (!syntaxHelper.SupportsEmbeddedParameters())
             return new List<ConstantParameter>();
 
         var toReturn = new List<ConstantParameter>();
 
-        if(syntaxHelper.DatabaseType == FAnsi.DatabaseType.Oracle)
+        if (syntaxHelper.DatabaseType == FAnsi.DatabaseType.Oracle)
             return toReturn;
 
         var project = configuration.Project;
@@ -203,13 +213,15 @@ public static List<ConstantParameter> GetConstantParameters(IQuerySyntaxHelper s
         if (project.ProjectNumber == null)
             throw new ProjectNumberException("Project number has not been entered, cannot create constant paramaters");
 
-        if(extractableCohort == null)
+        if (extractableCohort == null)
             throw new Exception("Cohort has not been selected, cannot create constant parameters");
 
         var externalCohortTable = extractableCohort.ExternalCohortTable;
 
-        var declarationSqlCohortId = syntaxHelper.GetParameterDeclaration("@CohortDefinitionID", new DatabaseTypeRequest(typeof (int)));
-        var declarationSqlProjectNumber = syntaxHelper.GetParameterDeclaration("@ProjectNumber", new DatabaseTypeRequest(typeof(int)));
+        var declarationSqlCohortId =
+            syntaxHelper.GetParameterDeclaration("@CohortDefinitionID", new DatabaseTypeRequest(typeof(int)));
+        var declarationSqlProjectNumber =
+            syntaxHelper.GetParameterDeclaration("@ProjectNumber", new DatabaseTypeRequest(typeof(int)));
 
         toReturn.Add(new ConstantParameter(declarationSqlCohortId, extractableCohort.OriginID.ToString(),
             $"The ID of the cohort in {externalCohortTable.TableName}", syntaxHelper));
diff --git a/Rdmp.Core/QueryBuilding/IColumn.cs b/Rdmp.Core/QueryBuilding/IColumn.cs
index 99e9fe2622..5b1b7eb7fc 100644
--- a/Rdmp.Core/QueryBuilding/IColumn.cs
+++ b/Rdmp.Core/QueryBuilding/IColumn.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.QueryBuilding;
 /// 
 /// <para>Note that many properties can be null including ColumnInfo and Alias etc.</para>
 /// </summary>
-public interface IColumn : IHasRuntimeName,ICheckable, IOrderable,IMapsDirectlyToDatabaseTable
+public interface IColumn : IHasRuntimeName, ICheckable, IOrderable, IMapsDirectlyToDatabaseTable
 {
     /// <summary>
     /// Gets the underlying <see cref="ColumnInfo"/> behind this line of SELECT SQL.
@@ -33,7 +33,7 @@ public interface IColumn : IHasRuntimeName,ICheckable, IOrderable,IMapsDirectlyT
     /// </summary>
     [Sql]
     string SelectSQL { get; set; }
-        
+
     /// <summary>
     /// The alias (if any) for the column when it is included in a SELECT statement.  This should not include the " AS " bit only the text that would come after.
     /// <para>Only use if the <see cref="SelectSQL"/> is a transform e.g. "UPPER([mydb]..[mytbl].[mycol])" </para>
@@ -58,5 +58,4 @@ public interface IColumn : IHasRuntimeName,ICheckable, IOrderable,IMapsDirectlyT
     /// you may have a transform or hash configured or your <see cref="Catalogue"/> may involve joining multiple <see cref="TableInfo"/> together.
     /// </summary>
     bool IsPrimaryKey { get; }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/ISqlQueryBuilder.cs b/Rdmp.Core/QueryBuilding/ISqlQueryBuilder.cs
index 542550c77d..490013ea8a 100644
--- a/Rdmp.Core/QueryBuilding/ISqlQueryBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/ISqlQueryBuilder.cs
@@ -32,7 +32,7 @@ public interface ISqlQueryBuilder
     /// <summary>
     /// Any SQL to inject between SELECT and the first column, e.g. "DISTINCT"
     /// </summary>
-    string LimitationSQL { get;}
+    string LimitationSQL { get; }
 
     /// <summary>
     /// Wrapper class for the columns you added to the query with <see cref="AddColumn(Rdmp.Core.QueryBuilding.IColumn)"/>).  After fetching the query (See <see cref="SQL"/>) this will be populated with 
@@ -46,7 +46,7 @@ public interface ISqlQueryBuilder
     /// <para>Do not modify this manually</para>
     /// </summary>
     List<ITableInfo> TablesUsedInQuery { get; }
-        
+
     /// <summary>
     /// The DBMS syntax the query builder has picked to use (can be null of query building failed or has not happened yet)
     /// </summary>
@@ -67,8 +67,8 @@ public interface ISqlQueryBuilder
     /// <summary>
     /// The <see cref="IContainer"/> (AND / OR) that contains all the lines of WHERE SQL (<see cref="IFilter"/>) including subcontainers.
     /// </summary>
-    IContainer RootFilterContainer{get;set;}
-        
+    IContainer RootFilterContainer { get; set; }
+
     /// <summary>
     /// True to check the syntax of columns, parameters etc.  This should result in SyntaxErrorException being thrown when generating the SQL if it is substantially malformed
     /// </summary>
@@ -78,12 +78,12 @@ public interface ISqlQueryBuilder
     /// The single <see cref="TableInfo"/> amongst <see cref="TablesUsedInQuery"/> that was <see cref="TableInfo.IsPrimaryExtractionTable"/>
     /// </summary>
     ITableInfo PrimaryExtractionTable { get; }
-        
+
     /// <summary>
     /// Manages the addition of <see cref="ISqlParameter"/> to the <see cref="ISqlQueryBuilder"/> in a scoped way (globals, query level etc).
     /// 
     /// </summary>
-    ParameterManager ParameterManager { get;}
+    ParameterManager ParameterManager { get; }
 
     /// <summary>
     /// Adds the provided columns to the query as lines of SELECT SQL
@@ -96,7 +96,7 @@ public interface ISqlQueryBuilder
     /// </summary>
     /// <param name="col"></param>
     void AddColumn(IColumn col);
-        
+
 
     /// <summary>
     /// Manually forces the query builder to rebuild the query.  This will update <see cref="TablesUsedInQuery"/>, <see cref="SelectColumns"/> etc.
diff --git a/Rdmp.Core/QueryBuilding/Options/AggregateBuilderBasicOptions.cs b/Rdmp.Core/QueryBuilding/Options/AggregateBuilderBasicOptions.cs
index 9e23975bf4..5e3c45dd17 100644
--- a/Rdmp.Core/QueryBuilding/Options/AggregateBuilderBasicOptions.cs
+++ b/Rdmp.Core/QueryBuilding/Options/AggregateBuilderBasicOptions.cs
@@ -20,7 +20,7 @@ public class AggregateBuilderBasicOptions : IAggregateBuilderOptions
     /// <inheritdoc/>
     public string GetTitleTextPrefix(AggregateConfiguration aggregate)
     {
-        if(aggregate.IsExtractable)
+        if (aggregate.IsExtractable)
             return "Extractable 'Group By' Aggregate:";
 
         return "'Group By' Aggregate:";
@@ -31,20 +31,19 @@ public IColumn[] GetAvailableSELECTColumns(AggregateConfiguration aggregate)
     {
         var existingDimensions = aggregate.AggregateDimensions.Select(d => d.ExtractionInformation).ToArray();
 
-        return aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any) //all columns of any extraction category
-            .Except(existingDimensions)//except those that have already been added
-            .Where(e => !e.IsExtractionIdentifier)//don't advertise IsExtractionIdentifier columns for use in basic aggregates
+        return aggregate.Catalogue
+            .GetAllExtractionInformation(ExtractionCategory.Any) //all columns of any extraction category
+            .Except(existingDimensions) //except those that have already been added
+            .Where(e => !e
+                .IsExtractionIdentifier) //don't advertise IsExtractionIdentifier columns for use in basic aggregates
             .Cast<IColumn>()
             .ToArray();
-
     }
 
     /// <inheritdoc/>
-    public IColumn[] GetAvailableWHEREColumns(AggregateConfiguration aggregate)
-    {
+    public IColumn[] GetAvailableWHEREColumns(AggregateConfiguration aggregate) =>
         //for this basic case the WHERE columns can be anything
-        return aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Cast<IColumn>().ToArray();
-    }
+        aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Cast<IColumn>().ToArray();
 
     /// <inheritdoc/>
     public bool ShouldBeEnabled(AggregateEditorSection section, AggregateConfiguration aggregate)
@@ -57,7 +56,9 @@ public bool ShouldBeEnabled(AggregateEditorSection section, AggregateConfigurati
                 //can only Top X if we have a pivot (top x applies to the selection of the pivot values) or if we have nothing (no axis / pivot).  This rules out axis only queries
                 return aggregate.PivotOnDimensionID != null || aggregate.GetAxisIfAny() == null;
             case AggregateEditorSection.PIVOT:
-                return aggregate.GetAxisIfAny() != null || aggregate.AggregateDimensions.Length==2;//can only pivot if there is an axis or exactly 2 dimensions (+ count)
+                return aggregate.GetAxisIfAny() != null ||
+                       aggregate.AggregateDimensions.Length ==
+                       2; //can only pivot if there is an axis or exactly 2 dimensions (+ count)
             case AggregateEditorSection.AXIS:
                 return true;
             default:
@@ -70,7 +71,7 @@ public IMapsDirectlyToDatabaseTable[] GetAvailableJoinables(AggregateConfigurati
     {
         var availableTables = aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
             .Select(e => e.ColumnInfo?.TableInfo)
-            .Where( t=> t != null)
+            .Where(t => t != null)
             .Distinct();
 
         var implicitJoins =
@@ -95,14 +96,9 @@ private static bool CanMakeExtractable(AggregateConfiguration aggregate)
     }
 
     /// <inheritdoc/>
-    public ISqlParameter[] GetAllParameters(AggregateConfiguration aggregate)
-    {
-        return aggregate.GetAllParameters();
-    }
+    public ISqlParameter[] GetAllParameters(AggregateConfiguration aggregate) => aggregate.GetAllParameters();
 
     /// <inheritdoc/>
-    public CountColumnRequirement GetCountColumnRequirement(AggregateConfiguration aggregate)
-    {
-        return CountColumnRequirement.MustHaveOne;
-    }
+    public CountColumnRequirement GetCountColumnRequirement(AggregateConfiguration aggregate) =>
+        CountColumnRequirement.MustHaveOne;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/Options/AggregateBuilderCohortOptions.cs b/Rdmp.Core/QueryBuilding/Options/AggregateBuilderCohortOptions.cs
index a0a78c8dc9..1a4bf17744 100644
--- a/Rdmp.Core/QueryBuilding/Options/AggregateBuilderCohortOptions.cs
+++ b/Rdmp.Core/QueryBuilding/Options/AggregateBuilderCohortOptions.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.QueryBuilding.Options;
 /// <summary>
 /// Describes what parts of the GROUP BY statement are allowed for <see cref="AggregateConfiguration"/> that are running as a 'cohort set'
 /// </summary>
-public class AggregateBuilderCohortOptions: IAggregateBuilderOptions
+public class AggregateBuilderCohortOptions : IAggregateBuilderOptions
 {
     private readonly ISqlParameter[] _globals;
 
@@ -47,7 +47,8 @@ public IColumn[] GetAvailableSELECTColumns(AggregateConfiguration aggregate)
         var alreadyExisting = aggregate.AggregateDimensions.ToArray();
 
         //get novel ExtractionInformations from the catalogue for which there are not already any Dimensions
-        var candidates = aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Where(e => alreadyExisting.All(d => d.ExtractionInformation_ID != e.ID)).ToArray();
+        var candidates = aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Where(e => alreadyExisting.All(d => d.ExtractionInformation_ID != e.ID)).ToArray();
 
         //patient index tables can have any columns
         if (aggregate.IsJoinablePatientIndexTable())
@@ -61,14 +62,15 @@ public IColumn[] GetAvailableSELECTColumns(AggregateConfiguration aggregate)
     public IColumn[] GetAvailableWHEREColumns(AggregateConfiguration aggregate)
     {
         var toReturn = new List<IColumn>();
-            
+
         toReturn.AddRange(aggregate.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any));
 
         //for each joined PatientIdentifier table
         foreach (var usedJoinable in aggregate.PatientIndexJoinablesUsed)
         {
             var tableAlias = usedJoinable.GetJoinTableAlias();
-            var hackedDimensions = usedJoinable.JoinableCohortAggregateConfiguration.AggregateConfiguration.AggregateDimensions.Cast<IColumn>().ToArray();
+            var hackedDimensions = usedJoinable.JoinableCohortAggregateConfiguration.AggregateConfiguration
+                .AggregateDimensions.Cast<IColumn>().ToArray();
 
             //change the SelectSQL to the table alias of the joinable used (see CohortQueryBuilder.AddJoinablesToBuilder)
             foreach (var dimension in hackedDimensions)
@@ -109,7 +111,7 @@ public IMapsDirectlyToDatabaseTable[] GetAvailableJoinables(AggregateConfigurati
         var availableTableInfos = aggregate.Catalogue.GetTableInfoList(true);
 
         var toReturn = new List<IMapsDirectlyToDatabaseTable>();
-            
+
         //They can add TableInfos that have not been referenced yet by the columns or already been configured as an explicit force join
         toReturn.AddRange(availableTableInfos.Except(existingTablesAlreadyReferenced.Union(existingForcedJoinTables)));
 
@@ -119,10 +121,10 @@ public IMapsDirectlyToDatabaseTable[] GetAvailableJoinables(AggregateConfigurati
 
         //it's not a patient index table itself so it can reference other patient index tables in the configuration
         var config = aggregate.GetCohortIdentificationConfigurationIfAny() ?? throw new NotSupportedException(
-                $"Aggregate {aggregate} did not return its CohortIdentificationConfiguration correctly, did someone delete the configuration or Orphan this AggregateConfiguration while you weren't looking?");
+            $"Aggregate {aggregate} did not return its CohortIdentificationConfiguration correctly, did someone delete the configuration or Orphan this AggregateConfiguration while you weren't looking?");
 
         //find those that are already referenced
-        var existingJoinables = aggregate.PatientIndexJoinablesUsed.Select(u=>u.JoinableCohortAggregateConfiguration);
+        var existingJoinables = aggregate.PatientIndexJoinablesUsed.Select(u => u.JoinableCohortAggregateConfiguration);
 
         //return also these which are available for use but not yet linked in
         toReturn.AddRange(config.GetAllJoinables().Except(existingJoinables));
@@ -136,17 +138,15 @@ public ISqlParameter[] GetAllParameters(AggregateConfiguration aggregate)
         var parameterManager = new ParameterManager();
         foreach (var p in _globals)
             parameterManager.AddGlobalParameter(p);
-            
+
         parameterManager.AddParametersFor(aggregate, ParameterLevel.QueryLevel);
 
         return parameterManager.GetFinalResolvedParametersList().ToArray();
     }
 
     /// <inheritdoc/>
-    public CountColumnRequirement GetCountColumnRequirement(AggregateConfiguration aggregate)
-    {
-        return aggregate.IsJoinablePatientIndexTable()
+    public CountColumnRequirement GetCountColumnRequirement(AggregateConfiguration aggregate) =>
+        aggregate.IsJoinablePatientIndexTable()
             ? CountColumnRequirement.CanOptionallyHaveOne
             : CountColumnRequirement.CannotHaveOne;
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/Options/IAggregateBuilderOptions.cs b/Rdmp.Core/QueryBuilding/Options/IAggregateBuilderOptions.cs
index 30b79fbd88..dee645a7a6 100644
--- a/Rdmp.Core/QueryBuilding/Options/IAggregateBuilderOptions.cs
+++ b/Rdmp.Core/QueryBuilding/Options/IAggregateBuilderOptions.cs
@@ -71,7 +71,6 @@ public interface IAggregateBuilderOptions
     CountColumnRequirement GetCountColumnRequirement(AggregateConfiguration aggregate);
 }
 
-
 /// <summary>
 /// Indicates whether or not a given <see cref="AggregateConfiguration"/> (GROUP BY) can have a count(*), max(x) etc column given the 
 /// current configuration and role it is playing.
diff --git a/Rdmp.Core/QueryBuilding/Parameters/ParameterFoundAtLevel.cs b/Rdmp.Core/QueryBuilding/Parameters/ParameterFoundAtLevel.cs
index f0fa5a23ad..4ca313d0a6 100644
--- a/Rdmp.Core/QueryBuilding/Parameters/ParameterFoundAtLevel.cs
+++ b/Rdmp.Core/QueryBuilding/Parameters/ParameterFoundAtLevel.cs
@@ -30,7 +30,7 @@ public class ParameterFoundAtLevel
     /// </summary>
     /// <param name="parameter"></param>
     /// <param name="level"></param>
-    public ParameterFoundAtLevel(ISqlParameter parameter,ParameterLevel level)
+    public ParameterFoundAtLevel(ISqlParameter parameter, ParameterLevel level)
     {
         Parameter = parameter;
         Level = level;
@@ -40,8 +40,5 @@ public ParameterFoundAtLevel(ISqlParameter parameter,ParameterLevel level)
     /// Provides human readable description of the parameter and where it was found
     /// </summary>
     /// <returns></returns>
-    public override string ToString()
-    {
-        return $"{Parameter.ParameterName} (At Level:{Level})";
-    }
+    public override string ToString() => $"{Parameter.ParameterName} (At Level:{Level})";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/Parameters/ParameterManager.cs b/Rdmp.Core/QueryBuilding/Parameters/ParameterManager.cs
index b9e07f2c25..5a3679bf6a 100644
--- a/Rdmp.Core/QueryBuilding/Parameters/ParameterManager.cs
+++ b/Rdmp.Core/QueryBuilding/Parameters/ParameterManager.cs
@@ -42,7 +42,7 @@ public class ParameterManager
     /// Collection of all the parameters found at each level so far
     /// <para>Do not modify this yourself</para>
     /// </summary>
-    public Dictionary<ParameterLevel,List<ISqlParameter>> ParametersFoundSoFarInQueryGeneration = new();
+    public Dictionary<ParameterLevel, List<ISqlParameter>> ParametersFoundSoFarInQueryGeneration = new();
 
     /// <summary>
     /// Repository for creating temporary aggregate parameters
@@ -56,13 +56,13 @@ public class ParameterManager
     public ParameterManager(ISqlParameter[] globals = null)
     {
         State = ParameterManagerLifecycleState.AllowingGlobals;
-            
+
         ParametersFoundSoFarInQueryGeneration.Add(ParameterLevel.TableInfo, new List<ISqlParameter>());
         ParametersFoundSoFarInQueryGeneration.Add(ParameterLevel.QueryLevel, new List<ISqlParameter>());
         ParametersFoundSoFarInQueryGeneration.Add(ParameterLevel.CompositeQueryLevel, new List<ISqlParameter>());
         ParametersFoundSoFarInQueryGeneration.Add(ParameterLevel.Global, new List<ISqlParameter>());
 
-        if(globals != null)
+        if (globals != null)
             ParametersFoundSoFarInQueryGeneration[ParameterLevel.Global].AddRange(globals);
     }
 
@@ -106,15 +106,16 @@ public void AddParametersFor(ICollectSqlParameters collector, ParameterLevel par
     /// <param name="parameter"></param>
     public void AddGlobalParameter(ISqlParameter parameter)
     {
-        if(State != ParameterManagerLifecycleState.AllowingGlobals)
-            throw new InvalidOperationException("Cannot add global parameters at this stage, State must be AllowingGlobals.  Basically you can only add globals to a QueryBuilder before it has ever generated any .SQL, to prevent duplication or out dated results vs the results of a Resolved SQL resultant query");
+        if (State != ParameterManagerLifecycleState.AllowingGlobals)
+            throw new InvalidOperationException(
+                "Cannot add global parameters at this stage, State must be AllowingGlobals.  Basically you can only add globals to a QueryBuilder before it has ever generated any .SQL, to prevent duplication or out dated results vs the results of a Resolved SQL resultant query");
 
         ParametersFoundSoFarInQueryGeneration[ParameterLevel.Global].Add(parameter);
     }
 
     private void AddParametersFor(ICollectSqlParameters[] collectors, List<ISqlParameter> toAddTo)
     {
-        if(!collectors.Any())
+        if (!collectors.Any())
             return;
 
         foreach (var collector in collectors)
@@ -146,25 +147,24 @@ public IEnumerable<ISqlParameter> GetFinalResolvedParametersList()
 
         foreach (var kvp in ParametersFoundSoFarInQueryGeneration)
         foreach (var sqlParameter in kvp.Value)
-                AddParameterToCollection(new ParameterFoundAtLevel(sqlParameter,kvp.Key), toReturn);
+            AddParameterToCollection(new ParameterFoundAtLevel(sqlParameter, kvp.Key), toReturn);
 
 
         //There can be empty parameters during resolution but only if it finds an overriding one further up the hierarchy
         var emptyParameter = toReturn.FirstOrDefault(t => string.IsNullOrWhiteSpace(t.Parameter.Value));
-        if(emptyParameter != null)
+        if (emptyParameter != null)
         {
             var exceptionMessage = $"No Value defined for Parameter {emptyParameter.Parameter.ParameterName}";
 
             //problem was in a freaky parameter e.g. a constant one that doesn't come from database (rare to happen I would expect)
-            if(emptyParameter.Parameter is not IMapsDirectlyToDatabaseTable asConcreteObject)
+            if (emptyParameter.Parameter is not IMapsDirectlyToDatabaseTable asConcreteObject)
                 throw new QueryBuildingException(exceptionMessage);
-                
+
             //problem was from a user one from their Catalogue Database, tell them the ProblemObject aswell
-            throw new QueryBuildingException(exceptionMessage,new[]{asConcreteObject});
-                
+            throw new QueryBuildingException(exceptionMessage, new[] { asConcreteObject });
         }
 
-        return toReturn.Select(t=>t.Parameter);
+        return toReturn.Select(t => t.Parameter);
     }
 
     /// <summary>
@@ -179,10 +179,13 @@ public void ClearNonGlobals()
         _memoryRepository.Clear();
     }
 
-    private static void AddParameterToCollection(ParameterFoundAtLevel toAdd,List<ParameterFoundAtLevel> existingParameters)
+    private static void AddParameterToCollection(ParameterFoundAtLevel toAdd,
+        List<ParameterFoundAtLevel> existingParameters)
     {
         //see if parameter if we already have one with the same name
-        var duplicate = existingParameters.FirstOrDefault(p => p.Parameter.ParameterName.Equals(toAdd.Parameter.ParameterName,StringComparison.InvariantCultureIgnoreCase));
+        var duplicate = existingParameters.FirstOrDefault(p =>
+            p.Parameter.ParameterName.Equals(toAdd.Parameter.ParameterName,
+                StringComparison.InvariantCultureIgnoreCase));
         if (duplicate != null)
         {
             //deal with duplicate paramater naming e.g. @startDate BUT: declared with 2 different types
@@ -191,11 +194,13 @@ private static void AddParameterToCollection(ParameterFoundAtLevel toAdd,List<Pa
                         .Equals(duplicate.Parameter.ParameterSQL.Trim(), StringComparison.CurrentCultureIgnoreCase))
                 //to lower them so that we don't complain about 'AS VARCHAR(50)' vs 'as varchar(50)'
                 ThrowExceptionForParameterPair(
-                    $"Found multiple parameters called {toAdd.Parameter} but with differing SQL:{toAdd.Parameter.ParameterSQL} vs {duplicate.Parameter.ParameterSQL}", toAdd, duplicate);
+                    $"Found multiple parameters called {toAdd.Parameter} but with differing SQL:{toAdd.Parameter.ParameterSQL} vs {duplicate.Parameter.ParameterSQL}",
+                    toAdd, duplicate);
 
 
             //if values differ!
-            if (!string.Equals((duplicate.Parameter.Value ?? "").Trim(), (toAdd.Parameter.Value ?? "").Trim(), StringComparison.CurrentCultureIgnoreCase))
+            if (!string.Equals((duplicate.Parameter.Value ?? "").Trim(), (toAdd.Parameter.Value ?? "").Trim(),
+                    StringComparison.CurrentCultureIgnoreCase))
             {
                 //if the duplicate (already existing) parameter is of a lower level then it can be discarded because it didn't have a dodgy type mismatch etc (see ThrowIfUnsuitable above)
                 if (duplicate.Level < toAdd.Level)
@@ -204,16 +209,22 @@ private static void AddParameterToCollection(ParameterFoundAtLevel toAdd,List<Pa
                     existingParameters.Add(toAdd);
                 }
                 else
+                {
                     ThrowExceptionForParameterPair(
-                        $"Found 2+ parameters with the name {toAdd} but differing Values of \"{toAdd.Parameter.Value}\" and \"{duplicate.Parameter.Value}\"",toAdd,duplicate);
+                        $"Found 2+ parameters with the name {toAdd} but differing Values of \"{toAdd.Parameter.Value}\" and \"{duplicate.Parameter.Value}\"",
+                        toAdd, duplicate);
+                }
             }
             //if we get here then its a duplicate but it is an exact duplicate so don't worry
         }
         else
+        {
             existingParameters.Add(toAdd); //its not a duplicate so add it to the list of RequiredParameters 
+        }
     }
 
-    private static void ThrowExceptionForParameterPair(string exceptionMessage, ParameterFoundAtLevel parameter1, ParameterFoundAtLevel parameter2)
+    private static void ThrowExceptionForParameterPair(string exceptionMessage, ParameterFoundAtLevel parameter1,
+        ParameterFoundAtLevel parameter2)
     {
         var concreteObjects = new List<IMapsDirectlyToDatabaseTable>();
 
@@ -221,15 +232,14 @@ private static void ThrowExceptionForParameterPair(string exceptionMessage, Para
         var desc2 = $"(Type:{parameter2.Parameter.GetType()}";
 
 
-        if(parameter1.Parameter is IMapsDirectlyToDatabaseTable concrete1)
+        if (parameter1.Parameter is IMapsDirectlyToDatabaseTable concrete1)
         {
             concreteObjects.Add(concrete1);
             desc1 += $" ID:{concrete1.ID}";
         }
 
-        if(parameter2.Parameter is IMapsDirectlyToDatabaseTable concrete2)
+        if (parameter2.Parameter is IMapsDirectlyToDatabaseTable concrete2)
         {
-
             concreteObjects.Add(concrete2);
             desc2 += $" ID:{concrete2.ID}";
         }
@@ -238,8 +248,8 @@ private static void ThrowExceptionForParameterPair(string exceptionMessage, Para
         desc2 += ")";
 
         exceptionMessage += $".  Problem objects were {parameter1}{desc1} and {parameter2} {desc2}";
-            
-        throw new QueryBuildingException(exceptionMessage,concreteObjects);
+
+        throw new QueryBuildingException(exceptionMessage, concreteObjects);
     }
 
     /// <summary>
@@ -249,51 +259,55 @@ private static void ThrowExceptionForParameterPair(string exceptionMessage, Para
     /// </summary>
     /// <param name="toImport"></param>
     /// <param name="parameterNameSubstitutions"></param>
-    public void ImportAndElevateResolvedParametersFromSubquery(ParameterManager toImport, out Dictionary<string,string> parameterNameSubstitutions)
+    public void ImportAndElevateResolvedParametersFromSubquery(ParameterManager toImport,
+        out Dictionary<string, string> parameterNameSubstitutions)
     {
         if (toImport == this)
             throw new InvalidOperationException("Cannot import parameters into yourself!");
 
-        if(State == ParameterManagerLifecycleState.Finalized)
+        if (State == ParameterManagerLifecycleState.Finalized)
             throw new InvalidOperationException(
                 $"Cannot import parameters because state of ParameterManager is already {ParameterManagerLifecycleState.Finalized}");
 
-        if(toImport.ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Any())
+        if (toImport.ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Any())
             throw new ArgumentException(
                 $"Cannot import from ParameterManager because it has 1+ {ParameterLevel.CompositeQueryLevel} parameters in it too!");
-            
+
         parameterNameSubstitutions = new Dictionary<string, string>();
 
         ////////////////////////////////////////////////////////////Handle TableInfo level parameters//////////////////////////////////////
         //for each table valued parameter (TableInfo level)
         foreach (var parameterToImport in toImport.ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo])
-        {
             //it does not already exist
-            if (!ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Any(p => p.ParameterName.Equals(parameterToImport.ParameterName,StringComparison.CurrentCultureIgnoreCase)))
+            if (!ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Any(p =>
+                    p.ParameterName.Equals(parameterToImport.ParameterName, StringComparison.CurrentCultureIgnoreCase)))
                 ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo].Add(parameterToImport); //import it 
-                
-            //Do not handle renaming here because it is likely the user doesn't even know this parameter exists as it is a tableinfo level one i.e. a default they declared when they first imported their table valued fuction (or there is a QueryLevel override anyway)
-        }
+        //Do not handle renaming here because it is likely the user doesn't even know this parameter exists as it is a tableinfo level one i.e. a default they declared when they first imported their table valued fuction (or there is a QueryLevel override anyway)
         toImport.ParametersFoundSoFarInQueryGeneration[ParameterLevel.TableInfo].Clear();
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            
+
 
         //////////////////////////////////////////////////////Handle all the other parameters//////////////////////////////////////////////
         //for each Query Level parameter
         foreach (var parameterToImport in toImport.GetFinalResolvedParametersList())
         {
             var toImportParameterName = parameterToImport.ParameterName;
-            var existing = ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].SingleOrDefault(p => p.ParameterName.Equals(toImportParameterName, StringComparison.CurrentCultureIgnoreCase));
-                
+            var existing = ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel]
+                .SingleOrDefault(p =>
+                    p.ParameterName.Equals(toImportParameterName, StringComparison.CurrentCultureIgnoreCase));
+
             if (existing == null)
-                ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Add(parameterToImport);        //import it to the composite level
+            {
+                ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel]
+                    .Add(parameterToImport); //import it to the composite level
+            }
             else
             {
                 //we are importing SqlParameters from a subquery and we have found a parameter with the same name as one that is already contained at this composite level
-                    
+
                 //if the one we are importing is 100% identical (same declaration and value) then we don't need to import it
                 if (AreIdentical(existing, parameterToImport))
-                    continue;//skip it
+                    continue; //skip it
 
                 //it is different so we have to handle the conflict.  This could be because user has a filter @icdCode in 2 datasets with 2 different meanings and 2 different values 
 
@@ -301,13 +315,14 @@ public void ImportAndElevateResolvedParametersFromSubquery(ParameterManager toIm
                 var overridingGlobal = GetOverrideIfAnyFor(existing);
 
                 //with the same declaration SQL then we can discard the parameter because all values are going to be replaced by the global anyway!
-                if(overridingGlobal != null)
-                    if(AreDeclaredTheSame(overridingGlobal,parameterToImport))
-                        continue;//override will replace both so don't bother importing it
+                if (overridingGlobal != null)
+                    if (AreDeclaredTheSame(overridingGlobal, parameterToImport))
+                        continue; //override will replace both so don't bother importing it
                     else
                         //there's an override with the same name but different datatypes (that's a problem)
                         throw new QueryBuildingException(
-                            $"Parameter {parameterToImport} has the same name as an existing parameter with a global override but differing declarations (normally we would handle with a rename but we can't because of the overriding global)",new object[]{existing,parameterToImport,overridingGlobal});
+                            $"Parameter {parameterToImport} has the same name as an existing parameter with a global override but differing declarations (normally we would handle with a rename but we can't because of the overriding global)",
+                            new object[] { existing, parameterToImport, overridingGlobal });
 
                 //one already exists so we will have to do a parameter rename
 
@@ -326,13 +341,13 @@ public void ImportAndElevateResolvedParametersFromSubquery(ParameterManager toIm
                     parameterToImport.Comment,
                     parameterToImport.GetQuerySyntaxHelper()
                 );
-                    
+
                 //now make it a composite query level parameter used by us
                 ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Add(spont);
             }
         }
     }
-        
+
     private static bool AreDeclaredTheSame(ISqlParameter first, ISqlParameter other)
     {
         if (first == null || other == null)
@@ -349,7 +364,7 @@ private static bool AreIdentical(ISqlParameter first, ISqlParameter other)
         var sameSql = AreDeclaredTheSame(first, other);
 
         var value1 = first.Value ?? "";
-        var value2 = other.Value??"";
+        var value2 = other.Value ?? "";
 
         var sameValue = value1.Trim().Equals(value2.Trim(), StringComparison.CurrentCultureIgnoreCase);
 
@@ -365,7 +380,8 @@ private int GetSuffixForRenaming(string toImportParameterName)
         //while we have parameter called @p_2, @p_3 etc etc keep adding
         while (
             ParametersFoundSoFarInQueryGeneration[ParameterLevel.CompositeQueryLevel].Any(
-                p => p.ParameterName.Equals($"{toImportParameterName}_{counter}", StringComparison.CurrentCultureIgnoreCase)))
+                p => p.ParameterName.Equals($"{toImportParameterName}_{counter}",
+                    StringComparison.CurrentCultureIgnoreCase)))
             counter++;
 
         //we have now found a unique number
@@ -382,7 +398,7 @@ public ISqlParameter[] GetOverridenParameters()
     {
         var toReturn = new List<ISqlParameter>();
 
-        var levels = (ParameterLevel[])Enum.GetValues(typeof (ParameterLevel));
+        var levels = (ParameterLevel[])Enum.GetValues(typeof(ParameterLevel));
 
         //for each level
         for (var i = 0; i < levels.Length; i++)
@@ -395,11 +411,12 @@ public ISqlParameter[] GetOverridenParameters()
                 for (var j = i + 1; j < levels.Length; j++)
                 {
                     var comparisonLevel = levels[j];
-                        
+
                     //if there is a parameter at the above level with the same declaration
                     if (ParametersFoundSoFarInQueryGeneration[comparisonLevel].Any(p => AreDeclaredTheSame(p1, p)))
                         if (!toReturn.Contains(p1))
-                            toReturn.Add(p1);//it overrides this one (regardless of value - type differences do not result in overriding, they result in Exceptions! - see GetFinalResolvedParametersList)
+                            toReturn.Add(
+                                p1); //it overrides this one (regardless of value - type differences do not result in overriding, they result in Exceptions! - see GetFinalResolvedParametersList)
                 }
         }
 
@@ -417,11 +434,12 @@ public ISqlParameter GetOverrideIfAnyFor(ISqlParameter existing)
 
         var overrides = GetOverridenParameters();
 
-        foreach (ParameterLevel level in Enum.GetValues(typeof (ParameterLevel)))
+        foreach (ParameterLevel level in Enum.GetValues(typeof(ParameterLevel)))
             if (level > currentLevel)
             {
-                var compatibleOverride = ParametersFoundSoFarInQueryGeneration[level].FirstOrDefault(o => AreDeclaredTheSame(existing, o));
-                    
+                var compatibleOverride = ParametersFoundSoFarInQueryGeneration[level]
+                    .FirstOrDefault(o => AreDeclaredTheSame(existing, o));
+
                 //there are no override compatible parameters at this candidate level or the override is itself overridden at a higher level
                 if (compatibleOverride == null || overrides.Contains(compatibleOverride))
                     continue;
@@ -457,12 +475,11 @@ public void RemoveParameter(ISqlParameter deleteable)
         if (!ParametersFoundSoFarInQueryGeneration.Any(k => k.Value.Contains(parameter)))
             return null;
 
-        return 
+        return
             ParametersFoundSoFarInQueryGeneration
                 //take the bottom most level it was found at
-                .OrderBy(kvp=>kvp.Key)
+                .OrderBy(kvp => kvp.Key)
                 .First(k => k.Value.Contains(parameter)).Key;
-        
     }
 
     /// <summary>
@@ -473,9 +490,9 @@ public void RemoveParameter(ISqlParameter deleteable)
     public ParameterManager Clone()
     {
         var clone = new ParameterManager(ParametersFoundSoFarInQueryGeneration[ParameterLevel.Global].ToArray())
- {
-     State = State
- };
+        {
+            State = State
+        };
 
         foreach (var kvp in ParametersFoundSoFarInQueryGeneration)
             clone.ParametersFoundSoFarInQueryGeneration[kvp.Key].AddRange(kvp.Value);
@@ -491,10 +508,10 @@ public ParameterManager Clone()
     public string[] GetCollisions(ParameterManager other)
     {
         var pm = new ParameterManager();
-        pm.ImportAndElevateResolvedParametersFromSubquery(this,out var subs);
-            
+        pm.ImportAndElevateResolvedParametersFromSubquery(this, out var subs);
+
         //not sure how there could be collisions given we went into a fresh one but I guess it would count
-        if(subs.Keys.Any())
+        if (subs.Keys.Any())
             return subs.Keys.ToArray();
 
         pm.ImportAndElevateResolvedParametersFromSubquery(other, out subs);
@@ -510,7 +527,7 @@ public string[] GetCollisions(ParameterManager other)
     public void MergeWithoutRename(ParameterManager other)
     {
         var collisions = GetCollisions(other);
-        if(collisions.Any())
+        if (collisions.Any())
             throw new QueryBuildingException(
                 $"PatientIndexTables cannot have parameters with the same name as their users.  Offending parameter(s) were {string.Join(",", collisions)}");
 
@@ -520,8 +537,7 @@ public void MergeWithoutRename(ParameterManager other)
             var from = other.ParametersFoundSoFarInQueryGeneration[l];
 
             //add all paramters which are not already represented with an identical parameter
-            to.AddRange(from.Where(f=>!to.Any(t=>AreIdentical(f,t))));
+            to.AddRange(from.Where(f => !to.Any(t => AreIdentical(f, t))));
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/Parameters/ParameterManagerLifecycleState.cs b/Rdmp.Core/QueryBuilding/Parameters/ParameterManagerLifecycleState.cs
index 3d0c385349..9bd7aad6fc 100644
--- a/Rdmp.Core/QueryBuilding/Parameters/ParameterManagerLifecycleState.cs
+++ b/Rdmp.Core/QueryBuilding/Parameters/ParameterManagerLifecycleState.cs
@@ -29,5 +29,4 @@ public enum ParameterManagerLifecycleState
     /// The final parameter list has been generated and no more parameters can be added
     /// </summary>
     Finalized
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/PrimaryKeyCollisionResolver.cs b/Rdmp.Core/QueryBuilding/PrimaryKeyCollisionResolver.cs
index 5f494edc66..089545c116 100644
--- a/Rdmp.Core/QueryBuilding/PrimaryKeyCollisionResolver.cs
+++ b/Rdmp.Core/QueryBuilding/PrimaryKeyCollisionResolver.cs
@@ -29,6 +29,7 @@ public class PrimaryKeyCollisionResolver
     private readonly IQuerySyntaxHelper _querySyntaxHelper;
     private const string WithCTE = "WITH CTE (DuplicateCount)";
     private const string SelectRownum = "\t SELECT ROW_NUMBER()";
+
     private const string DeleteBit =
         @"DELETE 
 FROM CTE 
@@ -48,11 +49,7 @@ public PrimaryKeyCollisionResolver(ITableInfo tableInfo)
     /// Get the SQL to run to delete records colliding on primary key
     /// </summary>
     /// <returns></returns>
-    public string GenerateSQL()
-    {
-
-        return GenerateSQL(out ColumnInfo[] pks, out List<IResolveDuplication> resolvers);
-    }
+    public string GenerateSQL() => GenerateSQL(out var pks, out var resolvers);
 
     private string GenerateSQL(out ColumnInfo[] pks, out List<IResolveDuplication> resolvers)
     {
@@ -61,7 +58,7 @@ private string GenerateSQL(out ColumnInfo[] pks, out List<IResolveDuplication> r
         var cols = _tableInfo.ColumnInfos.ToArray();
         pks = cols.Where(col => col.IsPrimaryKey).ToArray();
 
-        if(!pks.Any())
+        if (!pks.Any())
             throw new Exception(
                 $"TableInfo {_tableInfo.GetRuntimeName()} does not have any primary keys defined so cannot resolve primary key collisions");
 
@@ -85,7 +82,7 @@ private string GenerateSQL(out ColumnInfo[] pks, out List<IResolveDuplication> r
         //order by the priority of columns
         foreach (var column in resolvers.OrderBy(col => col.DuplicateRecordResolutionOrder))
         {
-            if(column is ColumnInfo { IsPrimaryKey: true })
+            if (column is ColumnInfo { IsPrimaryKey: true })
                 throw new Exception(
                     $"Column {column.GetRuntimeName()} is flagged as primary key when it also has a DuplicateRecordResolutionOrder, primary keys cannot be used to resolve duplication since they are the hash!  Resolve this in the CatalogueManager by right clicking the offending TableInfo {_tableInfo.GetRuntimeName()} and editing the resolution order");
 
@@ -99,10 +96,7 @@ private string GenerateSQL(out ColumnInfo[] pks, out List<IResolveDuplication> r
         return sql;
     }
 
-    private string GetTableName()
-    {
-        return _tableInfo.GetRuntimeName(LoadStage.AdjustRaw);
-    }
+    private string GetTableName() => _tableInfo.GetRuntimeName(LoadStage.AdjustRaw);
 
     private string AppendRelevantOrderBySql(string sql, IResolveDuplication col)
     {
@@ -117,12 +111,10 @@ private string AppendRelevantOrderBySql(string sql, IResolveDuplication col)
         var valueType = GetDataType(col.Data_type);
 
         if (valueType == ValueType.CharacterString)
-        {
             //character strings are compared first by LENGTH (to prefer longer data)
             //then by alphabetical comparison to prefer things towards the start of the alphabet (because this makes sense?!)
             return
                 $"{sql}LEN(ISNULL({colname},{GetNullSubstituteForComparisonsWithDataType(col.Data_type, true)})){direction},{Environment.NewLine}ISNULL({colname},{GetNullSubstituteForComparisonsWithDataType(col.Data_type, true)}){direction},{Environment.NewLine}";
-        }
 
         return
             $"{sql}ISNULL({colname},{GetNullSubstituteForComparisonsWithDataType(col.Data_type, true)}){direction},{Environment.NewLine}";
@@ -143,7 +135,7 @@ public string GenerateCollisionDetectionSQL()
         sql += tableNameInRAW + Environment.NewLine;
         sql +=
             $"group by {pks.Aggregate("", (s, n) => $"{s}{_querySyntaxHelper.EnsureWrapped(n.GetRuntimeName(LoadStage.AdjustRaw))},")}{Environment.NewLine}";
-        sql = sql.TrimEnd(new[] {',','\r','\n'}) + Environment.NewLine;
+        sql = sql.TrimEnd(new[] { ',', '\r', '\n' }) + Environment.NewLine;
         sql += $"having count(*) > 1{Environment.NewLine}";
         sql += $") then 1 else 0 end{Environment.NewLine}";
 
@@ -159,8 +151,10 @@ public string GeneratePreviewSQL()
     {
         var basicSQL = GenerateSQL(out var pks, out var resolvers);
 
-        var commaSeparatedPKs = string.Join(",", pks.Select(c => _querySyntaxHelper.EnsureWrapped(c.GetRuntimeName(LoadStage.AdjustRaw))));
-        var commaSeparatedCols = string.Join(",", resolvers.Select(c => _querySyntaxHelper.EnsureWrapped(c.GetRuntimeName(LoadStage.AdjustRaw))));
+        var commaSeparatedPKs = string.Join(",",
+            pks.Select(c => _querySyntaxHelper.EnsureWrapped(c.GetRuntimeName(LoadStage.AdjustRaw))));
+        var commaSeparatedCols = string.Join(",",
+            resolvers.Select(c => _querySyntaxHelper.EnsureWrapped(c.GetRuntimeName(LoadStage.AdjustRaw))));
 
         //add all the columns to the WITH CTE bit
         basicSQL = basicSQL.Replace(WithCTE, $"WITH CTE ({commaSeparatedPKs},{commaSeparatedCols},DuplicateCount)");
@@ -180,10 +174,13 @@ public string GeneratePreviewSQL()
         basicSQL += $"\twhere{Environment.NewLine}";
 
         //add the child.pk1 = CTE.pk1 bit to restrict preview only to rows that are going to get compared for nukage
-        basicSQL += string.Join("\r\n\t\tand",pks.Select(pk =>  "\t\tchild." + _querySyntaxHelper.EnsureWrapped(pk.GetRuntimeName(LoadStage.AdjustRaw)) + "= CTE." + _querySyntaxHelper.EnsureWrapped(pk.GetRuntimeName(LoadStage.AdjustRaw))));
+        basicSQL += string.Join("\r\n\t\tand",
+            pks.Select(pk =>
+                "\t\tchild." + _querySyntaxHelper.EnsureWrapped(pk.GetRuntimeName(LoadStage.AdjustRaw)) + "= CTE." +
+                _querySyntaxHelper.EnsureWrapped(pk.GetRuntimeName(LoadStage.AdjustRaw))));
 
         basicSQL += $"\tgroup by{Environment.NewLine}";
-        basicSQL += string.Join(",\r\n", pks.Select( pk =>
+        basicSQL += string.Join(",\r\n", pks.Select(pk =>
             $"\t\t{_querySyntaxHelper.EnsureWrapped(pk.GetRuntimeName(LoadStage.AdjustRaw))}"));
 
         basicSQL += $"\t\t{Environment.NewLine}";
@@ -238,8 +235,6 @@ private static ValueType GetDataType(string dataType)
             return ValueType.Freaky;
 
         throw new Exception($"Could not figure out the ValueType of SQL Type \"{dataType}\"");
-
-
     }
 
     /// <summary>
@@ -319,13 +314,15 @@ public static string GetNullSubstituteForComparisonsWithDataType(string datatype
             if (min)
                 return "''";
             else
-                throw new NotSupportedException("Cannot think what the maxmimum character string would be, maybe use min = true instead?");
+                throw new NotSupportedException(
+                    "Cannot think what the maxmimum character string would be, maybe use min = true instead?");
 
         if (valueType == ValueType.DateTime)
             if (min)
                 return "'1753-1-1'";
             else
-                throw new NotSupportedException("Cannot think what the maxmimum date would be, maybe use min = true instead?");
+                throw new NotSupportedException(
+                    "Cannot think what the maxmimum date would be, maybe use min = true instead?");
 
         if (valueType == ValueType.Time)
             if (min)
@@ -343,7 +340,6 @@ public static string GetNullSubstituteForComparisonsWithDataType(string datatype
 
 
         throw new NotSupportedException($"Didn't know what minimum value type to use for {datatype}");
-
     }
 
     private enum ValueType
diff --git a/Rdmp.Core/QueryBuilding/QueryBuilder.cs b/Rdmp.Core/QueryBuilding/QueryBuilder.cs
index 5f5f884210..ac36ba6acb 100644
--- a/Rdmp.Core/QueryBuilding/QueryBuilder.cs
+++ b/Rdmp.Core/QueryBuilding/QueryBuilder.cs
@@ -35,8 +35,8 @@ public class QueryBuilder : ISqlQueryBuilder
     /// <inheritdoc/>
     public string SQL
     {
-        get {
-
+        get
+        {
             lock (oSQLLock)
             {
                 if (SQLOutOfDate)
@@ -48,21 +48,25 @@ public string SQL
 
     /// <inheritdoc/>
     public string LimitationSQL { get; private set; }
+
     /// <inheritdoc/>
     public List<QueryTimeColumn> SelectColumns { get; private set; }
+
     /// <inheritdoc/>
     public List<ITableInfo> TablesUsedInQuery { get; private set; }
+
     /// <inheritdoc/>
     public List<JoinInfo> JoinsUsedInQuery { get; private set; }
+
     /// <inheritdoc/>
     public List<CustomLine> CustomLines { get; private set; }
 
     /// <inheritdoc/>
     public CustomLine TopXCustomLine { get; set; }
-        
+
     /// <inheritdoc/>
     public ParameterManager ParameterManager { get; private set; }
-        
+
     /// <summary>
     /// Optional field, this specifies where to start gargantuan joins such as when there are 3+ joins and multiple primary key tables e.g. in a star schema.
     /// If this is not set and there are too many JoinInfos defined in the Catalogue then the class will bomb out with the Exception 
@@ -76,12 +80,13 @@ public string SQL
     public IContainer RootFilterContainer
     {
         get => _rootFilterContainer;
-        set {
+        set
+        {
             _rootFilterContainer = value;
             SQLOutOfDate = true;
         }
     }
-        
+
     /// <inheritdoc/>
     public bool CheckSyntax { get; set; }
 
@@ -95,7 +100,7 @@ public IContainer RootFilterContainer
     /// <param name="salt">A 3 letter string indicating the desired SALT</param>
     public void SetSalt(string salt)
     {
-        if(string.IsNullOrWhiteSpace(salt))
+        if (string.IsNullOrWhiteSpace(salt))
             throw new NullReferenceException("Salt cannot be blank");
 
         _salt = salt;
@@ -103,7 +108,7 @@ public void SetSalt(string salt)
 
     public void SetLimitationSQL(string limitationSQL)
     {
-        if(limitationSQL != null && limitationSQL.Contains("top"))
+        if (limitationSQL != null && limitationSQL.Contains("top"))
             throw new Exception("Use TopX property instead of limitation SQL to acheive this");
 
         LimitationSQL = limitationSQL;
@@ -122,7 +127,7 @@ public int TopX
         set
         {
             //it already has that value
-            if(_topX == value)
+            if (_topX == value)
                 return;
 
             _topX = value;
@@ -138,7 +143,7 @@ public int TopX
     private IContainer _rootFilterContainer;
     private string _hashingAlgorithm;
     private int _topX;
-        
+
     public IQuerySyntaxHelper QuerySyntaxHelper { get; set; }
 
     /// <summary>
@@ -168,7 +173,7 @@ public void AddColumnRange(IColumn[] columnsToAdd)
         //add the new ones to the list
         foreach (var col in columnsToAdd)
             AddColumn(col);
-                
+
         SQLOutOfDate = true;
     }
 
@@ -182,7 +187,7 @@ public void AddColumn(IColumn col)
         {
             SelectColumns.Add(toAdd);
             SQLOutOfDate = true;
-        }   
+        }
     }
 
     /// <inheritdoc/>
@@ -191,7 +196,7 @@ public CustomLine AddCustomLine(string text, QueryComponent positionToInsert)
         SQLOutOfDate = true;
         return SqlQueryBuilderHelper.AddCustomLine(this, text, positionToInsert);
     }
-        
+
     /// <summary>
     /// Updates .SQL Property, note that this is automatically called when you query .SQL anyway so you do not need to manually call it. 
     /// </summary>
@@ -200,18 +205,19 @@ public void RegenerateSQL()
         var checkNotifier = new ThrowImmediatelyCheckNotifier();
 
         _sql = "";
-            
+
         //reset the Parameter knowledge
         ParameterManager.ClearNonGlobals();
 
         #region Setup to output the query, where we figure out all the joins etc
+
         //reset everything
-            
+
         SelectColumns.Sort();
-            
+
         //work out all the filters 
         Filters = SqlQueryBuilderHelper.GetAllFiltersUsedInContainerTreeRecursively(RootFilterContainer);
-           
+
         TablesUsedInQuery = SqlQueryBuilderHelper.GetTablesUsedInQuery(this, out var primary, _forceJoinsToTheseTables);
 
         //force join to any TableInfos that would not be normally joined to but the user wants to anyway e.g. if there's WHERE sql that references them but no columns
@@ -221,7 +227,7 @@ public void RegenerateSQL()
                     TablesUsedInQuery.Add(force);
 
         PrimaryExtractionTable = primary;
-            
+
         SqlQueryBuilderHelper.FindLookups(this);
 
         JoinsUsedInQuery = SqlQueryBuilderHelper.FindRequiredJoins(this);
@@ -246,6 +252,7 @@ public void RegenerateSQL()
         /////////////////////////////////////////////Assemble Query///////////////////////////////
 
         #region Preamble (including variable declarations/initializations)
+
         //assemble the query - never use Environment.Newline, use TakeNewLine() so that QueryBuilder knows what line its got up to
         var toReturn = "";
 
@@ -255,7 +262,7 @@ public void RegenerateSQL()
             var needsToldTheSyntaxHelper = parameter as IInjectKnown<IQuerySyntaxHelper>;
             needsToldTheSyntaxHelper?.InjectKnown(QuerySyntaxHelper);
 
-            if(CheckSyntax)
+            if (CheckSyntax)
                 parameter.Check(checkNotifier);
 
             toReturn += GetParameterDeclarationSQL(parameter);
@@ -267,6 +274,7 @@ public void RegenerateSQL()
         #endregion
 
         #region Select (including all IColumns)
+
         toReturn += Environment.NewLine;
         toReturn += $"SELECT {LimitationSQL}{Environment.NewLine}";
 
@@ -274,8 +282,8 @@ public void RegenerateSQL()
         toReturn += Environment.NewLine;
 
         toReturn = AppendCustomLines(toReturn, QueryComponent.QueryTimeColumn);
-            
-        for (var i = 0; i < SelectColumns.Count;i++ )
+
+        for (var i = 0; i < SelectColumns.Count; i++)
         {
             //output each of the ExtractionInformations that the user requested and record the line number for posterity
             var columnAsSql = SelectColumns[i].GetSelectSQL(_hashingAlgorithm, _salt, QuerySyntaxHelper);
@@ -294,14 +302,14 @@ public void RegenerateSQL()
 
         //add user custom JOIN lines
         toReturn = AppendCustomLines(toReturn, QueryComponent.JoinInfoJoin);
-            
+
         #region Filters (WHERE)
 
         toReturn += SqlQueryBuilderHelper.GetWHERESQL(this);
-            
+
         toReturn = AppendCustomLines(toReturn, QueryComponent.WHERE);
         toReturn = AppendCustomLines(toReturn, QueryComponent.Postfix);
-            
+
         _sql = toReturn;
         SQLOutOfDate = false;
 
@@ -321,11 +329,8 @@ private string AppendCustomLines(string toReturn, QueryComponent stage)
     }
 
     /// <inheritdoc/>
-    public IEnumerable<Lookup> GetDistinctRequiredLookups()
-    {
-        return SqlQueryBuilderHelper.GetDistinctRequiredLookups(this);
-    }
-        
+    public IEnumerable<Lookup> GetDistinctRequiredLookups() => SqlQueryBuilderHelper.GetDistinctRequiredLookups(this);
+
     /// <summary>
     /// Generates Sql to comment, declare and set the initial value for the supplied <see cref="ISqlParameter"/>.
     /// </summary>
@@ -337,20 +342,20 @@ public static string GetParameterDeclarationSQL(ISqlParameter sqlParameter)
 
         if (!string.IsNullOrWhiteSpace(sqlParameter.Comment))
             toReturn += $"/*{sqlParameter.Comment}*/{Environment.NewLine}";
-            
+
         toReturn += sqlParameter.ParameterSQL + Environment.NewLine;
 
         //it's a table valued parameter! advanced
-        if (!string.IsNullOrEmpty(sqlParameter.Value) && Regex.IsMatch(sqlParameter.Value, @"\binsert\s+into\b",RegexOptions.IgnoreCase))
+        if (!string.IsNullOrEmpty(sqlParameter.Value) &&
+            Regex.IsMatch(sqlParameter.Value, @"\binsert\s+into\b", RegexOptions.IgnoreCase))
             toReturn += $"{sqlParameter.Value};{Environment.NewLine}";
         else
-            toReturn += $"SET {sqlParameter.ParameterName}={sqlParameter.Value};{Environment.NewLine}";//its a regular value
-            
+            toReturn +=
+                $"SET {sqlParameter.ParameterName}={sqlParameter.Value};{Environment.NewLine}"; //its a regular value
+
         return toReturn;
     }
 
-    public static string GetParameterDeclarationSQL(IEnumerable<ISqlParameter> sqlParameters)
-    {
-        return string.Join("", sqlParameters.Select(GetParameterDeclarationSQL));
-    }
+    public static string GetParameterDeclarationSQL(IEnumerable<ISqlParameter> sqlParameters) =>
+        string.Join("", sqlParameters.Select(GetParameterDeclarationSQL));
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/QueryBuilderArgs.cs b/Rdmp.Core/QueryBuilding/QueryBuilderArgs.cs
index 66c0a60611..b01982aa7f 100644
--- a/Rdmp.Core/QueryBuilding/QueryBuilderArgs.cs
+++ b/Rdmp.Core/QueryBuilding/QueryBuilderArgs.cs
@@ -15,12 +15,12 @@ namespace Rdmp.Core.QueryBuilding;
 /// Input class for <see cref="CohortQueryBuilderHelper"/> that assists in building the Sql query for a single cohort set in a <see cref="AggregateConfiguration"/>
 /// This can include arbitrary hacks like replacing the patient identifier with * and applying TopX etc (see base class <see cref="QueryBuilderCustomArgs"/>).
 /// </summary>
-public class QueryBuilderArgs: QueryBuilderCustomArgs
+public class QueryBuilderArgs : QueryBuilderCustomArgs
 {
     public JoinableCohortAggregateConfigurationUse JoinIfAny { get; }
     public AggregateConfiguration JoinedTo { get; }
     public CohortQueryBuilderDependencySql JoinSql { get; }
-    public ISqlParameter[] Globals { get;}
+    public ISqlParameter[] Globals { get; }
 
     /// <summary>
     /// Creates basic arguments for an <see cref="AggregateConfiguration"/> that does not have a join to a patient index table
@@ -39,17 +39,19 @@ public QueryBuilderArgs(QueryBuilderCustomArgs customisations, ISqlParameter[] g
     /// <param name="joinSql">The full SQL of the join</param>
     /// <param name="customisations"></param>
     /// <param name="globals"></param>
-    public QueryBuilderArgs(JoinableCohortAggregateConfigurationUse join,AggregateConfiguration joinedTo,CohortQueryBuilderDependencySql joinSql, QueryBuilderCustomArgs customisations, ISqlParameter[] globals):this(customisations,globals)
+    public QueryBuilderArgs(JoinableCohortAggregateConfigurationUse join, AggregateConfiguration joinedTo,
+        CohortQueryBuilderDependencySql joinSql, QueryBuilderCustomArgs customisations,
+        ISqlParameter[] globals) : this(customisations, globals)
     {
         JoinIfAny = join;
         JoinedTo = joinedTo;
         JoinSql = joinSql;
 
-        if(JoinIfAny == null !=  (JoinedTo == null )||  JoinIfAny == null != (JoinSql == null))
+        if (JoinIfAny == null != (JoinedTo == null) || JoinIfAny == null != (JoinSql == null))
             throw new Exception("You must provide all arguments or no arguments");
 
-        if(JoinedTo != null)
-            if(!JoinedTo.IsCohortIdentificationAggregate || !JoinedTo.IsJoinablePatientIndexTable())
-                throw new ArgumentException($"JoinedTo ({JoinedTo}) was not a patient index table",nameof(joinedTo));
+        if (JoinedTo != null)
+            if (!JoinedTo.IsCohortIdentificationAggregate || !JoinedTo.IsJoinablePatientIndexTable())
+                throw new ArgumentException($"JoinedTo ({JoinedTo}) was not a patient index table", nameof(joinedTo));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryBuilding/QueryBuilderCustomArgs.cs b/Rdmp.Core/QueryBuilding/QueryBuilderCustomArgs.cs
index 0438dcea93..63f05e93f9 100644
--- a/Rdmp.Core/QueryBuilding/QueryBuilderCustomArgs.cs
+++ b/Rdmp.Core/QueryBuilding/QueryBuilderCustomArgs.cs
@@ -16,7 +16,7 @@ public class QueryBuilderCustomArgs
     public string OverrideLimitationSQL { get; set; }
     public int TopX { get; set; } = -1;
 
-    public QueryBuilderCustomArgs(string overrideSelectList,string overrideLimitationSQL,int topX)
+    public QueryBuilderCustomArgs(string overrideSelectList, string overrideLimitationSQL, int topX)
     {
         OverrideSelectList = overrideSelectList;
         OverrideLimitationSQL = overrideLimitationSQL;
@@ -25,7 +25,6 @@ public QueryBuilderCustomArgs(string overrideSelectList,string overrideLimitatio
 
     public QueryBuilderCustomArgs()
     {
-            
     }
 
     /// <summary>
diff --git a/Rdmp.Core/QueryBuilding/QueryBuildingException.cs b/Rdmp.Core/QueryBuilding/QueryBuildingException.cs
index baf28ca49b..c41c6008ce 100644
--- a/Rdmp.Core/QueryBuilding/QueryBuildingException.cs
+++ b/Rdmp.Core/QueryBuilding/QueryBuildingException.cs
@@ -20,16 +20,16 @@ public class QueryBuildingException : Exception
     /// <summary>
     /// List of objects thought to be responsible for the query generation failing
     /// </summary>
-    public List<IMapsDirectlyToDatabaseTable> ProblemObjects {get;private set;}
+    public List<IMapsDirectlyToDatabaseTable> ProblemObjects { get; private set; }
+
 
-        
     /// <inheritdoc cref="QueryBuildingException(string)"/>
     public QueryBuildingException(string message, IEnumerable<IMapsDirectlyToDatabaseTable> problemObjects,
         Exception innerException = null) : base(message, innerException)
     {
         ProblemObjects = new List<IMapsDirectlyToDatabaseTable>(problemObjects);
     }
-        
+
     /// <inheritdoc cref="QueryBuildingException(string)"/>
     public QueryBuildingException(string message, Exception innerException) : base(message, innerException)
     {
@@ -39,7 +39,7 @@ public QueryBuildingException(string message, Exception innerException) : base(m
     /// <summary>
     /// Creates a new Exception for when there is a problem with QueryBuilding e.g. being unable to find a compatible IJoin (JoinInfo) between two TableInfos required by a query
     /// </summary>
-    public QueryBuildingException(string message):base (message)
+    public QueryBuildingException(string message) : base(message)
     {
         ProblemObjects = new List<IMapsDirectlyToDatabaseTable>();
     }
diff --git a/Rdmp.Core/QueryBuilding/QueryTimeColumn.cs b/Rdmp.Core/QueryBuilding/QueryTimeColumn.cs
index c0ce779e9f..702ff3b80b 100644
--- a/Rdmp.Core/QueryBuilding/QueryTimeColumn.cs
+++ b/Rdmp.Core/QueryBuilding/QueryTimeColumn.cs
@@ -23,7 +23,7 @@ namespace Rdmp.Core.QueryBuilding;
 /// Table, whether it maps to an underlying ColumnInfo etc.  These facts are used later on by QueryBuilder to decide which tables/joins are needed in the FROM
 /// section of the query etc
 /// </summary>
-public class QueryTimeColumn: IComparable
+public class QueryTimeColumn : IComparable
 {
     /// <summary>
     /// The <see cref="UnderlyingColumn"/> is from a <see cref="Lookup"/> and is a description column but there was no associated
@@ -98,10 +98,8 @@ public override bool Equals(object obj)
     public int CompareTo(object obj)
     {
         if (obj is QueryTimeColumn column)
-        {
             return IColumn.Order -
                    column.IColumn.Order;
-        }
 
         return 0;
     }
@@ -114,7 +112,6 @@ public int CompareTo(object obj)
     /// <param name="tablesUsedInQuery"></param>
     public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITableInfo> tablesUsedInQuery)
     {
-
         ColumnInfo lastForeignKeyFound = null;
         var lookupTablesFound = 0;
 
@@ -122,7 +119,7 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
 
         var allAvailableLookups = Array.Empty<Lookup>();
 
-        if(firstTable != null)
+        if (firstTable != null)
             allAvailableLookups = firstTable.Repository.GetAllObjects<Lookup>();
 
         for (var i = 0; i < ColumnsInOrder.Length; i++)
@@ -131,8 +128,10 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
             if (ColumnsInOrder[i].UnderlyingColumn == null)
                 continue;
 
-            var foreignKeyLookupInvolvement = allAvailableLookups.Where(l=>l.ForeignKey_ID == ColumnsInOrder[i].UnderlyingColumn.ID).ToArray();
-            var lookupDescriptionInvolvement = allAvailableLookups.Where(l=>l.Description_ID == ColumnsInOrder[i].UnderlyingColumn.ID).ToArray();
+            var foreignKeyLookupInvolvement = allAvailableLookups
+                .Where(l => l.ForeignKey_ID == ColumnsInOrder[i].UnderlyingColumn.ID).ToArray();
+            var lookupDescriptionInvolvement = allAvailableLookups
+                .Where(l => l.Description_ID == ColumnsInOrder[i].UnderlyingColumn.ID).ToArray();
 
             if (foreignKeyLookupInvolvement.Select(l => l.PrimaryKey.TableInfo_ID).Distinct().Count() > 1)
                 throw new Exception(
@@ -163,18 +162,24 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
                         lookupDescriptionInvolvement.Where(
                             l => tablesUsedInQuery.Any(t => t.ID == l.ForeignKey.TableInfo_ID)).ToArray();
 
-                    if(potentialWinners.Length == 1)//or there are many options but only one which is in our existing table collection
+                    if (potentialWinners.Length ==
+                        1) //or there are many options but only one which is in our existing table collection
                     {
-                        lastForeignKeyFound = potentialWinners[0].ForeignKey;//use it there aren't multiple foreign keys to pick from (which would result in uncertainty)
+                        lastForeignKeyFound =
+                            potentialWinners[0]
+                                .ForeignKey; //use it there aren't multiple foreign keys to pick from (which would result in uncertainty)
                         lookupDescriptionIsIsolated = true;
                     }
                     else
                         //otherwise there are multiple foreign keys for this description and the user has not put in a foreign key to let us choose the correct one
+                    {
                         throw new QueryBuildingException(
                             $"Found lookup description before encountering any lookup foreign keys (Description column was {ColumnsInOrder[i].UnderlyingColumn}) - make sure you always order Descriptions after their Foreign key and ensure they are in a contiguous block");
+                    }
                 }
 
-                var correctLookupDescriptionInvolvement = lookupDescriptionInvolvement.Where(lookup => lookup.ForeignKey.ID == lastForeignKeyFound.ID).ToArray();
+                var correctLookupDescriptionInvolvement = lookupDescriptionInvolvement
+                    .Where(lookup => lookup.ForeignKey.ID == lastForeignKeyFound.ID).ToArray();
 
                 if (correctLookupDescriptionInvolvement.Length == 0)
                 {
@@ -182,12 +187,13 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
 
                     //either way the last seen fk (or guessed fk) isn't right.  So what fks could potentially be used with the Column?
                     var probableCorrectColumn = lookupDescriptionInvolvement.Where(
-                        l =>
-                            //any lookup where there is...
-                            ColumnsInOrder.Any(
-                                qtc =>
-                                    //a column with an ID equal to the fk
-                                    qtc.UnderlyingColumn != null && qtc.UnderlyingColumn.ID == l.ForeignKey_ID)).ToArray();
+                            l =>
+                                //any lookup where there is...
+                                ColumnsInOrder.Any(
+                                    qtc =>
+                                        //a column with an ID equal to the fk
+                                        qtc.UnderlyingColumn != null && qtc.UnderlyingColumn.ID == l.ForeignKey_ID))
+                        .ToArray();
 
 
                     var suggestions = "";
@@ -206,7 +212,8 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
                 ColumnsInOrder[i].IsIsolatedLookupDescription = lookupDescriptionIsIsolated;
                 ColumnsInOrder[i].IsLookupForeignKey = false;
                 ColumnsInOrder[i].IsLookupDescription = true;
-                ColumnsInOrder[i].LookupTableAlias = lookupTablesFound; // must belong to same one as previously encountered foreign key
+                ColumnsInOrder[i].LookupTableAlias =
+                    lookupTablesFound; // must belong to same one as previously encountered foreign key
                 ColumnsInOrder[i].LookupTable = correctLookupDescriptionInvolvement[0];
 
                 //see if there are any supplemental joins to tables that are not involved in the query
@@ -229,7 +236,7 @@ public static void SetLookupStatus(QueryTimeColumn[] ColumnsInOrder, List<ITable
     /// <param name="salt"></param>
     /// <param name="syntaxHelper"></param>
     /// <returns></returns>
-    public string GetSelectSQL(string hashingPattern, string salt,IQuerySyntaxHelper syntaxHelper)
+    public string GetSelectSQL(string hashingPattern, string salt, IQuerySyntaxHelper syntaxHelper)
     {
         var toReturn = IColumn.SelectSQL;
 
@@ -241,8 +248,10 @@ public string GetSelectSQL(string hashingPattern, string salt,IQuerySyntaxHelper
                     $"IExtractableColumn {IColumn} is missing an Alias (required for hashing)");
 
             //if there is no custom hashing pattern
-            toReturn = string.IsNullOrWhiteSpace(hashingPattern) ? syntaxHelper.HowDoWeAchieveMd5(toReturn) : //use the DBMS specific one
-                string.Format(hashingPattern,toReturn, salt); //otherwise use the custom one
+            toReturn = string.IsNullOrWhiteSpace(hashingPattern)
+                ? syntaxHelper.HowDoWeAchieveMd5(toReturn)
+                : //use the DBMS specific one
+                string.Format(hashingPattern, toReturn, salt); //otherwise use the custom one
         }
 
         // the SELECT SQL may span multiple lines, so collapse it to a single line cleaning up any whitespace issues, e.g. to avoid double spaces in the collapsed version
@@ -288,7 +297,6 @@ public void CheckSyntax()
 
             if (string.IsNullOrWhiteSpace(runtimeName))
                 throw new SyntaxErrorException("no runtime name");
-
         }
         catch (SyntaxErrorException exception)
         {
diff --git a/Rdmp.Core/QueryBuilding/ReleaseIdentifierSubstitution.cs b/Rdmp.Core/QueryBuilding/ReleaseIdentifierSubstitution.cs
index 045029340c..19fe07af02 100644
--- a/Rdmp.Core/QueryBuilding/ReleaseIdentifierSubstitution.cs
+++ b/Rdmp.Core/QueryBuilding/ReleaseIdentifierSubstitution.cs
@@ -24,7 +24,7 @@ namespace Rdmp.Core.QueryBuilding;
 /// 
 /// <para>This class is an IColumn and is designed to be added as a new Column to a QueryBuilder as normal (See ExtractionQueryBuilder)</para>
 /// </summary>
-public class ReleaseIdentifierSubstitution :SpontaneousObject, IColumn
+public class ReleaseIdentifierSubstitution : SpontaneousObject, IColumn
 {
     public string JoinSQL { get; private set; }
 
@@ -32,13 +32,13 @@ public class ReleaseIdentifierSubstitution :SpontaneousObject, IColumn
     /// The identifiable column which is being substituted on
     /// </summary>
     public IColumn OriginalDatasetColumn;
+
     private readonly IQuerySyntaxHelper _querySyntaxHelper;
 
-    [Sql]
-    public string SelectSQL { get; set; }
+    [Sql] public string SelectSQL { get; set; }
 
     public string Alias { get; private set; }
-        
+
     //all these are hard coded to null or false really
     public ColumnInfo ColumnInfo => OriginalDatasetColumn.ColumnInfo;
 
@@ -47,16 +47,19 @@ public int Order
         get => OriginalDatasetColumn.Order;
         set { }
     }
+
     public bool HashOnDataRelease => false;
     public bool IsExtractionIdentifier => OriginalDatasetColumn.IsExtractionIdentifier;
     public bool IsPrimaryKey => OriginalDatasetColumn.IsPrimaryKey;
 
-    public ReleaseIdentifierSubstitution(MemoryRepository repo,IColumn extractionIdentifierToSubFor, IExtractableCohort extractableCohort, bool isPartOfMultiCHISubstitution,IQuerySyntaxHelper querySyntaxHelper):base(repo)
+    public ReleaseIdentifierSubstitution(MemoryRepository repo, IColumn extractionIdentifierToSubFor,
+        IExtractableCohort extractableCohort, bool isPartOfMultiCHISubstitution,
+        IQuerySyntaxHelper querySyntaxHelper) : base(repo)
     {
-        if(!extractionIdentifierToSubFor.IsExtractionIdentifier)
+        if (!extractionIdentifierToSubFor.IsExtractionIdentifier)
             throw new Exception(
                 $"Column {extractionIdentifierToSubFor} is not marked IsExtractionIdentifier so cannot be substituted for a ReleaseIdentifier");
-            
+
         OriginalDatasetColumn = extractionIdentifierToSubFor;
         _querySyntaxHelper = querySyntaxHelper;
         if (OriginalDatasetColumn.ColumnInfo == null)
@@ -69,7 +72,7 @@ public ReleaseIdentifierSubstitution(MemoryRepository repo,IColumn extractionIde
         var privateCol = extractableCohort.ExternalCohortTable.DiscoverPrivateIdentifier();
 
         var collateStatement = "";
-            
+
         //the release identifier join might require collation
 
         //if the private has a collation
@@ -80,8 +83,10 @@ public ReleaseIdentifierSubstitution(MemoryRepository repo,IColumn extractionIde
 
 
             //only collate if the server types match and if the collations differ
-            if(privateCol.Table.Database.Server.DatabaseType == OriginalDatasetColumn.ColumnInfo.TableInfo.DatabaseType)
-                if (!string.IsNullOrWhiteSpace(otherTableCollation) && !string.Equals(cohortCollation, otherTableCollation))
+            if (privateCol.Table.Database.Server.DatabaseType ==
+                OriginalDatasetColumn.ColumnInfo.TableInfo.DatabaseType)
+                if (!string.IsNullOrWhiteSpace(otherTableCollation) &&
+                    !string.Equals(cohortCollation, otherTableCollation))
                     collateStatement = $" collate {cohortCollation}";
         }
 
@@ -95,8 +100,8 @@ public ReleaseIdentifierSubstitution(MemoryRepository repo,IColumn extractionIde
         {
             SelectSQL =
                 $"(SELECT DISTINCT {extractableCohort.GetReleaseIdentifier()} FROM {privateCol.Table.GetFullyQualifiedName()} WHERE {extractableCohort.WhereSQL()} AND {privateCol.GetFullyQualifiedName()}={OriginalDatasetColumn.SelectSQL}{collateStatement})";
-                
-            if(!string.IsNullOrWhiteSpace(OriginalDatasetColumn.Alias))
+
+            if (!string.IsNullOrWhiteSpace(OriginalDatasetColumn.Alias))
             {
                 var toReplace = extractableCohort.GetPrivateIdentifier(true);
                 var toReplaceWith = extractableCohort.GetReleaseIdentifier(true);
@@ -105,27 +110,24 @@ public ReleaseIdentifierSubstitution(MemoryRepository repo,IColumn extractionIde
                 Alias = OriginalDatasetColumn.Alias;
 
                 //but replace all instances of CHI with PROCHI (or Barcode, or whatever)
-                if(!Alias.Contains(toReplace) || Regex.Matches(Alias,Regex.Escape(toReplace)).Count > 1)
-                {
+                if (!Alias.Contains(toReplace) || Regex.Matches(Alias, Regex.Escape(toReplace)).Count > 1)
                     throw new Exception(
                         $"Failed to resolve multiple extraction identifiers in dataset.  Either mark a single column as the IsExtractionIdentifier for this extraction or ensure all columns are of compatible type and have the text \"{toReplace}\" appearing once (and only once in its name)");
-                }
-                   
-                Alias = Alias.Replace(toReplace,toReplaceWith);
+
+                Alias = Alias.Replace(toReplace, toReplaceWith);
             }
             else
+            {
                 throw new Exception(
                     $"In cases where you have multiple columns marked IsExtractionIdentifier, they must all have Aliases, the column {OriginalDatasetColumn.SelectSQL} does not have one");
+            }
         }
 
         JoinSQL = $"{OriginalDatasetColumn.SelectSQL}={privateCol.GetFullyQualifiedName()}{collateStatement}";
-
     }
 
-    public string GetRuntimeName()
-    {
-        return string.IsNullOrWhiteSpace(Alias)?_querySyntaxHelper.GetRuntimeName(SelectSQL): Alias;
-    }
+    public string GetRuntimeName() =>
+        string.IsNullOrWhiteSpace(Alias) ? _querySyntaxHelper.GetRuntimeName(SelectSQL) : Alias;
 
     public void Check(ICheckNotifier notifier)
     {
diff --git a/Rdmp.Core/QueryBuilding/SqlQueryBuilderHelper.cs b/Rdmp.Core/QueryBuilding/SqlQueryBuilderHelper.cs
index bc442330ff..09e16a5edd 100644
--- a/Rdmp.Core/QueryBuilding/SqlQueryBuilderHelper.cs
+++ b/Rdmp.Core/QueryBuilding/SqlQueryBuilderHelper.cs
@@ -40,10 +40,8 @@ public static List<IFilter> GetAllFiltersUsedInContainerTreeRecursively(IContain
         {
             if (currentContainer.GetSubContainers() != null)
                 foreach (var subContainer in currentContainer.GetSubContainers())
-                {
                     //recursively add all subcontainers' filters
                     toAdd.AddRange(GetAllFiltersUsedInContainerTreeRecursively(subContainer));
-                }
 
             //add filters
             if (currentContainer.GetFilters() != null)
@@ -76,11 +74,13 @@ public static List<JoinInfo> FindRequiredJoins(ISqlQueryBuilder qb)
         var Joins = new List<JoinInfo>();
 
         if (qb.TablesUsedInQuery == null)
-            throw new NullReferenceException("You must populate TablesUsedInQuery before calling FindRequiredJoins, try calling GetTablesUsedInQuery");
+            throw new NullReferenceException(
+                "You must populate TablesUsedInQuery before calling FindRequiredJoins, try calling GetTablesUsedInQuery");
 
         //there are no tables so how could there be any joins!
         if (!qb.TablesUsedInQuery.Any())
-            throw new QueryBuildingException("Query has no TableInfos! Make sure your query has at least one column with an underlying ColumnInfo / TableInfo set - possibly you have deleted the TableInfo? this would result in orphan CatalogueItem");
+            throw new QueryBuildingException(
+                "Query has no TableInfos! Make sure your query has at least one column with an underlying ColumnInfo / TableInfo set - possibly you have deleted the TableInfo? this would result in orphan CatalogueItem");
 
         ICatalogueRepository cataRepository;
         try
@@ -90,60 +90,58 @@ public static List<JoinInfo> FindRequiredJoins(ISqlQueryBuilder qb)
         catch (Exception e)
         {
             throw new Exception(
-                $"Tables ({string.Join(",", qb.TablesUsedInQuery)}) do not seem to come from the same repository",e);
+                $"Tables ({string.Join(",", qb.TablesUsedInQuery)}) do not seem to come from the same repository", e);
         }
 
         foreach (TableInfo table1 in qb.TablesUsedInQuery)
-        {
-            foreach (TableInfo table2 in qb.TablesUsedInQuery)
-                if (table1.ID != table2.ID) //each table must join with a single other table
-                {
-                    //figure out which of the users columns is from table 1 to join using
-                    var availableJoins = cataRepository.JoinManager.GetAllJoinInfosBetweenColumnInfoSets(
-                        table1.ColumnInfos.ToArray(),
-                        table2.ColumnInfos.ToArray());
+        foreach (TableInfo table2 in qb.TablesUsedInQuery)
+            if (table1.ID != table2.ID) //each table must join with a single other table
+            {
+                //figure out which of the users columns is from table 1 to join using
+                var availableJoins = cataRepository.JoinManager.GetAllJoinInfosBetweenColumnInfoSets(
+                    table1.ColumnInfos.ToArray(),
+                    table2.ColumnInfos.ToArray());
 
-                    if (availableJoins.Length == 0)
-                        continue; //try another table
+                if (availableJoins.Length == 0)
+                    continue; //try another table
 
-                    var comboJoinResolved = false;
+                var comboJoinResolved = false;
 
-                    //if there are more than 1 join info between the two tables then we need to either do a combo join or complain to user
-                    if (availableJoins.Length > 1)
-                    {
-                        var additionalErrorMessageWhyWeCantDoComboJoin = "";
-                        //if there are multiple joins but they all join between the same 2 tables in the same direction
-                        if(availableJoins.Select(j=>j.PrimaryKey.TableInfo_ID).Distinct().Count() ==1
-                           &&
-                           availableJoins.Select(j=>j.ForeignKey.TableInfo_ID).Distinct().Count() ==1)
-                            if (availableJoins.Select(j => j.ExtractionJoinType).Distinct().Count() == 1)
-                            {
-                                //add as combo join
-                                for(var i =1 ; i<availableJoins.Length;i++)
-                                    availableJoins[0].AddQueryBuildingTimeComboJoinDiscovery(availableJoins[i]);
-                                comboJoinResolved = true;
-                            }
-                            else
-                                additionalErrorMessageWhyWeCantDoComboJoin =
-                                    " Although joins are all between the same tables in the same direction, the ExtractionJoinTypes are different (e.g. LEFT and RIGHT) which prevents forming a Combo AND based join using both relationships";
+                //if there are more than 1 join info between the two tables then we need to either do a combo join or complain to user
+                if (availableJoins.Length > 1)
+                {
+                    var additionalErrorMessageWhyWeCantDoComboJoin = "";
+                    //if there are multiple joins but they all join between the same 2 tables in the same direction
+                    if (availableJoins.Select(j => j.PrimaryKey.TableInfo_ID).Distinct().Count() == 1
+                        &&
+                        availableJoins.Select(j => j.ForeignKey.TableInfo_ID).Distinct().Count() == 1)
+                        if (availableJoins.Select(j => j.ExtractionJoinType).Distinct().Count() == 1)
+                        {
+                            //add as combo join
+                            for (var i = 1; i < availableJoins.Length; i++)
+                                availableJoins[0].AddQueryBuildingTimeComboJoinDiscovery(availableJoins[i]);
+                            comboJoinResolved = true;
+                        }
                         else
                         {
                             additionalErrorMessageWhyWeCantDoComboJoin =
-                                " The Joins do not go in the same direction e.g. Table1.FK=>Table=2.PK and then a reverse relationship Table2.FK=>Table1.PK, in this case the system cannot do a Combo AND based join";
+                                " Although joins are all between the same tables in the same direction, the ExtractionJoinTypes are different (e.g. LEFT and RIGHT) which prevents forming a Combo AND based join using both relationships";
                         }
+                    else
+                        additionalErrorMessageWhyWeCantDoComboJoin =
+                            " The Joins do not go in the same direction e.g. Table1.FK=>Table=2.PK and then a reverse relationship Table2.FK=>Table1.PK, in this case the system cannot do a Combo AND based join";
 
-                        var possibleJoinsWere = availableJoins.Select(s => $"JoinInfo[{s}]").Aggregate((a, b) => a + Environment.NewLine + b);
+                    var possibleJoinsWere = availableJoins.Select(s => $"JoinInfo[{s}]")
+                        .Aggregate((a, b) => a + Environment.NewLine + b);
 
-                        if(!comboJoinResolved)
-                            throw new QueryBuildingException(
-                                $"Found {availableJoins.Length} possible Joins for {table1.Name} and {table2.Name}, did not know which to use.  Available joins were:{Environment.NewLine}{possibleJoinsWere}{Environment.NewLine} It was not possible to configure a Composite Join because:{Environment.NewLine}{additionalErrorMessageWhyWeCantDoComboJoin}");
-                    }
-                        
-                    if (!Joins.Contains(availableJoins[0]))
-                        Joins.Add(availableJoins[0]);
+                    if (!comboJoinResolved)
+                        throw new QueryBuildingException(
+                            $"Found {availableJoins.Length} possible Joins for {table1.Name} and {table2.Name}, did not know which to use.  Available joins were:{Environment.NewLine}{possibleJoinsWere}{Environment.NewLine} It was not possible to configure a Composite Join because:{Environment.NewLine}{additionalErrorMessageWhyWeCantDoComboJoin}");
                 }
 
-        }
+                if (!Joins.Contains(availableJoins[0]))
+                    Joins.Add(availableJoins[0]);
+            }
 
         if (qb.TablesUsedInQuery.Count - GetDistinctRequiredLookups(qb).Count() - Joins.Count > 1)
             throw new QueryBuildingException(
@@ -165,11 +163,11 @@ public static List<JoinInfo> FindRequiredJoins(ISqlQueryBuilder qb)
         }
 
         if (qb.PrimaryExtractionTable != null && qb.TablesUsedInQuery.Contains(qb.PrimaryExtractionTable) == false)
-            throw new QueryBuildingException("Specified PrimaryExtractionTable was not found amongst the chosen extraction columns");
+            throw new QueryBuildingException(
+                "Specified PrimaryExtractionTable was not found amongst the chosen extraction columns");
 
 
         return Joins;
-
     }
 
     /// <summary>
@@ -177,20 +175,18 @@ public static List<JoinInfo> FindRequiredJoins(ISqlQueryBuilder qb)
     /// </summary>
     /// <param name="qb"></param>
     /// <returns></returns>
-    public static IEnumerable<Lookup> GetDistinctRequiredLookups(ISqlQueryBuilder qb)
-    {
+    public static IEnumerable<Lookup> GetDistinctRequiredLookups(ISqlQueryBuilder qb) =>
         //from all columns
-        return from column in qb.SelectColumns
-            where 
-                (
-                    column.IsLookupForeignKey 
-                    && 
-                    column.IsLookupForeignKeyActuallyUsed(qb.SelectColumns) 
-                )
-                || 
-                column.IsIsolatedLookupDescription //this is when there are no foreign key columns in the SelectedColumns set but there is still a lookup description field so we have to link to the table anyway
-            select column.LookupTable;
-    }
+        from column in qb.SelectColumns
+        where
+            (
+                column.IsLookupForeignKey
+                &&
+                column.IsLookupForeignKeyActuallyUsed(qb.SelectColumns)
+            )
+            ||
+            column.IsIsolatedLookupDescription //this is when there are no foreign key columns in the SelectedColumns set but there is still a lookup description field so we have to link to the table anyway
+        select column.LookupTable;
 
     /// <summary>
     /// Make sure you have set your Filters and SelectColumns properties before calling this method so that it can find table dependencies
@@ -199,12 +195,13 @@ public static IEnumerable<Lookup> GetDistinctRequiredLookups(ISqlQueryBuilder qb
     /// <param name="primaryExtractionTable"></param>
     /// <param name="forceJoinsToTheseTables"></param>
     /// <returns></returns>
-    public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITableInfo primaryExtractionTable, ITableInfo[] forceJoinsToTheseTables = null)
+    public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITableInfo primaryExtractionTable,
+        ITableInfo[] forceJoinsToTheseTables = null)
     {
-        if (qb.SelectColumns == null )
+        if (qb.SelectColumns == null)
             throw new QueryBuildingException("ISqlQueryBuilder.SelectedColumns is null");
 
-        if(qb.SelectColumns.Count == 0)
+        if (qb.SelectColumns.Count == 0)
             throw new QueryBuildingException("There are no columns in the SELECT query");
 
         var toReturn = new List<ITableInfo>(forceJoinsToTheseTables ?? Array.Empty<ITableInfo>());
@@ -212,17 +209,17 @@ public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITa
         if (forceJoinsToTheseTables != null)
         {
             if (forceJoinsToTheseTables.Count(t => t.IsPrimaryExtractionTable) > 1)
-            {
-                primaryExtractionTable = PickBestPrimaryExtractionTable(qb, forceJoinsToTheseTables.Where(t=>t.IsPrimaryExtractionTable).ToArray())
-                                         ?? throw new QueryBuildingException("Found 2+ tables marked IsPrimaryExtractionTable in force joined tables");
-            }
+                primaryExtractionTable = PickBestPrimaryExtractionTable(qb,
+                                             forceJoinsToTheseTables.Where(t => t.IsPrimaryExtractionTable).ToArray())
+                                         ?? throw new QueryBuildingException(
+                                             "Found 2+ tables marked IsPrimaryExtractionTable in force joined tables");
             else
-            {
                 primaryExtractionTable = forceJoinsToTheseTables.SingleOrDefault(t => t.IsPrimaryExtractionTable);
-            }
         }
         else
+        {
             primaryExtractionTable = null;
+        }
 
 
         //get all the tables based on selected columns
@@ -244,14 +241,14 @@ public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITa
                     if (primaryExtractionTable == null)
                         primaryExtractionTable = table;
                     else
-                        primaryExtractionTable = PickBestPrimaryExtractionTable(qb,primaryExtractionTable, table)
+                        primaryExtractionTable = PickBestPrimaryExtractionTable(qb, primaryExtractionTable, table)
                                                  ?? throw new QueryBuildingException(
                                                      $"There are multiple tables marked as IsPrimaryExtractionTable:{primaryExtractionTable.Name}(ID={primaryExtractionTable.ID}) and {table.Name}(ID={table.ID})");
             }
         }
 
         //get other tables we might need because they are referenced by filters
-        if(qb.Filters != null && qb.Filters.Any())
+        if (qb.Filters != null && qb.Filters.Any())
         {
             foreach (var filter in qb.Filters)
             {
@@ -259,18 +256,17 @@ public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITa
                 if (col != null)
                 {
                     var tableInfoOfFilter = col.TableInfo;
-                    if(!toReturn.Contains(tableInfoOfFilter))
+                    if (!toReturn.Contains(tableInfoOfFilter))
                         toReturn.Add(tableInfoOfFilter);
                 }
             }
 
             toReturn = AddOpportunisticJoins(toReturn, qb.Filters);
-
         }
 
         //Some TableInfos might be TableValuedFunctions or for some other reason have a paramter associated with them
         qb.ParameterManager.AddParametersFor(toReturn);
-                
+
 
         return toReturn;
     }
@@ -283,10 +279,11 @@ public static List<ITableInfo> GetTablesUsedInQuery(ISqlQueryBuilder qb, out ITa
     /// <param name="tables"></param>
     /// <returns></returns>
     /// <exception cref="QueryBuildingException"></exception>
-    private static ITableInfo PickBestPrimaryExtractionTable(ISqlQueryBuilder qb,params ITableInfo[] tables)
+    private static ITableInfo PickBestPrimaryExtractionTable(ISqlQueryBuilder qb, params ITableInfo[] tables)
     {
         if (tables.Length == 0)
-            throw new ArgumentException($"At least one table must be provided to {nameof(PickBestPrimaryExtractionTable)}");
+            throw new ArgumentException(
+                $"At least one table must be provided to {nameof(PickBestPrimaryExtractionTable)}");
 
         // if there is only one choice
         if (tables.Length == 1)
@@ -299,15 +296,13 @@ private static ITableInfo PickBestPrimaryExtractionTable(ISqlQueryBuilder qb,par
             .Where(id => id != null)
             .ToArray();
 
-        if(extractionIdentifierTables.Length == 1)
+        if (extractionIdentifierTables.Length == 1)
         {
             var id = extractionIdentifierTables[0];
 
-            foreach(var t in tables)
-            {
+            foreach (var t in tables)
                 if (id == t.ID)
                     return t;
-            }
 
             // IsExtractionIdentifier column is from neither of these tables, bad times
         }
@@ -319,29 +314,22 @@ private static ITableInfo PickBestPrimaryExtractionTable(ISqlQueryBuilder qb,par
     private static List<ITableInfo> AddOpportunisticJoins(List<ITableInfo> toReturn, List<IFilter> filters)
     {
         //there must be at least one TableInfo here to do this... but we are going to look up all available JoinInfos from these tables to identify opportunistic joins
-        foreach(var table in toReturn.ToArray())
+        foreach (var table in toReturn.ToArray())
         {
-            var available = table.CatalogueRepository.JoinManager.GetAllJoinInfosWhereTableContains(table, JoinInfoType.AnyKey);
-                
+            var available =
+                table.CatalogueRepository.JoinManager.GetAllJoinInfosWhereTableContains(table, JoinInfoType.AnyKey);
+
             foreach (var newAvailableJoin in available)
-            {
-                foreach (var availableTable in new TableInfo[]{newAvailableJoin.PrimaryKey.TableInfo,newAvailableJoin.ForeignKey.TableInfo})
-                {
-                    //if it's a never before seen table
-                    if (!toReturn.Contains(availableTable))
-                    {
-                        //are there any filters which reference the available TableInfo
-                        if (filters.Any(f =>f.WhereSQL != null && f.WhereSQL.ToLower().Contains(
-                                $"{availableTable.Name.ToLower()}.")))
-                        {
-                            toReturn.Add(availableTable);
-                        }
-                    }
-                }
-                        
-            }
+            foreach (var availableTable in new TableInfo[]
+                         { newAvailableJoin.PrimaryKey.TableInfo, newAvailableJoin.ForeignKey.TableInfo })
+                //if it's a never before seen table
+                if (!toReturn.Contains(availableTable))
+                    //are there any filters which reference the available TableInfo
+                    if (filters.Any(f => f.WhereSQL != null && f.WhereSQL.ToLower().Contains(
+                            $"{availableTable.Name.ToLower()}.")))
+                        toReturn.Add(availableTable);
         }
-            
+
 
         return toReturn;
     }
@@ -357,8 +345,9 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
         //add the from bit
         var toReturn = $"FROM {Environment.NewLine}";
 
-        if(qb.TablesUsedInQuery.Count == 0)
-            throw new QueryBuildingException("There are no tables involved in the query: We were asked to compute the FROM SQL but qb.TablesUsedInQuery was of length 0");
+        if (qb.TablesUsedInQuery.Count == 0)
+            throw new QueryBuildingException(
+                "There are no tables involved in the query: We were asked to compute the FROM SQL but qb.TablesUsedInQuery was of length 0");
 
         //IDs of tables we already have in our FROM section
         var tablesAddedSoFar = new HashSet<int>();
@@ -373,13 +362,16 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
 
             //is there only one table involved in the query?
             if (qb.TablesUsedInQuery.Count == 1)
+            {
                 firstTable = qb.TablesUsedInQuery[0];
-            else if (qb.TablesUsedInQuery.Count(t => t.IsPrimaryExtractionTable) == 1) //has the user picked one to be primary?
+            }
+            else if (qb.TablesUsedInQuery.Count(t => t.IsPrimaryExtractionTable) ==
+                     1) //has the user picked one to be primary?
             {
                 firstTable = qb.TablesUsedInQuery.Single(t => t.IsPrimaryExtractionTable);
-                    
+
                 //has user tried to make a lookup table the primary table!
-                if(TableIsLookupTable(firstTable,qb))
+                if (TableIsLookupTable(firstTable, qb))
                     throw new QueryBuildingException(
                         $"Lookup tables cannot be marked IsPrimaryExtractionTable (Offender ={firstTable})");
             }
@@ -389,11 +381,11 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
 
                 //can we discard all tables but one based on the fact that they are look up tables?
                 //maybe! lookup tables are tables where there is an underlying column from that table that is a lookup description
-                var winners = 
-                    qb.TablesUsedInQuery.Where(t=> 
-                            !TableIsLookupTable(t,qb))
+                var winners =
+                    qb.TablesUsedInQuery.Where(t =>
+                            !TableIsLookupTable(t, qb))
                         .ToArray();
-                    
+
                 //if we have discarded all but 1 it is the only table that does not have any lookup descriptions in it so clearly the correct table to start joins from
                 if (winners.Length == 1)
                     firstTable = winners[0];
@@ -401,15 +393,14 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
                     throw new QueryBuildingException(
                         $"There were {qb.TablesUsedInQuery.Count} Tables ({string.Join(",", qb.TablesUsedInQuery)}) involved in the query, some of them might have been lookup tables but there was no clear table to start joining from, either mark one of the TableInfos IsPrimaryExtractionTable or refine your query columns / create new lookup relationships");
             }
-                
+
             toReturn += firstTable.Name; //simple case "FROM tableX"
         }
-        else
-        if (qb.PrimaryExtractionTable != null)
+        else if (qb.PrimaryExtractionTable != null)
         {
             //user has specified which table to start from 
             toReturn += qb.PrimaryExtractionTable.Name;
-                
+
             //now find any joins which involve the primary extraction table
             for (var i = 0; i < qb.JoinsUsedInQuery.Count; i++)
                 if (qb.JoinsUsedInQuery[i].PrimaryKey.TableInfo_ID == qb.PrimaryExtractionTable.ID)
@@ -420,20 +411,21 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
                     if (!tablesAddedSoFar.Contains(fkTableId))
                     {
                         //we are joining to a table where the PrimaryExtractionTable is the PK in the relationship so join into the foreign key side
-                        toReturn += JoinHelper.GetJoinSQLForeignKeySideOnly(qb.JoinsUsedInQuery[i]) + Environment.NewLine;
+                        toReturn += JoinHelper.GetJoinSQLForeignKeySideOnly(qb.JoinsUsedInQuery[i]) +
+                                    Environment.NewLine;
                         tablesAddedSoFar.Add(fkTableId);
                     }
                 }
-                else
-                if (qb.JoinsUsedInQuery[i].ForeignKey.TableInfo_ID == qb.PrimaryExtractionTable.ID)
+                else if (qb.JoinsUsedInQuery[i].ForeignKey.TableInfo_ID == qb.PrimaryExtractionTable.ID)
                 {
                     var pkTableId = qb.JoinsUsedInQuery[i].PrimaryKey.TableInfo_ID;
-        
+
                     //don't double JOIN to the same table twice even using different routes (see Test_FourTables_MultipleRoutes)
                     if (!tablesAddedSoFar.Contains(pkTableId))
                     {
                         //we are joining to a table where the PrimaryExtractionTable is the FK in the relationship so join into the primary key side
-                        toReturn += JoinHelper.GetJoinSQLPrimaryKeySideOnly(qb.JoinsUsedInQuery[i]) + Environment.NewLine;
+                        toReturn += JoinHelper.GetJoinSQLPrimaryKeySideOnly(qb.JoinsUsedInQuery[i]) +
+                                    Environment.NewLine;
                         tablesAddedSoFar.Add(pkTableId);
                     }
                 }
@@ -443,7 +435,6 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
                 if (qb.JoinsUsedInQuery[i].ForeignKey.TableInfo_ID != qb.PrimaryExtractionTable.ID &&
                     qb.JoinsUsedInQuery[i].PrimaryKey.TableInfo_ID != qb.PrimaryExtractionTable.ID)
                 {
-
                     var pkTableID = qb.JoinsUsedInQuery[i].PrimaryKey.TableInfo_ID;
                     var fkTableID = qb.JoinsUsedInQuery[i].ForeignKey.TableInfo_ID;
 
@@ -451,7 +442,9 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
                     //if we have already seen foreign key table before 
                     //if we already have 
                     if (tablesAddedSoFar.Contains(fkTableID) && tablesAddedSoFar.Contains(pkTableID))
+                    {
                         unneededJoins.Add(qb.JoinsUsedInQuery[i]);
+                    }
                     else if (tablesAddedSoFar.Contains(fkTableID))
                     {
                         toReturn += JoinHelper.GetJoinSQLPrimaryKeySideOnly(qb.JoinsUsedInQuery[i]) +
@@ -462,38 +455,38 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
                         //else if we have already seen primary key table before
                     if (tablesAddedSoFar.Contains(pkTableID))
                     {
-
                         toReturn += JoinHelper.GetJoinSQLForeignKeySideOnly(qb.JoinsUsedInQuery[i]) +
                                     Environment.NewLine; //add foreign instead
                         tablesAddedSoFar.Add(fkTableID);
                     }
-                                
+
                     else
+                    {
                         throw new NotImplementedException(
                             "We are having to add a Join for a table that is not 1 level down from the PrimaryExtractionTable");
+                    }
                 }
         }
         else
         {
             //user has not specified which table to start from so just output them all in a random order (hopefully FindRequiredJoins bombed out if they tried to do anything too mental)
-            toReturn += JoinHelper.GetJoinSQL(qb.JoinsUsedInQuery[0]) + Environment.NewLine; //"FROM ForeignKeyTable JOIN PrimaryKeyTable ON ..."
+            toReturn += JoinHelper.GetJoinSQL(qb.JoinsUsedInQuery[0]) +
+                        Environment.NewLine; //"FROM ForeignKeyTable JOIN PrimaryKeyTable ON ..."
 
             //any subsequent joins
             for (var i = 1; i < qb.JoinsUsedInQuery.Count; i++)
-            {
-                toReturn += JoinHelper.GetJoinSQLForeignKeySideOnly(qb.JoinsUsedInQuery[i]) + Environment.NewLine; //right side only (ForeignKeyTable)
-            }
+                toReturn += JoinHelper.GetJoinSQLForeignKeySideOnly(qb.JoinsUsedInQuery[i]) +
+                            Environment.NewLine; //right side only (ForeignKeyTable)
         }
 
         //any subsequent lookup joins
         foreach (var column in qb.SelectColumns)
-        {
             if (
                 (column.IsLookupForeignKey && column.IsLookupForeignKeyActuallyUsed(qb.SelectColumns))
                 ||
                 column.IsIsolatedLookupDescription)
-                toReturn += JoinHelper.GetJoinSQLPrimaryKeySideOnly(column.LookupTable, column.LookupTableAlias) + Environment.NewLine;
-        }
+                toReturn += JoinHelper.GetJoinSQLPrimaryKeySideOnly(column.LookupTable, column.LookupTableAlias) +
+                            Environment.NewLine;
 
         //remove any joins that didn't turn out to be needed when joining the tables
         foreach (var j in unneededJoins)
@@ -502,7 +495,7 @@ public static string GetFROMSQL(ISqlQueryBuilder qb)
         return toReturn;
     }
 
-    private static bool TableIsLookupTable(ITableInfo tableInfo,ISqlQueryBuilder qb)
+    private static bool TableIsLookupTable(ITableInfo tableInfo, ISqlQueryBuilder qb)
     {
         return
             //tables where there is any columns which 
@@ -523,7 +516,8 @@ public static CustomLine AddCustomLine(ISqlQueryBuilder builder, string text, Qu
     {
         var toAdd = new CustomLine(text, positionToInsert);
 
-        if(positionToInsert == QueryComponent.GroupBy || positionToInsert == QueryComponent.OrderBy || positionToInsert == QueryComponent.FROM || positionToInsert == QueryComponent.Having)
+        if (positionToInsert == QueryComponent.GroupBy || positionToInsert == QueryComponent.OrderBy ||
+            positionToInsert == QueryComponent.FROM || positionToInsert == QueryComponent.Having)
             throw new QueryBuildingException(
                 $"Cannot inject custom lines into QueryBuilders at location {positionToInsert}");
 
@@ -554,13 +548,13 @@ public static string GetWHERESQL(ISqlQueryBuilder qb)
         if (emptyFilters.Any())
             throw new QueryBuildingException(
                 $"The following empty filters were found in the query:{Environment.NewLine}{string.Join(Environment.NewLine, emptyFilters.Select(f => f.Name))}");
-            
+
         //recursively iterate the filter containers joining them up with their operation (AND or OR) and doing tab indentation etc
         if (qb.Filters.Any())
         {
             var filtersSql = WriteContainerTreeRecursively(toReturn, 0, qb.RootFilterContainer, qb);
 
-            if(!string.IsNullOrWhiteSpace(filtersSql))
+            if (!string.IsNullOrWhiteSpace(filtersSql))
             {
                 toReturn += Environment.NewLine;
                 toReturn += $"WHERE{Environment.NewLine}";
@@ -571,7 +565,8 @@ public static string GetWHERESQL(ISqlQueryBuilder qb)
         return toReturn;
     }
 
-    private static string WriteContainerTreeRecursively(string toReturn, int tabDepth, IContainer currentContainer, ISqlQueryBuilder qb)
+    private static string WriteContainerTreeRecursively(string toReturn, int tabDepth, IContainer currentContainer,
+        ISqlQueryBuilder qb)
     {
         var tabs = "";
         //see how far we have to tab in
@@ -590,7 +585,7 @@ private static string WriteContainerTreeRecursively(string toReturn, int tabDept
 
         //output starting bracket
         toReturn += $"{tabs}({Environment.NewLine}";
-            
+
         //write out subcontainers
         for (var i = 0; i < subcontainers.Length; i++)
         {
@@ -600,7 +595,7 @@ private static string WriteContainerTreeRecursively(string toReturn, int tabDept
             if (i + 1 < subcontainers.Length)
                 toReturn += tabs + currentContainer.Operation + Environment.NewLine;
         }
-            
+
         //if there are both filters and containers we need to join the trees with the operator (e.g. AND)
         if (subcontainers.Length >= 1 && filtersInContainer.Length >= 1)
             toReturn += currentContainer.Operation + Environment.NewLine;
@@ -614,8 +609,8 @@ private static string WriteContainerTreeRecursively(string toReturn, int tabDept
             toReturn += $@"{tabs}/*{filtersInContainer[i].Name}*/{Environment.NewLine}";
 
             // the filter may span multiple lines, so collapse it to a single line cleaning up any whitespace issues, e.g. to avoid double spaces in the collapsed version
-            var trimmedFilters = (filtersInContainer[i].WhereSQL??"")
-                .Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries)
+            var trimmedFilters = (filtersInContainer[i].WhereSQL ?? "")
+                .Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries)
                 .Select(s => s.Trim());
             var singleLineWhereSQL = string.Join(" ", trimmedFilters);
             toReturn += tabs + singleLineWhereSQL + Environment.NewLine;
@@ -623,7 +618,6 @@ private static string WriteContainerTreeRecursively(string toReturn, int tabDept
             //if there are more filters to come
             if (i + 1 < filtersInContainer.Length)
                 toReturn += tabs + currentContainer.Operation + Environment.NewLine;
-
         }
 
         toReturn += $"{tabs}){Environment.NewLine}";
@@ -636,22 +630,19 @@ private static string WriteContainerTreeRecursively(string toReturn, int tabDept
     /// </summary>
     /// <param name="container"></param>
     /// <returns></returns>
-    private static bool IsEnabled(IContainer container)
-    {
+    private static bool IsEnabled(IContainer container) =>
         //skip disabled containers
-        return container is not IDisableable dis || !dis.IsDisabled;
-    }
+        container is not IDisableable dis || !dis.IsDisabled;
 
     /// <summary>
     /// Filters are enabled if they do not support disabling (<see cref="IDisableable"/>) or are <see cref="IDisableable.IsDisabled"/> = false
     /// </summary>
     /// <param name="filter"></param>
     /// <returns></returns>
-    private static bool IsEnabled(IFilter filter)
-    {
+    private static bool IsEnabled(IFilter filter) =>
         //skip disabled filters
-        return filter is not IDisableable dis || !dis.IsDisabled;
-    }
+        filter is not IDisableable dis || !dis.IsDisabled;
+
     /// <summary>
     /// Returns the unique database server type <see cref="IQuerySyntaxHelper"/> by evaluating the <see cref="TableInfo"/> used in the query.
     /// <para>Throws <see cref="QueryBuildingException"/> if the tables are from mixed server types (e.g. MySql mixed with Oracle)</para> 
@@ -661,11 +652,12 @@ private static bool IsEnabled(IFilter filter)
     public static IQuerySyntaxHelper GetSyntaxHelper(List<ITableInfo> tablesUsedInQuery)
     {
         if (!tablesUsedInQuery.Any())
-            throw new QueryBuildingException("Could not pick an IQuerySyntaxHelper because the there were no TableInfos used in the query");
+            throw new QueryBuildingException(
+                "Could not pick an IQuerySyntaxHelper because the there were no TableInfos used in the query");
 
 
         var databaseTypes = tablesUsedInQuery.Select(t => t.DatabaseType).Distinct().ToArray();
-        if(databaseTypes.Length > 1)
+        if (databaseTypes.Length > 1)
             throw new QueryBuildingException(
                 $"Cannot build query because there are multiple DatabaseTypes involved in the query:{string.Join(",", tablesUsedInQuery.Select(t => $"{t.GetRuntimeName()}({t.DatabaseType})"))}");
 
@@ -714,20 +706,23 @@ public static void ClearTopX(ISqlQueryBuilder queryBuilder)
     public static IEnumerable<CustomLine> GetCustomLinesSQLForStage(ISqlQueryBuilder queryBuilder, QueryComponent stage)
     {
         var lines = queryBuilder.CustomLines.Where(c => c.LocationToInsert == stage).ToArray();
-            
-        if (!lines.Any())//no lines
+
+        if (!lines.Any()) //no lines
             yield break;
 
-           
+
         //Custom Filters (for people who can't be bothered to implement IFilter or when IContainer doesnt support ramming in additional Filters at runtime because you feel like it ) - these all get AND together and a WHERE is put at the start if needed
         //if there are custom lines being rammed into the Filter section
         if (stage == QueryComponent.WHERE)
         {
             //if we haven't put a WHERE yet, put one in
             if (queryBuilder.Filters.Count == 0)
-                yield return new CustomLine("WHERE" ,QueryComponent.WHERE);
+                yield return new CustomLine("WHERE", QueryComponent.WHERE);
             else
-                yield return new CustomLine("AND" , QueryComponent.WHERE); //otherwise just AND it with every other filter we currently have configured
+                yield return
+                    new CustomLine("AND",
+                        QueryComponent
+                            .WHERE); //otherwise just AND it with every other filter we currently have configured
 
             //add user custom Filter lines
             for (var i = 0; i < lines.Length; i++)
@@ -735,11 +730,12 @@ public static IEnumerable<CustomLine> GetCustomLinesSQLForStage(ISqlQueryBuilder
                 yield return lines[i];
 
                 if (i + 1 < lines.Length)
-                    yield return new CustomLine("AND" , QueryComponent.WHERE);
+                    yield return new CustomLine("AND", QueryComponent.WHERE);
             }
+
             yield break;
         }
-            
+
         //not a custom filter (which requires ANDing - see above) so this is the rest of the cases
         foreach (var line in lines)
             yield return line;
diff --git a/Rdmp.Core/QueryBuilding/SyntaxChecking/ColumnSyntaxChecker.cs b/Rdmp.Core/QueryBuilding/SyntaxChecking/ColumnSyntaxChecker.cs
index 215e37766c..8bb4302344 100644
--- a/Rdmp.Core/QueryBuilding/SyntaxChecking/ColumnSyntaxChecker.cs
+++ b/Rdmp.Core/QueryBuilding/SyntaxChecking/ColumnSyntaxChecker.cs
@@ -25,7 +25,7 @@ public class ColumnSyntaxChecker : SyntaxChecker
     /// Prepares the checker to check the IColumn supplied
     /// </summary>
     /// <param name="column"></param>
-    public  ColumnSyntaxChecker(IColumn column)
+    public ColumnSyntaxChecker(IColumn column)
     {
         _column = column;
     }
@@ -47,8 +47,7 @@ public override void Check(ICheckNotifier notifier)
             //alias is NOT wrapped
             if (_column.Alias.Any(invalidColumnValues.Contains)) //there are invalid characters
                 throw new SyntaxErrorException($"Invalid characters found in Alias \"{_column.Alias}\"");
-            else
-            if (_column.Alias.Any(whiteSpace.Contains))
+            else if (_column.Alias.Any(whiteSpace.Contains))
                 throw new SyntaxErrorException($"Whitespace found in unwrapped Alias \"{_column.Alias}\"");
 
         ParityCheckCharacterPairs(openingCharacters, closingCharacters, _column.SelectSQL);
diff --git a/Rdmp.Core/QueryBuilding/SyntaxChecking/SyntaxChecker.cs b/Rdmp.Core/QueryBuilding/SyntaxChecking/SyntaxChecker.cs
index 12ad38700b..0a2c32be12 100644
--- a/Rdmp.Core/QueryBuilding/SyntaxChecking/SyntaxChecker.cs
+++ b/Rdmp.Core/QueryBuilding/SyntaxChecking/SyntaxChecker.cs
@@ -36,7 +36,9 @@ public static void ParityCheckCharacterPairs(char[] openingCharacters, char[] cl
         //it has select sql
         if (string.IsNullOrWhiteSpace(sql)) return;
         for (var i = 0; i < openingCharacters.Length; i++)
-            if (openingCharacters[i] == closingCharacters[i]) //if the opening and closing characters are the same character then there should be an even number of them
+            if (openingCharacters[i] ==
+                closingCharacters
+                    [i]) //if the opening and closing characters are the same character then there should be an even number of them
             {
                 //if it is not an even number of them
                 if (sql.Count(c => c == openingCharacters[i]) % 2 == 1)
@@ -45,8 +47,10 @@ public static void ParityCheckCharacterPairs(char[] openingCharacters, char[] cl
             }
             else //opening and closing characters are different e.g. '('  and ')', there should be the same number of each of them
             if (sql.Count(c => c == openingCharacters[i]) != sql.Count(c => c == closingCharacters[i]))
+            {
                 throw new SyntaxErrorException(
                     $"Mismatch in the number of opening '{openingCharacters[i]}' and closing '{closingCharacters[i]}'");
+            }
     }
 
     /// <summary>
@@ -55,7 +59,6 @@ public static void ParityCheckCharacterPairs(char[] openingCharacters, char[] cl
     /// <param name="parameter"></param>
     public static void CheckSyntax(ISqlParameter parameter)
     {
-
         if (string.IsNullOrWhiteSpace(parameter.Value))
             throw new SyntaxErrorException($"Parameter {parameter.ParameterName} does not have a value");
 
@@ -88,13 +91,13 @@ public static void CheckSyntax(ISqlParameter parameter)
         }
         catch (SyntaxErrorException exception)
         {
-            throw new SyntaxErrorException($"Failed to validate the bracket parity of parameter {parameter}", exception);
+            throw new SyntaxErrorException($"Failed to validate the bracket parity of parameter {parameter}",
+                exception);
         }
 
 
         if (!parameter.GetQuerySyntaxHelper().IsValidParameterName(parameter.ParameterSQL))
             throw new SyntaxErrorException($"parameterSQL is not valid \"{parameter.ParameterSQL}\"");
-
     }
 
     /// <summary>
diff --git a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitArguments.cs b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitArguments.cs
index 626252c624..3cc549eb28 100644
--- a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitArguments.cs
+++ b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitArguments.cs
@@ -20,7 +20,8 @@ public abstract class CacheCommitArguments
     public DataTable Results { get; private set; }
     public DatabaseColumnRequest[] ExplicitColumns { get; private set; }
 
-    protected CacheCommitArguments(AggregateOperation operation, AggregateConfiguration configuration, string sql, DataTable results, int timeout, DatabaseColumnRequest[] explicitColumns = null)
+    protected CacheCommitArguments(AggregateOperation operation, AggregateConfiguration configuration, string sql,
+        DataTable results, int timeout, DatabaseColumnRequest[] explicitColumns = null)
     {
         Timeout = timeout;
         Operation = operation;
@@ -31,7 +32,6 @@ protected CacheCommitArguments(AggregateOperation operation, AggregateConfigurat
 
         if (results == null)
             throw new Exception("DataTable results must have a value");
-
     }
 
     public abstract void CommitTableDataCompleted(DiscoveredTable resultingTable);
diff --git a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitExtractableAggregate.cs b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitExtractableAggregate.cs
index e7d870c507..2b27b1a427 100644
--- a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitExtractableAggregate.cs
+++ b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitExtractableAggregate.cs
@@ -20,7 +20,8 @@ namespace Rdmp.Core.QueryCaching.Aggregation.Arguments;
 ///</summary>
 public class CacheCommitExtractableAggregate : CacheCommitArguments
 {
-    public CacheCommitExtractableAggregate(AggregateConfiguration configuration, string sql, DataTable results, int timeout)
+    public CacheCommitExtractableAggregate(AggregateConfiguration configuration, string sql, DataTable results,
+        int timeout)
         : base(AggregateOperation.ExtractableAggregateResults, configuration, sql, results, timeout)
     {
         if (results.Columns.Count == 0)
@@ -39,7 +40,6 @@ public CacheCommitExtractableAggregate(AggregateConfiguration configuration, str
         if (!configuration.IsExtractable)
             throw new NotSupportedException(
                 $"Aggregate {configuration} is not marked as IsExtractable therefore cannot be cached for publication on website");
-            
     }
 
     public override void CommitTableDataCompleted(DiscoveredTable resultingTable)
diff --git a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitIdentifierList.cs b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitIdentifierList.cs
index 172be801a0..7734f6c521 100644
--- a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitIdentifierList.cs
+++ b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitIdentifierList.cs
@@ -22,8 +22,10 @@ public class CacheCommitIdentifierList : CacheCommitArguments
 {
     private DatabaseColumnRequest _identifierColumn;
 
-    public CacheCommitIdentifierList(AggregateConfiguration configuration, string sql, DataTable results, DatabaseColumnRequest identifierColumn, int timeout)
-        : base(AggregateOperation.IndexedExtractionIdentifierList, configuration, sql, results, timeout, new []{identifierColumn})
+    public CacheCommitIdentifierList(AggregateConfiguration configuration, string sql, DataTable results,
+        DatabaseColumnRequest identifierColumn, int timeout)
+        : base(AggregateOperation.IndexedExtractionIdentifierList, configuration, sql, results, timeout,
+            new[] { identifierColumn })
     {
         //advise them if they are trying to cache an identifier list but the DataTable has more than 1 column
         if (results.Columns.Count != 1)
@@ -39,7 +41,7 @@ public CacheCommitIdentifierList(AggregateConfiguration configuration, string sq
         foreach (var r in results.Rows.Cast<DataRow>().ToArray())
             if (r[0] == null || r[0] == DBNull.Value)
                 results.Rows.Remove(r);
-            
+
         if (identifierColumn == null)
             throw new Exception("You must specify the data type of the identifier column, identifierColumn was null");
 
@@ -53,7 +55,7 @@ public override void CommitTableDataCompleted(DiscoveredTable resultingTable)
         //if user has an explicit type to use for the column (probably a good idea to have all extraction idetntifiers of the same data type
         var col = resultingTable.DiscoverColumn(_identifierColumn.ColumnName);
 
-        CreateIndex(resultingTable,col, Configuration.ToString());
+        CreateIndex(resultingTable, col, Configuration.ToString());
     }
 
 
diff --git a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitJoinableInceptionQuery.cs b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitJoinableInceptionQuery.cs
index 884cb9bbf9..06e5c7802b 100644
--- a/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitJoinableInceptionQuery.cs
+++ b/Rdmp.Core/QueryCaching/Aggregation/Arguments/CacheCommitJoinableInceptionQuery.cs
@@ -19,15 +19,15 @@ namespace Rdmp.Core.QueryCaching.Aggregation.Arguments;
 /// 
 /// <para>Serves as an input to CachedAggregateConfigurationResultsManager.</para>
 ///</summary>
-public class CacheCommitJoinableInceptionQuery:CacheCommitArguments
+public class CacheCommitJoinableInceptionQuery : CacheCommitArguments
 {
-    public CacheCommitJoinableInceptionQuery(AggregateConfiguration configuration, string sql, DataTable results, DatabaseColumnRequest[] explicitTypes,int timeout)
+    public CacheCommitJoinableInceptionQuery(AggregateConfiguration configuration, string sql, DataTable results,
+        DatabaseColumnRequest[] explicitTypes, int timeout)
         : base(AggregateOperation.JoinableInceptionQuery, configuration, sql, results, timeout, explicitTypes)
     {
     }
 
     public override void CommitTableDataCompleted(DiscoveredTable resultingTable)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/QueryCaching/Aggregation/CachedAggregateConfigurationResultsManager.cs b/Rdmp.Core/QueryCaching/Aggregation/CachedAggregateConfigurationResultsManager.cs
index a29b23d556..e2f7d91788 100644
--- a/Rdmp.Core/QueryCaching/Aggregation/CachedAggregateConfigurationResultsManager.cs
+++ b/Rdmp.Core/QueryCaching/Aggregation/CachedAggregateConfigurationResultsManager.cs
@@ -41,7 +41,7 @@ public class CachedAggregateConfigurationResultsManager
     private DiscoveredDatabase _database;
 
     private readonly Logger _logger = LogManager.GetCurrentClassLogger();
-        
+
     /// <summary>
     /// The name of the table in the query cache which tracks the SQL executed and the resulting tables generated when caching
     /// </summary>
@@ -55,11 +55,11 @@ public CachedAggregateConfigurationResultsManager(IExternalDatabaseServer server
 
     public const string CachingPrefix = "/*Cached:";
 
-    public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfiguration configuration, AggregateOperation operation)
-    {
-        return GetLatestResultsTableUnsafe(configuration, operation, out _);
-    }
-    public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfiguration configuration,AggregateOperation operation, out string sql)
+    public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfiguration configuration,
+        AggregateOperation operation) => GetLatestResultsTableUnsafe(configuration, operation, out _);
+
+    public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfiguration configuration,
+        AggregateOperation operation, out string sql)
     {
         var syntax = _database.Server.GetQuerySyntaxHelper();
         var mgrTable = _database.ExpectTable(ResultsManagerTable);
@@ -74,15 +74,16 @@ public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfigurat
 WHERE {syntax.EnsureWrapped("AggregateConfiguration_ID")} = {configuration.ID}
 AND {syntax.EnsureWrapped("Operation")} = '{operation}'", con))
             {
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     if (r.Read())
                     {
-                        var tableName =  r["TableName"].ToString();
+                        var tableName = r["TableName"].ToString();
                         sql = r["SqlExecuted"] as string;
                         return _database.ExpectTable(tableName);
                     }
+                }
             }
-                
         }
 
         sql = null;
@@ -98,7 +99,8 @@ public IHasFullyQualifiedNameToo GetLatestResultsTableUnsafe(AggregateConfigurat
     /// <param name="operation"></param>
     /// <param name="currentSql"></param>
     /// <returns></returns>
-    public IHasFullyQualifiedNameToo GetLatestResultsTable(AggregateConfiguration configuration, AggregateOperation operation, string currentSql)
+    public IHasFullyQualifiedNameToo GetLatestResultsTable(AggregateConfiguration configuration,
+        AggregateOperation operation, string currentSql)
     {
         var syntax = _database.Server.GetQuerySyntaxHelper();
         var mgrTable = _database.ExpectTable(ResultsManagerTable);
@@ -116,7 +118,8 @@ public IHasFullyQualifiedNameToo GetLatestResultsTable(AggregateConfiguration co
 {syntax.EnsureWrapped("AggregateConfiguration_ID")} = {configuration.ID} AND
 {syntax.EnsureWrapped("Operation")} = '{operation}'", con))
             {
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     if (r.Read())
                     {
                         if (IsMatchOnSqlExecuted(r, currentSql))
@@ -127,6 +130,7 @@ public IHasFullyQualifiedNameToo GetLatestResultsTable(AggregateConfiguration co
 
                         return null; //this means that there was outdated SQL, we could show this to user at some point
                     }
+                }
             }
         }
 
@@ -137,7 +141,7 @@ private bool IsMatchOnSqlExecuted(DbDataReader r, string currentSql)
     {
         //replace all whitespace with single whitespace 
         var standardisedDatabaseSql = Regex.Replace(r["SqlExecuted"].ToString(), @"\s+", " ");
-        var standardisedUsersSql = Regex.Replace(currentSql,@"\s+"," ");
+        var standardisedUsersSql = Regex.Replace(currentSql, @"\s+", " ");
 
         var match = standardisedDatabaseSql.ToLower().Trim().Equals(standardisedUsersSql.ToLower().Trim());
 
@@ -174,7 +178,7 @@ public void CommitResults(CacheCommitArguments arguments)
 
             //add explicit types
             var tbl = _database.ExpectTable(nameWeWillGiveTableInCache);
-            if(tbl.Exists())
+            if (tbl.Exists())
                 tbl.Drop();
 
             tbl = _database.CreateTable(nameWeWillGiveTableInCache, arguments.Results, arguments.ExplicitColumns);
@@ -186,11 +190,11 @@ public void CommitResults(CacheCommitArguments arguments)
 
             mgrTable.Insert(new Dictionary<string, object>
             {
-                { "Committer", Environment.UserName},
-                { "AggregateConfiguration_ID", configuration.ID},
-                { "SqlExecuted", arguments.SQL.Trim()},
-                { "Operation", operation.ToString()},
-                { "TableName", tbl.GetRuntimeName()}
+                { "Committer", Environment.UserName },
+                { "AggregateConfiguration_ID", configuration.ID },
+                { "SqlExecuted", arguments.SQL.Trim() },
+                { "Operation", operation.ToString() },
+                { "TableName", tbl.GetRuntimeName() }
             });
 
             arguments.CommitTableDataCompleted(tbl);
@@ -216,13 +220,14 @@ public bool DeleteCacheEntryIfAny(AggregateConfiguration configuration, Aggregat
 
                 //drop the data
                 _database.ExpectTable(table.GetRuntimeName()).Drop();
-                    
+
                 //delete the record!
                 using (var cmd = DatabaseCommandHelper.GetCommand(
-                           $"DELETE FROM {mgrTable.GetFullyQualifiedName()} WHERE AggregateConfiguration_ID = {configuration.ID} AND Operation = '{operation}'", con))
+                           $"DELETE FROM {mgrTable.GetFullyQualifiedName()} WHERE AggregateConfiguration_ID = {configuration.ID} AND Operation = '{operation}'",
+                           con))
                 {
                     var deletedRows = cmd.ExecuteNonQuery();
-                    if(deletedRows != 1)
+                    if (deletedRows != 1)
                         throw new Exception(
                             $"Expected exactly 1 record in CachedAggregateConfigurationResults to be deleted when erasing its record of operation {operation} but there were {deletedRows} affected records");
                 }
diff --git a/Rdmp.Core/RDMPCollection.cs b/Rdmp.Core/RDMPCollection.cs
index 0ee16fa556..aee2552f78 100644
--- a/Rdmp.Core/RDMPCollection.cs
+++ b/Rdmp.Core/RDMPCollection.cs
@@ -20,5 +20,4 @@ public enum RDMPCollection
 
     Cohort,
     DataLoad
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Rdmp.Core.csproj b/Rdmp.Core/Rdmp.Core.csproj
index 51048c4e84..0b6630e56f 100644
--- a/Rdmp.Core/Rdmp.Core.csproj
+++ b/Rdmp.Core/Rdmp.Core.csproj
@@ -293,7 +293,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="NLog" Version="5.2.2" />
+    <PackageReference Include="NLog" Version="5.2.3" />
     <PackageReference Include="NPOI" Version="2.5.5" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
diff --git a/Rdmp.Core/Reports/CustomMetadataReport.cs b/Rdmp.Core/Reports/CustomMetadataReport.cs
index 4f3d3a07dd..85665e96ee 100644
--- a/Rdmp.Core/Reports/CustomMetadataReport.cs
+++ b/Rdmp.Core/Reports/CustomMetadataReport.cs
@@ -25,14 +25,12 @@ public class CustomMetadataReport
     /// <summary>
     /// Substitutions that are used during template value replacement e.g. $Name => Catalogue.Name
     /// </summary>
-
-    private Dictionary<string,Func<Catalogue,object>> Replacements = new();
+    private Dictionary<string, Func<Catalogue, object>> Replacements = new();
 
     /// <summary>
     /// Substitutions that are used during template value replacement when inside a '$foreach CatalogueItem' block e.g. $Name => CatalogueItem.Name
     /// </summary>
-
-    private Dictionary<string,Func<CatalogueItem,object>> ReplacementsCatalogueItem = new();
+    private Dictionary<string, Func<CatalogueItem, object>> ReplacementsCatalogueItem = new();
 
 
     /// <summary>
@@ -55,7 +53,7 @@ public class CustomMetadataReport
     /// <summary>
     /// How the range of data in each <see cref="Catalogue"/> is determined, defaults to <see cref="DatasetTimespanCalculator"/> (using the DQE results)
     /// </summary>
-    public IDetermineDatasetTimespan TimespanCalculator { get; set; }  = new DatasetTimespanCalculator();
+    public IDetermineDatasetTimespan TimespanCalculator { get; set; } = new DatasetTimespanCalculator();
 
     /// <summary>
     /// Specify a replacement for newlines when found in fields e.g. with space.  Leave as null to leave newlines intact.
@@ -77,7 +75,7 @@ public class CustomMetadataReport
     /// <summary>
     /// Cache of latest run DQE <see cref="Evaluation"/> by <see cref="Catalogue"/> (populated from <see cref="DQERepository"/>)
     /// </summary>
-    public Dictionary<ICatalogue, Evaluation> EvaluationCache { get; set; }  = new Dictionary<ICatalogue, Evaluation>();
+    public Dictionary<ICatalogue, Evaluation> EvaluationCache { get; set; } = new();
 
     /// <summary>
     /// Describes whether a $foreach is iterating and which element type is
@@ -100,10 +98,8 @@ public CustomMetadataReport(IRDMPPlatformRepositoryServiceLocator repositoryLoca
 
         //add basic properties TableInfo
         foreach (var prop in typeof(TableInfo).GetProperties())
-        {
             // if it's not already a property of Catalogue
             Replacements.TryAdd($"${prop.Name}", c => GetTable(c) == null ? null : prop.GetValue(GetTable(c)));
-        }
 
         AddDQEReplacements();
 
@@ -115,10 +111,9 @@ public CustomMetadataReport(IRDMPPlatformRepositoryServiceLocator repositoryLoca
 
         //add basic properties ColumnInfo
         foreach (var prop in typeof(ColumnInfo).GetProperties())
-        {
             // if it's not already a property of CatalogueItem
-            ReplacementsCatalogueItem.TryAdd($"${prop.Name}", s => s.ColumnInfo_ID == null ? null : prop.GetValue(s.ColumnInfo));
-        }
+            ReplacementsCatalogueItem.TryAdd($"${prop.Name}",
+                s => s.ColumnInfo_ID == null ? null : prop.GetValue(s.ColumnInfo));
 
         try
         {
@@ -128,8 +123,6 @@ public CustomMetadataReport(IRDMPPlatformRepositoryServiceLocator repositoryLoca
         {
             DQERepository = null;
         }
-
-            
     }
 
     private static ITableInfo GetTable(Catalogue c)
@@ -205,25 +198,18 @@ private string GetPercentNull(CatalogueItem ci)
     {
         var columnStats = GetColumnState(ci);
 
-        if (columnStats == null)
-        {
-            return null;
-        }
+        if (columnStats == null) return null;
 
-        var total = columnStats.CountCorrect + columnStats.CountInvalidatesRow + columnStats.CountMissing + columnStats.CountWrong;
+        var total = columnStats.CountCorrect + columnStats.CountInvalidatesRow + columnStats.CountMissing +
+                    columnStats.CountWrong;
 
-        if (total == 0)
-        {
-            return null;
-        }
+        if (total == 0) return null;
 
         return $"{(int)(columnStats.CountDBNull / (double)total * 100)}%";
     }
 
-    private Evaluation GetEvaluation(CatalogueItem ci)
-    {
-        return GetEvaluation(ci.Catalogue);
-    }
+    private Evaluation GetEvaluation(CatalogueItem ci) => GetEvaluation(ci.Catalogue);
+
     private Evaluation GetEvaluation(Catalogue c)
     {
         if (!EvaluationCache.TryGetValue(c, out var evaluation))
@@ -235,15 +221,11 @@ private Evaluation GetEvaluation(Catalogue c)
         return evaluation;
     }
 
-    private DateTime? GetStartDate(Catalogue c)
-    {
-        return TimespanCalculator?.GetMachineReadableTimespanIfKnownOf(c, true, out _)?.Item1;
-    }
+    private DateTime? GetStartDate(Catalogue c) =>
+        TimespanCalculator?.GetMachineReadableTimespanIfKnownOf(c, true, out _)?.Item1;
 
-    private DateTime? GetEndDate(Catalogue c)
-    {
-        return TimespanCalculator?.GetMachineReadableTimespanIfKnownOf(c, true, out _)?.Item2;
-    }
+    private DateTime? GetEndDate(Catalogue c) =>
+        TimespanCalculator?.GetMachineReadableTimespanIfKnownOf(c, true, out _)?.Item2;
 
     /// <summary>
     /// Reads the contents of <paramref name="template"/> and generates one or more files (see <paramref name="oneFile"/>) by substituting tokens (e.g. $Name) for the values in the provided <paramref name="catalogues"/>
@@ -253,61 +235,62 @@ private Evaluation GetEvaluation(Catalogue c)
     /// <param name="template">Template file with free text and substitutions (e.g. $Name).  Also supports looping e.g. $foreach CatalogueItem</param>
     /// <param name="fileNaming">Determines how output file(s) will be named in the <paramref name="outputDirectory"/>.  Supports substitution e.g. $Name.md</param>
     /// <param name="oneFile">True to concatenate the results together and output in a single file.  If true then <paramref name="fileNaming"/> should not contain substitutions.  If false then <paramref name="fileNaming"/> should contain substitutions (e.g. $Name.doc) to prevent duplicate file names</param>
-    public void GenerateReport(Catalogue[] catalogues, DirectoryInfo outputDirectory, FileInfo template, string fileNaming, bool oneFile)
+    public void GenerateReport(Catalogue[] catalogues, DirectoryInfo outputDirectory, FileInfo template,
+        string fileNaming, bool oneFile)
     {
-        if(catalogues == null || !catalogues.Any())
+        if (catalogues == null || !catalogues.Any())
             return;
 
         var templateBody = File.ReadAllLines(template.FullName);
 
-        var outname = DoReplacements(new []{fileNaming},catalogues.First(),null,ElementIteration.NotIterating).Trim();
+        var outname = DoReplacements(new[] { fileNaming }, catalogues.First(), null, ElementIteration.NotIterating)
+            .Trim();
 
         StreamWriter outFile = null;
-            
+
         try
         {
-            if(oneFile)
+            if (oneFile)
                 outFile = new StreamWriter(File.Create(Path.Combine(outputDirectory.FullName, outname)));
 
             if (templateBody.Contains(LoopCatalogues))
             {
                 if (oneFile)
-                {
-                    foreach(var section in SplitCatalogueLoops(templateBody))
-                    {
-                        if(section.IsPlainText)
-                        {
-                            outFile.WriteLine(string.Join(Environment.NewLine,section.Body));
-                        }
+                    foreach (var section in SplitCatalogueLoops(templateBody))
+                        if (section.IsPlainText)
+                            outFile.WriteLine(string.Join(Environment.NewLine, section.Body));
                         else
-                        {
-                            for (var i =0;i<catalogues.Length;i++)
+                            for (var i = 0; i < catalogues.Length; i++)
                             {
                                 var element =
-                                    i == catalogues.Length - 1 ? ElementIteration.LastElement : ElementIteration.RegularElement;
+                                    i == catalogues.Length - 1
+                                        ? ElementIteration.LastElement
+                                        : ElementIteration.RegularElement;
 
-                                var newContents = DoReplacements(section.Body.ToArray(), catalogues[i],section, element);
+                                var newContents = DoReplacements(section.Body.ToArray(), catalogues[i], section,
+                                    element);
                                 outFile.WriteLine(newContents);
                             }
-                        }
-                    }
-                }
                 else
-                    throw new Exception($"'{LoopCatalogues}' is on valid when extracting in oneFile mode (a single document for all Catalogues' metadata)");
+                    throw new Exception(
+                        $"'{LoopCatalogues}' is on valid when extracting in oneFile mode (a single document for all Catalogues' metadata)");
             }
             else
             {
                 foreach (var catalogue in catalogues)
                 {
-                    var newContents = DoReplacements(templateBody, catalogue,null,ElementIteration.NotIterating);
+                    var newContents = DoReplacements(templateBody, catalogue, null, ElementIteration.NotIterating);
 
                     if (oneFile)
+                    {
                         outFile.WriteLine(newContents);
+                    }
                     else
                     {
-                        var filename = DoReplacements(new[] {fileNaming}, catalogue,null, ElementIteration.NotIterating).Trim();
+                        var filename = DoReplacements(new[] { fileNaming }, catalogue, null,
+                            ElementIteration.NotIterating).Trim();
 
-                        using (var sw = new StreamWriter(Path.Combine(outputDirectory.FullName,filename)))
+                        using (var sw = new StreamWriter(Path.Combine(outputDirectory.FullName, filename)))
                         {
                             sw.Write(newContents);
                             sw.Flush();
@@ -321,26 +304,28 @@ public void GenerateReport(Catalogue[] catalogues, DirectoryInfo outputDirectory
         {
             outFile?.Flush();
             outFile?.Dispose();
-        }   
+        }
     }
 
     private static IEnumerable<CatalogueSection> SplitCatalogueLoops(string[] templateBody)
     {
-        if(templateBody.Length == 0)
+        if (templateBody.Length == 0)
             yield break;
 
         CatalogueSection currentSection = null;
         var depth = 0;
 
-        for(var i =0;i< templateBody.Length ;i++)
+        for (var i = 0; i < templateBody.Length; i++)
         {
             var str = templateBody[i];
 
             // is it trying to loop catalogue items
-            if(str.Trim().Equals(LoopCatalogueItems))
+            if (str.Trim().Equals(LoopCatalogueItems))
             {
-                if(currentSection == null || currentSection.IsPlainText)
-                    throw new CustomMetadataReportException($"Error, Unexpected '{str}' on line {i+1}.  Current section is plain text, '{LoopCatalogueItems}' can only appear within a '{LoopCatalogues}' block (you cannot mix and match top level loop elements)",i+1);
+                if (currentSection == null || currentSection.IsPlainText)
+                    throw new CustomMetadataReportException(
+                        $"Error, Unexpected '{str}' on line {i + 1}.  Current section is plain text, '{LoopCatalogueItems}' can only appear within a '{LoopCatalogues}' block (you cannot mix and match top level loop elements)",
+                        i + 1);
 
                 // ignore dives into CatalogueItems
                 depth++;
@@ -350,36 +335,39 @@ private static IEnumerable<CatalogueSection> SplitCatalogueLoops(string[] templa
             }
             else
                 // is it a loop Catalogues
-            if(str.Trim().Equals(LoopCatalogues))
+            if (str.Trim().Equals(LoopCatalogues))
             {
-                if(currentSection != null)
-                    if(currentSection.IsPlainText)
+                if (currentSection != null)
+                    if (currentSection.IsPlainText)
                         yield return currentSection;
                     else
-                        throw new CustomMetadataReportException($"Unexpected '{str}' before the end of the last one on line {i+1}",i+1);
+                        throw new CustomMetadataReportException(
+                            $"Unexpected '{str}' before the end of the last one on line {i + 1}", i + 1);
 
                 // start new section looping Catalogues
-                currentSection = new CatalogueSection(false,i);
+                currentSection = new CatalogueSection(false, i);
                 depth = 1;
             }
             else
                 // is it an end loop
-            if(str.Trim().Equals(EndLoop))
+            if (str.Trim().Equals(EndLoop))
             {
-                if(currentSection == null || currentSection.IsPlainText)
-                    throw new CustomMetadataReportException($"Error, encountered '{str}' on line {i+1} while not in a {LoopCatalogues} block",i+1);
+                if (currentSection == null || currentSection.IsPlainText)
+                    throw new CustomMetadataReportException(
+                        $"Error, encountered '{str}' on line {i + 1} while not in a {LoopCatalogues} block", i + 1);
 
                 depth--;
 
                 // does end loop correspond to ending a $foreach Catalogue
-                if(depth == 0)
+                if (depth == 0)
                 {
                     yield return currentSection;
                     currentSection = null;
                 }
-                else
-                if(depth <0)
-                    throw new CustomMetadataReportException($"Error, unexpected '{str}' on line {i+1}",i+1);
+                else if (depth < 0)
+                {
+                    throw new CustomMetadataReportException($"Error, unexpected '{str}' on line {i + 1}", i + 1);
+                }
                 else
                 {
                     // $end is for a CatalogueItem block so preserve it in the body
@@ -391,24 +379,25 @@ private static IEnumerable<CatalogueSection> SplitCatalogueLoops(string[] templa
                 // it's just a regular line of text
 
                 //if it's the first line of a new block we get a plaintext block
-                currentSection ??= new CatalogueSection(true,i);
+                currentSection ??= new CatalogueSection(true, i);
 
                 currentSection.Body.Add(str);
             }
         }
-            
-        if(currentSection != null)
-            if(currentSection.IsPlainText)
+
+        if (currentSection != null)
+            if (currentSection.IsPlainText)
                 yield return currentSection;
             else
-                throw new CustomMetadataReportException($"Reached end of template without finding an expected {EndLoop}",templateBody.Length);
+                throw new CustomMetadataReportException(
+                    $"Reached end of template without finding an expected {EndLoop}", templateBody.Length);
     }
 
     private class CatalogueSection
     {
-        public int LineNumber { get;set;}
-        public bool IsPlainText { get;set;}
-        public List<string> Body {get;set; } = new List<string>();
+        public int LineNumber { get; set; }
+        public bool IsPlainText { get; set; }
+        public List<string> Body { get; set; } = new();
 
         public CatalogueSection(bool isPlainText, int lineNumber)
         {
@@ -425,7 +414,8 @@ public CatalogueSection(bool isPlainText, int lineNumber)
     /// <param name="section"></param>
     /// <param name="iteration">Indicates if looping through Catalogues and we are not at the last element in the collection yet.</param>
     /// <returns></returns>
-    private string DoReplacements(string[] strs, Catalogue catalogue, CatalogueSection section, ElementIteration iteration)
+    private string DoReplacements(string[] strs, Catalogue catalogue, CatalogueSection section,
+        ElementIteration iteration)
     {
         var sb = new StringBuilder();
 
@@ -436,25 +426,19 @@ private string DoReplacements(string[] strs, Catalogue catalogue, CatalogueSecti
 
             if (str.Trim().Equals(LoopCatalogueItems, StringComparison.CurrentCultureIgnoreCase))
             {
-                index = DoReplacements(strs, index, out copy,catalogue.CatalogueItems,section);
+                index = DoReplacements(strs, index, out copy, catalogue.CatalogueItems, section);
             }
             else
             {
                 foreach (var r in Replacements)
-                {
                     if (copy.Contains(r.Key))
                         copy = copy.Replace(r.Key, ValueToString(r.Value(catalogue)));
-                }
 
                 // when iterating we need to respect iteration symbols (e.g. $Comma).
-                if(iteration == ElementIteration.NotIterating)
-                {
+                if (iteration == ElementIteration.NotIterating)
                     ThrowIfContainsIterationElements(copy);
-                }
                 else
-                {
                     copy = copy.Replace(Comma, iteration == ElementIteration.RegularElement ? CommaSubstitution : "");
-                }
             }
 
             sb.AppendLine(copy.TrimEnd());
@@ -472,7 +456,8 @@ private string DoReplacements(string[] strs, Catalogue catalogue, CatalogueSecti
     /// <param name="catalogueItems"></param>
     /// <param name="section"></param>
     /// <returns>The index in <paramref name="strs"/> where the $end was detected</returns>
-    private int DoReplacements(string[] strs, int index, out string result, CatalogueItem[] catalogueItems,CatalogueSection section)
+    private int DoReplacements(string[] strs, int index, out string result, CatalogueItem[] catalogueItems,
+        CatalogueSection section)
     {
         // The foreach template block as extracted from strs
         var block = new StringBuilder();
@@ -480,16 +465,16 @@ private int DoReplacements(string[] strs, int index, out string result, Catalogu
         //the result of printing out the block once for each CatalogueItem item (with replacements)
         var sbResult = new StringBuilder();
 
-        var i = index+1;
+        var i = index + 1;
         var blockTerminated = false;
 
-        var sectionOffset = section?.LineNumber ??0;
+        var sectionOffset = section?.LineNumber ?? 0;
 
         //starting on the next line after $foreach until the end of the file
         for (; i < strs.Length; i++)
         {
             var current = strs[i];
-            var lineNumberHuman = i +1+sectionOffset;
+            var lineNumberHuman = i + 1 + sectionOffset;
 
             if (current.Trim().Equals(EndLoop, StringComparison.CurrentCultureIgnoreCase))
             {
@@ -497,22 +482,23 @@ private int DoReplacements(string[] strs, int index, out string result, Catalogu
                 break;
             }
 
-            if(current == LoopCatalogueItems)
-                throw new CustomMetadataReportException($"Error, encountered '{current}' on line {lineNumberHuman} before the end of current block which started on line {lineNumberHuman}.  Make sure to add {EndLoop} at the end of each loop",lineNumberHuman);
+            if (current == LoopCatalogueItems)
+                throw new CustomMetadataReportException(
+                    $"Error, encountered '{current}' on line {lineNumberHuman} before the end of current block which started on line {lineNumberHuman}.  Make sure to add {EndLoop} at the end of each loop",
+                    lineNumberHuman);
 
             block.AppendLine(current);
         }
 
-        if(!blockTerminated)
-            throw new CustomMetadataReportException($"Expected {EndLoop} to match $foreach which started on line {index+1+sectionOffset}",index+1+sectionOffset);
+        if (!blockTerminated)
+            throw new CustomMetadataReportException(
+                $"Expected {EndLoop} to match $foreach which started on line {index + 1 + sectionOffset}",
+                index + 1 + sectionOffset);
 
-        for(var j =0;j< catalogueItems.Length; j++)
-        {
+        for (var j = 0; j < catalogueItems.Length; j++)
             sbResult.AppendLine(DoReplacements(block.ToString(), catalogueItems[j],
-                j < catalogueItems.Length -1 ?
-                    ElementIteration.RegularElement : ElementIteration.LastElement));
-        }
-                
+                j < catalogueItems.Length - 1 ? ElementIteration.RegularElement : ElementIteration.LastElement));
+
 
         result = sbResult.ToString();
 
@@ -526,18 +512,15 @@ private int DoReplacements(string[] strs, int index, out string result, Catalogu
     /// <returns></returns>
     private string ValueToString(object v)
     {
-        if(v is ExtractionInformation ei)
-        {
-            return ei.GetRuntimeName();
-        }
+        if (v is ExtractionInformation ei) return ei.GetRuntimeName();
 
         return ReplaceNewlines(v?.ToString() ?? "");
     }
 
     public string ReplaceNewlines(string input)
     {
-        if(input != null && NewlineSubstitution != null)
-            return Regex.Replace(input,"[\r]?\n",NewlineSubstitution);
+        if (input != null && NewlineSubstitution != null)
+            return Regex.Replace(input, "[\r]?\n", NewlineSubstitution);
 
         return input;
     }
@@ -555,24 +538,19 @@ private string DoReplacements(string template, CatalogueItem catalogueItem, Elem
             if (template.Contains(r.Key))
                 template = template.Replace(r.Key, ValueToString(r.Value(catalogueItem)));
 
-        if(iteration == ElementIteration.NotIterating)
-        {
+        if (iteration == ElementIteration.NotIterating)
             ThrowIfContainsIterationElements(template);
-        }
         else
-        {
             template = template.Replace(Comma, iteration == ElementIteration.RegularElement ? CommaSubstitution : "");
-        }
-            
+
 
         return template.TrimEnd();
     }
 
     private static void ThrowIfContainsIterationElements(string template)
     {
-        if(template.Contains(Comma))
-        {
-            throw new CustomMetadataReportException($"Unexpected use of {Comma} outside of an iteration ($foreach) block",-1);
-        }
+        if (template.Contains(Comma))
+            throw new CustomMetadataReportException(
+                $"Unexpected use of {Comma} outside of an iteration ($foreach) block", -1);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Reports/CustomMetadataReportException.cs b/Rdmp.Core/Reports/CustomMetadataReportException.cs
index 1a4942d07a..f60ee570d2 100644
--- a/Rdmp.Core/Reports/CustomMetadataReportException.cs
+++ b/Rdmp.Core/Reports/CustomMetadataReportException.cs
@@ -23,14 +23,13 @@ public class CustomMetadataReportException : Exception
     /// </summary>
     /// <param name="msg"></param>
     /// <param name="lineNumber">The line number in the template that the error occurred (first line of file is 1)</param>
-    public CustomMetadataReportException(string msg,int lineNumber) : base(msg)
+    public CustomMetadataReportException(string msg, int lineNumber) : base(msg)
     {
         LineNumber = lineNumber;
     }
 
-    public CustomMetadataReportException(string msg, Exception inner,int lineNumber):base(msg,inner)
+    public CustomMetadataReportException(string msg, Exception inner, int lineNumber) : base(msg, inner)
     {
         LineNumber = lineNumber;
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Reports/DitaCatalogueExtractor.cs b/Rdmp.Core/Reports/DitaCatalogueExtractor.cs
index 204d3a5615..a84a9763c7 100644
--- a/Rdmp.Core/Reports/DitaCatalogueExtractor.cs
+++ b/Rdmp.Core/Reports/DitaCatalogueExtractor.cs
@@ -62,8 +62,8 @@ public void Extract(IDataLoadEventListener listener)
         xml += $"<author>Wilfred Bonney; Thomas Nind; Mikhail Ghattas</author>{Environment.NewLine}";
         xml += $"<publisher>Health Informatics Centre (HIC), University of Dundee</publisher>{Environment.NewLine}";
         xml += $"</topicmeta>{Environment.NewLine}";
-            
-            
+
+
         xml += $@"<topicref href=""introduction.dita""/>{Environment.NewLine}";
         GenerateIntroductionFile("introduction.dita");
 
@@ -73,7 +73,8 @@ public void Extract(IDataLoadEventListener listener)
         xml += Environment.NewLine;
 
         //get all the catalogues then sort them alphabetically
-        var catas = new List<Catalogue>(_repository.GetAllObjects<Catalogue>().Where(c => !(c.IsDeprecated || c.IsInternalDataset || c.IsColdStorageDataset)));
+        var catas = new List<Catalogue>(_repository.GetAllObjects<Catalogue>()
+            .Where(c => !(c.IsDeprecated || c.IsInternalDataset || c.IsColdStorageDataset)));
         catas.Sort();
 
         var sw = Stopwatch.StartNew();
@@ -81,15 +82,18 @@ public void Extract(IDataLoadEventListener listener)
         var cataloguesCompleted = 0;
         foreach (var c in catas)
         {
-            listener.OnProgress(this, new ProgressEventArgs("Extracting", new ProgressMeasurement(cataloguesCompleted++,ProgressType.Records,catas.Count), sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Extracting",
+                    new ProgressMeasurement(cataloguesCompleted++, ProgressType.Records, catas.Count), sw.Elapsed));
 
             //ensure that it has an acryonym
-            if(string.IsNullOrWhiteSpace(c.Acronym))
+            if (string.IsNullOrWhiteSpace(c.Acronym))
                 throw new Exception(
                     $"Dita Extraction requires that each catalogue have a unique Acronym, the catalogue {c.Name} is missing an Acronym");
 
             if (c.Name.Contains('\\') || c.Name.Contains('/'))
-                throw new Exception("Dita Extractor does not support catalogues with backslashes or forward slashs in their name");
+                throw new Exception(
+                    "Dita Extractor does not support catalogues with backslashes or forward slashs in their name");
 
             //catalogue main file
             xml += $"<topicref href=\"{GetFileNameForCatalogue(c)}\">{Environment.NewLine}";
@@ -102,35 +106,33 @@ public void Extract(IDataLoadEventListener listener)
             foreach (var ci in cataItems)
             {
                 xml += $"<topicref href=\"{GetFileNameForCatalogueItem(c, ci)}\"/>{Environment.NewLine}";
-                CreateCatalogueItemFile(c,ci);
+                CreateCatalogueItemFile(c, ci);
             }
+
             xml += $"</topicref>{Environment.NewLine}";
 
             //completed - mostly for end of loop tbh
-            listener.OnProgress(this, new ProgressEventArgs("Extracting", new ProgressMeasurement(cataloguesCompleted, ProgressType.Records, catas.Count), sw.Elapsed));
+            listener.OnProgress(this,
+                new ProgressEventArgs("Extracting",
+                    new ProgressMeasurement(cataloguesCompleted, ProgressType.Records, catas.Count), sw.Elapsed));
         }
 
         xml += Environment.NewLine;
         xml += $@"</topicref>{Environment.NewLine}";
         xml += "</map>";
 
-        File.WriteAllText(Path.Combine(_folderToCreateIn.FullName ,"hic_data_catalogue.ditamap"  ),xml);
-
+        File.WriteAllText(Path.Combine(_folderToCreateIn.FullName, "hic_data_catalogue.ditamap"), xml);
     }
 
 
-
-    private static string GetFileNameForCatalogueItem(Catalogue c,CatalogueItem ci)
+    private static string GetFileNameForCatalogueItem(Catalogue c, CatalogueItem ci)
     {
         var parentName = FixName(c.Acronym);
         var childName = FixName(ci.Name);
         return $"{parentName}_{childName}.dita";
     }
 
-    private static string GetFileNameForCatalogue(Catalogue catalogue)
-    {
-        return $"{FixName(catalogue.Name)}.dita";
-    }
+    private static string GetFileNameForCatalogue(Catalogue catalogue) => $"{FixName(catalogue.Name)}.dita";
 
     private static string FixName(string name)
     {
@@ -141,7 +143,7 @@ private static string FixName(string name)
         name = name.Replace(")", "");
         name = name.Replace(' ', '_');
         name = name.Replace("&", "and");
-                
+
         return name.ToLower();
     }
 
@@ -149,7 +151,7 @@ private void CreateCatalogueFile(Catalogue c)
     {
         var saveLocation = Path.Combine(_folderToCreateIn.FullName, GetFileNameForCatalogue(c));
 
-        if(File.Exists(saveLocation))
+        if (File.Exists(saveLocation))
             throw new Exception(
                 $"Attempted to create Catalogue named {saveLocation} but it already existed (possibly you have two Catalogues with the same name");
 
@@ -170,17 +172,17 @@ private void CreateCatalogueFile(Catalogue c)
 
 
         xml += $@"</simpletable>{Environment.NewLine}";
-            
+
         xml += $"</conbody>{Environment.NewLine}";
 
         xml += $"</concept>{Environment.NewLine}";
 
-        File.WriteAllText(saveLocation,xml);
+        File.WriteAllText(saveLocation, xml);
     }
 
     private void CreateCatalogueItemFile(Catalogue c, CatalogueItem ci)
     {
-        var saveLocation = Path.Combine(_folderToCreateIn.FullName, GetFileNameForCatalogueItem(c,ci));
+        var saveLocation = Path.Combine(_folderToCreateIn.FullName, GetFileNameForCatalogueItem(c, ci));
 
         if (File.Exists(saveLocation))
             throw new Exception(
@@ -192,7 +194,7 @@ private void CreateCatalogueItemFile(Catalogue c, CatalogueItem ci)
 <!DOCTYPE concept PUBLIC ""-//OASIS//DTD DITA Concept//EN""
 ""concept.dtd"">";
 
-        xml+= $"<concept id=\"{FixName(c.Name)}_{FixName(ci.Name)}\">{Environment.NewLine}";
+        xml += $"<concept id=\"{FixName(c.Name)}_{FixName(ci.Name)}\">{Environment.NewLine}";
 
         xml += $"<title>{FixName(ci.Name)}</title>{Environment.NewLine}";
 
@@ -217,20 +219,22 @@ private static string GenerateObjectPropertiesAsRowUsingReflection(object o)
     {
         var toReturnXml = "";
 
-        var propertyInfo = o.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        var propertyInfo =
+            o.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
         //generate a strow for each property
         foreach (var property in propertyInfo)
         {
             //do not extract these
-            if(property.GetCustomAttributes(typeof(DoNotExtractProperty)).Any())
+            if (property.GetCustomAttributes(typeof(DoNotExtractProperty)).Any())
                 continue;
             if (property.GetCustomAttributes(typeof(NoMappingToDatabase)).Any())
                 continue;
 
             //Check whether property can be written to
             if (property.CanRead)
-                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum || property.PropertyType.Equals(typeof(string)))
+                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum ||
+                    property.PropertyType.Equals(typeof(string)))
                 {
                     toReturnXml += $"<strow>{Environment.NewLine}";
                     toReturnXml += $"<stentry>{GetHtmlEncodedHeader(property.Name)}</stentry>{Environment.NewLine}";
@@ -300,16 +304,18 @@ private void GenerateIntroductionFile(string filename)
     /// <param name="notifier"></param>
     public void Check(ICheckNotifier notifier)
     {
-        var catas = _repository.GetAllObjects<Catalogue>().Where(c => !c.IsInternalDataset && !c.IsColdStorageDataset).ToArray();
+        var catas = _repository.GetAllObjects<Catalogue>().Where(c => !c.IsInternalDataset && !c.IsColdStorageDataset)
+            .ToArray();
 
         //Catalogues with no acronyms
         foreach (var c in catas.Where(c => string.IsNullOrWhiteSpace(c.Acronym)))
         {
             var suggestion = GetAcronymSuggestionFromCatalogueName(c.Name);
-            var useSuggestion = notifier.OnCheckPerformed(new CheckEventArgs($"Catalogue {c.Name} has no Acronym", CheckResult.Fail, null,
+            var useSuggestion = notifier.OnCheckPerformed(new CheckEventArgs($"Catalogue {c.Name} has no Acronym",
+                CheckResult.Fail, null,
                 $"Assign it a suggested acronym: '{suggestion}'?"));
 
-            if(useSuggestion)
+            if (useSuggestion)
             {
                 c.Acronym = suggestion;
                 c.SaveToDatabase();
@@ -317,19 +323,16 @@ public void Check(ICheckNotifier notifier)
         }
 
         //acronym collisions
-        for(var i =0;i<catas.Length;i++)
+        for (var i = 0; i < catas.Length; i++)
         {
             var acronym = catas[i].Acronym;
 
             for (var j = i + 1; j < catas.Length; j++)
-            {
                 if (catas[j].Acronym.Equals(acronym))
                     notifier.OnCheckPerformed(new CheckEventArgs(
                         string.Format(
                             "Duplication in acronym between Catalogues {0} and {1}, duplicate acronym value is {2}",
                             catas[i], catas[j], acronym), CheckResult.Fail, null));
-            }
-
         }
     }
 
@@ -344,22 +347,24 @@ public static string GetAcronymSuggestionFromCatalogueName(string name)
         var capsConcat = name.Where(c => char.IsUpper(c) || char.IsDigit(c)).Aggregate("", (s, n) => s + n);
 
         //if the capitals and digits go together to make something that is less than 10 long then suggest that
-        if (capsConcat.Length >1 && capsConcat.Length < 10)
+        if (capsConcat.Length > 1 && capsConcat.Length < 10)
             return capsConcat;
 
         //else try to split up stuff and make suggestions based on that
         var words = Regex.Split(name, "\\s_").Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
 
-        if(words.Length == 0)
+        if (words.Length == 0)
             throw new Exception(
                 $"Could not generate acronym suggestion for name '{name}' because split resulted in 0 words");
 
         //if there is only 1 word in the Catalogue name
-        if(words.Length == 1)
+        if (words.Length == 1)
             if (words[0].Length < 10)
-                return words[0];        //if the only word is less than 10 long it can be used as acronym anyway (will be the same as catalogue name)
+                return words
+                    [0]; //if the only word is less than 10 long it can be used as acronym anyway (will be the same as catalogue name)
             else
-                return words[0][..5]; //there's only one word so just suggest using the first 5 letters... suboptimal but hey whatever
+                return words[0]
+                    [..5]; //there's only one word so just suggest using the first 5 letters... suboptimal but hey whatever
 
         //return the first letter from every word and also add in all numbers that appear after the first letter in the word
         return words.Aggregate("", (s, n) => s + n[..1] + n.Skip(1).Where(char.IsDigit));
diff --git a/Rdmp.Core/Reports/DocXHelper.cs b/Rdmp.Core/Reports/DocXHelper.cs
index b1b72c7262..4425d5d35c 100644
--- a/Rdmp.Core/Reports/DocXHelper.cs
+++ b/Rdmp.Core/Reports/DocXHelper.cs
@@ -36,12 +36,9 @@ public class DocXHelper
 
     protected static void InsertParagraph(XWPFDocument document, string ptext, int textFontSize = -1)
     {
-        if(string.IsNullOrWhiteSpace(ptext))
-        {
-            return;
-        }
+        if (string.IsNullOrWhiteSpace(ptext)) return;
 
-        foreach(var para in ptext.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries))
+        foreach (var para in ptext.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries))
         {
             var h = document.CreateParagraph();
             var r0 = h.CreateRun();
@@ -50,7 +47,6 @@ protected static void InsertParagraph(XWPFDocument document, string ptext, int t
 
             r0.FontSize = textFontSize != -1 ? textFontSize : 10;
         }
-
     }
 
     protected static void InsertHeader(XWPFDocument document, string htext, int headSize = 1)
@@ -60,12 +56,12 @@ protected static void InsertHeader(XWPFDocument document, string htext, int head
         r0.FontSize = GetSize(headSize);
 
         //file data
-        r0.SetText(htext??"");
+        r0.SetText(htext ?? "");
     }
 
     private static int GetSize(int headSize)
     {
-        switch(headSize)
+        switch (headSize)
         {
             case 1: return H1Size;
             case 2: return H2Size;
@@ -77,16 +73,13 @@ private static int GetSize(int headSize)
 
     protected static void SetTableCell(XWPFTable table, int row, int col, string value, int fontSize = -1)
     {
-        if(string.IsNullOrEmpty(value))
-        {
-            return;
-        }
+        if (string.IsNullOrEmpty(value)) return;
 
         var cell = table.GetRow(row).GetCell(col);
 
         var first = true;
 
-        foreach(var bit in value.Split(Environment.NewLine,StringSplitOptions.RemoveEmptyEntries))
+        foreach (var bit in value.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries))
         {
             var para = first ? cell.Paragraphs[0] : cell.AddParagraph();
             var run = para.CreateRun();
@@ -98,14 +91,15 @@ protected static void SetTableCell(XWPFTable table, int row, int col, string val
                 run.FontSize = fontSize;
         }
     }
-    public const int PICTURE_TYPE_PNG =	6;
+
+    public const int PICTURE_TYPE_PNG = 6;
 
     protected static XWPFPicture GetPicture(XWPFDocument document, Image bmp)
     {
         var para = document.CreateParagraph();
         var run = para.CreateRun();
-            
-        return GetPicture(run,bmp);
+
+        return GetPicture(run, bmp);
     }
 
     protected static XWPFPicture GetPicture(XWPFRun run, Image bmp)
@@ -113,12 +107,13 @@ protected static XWPFPicture GetPicture(XWPFRun run, Image bmp)
         using (var ms = new MemoryStream())
         {
             bmp.SaveAsPng(ms);
-                
+
             ms.Seek(0, 0);
 
             // Add an image into the document.
-            var picture = run.AddPicture(ms,PICTURE_TYPE_PNG,"",Units.ToEMU(bmp.Width * PICTURE_SCALING), Units.ToEMU(bmp.Height *PICTURE_SCALING));
-                
+            var picture = run.AddPicture(ms, PICTURE_TYPE_PNG, "", Units.ToEMU(bmp.Width * PICTURE_SCALING),
+                Units.ToEMU(bmp.Height * PICTURE_SCALING));
+
             return picture;
         }
     }
@@ -131,10 +126,7 @@ protected static XWPFTable InsertTable(XWPFDocument document, int rowCount, int
 
         const int width = 10000;
 
-        for (var i = 0; i < colCount; i++)
-        {
-            table1.SetColumnWidth(i, (ulong)(width / colCount));
-        }
+        for (var i = 0; i < colCount; i++) table1.SetColumnWidth(i, (ulong)(width / colCount));
 
         return table1;
     }
@@ -144,7 +136,8 @@ protected static FileInfo GetUniqueFilenameInWorkArea(string desiredName, string
         var root = GetTempPath();
 
 
-        var f = new FileInfo(Path.Combine(root.FullName,UsefulStuff.RemoveIllegalFilenameCharacters(desiredName) + extension));
+        var f = new FileInfo(Path.Combine(root.FullName,
+            UsefulStuff.RemoveIllegalFilenameCharacters(desiredName) + extension));
         var i = 1;
 
         //file name is taken
@@ -161,10 +154,7 @@ protected static FileInfo GetUniqueFilenameInWorkArea(string desiredName, string
         return f;
     }
 
-    protected static DirectoryInfo GetTempPath()
-    {
-        return new DirectoryInfo(Path.GetTempPath());
-    }
+    protected static DirectoryInfo GetTempPath() => new(Path.GetTempPath());
 
     /// <summary>
     /// Creates a new document in Work Area (temp) - see <see cref="GetUniqueFilenameInWorkArea(string, string)"/>
@@ -174,8 +164,9 @@ protected static DirectoryInfo GetTempPath()
     protected static XWPFDocumentFile GetNewDocFile(string filename)
     {
         var fi = GetUniqueFilenameInWorkArea(filename);
-        return new XWPFDocumentFile(fi,new FileStream(fi.FullName,FileMode.Create));
+        return new XWPFDocumentFile(fi, new FileStream(fi.FullName, FileMode.Create));
     }
+
     /// <summary>
     /// Opens windows explorer to show the file
     /// </summary>
@@ -184,6 +175,7 @@ protected static void ShowFile(FileInfo fileInfo)
     {
         UsefulStuff.ShowPathInWindowsExplorer(fileInfo);
     }
+
     /// <summary>
     /// Opens windows explorer to show the document
     /// </summary>
@@ -193,14 +185,16 @@ protected static void ShowFile(XWPFDocumentFile document)
         ShowFile(document.FileInfo);
     }
 
-    protected static void AddFooter(XWPFDocument document,string text,int textFontSize)
+    protected static void AddFooter(XWPFDocument document, string text, int textFontSize)
     {
         var secPr = document.Document.body.sectPr;
         var footer = new CT_Ftr();
         var run = footer.AddNewP().AddNewR();
         run.AddNewT().Value = text;
         var relation2 = XWPFRelation.FOOTER;
-        var myFooter = (XWPFFooter)document.CreateRelationship(relation2, XWPFFactory.GetInstance(), document.FooterList.Count + 1);
+        var myFooter =
+            (XWPFFooter)document.CreateRelationship(relation2, XWPFFactory.GetInstance(),
+                document.FooterList.Count + 1);
 
         myFooter.SetHeaderFooter(footer);
         var myFooterRef = secPr.AddNewFooterReference();
@@ -210,41 +204,41 @@ protected static void AddFooter(XWPFDocument document,string text,int textFontSi
 #pragma warning restore CS0618 // Type or member is obsolete
         myFooter.Paragraphs[0].Runs[0].FontSize = textFontSize != -1 ? textFontSize : 10;
     }
+
     /// <summary>
     /// Creates a new document in the location of <paramref name="fileInfo"/>
     /// </summary>
     /// <param name="fileInfo"></param>
     /// <returns></returns>
-    protected static XWPFDocumentFile GetNewDocFile(FileInfo fileInfo)
-    {
-        return new XWPFDocumentFile(fileInfo,new FileStream(fileInfo.FullName,FileMode.Create));
-    }
-        
+    protected static XWPFDocumentFile GetNewDocFile(FileInfo fileInfo) =>
+        new(fileInfo, new FileStream(fileInfo.FullName, FileMode.Create));
+
     protected static void InsertSectionPageBreak(XWPFDocument document)
     {
         var pageBreak = document.CreateParagraph();
         var pageBreakRun = pageBreak.CreateRun();
         pageBreakRun.AddBreak(BreakType.PAGE);
     }
-        
+
     protected static void SetLandscape(XWPFDocumentFile document)
     {
-        document.Document.body.sectPr = document.Document.body.sectPr??new CT_SectPr();
+        document.Document.body.sectPr = document.Document.body.sectPr ?? new CT_SectPr();
         document.Document.body.sectPr.pgSz = document.Document.body.sectPr.pgSz ?? new CT_PageSz();
-            
+
         document.Document.body.sectPr.pgSz.orient = ST_PageOrientation.landscape;
         document.Document.body.sectPr.pgSz.w = 842 * 20;
         document.Document.body.sectPr.pgSz.h = 595 * 20;
-        
+
 
         //document.PageLayout.Orientation = Orientation.Landscape;
     }
+
     protected static void InsertTableOfContents(XWPFDocumentFile document)
     {
         //todo
         //document.InsertTableOfContents("Contents", new TableOfContentsSwitches());
     }
-        
+
     protected static void AutoFit(XWPFTable table)
     {
         //tables auto fit already with NPOI
@@ -258,9 +252,9 @@ protected static void AutoFit(XWPFTable table)
     /// <param name="marginSize"></param>
     protected static void SetMargins(XWPFDocumentFile document, int marginSize)
     {
-        document.Document.body.sectPr = document.Document.body.sectPr??new CT_SectPr();
-        document.Document.body.sectPr.pgMar.right = (ulong) (marginSize * 14.60);
-        document.Document.body.sectPr.pgMar.left = (ulong) (marginSize * 14.60);
+        document.Document.body.sectPr = document.Document.body.sectPr ?? new CT_SectPr();
+        document.Document.body.sectPr.pgMar.right = (ulong)(marginSize * 14.60);
+        document.Document.body.sectPr.pgMar.left = (ulong)(marginSize * 14.60);
 
         /*document.MarginLeft = marginSize;
         document.MarginRight= marginSize;
@@ -268,11 +262,9 @@ protected static void SetMargins(XWPFDocumentFile document, int marginSize)
         document.MarginBottom = marginSize;*/
     }
 
-    protected static float GetPageWidth()
-    {
-        return 500;
-        //return document.PageWidth;
-    }
+    protected static float GetPageWidth() => 500;
+
+    //return document.PageWidth;
     /// <summary>
     /// An <see cref="XWPFDocument"/> pointed at a <see cref="FileStream"/> that implements <see cref="IDisposable"/> and
     /// disposes of underlying stream when that happens.
@@ -281,8 +273,8 @@ protected class XWPFDocumentFile : XWPFDocument, IDisposable
     {
         public FileInfo FileInfo { get; }
         private readonly FileStream _stream;
-            
-        public XWPFDocumentFile(FileInfo fileInfo,FileStream stream)
+
+        public XWPFDocumentFile(FileInfo fileInfo, FileStream stream)
         {
             FileInfo = fileInfo;
             _stream = stream;
@@ -295,7 +287,6 @@ public void Dispose()
             Write(_stream);
             _stream.Close();
             _stream.Dispose();
-
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Reports/DocumentationReportDatabaseEntities.cs b/Rdmp.Core/Reports/DocumentationReportDatabaseEntities.cs
index b1baa5f98d..508129dd93 100644
--- a/Rdmp.Core/Reports/DocumentationReportDatabaseEntities.cs
+++ b/Rdmp.Core/Reports/DocumentationReportDatabaseEntities.cs
@@ -30,7 +30,8 @@ public class DocumentationReportDatabaseEntities : DocXHelper
     private CommentStore _commentStore;
     private Dictionary<Type, string> Summaries = new();
 
-    public void GenerateReport(CommentStore commentStore,ICheckNotifier notifier, IIconProvider iconProvider,MEF mef, bool showFile)
+    public void GenerateReport(CommentStore commentStore, ICheckNotifier notifier, IIconProvider iconProvider, MEF mef,
+        bool showFile)
     {
         _mef = mef;
         _commentStore = commentStore;
@@ -39,7 +40,7 @@ public void GenerateReport(CommentStore commentStore,ICheckNotifier notifier, II
             Check(notifier);
 
             using var document = GetNewDocFile("RDMPDocumentation");
-            var t = InsertTable(document,Summaries.Count *2 +1, 1);
+            var t = InsertTable(document, Summaries.Count * 2 + 1, 1);
 
             //Listing Cell header
             SetTableCell(t, 0, 0, "Tables");
@@ -49,7 +50,7 @@ public void GenerateReport(CommentStore commentStore,ICheckNotifier notifier, II
             for (var i = 0; i < Summaries.Count; i++)
             {
                 //creates the run
-                SetTableCell(t, i*2 + 1, 0, "");
+                SetTableCell(t, i * 2 + 1, 0, "");
 
                 var bmp = iconProvider.GetImage(keys[i]);
 
@@ -57,14 +58,15 @@ public void GenerateReport(CommentStore commentStore,ICheckNotifier notifier, II
                 {
                     var para = t.Rows[i * 2 + 1].GetCell(0).Paragraphs.First();
                     var run = para.Runs.FirstOrDefault() ?? para.CreateRun();
-                    GetPicture(run,bmp);
+                    GetPicture(run, bmp);
                 }
+
                 SetTableCell(t, i * 2 + 1, 0, $" {keys[i].Name}");
 
-                SetTableCell(t,i*2 + 2, 0, Summaries[keys[i]]);
+                SetTableCell(t, i * 2 + 2, 0, Summaries[keys[i]]);
             }
 
-            if(showFile)
+            if (showFile)
                 ShowFile(document);
         }
         catch (Exception e)
@@ -75,18 +77,19 @@ public void GenerateReport(CommentStore commentStore,ICheckNotifier notifier, II
 
     private void Check(ICheckNotifier notifier)
     {
-        foreach (var t in _mef.GetAllTypes().Where(t=>typeof(DatabaseEntity).IsAssignableFrom(t)))
-            if (typeof (IMapsDirectlyToDatabaseTable).IsAssignableFrom(t))
+        foreach (var t in _mef.GetAllTypes().Where(t => typeof(DatabaseEntity).IsAssignableFrom(t)))
+            if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(t))
             {
-                if (t.IsInterface || t.IsAbstract || t.Name.StartsWith("Spontaneous") || t.Assembly.FullName?.StartsWith("DynamicProxyGenAssembly2")==true)
+                if (t.IsInterface || t.IsAbstract || t.Name.StartsWith("Spontaneous") ||
+                    t.Assembly.FullName?.StartsWith("DynamicProxyGenAssembly2") == true)
                     continue;
                 try
                 {
                     //spontaneous objects don't exist in the database.
-                    if(typeof(SpontaneousObject).IsAssignableFrom(t))
+                    if (typeof(SpontaneousObject).IsAssignableFrom(t))
                         continue;
                 }
-                catch(Exception)
+                catch (Exception)
                 {
                     continue;
                 }
@@ -97,7 +100,8 @@ private void Check(ICheckNotifier notifier)
 
                 if (docs == null)
                     notifier.OnCheckPerformed(
-                        new CheckEventArgs($"Failed to get definition for class {t.FullName} defined in {t.Assembly}", CheckResult.Fail));
+                        new CheckEventArgs($"Failed to get definition for class {t.FullName} defined in {t.Assembly}",
+                            CheckResult.Fail));
                 else
                     Summaries.Add(t, docs);
             }
diff --git a/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs b/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs
index 5aa0ba3d61..06ea845641 100644
--- a/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs
+++ b/Rdmp.Core/Reports/DublinCore/DublinCoreDefinition.cs
@@ -36,7 +36,7 @@ public class DublinCoreDefinition
     /// Dublin Core property see http://www.dublincore.org/documents/dces/
     /// </summary>
     public string Description { get; set; }
-        
+
     /// <summary>
     /// Dublin Core property see http://www.dublincore.org/documents/dces/
     /// </summary>
@@ -51,7 +51,7 @@ public class DublinCoreDefinition
     /// Dublin Core property see http://www.dublincore.org/documents/dces/
     /// </summary>
     public Uri Identifier { get; set; }
-        
+
     /// <summary>
     /// Dublin Core property see http://www.dublincore.org/documents/dces/
     /// </summary>
@@ -68,7 +68,6 @@ public class DublinCoreDefinition
     /// <param name="to"></param>
     public void WriteXml(Stream to)
     {
-
         XNamespace xsi = "http://www.w3.org/2001/XMLSchema-instance";
         XNamespace dc = "http://purl.org/dc/elements/1.1/";
         XNamespace dcterms = "http://purl.org/dc/terms/";
@@ -76,9 +75,9 @@ public void WriteXml(Stream to)
 
         var xsiAttr = new XAttribute(XNamespace.Xmlns + "xsi", xsi);
         var dcAttr = new XAttribute(XNamespace.Xmlns + "dc", dc);
-        var dctermsAttr = new XAttribute(XNamespace.Xmlns + "dcterms",dcterms);
+        var dctermsAttr = new XAttribute(XNamespace.Xmlns + "dcterms", dcterms);
 
-        var doc = new XDocument(new XElement("metadata",xsiAttr,dcAttr,dctermsAttr));
+        var doc = new XDocument(new XElement("metadata", xsiAttr, dcAttr, dctermsAttr));
         doc.Root.Add(new XElement(dc + "title", Title));
         doc.Root.Add(new XElement(dcterms + "alternative", Alternative));
         doc.Root.Add(new XElement(dc + "subject", Subject));
@@ -90,12 +89,15 @@ public void WriteXml(Stream to)
 
         //<dcterms:modified xsi:type="dcterms:W3CDTF">
         if (Modified.HasValue)
-            doc.Root.Add(new XElement(dcterms + "modified", new XAttribute(xsi + "type", "dcterms:W3CDTF"), Modified.Value.ToString("yyyy-MM-dd")));
+            doc.Root.Add(new XElement(dcterms + "modified", new XAttribute(xsi + "type", "dcterms:W3CDTF"),
+                Modified.Value.ToString("yyyy-MM-dd")));
 
         doc.Root.Add(new XElement(dc + "format", new XAttribute(xsi + "type", "dcterms:IMT"), Format));
-            
-        using(var sw = new StreamWriter(to))
+
+        using (var sw = new StreamWriter(to))
+        {
             sw.Write(doc.ToString(SaveOptions.None));
+        }
     }
 
     /// <summary>
@@ -104,19 +106,19 @@ public void WriteXml(Stream to)
     /// <param name="element"></param>
     public void LoadFrom(XElement element)
     {
-        if(element.Name != "metadata")
+        if (element.Name != "metadata")
             throw new XmlSyntaxException($"Expected metadata element but got {element}");
 
         var descendants = element.Descendants().ToArray();
-        Title = GetElement(descendants, "title",true);
-        Alternative = GetElement(descendants, "alternative",false);
+        Title = GetElement(descendants, "title", true);
+        Alternative = GetElement(descendants, "alternative", false);
         Subject = GetElement(descendants, "subject", false);
         Description = GetElement(descendants, "description", false);
         Publisher = GetElement(descendants, "publisher", false);
-        IsPartOf = GetElementUri(descendants, "ispartof",false);
-        Identifier = GetElementUri(descendants, "identifier",false);
-        Modified = GetElementDateTime(descendants, "modified",false);
-        Format = GetElement(descendants, "format",false);
+        IsPartOf = GetElementUri(descendants, "ispartof", false);
+        Identifier = GetElementUri(descendants, "identifier", false);
+        Modified = GetElementDateTime(descendants, "modified", false);
+        Format = GetElement(descendants, "format", false);
     }
 
     private static DateTime? GetElementDateTime(XElement[] descendants, string tagLocalName, bool mandatory)
@@ -139,10 +141,11 @@ private static Uri GetElementUri(XElement[] descendants, string tagLocalName, bo
 
     private static string GetElement(XElement[] descendants, string tagLocalName, bool mandatory)
     {
-        var match = descendants.FirstOrDefault(e => e.Name.LocalName.Equals(tagLocalName,StringComparison.CurrentCultureIgnoreCase));
+        var match = descendants.FirstOrDefault(e =>
+            e.Name.LocalName.Equals(tagLocalName, StringComparison.CurrentCultureIgnoreCase));
 
         if (match == null)
-            if(mandatory)
+            if (mandatory)
                 throw new XmlSyntaxException($"Failed to find mandatory tag {tagLocalName}");
             else
                 return null;
diff --git a/Rdmp.Core/Reports/DublinCore/DublinCoreTranslater.cs b/Rdmp.Core/Reports/DublinCore/DublinCoreTranslater.cs
index 9c2fcc6b69..225fc14a11 100644
--- a/Rdmp.Core/Reports/DublinCore/DublinCoreTranslater.cs
+++ b/Rdmp.Core/Reports/DublinCore/DublinCoreTranslater.cs
@@ -22,24 +22,26 @@ public class DublinCoreTranslater
     /// <typeparam name="T"></typeparam>
     /// <param name="toFill"></param>
     /// <param name="fillWith"></param>
-    public static void Fill<T>(T toFill,DublinCoreDefinition fillWith)
+    public static void Fill<T>(T toFill, DublinCoreDefinition fillWith)
     {
         if (toFill is Catalogue c)
         {
             //only overwritte name if Catalogue has default blank name
-            if (c.Name != null && c.Name.StartsWith("New Catalogue ",StringComparison.CurrentCultureIgnoreCase))
+            if (c.Name != null && c.Name.StartsWith("New Catalogue ", StringComparison.CurrentCultureIgnoreCase))
                 c.Name = fillWith.Title;
 
             c.Description = fillWith.Description;
             c.Search_keywords = fillWith.Subject;
 
             //only change Acronym if it was null before
-            if(string.IsNullOrWhiteSpace(c.Acronym))
+            if (string.IsNullOrWhiteSpace(c.Acronym))
                 c.Acronym = fillWith.Alternative;
         }
         else
+        {
             throw new NotSupportedException(
                 $"Did not know how to hydrate the Type {typeof(T)} from a DublinCoreDefinition");
+        }
     }
 
     /// <summary>
@@ -63,8 +65,10 @@ public static DublinCoreDefinition GenerateFrom<T>(T generateFrom)
             toReturn.Alternative = c.Acronym;
         }
         else
+        {
             throw new NotSupportedException(
                 $"Did not know how to extracta a DublinCoreDefinition from the Type {typeof(T)}");
+        }
 
         return toReturn;
     }
diff --git a/Rdmp.Core/Reports/ExtractionTime/WordCatalogueExtractor.cs b/Rdmp.Core/Reports/ExtractionTime/WordCatalogueExtractor.cs
index df65b66cf6..3769c080dc 100644
--- a/Rdmp.Core/Reports/ExtractionTime/WordCatalogueExtractor.cs
+++ b/Rdmp.Core/Reports/ExtractionTime/WordCatalogueExtractor.cs
@@ -18,12 +18,13 @@ namespace Rdmp.Core.Reports.ExtractionTime;
 /// Generates tables in a Microsoft Word document describing a Catalogue, its CatalogueItems and any Issues associated with it.  This is used in data extraction 
 /// to generate metadata documents for the researchers to read (See WordDataWriter)
 /// </summary>
-public class WordCatalogueExtractor: DocXHelper
+public class WordCatalogueExtractor : DocXHelper
 {
     private ICatalogue Catalogue { get; set; }
 
     //This is an alternative for [DoNotExtractProperty] that only applies to this class where [DoNotExtractProperty] applies to all users of Catalogue e.g. DITAExtractor
-    private static string[] PropertyIgnorelist = {
+    private static string[] PropertyIgnorelist =
+    {
         "Statistical_cons", "Research_relevance", "Topic", "Agg_method", "Limitations", "Comments", "Periodicity",
         "Acronym",
         "Detail_Page_URL",
@@ -64,7 +65,6 @@ public class WordCatalogueExtractor: DocXHelper
         "Ticket",
         "DatasetStartDate",
         "Name"
-
     };
 
     private XWPFDocument _document;
@@ -81,7 +81,8 @@ public WordCatalogueExtractor(ICatalogue catalogue, XWPFDocument document)
     /// </summary>
     /// <param name="cataItems">The CatalogueItems you want to write out ( should all belong to the same Catalogue) but may be a subset of the whole Catalogue e.g. those columns that were actualy extracted</param>
     /// <param name="supplementalData">A bunch of key value pairs (Tuple actually) that accompany a CatalogueItem and should be rammed into the table as it is written out, this could contain information only determined at runtime e.g. not part of the Catalogue</param>
-    public void AddMetaDataForColumns(CatalogueItem[] cataItems, Dictionary<CatalogueItem, Tuple<string, string>[]> supplementalData = null)
+    public void AddMetaDataForColumns(CatalogueItem[] cataItems,
+        Dictionary<CatalogueItem, Tuple<string, string>[]> supplementalData = null)
     {
         InsertHeader(_document, $"Catalogue:{Catalogue.Name}");
 
@@ -89,26 +90,26 @@ public void AddMetaDataForColumns(CatalogueItem[] cataItems, Dictionary<Catalogu
 
         var requiredRowsCount = CountWriteableProperties(Catalogue);
 
-        var table = InsertTable(_document,requiredRowsCount, 2);
+        var table = InsertTable(_document, requiredRowsCount, 2);
 
         GenerateObjectPropertiesAsRowUsingReflection(table, Catalogue, null);
 
         //then move onto CatalogueItems that have been extracte
         foreach (var catalogueItem in cataItems)
         {
-            InsertHeader(_document,catalogueItem.Name,2);
-                
+            InsertHeader(_document, catalogueItem.Name, 2);
+
             requiredRowsCount = CountWriteableProperties(catalogueItem);
-                
+
             //allocate extra space for supplementalData
-            if(supplementalData != null)
+            if (supplementalData != null)
                 requiredRowsCount += supplementalData[catalogueItem].Length;
 
             //create a new table
             var t = InsertTable(_document, requiredRowsCount, 2);
-                
-            if(supplementalData!=null && supplementalData.TryGetValue(catalogueItem, out var value))
-                GenerateObjectPropertiesAsRowUsingReflection(t, catalogueItem,value);
+
+            if (supplementalData != null && supplementalData.TryGetValue(catalogueItem, out var value))
+                GenerateObjectPropertiesAsRowUsingReflection(t, catalogueItem, value);
             else
                 GenerateObjectPropertiesAsRowUsingReflection(t, catalogueItem, null);
         }
@@ -121,44 +122,44 @@ private static int CountWriteableProperties(object o)
 
         var count = 0;
         //generate a row for each property
-        foreach (var property in propertyInfo )
-        {
+        foreach (var property in propertyInfo)
             //Check whether property can be written to
-            if (property.CanRead && Attribute.IsDefined(property, typeof(DoNotExtractProperty)) == false && !PropertyIgnorelist.Contains(property.Name))
-                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum ||property.PropertyType.Equals(typeof (string)))
+            if (property.CanRead && Attribute.IsDefined(property, typeof(DoNotExtractProperty)) == false &&
+                !PropertyIgnorelist.Contains(property.Name))
+                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum ||
+                    property.PropertyType.Equals(typeof(string)))
                     count++;
-
-        }
         return count;
     }
 
-    private static void GenerateObjectPropertiesAsRowUsingReflection(XWPFTable table, object o, Tuple<string,string>[] supplementalData )
+    private static void GenerateObjectPropertiesAsRowUsingReflection(XWPFTable table, object o,
+        Tuple<string, string>[] supplementalData)
     {
-        var propertyInfo = o.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        var propertyInfo =
+            o.GetType().GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
 
         var currentRow = 0;
 
         //generate a row for each property
         foreach (var property in propertyInfo)
-        {
-                
             //Check whether property can be written to
-            if (property.CanRead && Attribute.IsDefined(property, typeof(DoNotExtractProperty)) == false && !PropertyIgnorelist.Contains(property.Name))
-                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum || property.PropertyType.Equals(typeof(string)))
+            if (property.CanRead && Attribute.IsDefined(property, typeof(DoNotExtractProperty)) == false &&
+                !PropertyIgnorelist.Contains(property.Name))
+                if (property.PropertyType.IsValueType || property.PropertyType.IsEnum ||
+                    property.PropertyType.Equals(typeof(string)))
                 {
                     SetTableCell(table, currentRow, 0, property.Name);
 
                     var val = property.GetValue(o, null);
 
-                    if(val != null)
+                    if (val != null)
                         SetTableCell(table, currentRow, 1, val.ToString());
 
                     currentRow++;
                 }
-        }
 
         //add any supplemental data they want in the table
-        if(supplementalData!= null)
+        if (supplementalData != null)
             foreach (var tuple in supplementalData)
             {
                 SetTableCell(table, currentRow, 0, tuple.Item1);
@@ -168,6 +169,4 @@ private static void GenerateObjectPropertiesAsRowUsingReflection(XWPFTable table
 
         //table.AutoFit = AutoFit.Contents;
     }
-        
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Reports/ExtractionTime/WordDataReleaseFileGenerator.cs b/Rdmp.Core/Reports/ExtractionTime/WordDataReleaseFileGenerator.cs
index 3976467b4b..7876bec825 100644
--- a/Rdmp.Core/Reports/ExtractionTime/WordDataReleaseFileGenerator.cs
+++ b/Rdmp.Core/Reports/ExtractionTime/WordDataReleaseFileGenerator.cs
@@ -38,7 +38,7 @@ public WordDataReleaseFileGenerator(IExtractionConfiguration configuration, IDat
         if (Configuration.Cohort_ID == null)
             throw new NullReferenceException("Configuration has no Cohort");
 
-        Cohort = _repository.GetObjectByID<ExtractableCohort>((int) Configuration.Cohort_ID);
+        Cohort = _repository.GetObjectByID<ExtractableCohort>((int)Configuration.Cohort_ID);
 
         ExtractionResults =
             Configuration.CumulativeExtractionResults
@@ -49,25 +49,26 @@ public WordDataReleaseFileGenerator(IExtractionConfiguration configuration, IDat
 
     public void GenerateWordFile(string saveAsFilename)
     {
-
         FileInfo f;
 
-        f = string.IsNullOrWhiteSpace(saveAsFilename) ? GetUniqueFilenameInWorkArea("ReleaseDocument") : new FileInfo(saveAsFilename);
+        f = string.IsNullOrWhiteSpace(saveAsFilename)
+            ? GetUniqueFilenameInWorkArea("ReleaseDocument")
+            : new FileInfo(saveAsFilename);
 
         // Create an instance of Word  and make it visible.=
         using (var document = GetNewDocFile(f))
         {
-
             //actually changes it to landscape :)
             SetLandscape(document);
 
-            InsertHeader(document, $"Project:{Project.Name}",1);
-            InsertHeader(document, Configuration.Name,2);
+            InsertHeader(document, $"Project:{Project.Name}", 1);
+            InsertHeader(document, Configuration.Name, 2);
 
-            var disclaimer = _repository.DataExportPropertyManager.GetValue(DataExportProperty.ReleaseDocumentDisclaimer);
+            var disclaimer =
+                _repository.DataExportPropertyManager.GetValue(DataExportProperty.ReleaseDocumentDisclaimer);
 
-            if(disclaimer != null)
-                InsertParagraph(document,disclaimer);
+            if (disclaimer != null)
+                InsertParagraph(document, disclaimer);
 
             CreateTopTable1(document);
 
@@ -75,7 +76,7 @@ public void GenerateWordFile(string saveAsFilename)
 
             CreateCohortDetailsTable(document);
 
-            InsertParagraph(document,Environment.NewLine);
+            InsertParagraph(document, Environment.NewLine);
 
             CreateFileSummary(document);
 
@@ -83,7 +84,6 @@ public void GenerateWordFile(string saveAsFilename)
             if (string.IsNullOrWhiteSpace(saveAsFilename))
                 ShowFile(f);
         }
-
     }
 
     private void CreateTopTable1(XWPFDocument document)
@@ -101,20 +101,20 @@ private void CreateTopTable1(XWPFDocument document)
 
         var table = InsertTable(document, requiredRows, 2);
 
-        if(hasTicket)
+        if (hasTicket)
         {
             SetTableCell(table, currentRow, 0, "Master Issue");
             SetTableCell(table, currentRow, 1, Project.MasterTicket);
             currentRow++;
         }
 
-        SetTableCell(table,currentRow, 0, "ReleaseIdentifier");
-        SetTableCell(table,currentRow, 1, Cohort.GetReleaseIdentifier(true));
+        SetTableCell(table, currentRow, 0, "ReleaseIdentifier");
+        SetTableCell(table, currentRow, 1, Cohort.GetReleaseIdentifier(true));
         currentRow++;
 
         if (hasProchi)
         {
-            SetTableCell(table,currentRow, 0,"Prefix");
+            SetTableCell(table, currentRow, 0, "Prefix");
             SetTableCell(table, currentRow, 1, GetFirstProCHIPrefix());
         }
     }
@@ -135,7 +135,7 @@ private string GetFirstProCHIPrefix()
             var sql =
                 $"SELECT  TOP 1 LEFT({Cohort.GetReleaseIdentifier()},3) FROM {ect.TableName} WHERE {Cohort.WhereSQL()}";
 
-            using(var cmd = db.Server.GetCommand(sql, con))
+            using (var cmd = db.Server.GetCommand(sql, con))
             {
                 cmd.CommandTimeout = CohortCountTimeoutInSeconds;
                 return (string)cmd.ExecuteScalar();
@@ -149,18 +149,23 @@ private void CreateCohortDetailsTable(XWPFDocument document)
 
         var tableLine = 0;
 
-        SetTableCell(table,tableLine, 0, "Version");
-        SetTableCell(table,tableLine, 1, "Description");
-        SetTableCell(table,tableLine, 2, "Date Extracted");
-        SetTableCell(table,tableLine, 3, "Unique Individuals");
+        SetTableCell(table, tableLine, 0, "Version");
+        SetTableCell(table, tableLine, 1, "Description");
+        SetTableCell(table, tableLine, 2, "Date Extracted");
+        SetTableCell(table, tableLine, 3, "Unique Individuals");
         tableLine++;
 
-        SetTableCell(table,tableLine, 0, Cohort.GetExternalData(CohortCountTimeoutInSeconds).ExternalVersion.ToString());
-        SetTableCell(table,tableLine, 1, $"{Cohort} (ID={Cohort.ID}, OriginID={Cohort.OriginID})");//description fetched from remote table
-
-        var lastExtracted = ExtractionResults.Any() ? ExtractionResults.Max(r => r.DateOfExtraction).ToString() : "Never";
-        SetTableCell(table,tableLine, 2, lastExtracted);
-        SetTableCell(table,tableLine, 3, Cohort.GetCountDistinctFromDatabase(CohortCountTimeoutInSeconds).ToString("N0"));
+        SetTableCell(table, tableLine, 0,
+            Cohort.GetExternalData(CohortCountTimeoutInSeconds).ExternalVersion.ToString());
+        SetTableCell(table, tableLine, 1,
+            $"{Cohort} (ID={Cohort.ID}, OriginID={Cohort.OriginID})"); //description fetched from remote table
+
+        var lastExtracted = ExtractionResults.Any()
+            ? ExtractionResults.Max(r => r.DateOfExtraction).ToString()
+            : "Never";
+        SetTableCell(table, tableLine, 2, lastExtracted);
+        SetTableCell(table, tableLine, 3,
+            Cohort.GetCountDistinctFromDatabase(CohortCountTimeoutInSeconds).ToString("N0"));
     }
 
     private void CreateFileSummary(XWPFDocument document)
@@ -169,25 +174,25 @@ private void CreateFileSummary(XWPFDocument document)
 
         var tableLine = 0;
 
-        SetTableCell(table,tableLine, 0, "Data Requirement");
-        SetTableCell(table,tableLine, 1, "Notes");
-        SetTableCell(table,tableLine, 2, "Filename");
-        SetTableCell(table,tableLine, 3, "Records");
-        SetTableCell(table,tableLine, 4, "Unique Individuals");
+        SetTableCell(table, tableLine, 0, "Data Requirement");
+        SetTableCell(table, tableLine, 1, "Notes");
+        SetTableCell(table, tableLine, 2, "Filename");
+        SetTableCell(table, tableLine, 3, "Records");
+        SetTableCell(table, tableLine, 4, "Unique Individuals");
         tableLine++;
 
         foreach (var result in ExtractionResults)
         {
             var filename = GetFileName(result);
 
-            SetTableCell(table,tableLine, 0,_repository.GetObjectByID<ExtractableDataSet>(result.ExtractableDataSet_ID).ToString());
-            SetTableCell(table,tableLine, 1,result.FiltersUsed);
-            SetTableCell(table,tableLine, 2,filename);
-            SetTableCell(table,tableLine, 3,result.RecordsExtracted.ToString("N0"));
-            SetTableCell(table,tableLine, 4,result.DistinctReleaseIdentifiersEncountered.ToString("N0"));
+            SetTableCell(table, tableLine, 0,
+                _repository.GetObjectByID<ExtractableDataSet>(result.ExtractableDataSet_ID).ToString());
+            SetTableCell(table, tableLine, 1, result.FiltersUsed);
+            SetTableCell(table, tableLine, 2, filename);
+            SetTableCell(table, tableLine, 3, result.RecordsExtracted.ToString("N0"));
+            SetTableCell(table, tableLine, 4, result.DistinctReleaseIdentifiersEncountered.ToString("N0"));
             tableLine++;
         }
-
     }
 
     private string GetFileName(ICumulativeExtractionResults result)
diff --git a/Rdmp.Core/Reports/ExtractionTime/WordDataWriter.cs b/Rdmp.Core/Reports/ExtractionTime/WordDataWriter.cs
index 1c075ca14c..62f780bea8 100644
--- a/Rdmp.Core/Reports/ExtractionTime/WordDataWriter.cs
+++ b/Rdmp.Core/Reports/ExtractionTime/WordDataWriter.cs
@@ -34,17 +34,18 @@ public class WordDataWriter : DocXHelper
 
     public WordDataWriter(ExtractionPipelineUseCase executer)
     {
-        if(executer == null)
+        if (executer == null)
             throw new NullReferenceException("Cannot write meta data without the accompanying ExtractionPipelineHost");
 
         if (executer.Source.WasCancelled)
-            throw new NullReferenceException("Cannot write meta data since ExtractionPipelineHost reports that it was Cancelled");
+            throw new NullReferenceException(
+                "Cannot write meta data since ExtractionPipelineHost reports that it was Cancelled");
 
         Executer = executer;
 
         _destination = Executer.Destination;
 
-        if(_destination == null)
+        if (_destination == null)
             throw new NotSupportedException(
                 $"{GetType().FullName} only supports destinations which are {typeof(ExecuteDatasetExtractionFlatFileDestination).FullName}");
     }
@@ -68,7 +69,7 @@ public void GenerateWordFile()
 
                 InsertTableOfContents(document);
 
-                InsertHeader(document,"File Data");
+                InsertHeader(document, "File Data");
 
                 var rowCount = _destination.GeneratesFiles ? 10 : 5;
 
@@ -77,54 +78,57 @@ public void GenerateWordFile()
                 var rownum = 0;
                 if (_destination.GeneratesFiles)
                 {
-                    SetTableCell(t,rownum,0,"File Name");
-                    SetTableCell(t,rownum,1,new FileInfo(_destination.OutputFile).Name);
+                    SetTableCell(t, rownum, 0, "File Name");
+                    SetTableCell(t, rownum, 1, new FileInfo(_destination.OutputFile).Name);
                     rownum++;
                 }
 
                 var request = Executer.Source.Request;
 
-                SetTableCell(t,rownum,0,"Cohort Size (Distinct)");
-                SetTableCell(t,rownum,1, request.ExtractableCohort.CountDistinct.ToString());
+                SetTableCell(t, rownum, 0, "Cohort Size (Distinct)");
+                SetTableCell(t, rownum, 1, request.ExtractableCohort.CountDistinct.ToString());
                 rownum++;
 
-                SetTableCell(t,rownum,0,"Cohorts Found In Dataset");
-                SetTableCell(t,rownum,1, request.IsBatchResume ? "unknown (batching was used)" : Executer.Source.UniqueReleaseIdentifiersEncountered.Count.ToString());
+                SetTableCell(t, rownum, 0, "Cohorts Found In Dataset");
+                SetTableCell(t, rownum, 1,
+                    request.IsBatchResume
+                        ? "unknown (batching was used)"
+                        : Executer.Source.UniqueReleaseIdentifiersEncountered.Count.ToString());
                 rownum++;
 
-                SetTableCell(t,rownum,0,"Dataset Line Count");
-                SetTableCell(t,rownum,1, request.CumulativeExtractionResults.RecordsExtracted.ToString("N0"));
+                SetTableCell(t, rownum, 0, "Dataset Line Count");
+                SetTableCell(t, rownum, 1, request.CumulativeExtractionResults.RecordsExtracted.ToString("N0"));
                 rownum++;
 
                 if (_destination.GeneratesFiles)
                 {
-                    SetTableCell(t,rownum,0,"MD5");
-                    SetTableCell(t,rownum,1, FormatHashString(UsefulStuff.HashFile(_destination.OutputFile)));
+                    SetTableCell(t, rownum, 0, "MD5");
+                    SetTableCell(t, rownum, 1, FormatHashString(UsefulStuff.HashFile(_destination.OutputFile)));
                     rownum++;
 
                     var f = new FileInfo(_destination.OutputFile);
-                    SetTableCell(t,rownum,0,"File Size");
-                    SetTableCell(t,rownum,1, $"{f.Length}bytes ({f.Length / 1024}KB)");
+                    SetTableCell(t, rownum, 0, "File Size");
+                    SetTableCell(t, rownum, 1, $"{f.Length}bytes ({f.Length / 1024}KB)");
                     rownum++;
                 }
 
-                SetTableCell(t,rownum,0,"Extraction Date");
-                SetTableCell(t,rownum,1,Executer.Destination.TableLoadInfo.EndTime.ToString());
+                SetTableCell(t, rownum, 0, "Extraction Date");
+                SetTableCell(t, rownum, 1, Executer.Destination.TableLoadInfo.EndTime.ToString());
                 rownum++;
 
-                SetTableCell(t,rownum,0,"Table Load ID (for HIC)");
-                SetTableCell(t,rownum,1,Executer.Destination.TableLoadInfo.ID.ToString());
+                SetTableCell(t, rownum, 0, "Table Load ID (for HIC)");
+                SetTableCell(t, rownum, 1, Executer.Destination.TableLoadInfo.ID.ToString());
                 rownum++;
 
                 if (_destination.GeneratesFiles)
                 {
-                    SetTableCell(t,rownum,0,"Separator");
-                    SetTableCell(t,rownum,1,
+                    SetTableCell(t, rownum, 0, "Separator");
+                    SetTableCell(t, rownum, 1,
                         $"{Executer.Source.Request.Configuration.Separator}\t({_destination.SeparatorsStrippedOut} values stripped from data)");
                     rownum++;
 
-                    SetTableCell(t,rownum,0,"Date Format");
-                    SetTableCell(t,rownum,1,_destination.DateFormat);
+                    SetTableCell(t, rownum, 0, "Date Format");
+                    SetTableCell(t, rownum, 1, _destination.DateFormat);
                     rownum++;
                 }
 
@@ -132,7 +136,7 @@ public void GenerateWordFile()
                 {
                     InsertSectionPageBreak(document);
 
-                    InsertHeader(document,"Validation Information");
+                    InsertHeader(document, "Validation Information");
 
                     CreateValidationRulesTable(document);
 
@@ -142,24 +146,20 @@ public void GenerateWordFile()
                 }
 
                 //if a count of date times seen exists for this extraction create a graph of the counts seen
-                if (Executer.Source.ExtractionTimeTimeCoverageAggregator != null && Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets.Any())
-                {
-                    if(!request.IsBatchResume)
-                    {
+                if (Executer.Source.ExtractionTimeTimeCoverageAggregator != null &&
+                    Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets.Any())
+                    if (!request.IsBatchResume)
                         try
                         {
                             InsertSectionPageBreak(document);
                             InsertHeader(document, "Dataset Timespan");
 
                             CreateTimespanGraph(Executer.Source.ExtractionTimeTimeCoverageAggregator);
-
                         }
                         catch (Exception e)
                         {
                             ExceptionsGeneratingWordFile.Add(e);
                         }
-                    }
-                }
 
                 InsertSectionPageBreak(document);
 
@@ -175,27 +175,26 @@ public void GenerateWordFile()
 
     private static string FormatHashString(string s)
     {
-        if(string.IsNullOrWhiteSpace(s))
+        if (string.IsNullOrWhiteSpace(s))
             return null;
 
         //add a space every 8 hex pairs
         // E5-F2-AB-D9-A2-6E-15-38 E5-F2-AB-D9-A2-6E-15-38
-        var result  = new StringBuilder();
+        var result = new StringBuilder();
 
         var sr = new StringReader(s);
 
         var buff = new char[23];
 
-        while(sr.Read(buff,0,23) > 0)
+        while (sr.Read(buff, 0, 23) > 0)
         {
             result.Append(buff);
             result.Append(' ');
 
             //skip a character (should be a -, if not something has gone badly wrong)
             var skipped = sr.Read();
-            if(!(skipped == '-' || skipped == -1))
+            if (!(skipped == '-' || skipped == -1))
                 return s;
-
         }
 
         return result.ToString().Trim();
@@ -210,23 +209,23 @@ private void AddFiltersAndParameters(XWPFDocument document)
         {
             var filtersUsed = fc.GetAllFiltersIncludingInSubContainersRecursively();
 
-            WriteOutFilters(document,filtersUsed);
+            WriteOutFilters(document, filtersUsed);
 
-            WriteOutParameters(document,filtersUsed);
+            WriteOutParameters(document, filtersUsed);
         }
     }
 
     private void WriteOutParameters(XWPFDocument document, List<IFilter> filtersUsed)
     {
-        InsertHeader(document,"Parameters");
+        InsertHeader(document, "Parameters");
 
         var linesRequred = filtersUsed.Aggregate(0, (s, f) => s + f.GetAllParameters().Length);
 
         var globalParameters = Executer.Source.Request.Configuration.GlobalExtractionFilterParameters.ToArray();
         linesRequred += globalParameters.Length;
 
-        var t = InsertTable(document,linesRequred + 1, 3);
-        SetTableCell(t,0,0,"Name");
+        var t = InsertTable(document, linesRequred + 1, 3);
+        SetTableCell(t, 0, 0, "Name");
         SetTableCell(t, 0, 1, "Comment");
         SetTableCell(t, 0, 2, "Value");
 
@@ -235,44 +234,44 @@ private void WriteOutParameters(XWPFDocument document, List<IFilter> filtersUsed
         foreach (var filter in filtersUsed)
         foreach (var parameter in filter.GetAllParameters())
         {
-                SetTableCell(t,currentLine, 0, parameter.ParameterName);
-                SetTableCell(t,currentLine, 1, parameter.Comment);
-                SetTableCell(t,currentLine, 2, parameter.Value);
+            SetTableCell(t, currentLine, 0, parameter.ParameterName);
+            SetTableCell(t, currentLine, 1, parameter.Comment);
+            SetTableCell(t, currentLine, 2, parameter.Value);
             currentLine++;
         }
 
         foreach (var globalParameter in globalParameters)
         {
-            SetTableCell(t,currentLine, 0, globalParameter.ParameterName);
-            SetTableCell(t,currentLine, 1, globalParameter.Comment);
-            SetTableCell(t,currentLine, 2, globalParameter.Value);
+            SetTableCell(t, currentLine, 0, globalParameter.ParameterName);
+            SetTableCell(t, currentLine, 1, globalParameter.Comment);
+            SetTableCell(t, currentLine, 2, globalParameter.Value);
             currentLine++;
         }
     }
 
-    private static void  WriteOutFilters(XWPFDocument document, List<IFilter> filtersUsed)
+    private static void WriteOutFilters(XWPFDocument document, List<IFilter> filtersUsed)
     {
-        InsertHeader(document,"Filters");
+        InsertHeader(document, "Filters");
 
-        var t = InsertTable(document,filtersUsed.Count + 1, 3);
+        var t = InsertTable(document, filtersUsed.Count + 1, 3);
 
-        SetTableCell(t,0, 0, "Name");
-        SetTableCell(t,0, 1, "Description");
-        SetTableCell(t,0, 2, "SQL");
+        SetTableCell(t, 0, 0, "Name");
+        SetTableCell(t, 0, 1, "Description");
+        SetTableCell(t, 0, 2, "SQL");
 
         for (var i = 0; i < filtersUsed.Count; i++)
         {
             //i+2 because, first row is for headers and indexing in word starts at 1 not 0
-            SetTableCell(t,i + 1, 0, filtersUsed[i].Name);
-            SetTableCell(t,i + 1, 1, filtersUsed[i].Description);
-            SetTableCell(t,i + 1, 2, filtersUsed[i].WhereSQL);
+            SetTableCell(t, i + 1, 0, filtersUsed[i].Name);
+            SetTableCell(t, i + 1, 1, filtersUsed[i].Description);
+            SetTableCell(t, i + 1, 2, filtersUsed[i].WhereSQL);
         }
     }
 
     private void AddAllCatalogueItemMetaData(XWPFDocument document)
     {
         var cata = Executer.Source.Request.Catalogue;
-        var catalogueMetaData = new WordCatalogueExtractor(cata,document);
+        var catalogueMetaData = new WordCatalogueExtractor(cata, document);
 
         var supplementalData = new Dictionary<CatalogueItem, Tuple<string, string>[]>();
 
@@ -288,7 +287,7 @@ private void AddAllCatalogueItemMetaData(XWPFDocument document)
                     supplementalValuesForThisOne.Add(new Tuple<string, string>("Runtime Name:", "Not found"));
                 */
 
-                new Tuple<string, string>("Datatype (SQL):", value.DataTypeInCatalogue)
+                new("Datatype (SQL):", value.DataTypeInCatalogue)
             };
 
 
@@ -299,108 +298,108 @@ private void AddAllCatalogueItemMetaData(XWPFDocument document)
 
 
             //add it with supplemental values
-            if(value.CatalogueItem != null)
-                supplementalData.Add(value.CatalogueItem ,supplementalValuesForThisOne.ToArray());
-
+            if (value.CatalogueItem != null)
+                supplementalData.Add(value.CatalogueItem, supplementalValuesForThisOne.ToArray());
         }
 
-        catalogueMetaData.AddMetaDataForColumns(supplementalData.Keys.ToArray(),supplementalData);
+        catalogueMetaData.AddMetaDataForColumns(supplementalData.Keys.ToArray(), supplementalData);
     }
 
     private static void CreateTimespanGraph(ExtractionTimeTimeCoverageAggregator toGraph)
-    {/*
-            Chart wdChart = wrdDoc.InlineShapes.AddChart(Microsoft.Office.Core.XlChartType.xl3DColumn, ref oMissing).Chart;
-            ChartData wdChartData = wdChart.ChartData;
-            Workbook dataWorkbook = (Workbook)wdChartData.Workbook;
-            dataWorkbook.Application.Visible = DEBUG_WORD;
-            Worksheet dataSheet = (Worksheet)dataWorkbook.Worksheets[1];
-
-            //set title before putting any data in
-            wdChart.ApplyLayout(1);
-            wdChart.ChartTitle.Text = "Dataset Timespan";
-            wdChart.ChartTitle.Font.Italic = true;
-            wdChart.ChartTitle.Font.Size = 18;
-            wdChart.ChartTitle.Font.Color = Color.Black.ToArgb();
-
-            //fill in sheet data
-            dataSheet.Cells.Range["A1", oMissing].FormulaR1C1 = "Date";
-            dataSheet.Cells.Range["B1", oMissing].FormulaR1C1 = "Record Count";
-            dataSheet.Cells.Range["C1", oMissing].FormulaR1C1 = "Distinct Patient Count";
-
-            //get rid of default microsoft crap
-            dataSheet.Cells.Range["D1", oMissing].FormulaR1C1 = "";
-            dataSheet.Cells.Range["D2", oMissing].FormulaR1C1 = "";
-            dataSheet.Cells.Range["D3", oMissing].FormulaR1C1 = "";
-            dataSheet.Cells.Range["D4", oMissing].FormulaR1C1 = "";
-            dataSheet.Cells.Range["D5", oMissing].FormulaR1C1 = "";
-       
-            //get first of the month
-            int futureRecordsCount = 0;
-            int recordsPriorToDatasetStartCount = 0;
-
-            int currentRow = 2;
-
-            var cata = Executer.Source.Request.Catalogue;
-            DateTime startDateCutoff;
-
-            if (cata.DatasetStartDate == null)
-                startDateCutoff = DateTime.MinValue;
-            else
-                startDateCutoff = (DateTime)cata.DatasetStartDate;
-
-            foreach (DateTime key in Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets.Keys.OrderBy(d => d))
-            {
-                if (key < startDateCutoff)
-                {
-                    recordsPriorToDatasetStartCount += Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key].CountOfTimesSeen;
-                    continue;
-                }
-                if (key > DateTime.Now)
+    {
+        /*
+                Chart wdChart = wrdDoc.InlineShapes.AddChart(Microsoft.Office.Core.XlChartType.xl3DColumn, ref oMissing).Chart;
+                ChartData wdChartData = wdChart.ChartData;
+                Workbook dataWorkbook = (Workbook)wdChartData.Workbook;
+                dataWorkbook.Application.Visible = DEBUG_WORD;
+                Worksheet dataSheet = (Worksheet)dataWorkbook.Worksheets[1];
+
+                //set title before putting any data in
+                wdChart.ApplyLayout(1);
+                wdChart.ChartTitle.Text = "Dataset Timespan";
+                wdChart.ChartTitle.Font.Italic = true;
+                wdChart.ChartTitle.Font.Size = 18;
+                wdChart.ChartTitle.Font.Color = Color.Black.ToArgb();
+
+                //fill in sheet data
+                dataSheet.Cells.Range["A1", oMissing].FormulaR1C1 = "Date";
+                dataSheet.Cells.Range["B1", oMissing].FormulaR1C1 = "Record Count";
+                dataSheet.Cells.Range["C1", oMissing].FormulaR1C1 = "Distinct Patient Count";
+
+                //get rid of default microsoft crap
+                dataSheet.Cells.Range["D1", oMissing].FormulaR1C1 = "";
+                dataSheet.Cells.Range["D2", oMissing].FormulaR1C1 = "";
+                dataSheet.Cells.Range["D3", oMissing].FormulaR1C1 = "";
+                dataSheet.Cells.Range["D4", oMissing].FormulaR1C1 = "";
+                dataSheet.Cells.Range["D5", oMissing].FormulaR1C1 = "";
+
+                //get first of the month
+                int futureRecordsCount = 0;
+                int recordsPriorToDatasetStartCount = 0;
+
+                int currentRow = 2;
+
+                var cata = Executer.Source.Request.Catalogue;
+                DateTime startDateCutoff;
+
+                if (cata.DatasetStartDate == null)
+                    startDateCutoff = DateTime.MinValue;
+                else
+                    startDateCutoff = (DateTime)cata.DatasetStartDate;
+
+                foreach (DateTime key in Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets.Keys.OrderBy(d => d))
                 {
-                    futureRecordsCount += Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key].CountOfTimesSeen;
-                    continue;
+                    if (key < startDateCutoff)
+                    {
+                        recordsPriorToDatasetStartCount += Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key].CountOfTimesSeen;
+                        continue;
+                    }
+                    if (key > DateTime.Now)
+                    {
+                        futureRecordsCount += Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key].CountOfTimesSeen;
+                        continue;
+                    }
+
+                    dataSheet.Cells.Range["A" + currentRow, oMissing].FormulaR1C1 = key.ToString("yyyy-MM-dd");
+                    ExtractionTimeTimeCoverageAggregatorBucket currentBucket = Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key];
+                    dataSheet.Cells.Range["B" + currentRow, oMissing].FormulaR1C1 = currentBucket.CountOfTimesSeen;
+                    dataSheet.Cells.Range["C" + currentRow, oMissing].FormulaR1C1 = currentBucket.CountOfDistinctIdentifiers;
+
+                    currentRow++;
                 }
 
-                dataSheet.Cells.Range["A" + currentRow, oMissing].FormulaR1C1 = key.ToString("yyyy-MM-dd");
-                ExtractionTimeTimeCoverageAggregatorBucket currentBucket = Executer.Source.ExtractionTimeTimeCoverageAggregator.Buckets[key];
-                dataSheet.Cells.Range["B" + currentRow, oMissing].FormulaR1C1 = currentBucket.CountOfTimesSeen;
-                dataSheet.Cells.Range["C" + currentRow, oMissing].FormulaR1C1 = currentBucket.CountOfDistinctIdentifiers;
+                //set max size of sheet
+                Microsoft.Office.Interop.Excel.Range tRange = dataSheet.Cells.get_Range("A1", "C" + (currentRow-1));
 
-                currentRow++;
-            }
+                ListObject tbl1 = dataSheet.ListObjects["Table1"];
+                tbl1.Resize(tRange);
+
+                wdChart.ApplyDataLabels(XlDataLabelsType.xlDataLabelsShowNone, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing);
+                wdChart.ChartType = XlChartType.xlLine;
+                Microsoft.Office.Interop.Word.Axis xAxis = (Microsoft.Office.Interop.Word.Axis)wdChart.Axes(Microsoft.Office.Interop.Word.XlAxisType.xlCategory, XlAxisGroup.xlPrimary);
+                xAxis.BaseUnit = Microsoft.Office.Interop.Word.XlTimeUnit.xlMonths;
+
+
+                wdChart.Refresh();
+
+                 if (Executer.Destination.TableLoadInfo.Inserts == 0)
+                    return;
+
+                float futureRecordsCountAsFraction = ((float)futureRecordsCount) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
+                float nullCountAsFraction = ((float)toGraph.countOfNullsSeen) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
+                float brokenDatesAsFraction = ((float)toGraph.countOfBrokenDates) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
+                float recordsPriorToDatasetStartCountAsFraction = ((float)recordsPriorToDatasetStartCount) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
+
+                wordHelper.WriteLine("Nulls:" + toGraph.countOfNullsSeen + "(" + nullCountAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
+                wordHelper.WriteLine("Invalid Date formats:" + toGraph.countOfBrokenDates + "(" + brokenDatesAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
+                wordHelper.WriteLine("Future Dates:" + futureRecordsCount +"("+ futureRecordsCountAsFraction + "%)",WdBuiltinStyle.wdStyleNormal);
+                wordHelper.WriteLine("Timespan Field: " + cata.TimeCoverage_ExtractionInformation.GetRuntimeName(), WdBuiltinStyle.wdStyleNormal);
+
+                if (cata.DatasetStartDate != null)
+                    wordHelper.WriteLine("Dates before dataset start date(" + cata.DatasetStartDate.Value.ToString(_destination.DateFormat) + "):" + recordsPriorToDatasetStartCount + "(" + recordsPriorToDatasetStartCountAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
 
-            //set max size of sheet
-            Microsoft.Office.Interop.Excel.Range tRange = dataSheet.Cells.get_Range("A1", "C" + (currentRow-1));
-
-            ListObject tbl1 = dataSheet.ListObjects["Table1"];
-            tbl1.Resize(tRange);
-
-            wdChart.ApplyDataLabels(XlDataLabelsType.xlDataLabelsShowNone, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing, oMissing);
-            wdChart.ChartType = XlChartType.xlLine;
-            Microsoft.Office.Interop.Word.Axis xAxis = (Microsoft.Office.Interop.Word.Axis)wdChart.Axes(Microsoft.Office.Interop.Word.XlAxisType.xlCategory, XlAxisGroup.xlPrimary);
-            xAxis.BaseUnit = Microsoft.Office.Interop.Word.XlTimeUnit.xlMonths;
-            
-            
-            wdChart.Refresh();
-
-             if (Executer.Destination.TableLoadInfo.Inserts == 0)
-                return;
-            
-            float futureRecordsCountAsFraction = ((float)futureRecordsCount) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
-            float nullCountAsFraction = ((float)toGraph.countOfNullsSeen) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
-            float brokenDatesAsFraction = ((float)toGraph.countOfBrokenDates) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
-            float recordsPriorToDatasetStartCountAsFraction = ((float)recordsPriorToDatasetStartCount) / ((float)Executer.Destination.TableLoadInfo.Inserts) * 100.0f;
-            
-            wordHelper.WriteLine("Nulls:" + toGraph.countOfNullsSeen + "(" + nullCountAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
-            wordHelper.WriteLine("Invalid Date formats:" + toGraph.countOfBrokenDates + "(" + brokenDatesAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
-            wordHelper.WriteLine("Future Dates:" + futureRecordsCount +"("+ futureRecordsCountAsFraction + "%)",WdBuiltinStyle.wdStyleNormal);
-            wordHelper.WriteLine("Timespan Field: " + cata.TimeCoverage_ExtractionInformation.GetRuntimeName(), WdBuiltinStyle.wdStyleNormal);
-
-            if (cata.DatasetStartDate != null)
-                wordHelper.WriteLine("Dates before dataset start date(" + cata.DatasetStartDate.Value.ToString(_destination.DateFormat) + "):" + recordsPriorToDatasetStartCount + "(" + recordsPriorToDatasetStartCountAsFraction + "%)", WdBuiltinStyle.wdStyleNormal);
-           
-            dataWorkbook.Application.Quit();
-        */
+                dataWorkbook.Application.Quit();
+            */
     }
 
     private void CreateValidationRulesTable(XWPFDocument document)
@@ -410,18 +409,18 @@ private void CreateValidationRulesTable(XWPFDocument document)
         var rowCount = validator.ItemValidators.Count +
                        Executer.Source.ExtractionTimeValidator.IgnoredBecauseColumnHashed.Count + 1;
 
-        var t = InsertTable(document,rowCount, 2);
+        var t = InsertTable(document, rowCount, 2);
 
         var tableLine = 0;
         //output table header
-        SetTableCell(t,tableLine, 0,"Column");
-        SetTableCell(t,tableLine, 1, "Validation");
+        SetTableCell(t, tableLine, 0, "Column");
+        SetTableCell(t, tableLine, 1, "Validation");
         tableLine++;
 
         //output list of validations we carried out
         foreach (var iv in validator.ItemValidators)
         {
-            SetTableCell(t,tableLine, 0, iv.TargetProperty);
+            SetTableCell(t, tableLine, 0, iv.TargetProperty);
 
             var definition = "";
 
@@ -443,14 +442,14 @@ private void CreateValidationRulesTable(XWPFDocument document)
             if (string.IsNullOrWhiteSpace(definition))
                 definition = "No validation configured";
 
-            SetTableCell(t, tableLine,1, definition);
+            SetTableCell(t, tableLine, 1, definition);
             tableLine++;
         }
 
         //ouput list of validations we skipped
         foreach (var iv in Executer.Source.ExtractionTimeValidator.IgnoredBecauseColumnHashed)
         {
-            SetTableCell(t, tableLine, 0 , iv.TargetProperty);
+            SetTableCell(t, tableLine, 0, iv.TargetProperty);
             SetTableCell(t, tableLine, 1, "No validations carried out because column is Hashed/Annonymised");
             tableLine++;
         }
@@ -460,23 +459,23 @@ private void CreateValidationResultsTable(XWPFDocument document)
     {
         var results = Executer.Source.ExtractionTimeValidator.Results;
 
-        var t = InsertTable(document,results.DictionaryOfFailure.Count + 1, 4);
+        var t = InsertTable(document, results.DictionaryOfFailure.Count + 1, 4);
 
         var tableLine = 0;
 
-        SetTableCell(t,tableLine, 0, "");
-        SetTableCell(t,tableLine, 1, Consequence.Missing.ToString());
-        SetTableCell(t,tableLine, 2, Consequence.Wrong.ToString());
-        SetTableCell(t,tableLine, 3, Consequence.InvalidatesRow.ToString());
+        SetTableCell(t, tableLine, 0, "");
+        SetTableCell(t, tableLine, 1, Consequence.Missing.ToString());
+        SetTableCell(t, tableLine, 2, Consequence.Wrong.ToString());
+        SetTableCell(t, tableLine, 3, Consequence.InvalidatesRow.ToString());
 
         tableLine++;
 
         foreach (var (colname, value) in results.DictionaryOfFailure)
         {
-            SetTableCell(t,tableLine, 0,colname);
-            SetTableCell(t,tableLine, 1,value[Consequence.Missing].ToString());
-            SetTableCell(t,tableLine, 2,value[Consequence.Wrong].ToString());
-            SetTableCell(t,tableLine, 3,value[Consequence.InvalidatesRow].ToString());
+            SetTableCell(t, tableLine, 0, colname);
+            SetTableCell(t, tableLine, 1, value[Consequence.Missing].ToString());
+            SetTableCell(t, tableLine, 2, value[Consequence.Wrong].ToString());
+            SetTableCell(t, tableLine, 3, value[Consequence.InvalidatesRow].ToString());
             tableLine++;
         }
     }
diff --git a/Rdmp.Core/Reports/GovernanceReport.cs b/Rdmp.Core/Reports/GovernanceReport.cs
index c223b0286f..e1a01d3ffe 100644
--- a/Rdmp.Core/Reports/GovernanceReport.cs
+++ b/Rdmp.Core/Reports/GovernanceReport.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.Reports;
 /// Processes all GovernancePeriod and Catalogues into a CSV report about which datasets are covered by which governance periods, which periods have expired (and there
 /// is no corresponding follow on GovernancePeriod) and which Catalogues are not covered by any governance.
 /// </summary>
-public class GovernanceReport:DocXHelper
+public class GovernanceReport : DocXHelper
 {
     private readonly IDetermineDatasetTimespan _timespanCalculator;
     private readonly ICatalogueRepository _repository;
@@ -29,7 +29,8 @@ public class GovernanceReport:DocXHelper
     {
         Delimiter = ","
     };
-    public GovernanceReport(IDetermineDatasetTimespan timespanCalculator,ICatalogueRepository repository)
+
+    public GovernanceReport(IDetermineDatasetTimespan timespanCalculator, ICatalogueRepository repository)
     {
         _timespanCalculator = timespanCalculator;
         _repository = repository;
@@ -45,7 +46,7 @@ public void GenerateReport()
             {
                 writer.WriteField("Extractable Datasets");
                 writer.NextRecord();
-                        
+
                 writer.WriteField("Folder");
                 writer.WriteField("Catalogue");
                 writer.WriteField("Current Governance");
@@ -54,23 +55,26 @@ public void GenerateReport()
                 writer.NextRecord();
 
 
-                var govs = _repository.GetAllObjects<GovernancePeriod>().ToDictionary(period => period, period => period.GovernedCatalogues.ToArray());
-            
+                var govs = _repository.GetAllObjects<GovernancePeriod>()
+                    .ToDictionary(period => period, period => period.GovernedCatalogues.ToArray());
+
                 foreach (var catalogue in _repository.GetAllObjects<Catalogue>()
-                             .Where(c=>c.CatalogueItems.Any(ci=>ci.ExtractionInformation != null))
-                             .OrderBy(c=>c.Name))
+                             .Where(c => c.CatalogueItems.Any(ci => ci.ExtractionInformation != null))
+                             .OrderBy(c => c.Name))
                 {
                     if (catalogue.IsDeprecated || catalogue.IsColdStorageDataset || catalogue.IsInternalDataset)
                         continue;
 
                     //get active governances
-                    var activeGovs = govs.Where(kvp => kvp.Value.Contains(catalogue) && !kvp.Key.IsExpired()).Select(g=>g.Key).ToArray();
-                    var expiredGovs = govs.Where(kvp => kvp.Value.Contains(catalogue) && kvp.Key.IsExpired()).Select(g => g.Key).ToArray();
+                    var activeGovs = govs.Where(kvp => kvp.Value.Contains(catalogue) && !kvp.Key.IsExpired())
+                        .Select(g => g.Key).ToArray();
+                    var expiredGovs = govs.Where(kvp => kvp.Value.Contains(catalogue) && kvp.Key.IsExpired())
+                        .Select(g => g.Key).ToArray();
 
                     string relevantGovernance = null;
 
                     if (activeGovs.Any())
-                        relevantGovernance = string.Join("," , activeGovs.Select(gov => gov.Name));
+                        relevantGovernance = string.Join(",", activeGovs.Select(gov => gov.Name));
                     else if (expiredGovs.Any())
                         relevantGovernance =
                             $"No Current Governance (Expired Governances: {string.Join(",", expiredGovs.Select(gov => gov.Name))})";
@@ -82,7 +86,7 @@ public void GenerateReport()
                     writer.WriteField(catalogue.Folder);
                     writer.WriteField(catalogue.Name);
                     writer.WriteField(relevantGovernance);
-                    writer.WriteField(_timespanCalculator.GetHumanReadableTimespanIfKnownOf(catalogue,true, out _));
+                    writer.WriteField(_timespanCalculator.GetHumanReadableTimespanIfKnownOf(catalogue, true, out _));
                     writer.WriteField(ShortenDescription(catalogue.Description));
 
                     writer.NextRecord();
@@ -93,13 +97,13 @@ public void GenerateReport()
                 // next section header
                 writer.WriteField("Active Governance");
 
-                OutputGovernanceList(govs,writer, false);
+                OutputGovernanceList(govs, writer, false);
 
                 writer.NextRecord();
                 // next section header
                 writer.WriteField("Expired Governance");
 
-                OutputGovernanceList(govs,writer, true);
+                OutputGovernanceList(govs, writer, true);
             }
         }
 
@@ -111,8 +115,8 @@ private static string ShortenDescription(string description)
         if (string.IsNullOrWhiteSpace(description))
             return description;
 
-        description = description.Replace("\r\n"," ");
-        description = description.Replace("\n"," ");
+        description = description.Replace("\r\n", " ");
+        description = description.Replace("\n", " ");
 
         if (description.Length >= 100)
             return $"{description[..100]}...";
@@ -125,7 +129,8 @@ private static string ShortenDescription(string description)
     /// <param name="govs"></param>
     /// <param name="writer"></param>
     /// <param name="expired"></param>
-    private static void OutputGovernanceList(Dictionary<GovernancePeriod, ICatalogue[]> govs, CsvWriter writer, bool expired)
+    private static void OutputGovernanceList(Dictionary<GovernancePeriod, ICatalogue[]> govs, CsvWriter writer,
+        bool expired)
     {
         //headers for this section
         writer.WriteField("Governance");
@@ -135,7 +140,7 @@ private static void OutputGovernanceList(Dictionary<GovernancePeriod, ICatalogue
         writer.WriteField("Approval End");
         writer.WriteField("Documents");
         writer.NextRecord();
-            
+
         foreach (var kvp in govs)
         {
             //if governance period does not have any Catalogues associated with it skip it
diff --git a/Rdmp.Core/Reports/IDetermineDatasetTimespan.cs b/Rdmp.Core/Reports/IDetermineDatasetTimespan.cs
index c5e6b9c577..dc401e6ba5 100644
--- a/Rdmp.Core/Reports/IDetermineDatasetTimespan.cs
+++ b/Rdmp.Core/Reports/IDetermineDatasetTimespan.cs
@@ -31,5 +31,6 @@ public interface IDetermineDatasetTimespan
     /// <param name="discardOutliers">True to attempt to throw out outlier rows when determining the dataset timespan</param>
     /// <param name="accurateAsOf">The date at which the timespan was calculated e.g. if the result is cached</param>
     /// <returns></returns>
-    Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Catalogue catalogue, bool discardOutliers, out DateTime? accurateAsOf);
+    Tuple<DateTime?, DateTime?> GetMachineReadableTimespanIfKnownOf(Catalogue catalogue, bool discardOutliers,
+        out DateTime? accurateAsOf);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Reports/MetadataReport.cs b/Rdmp.Core/Reports/MetadataReport.cs
index d4d16f31e7..6b9f261a19 100644
--- a/Rdmp.Core/Reports/MetadataReport.cs
+++ b/Rdmp.Core/Reports/MetadataReport.cs
@@ -33,7 +33,7 @@ namespace Rdmp.Core.Reports;
 /// of extractable columns as well as an Appendix of Lookups.  In addition any IsExtractable AggregateConfiguration graphs will be run and screen captured and added to
 /// the report (including heatmap if a dynamic pivot is included in the graph).
 /// </summary>
-public class MetadataReport:DocXHelper
+public class MetadataReport : DocXHelper
 {
     private readonly ICatalogueRepository _repository;
     private readonly MetadataReportArgs _args;
@@ -46,8 +46,7 @@ public class MetadataReport:DocXHelper
     private const int TextFontSize = 7;
 
 
-
-    public MetadataReport(ICatalogueRepository repository,MetadataReportArgs args)
+    public MetadataReport(ICatalogueRepository repository, MetadataReportArgs args)
     {
         _repository = repository;
         _args = args;
@@ -57,8 +56,7 @@ public MetadataReport(ICatalogueRepository repository,MetadataReportArgs args)
 
     public void GenerateWordFileAsync(IDataLoadEventListener listener, bool showFile)
     {
-
-        thread = new Thread(() => GenerateWordFile(listener,showFile));
+        thread = new Thread(() => GenerateWordFile(listener, showFile));
         thread.Start();
     }
 
@@ -80,9 +78,12 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
                     var completed = 0;
 
 
-                    foreach (var c in _args.Catalogues.OrderBy(c=>c.Name))
+                    foreach (var c in _args.Catalogues.OrderBy(c => c.Name))
                     {
-                        listener.OnProgress(this, new ProgressEventArgs("Extracting", new ProgressMeasurement(completed++, ProgressType.Records, _args.Catalogues.Length), sw.Elapsed));
+                        listener.OnProgress(this,
+                            new ProgressEventArgs("Extracting",
+                                new ProgressMeasurement(completed++, ProgressType.Records, _args.Catalogues.Length),
+                                sw.Elapsed));
 
                         var recordCount = -1;
                         var distinctRecordCount = -1;
@@ -99,11 +100,11 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
                         }
                         catch (Exception e)
                         {
-                            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error,
-                                $"Error processing record count for Catalogue {c.Name}",e));
+                            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
+                                $"Error processing record count for Catalogue {c.Name}", e));
                         }
 
-                        InsertHeader(document,c.Name);
+                        InsertHeader(document, c.Name);
 
                         //assume we don't know the age of the dataset
                         DateTime? accurateAsOf = null;
@@ -111,20 +112,21 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
                         //get the age of the dataset if known and output it
                         if (_args.TimespanCalculator != null)
                         {
-                            var timespan = _args.TimespanCalculator.GetHumanReadableTimespanIfKnownOf(c, true,out accurateAsOf);
+                            var timespan =
+                                _args.TimespanCalculator.GetHumanReadableTimespanIfKnownOf(c, true, out accurateAsOf);
                             if (!string.IsNullOrWhiteSpace(timespan) && !timespan.Equals("Unknown"))
-                                InsertParagraph(document,timespan + (accurateAsOf.HasValue ? "*" :""), TextFontSize);
+                                InsertParagraph(document, timespan + (accurateAsOf.HasValue ? "*" : ""), TextFontSize);
                         }
 
-                        InsertParagraph(document,c.Description, TextFontSize);
+                        InsertParagraph(document, c.Description, TextFontSize);
 
-                        if(accurateAsOf.HasValue)
-                            InsertParagraph(document, $"* Based on DQE run on {accurateAsOf.Value}", TextFontSize-2);
+                        if (accurateAsOf.HasValue)
+                            InsertParagraph(document, $"* Based on DQE run on {accurateAsOf.Value}", TextFontSize - 2);
 
                         if (gotRecordCount)
                         {
-                            InsertHeader(document,"Record Count", 3);
-                            CreateCountTable(document,recordCount, distinctRecordCount, identifierName);
+                            InsertHeader(document, "Record Count", 3);
+                            CreateCountTable(document, recordCount, distinctRecordCount, identifierName);
                         }
 
                         if (!_args.SkipImages && RequestCatalogueImages != null)
@@ -133,31 +135,33 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
 
                             if (onRequestCatalogueImages.Any())
                             {
-                                InsertHeader(document,"Aggregates",2);
-                                AddImages(document,onRequestCatalogueImages);
+                                InsertHeader(document, "Aggregates", 2);
+                                AddImages(document, onRequestCatalogueImages);
                             }
-
                         }
 
-                        CreateDescriptionsTable(document,c);
+                        CreateDescriptionsTable(document, c);
 
-                        if(_args.IncludeNonExtractableItems)
-                            CreateNonExtractableColumnsTable(document,c);
+                        if (_args.IncludeNonExtractableItems)
+                            CreateNonExtractableColumnsTable(document, c);
 
                         //if this is not the last Catalogue create a new page
                         if (completed != _args.Catalogues.Length)
                             InsertSectionPageBreak(document);
 
-                        listener.OnProgress(this, new ProgressEventArgs("Extracting", new ProgressMeasurement(completed, ProgressType.Records, _args.Catalogues.Length), sw.Elapsed));
+                        listener.OnProgress(this,
+                            new ProgressEventArgs("Extracting",
+                                new ProgressMeasurement(completed, ProgressType.Records, _args.Catalogues.Length),
+                                sw.Elapsed));
                     }
 
                     if (LookupsEncounteredToAppearInAppendix.Any())
                         CreateLookupAppendix(document, listener);
 
-                    if(showFile)
+                    if (showFile)
                         ShowFile(document);
 
-                    SetMargins(document,20);
+                    SetMargins(document, 20);
 
                     AddFooter(document, $"Created on {DateTime.Now}", TextFontSize);
 
@@ -168,11 +172,11 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
                     //user hit abort
                 }
             }
-
         }
         catch (Exception e)
         {
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error, "Entire process failed, see Exception for details", e));
+            listener.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Entire process failed, see Exception for details", e));
         }
 
         return null;
@@ -181,7 +185,7 @@ public FileInfo GenerateWordFile(IDataLoadEventListener listener, bool showFile)
     private void CreateLookupAppendix(XWPFDocument document, IDataLoadEventListener listener)
     {
         InsertSectionPageBreak(document);
-        InsertHeader(document,"Appendix 1 - Lookup Tables");
+        InsertHeader(document, "Appendix 1 - Lookup Tables");
 
         //foreach lookup
         foreach (var lookupTable in LookupsEncounteredToAppearInAppendix)
@@ -194,25 +198,25 @@ private void CreateLookupAppendix(XWPFDocument document, IDataLoadEventListener
             }
             catch (Exception e)
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Error,
+                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                     $"Failed to get the contents of loookup {lookupTable.Name}", e));
             }
 
-            if(dt == null)
+            if (dt == null)
                 continue;
 
             //if it has too many columns
             if (dt.Columns.Count > 5)
             {
-                listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Warning,
+                listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,
                     $"Lookup table {lookupTable.Name} has more than 5 columns so will not be processed"));
                 continue;
             }
 
             //write name of lookup
-            InsertHeader(document,lookupTable.Name);
+            InsertHeader(document, lookupTable.Name);
 
-            var table = InsertTable(document,Math.Min(dt.Rows.Count + 1, _args.MaxLookupRows + 2), dt.Columns.Count);
+            var table = InsertTable(document, Math.Min(dt.Rows.Count + 1, _args.MaxLookupRows + 2), dt.Columns.Count);
 
             var tableLine = 0;
 
@@ -223,13 +227,13 @@ private void CreateLookupAppendix(XWPFDocument document, IDataLoadEventListener
             //move to next line
             tableLine++;
 
-            var maxLineCountDowner = _args.MaxLookupRows + 1;//1 for the headers and 1 for the ... row
+            var maxLineCountDowner = _args.MaxLookupRows + 1; //1 for the headers and 1 for the ... row
 
             //see if it has any lookups
             foreach (DataRow row in dt.Rows)
             {
                 for (var i = 0; i < dt.Columns.Count; i++)
-                    SetTableCell(table,tableLine, i, Convert.ToString(row[i]));
+                    SetTableCell(table, tableLine, i, Convert.ToString(row[i]));
 
                 //move to next line
                 tableLine++;
@@ -238,14 +242,14 @@ private void CreateLookupAppendix(XWPFDocument document, IDataLoadEventListener
                 if (maxLineCountDowner == 1)
                 {
                     for (var i = 0; i < dt.Columns.Count; i++)
-                        SetTableCell(table,tableLine, i, "...");
+                        SetTableCell(table, tableLine, i, "...");
                     break;
                 }
             }
 
             AutoFit(table);
 
-            listener.OnNotify(this,new NotifyEventArgs(ProgressEventType.Information,
+            listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                 $"Wrote out lookup table {lookupTable.Name} successfully"));
         }
     }
@@ -254,11 +258,12 @@ private void CreateLookupAppendix(XWPFDocument document, IDataLoadEventListener
     private static DataTable GetLookupTableInfoContentsFromDatabase(TableInfo lookupTable)
     {
         //get the contents of the lookup
-        using(var con = DataAccessPortal.ExpectServer(lookupTable,DataAccessContext.InternalDataProcessing).GetConnection())
+        using (var con = DataAccessPortal.ExpectServer(lookupTable, DataAccessContext.InternalDataProcessing)
+                   .GetConnection())
         {
             con.Open();
 
-            using(var cmd = DatabaseCommandHelper.GetCommand($"Select * from {lookupTable.Name}", con))
+            using (var cmd = DatabaseCommandHelper.GetCommand($"Select * from {lookupTable.Name}", con))
             using (var da = DatabaseCommandHelper.GetDataAdapter(cmd))
             {
                 var dt = new DataTable();
@@ -273,13 +278,13 @@ private static void AddImages(XWPFDocument document, BitmapWithDescription[] onR
     {
         foreach (var image in onRequestCatalogueImages)
         {
-            if(!string.IsNullOrWhiteSpace(image.Header))
-                InsertHeader(document,image.Header,3);
+            if (!string.IsNullOrWhiteSpace(image.Header))
+                InsertHeader(document, image.Header, 3);
 
             if (!string.IsNullOrWhiteSpace(image.Description))
                 InsertParagraph(document, image.Description);
 
-            GetPicture(document,image.Bitmap);
+            GetPicture(document, image.Bitmap);
         }
     }
 
@@ -308,7 +313,8 @@ private void CreateDescriptionsTable(XWPFDocument document, Catalogue c)
         foreach (var information in extractionInformations)
         {
             SetTableCell(table, tableLine, 0, information.GetRuntimeName(), TextFontSize);
-            SetTableCell(table, tableLine, 1, information.ColumnInfo == null ? "ORPHAN":information.ColumnInfo.Data_type, TextFontSize);
+            SetTableCell(table, tableLine, 1,
+                information.ColumnInfo == null ? "ORPHAN" : information.ColumnInfo.Data_type, TextFontSize);
             var description = information.CatalogueItem.Description;
 
             //a field should only ever be a foreign key to one Lookup table
@@ -325,7 +331,6 @@ private void CreateDescriptionsTable(XWPFDocument document, Catalogue c)
                     LookupsEncounteredToAppearInAppendix.Add(lookupTable);
 
                 description += $"References Lookup Table {lookupTable.GetRuntimeName()}";
-
             }
 
             SetTableCell(table, tableLine, 2, description, TextFontSize);
@@ -336,6 +341,7 @@ private void CreateDescriptionsTable(XWPFDocument document, Catalogue c)
 
         AutoFit(table);
     }
+
     private static void CreateNonExtractableColumnsTable(XWPFDocument document, Catalogue c)
     {
         var nonExtractableCatalogueItems = c.CatalogueItems.Where(ci => ci.ExtractionInformation == null).ToList();
@@ -394,20 +400,20 @@ private bool Include(ExtractionInformation arg)
 
     private void CreateCountTable(XWPFDocument document, int recordCount, int distinctCount, string identifierName)
     {
-        var table = InsertTable(document,2, identifierName != null && _args.IncludeDistinctIdentifierCounts ? 2 : 1);
+        var table = InsertTable(document, 2, identifierName != null && _args.IncludeDistinctIdentifierCounts ? 2 : 1);
 
         var tableLine = 0;
 
-        SetTableCell(table,tableLine, 0, "Records",TextFontSize);
+        SetTableCell(table, tableLine, 0, "Records", TextFontSize);
 
         //only add column values if there is an IsExtractionIdentifier returned
         if (identifierName != null && _args.IncludeDistinctIdentifierCounts)
-            SetTableCell(table,tableLine, 1, $"Distinct {identifierName}",TextFontSize);
+            SetTableCell(table, tableLine, 1, $"Distinct {identifierName}", TextFontSize);
 
         tableLine++;
 
 
-        SetTableCell(table,tableLine, 0,recordCount.ToString("N0"),TextFontSize);
+        SetTableCell(table, tableLine, 0, recordCount.ToString("N0"), TextFontSize);
 
         //only add column values if there is an IsExtractionIdentifier returned
         if (identifierName != null && _args.IncludeDistinctIdentifierCounts)
@@ -418,7 +424,8 @@ private void CreateCountTable(XWPFDocument document, int recordCount, int distin
     private void GetRecordCount(Catalogue c, out int count, out int distinct, out string identifierName)
     {
         //one of the fields will be marked IsExtractionIdentifier (e.g. CHI column)
-        var bestExtractionInformation = c.GetAllExtractionInformation(ExtractionCategory.Any).Where(e => e.IsExtractionIdentifier).ToArray();
+        var bestExtractionInformation = c.GetAllExtractionInformation(ExtractionCategory.Any)
+            .Where(e => e.IsExtractionIdentifier).ToArray();
 
         TableInfo tableToQuery = null;
 
@@ -435,24 +442,27 @@ private void GetRecordCount(Catalogue c, out int count, out int distinct, out st
 
             //there is only one table that we can query
             if (tableInfos.Length == 1)
-                tableToQuery = tableInfos.Single();//query that one
-            else
-            if (tableInfos.Count(t => t.IsPrimaryExtractionTable) == 1)//there are multiple tables but there is only one IsPrimaryExtractionTable
+                tableToQuery = tableInfos.Single(); //query that one
+            else if
+                (tableInfos.Count(t => t.IsPrimaryExtractionTable) ==
+                 1) //there are multiple tables but there is only one IsPrimaryExtractionTable
                 tableToQuery = tableInfos.Single(t => t.IsPrimaryExtractionTable);
             else
                 throw new Exception(
-                    $"Did not know which table to query out of {string.Join(",", tableInfos.Select(t => t.GetRuntimeName()))} you can resolve this by marking one (AND ONLY ONE) of these tables as IsPrimaryExtractionTable=true");//there are multiple tables and multiple or no IsPrimaryExtractionTable
-
+                    $"Did not know which table to query out of {string.Join(",", tableInfos.Select(t => t.GetRuntimeName()))} you can resolve this by marking one (AND ONLY ONE) of these tables as IsPrimaryExtractionTable=true"); //there are multiple tables and multiple or no IsPrimaryExtractionTable
         }
         else
-            tableToQuery = bestExtractionInformation[0].ColumnInfo.TableInfo;//there is an extraction identifier so use its table to query
+        {
+            tableToQuery =
+                bestExtractionInformation[0].ColumnInfo
+                    .TableInfo; //there is an extraction identifier so use its table to query
+        }
 
         var hasExtractionIdentifier = bestExtractionInformation.Any();
 
         var server = c.GetDistinctLiveDatabaseServer(DataAccessContext.InternalDataProcessing, true);
         using (var con = server.GetConnection())
         {
-
             con.Open();
 
             if (tableToQuery.Name.Contains('@'))
@@ -480,7 +490,9 @@ private void GetRecordCount(Catalogue c, out int count, out int distinct, out st
                 {
                     r.Read();
                     count = Convert.ToInt32(r["recordCount"]);
-                    distinct = hasExtractionIdentifier && _args.IncludeDistinctIdentifierCounts ? Convert.ToInt32(r["recordCountDistinct"]) : -1;
+                    distinct = hasExtractionIdentifier && _args.IncludeDistinctIdentifierCounts
+                        ? Convert.ToInt32(r["recordCountDistinct"])
+                        : -1;
                 }
             }
 
diff --git a/Rdmp.Core/Reports/MetadataReportArgs.cs b/Rdmp.Core/Reports/MetadataReportArgs.cs
index ddc4e64bb8..dd2ecea7c9 100644
--- a/Rdmp.Core/Reports/MetadataReportArgs.cs
+++ b/Rdmp.Core/Reports/MetadataReportArgs.cs
@@ -60,7 +60,7 @@ public class MetadataReportArgs
     /// <summary>
     /// True to output descriptions of <see cref="CatalogueItem"/> even if they don't have any <see cref="ExtractionInformation"/>
     /// </summary>
-    public bool IncludeNonExtractableItems { get;set;}
+    public bool IncludeNonExtractableItems { get; set; }
 
     /// <summary>
     /// When outputting <see cref="Lookup"/> tables this is the maximum number of rows that will be written from the lookup table.
@@ -71,5 +71,4 @@ public MetadataReportArgs(IEnumerable<Catalogue> toReportOn)
     {
         Catalogues = toReportOn.ToArray();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/AmbiguousTypeException.cs b/Rdmp.Core/Repositories/AmbiguousTypeException.cs
index c986641124..7bab9716b4 100644
--- a/Rdmp.Core/Repositories/AmbiguousTypeException.cs
+++ b/Rdmp.Core/Repositories/AmbiguousTypeException.cs
@@ -13,14 +13,11 @@ namespace Rdmp.Core.Repositories;
 /// </summary>
 public class AmbiguousTypeException : Exception
 {
-    public AmbiguousTypeException(string message):base(message)
+    public AmbiguousTypeException(string message) : base(message)
     {
-                
     }
 
-    public AmbiguousTypeException(string message, Exception innerException): base(message,innerException)
+    public AmbiguousTypeException(string message, Exception innerException) : base(message, innerException)
     {
-                
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/CatalogueRepository.cs b/Rdmp.Core/Repositories/CatalogueRepository.cs
index f35420d83d..dd02f4c618 100644
--- a/Rdmp.Core/Repositories/CatalogueRepository.cs
+++ b/Rdmp.Core/Repositories/CatalogueRepository.cs
@@ -72,7 +72,8 @@ public class CatalogueRepository : TableRepository, ICatalogueRepository
     /// Sets up an <see cref="IRepository"/> which connects to the database <paramref name="catalogueConnectionString"/> to fetch/create <see cref="DatabaseEntity"/> objects.
     /// </summary>
     /// <param name="catalogueConnectionString"></param>
-    public CatalogueRepository(DbConnectionStringBuilder catalogueConnectionString): base(null,catalogueConnectionString)
+    public CatalogueRepository(DbConnectionStringBuilder catalogueConnectionString) : base(null,
+        catalogueConnectionString)
     {
         AggregateForcedJoinManager = new AggregateForcedJoin(this);
         GovernanceManager = new GovernanceManager(this);
@@ -87,69 +88,88 @@ public CatalogueRepository(DbConnectionStringBuilder catalogueConnectionString):
         CommentStore = new CommentStoreWithKeywords();
 
         ObscureDependencyFinder = new CatalogueObscureDependencyFinder(this);
-            
+
         //Shortcuts to improve performance of ConstructEntity (avoids reflection)
-        Constructors.Add(typeof(Catalogue),(rep, r) => new Catalogue((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(CohortAggregateContainer),(rep,r)=>new CohortAggregateContainer((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(CohortIdentificationConfiguration),(rep,r)=>new CohortIdentificationConfiguration((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(GovernanceDocument),(rep,r)=>new GovernanceDocument((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(GovernancePeriod),(rep,r)=>new GovernancePeriod((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(StandardRegex),(rep,r)=>new StandardRegex((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AnyTableSqlParameter),(rep,r)=>new AnyTableSqlParameter((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(Curation.Data.Plugin),(rep,r)=>new Curation.Data.Plugin((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ANOTable),(rep,r)=>new ANOTable((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateConfiguration),(rep,r)=>new AggregateConfiguration((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateContinuousDateAxis),(rep,r)=>new AggregateContinuousDateAxis((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateDimension),(rep,r)=>new AggregateDimension((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateFilter),(rep,r)=>new AggregateFilter((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateFilterContainer),(rep,r)=>new AggregateFilterContainer((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateFilterParameter),(rep,r)=>new AggregateFilterParameter((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(CatalogueItem),(rep,r)=>new CatalogueItem((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ColumnInfo),(rep,r)=>new ColumnInfo((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(JoinableCohortAggregateConfiguration),(rep,r)=>new JoinableCohortAggregateConfiguration((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(JoinableCohortAggregateConfigurationUse),(rep,r)=>new JoinableCohortAggregateConfigurationUse((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExternalDatabaseServer),(rep,r)=>new ExternalDatabaseServer((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExtractionFilter),(rep,r)=>new ExtractionFilter((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExtractionFilterParameter),(rep,r)=>new ExtractionFilterParameter((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExtractionInformation),(rep,r)=>new ExtractionInformation((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExtractionFilterParameterSet),(rep,r)=>new ExtractionFilterParameterSet((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(LoadMetadata),(rep,r)=>new LoadMetadata((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ExtractionFilterParameterSetValue),(rep,r)=>new ExtractionFilterParameterSetValue((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(LoadModuleAssembly),(rep,r)=>new LoadModuleAssembly((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(LoadProgress),(rep,r)=>new LoadProgress((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(Favourite),(rep,r)=>new Favourite((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(Pipeline),(rep,r)=>new Pipeline((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(Lookup),(rep,r)=>new Lookup((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(AggregateTopX),(rep,r)=>new AggregateTopX((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(PipelineComponent),(rep,r)=>new PipelineComponent((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(LookupCompositeJoinInfo),(rep,r)=>new LookupCompositeJoinInfo((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(PipelineComponentArgument),(rep,r)=>new PipelineComponentArgument((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(PreLoadDiscardedColumn),(rep,r)=>new PreLoadDiscardedColumn((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ProcessTask),(rep,r)=>new ProcessTask((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(DashboardLayout),(rep,r)=>new DashboardLayout((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ProcessTaskArgument),(rep,r)=>new ProcessTaskArgument((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(DashboardControl),(rep,r)=>new DashboardControl((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(DataAccessCredentials),(rep,r)=>new DataAccessCredentials((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(SupportingDocument),(rep,r)=>new SupportingDocument((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(DashboardObjectUse),(rep,r)=>new DashboardObjectUse((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(SupportingSQLTable),(rep,r)=>new SupportingSQLTable((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(TableInfo),(rep,r)=>new TableInfo((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(RemoteRDMP),(rep,r)=>new RemoteRDMP((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ObjectImport),(rep,r)=>new ObjectImport((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ObjectExport),(rep,r)=>new ObjectExport((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(CacheProgress),(rep,r)=>new CacheProgress((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(ConnectionStringKeyword),(rep,r)=>new ConnectionStringKeyword((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(WindowLayout),(rep,r)=>new WindowLayout((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(PermissionWindow),(rep,r)=>new PermissionWindow((ICatalogueRepository)rep, r));
-        Constructors.Add(typeof(TicketingSystemConfiguration),(rep,r)=>new TicketingSystemConfiguration((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(Catalogue), (rep, r) => new Catalogue((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(CohortAggregateContainer),
+            (rep, r) => new CohortAggregateContainer((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(CohortIdentificationConfiguration),
+            (rep, r) => new CohortIdentificationConfiguration((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(GovernanceDocument), (rep, r) => new GovernanceDocument((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(GovernancePeriod), (rep, r) => new GovernancePeriod((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(StandardRegex), (rep, r) => new StandardRegex((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AnyTableSqlParameter),
+            (rep, r) => new AnyTableSqlParameter((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(Curation.Data.Plugin),
+            (rep, r) => new Curation.Data.Plugin((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ANOTable), (rep, r) => new ANOTable((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateConfiguration),
+            (rep, r) => new AggregateConfiguration((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateContinuousDateAxis),
+            (rep, r) => new AggregateContinuousDateAxis((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateDimension), (rep, r) => new AggregateDimension((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateFilter), (rep, r) => new AggregateFilter((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateFilterContainer),
+            (rep, r) => new AggregateFilterContainer((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateFilterParameter),
+            (rep, r) => new AggregateFilterParameter((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(CatalogueItem), (rep, r) => new CatalogueItem((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ColumnInfo), (rep, r) => new ColumnInfo((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(JoinableCohortAggregateConfiguration),
+            (rep, r) => new JoinableCohortAggregateConfiguration((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(JoinableCohortAggregateConfigurationUse),
+            (rep, r) => new JoinableCohortAggregateConfigurationUse((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExternalDatabaseServer),
+            (rep, r) => new ExternalDatabaseServer((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExtractionFilter), (rep, r) => new ExtractionFilter((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExtractionFilterParameter),
+            (rep, r) => new ExtractionFilterParameter((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExtractionInformation),
+            (rep, r) => new ExtractionInformation((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExtractionFilterParameterSet),
+            (rep, r) => new ExtractionFilterParameterSet((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(LoadMetadata), (rep, r) => new LoadMetadata((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ExtractionFilterParameterSetValue),
+            (rep, r) => new ExtractionFilterParameterSetValue((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(LoadModuleAssembly), (rep, r) => new LoadModuleAssembly((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(LoadProgress), (rep, r) => new LoadProgress((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(Favourite), (rep, r) => new Favourite((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(Pipeline), (rep, r) => new Pipeline((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(Lookup), (rep, r) => new Lookup((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(AggregateTopX), (rep, r) => new AggregateTopX((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(PipelineComponent), (rep, r) => new PipelineComponent((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(LookupCompositeJoinInfo),
+            (rep, r) => new LookupCompositeJoinInfo((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(PipelineComponentArgument),
+            (rep, r) => new PipelineComponentArgument((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(PreLoadDiscardedColumn),
+            (rep, r) => new PreLoadDiscardedColumn((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ProcessTask), (rep, r) => new ProcessTask((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(DashboardLayout), (rep, r) => new DashboardLayout((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ProcessTaskArgument),
+            (rep, r) => new ProcessTaskArgument((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(DashboardControl), (rep, r) => new DashboardControl((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(DataAccessCredentials),
+            (rep, r) => new DataAccessCredentials((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(SupportingDocument), (rep, r) => new SupportingDocument((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(DashboardObjectUse), (rep, r) => new DashboardObjectUse((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(SupportingSQLTable), (rep, r) => new SupportingSQLTable((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(TableInfo), (rep, r) => new TableInfo((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(RemoteRDMP), (rep, r) => new RemoteRDMP((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ObjectImport), (rep, r) => new ObjectImport((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ObjectExport), (rep, r) => new ObjectExport((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(CacheProgress), (rep, r) => new CacheProgress((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(ConnectionStringKeyword),
+            (rep, r) => new ConnectionStringKeyword((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(WindowLayout), (rep, r) => new WindowLayout((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(PermissionWindow), (rep, r) => new PermissionWindow((ICatalogueRepository)rep, r));
+        Constructors.Add(typeof(TicketingSystemConfiguration),
+            (rep, r) => new TicketingSystemConfiguration((ICatalogueRepository)rep, r));
         Constructors.Add(typeof(CacheFetchFailure), (rep, r) => new CacheFetchFailure((ICatalogueRepository)rep, r));
     }
 
     /// <inheritdoc/>
-    public LogManager GetDefaultLogManager()
-    {
-        return new LogManager(GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID));
-    }
+    public LogManager GetDefaultLogManager() => new(GetDefaultFor(PermissableDefaults.LiveLoggingServer_ID));
 
     /// <inheritdoc/>
     public IEnumerable<AnyTableSqlParameter> GetAllParametersForParentTable(IMapsDirectlyToDatabaseTable parent)
@@ -186,22 +206,20 @@ protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataRe
     }
 
     private readonly ConcurrentDictionary<Type, IRowVerCache> _caches = new();
+
     public override T[] GetAllObjects<T>()
     {
-        return _caches.GetOrAdd(typeof(T),t=> new RowVerCache<T>(this))
+        return _caches.GetOrAdd(typeof(T), t => new RowVerCache<T>(this))
             .GetAllObjects<T>();
     }
 
-    public override T[] GetAllObjectsNoCache<T>()
-    {
-        return base.GetAllObjects<T>();
-    }
+    public override T[] GetAllObjectsNoCache<T>() => base.GetAllObjects<T>();
 
 
-    public ExternalDatabaseServer[] GetAllDatabases<T>() where T:IPatcher,new()
+    public ExternalDatabaseServer[] GetAllDatabases<T>() where T : IPatcher, new()
     {
         IPatcher p = new T();
-        return GetAllObjects<ExternalDatabaseServer>().Where(s=>s.WasCreatedBy(p)).ToArray();
+        return GetAllObjects<ExternalDatabaseServer>().Where(s => s.WasCreatedBy(p)).ToArray();
     }
 
 
@@ -210,11 +228,9 @@ public ExternalDatabaseServer[] GetAllDatabases<T>() where T:IPatcher,new()
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    public T[] GetReferencesTo<T>(IMapsDirectlyToDatabaseTable o) where T : ReferenceOtherObjectDatabaseEntity
-    {
-        return GetAllObjects<T>(
+    public T[] GetReferencesTo<T>(IMapsDirectlyToDatabaseTable o) where T : ReferenceOtherObjectDatabaseEntity =>
+        GetAllObjects<T>(
             $"WHERE ReferencedObjectID = {o.ID} AND ReferencedObjectType = '{o.GetType().Name}' AND ReferencedObjectRepositoryType = '{o.Repository.GetType().Name}'");
-    }
 
     public bool IsLookupTable(ITableInfo tableInfo)
     {
@@ -232,21 +248,17 @@ select 1
         }
     }
 
-    public Catalogue[] GetAllCataloguesUsing(TableInfo tableInfo)
-    {
-
-        return GetAllObjects<Catalogue>(
+    public Catalogue[] GetAllCataloguesUsing(TableInfo tableInfo) =>
+        GetAllObjects<Catalogue>(
             $@"Where
   Catalogue.ID in (Select CatalogueItem.Catalogue_ID from
   CatalogueItem join
   ColumnInfo on ColumnInfo_ID = ColumnInfo.ID
   where
   TableInfo_ID = {tableInfo.ID} )").ToArray();
-    }
 
     public IExternalDatabaseServer GetDefaultFor(PermissableDefaults field)
     {
-
         if (field == PermissableDefaults.None)
             return null;
 
@@ -262,7 +274,9 @@ public IExternalDatabaseServer GetDefaultFor(PermissableDefaults field)
 
         var executeScalar = cmd.ExecuteScalar();
 
-        return executeScalar == DBNull.Value ? null : GetObjectByID<ExternalDatabaseServer>(Convert.ToInt32(executeScalar));
+        return executeScalar == DBNull.Value
+            ? null
+            : GetObjectByID<ExternalDatabaseServer>(Convert.ToInt32(executeScalar));
     }
 
     public void ClearDefault(PermissableDefaults toDelete)
@@ -273,8 +287,8 @@ public void ClearDefault(PermissableDefaults toDelete)
         Delete("DELETE FROM ServerDefaults WHERE DefaultType=@DefaultType",
             new Dictionary<string, object>
             {
-                {"DefaultType",ServerDefaults.StringExpansionDictionary[toDelete]}
-            },false);
+                { "DefaultType", ServerDefaults.StringExpansionDictionary[toDelete] }
+            }, false);
     }
 
 
@@ -309,8 +323,8 @@ private void UpdateExistingValue(PermissableDefaults toChange, IExternalDatabase
 
         var affectedRows = Update(sql, new Dictionary<string, object>
         {
-            {"DefaultType",ServerDefaults.StringExpansionDictionary[toChange]},
-            {"ExternalDatabaseServer_ID",externalDatabaseServer.ID}
+            { "DefaultType", ServerDefaults.StringExpansionDictionary[toChange] },
+            { "ExternalDatabaseServer_ID", externalDatabaseServer.ID }
         });
 
         if (affectedRows != 1)
@@ -327,8 +341,8 @@ private void InsertNewValue(PermissableDefaults toChange, IExternalDatabaseServe
             "INSERT INTO ServerDefaults(DefaultType,ExternalDatabaseServer_ID) VALUES (@DefaultType,@ExternalDatabaseServer_ID)",
             new Dictionary<string, object>
             {
-                {"DefaultType",ServerDefaults.StringExpansionDictionary[toChange]},
-                {"ExternalDatabaseServer_ID",externalDatabaseServer.ID}
+                { "DefaultType", ServerDefaults.StringExpansionDictionary[toChange] },
+                { "ExternalDatabaseServer_ID", externalDatabaseServer.ID }
             });
     }
 
@@ -373,11 +387,11 @@ public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName,
         return GetAllObjectsWhere<ExtendedProperty>("Name", propertyName)
             .Where(r => r.IsReferenceTo(obj));
     }
+
     /// <inheritdoc/>
-    public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName)
-    {
-        return GetAllObjectsWhere<ExtendedProperty>("Name", propertyName);
-    }
+    public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName) =>
+        GetAllObjectsWhere<ExtendedProperty>("Name", propertyName);
+
     /// <inheritdoc/>
     public IEnumerable<ExtendedProperty> GetExtendedProperties(IMapsDirectlyToDatabaseTable obj)
     {
diff --git a/Rdmp.Core/Repositories/Construction/ObjectConstructor.cs b/Rdmp.Core/Repositories/Construction/ObjectConstructor.cs
index 431e902262..e62b1f633c 100644
--- a/Rdmp.Core/Repositories/Construction/ObjectConstructor.cs
+++ b/Rdmp.Core/Repositories/Construction/ObjectConstructor.cs
@@ -25,17 +25,15 @@ namespace Rdmp.Core.Repositories.Construction;
 /// </summary>
 public class ObjectConstructor
 {
-    private static readonly BindingFlags BindingFlags = BindingFlags.Instance  | BindingFlags.Public| BindingFlags.NonPublic;
+    private static readonly BindingFlags BindingFlags =
+        BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
 
     /// <summary>
     /// Constructs a new instance of Type t using the blank constructor
     /// </summary>
     /// <param name="t"></param>
     /// <returns></returns>
-    public static object Construct(Type t)
-    {
-        return GetUsingBlankConstructor(t);
-    }
+    public static object Construct(Type t) => GetUsingBlankConstructor(t);
 
     #region permissable constructor signatures for use with this class
 
@@ -46,10 +44,9 @@ public static object Construct(Type t)
     /// <param name="serviceLocator"></param>
     /// <param name="allowBlank"></param>
     /// <returns></returns>
-    public static object Construct(Type t, IRDMPPlatformRepositoryServiceLocator serviceLocator,bool allowBlank = true)
-    {
-        return Construct<IRDMPPlatformRepositoryServiceLocator>(t,serviceLocator, allowBlank);
-    }
+    public static object
+        Construct(Type t, IRDMPPlatformRepositoryServiceLocator serviceLocator, bool allowBlank = true) =>
+        Construct<IRDMPPlatformRepositoryServiceLocator>(t, serviceLocator, allowBlank);
 
     /// <summary>
     /// Constructs a new instance of Type t using the default constructor or one that takes an ICatalogueRepository (or any derived class)
@@ -58,10 +55,8 @@ public static object Construct(Type t, IRDMPPlatformRepositoryServiceLocator ser
     /// <param name="catalogueRepository"></param>
     /// <param name="allowBlank"></param>
     /// <returns></returns>
-    public static object Construct(Type t, ICatalogueRepository catalogueRepository, bool allowBlank = true)
-    {
-        return Construct<ICatalogueRepository>(t, catalogueRepository, allowBlank);
-    }
+    public static object Construct(Type t, ICatalogueRepository catalogueRepository, bool allowBlank = true) =>
+        Construct<ICatalogueRepository>(t, catalogueRepository, allowBlank);
 
     /// <summary>
     /// Constructs a new instance of Type objectType by invoking the constructor MyClass(IRepository x, DbDataReader r) (See <see cref="DatabaseEntity"/>).
@@ -71,20 +66,20 @@ public static object Construct(Type t, ICatalogueRepository catalogueRepository,
     /// <param name="repositoryOfTypeT"></param>
     /// <param name="reader"></param>
     /// <returns></returns>
-    public static IMapsDirectlyToDatabaseTable ConstructIMapsDirectlyToDatabaseObject<T>(Type objectType, T repositoryOfTypeT, DbDataReader reader) where T : IRepository
+    public static IMapsDirectlyToDatabaseTable ConstructIMapsDirectlyToDatabaseObject<T>(Type objectType,
+        T repositoryOfTypeT, DbDataReader reader) where T : IRepository
     {
         // Preferred constructor
         var constructors = GetConstructors<T, DbDataReader>(objectType);
 
         if (!constructors.Any())
-        {
             // Fallback constructor
             throw new ObjectLacksCompatibleConstructorException(
                 $"{objectType.Name} requires a constructor ({typeof(T).Name} repo, DbDataReader reader) to be used with ConstructIMapsDirectlyToDatabaseObject");
-        }
 
         return (IMapsDirectlyToDatabaseTable)InvokeBestConstructor(constructors, repositoryOfTypeT, reader);
     }
+
     #endregion
 
     /// <summary>
@@ -129,19 +124,21 @@ private static List<ConstructorInfo> GetConstructors<T>(Type type)
             switch (p.Length)
             {
                 //is it an exact match i.e. ctor(T bob)
-                case 1 when p[0].ParameterType == typeof (T):
+                case 1 when p[0].ParameterType == typeof(T):
                     exactMatch = constructor;
                     break;
                 case 1:
                 {
-                    if(p[0].ParameterType.IsAssignableFrom(typeof(T))) //is it a derived class match i.e. ctor(F bob) where F is a derived class of T
+                    if (p[0].ParameterType
+                        .IsAssignableFrom(
+                            typeof(T))) //is it a derived class match i.e. ctor(F bob) where F is a derived class of T
                         toReturn.Add(constructor);
                     break;
                 }
             }
         }
 
-        return exactMatch != null ? new List<ConstructorInfo>(new []{exactMatch}) : toReturn;
+        return exactMatch != null ? new List<ConstructorInfo>(new[] { exactMatch }) : toReturn;
     }
 
 
@@ -152,7 +149,7 @@ private static List<ConstructorInfo> GetConstructors<T>(Type type)
     /// <typeparam name="T2"></typeparam>
     /// <param name="type"></param>
     /// <returns></returns>
-    private static List<ConstructorInfo> GetConstructors<T,T2>(Type type)
+    private static List<ConstructorInfo> GetConstructors<T, T2>(Type type)
     {
         var toReturn = new List<ConstructorInfo>();
         ConstructorInfo exactMatch = null;
@@ -162,10 +159,10 @@ private static List<ConstructorInfo> GetConstructors<T,T2>(Type type)
             var p = constructor.GetParameters();
 
             if (p.Length == 2)
-                if (p[0].ParameterType == typeof (T) && p[1].ParameterType == typeof (T2))
+                if (p[0].ParameterType == typeof(T) && p[1].ParameterType == typeof(T2))
                     exactMatch = constructor;
-                else
-                if(p[0].ParameterType.IsAssignableFrom(typeof(T)) && p[1].ParameterType.IsAssignableFrom(typeof(T2)))
+                else if (p[0].ParameterType.IsAssignableFrom(typeof(T)) &&
+                         p[1].ParameterType.IsAssignableFrom(typeof(T2)))
                     toReturn.Add(constructor);
         }
 
@@ -174,6 +171,7 @@ private static List<ConstructorInfo> GetConstructors<T,T2>(Type type)
 
         return toReturn;
     }
+
     /// <summary>
     /// Returns all constructors defined for class 'type' which are compatible with any set or subset of the provided parameters.  The return value is a dictionary
     /// of all compatible constructors with the objects needed to invoke them.
@@ -183,23 +181,27 @@ private static List<ConstructorInfo> GetConstructors<T,T2>(Type type)
     /// <param name="allowPrivate"></param>
     /// <param name="parameterObjects"></param>
     /// <returns></returns>
-    public static Dictionary<ConstructorInfo, List<object>> GetConstructors(Type type, bool allowBlankConstructor, bool allowPrivate, params object[] parameterObjects)
+    public static Dictionary<ConstructorInfo, List<object>> GetConstructors(Type type, bool allowBlankConstructor,
+        bool allowPrivate, params object[] parameterObjects)
     {
         var toReturn = new Dictionary<ConstructorInfo, List<object>>();
 
         foreach (var constructor in type.GetConstructors(BindingFlags))
         {
-            if(constructor.IsPrivate && !allowPrivate)
+            if (constructor.IsPrivate && !allowPrivate)
                 continue;
 
             var p = constructor.GetParameters();
 
             //if it is a blank constructor
-            if(!p.Any())
+            if (!p.Any())
+            {
                 if (!allowBlankConstructor) //if we do not allow blank constructors ignore it
                     continue;
                 else
-                    toReturn.Add(constructor, new List<object>()); //otherwise add it to the return list with no objects for invoking (because it's blank duh!)
+                    toReturn.Add(constructor,
+                        new List<object>()); //otherwise add it to the return list with no objects for invoking (because it's blank duh!)
+            }
             else
             {
                 //ok we found a constructor that takes some arguments
@@ -221,8 +223,8 @@ public static Dictionary<ConstructorInfo, List<object>> GetConstructors(Type typ
                         invokeWithObjects.Add(o);
                 }
 
-                if(canInvoke)
-                    toReturn.Add(constructor,invokeWithObjects);
+                if (canInvoke)
+                    toReturn.Add(constructor, invokeWithObjects);
             }
         }
 
@@ -245,10 +247,8 @@ private static object GetBestObjectForPopulating(Type parameterType, params obje
 
         //if there are no exact matches look for an assignable one
         if (matches.Length == 0)
-        {
             //look for an assignable one instead
             matches = parameterObjects.Where(parameterType.IsInstanceOfType).ToArray();
-        }
 
         //if there is one exact match on Type, use that to hydrate it
         if (matches.Length == 1)
@@ -259,7 +259,6 @@ private static object GetBestObjectForPopulating(Type parameterType, params obje
 
         throw new ObjectLacksCompatibleConstructorException(
             $"Could not pick a suitable parameterObject for populating {parameterType} (found {matches.Length} compatible parameter objects)");
-
     }
 
     private static object InvokeBestConstructor(List<ConstructorInfo> constructors, params object[] parameters)
@@ -267,9 +266,10 @@ private static object InvokeBestConstructor(List<ConstructorInfo> constructors,
         if (constructors.Count == 1)
             return constructors[0].Invoke(parameters);
 
-        var importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof (UseWithObjectConstructorAttribute))).ToArray();
-        if(importDecorated.Length == 1)
-            return importDecorated[0].Invoke( parameters);
+        var importDecorated = constructors.Where(c => Attribute.IsDefined(c, typeof(UseWithObjectConstructorAttribute)))
+            .ToArray();
+        if (importDecorated.Length == 1)
+            return importDecorated[0].Invoke(parameters);
 
         throw new ObjectLacksCompatibleConstructorException(
             $"Could not pick the correct constructor between:{Environment.NewLine}{string.Join($"{Environment.NewLine}", constructors.Select(c => $"{c.Name}({string.Join(",", c.GetParameters().Select(p => p.ParameterType))}"))}");
@@ -277,7 +277,9 @@ private static object InvokeBestConstructor(List<ConstructorInfo> constructors,
 
     private static object GetUsingBlankConstructor(Type t)
     {
-        var blankConstructor = t.GetConstructor(Type.EmptyTypes) ?? throw new ObjectLacksCompatibleConstructorException($"Type '{t}' did not contain a blank constructor");
+        var blankConstructor = t.GetConstructor(Type.EmptyTypes) ??
+                               throw new ObjectLacksCompatibleConstructorException(
+                                   $"Type '{t}' did not contain a blank constructor");
         return blankConstructor.Invoke(Array.Empty<object>());
     }
 
@@ -286,10 +288,7 @@ private static object GetUsingBlankConstructor(Type t)
     /// </summary>
     /// <param name="arg"></param>
     /// <returns></returns>
-    public static bool HasBlankConstructor(Type arg)
-    {
-        return arg.GetConstructor(Type.EmptyTypes) != null;
-    }
+    public static bool HasBlankConstructor(Type arg) => arg.GetConstructor(Type.EmptyTypes) != null;
 
     /// <summary>
     /// Attempts to construct an instance of Type typeToConstruct using the provided constructorValues.  This must match on parameter number but ignores order
@@ -317,7 +316,6 @@ public static object ConstructIfPossible(Type typeToConstruct, params object[] c
             var isCompatible = true;
 
             for (var index = 0; index < constructorValues.Length; index++)
-            {
                 //if we have been given a null value for this parameter
                 if (constructorValues[index] == null)
                 {
@@ -325,17 +323,17 @@ public static object ConstructIfPossible(Type typeToConstruct, params object[] c
                     if (p[index].ParameterType.IsEnum || p[index].ParameterType.IsValueType)
                         isCompatible = false;
                 }
-                else
-                if (!p[index].ParameterType.IsInstanceOfType(constructorValues[index]))
+                else if (!p[index].ParameterType.IsInstanceOfType(constructorValues[index]))
+                {
                     isCompatible = false;
-            }
+                }
 
-            if(isCompatible)
+            if (isCompatible)
                 compatible.Add(constructor);
         }
 
         if (compatible.Any())
-            return InvokeBestConstructor(compatible,constructorValues);
+            return InvokeBestConstructor(compatible, constructorValues);
 
         return null;
     }
@@ -363,7 +361,7 @@ public static ConstructorInfo GetRepositoryConstructor(Type type)
                 continue;
 
             //at least one parameter must be an IRepository
-            if(!parameters.Any(p=>typeof(IRepository).IsAssignableFrom(p.ParameterType)))
+            if (!parameters.Any(p => typeof(IRepository).IsAssignableFrom(p.ParameterType)))
                 continue;
 
             //yay it's compatible
diff --git a/Rdmp.Core/Repositories/Construction/ObjectLacksCompatibleConstructorException.cs b/Rdmp.Core/Repositories/Construction/ObjectLacksCompatibleConstructorException.cs
index 00fe75ba34..475453a5d7 100644
--- a/Rdmp.Core/Repositories/Construction/ObjectLacksCompatibleConstructorException.cs
+++ b/Rdmp.Core/Repositories/Construction/ObjectLacksCompatibleConstructorException.cs
@@ -17,8 +17,7 @@ public class ObjectLacksCompatibleConstructorException : Exception
     /// Creates a new exception describing that a Type the user requested does not have any constructors that match the signature requested
     /// </summary>
     /// <param name="msg"></param>
-    public ObjectLacksCompatibleConstructorException(string msg):base(msg)
+    public ObjectLacksCompatibleConstructorException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Construction/UseWithObjectConstructorAttribute.cs b/Rdmp.Core/Repositories/Construction/UseWithObjectConstructorAttribute.cs
index 7c9900ff73..85a3c14de1 100644
--- a/Rdmp.Core/Repositories/Construction/UseWithObjectConstructorAttribute.cs
+++ b/Rdmp.Core/Repositories/Construction/UseWithObjectConstructorAttribute.cs
@@ -15,5 +15,4 @@ namespace Rdmp.Core.Repositories.Construction;
 [AttributeUsage(AttributeTargets.Constructor)]
 public class UseWithObjectConstructorAttribute : Attribute
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/DQERepository.cs b/Rdmp.Core/Repositories/DQERepository.cs
index b7df208972..de3963e6c6 100644
--- a/Rdmp.Core/Repositories/DQERepository.cs
+++ b/Rdmp.Core/Repositories/DQERepository.cs
@@ -44,7 +44,8 @@ public DQERepository(ICatalogueRepository catalogueRepository)
     {
         CatalogueRepository = catalogueRepository;
 
-        var server = CatalogueRepository.GetDefaultFor(PermissableDefaults.DQE) ?? throw new NotSupportedException("There is no DataQualityEngine Reporting Server (ExternalDatabaseServer).  You will need to create/set one in CatalogueManager by using 'Locations=>Manage External Servers...'");
+        var server = CatalogueRepository.GetDefaultFor(PermissableDefaults.DQE) ?? throw new NotSupportedException(
+            "There is no DataQualityEngine Reporting Server (ExternalDatabaseServer).  You will need to create/set one in CatalogueManager by using 'Locations=>Manage External Servers...'");
         DiscoveredServer = DataAccessPortal.ExpectServer(server, DataAccessContext.InternalDataProcessing);
         _connectionStringBuilder = DiscoveredServer.Builder;
     }
@@ -73,18 +74,14 @@ public Evaluation GetMostRecentEvaluationFor(ICatalogue c)
     /// <inheritdoc/>
     public IEnumerable<Evaluation> GetAllEvaluationsFor(ICatalogue catalogue)
     {
-        return GetAllObjects<Evaluation>($"where CatalogueID = {catalogue.ID }").OrderBy(e => e.DateOfEvaluation);
+        return GetAllObjects<Evaluation>($"where CatalogueID = {catalogue.ID}").OrderBy(e => e.DateOfEvaluation);
     }
 
     /// <inheritdoc/>
-    public bool HasEvaluations(ICatalogue catalogue)
-    {
-        return GetAllEvaluationsFor(catalogue).Any();
-    }
+    public bool HasEvaluations(ICatalogue catalogue) => GetAllEvaluationsFor(catalogue).Any();
 
     private readonly ObjectConstructor _constructor = new();
-    protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader)
-    {
-        return ObjectConstructor.ConstructIMapsDirectlyToDatabaseObject(t,this, reader);
-    }
+
+    protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader) =>
+        ObjectConstructor.ConstructIMapsDirectlyToDatabaseObject(t, this, reader);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/DataExportRepository.cs b/Rdmp.Core/Repositories/DataExportRepository.cs
index 2ba67167f2..d33b40e728 100644
--- a/Rdmp.Core/Repositories/DataExportRepository.cs
+++ b/Rdmp.Core/Repositories/DataExportRepository.cs
@@ -44,41 +44,52 @@ public class DataExportRepository : TableRepository, IDataExportRepository
 
     private Lazy<Dictionary<int, List<int>>> _packageContentsDictionary;
 
-    public DataExportRepository(DbConnectionStringBuilder connectionString, ICatalogueRepository catalogueRepository) : base(null, connectionString)
+    public DataExportRepository(DbConnectionStringBuilder connectionString, ICatalogueRepository catalogueRepository) :
+        base(null, connectionString)
     {
         CatalogueRepository = catalogueRepository;
-            
+
         FilterManager = new DataExportFilterManager(this);
 
         _packageContentsDictionary = new Lazy<Dictionary<int, List<int>>>(GetPackageContentsDictionary);
 
-        DataExportPropertyManager = new DataExportPropertyManager(false,this);
-
-        Constructors.Add(typeof(SupplementalExtractionResults),(rep,r)=>new SupplementalExtractionResults((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(CumulativeExtractionResults),(rep,r)=>new CumulativeExtractionResults((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(DeployedExtractionFilter),(rep,r)=>new DeployedExtractionFilter((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(DeployedExtractionFilterParameter),(rep,r)=>new DeployedExtractionFilterParameter((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExternalCohortTable),(rep,r)=>new ExternalCohortTable((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExtractableCohort),(rep,r)=>new ExtractableCohort((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExtractableColumn),(rep,r)=>new ExtractableColumn((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExtractableDataSet),(rep,r)=>new ExtractableDataSet((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExtractionConfiguration),(rep,r)=>new ExtractionConfiguration((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(FilterContainer),(rep,r)=>new FilterContainer((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(GlobalExtractionFilterParameter),(rep,r)=>new GlobalExtractionFilterParameter((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(Project),(rep,r)=>new Project((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(SelectedDataSets),(rep,r)=>new SelectedDataSets((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ExtractableDataSetPackage),(rep,r)=>new ExtractableDataSetPackage((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(ProjectCohortIdentificationConfigurationAssociation),(rep,r)=>new ProjectCohortIdentificationConfigurationAssociation((IDataExportRepository)rep,r));
-        Constructors.Add(typeof(SelectedDataSetsForcedJoin), (rep, r) => new SelectedDataSetsForcedJoin((IDataExportRepository)rep, r));
+        DataExportPropertyManager = new DataExportPropertyManager(false, this);
+
+        Constructors.Add(typeof(SupplementalExtractionResults),
+            (rep, r) => new SupplementalExtractionResults((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(CumulativeExtractionResults),
+            (rep, r) => new CumulativeExtractionResults((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(DeployedExtractionFilter),
+            (rep, r) => new DeployedExtractionFilter((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(DeployedExtractionFilterParameter),
+            (rep, r) => new DeployedExtractionFilterParameter((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExternalCohortTable),
+            (rep, r) => new ExternalCohortTable((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExtractableCohort), (rep, r) => new ExtractableCohort((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExtractableColumn), (rep, r) => new ExtractableColumn((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExtractableDataSet), (rep, r) => new ExtractableDataSet((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExtractionConfiguration),
+            (rep, r) => new ExtractionConfiguration((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(FilterContainer), (rep, r) => new FilterContainer((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(GlobalExtractionFilterParameter),
+            (rep, r) => new GlobalExtractionFilterParameter((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(Project), (rep, r) => new Project((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(SelectedDataSets), (rep, r) => new SelectedDataSets((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ExtractableDataSetPackage),
+            (rep, r) => new ExtractableDataSetPackage((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(ProjectCohortIdentificationConfigurationAssociation),
+            (rep, r) => new ProjectCohortIdentificationConfigurationAssociation((IDataExportRepository)rep, r));
+        Constructors.Add(typeof(SelectedDataSetsForcedJoin),
+            (rep, r) => new SelectedDataSetsForcedJoin((IDataExportRepository)rep, r));
     }
-        
-    public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(IExtractionConfiguration configuration, IExtractableDataSet dataset)
-    {
-        return GetAllObjects<CumulativeExtractionResults>(
+
+    public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(
+        IExtractionConfiguration configuration, IExtractableDataSet dataset) =>
+        GetAllObjects<CumulativeExtractionResults>(
             $"WHERE ExtractionConfiguration_ID={configuration.ID}AND ExtractableDataSet_ID={dataset.ID}");
-    }
 
     private readonly ObjectConstructor _constructor = new();
+
     protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader)
     {
         if (Constructors.TryGetValue(t, out var constructor))
@@ -86,7 +97,7 @@ protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataRe
 
         return ObjectConstructor.ConstructIMapsDirectlyToDatabaseObject<IDataExportRepository>(t, this, reader);
     }
-        
+
     public CatalogueExtractabilityStatus GetExtractabilityStatus(ICatalogue c)
     {
         var eds = GetAllObjectsWithParent<ExtractableDataSet>(c).SingleOrDefault();
@@ -95,10 +106,9 @@ public CatalogueExtractabilityStatus GetExtractabilityStatus(ICatalogue c)
 
         return eds.GetCatalogueExtractabilityStatus();
     }
-        
-    public ISelectedDataSets[] GetSelectedDatasetsWithNoExtractionIdentifiers()
-    {
-        return SelectAll<SelectedDataSets>(@"
+
+    public ISelectedDataSets[] GetSelectedDatasetsWithNoExtractionIdentifiers() =>
+        SelectAll<SelectedDataSets>(@"
 SELECT ID  FROM SelectedDataSets sds
 where not exists (
 select 1 FROM ExtractableColumn ec where 
@@ -108,24 +118,18 @@ select 1 FROM ExtractableColumn ec where
 AND
 ec.ExtractionConfiguration_ID = sds.ExtractionConfiguration_ID
 )", "ID").ToArray();
-    }
 
     private readonly Dictionary<Type, IRowVerCache> _caches = new();
 
     public override T[] GetAllObjects<T>()
     {
-        if (!_caches.ContainsKey(typeof(T))) 
+        if (!_caches.ContainsKey(typeof(T)))
             _caches.Add(typeof(T), new RowVerCache<T>(this));
 
         return _caches[typeof(T)].GetAllObjects<T>();
     }
 
-    public override T[] GetAllObjectsNoCache<T>()
-    {
-        return base.GetAllObjects<T>();
-    }
-
-
+    public override T[] GetAllObjectsNoCache<T>() => base.GetAllObjects<T>();
 
 
     /// <inheritdoc/>
@@ -144,7 +148,10 @@ public Dictionary<int, List<int>> GetPackageContentsDictionary()
         var toReturn = new Dictionary<int, List<int>>();
 
         using var con = GetConnection();
-        using var r = DiscoveredServer.GetCommand("SELECT * FROM ExtractableDataSetPackage_ExtractableDataSet ORDER BY ExtractableDataSetPackage_ID", con).ExecuteReader();
+        using var r = DiscoveredServer
+            .GetCommand(
+                "SELECT * FROM ExtractableDataSetPackage_ExtractableDataSet ORDER BY ExtractableDataSetPackage_ID", con)
+            .ExecuteReader();
 
         var lastPackageId = -1;
         while (r.Read())
@@ -178,9 +185,14 @@ public void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractable
     {
         if (_packageContentsDictionary.Value.TryGetValue(package.ID, out var contents))
         {
-            if (contents.Contains(dataSet.ID)) throw new ArgumentException($"dataSet {dataSet} is already part of package '{package}'", nameof(dataSet));
-        } else
-            _packageContentsDictionary.Value.Add(package.ID, contents=new List<int>());
+            if (contents.Contains(dataSet.ID))
+                throw new ArgumentException($"dataSet {dataSet} is already part of package '{package}'",
+                    nameof(dataSet));
+        }
+        else
+        {
+            _packageContentsDictionary.Value.Add(package.ID, contents = new List<int>());
+        }
 
         using (var con = GetConnection())
         {
@@ -206,7 +218,8 @@ public void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractable
     public void RemoveDataSetFromPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
     {
         if (!_packageContentsDictionary.Value[package.ID].Contains(dataSet.ID))
-            throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed", nameof(dataSet));
+            throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed",
+                nameof(dataSet));
 
         using (var con = GetConnection())
         {
@@ -225,7 +238,8 @@ public IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativ
             .GetCommand($@"SELECT *
                                     FROM ReleaseLog
                                     where
-                                    CumulativeExtractionResults_ID = {cumulativeExtractionResults.ID}", con.Connection, con.Transaction);
+                                    CumulativeExtractionResults_ID = {cumulativeExtractionResults.ID}", con.Connection,
+                con.Transaction);
         using var r = cmdselect.ExecuteReader();
         return r.Read() ? new ReleaseLog(this, r) : null;
     }
diff --git a/Rdmp.Core/Repositories/ICatalogueRepository.cs b/Rdmp.Core/Repositories/ICatalogueRepository.cs
index aecba03ce2..4712c6338f 100644
--- a/Rdmp.Core/Repositories/ICatalogueRepository.cs
+++ b/Rdmp.Core/Repositories/ICatalogueRepository.cs
@@ -120,6 +120,7 @@ public interface ICatalogueRepository : IRepository, IServerDefaults
     /// </summary>
     /// <returns></returns>
     bool IsLookupTable(ITableInfo tableInfo);
+
     void SetEncryptionKeyPath(string fullName);
 
     /// <summary>
@@ -135,6 +136,7 @@ public interface ICatalogueRepository : IRepository, IServerDefaults
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
     ExternalDatabaseServer[] GetAllDatabases<T>() where T : IPatcher, new();
+
     void DeleteEncryptionKeyPath();
 
     /// <summary>
diff --git a/Rdmp.Core/Repositories/IDataExportRepository.cs b/Rdmp.Core/Repositories/IDataExportRepository.cs
index fdb728800c..db8a140e52 100644
--- a/Rdmp.Core/Repositories/IDataExportRepository.cs
+++ b/Rdmp.Core/Repositories/IDataExportRepository.cs
@@ -33,9 +33,11 @@ public interface IDataExportRepository : IRepository, IExtractableDataSetPackage
     /// Handles forbidding deleting stuff / cascading deletes into other objects
     /// </summary>
     IObscureDependencyFinder ObscureDependencyFinder { get; set; }
-        
+
     IDataExportPropertyManager DataExportPropertyManager { get; }
-        
-    IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(IExtractionConfiguration configuration, IExtractableDataSet dataset);
+
+    IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(
+        IExtractionConfiguration configuration, IExtractableDataSet dataset);
+
     IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativeExtractionResults);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/IRDMPPlatformRepositoryServiceLocator.cs b/Rdmp.Core/Repositories/IRDMPPlatformRepositoryServiceLocator.cs
index a436a2ecba..cf09f63b9e 100644
--- a/Rdmp.Core/Repositories/IRDMPPlatformRepositoryServiceLocator.cs
+++ b/Rdmp.Core/Repositories/IRDMPPlatformRepositoryServiceLocator.cs
@@ -15,7 +15,8 @@ namespace Rdmp.Core.Repositories;
 /// A class which can find the location (connection strings) of the of Catalogue and Data Export databases.  This might come from a user settings file or from a 
 /// config file or whatever (depending on how you implement this interface).
 /// </summary>
-public interface IRDMPPlatformRepositoryServiceLocator: ICatalogueRepositoryServiceLocator,IDataExportRepositoryServiceLocator
+public interface IRDMPPlatformRepositoryServiceLocator : ICatalogueRepositoryServiceLocator,
+    IDataExportRepositoryServiceLocator
 {
     /// <summary>
     /// Cross repository method equivallent to GetObjectByID mostly used in persistence recovery (when you startup RDMP after closing it down before).  It is better
@@ -25,8 +26,9 @@ public interface IRDMPPlatformRepositoryServiceLocator: ICatalogueRepositoryServ
     /// <param name="databaseObjectTypeName"></param>
     /// <param name="objectID"></param>
     /// <returns></returns>
-    IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName, string databaseObjectTypeName,int objectID);
-        
+    IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName, string databaseObjectTypeName,
+        int objectID);
+
     bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID);
 
     /// <summary>
@@ -46,7 +48,7 @@ public interface IRDMPPlatformRepositoryServiceLocator: ICatalogueRepositoryServ
     /// <param name="t"></param>
     /// <param name="value"></param>
     /// <returns></returns>
-    IMapsDirectlyToDatabaseTable GetObjectByID(Type t,int value);
+    IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value);
 
     /// <summary>
     /// Returns all repositories (including plugin repositories if supported) known about by this
diff --git a/Rdmp.Core/Repositories/MEF.cs b/Rdmp.Core/Repositories/MEF.cs
index 740123e4c7..9dbadd115c 100644
--- a/Rdmp.Core/Repositories/MEF.cs
+++ b/Rdmp.Core/Repositories/MEF.cs
@@ -42,15 +42,18 @@ public MEF()
 
         try
         {
-            _MEFPathAsString = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "MEF");
+            _MEFPathAsString =
+                Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "MEF");
         }
-        catch (Exception)//couldn't get the AppData/MEF directory so instead go to .\MEF\
+        catch (Exception) //couldn't get the AppData/MEF directory so instead go to .\MEF\
         {
             if (_localPath == null)
-                throw new Exception("ApplicationData was not available to download MEF and neither apparently was Assembly.GetExecutingAssembly().GetName().CodeBase");
+                throw new Exception(
+                    "ApplicationData was not available to download MEF and neither apparently was Assembly.GetExecutingAssembly().GetName().CodeBase");
 
             _MEFPathAsString = Path.Combine(_localPath, "MEF");
         }
+
         DownloadDirectory = new DirectoryInfo(_MEFPathAsString);
     }
 
@@ -66,90 +69,94 @@ public MEF()
     /// <param name="type"></param>
     /// <returns></returns>
     public Type GetType(string type)
-    {            
-        if(string.IsNullOrWhiteSpace(type))
+    {
+        if (string.IsNullOrWhiteSpace(type))
             throw new ArgumentNullException(nameof(type));
 
-        if(TypeNotKnown.Contains(type))
+        if (TypeNotKnown.Contains(type))
             return null;
 
         if (SafeDirectoryCatalog.TypesByName.TryGetValue(type, out var type1)) return type1;
         var toReturn = Type.GetType(type);
-                
+
         //If they are looking for the Type name without the namespace that's bad
-        if(toReturn == null)
-            if(!type.Contains('.'))
+        if (toReturn == null)
+            if (!type.Contains('.'))
             {
                 //can we find one in Core with that name e.g. "Plugin" or "plugin"
                 toReturn =
-                    typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t=>t.Name.Equals(type))
-                    ??typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t=>t.Name.Equals(type,StringComparison.InvariantCultureIgnoreCase));
+                    typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t => t.Name.Equals(type))
+                    ?? typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t =>
+                        t.Name.Equals(type, StringComparison.InvariantCultureIgnoreCase));
 
                 //no, anyone else got one?
-                if(toReturn == null)
+                if (toReturn == null)
                 {
-                    var matches = SafeDirectoryCatalog.TypesByName.Values.Where(t=>t.Name.Equals(type)).ToArray();
+                    var matches = SafeDirectoryCatalog.TypesByName.Values.Where(t => t.Name.Equals(type)).ToArray();
 
                     //try caseless
-                    if(matches.Length == 0)
-                        matches = SafeDirectoryCatalog.TypesByName.Values.Where(t=>t.Name.Equals(type,StringComparison.InvariantCultureIgnoreCase)).ToArray();
+                    if (matches.Length == 0)
+                        matches = SafeDirectoryCatalog.TypesByName.Values.Where(t =>
+                            t.Name.Equals(type, StringComparison.InvariantCultureIgnoreCase)).ToArray();
 
                     //great there's only one
-                    if(matches.Length == 1)
+                    if (matches.Length == 1)
                         toReturn = matches[0];
-                    else if(matches.Length > 1) //nope looks like everyone has a class called MyClass
+                    else if (matches.Length > 1) //nope looks like everyone has a class called MyClass
                         throw new AmbiguousTypeException($"Found {matches.Length} Types called '{type}'");
                 }
             }
             else
             {
                 //ok they are lying about the Type.  It's not MyLib.Myclass but maybe we still have a Myclass in Rdmp.Core?
-                var name = type[(type.LastIndexOf('.')+1)..];
+                var name = type[(type.LastIndexOf('.') + 1)..];
                 toReturn =
-                    typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t=>t.Name.Equals(name))
-                    ?? typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t=>t.Name.Equals(name,StringComparison.InvariantCultureIgnoreCase));
+                    typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t => t.Name.Equals(name))
+                    ?? typeof(Catalogue).Assembly.ExportedTypes.SingleOrDefault(t =>
+                        t.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
 
                 //no, anyone else got one?
-                if(toReturn == null)
+                if (toReturn == null)
                 {
-                    var matches = SafeDirectoryCatalog.TypesByName.Values.Where(t=>t.Name.Equals(name)).ToArray();
+                    var matches = SafeDirectoryCatalog.TypesByName.Values.Where(t => t.Name.Equals(name)).ToArray();
 
                     //try caseless
-                    if(matches.Length == 0)
-                        matches =  SafeDirectoryCatalog.TypesByName.Values.Where(t=>t.Name.Equals(name,StringComparison.InvariantCultureIgnoreCase)).ToArray();
+                    if (matches.Length == 0)
+                        matches = SafeDirectoryCatalog.TypesByName.Values.Where(t =>
+                            t.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase)).ToArray();
 
                     //great there's only one
-                    if(matches.Length == 1)
+                    if (matches.Length == 1)
                         toReturn = matches[0];
-                    else if(matches.Length > 1) //nope looks like everyone has a class called MyClass
+                    else if (matches.Length > 1) //nope looks like everyone has a class called MyClass
                         throw new AmbiguousTypeException($"Found {matches.Length} Types called '{type}'");
                 }
             }
 
-        if(toReturn == null)
+        if (toReturn == null)
         {
             TypeNotKnown.Add(type);
             return null;
         }
-                
+
         //we know about it now!
         SafeDirectoryCatalog.AddType(toReturn, type);
 
         return toReturn;
-
-
     }
+
     public Type GetType(string type, Type expectedBaseClass)
     {
         var t = GetType(type);
 
-        if(!expectedBaseClass.IsAssignableFrom(t))
+        if (!expectedBaseClass.IsAssignableFrom(t))
             throw new Exception(
                 $"Found Type '{type}' did not implement expected base class/interface '{expectedBaseClass}'");
 
 
         return t;
     }
+
     public void Setup(SafeDirectoryCatalog result)
     {
         SafeDirectoryCatalog = result;
@@ -195,7 +202,8 @@ public static string GetMEFNameForType(Type t)
     {
         if (!t.IsGenericType) return t.FullName;
         if (t.GenericTypeArguments.Length != 1)
-            throw new NotSupportedException("Generic type has more than 1 token (e.g. T1,T2) so no idea what MEF would call it");
+            throw new NotSupportedException(
+                "Generic type has more than 1 token (e.g. T1,T2) so no idea what MEF would call it");
         var genericTypeName = t.GetGenericTypeDefinition().FullName;
 
         Debug.Assert(genericTypeName.EndsWith("`1"));
@@ -203,7 +211,6 @@ public static string GetMEFNameForType(Type t)
 
         var underlyingType = t.GenericTypeArguments.Single().FullName;
         return $"{genericTypeName}({underlyingType})";
-
     }
 
     /// <summary>
@@ -220,7 +227,8 @@ public static string GetCSharpNameForType(Type t)
     {
         if (!t.IsGenericType) return t.Name;
         if (t.GenericTypeArguments.Length != 1)
-            throw new NotSupportedException("Generic type has more than 1 token (e.g. T1,T2) so no idea what MEF would call it");
+            throw new NotSupportedException(
+                "Generic type has more than 1 token (e.g. T1,T2) so no idea what MEF would call it");
         var genericTypeName = t.GetGenericTypeDefinition().Name;
 
         Debug.Assert(genericTypeName.EndsWith("`1"));
@@ -228,7 +236,6 @@ public static string GetCSharpNameForType(Type t)
 
         var underlyingType = t.GenericTypeArguments.Single().Name;
         return $"{genericTypeName}<{underlyingType}>";
-
     }
 
     public void CheckForVersionMismatches(ICheckNotifier notifier)
@@ -253,6 +260,7 @@ public void CheckForVersionMismatches(ICheckNotifier notifier)
                     , CheckResult.Warning, null));
         }
     }
+
     public IEnumerable<Type> GetTypes<T>()
     {
         SetupMEFIfRequired();
@@ -261,7 +269,7 @@ public IEnumerable<Type> GetTypes<T>()
     }
 
     private object _cachedImplementationsLock = new();
-    private Dictionary<Type,Type[]> _cachedImplementations = new();
+    private Dictionary<Type, Type[]> _cachedImplementations = new();
 
     /// <summary>
     /// Returns MEF exported Types which inherit or implement <paramref name="type"/>.  E.g. pass IAttacher to see
@@ -273,13 +281,14 @@ public IEnumerable<Type> GetTypes(Type type)
     {
         SetupMEFIfRequired();
 
-        lock(_cachedImplementationsLock)
+        lock (_cachedImplementationsLock)
         {
-            if(_cachedImplementations.TryGetValue(type, out var types))
+            if (_cachedImplementations.TryGetValue(type, out var types))
                 return types;
 
-            var results = SafeDirectoryCatalog.GetAllTypes().Where(t=>type.IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
-            _cachedImplementations.Add(type,results);
+            var results = SafeDirectoryCatalog.GetAllTypes()
+                .Where(t => type.IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
+            _cachedImplementations.Add(type, results);
             return results;
         }
     }
@@ -290,10 +299,8 @@ public IEnumerable<Type> GetTypes(Type type)
     /// <param name="genericType"></param>
     /// <param name="typeOfT"></param>
     /// <returns></returns>
-    public IEnumerable<Type> GetGenericTypes(Type genericType, Type typeOfT)
-    {
-        return GetTypes(genericType.MakeGenericType(typeOfT));
-    }
+    public IEnumerable<Type> GetGenericTypes(Type genericType, Type typeOfT) =>
+        GetTypes(genericType.MakeGenericType(typeOfT));
 
     public IEnumerable<Type> GetAllTypes()
     {
@@ -318,9 +325,9 @@ public T CreateA<T>(string typeToCreate, params object[] args)
             throw new Exception(
                 $"Requested typeToCreate '{typeToCreate}' was not assignable to the required Type '{typeof(T).Name}'");
 
-        var instance = (T)ObjectConstructor.ConstructIfPossible(typeToCreateAsType,args) ?? throw new ObjectLacksCompatibleConstructorException(
-                $"Could not construct a {typeof(T)} using the {args.Length} constructor arguments");
+        var instance = (T)ObjectConstructor.ConstructIfPossible(typeToCreateAsType, args) ??
+                       throw new ObjectLacksCompatibleConstructorException(
+                           $"Could not construct a {typeof(T)} using the {args.Length} constructor arguments");
         return instance;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/AggregateFilterManager.cs b/Rdmp.Core/Repositories/Managers/AggregateFilterManager.cs
index 2f30e26ccd..c693344cbd 100644
--- a/Rdmp.Core/Repositories/Managers/AggregateFilterManager.cs
+++ b/Rdmp.Core/Repositories/Managers/AggregateFilterManager.cs
@@ -20,33 +20,28 @@ public AggregateFilterManager(CatalogueRepository catalogueRepository)
         _catalogueRepository = catalogueRepository;
     }
 
-    public virtual IContainer[] GetSubContainers(IContainer container)
-    {
-        return 
-            _catalogueRepository.SelectAll<AggregateFilterContainer>(
-                $"SELECT AggregateFilterContainer_ChildID FROM AggregateFilterSubContainer WHERE AggregateFilterContainer_ParentID={container.ID}",
-                "AggregateFilterContainer_ChildID").ToArray();
-    }
+    public virtual IContainer[] GetSubContainers(IContainer container) =>
+        _catalogueRepository.SelectAll<AggregateFilterContainer>(
+            $"SELECT AggregateFilterContainer_ChildID FROM AggregateFilterSubContainer WHERE AggregateFilterContainer_ParentID={container.ID}",
+            "AggregateFilterContainer_ChildID").ToArray();
 
     public void MakeIntoAnOrphan(IContainer container)
     {
-        _catalogueRepository.Delete("DELETE FROM AggregateFilterSubContainer WHERE AggregateFilterContainer_ChildID = @AggregateFilterContainer_ChildID", new Dictionary<string, object>
-        {
-            {"AggregateFilterContainer_ChildID", container.ID}
-        },false);
+        _catalogueRepository.Delete(
+            "DELETE FROM AggregateFilterSubContainer WHERE AggregateFilterContainer_ChildID = @AggregateFilterContainer_ChildID",
+            new Dictionary<string, object>
+            {
+                { "AggregateFilterContainer_ChildID", container.ID }
+            }, false);
     }
 
-    public IContainer GetParentContainerIfAny(IContainer container)
-    {
-        return _catalogueRepository.SelectAll<AggregateFilterContainer>(
+    public IContainer GetParentContainerIfAny(IContainer container) =>
+        _catalogueRepository.SelectAll<AggregateFilterContainer>(
             $"SELECT AggregateFilterContainer_ParentID FROM AggregateFilterSubContainer WHERE AggregateFilterContainer_ChildID={container.ID}",
             "AggregateFilterContainer_ParentID").SingleOrDefault();
-    }
 
-    public virtual IFilter[] GetFilters(IContainer container)
-    {
-        return _catalogueRepository.GetAllObjectsWhere<AggregateFilter>("FilterContainer_ID", container.ID).ToArray();
-    }
+    public virtual IFilter[] GetFilters(IContainer container) => _catalogueRepository
+        .GetAllObjectsWhere<AggregateFilter>("FilterContainer_ID", container.ID).ToArray();
 
     public void AddSubContainer(IContainer parent, IContainer child)
     {
@@ -54,11 +49,11 @@ public void AddSubContainer(IContainer parent, IContainer child)
             "INSERT INTO AggregateFilterSubContainer(AggregateFilterContainer_ParentID,AggregateFilterContainer_ChildID) VALUES (@AggregateFilterContainer_ParentID,@AggregateFilterContainer_ChildID)",
             new Dictionary<string, object>
             {
-                {"AggregateFilterContainer_ParentID", parent.ID},
-                {"AggregateFilterContainer_ChildID", child.ID}
+                { "AggregateFilterContainer_ParentID", parent.ID },
+                { "AggregateFilterContainer_ChildID", child.ID }
             });
     }
-        
+
     public void AddChild(IContainer container, IFilter filter)
     {
         filter.FilterContainer_ID = container.ID;
diff --git a/Rdmp.Core/Repositories/Managers/CohortContainerManager.cs b/Rdmp.Core/Repositories/Managers/CohortContainerManager.cs
index 568e597956..85336f99fb 100644
--- a/Rdmp.Core/Repositories/Managers/CohortContainerManager.cs
+++ b/Rdmp.Core/Repositories/Managers/CohortContainerManager.cs
@@ -23,47 +23,46 @@ public CohortContainerManager(CatalogueRepository catalogueRepository)
         CatalogueRepository = catalogueRepository;
     }
 
-    public CohortAggregateContainer GetParent(AggregateConfiguration child)
-    {
-        return
-            CatalogueRepository.SelectAllWhere<CohortAggregateContainer>(
-                "SELECT CohortAggregateContainer_ID FROM CohortAggregateContainer_AggregateConfiguration WHERE AggregateConfiguration_ID = @AggregateConfiguration_ID",
-                "CohortAggregateContainer_ID",
-                new Dictionary<string, object>
-                {
-                    {"AggregateConfiguration_ID", child.ID}
-                }).SingleOrDefault();
-    }
+    public CohortAggregateContainer GetParent(AggregateConfiguration child) =>
+        CatalogueRepository.SelectAllWhere<CohortAggregateContainer>(
+            "SELECT CohortAggregateContainer_ID FROM CohortAggregateContainer_AggregateConfiguration WHERE AggregateConfiguration_ID = @AggregateConfiguration_ID",
+            "CohortAggregateContainer_ID",
+            new Dictionary<string, object>
+            {
+                { "AggregateConfiguration_ID", child.ID }
+            }).SingleOrDefault();
 
-    public void Add(CohortAggregateContainer parent, AggregateConfiguration child,int order)
+    public void Add(CohortAggregateContainer parent, AggregateConfiguration child, int order)
     {
-
         CatalogueRepository.Insert(
             "INSERT INTO CohortAggregateContainer_AggregateConfiguration (CohortAggregateContainer_ID, AggregateConfiguration_ID, [Order]) VALUES (@CohortAggregateContainer_ID, @AggregateConfiguration_ID, @Order)",
             new Dictionary<string, object>
             {
-                {"CohortAggregateContainer_ID", parent.ID},
-                {"AggregateConfiguration_ID", child.ID},
-                {"Order", order}
+                { "CohortAggregateContainer_ID", parent.ID },
+                { "AggregateConfiguration_ID", child.ID },
+                { "Order", order }
             });
-
     }
 
-    public void Remove(CohortAggregateContainer parent,AggregateConfiguration child)
+    public void Remove(CohortAggregateContainer parent, AggregateConfiguration child)
     {
-        CatalogueRepository.Delete("DELETE FROM CohortAggregateContainer_AggregateConfiguration WHERE CohortAggregateContainer_ID = @CohortAggregateContainer_ID AND AggregateConfiguration_ID = @AggregateConfiguration_ID", new Dictionary<string, object>
-        {
-            {"CohortAggregateContainer_ID", parent.ID},
-            {"AggregateConfiguration_ID", child.ID}
-        });
+        CatalogueRepository.Delete(
+            "DELETE FROM CohortAggregateContainer_AggregateConfiguration WHERE CohortAggregateContainer_ID = @CohortAggregateContainer_ID AND AggregateConfiguration_ID = @AggregateConfiguration_ID",
+            new Dictionary<string, object>
+            {
+                { "CohortAggregateContainer_ID", parent.ID },
+                { "AggregateConfiguration_ID", child.ID }
+            });
     }
 
-        
+
     public int? GetOrderIfExistsFor(AggregateConfiguration configuration)
     {
         if (configuration.Repository != this)
-            if (((CatalogueRepository)configuration.Repository).ConnectionString != CatalogueRepository.ConnectionString)
-                throw new NotSupportedException("AggregateConfiguration is from a different repository than this with a different connection string");
+            if (((CatalogueRepository)configuration.Repository).ConnectionString !=
+                CatalogueRepository.ConnectionString)
+                throw new NotSupportedException(
+                    "AggregateConfiguration is from a different repository than this with a different connection string");
 
         using (var con = CatalogueRepository.GetConnection())
         {
@@ -81,52 +80,58 @@ public void Remove(CohortAggregateContainer parent,AggregateConfiguration child)
 
     public virtual IOrderable[] GetChildren(CohortAggregateContainer parent)
     {
-        var containers = CatalogueRepository.SelectAllWhere<CohortAggregateContainer>("SELECT CohortAggregateContainer_ChildID FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ParentID=@CohortAggregateContainer_ParentID",
+        var containers = CatalogueRepository.SelectAllWhere<CohortAggregateContainer>(
+            "SELECT CohortAggregateContainer_ChildID FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ParentID=@CohortAggregateContainer_ParentID",
             "CohortAggregateContainer_ChildID",
             new Dictionary<string, object>
             {
-                {"CohortAggregateContainer_ParentID", parent.ID}
+                { "CohortAggregateContainer_ParentID", parent.ID }
             }).ToArray();
 
         var configs = CatalogueRepository.SelectAll<AggregateConfiguration>(
-            $"SELECT AggregateConfiguration_ID FROM CohortAggregateContainer_AggregateConfiguration where CohortAggregateContainer_ID={parent.ID}").OrderBy(config => config.Order).ToArray();
+                $"SELECT AggregateConfiguration_ID FROM CohortAggregateContainer_AggregateConfiguration where CohortAggregateContainer_ID={parent.ID}")
+            .OrderBy(config => config.Order).ToArray();
 
         return containers.Cast<IOrderable>().Union(configs).OrderBy(o => o.Order).ToArray();
     }
 
-    public CohortAggregateContainer GetParent(CohortAggregateContainer child)
-    {
-        return CatalogueRepository.SelectAllWhere<CohortAggregateContainer>("SELECT CohortAggregateContainer_ParentID FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ChildID=@CohortAggregateContainer_ChildID",
+    public CohortAggregateContainer GetParent(CohortAggregateContainer child) =>
+        CatalogueRepository.SelectAllWhere<CohortAggregateContainer>(
+            "SELECT CohortAggregateContainer_ParentID FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ChildID=@CohortAggregateContainer_ChildID",
             "CohortAggregateContainer_ParentID",
             new Dictionary<string, object>
             {
-                {"CohortAggregateContainer_ChildID", child.ID}
+                { "CohortAggregateContainer_ChildID", child.ID }
             }).SingleOrDefault();
-    }
 
     public void Remove(CohortAggregateContainer parent, CohortAggregateContainer child)
     {
-        CatalogueRepository.Delete("DELETE FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ChildID = @CohortAggregateContainer_ChildID", new Dictionary<string, object>
-        {
-            {"CohortAggregateContainer_ChildID", child.ID}
-        });
+        CatalogueRepository.Delete(
+            "DELETE FROM CohortAggregateSubContainer WHERE CohortAggregateContainer_ChildID = @CohortAggregateContainer_ChildID",
+            new Dictionary<string, object>
+            {
+                { "CohortAggregateContainer_ChildID", child.ID }
+            });
     }
 
     public void SetOrder(AggregateConfiguration child, int newOrder)
     {
         CatalogueRepository.Update(
-            $"UPDATE CohortAggregateContainer_AggregateConfiguration SET [Order] = {newOrder} WHERE AggregateConfiguration_ID = @AggregateConfiguration_ID", new Dictionary<string, object>
-        {
-            {"AggregateConfiguration_ID", child.ID}
-        });
+            $"UPDATE CohortAggregateContainer_AggregateConfiguration SET [Order] = {newOrder} WHERE AggregateConfiguration_ID = @AggregateConfiguration_ID",
+            new Dictionary<string, object>
+            {
+                { "AggregateConfiguration_ID", child.ID }
+            });
     }
 
     public void Add(CohortAggregateContainer parent, CohortAggregateContainer child)
     {
-        CatalogueRepository.Insert("INSERT INTO CohortAggregateSubContainer(CohortAggregateContainer_ParentID,CohortAggregateContainer_ChildID) VALUES (@CohortAggregateContainer_ParentID, @CohortAggregateContainer_ChildID)", new Dictionary<string, object>
-        {
-            {"CohortAggregateContainer_ParentID", parent.ID},
-            {"CohortAggregateContainer_ChildID", child.ID}
-        });
+        CatalogueRepository.Insert(
+            "INSERT INTO CohortAggregateSubContainer(CohortAggregateContainer_ParentID,CohortAggregateContainer_ChildID) VALUES (@CohortAggregateContainer_ParentID, @CohortAggregateContainer_ChildID)",
+            new Dictionary<string, object>
+            {
+                { "CohortAggregateContainer_ParentID", parent.ID },
+                { "CohortAggregateContainer_ChildID", child.ID }
+            });
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/CommentStoreWithKeywords.cs b/Rdmp.Core/Repositories/Managers/CommentStoreWithKeywords.cs
index 94d2dd2870..186235f7cf 100644
--- a/Rdmp.Core/Repositories/Managers/CommentStoreWithKeywords.cs
+++ b/Rdmp.Core/Repositories/Managers/CommentStoreWithKeywords.cs
@@ -21,7 +21,7 @@ public override void ReadComments(params string[] directoriesToLookInForComments
 
         var keywords = new FileInfo("./Curation/KeywordHelp.txt");
 
-        if(keywords.Exists)
+        if (keywords.Exists)
             AddToHelp(File.ReadAllText(keywords.FullName));
     }
 
diff --git a/Rdmp.Core/Repositories/Managers/DataExportFilterManager.cs b/Rdmp.Core/Repositories/Managers/DataExportFilterManager.cs
index a89c2fb27b..d9b5ea0afb 100644
--- a/Rdmp.Core/Repositories/Managers/DataExportFilterManager.cs
+++ b/Rdmp.Core/Repositories/Managers/DataExportFilterManager.cs
@@ -21,12 +21,10 @@ public DataExportFilterManager(DataExportRepository dataExportRepository)
         _dataExportRepository = dataExportRepository;
     }
 
-    public IContainer GetParentContainerIfAny(IContainer container)
-    {
-        return _dataExportRepository.SelectAll<FilterContainer>(
+    public IContainer GetParentContainerIfAny(IContainer container) =>
+        _dataExportRepository.SelectAll<FilterContainer>(
             $"SELECT FilterContainer_ParentID FROM FilterContainerSubcontainers WHERE FilterContainerChildID={container.ID}",
             "FilterContainer_ParentID").SingleOrDefault();
-    }
 
 
     /// <inheritdoc/>
@@ -42,7 +40,8 @@ public virtual IContainer[] GetSubContainers(IContainer parent)
     /// <inheritdoc/>
     public virtual IFilter[] GetFilters(IContainer container)
     {
-        var filters = _dataExportRepository.GetAllObjectsWhere<DeployedExtractionFilter>("FilterContainer_ID" , container.ID);
+        var filters =
+            _dataExportRepository.GetAllObjectsWhere<DeployedExtractionFilter>("FilterContainer_ID", container.ID);
         return filters.Cast<IFilter>().ToArray();
     }
 
@@ -52,21 +51,26 @@ public void AddSubContainer(IContainer parent, IContainer child)
         if (child is not FilterContainer)
             throw new NotSupportedException();
 
-        _dataExportRepository.Insert("INSERT INTO FilterContainerSubcontainers(FilterContainer_ParentID,FilterContainerChildID) VALUES (@FilterContainer_ParentID, @FilterContainerChildID)", new Dictionary<string, object>
-        {
-            {"FilterContainer_ParentID", parent.ID},
-            {"FilterContainerChildID", child.ID}
-        });
+        _dataExportRepository.Insert(
+            "INSERT INTO FilterContainerSubcontainers(FilterContainer_ParentID,FilterContainerChildID) VALUES (@FilterContainer_ParentID, @FilterContainerChildID)",
+            new Dictionary<string, object>
+            {
+                { "FilterContainer_ParentID", parent.ID },
+                { "FilterContainerChildID", child.ID }
+            });
     }
 
     /// <inheritdoc/>
     public void MakeIntoAnOrphan(IContainer container)
     {
-        _dataExportRepository.Delete("DELETE FROM FilterContainerSubcontainers where FilterContainerChildID = @FilterContainerChildID", new Dictionary<string, object>
-        {
-            {"FilterContainerChildID", container.ID}
-        },false);
+        _dataExportRepository.Delete(
+            "DELETE FROM FilterContainerSubcontainers where FilterContainerChildID = @FilterContainerChildID",
+            new Dictionary<string, object>
+            {
+                { "FilterContainerChildID", container.ID }
+            }, false);
     }
+
     public void AddChild(IContainer container, IFilter filter)
     {
         filter.FilterContainer_ID = container.ID;
diff --git a/Rdmp.Core/Repositories/Managers/DataExportPropertyManager.cs b/Rdmp.Core/Repositories/Managers/DataExportPropertyManager.cs
index 24b3172104..c8b47b7053 100644
--- a/Rdmp.Core/Repositories/Managers/DataExportPropertyManager.cs
+++ b/Rdmp.Core/Repositories/Managers/DataExportPropertyManager.cs
@@ -23,7 +23,7 @@ internal class DataExportPropertyManager : IDataExportPropertyManager
     private readonly bool _allowCaching;
     private readonly DataExportRepository _repository;
     private bool _cacheOutOfDate = true;
-    private readonly ConcurrentDictionary<string,string> _cacheDictionary = new();
+    private readonly ConcurrentDictionary<string, string> _cacheDictionary = new();
 
     /// <summary>
     /// Creates a new instance ready to read values out of the <paramref name="repository"/> database
@@ -44,7 +44,6 @@ public DataExportPropertyManager(bool allowCaching, DataExportRepository reposit
     /// <exception cref="KeyNotFoundException"></exception>
     public string GetValue(string property)
     {
-
         //if we do not allow caching then we effectively pull all values every time.  We also pull every value if cache has not been built yet (is out of date)
         if (!_allowCaching || _cacheOutOfDate)
             RefreshCache();
@@ -54,12 +53,9 @@ public string GetValue(string property)
 
         return null;
     }
-        
+
     /// <inheritdoc cref="GetValue(string)"/>
-    public string GetValue(DataExportProperty property)
-    {
-        return GetValue(property.ToString());
-    }
+    public string GetValue(DataExportProperty property) => GetValue(property.ToString());
 
 
     /// <summary>
@@ -74,7 +70,7 @@ public void SetValue(DataExportProperty property, string value)
 
     private void SetValue(string property, string value)
     {
-        if(_cacheOutOfDate)
+        if (_cacheOutOfDate)
             RefreshCache();
 
         if (string.IsNullOrWhiteSpace(value))
@@ -84,7 +80,7 @@ private void SetValue(string property, string value)
             IssueUpdateCommand(property, value);
         else
             IssueInsertCommand(property, value);
-            
+
         //a value has been set, reset cache (we could update cache manually in memory but a round trip to database is safer)
         _cacheOutOfDate = true;
     }
@@ -94,28 +90,24 @@ private void SetValue(string property, string value)
     /// </summary>
     /// <param name="property"></param>
     /// <returns></returns>
-    public int DeleteValue(string property)
-    {
-        return IssueDeleteCommand(property);
-    }
+    public int DeleteValue(string property) => IssueDeleteCommand(property);
 
     #region read/write to database
-    private int IssueDeleteCommand(string property)
-    {
-        return _repository.Delete("DELETE FROM [ConfigurationProperties] WHERE Property=@property",
+
+    private int IssueDeleteCommand(string property) =>
+        _repository.Delete("DELETE FROM [ConfigurationProperties] WHERE Property=@property",
             new Dictionary<string, object>
             {
-                {"property", property}
+                { "property", property }
             });
-    }
 
     private void IssueInsertCommand(string property, string value)
     {
         _repository.Insert("INSERT INTO [ConfigurationProperties](Property,Value) VALUES (@property,@value)",
             new Dictionary<string, object>
             {
-                {"value", value},
-                {"property", property}
+                { "value", value },
+                { "property", property }
             });
     }
 
@@ -124,8 +116,8 @@ private void IssueUpdateCommand(string property, string value)
         _repository.Update("UPDATE [ConfigurationProperties] set Value=@value where Property=@property",
             new Dictionary<string, object>
             {
-                {"value", value},
-                {"property", property}
+                { "value", value },
+                { "property", property }
             });
     }
 
@@ -150,10 +142,10 @@ private void RefreshCache()
                     }
                 }
             }
-                
         }
 
         _cacheOutOfDate = false;
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/GovernanceManager.cs b/Rdmp.Core/Repositories/Managers/GovernanceManager.cs
index 987697bb6b..abcd489a1a 100644
--- a/Rdmp.Core/Repositories/Managers/GovernanceManager.cs
+++ b/Rdmp.Core/Repositories/Managers/GovernanceManager.cs
@@ -33,7 +33,8 @@ public void Link(GovernancePeriod governancePeriod, ICatalogue catalogue)
             return;
 
         _catalogueRepository.Insert(
-            $@"INSERT INTO GovernancePeriod_Catalogue (Catalogue_ID,GovernancePeriod_ID) VALUES ({catalogue.ID},{governancePeriod.ID})", null);
+            $@"INSERT INTO GovernancePeriod_Catalogue (Catalogue_ID,GovernancePeriod_ID) VALUES ({catalogue.ID},{governancePeriod.ID})",
+            null);
     }
 
     /// <inheritdoc/>
@@ -62,15 +63,13 @@ public Dictionary<int, HashSet<int>> GetAllGovernedCataloguesForAllGovernancePer
                     }
                 }
             }
-
         }
 
         return toReturn;
     }
 
-    public IEnumerable<ICatalogue> GetAllGovernedCatalogues(GovernancePeriod governancePeriod)
-    {
-        return _catalogueRepository.SelectAll<Catalogue>(
-            $@"SELECT Catalogue_ID FROM GovernancePeriod_Catalogue where GovernancePeriod_ID={governancePeriod.ID}","Catalogue_ID");
-    }
+    public IEnumerable<ICatalogue> GetAllGovernedCatalogues(GovernancePeriod governancePeriod) =>
+        _catalogueRepository.SelectAll<Catalogue>(
+            $@"SELECT Catalogue_ID FROM GovernancePeriod_Catalogue where GovernancePeriod_ID={governancePeriod.ID}",
+            "Catalogue_ID");
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/HighPerformance/CohortContainerManagerFromChildProvider.cs b/Rdmp.Core/Repositories/Managers/HighPerformance/CohortContainerManagerFromChildProvider.cs
index 942c47b0bc..6eabbbe271 100644
--- a/Rdmp.Core/Repositories/Managers/HighPerformance/CohortContainerManagerFromChildProvider.cs
+++ b/Rdmp.Core/Repositories/Managers/HighPerformance/CohortContainerManagerFromChildProvider.cs
@@ -20,11 +20,12 @@ namespace Rdmp.Core.Repositories.Managers.HighPerformance;
 /// 
 /// <para>This allows you to use GetSubContainers and GetAggregateConfigurations in bulk without having to use the method on IContainer directly (which goes back to the database).</para>
 /// </summary>
-internal class CohortContainerManagerFromChildProvider:CohortContainerManager
+internal class CohortContainerManagerFromChildProvider : CohortContainerManager
 {
     private readonly Dictionary<int, List<IOrderable>> _contents = new();
 
-    public CohortContainerManagerFromChildProvider(CatalogueRepository repository,CatalogueChildProvider childProvider):base(repository)
+    public CohortContainerManagerFromChildProvider(CatalogueRepository repository, CatalogueChildProvider childProvider)
+        : base(repository)
     {
         FetchAllRelationships(childProvider);
     }
@@ -46,9 +47,11 @@ public void FetchAllRelationships(ICoreChildProvider childProvider)
     {
         using (var con = CatalogueRepository.GetConnection())
         {
-
             //find all the cohort SET operation subcontainers e.g. UNION Ag1,Ag2,(Agg3 INTERSECT Agg4) would have 2 CohortAggregateContainers (the UNION and the INTERSECT) in which the INTERSECT was the child container of the UNION
-            var r = CatalogueRepository.DiscoveredServer.GetCommand("SELECT [CohortAggregateContainer_ParentID],[CohortAggregateContainer_ChildID] FROM [CohortAggregateSubContainer] ORDER BY CohortAggregateContainer_ParentID", con).ExecuteReader();
+            var r = CatalogueRepository.DiscoveredServer
+                .GetCommand(
+                    "SELECT [CohortAggregateContainer_ParentID],[CohortAggregateContainer_ChildID] FROM [CohortAggregateSubContainer] ORDER BY CohortAggregateContainer_ParentID",
+                    con).ExecuteReader();
 
             while (r.Read())
             {
@@ -58,12 +61,17 @@ public void FetchAllRelationships(ICoreChildProvider childProvider)
                 if (!_contents.ContainsKey(currentParentId))
                     _contents.Add(currentParentId, new List<IOrderable>());
 
-                _contents[currentParentId].Add(childProvider.AllCohortAggregateContainers.Single(c => c.ID == currentChildId));
+                _contents[currentParentId]
+                    .Add(childProvider.AllCohortAggregateContainers.Single(c => c.ID == currentChildId));
             }
+
             r.Close();
 
             //now find all the Agg configurations within the containers too, (in the above example we will find Agg1 in the UNION container at order 1 and Agg2 at order 2 and then we find Agg3 and Agg4 in the INTERSECT container)
-            r = CatalogueRepository.DiscoveredServer.GetCommand(@"SELECT [CohortAggregateContainer_ID], [AggregateConfiguration_ID],[Order] FROM [CohortAggregateContainer_AggregateConfiguration] ORDER BY CohortAggregateContainer_ID", con).ExecuteReader();
+            r = CatalogueRepository.DiscoveredServer
+                .GetCommand(
+                    @"SELECT [CohortAggregateContainer_ID], [AggregateConfiguration_ID],[Order] FROM [CohortAggregateContainer_AggregateConfiguration] ORDER BY CohortAggregateContainer_ID",
+                    con).ExecuteReader();
 
             while (r.Read())
             {
@@ -89,8 +97,8 @@ public void FetchAllRelationships(ICoreChildProvider childProvider)
                 config.SetKnownOrder(currentOrder);
 
                 _contents[currentParentId].Add(config);
-
             }
+
             r.Close();
         }
     }
diff --git a/Rdmp.Core/Repositories/Managers/HighPerformance/DataExportFilterManagerFromChildProvider.cs b/Rdmp.Core/Repositories/Managers/HighPerformance/DataExportFilterManagerFromChildProvider.cs
index 09df2bbf79..f46404fc06 100644
--- a/Rdmp.Core/Repositories/Managers/HighPerformance/DataExportFilterManagerFromChildProvider.cs
+++ b/Rdmp.Core/Repositories/Managers/HighPerformance/DataExportFilterManagerFromChildProvider.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.Repositories.Managers.HighPerformance;
 internal class DataExportFilterManagerFromChildProvider : DataExportFilterManager
 {
     private readonly Dictionary<int, List<FilterContainer>> _subcontainers = new();
-        
+
     private Dictionary<int, List<DeployedExtractionFilter>> _containersToFilters;
 
     /// <summary>
@@ -29,43 +29,41 @@ internal class DataExportFilterManagerFromChildProvider : DataExportFilterManage
     /// </summary>
     /// <param name="repository"></param>
     /// <param name="childProvider"></param>
-    public DataExportFilterManagerFromChildProvider(DataExportRepository repository, DataExportChildProvider childProvider): base(repository)
+    public DataExportFilterManagerFromChildProvider(DataExportRepository repository,
+        DataExportChildProvider childProvider) : base(repository)
     {
-        _containersToFilters = childProvider.AllDeployedExtractionFilters.Where(f=>f.FilterContainer_ID.HasValue).GroupBy(f=>f.FilterContainer_ID.Value).ToDictionary(gdc => gdc.Key, gdc => gdc.ToList());
+        _containersToFilters = childProvider.AllDeployedExtractionFilters.Where(f => f.FilterContainer_ID.HasValue)
+            .GroupBy(f => f.FilterContainer_ID.Value).ToDictionary(gdc => gdc.Key, gdc => gdc.ToList());
 
         var server = repository.DiscoveredServer;
         using (var con = repository.GetConnection())
         {
             var r = server.GetCommand("SELECT *  FROM FilterContainerSubcontainers", con).ExecuteReader();
-            while(r.Read())
+            while (r.Read())
             {
-
                 var parentId = Convert.ToInt32(r["FilterContainer_ParentID"]);
                 var subcontainerId = Convert.ToInt32(r["FilterContainerChildID"]);
 
-                if(!_subcontainers.ContainsKey(parentId))
-                    _subcontainers.Add(parentId,new List<FilterContainer>());
+                if (!_subcontainers.ContainsKey(parentId))
+                    _subcontainers.Add(parentId, new List<FilterContainer>());
 
                 _subcontainers[parentId].Add(childProvider.AllContainers[subcontainerId]);
             }
+
             r.Close();
         }
     }
-        
+
     /// <summary>
     /// Returns all subcontainers found in the <paramref name="parent"/> (results are returned from the cache created during class construction)
     /// </summary>
-    public override IContainer[] GetSubContainers(IContainer parent)
-    {
-        return _subcontainers.TryGetValue(parent.ID, out var result)
+    public override IContainer[] GetSubContainers(IContainer parent) =>
+        _subcontainers.TryGetValue(parent.ID, out var result)
             ? result.ToArray()
             : Array.Empty<IContainer>();
-    }
 
-    public override IFilter[] GetFilters(IContainer container)
-    {
-        return _containersToFilters.TryGetValue(container.ID, out var filters)
+    public override IFilter[] GetFilters(IContainer container) =>
+        _containersToFilters.TryGetValue(container.ID, out var filters)
             ? filters.ToArray()
             : Array.Empty<IFilter>();
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/HighPerformance/FilterManagerFromChildProvider.cs b/Rdmp.Core/Repositories/Managers/HighPerformance/FilterManagerFromChildProvider.cs
index 209e229e36..7ac39a0e79 100644
--- a/Rdmp.Core/Repositories/Managers/HighPerformance/FilterManagerFromChildProvider.cs
+++ b/Rdmp.Core/Repositories/Managers/HighPerformance/FilterManagerFromChildProvider.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.Repositories.Managers.HighPerformance;
 /// AggregateConfigurations 
 /// 
 /// </summary>
-internal class FilterManagerFromChildProvider: AggregateFilterManager
+internal class FilterManagerFromChildProvider : AggregateFilterManager
 {
     /// <summary>
     /// Where ID key is the ID of the parent and the Value List is all the subcontainers.  If there is no key there are no subcontainers.
@@ -27,41 +27,43 @@ internal class FilterManagerFromChildProvider: AggregateFilterManager
 
     private Dictionary<int, List<AggregateFilter>> _containersToFilters;
 
-    public FilterManagerFromChildProvider(CatalogueRepository repository,ICoreChildProvider childProvider):base(repository)
+    public FilterManagerFromChildProvider(CatalogueRepository repository, ICoreChildProvider childProvider) :
+        base(repository)
     {
-
-        _containersToFilters = 
-            childProvider.AllAggregateFilters.Where(f=>f.FilterContainer_ID.HasValue)
-                .GroupBy(f=>f.FilterContainer_ID.Value)
+        _containersToFilters =
+            childProvider.AllAggregateFilters.Where(f => f.FilterContainer_ID.HasValue)
+                .GroupBy(f => f.FilterContainer_ID.Value)
                 .ToDictionary(gdc => gdc.Key, gdc => gdc.ToList());
 
         var server = repository.DiscoveredServer;
         using (var con = repository.GetConnection())
         {
-            var r = server.GetCommand("SELECT [AggregateFilterContainer_ParentID],[AggregateFilterContainer_ChildID]  FROM [AggregateFilterSubContainer]", con).ExecuteReader();
-            while(r.Read())
+            var r = server
+                .GetCommand(
+                    "SELECT [AggregateFilterContainer_ParentID],[AggregateFilterContainer_ChildID]  FROM [AggregateFilterSubContainer]",
+                    con).ExecuteReader();
+            while (r.Read())
             {
-
                 var parentId = Convert.ToInt32(r["AggregateFilterContainer_ParentID"]);
                 var subcontainerId = Convert.ToInt32(r["AggregateFilterContainer_ChildID"]);
 
-                if(!_subcontainers.ContainsKey(parentId))
-                    _subcontainers.Add(parentId,new List<AggregateFilterContainer>());
+                if (!_subcontainers.ContainsKey(parentId))
+                    _subcontainers.Add(parentId, new List<AggregateFilterContainer>());
 
                 _subcontainers[parentId].Add(childProvider.AllAggregateContainersDictionary[subcontainerId]);
             }
+
             r.Close();
         }
     }
-        
-    public override IContainer[] GetSubContainers(IContainer container)
-    {
-        return _subcontainers.TryGetValue(container.ID, out var result) ? result.ToArray() :
-            Array.Empty<AggregateFilterContainer>();
-    }
 
-    public override IFilter[] GetFilters(IContainer container)
-    {
-        return _containersToFilters.TryGetValue(container.ID,out var result) ? result.ToArray() : Array.Empty<AggregateFilter>();
-    }
+    public override IContainer[] GetSubContainers(IContainer container) =>
+        _subcontainers.TryGetValue(container.ID, out var result)
+            ? result.ToArray()
+            : Array.Empty<AggregateFilterContainer>();
+
+    public override IFilter[] GetFilters(IContainer container) =>
+        _containersToFilters.TryGetValue(container.ID, out var result)
+            ? result.ToArray()
+            : Array.Empty<AggregateFilter>();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/ICohortContainerManager.cs b/Rdmp.Core/Repositories/Managers/ICohortContainerManager.cs
index 68c280159c..f5f691981d 100644
--- a/Rdmp.Core/Repositories/Managers/ICohortContainerManager.cs
+++ b/Rdmp.Core/Repositories/Managers/ICohortContainerManager.cs
@@ -33,14 +33,14 @@ public interface ICohortContainerManager
     /// <param name="parent"></param>
     /// <param name="child"></param>
     /// <param name="order"></param>
-    void Add(CohortAggregateContainer parent,AggregateConfiguration child, int order);
+    void Add(CohortAggregateContainer parent, AggregateConfiguration child, int order);
 
     /// <summary>
     /// Removes the <paramref name="child"/> configuration from the given container (to which it must belong already)
     /// </summary>
     /// <param name="parent"></param>
     /// <param name="child"></param>
-    void Remove(CohortAggregateContainer parent,AggregateConfiguration child);
+    void Remove(CohortAggregateContainer parent, AggregateConfiguration child);
 
     /// <summary>
     /// If the configuration is part of any aggregate container anywhere this method will return the order within that container
@@ -54,7 +54,7 @@ public interface ICohortContainerManager
     /// </summary>
     /// <returns></returns>
     IOrderable[] GetChildren(CohortAggregateContainer parent);
-        
+
     /// <summary>
     /// Removes the given <paramref name="child"/> container from its host parent container
     /// </summary>
@@ -75,5 +75,4 @@ public interface ICohortContainerManager
     /// <param name="parent"></param>
     /// <param name="child"></param>
     void Add(CohortAggregateContainer parent, CohortAggregateContainer child);
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/IEncryptionManager.cs b/Rdmp.Core/Repositories/Managers/IEncryptionManager.cs
index d3b47ecee7..3173945a39 100644
--- a/Rdmp.Core/Repositories/Managers/IEncryptionManager.cs
+++ b/Rdmp.Core/Repositories/Managers/IEncryptionManager.cs
@@ -12,7 +12,7 @@ namespace Rdmp.Core.Repositories.Managers;
 /// <summary>
 /// Handles persisting encryption certificate for public/private key encryption.
 /// </summary>
-public interface IEncryptionManager:IInjectKnown
+public interface IEncryptionManager : IInjectKnown
 {
     /// <summary>
     /// Enables encryption/decryption of strings using a custom RSA key stored in a secure location on disk
diff --git a/Rdmp.Core/Repositories/Managers/IGovernanceManager.cs b/Rdmp.Core/Repositories/Managers/IGovernanceManager.cs
index 33ba1677c8..211af72692 100644
--- a/Rdmp.Core/Repositories/Managers/IGovernanceManager.cs
+++ b/Rdmp.Core/Repositories/Managers/IGovernanceManager.cs
@@ -18,7 +18,7 @@ public interface IGovernanceManager
 {
     void Unlink(GovernancePeriod governancePeriod, ICatalogue catalogue);
     void Link(GovernancePeriod governancePeriod, ICatalogue catalogue);
-        
+
     /// <summary>
     /// Returns the IDs of all <see cref="GovernancePeriod"/> with the corresponding set of <see cref="Catalogue"/> IDs which are covered by the governance.
     /// </summary>
diff --git a/Rdmp.Core/Repositories/Managers/IJoinManager.cs b/Rdmp.Core/Repositories/Managers/IJoinManager.cs
index 5e5659d916..4e52ad7e2c 100644
--- a/Rdmp.Core/Repositories/Managers/IJoinManager.cs
+++ b/Rdmp.Core/Repositories/Managers/IJoinManager.cs
@@ -16,5 +16,5 @@ public interface IJoinManager
 {
     JoinInfo[] GetAllJoinInfosBetweenColumnInfoSets(JoinInfo[] joinInfos, ColumnInfo[] set1, ColumnInfo[] set2);
     JoinInfo[] GetAllJoinInfosBetweenColumnInfoSets(ColumnInfo[] set1, ColumnInfo[] set2);
-    JoinInfo[] GetAllJoinInfosWhereTableContains(ITableInfo tableInfo,JoinInfoType type);
+    JoinInfo[] GetAllJoinInfosWhereTableContains(ITableInfo tableInfo, JoinInfoType type);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/ITableInfoCredentialsManager.cs b/Rdmp.Core/Repositories/Managers/ITableInfoCredentialsManager.cs
index 0e42104c55..5f77717f3d 100644
--- a/Rdmp.Core/Repositories/Managers/ITableInfoCredentialsManager.cs
+++ b/Rdmp.Core/Repositories/Managers/ITableInfoCredentialsManager.cs
@@ -23,7 +23,7 @@ public interface ITableInfoCredentialsManager
     /// <param name="credentials"></param>
     /// <param name="tableInfo"></param>
     /// <param name="context"></param>
-    void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,DataAccessContext context);
+    void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context);
 
     /// <summary>
     /// Removes the right to use passed <paramref name="credentials"/> to access the <paramref name="tableInfo"/> under the <paramref name="context"/>
@@ -51,14 +51,14 @@ public interface ITableInfoCredentialsManager
     /// <param name="context"></param>
     /// <returns></returns>
     DataAccessCredentials GetCredentialsIfExistsFor(ITableInfo tableInfo, DataAccessContext context);
-        
+
     /// <summary>
     /// Fetches all <see cref="DataAccessCredentials"/> (username and encrypted password) that can be used to access the <see cref="TableInfo"/> under any
     /// <see cref="DataAccessContext"/>)
     /// </summary>
     /// <param name="tableInfo"></param>
     /// <returns></returns>
-    Dictionary<DataAccessContext,DataAccessCredentials> GetCredentialsIfExistsFor(ITableInfo tableInfo);
+    Dictionary<DataAccessContext, DataAccessCredentials> GetCredentialsIfExistsFor(ITableInfo tableInfo);
 
     /// <summary>
     /// Returns all credential usage permissions for the given set of <paramref name="allTableInfos"/> and <paramref name="allCredentials"/>
@@ -66,7 +66,8 @@ public interface ITableInfoCredentialsManager
     /// <param name="allCredentials"></param>
     /// <param name="allTableInfos"></param>
     /// <returns></returns>
-    Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos);
+    Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(
+        DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos);
 
     /// <summary>
     /// Returns all the <see cref="TableInfo"/> that are allowed to use the given <paramref name="credentials"/>
diff --git a/Rdmp.Core/Repositories/Managers/JoinInfoType.cs b/Rdmp.Core/Repositories/Managers/JoinInfoType.cs
index 54a8d7bef5..0cf0aeb808 100644
--- a/Rdmp.Core/Repositories/Managers/JoinInfoType.cs
+++ b/Rdmp.Core/Repositories/Managers/JoinInfoType.cs
@@ -16,7 +16,7 @@ public enum JoinInfoType
     /// Either <see cref="ForeignKey"/> or <see cref="PrimaryKey"/> (only valid for querying)
     /// </summary>
     AnyKey,
-        
+
     /// <summary>
     /// The child table which contains a field referencing the primary key of the parent table
     /// </summary>
diff --git a/Rdmp.Core/Repositories/Managers/JoinManager.cs b/Rdmp.Core/Repositories/Managers/JoinManager.cs
index 7ae6e72aaf..958a917089 100644
--- a/Rdmp.Core/Repositories/Managers/JoinManager.cs
+++ b/Rdmp.Core/Repositories/Managers/JoinManager.cs
@@ -43,19 +43,19 @@ public JoinInfo[] GetAllJoinInfosBetweenColumnInfoSets(JoinInfo[] joinInfos, Col
                     (idSet1.Contains(j.PrimaryKey_ID) && idSet2.Contains(j.ForeignKey_ID)))
                 .ToArray();
     }
-    public JoinInfo[] GetAllJoinInfosBetweenColumnInfoSets(ColumnInfo[] set1, ColumnInfo[] set2)
-    {
-        return GetAllJoinInfosBetweenColumnInfoSets(_repository.GetAllObjects<JoinInfo>(), set1, set2);
-    }
 
-    public JoinInfo[] GetAllJoinInfosWhereTableContains(ITableInfo tableInfo,JoinInfoType type)
+    public JoinInfo[] GetAllJoinInfosBetweenColumnInfoSets(ColumnInfo[] set1, ColumnInfo[] set2) =>
+        GetAllJoinInfosBetweenColumnInfoSets(_repository.GetAllObjects<JoinInfo>(), set1, set2);
+
+    public JoinInfo[] GetAllJoinInfosWhereTableContains(ITableInfo tableInfo, JoinInfoType type)
     {
         var ids = new HashSet<int>(tableInfo.ColumnInfos.Select(c => c.ID));
 
         switch (type)
         {
             case JoinInfoType.AnyKey:
-                return _repository.GetAllObjects<JoinInfo>().Where(j => ids.Contains(j.ForeignKey_ID) || ids.Contains(j.PrimaryKey_ID)).ToArray();
+                return _repository.GetAllObjects<JoinInfo>()
+                    .Where(j => ids.Contains(j.ForeignKey_ID) || ids.Contains(j.PrimaryKey_ID)).ToArray();
             case JoinInfoType.ForeignKey:
                 return _repository.GetAllObjects<JoinInfo>().Where(j => ids.Contains(j.ForeignKey_ID)).ToArray();
             case JoinInfoType.PrimaryKey:
@@ -64,5 +64,4 @@ public JoinInfo[] GetAllJoinInfosWhereTableContains(ITableInfo tableInfo,JoinInf
                 throw new ArgumentOutOfRangeException(nameof(type));
         }
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/PasswordEncryptionKeyLocation.cs b/Rdmp.Core/Repositories/Managers/PasswordEncryptionKeyLocation.cs
index ba43b1b3b2..537ef30ba9 100644
--- a/Rdmp.Core/Repositories/Managers/PasswordEncryptionKeyLocation.cs
+++ b/Rdmp.Core/Repositories/Managers/PasswordEncryptionKeyLocation.cs
@@ -37,10 +37,7 @@ public PasswordEncryptionKeyLocation(ICatalogueRepository catalogueRepository)
         ClearAllInjections();
     }
 
-    public IEncryptStrings GetEncrypter()
-    {
-        return new SimpleStringValueEncryption(OpenKeyFile());
-    }
+    public IEncryptStrings GetEncrypter() => new SimpleStringValueEncryption(OpenKeyFile());
 
     private Lazy<string> _knownKeyFileLocation;
 
@@ -50,10 +47,7 @@ public IEncryptStrings GetEncrypter()
     /// the cache
     /// </summary>
     /// <returns></returns>
-    public string GetKeyFileLocation()
-    {
-        return _knownKeyFileLocation.Value;
-    }
+    public string GetKeyFileLocation() => _knownKeyFileLocation.Value;
 
     private string GetKeyFileLocationImpl()
     {
@@ -85,7 +79,8 @@ private static void DeserializeFromLocation(string keyLocation)
         catch (Exception ex)
         {
             throw new Exception(
-                $"Failed to open and read key file {keyLocation} (possibly it is not in a shared network location or the current user ({Environment.UserName}) does not have access to the file?)", ex);
+                $"Failed to open and read key file {keyLocation} (possibly it is not in a shared network location or the current user ({Environment.UserName}) does not have access to the file?)",
+                ex);
         }
     }
 
@@ -107,11 +102,14 @@ public FileInfo CreateNewKeyFile(string path)
 
         var fi = new FileInfo(path);
 
-        if(fi.Directory is { Exists: false })
+        if (fi.Directory is { Exists: false })
             fi.Directory.Create();
 
         using (var stream = fi.Create())
+        {
             stream.Write(Encoding.UTF8.GetBytes(provider.ToXmlString(true)));
+        }
+
         var fileInfo = new FileInfo(path);
 
         if (!fileInfo.Exists)
@@ -120,7 +118,7 @@ public FileInfo CreateNewKeyFile(string path)
         _catalogueRepository.SetEncryptionKeyPath(fileInfo.FullName);
 
         ClearAllInjections();
-            
+
         return fileInfo;
     }
 
diff --git a/Rdmp.Core/Repositories/Managers/PluginManager.cs b/Rdmp.Core/Repositories/Managers/PluginManager.cs
index eed7c6ceae..34ba692f44 100644
--- a/Rdmp.Core/Repositories/Managers/PluginManager.cs
+++ b/Rdmp.Core/Repositories/Managers/PluginManager.cs
@@ -30,12 +30,13 @@ public Curation.Data.Plugin[] GetCompatiblePlugins()
         var runningSoftwareVersion = typeof(PluginManager).Assembly.GetName().Version;
 
         //nupkg that are compatible with the running software
-        var plugins = _repository.GetAllObjects<Curation.Data.Plugin>().Where(a=>a.RdmpVersion.IsCompatibleWith(runningSoftwareVersion,2));
+        var plugins = _repository.GetAllObjects<Curation.Data.Plugin>()
+            .Where(a => a.RdmpVersion.IsCompatibleWith(runningSoftwareVersion, 2));
 
         //latest versions
         var latestVersionsOfPlugins = plugins.GroupBy(static p => p.GetShortName())
             .Select(static grp => grp.MaxBy(static p => p.PluginVersion));
-                        
+
         return latestVersionsOfPlugins.ToArray();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/Managers/TableInfoCredentialsManager.cs b/Rdmp.Core/Repositories/Managers/TableInfoCredentialsManager.cs
index 842e235329..fe66788f9c 100644
--- a/Rdmp.Core/Repositories/Managers/TableInfoCredentialsManager.cs
+++ b/Rdmp.Core/Repositories/Managers/TableInfoCredentialsManager.cs
@@ -29,7 +29,7 @@ internal class TableInfoCredentialsManager : ITableInfoCredentialsManager
     //returns of querying these links are either 
     //          Dictionary<DataAccessContext,DataAccessCredentials> for all links where there is only one access point 1 - M (1 point many credentials)
     //OR        Dictionary<DataAccessContext, List<TableInfo>>      for all links where the query originates with a credentials M-M (credential is used by many users under many different contexts including potentially used by the same user under two+ different contexts)
-        
+
     //Cannot query Find all links between [collection of access points] and [collection of credentials] yet (probably never need to do this)
 
     /// <summary>
@@ -43,7 +43,7 @@ public TableInfoCredentialsManager(CatalogueRepository repository)
 
 
     /// <inheritdoc/>
-    public void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,DataAccessContext context)
+    public void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context)
     {
         using (var con = _repository.GetConnection())
         {
@@ -73,9 +73,9 @@ public void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo table
             "DELETE FROM DataAccessCredentials_TableInfo WHERE DataAccessCredentials_ID = @cid AND TableInfo_ID = @tid and Context =@context",
             new Dictionary<string, object>
             {
-                {"cid", credentials.ID},
-                {"tid", tableInfo.ID},
-                {"context", context}
+                { "cid", credentials.ID },
+                { "tid", tableInfo.ID },
+                { "context", context }
             });
 
         tableInfo.ClearAllInjections();
@@ -84,12 +84,13 @@ public void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo table
     /// <inheritdoc/>
     public void BreakAllLinksBetween(DataAccessCredentials credentials, ITableInfo tableInfo)
     {
-        _repository.Delete("DELETE FROM DataAccessCredentials_TableInfo WHERE DataAccessCredentials_ID = @cid AND TableInfo_ID = @tid",
+        _repository.Delete(
+            "DELETE FROM DataAccessCredentials_TableInfo WHERE DataAccessCredentials_ID = @cid AND TableInfo_ID = @tid",
             new Dictionary<string, object>
             {
-                {"cid", credentials.ID},
-                {"tid", tableInfo.ID}
-            },false);
+                { "cid", credentials.ID },
+                { "tid", tableInfo.ID }
+            }, false);
     }
 
     /// <inheritdoc/>
@@ -100,7 +101,8 @@ public DataAccessCredentials GetCredentialsIfExistsFor(ITableInfo tableInfo, Dat
         using (var con = _repository.GetConnection())
         {
             using (var cmd = DatabaseCommandHelper.GetCommand(
-                       $"SELECT DataAccessCredentials_ID,Context FROM DataAccessCredentials_TableInfo WHERE TableInfo_ID = @tid and (Context =@context OR Context={(int)DataAccessContext.Any}) ", con.Connection, con.Transaction))
+                       $"SELECT DataAccessCredentials_ID,Context FROM DataAccessCredentials_TableInfo WHERE TableInfo_ID = @tid and (Context =@context OR Context={(int)DataAccessContext.Any}) ",
+                       con.Connection, con.Transaction))
             {
                 cmd.Parameters.Add(DatabaseCommandHelper.GetParameter("@tid", cmd));
                 cmd.Parameters["@tid"].Value = tableInfo.ID;
@@ -110,31 +112,28 @@ public DataAccessCredentials GetCredentialsIfExistsFor(ITableInfo tableInfo, Dat
                 using (var r = cmd.ExecuteReader())
                 {
                     //gets the first liscenced usage
-                    if(r.Read())
+                    if (r.Read())
                     {
                         //there is one 
                         //get it by its id
                         toReturn = Convert.ToInt32(r["DataAccessCredentials_ID"]);
 
                         //if the first record is liscenced for Any
-                        if (Convert.ToInt32(r["Context"]) == (int) DataAccessContext.Any)
-                        {
+                        if (Convert.ToInt32(r["Context"]) == (int)DataAccessContext.Any)
                             //see if there is a more specific second record (e.g. DataLoad)
-                            if(r.Read())
+                            if (r.Read())
                                 toReturn = Convert.ToInt32(r["DataAccessCredentials_ID"]);
-                        }           
                     }
                 }
             }
-                    
         }
 
-        return toReturn != -1 ?_repository.GetObjectByID<DataAccessCredentials>(toReturn):null;
+        return toReturn != -1 ? _repository.GetObjectByID<DataAccessCredentials>(toReturn) : null;
     }
 
 
     /// <inheritdoc/>
-    public Dictionary<DataAccessContext,DataAccessCredentials> GetCredentialsIfExistsFor(ITableInfo tableInfo)
+    public Dictionary<DataAccessContext, DataAccessCredentials> GetCredentialsIfExistsFor(ITableInfo tableInfo)
     {
         Dictionary<DataAccessContext, int> toReturn;
 
@@ -147,8 +146,10 @@ public Dictionary<DataAccessContext,DataAccessCredentials> GetCredentialsIfExist
                 cmd.Parameters.Add(DatabaseCommandHelper.GetParameter("@tid", cmd));
                 cmd.Parameters["@tid"].Value = tableInfo.ID;
 
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     toReturn = GetLinksFromReader(r);
+                }
             }
         }
 
@@ -156,12 +157,13 @@ public Dictionary<DataAccessContext,DataAccessCredentials> GetCredentialsIfExist
     }
 
     /// <inheritdoc/>
-    public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos)
+    public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(
+        DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos)
     {
         var allCredentialsDictionary = allCredentials.ToDictionary(k => k.ID, v => v);
         var allTablesDictionary = allTableInfos.ToDictionary(k => k.ID, v => v);
 
-        var toReturn = new Dictionary<ITableInfo,List<DataAccessCredentialUsageNode>>();
+        var toReturn = new Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>>();
 
         using (var con = _repository.GetConnection())
         {
@@ -178,19 +180,18 @@ public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredent
 
                         var tid = Convert.ToInt32(r["TableInfo_ID"]);
                         var cid = Convert.ToInt32(r["DataAccessCredentials_ID"]);
-                    
+
                         //async error? someone created a new credential usage between the allCredentials array being fetched and us reaching this methods execution?
                         if (!allTablesDictionary.ContainsKey(tid) || !allCredentialsDictionary.ContainsKey(cid))
-                            continue;//should be super rare never gonna happen
+                            continue; //should be super rare never gonna happen
 
                         var t = allTablesDictionary[tid];
                         var c = allCredentialsDictionary[cid];
 
-                        if(!toReturn.ContainsKey(t))
-                            toReturn.Add(t,new List<DataAccessCredentialUsageNode>());
-
-                        toReturn[t].Add(new DataAccessCredentialUsageNode(c,t,context));
+                        if (!toReturn.ContainsKey(t))
+                            toReturn.Add(t, new List<DataAccessCredentialUsageNode>());
 
+                        toReturn[t].Add(new DataAccessCredentialUsageNode(c, t, context));
                     }
                 }
             }
@@ -200,7 +201,8 @@ public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredent
     }
 
     /// <inheritdoc/>
-    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredentials(DataAccessCredentials credentials)
+    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredentials(
+        DataAccessCredentials credentials)
     {
         var toReturn = new Dictionary<DataAccessContext, List<int>>
         {
@@ -220,20 +222,22 @@ public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredenti
                 cmd.Parameters.Add(DatabaseCommandHelper.GetParameter("@cid", cmd));
                 cmd.Parameters["@cid"].Value = credentials.ID;
 
-                using(var r = cmd.ExecuteReader())
+                using (var r = cmd.ExecuteReader())
+                {
                     while (r.Read())
                     {
                         //get the context
                         var context = GetContext(r);
-                        
+
                         //add the TableInfo under that context
                         toReturn[context].Add((int)r["TableInfo_ID"]);
                     }
+                }
             }
-                
         }
 
-        return toReturn.ToDictionary(k => k.Key, v => _repository.GetAllObjectsInIDList<TableInfo>(v.Value).Cast<ITableInfo>().ToList());
+        return toReturn.ToDictionary(k => k.Key,
+            v => _repository.GetAllObjectsInIDList<TableInfo>(v.Value).Cast<ITableInfo>().ToList());
     }
 
     /// <summary>
@@ -263,7 +267,8 @@ private static Dictionary<DataAccessContext, int> GetLinksFromReader(DbDataReade
     public DataAccessCredentials GetCredentialByUsernameAndPasswordIfExists(string username, string password)
     {
         //see if we already have a record of this user
-        var existingCredentials = _repository.GetAllObjects<DataAccessCredentials>().Where(c => c.Username.Equals(username)).ToArray();
+        var existingCredentials = _repository.GetAllObjects<DataAccessCredentials>()
+            .Where(c => c.Username.Equals(username)).ToArray();
 
         //found an existing credential that matched on username
         if (existingCredentials.Any())
@@ -285,13 +290,13 @@ public DataAccessCredentials GetCredentialByUsernameAndPasswordIfExists(string u
         //did not find an existing credential that matched on username
         return null;
     }
+
     private static DataAccessContext GetContext(DbDataReader r)
     {
         //if it's not a valid context something has gone very wrong
-        if (!Enum.TryParse((string) r["Context"], out DataAccessContext context))
+        if (!Enum.TryParse((string)r["Context"], out DataAccessContext context))
             throw new Exception($"Invalid DataAccessContext {r["Context"]}");
 
         return context;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/MemoryCatalogueRepository.cs b/Rdmp.Core/Repositories/MemoryCatalogueRepository.cs
index b19bf276a1..dd515cb8e7 100644
--- a/Rdmp.Core/Repositories/MemoryCatalogueRepository.cs
+++ b/Rdmp.Core/Repositories/MemoryCatalogueRepository.cs
@@ -34,7 +34,8 @@ namespace Rdmp.Core.Repositories;
 /// Memory only implementation of <see cref="ICatalogueRepository"/> in which all objects are created in
 /// dictionaries and arrays in memory instead of the database.
 /// </summary>
-public class MemoryCatalogueRepository : MemoryRepository, ICatalogueRepository,ITableInfoCredentialsManager, IAggregateForcedJoinManager, ICohortContainerManager, IFilterManager, IGovernanceManager
+public class MemoryCatalogueRepository : MemoryRepository, ICatalogueRepository, ITableInfoCredentialsManager,
+    IAggregateForcedJoinManager, ICohortContainerManager, IFilterManager, IGovernanceManager
 {
     public IAggregateForcedJoinManager AggregateForcedJoinManager => this;
     public IGovernanceManager GovernanceManager => this;
@@ -54,8 +55,9 @@ public MEF MEF
         {
             _mef = value;
 
-            if(ObscureDependencyFinder is CatalogueObscureDependencyFinder odf && this is IDataExportRepository dxm)
-                odf.AddOtherDependencyFinderIfNotExists<ValidationXMLObscureDependencyFinder>(new RepositoryProvider(dxm));
+            if (ObscureDependencyFinder is CatalogueObscureDependencyFinder odf && this is IDataExportRepository dxm)
+                odf.AddOtherDependencyFinderIfNotExists<ValidationXMLObscureDependencyFinder>(
+                    new RepositoryProvider(dxm));
         }
     }
 
@@ -71,8 +73,7 @@ public MEF MEF
     /// </summary>
     public string EncryptionKeyPath { get; protected set; }
 
-    protected virtual Dictionary<PermissableDefaults, IExternalDatabaseServer> Defaults { get; set; } =
-        new Dictionary<PermissableDefaults, IExternalDatabaseServer>();
+    protected virtual Dictionary<PermissableDefaults, IExternalDatabaseServer> Defaults { get; set; } = new();
 
     public MemoryCatalogueRepository(IServerDefaults currentDefaults = null)
     {
@@ -82,9 +83,11 @@ public MemoryCatalogueRepository(IServerDefaults currentDefaults = null)
         EncryptionManager = new PasswordEncryptionKeyLocation(this);
 
         //we need to know what the default servers for stuff are
-        foreach (PermissableDefaults value in Enum.GetValues(typeof (PermissableDefaults)))
-            if(currentDefaults == null)
+        foreach (PermissableDefaults value in Enum.GetValues(typeof(PermissableDefaults)))
+            if (currentDefaults == null)
+            {
                 Defaults.Add(value, null); //we have no defaults to import
+            }
             else
             {
                 //we have defaults to import so get the default
@@ -92,9 +95,9 @@ public MemoryCatalogueRepository(IServerDefaults currentDefaults = null)
 
                 //if it's not null we must be able to return it with GetObjectByID
                 if (defaultServer != null)
-                    Objects.TryAdd(defaultServer,0);
+                    Objects.TryAdd(defaultServer, 0);
 
-                Defaults.Add(value,defaultServer);
+                Defaults.Add(value, defaultServer);
             }
 
         //start IDs with the maximum id of any default to avoid collisions
@@ -104,10 +107,12 @@ public MemoryCatalogueRepository(IServerDefaults currentDefaults = null)
 
         var dependencyFinder = new CatalogueObscureDependencyFinder(this);
 
-        if(this is IDataExportRepository dxm)
+        if (this is IDataExportRepository dxm)
         {
-            dependencyFinder.AddOtherDependencyFinderIfNotExists<ObjectSharingObscureDependencyFinder>(new RepositoryProvider(dxm));
-            dependencyFinder.AddOtherDependencyFinderIfNotExists<BetweenCatalogueAndDataExportObscureDependencyFinder>(new RepositoryProvider(dxm));
+            dependencyFinder.AddOtherDependencyFinderIfNotExists<ObjectSharingObscureDependencyFinder>(
+                new RepositoryProvider(dxm));
+            dependencyFinder.AddOtherDependencyFinderIfNotExists<BetweenCatalogueAndDataExportObscureDependencyFinder>(
+                new RepositoryProvider(dxm));
         }
 
         ObscureDependencyFinder = dependencyFinder;
@@ -128,10 +133,7 @@ public IEnumerable<AnyTableSqlParameter> GetAllParametersForParentTable(IMapsDir
         return GetAllObjects<AnyTableSqlParameter>().Where(o => o.IsReferenceTo(parent));
     }
 
-    public TicketingSystemConfiguration GetTicketingSystem()
-    {
-        return null;
-    }
+    public TicketingSystemConfiguration GetTicketingSystem() => null;
 
 
     public override void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
@@ -163,16 +165,14 @@ public Catalogue[] GetAllCataloguesUsing(TableInfo tableInfo)
                             ci => ci.ColumnInfo_ID != null && ci.ColumnInfo.TableInfo_ID == tableInfo.ID)).ToArray();
     }
 
-    public ExternalDatabaseServer[] GetAllDatabases<T>() where T:IPatcher,new()
+    public ExternalDatabaseServer[] GetAllDatabases<T>() where T : IPatcher, new()
     {
         IPatcher p = new T();
-        return GetAllObjects<ExternalDatabaseServer>().Where(s=>s.WasCreatedBy(p)).ToArray();
+        return GetAllObjects<ExternalDatabaseServer>().Where(s => s.WasCreatedBy(p)).ToArray();
     }
 
-    public IExternalDatabaseServer GetDefaultFor(PermissableDefaults field)
-    {
-        return Defaults.TryGetValue(field, out var result) ? result : null;
-    }
+    public IExternalDatabaseServer GetDefaultFor(PermissableDefaults field) =>
+        Defaults.TryGetValue(field, out var result) ? result : null;
 
     public void ClearDefault(PermissableDefaults toDelete)
     {
@@ -203,20 +203,26 @@ public override void Clear()
     /// <summary>
     /// records which credentials can be used to access the table under which contexts
     /// </summary>
-    protected Dictionary<ITableInfo,Dictionary<DataAccessContext, DataAccessCredentials>> CredentialsDictionary { get; set; } =
-        new Dictionary<ITableInfo, Dictionary<DataAccessContext, DataAccessCredentials>>();
+    protected Dictionary<ITableInfo, Dictionary<DataAccessContext, DataAccessCredentials>> CredentialsDictionary
+    {
+        get;
+        set;
+    } =
+        new();
 
-    public virtual void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context)
+    public virtual void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,
+        DataAccessContext context)
     {
-        if(!CredentialsDictionary.ContainsKey(tableInfo))
-            CredentialsDictionary.Add(tableInfo,new Dictionary<DataAccessContext, DataAccessCredentials>());
+        if (!CredentialsDictionary.ContainsKey(tableInfo))
+            CredentialsDictionary.Add(tableInfo, new Dictionary<DataAccessContext, DataAccessCredentials>());
 
-        CredentialsDictionary[tableInfo].Add(context,credentials);
+        CredentialsDictionary[tableInfo].Add(context, credentials);
 
         tableInfo.ClearAllInjections();
     }
 
-    public virtual void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context)
+    public virtual void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,
+        DataAccessContext context)
     {
         if (!CredentialsDictionary.ContainsKey(tableInfo))
             return;
@@ -228,10 +234,11 @@ public virtual void BreakLinkBetween(DataAccessCredentials credentials, ITableIn
 
     public virtual void BreakAllLinksBetween(DataAccessCredentials credentials, ITableInfo tableInfo)
     {
-        if(!CredentialsDictionary.ContainsKey(tableInfo))
+        if (!CredentialsDictionary.ContainsKey(tableInfo))
             return;
 
-        var toRemove = CredentialsDictionary[tableInfo].Where(v=>Equals(v.Value ,credentials)).Select(k=>k.Key).ToArray();
+        var toRemove = CredentialsDictionary[tableInfo].Where(v => Equals(v.Value, credentials)).Select(k => k.Key)
+            .ToArray();
 
         foreach (var context in toRemove)
             CredentialsDictionary[tableInfo].Remove(context);
@@ -239,12 +246,12 @@ public virtual void BreakAllLinksBetween(DataAccessCredentials credentials, ITab
 
     public DataAccessCredentials GetCredentialsIfExistsFor(ITableInfo tableInfo, DataAccessContext context)
     {
-        if(CredentialsDictionary.TryGetValue(tableInfo,out var creds))
+        if (CredentialsDictionary.TryGetValue(tableInfo, out var creds))
         {
-            if (creds.TryGetValue(context,out var cred))
+            if (creds.TryGetValue(context, out var cred))
                 return cred;
 
-            if (creds.TryGetValue(DataAccessContext.Any,out cred))
+            if (creds.TryGetValue(DataAccessContext.Any, out cred))
                 return cred;
         }
 
@@ -260,7 +267,8 @@ public Dictionary<DataAccessContext, DataAccessCredentials> GetCredentialsIfExis
         return null;
     }
 
-    public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos)
+    public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredentialUsagesBy(
+        DataAccessCredentials[] allCredentials, ITableInfo[] allTableInfos)
     {
         var toreturn = new Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>>();
 
@@ -275,12 +283,13 @@ public Dictionary<ITableInfo, List<DataAccessCredentialUsageNode>> GetAllCredent
         return toreturn;
     }
 
-    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredentials(DataAccessCredentials credentials)
+    public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredentials(
+        DataAccessCredentials credentials)
     {
         var toreturn = new Dictionary<DataAccessContext, List<ITableInfo>>();
 
         //add the keys
-        foreach (DataAccessContext context in Enum.GetValues(typeof (DataAccessContext)))
+        foreach (DataAccessContext context in Enum.GetValues(typeof(DataAccessContext)))
             toreturn.Add(context, new List<ITableInfo>());
 
         foreach (var kvp in CredentialsDictionary)
@@ -292,14 +301,15 @@ public Dictionary<DataAccessContext, List<ITableInfo>> GetAllTablesUsingCredenti
 
     public DataAccessCredentials GetCredentialByUsernameAndPasswordIfExists(string username, string password)
     {
-        return GetAllObjects<DataAccessCredentials>().FirstOrDefault(c=>Equals(c.Username,username) && Equals(c.GetDecryptedPassword(),password));
+        return GetAllObjects<DataAccessCredentials>().FirstOrDefault(c =>
+            Equals(c.Username, username) && Equals(c.GetDecryptedPassword(), password));
     }
 
     #endregion
 
     #region IAggregateForcedJoin
-    protected Dictionary<AggregateConfiguration,HashSet<ITableInfo>> ForcedJoins { get; set; } =
-        new Dictionary<AggregateConfiguration, HashSet<ITableInfo>>();
+
+    protected Dictionary<AggregateConfiguration, HashSet<ITableInfo>> ForcedJoins { get; set; } = new();
 
     public ITableInfo[] GetAllForcedJoinsFor(AggregateConfiguration configuration)
     {
@@ -326,29 +336,31 @@ public virtual void BreakLinkBetween(AggregateConfiguration configuration, ITabl
     public virtual void CreateLinkBetween(AggregateConfiguration configuration, ITableInfo tableInfo)
     {
         if (!ForcedJoins.ContainsKey(configuration))
-            ForcedJoins.Add(configuration,new HashSet<ITableInfo>());
+            ForcedJoins.Add(configuration, new HashSet<ITableInfo>());
 
         ForcedJoins[configuration].Add(tableInfo);
     }
+
     #endregion
 
     #region ICohortContainerLinker
+
     protected Dictionary<CohortAggregateContainer, HashSet<CohortContainerContent>> CohortContainerContents =
         new();
 
     public CohortAggregateContainer GetParent(AggregateConfiguration child)
     {
         //if it is in the contents of a container
-        if (CohortContainerContents.Any(kvp => kvp.Value.Select(c=>c.Orderable).Contains(child)))
+        if (CohortContainerContents.Any(kvp => kvp.Value.Select(c => c.Orderable).Contains(child)))
             return CohortContainerContents.Single(kvp => kvp.Value.Select(c => c.Orderable).Contains(child)).Key;
 
         return null;
     }
 
-    public virtual void Add(CohortAggregateContainer parent,AggregateConfiguration child,int order)
+    public virtual void Add(CohortAggregateContainer parent, AggregateConfiguration child, int order)
     {
         //make sure we know about the container
-        if(!CohortContainerContents.ContainsKey(parent))
+        if (!CohortContainerContents.ContainsKey(parent))
             CohortContainerContents.Add(parent, new HashSet<CohortContainerContent>());
 
         CohortContainerContents[parent].Add(new CohortContainerContent(child, order));
@@ -375,7 +387,8 @@ public CohortContainerContent(IOrderable orderable, int order)
 
     public int? GetOrderIfExistsFor(AggregateConfiguration configuration)
     {
-        var o = CohortContainerContents.SelectMany(kvp => kvp.Value).SingleOrDefault(c => c.Orderable.Equals(configuration));
+        var o = CohortContainerContents.SelectMany(kvp => kvp.Value)
+            .SingleOrDefault(c => c.Orderable.Equals(configuration));
 
         return o?.Order;
     }
@@ -390,7 +403,8 @@ public IOrderable[] GetChildren(CohortAggregateContainer parent)
 
     public CohortAggregateContainer GetParent(CohortAggregateContainer child)
     {
-        var match = CohortContainerContents.Where(k => k.Value.Any(hs => Equals(hs.Orderable, child))).Select(kvp=>kvp.Key).ToArray();
+        var match = CohortContainerContents.Where(k => k.Value.Any(hs => Equals(hs.Orderable, child)))
+            .Select(kvp => kvp.Key).ToArray();
         if (match.Length > 0)
             return match.Single();
 
@@ -416,24 +430,22 @@ public virtual void SetOrder(AggregateConfiguration child, int newOrder)
 
     public virtual void Add(CohortAggregateContainer parent, CohortAggregateContainer child)
     {
-        if(!CohortContainerContents.ContainsKey(parent))
-            CohortContainerContents.Add(parent,new HashSet<CohortContainerContent>());
+        if (!CohortContainerContents.ContainsKey(parent))
+            CohortContainerContents.Add(parent, new HashSet<CohortContainerContent>());
 
         CohortContainerContents[parent].Add(new CohortContainerContent(child, child.Order));
     }
 
-
     #endregion
 
 
     #region IFilterContainerManager
 
-    protected Dictionary<IContainer, HashSet<IContainer>> WhereSubContainers { get; set; } =
-        new Dictionary<IContainer, HashSet<IContainer>>();
+    protected Dictionary<IContainer, HashSet<IContainer>> WhereSubContainers { get; set; } = new();
 
     public IContainer[] GetSubContainers(IContainer container)
     {
-        if(!WhereSubContainers.ContainsKey(container))
+        if (!WhereSubContainers.ContainsKey(container))
             return Array.Empty<IContainer>();
 
         return WhereSubContainers[container].ToArray();
@@ -457,7 +469,8 @@ public IContainer GetParentContainerIfAny(IContainer container)
 
     public IFilter[] GetFilters(IContainer container)
     {
-        return GetAllObjects<IFilter>().Where(f =>f is not ExtractionFilter && f.FilterContainer_ID == container.ID).ToArray();
+        return GetAllObjects<IFilter>().Where(f => f is not ExtractionFilter && f.FilterContainer_ID == container.ID)
+            .ToArray();
     }
 
     public void AddChild(IContainer container, IFilter filter)
@@ -478,14 +491,13 @@ public virtual void AddSubContainer(IContainer parent, IContainer child)
 
     #region IGovernanceManager
 
-    protected Dictionary<GovernancePeriod,HashSet<ICatalogue>> GovernanceCoverage { get; set; } =
-        new Dictionary<GovernancePeriod, HashSet<ICatalogue>>();
+    protected Dictionary<GovernancePeriod, HashSet<ICatalogue>> GovernanceCoverage { get; set; } = new();
     private MEF _mef;
 
     public virtual void Unlink(GovernancePeriod governancePeriod, ICatalogue catalogue)
     {
-        if(!GovernanceCoverage.ContainsKey(governancePeriod))
-            GovernanceCoverage.Add(governancePeriod,new HashSet<ICatalogue>());
+        if (!GovernanceCoverage.ContainsKey(governancePeriod))
+            GovernanceCoverage.Add(governancePeriod, new HashSet<ICatalogue>());
 
         GovernanceCoverage[governancePeriod].Remove(catalogue);
     }
@@ -500,7 +512,7 @@ public virtual void Link(GovernancePeriod governancePeriod, ICatalogue catalogue
 
     public Dictionary<int, HashSet<int>> GetAllGovernedCataloguesForAllGovernancePeriods()
     {
-        return  GovernanceCoverage.ToDictionary(k => k.Key.ID, v => new HashSet<int>(v.Value.Select(c => c.ID)));
+        return GovernanceCoverage.ToDictionary(k => k.Key.ID, v => new HashSet<int>(v.Value.Select(c => c.ID)));
     }
 
     public IEnumerable<ICatalogue> GetAllGovernedCatalogues(GovernancePeriod governancePeriod)
@@ -520,32 +532,25 @@ public virtual void SetEncryptionKeyPath(string fullName)
         EncryptionKeyPath = fullName;
     }
 
-    public string GetEncryptionKeyPath()
-    {
-        return EncryptionKeyPath;
-    }
+    public string GetEncryptionKeyPath() => EncryptionKeyPath;
 
     public virtual void DeleteEncryptionKeyPath()
     {
         EncryptionKeyPath = null;
     }
+
     #endregion
+
     protected override void CascadeDeletes(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         base.CascadeDeletes(oTableWrapperObject);
 
         if (oTableWrapperObject is Catalogue catalogue)
-        {
             foreach (var ci in catalogue.CatalogueItems)
-            {
                 ci.DeleteInDatabase();
-            }
-        }
 
         if (oTableWrapperObject is ExtractionInformation extractionInformation)
-        {
             extractionInformation.CatalogueItem.ClearAllInjections();
-        }
 
         // when deleting a TableInfo
         if (oTableWrapperObject is TableInfo t)
@@ -553,39 +558,32 @@ protected override void CascadeDeletes(IMapsDirectlyToDatabaseTable oTableWrappe
             // forget about its credentials usages
             CredentialsDictionary.Remove(t);
 
-            foreach(var c in t.ColumnInfos)
-            {
-                c.DeleteInDatabase();
-            }
+            foreach (var c in t.ColumnInfos) c.DeleteInDatabase();
         }
 
         // when deleting a ColumnInfo
         if (oTableWrapperObject is ColumnInfo columnInfo)
-        {
-            foreach(var ci in Objects.Keys.OfType<CatalogueItem>().Where(ci=>ci.ColumnInfo_ID == columnInfo.ID))
+            foreach (var ci in Objects.Keys.OfType<CatalogueItem>().Where(ci => ci.ColumnInfo_ID == columnInfo.ID))
             {
                 ci.ColumnInfo_ID = null;
                 ci.ClearAllInjections();
                 ci.SaveToDatabase();
             }
-        }
 
-        if (oTableWrapperObject is CatalogueItem catalogueItem)
-        {
-            catalogueItem.ExtractionInformation?.DeleteInDatabase();
-        }
+        if (oTableWrapperObject is CatalogueItem catalogueItem) catalogueItem.ExtractionInformation?.DeleteInDatabase();
     }
+
     /// <inheritdoc/>
     public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName, IMapsDirectlyToDatabaseTable obj)
     {
         return GetAllObjectsWhere<ExtendedProperty>("Name", propertyName)
             .Where(r => r.IsReferenceTo(obj));
     }
+
     /// <inheritdoc/>
-    public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName)
-    {
-        return GetAllObjectsWhere<ExtendedProperty>("Name", propertyName);
-    }
+    public IEnumerable<ExtendedProperty> GetExtendedProperties(string propertyName) =>
+        GetAllObjectsWhere<ExtendedProperty>("Name", propertyName);
+
     /// <inheritdoc/>
     public IEnumerable<ExtendedProperty> GetExtendedProperties(IMapsDirectlyToDatabaseTable obj)
     {
diff --git a/Rdmp.Core/Repositories/MemoryDataExportRepository.cs b/Rdmp.Core/Repositories/MemoryDataExportRepository.cs
index cec94fc589..6cc8421690 100644
--- a/Rdmp.Core/Repositories/MemoryDataExportRepository.cs
+++ b/Rdmp.Core/Repositories/MemoryDataExportRepository.cs
@@ -18,7 +18,8 @@ namespace Rdmp.Core.Repositories;
 /// Memory only implementation of <see cref="IDataExportRepository"/>.  Also implements <see cref="ICatalogueRepository"/>.  All objects are created in 
 /// dictionaries and arrays in memory instead of the database.
 /// </summary>
-public class MemoryDataExportRepository : MemoryCatalogueRepository,IDataExportRepository, IDataExportPropertyManager, IExtractableDataSetPackageManager
+public class MemoryDataExportRepository : MemoryCatalogueRepository, IDataExportRepository, IDataExportPropertyManager,
+    IExtractableDataSetPackageManager
 {
     public ICatalogueRepository CatalogueRepository => this;
     public IDataExportPropertyManager DataExportPropertyManager => this;
@@ -46,28 +47,26 @@ public ISelectedDataSets[] GetSelectedDatasetsWithNoExtractionIdentifiers()
 
     #region IDataExportPropertyManager
 
-    protected Dictionary<DataExportProperty,string>  PropertiesDictionary = new();
-        
-    public virtual string GetValue(DataExportProperty property)
-    {
-        return PropertiesDictionary.TryGetValue(property, out var value) ? value : null;
-    }
+    protected Dictionary<DataExportProperty, string> PropertiesDictionary = new();
+
+    public virtual string GetValue(DataExportProperty property) =>
+        PropertiesDictionary.TryGetValue(property, out var value) ? value : null;
 
     public virtual void SetValue(DataExportProperty property, string value)
     {
         if (!PropertiesDictionary.ContainsKey(property))
-            PropertiesDictionary.Add(property,value);
+            PropertiesDictionary.Add(property, value);
         else
             PropertiesDictionary[property] = value;
     }
+
     #endregion
 
-        
 
     #region IExtractableDataSetPackageManager
 
-    protected Dictionary<IExtractableDataSetPackage,HashSet<IExtractableDataSet>> PackageDictionary { get; set; } =
-        new Dictionary<IExtractableDataSetPackage, HashSet<IExtractableDataSet>>();
+    protected Dictionary<IExtractableDataSetPackage, HashSet<IExtractableDataSet>> PackageDictionary { get; set; } =
+        new();
 
     public IExtractableDataSet[] GetAllDataSets(IExtractableDataSetPackage package, IExtractableDataSet[] allDataSets)
     {
@@ -79,8 +78,8 @@ public IExtractableDataSet[] GetAllDataSets(IExtractableDataSetPackage package,
 
     public virtual void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
     {
-        if(!PackageDictionary.ContainsKey(package))
-            PackageDictionary.Add(package,new HashSet<IExtractableDataSet>());
+        if (!PackageDictionary.ContainsKey(package))
+            PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());
 
         PackageDictionary[package].Add(dataSet);
     }
@@ -91,25 +90,27 @@ public virtual void RemoveDataSetFromPackage(IExtractableDataSetPackage package,
             PackageDictionary.Add(package, new HashSet<IExtractableDataSet>());
 
         if (!PackageDictionary[package].Contains(dataSet))
-            throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed", nameof(dataSet));
+            throw new ArgumentException($"dataSet {dataSet} is not part of package {package} so cannot be removed",
+                nameof(dataSet));
 
         PackageDictionary[package].Remove(dataSet);
     }
 
     public Dictionary<int, List<int>> GetPackageContentsDictionary()
     {
-        return PackageDictionary.ToDictionary(k=>k.Key.ID,v=>v.Value.Select(o=>o.ID).ToList());
+        return PackageDictionary.ToDictionary(k => k.Key.ID, v => v.Value.Select(o => o.ID).ToList());
     }
 
-    public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(IExtractionConfiguration configuration, IExtractableDataSet dataset)
+    public IEnumerable<ICumulativeExtractionResults> GetAllCumulativeExtractionResultsFor(
+        IExtractionConfiguration configuration, IExtractableDataSet dataset)
     {
-        return GetAllObjects<CumulativeExtractionResults>().Where(e=>
+        return GetAllObjects<CumulativeExtractionResults>().Where(e =>
             e.ExtractionConfiguration_ID == configuration.ID && e.ExtractableDataSet_ID == dataset.ID);
     }
 
-    public IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativeExtractionResults)
-    {
-        return GetAllObjectsWhere<ReleaseLog>("CumulativeExtractionResults_ID", cumulativeExtractionResults.ID).SingleOrDefault();
-    }
+    public IReleaseLog GetReleaseLogEntryIfAny(CumulativeExtractionResults cumulativeExtractionResults) =>
+        GetAllObjectsWhere<ReleaseLog>("CumulativeExtractionResults_ID", cumulativeExtractionResults.ID)
+            .SingleOrDefault();
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/RepositoryProvider.cs b/Rdmp.Core/Repositories/RepositoryProvider.cs
index ca5bbb3e4c..664eee6b3c 100644
--- a/Rdmp.Core/Repositories/RepositoryProvider.cs
+++ b/Rdmp.Core/Repositories/RepositoryProvider.cs
@@ -35,10 +35,10 @@ public RepositoryProvider(IDataExportRepository dataExportRepository)
 
     protected RepositoryProvider()
     {
-            
     }
 
-    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName, string databaseObjectTypeName, int objectId)
+    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName,
+        string databaseObjectTypeName, int objectId)
     {
         var repository = GetRepository(repositoryTypeName);
         var objectType = GetTypeByName(databaseObjectTypeName, typeof(IMapsDirectlyToDatabaseTable));
@@ -73,10 +73,10 @@ protected virtual IRepository GetRepository(string s)
 
         throw new NotSupportedException(
             $"Did not know what instance of IRepository to use for IRepository Type '{repoType}' , expected it to either be CatalogueRepository or DataExportRepository");
-
     }
 
     private object oLockDictionary = new();
+
     private Type GetTypeByName(string s, Type expectedBaseClassType)
     {
         Type toReturn;
@@ -98,33 +98,35 @@ private Type GetTypeByName(string s, Type expectedBaseClassType)
             //cache known type to not hammer reflection all the time!
             _cachedTypesByNameDictionary.Add(s, toReturn);
         }
+
         return toReturn;
     }
 
     /// <inheritdoc/>
     public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable
     {
-        if(CatalogueRepository.SupportsObjectType(typeof(T)))
+        if (CatalogueRepository.SupportsObjectType(typeof(T)))
             return CatalogueRepository.GetObjectByID<T>(value);
-        if(DataExportRepository.SupportsObjectType(typeof(T)))
+        if (DataExportRepository.SupportsObjectType(typeof(T)))
             return DataExportRepository.GetObjectByID<T>(value);
         throw new ArgumentException($"Did not know what repository to use to fetch objects of Type '{typeof(T)}'");
     }
 
     /// <inheritdoc/>
-    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t,int value)
+    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value)
     {
-        if(CatalogueRepository.SupportsObjectType(t))
-            return CatalogueRepository.GetObjectByID(t,value);
-        if(DataExportRepository.SupportsObjectType(t))
-            return DataExportRepository.GetObjectByID(t,value);
+        if (CatalogueRepository.SupportsObjectType(t))
+            return CatalogueRepository.GetObjectByID(t, value);
+        if (DataExportRepository.SupportsObjectType(t))
+            return DataExportRepository.GetObjectByID(t, value);
         throw new ArgumentException($"Did not know what repository to use to fetch objects of Type '{t}'");
     }
+
     public virtual IEnumerable<IRepository> GetAllRepositories()
     {
         yield return CatalogueRepository;
 
-        if(DataExportRepository != null)
+        if (DataExportRepository != null)
             yield return DataExportRepository;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/RowVerCache.cs b/Rdmp.Core/Repositories/RowVerCache.cs
index c213d7f36a..473d84d983 100644
--- a/Rdmp.Core/Repositories/RowVerCache.cs
+++ b/Rdmp.Core/Repositories/RowVerCache.cs
@@ -20,7 +20,7 @@ namespace Rdmp.Core.Repositories;
 /// constructed / updated when an RDMP platform database stores hundreds of thousands of objects.
 /// </summary>
 /// <typeparam name="T"></typeparam>
-public class RowVerCache<T>: IRowVerCache where T : IMapsDirectlyToDatabaseTable
+public class RowVerCache<T> : IRowVerCache where T : IMapsDirectlyToDatabaseTable
 {
     private readonly TableRepository _repository;
 
@@ -61,10 +61,10 @@ public List<T> GetAllObjects()
 
             // Get deleted objects
             /*
-                SELECT  
+                SELECT
     CT.ID
-FROM  
-    CHANGETABLE(CHANGES Catalogue, @last_synchronization_version) AS CT  
+FROM
+    CHANGETABLE(CHANGES Catalogue, @last_synchronization_version) AS CT
     WHERE SYS_CHANGE_OPERATION = 'D'
 
     */
@@ -79,15 +79,16 @@ public List<T> GetAllObjects()
 
                 using (var cmd = _repository.DiscoveredServer.GetCommand(sql, con))
                 using (var r = cmd.ExecuteReader())
+                {
                     while (r.Read())
                     {
                         //it might have been added and deleted by someone else and we never saw it
-                        var d = _cachedObjects.SingleOrDefault(o => o.ID == (int) r["ID"]);
+                        var d = _cachedObjects.SingleOrDefault(o => o.ID == (int)r["ID"]);
 
                         if (d != null)
                             _cachedObjects.Remove(d);
-
                     }
+                }
             }
 
             //get new objects
@@ -123,33 +124,31 @@ private void UpdateMaxRowVer()
         //get the latest RowVer
         using var con = _repository.GetConnection();
         var table = _repository.DiscoveredServer.GetCurrentDatabase().ExpectTable(typeof(T).Name);
-        if (table.Exists() && table.DiscoverColumns().Any(c=>c.GetRuntimeName().Equals("RowVer",StringComparison.InvariantCultureIgnoreCase)))
+        if (table.Exists() && table.DiscoverColumns()
+                .Any(c => c.GetRuntimeName().Equals("RowVer", StringComparison.InvariantCultureIgnoreCase)))
             using (var cmd = _repository.DiscoveredServer.GetCommand($"select max(RowVer) from {typeof(T).Name}", con))
             {
                 var result = cmd.ExecuteScalar();
                 _maxRowVer = result == DBNull.Value ? null : (byte[])result;
             }
-                    
+
 
         using (var cmd =
                _repository.DiscoveredServer.GetCommand("select CHANGE_TRACKING_CURRENT_VERSION()", con))
         {
-
             var result = cmd.ExecuteScalar();
-            if(result != DBNull.Value)
+            if (result != DBNull.Value)
                 _changeTracking = Convert.ToInt64(result);
         }
     }
+
     private static string ByteArrayToString(IReadOnlyCollection<byte> ba)
     {
-        var hex = new StringBuilder("0x",2+ba.Count * 2);
+        var hex = new StringBuilder("0x", 2 + ba.Count * 2);
         foreach (var b in ba)
             hex.Append($"{b:x2}");
         return hex.ToString();
     }
 
-    public T1[] GetAllObjects<T1>()
-    {
-        return GetAllObjects().Cast<T1>().ToArray();
-    }
+    public T1[] GetAllObjects<T1>() => GetAllObjects().Cast<T1>().ToArray();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Repositories/VersionYamlTypeConverter.cs b/Rdmp.Core/Repositories/VersionYamlTypeConverter.cs
index 8bcee31f3f..f8eabea6cb 100644
--- a/Rdmp.Core/Repositories/VersionYamlTypeConverter.cs
+++ b/Rdmp.Core/Repositories/VersionYamlTypeConverter.cs
@@ -8,7 +8,6 @@
 using YamlDotNet.Core;
 using YamlDotNet.Core.Events;
 using YamlDotNet.Serialization;
-
 using Version = System.Version;
 
 namespace Rdmp.Core.Repositories;
@@ -18,10 +17,7 @@ namespace Rdmp.Core.Repositories;
 /// </summary>
 internal class VersionYamlTypeConverter : IYamlTypeConverter
 {
-    public bool Accepts(Type type)
-    {
-        return type == typeof(Version);
-    }
+    public bool Accepts(Type type) => type == typeof(Version);
 
     public object ReadYaml(IParser parser, Type type)
     {
diff --git a/Rdmp.Core/Repositories/YamlRepository.cs b/Rdmp.Core/Repositories/YamlRepository.cs
index 675c28cac9..a92a55309f 100644
--- a/Rdmp.Core/Repositories/YamlRepository.cs
+++ b/Rdmp.Core/Repositories/YamlRepository.cs
@@ -33,6 +33,7 @@ public class YamlRepository : MemoryDataExportRepository
     /// All objects that are known about by this repository
     /// </summary>
     public IReadOnlyCollection<IMapsDirectlyToDatabaseTable> AllObjects => Objects.Keys.ToList().AsReadOnly();
+
     public DirectoryInfo Directory { get; }
 
     private object lockFs = new();
@@ -64,7 +65,6 @@ public YamlRepository(DirectoryInfo dir)
     /// <returns></returns>
     public static ISerializer CreateSerializer(IEnumerable<Type> supportedTypes)
     {
-
         var builder = new SerializerBuilder();
         builder.WithTypeConverter(new VersionYamlTypeConverter());
 
@@ -73,12 +73,8 @@ public static ISerializer CreateSerializer(IEnumerable<Type> supportedTypes)
             var respect = TableRepository.GetPropertyInfos(type);
 
             foreach (var prop in type.GetProperties())
-            {
                 if (!respect.Contains(prop))
-                {
                     builder = builder.WithAttributeOverride(type, prop.Name, new YamlIgnoreAttribute());
-                }
-            }
         }
 
         return builder.Build();
@@ -103,21 +99,20 @@ private void LoadObjects()
                 continue;
             }
 
-            lock(lockFs)
+            lock (lockFs)
             {
                 foreach (var yaml in typeDir.EnumerateFiles("*.yaml"))
-                {
                     try
                     {
-                        var obj = (IMapsDirectlyToDatabaseTable)deserializer.Deserialize(File.ReadAllText(yaml.FullName), t);
+                        var obj = (IMapsDirectlyToDatabaseTable)deserializer.Deserialize(
+                            File.ReadAllText(yaml.FullName), t);
                         SetRepositoryOnObject(obj);
                         Objects.TryAdd(obj, 0);
                     }
                     catch (Exception ex)
                     {
-                        throw new Exception($"Error loading object in file {yaml.FullName}",ex);
+                        throw new Exception($"Error loading object in file {yaml.FullName}", ex);
                     }
-                }
             }
         }
 
@@ -127,11 +122,12 @@ private void LoadObjects()
 
         LoadCredentialsDictionary();
 
-        PackageDictionary = Load<IExtractableDataSetPackage,IExtractableDataSet>(nameof(PackageDictionary)) ?? PackageDictionary;
+        PackageDictionary = Load<IExtractableDataSetPackage, IExtractableDataSet>(nameof(PackageDictionary)) ??
+                            PackageDictionary;
 
         GovernanceCoverage = Load<GovernancePeriod, ICatalogue>(nameof(GovernanceCoverage)) ?? GovernanceCoverage;
 
-        ForcedJoins = Load<AggregateConfiguration,ITableInfo>(nameof(ForcedJoins)) ?? ForcedJoins;
+        ForcedJoins = Load<AggregateConfiguration, ITableInfo>(nameof(ForcedJoins)) ?? ForcedJoins;
 
         LoadCohortContainerContents();
 
@@ -178,11 +174,11 @@ protected virtual void SetRepositoryOnObject(IMapsDirectlyToDatabaseTable obj)
                 container.SetManager(this);
                 break;
             case LoadModuleAssembly lma:
-                lock(lockFs)
+                lock (lockFs)
                 {
                     var file = GetNupkgPath(lma);
 
-                    if(File.Exists(file))
+                    if (File.Exists(file))
                         lma.Bin = File.ReadAllBytes(file);
                     break;
                 }
@@ -194,7 +190,7 @@ public override void InsertAndHydrate<T>(T toCreate, Dictionary<string, object>
         base.InsertAndHydrate(toCreate, constructorParameters);
 
         // put it on disk
-        lock(lockFs)
+        lock (lockFs)
         {
             SaveToDatabase(toCreate);
         }
@@ -206,7 +202,7 @@ private string GetNupkgPath(LoadModuleAssembly lma)
         var path = Path.GetDirectoryName(GetPath(lma));
 
         //somedir/LoadModuleAssembly/MyPlugin1.0.0.nupkg
-        return Path.Combine(path,  GetObjectByID<Rdmp.Core.Curation.Data.Plugin>(lma.Plugin_ID).Name);
+        return Path.Combine(path, GetObjectByID<Rdmp.Core.Curation.Data.Plugin>(lma.Plugin_ID).Name);
     }
 
     public override void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapperObject)
@@ -217,10 +213,7 @@ public override void DeleteFromDatabase(IMapsDirectlyToDatabaseTable oTableWrapp
             File.Delete(GetPath(oTableWrapperObject));
 
             // if deleting a LoadModuleAssembly also delete its binary content file (the plugin dlls in nupkg)
-            if (oTableWrapperObject is LoadModuleAssembly lma)
-            {
-                File.Delete(GetNupkgPath(lma));
-            }
+            if (oTableWrapperObject is LoadModuleAssembly lma) File.Delete(GetNupkgPath(lma));
         }
     }
 
@@ -239,10 +232,8 @@ public override void SaveToDatabase(IMapsDirectlyToDatabaseTable o)
             // Do not write plugin binary content into yaml that results in
             // a massive blob of binary yaml (not useful and slow to load)
             if (o is LoadModuleAssembly lma)
-            {
                 // write the nupkg as a binary file instead to the same folder
                 File.WriteAllBytes(GetNupkgPath(lma), lma.Bin);
-            }
         }
     }
 
@@ -251,42 +242,39 @@ public override void SaveToDatabase(IMapsDirectlyToDatabaseTable o)
     /// </summary>
     /// <param name="o"></param>
     /// <returns></returns>
-    private string GetPath(IMapsDirectlyToDatabaseTable o)
-    {
-        return Path.Combine(Directory.FullName, o.GetType().Name, $"{o.ID}.yaml");
-    }
+    private string GetPath(IMapsDirectlyToDatabaseTable o) =>
+        Path.Combine(Directory.FullName, o.GetType().Name, $"{o.ID}.yaml");
 
     public override void DeleteEncryptionKeyPath()
     {
         base.DeleteEncryptionKeyPath();
 
-        if(File.Exists(GetEncryptionKeyPathFile()))
+        if (File.Exists(GetEncryptionKeyPathFile()))
             File.Delete(GetEncryptionKeyPathFile());
     }
+
     public override void SetEncryptionKeyPath(string fullName)
     {
         base.SetEncryptionKeyPath(fullName);
 
         // if setting it to null
-        if (string.IsNullOrWhiteSpace(fullName)) {
-
+        if (string.IsNullOrWhiteSpace(fullName))
+        {
             // delete the file on disk
             if (File.Exists(GetEncryptionKeyPathFile()))
                 File.Delete(GetEncryptionKeyPathFile());
         }
         else
+        {
             File.WriteAllText(GetEncryptionKeyPathFile(), fullName);
-    }
-    private string GetEncryptionKeyPathFile()
-    {
-        return Path.Combine(Directory.FullName, "EncryptionKeyPath");
+        }
     }
 
+    private string GetEncryptionKeyPathFile() => Path.Combine(Directory.FullName, "EncryptionKeyPath");
+
     #region Server Defaults Persistence
-    private string GetDefaultsFile()
-    {
-        return Path.Combine(Directory.FullName, "Defaults.yaml");
-    }
+
+    private string GetDefaultsFile() => Path.Combine(Directory.FullName, "Defaults.yaml");
 
     public override void SetDefault(PermissableDefaults toChange, IExternalDatabaseServer externalDatabaseServer)
     {
@@ -300,7 +288,8 @@ private void SaveDefaults()
         var serializer = new Serializer();
 
         // save the default and the ID
-        File.WriteAllText(GetDefaultsFile(),serializer.Serialize(Defaults.ToDictionary(k=>k.Key,v=>v.Value?.ID ?? 0)));
+        File.WriteAllText(GetDefaultsFile(),
+            serializer.Serialize(Defaults.ToDictionary(k => k.Key, v => v.Value?.ID ?? 0)));
     }
 
     public void LoadDefaults()
@@ -309,7 +298,7 @@ public void LoadDefaults()
 
         var defaultsFile = GetDefaultsFile();
 
-        if(File.Exists(defaultsFile))
+        if (File.Exists(defaultsFile))
         {
             var yaml = File.ReadAllText(defaultsFile);
             var objectIds = deserializer.Deserialize<Dictionary<PermissableDefaults, int>>(yaml);
@@ -319,8 +308,10 @@ public void LoadDefaults()
                 return;
 
             Defaults = objectIds.ToDictionary(
-                k=>k.Key,
-                v=>v.Value == 0 ? null : (IExternalDatabaseServer)GetObjectByIDIfExists<ExternalDatabaseServer>(v.Value));
+                k => k.Key,
+                v => v.Value == 0
+                    ? null
+                    : (IExternalDatabaseServer)GetObjectByIDIfExists<ExternalDatabaseServer>(v.Value));
         }
     }
 
@@ -330,7 +321,7 @@ public void LoadDefaults()
     /// <typeparam name="T"></typeparam>
     /// <param name="id"></param>
     /// <returns></returns>
-    private T GetObjectByIDIfExists<T>(int id) where T:DatabaseEntity
+    private T GetObjectByIDIfExists<T>(int id) where T : DatabaseEntity
     {
         try
         {
@@ -341,13 +332,13 @@ private T GetObjectByIDIfExists<T>(int id) where T:DatabaseEntity
             return null;
         }
     }
+
     #endregion
 
     #region DataExportProperties Persistence
-    private string GetDataExportPropertiesFile()
-    {
-        return Path.Combine(Directory.FullName, "DataExportProperties.yaml");
-    }
+
+    private string GetDataExportPropertiesFile() => Path.Combine(Directory.FullName, "DataExportProperties.yaml");
+
     public void LoadDataExportProperties()
     {
         var deserializer = new Deserializer();
@@ -359,10 +350,11 @@ public void LoadDataExportProperties()
             var yaml = File.ReadAllText(defaultsFile);
             var props = deserializer.Deserialize<Dictionary<DataExportProperty, string>>(yaml);
 
-            if(props != null)
+            if (props != null)
                 PropertiesDictionary = props;
         }
     }
+
     private void SaveDataExportProperties()
     {
         var serializer = new Serializer();
@@ -370,15 +362,15 @@ private void SaveDataExportProperties()
         // save the default and the ID
         File.WriteAllText(GetDataExportPropertiesFile(), serializer.Serialize(PropertiesDictionary));
     }
-    public override string GetValue(DataExportProperty property)
-    {
-        return base.GetValue(property);
-    }
+
+    public override string GetValue(DataExportProperty property) => base.GetValue(property);
+
     public override void SetValue(DataExportProperty property, string value)
     {
         base.SetValue(property, value);
         SaveDataExportProperties();
     }
+
     #endregion
 
     public override void AddDataSetToPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
@@ -390,14 +382,14 @@ public override void AddDataSetToPackage(IExtractableDataSetPackage package, IEx
     public override void RemoveDataSetFromPackage(IExtractableDataSetPackage package, IExtractableDataSet dataSet)
     {
         base.RemoveDataSetFromPackage(package, dataSet);
-        Save(PackageDictionary,nameof(PackageDictionary));
+        Save(PackageDictionary, nameof(PackageDictionary));
     }
 
 
     public override void Link(GovernancePeriod governancePeriod, ICatalogue catalogue)
     {
         base.Link(governancePeriod, catalogue);
-        Save(GovernanceCoverage,nameof(GovernanceCoverage));
+        Save(GovernanceCoverage, nameof(GovernanceCoverage));
     }
 
     public override void Unlink(GovernancePeriod governancePeriod, ICatalogue catalogue)
@@ -419,10 +411,9 @@ public override void BreakLinkBetween(AggregateConfiguration configuration, ITab
     }
 
     #region Persist CredentialsDictionary
-    private string GetCredentialsDictionaryFile()
-    {
-        return Path.Combine(Directory.FullName, "CredentialsDictionary.yaml");
-    }
+
+    private string GetCredentialsDictionaryFile() => Path.Combine(Directory.FullName, "CredentialsDictionary.yaml");
+
     public void LoadCredentialsDictionary()
     {
         var deserializer = new Deserializer();
@@ -441,7 +432,7 @@ public void LoadCredentialsDictionary()
 
             CredentialsDictionary = new Dictionary<ITableInfo, Dictionary<DataAccessContext, DataAccessCredentials>>();
 
-            foreach(var tableToCredentialUsage in ids)
+            foreach (var tableToCredentialUsage in ids)
             {
                 var table = GetObjectByIDIfExists<TableInfo>(tableToCredentialUsage.Key);
 
@@ -450,7 +441,7 @@ public void LoadCredentialsDictionary()
                     continue;
 
                 var valDictionary = new Dictionary<DataAccessContext, DataAccessCredentials>();
-                foreach(var (usage, value) in tableToCredentialUsage.Value)
+                foreach (var (usage, value) in tableToCredentialUsage.Value)
                 {
                     var credential = GetObjectByIDIfExists<DataAccessCredentials>(value);
 
@@ -460,10 +451,9 @@ public void LoadCredentialsDictionary()
 
                 CredentialsDictionary.Add(table, valDictionary);
             }
-
-
         }
     }
+
     private void SaveCredentialsDictionary()
     {
         var serializer = new Serializer();
@@ -483,16 +473,21 @@ public override void BreakAllLinksBetween(DataAccessCredentials credentials, ITa
 
         SaveCredentialsDictionary();
     }
-    public override void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context)
+
+    public override void BreakLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,
+        DataAccessContext context)
     {
         base.BreakLinkBetween(credentials, tableInfo, context);
         SaveCredentialsDictionary();
     }
-    public override void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo, DataAccessContext context)
+
+    public override void CreateLinkBetween(DataAccessCredentials credentials, ITableInfo tableInfo,
+        DataAccessContext context)
     {
         base.CreateLinkBetween(credentials, tableInfo, context);
         SaveCredentialsDictionary();
     }
+
     #endregion
 
 
@@ -504,7 +499,8 @@ private void SaveCohortContainerContents(CohortAggregateContainer toSave)
         var file = Path.Combine(dir, $"{toSave.ID}.yaml");
 
         var serializer = new Serializer();
-        var yaml = serializer.Serialize(CohortContainerContents[toSave].Select(c => new PersistCohortContainerContent(c)).ToList());
+        var yaml = serializer.Serialize(CohortContainerContents[toSave]
+            .Select(c => new PersistCohortContainerContent(c)).ToList());
         File.WriteAllText(file, yaml);
     }
 
@@ -547,10 +543,9 @@ private void LoadCohortContainerContents()
             }
             catch (Exception ex)
             {
-                throw new Exception($"Error reading file {f.FullName}",ex);
+                throw new Exception($"Error reading file {f.FullName}", ex);
             }
         }
-
     }
 
     public override void Add(CohortAggregateContainer parent, AggregateConfiguration child, int order)
@@ -591,8 +586,8 @@ private class PersistCohortContainerContent
 
         public PersistCohortContainerContent()
         {
-
         }
+
         public PersistCohortContainerContent(CohortContainerContent c)
         {
             Type = c.Orderable.GetType().Name;
@@ -604,14 +599,10 @@ public PersistCohortContainerContent(CohortContainerContent c)
         public CohortContainerContent GetContent(YamlRepository repository)
         {
             if (Type.Equals(nameof(AggregateConfiguration)))
-            {
                 return new CohortContainerContent(repository.GetObjectByID<AggregateConfiguration>(ID), Order);
-            }
 
             if (Type.Equals(nameof(CohortAggregateContainer)))
-            {
                 return new CohortContainerContent(repository.GetObjectByID<CohortAggregateContainer>(ID), Order);
-            }
 
             throw new Exception($"Unexpected IOrderable Type name '{Type}'");
         }
@@ -624,6 +615,7 @@ public override void MakeIntoAnOrphan(IContainer container)
         base.MakeIntoAnOrphan(container);
         SaveWhereSubContainers();
     }
+
     public override void AddSubContainer(IContainer parent, IContainer child)
     {
         base.AddSubContainer(parent, child);
@@ -634,30 +626,25 @@ private void SaveWhereSubContainers()
     {
         Save(WhereSubContainers.Where(kvp => kvp.Key is FilterContainer)
             .ToDictionary(
-            k => k.Key,
-            v => v.Value), "ExtractionFilters");
+                k => k.Key,
+                v => v.Value), "ExtractionFilters");
 
         Save(WhereSubContainers.Where(kvp => kvp.Key is AggregateFilterContainer)
             .ToDictionary(
-            k => k.Key,
-            v => v.Value), "AggregateFilters");
+                k => k.Key,
+                v => v.Value), "AggregateFilters");
     }
 
-    public override string ToString()
-    {
-        return $"{{YamlRepository {Directory.FullName}}}";
-    }
+    public override string ToString() => $"{{YamlRepository {Directory.FullName}}}";
 
     private void LoadWhereSubContainers()
     {
-        foreach (var c in Load<FilterContainer, FilterContainer>("ExtractionFilters") ?? new Dictionary<FilterContainer, HashSet<FilterContainer>>())
-        {
+        foreach (var c in Load<FilterContainer, FilterContainer>("ExtractionFilters") ??
+                          new Dictionary<FilterContainer, HashSet<FilterContainer>>())
             WhereSubContainers.Add(c.Key, new HashSet<IContainer>(c.Value));
-        }
-        foreach(var c in Load<AggregateFilterContainer, AggregateFilterContainer>("AggregateFilters") ?? new Dictionary<AggregateFilterContainer, HashSet<AggregateFilterContainer>>())
-        {
+        foreach (var c in Load<AggregateFilterContainer, AggregateFilterContainer>("AggregateFilters") ??
+                          new Dictionary<AggregateFilterContainer, HashSet<AggregateFilterContainer>>())
             WhereSubContainers.Add(c.Key, new HashSet<IContainer>(c.Value));
-        }
     }
 
     private Dictionary<T, HashSet<T2>> Load<T, T2>(string filenameWithoutSuffix)
@@ -681,15 +668,13 @@ private Dictionary<T, HashSet<T2>> Load<T, T2>(string filenameWithoutSuffix)
                 return null;
 
             foreach (var ids in dict)
-            {
                 try
                 {
                     var key = GetObjectByID<T>(ids.Key);
 
                     var set = new HashSet<T2>();
 
-                    foreach(var val in ids.Value)
-                    {
+                    foreach (var val in ids.Value)
                         try
                         {
                             set.Add(GetObjectByID<T2>(val));
@@ -699,7 +684,6 @@ private Dictionary<T, HashSet<T2>> Load<T, T2>(string filenameWithoutSuffix)
                             // skip missing objects (they will disapear next save anyway)
                             continue;
                         }
-                    }
 
                     dictionary.Add(key, set);
                 }
@@ -708,13 +692,13 @@ private Dictionary<T, HashSet<T2>> Load<T, T2>(string filenameWithoutSuffix)
                     // skip missing container objects (they will disapear next save anyway)
                     continue;
                 }
-            }
 
             return dictionary;
         }
 
         return new Dictionary<T, HashSet<T2>>();
     }
+
     private void Save<T, T2>(Dictionary<T, HashSet<T2>> collection, string filenameWithoutSuffix)
         where T : IMapsDirectlyToDatabaseTable
         where T2 : IMapsDirectlyToDatabaseTable
@@ -727,8 +711,6 @@ private void Save<T, T2>(Dictionary<T, HashSet<T2>> collection, string filenameW
             collection.ToDictionary(
                 k => k.Key.ID,
                 v => v.Value.Select(c => c.ID).ToList()
-                )));
-
+            )));
     }
-
-}
+}
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Annotations/Annotations.cs b/Rdmp.Core/ReusableLibraryCode/Annotations/Annotations.cs
index 4bc8a99836..6589f5a16b 100644
--- a/Rdmp.Core/ReusableLibraryCode/Annotations/Annotations.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Annotations/Annotations.cs
@@ -23,7 +23,9 @@ namespace Rdmp.Core.ReusableLibraryCode.Annotations;
     AttributeTargets.Method | AttributeTargets.Parameter |
     AttributeTargets.Property | AttributeTargets.Delegate |
     AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-public sealed class CanBeNullAttribute : Attribute { }
+public sealed class CanBeNullAttribute : Attribute
+{
+}
 
 /// <summary>
 /// Indicates that the value of the marked element could never be <c>null</c>
@@ -37,7 +39,9 @@ public sealed class CanBeNullAttribute : Attribute { }
     AttributeTargets.Method | AttributeTargets.Parameter |
     AttributeTargets.Property | AttributeTargets.Delegate |
     AttributeTargets.Field, AllowMultiple = false, Inherited = true)]
-public sealed class NotNullAttribute : Attribute { }
+public sealed class NotNullAttribute : Attribute
+{
+}
 
 /// <summary>
 /// Indicates that the method is contained in a type that implements
@@ -78,7 +82,10 @@ public sealed class NotNullAttribute : Attribute { }
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
 public sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
 {
-    public NotifyPropertyChangedInvocatorAttribute() { }
+    public NotifyPropertyChangedInvocatorAttribute()
+    {
+    }
+
     public NotifyPropertyChangedInvocatorAttribute(string parameterName)
     {
         ParameterName = parameterName;
@@ -96,8 +103,8 @@ public NotifyPropertyChangedInvocatorAttribute(string parameterName)
 public sealed class UsedImplicitlyAttribute : Attribute
 {
     public UsedImplicitlyAttribute(
-        ImplicitUseKindFlags useKindFlags=ImplicitUseKindFlags.Default,
-        ImplicitUseTargetFlags targetFlags=ImplicitUseTargetFlags.Default)
+        ImplicitUseKindFlags useKindFlags = ImplicitUseKindFlags.Default,
+        ImplicitUseTargetFlags targetFlags = ImplicitUseTargetFlags.Default)
     {
         UseKindFlags = useKindFlags;
         TargetFlags = targetFlags;
@@ -111,15 +118,19 @@ public UsedImplicitlyAttribute(
 public enum ImplicitUseKindFlags
 {
     Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
+
     /// <summary>Only entity marked with attribute considered used</summary>
     Access = 1,
+
     /// <summary>Indicates implicit assignment to a member</summary>
     Assign = 2,
+
     /// <summary>
     /// Indicates implicit instantiation of a type with fixed constructor signature.
     /// That means any unused constructor parameters won't be reported as such.
     /// </summary>
     InstantiatedWithFixedConstructorSignature = 4,
+
     /// <summary>Indicates implicit instantiation of a type</summary>
     InstantiatedNoFixedConstructorSignature = 8
 }
@@ -132,8 +143,10 @@ public enum ImplicitUseTargetFlags
 {
     Itself = 1,
     Default = Itself,
+
     /// <summary>Members of entity marked with attribute are considered used</summary>
     Members = 2,
+
     /// <summary>Entity marked with attribute and all its members considered used</summary>
     WithMembers = Itself | Members
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/AssemblyResolver.cs b/Rdmp.Core/ReusableLibraryCode/AssemblyResolver.cs
index eeb232fe6d..2bb0d9b45d 100644
--- a/Rdmp.Core/ReusableLibraryCode/AssemblyResolver.cs
+++ b/Rdmp.Core/ReusableLibraryCode/AssemblyResolver.cs
@@ -19,7 +19,7 @@ namespace Rdmp.Core.ReusableLibraryCode;
 /// </summary>
 public static class AssemblyResolver
 {
-    private static Dictionary<string,Assembly> assemblyResolveAttempts = new(); 
+    private static Dictionary<string, Assembly> assemblyResolveAttempts = new();
 
     public static void SetupAssemblyResolver(params DirectoryInfo[] dirs)
     {
@@ -33,12 +33,12 @@ public static void SetupAssemblyResolver(params DirectoryInfo[] dirs)
                 return expression;
 
             //start out assuming we cannot load it
-            assemblyResolveAttempts.Add(assemblyInfo,null);
-                
-            foreach(var dir in dirs)
+            assemblyResolveAttempts.Add(assemblyInfo, null);
+
+            foreach (var dir in dirs)
             {
                 var dll = dir.EnumerateFiles($"{name}.dll").SingleOrDefault();
-                if(dll != null)
+                if (dll != null)
                     return assemblyResolveAttempts[assemblyInfo] = LoadFile(dll); //cache and return answer
             }
 
@@ -53,29 +53,22 @@ public static void SetupAssemblyResolver(params DirectoryInfo[] dirs)
 
             return assemblyResolveAttempts[assemblyInfo] = Assembly.LoadFile(file.FullName); //cache and return answer
         };
-    } 
- 
+    }
+
     public static Assembly LoadFile(FileInfo f)
     {
         try
         {
             return F1(f);
-
-        }catch(FileLoadException)
+        }
+        catch (FileLoadException)
         {
             //AssemblyLoadContext.Default.LoadFromAssemblyPath causes this Exception at runtime only
             return F2(f);
         }
     }
 
-    private static Assembly F2(FileInfo f)
-    {
-        return Assembly.LoadFile(f.FullName);
-    }
-
-    private static Assembly F1(FileInfo f)
-    {
-        return AssemblyLoadContext.Default.LoadFromAssemblyPath(f.FullName);
-    }
+    private static Assembly F2(FileInfo f) => Assembly.LoadFile(f.FullName);
 
+    private static Assembly F1(FileInfo f) => AssemblyLoadContext.Default.LoadFromAssemblyPath(f.FullName);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/CheckEventArgs.cs b/Rdmp.Core/ReusableLibraryCode/Checks/CheckEventArgs.cs
index 92e4143db4..58da3eb1d3 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/CheckEventArgs.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/CheckEventArgs.cs
@@ -51,14 +51,13 @@ public CheckEventArgs(string message, CheckResult result, Exception ex = null, s
         }
     }
 
-    public CheckEventArgs(ErrorCode code, params object[] formatStringArgs) : this(code,null,null,formatStringArgs)
+    public CheckEventArgs(ErrorCode code, params object[] formatStringArgs) : this(code, null, null, formatStringArgs)
     {
-
     }
 
-    public CheckEventArgs(ErrorCode code, Exception ex, params object[] formatStringArgs) : this(code, ex, null, formatStringArgs)
+    public CheckEventArgs(ErrorCode code, Exception ex, params object[] formatStringArgs) : this(code, ex, null,
+        formatStringArgs)
     {
-
     }
 
     /// <summary>
@@ -86,18 +85,14 @@ public CheckEventArgs(ErrorCode code, Exception ex, string proposedFix, params o
         {
             //Stack trace not available ah well
         }
-
     }
 
-    public override string ToString()
-    {
-        return Message;
-    }
+    public override string ToString() => Message;
 
     public NotifyEventArgs ToNotifyEventArgs()
     {
         ProgressEventType status;
-            
+
         switch (Result)
         {
             case CheckResult.Success:
@@ -113,14 +108,14 @@ public NotifyEventArgs ToNotifyEventArgs()
                 throw new ArgumentOutOfRangeException();
         }
 
-        return new NotifyEventArgs(status, Message,Ex);
+        return new NotifyEventArgs(status, Message, Ex);
     }
 
-    public void GetSummary(out string title, out string body,out string stackTrace, out CheckResult level)
+    public void GetSummary(out string title, out string body, out string stackTrace, out CheckResult level)
     {
         title = "Check Result";
         body = Message;
-        stackTrace= StackTrace;
+        stackTrace = StackTrace;
         level = Result;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCode.cs b/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCode.cs
index ca9bf699bc..703f071e7e 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCode.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCode.cs
@@ -14,7 +14,6 @@ namespace Rdmp.Core.ReusableLibraryCode.Checks;
 /// </summary>
 public sealed class ErrorCode
 {
-
     /// <summary>
     /// A fixed code for uniquely identifying this error type
     /// </summary>
@@ -38,8 +37,5 @@ public ErrorCode(string code, string message, CheckResult defaultTreatment)
         DefaultTreatment = defaultTreatment;
     }
 
-    public override string ToString()
-    {
-        return Code;
-    }
+    public override string ToString() => Code;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCodes.cs b/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCodes.cs
index b63f4dc770..cb2628726d 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCodes.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/ErrorCodes.cs
@@ -17,11 +17,14 @@ public static class ErrorCodes
 {
     public static readonly ErrorCode ExistingExtractionTableInDatabase = new("R001",
         "Table {0} already exists in the extraction database {1}", CheckResult.Fail);
+
     public static readonly ErrorCode ExtractTimeoutChecking =
         new("R002", "Failed to read rows after {0}s", CheckResult.Warning);
+
     public static readonly ErrorCode ExtractionProgressColumnProbablyNotADate = new("R003",
         "Data type for column '{0}' is '{1}' which is not a date.  If the SelectSQL is a transform to then this is ok",
         CheckResult.Warning);
+
     public static readonly ErrorCode ExtractionIsIdentifiable = new("R004",
         "PrivateIdentifierField and ReleaseIdentifierField are the same, this means your cohort will extract identifiable data (no cohort identifier substitution takes place)",
         CheckResult.Fail);
@@ -29,23 +32,29 @@ public static class ErrorCodes
     public static readonly ErrorCode ExtractionContainsSpecialApprovalRequired = new("R005",
         "ExtractionConfiguration '{0}' dataset '{1}' contains SpecialApprovalRequired columns: {2}",
         CheckResult.Warning);
+
     public static readonly ErrorCode ExtractionContainsInternal = new("R006",
         "ExtractionConfiguration '{0}' dataset '{1}' contains Internal columns: {2}", CheckResult.Warning);
+
     public static readonly ErrorCode ExtractionContainsDeprecated = new("R007",
         "ExtractionConfiguration '{0}' dataset '{1}' contains Deprecated columns: {2}", CheckResult.Fail);
-        
+
     public static readonly ErrorCode CouldNotLoadDll =
         new("R008", "Encountered Bad Assembly loading {0} into memory", CheckResult.Success);
+
     public static readonly ErrorCode CouldOnlyHalfLoadDll =
         new("R009", "Loaded {0}/{1} Types from {2}", CheckResult.Warning);
+
     public static readonly ErrorCode CohortAndExtractableDatasetsAreOnDifferentServers = new("R010",
         "Cohort is on server '{0}' ({1}) but dataset '{2}' is on '{3}' ({4})", CheckResult.Warning);
+
     public static readonly ErrorCode CouldNotReachCohort = new("R011",
         "Could not reach cohort '{0}' (it may be slow responding or inaccessible due to user permissions)",
         CheckResult.Warning);
-        
+
     public static readonly ErrorCode ExtractionFailedToExecuteTop1 =
         new("R012", "Failed to execute Top 1 on dataset '{0}'", CheckResult.Warning);
+
     public static readonly ErrorCode TextColumnsInExtraction = new("R013",
         "The following columns are data type ntext or text and so may be incompatible with the DISTINCT keyword({0}).  Ensure that PipelineSources are set to use extraction strategy 'OrderByAndDistinctInMemory' (ignore this message if you have already enabled this setting)",
         CheckResult.Warning);
@@ -57,26 +66,25 @@ public static class ErrorCodes
     public static readonly ErrorCode AttemptToReleaseUnfinishedExtractionProgress = new("R015",
         "Dataset {0} should not be released because its ExtractionProgress has a progress date of {1} but an end date of {2}",
         CheckResult.Fail);
+
     public static readonly ErrorCode NoSqlAuditedForExtractionProgress = new("R0016",
         "ExtractionProgress '{0}' is 'in progress' (ProgressDate is not null) but there is no audit of previously extracted SQL (needed for checking cohort changes)",
         CheckResult.Fail);
+
     public static readonly ErrorCode CohortSwappedMidExtraction = new("R0017",
         "ExtractionProgress '{0}' is 'in progress' (ProgressDate is not null) but we did not find the expected Cohort WHERE Sql in the audit of SQL extracted with the last batch.  Did you change the cohort without resetting the ProgressDate? The SQL we expected to find was '{1}'",
         CheckResult.Fail);
-        
+
     static ErrorCodes()
     {
-        var fields = typeof(ErrorCodes).GetFields(BindingFlags.Public | BindingFlags.Static).Where(p => p.FieldType == typeof(ErrorCode));
+        var fields = typeof(ErrorCodes).GetFields(BindingFlags.Public | BindingFlags.Static)
+            .Where(p => p.FieldType == typeof(ErrorCode));
 
-        foreach(var field in fields)
-        {
-            KnownCodes.Add((ErrorCode)field.GetValue(null));
-        }
+        foreach (var field in fields) KnownCodes.Add((ErrorCode)field.GetValue(null));
     }
 
     /// <summary>
     /// Collection of all known error codes.  Plugins are free to add to these if desired but must do so pre startup
     /// </summary>
     public static readonly List<ErrorCode> KnownCodes = new();
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/IgnoreAllErrorsCheckNotifier.cs b/Rdmp.Core/ReusableLibraryCode/Checks/IgnoreAllErrorsCheckNotifier.cs
index d457392075..4f0f20e31d 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/IgnoreAllErrorsCheckNotifier.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/IgnoreAllErrorsCheckNotifier.cs
@@ -12,8 +12,5 @@ namespace Rdmp.Core.ReusableLibraryCode.Checks;
 /// </summary>
 public class IgnoreAllErrorsCheckNotifier : ICheckNotifier
 {
-    public bool OnCheckPerformed(CheckEventArgs args)
-    {
-        return true;
-    }
+    public bool OnCheckPerformed(CheckEventArgs args) => true;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/ReplayCheckable.cs b/Rdmp.Core/ReusableLibraryCode/Checks/ReplayCheckable.cs
index 817d7b3577..0b7869afd9 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/ReplayCheckable.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/ReplayCheckable.cs
@@ -29,5 +29,4 @@ public void Check(ICheckNotifier notifier)
             notifier.OnCheckPerformed(msg);
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/ThrowImmediatelyCheckNotifier.cs b/Rdmp.Core/ReusableLibraryCode/Checks/ThrowImmediatelyCheckNotifier.cs
index f0e6990127..5d5b81e09c 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/ThrowImmediatelyCheckNotifier.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/ThrowImmediatelyCheckNotifier.cs
@@ -33,7 +33,6 @@ public virtual bool OnCheckPerformed(CheckEventArgs args)
             _ => false
             //do not apply fixes to warnings/success
         };
-
     }
 
     /// <summary>
diff --git a/Rdmp.Core/ReusableLibraryCode/Checks/ToMemoryCheckNotifier.cs b/Rdmp.Core/ReusableLibraryCode/Checks/ToMemoryCheckNotifier.cs
index cebac8cb8f..61928e5043 100644
--- a/Rdmp.Core/ReusableLibraryCode/Checks/ToMemoryCheckNotifier.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Checks/ToMemoryCheckNotifier.cs
@@ -18,7 +18,7 @@ namespace Rdmp.Core.ReusableLibraryCode.Checks;
 public class ToMemoryCheckNotifier : ICheckNotifier
 {
     private readonly ICheckNotifier _childToPassEventsTo;
-    public List<CheckEventArgs> Messages { get; } = new List<CheckEventArgs>();
+    public List<CheckEventArgs> Messages { get; } = new();
 
     private readonly object _lockList = new();
 
@@ -48,7 +48,7 @@ public bool OnCheckPerformed(CheckEventArgs args)
             fix = _childToPassEventsTo.OnCheckPerformed(args);
 
             //if child accepted the fix
-            if(fix && !string.IsNullOrWhiteSpace(args.ProposedFix) && args.Result == CheckResult.Fail)
+            if (fix && !string.IsNullOrWhiteSpace(args.ProposedFix) && args.Result == CheckResult.Fail)
                 args.Result = CheckResult.Warning;
         }
 
diff --git a/Rdmp.Core/ReusableLibraryCode/Comments/CommentStore.cs b/Rdmp.Core/ReusableLibraryCode/Comments/CommentStore.cs
index 1eae27f653..34e700e98f 100644
--- a/Rdmp.Core/ReusableLibraryCode/Comments/CommentStore.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Comments/CommentStore.cs
@@ -23,9 +23,10 @@ namespace Rdmp.Core.ReusableLibraryCode.Comments;
 /// </summary>
 public class CommentStore : IEnumerable<KeyValuePair<string, string>>
 {
-    private readonly Dictionary<string,string> _dictionary = new(StringComparer.CurrentCultureIgnoreCase);
+    private readonly Dictionary<string, string> _dictionary = new(StringComparer.CurrentCultureIgnoreCase);
 
-    private string[] _ignoreHelpFor = {
+    private string[] _ignoreHelpFor =
+    {
         "CsvHelper.xml",
         "Google.Protobuf.xml",
         "MySql.Data.xml",
@@ -46,15 +47,21 @@ public virtual void ReadComments(params string[] locations)
             if (location is null)
                 continue;
             if (Directory.Exists(location))
-                foreach(var xml in Directory.EnumerateFiles(location,"*.xml",SearchOption.AllDirectories))
+                foreach (var xml in Directory.EnumerateFiles(location, "*.xml", SearchOption.AllDirectories))
                     using (var content = File.OpenRead(xml))
+                    {
                         ReadComments(content);
+                    }
             else if (File.Exists(location))
                 using (var zip = new LibArchiveReader(location))
-                    foreach(var xml in zip.Entries())
-                        if (xml.Name.EndsWith(".xml",true,CultureInfo.InvariantCulture))
-                            using (var content =xml.Stream)
+                {
+                    foreach (var xml in zip.Entries())
+                        if (xml.Name.EndsWith(".xml", true, CultureInfo.InvariantCulture))
+                            using (var content = xml.Stream)
+                            {
                                 ReadComments(content);
+                            }
+                }
         }
     }
 
@@ -63,7 +70,6 @@ private void ReadComments(Stream filename)
         var doc = new XmlDocument();
         doc.Load(filename);
         doc.IterateThroughAllNodes(AddXmlDoc);
-
     }
 
     /// <summary>
@@ -72,19 +78,19 @@ private void ReadComments(Stream filename)
     /// <param name="obj"></param>
     public void AddXmlDoc(XmlNode obj)
     {
-        if(obj == null)
+        if (obj == null)
             return;
 
         if (obj.Name != "member" || obj.Attributes == null) return;
         var memberName = obj.Attributes["name"]?.Value;
         var summary = GetSummaryAsText(obj["summary"]);
 
-        if(memberName == null || string.IsNullOrWhiteSpace(summary))
+        if (memberName == null || string.IsNullOrWhiteSpace(summary))
             return;
 
         //it's a Property get Type.Property (not fully specified)
         if (memberName.StartsWith("P:") || memberName.StartsWith("T:"))
-            Add(GetLastTokens(memberName),summary.Trim());
+            Add(GetLastTokens(memberName), summary.Trim());
     }
 
     private static string GetSummaryAsText(XmlElement summaryTag)
@@ -103,7 +109,9 @@ private static string GetSummaryAsText(XmlElement summaryTag)
                         sb.Append($"{GetLastTokens(n.Attributes["cref"]?.Value)} "); // a <see cref="omg"> tag
                         break;
                     case "para":
-                        TrimEndSpace(sb).Append(Environment.NewLine + Environment.NewLine);  //open para tag (next tag is probably #text)
+                        TrimEndSpace(sb)
+                            .Append(Environment.NewLine +
+                                    Environment.NewLine); //open para tag (next tag is probably #text)
                         break;
                     default:
                     {
@@ -117,10 +125,7 @@ private static string GetSummaryAsText(XmlElement summaryTag)
         return sb.ToString();
     }
 
-    private static string TrimSummary(string value)
-    {
-        return value == null ? null : Regex.Replace(value,@"\s+"," ").Trim();
-    }
+    private static string TrimSummary(string value) => value == null ? null : Regex.Replace(value, @"\s+", " ").Trim();
 
     /// <summary>
     /// Returns the last x parts from a string like M:Abc.Def.Geh.AAA(fff,mm).  In this case it would return AAA for 1, Geh.AAA for 2 etc.
@@ -176,37 +181,28 @@ public static StringBuilder TrimEndSpace(StringBuilder sb)
     public void Add(string name, string summary)
     {
         //these are not helpful!
-        if(name == "C" || name == "R")
+        if (name == "C" || name == "R")
             return;
 
-        if(_dictionary.ContainsKey(name))
+        if (_dictionary.ContainsKey(name))
             return;
 
-        _dictionary.Add(name,summary);
-
+        _dictionary.Add(name, summary);
     }
 
-    public bool ContainsKey(string keyword)
-    {
-        return _dictionary.ContainsKey(keyword);
-    }
+    public bool ContainsKey(string keyword) => _dictionary.ContainsKey(keyword);
 
     /// <summary>
     /// Returns documentation for the keyword or null if no documentation exists
     /// </summary>
     /// <param name="index"></param>
     /// <returns></returns>
-    public string this[string index] => _dictionary.TryGetValue(index,out var value) ? value : null; // Indexer declaration
+    public string this[string index] =>
+        _dictionary.TryGetValue(index, out var value) ? value : null; // Indexer declaration
 
-    public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-    {
-        return _dictionary.GetEnumerator();
-    }
+    public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => _dictionary.GetEnumerator();
 
-    IEnumerator IEnumerable.GetEnumerator()
-    {
-        return GetEnumerator();
-    }
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
 
     /// <summary>
     /// Returns documentation for the class specified up to maxLength characters (after which ... is appended).  Returns null if no documentation exists for the class
@@ -216,7 +212,8 @@ IEnumerator IEnumerable.GetEnumerator()
     /// <param name="allowInterfaceInstead">If no docs are found for Type X then look for IX too</param>
     /// <param name="formatAsParagraphs"></param>
     /// <returns></returns>
-    public string GetTypeDocumentationIfExists(int maxLength, Type type, bool allowInterfaceInstead = true,bool formatAsParagraphs = false)
+    public string GetTypeDocumentationIfExists(int maxLength, Type type, bool allowInterfaceInstead = true,
+        bool formatAsParagraphs = false)
     {
         var docs = this[type.Name];
 
@@ -240,11 +237,11 @@ public string GetTypeDocumentationIfExists(int maxLength, Type type, bool allowI
 
         return $"{docs[..maxLength]}...";
     }
+
     /// <inheritdoc cref="GetTypeDocumentationIfExists(int,Type,bool,bool)"/>
-    public string GetTypeDocumentationIfExists(Type type, bool allowInterfaceInstead = true, bool formatAsParagraphs = false)
-    {
-        return GetTypeDocumentationIfExists(int.MaxValue, type, allowInterfaceInstead, formatAsParagraphs);
-    }
+    public string GetTypeDocumentationIfExists(Type type, bool allowInterfaceInstead = true,
+        bool formatAsParagraphs = false) =>
+        GetTypeDocumentationIfExists(int.MaxValue, type, allowInterfaceInstead, formatAsParagraphs);
 
     /// <summary>
     /// Searches the CommentStore for variations of the <paramref name="word"/> and returns the documentation if found (or null)
@@ -255,7 +252,7 @@ public string GetTypeDocumentationIfExists(Type type, bool allowInterfaceInstead
     /// <returns></returns>
     public string GetDocumentationIfExists(string word, bool fuzzyMatch, bool formatAsParagraphs = false)
     {
-        var match = GetDocumentationKeywordIfExists(word,fuzzyMatch);
+        var match = GetDocumentationKeywordIfExists(word, fuzzyMatch);
 
         if (match == null)
             return null;
@@ -294,8 +291,7 @@ public string GetDocumentationKeywordIfExists(string word, bool fuzzyMatch)
     /// <returns></returns>
     public static string FormatAsParagraphs(string message)
     {
-
-        message = Regex.Replace(message, $"{Environment.NewLine}\\s*",Environment.NewLine + Environment.NewLine);
+        message = Regex.Replace(message, $"{Environment.NewLine}\\s*", Environment.NewLine + Environment.NewLine);
         message = Regex.Replace(message, @"(\.?[A-z]{2,}\.)+([A-z]+)", m => m.Groups[2].Value);
 
         return message;
diff --git a/Rdmp.Core/ReusableLibraryCode/Comments/XmlDocumentExtensions.cs b/Rdmp.Core/ReusableLibraryCode/Comments/XmlDocumentExtensions.cs
index e3bd1bab7c..76b462599a 100644
--- a/Rdmp.Core/ReusableLibraryCode/Comments/XmlDocumentExtensions.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Comments/XmlDocumentExtensions.cs
@@ -12,39 +12,27 @@ namespace Rdmp.Core.ReusableLibraryCode.Comments;
 public static class XmlDocumentExtensions
 {
     public static void IterateThroughAllNodes(
-        this XmlDocument doc, 
+        this XmlDocument doc,
         Action<XmlNode> elementVisitor)
     {
         if (doc != null && elementVisitor != null)
-        {
             foreach (XmlNode node in doc.ChildNodes)
-            {
                 doIterateNode(node, elementVisitor);
-            }
-        }
     }
 
     public static void IterateThroughAllNodes(
-        this XmlNode node, 
+        this XmlNode node,
         Action<XmlNode> elementVisitor)
     {
-            
-        foreach (XmlNode c in node.ChildNodes)
-        {
-            doIterateNode(c, elementVisitor);
-        }
-        
+        foreach (XmlNode c in node.ChildNodes) doIterateNode(c, elementVisitor);
     }
 
     private static void doIterateNode(
-        XmlNode node, 
+        XmlNode node,
         Action<XmlNode> elementVisitor)
     {
         elementVisitor(node);
 
-        foreach (XmlNode childNode in node.ChildNodes)
-        {
-            doIterateNode(childNode, elementVisitor);
-        }
+        foreach (XmlNode childNode in node.ChildNodes) doIterateNode(childNode, elementVisitor);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessContext.cs b/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessContext.cs
index a18236a0e6..9ebffd0e4d 100644
--- a/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessContext.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessContext.cs
@@ -9,9 +9,11 @@ namespace Rdmp.Core.ReusableLibraryCode.DataAccess;
 public enum DataAccessContext
 {
     //do not change these! (although you can add new ones)
-    DataLoad=0,
-    DataExport=1,
-    InternalDataProcessing=2,
-    Any=3, //You can request DataLoad and receive an Any credential (because there is not a more specific one) but you cannot make a request for Any
-    Logging=4
+    DataLoad = 0,
+    DataExport = 1,
+    InternalDataProcessing = 2,
+
+    Any =
+        3, //You can request DataLoad and receive an Any credential (because there is not a more specific one) but you cannot make a request for Any
+    Logging = 4
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessPortal.cs b/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessPortal.cs
index b818e1b86a..dd923f7724 100644
--- a/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessPortal.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DataAccess/DataAccessPortal.cs
@@ -19,45 +19,45 @@ namespace Rdmp.Core.ReusableLibraryCode.DataAccess;
 /// </summary>
 public static class DataAccessPortal
 {
-    public static DiscoveredServer ExpectServer(IDataAccessPoint dataAccessPoint, DataAccessContext context, bool setInitialDatabase=true)
-    {
-        return GetServer(dataAccessPoint, context,setInitialDatabase);
-    }
-    public static DiscoveredDatabase ExpectDatabase(IDataAccessPoint dataAccessPoint, DataAccessContext context)
-    {
-        return GetServer(dataAccessPoint, context,true).GetCurrentDatabase();
-    }
-    public static DiscoveredServer ExpectDistinctServer(IDataAccessPoint[] collection, DataAccessContext context, bool setInitialDatabase)
-    {
-        return GetServer(GetDistinct(collection, context, setInitialDatabase),context,setInitialDatabase);
-    }
+    public static DiscoveredServer ExpectServer(IDataAccessPoint dataAccessPoint, DataAccessContext context,
+        bool setInitialDatabase = true) => GetServer(dataAccessPoint, context, setInitialDatabase);
+
+    public static DiscoveredDatabase ExpectDatabase(IDataAccessPoint dataAccessPoint, DataAccessContext context) =>
+        GetServer(dataAccessPoint, context, true).GetCurrentDatabase();
+
+    public static DiscoveredServer ExpectDistinctServer(IDataAccessPoint[] collection, DataAccessContext context,
+        bool setInitialDatabase) =>
+        GetServer(GetDistinct(collection, context, setInitialDatabase), context, setInitialDatabase);
 
-    private static DiscoveredServer GetServer(IDataAccessPoint dataAccessPoint, DataAccessContext context, bool setInitialDatabase)
+    private static DiscoveredServer GetServer(IDataAccessPoint dataAccessPoint, DataAccessContext context,
+        bool setInitialDatabase)
     {
         var credentials = dataAccessPoint.GetCredentialsIfExists(context);
-            
-        if(string.IsNullOrWhiteSpace(dataAccessPoint.Server))
+
+        if (string.IsNullOrWhiteSpace(dataAccessPoint.Server))
             throw new NullReferenceException(
                 $"Could not get connection string because Server was null on dataAccessPoint '{dataAccessPoint}'");
- 
+
         string dbName = null;
-                                   
-        if(setInitialDatabase)
-            if(!string.IsNullOrWhiteSpace(dataAccessPoint.Database))
+
+        if (setInitialDatabase)
+            if (!string.IsNullOrWhiteSpace(dataAccessPoint.Database))
                 dbName = dataAccessPoint.GetQuerySyntaxHelper().GetRuntimeName(dataAccessPoint.Database);
             else
                 throw new Exception(
                     $"Could not get server with setInitialDatabase=true because no Database was set on IDataAccessPoint {dataAccessPoint}");
 
-        var server = new DiscoveredServer(dataAccessPoint.Server,dbName,dataAccessPoint.DatabaseType,credentials?.Username, credentials?.GetDecryptedPassword());
-                      
+        var server = new DiscoveredServer(dataAccessPoint.Server, dbName, dataAccessPoint.DatabaseType,
+            credentials?.Username, credentials?.GetDecryptedPassword());
+
         return server;
     }
 
-    private static IDataAccessPoint GetDistinct(IDataAccessPoint[] collection, DataAccessContext context, bool setInitialDatabase)
+    private static IDataAccessPoint GetDistinct(IDataAccessPoint[] collection, DataAccessContext context,
+        bool setInitialDatabase)
     {
         ///////////////////////Exception handling///////////////////////////////////////////////
-        if(!collection.Any())
+        if (!collection.Any())
             throw new Exception("No IDataAccessPoints were passed, so no connection string builder can be created");
 
         var first = collection.First();
@@ -65,20 +65,22 @@ private static IDataAccessPoint GetDistinct(IDataAccessPoint[] collection, DataA
         //There can be only one - server
         foreach (var accessPoint in collection)
         {
-            if(first.Server == null)
+            if (first.Server == null)
                 throw new Exception($"Server is null for {first}");
 
             if (!first.Server.Equals(accessPoint.Server, StringComparison.CurrentCultureIgnoreCase))
                 throw new ExpectedIdenticalStringsException(
-                    $"There was a mismatch in server names for data access points {first} and {accessPoint} server names must match exactly", first.Server, accessPoint.Server);
-                
-            if(first.DatabaseType != accessPoint.DatabaseType)
+                    $"There was a mismatch in server names for data access points {first} and {accessPoint} server names must match exactly",
+                    first.Server, accessPoint.Server);
+
+            if (first.DatabaseType != accessPoint.DatabaseType)
                 throw new ExpectedIdenticalStringsException(
-                    $"There was a mismatch on DatabaseType for data access points {first} and {accessPoint}", first.DatabaseType.ToString(),accessPoint.DatabaseType.ToString());
+                    $"There was a mismatch on DatabaseType for data access points {first} and {accessPoint}",
+                    first.DatabaseType.ToString(), accessPoint.DatabaseType.ToString());
 
-            if(setInitialDatabase)
+            if (setInitialDatabase)
             {
-                if(string.IsNullOrWhiteSpace(first.Database))
+                if (string.IsNullOrWhiteSpace(first.Database))
                     throw new Exception($"DataAccessPoint '{first}' does not have a Database specified on it");
 
                 var querySyntaxHelper = accessPoint.GetQuerySyntaxHelper();
@@ -88,7 +90,8 @@ private static IDataAccessPoint GetDistinct(IDataAccessPoint[] collection, DataA
 
                 if (!firstDbName.Equals(currentDbName))
                     throw new ExpectedIdenticalStringsException(
-                        $"All data access points must be into the same database, access points '{first}' and '{accessPoint}' are into different databases", firstDbName, currentDbName);    
+                        $"All data access points must be into the same database, access points '{first}' and '{accessPoint}' are into different databases",
+                        firstDbName, currentDbName);
             }
         }
 
@@ -96,29 +99,26 @@ private static IDataAccessPoint GetDistinct(IDataAccessPoint[] collection, DataA
         var credentials = collection.Select(t => t.GetCredentialsIfExists(context)).ToArray();
 
         //if there are credentials
-        if(credentials.Any(c => c != null)) 
-            if (credentials.Any(c=>c == null))//all objects in collection must have a credentials if any of them do
+        if (credentials.Any(c => c != null))
+            if (credentials.Any(c => c == null)) //all objects in collection must have a credentials if any of them do
                 throw new Exception(
                     $"IDataAccessPoint collection could not agree whether to use Credentials or not {Environment.NewLine}Objects wanting to use Credentials{string.Join(",", collection.Where(c => c.GetCredentialsIfExists(context) != null).Select(s => s.ToString()))}{Environment.NewLine}Objects not wanting to use Credentials{string.Join(",", collection.Where(c => c.GetCredentialsIfExists(context) == null).Select(s => s.ToString()))}{Environment.NewLine}"
                 );
             else
                 //There can be only one - Username
-            if(credentials.Select(c=>c.Username).Distinct().Count() != 1)
+            if (credentials.Select(c => c.Username).Distinct().Count() != 1)
                 throw new Exception(
                     $"IDataAccessPoint collection could not agree on a single Username to use to access the data under context {context} (Servers were {string.Join($",{Environment.NewLine}", collection.Select(c => $"{c} = {c.Database} - {c.DatabaseType}"))})");
             else
                 //There can be only one - Password
-            if(credentials.Select(c=>c.GetDecryptedPassword()).Distinct().Count() != 1)
+            if (credentials.Select(c => c.GetDecryptedPassword()).Distinct().Count() != 1)
                 throw new Exception(
                     $"IDataAccessPoint collection could not agree on a single Password to use to access the data under context {context} (Servers were {string.Join($",{Environment.NewLine}", collection.Select(c => $"{c} = {c.Database} - {c.DatabaseType}"))})");
-                
-                
-                
+
+
         ///////////////////////////////////////////////////////////////////////////////
 
         //the bit that actually matters:
         return first;
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessCredentials.cs b/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessCredentials.cs
index 4a3f0a4cf4..cdf1b593e7 100644
--- a/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessCredentials.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessCredentials.cs
@@ -14,5 +14,5 @@ public interface IDataAccessCredentials : IEncryptedPasswordHost
     /// <summary>
     /// The user account name to supply when sending the credentials
     /// </summary>
-    string Username { get;}
+    string Username { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessPoint.cs b/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessPoint.cs
index a614e7a3f0..032feeb648 100644
--- a/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessPoint.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DataAccess/IDataAccessPoint.cs
@@ -19,23 +19,23 @@ namespace Rdmp.Core.ReusableLibraryCode.DataAccess;
 /// <para>IDataAccessCredentials can include Encrypted passwords which the current user may or may not have access to decrypt.  Where no credentials are
 /// available it is assumed that the connection should be made using Integrated Security (Windows Security).</para>
 /// </summary>
-public interface IDataAccessPoint:IHasQuerySyntaxHelper
+public interface IDataAccessPoint : IHasQuerySyntaxHelper
 {
     /// <summary>
     /// The name of the server e.g. localhost\sqlexpress
     /// </summary>
-    string Server { get; set;}
+    string Server { get; set; }
 
     /// <summary>
     /// The name of the database to connect to e.g. master, tempdb, MyCoolDb etc
     /// </summary>
-    string Database { get; set;}
+    string Database { get; set; }
 
     /// <summary>
     /// The DBMS type of the server e.g. Sql Server / MySql / Oracle
     /// </summary>
-    DatabaseType DatabaseType { get; set;}
-        
+    DatabaseType DatabaseType { get; set; }
+
     /// <summary>
     /// The username/password to use when connecting to the server (otherwise integrated security is used)
     /// </summary>
@@ -43,7 +43,6 @@ public interface IDataAccessPoint:IHasQuerySyntaxHelper
     /// <returns></returns>
     IDataAccessCredentials GetCredentialsIfExists(DataAccessContext context);
 
-        
 
     /// <summary>
     /// Attempts to connect to the server using the provided <paramref name="context"/>.  If the object is not properly setup for a valid reference e.g. 
@@ -52,5 +51,5 @@ public interface IDataAccessPoint:IHasQuerySyntaxHelper
     /// <param name="context"></param>
     /// <param name="reason"></param>
     /// <returns></returns>
-    bool DiscoverExistence(DataAccessContext context,out string reason);
+    bool DiscoverExistence(DataAccessContext context, out string reason);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DataAccess/IEncryptedPasswordHost.cs b/Rdmp.Core/ReusableLibraryCode/DataAccess/IEncryptedPasswordHost.cs
index 08df6a48d5..43dea283fe 100644
--- a/Rdmp.Core/ReusableLibraryCode/DataAccess/IEncryptedPasswordHost.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DataAccess/IEncryptedPasswordHost.cs
@@ -17,7 +17,7 @@ public interface IEncryptedPasswordHost
     /// to get the decrypted string.
     /// </summary>
     string Password { get; set; }
-        
+
     /// <summary>
     /// Decrypts the encrypted Password property.  This method will throw an Exception if the user doesn't have access to the resources required
     /// to decrypt the Password (e.g. access to an RSA private key).
diff --git a/Rdmp.Core/ReusableLibraryCode/DatabaseCommandHelper.cs b/Rdmp.Core/ReusableLibraryCode/DatabaseCommandHelper.cs
index 2357211509..8ea142c8d8 100644
--- a/Rdmp.Core/ReusableLibraryCode/DatabaseCommandHelper.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DatabaseCommandHelper.cs
@@ -32,10 +32,10 @@ public class DatabaseCommandHelper
 {
     private static readonly Dictionary<DatabaseType, IImplementation> _dbConHelpersByType = new()
     {
-        {DatabaseType.MySql,new MySqlImplementation()},
-        {DatabaseType.Oracle,new OracleImplementation()},
-        {DatabaseType.MicrosoftSQLServer,new MicrosoftSQLImplementation()},
-        {DatabaseType.PostgreSql,new PostgreSqlImplementation()}
+        { DatabaseType.MySql, new MySqlImplementation() },
+        { DatabaseType.Oracle, new OracleImplementation() },
+        { DatabaseType.MicrosoftSQLServer, new MicrosoftSQLImplementation() },
+        { DatabaseType.PostgreSql, new PostgreSqlImplementation() }
     };
 
     public static ComprehensiveQueryPerformanceCounter PerformanceCounter = null;
@@ -45,7 +45,6 @@ public class DatabaseCommandHelper
     /// </summary>
     public static int GlobalTimeout = 30;
 
-        
 
     public static IDiscoveredServerHelper For(DbConnection con)
     {
@@ -57,10 +56,7 @@ public static IDiscoveredServerHelper For(DbConnectionStringBuilder connectionSt
         return _dbConHelpersByType.Values.Single(i => i.IsFor(connectionStringBuilder)).GetServerHelper();
     }
 
-    public static IDiscoveredServerHelper For(DatabaseType dbType)
-    {
-        return _dbConHelpersByType[dbType].GetServerHelper();
-    }
+    public static IDiscoveredServerHelper For(DatabaseType dbType) => _dbConHelpersByType[dbType].GetServerHelper();
 
     public static IDiscoveredServerHelper For(DbCommand cmd)
     {
@@ -82,7 +78,7 @@ public static DbCommand GetCommand(string s, DbConnection con, DbTransaction tra
     {
         var cmd = For(con).GetCommand(s, con, transaction);
 
-        PerformanceCounter?.AddAudit(cmd,Environment.StackTrace.ToString());
+        PerformanceCounter?.AddAudit(cmd, Environment.StackTrace.ToString());
 
         cmd.CommandTimeout = GlobalTimeout;
         return cmd;
@@ -92,29 +88,21 @@ public static DbCommand GetInsertCommand(DbCommand cmd)
     {
         var toReturn = For(cmd).GetCommandBuilder(cmd).GetInsertCommand(true);
         toReturn.CommandTimeout = cmd.CommandTimeout = GlobalTimeout;
-            
+
         return toReturn;
     }
 
-    public static DbParameter GetParameter(string parameterName,DbCommand forCommand)
-    {
-        return For(forCommand).GetParameter(parameterName);
-    }
+    public static DbParameter GetParameter(string parameterName, DbCommand forCommand) =>
+        For(forCommand).GetParameter(parameterName);
+
+    public static DbParameter GetParameter(string parameterName, DatabaseType databaseType) =>
+        For(databaseType).GetParameter(parameterName);
 
-    public static DbParameter GetParameter(string parameterName, DatabaseType databaseType)
-    {
-        return For(databaseType).GetParameter(parameterName);
-    }
     // only used in missing fields checker, should be in UsefulStuff?
-    public static DbConnection GetConnection(DbConnectionStringBuilder connectionStringBuilder)
-    {
-        return For(connectionStringBuilder).GetConnection(connectionStringBuilder);
-    }
+    public static DbConnection GetConnection(DbConnectionStringBuilder connectionStringBuilder) =>
+        For(connectionStringBuilder).GetConnection(connectionStringBuilder);
 
-    public static DbDataAdapter GetDataAdapter(DbCommand cmd)
-    {
-        return For(cmd).GetDataAdapter(cmd);
-    }
+    public static DbDataAdapter GetDataAdapter(DbCommand cmd) => For(cmd).GetDataAdapter(cmd);
 
     public static void AddParameterWithValueToCommand(string parameterName, DbCommand command, object valueForParameter)
     {
diff --git a/Rdmp.Core/ReusableLibraryCode/Diff.cs b/Rdmp.Core/ReusableLibraryCode/Diff.cs
index 81febe1e14..17d0468d18 100644
--- a/Rdmp.Core/ReusableLibraryCode/Diff.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Diff.cs
@@ -73,17 +73,20 @@ namespace Rdmp.Core.ReusableLibraryCode;
 /// 2006.03.10 using the standard Debug class for self-test now.
 ///            compile with: csc /target:exe /out:diffTest.exe /d:DEBUG /d:TRACE /d:SELFTEST Diff.cs</para>
 /// </summary>
-public class Diff {
-
+public class Diff
+{
     /// <summary>details of one difference.</summary>
-    public struct Item {
+    public struct Item
+    {
         /// <summary>Start Line number in Data A.</summary>
         public int StartA;
+
         /// <summary>Start Line number in Data B.</summary>
         public int StartB;
 
         /// <summary>Number of changes in Data A.</summary>
         public int deletedA;
+
         /// <summary>Number of changes in Data A.</summary>
         public int insertedB;
     } // Item
@@ -91,7 +94,8 @@ public struct Item {
     /// <summary>
     /// Shortest Middle Snake Return Data
     /// </summary>
-    private struct SMSRD {
+    private struct SMSRD
+    {
         internal int x, y;
         // internal int u, v;  // 2002.09.20: no need for 2 points
     }
@@ -185,6 +189,7 @@ public static string TestHelper(Item []f) {
       return (ret.ToString());
     }
 #endif
+
     #endregion
 
 
@@ -194,9 +199,8 @@ public static string TestHelper(Item []f) {
     /// <param name="TextA">A-version of the text (usualy the old one)</param>
     /// <param name="TextB">B-version of the text (usualy the new one)</param>
     /// <returns>Returns a array of Items that describe the differences.</returns>
-    public static Item [] DiffText(string TextA, string TextB) {
-        return DiffText(TextA, TextB, false, false, false);
-    } // DiffText
+    public static Item[] DiffText(string TextA, string TextB) =>
+        DiffText(TextA, TextB, false, false, false); // DiffText
 
 
     /// <summary>
@@ -212,7 +216,8 @@ public static Item [] DiffText(string TextA, string TextB) {
     /// <param name="ignoreSpace">When set to true, all whitespace characters are converted to a single space character before the comparation is done.</param>
     /// <param name="ignoreCase">When set to true, all characters are converted to their lowercase equivivalence before the comparation is done.</param>
     /// <returns>Returns a array of Items that describe the differences.</returns>
-    public static Item [] DiffText(string TextA, string TextB, bool trimSpace, bool ignoreSpace, bool ignoreCase) {
+    public static Item[] DiffText(string TextA, string TextB, bool trimSpace, bool ignoreSpace, bool ignoreCase)
+    {
         // prepare the input-text and convert to comparable numbers.
         var h = new Hashtable(TextA.Length + TextB.Length);
 
@@ -235,7 +240,8 @@ public static Item [] DiffText(string TextA, string TextB, bool trimSpace, bool
     /// <param name="ArrayA">A-version of the numbers (usualy the old one)</param>
     /// <param name="ArrayB">B-version of the numbers (usualy the new one)</param>
     /// <returns>Returns a array of Items that describe the differences.</returns>
-    public static Item [] DiffInt(int[] ArrayA, int[] ArrayB) {
+    public static Item[] DiffInt(int[] ArrayA, int[] ArrayB)
+    {
         // The A-Version of the data (original data) to be compared.
         var DataA = new DiffData(ArrayA);
 
@@ -257,7 +263,8 @@ public static Item [] DiffInt(int[] ArrayA, int[] ArrayB) {
     /// <param name="ignoreSpace">ignore whitespace differents e.g. double spaces vs single spaces</param>
     /// <param name="ignoreCase">ignore capitalisation in comparison</param>
     /// <returns>a array of integers.</returns>
-    private static int[] DiffCodes(string aText, Hashtable h, bool trimSpace, bool ignoreSpace, bool ignoreCase) {
+    private static int[] DiffCodes(string aText, Hashtable h, bool trimSpace, bool ignoreSpace, bool ignoreCase)
+    {
         // get all codes of the text
         var lastUsedCode = h.Count;
 
@@ -267,27 +274,30 @@ private static int[] DiffCodes(string aText, Hashtable h, bool trimSpace, bool i
 
         var Codes = new int[Lines.Length];
 
-        for (var i = 0; i < Lines.Length; ++i) {
+        for (var i = 0; i < Lines.Length; ++i)
+        {
             var s = Lines[i];
             if (trimSpace)
                 s = s.Trim();
 
-            if (ignoreSpace) {
-                s = Regex.Replace(s, "\\s+", " ");
-            }
+            if (ignoreSpace) s = Regex.Replace(s, "\\s+", " ");
 
             if (ignoreCase)
                 s = s.ToLower();
 
             var aCode = h[s];
-            if (aCode == null) {
+            if (aCode == null)
+            {
                 lastUsedCode++;
                 h[s] = lastUsedCode;
                 Codes[i] = lastUsedCode;
-            } else {
+            }
+            else
+            {
                 Codes[i] = (int)aCode;
             } // if
         } // for
+
         return Codes;
     } // DiffCodes
 
@@ -302,7 +312,8 @@ private static int[] DiffCodes(string aText, Hashtable h, bool trimSpace, bool i
     /// <param name="LowerB">lower bound of the actual range in DataB</param>
     /// <param name="UpperB">upper bound of the actual range in DataB (exclusive)</param>
     /// <returns>a MiddleSnakeData record containing x,y and u,v</returns>
-    private static SMSRD SMS(DiffData DataA, int LowerA, int UpperA, DiffData DataB, int LowerB, int UpperB) {
+    private static SMSRD SMS(DiffData DataA, int LowerA, int UpperA, DiffData DataB, int LowerB, int UpperB)
+    {
         var MAX = DataA.Length + DataB.Length + 1;
 
         var DownK = LowerA - LowerB; // the k-line to start the forward search
@@ -312,7 +323,7 @@ private static SMSRD SMS(DiffData DataA, int LowerA, int UpperA, DiffData DataB,
         var oddDelta = (Delta & 1) != 0;
 
         // vector for the (0,0) to (x,y) search
-        var DownVector = new int[2* MAX + 2];
+        var DownVector = new int[2 * MAX + 2];
 
         // vector for the (u,v) to (N,M) search
         var UpVector = new int[2 * MAX + 2];
@@ -323,83 +334,98 @@ private static SMSRD SMS(DiffData DataA, int LowerA, int UpperA, DiffData DataB,
         var UpOffset = MAX - UpK;
 
         var MaxD = (UpperA - LowerA + UpperB - LowerB) / 2 + 1;
-		
+
         // Debug.Write(2, "SMS", String.Format("Search the box: A[{0}-{1}] to B[{2}-{3}]", LowerA, UpperA, LowerB, UpperB));
 
         // init vectors
         DownVector[DownOffset + DownK + 1] = LowerA;
         UpVector[UpOffset + UpK - 1] = UpperA;
-			
-        for (var D = 0; D <= MaxD; D++) {
 
+        for (var D = 0; D <= MaxD; D++)
+        {
             // Extend the forward path.
             SMSRD ret;
-            for (var k = DownK - D; k <= DownK + D; k += 2) {
+            for (var k = DownK - D; k <= DownK + D; k += 2)
+            {
                 // Debug.Write(0, "SMS", "extend forward path " + k.ToString());
 
                 // find the only or better starting point
                 int x;
-                if (k == DownK - D) {
-                    x = DownVector[DownOffset + k+1]; // down
-                } else {
-                    x = DownVector[DownOffset + k-1] + 1; // a step to the right
-                    if (k < DownK + D && DownVector[DownOffset + k+1] >= x)
-                        x = DownVector[DownOffset + k+1]; // down
+                if (k == DownK - D)
+                {
+                    x = DownVector[DownOffset + k + 1]; // down
                 }
+                else
+                {
+                    x = DownVector[DownOffset + k - 1] + 1; // a step to the right
+                    if (k < DownK + D && DownVector[DownOffset + k + 1] >= x)
+                        x = DownVector[DownOffset + k + 1]; // down
+                }
+
                 var y = x - k;
 
                 // find the end of the furthest reaching forward D-path in diagonal k.
-                while (x < UpperA && y < UpperB && DataA.data[x] == DataB.data[y]) {
-                    x++; y++;
+                while (x < UpperA && y < UpperB && DataA.data[x] == DataB.data[y])
+                {
+                    x++;
+                    y++;
                 }
+
                 DownVector[DownOffset + k] = x;
 
                 // overlap ?
-                if (oddDelta && UpK-D < k && k < UpK+D) {
-                    if (UpVector[UpOffset + k] <= DownVector[DownOffset + k]) {
+                if (oddDelta && UpK - D < k && k < UpK + D)
+                    if (UpVector[UpOffset + k] <= DownVector[DownOffset + k])
+                    {
                         ret.x = DownVector[DownOffset + k];
                         ret.y = DownVector[DownOffset + k] - k;
                         // ret.u = UpVector[UpOffset + k];      // 2002.09.20: no need for 2 points
                         // ret.v = UpVector[UpOffset + k] - k;
                         return ret;
                     } // if
-                } // if
-
+                // if
             } // for k
 
             // Extend the reverse path.
-            for (var k = UpK - D; k <= UpK + D; k += 2) {
+            for (var k = UpK - D; k <= UpK + D; k += 2)
+            {
                 // Debug.Write(0, "SMS", "extend reverse path " + k.ToString());
 
                 // find the only or better starting point
                 int x;
-                if (k == UpK + D) {
-                    x = UpVector[UpOffset + k-1]; // up
-                } else {
-                    x = UpVector[UpOffset + k+1] - 1; // left
-                    if (k > UpK - D && UpVector[UpOffset + k-1] < x)
-                        x = UpVector[UpOffset + k-1]; // up
+                if (k == UpK + D)
+                {
+                    x = UpVector[UpOffset + k - 1]; // up
+                }
+                else
+                {
+                    x = UpVector[UpOffset + k + 1] - 1; // left
+                    if (k > UpK - D && UpVector[UpOffset + k - 1] < x)
+                        x = UpVector[UpOffset + k - 1]; // up
                 } // if
+
                 var y = x - k;
 
-                while (x > LowerA && y > LowerB && DataA.data[x-1] == DataB.data[y-1]) {
-                    x--; y--; // diagonal
+                while (x > LowerA && y > LowerB && DataA.data[x - 1] == DataB.data[y - 1])
+                {
+                    x--;
+                    y--; // diagonal
                 }
+
                 UpVector[UpOffset + k] = x;
 
                 // overlap ?
-                if (! oddDelta && DownK-D <= k && k <= DownK+D) {
-                    if (UpVector[UpOffset + k] <= DownVector[DownOffset + k]) {
+                if (!oddDelta && DownK - D <= k && k <= DownK + D)
+                    if (UpVector[UpOffset + k] <= DownVector[DownOffset + k])
+                    {
                         ret.x = DownVector[DownOffset + k];
                         ret.y = DownVector[DownOffset + k] - k;
                         // ret.u = UpVector[UpOffset + k];     // 2002.09.20: no need for 2 points
                         // ret.v = UpVector[UpOffset + k] - k;
                         return ret;
                     } // if
-                } // if
-
+                // if
             } // for k
-
         } // for D
 
         throw new ApplicationException("the algorithm should never come here.");
@@ -418,37 +444,45 @@ private static SMSRD SMS(DiffData DataA, int LowerA, int UpperA, DiffData DataB,
     /// <param name="DataB">sequence B</param>
     /// <param name="LowerB">lower bound of the actual range in DataB</param>
     /// <param name="UpperB">upper bound of the actual range in DataB (exclusive)</param>
-    private static void LCS(DiffData DataA, int LowerA, int UpperA, DiffData DataB, int LowerB, int UpperB) {
+    private static void LCS(DiffData DataA, int LowerA, int UpperA, DiffData DataB, int LowerB, int UpperB)
+    {
         // Debug.Write(2, "LCS", String.Format("Analyse the box: A[{0}-{1}] to B[{2}-{3}]", LowerA, UpperA, LowerB, UpperB));
 
         // Fast walkthrough equal lines at the start
-        while (LowerA < UpperA && LowerB < UpperB && DataA.data[LowerA] == DataB.data[LowerB]) {
-            LowerA++; LowerB++;
+        while (LowerA < UpperA && LowerB < UpperB && DataA.data[LowerA] == DataB.data[LowerB])
+        {
+            LowerA++;
+            LowerB++;
         }
 
         // Fast walkthrough equal lines at the end
-        while (LowerA < UpperA && LowerB < UpperB && DataA.data[UpperA-1] == DataB.data[UpperB-1]) {
-            --UpperA; --UpperB;
+        while (LowerA < UpperA && LowerB < UpperB && DataA.data[UpperA - 1] == DataB.data[UpperB - 1])
+        {
+            --UpperA;
+            --UpperB;
         }
-			
-        if (LowerA == UpperA) {
+
+        if (LowerA == UpperA)
+        {
             // mark as inserted lines.
             while (LowerB < UpperB)
                 DataB.modified[LowerB++] = true;
-
-        } else if (LowerB == UpperB) {
+        }
+        else if (LowerB == UpperB)
+        {
             // mark as deleted lines.
             while (LowerA < UpperA)
                 DataA.modified[LowerA++] = true;
-
-        } else {
+        }
+        else
+        {
             // Find the middle snakea and length of an optimal path for A and B
             var smsrd = SMS(DataA, LowerA, UpperA, DataB, LowerB, UpperB);
             // Debug.Write(2, "MiddleSnakeData", String.Format("{0},{1}", smsrd.x, smsrd.y));
 
             // The path is from LowerX to (x,y) and (x,y) ot UpperX
             LCS(DataA, LowerA, smsrd.x, DataB, LowerB, smsrd.y);
-            LCS(DataA, smsrd.x, UpperA, DataB, smsrd.y, UpperB);  // 2002.09.20: no need for 2 points
+            LCS(DataA, smsrd.x, UpperA, DataB, smsrd.y, UpperB); // 2002.09.20: no need for 2 points
         }
     } // LCS()
 
@@ -457,21 +491,24 @@ private static void LCS(DiffData DataA, int LowerA, int UpperA, DiffData DataB,
     /// producing an edit script in forward order.
     /// </summary>
     /// dynamic array
-    private static Item[] CreateDiffs(DiffData DataA, DiffData DataB) {
+    private static Item[] CreateDiffs(DiffData DataA, DiffData DataB)
+    {
         var a = new ArrayList();
 
         int StartA, StartB;
 
         var LineA = 0;
         var LineB = 0;
-        while (LineA < DataA.Length || LineB < DataB.Length) {
-            if (LineA < DataA.Length && ! DataA.modified[LineA]
-                                     && LineB < DataB.Length && ! DataB.modified[LineB]) {
+        while (LineA < DataA.Length || LineB < DataB.Length)
+            if (LineA < DataA.Length && !DataA.modified[LineA]
+                                     && LineB < DataB.Length && !DataB.modified[LineB])
+            {
                 // equal lines
                 LineA++;
                 LineB++;
-
-            } else {
+            }
+            else
+            {
                 // maybe deleted and/or inserted lines
                 StartA = LineA;
                 StartB = LineB;
@@ -484,31 +521,29 @@ private static Item[] CreateDiffs(DiffData DataA, DiffData DataB) {
                     // while (LineB < DataB.Length && DataB.modified[LineB])
                     LineB++;
 
-                if (StartA < LineA || StartB < LineB) {
+                if (StartA < LineA || StartB < LineB)
                     // store a new difference-item
-                    a.Add( new Item
+                    a.Add(new Item
                     {
                         StartA = StartA,
                         StartB = StartB,
                         deletedA = LineA - StartA,
                         insertedB = LineB - StartB
-                    });
-                } // if
+                    }); // if
             } // if
-        } // while
 
+        // while
         var result = new Item[a.Count];
         a.CopyTo(result);
 
         return result;
     }
-
 } // class Diff
 
 /// <summary>Data on one input file being compared.
 /// </summary>
-internal class DiffData {
-
+internal class DiffData
+{
     /// <summary>Number of elements (lines).</summary>
     internal int Length;
 
@@ -526,12 +561,12 @@ internal class DiffData {
     /// Initialize the Diff-Data buffer.
     /// </summary>
     /// <param name="initData">reference to the buffer</param>
-    internal DiffData(int[] initData) {
+    internal DiffData(int[] initData)
+    {
         data = initData;
         Length = initData.Length;
         modified = new bool[Length + 2];
     } // DiffData
-
 } // class DiffData
 
-// namespace
+// namespace
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/DirectoryInfoComparer.cs b/Rdmp.Core/ReusableLibraryCode/DirectoryInfoComparer.cs
index 60c214d084..26dae093e5 100644
--- a/Rdmp.Core/ReusableLibraryCode/DirectoryInfoComparer.cs
+++ b/Rdmp.Core/ReusableLibraryCode/DirectoryInfoComparer.cs
@@ -36,22 +36,13 @@ public static class DirectoryInfoExtensions
 {
     public static void CopyAll(this DirectoryInfo source, DirectoryInfo target)
     {
-        if (string.Equals(source.FullName, target.FullName, StringComparison.InvariantCultureIgnoreCase))
-        {
-            return;
-        }
+        if (string.Equals(source.FullName, target.FullName, StringComparison.InvariantCultureIgnoreCase)) return;
 
         // Check if the target directory exists, if not, create it.
-        if (Directory.Exists(target.FullName) == false)
-        {
-            Directory.CreateDirectory(target.FullName);
-        }
+        if (Directory.Exists(target.FullName) == false) Directory.CreateDirectory(target.FullName);
 
         // Copy each file into its new directory.
-        foreach (var fi in source.GetFiles())
-        {
-            fi.CopyTo(Path.Combine(target.ToString(), fi.Name), true);
-        }
+        foreach (var fi in source.GetFiles()) fi.CopyTo(Path.Combine(target.ToString(), fi.Name), true);
 
         // Copy each subdirectory using recursion.
         foreach (var diSourceSubDir in source.GetDirectories())
diff --git a/Rdmp.Core/ReusableLibraryCode/ExceptionHelper.cs b/Rdmp.Core/ReusableLibraryCode/ExceptionHelper.cs
index a2b2cd803d..583992028a 100644
--- a/Rdmp.Core/ReusableLibraryCode/ExceptionHelper.cs
+++ b/Rdmp.Core/ReusableLibraryCode/ExceptionHelper.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.ReusableLibraryCode;
 public static class ExceptionHelper
 {
     [Pure]
-    public static string ExceptionToListOfInnerMessages(Exception e, bool includeStackTrace=false)
+    public static string ExceptionToListOfInnerMessages(Exception e, bool includeStackTrace = false)
     {
         var message = e.Message;
         if (includeStackTrace)
@@ -40,10 +40,8 @@ public static string ExceptionToListOfInnerMessages(Exception e, bool includeSta
     /// <param name="e"></param>
     /// <returns></returns>
     [Pure]
-    public static T GetExceptionIfExists<T>(this AggregateException e) where T:Exception
-    {
-        return e.Flatten().InnerExceptions.OfType<T>().FirstOrDefault();
-    }
+    public static T GetExceptionIfExists<T>(this AggregateException e) where T : Exception =>
+        e.Flatten().InnerExceptions.OfType<T>().FirstOrDefault();
 
     /// <summary>
     /// Returns the first InnerException of type T in the Exception or null.
diff --git a/Rdmp.Core/ReusableLibraryCode/Exceptions/ExpectedIdenticalStringsException.cs b/Rdmp.Core/ReusableLibraryCode/Exceptions/ExpectedIdenticalStringsException.cs
index f2bf76ac73..83907949c9 100644
--- a/Rdmp.Core/ReusableLibraryCode/Exceptions/ExpectedIdenticalStringsException.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Exceptions/ExpectedIdenticalStringsException.cs
@@ -17,11 +17,10 @@ public class ExpectedIdenticalStringsException : Exception
     public string Actual { get; set; }
 
     public ExpectedIdenticalStringsException(string message, string expected, string actual)
-        : base(AssembleMessage(message,expected,actual))
+        : base(AssembleMessage(message, expected, actual))
     {
         Expected = expected;
         Actual = actual;
-            
     }
 
     private static string AssembleMessage(string message, string expected, string actual)
@@ -41,7 +40,6 @@ private static string AssembleMessage(string message, string expected, string ac
             //give them a preview of the location of the difference
             if (!expected[i].Equals(actual[i]))
             {
-
                 message = $"{message}{Environment.NewLine}Strings differ at index {i}";
                 message += GetPreviewsAround(i, expected, actual);
 
@@ -56,10 +54,9 @@ private static string AssembleMessage(string message, string expected, string ac
 
     private static string GetPreviewsAround(int i, string expected, string actual)
     {
-
         var toReturn = "";
 
-        var previewExpected = GetPreviewAround(i,expected,out var iIsAtCharacterPosition);
+        var previewExpected = GetPreviewAround(i, expected, out var iIsAtCharacterPosition);
         var previewActual = GetPreviewAround(i, actual, out iIsAtCharacterPosition);
 
         var differencePointer = "";
@@ -83,20 +80,21 @@ private static string GetPreviewAround(int i, string str, out int iIsAtCharacter
 
         //Do not start preview before the beginning of the string e.g. if difference is at index 3 then start at 0 not -17
         var startSubstringAt = Math.Max(0, i - charsBefore);
-        iIsAtCharacterPosition = i - startSubstringAt;  //if difference is at index 350 then return 350 - (350-20) i.e. 20 but if difference is at index 3 then return 3 - 0 (see Math.Max on line above)
+        iIsAtCharacterPosition =
+            i - startSubstringAt; //if difference is at index 350 then return 350 - (350-20) i.e. 20 but if difference is at index 3 then return 3 - 0 (see Math.Max on line above)
 
-        var lengthWeWantToTake = i - startSubstringAt + charsAfter;//usually the full amount unless charsBefore is truncated due to the start of the string (when difference is early in the string)
+        var lengthWeWantToTake =
+            i - startSubstringAt +
+            charsAfter; //usually the full amount unless charsBefore is truncated due to the start of the string (when difference is early in the string)
         var lengthAvailable = str.Length - startSubstringAt;
         var lengthWeWillActuallyTake = Math.Min(lengthWeWantToTake, lengthAvailable);
 
-            
 
         //if there is more available in the string put a ... so user knows it
-        if(lengthAvailable > lengthWeWillActuallyTake )
-            return $"{str.Substring(startSubstringAt, lengthWeWillActuallyTake)}..."; 
-            
+        if (lengthAvailable > lengthWeWillActuallyTake)
+            return $"{str.Substring(startSubstringAt, lengthWeWillActuallyTake)}...";
+
         //We ran out of characters at the end of the string so don't add ....
         return str.Substring(startSubstringAt, lengthWeWillActuallyTake);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Extensions/DataTableExtensions.cs b/Rdmp.Core/ReusableLibraryCode/Extensions/DataTableExtensions.cs
index f65b1afb72..2dae026daa 100644
--- a/Rdmp.Core/ReusableLibraryCode/Extensions/DataTableExtensions.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Extensions/DataTableExtensions.cs
@@ -19,9 +19,9 @@ public static class DataTableExtensions
     /// </summary>
     /// <param name="dt"></param>
     /// <param name="stream"></param>
-    public static void SaveAsCsv(this DataTable dt,StreamWriter stream)
+    public static void SaveAsCsv(this DataTable dt, StreamWriter stream)
     {
-        using var csvWriter = new CsvWriter(stream,CultureInfo.CurrentCulture);
+        using var csvWriter = new CsvWriter(stream, CultureInfo.CurrentCulture);
         foreach (DataColumn column in dt.Columns)
             csvWriter.WriteField(column.ColumnName);
 
@@ -38,7 +38,7 @@ public static void SaveAsCsv(this DataTable dt,StreamWriter stream)
 
     public static void SaveAsCsv(this DataTable dt, string path)
     {
-        using var stream = new StreamWriter(path,false,Encoding.UTF8, 1<<20);
+        using var stream = new StreamWriter(path, false, Encoding.UTF8, 1 << 20);
         dt.SaveAsCsv(stream);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Extensions/VersionExtensions.cs b/Rdmp.Core/ReusableLibraryCode/Extensions/VersionExtensions.cs
index 318a7894d5..e424be5e52 100644
--- a/Rdmp.Core/ReusableLibraryCode/Extensions/VersionExtensions.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Extensions/VersionExtensions.cs
@@ -17,10 +17,8 @@ public static class VersionExtensions
     /// <param name="other">The full version</param>
     /// <param name="significantParts"></param>
     /// <returns></returns>
-    public static bool IsCompatibleWith(this Version version, Version other, int significantParts)
-    {
-        return version.CompareTo(other, significantParts) == 0;
-    }
+    public static bool IsCompatibleWith(this Version version, Version other, int significantParts) =>
+        version.CompareTo(other, significantParts) == 0;
 
     /// <summary>
     /// Compares two versions but only up to the significant parts specified.
@@ -31,14 +29,8 @@ public static bool IsCompatibleWith(this Version version, Version other, int sig
     /// <returns></returns>
     public static int CompareTo(this Version version, Version otherVersion, int significantParts)
     {
-        if (version == null)
-        {
-            throw new ArgumentNullException(nameof(version));
-        }
-        if (otherVersion == null)
-        {
-            return 1;
-        }
+        if (version == null) throw new ArgumentNullException(nameof(version));
+        if (otherVersion == null) return 1;
 
         if (version.Major != otherVersion.Major && significantParts >= 1)
             if (version.Major > otherVersion.Major)
diff --git a/Rdmp.Core/ReusableLibraryCode/Helpers/Settings.cs b/Rdmp.Core/ReusableLibraryCode/Helpers/Settings.cs
index dcbf308256..1830a872d5 100644
--- a/Rdmp.Core/ReusableLibraryCode/Helpers/Settings.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Helpers/Settings.cs
@@ -15,7 +15,7 @@ namespace Rdmp.Core.ReusableLibraryCode.Helpers;
 /// <summary>
 /// This is the Settings static class that can be used in your Core solution or in any
 /// of your client applications. All settings are laid out the same exact way with getters
-/// and setters. 
+/// and setters.
 /// </summary>
 public static class Settings
 {
@@ -47,4 +47,5 @@ public static string GeneralSettings
         }
     }
 
-}*/
\ No newline at end of file
+}*/
+
diff --git a/Rdmp.Core/ReusableLibraryCode/IHasSummary.cs b/Rdmp.Core/ReusableLibraryCode/IHasSummary.cs
index 382ede5b41..5d04b489e2 100644
--- a/Rdmp.Core/ReusableLibraryCode/IHasSummary.cs
+++ b/Rdmp.Core/ReusableLibraryCode/IHasSummary.cs
@@ -20,5 +20,5 @@ public interface IHasSummary
     /// <param name="body">Long description which can contain newlines</param>
     /// <param name="stackTrace">Optional stack trace where error occurred (set to null if not applicable)</param>
     /// <param name="level">How servere the situation is/was</param>
-    void GetSummary(out string title, out string body,out string stackTrace, out CheckResult level);
+    void GetSummary(out string title, out string body, out string stackTrace, out CheckResult level);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs
index 1ac742c503..731157188e 100644
--- a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/DatabaseTypeIconProvider.cs
@@ -26,10 +26,10 @@ public class DatabaseTypeIconProvider
 
     private readonly Image<Rgba32> _postgresBig;
     private readonly Image<Rgba32> _postgresOverlay;
-        
+
     private readonly Image<Rgba32> _unknownBig;
     private readonly Image<Rgba32> _unknownOverlay;
-        
+
     public DatabaseTypeIconProvider()
     {
         _msBig = Image.Load<Rgba32>(DatabaseProviderIcons.Microsoft);
diff --git a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/OverlayKind.cs b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/OverlayKind.cs
index d2722633b6..53797b90a4 100644
--- a/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/OverlayKind.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Icons/IconProvision/OverlayKind.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.ReusableLibraryCode.Icons.IconProvision;
 /// </summary>
 public enum OverlayKind
 {
-    None =0,
+    None = 0,
     Add,
     Problem,
     Link,
diff --git a/Rdmp.Core/ReusableLibraryCode/ObjectExtensions.cs b/Rdmp.Core/ReusableLibraryCode/ObjectExtensions.cs
index 55452bcd75..6a28ddd403 100644
--- a/Rdmp.Core/ReusableLibraryCode/ObjectExtensions.cs
+++ b/Rdmp.Core/ReusableLibraryCode/ObjectExtensions.cs
@@ -24,9 +24,7 @@ public static class ObjectExtensions
     public static string ToBeautifulString(this object o)
     {
         if (o is Array a)
-        {
             return string.Join(", ", a.Cast<object>().Select(v => v == null ? "" : v.ToString()).ToArray());
-        }
 
         return o.ToString();
     }
diff --git a/Rdmp.Core/ReusableLibraryCode/Performance/ComprehensiveQueryPerformanceCounter.cs b/Rdmp.Core/ReusableLibraryCode/Performance/ComprehensiveQueryPerformanceCounter.cs
index 247081dc4d..832797994a 100644
--- a/Rdmp.Core/ReusableLibraryCode/Performance/ComprehensiveQueryPerformanceCounter.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Performance/ComprehensiveQueryPerformanceCounter.cs
@@ -20,16 +20,14 @@ namespace Rdmp.Core.ReusableLibraryCode.Performance;
 /// </summary>
 public class ComprehensiveQueryPerformanceCounter
 {
-    public Dictionary<string,QueryPerformed> DictionaryOfQueries = new();
-        
+    public Dictionary<string, QueryPerformed> DictionaryOfQueries = new();
+
     public ComprehensiveQueryPerformanceCounter()
     {
-            
     }
 
     public void AddAudit(DbCommand cmd, string environmentDotStackTrace)
     {
-            
         //is it a novel origin
         if (!DictionaryOfQueries.ContainsKey(environmentDotStackTrace))
             DictionaryOfQueries.Add(environmentDotStackTrace, new QueryPerformed(cmd.CommandText));
diff --git a/Rdmp.Core/ReusableLibraryCode/Performance/QueryPerformed.cs b/Rdmp.Core/ReusableLibraryCode/Performance/QueryPerformed.cs
index 1af0fc70de..c66fab1e39 100644
--- a/Rdmp.Core/ReusableLibraryCode/Performance/QueryPerformed.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Performance/QueryPerformed.cs
@@ -25,5 +25,4 @@ public void IncrementSeenCount()
     {
         TimesSeen++;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/ForkDataLoadEventListener.cs b/Rdmp.Core/ReusableLibraryCode/Progress/ForkDataLoadEventListener.cs
index b00e166069..df95962e95 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/ForkDataLoadEventListener.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/ForkDataLoadEventListener.cs
@@ -11,7 +11,7 @@ namespace Rdmp.Core.ReusableLibraryCode.Progress;
 /// therefore if you get an error (e.g. OnNotify event with ProgressEventType.Error) and the first listener decides to respond by raising it as an 
 /// Exception then the second listener will not get called (since at this point you will have entered Exception handling).
 /// </summary>
-public class ForkDataLoadEventListener:IDataLoadEventListener
+public class ForkDataLoadEventListener : IDataLoadEventListener
 {
     private IDataLoadEventListener[] _listeners;
 
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/FromCheckNotifierToDataLoadEventListener.cs b/Rdmp.Core/ReusableLibraryCode/Progress/FromCheckNotifierToDataLoadEventListener.cs
index 25a7c1e08e..23e4ed539f 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/FromCheckNotifierToDataLoadEventListener.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/FromCheckNotifierToDataLoadEventListener.cs
@@ -37,7 +37,8 @@ public void OnProgress(object sender, ProgressEventArgs e)
         if (!_progressMessagesReceived.Contains(e.TaskDescription))
         {
             _progressMessagesReceived.Add(e.TaskDescription);
-            _checker.OnCheckPerformed(new CheckEventArgs($"Started progress on {e.TaskDescription}",CheckResult.Success));
+            _checker.OnCheckPerformed(new CheckEventArgs($"Started progress on {e.TaskDescription}",
+                CheckResult.Success));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/FromDataLoadEventListenerToCheckNotifier.cs b/Rdmp.Core/ReusableLibraryCode/Progress/FromDataLoadEventListenerToCheckNotifier.cs
index ddeb5ec2ad..f1c1efc49f 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/FromDataLoadEventListenerToCheckNotifier.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/FromDataLoadEventListenerToCheckNotifier.cs
@@ -24,8 +24,8 @@ public FromDataLoadEventListenerToCheckNotifier(IDataLoadEventListener listener)
 
     public bool OnCheckPerformed(CheckEventArgs args)
     {
-        _listener.OnNotify(this,args.ToNotifyEventArgs());
-            
+        _listener.OnNotify(this, args.ToNotifyEventArgs());
+
         //reject all proposed fixes
         return false;
     }
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/NotifyEventArgs.cs b/Rdmp.Core/ReusableLibraryCode/Progress/NotifyEventArgs.cs
index 194d24d0ca..85f0760d46 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/NotifyEventArgs.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/NotifyEventArgs.cs
@@ -37,14 +37,15 @@ public NotifyEventArgs(ProgressEventType progressEventType, string message)
         }
     }
 
-    public NotifyEventArgs(ProgressEventType progressEventType, string message,  Exception exception)
+    public NotifyEventArgs(ProgressEventType progressEventType, string message, Exception exception)
     {
         ProgressEventType = progressEventType;
         Message = message;
         Exception = exception;
         Handled = false;
 
-        try{
+        try
+        {
             StackTrace = Environment.StackTrace;
         }
         catch (Exception)
@@ -74,6 +75,7 @@ public CheckEventArgs ToCheckEventArgs()
             default:
                 throw new ArgumentOutOfRangeException();
         }
+
         return new CheckEventArgs(Message, result, Exception);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/ProgressMeasurement.cs b/Rdmp.Core/ReusableLibraryCode/Progress/ProgressMeasurement.cs
index eb142b2747..8d8aedce89 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/ProgressMeasurement.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/ProgressMeasurement.cs
@@ -22,6 +22,7 @@ public ProgressMeasurement(int value, ProgressType unit)
         Value = value;
         UnitOfMeasurement = unit;
     }
+
     public ProgressMeasurement(int value, ProgressType unit, int knownTargetValue)
     {
         Value = value;
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/ThrowImmediatelyDataLoadEventListener.cs b/Rdmp.Core/ReusableLibraryCode/Progress/ThrowImmediatelyDataLoadEventListener.cs
index 0146b11080..ab8176eac7 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/ThrowImmediatelyDataLoadEventListener.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/ThrowImmediatelyDataLoadEventListener.cs
@@ -18,7 +18,7 @@ public class ThrowImmediatelyDataLoadEventListener : IDataLoadEventListener
     /// By default this class will only throw Fail results but if you set this flag then it will also throw warning messages
     /// </summary>
     public bool ThrowOnWarning { get; set; }
-        
+
     public bool WriteToConsole { get; set; }
 
     public ThrowImmediatelyDataLoadEventListener()
@@ -31,13 +31,12 @@ public void OnNotify(object sender, NotifyEventArgs e)
         if (WriteToConsole)
             Console.WriteLine($"{sender}:{e.Message}");
 
-        if(e.ProgressEventType == ProgressEventType.Error || 
-           (e.ProgressEventType == ProgressEventType.Warning && ThrowOnWarning))
+        if (e.ProgressEventType == ProgressEventType.Error ||
+            (e.ProgressEventType == ProgressEventType.Warning && ThrowOnWarning))
             throw new Exception(e.Message, e.Exception);
     }
 
     public void OnProgress(object sender, ProgressEventArgs e)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Progress/ToMemoryDataLoadEventListener.cs b/Rdmp.Core/ReusableLibraryCode/Progress/ToMemoryDataLoadEventListener.cs
index 722f32d347..f2b9e41d8e 100644
--- a/Rdmp.Core/ReusableLibraryCode/Progress/ToMemoryDataLoadEventListener.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Progress/ToMemoryDataLoadEventListener.cs
@@ -17,11 +17,11 @@ namespace Rdmp.Core.ReusableLibraryCode.Progress;
 /// 
 /// <para>The typical use case for this is for testing to ensure that components log specific messages.</para>
 /// </summary>
-public class ToMemoryDataLoadEventListener:IDataLoadEventListener
+public class ToMemoryDataLoadEventListener : IDataLoadEventListener
 {
     private readonly bool _throwOnErrorEvents;
-    public Dictionary<object,List<NotifyEventArgs>> EventsReceivedBySender = new();
-    public Dictionary<string,ProgressEventArgs> LastProgressRecieivedByTaskName = new();
+    public Dictionary<object, List<NotifyEventArgs>> EventsReceivedBySender = new();
+    public Dictionary<string, ProgressEventArgs> LastProgressRecieivedByTaskName = new();
 
     public ToMemoryDataLoadEventListener(bool throwOnErrorEvents)
     {
@@ -30,16 +30,15 @@ public ToMemoryDataLoadEventListener(bool throwOnErrorEvents)
 
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-
-        if(e.ProgressEventType == ProgressEventType.Error && _throwOnErrorEvents)
+        if (e.ProgressEventType == ProgressEventType.Error && _throwOnErrorEvents)
             if (e.Exception != null)
                 throw e.Exception;
             else
                 throw new Exception(e.Message);
 
 
-        if(!EventsReceivedBySender.ContainsKey(sender))
-            EventsReceivedBySender.Add(sender,new List<NotifyEventArgs>());
+        if (!EventsReceivedBySender.ContainsKey(sender))
+            EventsReceivedBySender.Add(sender, new List<NotifyEventArgs>());
 
         EventsReceivedBySender[sender].Add(e);
     }
@@ -47,9 +46,9 @@ public void OnNotify(object sender, NotifyEventArgs e)
     public void OnProgress(object sender, ProgressEventArgs e)
     {
         if (!LastProgressRecieivedByTaskName.ContainsKey(e.TaskDescription))
-            LastProgressRecieivedByTaskName.Add(e.TaskDescription, e);//add progress on new item
+            LastProgressRecieivedByTaskName.Add(e.TaskDescription, e); //add progress on new item
         else
-            LastProgressRecieivedByTaskName[e.TaskDescription] = e;//replace last progress
+            LastProgressRecieivedByTaskName[e.TaskDescription] = e; //replace last progress
     }
 
     public override string ToString()
@@ -61,7 +60,6 @@ public override string ToString()
             sb.AppendLine($"{kvp.Key} Messages:");
             foreach (var msg in kvp.Value)
                 sb.AppendLine($"{msg.ProgressEventType}:{msg.Message}");
-
         }
 
         foreach (var kvp in LastProgressRecieivedByTaskName)
@@ -74,12 +72,12 @@ public override string ToString()
     /// Flattens EventsReceivedBySender and returns the result as a Dictionary by ProgressEventType (Error / Warning etc)
     /// </summary>
     /// <returns></returns>
-    public Dictionary<ProgressEventType,List<NotifyEventArgs>> GetAllMessagesByProgressEventType()
+    public Dictionary<ProgressEventType, List<NotifyEventArgs>> GetAllMessagesByProgressEventType()
     {
-        var toReturn = new Dictionary<ProgressEventType,List<NotifyEventArgs>>();
+        var toReturn = new Dictionary<ProgressEventType, List<NotifyEventArgs>>();
 
         foreach (ProgressEventType e in Enum.GetValues(typeof(ProgressEventType)))
-            toReturn.Add(e,new List<NotifyEventArgs>());
+            toReturn.Add(e, new List<NotifyEventArgs>());
 
         foreach (var eventArgs in EventsReceivedBySender.Values.SelectMany(a => a))
             toReturn[eventArgs.ProgressEventType].Add(eventArgs);
@@ -89,6 +87,6 @@ public Dictionary<ProgressEventType,List<NotifyEventArgs>> GetAllMessagesByProgr
 
     public ProgressEventType GetWorst()
     {
-        return EventsReceivedBySender.Values.Max(v=>v.Max(e=>e.ProgressEventType));
+        return EventsReceivedBySender.Values.Max(v => v.Max(e => e.ProgressEventType));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Rfc4180Writer.cs b/Rdmp.Core/ReusableLibraryCode/Rfc4180Writer.cs
index 586ce3ee36..54206b111b 100644
--- a/Rdmp.Core/ReusableLibraryCode/Rfc4180Writer.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Rfc4180Writer.cs
@@ -16,7 +16,8 @@ namespace Rdmp.Core.ReusableLibraryCode;
 
 public static class Rfc4180Writer
 {
-    public static void WriteDataTable(DataTable sourceTable, TextWriter writer, bool includeHeaders, QuerySyntaxHelper escaper = null)
+    public static void WriteDataTable(DataTable sourceTable, TextWriter writer, bool includeHeaders,
+        QuerySyntaxHelper escaper = null)
     {
         if (includeHeaders)
         {
@@ -30,13 +31,14 @@ public static void WriteDataTable(DataTable sourceTable, TextWriter writer, bool
         var typeDictionary = sourceTable.Columns.Cast<DataColumn>().ToDictionary(c => c, c => new Guesser());
         foreach (var kvp in typeDictionary)
             kvp.Value.AdjustToCompensateForValues(kvp.Key);
-            
+
         foreach (DataRow row in sourceTable.Rows)
         {
             var line = new List<string>();
 
             foreach (DataColumn col in sourceTable.Columns)
-                line.Add(QuoteValue(GetStringRepresentation(row[col], typeDictionary[col].Guess.CSharpType == typeof(DateTime), escaper)));
+                line.Add(QuoteValue(GetStringRepresentation(row[col],
+                    typeDictionary[col].Guess.CSharpType == typeof(DateTime), escaper)));
 
             writer.WriteLine(string.Join(",", line));
         }
@@ -50,10 +52,8 @@ private static string GetStringRepresentation(object o, bool allowDates, QuerySy
             return null;
 
         if (o is string s && allowDates)
-        {
             if (DateTime.TryParse(s, out var dt))
                 return GetStringRepresentation(dt);
-        }
 
         if (o is DateTime time)
             return GetStringRepresentation(time);
@@ -79,6 +79,5 @@ private static string QuoteValue(string value)
             return "NULL";
 
         return $"\"{value}\"";
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Serialization/IgnorableSerializerContractResolver.cs b/Rdmp.Core/ReusableLibraryCode/Serialization/IgnorableSerializerContractResolver.cs
index 7e3ac3b074..841d840989 100644
--- a/Rdmp.Core/ReusableLibraryCode/Serialization/IgnorableSerializerContractResolver.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Serialization/IgnorableSerializerContractResolver.cs
@@ -34,10 +34,7 @@ public void Ignore(Type type, params string[] propertyName)
         // start bucket if DNE
         if (!Ignores.ContainsKey(type)) Ignores[type] = new HashSet<string>();
 
-        foreach (var prop in propertyName)
-        {
-            Ignores[type].Add(prop);
-        }
+        foreach (var prop in propertyName) Ignores[type].Add(prop);
     }
 
     /// <summary>
@@ -68,10 +65,9 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
 
         if (IsIgnored(property.DeclaringType, property.PropertyName)
             // need to check basetype as well for EF -- @per comment by user576838 - LT: but it can be null, so check that too!
-            || (property.DeclaringType.BaseType != null && IsIgnored(property.DeclaringType.BaseType, property.PropertyName)))
-        {
+            || (property.DeclaringType.BaseType != null &&
+                IsIgnored(property.DeclaringType.BaseType, property.PropertyName)))
             property.ShouldSerialize = instance => { return false; };
-        }
 
         return property;
     }
diff --git a/Rdmp.Core/ReusableLibraryCode/Settings/RDMPApplicationSettings.cs b/Rdmp.Core/ReusableLibraryCode/Settings/RDMPApplicationSettings.cs
index 7b5a9b094e..8671f9d59e 100644
--- a/Rdmp.Core/ReusableLibraryCode/Settings/RDMPApplicationSettings.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Settings/RDMPApplicationSettings.cs
@@ -49,9 +49,7 @@ private bool AddOrUpdateValueInternal<T>(string key, T value, string fileName =
         var type = value.GetType();
 
         if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-        {
             type = type.GenericTypeArguments.FirstOrDefault();
-        }
 
 
         if (type == typeof(string) ||
@@ -64,27 +62,21 @@ private bool AddOrUpdateValueInternal<T>(string key, T value, string fileName =
             type == typeof(int) ||
             type == typeof(long) ||
             type == typeof(byte))
-        {
             lock (locker)
             {
                 if (value is decimal)
-                {
                     return AddOrUpdateValue(key,
                         Convert.ToString(Convert.ToDecimal(value), System.Globalization.CultureInfo.InvariantCulture));
-                }
 
                 if (value is DateTime)
-                {
                     return AddOrUpdateValue(key,
                         Convert.ToString(-Convert.ToDateTime(value).ToUniversalTime().Ticks,
                             System.Globalization.CultureInfo.InvariantCulture));
-                }
                 var str = Convert.ToString(value, System.Globalization.CultureInfo.InvariantCulture);
 
                 string oldValue = null;
 
                 if (store.FileExists(key))
-                {
                     using (var stream = store.OpenFile(key, FileMode.Open))
                     {
                         using (var sr = new StreamReader(stream))
@@ -92,7 +84,6 @@ private bool AddOrUpdateValueInternal<T>(string key, T value, string fileName =
                             oldValue = sr.ReadToEnd();
                         }
                     }
-                }
 
                 using (var stream = store.OpenFile(key, FileMode.Create, FileAccess.Write))
                 {
@@ -104,7 +95,6 @@ private bool AddOrUpdateValueInternal<T>(string key, T value, string fileName =
 
                 return oldValue != str;
             }
-        }
 
         throw new ArgumentException($"Value of type {type.Name} is not supported.");
     }
@@ -128,7 +118,6 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
 
                 // If the key exists, retrieve the value.
                 if (store.FileExists(key))
-                {
                     using (var stream = store.OpenFile(key, FileMode.Open))
                     {
                         using (var sr = new StreamReader(stream))
@@ -136,7 +125,6 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
                             str = sr.ReadToEnd();
                         }
                     }
-                }
 
                 if (str == null)
                     return defaultValue;
@@ -144,23 +132,21 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
                 var type = typeof(T);
 
                 if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-                {
                     type = type.GenericTypeArguments.FirstOrDefault();
-                }
 
                 if (type == typeof(string))
+                {
                     value = str;
+                }
 
                 else if (type == typeof(decimal))
                 {
-
                     var savedDecimal = Convert.ToString(str);
 
 
                     value = Convert.ToDecimal(savedDecimal, System.Globalization.CultureInfo.InvariantCulture);
 
                     return null != value ? (T)value : defaultValue;
-
                 }
 
                 else if (type == typeof(double))
@@ -175,10 +161,11 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
 
                 else if (type == typeof(DateTime))
                 {
-
                     var ticks = Convert.ToInt64(str, System.Globalization.CultureInfo.InvariantCulture);
                     //Old value, stored before update to UTC values
-                    value = ticks >= 0 ? new DateTime(ticks) :
+                    value = ticks >= 0
+                        ? new DateTime(ticks)
+                        :
                         //New value, UTC
                         new DateTime(-ticks, DateTimeKind.Utc);
 
@@ -188,7 +175,7 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
 
                 else if (type == typeof(Guid))
                 {
-                    if (Guid.TryParse(str, out Guid guid))
+                    if (Guid.TryParse(str, out var guid))
                         value = guid;
                 }
 
@@ -221,10 +208,9 @@ private T GetValueOrDefaultInternal<T>(string key, T defaultValue = default, str
             {
                 return defaultValue;
             }
-
         }
 
-        return null != value ? (T) value : defaultValue;
+        return null != value ? (T)value : defaultValue;
     }
 
     /// <summary>
@@ -246,10 +232,7 @@ public void Clear(string fileName = null)
     {
         try
         {
-            foreach (var file in store.GetFileNames())
-            {
-                store.DeleteFile(file);
-            }
+            foreach (var file in store.GetFileNames()) store.DeleteFile(file);
         }
         catch (Exception ex)
         {
@@ -263,10 +246,7 @@ public void Clear(string fileName = null)
     /// <param name="key">Key to check</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True if contains key, else false</returns>
-    public bool Contains(string key, string fileName = null)
-    {
-        return store.FileExists(key);
-    }
+    public bool Contains(string key, string fileName = null) => store.FileExists(key);
 
     #region GetValueOrDefault
 
@@ -277,11 +257,8 @@ public bool Contains(string key, string fileName = null)
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public decimal GetValueOrDefault(string key, decimal defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-    }
+    public decimal GetValueOrDefault(string key, decimal defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -290,11 +267,8 @@ public decimal GetValueOrDefault(string key, decimal defaultValue, string fileNa
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public bool GetValueOrDefault(string key, bool defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-    }
+    public bool GetValueOrDefault(string key, bool defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -303,11 +277,8 @@ public bool GetValueOrDefault(string key, bool defaultValue, string fileName = n
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public long GetValueOrDefault(string key, long defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-    }
+    public long GetValueOrDefault(string key, long defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -316,12 +287,8 @@ public long GetValueOrDefault(string key, long defaultValue, string fileName = n
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public string GetValueOrDefault(string key, string defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-
-    }
+    public string GetValueOrDefault(string key, string defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -330,12 +297,8 @@ public string GetValueOrDefault(string key, string defaultValue, string fileName
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public int GetValueOrDefault(string key, int defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-
-    }
+    public int GetValueOrDefault(string key, int defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -344,12 +307,8 @@ public int GetValueOrDefault(string key, int defaultValue, string fileName = nul
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public float GetValueOrDefault(string key, float defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-
-    }
+    public float GetValueOrDefault(string key, float defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -358,12 +317,8 @@ public float GetValueOrDefault(string key, float defaultValue, string fileName =
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public DateTime GetValueOrDefault(string key, DateTime defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-
-    }
+    public DateTime GetValueOrDefault(string key, DateTime defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -372,12 +327,8 @@ public DateTime GetValueOrDefault(string key, DateTime defaultValue, string file
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public Guid GetValueOrDefault(string key, Guid defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-
-    }
+    public Guid GetValueOrDefault(string key, Guid defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     /// <summary>
     /// Gets the current value or the default that you specify.
@@ -386,11 +337,8 @@ public Guid GetValueOrDefault(string key, Guid defaultValue, string fileName = n
     /// <param name="defaultValue">default value if not set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>Value or default</returns>
-    public double GetValueOrDefault(string key, double defaultValue, string fileName = null)
-    {
-        return
-            GetValueOrDefaultInternal(key, defaultValue, fileName);
-    }
+    public double GetValueOrDefault(string key, double defaultValue, string fileName = null) =>
+        GetValueOrDefaultInternal(key, defaultValue, fileName);
 
     #endregion
 
@@ -403,12 +351,8 @@ public double GetValueOrDefault(string key, double defaultValue, string fileName
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, decimal value, string fileName = null)
-    {
-        return
-            AddOrUpdateValueInternal(key, value, fileName);
-
-    }
+    public bool AddOrUpdateValue(string key, decimal value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -417,12 +361,8 @@ public bool AddOrUpdateValue(string key, decimal value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, bool value, string fileName = null)
-    {
-        return
-            AddOrUpdateValueInternal(key, value, fileName);
-
-    }
+    public bool AddOrUpdateValue(string key, bool value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -431,10 +371,8 @@ public bool AddOrUpdateValue(string key, bool value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, long value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, long value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -443,12 +381,8 @@ public bool AddOrUpdateValue(string key, long value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, string value, string fileName = null)
-    {
-        return
-            AddOrUpdateValueInternal(key, value, fileName);
-
-    }
+    public bool AddOrUpdateValue(string key, string value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -457,10 +391,8 @@ public bool AddOrUpdateValue(string key, string value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, int value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, int value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -469,10 +401,8 @@ public bool AddOrUpdateValue(string key, int value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, float value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, float value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -481,10 +411,8 @@ public bool AddOrUpdateValue(string key, float value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, DateTime value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, DateTime value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -493,10 +421,8 @@ public bool AddOrUpdateValue(string key, DateTime value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, Guid value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, Guid value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     /// <summary>
     /// Adds or updates the value
@@ -505,10 +431,8 @@ public bool AddOrUpdateValue(string key, Guid value, string fileName = null)
     /// <param name="value">Value to set</param>
     /// <param name="fileName">Name of file for settings to be stored and retrieved </param>
     /// <returns>True of was added or updated and you need to save it.</returns>
-    public bool AddOrUpdateValue(string key, double value, string fileName = null)
-    {
-        return AddOrUpdateValueInternal(key, value, fileName);
-    }
+    public bool AddOrUpdateValue(string key, double value, string fileName = null) =>
+        AddOrUpdateValueInternal(key, value, fileName);
 
     #endregion
 
@@ -516,8 +440,5 @@ public bool AddOrUpdateValue(string key, double value, string fileName = null)
     /// Attempts to open the app settings page.
     /// </summary>
     /// <returns>true if success, else false and not supported</returns>
-    public bool OpenAppSettings()
-    {
-        return false;
-    }
+    public bool OpenAppSettings() => false;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs b/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs
index b1d2d1e8f2..d2e64390ec 100644
--- a/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs
+++ b/Rdmp.Core/ReusableLibraryCode/Settings/UserSettings.cs
@@ -20,13 +20,15 @@ namespace Rdmp.Core.ReusableLibraryCode.Settings;
 /// </summary>
 public static class UserSettings
 {
-    private static Lazy<ISettings> implementation = new(() => CreateSettings(), System.Threading.LazyThreadSafetyMode.PublicationOnly);
+    private static Lazy<ISettings> implementation =
+        new(() => CreateSettings(), System.Threading.LazyThreadSafetyMode.PublicationOnly);
 
     private static ISettings AppSettings
     {
         get
         {
-            var ret = implementation.Value ?? throw new NotImplementedException("Isolated Storage does not work in this environment...");
+            var ret = implementation.Value ??
+                      throw new NotImplementedException("Isolated Storage does not work in this environment...");
             return ret;
         }
     }
@@ -47,7 +49,7 @@ public static bool ConfirmApplicationExiting
     /// </summary>
     public static string LicenseAccepted
     {
-        get => AppSettings.GetValueOrDefault("LicenseAccepted",null);
+        get => AppSettings.GetValueOrDefault("LicenseAccepted", null);
         set => AppSettings.AddOrUpdateValue("LicenseAccepted", value);
     }
 
@@ -131,7 +133,8 @@ public static bool FindShouldPin
     public static int CreateDatabaseTimeout
     {
         get => AppSettings.GetValueOrDefault("CreateDatabaseTimeout", 30);
-        set => AppSettings.AddOrUpdateValue("CreateDatabaseTimeout", DiscoveredServerHelper.CreateDatabaseTimeoutInSeconds = Math.Max(value,30));
+        set => AppSettings.AddOrUpdateValue("CreateDatabaseTimeout",
+            DiscoveredServerHelper.CreateDatabaseTimeoutInSeconds = Math.Max(value, 30));
     }
 
     /// <summary>
@@ -140,7 +143,7 @@ public static int CreateDatabaseTimeout
     public static int TooltipAppearDelay
     {
         get => AppSettings.GetValueOrDefault("TooltipAppearDelay", 750);
-        set => AppSettings.AddOrUpdateValue("TooltipAppearDelay", Math.Max(10,value));
+        set => AppSettings.AddOrUpdateValue("TooltipAppearDelay", Math.Max(10, value));
     }
 
     /// <summary>
@@ -163,26 +166,31 @@ public static bool EnableCommits
 
 
     #region Catalogue flag visibility settings
+
     public static bool ShowInternalCatalogues
     {
         get => AppSettings.GetValueOrDefault("ShowInternalCatalogues", true);
         set => AppSettings.AddOrUpdateValue("ShowInternalCatalogues", value);
     }
+
     public static bool ShowDeprecatedCatalogues
     {
         get => AppSettings.GetValueOrDefault("ShowDeprecatedCatalogues", true);
         set => AppSettings.AddOrUpdateValue("ShowDeprecatedCatalogues", value);
     }
+
     public static bool ShowColdStorageCatalogues
     {
         get => AppSettings.GetValueOrDefault("ShowColdStorageCatalogues", true);
         set => AppSettings.AddOrUpdateValue("ShowColdStorageCatalogues", value);
     }
+
     public static bool ShowProjectSpecificCatalogues
     {
         get => AppSettings.GetValueOrDefault("ShowProjectSpecificCatalogues", true);
         set => AppSettings.AddOrUpdateValue("ShowProjectSpecificCatalogues", value);
     }
+
     public static bool ShowNonExtractableCatalogues
     {
         get => AppSettings.GetValueOrDefault("ShowNonExtractableCatalogues", true);
@@ -271,7 +279,8 @@ public static string RecentHistory
     /// <para>When enabled RDMP will record certain performance related metrics (how long refresh takes etc).</para>
     /// <para>These figures are completely internal to the application and are not transmitted anywhere.You can view the results in the toolbar.</para>
     /// </summary>
-    public static bool DebugPerformance {
+    public static bool DebugPerformance
+    {
         get => AppSettings.GetValueOrDefault("DebugPerformance", false);
         set => AppSettings.AddOrUpdateValue("DebugPerformance", value);
     }
@@ -280,7 +289,8 @@ public static bool DebugPerformance {
     /// <para>Automatically resize columns in the RDMP user interface with fit contents.</para>
     /// <para>Can be disabled if problems arrise with column content or header visibility</para>
     /// </summary>
-    public static bool AutoResizeColumns {
+    public static bool AutoResizeColumns
+    {
         get => AppSettings.GetValueOrDefault("AutoResizeColumns", true);
         set => AppSettings.AddOrUpdateValue("AutoResizeColumns", value);
     }
@@ -289,7 +299,8 @@ public static bool AutoResizeColumns {
     /// <summary>
     /// Show a popup confirmation dialog at the end of a pipeline completing execution
     /// </summary>
-    public static bool ShowPipelineCompletedPopup {
+    public static bool ShowPipelineCompletedPopup
+    {
         get => AppSettings.GetValueOrDefault("ShowPipelineCompletedPopup", true);
         set => AppSettings.AddOrUpdateValue("ShowPipelineCompletedPopup", value);
     }
@@ -344,6 +355,7 @@ public static int FindWindowWidth
         get => AppSettings.GetValueOrDefault("FindWindowWidth", 730);
         set => AppSettings.AddOrUpdateValue("FindWindowWidth", value);
     }
+
     public static int FindWindowHeight
     {
         get => AppSettings.GetValueOrDefault("FindWindowHeight", 400);
@@ -419,7 +431,6 @@ public static bool UseAliasInsteadOfTransformInGroupByAggregateGraphs
         set => AppSettings.AddOrUpdateValue("ShowProjectSpecificColumns", value);
     }
 
-
     #endregion
 
     /// <summary>
@@ -440,22 +451,22 @@ public static CheckResult GetErrorReportingLevelFor(ErrorCode errorCode)
     /// </summary>
     /// <param name="errorCode"></param>
     /// <param name="value"></param>
-    public static void SetErrorReportingLevelFor(ErrorCode errorCode,CheckResult value)
+    public static void SetErrorReportingLevelFor(ErrorCode errorCode, CheckResult value)
     {
         AppSettings.AddOrUpdateValue($"EC_{errorCode.Code}", value.ToString());
     }
 
     public static bool GetTutorialDone(Guid tutorialGuid)
     {
-        if(tutorialGuid == Guid.Empty)
+        if (tutorialGuid == Guid.Empty)
             return false;
 
-        return AppSettings.GetValueOrDefault($"T_{tutorialGuid:N}", false); 
+        return AppSettings.GetValueOrDefault($"T_{tutorialGuid:N}", false);
     }
 
-    public static void SetTutorialDone(Guid tutorialGuid,bool value)
+    public static void SetTutorialDone(Guid tutorialGuid, bool value)
     {
-        if(tutorialGuid == Guid.Empty)
+        if (tutorialGuid == Guid.Empty)
             return;
 
         AppSettings.AddOrUpdateValue($"T_{tutorialGuid:N}", value);
@@ -466,7 +477,6 @@ public static void SetColumnWidth(Guid columnGuid, int width)
         if (columnGuid == Guid.Empty)
             return;
         SetColumnWidth(columnGuid.ToString("N"), width);
-
     }
 
     public static void SetColumnWidth(string colIdentifier, int width)
@@ -478,11 +488,11 @@ public static void SetColumnVisible(Guid columnGuid, bool visible)
     {
         if (columnGuid == Guid.Empty)
             return;
-            
-        SetColumnVisible(columnGuid.ToString("N"),visible);
+
+        SetColumnVisible(columnGuid.ToString("N"), visible);
     }
 
-    public static void SetColumnVisible(string colIdentifier,bool visible)
+    public static void SetColumnVisible(string colIdentifier, bool visible)
     {
         AppSettings.AddOrUpdateValue($"ColV_{colIdentifier}", visible);
     }
@@ -494,10 +504,9 @@ public static int GetColumnWidth(Guid columnGuid)
 
         return GetColumnWidth(columnGuid.ToString("N"));
     }
-    public static int GetColumnWidth(string colIdentifier)
-    {
-        return AppSettings.GetValueOrDefault($"ColW_{colIdentifier}", 100);
-    }
+
+    public static int GetColumnWidth(string colIdentifier) =>
+        AppSettings.GetValueOrDefault($"ColW_{colIdentifier}", 100);
 
     public static bool GetColumnVisible(Guid columnGuid)
     {
@@ -507,17 +516,15 @@ public static bool GetColumnVisible(Guid columnGuid)
         return GetColumnVisible(columnGuid.ToString("N"));
     }
 
-    public static bool GetColumnVisible(string colIdentifier)
-    {
-        return AppSettings.GetValueOrDefault($"ColV_{colIdentifier}", true);
-    }
+    public static bool GetColumnVisible(string colIdentifier) =>
+        AppSettings.GetValueOrDefault($"ColV_{colIdentifier}", true);
 
     public static string[] GetHistoryForControl(Guid controlGuid)
     {
-        return AppSettings.GetValueOrDefault($"A_{controlGuid:N}", "").Split(new []{"#!#"},StringSplitOptions.None);
+        return AppSettings.GetValueOrDefault($"A_{controlGuid:N}", "").Split(new[] { "#!#" }, StringSplitOptions.None);
     }
 
-    public static void SetHistoryForControl(Guid controlGuid,IEnumerable<string> history)
+    public static void SetHistoryForControl(Guid controlGuid, IEnumerable<string> history)
     {
         AppSettings.AddOrUpdateValue($"A_{controlGuid:N}", string.Join("#!#", history));
     }
@@ -528,16 +535,16 @@ public static void AddHistoryForControl(Guid guid, string v)
             return;
 
         var l = GetHistoryForControl(guid).ToList();
-            
+
         if (l.Contains(v))
             return;
 
-        l.Add(v);            
+        l.Add(v);
 
         SetHistoryForControl(guid, l.Distinct().ToList());
     }
 
-    public static Tuple<string,bool> GetLastColumnSortForCollection(Guid controlGuid)
+    public static Tuple<string, bool> GetLastColumnSortForCollection(Guid controlGuid)
     {
         lock (_oLockUserSettings)
         {
@@ -547,7 +554,7 @@ public static Tuple<string,bool> GetLastColumnSortForCollection(Guid controlGuid
             if (string.IsNullOrWhiteSpace(value))
                 return null;
 
-            var args = value.Split(new[] {"#!#"}, StringSplitOptions.RemoveEmptyEntries);
+            var args = value.Split(new[] { "#!#" }, StringSplitOptions.RemoveEmptyEntries);
 
             //or it doesn't split properly
             if (args.Length != 2)
@@ -565,6 +572,7 @@ public static Tuple<string,bool> GetLastColumnSortForCollection(Guid controlGuid
     }
 
     private static object _oLockUserSettings = new();
+
     public static void SetLastColumnSortForCollection(Guid controlGuid, string columnName, bool ascending)
     {
         lock (_oLockUserSettings)
@@ -580,10 +588,8 @@ public static void SetLastColumnSortForCollection(Guid controlGuid, string colum
     /// </summary>
     /// <param name="controlGuid"></param>
     /// <returns></returns>
-    public static int GetSplitterDistance(Guid controlGuid)
-    {
-        return AppSettings.GetValueOrDefault($"SplitterDistance_{controlGuid:N}",-1);
-    }
+    public static int GetSplitterDistance(Guid controlGuid) =>
+        AppSettings.GetValueOrDefault($"SplitterDistance_{controlGuid:N}", -1);
 
     /// <summary>
     /// Records that the user has manaully changed the splitter distance of the Control
@@ -599,7 +605,6 @@ public static void SetSplitterDistance(Guid controlGuid, int splitterDistance)
         }
     }
 
-
     public static void ClearUserSettings(){
         AppSettings.Clear();
     }
@@ -609,4 +614,5 @@ private static ISettings CreateSettings()
         return new RDMPApplicationSettings();
     }
 
+    private static ISettings CreateSettings() => new RDMPApplicationSettings();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/UsefulStuff.cs b/Rdmp.Core/ReusableLibraryCode/UsefulStuff.cs
index 1bca576f93..131e22689d 100644
--- a/Rdmp.Core/ReusableLibraryCode/UsefulStuff.cs
+++ b/Rdmp.Core/ReusableLibraryCode/UsefulStuff.cs
@@ -31,22 +31,22 @@ public static class UsefulStuff
 {
     public static readonly Regex RegexThingsThatAreNotNumbersOrLetters =
         new("[^0-9A-Za-z]+", RegexOptions.Compiled | RegexOptions.CultureInvariant);
+
     public static readonly Regex RegexThingsThatAreNotNumbersOrLettersOrUnderscores =
         new("[^0-9A-Za-z_]+", RegexOptions.Compiled | RegexOptions.CultureInvariant);
+
     private static readonly Regex NullWithSpaces = new(@"^\s*null\s*$",
         RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 
-    public static bool IsBasicallyNull(this string result)
-    {
-        return string.IsNullOrWhiteSpace(result) ||
-               // if user types the literal string null then return null (typically interpreted as - 'I don't want to pick one')
-               // but not the same as task cancellation
-               NullWithSpaces.IsMatch(result);
-    }
+    public static bool IsBasicallyNull(this string result) =>
+        string.IsNullOrWhiteSpace(result) ||
+        // if user types the literal string null then return null (typically interpreted as - 'I don't want to pick one')
+        // but not the same as task cancellation
+        NullWithSpaces.IsMatch(result);
 
     public static bool IsBadName(string name)
     {
-        return name != null && name.Any(c=>Path.GetInvalidFileNameChars().Contains(c));
+        return name != null && name.Any(c => Path.GetInvalidFileNameChars().Contains(c));
     }
 
     public static void OpenUrl(string url)
@@ -106,9 +106,9 @@ internal static DateTime LooseConvertToDate(object iO)
             catch (Exception)
             {
                 throw new Exception($"Cannot recognise date format :{iO}");
-
             }
         }
+
         return sDate;
     }
 
@@ -119,9 +119,9 @@ internal static DateTime LooseConvertToDate(object iO)
     private static readonly Regex RBacktickQuotes = new("`([^']+)`$");
     private static readonly Regex RSquareBrackets = new(@"\[([^[]+)]$");
     private static readonly Regex RNoPunctuation = new(@"^([\w\s]+)$");
+
     public static IEnumerable<string> GetArrayOfColumnNamesFromStringPastedInByUser(string text)
     {
-
         if (string.IsNullOrWhiteSpace(text))
             yield break;
 
@@ -147,8 +147,11 @@ public static IEnumerable<string> GetArrayOfColumnNamesFromStringPastedInByUser(
             // if user has really horrible names like with spaces and stuff
             // then try expect them to have quoted them and pull out the capture
             // groups.  Remember different DBMS have different quoting symbols
-            foreach (var r in new[] { RDoubleQuotes, RSingleQuotes, 
-                         RSquareBrackets, RBacktickQuotes, RNoPunctuation})
+            foreach (var r in new[]
+                     {
+                         RDoubleQuotes, RSingleQuotes,
+                         RSquareBrackets, RBacktickQuotes, RNoPunctuation
+                     })
             {
                 var m = r.Matches(toAdd);
                 if (!m.Any()) continue;
@@ -177,7 +180,8 @@ public static IEnumerable<string> GetArrayOfColumnNamesFromStringPastedInByUser(
 
     public static bool CHIisOK(string sCHI)
     {
-        if (!long.TryParse(sCHI, NumberStyles.None,CultureInfo.InvariantCulture, out _) || sCHI.Length != 10) return false;
+        if (!long.TryParse(sCHI, NumberStyles.None, CultureInfo.InvariantCulture, out _) ||
+            sCHI.Length != 10) return false;
         return DateTime.TryParse($"{sCHI[..2]}/{sCHI[2..4]}/{sCHI[4..6]}", out _) && GetCHICheckDigit(sCHI) == sCHI[^1];
     }
 
@@ -196,15 +200,12 @@ private static char GetCHICheckDigit(string sCHI)
         if (c == 11) c = 0;
 
         return (char)(c + '0');
-
     }
 
-    public static DirectoryInfo GetExecutableDirectory()
-    {
-        return !string.IsNullOrWhiteSpace(AppDomain.CurrentDomain.BaseDirectory)
+    public static DirectoryInfo GetExecutableDirectory() =>
+        !string.IsNullOrWhiteSpace(AppDomain.CurrentDomain.BaseDirectory)
             ? new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory)
             : new DirectoryInfo(Environment.CurrentDirectory);
-    }
 
     public static string HashFile(string filename, int retryCount = 6)
     {
@@ -220,13 +221,11 @@ public static string HashFile(string filename, int retryCount = 6)
             Thread.Sleep(1000);
 
             if (retryCount-- > 0)
-                return HashFile(filename, retryCount);//try it again (recursively)
+                return HashFile(filename, retryCount); //try it again (recursively)
             throw;
         }
-
-
     }
-     
+
     public static bool RequiresLength(string columnType)
     {
         return columnType.ToLowerInvariant() switch
@@ -253,7 +252,7 @@ public static bool HasPrecisionAndScale(string columnType)
             _ => false
         };
     }
-        
+
     public static string RemoveIllegalFilenameCharacters(string value)
     {
         return string.IsNullOrWhiteSpace(value)
@@ -262,8 +261,9 @@ public static string RemoveIllegalFilenameCharacters(string value)
                 (current, invalidFileNameChar) => current.Replace(invalidFileNameChar.ToString(), ""));
     }
 
-        
-    public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransaction transaction = null, int timeout = 30)
+
+    public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransaction transaction = null,
+        int timeout = 30)
     {
         ExecuteBatchNonQuery(sql, conn, transaction, out _, timeout);
     }
@@ -276,7 +276,8 @@ public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransac
     /// <param name="transaction"></param>
     /// <param name="performanceFigures">Line number the batch started at and the time it took to complete it</param>
     /// <param name="timeout"></param>
-    public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransaction transaction,out Dictionary<int, Stopwatch> performanceFigures, int timeout = 30) 
+    public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransaction transaction,
+        out Dictionary<int, Stopwatch> performanceFigures, int timeout = 30)
     {
         performanceFigures = new Dictionary<int, Stopwatch>();
 
@@ -286,14 +287,13 @@ public static void ExecuteBatchNonQuery(string sql, DbConnection conn, DbTransac
 
         if (conn.State != ConnectionState.Open)
         {
-
             conn.Open();
             hadToOpen = true;
         }
 
         var lineNumber = 1;
 
-        sql += "\nGO";   // make sure last batch is executed.
+        sql += "\nGO"; // make sure last batch is executed.
         try
         {
             foreach (var line in sql.Split(new[] { "\n", "\r" }, StringSplitOptions.RemoveEmptyEntries))
@@ -345,14 +345,14 @@ public static FileInfo SprayFile(Assembly assembly, string manifestName, string
         outputDirectory ??= Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RDMP");
 
         using var fileToSpray = assembly.GetManifestResourceStream(manifestName) ?? throw new Exception(
-                $"assembly.GetManifestResourceStream returned null for manifest name {manifestName} in assembly {assembly}");
+            $"assembly.GetManifestResourceStream returned null for manifest name {manifestName} in assembly {assembly}");
 
         if (!Directory.Exists(outputDirectory))
             Directory.CreateDirectory(outputDirectory);
 
-        var target = new FileInfo(Path.Combine(outputDirectory,file));
+        var target = new FileInfo(Path.Combine(outputDirectory, file));
         using var destination = target.OpenWrite();
-        fileToSpray.CopyTo(destination,1<<20);
+        fileToSpray.CopyTo(destination, 1 << 20);
         return target;
     }
 
@@ -390,11 +390,7 @@ public static bool VerifyFileExists(string path, int timeout)
         return task.Wait(timeout) && task.Result;
     }
 
-    public static bool VerifyFileExists(Uri uri, int timeout)
-    {
-        return VerifyFileExists(uri.LocalPath,timeout);
-
-    }
+    public static bool VerifyFileExists(Uri uri, int timeout) => VerifyFileExists(uri.LocalPath, timeout);
 
     public static string DataTableToHtmlDataTable(DataTable dt)
     {
@@ -414,7 +410,7 @@ public static string DataTableToHtmlDataTable(DataTable dt)
 
             foreach (var cellObject in row.ItemArray)
                 sb.Append($"<TD>{cellObject}</TD>");
-                
+
             sb.AppendLine("</TR>");
         }
 
@@ -427,7 +423,7 @@ public static string DataTableToCsv(DataTable dt)
     {
         var sb = new StringBuilder();
 
-        using var w = new CsvWriter(new StringWriter(sb),CultureInfo.CurrentCulture);
+        using var w = new CsvWriter(new StringWriter(sb), CultureInfo.CurrentCulture);
         foreach (DataColumn column in dt.Columns)
             w.WriteField(column.ColumnName);
 
@@ -442,21 +438,23 @@ public static string DataTableToCsv(DataTable dt)
         }
 
         w.Flush();
-        
+
         return sb.ToString();
     }
+
     public static void ShowPathInWindowsExplorer(FileSystemInfo fileInfo)
     {
-        var argument = $"{(fileInfo is FileInfo?"/select,":"")} \"{fileInfo.FullName}\"";
+        var argument = $"{(fileInfo is FileInfo ? "/select," : "")} \"{fileInfo.FullName}\"";
         Process.Start("explorer.exe", argument);
     }
 
     public static string GetClipboardFormattedHtmlStringFromHtmlString(string s)
     {
-        const int maxLength = 1_000_000_000-52; // Header is 51 characters, total length must fit in 10 digits
-        if(s.Length > maxLength)
+        const int maxLength = 1_000_000_000 - 52; // Header is 51 characters, total length must fit in 10 digits
+        if (s.Length > maxLength)
             throw new ArgumentException(
-                $"String s is too long, the maximum length is {maxLength} but argument s was length {s.Length}",nameof(s));
+                $"String s is too long, the maximum length is {maxLength} but argument s was length {s.Length}",
+                nameof(s));
 
         // Circular dependency here: we need a string containing both its own length and the length of the string after it
         // {0:D6} is the same length as its own description
@@ -466,7 +464,7 @@ public static string GetClipboardFormattedHtmlStringFromHtmlString(string s)
         return string.Format(
             template,
             template.Length,
-            s.Length+template.Length,s);
+            s.Length + template.Length, s);
     }
 
     public static bool IsAssignableToGenericType(Type givenType, Type genericType)
@@ -512,14 +510,13 @@ public static string PascalCaseStringToHumanReadable(string pascalCaseString)
     /// <returns></returns>
     public static string SplitByLength(string input, int maxLen, string newline = null)
     {
-
         return
             string.Join(newline ?? Environment.NewLine,
                 Regex.Split(input, $@"(.{{1,{maxLen}}})(?:\s|$)")
                     .Where(x => x.Length > 0)
                     .Select(x => x.Trim()));
     }
-        
+
 
     public static void ConfirmContentsOfDirectoryAreTheSame(DirectoryInfo first, DirectoryInfo other)
     {
@@ -574,12 +571,14 @@ public static object ChangeType(object value, Type conversionType)
         var t = Nullable.GetUnderlyingType(conversionType) ?? conversionType;
 
         if (t == typeof(DateTime) && value is string s)
-        {
-            return string.Equals(s, "now",StringComparison.InvariantCultureIgnoreCase) ? DateTime.Now :
+            return string.Equals(s, "now", StringComparison.InvariantCultureIgnoreCase)
+                ? DateTime.Now
+                :
                 //Convert.ChangeType doesn't handle dates, so let's deal with that
                 DateTime.Parse(s);
-        }
 
-        return value == null || value is string sval && string.IsNullOrWhiteSpace(sval) ? null : Convert.ChangeType(value, t);
+        return value == null || (value is string sval && string.IsNullOrWhiteSpace(sval))
+            ? null
+            : Convert.ChangeType(value, t);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/ReusableLibraryCode/VisualStudioSolutionFileProcessing/VisualStudioSolutionFile.cs b/Rdmp.Core/ReusableLibraryCode/VisualStudioSolutionFileProcessing/VisualStudioSolutionFile.cs
index 15c1f0c8d4..ec9a9eac4f 100644
--- a/Rdmp.Core/ReusableLibraryCode/VisualStudioSolutionFileProcessing/VisualStudioSolutionFile.cs
+++ b/Rdmp.Core/ReusableLibraryCode/VisualStudioSolutionFileProcessing/VisualStudioSolutionFile.cs
@@ -31,9 +31,14 @@ public VisualStudioSolutionFile(DirectoryInfo solutionDirectory, FileInfo slnFil
         var slnFileContents = File.ReadAllText(slnFile.FullName);
 
         //                                                           Group 1             Group 2                       Group4
-        var projReg = new Regex(@"Project\(\""\{[\w-]*\}\""\) = \""([\w _]*.*)\"", \""(.*\.(cs|vcx|vb)proj)\"", \""({[\w-]*\})\""", RegexOptions.Compiled);
+        var projReg =
+            new Regex(
+                @"Project\(\""\{[\w-]*\}\""\) = \""([\w _]*.*)\"", \""(.*\.(cs|vcx|vb)proj)\"", \""({[\w-]*\})\""",
+                RegexOptions.Compiled);
         //                                                           Group 1                Group 2            Group3
-        var folderReg = new Regex(@"Project\(\""\{[\w-]*\}\""\) = \""([\w _]*.*)\"", \""([\w\.]*)\"", \""({[\w-]*\})\""", RegexOptions.Compiled);
+        var folderReg =
+            new Regex(@"Project\(\""\{[\w-]*\}\""\) = \""([\w _]*.*)\"", \""([\w\.]*)\"", \""({[\w-]*\})\""",
+                RegexOptions.Compiled);
 
         Projects = new List<VisualStudioProjectReference>();
         Folders = new List<VisualStudioSolutionFolder>();
@@ -44,7 +49,7 @@ public VisualStudioSolutionFile(DirectoryInfo solutionDirectory, FileInfo slnFil
 
         foreach (Match m in folderReg.Matches(slnFileContents))
         {
-            if(!m.Groups[1].Value.Equals(m.Groups[2].Value))
+            if (!m.Groups[1].Value.Equals(m.Groups[2].Value))
                 throw new Exception(
                     $"Expected folder name to be the same as folder text when evaluating the projects in solution {slnFile.FullName} (Regex matches were'{m.Groups[1].Value}' and '{m.Groups[2].Value}')");
 
@@ -84,15 +89,18 @@ public VisualStudioSolutionFile(DirectoryInfo solutionDirectory, FileInfo slnFil
                 var folderInside = Folders.SingleOrDefault(f => f.Guid.Equals(thingInside));
                 var folderHoldingIt = Folders.SingleOrDefault(f => f.Guid.Equals(thingHoldingIt));
 
-                if(folderHoldingIt == null)
+                if (folderHoldingIt == null)
                     continue;
 
                 if (folderInside != null)
+                {
                     folderHoldingIt.ChildrenFolders.Add(folderInside);
+                }
                 else
                 {
                     var visualStudioProjectReferenceInside = Projects.Single(p => p.Guid.Equals(thingInside));
-                    Folders.Single(f => f.Guid.Equals(thingHoldingIt)).ChildrenProjects.Add(visualStudioProjectReferenceInside);
+                    Folders.Single(f => f.Guid.Equals(thingHoldingIt)).ChildrenProjects
+                        .Add(visualStudioProjectReferenceInside);
                 }
             }
         }
@@ -100,6 +108,4 @@ public VisualStudioSolutionFile(DirectoryInfo solutionDirectory, FileInfo slnFil
         RootFolders = Folders.Where(f => !Folders.Any(f2 => f2.ChildrenFolders.Contains(f))).ToArray();
         RootProjects = Projects.Where(p => !Folders.Any(f => f.ChildrenProjects.Contains(p))).ToArray();
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Dependency/Gathering/GatheredObject.cs b/Rdmp.Core/Sharing/Dependency/Gathering/GatheredObject.cs
index 899f3f88f0..423c6fe686 100644
--- a/Rdmp.Core/Sharing/Dependency/Gathering/GatheredObject.cs
+++ b/Rdmp.Core/Sharing/Dependency/Gathering/GatheredObject.cs
@@ -52,7 +52,7 @@ public GatheredObject(IMapsDirectlyToDatabaseTable o)
     /// <param name="shareManager"></param>
     /// <param name="branchParents"></param>
     /// <returns></returns>
-    public ShareDefinition ToShareDefinition(ShareManager shareManager,List<ShareDefinition> branchParents)
+    public ShareDefinition ToShareDefinition(ShareManager shareManager, List<ShareDefinition> branchParents)
     {
         var export = shareManager.GetNewOrExistingExportFor(Object);
 
@@ -62,16 +62,16 @@ public ShareDefinition ToShareDefinition(ShareManager shareManager,List<ShareDef
         var relationshipFinder = new AttributePropertyFinder<RelationshipAttribute>(Object);
         var noMappingFinder = new AttributePropertyFinder<NoMappingToDatabase>(Object);
 
-            
+
         //for each property in the Object class
         foreach (var property in Object.GetType().GetProperties())
         {
             //if it's the ID column skip it
-            if(property.Name == "ID")
+            if (property.Name == "ID")
                 continue;
 
             //skip [NoMapping] columns
-            if(noMappingFinder.GetAttribute(property) != null)
+            if (noMappingFinder.GetAttribute(property) != null)
                 continue;
 
             //skip IRepositories (these tell you where the object came from)
@@ -81,7 +81,8 @@ public ShareDefinition ToShareDefinition(ShareManager shareManager,List<ShareDef
             var attribute = relationshipFinder.GetAttribute(property);
 
             //if it's a relationship to a shared object
-            if (attribute != null && (attribute.Type == RelationshipType.SharedObject || attribute.Type == RelationshipType.OptionalSharedObject))
+            if (attribute != null && (attribute.Type == RelationshipType.SharedObject ||
+                                      attribute.Type == RelationshipType.OptionalSharedObject))
             {
                 var idOfParent = property.GetValue(Object);
                 var typeOfParent = attribute.Cref;
@@ -89,21 +90,26 @@ public ShareDefinition ToShareDefinition(ShareManager shareManager,List<ShareDef
                 var parent = branchParents.SingleOrDefault(d => d.Type == typeOfParent && d.ID.Equals(idOfParent));
 
                 //if the parent is not being shared along with us
-                if(parent == null)
+                if (parent == null)
                 {
                     //if a reference is required (i.e. not optional)
-                    if(attribute.Type != RelationshipType.OptionalSharedObject)
+                    if (attribute.Type != RelationshipType.OptionalSharedObject)
                         throw new SharingException(
                             $"Property {property} on Type {Object.GetType()} is marked [Relationship] but we found no ShareDefinition amongst the current objects parents to satisfy this property");
                 }
                 else
+                {
                     relationshipProperties.Add(attribute, parent.SharingGuid);
+                }
             }
             else
+            {
                 properties.Add(property.Name, property.GetValue(Object));
+            }
         }
 
-        return new ShareDefinition(export.SharingUIDAsGuid,Object.ID,Object.GetType(),properties,relationshipProperties);
+        return new ShareDefinition(export.SharingUIDAsGuid, Object.ID, Object.GetType(), properties,
+            relationshipProperties);
     }
 
     /// <summary>
@@ -112,12 +118,11 @@ public ShareDefinition ToShareDefinition(ShareManager shareManager,List<ShareDef
     /// </summary>
     /// <param name="shareManager"></param>
     /// <returns></returns>
-    public List<ShareDefinition> ToShareDefinitionWithChildren(ShareManager shareManager)
-    {
-        return ToShareDefinitionWithChildren(shareManager, new List<ShareDefinition>());
-    }
+    public List<ShareDefinition> ToShareDefinitionWithChildren(ShareManager shareManager) =>
+        ToShareDefinitionWithChildren(shareManager, new List<ShareDefinition>());
 
-    private List<ShareDefinition> ToShareDefinitionWithChildren(ShareManager shareManager, List<ShareDefinition> branchParents)
+    private List<ShareDefinition> ToShareDefinitionWithChildren(ShareManager shareManager,
+        List<ShareDefinition> branchParents)
     {
         var me = ToShareDefinition(shareManager, branchParents);
 
@@ -135,47 +140,28 @@ private List<ShareDefinition> ToShareDefinitionWithChildren(ShareManager shareMa
     }
 
     #region Equality
-    protected bool Equals(GatheredObject other)
-    {
-        return Equals(Object, other.Object);
-    }
+
+    protected bool Equals(GatheredObject other) => Equals(Object, other.Object);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((GatheredObject) obj);
+        return Equals((GatheredObject)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Object != null ? Object.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => Object != null ? Object.GetHashCode() : 0;
 
-    public object MasqueradingAs()
-    {
-        return Object;
-    }
+    public object MasqueradingAs() => Object;
 
-    public static bool operator ==(GatheredObject left, GatheredObject right)
-    {
-        return Equals(left, right);
-    }
+    public static bool operator ==(GatheredObject left, GatheredObject right) => Equals(left, right);
+
+    public static bool operator !=(GatheredObject left, GatheredObject right) => !Equals(left, right);
 
-    public static bool operator !=(GatheredObject left, GatheredObject right)
-    {
-        return !Equals(left, right);
-    }
     #endregion
 
-    public IHasDependencies[] GetObjectsThisDependsOn()
-    {
-        return Array.Empty<IHasDependencies>();
-    }
+    public IHasDependencies[] GetObjectsThisDependsOn() => Array.Empty<IHasDependencies>();
 
-    public IHasDependencies[] GetObjectsDependingOnThis()
-    {
-        return Children.ToArray();
-    }
+    public IHasDependencies[] GetObjectsDependingOnThis() => Children.ToArray();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Dependency/Gathering/Gatherer.cs b/Rdmp.Core/Sharing/Dependency/Gathering/Gatherer.cs
index b40f37c740..0e4a5d0a95 100644
--- a/Rdmp.Core/Sharing/Dependency/Gathering/Gatherer.cs
+++ b/Rdmp.Core/Sharing/Dependency/Gathering/Gatherer.cs
@@ -30,7 +30,7 @@ public Gatherer(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
         _repositoryLocator = repositoryLocator;
 
         _functions.Add(typeof(Catalogue), o => GatherDependencies((Catalogue)o));
-        _functions.Add(typeof(ColumnInfo),o=>GatherDependencies((ColumnInfo)o));
+        _functions.Add(typeof(ColumnInfo), o => GatherDependencies((ColumnInfo)o));
         _functions.Add(typeof(ANOTable), o => GatherDependencies((ANOTable)o));
         _functions.Add(typeof(Curation.Data.Plugin), o => GatherDependencies((Curation.Data.Plugin)o));
 
@@ -54,15 +54,10 @@ public IMapsDirectlyToDatabaseTable[] GetAllObjectsInAllDatabases()
     /// </summary>
     /// <param name="databaseEntity"></param>
     /// <returns></returns>
-    public bool CanGatherDependencies(IMapsDirectlyToDatabaseTable databaseEntity)
-    {
-        return _functions.ContainsKey(databaseEntity.GetType());
-    }
+    public bool CanGatherDependencies(IMapsDirectlyToDatabaseTable databaseEntity) =>
+        _functions.ContainsKey(databaseEntity.GetType());
 
-    public GatheredObject GatherDependencies(IMapsDirectlyToDatabaseTable o)
-    {
-        return _functions[o.GetType()](o);
-    }
+    public GatheredObject GatherDependencies(IMapsDirectlyToDatabaseTable o) => _functions[o.GetType()](o);
 
     public static GatheredObject GatherDependencies(ANOTable anoTable)
     {
@@ -78,7 +73,7 @@ public static GatheredObject GatherDependencies(Curation.Data.Plugin plugin)
 
         foreach (var lma in plugin.LoadModuleAssemblies)
             root.Children.Add(new GatheredObject(lma));
-            
+
         return root;
     }
 
@@ -88,7 +83,7 @@ public GatheredObject GatherDependencies(LoadMetadata loadMetadata)
         var root = new GatheredObject(loadMetadata);
 
         //and the catalogues behind the load
-        foreach (var cata in loadMetadata.GetAllCatalogues()) 
+        foreach (var cata in loadMetadata.GetAllCatalogues())
             root.Children.Add(GatherDependencies(cata));
 
         //and the load operations
@@ -113,17 +108,17 @@ public static GatheredObject GatherDependencies(Catalogue catalogue)
 
         foreach (var cis in catalogue.CatalogueItems)
             root.Children.Add(new GatheredObject(cis));
-            
+
         return root;
     }
-        
+
     public static GatheredObject GatherDependencies(IFilter filter)
     {
         var root = new GatheredObject(filter);
-            
+
         foreach (var param in filter.GetAllParameters())
-            root.Children.Add(new GatheredObject((IMapsDirectlyToDatabaseTable) param));
-            
+            root.Children.Add(new GatheredObject((IMapsDirectlyToDatabaseTable)param));
+
         return root;
     }
 
@@ -141,13 +136,13 @@ public GatheredObject GatherDependencies(ColumnInfo c)
         var propertyFinder = new AttributePropertyFinder<SqlAttribute>(allObjects);
 
         var root = new GatheredObject(c);
-            
+
         foreach (var o in allObjects)
         {
             //don't add a reference to the thing we are gathering dependencies on!
-            if(Equals(o,c))
+            if (Equals(o, c))
                 continue;
-                
+
             foreach (var propertyInfo in propertyFinder.GetProperties(o))
             {
                 var sql = (string)propertyInfo.GetValue(o);
@@ -156,8 +151,7 @@ public GatheredObject GatherDependencies(ColumnInfo c)
                     root.Children.Add(new GatheredObject(o));
             }
         }
-            
+
         return root;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Dependency/ObjectSharingObscureDependencyFinder.cs b/Rdmp.Core/Sharing/Dependency/ObjectSharingObscureDependencyFinder.cs
index f36c28e7c3..419db6059b 100644
--- a/Rdmp.Core/Sharing/Dependency/ObjectSharingObscureDependencyFinder.cs
+++ b/Rdmp.Core/Sharing/Dependency/ObjectSharingObscureDependencyFinder.cs
@@ -34,11 +34,10 @@ public void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperOb
 
     public void HandleCascadeDeletesForDeletedObject(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
-        if(_shareManager.RepositoryLocator.CatalogueRepository.MEF == null)
+        if (_shareManager.RepositoryLocator.CatalogueRepository.MEF == null)
             return;
 
-        if (oTableWrapperObject.GetType() != typeof (ObjectImport))
+        if (oTableWrapperObject.GetType() != typeof(ObjectImport))
             _shareManager.DeleteAllOrphanImportDefinitions();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Dependency/SharedPluginImporter.cs b/Rdmp.Core/Sharing/Dependency/SharedPluginImporter.cs
index a562c5884e..5b5f58dc8b 100644
--- a/Rdmp.Core/Sharing/Dependency/SharedPluginImporter.cs
+++ b/Rdmp.Core/Sharing/Dependency/SharedPluginImporter.cs
@@ -23,8 +23,6 @@ public SharedPluginImporter(IRDMPPlatformRepositoryServiceLocator repositoryLoca
         _shareManager = new ShareManager(repositoryLocator);
     }
 
-    public Curation.Data.Plugin Import(Stream stream)
-    {
-        return _shareManager.ImportSharedObject(stream, deleteExisting: true).OfType<Curation.Data.Plugin>().Single();
-    }
+    public Curation.Data.Plugin Import(Stream stream) =>
+        _shareManager.ImportSharedObject(stream, true).OfType<Curation.Data.Plugin>().Single();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Refactoring/Exceptions/RefactoringException.cs b/Rdmp.Core/Sharing/Refactoring/Exceptions/RefactoringException.cs
index 0268979d3d..62124566ec 100644
--- a/Rdmp.Core/Sharing/Refactoring/Exceptions/RefactoringException.cs
+++ b/Rdmp.Core/Sharing/Refactoring/Exceptions/RefactoringException.cs
@@ -11,14 +11,13 @@ namespace Rdmp.Core.Sharing.Refactoring.Exceptions;
 /// <summary>
 /// Thrown when there is a problem performing renaming refactoring on an SQL string (e.g. SelectSQL / WhereSQL etc)
 /// </summary>
-public class RefactoringException:Exception
+public class RefactoringException : Exception
 {
-    public RefactoringException(string msg):base(msg)
+    public RefactoringException(string msg) : base(msg)
     {
-            
     }
-    public RefactoringException(string msg, Exception ex):base(msg,ex)
+
+    public RefactoringException(string msg, Exception ex) : base(msg, ex)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Refactoring/SelectSQLRefactorer.cs b/Rdmp.Core/Sharing/Refactoring/SelectSQLRefactorer.cs
index 5148139e9c..39c669fa36 100644
--- a/Rdmp.Core/Sharing/Refactoring/SelectSQLRefactorer.cs
+++ b/Rdmp.Core/Sharing/Refactoring/SelectSQLRefactorer.cs
@@ -29,16 +29,18 @@ public class SelectSQLRefactorer
     /// <param name="column"></param>
     /// <param name="tableName"></param>
     /// <param name="newFullySpecifiedTableName"></param>
-    public static void RefactorTableName(IColumn column,IHasFullyQualifiedNameToo tableName,string newFullySpecifiedTableName)
+    public static void RefactorTableName(IColumn column, IHasFullyQualifiedNameToo tableName,
+        string newFullySpecifiedTableName)
     {
-        var ci = column.ColumnInfo ?? throw new RefactoringException($"Cannot refactor '{column}' because its ColumnInfo was null");
+        var ci = column.ColumnInfo ??
+                 throw new RefactoringException($"Cannot refactor '{column}' because its ColumnInfo was null");
         var fullyQualifiedName = tableName.GetFullyQualifiedName();
-            
-        if(!column.SelectSQL.Contains(fullyQualifiedName))
+
+        if (!column.SelectSQL.Contains(fullyQualifiedName))
             throw new RefactoringException(
                 $"IColumn '{column}' did not contain the fully specified table name during refactoring ('{fullyQualifiedName}'");
 
-        if(!newFullySpecifiedTableName.Contains('.'))
+        if (!newFullySpecifiedTableName.Contains('.'))
             throw new RefactoringException(
                 $"Replacement table name was not fully specified, value passed was '{newFullySpecifiedTableName}' which did not contain any dots");
 
@@ -53,7 +55,8 @@ public static void RefactorTableName(IColumn column,IHasFullyQualifiedNameToo ta
     /// <param name="column"></param>
     /// <param name="tableName"></param>
     /// <param name="newFullySpecifiedTableName"></param>
-    public static void RefactorTableName(ColumnInfo column, IHasFullyQualifiedNameToo tableName, string newFullySpecifiedTableName)
+    public static void RefactorTableName(ColumnInfo column, IHasFullyQualifiedNameToo tableName,
+        string newFullySpecifiedTableName)
     {
         var fullyQualifiedName = tableName.GetFullyQualifiedName();
 
@@ -83,18 +86,19 @@ protected static void Save(object o)
     /// <param name="columnName"></param>
     /// <param name="newFullySpecifiedColumnName"></param>
     /// <param name="strict">Determines behaviour when column SelectSQL does not contain a reference to columnName.  True will throw a RefactoringException, false will return without making any changes</param>
-    public static void RefactorColumnName(IColumn column, IHasFullyQualifiedNameToo columnName, string newFullySpecifiedColumnName,bool strict = true)
+    public static void RefactorColumnName(IColumn column, IHasFullyQualifiedNameToo columnName,
+        string newFullySpecifiedColumnName, bool strict = true)
     {
         var fullyQualifiedName = columnName.GetFullyQualifiedName();
 
         if (!column.SelectSQL.Contains(fullyQualifiedName))
-            if(strict)
+            if (strict)
                 throw new RefactoringException(
                     $"IColumn '{column}' did not contain the fully specified column name during refactoring ('{fullyQualifiedName}'");
             else
                 return;
-                
-        if (newFullySpecifiedColumnName.Count(c=>c == '.')<2)
+
+        if (newFullySpecifiedColumnName.Count(c => c == '.') < 2)
             throw new RefactoringException(
                 $"Replacement column name was not fully specified, value passed was '{newFullySpecifiedColumnName}' which should have had at least 2 dots");
 
@@ -109,10 +113,7 @@ public static void RefactorColumnName(IColumn column, IHasFullyQualifiedNameToo
     /// </summary>
     /// <param name="column"></param>
     /// <returns></returns>
-    public static bool IsRefactorable(IColumn column)
-    {
-        return GetReasonNotRefactorable(column) == null;
-    }
+    public static bool IsRefactorable(IColumn column) => GetReasonNotRefactorable(column) == null;
 
     /// <summary>
     /// Determines whether the SelectSQL of the specified IColumn includes fully specified refactorable references.  Returns the reason why
@@ -146,10 +147,7 @@ public static string GetReasonNotRefactorable(IColumn column)
     /// </summary>
     /// <param name="tableInfo"></param>
     /// <returns></returns>
-    public static bool IsRefactorable(ITableInfo tableInfo)
-    {
-        return GetReasonNotRefactorable(tableInfo) == null;
-    }
+    public static bool IsRefactorable(ITableInfo tableInfo) => GetReasonNotRefactorable(tableInfo) == null;
 
     /// <summary>
     /// Returns the reason why <paramref name="table"/> is not refactorable e.g. if its name is not properly qualified
@@ -159,20 +157,20 @@ public static bool IsRefactorable(ITableInfo tableInfo)
     /// <returns></returns>
     public static string GetReasonNotRefactorable(ITableInfo table)
     {
-        if(string.IsNullOrWhiteSpace(table.Name))
+        if (string.IsNullOrWhiteSpace(table.Name))
             return "Table has no Name property, this should be the fully qualified database table name";
 
-        if(string.IsNullOrWhiteSpace(table.Database))
+        if (string.IsNullOrWhiteSpace(table.Database))
             return "Table does not have its Database property set";
 
         //ensure database and Name match correctly
         var syntaxHelper = table.GetQuerySyntaxHelper();
         var db = table.GetDatabaseRuntimeName(Curation.Data.DataLoad.LoadStage.PostLoad);
 
-        if(!table.Name.StartsWith(syntaxHelper.EnsureWrapped(db)))
+        if (!table.Name.StartsWith(syntaxHelper.EnsureWrapped(db)))
             return $"Table with Name '{table.Name}' has incorrect database propery '{table.Database}'";
 
-        if(table.Name != table.GetFullyQualifiedName())
+        if (table.Name != table.GetFullyQualifiedName())
             return
                 $"Table name '{table.Name}' did not match the expected fully qualified name '{table.GetFullyQualifiedName()}'";
 
@@ -188,22 +186,21 @@ public static string GetReasonNotRefactorable(ITableInfo table)
     /// <param name="tableInfo"></param>
     /// <param name="newFullyQualifiedTableName"></param>
     /// <returns>Total number of changes made in columns and table name</returns>
-    public static int RefactorTableName(ITableInfo tableInfo, string newFullyQualifiedTableName)
-    {
-        return RefactorTableName(tableInfo, tableInfo.GetFullyQualifiedName(), newFullyQualifiedTableName);
-    }
+    public static int RefactorTableName(ITableInfo tableInfo, string newFullyQualifiedTableName) =>
+        RefactorTableName(tableInfo, tableInfo.GetFullyQualifiedName(), newFullyQualifiedTableName);
 
     /// <inheritdoc cref="RefactorTableName(ITableInfo, string)"/>
-    public static int RefactorTableName(ITableInfo tableInfo, string oldFullyQualifiedTableName, string newFullyQualifiedTableName)
+    public static int RefactorTableName(ITableInfo tableInfo, string oldFullyQualifiedTableName,
+        string newFullyQualifiedTableName)
     {
-        if(!IsRefactorable(tableInfo))
+        if (!IsRefactorable(tableInfo))
             throw new RefactoringException(
                 $"TableInfo {tableInfo} is not refactorable because {GetReasonNotRefactorable(tableInfo)}");
 
         var updatesMade = 0;
 
         //if it's a new name
-        if(tableInfo.Name != newFullyQualifiedTableName)
+        if (tableInfo.Name != newFullyQualifiedTableName)
         {
             tableInfo.Name = newFullyQualifiedTableName;
             Save(tableInfo);
@@ -212,7 +209,7 @@ public static int RefactorTableName(ITableInfo tableInfo, string oldFullyQualifi
 
         //Rename all ColumnInfos that belong to this TableInfo
         foreach (var columnInfo in tableInfo.ColumnInfos)
-            updatesMade += RefactorTableName(columnInfo,oldFullyQualifiedTableName,newFullyQualifiedTableName);
+            updatesMade += RefactorTableName(columnInfo, oldFullyQualifiedTableName, newFullyQualifiedTableName);
 
         return updatesMade;
     }
@@ -225,61 +222,60 @@ public static int RefactorTableName(ITableInfo tableInfo, string oldFullyQualifi
     /// <param name="oldFullyQualifiedTableName"></param>
     /// <param name="newFullyQualifiedTableName"></param>
     /// <returns>Total number of changes made including <paramref name="columnInfo"/> and any <see cref="ExtractionInformation"/> declared on it</returns>
-    public static int RefactorTableName(ColumnInfo columnInfo, string oldFullyQualifiedTableName, string newFullyQualifiedTableName)
+    public static int RefactorTableName(ColumnInfo columnInfo, string oldFullyQualifiedTableName,
+        string newFullyQualifiedTableName)
     {
         var updatesMade = 0;
-            
+
         //run what they asked for
-        updatesMade += RefactorTableNameImpl(columnInfo,oldFullyQualifiedTableName,newFullyQualifiedTableName);
+        updatesMade += RefactorTableNameImpl(columnInfo, oldFullyQualifiedTableName, newFullyQualifiedTableName);
 
         //these are all the things that could appear spattered throughout the old columns
-        var oldPrefixes = new List<string>{".." ,".dbo.",".[dbo]."};
+        var oldPrefixes = new List<string> { "..", ".dbo.", ".[dbo]." };
 
         //this is what they said they wanted in the refactoring
         var newPrefix = oldPrefixes.FirstOrDefault(newFullyQualifiedTableName.Contains);
 
         //if they are trying to standardise
-        if(newPrefix != null)
-            foreach(var old in oldPrefixes)
-            {
-                if(!string.Equals(old ,newPrefix))
-                {
-                    updatesMade += RefactorTableNameImpl(columnInfo,oldFullyQualifiedTableName.Replace(newPrefix,old),newFullyQualifiedTableName);
-                }
-            }
+        if (newPrefix != null)
+            foreach (var old in oldPrefixes)
+                if (!string.Equals(old, newPrefix))
+                    updatesMade += RefactorTableNameImpl(columnInfo, oldFullyQualifiedTableName.Replace(newPrefix, old),
+                        newFullyQualifiedTableName);
 
         return updatesMade;
     }
 
-    private static int RefactorTableNameImpl(ColumnInfo columnInfo, string oldFullyQualifiedTableName, string newFullyQualifiedTableName)
+    private static int RefactorTableNameImpl(ColumnInfo columnInfo, string oldFullyQualifiedTableName,
+        string newFullyQualifiedTableName)
     {
         var updatesMade = 0;
 
         var extractionInformations = columnInfo.ExtractionInformations.ToArray();
 
         foreach (var extractionInformation in extractionInformations)
-        {
             if (extractionInformation.SelectSQL.Contains(oldFullyQualifiedTableName))
             {
-                var newvalue = extractionInformation.SelectSQL.Replace(oldFullyQualifiedTableName, newFullyQualifiedTableName);
+                var newvalue =
+                    extractionInformation.SelectSQL.Replace(oldFullyQualifiedTableName, newFullyQualifiedTableName);
 
-                if(!extractionInformation.SelectSQL.Equals(newvalue))
+                if (!extractionInformation.SelectSQL.Equals(newvalue))
                 {
                     extractionInformation.SelectSQL = newvalue;
                     extractionInformation.SaveToDatabase();
                     updatesMade++;
                 }
             }
-        }
-            
+
         //rename ColumnInfos
-        if(columnInfo.Name.StartsWith(oldFullyQualifiedTableName))
+        if (columnInfo.Name.StartsWith(oldFullyQualifiedTableName))
         {
-            columnInfo.Name = Regex.Replace(columnInfo.Name , $"^{Regex.Escape(oldFullyQualifiedTableName)}",newFullyQualifiedTableName);
+            columnInfo.Name = Regex.Replace(columnInfo.Name, $"^{Regex.Escape(oldFullyQualifiedTableName)}",
+                newFullyQualifiedTableName);
             columnInfo.SaveToDatabase();
             updatesMade++;
         }
-                
+
         return updatesMade;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Sharing/Transmission/RemotePushingService.cs b/Rdmp.Core/Sharing/Transmission/RemotePushingService.cs
index 2354dd2cb7..2e88e8defe 100644
--- a/Rdmp.Core/Sharing/Transmission/RemotePushingService.cs
+++ b/Rdmp.Core/Sharing/Transmission/RemotePushingService.cs
@@ -31,7 +31,8 @@ public class RemotePushingService
     private Gatherer _gatherer;
     private ShareManager _shareManager;
 
-    public RemotePushingService(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener)
+    public RemotePushingService(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        IDataLoadEventListener listener)
     {
         _repositoryLocator = repositoryLocator;
         this.listener = listener;
@@ -40,26 +41,26 @@ public RemotePushingService(IRDMPPlatformRepositoryServiceLocator repositoryLoca
         _shareManager = new ShareManager(_repositoryLocator);
     }
 
-    public async void SendToAllRemotes<T>(T[] toSendAll, Action callback = null) where  T:IMapsDirectlyToDatabaseTable
+    public async void SendToAllRemotes<T>(T[] toSendAll, Action callback = null) where T : IMapsDirectlyToDatabaseTable
     {
         listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
             $"Ready to send {toSendAll.Length} {typeof(T).Name} items to all remotes."));
         var done = new Dictionary<string, int>();
 
         foreach (var remoteRDMP in remotes)
-        {
-            listener.OnProgress(this, new ProgressEventArgs(remoteRDMP.Name, new ProgressMeasurement(0, ProgressType.Records, toSendAll.Length), new TimeSpan()));
-        }
+            listener.OnProgress(this,
+                new ProgressEventArgs(remoteRDMP.Name,
+                    new ProgressMeasurement(0, ProgressType.Records, toSendAll.Length), new TimeSpan()));
 
         var tasks = new List<Task>();
 
         foreach (var remote in remotes)
         {
             done.Add(remote.Name, 0);
-                    
+
             foreach (var toSend in toSendAll)
             {
-                if(!_gatherer.CanGatherDependencies(toSend))
+                if (!_gatherer.CanGatherDependencies(toSend))
                     throw new Exception(
                         $"Type {typeof(T)} is not supported yet by Gatherer and therefore cannot be shared");
 
@@ -84,7 +85,8 @@ public async void SendToAllRemotes<T>(T[] toSendAll, Action callback = null) whe
                     {
                         try
                         {
-                            result = client.PostAsync(new Uri(apiUrl), new StringContent(json, Encoding.UTF8, "text/plain")).Result;
+                            result = client.PostAsync(new Uri(apiUrl),
+                                new StringContent(json, Encoding.UTF8, "text/plain")).Result;
                             if (result.IsSuccessStatusCode)
                                 listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Information,
                                     $"Sending {toSend1} to {remote1.Name} completed."));
@@ -93,14 +95,19 @@ public async void SendToAllRemotes<T>(T[] toSendAll, Action callback = null) whe
                                     $"Error sending {toSend1} to {remote1.Name}: {result.ReasonPhrase} - {result.Content.ReadAsStringAsync().Result}"));
                             lock (done)
                             {
-                                listener.OnProgress(this, new ProgressEventArgs(remote1.Name, new ProgressMeasurement(++done[remote1.Name], ProgressType.Records, toSendAll.Length), new TimeSpan()));
+                                listener.OnProgress(this,
+                                    new ProgressEventArgs(remote1.Name,
+                                        new ProgressMeasurement(++done[remote1.Name], ProgressType.Records,
+                                            toSendAll.Length), new TimeSpan()));
                             }
                         }
                         catch (Exception ex)
                         {
                             listener.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
                                 $"Error sending {toSend1} to {remote1.Name}", ex));
-                            listener.OnProgress(this, new ProgressEventArgs(remote1.Name, new ProgressMeasurement(1, ProgressType.Records, 1), new TimeSpan()));
+                            listener.OnProgress(this,
+                                new ProgressEventArgs(remote1.Name, new ProgressMeasurement(1, ProgressType.Records, 1),
+                                    new TimeSpan()));
                         }
                     }
                 });
diff --git a/Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs b/Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs
index 77de1acd56..96f005d5d2 100644
--- a/Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs
+++ b/Rdmp.Core/Startup/CorruptRepositoryConnectionDetailsException.cs
@@ -24,11 +24,13 @@ public CorruptRepositoryConnectionDetailsException(string message) : base(messag
     {
     }
 
-    public CorruptRepositoryConnectionDetailsException(string message, Exception innerException) : base(message, innerException)
+    public CorruptRepositoryConnectionDetailsException(string message, Exception innerException) : base(message,
+        innerException)
     {
     }
 
-    protected CorruptRepositoryConnectionDetailsException(SerializationInfo info, StreamingContext context) : base(info, context)
+    protected CorruptRepositoryConnectionDetailsException(SerializationInfo info, StreamingContext context) : base(info,
+        context)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/EnvironmentInfo.cs b/Rdmp.Core/Startup/EnvironmentInfo.cs
index 416c6b49cc..2f846ba283 100644
--- a/Rdmp.Core/Startup/EnvironmentInfo.cs
+++ b/Rdmp.Core/Startup/EnvironmentInfo.cs
@@ -37,7 +37,7 @@ public class EnvironmentInfo
     /// <summary>
     /// Creates a new instance, optionally specifying which plugins should be loaded, default none.
     /// </summary>
-    public EnvironmentInfo(PluginFolders pluginsToLoad=PluginFolders.None)
+    public EnvironmentInfo(PluginFolders pluginsToLoad = PluginFolders.None)
     {
         _pluginsToLoad = pluginsToLoad;
     }
@@ -57,43 +57,40 @@ public static bool IsLinux
     /// </summary>
     internal IEnumerable<DirectoryInfo> GetPluginSubDirectories(DirectoryInfo root, ICheckNotifier notifier)
     {
-        if(!root.Name.Equals("lib"))
+        if (!root.Name.Equals("lib"))
             throw new ArgumentException($"Expected {root.FullName} to be the 'lib' directory");
 
         // if we are loading the main codebase of plugins
         if (_pluginsToLoad.HasFlag(PluginFolders.Main))
         {
             // find the main dir
-            var mainDir = root.GetDirectories(MainSubDir,new EnumerationOptions {MatchCasing = MatchCasing.CaseInsensitive,AttributesToSkip = 0}).FirstOrDefault();
+            var mainDir = root.GetDirectories(MainSubDir,
+                    new EnumerationOptions { MatchCasing = MatchCasing.CaseInsensitive, AttributesToSkip = 0 })
+                .FirstOrDefault();
 
             if (mainDir != null)
-            {
                 // great, go load the dlls in there
                 yield return mainDir;
-            }
             else
-            {
                 // plugin has no main directory, maybe it is not built correctly
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Could not find an expected folder called '/lib/{MainSubDir}' in folder:{root}", CheckResult.Warning));
-            }   
+                    $"Could not find an expected folder called '/lib/{MainSubDir}' in folder:{root}",
+                    CheckResult.Warning));
         }
 
         // if we are to load the windows specific (e.g. winforms) plugins too?
         if (_pluginsToLoad.HasFlag(PluginFolders.Windows))
         {
             // see if current plugin has winforms stuff
-            var winDir =root.GetDirectories(WindowsSubDir, new EnumerationOptions
+            var winDir = root.GetDirectories(WindowsSubDir, new EnumerationOptions
             {
                 MatchCasing = MatchCasing.PlatformDefault,
                 AttributesToSkip = 0
             }).FirstOrDefault();
 
             if (winDir != null)
-            {
                 //yes
                 yield return winDir;
-            }
 
             // if not then no big deal
         }
diff --git a/Rdmp.Core/Startup/Events/MEFFileDownloadEventStatus.cs b/Rdmp.Core/Startup/Events/MEFFileDownloadEventStatus.cs
index a7968a3eee..aa0c56117f 100644
--- a/Rdmp.Core/Startup/Events/MEFFileDownloadEventStatus.cs
+++ b/Rdmp.Core/Startup/Events/MEFFileDownloadEventStatus.cs
@@ -12,7 +12,6 @@ namespace Rdmp.Core.Startup.Events;
 /// </summary>
 public enum MEFFileDownloadEventStatus
 {
-        
     /// <summary>
     /// The file was successfully processed
     /// </summary>
diff --git a/Rdmp.Core/Startup/Events/MEFFileDownloadProgressEventArgs.cs b/Rdmp.Core/Startup/Events/MEFFileDownloadProgressEventArgs.cs
index 8950871fc4..e5c2c2a897 100644
--- a/Rdmp.Core/Startup/Events/MEFFileDownloadProgressEventArgs.cs
+++ b/Rdmp.Core/Startup/Events/MEFFileDownloadProgressEventArgs.cs
@@ -16,7 +16,9 @@ namespace Rdmp.Core.Startup.Events;
 /// </summary>
 public class MEFFileDownloadProgressEventArgs
 {
-    public MEFFileDownloadProgressEventArgs(DirectoryInfo downloadDirectory, int dllsSeenInCatalogue, int currentDllNumber, string fileBeingProcessed, bool includesPdbFile,MEFFileDownloadEventStatus status, Exception exception=null)
+    public MEFFileDownloadProgressEventArgs(DirectoryInfo downloadDirectory, int dllsSeenInCatalogue,
+        int currentDllNumber, string fileBeingProcessed, bool includesPdbFile, MEFFileDownloadEventStatus status,
+        Exception exception = null)
     {
         DownloadDirectory = downloadDirectory;
         DllsSeenInCatalogue = dllsSeenInCatalogue;
@@ -28,14 +30,13 @@ public MEFFileDownloadProgressEventArgs(DirectoryInfo downloadDirectory, int dll
     }
 
     public DirectoryInfo DownloadDirectory { get; set; }
-        
+
     public int DllsSeenInCatalogue { get; set; }
     public int CurrentDllNumber { get; set; }
 
     public MEFFileDownloadEventStatus Status { get; set; }
 
-    public string FileBeingProcessed { get; set; } 
-    public bool IncludesPdbFile{get; set;} 
+    public string FileBeingProcessed { get; set; }
+    public bool IncludesPdbFile { get; set; }
     public Exception Exception { get; set; }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/Events/PlatformDatabaseFoundEventArgs.cs b/Rdmp.Core/Startup/Events/PlatformDatabaseFoundEventArgs.cs
index aac68c79e4..c9b613e6f5 100644
--- a/Rdmp.Core/Startup/Events/PlatformDatabaseFoundEventArgs.cs
+++ b/Rdmp.Core/Startup/Events/PlatformDatabaseFoundEventArgs.cs
@@ -27,7 +27,8 @@ public class PlatformDatabaseFoundEventArgs
     public RDMPPlatformDatabaseStatus Status { get; set; }
     public Exception Exception { get; set; }
 
-    public PlatformDatabaseFoundEventArgs(ITableRepository repository, IPatcher patcher, RDMPPlatformDatabaseStatus status, Exception exception=null)
+    public PlatformDatabaseFoundEventArgs(ITableRepository repository, IPatcher patcher,
+        RDMPPlatformDatabaseStatus status, Exception exception = null)
     {
         Repository = repository;
         Patcher = patcher;
@@ -35,9 +36,6 @@ public PlatformDatabaseFoundEventArgs(ITableRepository repository, IPatcher patc
         Exception = exception;
     }
 
-    public string SummariseAsString()
-    {
-        return
-            $"RDMPPlatformDatabaseStatus is {Status} for tier {Patcher.Tier} database of type {Patcher.Name} with connection string {(Repository == null ? "Unknown" : Repository.ConnectionString)}{Environment.NewLine}{(Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(Exception))}";
-    }
+    public string SummariseAsString() =>
+        $"RDMPPlatformDatabaseStatus is {Status} for tier {Patcher.Tier} database of type {Patcher.Name} with connection string {(Repository == null ? "Unknown" : Repository.ConnectionString)}{Environment.NewLine}{(Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(Exception))}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/Events/PluginPatcherFoundEventArgs.cs b/Rdmp.Core/Startup/Events/PluginPatcherFoundEventArgs.cs
index b1a7c3c42d..822f2dff0b 100644
--- a/Rdmp.Core/Startup/Events/PluginPatcherFoundEventArgs.cs
+++ b/Rdmp.Core/Startup/Events/PluginPatcherFoundEventArgs.cs
@@ -18,7 +18,8 @@ namespace Rdmp.Core.Startup.Events;
 /// </summary>
 public class PluginPatcherFoundEventArgs
 {
-    public PluginPatcherFoundEventArgs(Type type, IPatcher instance, PluginPatcherStatus status, Exception exception=null)
+    public PluginPatcherFoundEventArgs(Type type, IPatcher instance, PluginPatcherStatus status,
+        Exception exception = null)
     {
         Type = type;
         Instance = instance;
@@ -27,7 +28,7 @@ public PluginPatcherFoundEventArgs(Type type, IPatcher instance, PluginPatcherSt
     }
 
     public Type Type { get; set; }
-    public IPatcher Instance { get; set; } 
-    public PluginPatcherStatus Status {get;set;}
+    public IPatcher Instance { get; set; }
+    public PluginPatcherStatus Status { get; set; }
     public Exception Exception { get; set; }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/LinkedRepositoryProvider.cs b/Rdmp.Core/Startup/LinkedRepositoryProvider.cs
index 4c2d40c8b7..c15b811179 100644
--- a/Rdmp.Core/Startup/LinkedRepositoryProvider.cs
+++ b/Rdmp.Core/Startup/LinkedRepositoryProvider.cs
@@ -38,13 +38,15 @@ public LinkedRepositoryProvider(string catalogueConnectionString, string dataExp
         }
         catch (SourceCodeNotFoundException ex)
         {
-
             throw new Exception("There was a problem with the Catalogue connection string", ex);
         }
 
         try
         {
-            DataExportRepository =  string.IsNullOrWhiteSpace(dataExportConnectionString) ? null : new DataExportRepository(new SqlConnectionStringBuilder(dataExportConnectionString), CatalogueRepository);
+            DataExportRepository = string.IsNullOrWhiteSpace(dataExportConnectionString)
+                ? null
+                : new DataExportRepository(new SqlConnectionStringBuilder(dataExportConnectionString),
+                    CatalogueRepository);
         }
         catch (Exception)
         {
@@ -74,9 +76,9 @@ private void ConfigureObscureDependencies()
 
         if (DataExportRepository.ObscureDependencyFinder == null)
             DataExportRepository.ObscureDependencyFinder = new ObjectSharingObscureDependencyFinder(this);
-        else
-        if (DataExportRepository.ObscureDependencyFinder is not ObjectSharingObscureDependencyFinder)
-            throw new Exception("Expected DataExportRepository.ObscureDependencyFinder to be an ObjectSharingObscureDependencyFinder");
+        else if (DataExportRepository.ObscureDependencyFinder is not ObjectSharingObscureDependencyFinder)
+            throw new Exception(
+                "Expected DataExportRepository.ObscureDependencyFinder to be an ObjectSharingObscureDependencyFinder");
     }
 
     protected override IRepository GetRepository(string s)
@@ -84,16 +86,14 @@ protected override IRepository GetRepository(string s)
         LoadPluginRepositoryFindersIfNotLoaded();
 
         foreach (var repoFinder in _pluginRepositoryFinders)
-        {
             if (repoFinder.GetRepositoryType().FullName.Equals(s))
             {
                 var toReturn = repoFinder.GetRepositoryIfAny() ?? throw new NotSupportedException(
-                        $"IPluginRepositoryFinder '{repoFinder}' said that it was the correct repository finder for repository of type '{s}' but it was unable to find an existing repository instance (GetRepositoryIfAny returned null)");
+                    $"IPluginRepositoryFinder '{repoFinder}' said that it was the correct repository finder for repository of type '{s}' but it was unable to find an existing repository instance (GetRepositoryIfAny returned null)");
                 return toReturn;
             }
-        }
 
-            
+
         return base.GetRepository(s);
     }
 
@@ -116,10 +116,10 @@ public override IEnumerable<IRepository> GetAllRepositories()
 
         yield return CatalogueRepository;
 
-        if(DataExportRepository != null)
+        if (DataExportRepository != null)
             yield return DataExportRepository;
 
-        foreach(var p in _pluginRepositoryFinders)
+        foreach (var p in _pluginRepositoryFinders)
         {
             var r = p.GetRepositoryIfAny();
             if (r != null)
diff --git a/Rdmp.Core/Startup/PluginRepository.cs b/Rdmp.Core/Startup/PluginRepository.cs
index c837717d47..e56918931c 100644
--- a/Rdmp.Core/Startup/PluginRepository.cs
+++ b/Rdmp.Core/Startup/PluginRepository.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.Startup;
 /// Repository for constructing/saving/deleting <see cref="DatabaseEntity"/> objects that are are stored in your plugin database.
 /// The assembly containing your <see cref="PluginRepository"/> must be the same assembly that contains the class definitions.
 /// </summary>
-public abstract class PluginRepository:TableRepository
+public abstract class PluginRepository : TableRepository
 {
     public ExternalDatabaseServer ExternalDatabaseServer { get; set; }
 
@@ -26,14 +26,15 @@ public abstract class PluginRepository:TableRepository
     /// </summary>
     /// <param name="externalDatabaseServer">The database to connect to</param>
     /// <param name="dependencyFinder">Optional class that can forbid deleting objects because you have dependencies on them in your database (e.g. if your custom object has a field Catalogue_ID)</param>
-    protected PluginRepository(ExternalDatabaseServer externalDatabaseServer, IObscureDependencyFinder dependencyFinder):base(dependencyFinder,externalDatabaseServer.Discover(DataAccessContext.InternalDataProcessing).Server.Builder)
+    protected PluginRepository(ExternalDatabaseServer externalDatabaseServer, IObscureDependencyFinder dependencyFinder)
+        : base(dependencyFinder,
+            externalDatabaseServer.Discover(DataAccessContext.InternalDataProcessing).Server.Builder)
     {
         ExternalDatabaseServer = externalDatabaseServer;
     }
 
     private readonly ObjectConstructor _constructor = new();
-    protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader)
-    {
-        return ObjectConstructor.ConstructIMapsDirectlyToDatabaseObject(t, this, reader);
-    }
+
+    protected override IMapsDirectlyToDatabaseTable ConstructEntity(Type t, DbDataReader reader) =>
+        ObjectConstructor.ConstructIMapsDirectlyToDatabaseObject(t, this, reader);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/PluginRepositoryFinder.cs b/Rdmp.Core/Startup/PluginRepositoryFinder.cs
index 6714f92f6d..32f51b0948 100644
--- a/Rdmp.Core/Startup/PluginRepositoryFinder.cs
+++ b/Rdmp.Core/Startup/PluginRepositoryFinder.cs
@@ -12,9 +12,10 @@ namespace Rdmp.Core.Startup;
 /// <summary>
 /// MEF discoverable version of IPluginRepositoryFinder
 /// </summary>
-public abstract class PluginRepositoryFinder :IPluginRepositoryFinder
+public abstract class PluginRepositoryFinder : IPluginRepositoryFinder
 {
     protected readonly IRDMPPlatformRepositoryServiceLocator RepositoryLocator;
+
     protected PluginRepositoryFinder(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
         RepositoryLocator = repositoryLocator;
diff --git a/Rdmp.Core/Startup/SourceCodeNotFoundException.cs b/Rdmp.Core/Startup/SourceCodeNotFoundException.cs
index a7cf2a5968..54f21b099b 100644
--- a/Rdmp.Core/Startup/SourceCodeNotFoundException.cs
+++ b/Rdmp.Core/Startup/SourceCodeNotFoundException.cs
@@ -14,8 +14,7 @@ namespace Rdmp.Core.Startup;
 /// </summary>
 public class SourceCodeNotFoundException : Exception
 {
-    public SourceCodeNotFoundException(string msg):base(msg)
+    public SourceCodeNotFoundException(string msg) : base(msg)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Startup/Startup.cs b/Rdmp.Core/Startup/Startup.cs
index b4873d71a4..8772aa7ca4 100644
--- a/Rdmp.Core/Startup/Startup.cs
+++ b/Rdmp.Core/Startup/Startup.cs
@@ -58,7 +58,9 @@ public class Startup
     private PatcherManager _patcherManager = new();
 
     #region Constructors
-    public Startup(EnvironmentInfo environmentInfo,IRDMPPlatformRepositoryServiceLocator repositoryLocator):this(environmentInfo)
+
+    public Startup(EnvironmentInfo environmentInfo, IRDMPPlatformRepositoryServiceLocator repositoryLocator) : this(
+        environmentInfo)
     {
         RepositoryLocator = repositoryLocator;
     }
@@ -68,14 +70,16 @@ public Startup(EnvironmentInfo environmentInfo)
         _environmentInfo = environmentInfo;
         TypeGuesser.GuessSettingsFactory.Defaults.CharCanBeBoolean = false;
     }
+
     #endregion
 
     #region Database Discovery
+
     public void DoStartup(ICheckNotifier notifier)
     {
         var foundCatalogue = false;
 
-        notifier.OnCheckPerformed(new CheckEventArgs("Loading core assemblies",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs("Loading core assemblies", CheckResult.Success));
 
         DiscoveredServerHelper.CreateDatabaseTimeoutInSeconds = UserSettings.CreateDatabaseTimeout;
 
@@ -83,11 +87,12 @@ public void DoStartup(ICheckNotifier notifier)
 
         try
         {
-            foundCatalogue = Find(RepositoryLocator.CatalogueRepository,cataloguePatcher,notifier);
+            foundCatalogue = Find(RepositoryLocator.CatalogueRepository, cataloguePatcher, notifier);
         }
         catch (Exception e)
         {
-            DatabaseFound(this, new PlatformDatabaseFoundEventArgs(null,cataloguePatcher, RDMPPlatformDatabaseStatus.Broken,e));
+            DatabaseFound(this,
+                new PlatformDatabaseFoundEventArgs(null, cataloguePatcher, RDMPPlatformDatabaseStatus.Broken, e));
         }
 
         if (foundCatalogue)
@@ -104,59 +109,63 @@ public void DoStartup(ICheckNotifier notifier)
                         continue;
 
                     //pass it into the system wide static keyword collection for use with all databases of this type all the time (that includes Microsoft Sql Server btw which means those options will happen for DataExport too!)
-                    DiscoveredServerHelper.AddConnectionStringKeyword(keyword.DatabaseType, keyword.Name, keyword.Value, ConnectionStringKeywordPriority.SystemDefaultMedium);
+                    DiscoveredServerHelper.AddConnectionStringKeyword(keyword.DatabaseType, keyword.Name, keyword.Value,
+                        ConnectionStringKeywordPriority.SystemDefaultMedium);
                 }
-
             }
             catch (Exception ex)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs("Could not apply ConnectionStringKeywords",CheckResult.Fail, ex));
+                notifier.OnCheckPerformed(new CheckEventArgs("Could not apply ConnectionStringKeywords",
+                    CheckResult.Fail, ex));
             }
-            
+
 
         //only load data export manager if catalogue worked
-        if(foundCatalogue)
+        if (foundCatalogue)
         {
-            LoadMEF(RepositoryLocator.CatalogueRepository,notifier);
+            LoadMEF(RepositoryLocator.CatalogueRepository, notifier);
 
             //find tier 2 databases
-            foreach (var patcher in _patcherManager.Tier2Patchers) 
-                FindWithPatcher(patcher,notifier);
+            foreach (var patcher in _patcherManager.Tier2Patchers)
+                FindWithPatcher(patcher, notifier);
 
             try
             {
                 var dataExportRepository = RepositoryLocator.DataExportRepository;
 
                 //not configured
-                if(dataExportRepository == null)
+                if (dataExportRepository == null)
                     return;
 
-                Find(dataExportRepository, new DataExportPatcher(),notifier);
+                Find(dataExportRepository, new DataExportPatcher(), notifier);
             }
             catch (Exception e)
             {
-                DatabaseFound(this, new PlatformDatabaseFoundEventArgs(null,new DataExportPatcher(), RDMPPlatformDatabaseStatus.Broken,e));
+                DatabaseFound(this,
+                    new PlatformDatabaseFoundEventArgs(null, new DataExportPatcher(), RDMPPlatformDatabaseStatus.Broken,
+                        e));
             }
 
-            FindTier3Databases( RepositoryLocator.CatalogueRepository,notifier);
+            FindTier3Databases(RepositoryLocator.CatalogueRepository, notifier);
         }
-            
-        if(MEFSafeDirectoryCatalog != null)
-            Validator.RefreshExtraTypes(MEFSafeDirectoryCatalog,notifier);
+
+        if (MEFSafeDirectoryCatalog != null)
+            Validator.RefreshExtraTypes(MEFSafeDirectoryCatalog, notifier);
     }
 
-    private void FindTier3Databases(ICatalogueRepository catalogueRepository,ICheckNotifier notifier)
+    private void FindTier3Databases(ICatalogueRepository catalogueRepository, ICheckNotifier notifier)
     {
-        foreach (var patcher in _patcherManager.GetTier3Patchers(catalogueRepository.MEF,PluginPatcherFound))
-            FindWithPatcher(patcher,notifier);
+        foreach (var patcher in _patcherManager.GetTier3Patchers(catalogueRepository.MEF, PluginPatcherFound))
+            FindWithPatcher(patcher, notifier);
     }
 
-    private bool Find(IRepository repository, IPatcher patcher,ICheckNotifier notifier)
+    private bool Find(IRepository repository, IPatcher patcher, ICheckNotifier notifier)
     {
         //if it's not configured
         if (repository == null)
         {
-            DatabaseFound(this, new PlatformDatabaseFoundEventArgs(null, patcher, RDMPPlatformDatabaseStatus.Unreachable));
+            DatabaseFound(this,
+                new PlatformDatabaseFoundEventArgs(null, patcher, RDMPPlatformDatabaseStatus.Unreachable));
             return false;
         }
 
@@ -166,7 +175,8 @@ private bool Find(IRepository repository, IPatcher patcher,ICheckNotifier notifi
 
         //check we can reach it
         var db = tableRepository.DiscoveredServer.GetCurrentDatabase();
-        notifier.OnCheckPerformed(new CheckEventArgs($"Connecting to {db.GetRuntimeName()} on {db.Server.Name}",CheckResult.Success));
+        notifier.OnCheckPerformed(new CheckEventArgs($"Connecting to {db.GetRuntimeName()} on {db.Server.Name}",
+            CheckResult.Success));
 
         //is it reachable
         try
@@ -176,7 +186,9 @@ private bool Find(IRepository repository, IPatcher patcher,ICheckNotifier notifi
         catch (Exception ex)
         {
             //no
-            DatabaseFound(this, new PlatformDatabaseFoundEventArgs(tableRepository, patcher, RDMPPlatformDatabaseStatus.Unreachable, ex));
+            DatabaseFound(this,
+                new PlatformDatabaseFoundEventArgs(tableRepository, patcher, RDMPPlatformDatabaseStatus.Unreachable,
+                    ex));
             return false;
         }
 
@@ -191,7 +203,8 @@ private bool Find(IRepository repository, IPatcher patcher,ICheckNotifier notifi
         catch (Exception e)
         {
             //database is broken (maybe the version of the db is ahead of the host assembly?)
-            DatabaseFound(this, new PlatformDatabaseFoundEventArgs(tableRepository, patcher, RDMPPlatformDatabaseStatus.Broken, e));
+            DatabaseFound(this,
+                new PlatformDatabaseFoundEventArgs(tableRepository, patcher, RDMPPlatformDatabaseStatus.Broken, e));
             return false;
         }
 
@@ -199,34 +212,37 @@ private bool Find(IRepository repository, IPatcher patcher,ICheckNotifier notifi
             new PlatformDatabaseFoundEventArgs(tableRepository, patcher, patchingRequired switch
             {
                 Patch.PatchingState.NotRequired => RDMPPlatformDatabaseStatus.Healthy,
-                Patch.PatchingState.Required    => SkipPatching ? RDMPPlatformDatabaseStatus.Healthy : RDMPPlatformDatabaseStatus.RequiresPatching,
-                Patch.PatchingState.SoftwareBehindDatabase  => RDMPPlatformDatabaseStatus.SoftwareOutOfDate,
+                Patch.PatchingState.Required => SkipPatching
+                    ? RDMPPlatformDatabaseStatus.Healthy
+                    : RDMPPlatformDatabaseStatus.RequiresPatching,
+                Patch.PatchingState.SoftwareBehindDatabase => RDMPPlatformDatabaseStatus.SoftwareOutOfDate,
                 _ => throw new ArgumentOutOfRangeException(nameof(patchingRequired))
             }));
 
         return true;
     }
 
-    private void FindWithPatcher(IPatcher patcher,ICheckNotifier notifier)
+    private void FindWithPatcher(IPatcher patcher, ICheckNotifier notifier)
     {
-        var dbs = RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>().Where(eds => eds.WasCreatedBy(patcher));
+        var dbs = RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
+            .Where(eds => eds.WasCreatedBy(patcher));
 
         foreach (IExternalDatabaseServer server in dbs)
-        {
             try
             {
                 var builder = DataAccessPortal
                     .ExpectServer(server, DataAccessContext.InternalDataProcessing)
                     .Builder;
 
-                Find(new CatalogueRepository(builder), patcher,notifier);
+                Find(new CatalogueRepository(builder), patcher, notifier);
             }
             catch (Exception e)
             {
-                notifier.OnCheckPerformed(new CheckEventArgs($"Could not resolve ExternalDatabaseServer '{server}'",CheckResult.Warning,e));
+                notifier.OnCheckPerformed(new CheckEventArgs($"Could not resolve ExternalDatabaseServer '{server}'",
+                    CheckResult.Warning, e));
             }
-        }
     }
+
     #endregion
 
 
@@ -237,15 +253,16 @@ private void LoadMEF(ICatalogueRepository catalogueRepository, ICheckNotifier no
         catalogueRepository.MEF ??= new MEF();
 
         var downloadDirectory = catalogueRepository.MEF.DownloadDirectory;
-             
+
         //make sure the MEF directory exists
-        if(!downloadDirectory.Exists)
+        if (!downloadDirectory.Exists)
             downloadDirectory.Create();
 
         var compatiblePlugins = catalogueRepository.PluginManager.GetCompatiblePlugins();
 
         var dirs = new List<DirectoryInfo>();
-        var toLoad = new List<DirectoryInfo> {
+        var toLoad = new List<DirectoryInfo>
+        {
             //always load the current application directory
             //new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory)
         };
@@ -260,13 +277,14 @@ private void LoadMEF(ICatalogueRepository catalogueRepository, ICheckNotifier no
             var existingFiles = subdir.GetFiles($"*{PackPluginRunner.PluginPackageSuffix}").ToList();
 
             //if we have not downloaded this yet
-            if(!existingFiles.Any(f=>f.Name.Equals(compatiblePlugins[i].Name)))
-                compatiblePlugins[i].LoadModuleAssemblies.SingleOrDefault()?.DownloadAssembly(subdir); 
+            if (!existingFiles.Any(f => f.Name.Equals(compatiblePlugins[i].Name)))
+                compatiblePlugins[i].LoadModuleAssemblies.SingleOrDefault()?.DownloadAssembly(subdir);
             else
                 notifier.OnCheckPerformed(new CheckEventArgs(
-                    $"Found existing file '{compatiblePlugins[i].Name}' so didn't bother downloading it.",CheckResult.Success));
-                                
-            foreach(var archive in  subdir.GetFiles($"*{PackPluginRunner.PluginPackageSuffix}").ToList())
+                    $"Found existing file '{compatiblePlugins[i].Name}' so didn't bother downloading it.",
+                    CheckResult.Success));
+
+            foreach (var archive in subdir.GetFiles($"*{PackPluginRunner.PluginPackageSuffix}").ToList())
             {
                 //get rid of any old out dirs
                 var outDir = subdir.EnumerateDirectories("out").SingleOrDefault();
@@ -274,31 +292,36 @@ private void LoadMEF(ICatalogueRepository catalogueRepository, ICheckNotifier no
                 var mustUnzip = true;
 
                 //if there's already an unpacked version
-                if(outDir is { Exists: true })
+                if (outDir is { Exists: true })
                 {
                     //if the directory has no files we have to unzip - otherwise it has an unzipped version already yay
-                    mustUnzip = !outDir.GetFiles("*.dll",SearchOption.AllDirectories).Any();
+                    mustUnzip = !outDir.GetFiles("*.dll", SearchOption.AllDirectories).Any();
 
-                    if(mustUnzip)
+                    if (mustUnzip)
                         outDir.Delete(true);
                 }
                 else
+                {
                     outDir = subdir.CreateSubdirectory("out");
+                }
 
-                if(mustUnzip)
-                    using(var zf = ZipFile.OpenRead(archive.FullName))
+                if (mustUnzip)
+                    using (var zf = ZipFile.OpenRead(archive.FullName))
+                    {
                         try
                         {
                             zf.ExtractToDirectory(outDir.FullName);
                         }
-                        catch(Exception ex)
+                        catch (Exception ex)
                         {
                             notifier.OnCheckPerformed(new CheckEventArgs(
-                                $"Could not extract Plugin to '{outDir.FullName}'",CheckResult.Warning,ex));
+                                $"Could not extract Plugin to '{outDir.FullName}'", CheckResult.Warning, ex));
                         }
+                    }
                 else
                     notifier.OnCheckPerformed(new CheckEventArgs(
-                        $"Found existing directory '{outDir.FullName}' so didn't bother unzipping.",CheckResult.Success));
+                        $"Found existing directory '{outDir.FullName}' so didn't bother unzipping.",
+                        CheckResult.Success));
 
                 toLoad.AddRange(_environmentInfo.GetPluginSubDirectories(outDir.CreateSubdirectory("lib"), notifier));
 
@@ -310,14 +333,13 @@ private void LoadMEF(ICatalogueRepository catalogueRepository, ICheckNotifier no
         }
 
         //The only Directories in MEF folder should be Plugin subdirectories, any that don't correspond with a plugin should be deleted 
-        foreach (var unexpectedDirectory in downloadDirectory.GetDirectories().Where(expected=>!dirs.Any(d=>d.FullName.Equals(expected.FullName))))
-        {
+        foreach (var unexpectedDirectory in downloadDirectory.GetDirectories()
+                     .Where(expected => !dirs.Any(d => d.FullName.Equals(expected.FullName))))
             try
             {
                 unexpectedDirectory.Delete(true);
                 notifier.OnCheckPerformed(new CheckEventArgs(
                     $"Deleted unreferenced plugin folder {unexpectedDirectory.FullName}", CheckResult.Success));
-
             }
             catch (Exception ex)
             {
@@ -326,21 +348,20 @@ private void LoadMEF(ICatalogueRepository catalogueRepository, ICheckNotifier no
                         $"Found unreferenced (no Plugin) folder {unexpectedDirectory.FullName} but we were unable to delete it (possibly because it is in use, try closing all your local RDMP applications and restarting this one)",
                         CheckResult.Fail, ex));
             }
-        }
 
         AssemblyResolver.SetupAssemblyResolver(toLoad.ToArray());
-            
-        MEFSafeDirectoryCatalog = new SafeDirectoryCatalog(notifier, toLoad.Select(d=>d.FullName).ToArray());
+
+        MEFSafeDirectoryCatalog = new SafeDirectoryCatalog(notifier, toLoad.Select(d => d.FullName).ToArray());
         catalogueRepository.MEF.Setup(MEFSafeDirectoryCatalog);
-            
+
         if (CatalogueRepository.SuppressHelpLoading) return;
         notifier.OnCheckPerformed(new CheckEventArgs("Loading Help...", CheckResult.Success));
         var sw = Stopwatch.StartNew();
         catalogueRepository.CommentStore.ReadComments(Environment.CurrentDirectory, "SourceCodeForSelfAwareness.zip");
         sw.Stop();
         notifier.OnCheckPerformed(new CheckEventArgs($"Help loading took:{sw.Elapsed}", CheckResult.Success));
-
     }
+
     #endregion
 
     /// <summary>
diff --git a/Rdmp.Core/Startup/UserSettingsRepositoryFinder.cs b/Rdmp.Core/Startup/UserSettingsRepositoryFinder.cs
index 0aaa868f0e..f5267b75b0 100644
--- a/Rdmp.Core/Startup/UserSettingsRepositoryFinder.cs
+++ b/Rdmp.Core/Startup/UserSettingsRepositoryFinder.cs
@@ -27,11 +27,12 @@ public ICatalogueRepository CatalogueRepository
     {
         get
         {
-            if(_linkedRepositoryProvider == null)
+            if (_linkedRepositoryProvider == null)
                 RefreshRepositoriesFromUserSettings();
 
             if (_linkedRepositoryProvider == null)
-                throw new Exception("RefreshRepositoriesFromUserSettings failed to populate_linkedRepositoryProvider as expected ");
+                throw new Exception(
+                    "RefreshRepositoriesFromUserSettings failed to populate_linkedRepositoryProvider as expected ");
 
             return _linkedRepositoryProvider.CatalogueRepository;
         }
@@ -45,33 +46,30 @@ public IDataExportRepository DataExportRepository
                 RefreshRepositoriesFromUserSettings();
 
             if (_linkedRepositoryProvider == null)
-                throw new Exception("RefreshRepositoriesFromUserSettings failed to populate_linkedRepositoryProvider as expected ");
+                throw new Exception(
+                    "RefreshRepositoriesFromUserSettings failed to populate_linkedRepositoryProvider as expected ");
 
-            return _linkedRepositoryProvider.DataExportRepository; 
+            return _linkedRepositoryProvider.DataExportRepository;
         }
     }
 
-    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName, string databaseObjectTypeName, int objectID)
-    {
-        return _linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName,objectID);
-    }
+    public IMapsDirectlyToDatabaseTable GetArbitraryDatabaseObject(string repositoryTypeName,
+        string databaseObjectTypeName, int objectID) =>
+        _linkedRepositoryProvider.GetArbitraryDatabaseObject(repositoryTypeName, databaseObjectTypeName, objectID);
 
-    public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID)
-    {
-        return _linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName, databaseObjectTypeName, objectID);
-    }
+    public bool ArbitraryDatabaseObjectExists(string repositoryTypeName, string databaseObjectTypeName, int objectID) =>
+        _linkedRepositoryProvider.ArbitraryDatabaseObjectExists(repositoryTypeName, databaseObjectTypeName, objectID);
 
     public void RefreshRepositoriesFromUserSettings()
     {
         //we have mef?
         MEF mef = null;
         CommentStore commentStore = null;
-            
+
         //if we have a catalogue repository with loaded MEF then grab it
         if (_linkedRepositoryProvider != null && _linkedRepositoryProvider.CatalogueRepository != null)
         {
-
-            if(_linkedRepositoryProvider.CatalogueRepository.MEF != null)
+            if (_linkedRepositoryProvider.CatalogueRepository.MEF != null)
                 mef = _linkedRepositoryProvider.CatalogueRepository.MEF;
 
             if (_linkedRepositoryProvider.CatalogueRepository.CommentStore != null)
@@ -92,7 +90,8 @@ public void RefreshRepositoriesFromUserSettings()
         }
         catch (Exception ex)
         {
-            throw new CorruptRepositoryConnectionDetailsException($"Unable to create {nameof(LinkedRepositoryProvider)}",ex);
+            throw new CorruptRepositoryConnectionDetailsException(
+                $"Unable to create {nameof(LinkedRepositoryProvider)}", ex);
         }
 
         //preserve the currently loaded MEF assemblies
@@ -101,30 +100,24 @@ public void RefreshRepositoriesFromUserSettings()
         if (newrepo.CatalogueRepository != null)
         {
             //and the new repo doesn't have MEF loaded
-            if(newrepo.CatalogueRepository.MEF != null && !newrepo.CatalogueRepository.MEF.HaveDownloadedAllAssemblies && mef != null && mef.HaveDownloadedAllAssemblies)
+            if (newrepo.CatalogueRepository.MEF != null &&
+                !newrepo.CatalogueRepository.MEF.HaveDownloadedAllAssemblies && mef != null &&
+                mef.HaveDownloadedAllAssemblies)
                 //use the old MEF    
                 newrepo.CatalogueRepository.MEF = mef;
 
             newrepo.CatalogueRepository.CommentStore = commentStore ?? newrepo.CatalogueRepository.CommentStore;
-
         }
-            
+
 
         _linkedRepositoryProvider = newrepo;
     }
 
-    public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable
-    {
-        return _linkedRepositoryProvider.GetObjectByID<T>(value);
-    }
+    public IMapsDirectlyToDatabaseTable GetObjectByID<T>(int value) where T : IMapsDirectlyToDatabaseTable =>
+        _linkedRepositoryProvider.GetObjectByID<T>(value);
 
-    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value)
-    {
-        return _linkedRepositoryProvider.GetObjectByID(t,value);
-    }
+    public IMapsDirectlyToDatabaseTable GetObjectByID(Type t, int value) =>
+        _linkedRepositoryProvider.GetObjectByID(t, value);
 
-    public IEnumerable<IRepository> GetAllRepositories()
-    {
-        return _linkedRepositoryProvider.GetAllRepositories();
-    }
+    public IEnumerable<IRepository> GetAllRepositories() => _linkedRepositoryProvider.GetAllRepositories();
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Ticketing/ITicketingSystem.cs b/Rdmp.Core/Ticketing/ITicketingSystem.cs
index c59bea9204..eb772e62ce 100644
--- a/Rdmp.Core/Ticketing/ITicketingSystem.cs
+++ b/Rdmp.Core/Ticketing/ITicketingSystem.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Ticketing;
 /// 
 /// <para>IMPORTANT: you must have a constructor that takes a single parameter of Type TicketingSystemConstructorParameters</para>
 /// </summary>
-public interface ITicketingSystem:ICheckable
+public interface ITicketingSystem : ICheckable
 {
     /// <summary>
     /// Called when the user enters a string he thinks is a valid ticket.  You should respond quickly (e.g. by Regex pattern matching not database query
@@ -44,7 +44,8 @@ public interface ITicketingSystem:ICheckable
     /// <param name="reason"></param>
     /// <param name="exception"></param>
     /// <returns></returns>
-    TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket, string releaseTicket, out string reason, out Exception exception);
+    TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket,
+        string releaseTicket, out string reason, out Exception exception);
 
     string GetProjectFolderName(string masterTicket);
 }
diff --git a/Rdmp.Core/Ticketing/PluginTicketingSystem.cs b/Rdmp.Core/Ticketing/PluginTicketingSystem.cs
index 1ee2394c92..276c5c3159 100644
--- a/Rdmp.Core/Ticketing/PluginTicketingSystem.cs
+++ b/Rdmp.Core/Ticketing/PluginTicketingSystem.cs
@@ -14,7 +14,7 @@ public abstract class PluginTicketingSystem : ICheckable, ITicketingSystem
 {
     protected IDataAccessCredentials Credentials { get; set; }
     protected string Url { get; set; }
-        
+
     protected PluginTicketingSystem(TicketingSystemConstructorParameters parameters)
     {
         Credentials = parameters.Credentials;
@@ -25,6 +25,8 @@ protected PluginTicketingSystem(TicketingSystemConstructorParameters parameters)
     public abstract bool IsValidTicketName(string ticketName);
     public abstract void NavigateToTicket(string ticketName);
 
-    public abstract TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket, string releaseTicket, out string reason, out Exception exception);
+    public abstract TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket,
+        string requestTicket, string releaseTicket, out string reason, out Exception exception);
+
     public abstract string GetProjectFolderName(string masterTicket);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Ticketing/SimpleTicketingSystem.cs b/Rdmp.Core/Ticketing/SimpleTicketingSystem.cs
index fc9a344dc3..92d343eef0 100644
--- a/Rdmp.Core/Ticketing/SimpleTicketingSystem.cs
+++ b/Rdmp.Core/Ticketing/SimpleTicketingSystem.cs
@@ -32,28 +32,28 @@ public void Check(ICheckNotifier notifier)
         // all ticket names are valid
         return;
     }
-    public bool IsValidTicketName(string ticketName)
-    {
+
+    public bool IsValidTicketName(string ticketName) =>
         // all ticket names are valid
-        return true;
-    }
+        true;
+
     public void NavigateToTicket(string ticketName)
     {
         // if the user has added a URL just append the ticket name to it
         // and open e.g. "www.myticketing?q=" + "HDD-123"
-        if(!string.IsNullOrWhiteSpace(Url))
+        if (!string.IsNullOrWhiteSpace(Url))
             UsefulStuff.OpenUrl(Url + ticketName);
     }
 
-    public TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket, string releaseTicket, out string reason, out Exception exception)
+    public TicketingReleaseabilityEvaluation GetDataReleaseabilityOfTicket(string masterTicket, string requestTicket,
+        string releaseTicket, out string reason, out Exception exception)
     {
         reason = null;
         exception = null;
         // No restrictions on releasability
         return TicketingReleaseabilityEvaluation.Releaseable;
     }
-    public string GetProjectFolderName(string masterTicket)
-    {
-        return UsefulStuff.RegexThingsThatAreNotNumbersOrLettersOrUnderscores.Replace(masterTicket, "");
-    }
+
+    public string GetProjectFolderName(string masterTicket) =>
+        UsefulStuff.RegexThingsThatAreNotNumbersOrLettersOrUnderscores.Replace(masterTicket, "");
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Ticketing/TicketingSystemFactory.cs b/Rdmp.Core/Ticketing/TicketingSystemFactory.cs
index 3fd3ac1958..5930ab9a9e 100644
--- a/Rdmp.Core/Ticketing/TicketingSystemFactory.cs
+++ b/Rdmp.Core/Ticketing/TicketingSystemFactory.cs
@@ -25,18 +25,16 @@ public TicketingSystemFactory(ICatalogueRepository repository)
         _repository = repository;
     }
 
-    public Type[] GetAllKnownTicketingSystems()
-    {
-        return _repository.MEF.GetTypes<ITicketingSystem>().ToArray();
-    }
+    public Type[] GetAllKnownTicketingSystems() => _repository.MEF.GetTypes<ITicketingSystem>().ToArray();
 
     //public ITicketingSystem Create(string )
     public ITicketingSystem Create(string typeName, string url, IDataAccessCredentials credentials)
     {
-        if(string.IsNullOrWhiteSpace(typeName))
+        if (string.IsNullOrWhiteSpace(typeName))
             throw new NullReferenceException("Type name was blank, cannot create ITicketingSystem");
 
-        return _repository.MEF.CreateA<ITicketingSystem>(typeName, new TicketingSystemConstructorParameters(url, credentials));
+        return _repository.MEF.CreateA<ITicketingSystem>(typeName,
+            new TicketingSystemConstructorParameters(url, credentials));
     }
 
     public ITicketingSystem CreateIfExists(TicketingSystemConfiguration ticketingSystemConfiguration)
@@ -50,11 +48,12 @@ public ITicketingSystem CreateIfExists(TicketingSystemConfiguration ticketingSys
             return null;
 
         IDataAccessCredentials creds = null;
-            
+
         //if there are credentials create with those (otherwise create with null credentials)
-        if(ticketingSystemConfiguration.DataAccessCredentials_ID != null)
-            creds = _repository.GetObjectByID<DataAccessCredentials>((int)ticketingSystemConfiguration.DataAccessCredentials_ID);
-            
+        if (ticketingSystemConfiguration.DataAccessCredentials_ID != null)
+            creds = _repository.GetObjectByID<DataAccessCredentials>((int)ticketingSystemConfiguration
+                .DataAccessCredentials_ID);
+
         return Create(ticketingSystemConfiguration.Type, ticketingSystemConfiguration.Url, creds);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/IConstraint.cs b/Rdmp.Core/Validation/Constraints/IConstraint.cs
index 5356e8d7aa..847f459079 100644
--- a/Rdmp.Core/Validation/Constraints/IConstraint.cs
+++ b/Rdmp.Core/Validation/Constraints/IConstraint.cs
@@ -15,7 +15,7 @@ public interface IConstraint
     /// The consequences of the rule being broken
     /// </summary>
     Consequence? Consequence { get; set; }
-       
+
     /// <summary>
     /// Updates the state / persistence of the <see cref="IConstraint"/> to reflect that it's currently
     /// referencing column (<paramref name="originalName"/>) has been renamed (<paramref name="newName"/>)
diff --git a/Rdmp.Core/Validation/Constraints/Primary/Alpha.cs b/Rdmp.Core/Validation/Constraints/Primary/Alpha.cs
index 334c2f8908..f460f18522 100644
--- a/Rdmp.Core/Validation/Constraints/Primary/Alpha.cs
+++ b/Rdmp.Core/Validation/Constraints/Primary/Alpha.cs
@@ -25,21 +25,15 @@ public override ValidationFailure Validate(object value)
         var match = Regex.Match(text, RegExp);
 
         if (!match.Success)
-        {
-            return new ValidationFailure($"Value [{value}] contains characters other than alphabetic",this);
-        }
+            return new ValidationFailure($"Value [{value}] contains characters other than alphabetic", this);
 
         return null;
     }
 
     public override void RenameColumn(string originalName, string newName)
     {
-            
-    }
-
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return $"Checks to see if input strings contain nothing but characters by using pattern {RegExp}";
     }
 
+    public override string GetHumanReadableDescriptionOfValidation() =>
+        $"Checks to see if input strings contain nothing but characters by using pattern {RegExp}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Primary/AlphaNumeric.cs b/Rdmp.Core/Validation/Constraints/Primary/AlphaNumeric.cs
index b35d76b49a..0694533217 100644
--- a/Rdmp.Core/Validation/Constraints/Primary/AlphaNumeric.cs
+++ b/Rdmp.Core/Validation/Constraints/Primary/AlphaNumeric.cs
@@ -14,7 +14,7 @@ namespace Rdmp.Core.Validation.Constraints.Primary;
 public class AlphaNumeric : PrimaryConstraint
 {
     public const string RegExp = @"^[A-Za-z0-9]([A-Za-z0-9]*)$";
-        
+
     public override ValidationFailure Validate(object value)
     {
         if (value == null)
@@ -24,19 +24,15 @@ public override ValidationFailure Validate(object value)
         var match = Regex.Match(text, RegExp);
 
         if (!match.Success)
-            return new ValidationFailure($"Value [{value}] contains characters other than alphanumeric",this);
+            return new ValidationFailure($"Value [{value}] contains characters other than alphanumeric", this);
 
         return null;
     }
-        
+
     public override void RenameColumn(string originalName, string newName)
     {
-            
     }
 
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return
-            "Checks that values have 1 or more characters/numbers in a sequence with no spaces or other punctuation";
-    }
+    public override string GetHumanReadableDescriptionOfValidation() =>
+        "Checks that values have 1 or more characters/numbers in a sequence with no spaces or other punctuation";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Primary/Chi.cs b/Rdmp.Core/Validation/Constraints/Primary/Chi.cs
index fada58886b..95a468f359 100644
--- a/Rdmp.Core/Validation/Constraints/Primary/Chi.cs
+++ b/Rdmp.Core/Validation/Constraints/Primary/Chi.cs
@@ -21,27 +21,23 @@ public override ValidationFailure Validate(object value)
             return null;
 
 
-        if(value is not string valueAsString)
+        if (value is not string valueAsString)
             return new ValidationFailure(
-                $"Incompatible type, CHIs must be strings, value passed was of type {value.GetType().Name}",this);
+                $"Incompatible type, CHIs must be strings, value passed was of type {value.GetType().Name}", this);
 
         if (!IsValidChi(valueAsString, out var reason))
-            return new ValidationFailure(reason,this);
-           
+            return new ValidationFailure(reason, this);
+
         return null;
     }
 
 
     public override void RenameColumn(string originalName, string newName)
     {
-            
     }
 
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return
-            "Checks that the input value is 10 characters long and the first 6 characters are a valid date and that the final digit checksum matches";
-    }
+    public override string GetHumanReadableDescriptionOfValidation() =>
+        "Checks that the input value is 10 characters long and the first 6 characters are a valid date and that the final digit checksum matches";
 
     public static bool IsValidChi(string columnValueAsString, out string reason)
     {
@@ -56,7 +52,7 @@ public static bool IsValidChi(string columnValueAsString, out string reason)
         var yy = columnValueAsString.Substring(4, 2);
 
         //maybe tryparse instead
-        if (DateTime.TryParse($"{dd}/{mm}/{yy}", out DateTime outDt) == false)
+        if (DateTime.TryParse($"{dd}/{mm}/{yy}", out var outDt) == false)
         {
             reason = "First 6 numbers of CHI did not constitute a valid date";
             return false;
@@ -71,7 +67,6 @@ public static bool IsValidChi(string columnValueAsString, out string reason)
 
         reason = null;
         return true;
-
     }
 
     /// <summary>
@@ -96,7 +91,6 @@ private static string GetCHICheckDigit(string sCHI)
         if (c == 11) c = 0;
 
         return ((char)(c + '0')).ToString();
-
     }
 
     /// <summary>
@@ -106,8 +100,7 @@ private static string GetCHICheckDigit(string sCHI)
     /// <returns>1 for male and 0 for female</returns>
     public static int GetSex(string chi)
     {
-
-        if (!IsValidChiNumber(chi, out string errorReport))
+        if (!IsValidChiNumber(chi, out var errorReport))
             throw new ArgumentException("Invalid CHI");
 
         var sexChar = chi[8];
@@ -162,10 +155,7 @@ private static int SumDigits(string chi)
     {
         var sum = 0;
         var factor = 10;
-        for (var i = 0; i < 9; i++)
-        {
-            sum += (chi[i] - 48) * factor--;
-        }
+        for (var i = 0; i < 9; i++) sum += (chi[i] - 48) * factor--;
 
         return sum;
     }
diff --git a/Rdmp.Core/Validation/Constraints/Primary/Date.cs b/Rdmp.Core/Validation/Constraints/Primary/Date.cs
index c6b03c1fab..f068310302 100644
--- a/Rdmp.Core/Validation/Constraints/Primary/Date.cs
+++ b/Rdmp.Core/Validation/Constraints/Primary/Date.cs
@@ -44,11 +44,11 @@ public override ValidationFailure Validate(object value)
             DateTime.Parse(s, _ukCulture.DateTimeFormat);
 
             if (NotAFullySpecifiedDate(s))
-                return new ValidationFailure("Partial dates not allowed.",this);
+                return new ValidationFailure("Partial dates not allowed.", this);
         }
         catch (FormatException ex)
         {
-            return new ValidationFailure(ex.Message,this);
+            return new ValidationFailure(ex.Message, this);
         }
 
         return null;
@@ -63,13 +63,10 @@ private static bool NotAFullySpecifiedDate(string s)
 
     public override void RenameColumn(string originalName, string newName)
     {
-
     }
 
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return "Checks that the data type is DateTime or a string which can be parsed into a valid DateTime";
-    }
+    public override string GetHumanReadableDescriptionOfValidation() =>
+        "Checks that the data type is DateTime or a string which can be parsed into a valid DateTime";
 
     [GeneratedRegex("^(\\d{1,2})(\\.|/|-)(\\d{1,2})(\\.|/|-)(\\d{2}(\\d{2})?)$")]
     private static partial Regex DateRegex();
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Bound.cs b/Rdmp.Core/Validation/Constraints/Secondary/Bound.cs
index d1f5af4294..622678a1ac 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Bound.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Bound.cs
@@ -16,17 +16,20 @@ namespace Rdmp.Core.Validation.Constraints.Secondary;
 /// </summary>
 public abstract class Bound : SecondaryConstraint
 {
-    [Description("Optional, requires that the value being validated is HIGHER than the value stored in the referenced column (where values are present in both columns)")]
+    [Description(
+        "Optional, requires that the value being validated is HIGHER than the value stored in the referenced column (where values are present in both columns)")]
     [ExpectsColumnNameAsInput]
     public string LowerFieldName { get; set; }
 
-    [Description("Optional, requires that the value being validated is LOWER than the value stored in the referenced column (where values are present in both columns)")]
+    [Description(
+        "Optional, requires that the value being validated is LOWER than the value stored in the referenced column (where values are present in both columns)")]
     [ExpectsColumnNameAsInput]
     public string UpperFieldName { get; set; }
 
-    [Description("When ticked allows values that are EXACTLY THE SAME AS either the Upper or Lower boundary (including field boundaries) to pass validation")]
+    [Description(
+        "When ticked allows values that are EXACTLY THE SAME AS either the Upper or Lower boundary (including field boundaries) to pass validation")]
     public bool Inclusive { get; set; }
-        
+
 
     protected static object LookupFieldNamed(string name, object[] otherColumns, object[] otherColumnNames)
     {
@@ -45,7 +48,6 @@ private static void SignalThatFieldWasNotFound(string name)
         throw new MissingFieldException($"Validation failed: Comparator field [{name}] not found in dictionary.");
     }
 
-        
 
     public override void RenameColumn(string originalName, string newName)
     {
@@ -62,13 +64,13 @@ public override string GetHumanReadableDescriptionOfValidation()
     {
         var result = "";
 
-        if (LowerFieldName != null )
-            if(Inclusive)
+        if (LowerFieldName != null)
+            if (Inclusive)
                 result += $" >={LowerFieldName}";
             else
                 result += $" >{LowerFieldName}";
-            
-        if (UpperFieldName != null )
+
+        if (UpperFieldName != null)
             if (Inclusive)
                 result += $" <={UpperFieldName}";
             else
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/BoundDate.cs b/Rdmp.Core/Validation/Constraints/Secondary/BoundDate.cs
index bc828291ba..d162e92207 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/BoundDate.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/BoundDate.cs
@@ -18,6 +18,7 @@ public class BoundDate : Bound
 {
     [Description("Optional, Requires the value being validated to be AFTER this date")]
     public DateTime? Lower { get; set; }
+
     [Description("Optional, Requires the value being validated to be BEFORE this date")]
     public DateTime? Upper { get; set; }
 
@@ -28,7 +29,7 @@ public BoundDate()
 
     public override ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames)
     {
-        if(value == null)
+        if (value == null)
             return null;
 
         if (value is string s)
@@ -42,10 +43,10 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
         var d = (DateTime)value;
 
         if (value != null && !IsWithinRange(d))
-            return new ValidationFailure(CreateViolationReportUsingDates(d),this);
-            
-        if (value != null && !IsWithinRange(d,otherColumns, otherColumnNames))
-            return new ValidationFailure(CreateViolationReportUsingFieldNames(d),this);
+            return new ValidationFailure(CreateViolationReportUsingDates(d), this);
+
+        if (value != null && !IsWithinRange(d, otherColumns, otherColumnNames))
+            return new ValidationFailure(CreateViolationReportUsingFieldNames(d), this);
 
         return null;
     }
@@ -116,11 +117,12 @@ private bool IsWithinRange(DateTime d, object[] otherColumns, string[] otherColu
             {
                 lookupFieldNamed = DateTime.Parse(named);
             }
-            catch (InvalidCastException )
+            catch (InvalidCastException)
             {
-                return null; //it's not our responsibility to look for malformed dates in this constraint (leave that to primary constraint date)
+                return
+                    null; //it's not our responsibility to look for malformed dates in this constraint (leave that to primary constraint date)
             }
-            catch (FormatException )
+            catch (FormatException)
             {
                 return null;
             }
@@ -139,7 +141,7 @@ private string CreateViolationReportUsingDates(DateTime d)
         if (Lower != null)
             return GreaterThanMessage(d, Lower.ToString());
 
-        if (Upper!= null)
+        if (Upper != null)
             return LessThanMessage(d, Upper.ToString());
 
         throw new InvalidOperationException("Illegal state.");
@@ -159,40 +161,28 @@ private string CreateViolationReportUsingFieldNames(DateTime d)
         throw new InvalidOperationException("Illegal state.");
     }
 
-    private string BetweenMessage(DateTime d, string l, string u)
-    {
-        return
-            $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date between {Wrap(l)} and {Wrap(u)}{(Inclusive ? " inclusively" : " exclusively")}.";
-    }
+    private string BetweenMessage(DateTime d, string l, string u) =>
+        $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date between {Wrap(l)} and {Wrap(u)}{(Inclusive ? " inclusively" : " exclusively")}.";
 
-    private static string GreaterThanMessage(DateTime d, string s)
-    {
-        return
-            $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date greater than {Wrap(s)}.";
-    }
+    private static string GreaterThanMessage(DateTime d, string s) =>
+        $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date greater than {Wrap(s)}.";
 
-    private static string LessThanMessage(DateTime d, string s)
-    {
-        return
-            $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date less than {Wrap(s)}.";
-    }
+    private static string LessThanMessage(DateTime d, string s) =>
+        $"Date {Wrap(d.ToString(CultureInfo.InvariantCulture))} out of range. Expected a date less than {Wrap(s)}.";
 
-    private static string Wrap(string s)
-    {
-        return $"[{s}]";
-    }
+    private static string Wrap(string s) => $"[{s}]";
 
     public override string GetHumanReadableDescriptionOfValidation()
     {
         var result = "Checks that a date is within a given set of bounds.  This field is currently configured to be ";
-            
-        if (Lower != null )
-            if(Inclusive)
+
+        if (Lower != null)
+            if (Inclusive)
                 result += $" >={Lower}";
             else
                 result += $" >{Lower}";
-            
-        if(Upper != null)
+
+        if (Upper != null)
             if (Inclusive)
                 result += $" <={Upper}";
             else
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/BoundDouble.cs b/Rdmp.Core/Validation/Constraints/Secondary/BoundDouble.cs
index 55a9c847aa..df20c0618d 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/BoundDouble.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/BoundDouble.cs
@@ -13,7 +13,7 @@ namespace Rdmp.Core.Validation.Constraints.Secondary;
 /// Values (if present) in a column must be within a certain range of numeric values.  This can include referencing another column.  For example you could
 /// specify that the column 'AverageResult' must have an Inclusive Upper bound of the column 'MaxResult'.
 /// </summary>
-public class BoundDouble :  Bound
+public class BoundDouble : Bound
 {
     [Description("Optional, Requires the value being validated to be HIGHER than this number")]
     public double? Lower { get; set; }
@@ -29,7 +29,7 @@ public BoundDouble()
     public override ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames)
     {
         //nulls are fine
-        if(value == null)
+        if (value == null)
             return null;
 
         //nulls are also fine if we are passed blanks
@@ -44,13 +44,13 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
         }
         catch (FormatException)
         {
-            return new ValidationFailure("Invalid format for double ",this);
+            return new ValidationFailure("Invalid format for double ", this);
         }
 
 
         if (Lower.HasValue || Upper.HasValue)
             if (value != null && !IsWithinRange(v))
-                return new ValidationFailure(CreateViolationReportUsingValues(v),this);
+                return new ValidationFailure(CreateViolationReportUsingValues(v), this);
 
         if (value != null && !IsWithinRange(v, otherColumns, otherColumnNames))
             return new ValidationFailure(CreateViolationReportUsingFieldNames(v), this);
@@ -139,26 +139,16 @@ private string CreateViolationReportUsingFieldNames(double d)
         throw new InvalidOperationException("Illegal state.");
     }
 
-    private string BetweenMessage(double d, string l, string u)
-    {
-        return
-            $"Value {Wrap(d.ToString())} out of range. Expected a value between {Wrap(l)} and {Wrap(u)}{(Inclusive ? " inclusively" : " exclusively")}.";
-    }
+    private string BetweenMessage(double d, string l, string u) =>
+        $"Value {Wrap(d.ToString())} out of range. Expected a value between {Wrap(l)} and {Wrap(u)}{(Inclusive ? " inclusively" : " exclusively")}.";
 
-    private static string GreaterThanMessage(double d, string s)
-    {
-        return $"Value {Wrap(d.ToString())} out of range. Expected a value greater than {Wrap(s)}.";
-    }
+    private static string GreaterThanMessage(double d, string s) =>
+        $"Value {Wrap(d.ToString())} out of range. Expected a value greater than {Wrap(s)}.";
 
-    private static string LessThanMessage(double d, string s)
-    {
-        return $"Value {Wrap(d.ToString())} out of range. Expected a value less than {Wrap(s)}.";
-    }
+    private static string LessThanMessage(double d, string s) =>
+        $"Value {Wrap(d.ToString())} out of range. Expected a value less than {Wrap(s)}.";
 
-    private static string Wrap(string s)
-    {
-        return $"[{s}]";
-    }
+    private static string Wrap(string s) => $"[{s}]";
 
     public BoundDouble And(int upper)
     {
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/NotNull.cs b/Rdmp.Core/Validation/Constraints/Secondary/NotNull.cs
index 4de0fdb98b..269520b1bc 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/NotNull.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/NotNull.cs
@@ -18,22 +18,17 @@ public class NotNull : SecondaryConstraint
     public override ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames)
     {
         if (value == null || value == DBNull.Value)
-            return new ValidationFailure("Value cannot be null",this);
+            return new ValidationFailure("Value cannot be null", this);
 
         if (value is string && string.IsNullOrWhiteSpace(value.ToString()))
             return new ValidationFailure("Value cannot be whitespace only", this);
 
         return null;
     }
-        
-    public override void RenameColumn(string originalName, string newName)
-    {
-            
-    }
 
-    public override string GetHumanReadableDescriptionOfValidation()
+    public override void RenameColumn(string originalName, string newName)
     {
-        return "not null";
     }
 
+    public override string GetHumanReadableDescriptionOfValidation() => "not null";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ChiSexPredictor.cs b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ChiSexPredictor.cs
index c14d709c9e..038055092d 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ChiSexPredictor.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ChiSexPredictor.cs
@@ -15,17 +15,16 @@ namespace Rdmp.Core.Validation.Constraints.Secondary.Predictor;
 /// </summary>
 public class ChiSexPredictor : PredictionRule
 {
-    public override ValidationFailure Predict(IConstraint parent,object oChi, object oGender)
+    public override ValidationFailure Predict(IConstraint parent, object oChi, object oGender)
     {
-        if(oChi == null || oGender == null) // Null is valid
+        if (oChi == null || oGender == null) // Null is valid
             return null;
 
         char sex;
 
         if (oGender is string s)
             sex = s.ToCharArray()[0];
-        else
-        if (oGender is char gender)
+        else if (oGender is char gender)
             sex = gender;
         else
             throw new ArgumentException($"Gender must be a string or char, gender value is a {oGender.GetType()}");
@@ -39,7 +38,9 @@ public override ValidationFailure Predict(IConstraint parent,object oChi, object
 
             var isvalid = true;
 
-            if (sex.ToString(CultureInfo.InvariantCulture).ToUpper() != "M" && sex.ToString(CultureInfo.InvariantCulture).ToUpper() != "F") // Pass as valid if sex is not strictly specified
+            if (sex.ToString(CultureInfo.InvariantCulture).ToUpper() != "M" &&
+                sex.ToString(CultureInfo.InvariantCulture).ToUpper() !=
+                "F") // Pass as valid if sex is not strictly specified
                 return null;
 
             if (sexDigit % 2 == 0 && sex == 'M')
@@ -50,7 +51,7 @@ public override ValidationFailure Predict(IConstraint parent,object oChi, object
 
             if (!isvalid)
                 return new ValidationFailure(
-                    $"CHI sex indicator ({sexDigit})  did not match associated sex field ({sex})",parent);
+                    $"CHI sex indicator ({sexDigit})  did not match associated sex field ({sex})", parent);
         }
 
         //invalid chi, who cares
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PluginPredictionRule.cs b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PluginPredictionRule.cs
index 09d6480cee..11b576831a 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PluginPredictionRule.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PluginPredictionRule.cs
@@ -10,6 +10,6 @@ namespace Rdmp.Core.Validation.Constraints.Secondary.Predictor;
 /// <summary>
 /// Abstract base for plugin developers to write new <see cref="PredictionRule"/> for the data quality engine
 /// </summary>
-public abstract class PluginPredictionRule:PredictionRule
+public abstract class PluginPredictionRule : PredictionRule
 {
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/Prediction.cs b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/Prediction.cs
index b1dbfdc9de..dd34dfe9ca 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/Prediction.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/Prediction.cs
@@ -19,20 +19,20 @@ public class Prediction : SecondaryConstraint
     [Description("The current value enforces a prediction about the value of this other field")]
     [ExpectsColumnNameAsInput]
     public string TargetColumn { get; set; }
-        
-    [Description("The prediction rule that takes as input the current value and uses it to check the target column matches expectations")]
+
+    [Description(
+        "The prediction rule that takes as input the current value and uses it to check the target column matches expectations")]
     public PredictionRule Rule { get; set; }
 
     //blank constructor required for XMLSerialization
     public Prediction()
     {
-            
     }
 
     public Prediction(PredictionRule rule, string targetColumn)
     {
-        if(rule == null)
-            throw new ArgumentException("You must specify a PredictionRule to follow",nameof(rule));
+        if (rule == null)
+            throw new ArgumentException("You must specify a PredictionRule to follow", nameof(rule));
 
         Rule = rule;
         TargetColumn = targetColumn;
@@ -40,32 +40,31 @@ public Prediction(PredictionRule rule, string targetColumn)
 
     public override ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames)
     {
-        if(Rule == null )
+        if (Rule == null)
             throw new InvalidOperationException("PredictionRule has not been set yet");
 
-        if(TargetColumn == null)
+        if (TargetColumn == null)
             throw new InvalidOperationException("TargetColumn has not been set yet");
 
-        if(OtherFieldInfoIsNotProvided(otherColumns, otherColumnNames))
+        if (OtherFieldInfoIsNotProvided(otherColumns, otherColumnNames))
             throw new ArgumentException("Could not make prediction because no other fields were passed");
 
         if (otherColumns.Length != otherColumnNames.Length)
-            throw new Exception("Could not make prediction because of mismatch between column values and column names array sizes");
+            throw new Exception(
+                "Could not make prediction because of mismatch between column values and column names array sizes");
 
-        var i = Array.IndexOf(otherColumnNames,TargetColumn);
+        var i = Array.IndexOf(otherColumnNames, TargetColumn);
 
         if (i == -1)
             throw new MissingFieldException(
                 $"Could not find TargetColumn '{TargetColumn}' for Prediction validation constraint.  Supplied column name collection was:({string.Join(",", otherColumnNames)})");
 
-        return Rule.Predict(this,value,otherColumns[i]);
+        return Rule.Predict(this, value, otherColumns[i]);
     }
 
 
-    private static bool OtherFieldInfoIsNotProvided(object[] otherColumns, string[] otherColumnNames)
-    {
-        return otherColumns == null || otherColumns.Length < 1 || otherColumnNames == null || otherColumnNames.Length < 1;
-    }
+    private static bool OtherFieldInfoIsNotProvided(object[] otherColumns, string[] otherColumnNames) =>
+        otherColumns == null || otherColumns.Length < 1 || otherColumnNames == null || otherColumnNames.Length < 1;
 
 
     public override void RenameColumn(string originalName, string newName)
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PredictionRule.cs b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PredictionRule.cs
index 5ed1976a80..64a0c9dafc 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PredictionRule.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/PredictionRule.cs
@@ -19,5 +19,5 @@ public abstract class PredictionRule
     /// <param name="value">The value upon which to make a prediction</param>
     /// <param name="targetValue">The value that should match the prediction</param>
     /// <returns>null if the predicted value matches the <paramref name="targetValue"/> otherwise a <see cref="ValidationFailure"/></returns>
-    public abstract ValidationFailure Predict(IConstraint parent,object value, object targetValue);
+    public abstract ValidationFailure Predict(IConstraint parent, object value, object targetValue);
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ValuePredictsOtherValueNullness.cs b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ValuePredictsOtherValueNullness.cs
index 1f6c46dadb..002432e4d8 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ValuePredictsOtherValueNullness.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/Predictor/ValuePredictsOtherValueNullness.cs
@@ -13,9 +13,10 @@ public class ValuePredictsOtherValueNullness : PredictionRule
 {
     public override ValidationFailure Predict(IConstraint parent, object value, object targetValue)
     {
-        if(value == null != (targetValue == null))
+        if (value == null != (targetValue == null))
             return new ValidationFailure(
-                $"Nullness did not match, when one value is null, the other must be null.  When one value has a value the other must also have a value.  Nullness of ConstrainedColumn:{value == null}. Nullness of TargetColumn:{targetValue == null}",parent);
+                $"Nullness did not match, when one value is null, the other must be null.  When one value has a value the other must also have a value.  Nullness of ConstrainedColumn:{value == null}. Nullness of TargetColumn:{targetValue == null}",
+                parent);
 
         return null;
     }
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/ReferentialIntegrityConstraint.cs b/Rdmp.Core/Validation/Constraints/Secondary/ReferentialIntegrityConstraint.cs
index f7b9018beb..5d58685442 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/ReferentialIntegrityConstraint.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/ReferentialIntegrityConstraint.cs
@@ -30,7 +30,7 @@ public class ReferentialIntegrityConstraint : SecondaryConstraint, ICheckable
     [Description("When ticked, the current value MUST NOT appear in the OtherColumnInfo")]
     public bool InvertLogic { get; set; }
 
-    private int _otherColumnInfoID ;
+    private int _otherColumnInfoID;
 
     //this is the only value that actually needs to be serialized!
     [HideOnValidationUI]
@@ -41,12 +41,13 @@ public int OtherColumnInfoID
         {
             _otherColumnInfoID = value;
 
-            if(value >0)
+            if (value > 0)
                 OtherColumnInfo = _repository.GetObjectByID<ColumnInfo>(value);
         }
     }
 
-    [Description("The current value MUST appear in the SET OF ALL VALUES stored in the this column.  The ColumnInfo you choose does not have to be stored on the same server/database as your dataset")]
+    [Description(
+        "The current value MUST appear in the SET OF ALL VALUES stored in the this column.  The ColumnInfo you choose does not have to be stored on the same server/database as your dataset")]
     [XmlIgnore]
     public ColumnInfo OtherColumnInfo
     {
@@ -66,7 +67,8 @@ public ColumnInfo OtherColumnInfo
     public ReferentialIntegrityConstraint()
     {
         if (Validator.LocatorForXMLDeserialization == null)
-            throw new Exception("Cannot deserialize/construct this class because the static LocatorForXMLDeserialization field has not been set");
+            throw new Exception(
+                "Cannot deserialize/construct this class because the static LocatorForXMLDeserialization field has not been set");
 
         _repository = Validator.LocatorForXMLDeserialization.CatalogueRepository;
     }
@@ -82,7 +84,6 @@ public ReferentialIntegrityConstraint(IRepository repository)
 
     public override void RenameColumn(string originalName, string newName)
     {
-
     }
 
     public override string GetHumanReadableDescriptionOfValidation()
@@ -123,12 +124,13 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
 
         //it is in the hashset
         if (contained)
-            if(!InvertLogic)//the logic is not inverted (expected behaviour)
+            if (!InvertLogic) //the logic is not inverted (expected behaviour)
                 return null;
             else
                 //the logic is inverted!
                 return new ValidationFailure(
-                    $"Value '{value}' was found in row and also in the column {OtherColumnInfo} (InvertLogic was set to true meaning that OtherColumnInfo is an exclusion list)", this);
+                    $"Value '{value}' was found in row and also in the column {OtherColumnInfo} (InvertLogic was set to true meaning that OtherColumnInfo is an exclusion list)",
+                    this);
 
         //it was not contained in the hashset
 
@@ -139,11 +141,11 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
         //it is not contained and we have not inverted the logic so this is a validation failure, the value was not found in the referential integrity column OtherColumnInfo
         return
             new ValidationFailure(
-                $"Value '{value}' was found in row but not in corresponding referential integrity column {OtherColumnInfo}", this);
+                $"Value '{value}' was found in row but not in corresponding referential integrity column {OtherColumnInfo}",
+                this);
     }
 
 
-
     public void Check(ICheckNotifier checker)
     {
         if (OtherColumnInfo == null)
@@ -169,7 +171,6 @@ public void Check(ICheckNotifier checker)
                     cmd.CommandTimeout = 5;
                     itemToValidate = cmd.ExecuteScalar();
                 }
-
             }
             catch (Exception e)
             {
@@ -186,7 +187,8 @@ public void Check(ICheckNotifier checker)
 
         if (itemToValidate == null)
         {
-            checker.OnCheckPerformed(new CheckEventArgs($"No validation items were found in {OtherColumnInfo}", CheckResult.Fail));
+            checker.OnCheckPerformed(new CheckEventArgs($"No validation items were found in {OtherColumnInfo}",
+                CheckResult.Fail));
             return;
         }
 
@@ -206,8 +208,9 @@ public void Check(ICheckNotifier checker)
     /// </summary>
     private void GetUniqueValues()
     {
-        if(OtherColumnInfo == null)
-            throw new NotSupportedException("No ColumnInfo has been selected yet! unable to populate constraint HashSet");
+        if (OtherColumnInfo == null)
+            throw new NotSupportedException(
+                "No ColumnInfo has been selected yet! unable to populate constraint HashSet");
 
 
         //Get the values off the server
@@ -221,7 +224,7 @@ private void GetUniqueValues()
             try
             {
                 //send the select
-                using(var cmd = DatabaseCommandHelper.GetCommand(sqlToFetchValues, con))
+                using (var cmd = DatabaseCommandHelper.GetCommand(sqlToFetchValues, con))
                 using (var reader = cmd.ExecuteReader())
                 {
                     var runtimeName = OtherColumnInfo.GetRuntimeName();
@@ -230,29 +233,26 @@ private void GetUniqueValues()
                     while (reader.Read())
                     {
                         var obj = reader[runtimeName];
-                        if(obj != null && obj != DBNull.Value)
+                        if (obj != null && obj != DBNull.Value)
                         {
                             var strValue = obj.ToString();
-                            if(!string.IsNullOrWhiteSpace(strValue))
+                            if (!string.IsNullOrWhiteSpace(strValue))
                                 _uniqueValues.Add(strValue);
                         }
                     }
                 }
-
             }
             catch (Exception e)
             {
                 throw new Exception(
-                    $"Failed to execute SQL '{sqlToFetchValues}' under context {DataAccessContext.InternalDataProcessing}",e);
+                    $"Failed to execute SQL '{sqlToFetchValues}' under context {DataAccessContext.InternalDataProcessing}",
+                    e);
             }
         }
-
     }
 
-    private static DbConnection GetConnectionToOtherTable(IDataAccessPoint tableInfo)
-    {
-        return DataAccessPortal
+    private static DbConnection GetConnectionToOtherTable(IDataAccessPoint tableInfo) =>
+        DataAccessPortal
             .ExpectServer(tableInfo, DataAccessContext.InternalDataProcessing)
             .GetConnection();
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/RegularExpression.cs b/Rdmp.Core/Validation/Constraints/Secondary/RegularExpression.cs
index 262e57a4b0..a8196fa224 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/RegularExpression.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/RegularExpression.cs
@@ -17,7 +17,7 @@ namespace Rdmp.Core.Validation.Constraints.Secondary;
 public class RegularExpression : SecondaryConstraint
 {
     private string _pattern;
-        
+
     public RegularExpression()
     {
         // Required for serialisation. 
@@ -28,7 +28,8 @@ public RegularExpression(string pattern)
         _pattern = pattern;
     }
 
-    [Description("The Regular Expression pattern that MUST match the value being validated.  If you find yourself copy pasting the same Pattern all over the place you should instead consider a StandardRegexConstraint")]
+    [Description(
+        "The Regular Expression pattern that MUST match the value being validated.  If you find yourself copy pasting the same Pattern all over the place you should instead consider a StandardRegexConstraint")]
     [ExpectsLotsOfText]
     public string Pattern
     {
@@ -38,7 +39,7 @@ public string Pattern
             //throws if you pass an invalid pattern
             new Regex(value);
 
-                
+
             _pattern = value;
         }
     }
@@ -55,19 +56,15 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
         var text = (string)value;
         var match = Regex.Match(text, _pattern);
 
-        if (!match.Success) 
-            return new ValidationFailure($"Failed to match text [{value}] to regular expression /{_pattern}/",this);
+        if (!match.Success)
+            return new ValidationFailure($"Failed to match text [{value}] to regular expression /{_pattern}/", this);
 
         return null;
     }
 
     public override void RenameColumn(string originalName, string newName)
     {
-            
     }
 
-    public override string GetHumanReadableDescriptionOfValidation()
-    {
-        return $"Matches regex {Pattern}";
-    }
+    public override string GetHumanReadableDescriptionOfValidation() => $"Matches regex {Pattern}";
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/SecondaryConstraint.cs b/Rdmp.Core/Validation/Constraints/Secondary/SecondaryConstraint.cs
index 12516d63d0..c9c48956b3 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/SecondaryConstraint.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/SecondaryConstraint.cs
@@ -21,5 +21,4 @@ public abstract class SecondaryConstraint : ISecondaryConstraint
     public abstract void RenameColumn(string originalName, string newName);
     public abstract string GetHumanReadableDescriptionOfValidation();
     public abstract ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames);
-        
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Constraints/Secondary/StandardRegexConstraint.cs b/Rdmp.Core/Validation/Constraints/Secondary/StandardRegexConstraint.cs
index 845e707f55..a859321697 100644
--- a/Rdmp.Core/Validation/Constraints/Secondary/StandardRegexConstraint.cs
+++ b/Rdmp.Core/Validation/Constraints/Secondary/StandardRegexConstraint.cs
@@ -52,7 +52,8 @@ public int StandardRegexID
         }
     }
 
-    [Description("The Regular Expression pattern that MUST match the value being validated.  This is a centralised definition of a Concept stored in the Catalogue (Click the RegEx button to edit these)")]
+    [Description(
+        "The Regular Expression pattern that MUST match the value being validated.  This is a centralised definition of a Concept stored in the Catalogue (Click the RegEx button to edit these)")]
     [XmlIgnore]
     public StandardRegex CatalogueStandardRegex
     {
@@ -70,14 +71,13 @@ public StandardRegex CatalogueStandardRegex
             _regex = new Regex(value.Regex);
 
             //check is not redundant because assigning the field has repercusions and would result in circular reference! (Blame XMLSerialization for this cluster F*)
-            if(StandardRegexID != value.ID)
+            if (StandardRegexID != value.ID)
                 StandardRegexID = value.ID;
         }
     }
 
     public override void RenameColumn(string originalName, string newName)
     {
-
     }
 
     public override string GetHumanReadableDescriptionOfValidation()
@@ -86,7 +86,8 @@ public override string GetHumanReadableDescriptionOfValidation()
             return
                 $"Checks that the value conforms to the agency specific StandardRegex concept '{CatalogueStandardRegex.ConceptName}' defined in the Catalogue";
 
-        return "Checks that values match the supplied agency specific StandardRegex defined in the Catalogue for core concepts (e.g. Gender)";
+        return
+            "Checks that values match the supplied agency specific StandardRegex defined in the Catalogue for core concepts (e.g. Gender)";
     }
 
     public override ValidationFailure Validate(object value, object[] otherColumns, string[] otherColumnNames)
@@ -94,15 +95,14 @@ public override ValidationFailure Validate(object value, object[] otherColumns,
         if (value == null || value == DBNull.Value)
             return null;
 
-        if(string.IsNullOrWhiteSpace(value.ToString()))
+        if (string.IsNullOrWhiteSpace(value.ToString()))
             return null;
 
         if (_regex.IsMatch(value.ToString()))
             return null;
 
         return new ValidationFailure(
-            $"Value {value} did not match pattern for StandardRegex concept '{CatalogueStandardRegex.ConceptName}'", this);
-
+            $"Value {value} did not match pattern for StandardRegex concept '{CatalogueStandardRegex.ConceptName}'",
+            this);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Dependency/Exceptions/ValidationXmlDependencyException.cs b/Rdmp.Core/Validation/Dependency/Exceptions/ValidationXmlDependencyException.cs
index 2f716b75a7..15fb49b69c 100644
--- a/Rdmp.Core/Validation/Dependency/Exceptions/ValidationXmlDependencyException.cs
+++ b/Rdmp.Core/Validation/Dependency/Exceptions/ValidationXmlDependencyException.cs
@@ -13,8 +13,7 @@ namespace Rdmp.Core.Validation.Dependency.Exceptions;
 /// </summary>
 public class ValidationXmlDependencyException : Exception
 {
-    public ValidationXmlDependencyException(string s):base(s)
+    public ValidationXmlDependencyException(string s) : base(s)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Dependency/Suspect.cs b/Rdmp.Core/Validation/Dependency/Suspect.cs
index 98773a7b28..d31b295df6 100644
--- a/Rdmp.Core/Validation/Dependency/Suspect.cs
+++ b/Rdmp.Core/Validation/Dependency/Suspect.cs
@@ -16,7 +16,7 @@ namespace Rdmp.Core.Validation.Dependency;
 /// </summary>
 public class Suspect
 {
-    public string Pattern { get;private set; }
+    public string Pattern { get; private set; }
     public Type Type { get; private set; }
     public List<PropertyInfo> SuspectProperties = new();
     public List<FieldInfo> SuspectFields = new();
diff --git a/Rdmp.Core/Validation/Dependency/ValidationXMLObscureDependencyFinder.cs b/Rdmp.Core/Validation/Dependency/ValidationXMLObscureDependencyFinder.cs
index 33a77a9cbd..fd6d1e3dfb 100644
--- a/Rdmp.Core/Validation/Dependency/ValidationXMLObscureDependencyFinder.cs
+++ b/Rdmp.Core/Validation/Dependency/ValidationXMLObscureDependencyFinder.cs
@@ -22,7 +22,7 @@ namespace Rdmp.Core.Validation.Dependency;
 /// Prevents deleting objects which are referenced in the ValidatorXML of Catalogues.  This is done by processing the ValidatorXML as a string for speed
 /// rather than deserializing every ValidationXml.
 /// </summary>
-public class ValidationXMLObscureDependencyFinder:IObscureDependencyFinder
+public class ValidationXMLObscureDependencyFinder : IObscureDependencyFinder
 {
     /// <summary>
     /// This is a list of regex patterns for identifying xml serialized classes that implement IMapsDirectlyToDatabaseTable in Xml strings
@@ -35,14 +35,14 @@ public class ValidationXMLObscureDependencyFinder:IObscureDependencyFinder
     /// Catalogues whose ValidationXML doesn't resolve properly
     /// </summary>
     public List<Catalogue> CataloguesWithBrokenValidationXml = new();
+
     private readonly MEF _mef;
 
     public ValidationXMLObscureDependencyFinder(ICatalogueRepositoryServiceLocator catalogueRepositoryServiceLocator)
     {
         Validator.LocatorForXMLDeserialization ??= catalogueRepositoryServiceLocator;
-           
+
         _mef = catalogueRepositoryServiceLocator.CatalogueRepository.MEF;
-            
     }
 
     private bool initialized = false;
@@ -55,8 +55,10 @@ private void Initialize()
         foreach (var constraintType in _mef.GetAllTypes().Where(c => typeof(ISecondaryConstraint).IsAssignableFrom(c)))
         {
             //get all properties and fields which map to a database object
-            var props = constraintType.GetProperties().Where(p => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(p.PropertyType)).ToList();
-            var fields = constraintType.GetFields().Where(f => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(f.FieldType)).ToList();
+            var props = constraintType.GetProperties()
+                .Where(p => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(p.PropertyType)).ToList();
+            var fields = constraintType.GetFields()
+                .Where(f => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(f.FieldType)).ToList();
 
             //there are no suspect fields that could have hidden dependencies
             if (!props.Any() && !fields.Any())
@@ -80,22 +82,21 @@ private void Initialize()
             TheUsualSuspects.Add(new Suspect(pattern, constraintType, props, fields));
         }
     }
-        
+
     public void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
         //dependency can only be initialized if mef is setup
-        if(!initialized)
-            if(_mef == null)
+        if (!initialized)
+            if (_mef == null)
                 return;
             else
                 Initialize();
 
-        ThrowIfDeleteDisallowed(oTableWrapperObject,0);
+        ThrowIfDeleteDisallowed(oTableWrapperObject, 0);
     }
 
     public void HandleCascadeDeletesForDeletedObject(IMapsDirectlyToDatabaseTable oTableWrapperObject)
     {
-            
     }
 
     private void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperObject, int depth)
@@ -106,7 +107,7 @@ private void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperO
         var repository = oTableWrapperObject.Repository;
 
 
-        if (depth >= 5)//its fine
+        if (depth >= 5) //its fine
             return;
 
         if (oTableWrapperObject is IHasDependencies treeObject)
@@ -122,7 +123,7 @@ private void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperO
                 //couldn't get the dependants, we are mid delete operation so to be honest it's not super surprising if a dependency is unresolvable
                 dependants = null;
             }
-                
+
             //check for undeletable dependants
             if (dependants != null)
                 foreach (var child in dependants.OfType<IMapsDirectlyToDatabaseTable>())
@@ -138,7 +139,8 @@ private void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperO
         var firstPassSuspects = new HashSet<Catalogue>();
 
         //get all catalogues with some validation XML and see if the checker matches any of them
-        foreach (var catalogue in repository.GetAllObjects<Catalogue>().Where(c => !string.IsNullOrWhiteSpace(c.ValidatorXML)))
+        foreach (var catalogue in repository.GetAllObjects<Catalogue>()
+                     .Where(c => !string.IsNullOrWhiteSpace(c.ValidatorXML)))
             if (checkers.Any(checker => checker.IsMatch(catalogue.ValidatorXML)))
                 firstPassSuspects.Add(catalogue);
 
@@ -148,17 +150,19 @@ private void ThrowIfDeleteDisallowed(IMapsDirectlyToDatabaseTable oTableWrapperO
                     $"The ValidationXML of Catalogue {firstPassSuspect} contains a reference to the object you are trying to delete:{oTableWrapperObject}");
     }
 
-    private bool DeserializeToSeeIfThereIsADependency(IMapsDirectlyToDatabaseTable oTableWrapperObject, Catalogue firstPassSuspect)
+    private bool DeserializeToSeeIfThereIsADependency(IMapsDirectlyToDatabaseTable oTableWrapperObject,
+        Catalogue firstPassSuspect)
     {
         //we already forbidlisted this Catalogue because it has dodgy XML that cant be deserialized properly
         var forbidlisted = CataloguesWithBrokenValidationXml.SingleOrDefault(c => c.ID == firstPassSuspect.ID);
-            
+
         //it was forbidlisted because it had dodgy XML, if the xml hasn't changed it will still be broken so give up
-        if(forbidlisted != null)
-            if(forbidlisted.ValidatorXML.Equals(firstPassSuspect.ValidatorXML))
+        if (forbidlisted != null)
+            if (forbidlisted.ValidatorXML.Equals(firstPassSuspect.ValidatorXML))
                 return false;
             else
-                CataloguesWithBrokenValidationXml.Remove(firstPassSuspect);//they have changed the ValidatorXML so maybe it is ok again
+                CataloguesWithBrokenValidationXml
+                    .Remove(firstPassSuspect); //they have changed the ValidatorXML so maybe it is ok again
 
         //deserialize the catalogues validation XML
         Validator validator;
@@ -174,7 +178,8 @@ private bool DeserializeToSeeIfThereIsADependency(IMapsDirectlyToDatabaseTable o
         }
 
         //get all constraints
-        IEnumerable<ISecondaryConstraint> constraints = validator.ItemValidators.SelectMany(iv => iv.SecondaryConstraints);
+        IEnumerable<ISecondaryConstraint> constraints =
+            validator.ItemValidators.SelectMany(iv => iv.SecondaryConstraints);
 
         //get those that are associated with the usual suspects
         foreach (var constraint in constraints)
@@ -191,7 +196,6 @@ private bool DeserializeToSeeIfThereIsADependency(IMapsDirectlyToDatabaseTable o
             foreach (var f in suspect.SuspectFields)
                 if (oTableWrapperObject.Equals(f.GetValue(constraint)))
                     return true;
-
         }
 
         return false;
diff --git a/Rdmp.Core/Validation/ItemValidator.cs b/Rdmp.Core/Validation/ItemValidator.cs
index 7af93487f1..876f47df79 100644
--- a/Rdmp.Core/Validation/ItemValidator.cs
+++ b/Rdmp.Core/Validation/ItemValidator.cs
@@ -24,8 +24,7 @@ public class ItemValidator
     public PrimaryConstraint PrimaryConstraint { get; set; }
     public string TargetProperty { get; set; }
 
-    [XmlIgnore]
-    public Type ExpectedType { get; set; }
+    [XmlIgnore] public Type ExpectedType { get; set; }
 
     [XmlArray]
     [XmlArrayItem("SecondaryConstraint", typeof(SecondaryConstraint))]
@@ -42,12 +41,11 @@ public ItemValidator(string targetProperty)
         TargetProperty = targetProperty;
         PrimaryConstraint = null;
         SecondaryConstraints = new List<SecondaryConstraint>();
-
     }
 
     public ValidationFailure ValidateAll(object columnValue, object[] otherColumns, string[] otherColumnNames)
     {
-        if(otherColumns == null)
+        if (otherColumns == null)
             throw new Exception("we were not passed any otherColumns");
 
         if (otherColumns.Length != otherColumnNames.Length)
@@ -72,15 +70,16 @@ private ValidationFailure ValidatePrimaryConstraint(object columnValue)
         }
         catch (Exception ex)
         {
-            throw new Exception($"Error processing PrimaryConstraint validator of Type {PrimaryConstraint.GetType().Name} on column {TargetProperty}.  Value being validated was '{columnValue}'",ex);
+            throw new Exception(
+                $"Error processing PrimaryConstraint validator of Type {PrimaryConstraint.GetType().Name} on column {TargetProperty}.  Value being validated was '{columnValue}'",
+                ex);
         }
     }
 
-    private ValidationFailure ValidateSecondayConstraints(object columnValue, object[] otherColumns, string[] otherColumnNames)
+    private ValidationFailure ValidateSecondayConstraints(object columnValue, object[] otherColumns,
+        string[] otherColumnNames)
     {
         foreach (ISecondaryConstraint secondaryConstraint in SecondaryConstraints)
-        {
-                
             try
             {
                 var result = secondaryConstraint.Validate(columnValue, otherColumns, otherColumnNames);
@@ -90,9 +89,10 @@ private ValidationFailure ValidateSecondayConstraints(object columnValue, object
             }
             catch (Exception ex)
             {
-                throw new InvalidOperationException($"Error processing Secondary Constraint validator of Type {secondaryConstraint.GetType().Name} on column {TargetProperty}.  Value being validated was '{columnValue}'",ex);
+                throw new InvalidOperationException(
+                    $"Error processing Secondary Constraint validator of Type {secondaryConstraint.GetType().Name} on column {TargetProperty}.  Value being validated was '{columnValue}'",
+                    ex);
             }
-        }
 
         return null;
     }
@@ -102,16 +102,13 @@ public void AddSecondaryConstraint(SecondaryConstraint c)
         SecondaryConstraints.Add(c);
     }
 
-    public override string ToString()
-    {
-        return TargetProperty;
-    }
+    public override string ToString() => TargetProperty;
 
     #region Fluent API experiment
 
     public void As(string constraintType)
     {
-        PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint(constraintType,Consequence.Wrong);
+        PrimaryConstraint = (PrimaryConstraint)Validator.CreateConstraint(constraintType, Consequence.Wrong);
     }
 
     public ItemValidator OfType(Type type)
@@ -122,17 +119,17 @@ public ItemValidator OfType(Type type)
 
     public void OccursAfter(string comparatorFieldName)
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Inclusive = false;
         b.LowerFieldName = comparatorFieldName;
         b.Upper = DateTime.MaxValue;
 
         AddSecondaryConstraint(b);
     }
-        
+
     public void OccursBefore(string comparatorFieldName)
     {
-        var b = (BoundDate)Validator.CreateConstraint("bounddate",Consequence.Wrong);
+        var b = (BoundDate)Validator.CreateConstraint("bounddate", Consequence.Wrong);
         b.Lower = DateTime.MinValue;
         b.UpperFieldName = comparatorFieldName;
 
@@ -141,7 +138,7 @@ public void OccursBefore(string comparatorFieldName)
 
     public ItemValidator IsLessThan(string comparatorFieldName)
     {
-        var b = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var b = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         b.UpperFieldName = comparatorFieldName;
         b.Lower = double.MinValue;
         AddSecondaryConstraint(b);
@@ -151,7 +148,7 @@ public ItemValidator IsLessThan(string comparatorFieldName)
 
     public ItemValidator IsGreaterThan(string comparatorFieldName)
     {
-        var b = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var b = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         b.LowerFieldName = comparatorFieldName;
         b.Upper = double.MaxValue;
         AddSecondaryConstraint(b);
@@ -161,17 +158,14 @@ public ItemValidator IsGreaterThan(string comparatorFieldName)
 
     public BoundDouble IsBetween(int lower)
     {
-        var b = (BoundDouble)Validator.CreateConstraint("bounddouble",Consequence.Wrong);
+        var b = (BoundDouble)Validator.CreateConstraint("bounddouble", Consequence.Wrong);
         b.Lower = lower;
         AddSecondaryConstraint(b);
 
         return b;
     }
 
-    public ItemValidator And()
-    {
-        return this;
-    }
+    public ItemValidator And() => this;
 
     #endregion
 
@@ -189,9 +183,10 @@ public string SaveToXml(bool indent = true)
         var sb = new StringBuilder();
 
         using (var sw = XmlWriter.Create(sb, new XmlWriterSettings { Indent = indent }))
+        {
             _serializer.Serialize(sw, this);
+        }
 
         return sb.ToString();
-        
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/UIAttributes/Attributes.cs b/Rdmp.Core/Validation/UIAttributes/Attributes.cs
index 705fd6e60f..6dbe46d8b0 100644
--- a/Rdmp.Core/Validation/UIAttributes/Attributes.cs
+++ b/Rdmp.Core/Validation/UIAttributes/Attributes.cs
@@ -20,7 +20,7 @@ public class HideOnValidationUI : System.Attribute
 /// Attribute for <see cref="IConstraint"/> properties which should store a column name
 /// </summary>
 [System.AttributeUsage(System.AttributeTargets.Property)]
-public class ExpectsColumnNameAsInput: System.Attribute
+public class ExpectsColumnNameAsInput : System.Attribute
 {
 }
 
diff --git a/Rdmp.Core/Validation/ValidationFailure.cs b/Rdmp.Core/Validation/ValidationFailure.cs
index d90bee5f1b..af66ae0823 100644
--- a/Rdmp.Core/Validation/ValidationFailure.cs
+++ b/Rdmp.Core/Validation/ValidationFailure.cs
@@ -14,7 +14,6 @@ namespace Rdmp.Core.Validation;
 /// </summary>
 public class ValidationFailure
 {
-        
     public ItemValidator SourceItemValidator { get; set; }
     public IConstraint SourceConstraint { get; set; }
 
@@ -27,24 +26,20 @@ private ValidationFailure(string message)
         Message = message;
     }
 
-    public ValidationFailure(string message, IConstraint sender) :this(message)
+    public ValidationFailure(string message, IConstraint sender) : this(message)
     {
         SourceConstraint = sender;
     }
 
-    public ValidationFailure(string message, ItemValidator sender): this(message)
+    public ValidationFailure(string message, ItemValidator sender) : this(message)
     {
-            
         SourceItemValidator = sender;
     }
 
-    public ValidationFailure(string message, List<ValidationFailure> e): this(message)
+    public ValidationFailure(string message, List<ValidationFailure> e) : this(message)
     {
         eList = e;
     }
 
-    public List<ValidationFailure> GetExceptionList()
-    {
-        return eList;
-    } 
+    public List<ValidationFailure> GetExceptionList() => eList;
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/Validator.cs b/Rdmp.Core/Validation/Validator.cs
index 285c8cb4a1..cac648ea31 100644
--- a/Rdmp.Core/Validation/Validator.cs
+++ b/Rdmp.Core/Validation/Validator.cs
@@ -51,14 +51,13 @@ public class Validator
     /// for selection (the Catalogue database).
     /// </summary>
     public static ICatalogueRepositoryServiceLocator LocatorForXMLDeserialization;
-    public List<ItemValidator> ItemValidators { get; set; }
 
+    public List<ItemValidator> ItemValidators { get; set; }
 
 
     public Validator()
     {
         ItemValidators = new List<ItemValidator>();
-
     }
 
     /// <summary>
@@ -70,8 +69,9 @@ public Validator()
     /// <param name="expectedType"></param>
     public void AddItemValidator(ItemValidator itemValidator, string targetProperty, Type expectedType)
     {
-        if(ItemValidators.Any(iv=>iv.TargetProperty.Equals(targetProperty)))
-            throw new ArgumentException("TargetProperty is already targeted by another ItemValidator in the collection");
+        if (ItemValidators.Any(iv => iv.TargetProperty.Equals(targetProperty)))
+            throw new ArgumentException(
+                "TargetProperty is already targeted by another ItemValidator in the collection");
 
         itemValidator.TargetProperty = targetProperty;
         itemValidator.ExpectedType = expectedType;
@@ -94,7 +94,6 @@ public ItemValidator GetItemValidator(string key)
         {
             return null;
         }
-
     }
 
     /// <summary>
@@ -104,7 +103,6 @@ public ItemValidator GetItemValidator(string key)
     /// <returns>true if the removal succeeded, false otherwise</returns>
     public bool RemoveItemValidator(string key)
     {
-
         ItemValidator toRemove;
 
         try
@@ -113,7 +111,6 @@ public bool RemoveItemValidator(string key)
         }
         catch (InvalidOperationException)
         {
-
             return false;
         }
 
@@ -138,7 +135,8 @@ public ValidationFailure Validate(object domainObject)
     /// <param name="domainObject"></param>
     /// /// <param name="currentResults">It is expected that Validate is called multiple times (once per row) therefore you can store the Result of the last one and pass it back into the method the next time you call it in order to maintain a running total</param>
     /// <param name="worstConsequence"></param>
-    public VerboseValidationResults ValidateVerboseAdditive(object domainObject,VerboseValidationResults currentResults, out Consequence? worstConsequence)
+    public VerboseValidationResults ValidateVerboseAdditive(object domainObject,
+        VerboseValidationResults currentResults, out Consequence? worstConsequence)
     {
         worstConsequence = null;
 
@@ -188,7 +186,7 @@ public static Validator LoadFromXml(string xml)
 
     private static void InitializeSerializer()
     {
-        _serializer ??= new XmlSerializer(typeof (Validator), GetExtraTypes());
+        _serializer ??= new XmlSerializer(typeof(Validator), GetExtraTypes());
     }
 
     /// <summary>
@@ -202,7 +200,9 @@ public string SaveToXml(bool indent = true)
         InitializeSerializer();
 
         using (var sw = XmlWriter.Create(sb, new XmlWriterSettings { Indent = indent }))
+        {
             _serializer.Serialize(sw, this);
+        }
 
         return sb.ToString();
     }
@@ -220,12 +220,12 @@ public static void RefreshExtraTypes(SafeDirectoryCatalog mef, ICheckNotifier no
 
             //Get all the Types in the assembly that are compatible with Constraint (primary or secondary)
             extraTypes.AddRange(mef.GetAllTypes().Where(
-
                     //type is
                     type =>
                         type != null &&
                         //of the correct Type
-                        (typeof(IConstraint).IsAssignableFrom(type) || typeof(PredictionRule).IsAssignableFrom(type)) //Constraint or prediction
+                        (typeof(IConstraint).IsAssignableFrom(type) ||
+                         typeof(PredictionRule).IsAssignableFrom(type)) //Constraint or prediction
                         &&
                         !type.IsAbstract
                         &&
@@ -233,7 +233,6 @@ public static void RefreshExtraTypes(SafeDirectoryCatalog mef, ICheckNotifier no
                         &&
                         type.IsClass
                 )
-
             );
 
             _extraTypes = extraTypes.ToArray();
@@ -244,7 +243,7 @@ public static Type[] GetExtraTypes()
     {
         lock (oLockExtraTypes)
         {
-            return _extraTypes??Type.EmptyTypes;
+            return _extraTypes ?? Type.EmptyTypes;
         }
     }
 
@@ -254,10 +253,7 @@ public static Type[] GetExtraTypes()
     /// </summary>
     /// <param name="pattern"></param>
     /// <returns></returns>
-    public static ISecondaryConstraint CreateRegularExpression(string pattern)
-    {
-        return new RegularExpression(pattern);
-    }
+    public static ISecondaryConstraint CreateRegularExpression(string pattern) => new RegularExpression(pattern);
 
     /// <summary>
     /// Returns an array of available PrimaryConstraint names.
@@ -288,9 +284,8 @@ public static string[] GetSecondaryConstraintNames()
     /// <returns>A Constraint</returns>
     public static IConstraint CreateConstraint(string name, Consequence consequence)
     {
-
         var type = GetExtraTypes().Single(t => t.Name.Equals(name, StringComparison.CurrentCultureIgnoreCase));
-        var toReturn = (IConstraint) Activator.CreateInstance(type);
+        var toReturn = (IConstraint)Activator.CreateInstance(type);
         toReturn.Consequence = consequence;
         return toReturn;
     }
@@ -343,14 +338,13 @@ private ValidationFailure ValidateAgainstDictionary()
 
         //for all the columns we need to validate
         foreach (var itemValidator in ItemValidators)
-        {
             if (_domainObjectDictionary.TryGetValue(itemValidator.TargetProperty, out var o))
             {
                 //get the first validation failure for the given column (or null if it is valid)
                 var result = itemValidator.ValidateAll(o, vals, keys);
 
                 //if it wasn't valid then add it to the eList
-                if(result is { SourceItemValidator: null })
+                if (result is { SourceItemValidator: null })
                 {
                     result.SourceItemValidator = itemValidator;
                     eList.Add(result);
@@ -361,15 +355,10 @@ private ValidationFailure ValidateAgainstDictionary()
                 throw new InvalidOperationException(
                     $"Validation failed: Target field [{itemValidator.TargetProperty}] not found in dictionary.");
             }
-        }
 
-        if (eList.Count > 0)
-        {
-            return new ValidationFailure("There are validation errors.", eList);
-        }
+        if (eList.Count > 0) return new ValidationFailure("There are validation errors.", eList);
 
         return null;
-
     }
 
     private ValidationFailure ValidateAgainstDomainObject()
@@ -377,6 +366,7 @@ private ValidationFailure ValidateAgainstDomainObject()
         var eList = new List<ValidationFailure>();
 
         #region work out other column values
+
         string[] names = null;
         object[] values = null;
 
@@ -413,13 +403,13 @@ private ValidationFailure ValidateAgainstDomainObject()
                     values[i] = row[i].ToString();
             }
         }
+
         #endregion
 
 
         foreach (var itemValidator in ItemValidators)
         {
-
-            if(itemValidator.TargetProperty == null)
+            if (itemValidator.TargetProperty == null)
                 throw new NullReferenceException("Target property cannot be null");
 
             try
@@ -436,9 +426,10 @@ private ValidationFailure ValidateAgainstDomainObject()
 
                     result = itemValidator.ValidateAll(value, values, names);
                 }
-                else
-                if (o is DataRow dataRow)
+                else if (o is DataRow dataRow)
+                {
                     result = itemValidator.ValidateAll(dataRow[itemValidator.TargetProperty], values, names);
+                }
                 else
                 {
                     var propertiesDictionary = DomainObjectPropertiesToDictionary(o);
@@ -447,13 +438,16 @@ private ValidationFailure ValidateAgainstDomainObject()
                     {
                         value = value1;
 
-                        result = itemValidator.ValidateAll(value, propertiesDictionary.Values.ToArray(), propertiesDictionary.Keys.ToArray());
+                        result = itemValidator.ValidateAll(value, propertiesDictionary.Values.ToArray(),
+                            propertiesDictionary.Keys.ToArray());
                     }
                     else
+                    {
                         throw new MissingFieldException(
                             $"Validation failed: Target field [{itemValidator.TargetProperty}] not found in domain object.");
-
+                    }
                 }
+
                 if (result != null)
                 {
                     result.SourceItemValidator ??= itemValidator;
@@ -468,10 +462,7 @@ private ValidationFailure ValidateAgainstDomainObject()
             }
         }
 
-        if (eList.Count > 0)
-        {
-            return new ValidationFailure("There are validation errors.", eList);
-        }
+        if (eList.Count > 0) return new ValidationFailure("There are validation errors.", eList);
 
         return null;
     }
@@ -480,20 +471,19 @@ private static Dictionary<string, object> DomainObjectPropertiesToDictionary(obj
     {
         var toReturn = new Dictionary<string, object>();
 
-        foreach(var prop in o.GetType().GetProperties())
+        foreach (var prop in o.GetType().GetProperties())
             toReturn.Add(prop.Name, prop.GetValue(o));
 
 
         return toReturn;
-
     }
 
     #endregion
 
     public void RenameColumns(Dictionary<string, string> renameDictionary)
     {
-        foreach(var kvp in renameDictionary)
-            RenameColumn(kvp.Key,kvp.Value);
+        foreach (var kvp in renameDictionary)
+            RenameColumn(kvp.Key, kvp.Value);
     }
 
     public void RenameColumn(string oldName, string newName)
@@ -503,7 +493,7 @@ public void RenameColumn(string oldName, string newName)
             if (itemValidator.TargetProperty == oldName)
                 itemValidator.TargetProperty = newName;
 
-            itemValidator.PrimaryConstraint?.RenameColumn(oldName,newName);
+            itemValidator.PrimaryConstraint?.RenameColumn(oldName, newName);
 
             foreach (ISecondaryConstraint constraint in itemValidator.SecondaryConstraints)
                 constraint.RenameColumn(oldName, newName);
@@ -512,6 +502,6 @@ public void RenameColumn(string oldName, string newName)
 
     public static Type[] GetPredictionExtraTypes()
     {
-        return GetExtraTypes().Where(t => typeof (PredictionRule).IsAssignableFrom(t)).ToArray();
+        return GetExtraTypes().Where(t => typeof(PredictionRule).IsAssignableFrom(t)).ToArray();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.Core/Validation/VerboseValidationResults.cs b/Rdmp.Core/Validation/VerboseValidationResults.cs
index 95fb2292eb..c1ec78dda4 100644
--- a/Rdmp.Core/Validation/VerboseValidationResults.cs
+++ b/Rdmp.Core/Validation/VerboseValidationResults.cs
@@ -34,7 +34,7 @@ public class VerboseValidationResults
     /// <summary>
     /// A count of the rows Invalidated due to dodgy data - failed Validations with Consequence.InvalidatesRow
     /// </summary>
-    public int CountOfRowsInvalidated {get; set; }
+    public int CountOfRowsInvalidated { get; set; }
 
     public VerboseValidationResults(ItemValidator[] validators)
     {
@@ -44,7 +44,7 @@ public VerboseValidationResults(ItemValidator[] validators)
 
         foreach (var iv in validators)
         {
-            DictionaryOfFailure.Add(iv.TargetProperty,null);
+            DictionaryOfFailure.Add(iv.TargetProperty, null);
             DictionaryOfFailure[iv.TargetProperty] = new Dictionary<Consequence, int>
             {
                 { Consequence.Missing, 0 },
@@ -76,7 +76,7 @@ public Consequence ProcessException(ValidationFailure rootValidationFailure)
                         ReasonsRowsInvalidated.Add(
                             $"{subException.SourceItemValidator.TargetProperty}|{subException.SourceConstraint.GetType().Name}");
 
-                if (worstConsequences.TryGetValue(subException.SourceItemValidator,out var oldConsequence))
+                if (worstConsequences.TryGetValue(subException.SourceItemValidator, out var oldConsequence))
                 {
                     //see if situation got worse
                     var newConsequence = subException.SourceConstraint.Consequence.Value;
@@ -87,18 +87,19 @@ public Consequence ProcessException(ValidationFailure rootValidationFailure)
                 else
                 {
                     //new validation error for this column
-                    worstConsequences.Add(subException.SourceItemValidator, (Consequence)subException.SourceConstraint.Consequence);
+                    worstConsequences.Add(subException.SourceItemValidator,
+                        (Consequence)subException.SourceConstraint.Consequence);
                 }
             }
 
             //now record the worst case event
             if (worstConsequences.ContainsValue(Consequence.InvalidatesRow))
                 CountOfRowsInvalidated++;
-                
+
             foreach (var itemValidator in worstConsequences.Keys)
             {
                 var columnName = itemValidator.TargetProperty;
-                    
+
                 //increment the most damaging consequence count for this cell
                 DictionaryOfFailure[columnName][worstConsequences[itemValidator]]++;
             }
@@ -120,7 +121,8 @@ private static void ConfirmIntegrityOfValidationException(ValidationFailure v)
 
         foreach (var validationException in v.GetExceptionList())
         {
-            if (validationException.SourceItemValidator == null || validationException.SourceItemValidator.TargetProperty == null)
+            if (validationException.SourceItemValidator == null ||
+                validationException.SourceItemValidator.TargetProperty == null)
                 throw new NullReferenceException(
                     $"Column name referenced in ValidationException was null!, message in the exception was:{validationException.Message}");
 
diff --git a/Rdmp.UI.Tests/ANOTableUITests.cs b/Rdmp.UI.Tests/ANOTableUITests.cs
index 0f10fa2268..4c2d2bda9f 100644
--- a/Rdmp.UI.Tests/ANOTableUITests.cs
+++ b/Rdmp.UI.Tests/ANOTableUITests.cs
@@ -13,7 +13,8 @@ namespace Rdmp.UI.Tests;
 
 internal class ANOTableUITests : UITests
 {
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ANOTableUI_NormalState()
     {
         var anoTable = WhenIHaveA<ANOTable>();
@@ -29,7 +30,8 @@ public void Test_ANOTableUI_NormalState()
         anoTable.DeleteInDatabase();
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ANOTableUI_ServerWrongType()
     {
         var anoTable = WhenIHaveA<ANOTable>(Repository, out var srv);
@@ -37,16 +39,14 @@ public void Test_ANOTableUI_ServerWrongType()
         srv.SaveToDatabase();
 
         var ui = AndLaunch<ANOTableUI>(anoTable);
-            
+
         //should be an error on the server showing that it is misconfigured
-        AssertErrorWasShown(ExpectedErrorType.ErrorProvider,"Server is not an ANO server");
+        AssertErrorWasShown(ExpectedErrorType.ErrorProvider, "Server is not an ANO server");
         AssertErrorWasShown(ExpectedErrorType.Fatal, "Could not reach ANO Server");
-            
+
         //but form was not killed
         AssertNoErrors(ExpectedErrorType.KilledForm);
 
         anoTable.DeleteInDatabase();
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/AggregateEditorUITests.cs b/Rdmp.UI.Tests/AggregateEditorUITests.cs
index 873c1bab0c..86683afb9c 100644
--- a/Rdmp.UI.Tests/AggregateEditorUITests.cs
+++ b/Rdmp.UI.Tests/AggregateEditorUITests.cs
@@ -13,9 +13,10 @@
 
 namespace Rdmp.UI.Tests;
 
-internal class AggregateEditorUITests:UITests
+internal class AggregateEditorUITests : UITests
 {
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_AggregateEditorUI_NormalState()
     {
         var config = GetAggregateConfigurationWithNoDimensions();
@@ -26,7 +27,7 @@ public void Test_AggregateEditorUI_NormalState()
 
         //should show two available columns
         var available = colsUi.AvailableColumns;
-        Assert.AreEqual(2,available.Count);
+        Assert.AreEqual(2, available.Count);
 
         //the count(*) column
         var included = colsUi.IncludedColumns;
@@ -35,13 +36,14 @@ public void Test_AggregateEditorUI_NormalState()
         //before we have added any columns it should not be possible to launch the graph
         var cmdExecuteGraph = new ExecuteCommandExecuteAggregateGraph(ItemActivator, config);
         Assert.IsTrue(cmdExecuteGraph.IsImpossible);
-        StringAssert.Contains("No tables could be identified for the query.  Try adding a column or a force join",cmdExecuteGraph.ReasonCommandImpossible);
+        StringAssert.Contains("No tables could be identified for the query.  Try adding a column or a force join",
+            cmdExecuteGraph.ReasonCommandImpossible);
 
         var ei = config.Catalogue.CatalogueItems[0].ExtractionInformation;
 
         //create a new dimension to the config in the database
         var dim = new AggregateDimension(Repository, ei, config);
-            
+
         //publish a refresh
         Publish(config);
 
@@ -60,7 +62,8 @@ public void Test_AggregateEditorUI_NormalState()
         AssertNoErrors(ExpectedErrorType.Any);
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_AggregateEditorUI_AxisOnlyShowsDateDimensions()
     {
         var config = GetAggregateConfigurationWithNoDimensions(out var dateEi, out var otherEi);
@@ -73,14 +76,15 @@ public void Test_AggregateEditorUI_AxisOnlyShowsDateDimensions()
 
         //only date should be an option for axis dimension
         Assert.AreEqual(1, ui.ddAxisDimension.Items.Count);
-        Assert.AreEqual(dimDate,ui.ddAxisDimension.Items[0]);
+        Assert.AreEqual(dimDate, ui.ddAxisDimension.Items[0]);
 
         //dates are not valid for pivots
         Assert.AreEqual(1, ui.ddPivotDimension.Items.Count);
         Assert.AreEqual(dimOther, ui.ddPivotDimension.Items[0]);
 
         //it wants us to pick either a pivot or an axis
-        AssertErrorWasShown(ExpectedErrorType.FailedCheck,"In order to have 2 columns, one must be selected as a pivot");
+        AssertErrorWasShown(ExpectedErrorType.FailedCheck,
+            "In order to have 2 columns, one must be selected as a pivot");
         config.PivotOnDimensionID = dimOther.ID;
         config.SaveToDatabase();
 
@@ -89,40 +93,36 @@ public void Test_AggregateEditorUI_AxisOnlyShowsDateDimensions()
         AssertNoErrors(ExpectedErrorType.Any);
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_AggregateEditorUI_NoExtractableColumns()
     {
         //Create a Catalogue with an AggregateConfiguration that doesn't have any extractable columns yet
         var cata = WhenIHaveA<Catalogue>();
-        var config = new AggregateConfiguration(Repository,cata,"My config");
+        var config = new AggregateConfiguration(Repository, cata, "My config");
 
         //these commands should be impossible
         var cmd = new ExecuteCommandAddNewAggregateGraph(ItemActivator, cata);
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.Contains("no extractable columns",cmd.ReasonCommandImpossible);
+        StringAssert.Contains("no extractable columns", cmd.ReasonCommandImpossible);
 
         //and if the broken config is activated
         var ui = AndLaunch<AggregateEditorUI>(config);
 
         //it should not launch and instead show the following message
         var killed = ItemActivator.Results.KilledForms.Single();
-        Assert.AreEqual(ui.ParentForm,killed.Key);
+        Assert.AreEqual(ui.ParentForm, killed.Key);
         StringAssert.Contains("no extractable columns", killed.Value.Message);
     }
 
 
+    private AggregateConfiguration GetAggregateConfigurationWithNoDimensions() =>
+        GetAggregateConfigurationWithNoDimensions(out var dateEi, out var otherEi);
 
-
-
-
-    private AggregateConfiguration GetAggregateConfigurationWithNoDimensions()
-    {
-        return GetAggregateConfigurationWithNoDimensions(out ExtractionInformation dateEi, out ExtractionInformation otherEi);
-    }
-
-    private AggregateConfiguration GetAggregateConfigurationWithNoDimensions(out ExtractionInformation dateEi, out ExtractionInformation otherEi)
+    private AggregateConfiguration GetAggregateConfigurationWithNoDimensions(out ExtractionInformation dateEi,
+        out ExtractionInformation otherEi)
     {
-        var config = WhenIHaveA<AggregateConfiguration>(Repository,out dateEi, out otherEi);
+        var config = WhenIHaveA<AggregateConfiguration>(Repository, out dateEi, out otherEi);
 
         //remove any existing dimensions
         foreach (var d in config.AggregateDimensions)
diff --git a/Rdmp.UI.Tests/ArbitraryFolderNodeTests.cs b/Rdmp.UI.Tests/ArbitraryFolderNodeTests.cs
index 7bb6dd353a..68472b597c 100644
--- a/Rdmp.UI.Tests/ArbitraryFolderNodeTests.cs
+++ b/Rdmp.UI.Tests/ArbitraryFolderNodeTests.cs
@@ -15,28 +15,28 @@
 
 namespace Rdmp.UI.Tests;
 
-internal class ArbitraryFolderNodeTests:UITests
+internal class ArbitraryFolderNodeTests : UITests
 {
-
-    [Test,UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ArbitraryFolderNode_CommandGetter_Throwing()
     {
         SetupMEF();
 
         var tlv = new TreeListView();
         var common = new RDMPCollectionCommonFunctionality();
-        common.SetUp(RDMPCollection.None,tlv,ItemActivator,null,null);
+        common.SetUp(RDMPCollection.None, tlv, ItemActivator, null, null);
 
-        var node = new ArbitraryFolderNode("my node",0);
+        var node = new ArbitraryFolderNode("my node", 0);
 
         var menu1 = common.GetMenuIfExists(node);
         Assert.IsNotNull(menu1);
         var count1 = menu1.Items.Count;
         //some you get for free e.g. Expand/Collapse
-        Assert.GreaterOrEqual(count1,2);
+        Assert.GreaterOrEqual(count1, 2);
 
         //set the menu to have one command in it
-        node.CommandGetter = () =>  new IAtomicCommand[] { new ImpossibleCommand("Do Nothing")};
+        node.CommandGetter = () => new IAtomicCommand[] { new ImpossibleCommand("Do Nothing") };
 
         var menu2 = common.GetMenuIfExists(node);
 
@@ -44,14 +44,14 @@ public void Test_ArbitraryFolderNode_CommandGetter_Throwing()
 
         // expect 2 new entries in the context menu.  The "Do Nothing" command added above
         // and a tool strip seperator to divide the menu commands from the common commands
-        Assert.AreEqual(count1+2,count2);
-            
+        Assert.AreEqual(count1 + 2, count2);
+
         //what happens if the delegate crashes?
         node.CommandGetter = () => throw new NotSupportedException("It went wrong!");
 
-        Assert.DoesNotThrow(()=>common.GetMenuIfExists(node));
+        Assert.DoesNotThrow(() => common.GetMenuIfExists(node));
 
-        AssertErrorWasShown(ExpectedErrorType.GlobalErrorCheckNotifier, "Failed to build menu for my node of Type Rdmp.Core.Providers.Nodes.ArbitraryFolderNode");
+        AssertErrorWasShown(ExpectedErrorType.GlobalErrorCheckNotifier,
+            "Failed to build menu for my node of Type Rdmp.Core.Providers.Nodes.ArbitraryFolderNode");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/CatalogueIconProviderTests.cs b/Rdmp.UI.Tests/CatalogueIconProviderTests.cs
index 2e6661bbf2..c07f8415ec 100644
--- a/Rdmp.UI.Tests/CatalogueIconProviderTests.cs
+++ b/Rdmp.UI.Tests/CatalogueIconProviderTests.cs
@@ -17,13 +17,12 @@
 namespace Rdmp.UI.Tests;
 
 [SupportedOSPlatform("windows7.0")]
-internal class CatalogueIconProviderTests: UITests
+internal class CatalogueIconProviderTests : UITests
 {
-
     [Test]
     public void CatalogueIconProvider_HasImage_NoImage()
     {
-        var provider = new CatalogueIconProvider(RepositoryLocator,null);
+        var provider = new CatalogueIconProvider(RepositoryLocator, null);
 
         var img = provider.GetImage(new object(), OverlayKind.None);
 
@@ -34,8 +33,8 @@ public void CatalogueIconProvider_HasImage_NoImage()
     public void CatalogueIconProvider_HasImage_AllObjectsHave()
     {
         var objectCount = 0;
-        var provider = new DataExportIconProvider(RepositoryLocator,null);
-            
+        var provider = new DataExportIconProvider(RepositoryLocator, null);
+
         foreach (var obj in WhenIHaveAll())
         {
             var img = provider.GetImage(obj, OverlayKind.None);
@@ -44,13 +43,15 @@ public void CatalogueIconProvider_HasImage_AllObjectsHave()
             {
                 d.IsDisabled = true;
 
-                Assert.IsTrue(IsBlackAndWhite(provider.GetImage(obj,OverlayKind.Add)),$"Grayscaling failed for Object of Type '{obj.GetType().Name}' did not have an image");
-                    
+                Assert.IsTrue(IsBlackAndWhite(provider.GetImage(obj, OverlayKind.Add)),
+                    $"Grayscaling failed for Object of Type '{obj.GetType().Name}' did not have an image");
+
                 d.IsDisabled = false;
-                Assert.IsFalse(IsBlackAndWhite(provider.GetImage(obj,OverlayKind.Add)),$"Enabled Object of Type '{obj.GetType().Name}' was unexpectedly Grayscale");
+                Assert.IsFalse(IsBlackAndWhite(provider.GetImage(obj, OverlayKind.Add)),
+                    $"Enabled Object of Type '{obj.GetType().Name}' was unexpectedly Grayscale");
             }
-                    
-            Assert.IsTrue(provider.HasIcon(obj),$"Object of Type '{obj.GetType().Name}' did not have an image");
+
+            Assert.IsTrue(provider.HasIcon(obj), $"Object of Type '{obj.GetType().Name}' did not have an image");
             objectCount++;
         }
 
@@ -61,17 +62,17 @@ public void CatalogueIconProvider_HasImage_AllObjectsHave()
     [Test]
     public void TestGrayscale()
     {
-        var provider = new CatalogueIconProvider(RepositoryLocator,null);
+        var provider = new CatalogueIconProvider(RepositoryLocator, null);
 
         var ac = WhenIHaveA<AggregateConfiguration>();
 
-        Assert.IsFalse(IsBlackAndWhite(provider.GetImage(ac)),"Image was unexpectedly Grayscale");
+        Assert.IsFalse(IsBlackAndWhite(provider.GetImage(ac)), "Image was unexpectedly Grayscale");
 
         ac.IsDisabled = true;
-        Assert.IsTrue(IsBlackAndWhite(provider.GetImage(ac)),"Image was expected to be Grayscale but wasn't'");
+        Assert.IsTrue(IsBlackAndWhite(provider.GetImage(ac)), "Image was expected to be Grayscale but wasn't'");
     }
 
-        
+
     /// <summary>
     /// Exposes a potential infinite loop / stack overflow where an object is masquerading as an IMasquerade
     /// </summary>
@@ -80,17 +81,15 @@ public void Test_ObjectMasqueradingAsSelf()
     {
         var me = new IAmMe();
 
-        var provider = new CatalogueIconProvider(RepositoryLocator,null);
+        var provider = new CatalogueIconProvider(RepositoryLocator, null);
         provider.GetImage(me, OverlayKind.Add);
 
         Assert.IsFalse(provider.HasIcon(me));
     }
+
     private class IAmMe : IMasqueradeAs
     {
-        public object MasqueradingAs()
-        {
-            return this;
-        }
+        public object MasqueradingAs() => this;
     }
 
 
@@ -100,19 +99,13 @@ private static bool IsBlackAndWhite(SixLabors.ImageSharp.Image<Rgba32> img)
         img.ProcessPixelRows(pixels =>
         {
             for (var y = 0; y < pixels.Height; y++)
-            {
                 foreach (ref var pixel in pixels.GetRowSpan(y))
-                {
                     if (pixel.R != pixel.G || pixel.G != pixel.B)
                     {
                         foundColoured = true;
                         return;
                     }
-                }
-            }
         });
         return !foundColoured;
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/CatalogueItemUITests.cs b/Rdmp.UI.Tests/CatalogueItemUITests.cs
index f3d6a8183f..6ef98d63b6 100644
--- a/Rdmp.UI.Tests/CatalogueItemUITests.cs
+++ b/Rdmp.UI.Tests/CatalogueItemUITests.cs
@@ -17,7 +17,8 @@ namespace Rdmp.UI.Tests;
 [SupportedOSPlatform("windows7.0")]
 internal class CatalogueItemUITests : UITests
 {
-    [Test, UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_CatalogueItemUI_NormalState()
     {
         //when I have two CatalogueItems that have the same name
@@ -39,7 +40,8 @@ public void Test_CatalogueItemUI_NormalState()
 
         //and the UI should have shown the Propagate changes dialog
         Assert.AreEqual(1, ItemActivator.Results.WindowsShown.Count);
-        Assert.IsInstanceOf(typeof(PropagateCatalogueItemChangesToSimilarNamedUI),ItemActivator.Results.WindowsShown.Single());
+        Assert.IsInstanceOf(typeof(PropagateCatalogueItemChangesToSimilarNamedUI),
+            ItemActivator.Results.WindowsShown.Single());
 
         AssertNoErrors(ExpectedErrorType.Any);
     }
@@ -48,32 +50,33 @@ public void Test_CatalogueItemUI_NormalState()
     /// Tests that <see cref="INamedTab.GetTabName"/> works even when half way through a call
     /// to <see cref="IRDMPSingleDatabaseObjectControl.SetDatabaseObject"/>
     /// </summary>
-    [Test, UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_CatalogueItemUI_GetTabName()
     {
         var ci = WhenIHaveA<CatalogueItem>();
         var ui = AndLaunch<CatalogueItemUI>(ci);
-            
-        Assert.AreEqual("MyCataItem (Mycata)",ui.GetTabName());
+
+        Assert.AreEqual("MyCataItem (Mycata)", ui.GetTabName());
 
         //introduce database change but don't save
         ci.Name = "Fish";
 
         //simulates loading the UI with an out of date object
-        ui = AndLaunch<CatalogueItemUI>(ci,false);
+        ui = AndLaunch<CatalogueItemUI>(ci, false);
 
         //now what we want to ensure is that ui.GetTabName works properly even half way through SetDatabaseObject
         //so register a callback that interrogates GetTabName midway
-        ItemActivator.ShouldReloadFreshCopyDelegate = ()=>
+        ItemActivator.ShouldReloadFreshCopyDelegate = () =>
         {
             ui.GetTabName();
             return true;
         };
 
         //and finish launching it, this should trigger the 'FreshCopyDelegate' which will exercise GetTabName.
-        ui.SetDatabaseObject(ItemActivator,ci);
-            
-        Assert.AreEqual("MyCataItem (Mycata)",ui.GetTabName());
+        ui.SetDatabaseObject(ItemActivator, ci);
+
+        Assert.AreEqual("MyCataItem (Mycata)", ui.GetTabName());
 
         //clear the delgate for the next user
         ItemActivator.ShouldReloadFreshCopyDelegate = null;
diff --git a/Rdmp.UI.Tests/CatalogueUITests.cs b/Rdmp.UI.Tests/CatalogueUITests.cs
index 136227853f..73bf572892 100644
--- a/Rdmp.UI.Tests/CatalogueUITests.cs
+++ b/Rdmp.UI.Tests/CatalogueUITests.cs
@@ -15,7 +15,8 @@ namespace Rdmp.UI.Tests;
 [SupportedOSPlatform("windows7.0")]
 public class CatalogueUITests : UITests
 {
-    [Test, UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_CatalogueUI_NormalState()
     {
         var cata = WhenIHaveA<Catalogue>();
@@ -70,7 +71,8 @@ public void Test_CatalogueUI_NormalState()
         AssertNoErrors(ExpectedErrorType.Any);
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_CatalogueUI_AcronymDuplicates()
     {
         var cata1 = WhenIHaveA<Catalogue>();
@@ -97,7 +99,7 @@ public void Test_CatalogueUI_AcronymDuplicates()
         ui.tbAcronym.Text = "AB";
 
         //it tells me that I have to make it unique
-        AssertErrorWasShown(ExpectedErrorType.ErrorProvider,"Must be unique");
+        AssertErrorWasShown(ExpectedErrorType.ErrorProvider, "Must be unique");
 
         //so I make it unique
         ui.tbAcronym.Text = "ABC";
diff --git a/Rdmp.UI.Tests/ChildProviderTests.cs b/Rdmp.UI.Tests/ChildProviderTests.cs
index 3a6ab84559..d74ebca1e2 100644
--- a/Rdmp.UI.Tests/ChildProviderTests.cs
+++ b/Rdmp.UI.Tests/ChildProviderTests.cs
@@ -26,12 +26,13 @@ public void ChildProviderGiven_TableInfoWith_NullServer()
         ti.SaveToDatabase();
 
         //creating a child provider when there are TableInfos with null servers should not crash the API!
-        var provider = new CatalogueChildProvider(Repository.CatalogueRepository, null, new ThrowImmediatelyCheckNotifier(),null);
+        var provider = new CatalogueChildProvider(Repository.CatalogueRepository, null,
+            new ThrowImmediatelyCheckNotifier(), null);
         var desc = provider.GetDescendancyListIfAnyFor(ti);
         Assert.IsNotNull(desc);
 
         //instead we should get a parent node with the name "Null Server"
-        var parent = (TableInfoServerNode) desc.Parents[^2];
+        var parent = (TableInfoServerNode)desc.Parents[^2];
         Assert.AreEqual(TableInfoServerNode.NullServerNode, parent.ServerName);
     }
 
@@ -43,7 +44,8 @@ public void ChildProviderGiven_TableInfoWith_NullDatabase()
         ti.SaveToDatabase();
 
         //creating a child provider when there are TableInfos with null servers should not crash the API!
-        var provider = new CatalogueChildProvider(Repository.CatalogueRepository, null, new ThrowImmediatelyCheckNotifier(), null);
+        var provider = new CatalogueChildProvider(Repository.CatalogueRepository, null,
+            new ThrowImmediatelyCheckNotifier(), null);
         var desc = provider.GetDescendancyListIfAnyFor(ti);
         Assert.IsNotNull(desc);
 
@@ -55,38 +57,42 @@ public void ChildProviderGiven_TableInfoWith_NullDatabase()
     [Test]
     public void TestUpTo()
     {
-        string[] skip = {"AllAggregateContainers","_dataExportFilterManager","dataExportRepository","WriteLock","_oProjectNumberToCohortsDictionary","_errorsCheckNotifier", "ProgressStopwatch" };
+        string[] skip =
+        {
+            "AllAggregateContainers", "_dataExportFilterManager", "dataExportRepository", "WriteLock",
+            "_oProjectNumberToCohortsDictionary", "_errorsCheckNotifier", "ProgressStopwatch"
+        };
 
         // We have 2 providers and want to suck all the data out of one into the other
-        var cp1 = new DataExportChildProvider(RepositoryLocator,null,new ThrowImmediatelyCheckNotifier(),null);
-        var cp2 = new DataExportChildProvider(RepositoryLocator,null,new ThrowImmediatelyCheckNotifier(),null);
+        var cp1 = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
+        var cp2 = new DataExportChildProvider(RepositoryLocator, null, new ThrowImmediatelyCheckNotifier(), null);
 
         //to start with let's make sure all fields and properties are different on the two classes except where we expect them to be the same
         var bindFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static;
 
-        foreach(var prop in typeof(DataExportChildProvider).GetProperties().Where(p => !skip.Contains(p.Name)))
+        foreach (var prop in typeof(DataExportChildProvider).GetProperties().Where(p => !skip.Contains(p.Name)))
         {
             var val1 = prop.GetValue(cp1);
             var val2 = prop.GetValue(cp2);
 
             // these are exempt, I guess 2 seperate empty arrays are now considered 'same'
-            if(val1 is Array a1 && val2 is Array a2 && a1.Length == 0 && a2.Length == 0)
+            if (val1 is Array a1 && val2 is Array a2 && a1.Length == 0 && a2.Length == 0)
                 continue;
 
-            Assert.AreNotSame(val1,val2,$"Prop {prop} was unexpectedly the same between child providers");
+            Assert.AreNotSame(val1, val2, $"Prop {prop} was unexpectedly the same between child providers");
         }
 
 
-        foreach(var field in typeof(DataExportChildProvider).GetFields(bindFlags).Where(p=>!skip.Contains(p.Name)))
+        foreach (var field in typeof(DataExportChildProvider).GetFields(bindFlags).Where(p => !skip.Contains(p.Name)))
         {
             var val1 = field.GetValue(cp1);
             var val2 = field.GetValue(cp2);
 
             // these are exempt, I guess 2 seperate empty arrays are now considered 'same'
-            if(val1 is Array a1 && val2 is Array a2 && a1.Length == 0 && a2.Length == 0)
+            if (val1 is Array a1 && val2 is Array a2 && a1.Length == 0 && a2.Length == 0)
                 continue;
 
-            Assert.AreNotSame(val1,val2,$"Field {field} was unexpectedly the same between child providers");
+            Assert.AreNotSame(val1, val2, $"Field {field} was unexpectedly the same between child providers");
         }
 
 
@@ -95,10 +101,11 @@ public void TestUpTo()
 
         var badProps = new List<string>();
 
-        foreach(var prop in typeof(DataExportChildProvider).GetProperties().Where(p=>!skip.Contains(p.Name)))
+        foreach (var prop in typeof(DataExportChildProvider).GetProperties().Where(p => !skip.Contains(p.Name)))
             try
             {
-                Assert.AreSame(prop.GetValue(cp1),prop.GetValue(cp2),$"Prop {prop} was not the same between child providers - after UpdateTo");
+                Assert.AreSame(prop.GetValue(cp1), prop.GetValue(cp2),
+                    $"Prop {prop} was not the same between child providers - after UpdateTo");
             }
             catch (Exception)
             {
@@ -109,18 +116,18 @@ public void TestUpTo()
 
         var badFields = new List<string>();
 
-        foreach(var field in typeof(DataExportChildProvider).GetFields(bindFlags).Where(p=>!skip.Contains(p.Name)))
+        foreach (var field in typeof(DataExportChildProvider).GetFields(bindFlags).Where(p => !skip.Contains(p.Name)))
             try
             {
-                Assert.AreSame(field.GetValue(cp1),field.GetValue(cp2),$"Field {field} was not the same between child providers - after UpdateTo");
+                Assert.AreSame(field.GetValue(cp1), field.GetValue(cp2),
+                    $"Field {field} was not the same between child providers - after UpdateTo");
             }
-            catch(Exception)
+            catch (Exception)
             {
                 badFields.Add(field.Name);
             }
 
         Assert.IsEmpty(badFields);
-
     }
 
     [Test]
@@ -239,6 +246,7 @@ public void TestDuplicateTableInfos_DifferentDatabases()
         Assert.IsInstanceOf<TableInfoDatabaseNode>(p2[2]);
         Assert.AreNotEqual(p1[2], p2[2]); // Database (i.e. Frank/Biff)
     }
+
     /// <summary>
     /// Capitalization changes are not considered different.  This test confirms that
     /// when user has 2 nodes that have SERVER names with different caps they get grouped
diff --git a/Rdmp.UI.Tests/CohortBuilding/CohortIdentificationConfigurationUnitTests.cs b/Rdmp.UI.Tests/CohortBuilding/CohortIdentificationConfigurationUnitTests.cs
index 719ae53e38..39257215fb 100644
--- a/Rdmp.UI.Tests/CohortBuilding/CohortIdentificationConfigurationUnitTests.cs
+++ b/Rdmp.UI.Tests/CohortBuilding/CohortIdentificationConfigurationUnitTests.cs
@@ -14,12 +14,12 @@
 
 namespace Rdmp.UI.Tests.CohortBuilding;
 
-internal class CohortIdentificationConfigurationUnitTests:UITests
+internal class CohortIdentificationConfigurationUnitTests : UITests
 {
     private void GetObjects(out Catalogue cata, out CohortIdentificationConfiguration cic)
     {
         cic = WhenIHaveA<CohortIdentificationConfiguration>();
-             
+
         cic.CreateRootContainerIfNotExists();
 
         //clear anything old
@@ -35,7 +35,8 @@ private void GetObjects(out Catalogue cata, out CohortIdentificationConfiguratio
         cata = ei.CatalogueItem.Catalogue;
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_AggregateConfigurationOrder_TwoAggregates()
     {
         DeleteOldAggregates();
@@ -43,16 +44,18 @@ public void Test_AggregateConfigurationOrder_TwoAggregates()
         GetObjects(out var cata, out var cic);
 
         //we should be able to add it
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, new CatalogueCombineable(cata),cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,
+            new CatalogueCombineable(cata), cic.RootCohortAggregateContainer);
         AssertCommandIsPossible(cmd);
 
         cmd.Execute();
 
         var ac1 = (AggregateConfiguration)cic.RootCohortAggregateContainer.GetOrderedContents().First();
-        Assert.AreEqual(0,ac1.Order);
+        Assert.AreEqual(0, ac1.Order);
 
         //add another one
-        var cmd2 = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, new CatalogueCombineable(cata),cic.RootCohortAggregateContainer);
+        var cmd2 = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,
+            new CatalogueCombineable(cata), cic.RootCohortAggregateContainer);
         AssertCommandIsPossible(cmd2);
         cmd2.Execute();
 
@@ -61,20 +64,23 @@ public void Test_AggregateConfigurationOrder_TwoAggregates()
         ac1 = (AggregateConfiguration)all[0];
         var ac2 = (AggregateConfiguration)all[1];
 
-        Assert.AreEqual(0,ac1.Order);
-        Assert.AreEqual(1,ac2.Order);
+        Assert.AreEqual(0, ac1.Order);
+        Assert.AreEqual(1, ac2.Order);
 
-        Assert.AreEqual(2, Repository.GetAllObjects<AggregateConfiguration>().Length, "Expected you to create 2 AggregateConfiguration only");
+        Assert.AreEqual(2, Repository.GetAllObjects<AggregateConfiguration>().Length,
+            "Expected you to create 2 AggregateConfiguration only");
     }
 
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_AggregateConfigurationOrder_MovingAggregatesBetweenContainers()
     {
         GetObjects(out var cata, out var cic);
 
         //we should be able to add it to root container
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, new CatalogueCombineable(cata),cic.RootCohortAggregateContainer);
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,
+            new CatalogueCombineable(cata), cic.RootCohortAggregateContainer);
         cmd.Execute();
 
 
@@ -83,7 +89,8 @@ public void Test_AggregateConfigurationOrder_MovingAggregatesBetweenContainers()
         cic.RootCohortAggregateContainer.AddChild(subcontainer);
 
         //add the second ac to the subcontainer 
-        var cmd2 = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, new CatalogueCombineable(cata),subcontainer);
+        var cmd2 = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,
+            new CatalogueCombineable(cata), subcontainer);
         cmd2.Execute();
 
         //should now look like this:
@@ -95,16 +102,17 @@ public void Test_AggregateConfigurationOrder_MovingAggregatesBetweenContainers()
 
         var all = cic.RootCohortAggregateContainer.GetOrderedContents().ToArray();
 
-        var ac1 = (AggregateConfiguration) all[1];
+        var ac1 = (AggregateConfiguration)all[1];
         var ac2 = (AggregateConfiguration)subcontainer.GetOrderedContents().Single();
-        var intersect = (CohortAggregateContainer) all[0];
+        var intersect = (CohortAggregateContainer)all[0];
 
-        Assert.AreEqual(0,intersect.Order);
-        Assert.AreEqual(1,ac1.Order);
-        Assert.AreEqual(0,ac2.Order);
+        Assert.AreEqual(0, intersect.Order);
+        Assert.AreEqual(1, ac1.Order);
+        Assert.AreEqual(0, ac2.Order);
 
         //now move the Ac2 to Root (problematic since both Ac 2 and the INTERSECT have Order 0 - in their own separate containers)
-        var cmd3 = new ExecuteCommandMoveAggregateIntoContainer(ItemActivator, new AggregateConfigurationCombineable(ac2),cic.RootCohortAggregateContainer);
+        var cmd3 = new ExecuteCommandMoveAggregateIntoContainer(ItemActivator,
+            new AggregateConfigurationCombineable(ac2), cic.RootCohortAggregateContainer);
         cmd3.Execute();
 
         all = cic.RootCohortAggregateContainer.GetOrderedContents().ToArray();
@@ -115,13 +123,13 @@ public void Test_AggregateConfigurationOrder_MovingAggregatesBetweenContainers()
         //  INTERSECT (empty)
         //  Ac 1
 
-        ac2 = (AggregateConfiguration) all[0];
-        intersect = (CohortAggregateContainer) all[1];
+        ac2 = (AggregateConfiguration)all[0];
+        intersect = (CohortAggregateContainer)all[1];
         ac1 = (AggregateConfiguration)all[2];
 
-        Assert.AreEqual(0,ac2.Order);
-        Assert.AreEqual(1,intersect.Order);
-        Assert.AreEqual(2,ac1.Order);
+        Assert.AreEqual(0, ac2.Order);
+        Assert.AreEqual(1, intersect.Order);
+        Assert.AreEqual(2, ac1.Order);
     }
 
     private void DeleteOldAggregates()
@@ -130,7 +138,7 @@ private void DeleteOldAggregates()
         foreach (var ac in Repository.GetAllObjects<AggregateConfiguration>())
             ac.DeleteInDatabase();
 
-        Assert.AreEqual(0, Repository.GetAllObjects<AggregateConfiguration>().Length, "We just deleted the AggregateConfigurations why were there suddenly some in the db!?");
+        Assert.AreEqual(0, Repository.GetAllObjects<AggregateConfiguration>().Length,
+            "We just deleted the AggregateConfigurations why were there suddenly some in the db!?");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/CohortUI/CohortSourceManagement/ExternalCohortTableUITests.cs b/Rdmp.UI.Tests/CohortUI/CohortSourceManagement/ExternalCohortTableUITests.cs
index 37acffd1e7..84373e7fc4 100644
--- a/Rdmp.UI.Tests/CohortUI/CohortSourceManagement/ExternalCohortTableUITests.cs
+++ b/Rdmp.UI.Tests/CohortUI/CohortSourceManagement/ExternalCohortTableUITests.cs
@@ -10,9 +10,10 @@
 
 namespace Rdmp.UI.Tests.CohortUI.CohortSourceManagement;
 
-public class ExternalCohortTableUITests :UITests
+public class ExternalCohortTableUITests : UITests
 {
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_ExternalCohortTableUI_Constructor()
     {
         var o = WhenIHaveA<ExternalCohortTable>();
@@ -20,7 +21,8 @@ public void Test_ExternalCohortTableUI_Constructor()
         Assert.IsNotNull(ui);
 
         //because cohort table doesnt actually go to a legit database the source should have been forbidlisted during the child provider stage (not really related to our UI).
-        AssertErrorWasShown(ExpectedErrorType.GlobalErrorCheckNotifier,"Could not reach cohort 'My cohorts' (it may be slow responding or inaccessible"); 
+        AssertErrorWasShown(ExpectedErrorType.GlobalErrorCheckNotifier,
+            "Could not reach cohort 'My cohorts' (it may be slow responding or inaccessible");
         AssertNoErrors(ExpectedErrorType.Fatal);
         AssertNoErrors(ExpectedErrorType.KilledForm);
         AssertNoErrors(ExpectedErrorType.ErrorProvider);
diff --git a/Rdmp.UI.Tests/CommandExecution/Alter/ExecuteCommandAlterColumnTypeTests.cs b/Rdmp.UI.Tests/CommandExecution/Alter/ExecuteCommandAlterColumnTypeTests.cs
index c4bd5ea8b3..4723f21d83 100644
--- a/Rdmp.UI.Tests/CommandExecution/Alter/ExecuteCommandAlterColumnTypeTests.cs
+++ b/Rdmp.UI.Tests/CommandExecution/Alter/ExecuteCommandAlterColumnTypeTests.cs
@@ -15,15 +15,15 @@
 
 namespace Rdmp.UI.Tests.CommandExecution.Alter;
 
-internal class ExecuteCommandAlterColumnTypeTests:DatabaseTests
+internal class ExecuteCommandAlterColumnTypeTests : DatabaseTests
 {
-    [TestCaseSource(typeof(All),nameof(All.DatabaseTypes))]
+    [TestCaseSource(typeof(All), nameof(All.DatabaseTypes))]
     [UITimeout(10000)]
     public void AlterColumnType_NoArchive(DatabaseType dbType)
     {
-
         var db = GetCleanedServer(dbType);
-        var tbl = db.CreateTable("MyTbl", new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
+        var tbl = db.CreateTable("MyTbl",
+            new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
 
         Import(tbl, out var ti, out _);
 
@@ -31,7 +31,7 @@ public void AlterColumnType_NoArchive(DatabaseType dbType)
         var activator = new TestActivateItems(ui, new MemoryDataExportRepository());
 
         var myCol = tbl.DiscoverColumn("myCol");
-            
+
         //should have started out as 10
         Assert.AreEqual(10, myCol.DataType.GetLengthIfString());
 
@@ -58,10 +58,11 @@ public void AlterColumnType_NoArchive(DatabaseType dbType)
     [UITimeout(10000)]
     public void AlterColumnType_WithArchive(DatabaseType dbType)
     {
-
         var db = GetCleanedServer(dbType);
-        var tbl = db.CreateTable("MyTbl", new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
-        var tblArchive = db.CreateTable("MyTbl_Archive", new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
+        var tbl = db.CreateTable("MyTbl",
+            new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
+        var tblArchive = db.CreateTable("MyTbl_Archive",
+            new[] { new DatabaseColumnRequest("mycol", new DatabaseTypeRequest(typeof(string), 10)) });
 
         Import(tbl, out var ti, out _);
 
diff --git a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs
index 77fa73f6e7..5836ca1a1f 100644
--- a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs
+++ b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandClearFavouritesTests.cs
@@ -13,49 +13,50 @@ namespace Rdmp.UI.Tests.CommandExecution;
 
 internal class ExecuteCommandClearFavouritesTests : UITests
 {
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_NoFavourites()
     {
         var cmd = new ExecuteCommandClearFavourites(ItemActivator);
 
         Assert.IsTrue(cmd.IsImpossible);
-        StringAssert.AreEqualIgnoringCase("You do not have any Favourites",cmd.ReasonCommandImpossible);
+        StringAssert.AreEqualIgnoringCase("You do not have any Favourites", cmd.ReasonCommandImpossible);
 
         var myFavCatalogue = WhenIHaveA<Catalogue>();
 
-        ItemActivator.FavouritesProvider.AddFavourite(this,myFavCatalogue);
-            
+        ItemActivator.FavouritesProvider.AddFavourite(this, myFavCatalogue);
+
         cmd = new ExecuteCommandClearFavourites(ItemActivator);
         Assert.IsFalse(cmd.IsImpossible);
     }
 
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ClearFavourites()
     {
         var myFavCatalogue = WhenIHaveA<Catalogue>();
         var mProject = WhenIHaveA<Project>();
 
-        ItemActivator.FavouritesProvider.AddFavourite(this,myFavCatalogue);
-        ItemActivator.FavouritesProvider.AddFavourite(this,mProject);
+        ItemActivator.FavouritesProvider.AddFavourite(this, myFavCatalogue);
+        ItemActivator.FavouritesProvider.AddFavourite(this, mProject);
 
         Assert.AreEqual(2, ItemActivator.FavouritesProvider.CurrentFavourites.Count);
-            
+
         //when we say no to deleting them
         ItemActivator.YesNoResponse = false;
 
         var cmd = new ExecuteCommandClearFavourites(ItemActivator);
         cmd.Execute();
-            
+
         //they should not be deleted!
         Assert.AreEqual(2, ItemActivator.FavouritesProvider.CurrentFavourites.Count);
 
         //when we say yes to deleting them
         ItemActivator.YesNoResponse = true;
         cmd.Execute();
-            
+
         //they should not be deleted
         Assert.IsEmpty(ItemActivator.FavouritesProvider.CurrentFavourites);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandDeleteTests.cs b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandDeleteTests.cs
index bbaecbaab3..cf9ad0b394 100644
--- a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandDeleteTests.cs
+++ b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandDeleteTests.cs
@@ -15,7 +15,6 @@ namespace Rdmp.UI.Tests.CommandExecution;
 
 internal class ExecuteCommandDeleteTests : UITests
 {
-
     [Test]
     public void Delete_IsSupportedCommand()
     {
@@ -28,7 +27,8 @@ public void Delete_IsSupportedCommand()
     /// RDMPDEV-1551 Tests system behaviour when user selects a <see cref="CatalogueItem"/> and the <see cref="ExtractionInformation"/>
     /// that is the immediate child of it and issues a multi delete.  The first delete will also CASCADE delete the other
     /// </summary>
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void TestDeleteMultiple_OneObjectInheritsAnother()
     {
         var ei = WhenIHaveA<ExtractionInformation>();
@@ -49,37 +49,38 @@ public void TestDeleteMultiple_OneObjectInheritsAnother()
         Assert.IsFalse(ei.Exists());
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_DeleteRootContainer_IsImpossible()
     {
         var container = WhenIHaveA<CohortAggregateContainer>();
         Assert.IsNotNull(container);
-        Assert.IsTrue(container.IsRootContainer(),"expected it to be a root container");
+        Assert.IsTrue(container.IsRootContainer(), "expected it to be a root container");
 
         var cmd = new ExecuteCommandDelete(ItemActivator, container);
 
-        Assert.IsTrue(cmd.IsImpossible,"expected command to be impossible");
-        StringAssert.Contains("root container",cmd.ReasonCommandImpossible);
-
+        Assert.IsTrue(cmd.IsImpossible, "expected command to be impossible");
+        StringAssert.Contains("root container", cmd.ReasonCommandImpossible);
     }
 
-        
-    [Test, UITimeout(50000)]
+
+    [Test]
+    [UITimeout(50000)]
     public void Test_Delete2RootContainers_IsImpossible()
     {
         var container1 = WhenIHaveA<CohortAggregateContainer>();
 
         var container2 = WhenIHaveA<CohortAggregateContainer>();
 
-        var cmd = new ExecuteCommandDelete(ItemActivator, new IDeleteable[]{container1,container2});
-
-        Assert.IsTrue(cmd.IsImpossible,"expected command to be impossible");
-        StringAssert.Contains("root container",cmd.ReasonCommandImpossible);
+        var cmd = new ExecuteCommandDelete(ItemActivator, new IDeleteable[] { container1, container2 });
 
+        Assert.IsTrue(cmd.IsImpossible, "expected command to be impossible");
+        StringAssert.Contains("root container", cmd.ReasonCommandImpossible);
     }
 
-        
-    [Test, UITimeout(50000)]
+
+    [Test]
+    [UITimeout(50000)]
     public void Test_DeleteNonRootContainer_Possible()
     {
         var container = WhenIHaveA<CohortAggregateContainer>();
@@ -90,11 +91,9 @@ public void Test_DeleteNonRootContainer_Possible()
         cic.SaveToDatabase();
 
         container.AddChild(subcontainer);
-        Assert.IsFalse(subcontainer.IsRootContainer(),"expected it not to be a root container");
+        Assert.IsFalse(subcontainer.IsRootContainer(), "expected it not to be a root container");
         var cmd = new ExecuteCommandDelete(ItemActivator, subcontainer);
 
-        Assert.IsFalse(cmd.IsImpossible,"expected command to be possible");
-
+        Assert.IsFalse(cmd.IsImpossible, "expected command to be possible");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandImportDublinCoreFormatTests.cs b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandImportDublinCoreFormatTests.cs
index b25718dbf1..92188bb00a 100644
--- a/Rdmp.UI.Tests/CommandExecution/ExecuteCommandImportDublinCoreFormatTests.cs
+++ b/Rdmp.UI.Tests/CommandExecution/ExecuteCommandImportDublinCoreFormatTests.cs
@@ -14,7 +14,6 @@ namespace Rdmp.UI.Tests.CommandExecution;
 
 internal class ExecuteCommandImportDublinCoreFormatTests
 {
-
     /// <summary>
     /// This test also appears in the Rdmp.Tests project since it behaves differently in different runtime. 
     /// </summary>
@@ -23,21 +22,23 @@ public void Test_DublinCore_WriteReadFile_Net461()
     {
         var def1 = new DublinCoreDefinition
         {
-            Title =  "ssssshh",
-            Alternative =  "O'Rly",
+            Title = "ssssshh",
+            Alternative = "O'Rly",
             Description = "Description of stuff",
             Format = "text/html",
             Identifier = new Uri("http://foo.com"),
             Publisher = "University of Dundee",
             IsPartOf = new Uri("http://foo2.com"),
-            Modified = new DateTime(2001,1,1),
+            Modified = new DateTime(2001, 1, 1),
             Subject = "Interesting, PayAttention, HighPriority, Omg"
         };
 
         var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory, "dublin.xml"));
 
-        using(var outStream = fi.OpenWrite())
+        using (var outStream = fi.OpenWrite())
+        {
             def1.WriteXml(outStream);
+        }
 
         using (var inStream = fi.OpenRead())
         {
diff --git a/Rdmp.UI.Tests/Curation/Integration/ExtractionFilterUITests.cs b/Rdmp.UI.Tests/Curation/Integration/ExtractionFilterUITests.cs
index 6dc972a499..159f93ccde 100644
--- a/Rdmp.UI.Tests/Curation/Integration/ExtractionFilterUITests.cs
+++ b/Rdmp.UI.Tests/Curation/Integration/ExtractionFilterUITests.cs
@@ -12,17 +12,16 @@ namespace Rdmp.UI.Tests.Curation.Integration;
 
 internal class ExtractionFilterUITests : UITests
 {
-
     [Test]
     public void TestExtractionFilterDeleting_WhenItHas_ExtractionFilterParameterSet_Interactive()
     {
         var filter = WhenIHaveA<ExtractionFilter>();
 
-        var set = new ExtractionFilterParameterSet(Repository,filter,"fff");
+        var set = new ExtractionFilterParameterSet(Repository, filter, "fff");
 
         Assert.IsTrue(filter.Exists());
         Assert.IsTrue(set.Exists());
-            
+
         SetupMEF();
 
         var activator = new TestActivateItems(this, Repository)
@@ -37,5 +36,4 @@ public void TestExtractionFilterDeleting_WhenItHas_ExtractionFilterParameterSet_
         Assert.IsFalse(filter.Exists());
         Assert.IsFalse(set.Exists());
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUITests.cs b/Rdmp.UI.Tests/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUITests.cs
index cbeb57db8a..3401803107 100644
--- a/Rdmp.UI.Tests/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUITests.cs
+++ b/Rdmp.UI.Tests/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUITests.cs
@@ -10,15 +10,17 @@
 
 namespace Rdmp.UI.Tests.DataLoadUIs.ANOUIs.ANOTableManagement;
 
-public class ColumnInfoToANOTableConverterUITests :UITests
+public class ColumnInfoToANOTableConverterUITests : UITests
 {
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_ColumnInfoToANOTableConverterUI_Constructor()
     {
         var o = WhenIHaveA<ColumnInfo>();
         var ui = AndLaunch<ColumnInfoToANOTableConverterUI>(o);
         Assert.IsNotNull(ui);
-        AssertErrorWasShown(ExpectedErrorType.KilledForm,"Could not get connection string because Server was null on dataAccessPoint 'My_Table'");
+        AssertErrorWasShown(ExpectedErrorType.KilledForm,
+            "Could not get connection string because Server was null on dataAccessPoint 'My_Table'");
         //AssertNoErrors(ExpectedErrorType.Fatal);
         //AssertNoErrors(ExpectedErrorType.KilledForm);
     }
diff --git a/Rdmp.UI.Tests/DataRelease/DataReleaseUITests.cs b/Rdmp.UI.Tests/DataRelease/DataReleaseUITests.cs
index e81757fc37..5878d1ce28 100644
--- a/Rdmp.UI.Tests/DataRelease/DataReleaseUITests.cs
+++ b/Rdmp.UI.Tests/DataRelease/DataReleaseUITests.cs
@@ -10,9 +10,10 @@
 
 namespace Rdmp.UI.Tests.DataRelease;
 
-public class DataReleaseUITests :UITests
+public class DataReleaseUITests : UITests
 {
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_DataReleaseUI_Constructor()
     {
         var o = WhenIHaveA<Project>();
diff --git a/Rdmp.UI.Tests/DesignPatternTests/AllObjectsHaveImages.cs b/Rdmp.UI.Tests/DesignPatternTests/AllObjectsHaveImages.cs
index 1bf60af21b..7c55e70e69 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/AllObjectsHaveImages.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/AllObjectsHaveImages.cs
@@ -15,14 +15,13 @@
 
 namespace Rdmp.UI.Tests.DesignPatternTests;
 
-public class AllObjectsHaveImages:DatabaseTests
+public class AllObjectsHaveImages : DatabaseTests
 {
     [Test]
     public void AllIHasDependenciesHaveIcons()
     {
         var exceptionsAllowed = new[]
         {
-
             "IHasDependencies", //base interface of which nobody is who isn't otherwise on this list
             "ITableInfo", //handled because they are all secretly TableInfos
             "AggregateConfiguration", //handled by AggregateConfigurationStateBasedIconProvider
@@ -34,7 +33,6 @@ public void AllIHasDependenciesHaveIcons()
 
             "StackFrame"
             //not required , it's only ever dependent on itself and it doesn't have any visualisation on Catalogue / Export
-
         };
 
         var missingConcepts = RepositoryLocator.CatalogueRepository.MEF.GetAllTypes()
@@ -48,6 +46,6 @@ public void AllIHasDependenciesHaveIcons()
             Console.WriteLine(
                 $"The following Database Object Types are missing concepts (and therefore images) in CatalogueManager.exe{Environment.NewLine}{string.Join($",{Environment.NewLine}", missingConcepts)}");
 
-        Assert.AreEqual(0,missingConcepts.Count);
+        Assert.AreEqual(0, missingConcepts.Count);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/AllUIsDocumentedTest.cs b/Rdmp.UI.Tests/DesignPatternTests/AllUIsDocumentedTest.cs
index 9d62baee3d..a1288c9b1f 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/AllUIsDocumentedTest.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/AllUIsDocumentedTest.cs
@@ -35,13 +35,13 @@ public void EveryClassInAppropriateNamespace()
             "CommandExecution",
             "CommandExecution.AtomicCommands",
             "CommandExecution.AtomicCommands.PluginCommands",
-            "CommandExecution.AtomicCommands.WindowArranging"));//legal namespaces
+            "CommandExecution.AtomicCommands.WindowArranging")); //legal namespaces
 
-        Errors.AddRange(EnforceTypeBelongsInNamespace(typeof(IAtomicCommand), 
+        Errors.AddRange(EnforceTypeBelongsInNamespace(typeof(IAtomicCommand),
             "CommandExecution",
             "CommandExecution.AtomicCommands",
             "CommandExecution.AtomicCommands.PluginCommands",
-            "CommandExecution.AtomicCommands.WindowArranging"));//legal namespaces
+            "CommandExecution.AtomicCommands.WindowArranging")); //legal namespaces
 
         //proposals
         Errors.AddRange(EnforceTypeBelongsInNamespace(typeof(ICommandExecutionProposal), "CommandExecution.Proposals"));
@@ -49,14 +49,15 @@ public void EveryClassInAppropriateNamespace()
         //menus
         Errors.AddRange(EnforceTypeBelongsInNamespace(typeof(ContextMenuStrip), "Menus"));
         Errors.AddRange(EnforceTypeBelongsInNamespace(typeof(ToolStripMenuItem), "Menus.MenuItems"));
-            
+
         foreach (var error in Errors)
             Console.WriteLine($"FATAL NAMESPACE ERROR FAILURE:{error}");
 
-        Assert.AreEqual(Errors.Count,0);
+        Assert.AreEqual(Errors.Count, 0);
     }
 
-    private string[] _exemptNamespaces = {
+    private string[] _exemptNamespaces =
+    {
         "System.ComponentModel.Design",
         "System.Windows.Forms",
         "Rdmp.UI.ScintillaHelper"
@@ -64,11 +65,10 @@ public void EveryClassInAppropriateNamespace()
 
     private IEnumerable<string> EnforceTypeBelongsInNamespace(Type InterfaceType, params string[] legalNamespaces)
     {
-
         SetupMEF();
         foreach (var type in MEF.GetAllTypes().Where(InterfaceType.IsAssignableFrom))
         {
-            if (type.Namespace == null) 
+            if (type.Namespace == null)
                 continue;
 
             //don't validate classes in testing code
@@ -79,7 +79,7 @@ private IEnumerable<string> EnforceTypeBelongsInNamespace(Type InterfaceType, pa
             if (_exemptNamespaces.Any(e => type.Namespace.Contains(e)))
                 continue;
 
-            if (!legalNamespaces.Any(ns=>type.Namespace.Contains(ns)))
+            if (!legalNamespaces.Any(ns => type.Namespace.Contains(ns)))
                 yield return
                     $"Expected Type '{type.Name}' to be in namespace(s) '{string.Join("' or '", legalNamespaces)}' but it was in '{type.Namespace}'";
         }
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/AllImportantClassesDocumented.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/AllImportantClassesDocumented.cs
index 7ea131e3a7..f92f6fdc4f 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/AllImportantClassesDocumented.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/AllImportantClassesDocumented.cs
@@ -31,14 +31,13 @@ public class AllImportantClassesDocumented
 
         //todo resolve the following:
         "ReleasePipeline.cs", //needs refactoring
-        "ReleaseUseCase.cs",//needs refactoring
-        "FixedDataReleaseSource.cs",//needs refactoring
+        "ReleaseUseCase.cs", //needs refactoring
+        "FixedDataReleaseSource.cs", //needs refactoring
         "CacheFetchRequestProvider.cs", //why do we need this class?
-            
-        "SharedObjectImporter.cs", //deprecated by the anonymisation object sharing framework?
-        "Relationship.cs",//deprecated by the anonymisation object sharing framework?
-        "RelationshipMap.cs"//deprecated by the anonymisation object sharing framework?
 
+        "SharedObjectImporter.cs", //deprecated by the anonymisation object sharing framework?
+        "Relationship.cs", //deprecated by the anonymisation object sharing framework?
+        "RelationshipMap.cs" //deprecated by the anonymisation object sharing framework?
     };
 
     public void FindProblems(List<string> csFilesList)
@@ -47,13 +46,13 @@ public void FindProblems(List<string> csFilesList)
 
         foreach (var f in _csFilesList)
         {
-            if(excusedClassFileNames.Contains(Path.GetFileName(f)))
+            if (excusedClassFileNames.Contains(Path.GetFileName(f)))
                 continue;
 
             var text = File.ReadAllText(f);
 
             var startAt = text.IndexOf("public class");
-            if(startAt == -1)
+            if (startAt == -1)
                 startAt = text.IndexOf("public interface");
 
             if (startAt != -1)
@@ -62,8 +61,8 @@ public void FindProblems(List<string> csFilesList)
 
                 var mNamespace = Regex.Match(beforeDeclaration, "namespace (.*)");
 
-                if(!mNamespace.Success)
-                    Assert.Fail($"No namespace found in class file {f}");//no namespace in class!
+                if (!mNamespace.Success)
+                    Assert.Fail($"No namespace found in class file {f}"); //no namespace in class!
 
                 var nameSpace = mNamespace.Groups[1].Value;
 
@@ -71,13 +70,13 @@ public void FindProblems(List<string> csFilesList)
                 if (nameSpace.Contains("Tests"))
                     continue;
 
-                if (nameSpace.Contains("TestData.Relational"))//this has never been tested / used
+                if (nameSpace.Contains("TestData.Relational")) //this has never been tested / used
                     continue;
 
-                if (nameSpace.Contains("CohortManagerLibrary.FreeText"))//this has never been tested / used
+                if (nameSpace.Contains("CohortManagerLibrary.FreeText")) //this has never been tested / used
                     continue;
 
-                if (nameSpace.Contains("CatalogueWebService"))//this has never been tested / used
+                if (nameSpace.Contains("CatalogueWebService")) //this has never been tested / used
                     continue;
 
                 if (nameSpace.Contains("CommitAssemblyEmptyAssembly"))
@@ -97,7 +96,7 @@ public void FindProblems(List<string> csFilesList)
                             continue;
                         if (nameSpace.Contains("CommandExecution"))
                             continue;
-                            
+
                         if (nameSpace.Contains("Copying"))
                             continue;
                         if (nameSpace.Contains("Icons"))
@@ -111,16 +110,17 @@ public void FindProblems(List<string> csFilesList)
 
                         if (nameSpace.Contains("MapsDirectlyToDatabaseTableUI"))
                             continue;
-                            
+
                         //Provider specific implementations of stuff that is documented at interface level
-                        if (nameSpace.Contains(".Discovery.Microsoft") ||nameSpace.Contains(".Discovery.Oracle") ||nameSpace.Contains(".Discovery.MySql"))
+                        if (nameSpace.Contains(".Discovery.Microsoft") || nameSpace.Contains(".Discovery.Oracle") ||
+                            nameSpace.Contains(".Discovery.MySql"))
                             continue;
                     }
 
                     var idxLastSlash = f.LastIndexOf("\\");
 
-                    if(idxLastSlash != -1)
-                        problems.Add(string.Format("FAIL UNDOCUMENTED CLASS:{0} ({1})", 
+                    if (idxLastSlash != -1)
+                        problems.Add(string.Format("FAIL UNDOCUMENTED CLASS:{0} ({1})",
                             f[(f.LastIndexOf("\\") + 1)..],
                             f[..idxLastSlash])
                         );
@@ -129,19 +129,20 @@ public void FindProblems(List<string> csFilesList)
                 }
                 else
                 {
-                    var lines = match.Groups[1].Value.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).Length;
+                    var lines = match.Groups[1].Value
+                        .Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).Length;
                     commentLineCount += lines;
                     commentedCount++;
                 }
             }
         }
-            
+
         foreach (var fail in problems)
             Console.WriteLine(fail);
 
         Console.WriteLine($"Total Documented Classes:{commentedCount}");
         Console.WriteLine($"Total Lines of Classes Documentation:{commentLineCount}");
-            
+
         Assert.AreEqual(0, problems.Count);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/DocumentationCrossExaminationTest.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/DocumentationCrossExaminationTest.cs
index 10ed948071..e0a31818c3 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/DocumentationCrossExaminationTest.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/DocumentationCrossExaminationTest.cs
@@ -17,16 +17,22 @@ namespace Rdmp.UI.Tests.DesignPatternTests.ClassFileEvaluation;
 internal class DocumentationCrossExaminationTest
 {
     private readonly DirectoryInfo _slndir;
-    private static readonly Regex MatchComments = new(@"///[^;\r\n]*",RegexOptions.Compiled|RegexOptions.CultureInvariant);
+
+    private static readonly Regex MatchComments =
+        new(@"///[^;\r\n]*", RegexOptions.Compiled | RegexOptions.CultureInvariant);
 
     private string[] _mdFiles;
-    private static readonly Regex MatchMdReferences = new(@"`(.*)`",RegexOptions.Compiled|RegexOptions.CultureInvariant);
+
+    private static readonly Regex MatchMdReferences =
+        new(@"`(.*)`", RegexOptions.Compiled | RegexOptions.CultureInvariant);
 
     private const bool ReWriteMarkdownToReferenceGlossary = true;
 
     //words that are in Pascal case and you can use in comments despite not being in the codebase... this is an ironic variable to be honest
     //since the very fact that you add something to _ignorelist means that it is in the codebase after all!
+
     #region IgnoreList Terms
+
     private static readonly HashSet<string> IgnoreList = new()
     {
         "ExecuteAggregateGraph",
@@ -152,9 +158,9 @@ internal class DocumentationCrossExaminationTest
         "ProposedFixes",
         "PropertyX",
         "FamilyMembers",
-            
+
         //CreatingANewCollectionTreeNode.md
-        "FolderOfX", 
+        "FolderOfX",
 
         //PluginWriting.md
         "MyPluginUserInterface",
@@ -197,7 +203,7 @@ internal class DocumentationCrossExaminationTest
         "SexDescription",
         "SexDescriptionLong",
         "MyTransform",
-            
+
         "MyObject",
         "MyObjectMenu",
         "AllServersNodeMenu",
@@ -270,11 +276,13 @@ internal class DocumentationCrossExaminationTest
         "SocialSecurityNumber",
         "BuildInParallel"
     };
+
     #endregion
+
     public DocumentationCrossExaminationTest(DirectoryInfo slndir)
     {
         _slndir = slndir;
-        _mdFiles = Directory.GetFiles(slndir.FullName, "*.md",SearchOption.AllDirectories);
+        _mdFiles = Directory.GetFiles(slndir.FullName, "*.md", SearchOption.AllDirectories);
     }
 
     public void FindProblems(List<string> csFilesFound)
@@ -298,16 +306,15 @@ public void FindProblems(List<string> csFilesFound)
         foreach (var file in csFilesFound)
         {
             var isDesignerFile = file.Contains(".Designer.cs");
-                
-            if(file.Contains("CodeTutorials"))
+
+            if (file.Contains("CodeTutorials"))
                 continue;
-                
+
             //don't look in the packages dir!
-            if(file.Contains("packages"))
+            if (file.Contains("packages"))
                 continue;
 
             foreach (var line in File.ReadAllLines(file))
-            {
                 //if it is a comment
                 if (MatchComments.IsMatch(line))
                 {
@@ -316,7 +323,7 @@ public void FindProblems(List<string> csFilesFound)
 
                     if (!fileCommentTokens.ContainsKey(file))
                         fileCommentTokens.Add(file, new HashSet<string>());
-                        
+
                     //its a comment extract all pascal case words
                     foreach (Match word in Regex.Matches(line, @"\b([A-Z]\w+){2,}"))
                         fileCommentTokens[file].Add(word.Value);
@@ -327,31 +334,29 @@ public void FindProblems(List<string> csFilesFound)
                     foreach (Match word in Regex.Matches(line, @"\w+"))
                         codeTokens.Add(word.Value);
                 }
-            }
         }
 
         //find all comments in .md tutorials
         foreach (var mdFile in _mdFiles)
         {
             //don't look in the packages dir!
-            if(mdFile.Contains("packages"))
+            if (mdFile.Contains("packages"))
                 continue;
 
-            fileCommentTokens.Add(mdFile,new HashSet<string>());
+            fileCommentTokens.Add(mdFile, new HashSet<string>());
             var fileContents = File.ReadAllText(mdFile);
-                
+
             foreach (Match m in MatchMdReferences.Matches(fileContents))
             foreach (Match word in Regex.Matches(m.Groups[1].Value, @"([A-Z]\w+){2,}"))
                 fileCommentTokens[mdFile].Add(word.Value);
 
-            EnsureMaximumGlossaryUse(mdFile,problems);
+            EnsureMaximumGlossaryUse(mdFile, problems);
 
             EnsureCodeBlocksCompile(mdFile, problems);
         }
 
 
-        foreach ((var filename, var tokens) in fileCommentTokens)
-        {
+        foreach (var (filename, tokens) in fileCommentTokens)
             problems.AddRange(tokens
                 .Where(token => !codeTokens.Contains(token) && !codeTokens.Contains($"ExecuteCommand{token}"))
                 .Where(token => !IgnoreList.Contains(token))
@@ -359,23 +364,25 @@ public void FindProblems(List<string> csFilesFound)
                 .Where(token => token.Length <= 2 || !token.EndsWith("s") || !codeTokens.Contains(token[..^1]))
                 .Select(token =>
                     $"FATAL PROBLEM: File '{filename}' talks about something which isn't in the codebase, called a:{Environment.NewLine}{token}"));
-        }
 
         if (problems.Any())
         {
-            Console.WriteLine("Found problem words in comments (Scroll down to see by file then if you think they are fine add them to DocumentationCrossExaminationTest._ignorelist):");
-            foreach (var pLine in problems.Where(l=>l.Contains('\n')).Select(p => p.Split('\n')))
+            Console.WriteLine(
+                "Found problem words in comments (Scroll down to see by file then if you think they are fine add them to DocumentationCrossExaminationTest._ignorelist):");
+            foreach (var pLine in problems.Where(l => l.Contains('\n')).Select(p => p.Split('\n')))
                 Console.WriteLine($"\"{pLine[1]}\",");
             foreach (var problem in problems)
                 Console.WriteLine(problem);
         }
 
-        Assert.AreEqual(0,problems.Count,"Expected there to be nothing talked about in comments that doesn't appear in the codebase somewhere");
+        Assert.AreEqual(0, problems.Count,
+            "Expected there to be nothing talked about in comments that doesn't appear in the codebase somewhere");
     }
 
     private static void EnsureCodeBlocksCompile(string mdFile, List<string> problems)
     {
-        var codeBlocks = Path.Combine(TestContext.CurrentContext.TestDirectory,"../../../DesignPatternTests/MarkdownCodeBlockTests.cs");
+        var codeBlocks = Path.Combine(TestContext.CurrentContext.TestDirectory,
+            "../../../DesignPatternTests/MarkdownCodeBlockTests.cs");
 
         Console.WriteLine($"Starting {mdFile}");
 
@@ -399,11 +406,12 @@ private static void EnsureCodeBlocksCompile(string mdFile, List<string> problems
                 var guid = match.Groups[1].Value;
                 var sb = new StringBuilder();
 
-                markdownCodeBlocks.Add(guid,null);
+                markdownCodeBlocks.Add(guid, null);
 
                 //consume the line and look for ```csharp on the next line
-                if(!rStartCodeBlock.IsMatch(lines[++i]))
-                    throw new Exception($"Expected code block in markdown for GUID {guid} to be followed by a line {rStartCodeBlock}");
+                if (!rStartCodeBlock.IsMatch(lines[++i]))
+                    throw new Exception(
+                        $"Expected code block in markdown for GUID {guid} to be followed by a line {rStartCodeBlock}");
 
                 //skip the ```csharp line
                 i++;
@@ -418,7 +426,7 @@ private static void EnsureCodeBlocksCompile(string mdFile, List<string> problems
 
         foreach (var kvp in markdownCodeBlocks)
         {
-            var rBlock = new Regex($"#region {kvp.Key}([^#]*)#endregion",RegexOptions.Singleline);
+            var rBlock = new Regex($"#region {kvp.Key}([^#]*)#endregion", RegexOptions.Singleline);
             var m = rBlock.Match(codeBlocksContent);
 
             if (!m.Success)
@@ -428,7 +436,7 @@ private static void EnsureCodeBlocksCompile(string mdFile, List<string> problems
             var code = Regex.Replace(m.Groups[1].Value, "\\s+", " ");
             var docs = Regex.Replace(kvp.Value, "\\s+", " ");
 
-            Assert.AreEqual(code.Trim(), docs.Trim(),        
+            Assert.AreEqual(code.Trim(), docs.Trim(),
                 $"Code in the documentation markdown (actual) did not match the corresponding compiled code (expected) for code guid {kvp.Key} markdown file was {mdFile} and code file was {codeBlocks}");
         }
     }
@@ -442,19 +450,19 @@ private void EnsureMaximumGlossaryUse(string mdFile, List<string> problems)
         var rGlossaryLink = new Regex(@"^\[\w*\]:");
 
         var glossaryPath = Path.Combine(_slndir.FullName, glossaryRelativePath);
-            
+
         //don't evaluate the glossary!
-        if(Path.GetFileName(mdFile) == "Glossary.md")
+        if (Path.GetFileName(mdFile) == "Glossary.md")
             return;
-            
+
         if (Path.GetFileName(mdFile) == "template.md")
             return;
 
-        var glossaryHeaders = 
+        var glossaryHeaders =
             new HashSet<string>(
                 File.ReadAllLines(glossaryPath)
-                    .Where(l=>rGlossary.IsMatch(l))
-                    .Select(l=>rGlossary.Match(l).Groups[1].Value.Trim()));
+                    .Where(l => rGlossary.IsMatch(l))
+                    .Select(l => rGlossary.Match(l).Groups[1].Value.Trim()));
 
         var inCodeBlock = false;
         var lineNumber = 0;
@@ -468,27 +476,25 @@ private void EnsureMaximumGlossaryUse(string mdFile, List<string> problems)
         {
             lineNumber++;
 
-            if(string.IsNullOrWhiteSpace(line))
+            if (string.IsNullOrWhiteSpace(line))
                 continue;
-                
+
             //don't complain about the glossary links at the bottom of the file.
-            if(rGlossaryLink.IsMatch(line))
+            if (rGlossaryLink.IsMatch(line))
                 continue;
 
             //don't complain about keywords in code blocks
-            if(line.TrimStart().StartsWith("```") || line.TrimStart().StartsWith("> ```"))
+            if (line.TrimStart().StartsWith("```") || line.TrimStart().StartsWith("> ```"))
                 inCodeBlock = !inCodeBlock;
 
             if (!inCodeBlock)
-            {
                 foreach (Match match in rWords.Matches(line))
-                {
                     if (glossaryHeaders.Contains(match.Value))
                     {
                         //It's already got a link on it e.g. [DBMS] or it's "UNION - sometext"
-                        if(match.Index - 1 > 0 
-                           && 
-                           (line[match.Index-1] == '[' || line[match.Index-1] == '"'))
+                        if (match.Index - 1 > 0
+                            &&
+                            (line[match.Index - 1] == '[' || line[match.Index - 1] == '"'))
                             continue;
 
 
@@ -503,9 +509,11 @@ private void EnsureMaximumGlossaryUse(string mdFile, List<string> problems)
                         var suggestedLine = $"[{match.Value}]: {relPath}#{match.Value}";
 
                         //if it has spaces on either side
-                        if(line[Math.Max(0,match.Index-1)] == ' ' && line[Math.Min(line.Length-1,match.Index + match.Length)] == ' '
-                                                                  //don't mess with lines that contain an image
-                                                                  && !line.Contains("!["))
+                        if (line[Math.Max(0, match.Index - 1)] == ' ' && line[
+                                                                          Math.Min(line.Length - 1,
+                                                                              match.Index + match.Length)] == ' '
+                                                                      //don't mess with lines that contain an image
+                                                                      && !line.Contains("!["))
                             allLinesRevised[lineNumber - 1] = line.Replace($" {match.Value} ", $" [{match.Value}] ");
 
                         //also if we have a name like `Catalogue` it should probably be [Catalogue] instead so it works as a link
@@ -514,23 +522,21 @@ private void EnsureMaximumGlossaryUse(string mdFile, List<string> problems)
                         //if it is a novel occurrence
                         if (!allLines.Contains(suggestedLine) && !suggestedLinks.ContainsValue(suggestedLine))
                         {
-                            suggestedLinks.Add(match.Value,suggestedLine);
-                            problems.Add($"Glossary term should be link in {mdFile} line number {lineNumber}.  Term is {match.Value}.  Suggested link line is:\"{suggestedLine}\"" );
+                            suggestedLinks.Add(match.Value, suggestedLine);
+                            problems.Add(
+                                $"Glossary term should be link in {mdFile} line number {lineNumber}.  Term is {match.Value}.  Suggested link line is:\"{suggestedLine}\"");
                         }
                     }
-                }
-            }
         }
-            
+
         // ReSharper disable once RedundantLogicalConditionalExpressionOperand
         // ReSharper disable once ConditionIsAlwaysTrueOrFalse
         if (suggestedLinks.Any() && ReWriteMarkdownToReferenceGlossary)
         {
-            File.WriteAllLines(mdFile,allLinesRevised);
+            File.WriteAllLines(mdFile, allLinesRevised);
 
-            File.AppendAllText(mdFile,Environment.NewLine);
+            File.AppendAllText(mdFile, Environment.NewLine);
             File.AppendAllLines(mdFile, suggestedLinks.Values.Distinct());
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/ExplicitDatabaseNameChecker.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/ExplicitDatabaseNameChecker.cs
index 9589eba342..f18da8ffd5 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/ExplicitDatabaseNameChecker.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/ExplicitDatabaseNameChecker.cs
@@ -23,7 +23,7 @@ public static void FindProblems(List<string> csFilesFound)
         {
             "ExplicitDatabaseNameChecker.cs", //us obviously since we do contain that text!
             "DatabaseCreationProgramOptions.cs", //allowed because it is the usage text for the program.
-            "AutomationServiceOptions.cs",//allowed because it is the usage text for the program.
+            "AutomationServiceOptions.cs", //allowed because it is the usage text for the program.
             "DatabaseTests.cs", //allowed because it is telling user about how you can setup database tests support
             "ChoosePlatformDatabasesUI.Designer.cs", //allowed because it is a suggestion to user about what prefix to use
             "PluginPackagerProgramOptions.cs", //allwed because it's a suggestion to the user about command line arguments
@@ -42,9 +42,6 @@ public static void FindProblems(List<string> csFilesFound)
                 "PlatformDatabaseCreationOptions.cs",
                 "PackOptions.cs",
                 "PasswordEncryptionKeyLocation.cs"
-
-
-
             }); //allowed because it's default arguments for CLI
 
         prohibitedStrings.Add("TEST_");
@@ -52,7 +49,7 @@ public static void FindProblems(List<string> csFilesFound)
 
         foreach (var file in csFilesFound)
         {
-            if (ignoreList.Any(str=>str.Equals(Path.GetFileName(file))))
+            if (ignoreList.Any(str => str.Equals(Path.GetFileName(file))))
                 continue;
 
             var contents = File.ReadAllText(file);
@@ -69,6 +66,6 @@ public static void FindProblems(List<string> csFilesFound)
             Console.WriteLine(
                 $"FAIL: File '{kvp.Key}' contains a reference to an explicitly prohibited database name string ('{kvp.Value}')");
 
-        Assert.AreEqual(0,problemFiles.Count);
+        Assert.AreEqual(0, problemFiles.Count);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/RDMPFormInitializationTests.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/RDMPFormInitializationTests.cs
index 0fe06a3599..80f906026e 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/RDMPFormInitializationTests.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/RDMPFormInitializationTests.cs
@@ -18,6 +18,7 @@ public class RDMPFormInitializationTests
 {
     private readonly List<string> _rdmpFormClassNames = new();
     private readonly List<string> _fails = new();
+
     private List<string> methodIgnoreList = new()
     {
         "if",
@@ -29,8 +30,8 @@ public class RDMPFormInitializationTests
     private Regex methodCalls = new("^\\s*([A-Za-z0-9]*)\\s?\\(", RegexOptions.Multiline);
     private Regex rdmpFormClasses = new("class\\s+(.*)\\s*:\\s*RDMPForm");
     private Regex rdmpControlClasses = new("class\\s+(.*)\\s*:\\s*RDMPUserControl");
-        
-    public void FindUninitializedForms(List<string> csFiles )
+
+    public void FindUninitializedForms(List<string> csFiles)
     {
         foreach (var readToEnd in csFiles.Select(File.ReadAllText))
         {
@@ -46,9 +47,9 @@ public void FindUninitializedForms(List<string> csFiles )
         sbFindInstantiations.Append(string.Join("|", rdmpFormClassNames.Select(Regex.Escape)));
         sbFindInstantiations.Append(")\\s*\\(");
 
-        if(_fails.Any())
-            Assert.Fail("Fix the problems above (anything marked FAIL:) then Clean and Recompile the ENTIRE solution to ensure a fresh copy of SourceCodeForSelfAwareness.zip gets created and run the test again");
-            
+        if (_fails.Any())
+            Assert.Fail(
+                "Fix the problems above (anything marked FAIL:) then Clean and Recompile the ENTIRE solution to ensure a fresh copy of SourceCodeForSelfAwareness.zip gets created and run the test again");
     }
 
     private void DealWithRDMPUserControls(string readToEnd)
@@ -91,11 +92,11 @@ private static void ComplainIfAccessesRepositoryLocatorInConstructor(string read
                     if (curlyBracerCount == -1)
                         curlyBracerCount = 1; //first curly bracer
                     else
-                        curlyBracerCount ++;
+                        curlyBracerCount++;
                 }
 
                 if (substring[index] == '}')
-                    curlyBracerCount --;
+                    curlyBracerCount--;
 
                 sbConstructor.Append(substring[index]);
 
@@ -104,7 +105,7 @@ private static void ComplainIfAccessesRepositoryLocatorInConstructor(string read
 
             var constructor = sbConstructor.ToString();
 
-            if (Regex.IsMatch(constructor,"[^.]RepositoryLocator") || constructor.Contains("_repositoryLocator"))
+            if (Regex.IsMatch(constructor, "[^.]RepositoryLocator") || constructor.Contains("_repositoryLocator"))
                 Assert.Fail(
                     $"Constructor of class {className} contains a reference to RepositoryLocator, this property cannot be used until OnLoad is called");
         }
@@ -124,5 +125,7 @@ private void ComplainIfUsesVisualStudioDesignerDetectionMagic(string readToEnd)
         Console.WriteLine(msg);
         _fails.Add(msg);
     }
-    private static Regex GetConstructorRegex(string className) => new($"(public|private)\\s+{className}\\s*\\(.*\\{{", RegexOptions.Singleline);
+
+    private static Regex GetConstructorRegex(string className) =>
+        new($"(public|private)\\s+{className}\\s*\\(.*\\{{", RegexOptions.Singleline);
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousEmptyChecksMethodsOrNotICheckablePlugins.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousEmptyChecksMethodsOrNotICheckablePlugins.cs
index 34272553b8..8c463e1719 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousEmptyChecksMethodsOrNotICheckablePlugins.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousEmptyChecksMethodsOrNotICheckablePlugins.cs
@@ -29,14 +29,15 @@ public void FindProblems(List<string> csFilesFound)
 
             var contents = File.ReadAllText(file);
 
-            if (!contents.Contains("[DemandsInitialization(\"") && !contents.Contains("[DemandsNestedInitialization(\""))
+            if (!contents.Contains("[DemandsInitialization(\"") &&
+                !contents.Contains("[DemandsNestedInitialization(\""))
                 continue;
 
             Console.WriteLine($"Found Demander:{file}");
 
             var index = contents.IndexOf(checkMethodSignature);
 
-            if(index == -1)
+            if (index == -1)
             {
                 _fails.Add(
                     $"FAIL:File {file} does not have a Check method implementation but contains the text [DemandsInitialization");
diff --git a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousRelationshipPropertyUse.cs b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousRelationshipPropertyUse.cs
index 55ecb0ed28..bd90cb85ec 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousRelationshipPropertyUse.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/ClassFileEvaluation/SuspiciousRelationshipPropertyUse.cs
@@ -23,7 +23,7 @@ namespace Rdmp.UI.Tests.DesignPatternTests.ClassFileEvaluation;
 public class SuspiciousRelationshipPropertyUse
 {
     private readonly MEF mef;
-    private List<string>  _fails = new();
+    private List<string> _fails = new();
 
     public SuspiciousRelationshipPropertyUse(MEF mef)
     {
@@ -33,28 +33,31 @@ public SuspiciousRelationshipPropertyUse(MEF mef)
     public void FindPropertyMisuse(List<string> csFilesFound)
     {
         //Find all the types that come from the database
-        var types = typeof(Catalogue).Assembly.GetTypes().Where(t => typeof(DatabaseEntity).IsAssignableFrom(t));
-        types = types.Union(typeof(Project).Assembly.GetTypes().Where(t => typeof(DatabaseEntity).IsAssignableFrom(t)))
+        var types = typeof(Catalogue).Assembly.GetTypes().Where(static t => typeof(DatabaseEntity).IsAssignableFrom(t));
+        types = types.Union(typeof(Project).Assembly.GetTypes().Where(static t => typeof(DatabaseEntity).IsAssignableFrom(t)))
             .ToArray();
 
         foreach (var type in types)
         {
-            //if it's a spont object ignore it
-            if(typeof(SpontaneousObject).IsAssignableFrom(type) || type == typeof(SpontaneouslyInventedColumn) || type == typeof(SpontaneouslyInventedFilter))
+            //if it's a spontaneous object ignore it
+            if (typeof(SpontaneousObject).IsAssignableFrom(type) || type == typeof(SpontaneouslyInventedColumn) ||
+                type == typeof(SpontaneouslyInventedFilter))
                 continue;
 
             //Find the C sharp code for the class
-            var relationshipProperties = type.GetProperties().Where(p => p.CanRead && !p.CanWrite);
+            var relationshipProperties = type.GetProperties().Where(static p => p.CanRead && !p.CanWrite);
 
             var expectedFileName = $"{type.Name}.cs";
-            var files = csFilesFound.Where(f => f.EndsWith($"\\{expectedFileName}",StringComparison.CurrentCultureIgnoreCase)).ToArray();
+            var files = csFilesFound
+                .Where(f => f.EndsWith($"\\{expectedFileName}", StringComparison.CurrentCultureIgnoreCase)).ToArray();
 
             if (files.Length == 0)
             {
                 _fails.Add($"FAIL: Could not find a csFile called '{expectedFileName}'");
                 continue;
             }
-            if(files.Length > 1)
+
+            if (files.Length > 1)
             {
                 _fails.Add($"FAIL: found multiple csFiles called '{expectedFileName}'");
                 continue;
@@ -63,14 +66,14 @@ public void FindPropertyMisuse(List<string> csFilesFound)
             //Find the #region Relationships bit should contain all the properties which get; database objects or enumerates database objects (These shouldn't have a set;)
             var classSourceCode = File.ReadAllText(files[0]);
 
-            var r = new Regex("#region Relationships(.*)#endregion",RegexOptions.Singleline);
+            var r = new Regex("#region Relationships(.*)#endregion", RegexOptions.Singleline);
 
             string relationshipsRegion = null;
 
             var matches = r.Matches(classSourceCode);
 
             if (matches.Count == 1)
-                relationshipsRegion = matches[0].Groups[1].Value;
+                relationshipsRegion = Regex.Replace(matches[0].Groups[1].Value,"[ \r\n\t]+"," ");
 
             if (matches.Count > 1)
                 _fails.Add($"FAIL: Class {type.FullName} has multiple '#region Relationships' blocks");
@@ -80,14 +83,14 @@ public void FindPropertyMisuse(List<string> csFilesFound)
                 if (relationshipProperty.Name.Equals("ID"))
                     continue;
 
-                if (relationshipProperty.CustomAttributes.All(c => c.AttributeType != typeof (NoMappingToDatabase)))
+                if (relationshipProperty.CustomAttributes.All(static c => c.AttributeType != typeof(NoMappingToDatabase)))
                 {
                     _fails.Add(
                         $"FAIL: Class {type.FullName} has readonly property {relationshipProperty} which is not decorated with NoMapping");
                     continue;
                 }
 
-                if(!IsRelationshipProperty(relationshipProperty.PropertyType))
+                if (!IsRelationshipProperty(relationshipProperty.PropertyType))
                 {
                     Console.WriteLine(
                         $"SKIPPED: Property {relationshipProperty} is ReadOnly and [NoMapping] but doesn't look like it serves up related objects");
@@ -95,8 +98,10 @@ public void FindPropertyMisuse(List<string> csFilesFound)
                 }
 
                 if (relationshipsRegion == null)
+                {
                     _fails.Add(
                         $"FAIL: Class {type.FullName} has no '#region Relationships' blocks but has a relationship style Property called {relationshipProperty.Name}");
+                }
                 else
                 {
                     var expectedString =
@@ -109,33 +114,34 @@ public void FindPropertyMisuse(List<string> csFilesFound)
             }
 
 
-            var databaseProperties = type.GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(p => p.CanRead && p.CanWrite);
+            var databaseProperties = type.GetProperties(BindingFlags.Public | BindingFlags.Instance)
+                .Where(static p => p.CanRead && p.CanWrite);
 
             var suggestedFieldDeclarations = "";
             var suggestedMethodWrappers = "";
 
             foreach (var p in databaseProperties)
             {
-                //its a NoMapping
-                if (p.CustomAttributes.Any(c => c.AttributeType == typeof (NoMappingToDatabase)))
+                //it's a NoMapping
+                if (p.CustomAttributes.Any(static c => c.AttributeType == typeof(NoMappingToDatabase)))
                     continue;
 
                 //special case, let this one pass, nobody should be changing it as a user anyway
-                if(p.Name.Equals("ID"))
+                if (p.Name.Equals("ID"))
                     continue;
 
 
                 var setMethod = p.GetSetMethod(false);
 
-                if(setMethod == null)
+                if (setMethod == null)
                 {
-                    Console.WriteLine($"WARNING: Property {p.Name} on Type {type.Name} has no set or it is not public;");
+                    Console.WriteLine(
+                        $"WARNING: Property {p.Name} on Type {type.Name} has no set or it is not public;");
                     continue;
                 }
 
                 if (MightBeCouldBeMaybeAutoGeneratedInstanceProperty(p))
                 {
-
                     var firstLetter = p.Name.ToLower()[0];
                     var fieldName = $"_{firstLetter}{p.Name[1..]}";
                     var typeName = p.PropertyType.Name;
@@ -147,27 +153,27 @@ public void FindPropertyMisuse(List<string> csFilesFound)
                     if (typeName == "Boolean")
                         typeName = "bool";
 
-                    if (p.PropertyType == typeof (int?))
+                    if (p.PropertyType == typeof(int?))
                         typeName = "int?";
 
-                    if (p.PropertyType == typeof (DateTime?))
+                    if (p.PropertyType == typeof(DateTime?))
                         typeName = "DateTime?";
 
                     suggestedFieldDeclarations += $"private {typeName} {fieldName};{Environment.NewLine}";
 
                     suggestedMethodWrappers += $"public {typeName} {p.Name}{Environment.NewLine}";
                     suggestedMethodWrappers += $"{{{Environment.NewLine}";
-                    suggestedMethodWrappers += $"\tget {{ return {fieldName};}}{Environment.NewLine}";
-                    suggestedMethodWrappers += $"\tset {{ SetField(ref {fieldName},value);}}{Environment.NewLine}";
+                    suggestedMethodWrappers += $"\tget => {fieldName};{Environment.NewLine}";
+                    suggestedMethodWrappers += $"\tset => SetField(ref {fieldName},value);{Environment.NewLine}";
                     suggestedMethodWrappers += $"}}{Environment.NewLine}";
                 }
 
-                if(!setMethod.IsAbstract)
+                if (!setMethod.IsAbstract)
                 {
                     /*var instructions = setMethod.GetInstructions();
 
                     bool foundINotify = false;
-                
+
                     foreach (Instruction instruction in instructions)
                     {
                         MethodInfo methodInfo = instruction.Operand as MethodInfo;
@@ -179,13 +185,13 @@ public void FindPropertyMisuse(List<string> csFilesFound)
 
                     if(!foundINotify)
                         _fails.Add("FAIL:Set Method for property " + p.Name + " on Type " + type.Name + " does not include an Instruction calling method 'SetField' or 'OnPropertyChanged'");
-                    
+
                     */
                 }
             }
 
 
-            if(!string.IsNullOrWhiteSpace(suggestedMethodWrappers))
+            if (!string.IsNullOrWhiteSpace(suggestedMethodWrappers))
             {
                 Console.WriteLine($"CODE SUGGESTION FOR {type.Name}");
                 Console.WriteLine("#region Database Properties");
@@ -195,95 +201,28 @@ public void FindPropertyMisuse(List<string> csFilesFound)
 
                 Console.WriteLine("#endregion");
             }
-
         }
 
-        AnalyseRelationshipPropertyUsages();
-
         foreach (var fail in _fails)
             Console.WriteLine(fail);
 
         Assert.AreEqual(0, _fails.Count);
     }
 
-    private void AnalyseRelationshipPropertyUsages()
-    {
-        foreach (var t in mef.GetAllTypes())
-        {
-            if (!t.IsClass)
-                continue;
-
-            //don't worry about the ToString method on classes that are IInjectKnown
-            var toStringMethod = t.GetMethod("ToString", Type.EmptyTypes);
-
-            //it doesn't have any ToString methods!
-            if (toStringMethod == null)
-                continue;
-
-            if (toStringMethod.DeclaringType == typeof (object))
-                continue;
-
-            if (toStringMethod.DeclaringType == typeof (MarshalByRefObject))
-                continue;
-            /*
-            IList<Instruction> instructions = null;
-            try
-            {
-                instructions = toStringMethod.GetInstructions();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-            }
-
-            if (instructions != null)
-                foreach (Instruction instruction in instructions)
-                {
-                    MethodInfo methodInfo = instruction.Operand as MethodInfo;
-
-                    if (methodInfo != null)
-                    {
-                        //is it a call to property
-                        PropertyInfo prop;
-
-                        if (RelationshipPropertyInfos.TryGetBySecond(methodInfo, out prop))
-                        {
-
-                            //It doesn't look injected but it is
-                            if(t == typeof(JoinInfo))
-                                continue;
-
-                            //if we are injectable for it
-                    if( t.GetInterfaces().Any(x =>
-                          x.IsGenericType &&
-                          x.GetGenericTypeDefinition() == typeof(IInjectKnown<>) &&
-                          x.GetGenericArguments()[0] == prop.PropertyType))
-                        continue;
-
-                            _fails.Add("FAIL: ToString method in Type " + t.FullName + " uses Relationship PropertyInfo " + prop.Name);
-                        }
-                    }
-                }*/
-        }
-    }
-
 
     private static bool IsRelationshipProperty(Type propertyType)
     {
         //If the Property is a maps directly to database object type
-        if(typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(propertyType))
+        if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(propertyType))
             return true;
 
         //If the Property is an array of them e.g. Catalogue[]
         if (propertyType.IsArray)
-            return typeof (IMapsDirectlyToDatabaseTable).IsAssignableFrom(propertyType.GetElementType());
+            return typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(propertyType.GetElementType());
 
         //or it's a generic collection of them e.g. IEnumerable<Catalogue>
-        if (propertyType.IsGenericType &&
-            propertyType.GetGenericArguments().Any(g => typeof (IMapsDirectlyToDatabaseTable).IsAssignableFrom(g)))
-            return true;
-
-        return false;
+        return propertyType.IsGenericType &&
+               propertyType.GetGenericArguments().Any(static g => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(g));
     }
 
     public static bool MightBeCouldBeMaybeAutoGeneratedInstanceProperty(PropertyInfo info)
@@ -294,10 +233,7 @@ public static bool MightBeCouldBeMaybeAutoGeneratedInstanceProperty(PropertyInfo
                 true
             )
             .Any();
-        if (!mightBe)
-        {
-            return false;
-        }
+        if (!mightBe) return false;
 
 
         var maybe = info.DeclaringType
diff --git a/Rdmp.UI.Tests/DesignPatternTests/CsProjFileTidy.cs b/Rdmp.UI.Tests/DesignPatternTests/CsProjFileTidy.cs
index f772e9387d..ab294a3fca 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/CsProjFileTidy.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/CsProjFileTidy.cs
@@ -15,7 +15,7 @@ namespace Rdmp.UI.Tests.DesignPatternTests;
 
 internal class CsProjFileTidy
 {
-    public List<string>  csFilesFound = new();
+    public List<string> csFilesFound = new();
 
     public List<string> UntidyMessages { get; set; }
 
@@ -23,9 +23,12 @@ internal class CsProjFileTidy
     private DirectoryInfo _root;
 
     //these class files are excused from having 2+ class files in them or 0
-    private string[] Ignorelist = {
-        "Attributes.cs", "AssemblyInfo.cs", "Annotations.cs", "StageArgs.cs" ,"ICustomUI.cs","MapsDirectlyToDatabaseTableStatelessDefinition.cs",
-        "IObjectUsedByOtherObjectNode.cs", "IInjectKnown.cs", "Themes.cs","TableView.cs","TreeView.cs", "MemoryCatalogueRepository.cs"
+    private string[] Ignorelist =
+    {
+        "Attributes.cs", "AssemblyInfo.cs", "Annotations.cs", "StageArgs.cs", "ICustomUI.cs",
+        "MapsDirectlyToDatabaseTableStatelessDefinition.cs",
+        "IObjectUsedByOtherObjectNode.cs", "IInjectKnown.cs", "Themes.cs", "TableView.cs", "TreeView.cs",
+        "MemoryCatalogueRepository.cs"
     };
 
     public CsProjFileTidy(FileInfo csProjFile)
@@ -33,7 +36,7 @@ public CsProjFileTidy(FileInfo csProjFile)
         UntidyMessages = new List<string>();
 
         _root = csProjFile.Directory;
-        _expectedRootNamespace = csProjFile.Name.Replace(".csproj","");
+        _expectedRootNamespace = csProjFile.Name.Replace(".csproj", "");
 
         //e.g. <Compile Include="Overview\OverviewScreen.Designer.cs"
         var allText = File.ReadAllText(csProjFile.FullName);
@@ -45,7 +48,7 @@ public CsProjFileTidy(FileInfo csProjFile)
         doc.LoadXml(allText);
 
         //var compilables = doc.GetElementsByTagName("Compile");
-            
+
 
         RecursivelyProcessSubfolders(csProjFile.Directory);
     }
@@ -54,19 +57,19 @@ private void RecursivelyProcessSubfolders(DirectoryInfo directory)
     {
         foreach (var enumerateFile in directory.EnumerateFiles("*.cs"))
             ConfirmClassNameAndNamespaces(enumerateFile);
-            
+
         foreach (var dir in directory.EnumerateDirectories())
         {
-            if(dir.Name.Equals("bin") || dir.Name.Equals("obj"))
+            if (dir.Name.Equals("bin") || dir.Name.Equals("obj"))
                 continue;
 
             RecursivelyProcessSubfolders(dir);
         }
     }
-        
+
     private void ConfirmClassNameAndNamespaces(FileInfo csFile)
     {
-        if(Ignorelist.Contains(csFile.Name))
+        if (Ignorelist.Contains(csFile.Name))
             return;
 
         csFilesFound.Add(csFile.FullName);
@@ -79,10 +82,14 @@ private void ConfirmClassNameAndNamespaces(FileInfo csFile)
         var classes = rPublicClasses.Matches(contents);
         var namespaces = rNamespace.Matches(contents);
 
-        if(namespaces.Count == 0)
+        if (namespaces.Count == 0)
+        {
             UntidyMessages.Add($"FAIL: .cs file does not have any namespaces listed in it:{csFile.FullName}");
+        }
         else if (namespaces.Count > 1)
+        {
             UntidyMessages.Add($"FAIL: .cs file has more than 1 namespaces listed in it!:{csFile.FullName}");
+        }
         else
         {
             var subspace = GetSubspace(csFile);
@@ -93,25 +100,24 @@ private void ConfirmClassNameAndNamespaces(FileInfo csFile)
 
             var actualNamespace = namespaces[0].Groups[1].Value;
 
-            if(!actualNamespace.Equals(expectedNamespace))
+            if (!actualNamespace.Equals(expectedNamespace))
                 UntidyMessages.Add(
                     $"Expected file {csFile.FullName} to have namespace {expectedNamespace} but its listed namespace is {actualNamespace}");
-
         }
-            
+
 
         //it's probably a enum or interface or delegates file
-        if(classes.Count ==0)
+        if (classes.Count == 0)
             return;
 
         //we are ok with Microsoft doing whatever it wants in these files
-        if(csFile.Name.Contains(".Designer.cs"))
+        if (csFile.Name.Contains(".Designer.cs"))
             return;
 
-        if(csFile.Name.Equals("MarkdownCodeBlockTests.cs"))
+        if (csFile.Name.Equals("MarkdownCodeBlockTests.cs"))
             return;
 
-        if(classes.Count > 1)
+        if (classes.Count > 1)
         {
             //The only files allowed 2+ class files in them are tests and factories
             if (csFile.Name.Contains("Test") || csFile.Name.Contains("Factory"))
@@ -121,17 +127,15 @@ private void ConfirmClassNameAndNamespaces(FileInfo csFile)
         }
         else
         {
-
             var firstClassNameInFile = classes[0].Groups[2].Value;
 
             if (firstClassNameInFile.Contains("_Design"))
                 return;
 
-            if (!csFile.Name.Equals($"{firstClassNameInFile}.cs",StringComparison.CurrentCultureIgnoreCase))
+            if (!csFile.Name.Equals($"{firstClassNameInFile}.cs", StringComparison.CurrentCultureIgnoreCase))
                 UntidyMessages.Add(
                     $"File {csFile.FullName} contains a class is called {firstClassNameInFile} (does not match file name of file)");
         }
-
     }
 
     private string GetSubspace(FileInfo csFile)
diff --git a/Rdmp.UI.Tests/DesignPatternTests/DependenciesEvaluation.cs b/Rdmp.UI.Tests/DesignPatternTests/DependenciesEvaluation.cs
index d73abc796b..873391405c 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/DependenciesEvaluation.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/DependenciesEvaluation.cs
@@ -22,8 +22,8 @@ public class DependenciesEvaluation
         "Plugin/Plugin.Test/Plugin.Test.nuspec",
         "Plugin/Plugin/Plugin.nuspec",
         "Plugin/Plugin.UI/Plugin.UI.nuspec"
-
     };
+
     private Dictionary<string, string> Dependencies = new();
 
     public void FindProblems(VisualStudioSolutionFile sln)
@@ -46,7 +46,9 @@ public void FindProblems(VisualStudioSolutionFile sln)
                 var version = match.Groups[2].Value;
 
                 if (!Dependencies.ContainsKey(assembly))
+                {
                     Dependencies.Add(assembly, version);
+                }
                 else
                 {
                     if (!Equals(Dependencies[assembly], version))
@@ -64,10 +66,10 @@ public void FindProblems(VisualStudioSolutionFile sln)
             if (fappConfig.Exists)
                 ProcessAppConfig(fappConfig, problems);
 
-            var fExeConfig = new FileInfo(Path.Combine(csproj.Directory.FullName,"RDMPAutomationService.exe.config"));
+            var fExeConfig = new FileInfo(Path.Combine(csproj.Directory.FullName, "RDMPAutomationService.exe.config"));
 
             if (fExeConfig.Exists)
-                ProcessAppConfig(fExeConfig,problems);
+                ProcessAppConfig(fExeConfig, problems);
 
             var fappPackages = new FileInfo(Path.Combine(csproj.Directory.FullName, "packages.config"));
             if (fappPackages.Exists)
@@ -94,9 +96,7 @@ public void FindProblems(VisualStudioSolutionFile sln)
                         problems.Add(
                             $"In package {fappPackages.FullName} you reference {assembly}  (version {version}) but no corresponding dependency listed in any of your nuspec files.");
                     }
-
                 }
-
             }
 
             var csprojFileContents = File.ReadAllText(csproj.FullName);
@@ -122,7 +122,6 @@ public void FindProblems(VisualStudioSolutionFile sln)
             Console.WriteLine(problem);
 
         Assert.AreEqual(0, problems.Count);
-
     }
 
     private void ProcessAppConfig(FileInfo fappConfig, List<string> problems)
@@ -175,8 +174,8 @@ private static bool AreProbablyCompatibleVersions(string availableVersion, strin
 
         //must be equal on first 3 numbers (Revision is allowed to differ)
         return
-            v1.Major == v2.Major&&
-            (v1.Minor == v2.Minor || v2.Minor == 0 || v2.Minor == -1)&&
+            v1.Major == v2.Major &&
+            (v1.Minor == v2.Minor || v2.Minor == 0 || v2.Minor == -1) &&
             (v1.Build == v2.Build || v2.Build == 0 || v2.Build == -1) &&
             (v1.Revision == v2.Revision || v2.Revision == 0 || v2.Revision == -1);
     }
diff --git a/Rdmp.UI.Tests/DesignPatternTests/EvaluateNamespacesAndSolutionFoldersTests.cs b/Rdmp.UI.Tests/DesignPatternTests/EvaluateNamespacesAndSolutionFoldersTests.cs
index 8b849f9844..c2bdd57a6f 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/EvaluateNamespacesAndSolutionFoldersTests.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/EvaluateNamespacesAndSolutionFoldersTests.cs
@@ -44,7 +44,7 @@ public void EvaluateNamespacesAndSolutionFolders()
         while (solutionDir?.GetFiles("*.sln").Any() != true) solutionDir = solutionDir?.Parent;
         Assert.IsNotNull(solutionDir, "Failed to find {0} in any parent directories", SolutionName);
 
-        var sln = new VisualStudioSolutionFile(solutionDir,solutionDir.GetFiles(SolutionName).Single());
+        var sln = new VisualStudioSolutionFile(solutionDir, solutionDir.GetFiles(SolutionName).Single());
 
         ProcessFolderRecursive(sln.RootFolders, solutionDir);
 
@@ -56,7 +56,6 @@ public void EvaluateNamespacesAndSolutionFolders()
         FindUnreferencedProjectsRecursively(foundProjects, solutionDir);
 
         foreach (var kvp in foundProjects)
-        {
             switch (kvp.Value.Count)
             {
                 case 0:
@@ -68,12 +67,11 @@ public void EvaluateNamespacesAndSolutionFolders()
                         $"FAIL: Found 2+ copies of project {kvp.Key.Name} while traversing solution directories and subdirectories:{Environment.NewLine}{string.Join(Environment.NewLine, kvp.Value)}");
                     break;
             }
-        }
 
-        Assert.AreEqual(0, _errors.Count); 
+        Assert.AreEqual(0, _errors.Count);
         //      DependenciesEvaluation dependencies = new DependenciesEvaluation();
         //      dependencies.FindProblems(sln);
-            
+
         InterfaceDeclarationsCorrect.FindProblems(CatalogueRepository.MEF);
 
         var documented = new AllImportantClassesDocumented();
@@ -103,7 +101,7 @@ public void EvaluateNamespacesAndSolutionFolders()
 
         //foreach (var file in slndir.EnumerateFiles("*.cs", SearchOption.AllDirectories))
         //{
-                
+
         //    if (file.Name.StartsWith("AssemblyInfo") || file.Name.StartsWith("TemporaryGenerated") || file.Name.EndsWith("Designer.cs"))
         //        continue;
 
@@ -112,13 +110,12 @@ public void EvaluateNamespacesAndSolutionFolders()
         //        continue;
 
 
-
         //    Console.WriteLine(file.FullName);
         //}
-
     }
 
-    private void FindUnreferencedProjectsRecursively(Dictionary<VisualStudioProjectReference, List<string>> projects, DirectoryInfo dir)
+    private void FindUnreferencedProjectsRecursively(Dictionary<VisualStudioProjectReference, List<string>> projects,
+        DirectoryInfo dir)
     {
         var projFiles = dir.EnumerateFiles("*.csproj");
 
@@ -138,13 +135,14 @@ private void FindUnreferencedProjectsRecursively(Dictionary<VisualStudioProjectR
             FindUnreferencedProjectsRecursively(projects, subdir);
     }
 
-    private void ProcessFolderRecursive(IEnumerable<VisualStudioSolutionFolder> folders, DirectoryInfo currentPhysicalDirectory)
+    private void ProcessFolderRecursive(IEnumerable<VisualStudioSolutionFolder> folders,
+        DirectoryInfo currentPhysicalDirectory)
     {
-
         //Process root folders
         foreach (var solutionFolder in folders)
         {
-            var physicalSolutionFolder = currentPhysicalDirectory.EnumerateDirectories().SingleOrDefault(d => d.Name.Equals(solutionFolder.Name));
+            var physicalSolutionFolder = currentPhysicalDirectory.EnumerateDirectories()
+                .SingleOrDefault(d => d.Name.Equals(solutionFolder.Name));
 
             if (physicalSolutionFolder == null)
             {
@@ -163,17 +161,22 @@ private void ProcessFolderRecursive(IEnumerable<VisualStudioSolutionFolder> fold
 
     private void FindProjectInFolder(VisualStudioProjectReference p, DirectoryInfo physicalSolutionFolder)
     {
-        var physicalProjectFolder = physicalSolutionFolder.EnumerateDirectories().SingleOrDefault(f => f.Name.Equals(p.Name));
+        var physicalProjectFolder =
+            physicalSolutionFolder.EnumerateDirectories().SingleOrDefault(f => f.Name.Equals(p.Name));
 
         if (physicalProjectFolder == null)
+        {
             Error($"FAIL: Physical folder {p.Name} does not exist in directory {physicalSolutionFolder.FullName}");
+        }
         else
         {
             var csProjFile = physicalProjectFolder.EnumerateFiles("*.csproj").SingleOrDefault(f => f.Name.Equals(
                 $"{p.Name}.csproj"));
             if (csProjFile == null)
+            {
                 Error(
                     $"FAIL: .csproj file {p.Name}.csproj was not found in folder {physicalProjectFolder.FullName}");
+            }
             else
             {
                 var tidy = new CsProjFileTidy(csProjFile);
@@ -193,6 +196,7 @@ private void FindProjectInFolder(VisualStudioProjectReference p, DirectoryInfo p
     }
 
     private readonly List<string> _errors = new();
+
     private void Error(string s)
     {
         Console.WriteLine(s);
@@ -218,7 +222,8 @@ public static void FindProblems(List<string> csFilesFound)
             var text = File.ReadLines(file).First();
 
             if (!text.StartsWith("// Copyright (c) The University of Dundee 2018-20")
-                && text != @"// This code is adapted from https://www.codeproject.com/Articles/1182358/Using-Autocomplete-in-Windows-Console-Applications")
+                && text !=
+                @"// This code is adapted from https://www.codeproject.com/Articles/1182358/Using-Autocomplete-in-Windows-Console-Applications")
             {
                 changes = true;
                 sbSuggestedText.AppendLine(@"// Copyright (c) The University of Dundee 2018-2023");
@@ -227,16 +232,19 @@ public static void FindProblems(List<string> csFilesFound)
                     @"// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.");
                 sbSuggestedText.AppendLine(
                     @"// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.");
-                sbSuggestedText.AppendLine(@"// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.");
+                sbSuggestedText.AppendLine(
+                    @"// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.");
                 sbSuggestedText.AppendLine();
-                sbSuggestedText.AppendJoin(Environment.NewLine,text);
+                sbSuggestedText.AppendJoin(Environment.NewLine, text);
             }
 
             if (changes)
                 suggestedNewFileContents.Add(file, sbSuggestedText.ToString());
         }
 
-        Assert.AreEqual(0,suggestedNewFileContents.Count,"The following files did not contain copyright:{0}{1}", Environment.NewLine, string.Join(Environment.NewLine,suggestedNewFileContents.Keys.Select(Path.GetFileName)));
+        Assert.AreEqual(0, suggestedNewFileContents.Count, "The following files did not contain copyright:{0}{1}",
+            Environment.NewLine,
+            string.Join(Environment.NewLine, suggestedNewFileContents.Keys.Select(Path.GetFileName)));
 
         //drag your debugger stack pointer to here to mess up all your files to match the suggestedNewFileContents :)
         foreach (var suggestedNewFileContent in suggestedNewFileContents)
@@ -252,7 +260,7 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
 
         foreach (var f in csFilesFound)
         {
-            if(f.Contains(".Designer.cs"))
+            if (f.Contains(".Designer.cs"))
                 continue;
 
             var changes = false;
@@ -265,7 +273,6 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
 
             for (var i = 0; i < text.Length; i++)
             {
-
                 //////////////////////////////////No Mapping Properties////////////////////////////////////////////////////
                 if (text[i].Trim().Equals("[NoMappingToDatabase]"))
                 {
@@ -281,7 +288,6 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
                         var m = Regex.Match(next, @"(.*)public\b(.*)\s+(.*)\b");
                         if (m.Success)
                         {
-
                             var whitespace = m.Groups[1].Value;
                             var type = m.Groups[2].Value;
                             var member = m.Groups[3].Value;
@@ -299,7 +305,6 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
                                 sbSuggestedText.AppendLine(text[i]);
                                 continue;
                             }
-
                         }
                     }
                 }
@@ -324,9 +329,9 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
                 }
 
                 //if we have a paragraph break in the summary comments and the next line isn't an end summary
-                if (areInSummary && text[i].Trim().Equals("///") && !text[i+1].Trim().Equals("/// </summary>"))
+                if (areInSummary && text[i].Trim().Equals("///") && !text[i + 1].Trim().Equals("/// </summary>"))
                 {
-                    if(paraOpened)
+                    if (paraOpened)
                     {
                         sbSuggestedText.Insert(sbSuggestedText.Length - 2, "</para>");
                         paraOpened = false;
@@ -341,7 +346,7 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
                         sbSuggestedText.AppendLine(text[i]);
 
                         //add the para tag
-                        var nextLine = text[i + 1].Insert(text[i+1].IndexOf("///")+4,"<para>");
+                        var nextLine = text[i + 1].Insert(text[i + 1].IndexOf("///") + 4, "<para>");
                         sbSuggestedText.AppendLine(nextLine);
                         i++;
                         paraOpened = true;
@@ -356,11 +361,18 @@ public static void FindProblems(MEF mef, List<string> csFilesFound)
                 suggestedNewFileContents.Add(f, sbSuggestedText.ToString());
         }
 
-        Assert.IsEmpty(suggestedNewFileContents);
 
         //drag your debugger stack pointer to here to mess up all your files to match the suggestedNewFileContents :)
+        if (suggestedNewFileContents.Count==0)
+            Assert.Pass();
+        else
+        {
+            Console.WriteLine($"Replacing file contents in {string.Join(";", suggestedNewFileContents.Keys)}");
+        }
         foreach (var suggestedNewFileContent in suggestedNewFileContents)
             File.WriteAllText(suggestedNewFileContent.Key, suggestedNewFileContent.Value);
+
+        Assert.IsEmpty(suggestedNewFileContents);
     }
 
     private static string GetUniqueTypeName(string typename)
diff --git a/Rdmp.UI.Tests/DesignPatternTests/InterfaceDeclarationsCorrect.cs b/Rdmp.UI.Tests/DesignPatternTests/InterfaceDeclarationsCorrect.cs
index f7ab55a76f..e9733fb648 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/InterfaceDeclarationsCorrect.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/InterfaceDeclarationsCorrect.cs
@@ -21,6 +21,7 @@ public class InterfaceDeclarationsCorrect
         "IDataAccessCredentials",
         "IProcessTask" //this is inherited by IRuntimeTask too which isn't an IMapsDirectlyToDatabaseTable
     };
+
     public static void FindProblems(MEF mef)
     {
         var problems =
@@ -33,7 +34,8 @@ public static void FindProblems(MEF mef)
                 .Where(matchingInterface =>
                     !typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(matchingInterface))
                 .Select(matchingInterface =>
-                    $"FAIL: Interface '{matchingInterface.Name}' does not inherit IMapsDirectlyToDatabaseTable").ToList();
+                    $"FAIL: Interface '{matchingInterface.Name}' does not inherit IMapsDirectlyToDatabaseTable")
+                .ToList();
         Assert.IsEmpty(problems);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/MarkdownCodeBlockTests.cs b/Rdmp.UI.Tests/DesignPatternTests/MarkdownCodeBlockTests.cs
index 16a0273359..d58a475628 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/MarkdownCodeBlockTests.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/MarkdownCodeBlockTests.cs
@@ -37,6 +37,7 @@ namespace Rdmp.UI.Tests.DesignPatternTests;
 internal class MarkdownCodeBlockTests
 {
     #region df7d2bb4cd6145719f933f6f15218b1a
+
     private class FrozenExtractionConfigurationsNode
     {
         public Project Project { get; set; }
@@ -46,16 +47,15 @@ public FrozenExtractionConfigurationsNode(Project project)
             Project = project;
         }
 
-        public override string ToString()
-        {
-            return "Frozen Extraction Configurations";
-        }
+        public override string ToString() => "Frozen Extraction Configurations";
     }
+
     #endregion
 
     private class _a93fd8b3d1fb4ad8975ef8cf9c384236
     {
         #region a93fd8b3d1fb4ad8975ef8cf9c384236
+
         private class FrozenExtractionConfigurationsNode
         {
             public Project Project { get; set; }
@@ -65,43 +65,39 @@ public FrozenExtractionConfigurationsNode(Project project)
                 Project = project;
             }
 
-            public override string ToString()
-            {
-                return "Frozen Extraction Configurations";
-            }
+            public override string ToString() => "Frozen Extraction Configurations";
 
-            protected bool Equals(FrozenExtractionConfigurationsNode other)
-            {
-                return Equals(Project, other.Project);
-            }
+            protected bool Equals(FrozenExtractionConfigurationsNode other) => Equals(Project, other.Project);
 
             public override bool Equals(object obj)
             {
                 if (obj is null) return false;
                 if (ReferenceEquals(this, obj)) return true;
                 if (obj.GetType() != GetType()) return false;
-                return Equals((FrozenExtractionConfigurationsNode) obj);
+                return Equals((FrozenExtractionConfigurationsNode)obj);
             }
 
-            public override int GetHashCode()
-            {
-                return Project != null ? Project.GetHashCode() : 0;
-            }
+            public override int GetHashCode() => Project?.GetHashCode() ?? 0;
         }
+
         #endregion
 
 
         private class _c9aeab3ddaf643e5967c3e2352c388f0 : DataExportChildProvider
         {
             #region c9aeab3ddaf643e5967c3e2352c388f0
-            private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNode, DescendancyList descendancy)
+
+            private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNode,
+                DescendancyList descendancy)
             {
                 var children = new HashSet<object>();
 
-                var frozenConfigurationsNode = new FrozenExtractionConfigurationsNode(extractionConfigurationsNode.Project);
+                var frozenConfigurationsNode =
+                    new FrozenExtractionConfigurationsNode(extractionConfigurationsNode.Project);
                 children.Add(frozenConfigurationsNode);
 
-                var configs = ExtractionConfigurations.Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
+                var configs = ExtractionConfigurations
+                    .Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
                 foreach (var config in configs)
                 {
                     AddChildren(config, descendancy.Add(config));
@@ -110,13 +106,17 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
 
                 AddToDictionaries(children, descendancy);
             }
+
             #endregion
 
             private void AddChildren(ExtractionConfiguration extractionConfigurationsNode, DescendancyList descendancy)
             {
                 throw new NotImplementedException();
             }
-            public _c9aeab3ddaf643e5967c3e2352c388f0(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier) : base(repositoryLocator, pluginChildProviders, errorsCheckNotifier,null)
+
+            public _c9aeab3ddaf643e5967c3e2352c388f0(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+                IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier) : base(repositoryLocator,
+                pluginChildProviders, errorsCheckNotifier, null)
             {
             }
         }
@@ -125,22 +125,26 @@ public _c9aeab3ddaf643e5967c3e2352c388f0(IRDMPPlatformRepositoryServiceLocator r
         private class _0bac9aa7f8874a25bc1fe1361b91f6e5 : DataExportChildProvider
         {
             #region 0bac9aa7f8874a25bc1fe1361b91f6e5
-            private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNode, DescendancyList descendancy)
+
+            private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNode,
+                DescendancyList descendancy)
             {
                 var children = new HashSet<object>();
 
                 //Create a frozen extraction configurations folder as a subfolder of each ExtractionConfigurationsNode
-                var frozenConfigurationsNode = new FrozenExtractionConfigurationsNode(extractionConfigurationsNode.Project);
+                var frozenConfigurationsNode =
+                    new FrozenExtractionConfigurationsNode(extractionConfigurationsNode.Project);
 
                 //Make the frozen folder appear under the extractionConfigurationsNode
                 children.Add(frozenConfigurationsNode);
 
                 //Add children to the frozen folder
-                AddChildren(frozenConfigurationsNode,descendancy.Add(frozenConfigurationsNode));
+                AddChildren(frozenConfigurationsNode, descendancy.Add(frozenConfigurationsNode));
 
                 //Add ExtractionConfigurations which are not released (frozen)
-                var configs = ExtractionConfigurations.Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
-                foreach (var config in configs.Where(c=>!c.IsReleased))
+                var configs = ExtractionConfigurations
+                    .Where(c => c.Project_ID == extractionConfigurationsNode.Project.ID).ToArray();
+                foreach (var config in configs.Where(c => !c.IsReleased))
                 {
                     AddChildren(config, descendancy.Add(config));
                     children.Add(config);
@@ -149,28 +153,34 @@ private void AddChildren(ExtractionConfigurationsNode extractionConfigurationsNo
                 AddToDictionaries(children, descendancy);
             }
 
-            private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConfigurationsNode, DescendancyList descendancy)
+            private void AddChildren(FrozenExtractionConfigurationsNode frozenExtractionConfigurationsNode,
+                DescendancyList descendancy)
             {
                 var children = new HashSet<object>();
 
                 //Add ExtractionConfigurations which are not released (frozen)
-                var configs = ExtractionConfigurations.Where(c => c.Project_ID == frozenExtractionConfigurationsNode.Project.ID).ToArray();
+                var configs = ExtractionConfigurations
+                    .Where(c => c.Project_ID == frozenExtractionConfigurationsNode.Project.ID).ToArray();
                 foreach (var config in configs.Where(c => c.IsReleased))
                 {
                     AddChildren(config, descendancy.Add(config));
                     children.Add(config);
                 }
 
-                AddToDictionaries(children,descendancy);
+                AddToDictionaries(children, descendancy);
             }
+
             #endregion
 
-            private void AddChildren(ExtractionConfiguration frozenExtractionConfigurationsNode, DescendancyList descendancy)
+            private void AddChildren(ExtractionConfiguration frozenExtractionConfigurationsNode,
+                DescendancyList descendancy)
             {
                 throw new NotImplementedException();
             }
 
-            public _0bac9aa7f8874a25bc1fe1361b91f6e5(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier) : base(repositoryLocator, pluginChildProviders, errorsCheckNotifier,null)
+            public _0bac9aa7f8874a25bc1fe1361b91f6e5(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+                IChildProvider[] pluginChildProviders, ICheckNotifier errorsCheckNotifier) : base(repositoryLocator,
+                pluginChildProviders, errorsCheckNotifier, null)
             {
             }
         }
@@ -178,6 +188,7 @@ public _0bac9aa7f8874a25bc1fe1361b91f6e5(IRDMPPlatformRepositoryServiceLocator r
         private class _f243e95a6dc94b3486f44b8f0bb0ed7d
         {
             #region f243e95a6dc94b3486f44b8f0bb0ed7d
+
             private class AllServersNodeMenu : RDMPContextMenuStrip
             {
                 public AllServersNodeMenu(RDMPContextMenuStripArgs args, AllServersNode o) : base(args, o)
@@ -185,75 +196,69 @@ public AllServersNodeMenu(RDMPContextMenuStripArgs args, AllServersNode o) : bas
                     Add(new ExecuteCommandCreateNewEmptyCatalogue(args.ItemActivator));
                 }
             }
+
             #endregion
         }
 
         private class _cae13dde1de14f5cac984330a222c311
         {
             #region cae13dde1de14f5cac984330a222c311
-            private class ProposeExecutionWhenTargetIsPipeline:RDMPCommandExecutionProposal<Pipeline>
+
+            private class ProposeExecutionWhenTargetIsPipeline : RDMPCommandExecutionProposal<Pipeline>
             {
                 public ProposeExecutionWhenTargetIsPipeline(IActivateItems itemActivator) : base(itemActivator)
                 {
                 }
 
-                public override bool CanActivate(Pipeline target)
-                {
-                    return true;
-                }
+                public override bool CanActivate(Pipeline target) => true;
 
                 public override void Activate(Pipeline target)
                 {
                     MessageBox.Show("Double clicked");
                 }
 
-                public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default)
-                {
-                    return null;
-                }
+                public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target,
+                    InsertOption insertOption = InsertOption.Default) => null;
             }
+
             #endregion
         }
 
         private class _d5ff7bebc57942df8c6c57a316bf72c6 : RDMPCommandExecutionProposal<AggregateConfiguration>
         {
-            public override bool CanActivate(AggregateConfiguration target)
-            {
-                throw new NotImplementedException();
-            }
+            public override bool CanActivate(AggregateConfiguration target) => throw new NotImplementedException();
+
             public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, AggregateConfiguration target,
-                InsertOption insertOption = InsertOption.Default)
-            {
+                InsertOption insertOption = InsertOption.Default) =>
                 throw new NotImplementedException();
-            }
+
             public _d5ff7bebc57942df8c6c57a316bf72c6(IActivateItems itemActivator) : base(itemActivator)
             {
             }
 
             #region d5ff7bebc57942df8c6c57a316bf72c6
+
             public override void Activate(AggregateConfiguration target)
             {
                 ItemActivator.Activate<AggregateEditorUI, AggregateConfiguration>(target);
             }
+
             #endregion
 
 
             #region 56df0867990f4b0397e51a6a49f7bdd0
+
             [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ANOTableUI_Design, UserControl>))]
             public abstract class ANOTableUI_Design : RDMPSingleDatabaseObjectControl<ANOTable>
             {
             }
-            #endregion
-
 
+            #endregion
         }
 
         private class _59f55fa3ef50404291c7ae3996772635 : RDMPCommandExecutionProposal<Pipeline>
         {
-            public override bool CanActivate(Pipeline target)
-            {
-                throw new NotImplementedException();
-            }
+            public override bool CanActivate(Pipeline target) => throw new NotImplementedException();
 
             public override void Activate(Pipeline target)
             {
@@ -261,13 +266,16 @@ public override void Activate(Pipeline target)
             }
 
             #region 59f55fa3ef50404291c7ae3996772635
-            public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default)
+
+            public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target,
+                InsertOption insertOption = InsertOption.Default)
             {
-                if(cmd is CatalogueCombineable sourceCatalogueCombineable)
-                    return new ExecuteCommandDelete(ItemActivator,sourceCatalogueCombineable.Catalogue);
+                if (cmd is CatalogueCombineable sourceCatalogueCombineable)
+                    return new ExecuteCommandDelete(ItemActivator, sourceCatalogueCombineable.Catalogue);
 
                 return null;
             }
+
             #endregion
 
             public _59f55fa3ef50404291c7ae3996772635(IActivateItems itemActivator) : base(itemActivator)
@@ -277,8 +285,8 @@ public _59f55fa3ef50404291c7ae3996772635(IActivateItems itemActivator) : base(it
 
         private class _bbee6cb18ebd4e35a19f5fa521063648
         {
-
             #region bbee6cb18ebd4e35a19f5fa521063648
+
             public class PipelineCombineable : ICombineToMakeCommand
             {
                 public Pipeline Pipeline { get; private set; }
@@ -290,13 +298,10 @@ public PipelineCombineable(Pipeline pipeline)
                     IsEmpty = Pipeline.PipelineComponents.Count == 0;
                 }
 
-                public string GetSqlString()
-                {
-                    return "";
-                }
+                public string GetSqlString() => "";
             }
+
             #endregion
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/RunUITests.cs b/Rdmp.UI.Tests/DesignPatternTests/RunUITests.cs
index 6ed2f2e2b8..a8e9fdf91d 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/RunUITests.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/RunUITests.cs
@@ -23,7 +23,7 @@
 
 namespace Rdmp.UI.Tests.DesignPatternTests;
 
-public class RunUITests:DatabaseTests
+public class RunUITests : DatabaseTests
 {
     private List<Type> allowedToBeIncompatible
         = new(new[]
@@ -38,7 +38,7 @@ private List<Type> allowedToBeIncompatible
             typeof(ExecuteCommandExpandAllNodes),
             typeof(ExecuteCommandViewCohortAggregateGraph),
             typeof(ExecuteCommandExecuteExtractionAggregateGraph),
-                
+
             typeof(ExecuteCommandAddNewCatalogueItem),
 
             typeof(ExecuteCommandCreateNewFilter),
@@ -54,7 +54,7 @@ private List<Type> allowedToBeIncompatible
 
             typeof(ExecuteCommandShowXmlDoc),
             typeof(ImpossibleCommand),
-     
+
             typeof(ExecuteCommandChangeLoadStage),
             typeof(ExecuteCommandReOrderProcessTask),
             typeof(ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer),
@@ -75,7 +75,6 @@ private List<Type> allowedToBeIncompatible
             typeof(ExecuteCommandImportFilterDescriptionsFromShare),
             typeof(ExecuteCommandSetArgument),
             typeof(ExecuteCommandAddToSession)
-
         });
 
     [Test]
@@ -88,22 +87,25 @@ public void AllCommandsCompatible()
         allowedToBeIncompatible.AddRange(activator.GetIgnoredCommands());
 
         var commandCaller = new CommandInvoker(activator);
-            
+
         Assert.IsTrue(commandCaller.WhyCommandNotSupported(typeof(ExecuteCommandDelete)) is null);
 
         var notSupported = RepositoryLocator.CatalogueRepository.MEF.GetAllTypes()
-            .Where(t=>typeof(IAtomicCommand).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface) //must be something we would normally expect to be a supported Type
+            .Where(t => typeof(IAtomicCommand).IsAssignableFrom(t) && !t.IsAbstract &&
+                        !t.IsInterface) //must be something we would normally expect to be a supported Type
             .Except(allowedToBeIncompatible) //and isn't a permissible one
             .Where(t => commandCaller.WhyCommandNotSupported(t) is not null) //but for some reason isn't
             .ToArray();
-            
-        Assert.AreEqual(0,notSupported.Length,"The following commands were not compatible with RunUI:" + Environment.NewLine + string.Join(Environment.NewLine,notSupported.Select(t=>t.Name)));
+
+        Assert.AreEqual(0, notSupported.Length,
+            "The following commands were not compatible with RunUI:" + Environment.NewLine +
+            string.Join(Environment.NewLine, notSupported.Select(t => t.Name)));
     }
 
     [Test]
     public void Test_IsSupported_BasicActivator()
     {
-        IBasicActivateItems basic = new ConsoleInputManager(RepositoryLocator,new ThrowImmediatelyCheckNotifier());
+        IBasicActivateItems basic = new ConsoleInputManager(RepositoryLocator, new ThrowImmediatelyCheckNotifier());
 
         var commandCaller = new CommandInvoker(basic);
         foreach (var t in new[]
@@ -114,34 +116,29 @@ public void Test_IsSupported_BasicActivator()
                  })
         {
             var isSupported = commandCaller.WhyCommandNotSupported(t);
-            Assert.IsTrue(isSupported is null,$"Unsupported type {t} due to {isSupported}");
+            Assert.IsTrue(isSupported is null, $"Unsupported type {t} due to {isSupported}");
         }
     }
 
-    private class TestCommandDiscoveredDatabase:BasicCommandExecution
-    {   
-        public TestCommandDiscoveredDatabase(IBasicActivateItems activator,DiscoveredDatabase _):base(activator)
+    private class TestCommandDiscoveredDatabase : BasicCommandExecution
+    {
+        public TestCommandDiscoveredDatabase(IBasicActivateItems activator, DiscoveredDatabase _) : base(activator)
         {
-                
         }
     }
 
     private class TestCommandLotsOfParameters : BasicCommandExecution
     {
-        public TestCommandLotsOfParameters(IRDMPPlatformRepositoryServiceLocator _1, DiscoveredDatabase _2, DirectoryInfo _3):base()
+        public TestCommandLotsOfParameters(IRDMPPlatformRepositoryServiceLocator _1, DiscoveredDatabase _2,
+            DirectoryInfo _3) : base()
         {
-                
         }
     }
 
     private class TestCommandTypeParameter : BasicCommandExecution
     {
-        public TestCommandTypeParameter(IRDMPPlatformRepositoryServiceLocator _1, Type _2):base()
+        public TestCommandTypeParameter(IRDMPPlatformRepositoryServiceLocator _1, Type _2) : base()
         {
-                
         }
     }
-
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/DesignPatternTests/UserInterfaceStandardisationChecker.cs b/Rdmp.UI.Tests/DesignPatternTests/UserInterfaceStandardisationChecker.cs
index 1faffdb6f8..7e6b243f26 100644
--- a/Rdmp.UI.Tests/DesignPatternTests/UserInterfaceStandardisationChecker.cs
+++ b/Rdmp.UI.Tests/DesignPatternTests/UserInterfaceStandardisationChecker.cs
@@ -35,27 +35,28 @@ public class UserInterfaceStandardisationChecker
     private List<string> _csFilesList;
     private List<string> problems = new();
 
-    private Type[] excusedNodeClasses = {
+    private Type[] excusedNodeClasses =
+    {
         //it's a singleton because you can only have one decryption certificate for an RDMP as opposed to other SingletonNode classses that represent collections e.g. AllTableInfos is the only collection of TableInfos but it's a collection
         typeof(DecryptionPrivateKeyNode),
         typeof(ArbitraryFolderNode),
-            
+
         //excused because although singletons they have dynamic names / they are basically a collection
         typeof(OtherPipelinesNode),
         typeof(StandardPipelineUseCaseNode),
-            
+
         //the base class
         typeof(Node)
-
     };
 
 
     /// <summary>
     /// UI classes that are allowed not to end with the suffix UI
     /// </summary>
-    private Type[] excusedUIClasses = {
-        typeof (RDMPUserControl),
-        typeof (RDMPForm),
+    private Type[] excusedUIClasses =
+    {
+        typeof(RDMPUserControl),
+        typeof(RDMPForm),
         typeof(RDMPSingleDatabaseObjectControl<>),
         typeof(DashboardableControlHostPanel),
         typeof(TimePeriodicityChart),
@@ -65,17 +66,17 @@ public class UserInterfaceStandardisationChecker
         typeof(ResolveFatalErrors),
         typeof(DataLoadsGraph),
         typeof(RDMPMainForm)
-
     };
 
-    public void FindProblems(List<string> csFilesList,MEF mef)
+    public void FindProblems(List<string> csFilesList, MEF mef)
     {
         _csFilesList = csFilesList;
 
         //All node classes should have equality compare members so that tree expansion works properly
-        foreach (var nodeClass in mef.GetAllTypes().Where(t => typeof(Node).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
+        foreach (var nodeClass in mef.GetAllTypes()
+                     .Where(t => typeof(Node).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
         {
-            if(nodeClass.Namespace == null || nodeClass.Namespace.StartsWith("System"))
+            if (nodeClass.Namespace == null || nodeClass.Namespace.StartsWith("System"))
                 continue;
 
             //class is excused
@@ -83,23 +84,22 @@ public void FindProblems(List<string> csFilesList,MEF mef)
                 continue;
 
             //it's something like ProposeExecutionWhenTargetIsIDirectoryNode.cs i.e. it's not a Node!
-            if (typeof (ICommandExecutionProposal).IsAssignableFrom(nodeClass))
+            if (typeof(ICommandExecutionProposal).IsAssignableFrom(nodeClass))
                 continue;
 
             //if it's an ObjectUsedByOtherObjectNode then it will already have GetHashCode implemented
-            if (typeof (IObjectUsedByOtherObjectNode).IsAssignableFrom(nodeClass))
+            if (typeof(IObjectUsedByOtherObjectNode).IsAssignableFrom(nodeClass))
                 continue;
-                
+
             if (typeof(ExtractionArbitraryFolderNode).IsAssignableFrom(nodeClass))
                 continue;
 
             //these are all supported at base class level
-            if (typeof (SingletonNode).IsAssignableFrom(nodeClass))
+            if (typeof(SingletonNode).IsAssignableFrom(nodeClass))
             {
-
-                if(!nodeClass.Name.StartsWith("All"))
+                if (!nodeClass.Name.StartsWith("All"))
                     problems.Add($"Class '{nodeClass.Name}' is a SingletonNode but its name doesn't start with All");
-                    
+
                 continue;
             }
 
@@ -107,12 +107,13 @@ public void FindProblems(List<string> csFilesList,MEF mef)
         }
 
         //All Menus should correspond to a data class
-        foreach (var menuClass in mef.GetAllTypes().Where(t => typeof (RDMPContextMenuStrip).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
-        { 
+        foreach (var menuClass in mef.GetAllTypes().Where(t =>
+                     typeof(RDMPContextMenuStrip).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
+        {
             //the basic class from which all are inherited or a menu for FolderNode<X>
-            if(menuClass == typeof(RDMPContextMenuStrip) || menuClass.Name.EndsWith("FolderMenu"))
+            if (menuClass == typeof(RDMPContextMenuStrip) || menuClass.Name.EndsWith("FolderMenu"))
                 continue;
-                
+
             //We are looking at something like AutomationServerSlotsMenu
             if (!menuClass.Name.EndsWith("Menu"))
             {
@@ -121,45 +122,45 @@ public void FindProblems(List<string> csFilesList,MEF mef)
             }
 
             foreach (var c in menuClass.GetConstructors())
-            {
-                if(c.GetParameters().Length != 2)
+                if (c.GetParameters().Length != 2)
                     problems.Add(
                         $"Constructor of class '{menuClass}' which is an RDMPContextMenuStrip contained {c.GetParameters().Length} constructor arguments.  These menus are driven by reflection (See RDMPCollectionCommonFunctionality.GetMenuWithCompatibleConstructorIfExists )");
-            }
 
 
             var toLookFor = menuClass.Name[..^"Menu".Length];
             var expectedClassName = GetExpectedClassOrInterface(toLookFor);
 
-            if(expectedClassName == null)
+            if (expectedClassName == null)
             {
                 problems.Add(
                     $"Found menu called '{menuClass.Name}' but couldn't find a corresponding data class called '{toLookFor}.cs'");
                 continue;
             }
 
-            ConfirmFileHasText(menuClass, "AddCommonMenuItems()",false);
+            ConfirmFileHasText(menuClass, "AddCommonMenuItems()", false);
 
             //expect something like this
             //public AutomationServerSlotsMenu(IActivateItems activator, AllAutomationServerSlotsNode databaseEntity)
             var expectedConstructorSignature = $"{menuClass.Name}(RDMPContextMenuStripArgs args,{expectedClassName}";
-            ConfirmFileHasText(menuClass,expectedConstructorSignature);
+            ConfirmFileHasText(menuClass, expectedConstructorSignature);
 
             var fields = menuClass.GetFields(
                 BindingFlags.NonPublic |
                 BindingFlags.Instance);
 
             //find private fields declared at the object level (i.e. not in base class that are of type IActivateItem)
-            var activatorField = fields.FirstOrDefault(f =>f.DeclaringType == menuClass &&  f.FieldType == typeof (IActivateItems));
-            if(activatorField != null)
+            var activatorField =
+                fields.FirstOrDefault(f => f.DeclaringType == menuClass && f.FieldType == typeof(IActivateItems));
+            if (activatorField != null)
                 problems.Add(
                     $"Menu '{menuClass}' contains a private field called '{activatorField.Name}'.  You should instead use base class protected field RDMPContextMenuStrip._activator");
         }
-            
+
         //Drag and drop / Activation - Execution Proposal system
-        foreach (var proposalClass in mef.GetAllTypes().Where(t => typeof(ICommandExecutionProposal).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
+        foreach (var proposalClass in mef.GetAllTypes().Where(t =>
+                     typeof(ICommandExecutionProposal).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface))
         {
-            if(proposalClass.Namespace.Contains("Rdmp.UI.Tests.DesignPatternTests"))
+            if (proposalClass.Namespace.Contains("Rdmp.UI.Tests.DesignPatternTests"))
                 continue;
 
             //We are looking at something like AutomationServerSlotsMenu
@@ -177,68 +178,67 @@ public void FindProblems(List<string> csFilesList,MEF mef)
                 problems.Add(
                     $"Found proposal called '{proposalClass}' but couldn't find a corresponding data class called '{toLookFor}.cs'");
         }
-            
+
         //Make sure all user interface classes have the suffix UI
-        foreach(var uiType in mef.GetAllTypes().Where(t => 
-                    typeof(RDMPUserControl).IsAssignableFrom(t)||typeof(RDMPForm).IsAssignableFrom(t)
-                    && !t.IsAbstract && !t.IsInterface))
-        {
-                
-            if(!uiType.Name.EndsWith("UI") && !uiType.Name.EndsWith("_Design"))
+        foreach (var uiType in mef.GetAllTypes().Where(t =>
+                     typeof(RDMPUserControl).IsAssignableFrom(t) || (typeof(RDMPForm).IsAssignableFrom(t)
+                                                                     && !t.IsAbstract && !t.IsInterface)))
+            if (!uiType.Name.EndsWith("UI") && !uiType.Name.EndsWith("_Design"))
             {
                 if (excusedUIClasses.Contains(uiType))
                     continue;
-                    
+
                 //also allow Screen1, Screen2 etc
-                if(Regex.IsMatch(uiType.Name,@"Screen\d") && uiType.IsNotPublic)
+                if (Regex.IsMatch(uiType.Name, @"Screen\d") && uiType.IsNotPublic)
                     continue;
 
                 problems.Add($"Class {uiType.Name} does not end with UI");
             }
-        }
 
 
         foreach (var problem in problems)
             Console.WriteLine($"FATAL ERROR PROBLEM:{problem}");
 
-        Assert.AreEqual(problems.Count,0);
+        Assert.AreEqual(problems.Count, 0);
     }
 
     private string GetExpectedClassOrInterface(string expectedClassName)
     {
         //found it?
-        if (_csFilesList.Any(f => Path.GetFileName(f).Equals($"{expectedClassName}.cs", StringComparison.InvariantCultureIgnoreCase)))
+        if (_csFilesList.Any(f =>
+                Path.GetFileName(f).Equals($"{expectedClassName}.cs", StringComparison.InvariantCultureIgnoreCase)))
             return expectedClassName;
 
         //expected Filter but found IFilter - acceptable
-        if (_csFilesList.Any(f => Path.GetFileName(f).Equals($"I{expectedClassName}.cs", StringComparison.InvariantCultureIgnoreCase)))
+        if (_csFilesList.Any(f =>
+                Path.GetFileName(f).Equals($"I{expectedClassName}.cs", StringComparison.InvariantCultureIgnoreCase)))
             return $"I{expectedClassName}";
 
         return null;
     }
 
-    private void ConfirmFileHasText(Type type, string expectedString,bool mustHaveText = true)
+    private void ConfirmFileHasText(Type type, string expectedString, bool mustHaveText = true)
     {
         var file = _csFilesList.SingleOrDefault(f => Path.GetFileName(f).Equals($"{type.Name}.cs"));
 
         //probably not our class
-        if(file == null)
+        if (file == null)
             return;
         var hasText = File.ReadAllText(file)
             .Replace(" ", "")
-            .ToLowerInvariant()
-            .Contains(expectedString.Replace(" ", "").ToLowerInvariant());
+            .Replace("\n", "")
+            .Replace("\r", "")
+            .Contains(expectedString.Replace(" ", ""),StringComparison.OrdinalIgnoreCase);
 
         if (mustHaveText)
         {
-            if(!hasText)
+            if (!hasText)
                 problems.Add($"File '{file}' did not contain expected text '{expectedString}'");
         }
         else
         {
-            if(hasText)
+            if (hasText)
                 problems.Add($"File '{file}' contains unexpected text '{expectedString}'");
         }
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/ExternalDatabaseServerUITests.cs b/Rdmp.UI.Tests/ExternalDatabaseServerUITests.cs
index 835bf51dfd..10c132d0a9 100644
--- a/Rdmp.UI.Tests/ExternalDatabaseServerUITests.cs
+++ b/Rdmp.UI.Tests/ExternalDatabaseServerUITests.cs
@@ -12,7 +12,8 @@ namespace Rdmp.UI.Tests;
 
 internal class ExternalDatabaseServerUITests : UITests
 {
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ExternalDatabaseServerUITests_NormalState()
     {
         SetupMEF();
@@ -32,5 +33,4 @@ public void Test_ExternalDatabaseServerUITests_NormalState()
         ui.GetObjectSaverButton().Save();
         Assert.AreEqual("", server.Username);
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/ExtractionUIs/ConfigureDatasetUITests.cs b/Rdmp.UI.Tests/ExtractionUIs/ConfigureDatasetUITests.cs
index f28a50cd2c..c2f5ad3c46 100644
--- a/Rdmp.UI.Tests/ExtractionUIs/ConfigureDatasetUITests.cs
+++ b/Rdmp.UI.Tests/ExtractionUIs/ConfigureDatasetUITests.cs
@@ -12,30 +12,31 @@ namespace Rdmp.UI.Tests.ExtractionUIs;
 
 internal class ConfigureDatasetUITests : UITests
 {
-    [Test,UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_RemoveAllColumns_Only1Publish()
     {
         var sds = WhenIHaveA<SelectedDataSets>();
         var ui = AndLaunch<ConfigureDatasetUI>(sds);
-            
+
         AssertNoErrors();
 
         var publishCount = 0;
 
         //should be at least 2 in the config for this test to be sensible
         var cols = sds.ExtractionConfiguration.GetAllExtractableColumnsFor(sds.ExtractableDataSet);
-        Assert.GreaterOrEqual(cols.Length,2);
+        Assert.GreaterOrEqual(cols.Length, 2);
 
-        ItemActivator.RefreshBus.BeforePublish += (s,e)=>publishCount++;
+        ItemActivator.RefreshBus.BeforePublish += (s, e) => publishCount++;
 
         Assert.AreEqual(0, publishCount);
 
         ui.ExcludeAll();
 
-        Assert.AreEqual(1,publishCount);
+        Assert.AreEqual(1, publishCount);
 
         AssertNoErrors();
-            
+
         //should now be no columns in the extraction configuration
         Assert.IsEmpty(sds.ExtractionConfiguration.GetAllExtractableColumnsFor(sds.ExtractableDataSet));
 
@@ -53,6 +54,7 @@ public void Test_RemoveAllColumns_Only1Publish()
         ui.IncludeAll();
         ui.IncludeAll();
 
-        Assert.AreEqual(cols.Length, sds.ExtractionConfiguration.GetAllExtractableColumnsFor(sds.ExtractableDataSet).Length);
+        Assert.AreEqual(cols.Length,
+            sds.ExtractionConfiguration.GetAllExtractableColumnsFor(sds.ExtractableDataSet).Length);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/ExtractionUIs/JoinsAndLookups/LookupBrowserUITests.cs b/Rdmp.UI.Tests/ExtractionUIs/JoinsAndLookups/LookupBrowserUITests.cs
index 40a1780508..0514cea790 100644
--- a/Rdmp.UI.Tests/ExtractionUIs/JoinsAndLookups/LookupBrowserUITests.cs
+++ b/Rdmp.UI.Tests/ExtractionUIs/JoinsAndLookups/LookupBrowserUITests.cs
@@ -10,9 +10,10 @@
 
 namespace Rdmp.UI.Tests.ExtractionUIs.JoinsAndLookups;
 
-public class LookupBrowserUITests :UITests
+public class LookupBrowserUITests : UITests
 {
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_LookupBrowserUI_Constructor()
     {
         var o = WhenIHaveA<Lookup>();
diff --git a/Rdmp.UI.Tests/ForEachUITests.cs b/Rdmp.UI.Tests/ForEachUITests.cs
index e42f541dc6..4337be0b63 100644
--- a/Rdmp.UI.Tests/ForEachUITests.cs
+++ b/Rdmp.UI.Tests/ForEachUITests.cs
@@ -10,16 +10,18 @@
 
 namespace Rdmp.UI.Tests;
 
-internal class ForEachUITests: UITests
+internal class ForEachUITests : UITests
 {
     /// <summary>
     /// Tests that all DatabaseEntity objects can be constructed with <see cref="UnitTests.WhenIHaveA{T}()"/> and that if <see cref="ExecuteCommandActivate"/>  says
     /// they can be activated then they can be (without blowing up in a major way).
     /// </summary>
-    [Test,UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void ForEachUI_Test_GetTabName()
     {
-        ForEachUI(ui=>{
+        ForEachUI(ui =>
+        {
             Assert.NotNull(ui);
             Assert.IsFalse(string.IsNullOrWhiteSpace(ui.GetTabName()));
         });
diff --git a/Rdmp.UI.Tests/ForwardEngineerANOCatalogueUITests.cs b/Rdmp.UI.Tests/ForwardEngineerANOCatalogueUITests.cs
index d75279534f..83db13bbe0 100644
--- a/Rdmp.UI.Tests/ForwardEngineerANOCatalogueUITests.cs
+++ b/Rdmp.UI.Tests/ForwardEngineerANOCatalogueUITests.cs
@@ -13,20 +13,22 @@ namespace Rdmp.UI.Tests;
 
 internal class ForwardEngineerANOCatalogueUITests : UITests
 {
-    [Test,UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ForwardEngineerANOCatalogueUI_NormalState()
     {
         SetupMEF();
 
         var eiChi = WhenIHaveA<ExtractionInformation>();
         var cata = eiChi.CatalogueItem.Catalogue;
-            
+
         AndLaunch<ForwardEngineerANOCatalogueUI>(cata);
 
         AssertNoErrors(ExpectedErrorType.Any);
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_ForwardEngineerANOCatalogueUI_NoColumns()
     {
         SetupMEF();
@@ -34,12 +36,12 @@ public void Test_ForwardEngineerANOCatalogueUI_NoColumns()
         var cata = WhenIHaveA<Catalogue>();
 
         //shouldn't be possible to launch the UI
-        AssertCommandIsImpossible(new ExecuteCommandCreateANOVersion(ItemActivator, cata), "does not have any Extractable Columns");
+        AssertCommandIsImpossible(new ExecuteCommandCreateANOVersion(ItemActivator, cata),
+            "does not have any Extractable Columns");
 
         //and if we are depersisting it that should be angry
         AndLaunch<ForwardEngineerANOCatalogueUI>(cata);
 
         AssertErrorWasShown(ExpectedErrorType.Fatal, "Could not generate a valid query for the Catalogue");
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/HelpIconTests.cs b/Rdmp.UI.Tests/HelpIconTests.cs
index 5e9a91972e..481e4cb481 100644
--- a/Rdmp.UI.Tests/HelpIconTests.cs
+++ b/Rdmp.UI.Tests/HelpIconTests.cs
@@ -5,7 +5,6 @@
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
 using NUnit.Framework;
-
 using HelpIcon = Rdmp.UI.SimpleControls.HelpIcon;
 
 namespace Rdmp.UI.Tests;
@@ -16,8 +15,8 @@ internal class HelpIconTests
     public void TestNullInputs_HelpIcon()
     {
         var hi = new HelpIcon();
-        hi.SetHelpText(null,null);
-        hi.SetHelpText("","");
+        hi.SetHelpText(null, null);
+        hi.SetHelpText("", "");
         Assert.IsNull(hi.HoverText);
     }
 
@@ -27,8 +26,9 @@ public void TestLongInputs_HelpIcon()
         var hi = new HelpIcon();
 
         //length is over 150 characters
-        var testLongString = "kdsfldsfjsdafdfjsdafldsafadsfksdafjdfjdsfasdjfdsjfsdfldsjfkdsfkdsfksdafjdfsdaf;sdafsdafadsflsdafksdfjadslfjdsflsdjfldsfksadkfadkfasdfadsjfasdsdfladsfjsdjfkdflsdfksdfkadsfladsfj";
-        hi.SetHelpText(null,testLongString);
-        Assert.AreEqual(HelpIcon.MaxHoverTextLength,hi.HoverText.Length);
+        var testLongString =
+            "kdsfldsfjsdafdfjsdafldsafadsfksdafjdfjdsfasdjfdsjfsdfldsjfkdsfkdsfksdafjdfsdaf;sdafsdafadsflsdafksdfjadslfjdsflsdjfldsfksadkfadkfasdfadsjfasdsdfladsfjsdjfkdflsdfksdfkadsfladsfj";
+        hi.SetHelpText(null, testLongString);
+        Assert.AreEqual(HelpIcon.MaxHoverTextLength, hi.HoverText.Length);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/HistoryProviderTests.cs b/Rdmp.UI.Tests/HistoryProviderTests.cs
index aee989aa7a..48dc9cd3fc 100644
--- a/Rdmp.UI.Tests/HistoryProviderTests.cs
+++ b/Rdmp.UI.Tests/HistoryProviderTests.cs
@@ -35,22 +35,23 @@ public void TestHistoryProvider_DuplicateAdding()
 
         provider.Add(c);
 
-        Assert.AreEqual(1,provider.History.Count);
+        Assert.AreEqual(1, provider.History.Count);
 
         provider.Add(c);
 
-        Assert.AreEqual(1,provider.History.Count);
+        Assert.AreEqual(1, provider.History.Count);
 
         provider.Add(c);
 
-        Assert.AreEqual(1,provider.History.Count);
+        Assert.AreEqual(1, provider.History.Count);
 
         var p = WhenIHaveA<Project>();
-            
+
         provider.Add(p);
 
-        Assert.AreEqual(2,provider.History.Count);
+        Assert.AreEqual(2, provider.History.Count);
     }
+
     [Test]
     public void TestHistoryProvider_Persist()
     {
@@ -63,28 +64,28 @@ public void TestHistoryProvider_Persist()
         provider.Clear();
         Assert.IsEmpty(provider.History);
 
-        provider.History.Add(new HistoryEntry(c1,new DateTime(2001,01,01)));
-        provider.History.Add(new HistoryEntry(c2,new DateTime(2002,02,01)));
-        provider.History.Add(new HistoryEntry(c3,new DateTime(2003,03,01)));
-        provider.History.Add(new HistoryEntry(c4,new DateTime(2004,01,04)));
+        provider.History.Add(new HistoryEntry(c1, new DateTime(2001, 01, 01)));
+        provider.History.Add(new HistoryEntry(c2, new DateTime(2002, 02, 01)));
+        provider.History.Add(new HistoryEntry(c3, new DateTime(2003, 03, 01)));
+        provider.History.Add(new HistoryEntry(c4, new DateTime(2004, 01, 04)));
 
         provider.Save(2);
-        Assert.AreEqual(2,provider.History.Count);
+        Assert.AreEqual(2, provider.History.Count);
 
-        Assert.AreEqual(c4,provider.History[0].Object);
-        Assert.AreEqual(c3,provider.History[1].Object);
-        Assert.AreEqual(new DateTime(2004,01,04),provider.History[0].Date);
-        Assert.AreEqual(new DateTime(2003,03,01),provider.History[1].Date);
+        Assert.AreEqual(c4, provider.History[0].Object);
+        Assert.AreEqual(c3, provider.History[1].Object);
+        Assert.AreEqual(new DateTime(2004, 01, 04), provider.History[0].Date);
+        Assert.AreEqual(new DateTime(2003, 03, 01), provider.History[1].Date);
 
 
         var provider2 = new HistoryProvider(RepositoryLocator);
 
-        Assert.AreEqual(c4,provider2.History[0].Object);
-        Assert.AreEqual(c3,provider2.History[1].Object);
-        Assert.AreEqual(new DateTime(2004,01,04),provider2.History[0].Date);
-        Assert.AreEqual(new DateTime(2003,03,01),provider2.History[1].Date);
-
+        Assert.AreEqual(c4, provider2.History[0].Object);
+        Assert.AreEqual(c3, provider2.History[1].Object);
+        Assert.AreEqual(new DateTime(2004, 01, 04), provider2.History[0].Date);
+        Assert.AreEqual(new DateTime(2003, 03, 01), provider2.History[1].Date);
     }
+
     [Test]
     public void TestHistoryProvider_PersistByType()
     {
@@ -98,23 +99,23 @@ public void TestHistoryProvider_PersistByType()
         Assert.IsEmpty(provider.History);
 
         //these were viewed recently
-        provider.History.Add(new HistoryEntry(c1,new DateTime(2001,01,01)));
-        provider.History.Add(new HistoryEntry(c2,new DateTime(2002,02,02)));
+        provider.History.Add(new HistoryEntry(c1, new DateTime(2001, 01, 01)));
+        provider.History.Add(new HistoryEntry(c2, new DateTime(2002, 02, 02)));
 
         //these were viewed ages ago
-        provider.History.Add(new HistoryEntry(lmd1,new DateTime(1999,01,01)));
-        provider.History.Add(new HistoryEntry(lmd2,new DateTime(2000,02,03)));
+        provider.History.Add(new HistoryEntry(lmd1, new DateTime(1999, 01, 01)));
+        provider.History.Add(new HistoryEntry(lmd2, new DateTime(2000, 02, 03)));
 
         //persist only 1 entry (by Type)
         provider.Save(1);
-        Assert.AreEqual(2,provider.History.Count);
+        Assert.AreEqual(2, provider.History.Count);
 
-        Assert.AreEqual(c2,provider.History[0].Object);
-        Assert.AreEqual(lmd2,provider.History[1].Object);
+        Assert.AreEqual(c2, provider.History[0].Object);
+        Assert.AreEqual(lmd2, provider.History[1].Object);
 
         var provider2 = new HistoryProvider(RepositoryLocator);
-            
-        Assert.AreEqual(c2,provider2.History[0].Object);
-        Assert.AreEqual(lmd2,provider2.History[1].Object);
+
+        Assert.AreEqual(c2, provider2.History[0].Object);
+        Assert.AreEqual(lmd2, provider2.History[1].Object);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/LoadDiagramUITests.cs b/Rdmp.UI.Tests/LoadDiagramUITests.cs
index 6eae136e23..71bbf4a007 100644
--- a/Rdmp.UI.Tests/LoadDiagramUITests.cs
+++ b/Rdmp.UI.Tests/LoadDiagramUITests.cs
@@ -14,11 +14,12 @@ namespace Rdmp.UI.Tests;
 
 public class LoadDiagramUITests : UITests
 {
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_LoadDiagramUITests_NormalState()
     {
         var lmd = WhenIHaveA<LoadMetadata>();
-            
+
         SetupMEF();
 
         var ui = AndLaunch<LoadDiagramUI>(lmd);
@@ -27,26 +28,26 @@ public void Test_LoadDiagramUITests_NormalState()
         AssertCommandIsPossible(new ExecuteCommandViewLoadDiagram(ItemActivator, lmd));
 
         AssertNoErrors(ExpectedErrorType.Any);
-
     }
 
-    [Test, UITimeout(50000)]
+    [Test]
+    [UITimeout(50000)]
     public void Test_LoadDiagramUITests_NoCatalogues()
     {
         var lmd = WhenIHaveA<LoadMetadata>();
-            
+
         //delete the Catalogue so the load is an orphan
         lmd.GetAllCatalogues().Single().DeleteInDatabase();
-            
+
         SetupMEF();
 
         var ui = AndLaunch<LoadDiagramUI>(lmd);
 
         //cant launch the command
-        AssertCommandIsImpossible(new ExecuteCommandViewLoadDiagram(ItemActivator, lmd), "does not have any associated Catalogues");
+        AssertCommandIsImpossible(new ExecuteCommandViewLoadDiagram(ItemActivator, lmd),
+            "does not have any associated Catalogues");
 
         //and ui should be showing big problems
-        AssertErrorWasShown(ExpectedErrorType.Fatal,"Could not fetch data");
-
+        AssertErrorWasShown(ExpectedErrorType.Fatal, "Could not fetch data");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/LogViewer/LoggingTabUITests.cs b/Rdmp.UI.Tests/LogViewer/LoggingTabUITests.cs
index 20194371ec..585be692a1 100644
--- a/Rdmp.UI.Tests/LogViewer/LoggingTabUITests.cs
+++ b/Rdmp.UI.Tests/LogViewer/LoggingTabUITests.cs
@@ -10,14 +10,15 @@
 
 namespace Rdmp.UI.Tests.LogViewer;
 
-public class LoggingTabUITests :UITests
+public class LoggingTabUITests : UITests
 {
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void Test_LoggingTabUI_Constructor()
     {
         var o = WhenIHaveA<ExternalDatabaseServer>();
         var ui = AndLaunch<LoggingTabUI>(o);
         Assert.IsNotNull(ui);
-        AssertErrorWasShown(ExpectedErrorType.KilledForm,"Database My Server did not exist");
+        AssertErrorWasShown(ExpectedErrorType.KilledForm, "Database My Server did not exist");
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/PluginProcessTaskUITests.cs b/Rdmp.UI.Tests/PluginProcessTaskUITests.cs
index 08098776c1..d60ae16e1e 100644
--- a/Rdmp.UI.Tests/PluginProcessTaskUITests.cs
+++ b/Rdmp.UI.Tests/PluginProcessTaskUITests.cs
@@ -25,14 +25,16 @@ protected override void OneTimeSetUp()
         SetupMEF();
     }
 
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void PluginProcessTaskUI_NoClass()
     {
         AndLaunch<PluginProcessTaskUI>(WhenIHaveA<ProcessTask>());
-        AssertErrorWasShown(ExpectedErrorType.KilledForm,"No class has been specified");
+        AssertErrorWasShown(ExpectedErrorType.KilledForm, "No class has been specified");
     }
 
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void PluginProcessTaskUI_ClassNotFound()
     {
         var pt = WhenIHaveA<ProcessTask>();
@@ -40,10 +42,11 @@ public void PluginProcessTaskUI_ClassNotFound()
         pt.SaveToDatabase();
 
         AndLaunch<PluginProcessTaskUI>(pt);
-        AssertErrorWasShown(ExpectedErrorType.KilledForm,"Could not find Type 'ArmageddonAttacher' for ProcessTask ");
+        AssertErrorWasShown(ExpectedErrorType.KilledForm, "Could not find Type 'ArmageddonAttacher' for ProcessTask ");
     }
 
-    [Test,UITimeout(20000)]
+    [Test]
+    [UITimeout(20000)]
     public void PluginProcessTaskUI_ClassIsLegit()
     {
         var pt = WhenIHaveA<ProcessTask>();
@@ -53,17 +56,18 @@ public void PluginProcessTaskUI_ClassIsLegit()
         AndLaunch<PluginProcessTaskUI>(pt);
         AssertNoErrors(ExpectedErrorType.Any);
     }
-        
-    [Test,UITimeout(20000)]
+
+    [Test]
+    [UITimeout(20000)]
     public void PluginProcessTaskUI_InvalidParameter_Date()
     {
         MEF.AddTypeToCatalogForTesting(typeof(OmgDates));
         var pt = WhenIHaveA<ProcessTask>();
         pt.Path = typeof(OmgDates).FullName;
         var arg = pt.CreateArgumentsForClassIfNotExists<OmgDates>().Single();
-            
+
         //set the argument value to 2001
-        arg.SetValue(new DateTime(2001,01,01));
+        arg.SetValue(new DateTime(2001, 01, 01));
         pt.SaveToDatabase();
 
         AndLaunch<PluginProcessTaskUI>(pt);
@@ -74,7 +78,7 @@ public void PluginProcessTaskUI_InvalidParameter_Date()
 
         //set the text to something nasty that won't compile
         tb.Text = "hahahah fff";
-            
+
         Publish(pt);
         AssertNoErrors(ExpectedErrorType.Any);
 
@@ -85,8 +89,6 @@ public void PluginProcessTaskUI_InvalidParameter_Date()
 
     private class OmgDates
     {
-        [DemandsInitialization("A Date")]
-        public DateTime MyDate { get; set; }
-
+        [DemandsInitialization("A Date")] public DateTime MyDate { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
index 4f35b8ad2d..29bfe946c9 100644
--- a/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
+++ b/Rdmp.UI.Tests/Rdmp.UI.Tests.csproj
@@ -16,7 +16,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Rdmp.UI.Tests/RecentHistoryOfControlsTests.cs b/Rdmp.UI.Tests/RecentHistoryOfControlsTests.cs
index f5ae2297c7..724594bd4d 100644
--- a/Rdmp.UI.Tests/RecentHistoryOfControlsTests.cs
+++ b/Rdmp.UI.Tests/RecentHistoryOfControlsTests.cs
@@ -18,15 +18,15 @@ public void TestOverflowPrevention()
     {
         var t = new System.Windows.Forms.TextBox();
 
-        var c = new RecentHistoryOfControls(t,new Guid("b3ccaf14-702a-438a-8cf4-d550d6d7775d"));
+        var c = new RecentHistoryOfControls(t, new Guid("b3ccaf14-702a-438a-8cf4-d550d6d7775d"));
 
         c.Clear();
         var overFlowCounter = 100000;
 
         for (var i = 0; i < overFlowCounter; i++)
-            c.AddResult($"testOverflowValue{Guid.NewGuid()}", i%1000 == 0);//only save every X values added for performance
+            c.AddResult($"testOverflowValue{Guid.NewGuid()}",
+                i % 1000 == 0); //only save every X values added for performance
 
         c.Clear();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/TestActivateItems.cs b/Rdmp.UI.Tests/TestActivateItems.cs
index 763dee3f2a..3473951806 100644
--- a/Rdmp.UI.Tests/TestActivateItems.cs
+++ b/Rdmp.UI.Tests/TestActivateItems.cs
@@ -39,7 +39,7 @@
 
 namespace Rdmp.UI.Tests;
 
-public class TestActivateItems: BasicActivateItems, IActivateItems, ITheme
+public class TestActivateItems : BasicActivateItems, IActivateItems, ITheme
 {
     private readonly UITests _uiTests;
     private static CommentStore _commentStore;
@@ -56,7 +56,8 @@ public class TestActivateItems: BasicActivateItems, IActivateItems, ITheme
     /// </summary>
     public TestActivateItemsResults Results { get; private set; }
 
-    public TestActivateItems(UITests uiTests,MemoryDataExportRepository repo):base(new RepositoryProvider(repo),new ToMemoryCheckNotifier())
+    public TestActivateItems(UITests uiTests, MemoryDataExportRepository repo) : base(new RepositoryProvider(repo),
+        new ToMemoryCheckNotifier())
     {
         _uiTests = uiTests;
         Results = new TestActivateItemsResults();
@@ -85,16 +86,16 @@ public Form ShowWindow(Control singleControlForm, bool asDocument = false)
         _uiTests.AndLaunch(singleControlForm);
         return singleControlForm.FindForm();
     }
-        
+
     public override void Publish(IMapsDirectlyToDatabaseTable o)
     {
         base.Publish(o);
 
-        if(o is DatabaseEntity e)
-            RefreshBus.Publish(this,new RefreshObjectEventArgs(e));
+        if (o is DatabaseEntity e)
+            RefreshBus.Publish(this, new RefreshObjectEventArgs(e));
     }
 
-    public override void Show(string title,string message)
+    public override void Show(string title, string message)
     {
         Assert.Fail($"Did not expect a MessageBox to be shown but it was '{message}'");
     }
@@ -104,10 +105,9 @@ public override void Show(string title,string message)
     public new CommentStore CommentStore { get; private set; } // Hide normal CommentStore so we can overwrite it later
     public HistoryProvider HistoryProvider { get; }
 
-    public T Activate<T, T2>(T2 databaseObject) where T : RDMPSingleDatabaseObjectControl<T2>, new() where T2 : DatabaseEntity
-    {
-        return _uiTests.AndLaunch<T>(databaseObject);
-    }
+    public T Activate<T, T2>(T2 databaseObject)
+        where T : RDMPSingleDatabaseObjectControl<T2>, new() where T2 : DatabaseEntity =>
+        _uiTests.AndLaunch<T>(databaseObject);
 
     public T Activate<T>(IPersistableObjectCollection collection) where T : Control, IObjectCollectionControl, new()
     {
@@ -119,7 +119,7 @@ public override void Show(string title,string message)
 
     public override bool DeleteWithConfirmation(IDeleteable deleteable)
     {
-        if(deleteable is DatabaseEntity d && !d.Exists())
+        if (deleteable is DatabaseEntity d && !d.Exists())
             throw new Exception("Attempt made to delete an object which didn't exist");
 
         base.DeleteWithConfirmation(deleteable);
@@ -128,36 +128,28 @@ public override bool DeleteWithConfirmation(IDeleteable deleteable)
         return true;
     }
 
-    public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
-    {
+    public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen) =>
         throw new NotImplementedException();
-    }
 
-    public override bool SelectType(DialogArgs args, Type[] available,out Type chosen)
-    {
+    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen) =>
         throw new NotImplementedException();
-    }
 
-    public bool IsRootObjectOfCollection(RDMPCollection collection, object rootObject)
-    {
+    public bool IsRootObjectOfCollection(RDMPCollection collection, object rootObject) =>
         throw new NotImplementedException();
-    }
 
     public bool HasProblem(object model)
     {
-        return _problemProviders.Any(p=>p.HasProblem(model));
+        return _problemProviders.Any(p => p.HasProblem(model));
     }
 
     public string DescribeProblemIfAny(object model)
     {
-        return _problemProviders.Select(p => p.DescribeProblem(model)).SingleOrDefault(prob=>prob != null);
-    }
-        
-    public string GetDocumentation(Type type)
-    {
-        return RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(type);
+        return _problemProviders.Select(p => p.DescribeProblem(model)).SingleOrDefault(prob => prob != null);
     }
 
+    public string GetDocumentation(Type type) =>
+        RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(type);
+
     public string CurrentDirectory => TestContext.CurrentContext.TestDirectory;
 
     public DialogResult ShowDialog(Form form)
@@ -166,14 +158,15 @@ public DialogResult ShowDialog(Form form)
         return DialogResult.OK;
     }
 
-        
+
     public void KillForm(Form f, Exception reason)
     {
-        Results.KilledForms.Add(f,reason);
+        Results.KilledForms.Add(f, reason);
     }
+
     public void KillForm(Form f, string reason)
     {
-        Results.KilledForms.Add(f,new Exception(reason));
+        Results.KilledForms.Add(f, new Exception(reason));
     }
 
     public void OnRuleRegistered(IBinderRule rule)
@@ -183,7 +176,7 @@ public void OnRuleRegistered(IBinderRule rule)
 
     public bool ShouldReloadFreshCopy(DatabaseEntity databaseEntity)
     {
-        if(ShouldReloadFreshCopyDelegate == null)
+        if (ShouldReloadFreshCopyDelegate == null)
         {
             Assert.Fail(
                 $"Object {databaseEntity} was out of date with the database, normally user would be asked to load a new copy but since this is a test the test will be failed.  Solve this either by calling SaveToDatabase before launching your UI or by setting the ShouldReloadFreshCopyDelegate delegate (if the MessageBox showing is how the live system should respond)");
@@ -195,27 +188,26 @@ public bool ShouldReloadFreshCopy(DatabaseEntity databaseEntity)
 
     public void ApplyTo(ToolStrip item)
     {
-            
     }
 
     public bool ApplyThemeToMenus { get; set; }
 
-        
+
     /// <summary>
     /// The answer to give when asked <see cref="YesNo"/>
     /// </summary>
-    public bool? YesNoResponse { get;set;}
+    public bool? YesNoResponse { get; set; }
 
     public override bool YesNo(DialogArgs args, out bool chosen)
     {
         if (YesNoResponse.HasValue)
         {
             chosen = YesNoResponse.Value;
-                
+
             //'user' consciously chose a value
             return true;
         }
-                
+
 
         throw new Exception($"Did not expect to be asked a question but we were asked :{args}");
     }
@@ -226,21 +218,18 @@ public override bool YesNo(DialogArgs args, out bool chosen)
     /// </summary>
     public string TypeTextResponse { get; set; }
 
-    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text, bool requireSaneHeaderText)
+    public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
+        bool requireSaneHeaderText)
     {
         text = TypeTextResponse;
         return !string.IsNullOrWhiteSpace(TypeTextResponse);
     }
 
-    public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription)
-    {
+    public override DiscoveredDatabase SelectDatabase(bool allowDatabaseCreation, string taskDescription) =>
         throw new NotImplementedException();
-    }
 
-    public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription)
-    {
+    public override DiscoveredTable SelectTable(bool allowDatabaseCreation, string taskDescription) =>
         throw new NotImplementedException();
-    }
 
     public override void ShowException(string errorText, Exception exception)
     {
@@ -251,60 +240,44 @@ public override void Wait(string title, Task task, CancellationTokenSource cts)
     {
         task.Wait(cts.Token);
     }
-        
+
     public override List<CommandInvokerDelegate> GetDelegates()
     {
         return new List<CommandInvokerDelegate>
         {
-            new CommandInvokerDelegate(typeof(IActivateItems),true,p=>this)
+            new(typeof(IActivateItems), true, p => this)
         };
     }
 
     public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type arrayElementType,
-        IMapsDirectlyToDatabaseTable[] availableObjects)
-    {
+        IMapsDirectlyToDatabaseTable[] availableObjects) =>
         throw new NotImplementedException();
-    }
 
-    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects)
-    {
-        throw new NotImplementedException();
-    }
+    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects) => throw new NotImplementedException();
 
-    public override DirectoryInfo SelectDirectory(string prompt)
-    {
-        throw new NotImplementedException();
-    }
+    public override DirectoryInfo SelectDirectory(string prompt) => throw new NotImplementedException();
 
-    public override FileInfo SelectFile(string prompt)
-    {
-        return SelectFile(prompt, null, null);
-    }
-        
-    public override FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern)
-    {
-        throw new NotImplementedException();
-    }
-    public override FileInfo SelectFile(string prompt, string patternDescription, string pattern)
-    {
+    public override FileInfo SelectFile(string prompt) => SelectFile(prompt, null, null);
+
+    public override FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern) =>
         throw new NotImplementedException();
-    }
 
-    protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue,out object chosen)
-    {
+    public override FileInfo SelectFile(string prompt, string patternDescription, string pattern) =>
         throw new NotImplementedException();
-    }
 
-    public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialSelectionIfAny, string initialSearch)
-    {
+    protected override bool
+        SelectValueTypeImpl(DialogArgs args, Type paramType, object initialValue, out object chosen) =>
         throw new NotImplementedException();
-    }
 
-    public IEnumerable<SessionCollectionUI> GetSessions()
+    public void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialSelectionIfAny,
+        string initialSearch)
     {
         throw new NotImplementedException();
     }
 
+    public IEnumerable<SessionCollectionUI> GetSessions() => throw new NotImplementedException();
+
     public override void ShowData(IViewSQLAndResultsCollection collection)
     {
         throw new NotImplementedException();
@@ -325,15 +298,11 @@ public override void ShowGraph(AggregateConfiguration aggregate)
         throw new NotImplementedException();
     }
 
-    public override bool SelectObject<T>(DialogArgs args, T[] available, out T selected)
-    {
+    public override bool SelectObject<T>(DialogArgs args, T[] available, out T selected) =>
         throw new NotImplementedException();
-    }
 
-    public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected)
-    {
+    public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] selected) =>
         throw new NotImplementedException();
-    }
 
     public override void LaunchSubprocess(ProcessStartInfo startInfo)
     {
@@ -346,7 +315,7 @@ public override void ShowData(System.Data.DataTable collection)
     }
 }
 
-public class TestActivateItemsResults:ICheckNotifier
+public class TestActivateItemsResults : ICheckNotifier
 {
     public List<Control> WindowsShown = new();
     public Dictionary<Form, Exception> KilledForms = new();
@@ -363,7 +332,7 @@ public void Clear()
 
     public bool OnCheckPerformed(CheckEventArgs args)
     {
-        if(args.Result >= CheckResult.Fail)
+        if (args.Result >= CheckResult.Fail)
             FatalCalls.Add(args);
 
         return false;
diff --git a/Rdmp.UI.Tests/TypeTextOrCancelDialogTests.cs b/Rdmp.UI.Tests/TypeTextOrCancelDialogTests.cs
index 45b223bd6c..f152cb6fcb 100644
--- a/Rdmp.UI.Tests/TypeTextOrCancelDialogTests.cs
+++ b/Rdmp.UI.Tests/TypeTextOrCancelDialogTests.cs
@@ -41,8 +41,8 @@ public void Test_TypeTextOrCancelDialog_LargeStrings()
 
         var s = sb.ToString();
 
-        var dlg = new TypeTextOrCancelDialog(s,s,5000);
-            
+        var dlg = new TypeTextOrCancelDialog(s, s, 5000);
+
         //pretend like we launched it
         LastUserInterfaceLaunched = dlg;
 
@@ -53,7 +53,5 @@ public void Test_TypeTextOrCancelDialog_LargeStrings()
         //dialog shouldn't go thinner than 540 or wider than 840 pixels
         Assert.GreaterOrEqual(dlg.Width, 540);
         Assert.LessOrEqual(dlg.Width, 840);
-
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI.Tests/UITests.cs b/Rdmp.UI.Tests/UITests.cs
index ccf0d77536..1304daf47f 100644
--- a/Rdmp.UI.Tests/UITests.cs
+++ b/Rdmp.UI.Tests/UITests.cs
@@ -34,7 +34,7 @@ public class UITests : UnitTests
 
     public Control LastUserInterfaceLaunched { get; set; }
 
-    protected TestActivateItems ItemActivator => _itemActivator?? InitializeItemActivator();
+    protected TestActivateItems ItemActivator => _itemActivator ?? InitializeItemActivator();
 
     /// <summary>
     /// Generates the <see cref="ItemActivator"/> (if it hasn't already been initialized).  This is normally done automatically
@@ -42,7 +42,7 @@ public class UITests : UnitTests
     /// </summary>
     private TestActivateItems InitializeItemActivator()
     {
-        _itemActivator = new TestActivateItems(this,Repository)
+        _itemActivator = new TestActivateItems(this, Repository)
         {
             RepositoryLocator =
             {
@@ -54,7 +54,7 @@ private TestActivateItems InitializeItemActivator()
         };
 
         //if mef was loaded for this test then this is supported otherwise not
-        if(MEF != null)
+        if (MEF != null)
             _itemActivator.CommandExecutionFactory = new RDMPCommandExecutionFactory(_itemActivator);
         return _itemActivator;
     }
@@ -71,23 +71,25 @@ private TestActivateItems InitializeItemActivator()
     /// will have to call it yourself</param>
     /// <returns></returns>
     /// <exception cref="NotSupportedException">Thrown when calling this method multiple times within a single test</exception>
-    public T AndLaunch<T>(DatabaseEntity o,bool setDatabaseObject=true) where T : Control, IRDMPSingleDatabaseObjectControl, new()
+    public T AndLaunch<T>(DatabaseEntity o, bool setDatabaseObject = true)
+        where T : Control, IRDMPSingleDatabaseObjectControl, new()
     {
         var ui = new T();
         AndLaunch(ui);
-        if(setDatabaseObject)
+        if (setDatabaseObject)
             ui.SetDatabaseObject(ItemActivator, o);
         return ui;
     }
 
 
-    public T AndLaunch<T>() where T : RDMPCollectionUI,new()
+    public T AndLaunch<T>() where T : RDMPCollectionUI, new()
     {
         var ui = new T();
         AndLaunch(ui);
         ui.SetItemActivator(ItemActivator);
         return ui;
     }
+
     public void AndLaunch(Control ui)
     {
         //clear the old results
@@ -98,7 +100,7 @@ public void AndLaunch(Control ui)
         f.Controls.Add(ui);
         CreateControls(ui);
 
-        if(ui is IRDMPControl rdmpUi)
+        if (ui is IRDMPControl rdmpUi)
         {
             rdmpUi.CommonFunctionality.BeforeChecking += CommonFunctionalityOnBeforeChecking;
             rdmpUi.CommonFunctionality.OnFatal += CommonFunctionalityOnFatal;
@@ -120,6 +122,7 @@ protected void ClearResults()
 
         LastUserInterfaceLaunched = null;
     }
+
     /// <summary>
     /// Asserts that the given command is impossible for the <paramref name="expectedReason"/>
     /// </summary>
@@ -130,6 +133,7 @@ protected static void AssertCommandIsImpossible(IAtomicCommand cmd, string expec
         Assert.IsTrue(cmd.IsImpossible);
         StringAssert.Contains(expectedReason, cmd.ReasonCommandImpossible);
     }
+
     /// <summary>
     /// Asserts that the given command is not marked IsImpossible
     /// </summary>
@@ -137,10 +141,10 @@ protected static void AssertCommandIsImpossible(IAtomicCommand cmd, string expec
     protected static void AssertCommandIsPossible(IAtomicCommand cmd)
     {
         //if it isn't marked impossible
-        if(!cmd.IsImpossible)
+        if (!cmd.IsImpossible)
             return;
 
-        if(string.IsNullOrWhiteSpace(cmd.ReasonCommandImpossible))
+        if (string.IsNullOrWhiteSpace(cmd.ReasonCommandImpossible))
             Assert.Fail("Command was impossible but no reason was given!!!");
 
         Assert.Fail($"Command was Impossible because:{cmd.ReasonCommandImpossible}");
@@ -149,7 +153,7 @@ protected static void AssertCommandIsPossible(IAtomicCommand cmd)
     private void CommonFunctionalityOnBeforeChecking(object sender, EventArgs eventArgs)
     {
         //intercept checking and replace with our own in memory checks
-        var e = (BeforeCheckingEventArgs) eventArgs;
+        var e = (BeforeCheckingEventArgs)eventArgs;
 
         _checkResults = new ToMemoryCheckNotifier();
         try
@@ -160,6 +164,7 @@ private void CommonFunctionalityOnBeforeChecking(object sender, EventArgs eventA
         {
             _checkResults.OnCheckPerformed(new CheckEventArgs("Checks threw exception", CheckResult.Fail, ex));
         }
+
         e.Cancel = true;
     }
 
@@ -233,7 +238,10 @@ protected void AssertErrorWasShown(ExpectedErrorType expectedErrorLevel, string
         switch (expectedErrorLevel)
         {
             case ExpectedErrorType.KilledForm:
-                Assert.IsTrue(ItemActivator.Results.KilledForms.Values.Any(v=>v.Message.Contains(expectedContainsText)),"Failed to find expected Exception, Exceptions were:\r\n" +string.Join(Environment.NewLine,ItemActivator.Results.KilledForms.Values.Select(v=>v.ToString())) );
+                Assert.IsTrue(
+                    ItemActivator.Results.KilledForms.Values.Any(v => v.Message.Contains(expectedContainsText)),
+                    "Failed to find expected Exception, Exceptions were:\r\n" + string.Join(Environment.NewLine,
+                        ItemActivator.Results.KilledForms.Values.Select(v => v.ToString())));
                 break;
             case ExpectedErrorType.Fatal:
                 Assert.IsTrue(ItemActivator.Results.FatalCalls.Any(c => c.Message.Contains(expectedContainsText)));
@@ -241,9 +249,10 @@ protected void AssertErrorWasShown(ExpectedErrorType expectedErrorLevel, string
             case ExpectedErrorType.FailedCheck:
 
                 if (_checkResults == null)
-                    throw new Exception("Could not check for Checks error because control did not register an ICheckable");
+                    throw new Exception(
+                        "Could not check for Checks error because control did not register an ICheckable");
 
-                AssertFailedCheck(_checkResults,expectedContainsText);
+                AssertFailedCheck(_checkResults, expectedContainsText);
 
                 break;
             case ExpectedErrorType.GlobalErrorCheckNotifier:
@@ -260,13 +269,13 @@ protected void AssertErrorWasShown(ExpectedErrorType expectedErrorLevel, string
         }
     }
 
-    private static void AssertFailedCheck(ToMemoryCheckNotifier checkResults,string expectedContainsText)
+    private static void AssertFailedCheck(ToMemoryCheckNotifier checkResults, string expectedContainsText)
     {
         //there must have been something checked that failed with the provided message
         Assert.IsTrue(checkResults.Messages.Any(m =>
             m.Message.Contains(expectedContainsText) ||
-            m.Ex != null && m.Ex.Message.Contains(expectedContainsText)
-                         && m.Result == CheckResult.Fail));
+            (m.Ex != null && m.Ex.Message.Contains(expectedContainsText)
+                          && m.Result == CheckResult.Fail)));
     }
 
     private List<string> GetAllErrorProviderErrorsShown()
@@ -274,19 +283,21 @@ private List<string> GetAllErrorProviderErrorsShown()
         var controls = GetControl<Control>().ToArray();
         var providers = controls.SelectMany(GetErrorProviders)
             .Union(ItemActivator.Results.RegisteredRules.Select(static r => r.ErrorProvider)).Distinct();
-        var errors=providers.Where(static ep=>ep.HasErrors)
-            .SelectMany(ep => controls.Select(ep.GetError)).Where(static s=>!string.IsNullOrWhiteSpace(s));
+        var errors = providers.Where(static ep => ep.HasErrors)
+            .SelectMany(ep => controls.Select(ep.GetError)).Where(static s => !string.IsNullOrWhiteSpace(s));
         return errors.ToList();
     }
 
-    private static readonly ConcurrentDictionary<Type, FieldInfo[]>  ErrorProviderFieldCache =new();
+    private static readonly ConcurrentDictionary<Type, FieldInfo[]> ErrorProviderFieldCache = new();
+
     private static IEnumerable<ErrorProvider> GetErrorProviders(Control arg)
     {
         var t = arg.GetType();
         var errorProviderFields = ErrorProviderFieldCache.GetOrAdd(t, static t => t
             .GetFields(BindingFlags.Instance | BindingFlags.NonPublic)
             .Where(static f => f.FieldType == typeof(ErrorProvider)).ToArray());
-        return errorProviderFields.Select(f => f.GetValue(arg)).Where(static instance => instance != null).Cast<ErrorProvider>();
+        return errorProviderFields.Select(f => f.GetValue(arg)).Where(static instance => instance != null)
+            .Cast<ErrorProvider>();
     }
 
     /// <summary>
@@ -295,14 +306,11 @@ private static IEnumerable<ErrorProvider> GetErrorProviders(Control arg)
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <returns></returns>
-    protected List<T> GetControl<T>() where T:Control
-    {
-        return GetControl(LastUserInterfaceLaunched, new List<T>());
-    }
+    protected List<T> GetControl<T>() where T : Control => GetControl(LastUserInterfaceLaunched, new List<T>());
 
-    private static List<T> GetControl<T>(Control c, List<T> list) where T:Control
+    private static List<T> GetControl<T>(Control c, List<T> list) where T : Control
     {
-        if(c is T control)
+        if (c is T control)
             list.Add(control);
 
         foreach (Control child in c.Controls)
@@ -323,11 +331,9 @@ protected void Publish(DatabaseEntity o)
     private static void CreateControls(Control control)
     {
         CreateControl(control);
-        foreach (Control subcontrol in control.Controls)
-        {
-            CreateControl(subcontrol);
-        }
+        foreach (Control subcontrol in control.Controls) CreateControl(subcontrol);
     }
+
     private static void CreateControl(Control control)
     {
         var method = control.GetType().GetMethod("CreateControl", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -350,16 +356,17 @@ protected void ForEachUI(Action<IRDMPSingleDatabaseObjectControl> action)
         SetupMEF();
 
         var types = typeof(Catalogue).Assembly.GetTypes()
-            .Where(t => t != null && typeof (DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
+            .Where(t => t != null && typeof(DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface)
+            .ToArray();
 
         var uiTypes = typeof(CatalogueUI).Assembly.GetTypes()
-            .Where(t=>t != null && typeof(IRDMPSingleDatabaseObjectControl).IsAssignableFrom(t)
-                                && !t.IsAbstract && !t.IsInterface
-                                && t.BaseType != null
-                                && t.BaseType.BaseType != null
-                                && t.BaseType.BaseType.GetGenericArguments().Any()).ToArray();
+            .Where(t => t != null && typeof(IRDMPSingleDatabaseObjectControl).IsAssignableFrom(t)
+                                  && !t.IsAbstract && !t.IsInterface
+                                  && t.BaseType != null
+                                  && t.BaseType.BaseType != null
+                                  && t.BaseType.BaseType.GetGenericArguments().Any()).ToArray();
 
-        var methods = typeof (UITests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        var methods = typeof(UITests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
         var methodWhenIHaveA = methods.Single(m => m.Name.Equals("WhenIHaveA") && !m.GetParameters().Any());
 
         var objectsToTest = types
@@ -369,38 +376,39 @@ protected void ForEachUI(Action<IRDMPSingleDatabaseObjectControl> action)
             .Select(genericWhenIHaveA => (DatabaseEntity)genericWhenIHaveA.Invoke(this, null)).ToList();
 
         //sets up all the child providers etc
-        _itemActivator=InitializeItemActivator();
+        _itemActivator = InitializeItemActivator();
 
-        foreach(var o in objectsToTest)
-        {
+        foreach (var o in objectsToTest)
             //foreach compatible UI
-            foreach (var uiType in uiTypes.Where(a=>a.BaseType.BaseType.GetGenericArguments()[0] == o.GetType()))
-            {
-                //todo
-                var methodAndLaunch = methods.Single(m => m.Name.Equals("AndLaunch") && m.GetParameters().Length >= 1 && m.GetParameters()[0].ParameterType == typeof(DatabaseEntity));
+        foreach (var uiType in uiTypes.Where(a => a.BaseType.BaseType.GetGenericArguments()[0] == o.GetType()))
+        {
+            //todo
+            var methodAndLaunch = methods.Single(m =>
+                m.Name.Equals("AndLaunch") && m.GetParameters().Length >= 1 &&
+                m.GetParameters()[0].ParameterType == typeof(DatabaseEntity));
 
-                //ensure that the method supports the Type
-                var genericAndLaunch = methodAndLaunch.MakeGenericMethod(uiType);
+            //ensure that the method supports the Type
+            var genericAndLaunch = methodAndLaunch.MakeGenericMethod(uiType);
 
-                IRDMPSingleDatabaseObjectControl ui;
+            IRDMPSingleDatabaseObjectControl ui;
 
-                try
-                {
-                    ui = (IRDMPSingleDatabaseObjectControl) genericAndLaunch.Invoke(this,new object[]{o,true});
+            try
+            {
+                ui = (IRDMPSingleDatabaseObjectControl)genericAndLaunch.Invoke(this, new object[] { o, true });
 
-                    if(ui is IDisposable d)
-                        d.Dispose();
-                }
-                catch(Exception ex)
-                {
-                    throw new Exception(
-                        $"Failed to construct '{uiType}'.  Code to reproduce is:{Environment.NewLine}{ShowCode(o.GetType(), uiType)}",ex);
-                }
+                if (ui is IDisposable d)
+                    d.Dispose();
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(
+                    $"Failed to construct '{uiType}'.  Code to reproduce is:{Environment.NewLine}{ShowCode(o.GetType(), uiType)}",
+                    ex);
+            }
 
 
-                action(ui);
-                ClearResults();
-            }
+            action(ui);
+            ClearResults();
         }
     }
 
diff --git a/Rdmp.UI.Tests/UITimeoutAttribute.cs b/Rdmp.UI.Tests/UITimeoutAttribute.cs
index 6e2b6ab103..0fb2bdb07d 100644
--- a/Rdmp.UI.Tests/UITimeoutAttribute.cs
+++ b/Rdmp.UI.Tests/UITimeoutAttribute.cs
@@ -32,16 +32,13 @@ public UITimeoutAttribute(int timeout)
     }
 
     /// <inheritdoc/>
-    public TestCommand Wrap(TestCommand command)
-    {
-        return new TimeoutCommand(command, _timeout);
-    }
+    public TestCommand Wrap(TestCommand command) => new TimeoutCommand(command, _timeout);
 
     private partial class TimeoutCommand : DelegatingTestCommand
     {
         private int _timeout;
 
-        public TimeoutCommand(TestCommand innerCommand, int timeout): base(innerCommand)
+        public TimeoutCommand(TestCommand innerCommand, int timeout) : base(innerCommand)
         {
             _timeout = timeout;
         }
@@ -84,11 +81,9 @@ public override TestResult Execute(TestExecutionContext context)
 
             try
             {
-                while (thread.IsAlive && (_timeout > 0  || Debugger.IsAttached))
-                {
+                while (thread.IsAlive && (_timeout > 0 || Debugger.IsAttached))
                     if (!thread.Join(_timeout) && !Debugger.IsAttached)
                         _timeout = 0;
-                }
 
                 var closeAttempts = 10;
 
@@ -100,9 +95,9 @@ public override TestResult Execute(TestExecutionContext context)
                     //if it still has a window handle then presumably needs further treatment
                     IntPtr handle;
 
-                    while((handle = Process.GetCurrentProcess().MainWindowHandle) != IntPtr.Zero)
+                    while ((handle = Process.GetCurrentProcess().MainWindowHandle) != IntPtr.Zero)
                     {
-                        if(closeAttempts-- <=0)
+                        if (closeAttempts-- <= 0)
                             throw new Exception("Failed to close all windows even after multiple attempts");
 
                         var sbClass = new StringBuilder(100);
@@ -124,7 +119,7 @@ public override TestResult Execute(TestExecutionContext context)
                 if (threadException != null)
                     throw threadException;
 
-                if(result == null)
+                if (result == null)
                     throw new Exception("UI test did not produce a result");
 
                 return result;
diff --git a/Rdmp.UI.Tests/WideMessageBoxTests.cs b/Rdmp.UI.Tests/WideMessageBoxTests.cs
index 79f5aba8ba..80c3a5abab 100644
--- a/Rdmp.UI.Tests/WideMessageBoxTests.cs
+++ b/Rdmp.UI.Tests/WideMessageBoxTests.cs
@@ -5,8 +5,6 @@
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
 using NUnit.Framework;
-
-
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
@@ -17,12 +15,12 @@
 
 namespace Rdmp.UI.Tests;
 
-internal class WideMessageBoxTests:UITests
+internal class WideMessageBoxTests : UITests
 {
     [Test]
     public void Test_WideMessageBox_TinyStrings()
     {
-        var args = new WideMessageBoxArgs("1","2","3", "4", WideMessageBoxTheme.Help);
+        var args = new WideMessageBoxArgs("1", "2", "3", "4", WideMessageBoxTheme.Help);
 
         //it is important that the args retain the original length e.g. so user can copy to clipboard the text
         Assert.AreEqual(1, args.Title.Length);
@@ -51,14 +49,14 @@ public void Test_WideMessageBox_LargeStrings()
         var sb = new StringBuilder();
 
         //send wide message box a million characters
-        for(var i =0;i< 1_000_000; i++)
+        for (var i = 0; i < 1_000_000; i++)
             sb.Append('f');
 
         var s = sb.ToString();
-        var args = new WideMessageBoxArgs(s,s,s,s,WideMessageBoxTheme.Help);
+        var args = new WideMessageBoxArgs(s, s, s, s, WideMessageBoxTheme.Help);
 
         //it is important that the args retain the original length e.g. so user can copy to clipboard the text
-        Assert.AreEqual(1_000_000,args.Title.Length);
+        Assert.AreEqual(1_000_000, args.Title.Length);
         Assert.AreEqual(1_000_000, args.Message.Length);
 
         var wmb = new WideMessageBox(args);
@@ -71,13 +69,13 @@ public void Test_WideMessageBox_LargeStrings()
         LastUserInterfaceLaunched = wmb;
 
         //the title and body should be a reasonable length
-        Assert.AreEqual(WideMessageBox.MAX_LENGTH_TITLE,GetControl<Label>().Single().Text.Length);
+        Assert.AreEqual(WideMessageBox.MAX_LENGTH_TITLE, GetControl<Label>().Single().Text.Length);
         Assert.AreEqual(WideMessageBox.MAX_LENGTH_BODY, GetControl<RichTextBox>().Single().Text.Length);
 
         //when shown on screen it should not go off the edge of the screen
 
         //find the widest screen
-        var availableWidth = Screen.AllScreens.Select(sc=>sc.Bounds.Width).Max();
+        var availableWidth = Screen.AllScreens.Select(sc => sc.Bounds.Width).Max();
         Assert.LessOrEqual(wmb.Width, availableWidth);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ANOEngineeringUIs/ANOTableUI.cs b/Rdmp.UI/ANOEngineeringUIs/ANOTableUI.cs
index a193dd6ec1..1b4f9773ca 100644
--- a/Rdmp.UI/ANOEngineeringUIs/ANOTableUI.cs
+++ b/Rdmp.UI/ANOEngineeringUIs/ANOTableUI.cs
@@ -44,12 +44,13 @@ public override void SetDatabaseObject(IActivateItems activator, ANOTable databa
 
         CommonFunctionality.AddChecks(databaseObject);
         CommonFunctionality.StartChecking();
-            
+
         SetEnabledness();
 
-        CommonFunctionality.AddHelp(tbSuffix,"ANOTable.Suffix");
+        CommonFunctionality.AddHelp(tbSuffix, "ANOTable.Suffix");
         CommonFunctionality.AddHelp(llServer, "ANOTable.Server_ID");
-        CommonFunctionality.AddHelpString(tbInputDataType,"DataType", "Datatype for private identifiers being mapped e.g. varchar(100)");
+        CommonFunctionality.AddHelpString(tbInputDataType, "DataType",
+            "Datatype for private identifiers being mapped e.g. varchar(100)");
         CommonFunctionality.AddHelp(nIntegers, "ANOTable.NumberOfIntegersToUseInAnonymousRepresentation");
         CommonFunctionality.AddHelp(nCharacters, "ANOTable.NumberOfCharactersToUseInAnonymousRepresentation");
 
@@ -63,11 +64,13 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, ANOTab
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",a=>a.ID);
-        Bind(nIntegers,"Value","NumberOfIntegersToUseInAnonymousRepresentation",a=>a.NumberOfIntegersToUseInAnonymousRepresentation);
-        Bind(nCharacters,"Value","NumberOfCharactersToUseInAnonymousRepresentation",a=>a.NumberOfCharactersToUseInAnonymousRepresentation);
-        Bind(tbName,"Text","TableName",a=>a.TableName);
-        Bind(tbSuffix,"Text","Suffix",a=>a.Suffix);
+        Bind(tbID, "Text", "ID", a => a.ID);
+        Bind(nIntegers, "Value", "NumberOfIntegersToUseInAnonymousRepresentation",
+            a => a.NumberOfIntegersToUseInAnonymousRepresentation);
+        Bind(nCharacters, "Value", "NumberOfCharactersToUseInAnonymousRepresentation",
+            a => a.NumberOfCharactersToUseInAnonymousRepresentation);
+        Bind(tbName, "Text", "TableName", a => a.TableName);
+        Bind(tbSuffix, "Text", "Suffix", a => a.Suffix);
     }
 
     private void SetEnabledness()
@@ -79,7 +82,7 @@ private void SetEnabledness()
         }
         catch (Exception e)
         {
-            CommonFunctionality.Fatal("Could not reach ANO Server",e);
+            CommonFunctionality.Fatal("Could not reach ANO Server", e);
             return;
         }
 
@@ -95,7 +98,6 @@ private void SetEnabledness()
 
         if (isPushed)
         {
-
             tbInputDataType.Text = _anoTable.GetRuntimeDataType(LoadStage.AdjustRaw);
 
             lblANOTableName.Text = pushedTable.GetRuntimeName();
@@ -111,7 +113,7 @@ private void SetEnabledness()
     private void btnFinalise_Click(object sender, EventArgs e)
     {
         ragSmiley1.Reset();
-        _anoTable.PushToANOServerAsNewTable(tbInputDataType.Text,ragSmiley1);
+        _anoTable.PushToANOServerAsNewTable(tbInputDataType.Text, ragSmiley1);
         SetEnabledness();
     }
 
@@ -126,13 +128,13 @@ private void btnDropANOTable_Click(object sender, EventArgs e)
         {
             ragSmiley1.OnCheckPerformed(new CheckEventArgs("Drop failed", CheckResult.Fail, exception));
         }
+
         SetEnabledness();
     }
 
     private void nIntegers_ValueChanged(object sender, EventArgs e)
     {
-        _anoTable.NumberOfIntegersToUseInAnonymousRepresentation = (int) nIntegers.Value;
-
+        _anoTable.NumberOfIntegersToUseInAnonymousRepresentation = (int)nIntegers.Value;
     }
 
     private void nCharacters_ValueChanged(object sender, EventArgs e)
@@ -146,7 +148,7 @@ private void llServer_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e
         cmd.Execute();
     }
 }
-    
+
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ANOTableUI_Design, UserControl>))]
 public abstract class ANOTableUI_Design : RDMPSingleDatabaseObjectControl<ANOTable>
 {
diff --git a/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs b/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs
index 36ed467be3..192cca03d8 100644
--- a/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs
+++ b/Rdmp.UI/ANOEngineeringUIs/ForwardEngineerANOCatalogueUI.cs
@@ -24,7 +24,6 @@
 using Rdmp.UI.Collections;
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using Rdmp.UI.SimpleDialogs;
 using Rdmp.Core.CommandExecution;
 using Rdmp.Core;
@@ -51,11 +50,13 @@ public ForwardEngineerANOCatalogueUI()
 
 
         olvSuffix.AspectGetter = o => o is ANOTable table ? table.Suffix : null;
-        olvNumberOfCharacters.AspectGetter = o => o is ANOTable table ? (object) table.NumberOfCharactersToUseInAnonymousRepresentation: null;
-        olvNumberOfDigits.AspectGetter = o => o is ANOTable table ? (object) table.NumberOfIntegersToUseInAnonymousRepresentation : null;
+        olvNumberOfCharacters.AspectGetter = o =>
+            o is ANOTable table ? (object)table.NumberOfCharactersToUseInAnonymousRepresentation : null;
+        olvNumberOfDigits.AspectGetter = o =>
+            o is ANOTable table ? (object)table.NumberOfIntegersToUseInAnonymousRepresentation : null;
 
         olvMigrationPlan.AspectGetter += MigrationPlanAspectGetter;
-            
+
         olvPickedANOTable.HeaderImageKey = "ANOTable";
         olvPickedANOTable.AspectGetter += PickedANOTableAspectGetter;
         olvPickedANOTable.ImageGetter += PickedANOTable_ImageGetter;
@@ -63,11 +64,11 @@ public ForwardEngineerANOCatalogueUI()
         olvDilution.HeaderImageKey = "PreLoadDiscardedColumn";
         olvDilution.AspectGetter += DilutionAspectGetter;
         olvDilution.ImageGetter += Dilution_ImageGetter;
-            
+
         olvDestinationType.AspectGetter += DestinationTypeAspectGetter;
 
         olvDestinationExtractionCategory.AspectGetter += DestinationExtractionCategoryAspectGetter;
-            
+
         tlvTableInfoMigrations.CellEditStarting += tlvTableInfoMigrations_CellEditStarting;
         tlvTableInfoMigrations.CellEditFinishing += tlvTableInfoMigrations_CellEditFinishing;
 
@@ -90,7 +91,7 @@ private object MigrationPlanAspectGetter(object rowobject)
 
         if (_planManager.SkippedTables.Contains(table))
             return "Already Exists";
-            
+
         return null;
     }
 
@@ -111,7 +112,7 @@ private object PickedANOTableAspectGetter(object rowobject)
             if (plan.ANOTable != null)
                 return plan.ANOTable.ToString();
 
-            if (plan.Plan  == Plan.ANO)
+            if (plan.Plan == Plan.ANO)
                 return "pick";
         }
 
@@ -133,6 +134,7 @@ private object DilutionAspectGetter(object rowobject)
 
         return null;
     }
+
     private string Dilution_ImageGetter(object rowobject)
     {
         if (rowobject is ColumnInfo col)
@@ -181,7 +183,6 @@ private object DestinationExtractionCategoryAspectGetter(object rowobject)
         return null;
     }
 
-
     #endregion
 
     private void tlvTableInfoMigrations_CellEditStarting(object sender, CellEditEventArgs e)
@@ -209,12 +210,11 @@ private void tlvTableInfoMigrations_CellEditStarting(object sender, CellEditEven
                 }
 
 
-                if(Activator.SelectObject(new DialogArgs
-                   {
-                       TaskDescription = "Choose an ANOTable into which to put the identifiable values stored in this column"
-
-                   }, Activator.CoreChildProvider.AllANOTables, out var selected))
-                {
+                if (Activator.SelectObject(new DialogArgs
+                    {
+                        TaskDescription =
+                            "Choose an ANOTable into which to put the identifiable values stored in this column"
+                    }, Activator.CoreChildProvider.AllANOTables, out var selected))
                     try
                     {
                         plan.ANOTable = selected;
@@ -224,14 +224,12 @@ private void tlvTableInfoMigrations_CellEditStarting(object sender, CellEditEven
                     {
                         ExceptionViewer.Show(exception);
                     }
-                }
 
                 e.Cancel = true;
             }
 
             if (e.Column == olvDilution)
             {
-
                 if (plan.Plan != Plan.Dilute)
                 {
                     e.Cancel = true;
@@ -246,6 +244,7 @@ private void tlvTableInfoMigrations_CellEditStarting(object sender, CellEditEven
                 cbx.Items.AddRange(_planManager.DilutionOperations.ToArray());
                 e.Control = cbx;
             }
+
             if (e.Column == olvDestinationExtractionCategory)
             {
                 //if the plan is to drop
@@ -262,16 +261,15 @@ private void tlvTableInfoMigrations_CellEditStarting(object sender, CellEditEven
                     Bounds = e.CellBounds
                 };
 
-                var list = Enum.GetValues(typeof (ExtractionCategory)).Cast<object>().Select(s=>s.ToString()).ToList();
+                var list = Enum.GetValues(typeof(ExtractionCategory)).Cast<object>().Select(s => s.ToString()).ToList();
                 list.Add("Clear");
 
                 cbx.Items.AddRange(list.ToArray());
                 e.Control = cbx;
 
-                if(plan.ExtractionCategoryIfAny.HasValue)
+                if (plan.ExtractionCategoryIfAny.HasValue)
                     cbx.SelectedItem = plan.ExtractionCategoryIfAny.Value.ToString();
             }
-
         }
     }
 
@@ -279,15 +277,15 @@ private void tlvTableInfoMigrations_CellEditFinishing(object sender, CellEditEve
     {
         try
         {
-            if(e.RowObject is not ColumnInfo col)
+            if (e.RowObject is not ColumnInfo col)
                 return;
 
             var plan = _planManager.GetPlanForColumnInfo(col);
 
-            if(e.Column == olvMigrationPlan)
-                plan.Plan = (Plan) e.NewValue;
+            if (e.Column == olvMigrationPlan)
+                plan.Plan = (Plan)e.NewValue;
 
-            if(e.Column == olvDilution)
+            if (e.Column == olvDilution)
             {
                 var cbx = (ComboBox)e.Control;
                 plan.Dilution = (IDilutionOperation)cbx.SelectedItem;
@@ -296,14 +294,15 @@ private void tlvTableInfoMigrations_CellEditFinishing(object sender, CellEditEve
             if (e.Column == olvDestinationExtractionCategory)
             {
                 var cbx = (ComboBox)e.Control;
-                if ((string) cbx.SelectedItem == "Clear")
+                if ((string)cbx.SelectedItem == "Clear")
+                {
                     plan.ExtractionCategoryIfAny = null;
+                }
                 else
                 {
-                    Enum.TryParse((string) cbx.SelectedItem, out ExtractionCategory c);
+                    Enum.TryParse((string)cbx.SelectedItem, out ExtractionCategory c);
                     plan.ExtractionCategoryIfAny = c;
                 }
-
             }
         }
         catch (Exception exception)
@@ -325,37 +324,41 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         }
         catch (QueryBuildingException e)
         {
-            CommonFunctionality.Fatal("Could not generate a valid query for the Catalogue",e);
+            CommonFunctionality.Fatal("Could not generate a valid query for the Catalogue", e);
             return;
         }
 
         if (!_setup)
         {
-            var settings = new RDMPCollectionCommonFunctionalitySettings {AddFavouriteColumn = false, AddCheckColumn = false};
+            var settings = new RDMPCollectionCommonFunctionalitySettings
+                { AddFavouriteColumn = false, AddCheckColumn = false };
 
             //Set up tree view to show ANO Tables that are usable
             tlvANOTablesCommonFunctionality = new RDMPCollectionCommonFunctionality();
-            tlvANOTablesCommonFunctionality.SetUp(RDMPCollection.None, tlvANOTables, activator, olvANOTablesName, null, settings);
+            tlvANOTablesCommonFunctionality.SetUp(RDMPCollection.None, tlvANOTables, activator, olvANOTablesName, null,
+                settings);
 
             tlvANOTables.AddObject(activator.CoreChildProvider.AllANOTablesNode);
             tlvANOTables.ExpandAll();
 
             //Setup tree view to show all TableInfos that you are trying to Migrate
             tlvTableInfoMigrationsCommonFunctionality = new RDMPCollectionCommonFunctionality();
-            tlvTableInfoMigrationsCommonFunctionality.SetUp(RDMPCollection.None, tlvTableInfoMigrations, activator, olvTableInfoName, null, settings);
+            tlvTableInfoMigrationsCommonFunctionality.SetUp(RDMPCollection.None, tlvTableInfoMigrations, activator,
+                olvTableInfoName, null, settings);
 
             //don't display anything below ColumnInfo
-            tlvTableInfoMigrationsCommonFunctionality.AxeChildren = new[] {typeof (ColumnInfo)};
+            tlvTableInfoMigrationsCommonFunctionality.AxeChildren = new[] { typeof(ColumnInfo) };
 
             _setup = true;
         }
-            
+
         //Add them and expand them
         tlvTableInfoMigrations.ClearObjects();
         tlvTableInfoMigrations.AddObjects(_planManager.TableInfos);
         tlvTableInfoMigrations.ExpandAll();
 
-        ddDateColumn.DataSource =_planManager.TableInfos.SelectMany(t => t.ColumnInfos).Where(c => c.Data_type != null && c.Data_type.Contains("date")).ToArray();
+        ddDateColumn.DataSource = _planManager.TableInfos.SelectMany(t => t.ColumnInfos)
+            .Where(c => c.Data_type != null && c.Data_type.Contains("date")).ToArray();
 
         Check();
     }
@@ -363,7 +366,6 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
     private void Check()
     {
         if (_planManager.TargetDatabase != null)
-        {
             if (_planManager.TargetDatabase.Exists())
             {
                 _planManager.SkippedTables.Clear();
@@ -377,8 +379,7 @@ private void Check()
                         _planManager.SkippedTables.Add(t);
                 }
             }
-        }
-            
+
         ragSmiley1.StartChecking(_planManager);
 
         DisableObjects();
@@ -390,9 +391,11 @@ private void tlvTableInfoMigrations_FormatCell(object sender, FormatCellEventArg
             if (_planManager.GetPlanForColumnInfo(ci).IsMandatory)
                 e.SubItem.BackColor = lblMandatory.BackColor;
 
-        if(e.Column == olvMigrationPlan)
-            if(e.Model is ColumnInfo)
+        if (e.Column == olvMigrationPlan)
+            if (e.Model is ColumnInfo)
+            {
                 e.SubItem.Font = new Font(e.Item.Font, FontStyle.Underline);
+            }
             else
             {
                 e.SubItem.Font = new Font(e.Item.Font, FontStyle.Italic);
@@ -415,7 +418,7 @@ private void btnRefreshChecks_Click(object sender, EventArgs e)
     private void serverDatabaseTableSelector1_SelectionChanged()
     {
         _planManager.TargetDatabase = serverDatabaseTableSelector1.GetDiscoveredDatabase();
-            
+
         Check();
     }
 
@@ -424,7 +427,7 @@ private void DisableObjects()
         var toDisable = new List<object>();
 
         toDisable.AddRange(_planManager.SkippedTables);
-        toDisable.AddRange(_planManager.SkippedTables.SelectMany(t=>t.ColumnInfos));
+        toDisable.AddRange(_planManager.SkippedTables.SelectMany(t => t.ColumnInfos));
 
         tlvTableInfoMigrations.DisabledObjects = toDisable;
     }
@@ -436,21 +439,24 @@ private void btnExecute_Click(object sender, EventArgs e)
             var engine = new ForwardEngineerANOCatalogueEngine(Activator.RepositoryLocator, _planManager);
             engine.Execute();
 
-            if(engine.NewCatalogue != null && engine.LoadMetadata != null)
+            if (engine.NewCatalogue != null && engine.LoadMetadata != null)
             {
                 foreach (var sqls in engine.SelectSQLForMigrations)
-                    CreateAttacher(sqls.Key, sqls.Value, engine.LoadMetadata, sqls.Key.IsLookupTable()? null:engine.LoadProgressIfAny);
+                    CreateAttacher(sqls.Key, sqls.Value, engine.LoadMetadata,
+                        sqls.Key.IsLookupTable() ? null : engine.LoadProgressIfAny);
 
                 foreach (var dilutionOps in engine.DilutionOperationsForMigrations)
-                    CreateDilutionMutilation(dilutionOps,engine.LoadMetadata);
+                    CreateDilutionMutilation(dilutionOps, engine.LoadMetadata);
 
                 Publish(engine.NewCatalogue);
 
-                if(Activator.YesNo($"Successfully created Catalogue '{engine.NewCatalogue}', close form?","Success"))
-                    Activator.WindowArranger.SetupEditAnything(this,engine.LoadMetadata);
+                if (Activator.YesNo($"Successfully created Catalogue '{engine.NewCatalogue}', close form?", "Success"))
+                    Activator.WindowArranger.SetupEditAnything(this, engine.LoadMetadata);
             }
             else
+            {
                 throw new Exception("Engine did not create a NewCatalogue/LoadMetadata");
+            }
         }
         catch (Exception ex)
         {
@@ -461,11 +467,11 @@ private void btnExecute_Click(object sender, EventArgs e)
     private void CreateAttacher(ITableInfo t, QueryBuilder qb, LoadMetadata lmd, LoadProgress loadProgressIfAny)
     {
         var pt = new ProcessTask(Activator.RepositoryLocator.CatalogueRepository, lmd, LoadStage.Mounting)
-            {
-                ProcessTaskType = ProcessTaskType.Attacher,
-                Name = $"Read from {t}",
-                Path = typeof(RemoteTableAttacher).FullName
-            };
+        {
+            ProcessTaskType = ProcessTaskType.Attacher,
+            Name = $"Read from {t}",
+            Path = typeof(RemoteTableAttacher).FullName
+        };
         pt.SaveToDatabase();
 
         pt.CreateArgumentsForClassIfNotExists<RemoteTableAttacher>();
@@ -479,11 +485,11 @@ private void CreateAttacher(ITableInfo t, QueryBuilder qb, LoadMetadata lmd, Loa
 
         pt.SetArgumentValue("RAWTableName", t.GetRuntimeName(LoadBubble.Raw));
 
-        if(loadProgressIfAny != null)
+        if (loadProgressIfAny != null)
         {
             pt.SetArgumentValue("Progress", loadProgressIfAny);
 //              pt.SetArgumentValue("ProgressUpdateStrategy", DataLoadProgressUpdateStrategy.UseMaxRequestedDay);
-            pt.SetArgumentValue("LoadNotRequiredIfNoRowsRead",true);
+            pt.SetArgumentValue("LoadNotRequiredIfNoRowsRead", true);
         }
 
         /*
@@ -492,7 +498,8 @@ private void CreateAttacher(ITableInfo t, QueryBuilder qb, LoadMetadata lmd, Loa
         */
     }
 
-    private void CreateDilutionMutilation(KeyValuePair<PreLoadDiscardedColumn, IDilutionOperation> dilutionOp,LoadMetadata lmd)
+    private void CreateDilutionMutilation(KeyValuePair<PreLoadDiscardedColumn, IDilutionOperation> dilutionOp,
+        LoadMetadata lmd)
     {
         var pt = new ProcessTask(Activator.RepositoryLocator.CatalogueRepository, lmd, LoadStage.AdjustStaging);
         pt.CreateArgumentsForClassIfNotExists<Dilution>();
@@ -501,9 +508,8 @@ private void CreateDilutionMutilation(KeyValuePair<PreLoadDiscardedColumn, IDilu
         pt.Path = typeof(Dilution).FullName;
         pt.SaveToDatabase();
 
-        pt.SetArgumentValue("ColumnToDilute",dilutionOp.Key);
-        pt.SetArgumentValue("Operation",dilutionOp.Value.GetType());
-
+        pt.SetArgumentValue("ColumnToDilute", dilutionOp.Key);
+        pt.SetArgumentValue("Operation", dilutionOp.Value.GetType());
     }
 
     private void ddDateColumn_SelectedIndexChanged(object sender, EventArgs e)
@@ -522,14 +528,12 @@ private void cbDateBasedLoad_CheckedChanged(object sender, EventArgs e)
 
     private void tbStartDate_TextChanged(object sender, EventArgs e)
     {
-        _planManager.StartDate = cbDateBasedLoad.Checked ? GetStartDate():null;
+        _planManager.StartDate = cbDateBasedLoad.Checked ? GetStartDate() : null;
     }
 
     private DateTime? GetStartDate()
     {
-
         if (cbDateBasedLoad.Checked)
-        {
             try
             {
                 var dt = DateTime.Parse(tbStartDate.Text);
@@ -540,7 +544,6 @@ private void tbStartDate_TextChanged(object sender, EventArgs e)
             {
                 tbStartDate.ForeColor = Color.Red;
             }
-        }
 
         return null;
     }
@@ -548,12 +551,11 @@ private void tbStartDate_TextChanged(object sender, EventArgs e)
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         tlvTableInfoMigrations.UseFiltering = true;
-        tlvTableInfoMigrations.ModelFilter = new TextMatchFilter(tlvTableInfoMigrations,tbFilter.Text);
+        tlvTableInfoMigrations.ModelFilter = new TextMatchFilter(tlvTableInfoMigrations, tbFilter.Text);
     }
 
     private void btnSavePlan_Click(object sender, EventArgs e)
     {
-
         var sfd = new SaveFileDialog
         {
             Filter = "Plans (*.plan)|*.plan"
@@ -562,17 +564,17 @@ private void btnSavePlan_Click(object sender, EventArgs e)
         {
             var fi = new FileInfo(sfd.FileName);
 
-            var cmdAnoTablesToo = new ExecuteCommandExportObjectsToFile(Activator, Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ANOTable>().ToArray(), fi.Directory)
-                {
-                    ShowInExplorer = false
-                };
+            var cmdAnoTablesToo = new ExecuteCommandExportObjectsToFile(Activator,
+                Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ANOTable>().ToArray(), fi.Directory)
+            {
+                ShowInExplorer = false
+            };
 
             if (!cmdAnoTablesToo.IsImpossible)
                 cmdAnoTablesToo.Execute();
 
             var json = JsonConvertExtensions.SerializeObject(_planManager, Activator.RepositoryLocator);
-            File.WriteAllText(fi.FullName,json);
-
+            File.WriteAllText(fi.FullName, json);
         }
     }
 
@@ -589,14 +591,14 @@ private void btnLoadPlan_Click(object sender, EventArgs e)
                 var fi = new FileInfo(ofd.FileName);
                 var json = File.ReadAllText(fi.FullName);
                 _planManager = (ForwardEngineerANOCataloguePlanManager)
-                    JsonConvertExtensions.DeserializeObject(json, typeof(ForwardEngineerANOCataloguePlanManager), Activator.RepositoryLocator);
+                    JsonConvertExtensions.DeserializeObject(json, typeof(ForwardEngineerANOCataloguePlanManager),
+                        Activator.RepositoryLocator);
 
                 if (_planManager.StartDate != null)
                     tbStartDate.Text = _planManager.StartDate.Value.ToString();
 
                 cbDateBasedLoad.Checked = _planManager.DateColumn != null;
                 ddDateColumn.SelectedItem = _planManager.DateColumn;
-
             }
         }
         catch (Exception exception)
diff --git a/Rdmp.UI/AbstractControlDescriptionProvider.cs b/Rdmp.UI/AbstractControlDescriptionProvider.cs
index e9fd31d14d..b7cb0a752b 100644
--- a/Rdmp.UI/AbstractControlDescriptionProvider.cs
+++ b/Rdmp.UI/AbstractControlDescriptionProvider.cs
@@ -33,7 +33,7 @@ public override object CreateInstance(IServiceProvider provider, Type objectType
         if (objectType == typeof(TAbstract))
             objectType = typeof(TBase);
 
-            
+
         return base.CreateInstance(provider, objectType, argTypes, args);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs b/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs
index fbc0513ff2..15208477c0 100644
--- a/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs
+++ b/Rdmp.UI/AggregationUIs/Advanced/AggregateEditorUI.cs
@@ -31,7 +31,6 @@
 using Rdmp.UI.ScintillaHelper;
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using ScintillaNET;
 
 namespace Rdmp.UI.AggregationUIs.Advanced;
@@ -62,7 +61,7 @@ namespace Rdmp.UI.AggregationUIs.Advanced;
 /// <para>One (DATE!) column can be marked as an Axis.  See AggregateContinuousDateAxisUI for description.</para>
 /// 
 /// </summary>
-public partial class AggregateEditorUI : AggregateEditor_Design,ISaveableUI
+public partial class AggregateEditorUI : AggregateEditor_Design, ISaveableUI
 {
     private IAggregateBuilderOptions _options;
     private AggregateConfiguration _aggregate;
@@ -72,6 +71,7 @@ public partial class AggregateEditorUI : AggregateEditor_Design,ISaveableUI
 
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public Scintilla QueryHaving;
+
     private ErrorProvider _errorProviderAxis = new();
 
     //Constructor
@@ -82,10 +82,10 @@ public AggregateEditorUI()
         //Stop mouse wheel scroll from scrolling the combobox when it's closed to avoid the value being changed without user noticing.
         RDMPControlCommonFunctionality.DisableMouseWheel(ddAxisDimension);
         RDMPControlCommonFunctionality.DisableMouseWheel(ddPivotDimension);
-            
-        if(VisualStudioDesignMode)
+
+        if (VisualStudioDesignMode)
             return;
-            
+
         olvJoin.CheckStateGetter += ForceJoinCheckStateGetter;
         olvJoin.CheckStatePutter += ForceJoinCheckStatePutter;
         olvJoinTableName.ImageGetter += ImageGetter;
@@ -100,7 +100,7 @@ private void JoinDirectionPutter(object rowobject, object newvalue)
     {
         if (rowobject is JoinableCohortAggregateConfigurationUse j)
         {
-            if(j.JoinType == (ExtractionJoinType) newvalue)
+            if (j.JoinType == (ExtractionJoinType)newvalue)
                 return;
 
             j.JoinType = (ExtractionJoinType)newvalue;
@@ -117,10 +117,7 @@ private object JoinDirectionGetter(object rowobject)
         return null;
     }
 
-    private Bitmap ImageGetter(object rowObject)
-    {
-        return Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
-    }
+    private Bitmap ImageGetter(object rowObject) => Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
 
     private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newvalue)
     {
@@ -132,7 +129,7 @@ private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newval
         if (newvalue == CheckState.Checked)
         {
             //user is trying to turn on usage of a TableInfo
-            if(ti != null)
+            if (ti != null)
             {
                 joiner.CreateLinkBetween(_aggregate, ti);
                 _forcedJoins.Add(ti);
@@ -141,14 +138,14 @@ private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newval
             // user is trying to join to a Patient Index table
             if (rowobject is JoinableCohortAggregateConfiguration patientIndexTable)
             {
-                if(_aggregate.Catalogue.IsApiCall())
+                if (_aggregate.Catalogue.IsApiCall())
                 {
                     Activator.Show("API calls cannot join to patient index tables");
                     return CheckState.Unchecked;
                 }
 
                 // if other check boxes are ticked
-                if(olvJoin.CheckedObjects.OfType<JoinableCohortAggregateConfigurationUse>().Any())
+                if (olvJoin.CheckedObjects.OfType<JoinableCohortAggregateConfigurationUse>().Any())
                 {
                     Activator.Show("You cannot join to more than 1 patient index table at once");
                     return CheckState.Unchecked;
@@ -168,7 +165,7 @@ private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newval
                 _forcedJoins.Remove(ti);
             }
 
-            if(rowobject is JoinableCohortAggregateConfigurationUse patientIndexTableUse)
+            if (rowobject is JoinableCohortAggregateConfigurationUse patientIndexTableUse)
             {
                 var joinable = patientIndexTableUse.JoinableCohortAggregateConfiguration;
 
@@ -182,7 +179,6 @@ private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newval
         Publish();
 
         return newvalue;
-
     }
 
     private CheckState ForceJoinCheckStateGetter(object rowObject)
@@ -191,24 +187,23 @@ private CheckState ForceJoinCheckStateGetter(object rowObject)
             return CheckState.Indeterminate;
 
         if (rowObject is TableInfo)
-            return _forcedJoins.Contains(rowObject)?CheckState.Checked : CheckState.Unchecked;
+            return _forcedJoins.Contains(rowObject) ? CheckState.Checked : CheckState.Unchecked;
 
         if (rowObject is JoinableCohortAggregateConfiguration)
             return CheckState.Unchecked;
 
         if (rowObject is JoinableCohortAggregateConfigurationUse)
             return CheckState.Checked;
-            
-        return CheckState.Indeterminate;
 
+        return CheckState.Indeterminate;
     }
 
     protected override void SetBindings(BinderWithErrorProviderFactory rules, AggregateConfiguration databaseObject)
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbDescription,"Text","Description",a=>a.Description);
-        Bind(cbExtractable,"Checked","IsExtractable",a=>a.IsExtractable);
+        Bind(tbDescription, "Text", "Description", a => a.Description);
+        Bind(cbExtractable, "Checked", "IsExtractable", a => a.IsExtractable);
     }
 
     private void PopulateTopX()
@@ -224,7 +219,7 @@ private void DetermineFromTables()
         foreach (var d in _aggregate.AggregateDimensions)
         {
             var colInfo = d.ExtractionInformation.ColumnInfo ?? throw new Exception(
-                    $"Aggregate Configuration {_aggregate} (Catalogue '{_aggregate.Catalogue}') has a Dimension '{d}' which is an orphan (someone deleted the ColumnInfo)");
+                $"Aggregate Configuration {_aggregate} (Catalogue '{_aggregate.Catalogue}') has a Dimension '{d}' which is an orphan (someone deleted the ColumnInfo)");
             var toAdd = colInfo.TableInfo.ToString();
 
             if (!uniqueUsedTables.Contains(toAdd))
@@ -235,18 +230,18 @@ private void DetermineFromTables()
 
         //explicit use
         olvJoin.ClearObjects();
-            
+
         //explicit forced joins
         _forcedJoins = _aggregate.ForcedJoins.ToList();
-            
+
         olvJoin.AddObjects(_forcedJoins);
 
         //available joinables
         var joinables = _options.GetAvailableJoinables(_aggregate);
 
-        if(joinables != null)
+        if (joinables != null)
             olvJoin.AddObjects(joinables);
-            
+
         //and patient index tables too
         olvJoin.AddObjects(_aggregate.PatientIndexJoinablesUsed);
     }
@@ -269,17 +264,22 @@ private void olvAny_CellEditFinishing(object sender, CellEditEventArgs e)
         e.Column.PutAspectByName(e.RowObject, e.NewValue);
 
         if (e.RowObject is AggregateCountColumn countColumn)
+        {
             _aggregate.CountSQL = countColumn.SelectSQL + (countColumn.Alias != null ? $" as {countColumn.Alias}" : "");
+        }
         else if (e.RowObject is IRevertable revertable)
         {
             if (revertable.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent)
                 revertable.SaveToDatabase();
         }
         else
+        {
             throw new NotSupportedException("Why is user editing something that isn't IRevertable?");
+        }
     }
 
     #region Having
+
     private void HavingTextChanged(object sender, EventArgs e)
     {
         _aggregate.HavingSQL = QueryHaving.Text;
@@ -287,11 +287,12 @@ private void HavingTextChanged(object sender, EventArgs e)
 
     private void PopulateHavingText()
     {
-        if(QueryHaving == null)
+        if (QueryHaving == null)
         {
             var querySyntaxHelper = _aggregate.GetQuerySyntaxHelper();
 
-            QueryHaving = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL, querySyntaxHelper);
+            QueryHaving = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL,
+                querySyntaxHelper);
             QueryHaving.TextChanged += HavingTextChanged;
             gbHaving.Controls.Add(QueryHaving);
 
@@ -306,6 +307,7 @@ private void PopulateHavingText()
     #endregion
 
     #region Pivot
+
     private void PopulatePivotDropdown(AggregateDimension axisIfAny, AggregateDimension pivotIfAny)
     {
         ddPivotDimension.Items.Clear();
@@ -313,18 +315,20 @@ private void PopulatePivotDropdown(AggregateDimension axisIfAny, AggregateDimens
         var dimensions = _aggregate.AggregateDimensions;
 
         //if there's an axis
-        if (axisIfAny != null && !axisIfAny.Equals(pivotIfAny))//<- if this second thing is the case then the graph is totally messed up!
-            dimensions = dimensions.Except(new[] {axisIfAny}).ToArray();//don't offer the axis as a pivot dimension!
+        if (axisIfAny != null &&
+            !axisIfAny.Equals(pivotIfAny)) //<- if this second thing is the case then the graph is totally messed up!
+            dimensions = dimensions.Except(new[] { axisIfAny }).ToArray(); //don't offer the axis as a pivot dimension!
 
         //don't let them pivot on a date, that's just a bad idea
-        ddPivotDimension.Items.AddRange(dimensions.Where(d=>!d.IsDate()).ToArray());
-            
-        if(pivotIfAny != null)
+        ddPivotDimension.Items.AddRange(dimensions.Where(d => !d.IsDate()).ToArray());
+
+        if (pivotIfAny != null)
             ddPivotDimension.SelectedItem = pivotIfAny;
     }
+
     private void ddPivotDimension_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(isRefreshing)
+        if (isRefreshing)
             return;
 
         if (ddPivotDimension.SelectedItem is AggregateDimension dimension && _aggregate != null)
@@ -334,7 +338,7 @@ private void ddPivotDimension_SelectedIndexChanged(object sender, EventArgs e)
 
             _aggregate.PivotOnDimensionID = dimension.ID;
             _aggregate.SaveToDatabase();
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_aggregate));
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
         }
 
         PublishToSelfOnly();
@@ -344,7 +348,7 @@ private static void EnsurePivotHasAlias(AggregateDimension dimension)
     {
         if (string.IsNullOrWhiteSpace(dimension.Alias))
         {
-            dimension.Alias =  dimension.GetRuntimeName();
+            dimension.Alias = dimension.GetRuntimeName();
             dimension.SaveToDatabase();
         }
     }
@@ -364,31 +368,31 @@ private void btnClearPivotDimension_Click(object sender, EventArgs e)
             _aggregate.PivotOnDimensionID = null;
             ddPivotDimension.SelectedItem = null;
 
-            if(sender == btnClearPivotDimension)
+            if (sender == btnClearPivotDimension)
             {
                 _aggregate.SaveToDatabase();
                 Publish();
             }
         }
-
     }
+
     #endregion
 
     private void PopulateAxis(AggregateDimension axisIfAny, AggregateDimension pivotIfAny)
     {
         var allDimensions = _aggregate.AggregateDimensions.ToArray();
-            
+
         //if there's a pivot then don't advertise that as an axis
         if (pivotIfAny != null && !pivotIfAny.Equals(axisIfAny))
-            allDimensions = allDimensions.Except(new[] {pivotIfAny}).ToArray();
-            
+            allDimensions = allDimensions.Except(new[] { pivotIfAny }).ToArray();
+
         ddAxisDimension.Items.Clear();
-        ddAxisDimension.Items.AddRange(allDimensions.Where(d=>d.IsDate()).ToArray());
+        ddAxisDimension.Items.AddRange(allDimensions.Where(d => d.IsDate()).ToArray());
 
         //should only be one
         var axisDimensions = allDimensions.Where(d => d.AggregateContinuousDateAxis != null).ToArray();
 
-        if(axisDimensions.Length >1)
+        if (axisDimensions.Length > 1)
             if (Activator.YesNo(
                     $"Aggregate {_aggregate} has more than 1 dimension, this is highly illegal, shall I delete all the axis configurations for you?",
                     "Delete all axis?"))
@@ -406,7 +410,7 @@ private void PopulateAxis(AggregateDimension axisIfAny, AggregateDimension pivot
         ddAxisDimension.SelectedItem = axisIfAny;
         aggregateContinuousDateAxisUI1.Dimension = axisIfAny;
 
-        if(!axisIfAny.IsDate())
+        if (!axisIfAny.IsDate())
             _errorProviderAxis.SetError(ddAxisDimension, "Column is not a DateTime");
         else
             _errorProviderAxis.Clear();
@@ -414,10 +418,10 @@ private void PopulateAxis(AggregateDimension axisIfAny, AggregateDimension pivot
 
     private void ddAxisDimension_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(isRefreshing)
+        if (isRefreshing)
             return;
 
-        if(ddAxisDimension.SelectedItem is not AggregateDimension selectedDimension)
+        if (ddAxisDimension.SelectedItem is not AggregateDimension selectedDimension)
             return;
 
         //is there already an axis? if so keep the old start/end dates
@@ -425,9 +429,9 @@ private void ddAxisDimension_SelectedIndexChanged(object sender, EventArgs e)
 
         //create a new one
         var axis = new AggregateContinuousDateAxis(Activator.RepositoryLocator.CatalogueRepository, selectedDimension)
-            {
-                AxisIncrement = AxisIncrement.Month
-            };
+        {
+            AxisIncrement = AxisIncrement.Month
+        };
 
         //copy over old values of start/end/increment
         if (existing != null && existing.AggregateDimension_ID != selectedDimension.ID)
@@ -437,7 +441,7 @@ private void ddAxisDimension_SelectedIndexChanged(object sender, EventArgs e)
             axis.AxisIncrement = existing.AxisIncrement;
             existing.DeleteInDatabase();
         }
-            
+
         axis.SaveToDatabase();
         PublishToSelfOnly();
     }
@@ -449,18 +453,19 @@ private void btnClearAxis_Click(object sender, EventArgs e)
         existing?.DeleteInDatabase();
 
         //also clear the pivot
-        btnClearPivotDimension_Click(this,e);
+        btnClearPivotDimension_Click(this, e);
 
         _errorProviderAxis.Clear();
         PublishToSelfOnly();
     }
+
     private bool isRefreshing;
 
     public override void SetDatabaseObject(IActivateItems activator, AggregateConfiguration databaseObject)
     {
         _aggregate = databaseObject;
 
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
 
         try
         {
@@ -468,14 +473,15 @@ public override void SetDatabaseObject(IActivateItems activator, AggregateConfig
         }
         catch (AmbiguousDatabaseTypeException e)
         {
-            activator.KillForm(ParentForm,e);
+            activator.KillForm(ParentForm, e);
             return;
         }
+
         isRefreshing = true;
-            
+
         //find out what is legal for the aggregate
         _options = AggregateBuilderOptionsFactory.Create(_aggregate);
-            
+
         //set enablednesss based on legality
         cbExtractable.Enabled = _options.ShouldBeEnabled(AggregateEditorSection.Extractable, _aggregate);
         cbExtractable.Checked = _aggregate.IsExtractable;
@@ -502,7 +508,7 @@ public override void SetDatabaseObject(IActivateItems activator, AggregateConfig
         PopulateAxis(_axisDimensionIfAny, _pivotIfAny);
 
         PopulateTopX();
-            
+
         if (databaseObject.IsCohortIdentificationAggregate)
         {
             var cic = databaseObject.GetCohortIdentificationConfigurationIfAny();
@@ -510,7 +516,9 @@ public override void SetDatabaseObject(IActivateItems activator, AggregateConfig
                 CommonFunctionality.AddToMenu(new ExecuteCommandActivate(activator, cic), "Open Cohort Query...");
         }
         else
+        {
             CommonFunctionality.AddToMenu(new ExecuteCommandShow(activator, databaseObject.Catalogue, 0, true));
+        }
 
         CommonFunctionality.Add(new ExecuteCommandExecuteAggregateGraph(activator, databaseObject));
         CommonFunctionality.Add(new ExecuteCommandViewData(activator, databaseObject));
@@ -525,7 +533,7 @@ public override void SetDatabaseObject(IActivateItems activator, AggregateConfig
         QueryHaving.ReadOnly = ReadOnly;
         olvJoin.Enabled = !ReadOnly;
         selectColumnUI1.Enabled = !ReadOnly;
-            
+
         isRefreshing = false;
     }
 
@@ -547,8 +555,8 @@ private void tbName_TextChanged(object sender, EventArgs e)
 
     private void olvJoin_ItemActivate(object sender, EventArgs e)
     {
-        if(olvJoin.SelectedObject is TableInfo t)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(t));
+        if (olvJoin.SelectedObject is TableInfo t)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(t));
     }
 }
 
diff --git a/Rdmp.UI/AggregationUIs/Advanced/AggregateTopXUI.cs b/Rdmp.UI/AggregationUIs/Advanced/AggregateTopXUI.cs
index 43427ad9dc..e1de512c60 100644
--- a/Rdmp.UI/AggregationUIs/Advanced/AggregateTopXUI.cs
+++ b/Rdmp.UI/AggregationUIs/Advanced/AggregateTopXUI.cs
@@ -26,8 +26,8 @@ public partial class AggregateTopXUI : RDMPUserControl
 {
     private AggregateTopX _topX;
     private AggregateConfiguration _aggregate;
-        
-    private const string CountColumn  = "Count Column";
+
+    private const string CountColumn = "Count Column";
 
     public AggregateTopXUI()
     {
@@ -49,7 +49,7 @@ public void SetUp(IActivateItems activator, IAggregateBuilderOptions options, Ag
         _topX = aggregate.GetTopXIfAny();
 
         //if a TopX exists and control is disabled
-        if(!Enabled && _topX != null)
+        if (!Enabled && _topX != null)
         {
             _topX.DeleteInDatabase();
             _topX = null;
@@ -69,7 +69,7 @@ private void RefreshUIFromDatabase()
         {
             ddOrderByDimension.Enabled = true;
             ddAscOrDesc.Enabled = true;
-                
+
             tbTopX.Text = _topX.TopX.ToString();
             ddAscOrDesc.DataSource = Enum.GetValues(typeof(AggregateTopXOrderByDirection));
             ddAscOrDesc.SelectedItem = _topX.OrderByDirection;
@@ -84,19 +84,20 @@ private void RefreshUIFromDatabase()
             ddOrderByDimension.Enabled = false;
             ddAscOrDesc.Enabled = false;
         }
+
         bLoading = false;
     }
 
     private void tbTopX_TextChanged(object sender, EventArgs e)
     {
-        if(bLoading)
+        if (bLoading)
             return;
 
         //user is trying to delete an existing TopX
         if (_topX != null && string.IsNullOrWhiteSpace(tbTopX.Text))
         {
             _topX.DeleteInDatabase();
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_aggregate));
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
             return;
         }
 
@@ -119,13 +120,16 @@ private void tbTopX_TextChanged(object sender, EventArgs e)
 
         //there isn't one yet
         if (_topX == null)
+        {
             _topX = new AggregateTopX(Activator.RepositoryLocator.CatalogueRepository, _aggregate, i);
+        }
         else
         {
             //there is one so change its topX
             _topX.TopX = i;
             _topX.SaveToDatabase();
         }
+
         Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
     }
 
@@ -134,7 +138,7 @@ private void ddOrderByDimension_SelectedIndexChanged(object sender, EventArgs e)
         if (bLoading)
             return;
 
-        if(_topX == null || ddOrderByDimension.SelectedItem == null)
+        if (_topX == null || ddOrderByDimension.SelectedItem == null)
             return;
 
         if (ddOrderByDimension.SelectedItem is AggregateDimension dimension)
@@ -151,10 +155,10 @@ private void ddAscOrDesc_SelectedIndexChanged(object sender, EventArgs e)
         if (bLoading)
             return;
 
-        if(_topX == null || ddAscOrDesc.SelectedItem == null)
+        if (_topX == null || ddAscOrDesc.SelectedItem == null)
             return;
 
-        _topX.OrderByDirection = (AggregateTopXOrderByDirection) ddAscOrDesc.SelectedItem;
+        _topX.OrderByDirection = (AggregateTopXOrderByDirection)ddAscOrDesc.SelectedItem;
         _topX.SaveToDatabase();
         Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
     }
diff --git a/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs b/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs
index 12e9b56b71..f057e45761 100644
--- a/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs
+++ b/Rdmp.UI/AggregationUIs/Advanced/SelectColumnUI.cs
@@ -46,7 +46,7 @@ public partial class SelectColumnUI : RDMPUserControl
 {
     private IAggregateBuilderOptions _options;
     private AggregateConfiguration _aggregate;
-        
+
     private List<IColumn> _availableColumns;
     private List<IColumn> _includedColumns;
 
@@ -62,16 +62,16 @@ public partial class SelectColumnUI : RDMPUserControl
     public SelectColumnUI()
     {
         InitializeComponent();
-            
+
         olvSelectColumns.ButtonClick += ButtonClick;
-            
+
         _availableColumns = new List<IColumn>();
         _includedColumns = new List<IColumn>();
 
         olvEditInPopup.ButtonSizing = OLVColumn.ButtonSizingMode.CellBounds;
-        olvEditInPopup.AspectGetter = rowObject => _includedColumns.Contains(rowObject)?"Edit...":null;
-            
-        olvIncluded.AspectGetter = rowObject => _includedColumns.Contains(rowObject)? "Included": "Not Included";
+        olvEditInPopup.AspectGetter = rowObject => _includedColumns.Contains(rowObject) ? "Edit..." : null;
+
+        olvIncluded.AspectGetter = rowObject => _includedColumns.Contains(rowObject) ? "Included" : "Not Included";
         olvSelectColumns.AlwaysGroupByColumn = olvIncluded;
         olvSelectColumns.RowFormatter += RowFormatter;
 
@@ -80,10 +80,9 @@ public SelectColumnUI()
 
         olvAddRemove.ImageGetter += ImageGetter;
         olvSelectColumns.CellClick += olvSelectColumns_CellClick;
-            
+
         _add = FamFamFamIcons.add.ImageToBitmap();
         _delete = FamFamFamIcons.delete.ImageToBitmap();
-
     }
 
     private void olvSelectColumns_CellClick(object sender, CellClickEventArgs e)
@@ -95,7 +94,8 @@ private void olvSelectColumns_CellClick(object sender, CellClickEventArgs e)
             var dimensionColumn = e.Model as AggregateDimension;
 
             if (countColumn == null && importableColumn == null && dimensionColumn == null)
-                throw new Exception($"Object in list view of type that wasn't IColumn, it was {e.Model.GetType().Name}");
+                throw new Exception(
+                    $"Object in list view of type that wasn't IColumn, it was {e.Model.GetType().Name}");
 
             //if it is an add
             if (_availableColumns.Contains(e.Model))
@@ -103,17 +103,16 @@ private void olvSelectColumns_CellClick(object sender, CellClickEventArgs e)
                 //count column added
                 if (countColumn != null)
                     if (_options.GetCountColumnRequirement(_aggregate) == CountColumnRequirement.CannotHaveOne)
-                    {
-                        WideMessageBox.Show("Cohort Sets cannot have count columns","A count column is a SELECT column with an aggregate function (count(*), sum(x) etc).  The SELECT component for cohort identification must be the patient id column only.");
-                    }
+                        WideMessageBox.Show("Cohort Sets cannot have count columns",
+                            "A count column is a SELECT column with an aggregate function (count(*), sum(x) etc).  The SELECT component for cohort identification must be the patient id column only.");
                     else
                         Save(countColumn);
 
                 //regular column added
                 if (importableColumn != null)
                 {
-
-                    var dimension = new AggregateDimension(Activator.RepositoryLocator.CatalogueRepository, importableColumn, _aggregate);
+                    var dimension = new AggregateDimension(Activator.RepositoryLocator.CatalogueRepository,
+                        importableColumn, _aggregate);
 
                     _availableColumns.Remove(importableColumn);
                     _includedColumns.Add(dimension);
@@ -185,7 +184,6 @@ private void olvSelectColumns_CellClick(object sender, CellClickEventArgs e)
 
     private Bitmap ImageGetter(object rowObject)
     {
-            
         if (_availableColumns.Contains(rowObject))
             return _add;
 
@@ -198,7 +196,7 @@ private Bitmap ImageGetter(object rowObject)
 
     private void CellEditFinished(object sender, CellEditEventArgs cellEditEventArgs)
     {
-        var col = (IColumn) cellEditEventArgs.RowObject;
+        var col = (IColumn)cellEditEventArgs.RowObject;
 
         //user deleted its value
         if (string.IsNullOrWhiteSpace(col.SelectSQL) && col.ColumnInfo != null)
@@ -209,7 +207,6 @@ private void CellEditFinished(object sender, CellEditEventArgs cellEditEventArgs
 
         if (cellEditEventArgs.RowObject != null)
             Save(col);
-
     }
 
     private void CellEditStarting(object sender, CellEditEventArgs cellEditEventArgs)
@@ -234,9 +231,8 @@ private void RowFormatter(OLVListItem olvItem)
 
     private void ButtonClick(object sender, CellClickEventArgs cellClickEventArgs)
     {
-        if(cellClickEventArgs.Column == olvEditInPopup)
-        {
-            if(cellClickEventArgs.Model is IColumn col)
+        if (cellClickEventArgs.Column == olvEditInPopup)
+            if (cellClickEventArgs.Model is IColumn col)
             {
                 var dialog = new SetSQLDialog(col.SelectSQL, new RDMPCombineableFactory());
 
@@ -247,14 +243,13 @@ private void ButtonClick(object sender, CellClickEventArgs cellClickEventArgs)
                 autoComplete.Add(_aggregate);
 
                 autoComplete.RegisterForEvents(dialog.QueryEditor);
-                    
+
                 if (dialog.ShowDialog() == DialogResult.OK)
                 {
                     col.SelectSQL = dialog.Result;
                     Save(col);
                 }
             }
-        }
     }
 
     /// <summary>
@@ -267,7 +262,7 @@ private void Save(IColumn col)
         {
             _aggregate.CountSQL = countCol.GetFullSelectLineStringForSavingIntoAnAggregate();
             _aggregate.SaveToDatabase();
-            if(!_includedColumns.Contains(countCol))
+            if (!_includedColumns.Contains(countCol))
             {
                 _includedColumns.Add(countCol);
                 _availableColumns.Remove(countCol);
@@ -276,7 +271,7 @@ private void Save(IColumn col)
                 olvSelectColumns.AddObject(countCol);
                 olvSelectColumns.EnsureModelVisible(countCol);
             }
-                
+
             Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
             return;
         }
@@ -285,7 +280,7 @@ private void Save(IColumn col)
         saveable?.SaveToDatabase();
 
         _aggregate.SaveToDatabase();
-        Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_aggregate));
+        Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_aggregate));
     }
 
 
@@ -296,7 +291,7 @@ public void SetUp(IActivateItems activator, IAggregateBuilderOptions options, Ag
         _options = options;
         _countColumnRequirement = _options.GetCountColumnRequirement(aggregate);
         _aggregate = aggregate;
-            
+
         _availableColumns.Clear();
         _includedColumns.Clear();
         olvSelectColumns.ClearObjects();
@@ -319,7 +314,8 @@ public void SetUp(IActivateItems activator, IAggregateBuilderOptions options, Ag
                 countCol = new AggregateCountColumn("count(*) as CountColumn");
                 _availableColumns.Add(countCol);
             }
-            countCol.SetQuerySyntaxHelper(_querySyntaxHelper,true);
+
+            countCol.SetQuerySyntaxHelper(_querySyntaxHelper, true);
         }
 
         olvSelectColumns.AddObjects(_includedColumns);
@@ -329,6 +325,7 @@ public void SetUp(IActivateItems activator, IAggregateBuilderOptions options, Ag
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         olvSelectColumns.UseFiltering = true;
-        olvSelectColumns.ModelFilter = new TextMatchFilterWithAlwaysShowList(_includedColumns,olvSelectColumns,tbFilter.Text,StringComparison.CurrentCultureIgnoreCase);
+        olvSelectColumns.ModelFilter = new TextMatchFilterWithAlwaysShowList(_includedColumns, olvSelectColumns,
+            tbFilter.Text, StringComparison.CurrentCultureIgnoreCase);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/AggregationUIs/AggregateContinuousDateAxisUI.cs b/Rdmp.UI/AggregationUIs/AggregateContinuousDateAxisUI.cs
index 0cf91d7fc8..cee212773e 100644
--- a/Rdmp.UI/AggregationUIs/AggregateContinuousDateAxisUI.cs
+++ b/Rdmp.UI/AggregationUIs/AggregateContinuousDateAxisUI.cs
@@ -49,12 +49,11 @@ public AggregateDimension Dimension
             _axis = value.AggregateContinuousDateAxis;
 
             UpdateFormStateToMatchAxisState();
-            
         }
     }
 
     private bool updating = false;
-        
+
     private void UpdateFormStateToMatchAxisState()
     {
         updating = true;
@@ -87,7 +86,10 @@ private void UpdateFormStateToMatchAxisState()
     public AggregateContinuousDateAxisUI()
     {
         InitializeComponent();
-        ddIncrement.DataSource = new object[]{AxisIncrement.Month,AxisIncrement.Quarter,AxisIncrement.Year}; //don't offer day, that was a terrible idea
+        ddIncrement.DataSource = new object[]
+        {
+            AxisIncrement.Month, AxisIncrement.Quarter, AxisIncrement.Year
+        }; //don't offer day, that was a terrible idea
     }
 
 
@@ -96,24 +98,26 @@ private void ddIncrement_SelectedIndexChanged(object sender, EventArgs e)
         if (updating || _axis == null)
             return;
 
-        _axis.AxisIncrement = (AxisIncrement) ddIncrement.SelectedValue;
+        _axis.AxisIncrement = (AxisIncrement)ddIncrement.SelectedValue;
         _axis.SaveToDatabase();
     }
-        
+
     private void tbDates_TextChanged(object sender, EventArgs e)
     {
         if (updating || _axis == null)
             return;
 
-        var s = (TextBox) sender;
+        var s = (TextBox)sender;
 
         if (string.IsNullOrWhiteSpace(s.Text))
         {
             _errorProvider.SetError(s, "Field cannot be blank");
             _errorProvider.Tag = s;
         }
-        else if(_errorProvider.Tag == s)
+        else if (_errorProvider.Tag == s)
+        {
             _errorProvider.Clear();
+        }
 
         //if user enters a date then put 
         if (DateTime.TryParse(s.Text, out var dt))
@@ -123,18 +127,18 @@ private void tbDates_TextChanged(object sender, EventArgs e)
             updating = false;
         }
 
-        if(s == tbStartDate)
+        if (s == tbStartDate)
             _axis.StartDate = s.Text;
         else
             _axis.EndDate = s.Text;
 
         try
         {
-            SyntaxChecker.ParityCheckCharacterPairs(new[] {'(', '\''}, new[] {')', '\''}, s.Text);
+            SyntaxChecker.ParityCheckCharacterPairs(new[] { '(', '\'' }, new[] { ')', '\'' }, s.Text);
             s.ForeColor = Color.Black;
 
             _axis.SaveToDatabase();
-            ((TextBox) sender).Focus();
+            ((TextBox)sender).Focus();
         }
         catch (SyntaxErrorException)
         {
diff --git a/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs b/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs
index 2e9cd70adb..d939fa2c72 100644
--- a/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs
+++ b/Rdmp.UI/AggregationUIs/AggregateGraphUI.cs
@@ -50,7 +50,6 @@ namespace Rdmp.UI.AggregationUIs;
 /// </summary>
 public partial class AggregateGraphUI : AggregateGraph_Design
 {
-
     /// <summary>
     /// The maximum number of cells in a DataTable before we warn the user that rendering it is likely to hang
     /// up System.Windows.Forms.DataVisualization.Charting for a minutes/hours
@@ -63,9 +62,9 @@ public partial class AggregateGraphUI : AggregateGraph_Design
     /// the sensible descision is taken e.g. to not try to render.
     /// 
     /// </summary>
-    public bool Silent { get;set;}
+    public bool Silent { get; set; }
 
-    public Scintilla QueryEditor { get;private set; }
+    public Scintilla QueryEditor { get; private set; }
 
     public int Timeout
     {
@@ -93,16 +92,18 @@ public AggregateGraphUI()
 
         #region Query Editor setup
 
-        if(VisualStudioDesignMode)
+        if (VisualStudioDesignMode)
             return;
 
         QueryEditor = new ScintillaTextEditorFactory().Create();
 
-        QueryEditor.Text = "/*Graph load has not been attempted yet, wait till the system calls LoadGraphAsync() or LoadGraph()*/";
+        QueryEditor.Text =
+            "/*Graph load has not been attempted yet, wait till the system calls LoadGraphAsync() or LoadGraph()*/";
 
         QueryEditor.ReadOnly = true;
 
         tpCode.Controls.Add(QueryEditor);
+
         #endregion QueryEditor
 
         SetToolbarButtonsEnabled(true);
@@ -131,11 +132,11 @@ private void SetToolbarButtonsEnabled(bool enabled)
     {
         if (InvokeRequired)
         {
-            Invoke(new MethodInvoker(()=>SetToolbarButtonsEnabled(enabled)));
+            Invoke(new MethodInvoker(() => SetToolbarButtonsEnabled(enabled)));
             return;
         }
 
-        miSaveImages.Enabled = enabled && _dt != null && _dt.Rows.Count>0;
+        miSaveImages.Enabled = enabled && _dt != null && _dt.Rows.Count > 0;
         miClipboardCsv.Enabled = enabled && _dt != null && _dt.Rows.Count > 0;
         miClipboardWord.Enabled = enabled && _dt != null && _dt.Rows.Count > 0;
         btnResendQuery.Enabled = enabled;
@@ -176,7 +177,7 @@ public void LoadGraphAsync()
         SetToolbarButtonsEnabled(false);
         Done = false;
         Crashed = false;
-        Exception = null; 
+        Exception = null;
 
         chart1.Visible = false;
 
@@ -200,15 +201,15 @@ public void LoadGraphAsync()
         _loadTask.Start();
     }
 
-    protected virtual string GetDescription()
-    {
-        return string.IsNullOrWhiteSpace(AggregateConfiguration.Description)
+    protected virtual string GetDescription() =>
+        string.IsNullOrWhiteSpace(AggregateConfiguration.Description)
             ? "No description"
             : AggregateConfiguration.Description;
-    }
 
     private DbCommand _cmd;
-    private ChartDashStyle[] StyleList = {
+
+    private ChartDashStyle[] StyleList =
+    {
         ChartDashStyle.Solid,
         ChartDashStyle.Dash,
         ChartDashStyle.Dot,
@@ -249,7 +250,7 @@ private void LoadGraph()
 
             var server =
                 AggregateConfiguration.Catalogue.GetDistinctLiveDatabaseServer(
-                    DataAccessContext.InternalDataProcessing,true);
+                    DataAccessContext.InternalDataProcessing, true);
 
             Invoke(new MethodInvoker(() => { lblLoadStage.Text = "Connecting To Server..."; }));
 
@@ -269,7 +270,7 @@ private void LoadGraph()
                 _cmd = null;
 
                 //trim all leading/trailing whitespace from column
-                foreach(DataColumn c in _dt.Columns)
+                foreach (DataColumn c in _dt.Columns)
                     c.ColumnName = c.ColumnName.Trim();
 
                 if (_dt.Rows.Count == 0)
@@ -317,14 +318,13 @@ private void LoadGraph()
 
             SetToolbarButtonsEnabled(true);
             Done = true;
-
         }
     }
 
     private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuousDateAxis axis)
     {
         var haveSetSource = false;
-        if(chart1.Legends.Count == 0)
+        if (chart1.Legends.Count == 0)
             chart1.Legends.Add(new Legend());
 
         chart1.Titles.Clear();
@@ -501,7 +501,7 @@ private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuo
                 chart1.Series[index].ChartType = SeriesChartType.Line;
 
                 //alternate in rotating style the various lines on the graph
-                chart1.Series[index].BorderDashStyle = StyleList[index%StyleList.Length];
+                chart1.Series[index].BorderDashStyle = StyleList[index % StyleList.Length];
                 chart1.Series[index].BorderWidth = 2;
             }
             else
@@ -519,7 +519,6 @@ private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuo
                     chart1.ChartAreas[0].AxisX.Interval = 1;
                     chart1.ChartAreas[0].AxisX.LabelAutoFitMinFontSize = 8;
                 }
-
             }
 
             //name series based on column 3 or the aggregate name
@@ -527,7 +526,7 @@ private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuo
         }
 
         //don't show legend if there's only one series
-        if(chart1.Series.Count == 1)
+        if (chart1.Series.Count == 1)
             chart1.Legends.Clear();
 
         lblLoadStage.Text = $"Data Binding Chart ({_dt.Columns.Count} columns)";
@@ -537,11 +536,13 @@ private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuo
 
         var abandon = false;
 
-        if(cells > MAXIMUM_CELLS_BEFORE_WARNING)
-            if(Silent)
+        if (cells > MAXIMUM_CELLS_BEFORE_WARNING)
+            if (Silent)
                 throw new Exception($"Aborting data binding because there were {cells} cells in the graph data table");
             else
-                abandon = !Activator.YesNo($"Data Table has {$"{cells:n0}"} cells.  Are you sure you want to attempt to graph it?", "Render Graph?");
+                abandon = !Activator.YesNo(
+                    $"Data Table has {$"{cells:n0}"} cells.  Are you sure you want to attempt to graph it?",
+                    "Render Graph?");
 
         if (!abandon)
         {
@@ -554,18 +555,18 @@ private void PopulateGraphResults(QueryTimeColumn countColumn, AggregateContinuo
         lblLoadStage.Visible = false;
 
         //set publish enabledness to the enabledness of
-        btnCache.Enabled =Activator.RepositoryLocator.CatalogueRepository.GetDefaultFor(PermissableDefaults.WebServiceQueryCachingServer_ID) != null;
+        btnCache.Enabled =
+            Activator.RepositoryLocator.CatalogueRepository.GetDefaultFor(PermissableDefaults
+                .WebServiceQueryCachingServer_ID) != null;
         btnClearFromCache.Enabled = false;
 
         //Make publish button enabledness be dependant on cache
         if (btnCache.Enabled)
-        {
             //let them clear if there is a query caching server and the manager has cached results already
             btnClearFromCache.Enabled =
                 GetCacheManager()
                     .GetLatestResultsTableUnsafe(AggregateConfiguration,
                         AggregateOperation.ExtractableAggregateResults) != null;
-        }
 
         SetToolbarButtonsEnabled(true);
     }
@@ -578,10 +579,10 @@ private void ShowHeatmapTab(bool show)
             return;
         }
 
-        if(show && !tabControl1.TabPages.Contains(tpHeatmap))
+        if (show && !tabControl1.TabPages.Contains(tpHeatmap))
             tabControl1.TabPages.Add(tpHeatmap);
 
-        if(!show && tabControl1.TabPages.Contains(tpHeatmap))
+        if (!show && tabControl1.TabPages.Contains(tpHeatmap))
             tabControl1.TabPages.Remove(tpHeatmap);
     }
 
@@ -598,10 +599,8 @@ public void UpdateQueryViewerScreenWithQuery(string sql)
         QueryEditor.ReadOnly = true;
     }
 
-    protected virtual AggregateBuilder GetQueryBuilder(AggregateConfiguration aggregateConfiguration)
-    {
-        return aggregateConfiguration.GetQueryBuilder();
-    }
+    protected virtual AggregateBuilder GetQueryBuilder(AggregateConfiguration aggregateConfiguration) =>
+        aggregateConfiguration.GetQueryBuilder();
 
 
     private static string GetSeriesName(object o)
@@ -612,7 +611,8 @@ private static string GetSeriesName(object o)
         return o.ToString();
     }
 
-    public void SaveTo(DirectoryInfo subdir, string nameOfFile, ICheckNotifier notifier, Dictionary<AggregateGraphUI, string> graphSaveLocations = null)
+    public void SaveTo(DirectoryInfo subdir, string nameOfFile, ICheckNotifier notifier,
+        Dictionary<AggregateGraphUI, string> graphSaveLocations = null)
     {
         if (!Done)
         {
@@ -631,16 +631,17 @@ public void SaveTo(DirectoryInfo subdir, string nameOfFile, ICheckNotifier notif
             chart1.SaveImage(imgSavePath, ChartImageFormat.Png);
             notifier.OnCheckPerformed(new CheckEventArgs($"Saved chart image to {imgSavePath}", CheckResult.Success));
 
-            graphSaveLocations?.Add(this,imgSavePath);
+            graphSaveLocations?.Add(this, imgSavePath);
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save image to {imgSavePath}", CheckResult.Fail,e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save image to {imgSavePath}", CheckResult.Fail,
+                e));
         }
 
         try
         {
-            var dt = (DataTable) dataGridView1.DataSource;
+            var dt = (DataTable)dataGridView1.DataSource;
             using var dataSaveStream = new StreamWriter(dataSavePath);
             dt.SaveAsCsv(dataSaveStream);
 
@@ -648,7 +649,8 @@ public void SaveTo(DirectoryInfo subdir, string nameOfFile, ICheckNotifier notif
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save chart data to {dataSavePath}",CheckResult.Fail, e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save chart data to {dataSavePath}",
+                CheckResult.Fail, e));
         }
 
         try
@@ -658,7 +660,8 @@ public void SaveTo(DirectoryInfo subdir, string nameOfFile, ICheckNotifier notif
         }
         catch (Exception e)
         {
-            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save SQL query to {querySavePath}",CheckResult.Fail,e));
+            notifier.OnCheckPerformed(new CheckEventArgs($"Failed to save SQL query to {querySavePath}",
+                CheckResult.Fail, e));
         }
     }
 
@@ -671,7 +674,8 @@ private void btnClearFromCache_Click(object sender, EventArgs e)
     {
         try
         {
-            GetCacheManager().DeleteCacheEntryIfAny(AggregateConfiguration,AggregateOperation.ExtractableAggregateResults);
+            GetCacheManager()
+                .DeleteCacheEntryIfAny(AggregateConfiguration, AggregateOperation.ExtractableAggregateResults);
             MessageBox.Show(
                 "Cached results deleted, they should no longer appear on the website (subject to website page level caching in IIS etc of course)");
             btnClearFromCache.Enabled = false;
@@ -680,15 +684,13 @@ private void btnClearFromCache_Click(object sender, EventArgs e)
         {
             ExceptionViewer.Show(exception);
         }
-
     }
 
-    private CachedAggregateConfigurationResultsManager GetCacheManager()
-    {
-        return new CachedAggregateConfigurationResultsManager(
-            Activator.RepositoryLocator.CatalogueRepository.GetDefaultFor(PermissableDefaults.WebServiceQueryCachingServer_ID)
+    private CachedAggregateConfigurationResultsManager GetCacheManager() =>
+        new(
+            Activator.RepositoryLocator.CatalogueRepository.GetDefaultFor(PermissableDefaults
+                .WebServiceQueryCachingServer_ID)
         );
-    }
 
     /// <summary>
     /// Normally you don't need to worry about double subscriptions but this graph gets recycled during MetadataReport generation with different aggregates one
@@ -700,11 +702,11 @@ private CachedAggregateConfigurationResultsManager GetCacheManager()
 
     public override void SetDatabaseObject(IActivateItems activator, AggregateConfiguration databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
 
         BuildMenu(activator);
 
-        SetAggregate(activator,databaseObject);
+        SetAggregate(activator, databaseObject);
     }
 
     protected void BuildMenu(IActivateItems activator)
@@ -713,7 +715,7 @@ protected void BuildMenu(IActivateItems activator)
         {
             menuInitialized = true;
 
-            if(DatabaseObject != null)
+            if (DatabaseObject != null)
                 CommonFunctionality.AddToMenu(new ExecuteCommandActivate(activator, DatabaseObject));
 
             CommonFunctionality.AddToMenu(new ToolStripSeparator());
@@ -736,11 +738,11 @@ protected void BuildMenu(IActivateItems activator)
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="graph"></param>
-    public void SetAggregate(IActivateItems activator,AggregateConfiguration graph)
+    public void SetAggregate(IActivateItems activator, AggregateConfiguration graph)
     {
         //graphs cant edit so no need to even record refresher/activator
         _aggregateConfiguration = graph;
-            
+
         SetItemActivator(activator);
 
         SetupRibbon();
@@ -750,11 +752,10 @@ private void SetupRibbon()
     {
         if (_ribbonInitialized)
             return;
-            
+
         _ribbonInitialized = true;
 
         foreach (var o in GetRibbonObjects())
-        {
             switch (o)
             {
                 case string s:
@@ -767,26 +768,22 @@ private void SetupRibbon()
                     throw new NotSupportedException(
                         $"GetRibbonObjects can only return strings or DatabaseEntity objects, object '{o}' is not valid because it is a '{o.GetType().Name}'");
             }
-        }
-            
     }
 
 
-    protected virtual object[] GetRibbonObjects()
-    {
-        return Array.Empty<object>();
-    }
+    protected virtual object[] GetRibbonObjects() => Array.Empty<object>();
 
 
     public IEnumerable<BitmapWithDescription> GetImages()
     {
         var b = new Bitmap(chart1.Width, chart1.Height);
         chart1.DrawToBitmap(b, new Rectangle(new Point(0, 0), new Size(chart1.Width, chart1.Height)));
-            
-        yield return new BitmapWithDescription(b.LegacyToImage(),AggregateConfiguration.Name,AggregateConfiguration.Description);
+
+        yield return new BitmapWithDescription(b.LegacyToImage(), AggregateConfiguration.Name,
+            AggregateConfiguration.Description);
 
         if (heatmapUI.HasDataTable())
-            yield return new BitmapWithDescription(heatmapUI.GetImage(800).LegacyToImage(),null,null);
+            yield return new BitmapWithDescription(heatmapUI.GetImage(800).LegacyToImage(), null, null);
     }
 
     private void MiSaveImagesClick(object sender, EventArgs e)
@@ -815,13 +812,13 @@ private void MiSaveImagesClick(object sender, EventArgs e)
 
     private void ClipboardClick(object sender, EventArgs e)
     {
-        if(sender == miClipboardWord)
+        if (sender == miClipboardWord)
         {
             var s = UsefulStuff.DataTableToHtmlDataTable(_dt);
 
             var formatted = UsefulStuff.GetClipboardFormattedHtmlStringFromHtmlString(s);
 
-            Clipboard.SetText(formatted,TextDataFormat.Html);
+            Clipboard.SetText(formatted, TextDataFormat.Html);
         }
 
         if (sender == miClipboardCsv)
@@ -836,10 +833,7 @@ private void btnResendQuery_Click(object sender, EventArgs e)
         LoadGraphAsync();
     }
 
-    public override string GetTabName()
-    {
-        return $"Graph:{base.GetTabName()}";
-    }
+    public override string GetTabName() => $"Graph:{base.GetTabName()}";
 
     private void btnCache_Click(object sender, EventArgs e)
     {
@@ -847,10 +841,15 @@ private void btnCache_Click(object sender, EventArgs e)
         {
             var cacheManager = GetCacheManager();
 
-            var args = new CacheCommitExtractableAggregate(AggregateConfiguration, QueryEditor.Text, (DataTable)dataGridView1.DataSource,Timeout);
+            var args = new CacheCommitExtractableAggregate(AggregateConfiguration, QueryEditor.Text,
+                (DataTable)dataGridView1.DataSource, Timeout);
             cacheManager.CommitResults(args);
 
-            var result = cacheManager.GetLatestResultsTable(AggregateConfiguration,AggregateOperation.ExtractableAggregateResults, QueryEditor.Text) ?? throw new NullReferenceException("CommitResults passed but GetLatestResultsTable returned false (when we tried to refetch the table name from the cache)");
+            var result =
+                cacheManager.GetLatestResultsTable(AggregateConfiguration,
+                    AggregateOperation.ExtractableAggregateResults, QueryEditor.Text) ??
+                throw new NullReferenceException(
+                    "CommitResults passed but GetLatestResultsTable returned false (when we tried to refetch the table name from the cache)");
             MessageBox.Show($"DataTable successfully submitted to:{result.GetFullyQualifiedName()}");
             btnClearFromCache.Enabled = true;
         }
diff --git a/Rdmp.UI/ApplicationRestarter.cs b/Rdmp.UI/ApplicationRestarter.cs
index d87dc2375e..7f52942186 100644
--- a/Rdmp.UI/ApplicationRestarter.cs
+++ b/Rdmp.UI/ApplicationRestarter.cs
@@ -14,7 +14,6 @@ namespace Rdmp.UI;
 
 public static class ApplicationRestarter
 {
-
     public static void Restart()
     {
         try
@@ -38,20 +37,19 @@ private static void RestartImpl()
             sb.Append(arguments[argumentIndex]);
             sb.Append("\" ");
         }
+
         if (arguments.Length > 1)
         {
             sb.Append('"');
             sb.Append(arguments[^1]);
             sb.Append('"');
         }
+
         var currentStartInfo = new ProcessStartInfo
         {
             FileName = Path.ChangeExtension(Application.ExecutablePath, "exe")
         };
-        if (sb.Length > 0)
-        {
-            currentStartInfo.Arguments = sb.ToString();
-        }
+        if (sb.Length > 0) currentStartInfo.Arguments = sb.ToString();
         Application.Exit();
         Process.Start(currentStartInfo);
     }
diff --git a/Rdmp.UI/AutoComplete/AutoCompleteProviderWin.cs b/Rdmp.UI/AutoComplete/AutoCompleteProviderWin.cs
index d0a82e71ca..8db754285a 100644
--- a/Rdmp.UI/AutoComplete/AutoCompleteProviderWin.cs
+++ b/Rdmp.UI/AutoComplete/AutoCompleteProviderWin.cs
@@ -34,32 +34,29 @@ public void RegisterForEvents(Scintilla queryEditor)
                 ShowAutocomplete(queryEditor, true);
             }
         };
-            
+
         queryEditor.AutoCSeparator = Separator;
         queryEditor.CharAdded += scintilla_CharAdded;
         queryEditor.AutoCIgnoreCase = true;
         queryEditor.AutoCOrder = Order.Custom;
         queryEditor.AutoCAutoHide = false;
 
-        for (var i = 0; i < Images.Length; i++)
-        {
-            queryEditor.RegisterRgbaImage(i, Images[i].ImageToBitmap());
-        }
+        for (var i = 0; i < Images.Length; i++) queryEditor.RegisterRgbaImage(i, Images[i].ImageToBitmap());
     }
 
     private void scintilla_CharAdded(object sender, CharAddedEventArgs e)
     {
         if (sender is not Scintilla scintilla)
             return;
-            
-        ShowAutocomplete(scintilla,false);
+
+        ShowAutocomplete(scintilla, false);
     }
 
-    private void ShowAutocomplete(Scintilla scintilla,bool all)
+    private void ShowAutocomplete(Scintilla scintilla, bool all)
     {
         // Find the word start
         var word = scintilla.GetWordFromPosition(scintilla.CurrentPosition)?.Trim();
-            
+
         if (string.IsNullOrWhiteSpace(word) && !all)
         {
             scintilla.AutoCCancel();
@@ -67,10 +64,10 @@ private void ShowAutocomplete(Scintilla scintilla,bool all)
         }
 
         var list = Items.Distinct()
-            .Where(s => !string.IsNullOrWhiteSpace(s) && s.Contains(word,StringComparison.CurrentCultureIgnoreCase))
+            .Where(s => !string.IsNullOrWhiteSpace(s) && s.Contains(word, StringComparison.CurrentCultureIgnoreCase))
             .OrderBy(a => a);
 
-        if(!list.Any())
+        if (!list.Any())
         {
             scintilla.AutoCCancel();
             return;
@@ -82,10 +79,7 @@ private void ShowAutocomplete(Scintilla scintilla,bool all)
 
     private string FormatForAutocomplete(string word)
     {
-        if(ItemsWithImages.TryGetValue(word, out var image))
-        {
-            return $"{word}?{image}";
-        }
+        if (ItemsWithImages.TryGetValue(word, out var image)) return $"{word}?{image}";
 
         return word;
     }
diff --git a/Rdmp.UI/CatalogueSummary/CatalogueDQEResultsUI.cs b/Rdmp.UI/CatalogueSummary/CatalogueDQEResultsUI.cs
index 3d8a769975..8e4705d884 100644
--- a/Rdmp.UI/CatalogueSummary/CatalogueDQEResultsUI.cs
+++ b/Rdmp.UI/CatalogueSummary/CatalogueDQEResultsUI.cs
@@ -29,12 +29,13 @@ public CatalogueDQEResultsUI()
     {
         InitializeComponent();
 
-        dqePivotCategorySelector1.PivotCategorySelectionChanged += dqePivotCategorySelector1_PivotCategorySelectionChanged;
+        dqePivotCategorySelector1.PivotCategorySelectionChanged +=
+            dqePivotCategorySelector1_PivotCategorySelectionChanged;
 
         AssociatedCollection = RDMPCollection.Catalogue;
         DoubleBuffered = true;
     }
-        
+
     private void ClearDQEGraphs()
     {
         timePeriodicityChart1.ClearGraph();
@@ -42,37 +43,37 @@ private void ClearDQEGraphs()
     }
 
     private Evaluation _lastSelected;
+
     private void evaluationTrackBar1_EvaluationSelected(object sender, Evaluation evaluation)
     {
         dqePivotCategorySelector1.LoadOptions(evaluation);
 
         var category = dqePivotCategorySelector1.SelectedPivotCategory;
-            
-        timePeriodicityChart1.SelectEvaluation(evaluation,category??"ALL");
+
+        timePeriodicityChart1.SelectEvaluation(evaluation, category ?? "ALL");
         columnStatesChart1.SelectEvaluation(evaluation, category ?? "ALL");
         _lastSelected = evaluation;
     }
 
     private void dqePivotCategorySelector1_PivotCategorySelectionChanged()
     {
-        if(_lastSelected ==  null)
+        if (_lastSelected == null)
             return;
 
         var category = dqePivotCategorySelector1.SelectedPivotCategory;
 
         timePeriodicityChart1.SelectEvaluation(_lastSelected, category ?? "ALL");
         columnStatesChart1.SelectEvaluation(_lastSelected, category ?? "ALL");
-
     }
 
     public override void SetDatabaseObject(IActivateItems activator, Catalogue databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         timePeriodicityChart1.SetItemActivator(activator);
 
         //clear old DQE graphs
         ClearDQEGraphs();
-            
+
         DQERepository dqeRepository = null;
         try
         {
@@ -94,18 +95,16 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
             evaluationTrackBar1.Evaluations = evaluations;
         }
 
-        CommonFunctionality.Add(new ExecuteCommandConfigureCatalogueValidationRules(activator).SetTarget(databaseObject));
-        CommonFunctionality.Add(new ExecuteCommandRunDQEOnCatalogue(activator, databaseObject), "Run Data Quality Engine...");
+        CommonFunctionality.Add(
+            new ExecuteCommandConfigureCatalogueValidationRules(activator).SetTarget(databaseObject));
+        CommonFunctionality.Add(new ExecuteCommandRunDQEOnCatalogue(activator, databaseObject),
+            "Run Data Quality Engine...");
     }
 
-    public override string GetTabName()
-    {
-        return $"DQE:{base.GetTabName()}";
-            
-    }
+    public override string GetTabName() => $"DQE:{base.GetTabName()}";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CatalogueSummaryScreen_Design, UserControl>))]
-public abstract class CatalogueSummaryScreen_Design:RDMPSingleDatabaseObjectControl<Catalogue>
+public abstract class CatalogueSummaryScreen_Design : RDMPSingleDatabaseObjectControl<Catalogue>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/ColumnStatesChart.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/ColumnStatesChart.cs
index b336911ce3..860f4523df 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/ColumnStatesChart.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/ColumnStatesChart.cs
@@ -46,16 +46,21 @@ private void GenerateChart(Evaluation evaluation, string pivotCategoryValue)
 
         var row = 0;
 
-        foreach (var property in evaluation.ColumnStates.Select(static c=>c.TargetProperty).Distinct())
+        foreach (var property in evaluation.ColumnStates.Select(static c => c.TargetProperty).Distinct())
         {
             var bar = new ConsequenceBar
             {
                 Label = property,
-                Correct = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountCorrect : 0),
-                Invalid = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountInvalidatesRow : 0),
-                Missing = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountMissing : 0),
-                Wrong = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountWrong : 0),
-                DBNull = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountDBNull : 0),
+                Correct = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property))
+                    .Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountCorrect : 0),
+                Invalid = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property)).Sum(s =>
+                    s.PivotCategory.Equals(pivotCategoryValue) ? s.CountInvalidatesRow : 0),
+                Missing = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property))
+                    .Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountMissing : 0),
+                Wrong = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property))
+                    .Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountWrong : 0),
+                DBNull = evaluation.ColumnStates.Where(c => c.TargetProperty.Equals(property))
+                    .Sum(s => s.PivotCategory.Equals(pivotCategoryValue) ? s.CountDBNull : 0),
 
                 Width = panel1.Width,
                 Location = new Point(0, 23 * row++),
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/DQEGraphAnnotationUI.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/DQEGraphAnnotationUI.cs
index 4fba0a47e8..c8163235db 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/DQEGraphAnnotationUI.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/DQEGraphAnnotationUI.cs
@@ -20,17 +20,13 @@ public override bool Equals(object obj)
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((DQEGraphAnnotationUI) obj);
-    }
-    protected bool Equals(DQEGraphAnnotationUI other)
-    {
-        return Equals(_underlyingAnnotationObject, other._underlyingAnnotationObject);
+        return Equals((DQEGraphAnnotationUI)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return _underlyingAnnotationObject.ID.GetHashCode();
-    }
+    protected bool Equals(DQEGraphAnnotationUI other) =>
+        Equals(_underlyingAnnotationObject, other._underlyingAnnotationObject);
+
+    public override int GetHashCode() => _underlyingAnnotationObject.ID.GetHashCode();
 
     public DQEGraphAnnotationUI(DQEGraphAnnotation a, Chart chart)
     {
@@ -62,7 +58,6 @@ public DQEGraphAnnotationUI(DQEGraphAnnotation a, Chart chart)
             AllowSelecting = true,
             Tag = this
         };
-
     }
 
     public void Delete(Chart chart)
@@ -71,6 +66,4 @@ public void Delete(Chart chart)
         chart.Annotations.Remove(Annotation);
         chart.Annotations.Remove(TextAnnotation);
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceBar.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceBar.cs
index 7364e5774e..a59c98d9db 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceBar.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceBar.cs
@@ -20,7 +20,6 @@ public partial class ConsequenceBar : UserControl
     public ConsequenceBar()
     {
         InitializeComponent();
-
     }
 
     internal static Color CorrectColor = Color.Green;
@@ -65,44 +64,46 @@ protected override void OnPaintBackground(PaintEventArgs e)
 
         var totalRecords = Correct + Missing + Invalid + Wrong;
 
-        var heightOfNullsBarStart = (int) (Height * 0.8);
-        var heightOfNullsBar = (int) (Height/5.0);
+        var heightOfNullsBarStart = (int)(Height * 0.8);
+        var heightOfNullsBar = (int)(Height / 5.0);
 
 
         //draw the nulls bar
         var valuesRatio = 1 - DBNull / totalRecords;
-        var midPointOfNullsBar = (int) (valuesRatio*Width);
+        var midPointOfNullsBar = (int)(valuesRatio * Width);
 
         //values
-        e.Graphics.FillRectangle(bValues,new Rectangle(0,heightOfNullsBarStart,midPointOfNullsBar,heightOfNullsBar));
-        e.Graphics.FillRectangle(bNulls,new Rectangle(midPointOfNullsBar,heightOfNullsBarStart,Width-midPointOfNullsBar,heightOfNullsBar));
+        e.Graphics.FillRectangle(bValues,
+            new Rectangle(0, heightOfNullsBarStart, midPointOfNullsBar, heightOfNullsBar));
+        e.Graphics.FillRectangle(bNulls,
+            new Rectangle(midPointOfNullsBar, heightOfNullsBarStart, Width - midPointOfNullsBar, heightOfNullsBar));
 
 
         //draw the main bar
-        var correctRightPoint = (int) (Correct/totalRecords*Width);
+        var correctRightPoint = (int)(Correct / totalRecords * Width);
 
-        var missingWidth = (int) (Missing/totalRecords*Width);
+        var missingWidth = (int)(Missing / totalRecords * Width);
         var missingRightPoint = correctRightPoint + missingWidth;
 
-        var wrongWidth = (int) (Wrong/totalRecords*Width);
-        var wrongRightPoint =  missingRightPoint + wrongWidth;
+        var wrongWidth = (int)(Wrong / totalRecords * Width);
+        var wrongRightPoint = missingRightPoint + wrongWidth;
 
         var invalidWidth = (int)(Invalid / totalRecords * Width);
 
-        e.Graphics.FillRectangle(bCorrect,new Rectangle(0,0,correctRightPoint,heightOfNullsBarStart));
+        e.Graphics.FillRectangle(bCorrect, new Rectangle(0, 0, correctRightPoint, heightOfNullsBarStart));
         e.Graphics.FillRectangle(bMissing, new Rectangle(correctRightPoint, 0, missingWidth, heightOfNullsBarStart));
         e.Graphics.FillRectangle(bWrong, new Rectangle(missingRightPoint, 0, wrongWidth, heightOfNullsBarStart));
         e.Graphics.FillRectangle(bInvalid, new Rectangle(wrongRightPoint, 0, invalidWidth, heightOfNullsBarStart));
 
-        if(!string.IsNullOrWhiteSpace(Label))
+        if (!string.IsNullOrWhiteSpace(Label))
         {
             var rect = e.Graphics.MeasureString(Label, Font);
 
             var textX = 0;
             var textY = 2;
 
-            e.Graphics.FillRectangle(Brushes.LightGray,textX,textY,rect.Width,rect.Height);
-            e.Graphics.DrawString(Label,Font,Brushes.Black,textX,textY);
+            e.Graphics.FillRectangle(Brushes.LightGray, textX, textY, rect.Width, rect.Height);
+            e.Graphics.DrawString(Label, Font, Brushes.Black, textX, textY);
         }
     }
 
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceKey.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceKey.cs
index 0e1c10e44f..2df43308cb 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceKey.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/ConsequenceKey.cs
@@ -27,7 +27,5 @@ public ConsequenceKey()
         lblInvalid.BackColor = ConsequenceBar.InvalidColor;
         lblHasValue.BackColor = ConsequenceBar.HasValuesColor;
         lblIsNull.BackColor = ConsequenceBar.IsNullColor;
-
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/DQEPivotCategorySelector.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/DQEPivotCategorySelector.cs
index 685e01afe3..c0ae15c929 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/DQEPivotCategorySelector.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/DQEPivotCategorySelector.cs
@@ -42,18 +42,17 @@ public void LoadOptions(Evaluation evaluation)
                 Tag = category
             };
 
-            if(rb.Text== "ALL")
-                rb.Checked = true;//always select this one by default first
+            if (rb.Text == "ALL")
+                rb.Checked = true; //always select this one by default first
 
-            rb.CheckedChanged+= OnCheckedChanged;
+            rb.CheckedChanged += OnCheckedChanged;
             flowLayoutPanel1.Controls.Add(rb);
         }
     }
 
     private void OnCheckedChanged(object sender, EventArgs eventArgs)
     {
-        SelectedPivotCategory = (string) ((RadioButton)sender).Tag;
+        SelectedPivotCategory = (string)((RadioButton)sender).Tag;
         PivotCategorySelectionChanged?.Invoke();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/EvaluationTrackBar.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/EvaluationTrackBar.cs
index ce5b27b54c..079a6fb1b2 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/EvaluationTrackBar.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/SubComponents/EvaluationTrackBar.cs
@@ -59,15 +59,18 @@ private void RefreshUI()
             EvaluationSelected(this, Evaluations.Single());
         }
         else
-            Enabled = true;//let user drag around the trackbar if he wants
+        {
+            Enabled = true; //let user drag around the trackbar if he wants
+        }
 
         foreach (var label in labels)
         {
             Controls.Remove(label);
             label.Dispose();
         }
+
         labels.Clear();
-            
+
         //if there is at least 2 evaluations done then we need to have a track bar of evaluations
         tbEvaluation.Minimum = 0;
         tbEvaluation.Maximum = Evaluations.Length - 1;
@@ -77,10 +80,10 @@ private void RefreshUI()
 
         for (var i = 0; i < Evaluations.Length; i++)
         {
-            var ratio = (double)i/(Evaluations.Length-1);
+            var ratio = (double)i / (Evaluations.Length - 1);
 
 
-            var x = tbEvaluation.Left + (int) (ratio * tbEvaluation.Width);
+            var x = tbEvaluation.Left + (int)(ratio * tbEvaluation.Width);
             var y = tbEvaluation.Bottom - 10;
 
             var l = new Label
@@ -93,9 +96,8 @@ private void RefreshUI()
             l.BringToFront();
 
             labels.Add(l);
-
         }
-            
+
         tbEvaluation.Value = tbEvaluation.Maximum;
         EvaluationSelected(this, Evaluations[tbEvaluation.Value]);
     }
@@ -103,7 +105,7 @@ private void RefreshUI()
     private void tbEvaluation_ValueChanged(object sender, EventArgs e)
     {
         if (tbEvaluation.Value >= 0)
-            EvaluationSelected(this,Evaluations[tbEvaluation.Value]);
+            EvaluationSelected(this, Evaluations[tbEvaluation.Value]);
     }
 }
 
diff --git a/Rdmp.UI/CatalogueSummary/DataQualityReporting/TimePeriodicityChart.cs b/Rdmp.UI/CatalogueSummary/DataQualityReporting/TimePeriodicityChart.cs
index 2a85c6dc84..2f75b6341a 100644
--- a/Rdmp.UI/CatalogueSummary/DataQualityReporting/TimePeriodicityChart.cs
+++ b/Rdmp.UI/CatalogueSummary/DataQualityReporting/TimePeriodicityChart.cs
@@ -23,14 +23,14 @@ namespace Rdmp.UI.CatalogueSummary.DataQualityReporting;
 /// validation as a stack chart.  The Data tab will show you the raw counts that power the graph.  See SecondaryConstraintUI for validation configuration and ConsequenceKey for the
 /// meanings of each consequence classification.
 /// </summary>
-public partial class TimePeriodicityChart : RDMPUserControl,IDataQualityReportingChart
+public partial class TimePeriodicityChart : RDMPUserControl, IDataQualityReportingChart
 {
-    private readonly ChartLookAndFeelSetter _chartLookAndFeelSetter =  new();
+    private readonly ChartLookAndFeelSetter _chartLookAndFeelSetter = new();
 
     public TimePeriodicityChart()
     {
         InitializeComponent();
-            
+
         chart1.PaletteCustomColors = new Color[]
         {
             ConsequenceBar.CorrectColor,
@@ -67,7 +67,7 @@ private void GenerateChart(Evaluation evaluation, string pivotCategoryValue)
         chart1.Visible = false;
         var dt = PeriodicityState.GetPeriodicityForDataTableForEvaluation(evaluation, pivotCategoryValue, true);
 
-        if(dt == null)
+        if (dt == null)
         {
             ClearGraph();
             chart1.Visible = true;
@@ -82,23 +82,21 @@ private void GenerateChart(Evaluation evaluation, string pivotCategoryValue)
 
         if (dt.Rows.Count != 0)
             ChartLookAndFeelSetter.PopulateYearMonthChart(chart1, dt, "Data Quality");
-            
+
         chart1.DataBind();
         chart1.Visible = true;
-            
+
         ReGenerateAnnotations();
     }
 
     private void ReGenerateAnnotations()
     {
-
         chart1.Annotations.Clear();
 
         AddUserAnnotations(_currentEvaluation);
 
         if (cbShowGaps.Checked)
             AddGapAnnotations(chart1.DataSource as DataTable);
-
     }
 
     private void AddGapAnnotations(DataTable dt)
@@ -108,12 +106,12 @@ private void AddGapAnnotations(DataTable dt)
 
         foreach (DataRow dr in dt.Rows)
         {
-            var currentBucket = new DateTime((int) dr["Year"],(int) dr["Month"],1);
+            var currentBucket = new DateTime((int)dr["Year"], (int)dr["Month"], 1);
             var diff = currentBucket.Subtract(lastBucket);
 
             bucketNumber++;
 
-            if (lastBucket != DateTime.MinValue && diff.TotalDays >31)
+            if (lastBucket != DateTime.MinValue && diff.TotalDays > 31)
             {
                 //add gap annotation
                 var line = new LineAnnotation
@@ -146,7 +144,7 @@ private void AddGapAnnotations(DataTable dt)
                 chart1.Annotations.Add(text);
             }
 
-            lastBucket = new DateTime((int) dr["Year"],(int) dr["Month"],1);
+            lastBucket = new DateTime((int)dr["Year"], (int)dr["Month"], 1);
         }
     }
 
@@ -155,11 +153,12 @@ private void AddUserAnnotations(Evaluation evaluation)
         //clear old annotations
         chart1.Annotations.Clear();
 
-        var evaluations = evaluation.GetAllDQEGraphAnnotations(_pivotCategoryValue).Where(a => a.AnnotationIsForGraph == DQEGraphType.TimePeriodicityGraph);
-            
+        var evaluations = evaluation.GetAllDQEGraphAnnotations(_pivotCategoryValue)
+            .Where(a => a.AnnotationIsForGraph == DQEGraphType.TimePeriodicityGraph);
+
         foreach (var annotation in evaluations)
         {
-            var a = new DQEGraphAnnotationUI(annotation,chart1);
+            var a = new DQEGraphAnnotationUI(annotation, chart1);
             chart1.Annotations.Add(a.Annotation);
             chart1.Annotations.Add(a.TextAnnotation);
         }
@@ -176,7 +175,7 @@ private void chart1_MouseDown(object sender, MouseEventArgs e)
 
         if (!annotating)
             return;
-            
+
         pointStartX = chart1.ChartAreas[0].AxisX.PixelPositionToValue(e.X);
         pointStartY = chart1.ChartAreas[0].AxisY.PixelPositionToValue(e.Y);
     }
@@ -190,20 +189,19 @@ private void chart1_MouseUp(object sender, MouseEventArgs e)
         var pointEndY = chart1.ChartAreas[0].AxisY.PixelPositionToValue(e.Y);
 
         // don't let them annotate emptiness!
-        if(double.IsNaN(pointEndX) || double.IsNaN(pointEndY))
-        {
-            return;
-        }
+        if (double.IsNaN(pointEndX) || double.IsNaN(pointEndY)) return;
 
         if (Activator.TypeText(new DialogArgs
             {
                 WindowTitle = "Add Annotation",
-                TaskDescription = "Type some annotation text(will be saved to the database for other data analysts to see)",
+                TaskDescription =
+                    "Type some annotation text(will be saved to the database for other data analysts to see)",
                 EntryLabel = "Annotation:"
             }, 500, null, out var result, false))
         {
             //create new annotation in the database
-            new DQEGraphAnnotation(_currentEvaluation.DQERepository,pointStartX, pointStartY, pointEndX, pointEndY, result, _currentEvaluation, DQEGraphType.TimePeriodicityGraph, _pivotCategoryValue);
+            new DQEGraphAnnotation(_currentEvaluation.DQERepository, pointStartX, pointStartY, pointEndX, pointEndY,
+                result, _currentEvaluation, DQEGraphType.TimePeriodicityGraph, _pivotCategoryValue);
 
             //refresh the annotations
             AddUserAnnotations(_currentEvaluation);
@@ -231,23 +229,20 @@ private void btnPointer_Click(object sender, EventArgs e)
 
     private void chart1_KeyUp(object sender, KeyEventArgs e)
     {
-        if(e.KeyCode == Keys.Delete)
+        if (e.KeyCode == Keys.Delete)
             foreach (DQEGraphAnnotationUI ui in
-                     chart1.Annotations.Where(a => a.IsSelected && a.Tag is DQEGraphAnnotationUI) //get the selected ones
+                     chart1.Annotations
+                         .Where(a => a.IsSelected && a.Tag is DQEGraphAnnotationUI) //get the selected ones
                          .Select(t => t.Tag) //get all the appropriately typed annotations
                          .Distinct() //distinct because we get a line and a text for each - works because all .Equals are on ID of underlying object
-                         .ToArray())//use ToArray so we can modify it in for loop
-            {
-                if(Activator.YesNo($"Delete annotation '{ui.TextAnnotation.Text}'", "Confirm deleting annotation from database"))
-                    ui.Delete(chart1);//delete it is what we are actually doing
-            }
+                         .ToArray()) //use ToArray so we can modify it in for loop
+                if (Activator.YesNo($"Delete annotation '{ui.TextAnnotation.Text}'",
+                        "Confirm deleting annotation from database"))
+                    ui.Delete(chart1); //delete it is what we are actually doing
     }
 
     private void cbShowGaps_CheckedChanged(object sender, EventArgs e)
     {
-        if(chart1.DataSource != null)
-        {
-            ReGenerateAnnotations();
-        }
+        if (chart1.DataSource != null) ReGenerateAnnotations();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/DiffDataTables.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/DiffDataTables.cs
index efe8f2aeea..731e96bc2f 100644
--- a/Rdmp.UI/CatalogueSummary/LoadEvents/DiffDataTables.cs
+++ b/Rdmp.UI/CatalogueSummary/LoadEvents/DiffDataTables.cs
@@ -34,11 +34,11 @@ public void PopulateWith(DataTable dt1, DataTable dt2)
 
         foreach (DataColumn col in dt1.Columns)
             dtResult.Columns.Add(col.ColumnName);
-            
-        if(dt1.Columns.Count != dt2.Columns.Count)
+
+        if (dt1.Columns.Count != dt2.Columns.Count)
             throw new NotSupportedException("Exected DataTables to have the same number of columns");
-         
-        if(dt1.Rows.Count != dt2.Rows.Count)
+
+        if (dt1.Rows.Count != dt2.Rows.Count)
             throw new NotSupportedException("Exected DataTables to have the same number of rows");
 
         for (var r = 0; r < dt1.Rows.Count; r++)
@@ -47,19 +47,18 @@ public void PopulateWith(DataTable dt1, DataTable dt2)
 
             for (var c = 0; c < dt1.Columns.Count; c++)
             {
-                var val1 = dt1.Rows[r][c] != null ?dt1.Rows[r][c].ToString():"";
+                var val1 = dt1.Rows[r][c] != null ? dt1.Rows[r][c].ToString() : "";
                 var val2 = dt2.Rows[r][c] != null ? dt2.Rows[r][c].ToString() : "";
 
-                if(val1.Equals(val2))
-                    copyToRow[c] = val1;//regular difference
-                else
-                if (val1.Trim().Equals(val2.Trim()))//whitespace difference
+                if (val1.Equals(val2))
+                    copyToRow[c] = val1; //regular difference
+                else if (val1.Trim().Equals(val2.Trim())) //whitespace difference
                     copyToRow[c] = val1 + WhitespaceDifference;
                 else
                     copyToRow[c] = val1 + DifferenceSymbol + val2;
             }
         }
-            
+
         dataGridView1.DataSource = dtResult;
     }
 
@@ -67,12 +66,11 @@ public void HighlightDiffCells()
     {
         foreach (DataGridViewRow r in dataGridView1.Rows)
         foreach (DataGridViewCell c in r.Cells)
-            if (c.Value != null )
-                if(c.Value.ToString().Contains(DifferenceSymbol))
+            if (c.Value != null)
+                if (c.Value.ToString().Contains(DifferenceSymbol))
                     c.Style.BackColor = Color.PaleGreen;
                 else if (c.Value.ToString().Contains(WhitespaceDifference))
                     c.Style.BackColor = Color.Red;
-
     }
 
     public void Clear()
@@ -82,7 +80,7 @@ public void Clear()
 
     private void dataGridView1_KeyUp(object sender, KeyEventArgs e)
     {
-        if(e.KeyCode == Keys.Escape)
+        if (e.KeyCode == Keys.Escape)
             dataGridView1.ClearSelection();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs
index 5ff22fa27a..233dccab46 100644
--- a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs
+++ b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeView.cs
@@ -36,9 +36,9 @@ namespace Rdmp.UI.CatalogueSummary.LoadEvents;
 /// <para>Right clicking on red error messages will allow you to resolve them into yellow state (error has been investigated and did not result in any serious problems / data integrity loss etc).
 /// This launches the ResolveFatalErrors dialog.  You can resolve multiple errors at the same time by selecting all the errors at once and then right clicking one of them.</para>
 /// </summary>
-public partial class LoadEventsTreeView : RDMPUserControl,IObjectCollectionControl
+public partial class LoadEventsTreeView : RDMPUserControl, IObjectCollectionControl
 {
-    public LoadEventsTreeViewObjectCollection Collection {get;set;}
+    public LoadEventsTreeViewObjectCollection Collection { get; set; }
 
     private BackgroundWorker _populateLoadHistory = new();
     private ArchivalDataLoadInfo[] _populateLoadHistoryResults = Array.Empty<ArchivalDataLoadInfo>();
@@ -51,7 +51,6 @@ public partial class LoadEventsTreeView : RDMPUserControl,IObjectCollectionContr
     private int _toFetch = 1000;
 
 
-
     //constructor
     public LoadEventsTreeView()
     {
@@ -62,7 +61,7 @@ public LoadEventsTreeView()
         _populateLoadHistory.RunWorkerCompleted += _populateLoadHistory_RunWorkerCompleted;
 
         treeView1.CanExpandGetter += CanExpandGetter;
-        treeView1.ChildrenGetter+= ChildrenGetter;
+        treeView1.ChildrenGetter += ChildrenGetter;
         treeView1.FormatRow += treeView1_FormatRow;
         treeView1.UseFiltering = true;
         olvDescription.UseFiltering = true;
@@ -75,10 +74,12 @@ public LoadEventsTreeView()
 
         _btnApplyFilter.Click += (s, e) => ApplyFilter(_tbFilterBox.Text);
         _tbToFetch.TextChanged += TbToFetchTextChanged;
-        _btnFetch.Click += (s,e)=>PopulateLoadHistory();
+        _btnFetch.Click += (s, e) => PopulateLoadHistory();
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(treeView1, olvDescription, new Guid("6b09f39c-2b88-41ed-a396-42a2d2288952"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(treeView1, olvDate, new Guid("d0caf588-cff8-4e49-b755-ed9aaf320f1a"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(treeView1, olvDescription,
+            new Guid("6b09f39c-2b88-41ed-a396-42a2d2288952"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(treeView1, olvDate,
+            new Guid("d0caf588-cff8-4e49-b755-ed9aaf320f1a"));
     }
 
     private void TbToFetchTextChanged(object sender, EventArgs e)
@@ -122,12 +123,11 @@ private static string WithCommas(int? i)
             return @"N\A";
 
         return i.Value.ToString("N0");
-
     }
 
     private object olvDate_AspectGetter(object rowObject)
     {
-        if(rowObject is ArchivalDataLoadInfo adi)
+        if (rowObject is ArchivalDataLoadInfo adi)
             return adi.StartTime;
 
         if (rowObject is LoadEventsTreeView_Category cat)
@@ -141,7 +141,7 @@ private object olvDate_AspectGetter(object rowObject)
 
         if (rowObject is ArchivalProgressLog pr)
             return pr.Date;
-            
+
         throw new NotSupportedException();
     }
 
@@ -163,15 +163,17 @@ private IEnumerable ChildrenGetter(object model)
 
         if (model is ArchivalDataLoadInfo dli)
         {
+            if (dli.Errors.Any())
+                children.Add(new LoadEventsTreeView_Category("Errors",
+                    dli.Errors.OrderByDescending(d => d.Date).ToArray(), LoggingTables.FatalError, dli.ID));
 
-            if(dli.Errors.Any())
-                children.Add(new LoadEventsTreeView_Category("Errors", dli.Errors.OrderByDescending(d=>d.Date).ToArray(), LoggingTables.FatalError, dli.ID));
-
-            if(dli.Progress.Any())
-                children.Add(new LoadEventsTreeView_Category("Progress Messages", dli.Progress.OrderByDescending(d => d.Date).ToArray(),LoggingTables.ProgressLog, dli.ID));
+            if (dli.Progress.Any())
+                children.Add(new LoadEventsTreeView_Category("Progress Messages",
+                    dli.Progress.OrderByDescending(d => d.Date).ToArray(), LoggingTables.ProgressLog, dli.ID));
 
-            if(dli.TableLoadInfos.Any())
-                children.Add(new LoadEventsTreeView_Category("Tables Loaded", dli.TableLoadInfos.OrderByDescending(d => d.Start).ToArray(),LoggingTables.TableLoadRun, dli.ID));
+            if (dli.TableLoadInfos.Any())
+                children.Add(new LoadEventsTreeView_Category("Tables Loaded",
+                    dli.TableLoadInfos.OrderByDescending(d => d.Start).ToArray(), LoggingTables.TableLoadRun, dli.ID));
         }
 
         if (model is LoadEventsTreeView_Category category)
@@ -189,7 +191,7 @@ private class LoadEventsTreeView_Category
         public readonly LoggingTables AssociatedTable;
         public readonly int RunId;
 
-        public LoadEventsTreeView_Category(string name, object[] children,LoggingTables associatedTable,int runId)
+        public LoadEventsTreeView_Category(string name, object[] children, LoggingTables associatedTable, int runId)
         {
             Children = children;
             RunId = runId;
@@ -197,17 +199,14 @@ public LoadEventsTreeView_Category(string name, object[] children,LoggingTables
             AssociatedTable = associatedTable;
         }
 
-        public override string ToString()
-        {
-            return string.Format(_name + " ({0})",Children.Length);
-        }
+        public override string ToString() => string.Format(_name + " ({0})", Children.Length);
     }
 
     private bool CanExpandGetter(object model)
     {
         if (model is ArchivalDataLoadInfo)
             return true;
-            
+
         if (model is LoadEventsTreeView_Category)
             return true;
 
@@ -223,7 +222,7 @@ private void _populateLoadHistory_RunWorkerCompleted(object sender, RunWorkerCom
         if (e.Error != null)
             ExceptionViewer.Show(e.Error);
 
-        if(e.Cancelled)
+        if (e.Cancelled)
         {
             ClearObjects();
             return;
@@ -252,10 +251,11 @@ private void _populateLoadHistory_DoWork(object sender, DoWorkEventArgs e)
             try
             {
                 _logManager = new LogManager(Collection.RootObject.GetDistinctLoggingDatabase());
-                var unfilteredResults = _logManager.GetArchivalDataLoadInfos(Collection.RootObject.GetDistinctLoggingTask(), _populateLoadHistoryCancel.Token,null, _toFetch);
+                var unfilteredResults = _logManager.GetArchivalDataLoadInfos(
+                    Collection.RootObject.GetDistinctLoggingTask(), _populateLoadHistoryCancel.Token, null, _toFetch);
                 results = Collection.RootObject.FilterRuns(unfilteredResults).ToArray();
             }
-            catch (OperationCanceledException)//user cancels
+            catch (OperationCanceledException) //user cancels
             {
                 results = Array.Empty<ArchivalDataLoadInfo>();
             }
@@ -264,7 +264,7 @@ private void _populateLoadHistory_DoWork(object sender, DoWorkEventArgs e)
         }
         catch (Exception exception)
         {
-            CommonFunctionality.Fatal("Failed to populate load history",exception);
+            CommonFunctionality.Fatal("Failed to populate load history", exception);
         }
     }
 
@@ -312,9 +312,8 @@ private void llLoading_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 
     public void ApplyFilter(string filter)
     {
-        treeView1.ModelFilter = new TextMatchFilter(treeView1, filter,StringComparison.CurrentCultureIgnoreCase);
+        treeView1.ModelFilter = new TextMatchFilter(treeView1, filter, StringComparison.CurrentCultureIgnoreCase);
         treeView1.UseFiltering = !string.IsNullOrWhiteSpace(filter);
-            
     }
 
     private void treeView1_ColumnRightClick(object sender, CellRightClickEventArgs e)
@@ -324,20 +323,23 @@ private void treeView1_ColumnRightClick(object sender, CellRightClickEventArgs e
 
         if (e.Model is LoadEventsTreeView_Category category)
         {
-            var cmd = new ExecuteCommandViewLogs(Activator, new LogViewerFilter(category.AssociatedTable) { Run = category.RunId });
+            var cmd = new ExecuteCommandViewLogs(Activator,
+                new LogViewerFilter(category.AssociatedTable) { Run = category.RunId });
             RightClickMenu.Items.Add(new AtomicCommandMenuItem(cmd, Activator));
         }
 
         if (e.Model is ArchivalTableLoadInfo tli && Collection?.RootObject is LoadMetadata lmd)
-        {
             //if it is not a freaky temp table
             if (!tli.TargetTable.EndsWith("_STAGING") && !tli.TargetTable.EndsWith("_RAW"))
             {
-                var mi = new ToolStripMenuItem("View Inserts/Updates", null, (a, b) => new ViewInsertsAndUpdatesDialog(tli, lmd.GetDistinctTableInfoList(true)).Show());
+                var mi = new ToolStripMenuItem("View Inserts/Updates", null,
+                    (a, b) => new ViewInsertsAndUpdatesDialog(tli, lmd.GetDistinctTableInfoList(true)).Show());
 
                 //if there are inserts/updates
-                if( tli.Inserts > 0 || tli.Updates > 0 )
+                if (tli.Inserts > 0 || tli.Updates > 0)
+                {
                     mi.Enabled = true;
+                }
                 else
                 {
                     mi.Enabled = false;
@@ -346,19 +348,18 @@ private void treeView1_ColumnRightClick(object sender, CellRightClickEventArgs e
 
                 RightClickMenu.Items.Add(mi);
             }
-        }
 
         if (e.Model is ArchivalFatalError fatalError && _logManager != null)
         {
             var toResolve = treeView1.SelectedObjects.OfType<ArchivalFatalError>().ToArray();
             RightClickMenu.Items.Add("Resolve Fatal Error(s)", null, (a, b) =>
             {
-                var resolve = new ResolveFatalErrors(Activator,_logManager, toResolve);
+                var resolve = new ResolveFatalErrors(Activator, _logManager, toResolve);
                 resolve.ShowDialog();
                 treeView1.RefreshObjects(toResolve);
             });
         }
-            
+
         if (RightClickMenu.Items.Count > 0)
             e.MenuStrip = RightClickMenu;
     }
@@ -371,19 +372,18 @@ public void ExpandAll()
     private void treeView1_ItemActivate(object sender, EventArgs e)
     {
         var o = treeView1.SelectedObject;
-            
+
         if (o == null)
             return;
-            
-        if(o is ArchivalDataLoadInfo dli)
-            new ExecuteCommandViewLogs(Activator,new LogViewerFilter(LoggingTables.DataLoadRun){Run = dli.ID}).Execute();
-        else
-        if (o is LoadEventsTreeView_Category cat)
-            new ExecuteCommandViewLogs(Activator,  new LogViewerFilter(cat.AssociatedTable) { Run = cat.RunId}).Execute();
-        else
-        if(o is IHasSummary s)
+
+        if (o is ArchivalDataLoadInfo dli)
+            new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.DataLoadRun) { Run = dli.ID })
+                .Execute();
+        else if (o is LoadEventsTreeView_Category cat)
+            new ExecuteCommandViewLogs(Activator, new LogViewerFilter(cat.AssociatedTable) { Run = cat.RunId })
+                .Execute();
+        else if (o is IHasSummary s)
             WideMessageBox.Show(s);
-            
     }
 
     private void treeView1_KeyUp(object sender, KeyEventArgs e)
@@ -400,26 +400,15 @@ private void treeView1_KeyUp(object sender, KeyEventArgs e)
             //We manually implement this here because the default TreeView will only copy 340? characters... very weird but hey Windows Forms
             if (sb.Length != 0)
                 Clipboard.SetText(sb.ToString());
-
         }
     }
 
 
+    public IPersistableObjectCollection GetCollection() => Collection;
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return Collection;
-    }
+    public string GetTabName() => $"Logs:{Collection?.RootObject}";
 
-    public string GetTabName()
-    {
-        return $"Logs:{Collection?.RootObject}";
-    }
-
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
@@ -431,7 +420,8 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
 
         Collection = (LoadEventsTreeViewObjectCollection)collection;
 
-        RDMPCollectionCommonFunctionality.SetupColumnSortTracking(treeView1, new Guid("ccbea22e-a784-4968-a127-7c3a55b6d281"));
+        RDMPCollectionCommonFunctionality.SetupColumnSortTracking(treeView1,
+            new Guid("ccbea22e-a784-4968-a127-7c3a55b6d281"));
 
         CommonFunctionality.ClearToolStrip();
 
diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeViewObjectCollection.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeViewObjectCollection.cs
index b1bd15800a..292e69f02b 100644
--- a/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeViewObjectCollection.cs
+++ b/Rdmp.UI/CatalogueSummary/LoadEvents/LoadEventsTreeViewObjectCollection.cs
@@ -21,14 +21,14 @@ public class LoadEventsTreeViewObjectCollection : PersistableObjectCollection
 
     public LoadEventsTreeViewObjectCollection()
     {
-
     }
+
     public LoadEventsTreeViewObjectCollection(ILoggedActivityRootObject rootObject)
     {
-        if(rootObject is not DatabaseEntity de)
-            throw new ArgumentException("rootObject ILoggedActivityRootObject must be a DatabaseEntity (to ensure persistence works)");
+        if (rootObject is not DatabaseEntity de)
+            throw new ArgumentException(
+                "rootObject ILoggedActivityRootObject must be a DatabaseEntity (to ensure persistence works)");
 
         DatabaseObjects.Add(de);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/ResolveFatalErrors.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/ResolveFatalErrors.cs
index a0c80ae72c..ef84a0f69f 100644
--- a/Rdmp.UI/CatalogueSummary/LoadEvents/ResolveFatalErrors.cs
+++ b/Rdmp.UI/CatalogueSummary/LoadEvents/ResolveFatalErrors.cs
@@ -30,13 +30,15 @@ public partial class ResolveFatalErrors : RDMPForm
     private readonly ArchivalFatalError[] _toResolve;
     public Scintilla Explanation { get; set; }
 
-    public ResolveFatalErrors(IActivateItems activator,LogManager logManager, ArchivalFatalError[] toResolve):base(activator)
+    public ResolveFatalErrors(IActivateItems activator, LogManager logManager, ArchivalFatalError[] toResolve) :
+        base(activator)
     {
         _logManager = logManager;
         _toResolve = toResolve;
         InitializeComponent();
 
-        if (VisualStudioDesignMode || logManager == null) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
+        if (VisualStudioDesignMode ||
+            logManager == null) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
             return;
 
         Explanation = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory());
@@ -53,19 +55,17 @@ public ResolveFatalErrors(IActivateItems activator,LogManager logManager, Archiv
     private void btnSaveAndClose_Click(object sender, EventArgs e)
     {
         var newState = DataLoadInfo.FatalErrorStates.Resolved;
-            
+
         if (string.IsNullOrEmpty(Explanation.Text))
-            Explanation.Text = "No Explanation"; 
+            Explanation.Text = "No Explanation";
 
         //resolve it in the database
         _logManager.ResolveFatalErrors(_toResolve.Select(f => f.ID).ToArray(), newState, Explanation.Text);
-            
+
         //resolve it in memory
         foreach (var error in _toResolve)
             error.Explanation = Explanation.Text;
 
         Close();
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CatalogueSummary/LoadEvents/ViewInsertsAndUpdatesDialog.cs b/Rdmp.UI/CatalogueSummary/LoadEvents/ViewInsertsAndUpdatesDialog.cs
index d3855920c7..8c322e43be 100644
--- a/Rdmp.UI/CatalogueSummary/LoadEvents/ViewInsertsAndUpdatesDialog.cs
+++ b/Rdmp.UI/CatalogueSummary/LoadEvents/ViewInsertsAndUpdatesDialog.cs
@@ -31,7 +31,6 @@ namespace Rdmp.UI.CatalogueSummary.LoadEvents;
 /// </summary>
 public partial class ViewInsertsAndUpdatesDialog : Form, ICheckNotifier
 {
-        
     private int _dataLoadRunID;
     private TableInfo _toInterrogate;
     private int _batchSizeToGet;
@@ -39,16 +38,15 @@ public partial class ViewInsertsAndUpdatesDialog : Form, ICheckNotifier
 
     public ViewInsertsAndUpdatesDialog(ArchivalTableLoadInfo toAttemptToDisplay, List<TableInfo> potentialTableInfos)
     {
-            
         InitializeComponent();
 
         if (toAttemptToDisplay == null)
             return;
-            
+
         _dataLoadRunID = toAttemptToDisplay.Parent.ID;
-        _toInterrogate = GetTableInfoFromConstructorArguments(toAttemptToDisplay, potentialTableInfos,checksUI1);
+        _toInterrogate = GetTableInfoFromConstructorArguments(toAttemptToDisplay, potentialTableInfos, checksUI1);
         tbBatchSizeToGet.Text = "20";
-        _batchSizeToGet = 20;//technically redundant since text changed will fire but nvm
+        _batchSizeToGet = 20; //technically redundant since text changed will fire but nvm
         tbTimeout.Text = "30";
         _timeout = 30;
 
@@ -68,7 +66,7 @@ private void tbBatchSizeToGet_TextChanged(object sender, EventArgs e)
             tbBatchSizeToGet.ForeColor = Color.Red;
         }
     }
-        
+
     private void tbTimeout_TextChanged(object sender, EventArgs e)
     {
         try
@@ -88,7 +86,7 @@ private void btnFetchData_Click(object sender, EventArgs e)
     {
         fetchDataResultedInNoErrors = true;
         var fetcher = new DiffDatabaseDataFetcher(_batchSizeToGet, _toInterrogate, _dataLoadRunID, _timeout);
-            
+
         fetcher.FetchData(this);
 
         dgInserts.DataSource = fetcher.Inserts;
@@ -96,52 +94,60 @@ private void btnFetchData_Click(object sender, EventArgs e)
         if (fetcher.Updates_New == null || fetcher.Updates_Replaced == null)
             diffDataTables1.Clear();
         else
-            diffDataTables1.PopulateWith(fetcher.Updates_New,fetcher.Updates_Replaced);
+            diffDataTables1.PopulateWith(fetcher.Updates_New, fetcher.Updates_Replaced);
 
         //if user is already viewing the updates we will need to re-highlight
         if (tabControl1.SelectedTab == tpViewUpdates)
             diffDataTables1.HighlightDiffCells();
 
         //we didn't see any errors so probably everything was fine
-        if(fetchDataResultedInNoErrors)
-            WideMessageBox.Show("Data Ready","Data ready for you to view in the Inserts / Updates tabs",WideMessageBoxTheme.Help);
-
+        if (fetchDataResultedInNoErrors)
+            WideMessageBox.Show("Data Ready", "Data ready for you to view in the Inserts / Updates tabs",
+                WideMessageBoxTheme.Help);
     }
 
 
-    private static TableInfo GetTableInfoFromConstructorArguments(ArchivalTableLoadInfo toAttemptToDisplay, List<TableInfo> potentialTableInfos, ICheckNotifier checkNotifier)
+    private static TableInfo GetTableInfoFromConstructorArguments(ArchivalTableLoadInfo toAttemptToDisplay,
+        List<TableInfo> potentialTableInfos, ICheckNotifier checkNotifier)
     {
         checkNotifier.OnCheckPerformed(new CheckEventArgs(
-            $"Table user is attempting to view updates/inserts for is called {toAttemptToDisplay.TargetTable}", CheckResult.Success));
-            
-        if(potentialTableInfos.Count == 0)
+            $"Table user is attempting to view updates/inserts for is called {toAttemptToDisplay.TargetTable}",
+            CheckResult.Success));
+
+        if (potentialTableInfos.Count == 0)
             throw new Exception("No potential tables were found");
-            
-        if(potentialTableInfos.Select(t=>t.DatabaseType).Distinct().Count() > 1)
-            throw new Exception($"Tables found were from different DBMS Types: {string.Join(",",potentialTableInfos.Select(t=>t.DatabaseType).Distinct())}");
+
+        if (potentialTableInfos.Select(t => t.DatabaseType).Distinct().Count() > 1)
+            throw new Exception(
+                $"Tables found were from different DBMS Types: {string.Join(",", potentialTableInfos.Select(t => t.DatabaseType).Distinct())}");
 
         var syntax = potentialTableInfos.First().GetQuerySyntaxHelper();
 
         var runtimeName = syntax.GetRuntimeName(toAttemptToDisplay.TargetTable);
 
-        checkNotifier.OnCheckPerformed(new CheckEventArgs($"The runtime name of the table is {runtimeName}", CheckResult.Success));
+        checkNotifier.OnCheckPerformed(new CheckEventArgs($"The runtime name of the table is {runtimeName}",
+            CheckResult.Success));
 
         checkNotifier.OnCheckPerformed(
             new CheckEventArgs(
-                $"The following TableInfos were given to us to pick from {string.Join(",", potentialTableInfos)}", CheckResult.Success));
+                $"The following TableInfos were given to us to pick from {string.Join(",", potentialTableInfos)}",
+                CheckResult.Success));
 
         var candidates = potentialTableInfos.Where(t => t.GetRuntimeName().Equals(runtimeName)).ToArray();
 
         if (!candidates.Any())
         {
-            checkNotifier.OnCheckPerformed(new CheckEventArgs("Could not find an appropriate TableInfo from those mentioned above", CheckResult.Fail));
+            checkNotifier.OnCheckPerformed(
+                new CheckEventArgs("Could not find an appropriate TableInfo from those mentioned above",
+                    CheckResult.Fail));
             return null;
         }
 
         if (candidates.Length > 1)
         {
             checkNotifier.OnCheckPerformed(new CheckEventArgs(
-                $"Found multiple TableInfos (mentioned above) with the runtime name {runtimeName} I don't know which one you want to view", CheckResult.Fail));
+                $"Found multiple TableInfos (mentioned above) with the runtime name {runtimeName} I don't know which one you want to view",
+                CheckResult.Fail));
             return null;
         }
 
@@ -161,7 +167,8 @@ public bool OnCheckPerformed(CheckEventArgs args)
                 return true;
 
             //we will handle this one instead of the checksui
-            var window = new SQLPreviewWindow("Send Query?","The following query is about to be submitted:",args.ProposedFix);
+            var window = new SQLPreviewWindow("Send Query?", "The following query is about to be submitted:",
+                args.ProposedFix);
             try
             {
                 return window.ShowDialog() == DialogResult.OK;
@@ -173,15 +180,14 @@ public bool OnCheckPerformed(CheckEventArgs args)
         }
 
         if (args.Result == CheckResult.Fail)
-            fetchDataResultedInNoErrors = false;//don't tell them everything was fine because it wasn't
+            fetchDataResultedInNoErrors = false; //don't tell them everything was fine because it wasn't
 
         return checksUI1.OnCheckPerformed(args);
     }
 
     private void tabControl1_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(tabControl1.SelectedTab == tpViewUpdates)
+        if (tabControl1.SelectedTab == tpViewUpdates)
             diffDataTables1.HighlightDiffCells();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ChartLookAndFeelSetter.cs b/Rdmp.UI/ChartLookAndFeelSetter.cs
index 392627d060..fa7001752d 100644
--- a/Rdmp.UI/ChartLookAndFeelSetter.cs
+++ b/Rdmp.UI/ChartLookAndFeelSetter.cs
@@ -28,8 +28,9 @@ public class ChartLookAndFeelSetter
     /// <param name="yAxisTitle"></param>
     public static void PopulateYearMonthChart(Chart chart, DataTable dt, string yAxisTitle)
     {
-        if(dt.Columns[0].ColumnName != "YearMonth")
-            throw new ArgumentException("Expected a graph with a first column YearMonth containing values expressed as YYYY-MM");
+        if (dt.Columns[0].ColumnName != "YearMonth")
+            throw new ArgumentException(
+                "Expected a graph with a first column YearMonth containing values expressed as YYYY-MM");
 
         chart.DataSource = dt;
         chart.Annotations.Clear();
@@ -106,7 +107,6 @@ public static void PopulateYearMonthChart(Chart chart, DataTable dt, string yAxi
         chart.ChartAreas[0].BackColor = Color.White;
         chart.ChartAreas[0].BackSecondaryColor = Color.FromArgb(255, 230, 230, 230);
         chart.ChartAreas[0].BackGradientStyle = GradientStyle.DiagonalRight;
-
     }
 
     /// <summary>
@@ -118,7 +118,7 @@ private static int GetOffset(string yearMonth)
     {
         var matchMonthName = Regex.Match(yearMonth, @"\d+-([A-Za-z]+)");
 
-        if(matchMonthName.Success)
+        if (matchMonthName.Success)
         {
             var monthName = matchMonthName.Groups[1].Value;
             return DateTime.ParseExact(monthName, "MMMM", CultureInfo.CurrentCulture).Month;
diff --git a/Rdmp.UI/ChecksUI/AllChecksCompleteHandlerArgs.cs b/Rdmp.UI/ChecksUI/AllChecksCompleteHandlerArgs.cs
index b09ed0c637..6e23170113 100644
--- a/Rdmp.UI/ChecksUI/AllChecksCompleteHandlerArgs.cs
+++ b/Rdmp.UI/ChecksUI/AllChecksCompleteHandlerArgs.cs
@@ -12,7 +12,7 @@ namespace Rdmp.UI.ChecksUI;
 /// <summary>
 /// Event arguments for when a <see cref="ICheckable"/> UI finishes checking an object.
 /// </summary>
-public class AllChecksCompleteHandlerArgs: EventArgs
+public class AllChecksCompleteHandlerArgs : EventArgs
 {
     public ToMemoryCheckNotifier CheckResults { get; private set; }
 
diff --git a/Rdmp.UI/ChecksUI/ChecksUI.cs b/Rdmp.UI/ChecksUI/ChecksUI.cs
index b37451baa3..7ca79141d7 100644
--- a/Rdmp.UI/ChecksUI/ChecksUI.cs
+++ b/Rdmp.UI/ChecksUI/ChecksUI.cs
@@ -34,7 +34,7 @@ namespace Rdmp.UI.ChecksUI;
 /// 
 /// <para>Typing into the Filter lets you filter by message text.</para>
 /// </summary>
-public partial  class ChecksUI : UserControl, ICheckNotifier
+public partial class ChecksUI : UserControl, ICheckNotifier
 {
     private Bitmap _tick;
     private Bitmap _warning;
@@ -71,9 +71,12 @@ public ChecksUI()
 
         if (!UserSettings.AutoResizeColumns)
         {
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvMessage, new Guid("5d62580d-2bee-420b-ab43-f40317769514"));
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvResult, new Guid("18b26ae1-c35d-4e73-9dc5-88f15910c1f9"));
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvEventDate, new Guid("28c13822-b4c0-4fa5-b20d-af612b076716"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvMessage,
+                new Guid("5d62580d-2bee-420b-ab43-f40317769514"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvResult,
+                new Guid("18b26ae1-c35d-4e73-9dc5-88f15910c1f9"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvChecks, olvEventDate,
+                new Guid("28c13822-b4c0-4fa5-b20d-af612b076716"));
         }
     }
 
@@ -86,7 +89,7 @@ private void _timer_Tick(object sender, EventArgs e)
             return;
         }
 
-        if(outOfDate)
+        if (outOfDate)
         {
             olvChecks.ClearObjects();
             olvChecks.AddObjects(_results);
@@ -98,7 +101,7 @@ private void _timer_Tick(object sender, EventArgs e)
 
     private void AutoResizeColumns()
     {
-        if(UserSettings.AutoResizeColumns)
+        if (UserSettings.AutoResizeColumns)
         {
             olvResult.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
             olvEventDate.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
@@ -134,16 +137,15 @@ protected override void OnLoad(EventArgs e)
 
         yesNoYesToAllDialog = new YesNoYesToAllDialog();
     }
-    public void StartChecking(ICheckable rootCheckable, bool bClearUI =true)
+
+    public void StartChecking(ICheckable rootCheckable, bool bClearUI = true)
     {
-        if(bClearUI)
-        {
-            yesNoYesToAllDialog = new YesNoYesToAllDialog();
-        }
+        if (bClearUI) yesNoYesToAllDialog = new YesNoYesToAllDialog();
 
         if (CheckingInProgress)
         {
-            MessageBox.Show("Checking already in progress, please wait for current checks to complete before requesting more");
+            MessageBox.Show(
+                "Checking already in progress, please wait for current checks to complete before requesting more");
             return;
         }
 
@@ -153,7 +155,7 @@ public void StartChecking(ICheckable rootCheckable, bool bClearUI =true)
         CheckingInProgress = true;
         btnAbortChecking.Enabled = true;
         var listener = new ToMemoryCheckNotifier(this);
-            
+
         _checkingThread = new Thread(() =>
         {
             try
@@ -163,7 +165,6 @@ public void StartChecking(ICheckable rootCheckable, bool bClearUI =true)
             }
             catch (Exception e)
             {
-
                 listener.OnCheckPerformed(new CheckEventArgs("Entire checking process crashed", CheckResult.Fail, e));
                 CheckingInProgress = false;
 
@@ -175,12 +176,12 @@ public void StartChecking(ICheckable rootCheckable, bool bClearUI =true)
 
     private void checker_AllChecksFinished(ToMemoryCheckNotifier listener)
     {
-        _results.Add(new CheckEventArgs("All Checks Complete",CheckResult.Success));
+        _results.Add(new CheckEventArgs("All Checks Complete", CheckResult.Success));
         outOfDate = true;
-            
+
         CheckingInProgress = false;
 
-        AllChecksComplete?.Invoke(this,new AllChecksCompleteHandlerArgs(listener));
+        AllChecksComplete?.Invoke(this, new AllChecksCompleteHandlerArgs(listener));
     }
 
 
@@ -219,12 +220,12 @@ private bool DoesUserWantToApplyFix(CheckEventArgs args)
     private void AddToListbox(CheckEventArgs args)
     {
         _results.Add(args);
-        outOfDate = true; 
+        outOfDate = true;
     }
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
-        olvChecks.ModelFilter = new TextMatchFilter(olvChecks,tbFilter.Text);
+        olvChecks.ModelFilter = new TextMatchFilter(olvChecks, tbFilter.Text);
     }
 
     public void Clear()
@@ -240,7 +241,7 @@ private void olvChecks_ItemActivate(object sender, EventArgs e)
             if (args.Ex != null)
                 ExceptionViewer.Show(args.Message, args.Ex);
             else
-                WideMessageBox.Show(args,false);
+                WideMessageBox.Show(args, false);
     }
 
     public void TerminateWithExtremePrejudice()
diff --git a/Rdmp.UI/ChecksUI/MakeChangePopup.cs b/Rdmp.UI/ChecksUI/MakeChangePopup.cs
index 3e2d53cb75..06d33d3020 100644
--- a/Rdmp.UI/ChecksUI/MakeChangePopup.cs
+++ b/Rdmp.UI/ChecksUI/MakeChangePopup.cs
@@ -16,7 +16,7 @@ namespace Rdmp.UI.ChecksUI;
 /// Yes/No dialog for handling <see cref="CheckEventArgs.ProposedFix"/>.  Describes the fix and prompts the user for a response.  Includes
 /// support for Yes to All.
 /// </summary>
-public class MakeChangePopup:ICheckNotifier
+public class MakeChangePopup : ICheckNotifier
 {
     private readonly YesNoYesToAllDialog _dialog;
 
@@ -44,14 +44,13 @@ public bool OnCheckPerformed(CheckEventArgs args)
     {
         //if there is a fix suggest it to the user
         if (args.ProposedFix != null)
-            return ShowYesNoMessageBoxToApplyFix(_dialog,args.Message, args.ProposedFix);
-            
+            return ShowYesNoMessageBoxToApplyFix(_dialog, args.Message, args.ProposedFix);
+
         //else show an Exception
-        if(args.Ex != null)
+        if (args.Ex != null)
             ExceptionViewer.Show(args.Ex);
-        else
-        if(args.Result == CheckResult.Fail)
-            WideMessageBox.Show(args.Message,"",environmentDotStackTrace: Environment.StackTrace);
+        else if (args.Result == CheckResult.Fail)
+            WideMessageBox.Show(args.Message, "", Environment.StackTrace);
 
         return false;
     }
diff --git a/Rdmp.UI/ChecksUI/PopupChecksUI.cs b/Rdmp.UI/ChecksUI/PopupChecksUI.cs
index b4a8041aea..2e5389af87 100644
--- a/Rdmp.UI/ChecksUI/PopupChecksUI.cs
+++ b/Rdmp.UI/ChecksUI/PopupChecksUI.cs
@@ -13,7 +13,7 @@ namespace Rdmp.UI.ChecksUI;
 /// <summary>
 /// Popup dialog version of ChecksUI, See ChecksUI for description of functionality.
 /// </summary>
-public partial class PopupChecksUI : Form,ICheckNotifier
+public partial class PopupChecksUI : Form, ICheckNotifier
 {
     public event EventHandler<AllChecksCompleteHandlerArgs> AllChecksComplete;
 
@@ -28,7 +28,9 @@ public PopupChecksUI(string task, bool showOnlyWhenError)
             haveDemandedVisibility = true;
         }
         else
+        {
             CreateHandle(); //let windows get a handle on the situation ;)
+        }
 
         KeyPreview = true;
     }
@@ -52,8 +54,8 @@ public bool OnCheckPerformed(CheckEventArgs args)
         if (_worstSeen < args.Result)
             _worstSeen = args.Result;
 
-        if(args.Result == CheckResult.Fail || args.Result == CheckResult.Warning)
-            if(!haveDemandedVisibility)
+        if (args.Result == CheckResult.Fail || args.Result == CheckResult.Warning)
+            if (!haveDemandedVisibility)
             {
                 haveDemandedVisibility = true;
                 Invoke(new MethodInvoker(Show));
@@ -89,8 +91,5 @@ public void StartChecking(ICheckable checkable)
         checksUI1.StartChecking(checkable);
     }
 
-    public CheckResult GetWorst()
-    {
-        return _worstSeen;
-    }
+    public CheckResult GetWorst() => _worstSeen;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ChecksUI/RAGSmiley.cs b/Rdmp.UI/ChecksUI/RAGSmiley.cs
index 00d79168b2..39063448b3 100644
--- a/Rdmp.UI/ChecksUI/RAGSmiley.cs
+++ b/Rdmp.UI/ChecksUI/RAGSmiley.cs
@@ -29,22 +29,15 @@ public bool AlwaysShowHandCursor
         }
     }
 
-    public bool IsGreen()
-    {
-        return pbGreen.Visible;
-    }
+    public bool IsGreen() => pbGreen.Visible;
 
-    public bool IsFatal()
-    {
-        return pbRed.Visible;
-    }
+    public bool IsFatal() => pbRed.Visible;
 
     private void SetCorrectCursor()
     {
         if (AlwaysShowHandCursor || memoryCheckNotifier.Messages.Any())
             Cursor = Cursors.Hand;
-        else
-        if (pbYellow.Tag != null || pbRed.Tag != null)
+        else if (pbYellow.Tag != null || pbRed.Tag != null)
             Cursor = Cursors.Hand;
         else
             Cursor = Cursors.Arrow;
@@ -55,7 +48,7 @@ public RAGSmiley()
         InitializeComponent();
 
         BackColor = Color.Transparent;
-            
+
         pbGreen.Visible = true;
         pbYellow.Visible = false;
         pbRed.Visible = false;
@@ -70,15 +63,14 @@ public RAGSmiley()
 
     private void Timer_Tick(object sender, EventArgs e)
     {
-
-        if(IsDisposed)
+        if (IsDisposed)
         {
             _timer.Stop();
             _timer.Dispose();
             return;
         }
 
-        switch(_state)
+        switch (_state)
         {
             case CheckResult.Success:
                 pbGreen.Visible = true;
@@ -116,7 +108,7 @@ private void Timer_Tick(object sender, EventArgs e)
     protected override void OnEnabledChanged(EventArgs e)
     {
         base.OnEnabledChanged(e);
-            
+
         pbGrey.Visible = !Enabled;
     }
 
@@ -128,24 +120,22 @@ public void ShowMessagesIfAny()
     private void pb_Click(object sender, EventArgs e)
     {
         var tag = ((Control)sender).Tag as Exception ?? _exception;
-            
+
         if (PopupMessagesIfAny(tag))
             return;
 
-        if(tag != null)
+        if (tag != null)
             ExceptionViewer.Show(tag);
     }
 
     public void Warning(Exception ex)
     {
-        if(_state == CheckResult.Fail)
-        {
-            return;
-        }    
+        if (_state == CheckResult.Fail) return;
 
         _state = CheckResult.Warning;
         _exception = ex;
     }
+
     public void Fatal(Exception ex)
     {
         _state = CheckResult.Fail;
@@ -168,16 +158,13 @@ public void Reset()
     private Exception _exception;
 
     public bool OnCheckPerformed(CheckEventArgs args)
-    {            
+    {
         //record in memory
         memoryCheckNotifier.OnCheckPerformed(args);
 
         ElevateState(args.Result);
 
-        if(args.Ex!= null)
-        {
-            _exception = args.Ex;
-        }
+        if (args.Ex != null) _exception = args.Ex;
 
         return false;
     }
@@ -206,7 +193,7 @@ private bool PopupMessagesIfAny(Exception tag)
             var popup = new PopupChecksUI("Record of events", false);
             new ReplayCheckable(memoryCheckNotifier).Check(popup);
 
-            if(tag != null)
+            if (tag != null)
                 popup.OnCheckPerformed(new CheckEventArgs(tag.Message, CheckResult.Fail, tag));
             return true;
         }
@@ -219,9 +206,10 @@ public void SetVisible(bool visible)
     {
         if (InvokeRequired)
         {
-            Invoke(new MethodInvoker(()=> SetVisible(visible)));
+            Invoke(new MethodInvoker(() => SetVisible(visible)));
             return;
         }
+
         BringToFront();
         Visible = visible;
     }
@@ -230,7 +218,6 @@ public void StartChecking(ICheckable checkable)
     {
         lock (oTaskLock)
         {
-
             //if there is already a Task and it has not completed
             if (_checkTask != null && !_checkTask.IsCompleted)
                 return;
@@ -245,7 +232,7 @@ public void StartChecking(ICheckable checkable)
                     }
                     catch (Exception ex)
                     {
-                        Fatal(new Exception("Entire Checking Process Failed",ex));
+                        Fatal(new Exception("Entire Checking Process Failed", ex));
                     }
                 }
             );
diff --git a/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs b/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs
index 45d0683cb5..ebca58c438 100644
--- a/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs
+++ b/Rdmp.UI/ChecksUI/RAGSmileyToolStrip.cs
@@ -16,7 +16,7 @@
 namespace Rdmp.UI.ChecksUI;
 
 /// <inheritdoc cref="IRAGSmiley" />
-public partial class RAGSmileyToolStrip : ToolStripButton,  IRAGSmiley
+public partial class RAGSmileyToolStrip : ToolStripButton, IRAGSmiley
 {
     private readonly Control _host;
     private CheckResult _worst;
@@ -43,7 +43,7 @@ public RAGSmileyToolStrip(Control host)
 
     private void T_Tick(object sender, EventArgs e)
     {
-        if(IsDisposed)
+        if (IsDisposed)
         {
             timer.Stop();
             timer.Dispose();
@@ -75,20 +75,11 @@ private void T_Tick(object sender, EventArgs e)
         }
     }
 
-    public bool IsGreen()
-    {
-        return _worst == CheckResult.Success;
-    }
+    public bool IsGreen() => _worst == CheckResult.Success;
 
-    public bool IsWarning()
-    {
-        return _worst == CheckResult.Warning;
-    }
+    public bool IsWarning() => _worst == CheckResult.Warning;
 
-    public bool IsFatal()
-    {
-        return _worst == CheckResult.Fail;
-    }
+    public bool IsFatal() => _worst == CheckResult.Fail;
 
     private Bitmap _green = Images.TinyGreen.ImageToBitmap();
     private Bitmap _yellow = Images.TinyYellow.ImageToBitmap();
@@ -113,7 +104,7 @@ protected override void OnClick(EventArgs e)
     }
 
     public void Warning(Exception ex)
-    {            
+    {
         if (IsFatal())
             return;
 
@@ -129,7 +120,7 @@ public void Fatal(Exception ex)
     }
 
     public void Reset()
-    {            
+    {
         //reset the checks too so as not to leave old check results kicking about
         memoryCheckNotifier = new ToMemoryCheckNotifier();
         _worst = CheckResult.Success;
@@ -137,21 +128,21 @@ public void Reset()
     }
 
     public bool OnCheckPerformed(CheckEventArgs args)
-    {            
+    {
         //record in memory
         memoryCheckNotifier.OnCheckPerformed(args);
-            
+
 
         if (dialog != null)
-        {
-            if(!string.IsNullOrWhiteSpace(args.ProposedFix))
-                if (dialog.ShowDialog($"Problem:{args.Message}\r\n\r\nFix:{args.ProposedFix}", "Apply Fix?") == DialogResult.Yes)
+            if (!string.IsNullOrWhiteSpace(args.ProposedFix))
+                if (dialog.ShowDialog($"Problem:{args.Message}\r\n\r\nFix:{args.ProposedFix}", "Apply Fix?") ==
+                    DialogResult.Yes)
                 {
                     ElevateState(CheckResult.Warning);
-                    memoryCheckNotifier.OnCheckPerformed(new CheckEventArgs("Fix will be applied",CheckResult.Warning));
+                    memoryCheckNotifier.OnCheckPerformed(new CheckEventArgs("Fix will be applied",
+                        CheckResult.Warning));
                     return true;
                 }
-        }
 
         ElevateState(args.Result);
 
@@ -186,7 +177,7 @@ private bool PopupMessagesIfAny(Exception tag)
             new ReplayCheckable(memoryCheckNotifier).Check(popup);
 
             //if we have a tagged Exception that isn't included in the ToMemoryCheckNotifier we should show the user that one too
-            if (tag != null && memoryCheckNotifier.Messages.All(m=>m.Ex != tag))
+            if (tag != null && memoryCheckNotifier.Messages.All(m => m.Ex != tag))
                 popup.OnCheckPerformed(new CheckEventArgs(tag.Message, CheckResult.Fail, tag));
 
             return true;
@@ -199,7 +190,6 @@ public void StartChecking(ICheckable checkable)
     {
         lock (oTaskLock)
         {
-
             //if there is already a Task and it has not completed
             if (_checkTask != null && !_checkTask.IsCompleted)
                 return;
diff --git a/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs b/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs
index d192e70d90..bf1d28408b 100644
--- a/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs
+++ b/Rdmp.UI/CohortUI/CohortSourceManagement/CreateNewCohortDatabaseWizardUI.cs
@@ -37,8 +37,8 @@ public CreateNewCohortDatabaseWizardUI(IActivateItems activator)
         InitializeComponent();
         helpIcon1.SetHelpText("Null Release Identifiers",
             @"In RMDP a cohort is a list of private identifiers paired to release identifiers.  Normally these release identifiers are allocated as part of the committing pipeline (e.g. as a new GUID).  If you want to allocate these later yourself e.g. with a stored proceedure then you can tick 'AllowNullReleaseIdentifiers' to create a cohort schema where the release identifier can be null.");
-            
-        helpIcon2.SetHelpText("Cohort Databases","Click to view a diagram of what a cohort store is");
+
+        helpIcon2.SetHelpText("Cohort Databases", "Click to view a diagram of what a cohort store is");
         helpIcon2.SuppressClick = true;
 
         serverDatabaseTableSelector1.SetItemActivator(activator);
@@ -49,7 +49,8 @@ protected override void OnLoad(EventArgs e)
         base.OnLoad(e);
 
         serverDatabaseTableSelector1.HideTableComponents();
-        Wizard = new CreateNewCohortDatabaseWizard(null, Activator.RepositoryLocator.CatalogueRepository, Activator.RepositoryLocator.DataExportRepository, false);
+        Wizard = new CreateNewCohortDatabaseWizard(null, Activator.RepositoryLocator.CatalogueRepository,
+            Activator.RepositoryLocator.DataExportRepository, false);
     }
 
     public CreateNewCohortDatabaseWizard Wizard { get; private set; }
@@ -63,7 +64,8 @@ private void btnDiscoverExtractionIdentifiers_Click(object sender, EventArgs e)
         listView1.AddObjects(Wizard.GetPrivateIdentifierCandidates());
 
         if (listView1.GetItemCount() == 0)
-            MessageBox.Show("It looks like none of the ExtractionInformations in your Catalogue database are marked as IsExtractionIdentifier");
+            MessageBox.Show(
+                "It looks like none of the ExtractionInformations in your Catalogue database are marked as IsExtractionIdentifier");
     }
 
     private void btnNext_Click(object sender, EventArgs e)
@@ -74,27 +76,28 @@ private void btnNext_Click(object sender, EventArgs e)
             MessageBox.Show("You must select a database");
             return;
         }
+
         if (PrivateIdentifierPrototype == null)
         {
             MessageBox.Show("You must select a private identifier datatype");
             return;
         }
 
-        Wizard = new CreateNewCohortDatabaseWizard(db, Activator.RepositoryLocator.CatalogueRepository, Activator.RepositoryLocator.DataExportRepository, cbAllowNullReleaseIdentifiers.Checked);
+        Wizard = new CreateNewCohortDatabaseWizard(db, Activator.RepositoryLocator.CatalogueRepository,
+            Activator.RepositoryLocator.DataExportRepository, cbAllowNullReleaseIdentifiers.Checked);
 
         var popup = new PopupChecksUI("Creating Cohort Table", false);
         ExternalCohortTableCreatedIfAny = Wizard.CreateDatabase(PrivateIdentifierPrototype, popup);
 
-        if(popup.GetWorst() <= CheckResult.Warning)
-            if(Activator.YesNo("Close Form?","Close"))
+        if (popup.GetWorst() <= CheckResult.Warning)
+            if (Activator.YesNo("Close Form?", "Close"))
                 ParentForm.Close();
     }
 
-        
 
     private void listView1_SelectedIndexChanged(object sender, EventArgs e)
     {
-        PrivateIdentifierPrototype = (PrivateIdentifierPrototype) listView1.SelectedObject;
+        PrivateIdentifierPrototype = (PrivateIdentifierPrototype)listView1.SelectedObject;
     }
 
     private void HelpIcon2_Click(object sender, EventArgs e)
@@ -104,8 +107,7 @@ private void HelpIcon2_Click(object sender, EventArgs e)
         var pb = new PictureBox
         {
             Image = bmp,
-            Size = new System.Drawing.Size(bmp.Width,bmp.Height)
-                
+            Size = new System.Drawing.Size(bmp.Width, bmp.Height)
         };
 
         new SingleControlForm(pb).Show();
diff --git a/Rdmp.UI/CohortUI/CohortSourceManagement/ExternalCohortTableUI.cs b/Rdmp.UI/CohortUI/CohortSourceManagement/ExternalCohortTableUI.cs
index 2ef1666392..aacaa04847 100644
--- a/Rdmp.UI/CohortUI/CohortSourceManagement/ExternalCohortTableUI.cs
+++ b/Rdmp.UI/CohortUI/CohortSourceManagement/ExternalCohortTableUI.cs
@@ -21,10 +21,10 @@ namespace Rdmp.UI.CohortUI.CohortSourceManagement;
 /// Allows you to edit an external cohort reference.  This is the location of a cohort database and includes the names of the Cohort table and the names of 
 /// private/release identifiers in the database
 /// </summary>
-public partial class ExternalCohortTableUI : ExternalCohortTableUI_Design,ISaveableUI
+public partial class ExternalCohortTableUI : ExternalCohortTableUI_Design, ISaveableUI
 {
     private ExternalCohortTable _externalCohortTable;
-        
+
     public ExternalCohortTableUI()
     {
         InitializeComponent();
@@ -39,7 +39,7 @@ private void SaveDatabaseSettings()
     {
         var db = serverDatabaseTableSelector1.GetDiscoveredDatabase();
 
-        if(db == null)
+        if (db == null)
             return;
 
         _externalCohortTable.Server = db.Server.Name;
@@ -51,7 +51,7 @@ private void SaveDatabaseSettings()
 
     public override void SetDatabaseObject(IActivateItems activator, ExternalCohortTable databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         _externalCohortTable = databaseObject;
 
         serverDatabaseTableSelector1.DatabaseType = _externalCohortTable.DatabaseType;
@@ -66,12 +66,14 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalCohortT
             password = null;
         }
 
-        serverDatabaseTableSelector1.SetExplicitDatabase(_externalCohortTable.Server, _externalCohortTable.Database, _externalCohortTable.Username, password);
+        serverDatabaseTableSelector1.SetExplicitDatabase(_externalCohortTable.Server, _externalCohortTable.Database,
+            _externalCohortTable.Username, password);
 
         CommonFunctionality.AddHelp(tbTableName, "IExternalCohortTable.TableName");
         CommonFunctionality.AddHelp(tbPrivateIdentifierField, "IExternalCohortTable.PrivateIdentifierField");
         CommonFunctionality.AddHelp(tbReleaseIdentifierField, "IExternalCohortTable.ReleaseIdentifierField");
-        CommonFunctionality.AddHelp(tbDefinitionTableForeignKeyField, "IExternalCohortTable.DefinitionTableForeignKeyField");
+        CommonFunctionality.AddHelp(tbDefinitionTableForeignKeyField,
+            "IExternalCohortTable.DefinitionTableForeignKeyField");
 
         CommonFunctionality.AddHelp(tbDefinitionTableName, "IExternalCohortTable.DefinitionTableName");
 
@@ -82,14 +84,15 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Extern
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",e=>e.ID);
-            
+        Bind(tbID, "Text", "ID", e => e.ID);
+
         Bind(tbID, "Text", "ID", e => e.ID);
         Bind(tbName, "Text", "Name", e => e.Name);
         Bind(tbTableName, "Text", "TableName", e => e.TableName);
         Bind(tbPrivateIdentifierField, "Text", "PrivateIdentifierField", e => e.PrivateIdentifierField);
         Bind(tbReleaseIdentifierField, "Text", "ReleaseIdentifierField", e => e.ReleaseIdentifierField);
-        Bind(tbDefinitionTableForeignKeyField, "Text", "DefinitionTableForeignKeyField", e => e.DefinitionTableForeignKeyField);
+        Bind(tbDefinitionTableForeignKeyField, "Text", "DefinitionTableForeignKeyField",
+            e => e.DefinitionTableForeignKeyField);
 
         Bind(tbDefinitionTableName, "Text", "DefinitionTableName", e => e.DefinitionTableName);
     }
@@ -98,5 +101,4 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Extern
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExternalCohortTableUI_Design, UserControl>))]
 public abstract class ExternalCohortTableUI_Design : RDMPSingleDatabaseObjectControl<ExternalCohortTable>
 {
-         
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CohortUI/ExtractableCohortCollectionUI.cs b/Rdmp.UI/CohortUI/ExtractableCohortCollectionUI.cs
index 59ef567f36..f117d9c97f 100644
--- a/Rdmp.UI/CohortUI/ExtractableCohortCollectionUI.cs
+++ b/Rdmp.UI/CohortUI/ExtractableCohortCollectionUI.cs
@@ -30,6 +30,7 @@ namespace Rdmp.UI.CohortUI;
 public partial class ExtractableCohortCollectionUI : RDMPUserControl, ILifetimeSubscriber
 {
     private ExtractableCohortAuditLogBuilder _auditLogBuilder = new();
+
     public ExtractableCohortCollectionUI()
     {
         InitializeComponent();
@@ -51,6 +52,7 @@ public ExtractableCohortCollectionUI()
 
         lbCohortDatabaseTable.BeforeSorting += BeforeSorting;
     }
+
     public override void SetItemActivator(IActivateItems activator)
     {
         base.SetItemActivator(activator);
@@ -58,6 +60,7 @@ public override void SetItemActivator(IActivateItems activator)
         // wait till we have an activator before registering this callback otherwise we will get null reference
         olvCreatedFrom.AspectGetter = CreatedFromAspectGetter;
     }
+
     private object CreatedFromAspectGetter(object rowObject)
     {
         if (rowObject is ExtractableCohortDescription ecd)
@@ -73,14 +76,14 @@ private object CreatedFromAspectGetter(object rowObject)
     private void BeforeSorting(object sender, BeforeSortingEventArgs e)
     {
         lbCohortDatabaseTable.ListViewItemSorter = new ColumnComparer(
-            e.ColumnToSort,e.SortOrder , e.SecondaryColumnToSort, e.SecondarySortOrder);
+            e.ColumnToSort, e.SortOrder, e.SecondaryColumnToSort, e.SecondarySortOrder);
         e.Handled = true;
     }
 
     private void lbCohortDatabaseTable_ButtonClick(object sender, CellClickEventArgs e)
     {
         if (e.Column == olvViewLog && e.Model is ExtractableCohortDescription ecd)
-            WideMessageBox.Show("Cohort audit log",ecd.Cohort.AuditLog,WideMessageBoxTheme.Help);
+            WideMessageBox.Show("Cohort audit log", ecd.Cohort.AuditLog, WideMessageBoxTheme.Help);
     }
 
     private object ViewLogAspectGetter(object rowObject)
@@ -104,7 +107,7 @@ public void SetupForAllCohorts(IActivateItems activator)
     {
         try
         {
-            if(!haveSubscribed)
+            if (!haveSubscribed)
             {
                 activator.RefreshBus.EstablishLifetimeSubscription(this);
                 haveSubscribed = true;
@@ -115,7 +118,8 @@ public void SetupForAllCohorts(IActivateItems activator)
         catch (Exception e)
         {
             ExceptionViewer.Show(
-                $"{GetType().Name} could not load Cohorts:{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(e)}", e);
+                $"{GetType().Name} could not load Cohorts:{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(e)}",
+                e);
         }
     }
 
@@ -124,12 +128,14 @@ public void SetupFor(ExtractableCohort[] cohorts)
         try
         {
             lbCohortDatabaseTable.ClearObjects();
-            lbCohortDatabaseTable.AddObjects(cohorts.Select(cohort => new ExtractableCohortDescription(cohort)).ToArray());
+            lbCohortDatabaseTable.AddObjects(cohorts.Select(cohort => new ExtractableCohortDescription(cohort))
+                .ToArray());
         }
         catch (Exception e)
         {
             ExceptionViewer.Show(
-                $"{GetType().Name} could not load Cohorts:{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(e)}", e);
+                $"{GetType().Name} could not load Cohorts:{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(e)}",
+                e);
         }
     }
 
@@ -147,19 +153,16 @@ private void ReFetchCohortDetailsAsync()
         //Just because the object updates itself doesn't mean ObjectListView will notice, so we must also subscribe to the fetch completion (1 per cohort source table)
         //when the fetch completes, update the UI nodes (they also themselves subscribe to the fetch completion handler and should be registered further up the inovcation list)
         foreach (var (fetch, nodes) in fetchDescriptionsDictionary)
-        {
             //Could be we are disposed when this happens
             fetch.Finished += () =>
             {
                 if (!lbCohortDatabaseTable.IsDisposed)
                     lbCohortDatabaseTable.RefreshObjects(nodes);
             };
-        }
     }
 
     private void lbCohortDatabaseTable_SelectedIndexChanged(object sender, EventArgs e)
     {
-
     }
 
     public event SelectedCohortChangedHandler SelectedCohortChanged;
@@ -172,8 +175,7 @@ private void lbCohortDatabaseTable_KeyUp(object sender, KeyEventArgs e)
 
             var toDelete = node.Cohort;
 
-            if (Activator.YesNo($"Are you sure you want to delete {toDelete} (ID={toDelete.ID})","Confirm Delete"))
-            {
+            if (Activator.YesNo($"Are you sure you want to delete {toDelete} (ID={toDelete.ID})", "Confirm Delete"))
                 try
                 {
                     toDelete.DeleteInDatabase();
@@ -184,7 +186,6 @@ private void lbCohortDatabaseTable_KeyUp(object sender, KeyEventArgs e)
                 {
                     ExceptionViewer.Show(exception);
                 }
-            }
             else
                 return;
         }
@@ -193,7 +194,8 @@ private void lbCohortDatabaseTable_KeyUp(object sender, KeyEventArgs e)
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         lbCohortDatabaseTable.UseFiltering = true;
-        lbCohortDatabaseTable.ModelFilter = new TextMatchFilter(lbCohortDatabaseTable, tbFilter.Text, StringComparison.CurrentCultureIgnoreCase);
+        lbCohortDatabaseTable.ModelFilter = new TextMatchFilter(lbCohortDatabaseTable, tbFilter.Text,
+            StringComparison.CurrentCultureIgnoreCase);
     }
 
     private void lbCohortDatabaseTable_FormatRow(object sender, FormatRowEventArgs e)
@@ -203,31 +205,34 @@ private void lbCohortDatabaseTable_FormatRow(object sender, FormatRowEventArgs e
         if (model?.Exception != null)
             e.Item.BackColor = Color.Red;
     }
+
     private void lbCohortDatabaseTable_ItemActivate(object sender, EventArgs e)
     {
         var model = lbCohortDatabaseTable.SelectedObject as ExtractableCohortDescription;
 
-        if(model?.Exception != null)
+        if (model?.Exception != null)
             ExceptionViewer.Show(model.Exception);
     }
 
     public void SetSelectedCohort(ExtractableCohort toSelect)
     {
-
         if (toSelect == null)
         {
             lbCohortDatabaseTable.SelectedObject = null;
             return;
         }
 
-        var matchingNode = lbCohortDatabaseTable.Objects.Cast<ExtractableCohortDescription>().SingleOrDefault(c => c.Cohort.ID == toSelect.ID);
+        var matchingNode = lbCohortDatabaseTable.Objects.Cast<ExtractableCohortDescription>()
+            .SingleOrDefault(c => c.Cohort.ID == toSelect.ID);
 
         lbCohortDatabaseTable.SelectedObject = matchingNode;
     }
 
     private void lbCohortDatabaseTable_SelectionChanged(object sender, EventArgs e)
     {
-        var selected = lbCohortDatabaseTable.SelectedObject is not ExtractableCohortDescription node ? null : node.Cohort;
+        var selected = lbCohortDatabaseTable.SelectedObject is not ExtractableCohortDescription node
+            ? null
+            : node.Cohort;
 
         SelectedCohortChanged?.Invoke(this, selected);
     }
diff --git a/Rdmp.UI/CohortUI/ExtractableCohortUI.cs b/Rdmp.UI/CohortUI/ExtractableCohortUI.cs
index b814e56790..cd5d0d04de 100644
--- a/Rdmp.UI/CohortUI/ExtractableCohortUI.cs
+++ b/Rdmp.UI/CohortUI/ExtractableCohortUI.cs
@@ -43,7 +43,7 @@ namespace Rdmp.UI.CohortUI;
 /// additional release identifier columns into your cohort table and want to use that column instead of the listed release identifier column (again this is a really bad idea).</para>
 /// 
 /// </summary>
-public partial class ExtractableCohortUI :ExtractableCohortUI_Design, ISaveableUI
+public partial class ExtractableCohortUI : ExtractableCohortUI_Design, ISaveableUI
 {
     private ExtractableCohort _extractableCohort;
     private RDMPCollectionCommonFunctionality _commonFunctionality1 = new();
@@ -51,9 +51,9 @@ public partial class ExtractableCohortUI :ExtractableCohortUI_Design, ISaveableU
 
     private void GenerateSQLPreview()
     {
-        if(VisualStudioDesignMode)
+        if (VisualStudioDesignMode)
             return;
-            
+
         QueryPreview.ReadOnly = false;
         try
         {
@@ -75,7 +75,6 @@ private void GenerateSQLPreview()
             toShow += sql;
 
             QueryPreview.Text = toShow;
-
         }
         catch (Exception ex)
         {
@@ -83,15 +82,14 @@ private void GenerateSQLPreview()
         }
         finally
         {
-
             QueryPreview.ReadOnly = true;
         }
     }
-        
+
     public ExtractableCohortUI()
     {
         InitializeComponent();
-            
+
         if (VisualStudioDesignMode) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
             return;
 
@@ -104,12 +102,16 @@ public ExtractableCohortUI()
 
         AssociatedCollection = RDMPCollection.SavedCohorts;
 
-        helpIcon1.SetHelpText("Override Release Identifier","Not Recommended.  Setting this lets you change which release identifier column is extracted (for this cohort only).");
+        helpIcon1.SetHelpText("Override Release Identifier",
+            "Not Recommended.  Setting this lets you change which release identifier column is extracted (for this cohort only).");
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCohortUsage, olvUsedIn, new Guid("0c402777-2c70-486a-adb3-32b6f2fbfe80"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCohortUsage, olvUsedIn,
+            new Guid("0c402777-2c70-486a-adb3-32b6f2fbfe80"));
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvPreviousVersions,olvOtherVersions, new Guid("4e753b4a-9989-4bf0-b2d4-7462e68b2fa3"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvPreviousVersions, olvVersion, new Guid("a5b4573f-5aad-456d-a431-d63d69e46e47"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvPreviousVersions, olvOtherVersions,
+            new Guid("4e753b4a-9989-4bf0-b2d4-7462e68b2fa3"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvPreviousVersions, olvVersion,
+            new Guid("a5b4573f-5aad-456d-a431-d63d69e46e47"));
     }
 
     private void AuditLogEditorOnTextChanged(object sender, EventArgs eventArgs)
@@ -117,17 +119,16 @@ private void AuditLogEditorOnTextChanged(object sender, EventArgs eventArgs)
         _extractableCohort.AuditLog = auditLogEditor.Text;
     }
 
-    [DesignerSerializationVisibility( DesignerSerializationVisibility.Hidden)]
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public Scintilla QueryPreview { get; set; }
 
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     private Scintilla auditLogEditor;
 
-        
 
     public override void SetDatabaseObject(IActivateItems activator, ExtractableCohort databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         _extractableCohort = databaseObject;
 
         //if the object passed in was null we set it to "" otherwise we are going to set it to the Name property (unless that is null in which case it's still going to end up as "")
@@ -143,7 +144,6 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho
 
 
         if (!_commonFunctionality1.IsSetup)
-        {
             _commonFunctionality1.SetUp(RDMPCollection.None, tlvCohortUsage, activator, olvUsedIn, null,
                 new RDMPCollectionCommonFunctionalitySettings
                 {
@@ -154,10 +154,8 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho
                     SuppressChildrenAdder = true
                 }
             );
-        }
 
         if (!_commonFunctionality2.IsSetup)
-        {
             _commonFunctionality2.SetUp(RDMPCollection.None, tlvPreviousVersions, activator, olvOtherVersions, null,
                 new RDMPCollectionCommonFunctionalitySettings
                 {
@@ -168,24 +166,24 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho
                     SuppressChildrenAdder = true
                 }
             );
-        }
 
-        if(Activator.CoreChildProvider is DataExportChildProvider dx)
+        if (Activator.CoreChildProvider is DataExportChildProvider dx)
         {
             tlvCohortUsage.ClearObjects();
-            tlvCohortUsage.AddObjects(dx.ExtractionConfigurations.Where(e=>e.Cohort_ID == _extractableCohort.ID).ToArray());
-                
+            tlvCohortUsage.AddObjects(dx.ExtractionConfigurations.Where(e => e.Cohort_ID == _extractableCohort.ID)
+                .ToArray());
+
             tlvPreviousVersions.ClearObjects();
             tlvPreviousVersions.AddObjects(
                 dx.Cohorts.Where(
                     c =>
                         c.ID != _extractableCohort.ID &&
-                        c.ExternalCohortTable_ID == _extractableCohort.ExternalCohortTable_ID && 
+                        c.ExternalCohortTable_ID == _extractableCohort.ExternalCohortTable_ID &&
                         c.GetExternalData().ExternalDescription ==
                         _extractableCohort.GetExternalData().ExternalDescription &&
                         c.ExternalProjectNumber == _extractableCohort.ExternalProjectNumber).ToArray());
         }
-            
+
         CommonFunctionality.Add(new ExecuteCommandCreateNewExtractionConfigurationForProject(activator, null)
         {
             CohortIfAny = databaseObject,
@@ -197,14 +195,14 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractableCoho
 
     private void tbOverrideReleaseIdentifierSQL_TextChanged(object sender, EventArgs e)
     {
-
         var syntax = _extractableCohort.GetQuerySyntaxHelper();
 
         if (
-            !string.IsNullOrWhiteSpace(tbOverrideReleaseIdentifierSQL.Text)//if it has an override
+            !string.IsNullOrWhiteSpace(tbOverrideReleaseIdentifierSQL.Text) //if it has an override
             &&
             syntax.GetRuntimeName(tbOverrideReleaseIdentifierSQL.Text)
-                .Equals(syntax.GetRuntimeName(_extractableCohort.GetPrivateIdentifier())))//and that ovoerride is the same as the private identifier they are trying to release identifiable data on the sly!
+                .Equals(syntax.GetRuntimeName(_extractableCohort
+                    .GetPrivateIdentifier()))) //and that ovoerride is the same as the private identifier they are trying to release identifiable data on the sly!
         {
             //release identifier cannot be the same as private identififer (I AM THE LAW!)
             tbOverrideReleaseIdentifierSQL.ForeColor = Color.Red;
@@ -217,32 +215,31 @@ private void tbOverrideReleaseIdentifierSQL_TextChanged(object sender, EventArgs
 
     private void btnShowProject_Click(object sender, EventArgs e)
     {
-        var dx = (DataExportChildProvider) Activator.CoreChildProvider;
+        var dx = (DataExportChildProvider)Activator.CoreChildProvider;
 
         var projects = dx.Projects.Where(p => p.ProjectNumber == _extractableCohort.ExternalProjectNumber).ToArray();
 
         if (!projects.Any())
+        {
             MessageBox.Show($"No Projects exist with ProjectNumber {_extractableCohort.ExternalProjectNumber}");
+        }
         else if (projects.Length == 1)
+        {
             Activator.RequestItemEmphasis(this, new EmphasiseRequest(projects.Single(), 1));
+        }
         else
         {
             var show = Activator.SelectOne(new DialogArgs
             {
-                TaskDescription = $"There are multiple Projects with the ProjectNumber {_extractableCohort.ExternalProjectNumber}.  Which would you like to see?"
+                TaskDescription =
+                    $"There are multiple Projects with the ProjectNumber {_extractableCohort.ExternalProjectNumber}.  Which would you like to see?"
             }, projects);
-                
-            if(show != null)
-            {
-                Activator.RequestItemEmphasis(this, new EmphasiseRequest(show, 1));
-            }   
+
+            if (show != null) Activator.RequestItemEmphasis(this, new EmphasiseRequest(show, 1));
         }
     }
 
-    public override string GetTabName()
-    {
-        return $"{_extractableCohort} (V{_extractableCohort.ExternalVersion})";
-    }
+    public override string GetTabName() => $"{_extractableCohort} (V{_extractableCohort.ExternalVersion})";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExtractableCohortUI_Design, UserControl>))]
diff --git a/Rdmp.UI/CohortUI/ImportCustomData/CohortCreationRequestUI.cs b/Rdmp.UI/CohortUI/ImportCustomData/CohortCreationRequestUI.cs
index 869f9cd1c4..169adde4bf 100644
--- a/Rdmp.UI/CohortUI/ImportCustomData/CohortCreationRequestUI.cs
+++ b/Rdmp.UI/CohortUI/ImportCustomData/CohortCreationRequestUI.cs
@@ -35,19 +35,20 @@ public partial class CohortCreationRequestUI : RDMPForm
 {
     private readonly IExternalCohortTable _target;
     private IDataExportRepository _repository;
-        
+
     public string CohortDescription
     {
         get => tbDescription.Text;
         set => tbDescription.Text = value;
     }
 
-    public CohortCreationRequestUI(IActivateItems activator,IExternalCohortTable target, IProject project =null):base(activator)
+    public CohortCreationRequestUI(IActivateItems activator, IExternalCohortTable target, IProject project = null) :
+        base(activator)
     {
         _target = target;
 
         InitializeComponent();
-            
+
         if (_target == null)
             return;
 
@@ -56,22 +57,22 @@ public CohortCreationRequestUI(IActivateItems activator,IExternalCohortTable tar
         lblExternalCohortTable.Text = _target.ToString();
 
         SetProject(project);
-            
+
         pbProject.Image = CatalogueIcons.Project.ImageToBitmap();
         pbCohortSource.Image = CatalogueIcons.ExternalCohortTable.ImageToBitmap();
         taskDescriptionLabel1.SetupFor(new DialogArgs
         {
-            TaskDescription = "Describe the cohort you are trying to create.  Which Project it will be extracted with and which ExternalCohortTable it should be stored in."
+            TaskDescription =
+                "Describe the cohort you are trying to create.  Which Project it will be extracted with and which ExternalCohortTable it should be stored in."
         });
     }
 
-        
+
     public CohortCreationRequest Result { get; set; }
     public IProject Project { get; set; }
 
     private void btnOk_Click(object sender, EventArgs e)
     {
-
         if (Project == null)
         {
             MessageBox.Show("You must select a project, if you do not have one yet then create one");
@@ -97,7 +98,6 @@ private void btnOk_Click(object sender, EventArgs e)
                 MessageBox.Show("You must enter a name for your cohort");
                 return;
             }
-
         }
         else if (rbRevisedCohort.Checked)
         {
@@ -116,15 +116,17 @@ private void btnOk_Click(object sender, EventArgs e)
             return;
         }
 
-            
+
         //construct the result
-        Result = new CohortCreationRequest(Project, new CohortDefinition(null, name, version, (int)Project.ProjectNumber, _target), (IDataExportRepository)Project.Repository, tbDescription.Text)
+        Result = new CohortCreationRequest(Project,
+            new CohortDefinition(null, name, version, (int)Project.ProjectNumber, _target),
+            (IDataExportRepository)Project.Repository, tbDescription.Text)
+        {
+            NewCohortDefinition =
             {
-                NewCohortDefinition =
-                {
-                    CohortReplacedIfAny = ddExistingCohort.SelectedItem as ExtractableCohort
-                }
-            };
+                CohortReplacedIfAny = ddExistingCohort.SelectedItem as ExtractableCohort
+            }
+        };
 
         //see if it is passing checks
         var notifier = new ToMemoryCheckNotifier();
@@ -154,7 +156,7 @@ private void btnCancel_Click(object sender, EventArgs e)
         DialogResult = DialogResult.Cancel;
         Close();
     }
-        
+
     private void rbNewCohort_CheckedChanged(object sender, EventArgs e)
     {
         gbNewCohort.Enabled = true;
@@ -166,7 +168,7 @@ private void rbRevisedCohort_CheckedChanged(object sender, EventArgs e)
         gbNewCohort.Enabled = false;
         gbRevisedCohort.Enabled = true;
 
-            
+
         RefreshCohortsDropdown(true);
     }
 
@@ -189,7 +191,9 @@ private void ddExistingCohort_SelectedIndexChanged(object sender, EventArgs e)
                 existingHelpIcon.Enabled = true;
             }
             else
+            {
                 existingHelpIcon.Enabled = false;
+            }
         }
         else
         {
@@ -206,17 +210,17 @@ private void RefreshCohortsDropdown(bool interactive)
 
         if (Project == null)
         {
-            if(interactive)
-            {
-                MessageBox.Show("You must select a Project");
-            }
-                    
+            if (interactive) MessageBox.Show("You must select a Project");
+
             return;
         }
 
-        var cohorts = ((DataExportChildProvider)Activator.CoreChildProvider).Cohorts.Where(c => c.ExternalProjectNumber == Project.ProjectNumber);
+        var cohorts =
+            ((DataExportChildProvider)Activator.CoreChildProvider).Cohorts.Where(c =>
+                c.ExternalProjectNumber == Project.ProjectNumber);
 
-        var maxVersionCohorts = cohorts.GroupBy(x => x.GetExternalData().ExternalDescription, (key, g) => g.OrderByDescending(e => e.ExternalVersion).First()).ToArray();
+        var maxVersionCohorts = cohorts.GroupBy(x => x.GetExternalData().ExternalDescription,
+            (key, g) => g.OrderByDescending(e => e.ExternalVersion).First()).ToArray();
         ddExistingCohort.Items.AddRange(maxVersionCohorts);
     }
 
@@ -230,14 +234,22 @@ private void btnNewProject_Click(object sender, EventArgs e)
             p.SwitchToCutDownUIMode();
 
             var ok = new Button();
-            ok.Click += (s, ev) => { dialog.Close(); dialog.DialogResult = DialogResult.OK; };
-            ok.Location = new Point(0,p.Height + 10);
-            ok.Width = p.Width/2;
+            ok.Click += (s, ev) =>
+            {
+                dialog.Close();
+                dialog.DialogResult = DialogResult.OK;
+            };
+            ok.Location = new Point(0, p.Height + 10);
+            ok.Width = p.Width / 2;
             ok.Height = 30;
             ok.Text = "Ok";
 
             var cancel = new Button();
-            cancel.Click += (s, ev) =>{dialog.Close();dialog.DialogResult = DialogResult.Cancel;};
+            cancel.Click += (s, ev) =>
+            {
+                dialog.Close();
+                dialog.DialogResult = DialogResult.Cancel;
+            };
             cancel.Location = new Point(p.Width / 2, p.Height + 10);
             cancel.Width = p.Width / 2;
             cancel.Height = 30;
@@ -245,16 +257,16 @@ private void btnNewProject_Click(object sender, EventArgs e)
 
             dialog.Controls.Add(ok);
             dialog.Controls.Add(cancel);
-                    
+
             dialog.Height = p.Height + 80;
             dialog.Width = p.Width + 10;
             dialog.Controls.Add(p);
-                
+
             ok.Anchor = AnchorStyles.Bottom;
-            cancel.Anchor  = AnchorStyles.Bottom;
+            cancel.Anchor = AnchorStyles.Bottom;
 
             var project = new Project(_repository, "New Project");
-            p.SetDatabaseObject(Activator,project);
+            p.SetDatabaseObject(Activator, project);
             var result = dialog.ShowDialog();
 
             if (result == DialogResult.OK)
@@ -264,8 +276,9 @@ private void btnNewProject_Click(object sender, EventArgs e)
                 Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(project));
             }
             else
+            {
                 project.DeleteInDatabase();
-
+            }
         }
         catch (Exception exception)
         {
@@ -294,7 +307,7 @@ private void SetProject(IProject project)
         btnNewProject.Visible = Project == null;
         btnExisting.Visible = Project == null;
         btnClear.Visible = Project != null;
-            
+
         //if a project is selected and the project has no project number
         lblErrorNoProjectNumber.Visible = Project != null && Project.ProjectNumber == null;
         tbSetProjectNumber.Visible = Project != null && Project.ProjectNumber == null;
@@ -302,18 +315,16 @@ private void SetProject(IProject project)
 
     private void tbName_TextChanged(object sender, EventArgs e)
     {
-
     }
 
     private void btnExisting_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "Choose a Project which this cohort will be associated with.  This will set the cohorts ProjectNumber.  A cohort can only be extracted from a Project whose ProjectNumber matches the cohort (multiple Projects are allowed to have the same ProjectNumber)"
-           }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>(), out var proj))
-        {
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "Choose a Project which this cohort will be associated with.  This will set the cohorts ProjectNumber.  A cohort can only be extracted from a Project whose ProjectNumber matches the cohort (multiple Projects are allowed to have the same ProjectNumber)"
+            }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>(), out var proj))
             SetProject(proj);
-        }                
     }
 
     private void tbSetProjectNumber_TextChanged(object sender, EventArgs e)
@@ -337,5 +348,4 @@ private void btnClear_Click(object sender, EventArgs e)
     {
         SetProject(null);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/AlwaysShowListOnlyFilter.cs b/Rdmp.UI/Collections/AlwaysShowListOnlyFilter.cs
index 2c9ede5d8a..715e1699fa 100644
--- a/Rdmp.UI/Collections/AlwaysShowListOnlyFilter.cs
+++ b/Rdmp.UI/Collections/AlwaysShowListOnlyFilter.cs
@@ -22,8 +22,5 @@ public AlwaysShowListOnlyFilter(IEnumerable<object> alwaysShowList)
         AlwaysShowList = new HashSet<object>(alwaysShowList);
     }
 
-    public bool Filter(object modelObject)
-    {
-        return AlwaysShowList.Contains(modelObject);
-    }
+    public bool Filter(object modelObject) => AlwaysShowList.Contains(modelObject);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/CatalogueCollectionFilterUI.cs b/Rdmp.UI/Collections/CatalogueCollectionFilterUI.cs
index 9dc88ab846..5464cf7c63 100644
--- a/Rdmp.UI/Collections/CatalogueCollectionFilterUI.cs
+++ b/Rdmp.UI/Collections/CatalogueCollectionFilterUI.cs
@@ -14,12 +14,13 @@ namespace Rdmp.UI.Collections;
 public partial class CatalogueCollectionFilterUI : UserControl
 {
     private bool _loading = true;
+
     public CatalogueCollectionFilterUI()
     {
         InitializeComponent();
 
         cbShowInternal.Checked = UserSettings.ShowInternalCatalogues;
-        cbShowDeprecated.Checked = UserSettings.ShowDeprecatedCatalogues ;
+        cbShowDeprecated.Checked = UserSettings.ShowDeprecatedCatalogues;
         cbShowColdStorage.Checked = UserSettings.ShowColdStorageCatalogues;
         cbProjectSpecific.Checked = UserSettings.ShowProjectSpecificCatalogues;
         cbShowNonExtractable.Checked = UserSettings.ShowNonExtractableCatalogues;
@@ -31,7 +32,7 @@ public CatalogueCollectionFilterUI()
 
     private void OnCheckboxChanged(object sender, EventArgs e)
     {
-        if(_loading)
+        if (_loading)
             return;
 
         UserSettings.ShowInternalCatalogues = cbShowInternal.Checked;
@@ -40,7 +41,7 @@ private void OnCheckboxChanged(object sender, EventArgs e)
         UserSettings.ShowProjectSpecificCatalogues = cbProjectSpecific.Checked;
         UserSettings.ShowNonExtractableCatalogues = cbShowNonExtractable.Checked;
 
-        FiltersChanged?.Invoke(this,EventArgs.Empty);
+        FiltersChanged?.Invoke(this, EventArgs.Empty);
     }
 
     public void EnsureVisible(Catalogue c)
@@ -55,8 +56,8 @@ public void EnsureVisible(Catalogue c)
 
         var isExtractable = c.GetExtractabilityStatus(null);
 
-        cbShowNonExtractable.Checked = cbShowNonExtractable.Checked || isExtractable == null || isExtractable.IsExtractable == false;
-
+        cbShowNonExtractable.Checked = cbShowNonExtractable.Checked || isExtractable == null ||
+                                       isExtractable.IsExtractable == false;
     }
 
     /// <summary>
@@ -65,7 +66,7 @@ public void EnsureVisible(Catalogue c)
     /// </summary>
     public void CheckForChanges()
     {
-        if(cbShowInternal.Checked != UserSettings.ShowInternalCatalogues)
+        if (cbShowInternal.Checked != UserSettings.ShowInternalCatalogues)
             cbShowInternal.Checked = UserSettings.ShowInternalCatalogues;
 
         if (cbShowDeprecated.Checked != UserSettings.ShowDeprecatedCatalogues)
diff --git a/Rdmp.UI/Collections/CatalogueCollectionUI.cs b/Rdmp.UI/Collections/CatalogueCollectionUI.cs
index 3813dbe696..27d4cfa306 100644
--- a/Rdmp.UI/Collections/CatalogueCollectionUI.cs
+++ b/Rdmp.UI/Collections/CatalogueCollectionUI.cs
@@ -49,6 +49,7 @@ public partial class CatalogueCollectionUI : RDMPCollectionUI
     //constructor
 
     private bool bLoading = true;
+
     public CatalogueCollectionUI()
     {
         InitializeComponent();
@@ -88,10 +89,7 @@ protected override void OnEnter(EventArgs e)
     /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
     protected override void Dispose(bool disposing)
     {
-        if (disposing && components != null)
-        {
-            components.Dispose();
-        }
+        if (disposing && components != null) components.Dispose();
         base.Dispose(disposing);
     }
 
@@ -113,40 +111,49 @@ public void RefreshUIFromDatabase(object oRefreshFrom)
             var newCatalogues = CommonTreeFunctionality.CoreChildProvider.AllCatalogues.Except(_allCatalogues);
             if (newCatalogues.Any())
             {
-                oRefreshFrom = rootFolder;//refresh from the root instead
+                oRefreshFrom = rootFolder; //refresh from the root instead
                 tlvCatalogues.RefreshObject(oRefreshFrom);
             }
         }
 
         _allCatalogues = CommonTreeFunctionality.CoreChildProvider.AllCatalogues;
-            
+
         if (isFirstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvColumn1, new Guid("1d912137-22ab-4536-b40b-bd984e27dc7a"));
             CommonTreeFunctionality.SetupColumnTracking(olvOrder, new Guid("0d8e6e49-03ae-48f2-9bf8-acc5107f65f8"));
             CommonTreeFunctionality.SetupColumnTracking(olvFilters, new Guid("c4c9b2ac-c9b5-4d23-b06d-d1f55013b4e9"));
 
-            CommonFunctionality.Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator), GlobalStrings.FromFile,null, NewMenu);
-            CommonFunctionality.Add(new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator), GlobalStrings.FromDatabase,null, NewMenu);
-            CommonFunctionality.Add(new ExecuteCommandCreateNewEmptyCatalogue(Activator),"Empty Catalogue (Advanced)", null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator),
+                GlobalStrings.FromFile, null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator),
+                GlobalStrings.FromDatabase, null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandCreateNewEmptyCatalogue(Activator), "Empty Catalogue (Advanced)",
+                null, NewMenu);
 
             CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-            CommonFunctionality.Add(new ExecuteCommandAddNewCatalogueItem(Activator,null) , "CatalogueItem", null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandAddNewCatalogueItem(Activator, null), "CatalogueItem", null,
+                NewMenu);
 
             CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-            CommonFunctionality.Add(new ExecuteCommandAddNewAggregateGraph(Activator, null), "Aggregate Graph", null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandAddNewAggregateGraph(Activator, null), "Aggregate Graph", null,
+                NewMenu);
 
             CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-            CommonFunctionality.Add(new ExecuteCommandAddNewSupportingDocument(Activator, null), "Supporting Document", null, NewMenu);
-            CommonFunctionality.Add(new ExecuteCommandAddNewSupportingSqlTable(Activator, null), "Supporting SQL Table", null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandAddNewSupportingDocument(Activator, null), "Supporting Document",
+                null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandAddNewSupportingSqlTable(Activator, null), "Supporting SQL Table",
+                null, NewMenu);
 
             CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-            CommonFunctionality.Add(new ExecuteCommandCreateNewGovernancePeriod(Activator), "Governance Period", null, NewMenu);
-            CommonFunctionality.Add(new ExecuteCommandAddNewGovernanceDocument(Activator,null), "Governance Document", null, NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandCreateNewGovernancePeriod(Activator), "Governance Period", null,
+                NewMenu);
+            CommonFunctionality.Add(new ExecuteCommandAddNewGovernanceDocument(Activator, null), "Governance Document",
+                null, NewMenu);
         }
 
         if (isFirstTime || Equals(oRefreshFrom, rootFolder))
@@ -156,12 +163,12 @@ public void RefreshUIFromDatabase(object oRefreshFrom)
             isFirstTime = false;
         }
     }
-        
+
     public void ApplyFilters()
     {
-        if(bLoading)
+        if (bLoading)
             return;
-            
+
         tlvCatalogues.UseFiltering = true;
         tlvCatalogues.ModelFilter = new CatalogueCollectionFilter(Activator.CoreChildProvider);
     }
@@ -173,14 +180,15 @@ public enum HighlightCatalogueType
         ExtractionBroken,
         TOP1Worked
     }
-        
+
     private object FilterAspectGetter(object rowObject)
     {
         try
         {
             if (rowObject is CatalogueItem cataItem)
-                return Activator.RefreshBus.PublishInProgress ? (object) null:
-                    Activator.CoreChildProvider.GetAllChildrenRecursively(cataItem).OfType<IFilter>().Count();
+                return Activator.RefreshBus.PublishInProgress
+                    ? (object)null
+                    : Activator.CoreChildProvider.GetAllChildrenRecursively(cataItem).OfType<IFilter>().Count();
         }
         catch (Exception)
         {
@@ -208,26 +216,30 @@ public override void SetItemActivator(IActivateItems activator)
 
         CommonTreeFunctionality.MaintainRootObjects = new[]
         {
-            typeof (AllGovernanceNode),
-            typeof (FolderNode<Catalogue>)
+            typeof(AllGovernanceNode),
+            typeof(FolderNode<Catalogue>)
         };
 
         //Things that are always visible regardless
-        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a=>new IAtomicCommand[]
+        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => new IAtomicCommand[]
         {
-            new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator){OverrideCommandName = "Add New Catalogue From File...",Weight = -50.9f},
-            new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator) { OverrideCommandName = "Add New Catalogue From Database..." ,Weight = -50.8f},
-            new ExecuteCommandCreateNewEmptyCatalogue(Activator){OverrideCommandName = "Add New Empty Catalogue (Advanced)", Weight = -50.7f},
+            new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator)
+                { OverrideCommandName = "Add New Catalogue From File...", Weight = -50.9f },
+            new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator)
+                { OverrideCommandName = "Add New Catalogue From Database...", Weight = -50.8f },
+            new ExecuteCommandCreateNewEmptyCatalogue(Activator)
+                { OverrideCommandName = "Add New Empty Catalogue (Advanced)", Weight = -50.7f },
 
-            new ExecuteCommandAddNewCatalogueItem(Activator, null){ Weight = -49.9f},
+            new ExecuteCommandAddNewCatalogueItem(Activator, null) { Weight = -49.9f },
 
-            new ExecuteCommandAddNewAggregateGraph(Activator, null){ Weight = -48.9f},
+            new ExecuteCommandAddNewAggregateGraph(Activator, null) { Weight = -48.9f },
 
-            new ExecuteCommandAddNewSupportingDocument(Activator, null){ Weight = -46.9f},
-            new ExecuteCommandAddNewSupportingSqlTable(Activator, null){ Weight = -46.8f},
+            new ExecuteCommandAddNewSupportingDocument(Activator, null) { Weight = -46.9f },
+            new ExecuteCommandAddNewSupportingSqlTable(Activator, null) { Weight = -46.8f },
 
-            new ExecuteCommandCreateNewGovernancePeriod(Activator){OverrideCommandName = "Add New Governance Period", Weight = 44.9f },
-            new ExecuteCommandAddNewGovernanceDocument(Activator, null){Weight = 44.9f }
+            new ExecuteCommandCreateNewGovernancePeriod(Activator)
+                { OverrideCommandName = "Add New Governance Period", Weight = 44.9f },
+            new ExecuteCommandAddNewGovernanceDocument(Activator, null) { Weight = 44.9f }
         };
 
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
@@ -243,7 +255,7 @@ private void _activator_Emphasise(object sender, EmphasiseEventArgs args)
     {
         //user wants this object emphasised
         var c = args.Request.ObjectToEmphasise as Catalogue;
-            
+
         if (c == null)
         {
             var descendancy = Activator.CoreChildProvider.GetDescendancyListIfAnyFor(args.Request.ObjectToEmphasise);
@@ -251,7 +263,7 @@ private void _activator_Emphasise(object sender, EmphasiseEventArgs args)
             if (descendancy != null)
                 c = descendancy.Parents.OfType<Catalogue>().SingleOrDefault();
         }
-            
+
         if (c != null)
         {
             catalogueCollectionFilterUI1.EnsureVisible(c);
@@ -276,25 +288,20 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
             return;
         }
 
-        if( o is CatalogueItem || o is AggregateConfiguration ||
+        if (o is CatalogueItem || o is AggregateConfiguration ||
             o is ColumnInfo || o is TableInfo || o is ExtractionFilter || o is ExtractionFilterParameter ||
             o is ExtractionFilterParameterSet || o is ExtractionInformation ||
             o is AggregateFilterContainer || o is AggregateFilter || o is AggregateFilterParameter)
-        {
             //then refresh us
             RefreshUIFromDatabase(o);
-        }
 
         ApplyFilters();
     }
-        
+
     public static bool IsRootObject(object root)
     {
         // The root ICatalogue FolderNode is a root element in this tree
-        if(root is FolderNode<Catalogue> f)
-        {
-            return f.Name == FolderHelper.Root;
-        }
+        if (root is FolderNode<Catalogue> f) return f.Name == FolderHelper.Root;
 
         // as is the GovernanceNode
         return root is AllGovernanceNode;
diff --git a/Rdmp.UI/Collections/CherryPickingTailFilter.cs b/Rdmp.UI/Collections/CherryPickingTailFilter.cs
index 944eae0f9d..8e8780fe8b 100644
--- a/Rdmp.UI/Collections/CherryPickingTailFilter.cs
+++ b/Rdmp.UI/Collections/CherryPickingTailFilter.cs
@@ -24,7 +24,7 @@ internal class CherryPickingTailFilter : IListFilter
     /// </summary>
     /// <param name="numberOfObjects">The maximum number of objects to return (can be exceeded if there are <see cref="TextMatchFilterWithAlwaysShowList.AlwaysShow"/> objects)</param>
     /// <param name="modelFilter">The optional search/alwaysShowList filter from which objects should be returned from first</param>
-    public CherryPickingTailFilter(int numberOfObjects,TextMatchFilterWithAlwaysShowList modelFilter)
+    public CherryPickingTailFilter(int numberOfObjects, TextMatchFilterWithAlwaysShowList modelFilter)
     {
         _numberOfObjects = numberOfObjects;
         _modelFilter = modelFilter;
@@ -48,8 +48,10 @@ public IEnumerable Filter(IEnumerable modelObjects)
         var available = modelObjects.Cast<object>().ToList();
 
         //We will return the alwaysShowList objects for sure
-        var toReturn = hasAlwaysShowlist ? new HashSet<object>(available.Intersect(_modelFilter.AlwaysShow)) : new HashSet<object>();
-            
+        var toReturn = hasAlwaysShowlist
+            ? new HashSet<object>(available.Intersect(_modelFilter.AlwaysShow))
+            : new HashSet<object>();
+
         //but let's also take up to _numberOfObjects other objects that match the filter (if any)
         foreach (var a in available.Where(o => !hasSearchTokens || _modelFilter.Filter(o)))
         {
diff --git a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs
index ae0129d5c2..8394fe6418 100644
--- a/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs
+++ b/Rdmp.UI/Collections/CohortIdentificationCollectionUI.cs
@@ -40,60 +40,69 @@ public override void SetItemActivator(IActivateItems activator)
 
         //important to register the setup before the lifetime subscription so it gets priority on events
         CommonTreeFunctionality.SetUp(
-            RDMPCollection.Cohort, 
+            RDMPCollection.Cohort,
             tlvCohortIdentificationConfigurations,
             Activator,
-            olvName,//column with the icon
-            olvName//column that can be renamed
-                
+            olvName, //column with the icon
+            olvName //column that can be renamed
         );
-        CommonTreeFunctionality.AxeChildren = new[]{typeof (CohortIdentificationConfiguration), typeof(Core.Curation.Data.Aggregation.AggregateConfiguration) };
+        CommonTreeFunctionality.AxeChildren = new[]
+        {
+            typeof(CohortIdentificationConfiguration), typeof(Core.Curation.Data.Aggregation.AggregateConfiguration)
+        };
 
-        CommonTreeFunctionality.MaintainRootObjects = new[] {
-                typeof (FolderNode<CohortIdentificationConfiguration>),
-                typeof(AllOrphanAggregateConfigurationsNode),
-                typeof(AllTemplateAggregateConfigurationsNode)};
-        tlvCohortIdentificationConfigurations.AddObject(Activator.CoreChildProvider.CohortIdentificationConfigurationRootFolder);
+        CommonTreeFunctionality.MaintainRootObjects = new[]
+        {
+            typeof(FolderNode<CohortIdentificationConfiguration>),
+            typeof(AllOrphanAggregateConfigurationsNode),
+            typeof(AllTemplateAggregateConfigurationsNode)
+        };
+        tlvCohortIdentificationConfigurations.AddObject(Activator.CoreChildProvider
+            .CohortIdentificationConfigurationRootFolder);
         tlvCohortIdentificationConfigurations.AddObject(Activator.CoreChildProvider.OrphanAggregateConfigurationsNode);
-        tlvCohortIdentificationConfigurations.AddObject(Activator.CoreChildProvider.TemplateAggregateConfigurationsNode);
-        
-        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a=>new IAtomicCommand[]{
+        tlvCohortIdentificationConfigurations.AddObject(Activator.CoreChildProvider
+            .TemplateAggregateConfigurationsNode);
+
+        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => new IAtomicCommand[]
+        {
             new ExecuteCommandCreateNewCohortIdentificationConfiguration(a),
-            new ExecuteCommandMergeCohortIdentificationConfigurations(a,null)};
+            new ExecuteCommandMergeCohortIdentificationConfigurations(a, null)
+        };
 
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
 
         var factory = new AtomicCommandUIFactory(activator);
-            
-        CommonFunctionality.Add(factory.CreateMenuItem(new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator)),"New...");
-        CommonFunctionality.Add(factory.CreateMenuItem(new ExecuteCommandMergeCohortIdentificationConfigurations(Activator,null){OverrideCommandName = "By Merging Existing..."}),"New...");
+
+        CommonFunctionality.Add(
+            factory.CreateMenuItem(new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator)), "New...");
+        CommonFunctionality.Add(
+            factory.CreateMenuItem(new ExecuteCommandMergeCohortIdentificationConfigurations(Activator, null)
+                { OverrideCommandName = "By Merging Existing..." }), "New...");
 
         if (_firstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f8a42259-ce5a-4006-8ab8-e0305fce05aa"));
             CommonTreeFunctionality.SetupColumnTracking(olvFrozen, new Guid("d1e155ef-a28f-41b5-81e4-b763627ddb3c"));
 
-            tlvCohortIdentificationConfigurations.Expand(Activator.CoreChildProvider.CohortIdentificationConfigurationRootFolder);
+            tlvCohortIdentificationConfigurations.Expand(Activator.CoreChildProvider
+                .CohortIdentificationConfigurationRootFolder);
 
             _firstTime = false;
         }
     }
-        
+
     public static bool IsRootObject(object root)
     {
         // The root CohortIdentificationConfiguration FolderNode is a root element in this tree
-        if (root is FolderNode<CohortIdentificationConfiguration> f)
-        {
-            return f.Name == FolderHelper.Root;
-        }
+        if (root is FolderNode<CohortIdentificationConfiguration> f) return f.Name == FolderHelper.Root;
 
         return root is AllOrphanAggregateConfigurationsNode or AllTemplateAggregateConfigurationsNode;
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-
     }
+
     private string FrozenAspectGetter(object o)
     {
         if (o is CohortIdentificationConfiguration cic)
diff --git a/Rdmp.UI/Collections/DataExportCollectionUI.cs b/Rdmp.UI/Collections/DataExportCollectionUI.cs
index 596f28f5de..4e957e95a5 100644
--- a/Rdmp.UI/Collections/DataExportCollectionUI.cs
+++ b/Rdmp.UI/Collections/DataExportCollectionUI.cs
@@ -84,7 +84,7 @@ public override void SetItemActivator(IActivateItems activator)
         base.SetItemActivator(activator);
 
         CommonTreeFunctionality.SetUp(
-            RDMPCollection.DataExport, 
+            RDMPCollection.DataExport,
             tlvDataExport,
             Activator,
             olvName,
@@ -92,36 +92,36 @@ public override void SetItemActivator(IActivateItems activator)
         );
 
         CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => GetWhitespaceRightClickMenu();
-            
-        CommonTreeFunctionality.MaintainRootObjects = new Type[]{typeof(ExtractableDataSetPackage),typeof(FolderNode<Project>)};
+
+        CommonTreeFunctionality.MaintainRootObjects = new Type[]
+            { typeof(ExtractableDataSetPackage), typeof(FolderNode<Project>) };
 
         var dataExportChildProvider = activator.CoreChildProvider as DataExportChildProvider;
 
-        if(dataExportChildProvider != null)
+        if (dataExportChildProvider != null)
         {
             tlvDataExport.AddObjects(dataExportChildProvider.AllPackages);
             tlvDataExport.AddObject(dataExportChildProvider.ProjectRootFolder);
         }
-            
+
         if (_isFirstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("00a384ce-08fa-43fd-9cf3-7ddbbf5cec1c"));
-            CommonTreeFunctionality.SetupColumnTracking(olvProjectNumber, new Guid("2a1764d4-8871-4488-b068-8940b777f90e"));
-            CommonTreeFunctionality.SetupColumnTracking(olvCohortSource, new Guid("c4dabcc3-ccc9-4c9b-906b-e8106e8b616c"));
-            CommonTreeFunctionality.SetupColumnTracking(olvCohortVersion, new Guid("2d0f8d32-090d-4d2b-8cfe-b6d16f5cc419"));
+            CommonTreeFunctionality.SetupColumnTracking(olvProjectNumber,
+                new Guid("2a1764d4-8871-4488-b068-8940b777f90e"));
+            CommonTreeFunctionality.SetupColumnTracking(olvCohortSource,
+                new Guid("c4dabcc3-ccc9-4c9b-906b-e8106e8b616c"));
+            CommonTreeFunctionality.SetupColumnTracking(olvCohortVersion,
+                new Guid("2d0f8d32-090d-4d2b-8cfe-b6d16f5cc419"));
+
+            if (dataExportChildProvider != null) tlvDataExport.Expand(dataExportChildProvider.ProjectRootFolder);
 
-            if(dataExportChildProvider != null)
-            {
-                tlvDataExport.Expand(dataExportChildProvider.ProjectRootFolder);
-            }
-                
             _isFirstTime = false;
         }
 
         SetupToolStrip();
 
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
-
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
@@ -132,36 +132,43 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     private void SetupToolStrip()
     {
         CommonFunctionality.ClearToolStrip();
-        CommonFunctionality.Add(new ExecuteCommandCreateNewDataExtractionProject(Activator),"Project",null,NewMenu);
-        CommonFunctionality.Add(new ToolStripSeparator(),NewMenu);
+        CommonFunctionality.Add(new ExecuteCommandCreateNewDataExtractionProject(Activator), "Project", null, NewMenu);
+        CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
         CommonFunctionality.Add(new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator)
-            { PromptToPickAProject = true}, "Cohort Builder Query", null, NewMenu);
+            { PromptToPickAProject = true }, "Cohort Builder Query", null, NewMenu);
 
         var uiFactory = new AtomicCommandUIFactory(Activator);
         var cohortSubmenu = new ToolStripMenuItem("Cohort");
         cohortSubmenu.DropDownItems.AddRange(
-            new[] {
-                
+            new[]
+            {
                 // from cic
-                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null) { OverrideCommandName = "From Cohort Builder Query" }),
+                uiFactory.CreateMenuItem(
+                    new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null)
+                        { OverrideCommandName = "From Cohort Builder Query" }),
 
                 // from file
-                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromFile(Activator, null) { OverrideCommandName = "From File" }),
+                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromFile(Activator, null)
+                    { OverrideCommandName = "From File" }),
 
                 // from catalogue
-                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromCatalogue(Activator,(Catalogue)null) { OverrideCommandName = "From Catalogue" }),
-                
+                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromCatalogue(Activator, (Catalogue)null)
+                    { OverrideCommandName = "From Catalogue" }),
+
                 // from table
-                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromTable(Activator,null) { OverrideCommandName = "From Table" })
+                uiFactory.CreateMenuItem(new ExecuteCommandCreateNewCohortFromTable(Activator, null)
+                    { OverrideCommandName = "From Table" })
             });
         CommonFunctionality.Add(cohortSubmenu, NewMenu);
         CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-        CommonFunctionality.Add(new ExecuteCommandCreateNewExtractionConfigurationForProject(Activator),"Extraction Configuration",null,NewMenu);
+        CommonFunctionality.Add(new ExecuteCommandCreateNewExtractionConfigurationForProject(Activator),
+            "Extraction Configuration", null, NewMenu);
         CommonFunctionality.Add(new ToolStripSeparator(), NewMenu);
 
-        var mi = new ToolStripMenuItem("Project Specific Catalogue",Activator.CoreIconProvider.GetImage(RDMPConcept.ProjectCatalogue,OverlayKind.Add).ImageToBitmap());
+        var mi = new ToolStripMenuItem("Project Specific Catalogue",
+            Activator.CoreIconProvider.GetImage(RDMPConcept.ProjectCatalogue, OverlayKind.Add).ImageToBitmap());
 
         var factory = new AtomicCommandUIFactory(Activator);
         mi.DropDownItems.Add(factory.CreateMenuItem(new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator)
@@ -170,36 +177,57 @@ private void SetupToolStrip()
             PromptForProject = true
         }));
 
-        mi.DropDownItems.Add(factory.CreateMenuItem(new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator)
-        {
-            OverrideCommandName = "From Database...",
-            PromptForProject = true
-        }));
+        mi.DropDownItems.Add(factory.CreateMenuItem(
+            new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator)
+            {
+                OverrideCommandName = "From Database...",
+                PromptForProject = true
+            }));
 
-        CommonFunctionality.Add(mi,NewMenu);
-        CommonFunctionality.Add(new ExecuteCommandCreateNewExtractableDataSetPackage(Activator), "Package", null, NewMenu);
+        CommonFunctionality.Add(mi, NewMenu);
+        CommonFunctionality.Add(new ExecuteCommandCreateNewExtractableDataSetPackage(Activator), "Package", null,
+            NewMenu);
     }
 
 
     private IAtomicCommand[] GetWhitespaceRightClickMenu()
     {
-
         return new IAtomicCommand[]
         {
-            new ExecuteCommandCreateNewDataExtractionProject(Activator) { OverrideCommandName = "Add New Project",Weight = -10 },
-            new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator) { PromptToPickAProject = true, OverrideCommandName = "Add New Cohort Builder Query" ,Weight = -4.95f },
-            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null) { OverrideCommandName = "From Cohort Builder Query",SuggestedCategory = "Add New Cohort", Weight = -4.9f},
-            new ExecuteCommandCreateNewCohortFromFile(Activator, null) { OverrideCommandName = "From File" ,SuggestedCategory = "Add New Cohort",Weight = -4.8f},
-            new ExecuteCommandCreateNewCohortFromCatalogue(Activator,(Catalogue)null) { OverrideCommandName = "From Catalogue" ,SuggestedCategory = "Add New Cohort",Weight = -4.7f},
-            new ExecuteCommandCreateNewCohortFromTable(Activator,null) { OverrideCommandName = "From Table" ,SuggestedCategory = "Add New Cohort",Weight = -4.6f},
-            new ExecuteCommandCreateNewExtractionConfigurationForProject(Activator){OverrideCommandName = "Add New Extraction Configuration" ,Weight = -2f},
-            new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator) { OverrideCommandName = "From File...",SuggestedCategory = "Add New Project Specific Catalogue" ,Weight = -1.9f},
-            new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator) { OverrideCommandName = "From Database...",SuggestedCategory = "Add New Project Specific Catalogue" ,Weight = -1.8f},
-            new ExecuteCommandCreateNewExtractableDataSetPackage(Activator){ OverrideCommandName = "Add New Package" , Weight = -1.7f}
+            new ExecuteCommandCreateNewDataExtractionProject(Activator)
+                { OverrideCommandName = "Add New Project", Weight = -10 },
+            new ExecuteCommandCreateNewCohortIdentificationConfiguration(Activator)
+            {
+                PromptToPickAProject = true, OverrideCommandName = "Add New Cohort Builder Query", Weight = -4.95f
+            },
+            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null)
+            {
+                OverrideCommandName = "From Cohort Builder Query", SuggestedCategory = "Add New Cohort", Weight = -4.9f
+            },
+            new ExecuteCommandCreateNewCohortFromFile(Activator, null)
+                { OverrideCommandName = "From File", SuggestedCategory = "Add New Cohort", Weight = -4.8f },
+            new ExecuteCommandCreateNewCohortFromCatalogue(Activator, (Catalogue)null)
+            {
+                OverrideCommandName = "From Catalogue", SuggestedCategory = "Add New Cohort", Weight = -4.7f
+            },
+            new ExecuteCommandCreateNewCohortFromTable(Activator, null)
+                { OverrideCommandName = "From Table", SuggestedCategory = "Add New Cohort", Weight = -4.6f },
+            new ExecuteCommandCreateNewExtractionConfigurationForProject(Activator)
+                { OverrideCommandName = "Add New Extraction Configuration", Weight = -2f },
+            new ExecuteCommandCreateNewCatalogueByImportingFileUI(Activator)
+            {
+                OverrideCommandName = "From File...", SuggestedCategory = "Add New Project Specific Catalogue",
+                Weight = -1.9f
+            },
+            new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(Activator)
+            {
+                OverrideCommandName = "From Database...", SuggestedCategory = "Add New Project Specific Catalogue",
+                Weight = -1.8f
+            },
+            new ExecuteCommandCreateNewExtractableDataSetPackage(Activator)
+                { OverrideCommandName = "Add New Package", Weight = -1.7f }
         };
     }
-    public static bool IsRootObject(object root)
-    {
-        return root is FolderNode<Project> || root is ExtractableDataSetPackage;
-    }
+
+    public static bool IsRootObject(object root) => root is FolderNode<Project> || root is ExtractableDataSetPackage;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/FavouritesCollectionUI.cs b/Rdmp.UI/Collections/FavouritesCollectionUI.cs
index b175131088..6f245e99d4 100644
--- a/Rdmp.UI/Collections/FavouritesCollectionUI.cs
+++ b/Rdmp.UI/Collections/FavouritesCollectionUI.cs
@@ -25,6 +25,7 @@ public partial class FavouritesCollectionUI : RDMPCollectionUI, ILifetimeSubscri
 {
     private List<IMapsDirectlyToDatabaseTable> favourites = new();
     private bool _firstTime = true;
+
     public FavouritesCollectionUI()
     {
         InitializeComponent();
@@ -34,7 +35,8 @@ public override void SetItemActivator(IActivateItems activator)
     {
         base.SetItemActivator(activator);
 
-        CommonTreeFunctionality.SetUp(RDMPCollection.Favourites,tlvFavourites,Activator,olvName,olvName,new RDMPCollectionCommonFunctionalitySettings());
+        CommonTreeFunctionality.SetUp(RDMPCollection.Favourites, tlvFavourites, Activator, olvName, olvName,
+            new RDMPCollectionCommonFunctionalitySettings());
         CommonTreeFunctionality.AxeChildren = new Type[] { typeof(CohortIdentificationConfiguration) };
         CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter =
             a => new IAtomicCommand[]
@@ -43,15 +45,14 @@ public override void SetItemActivator(IActivateItems activator)
                 new ExecuteCommandClearFavourites(a)
             };
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
-            
+
         RefreshFavourites();
 
-        if(_firstTime)
+        if (_firstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f8b0481e-378c-4996-9400-cb039c2efc5c"));
             _firstTime = false;
         }
-
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
@@ -61,8 +62,8 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
 
     private void RefreshFavourites()
     {
-        var actualRootFavourites = FindRootObjects(Activator,IncludeObject);
-            
+        var actualRootFavourites = FindRootObjects(Activator, IncludeObject);
+
         //no change in root favouratism
         if (favourites.SequenceEqual(actualRootFavourites))
             return;
@@ -86,9 +87,11 @@ private void RefreshFavourites()
     /// <param name="activator"></param>
     /// <param name="condition"></param>
     /// <returns></returns>
-    public static List<IMapsDirectlyToDatabaseTable> FindRootObjects(IActivateItems activator, Func<IMapsDirectlyToDatabaseTable, bool> condition)
+    public static List<IMapsDirectlyToDatabaseTable> FindRootObjects(IActivateItems activator,
+        Func<IMapsDirectlyToDatabaseTable, bool> condition)
     {
-        var potentialRootFavourites = activator.CoreChildProvider.GetAllSearchables().Where(k=>condition(k.Key)).ToArray();
+        var potentialRootFavourites =
+            activator.CoreChildProvider.GetAllSearchables().Where(k => condition(k.Key)).ToArray();
 
         var hierarchyCollisions = new List<IMapsDirectlyToDatabaseTable>();
 
@@ -96,7 +99,7 @@ public static List<IMapsDirectlyToDatabaseTable> FindRootObjects(IActivateItems
         foreach (var currentFavourite in potentialRootFavourites)
         {
             //current favourite is an absolute root object Type (no parents)
-            if(currentFavourite.Value == null)
+            if (currentFavourite.Value == null)
                 continue;
 
             //if any of the current favourites parents
@@ -104,16 +107,14 @@ public static List<IMapsDirectlyToDatabaseTable> FindRootObjects(IActivateItems
                 //are favourites
                 if (potentialRootFavourites.Any(kvp => kvp.Key.Equals(parent)))
                     //then this is not a favourite it's a collision (already favourited under another node)
-                    hierarchyCollisions.Add(currentFavourite.Key);    
+                    hierarchyCollisions.Add(currentFavourite.Key);
         }
 
         var actualRootFavourites = new List<IMapsDirectlyToDatabaseTable>();
 
         foreach (var currentFavourite in potentialRootFavourites)
-        {
             if (!hierarchyCollisions.Contains(currentFavourite.Key))
                 actualRootFavourites.Add(currentFavourite.Key);
-        }
 
         return actualRootFavourites;
     }
@@ -124,14 +125,10 @@ public static List<IMapsDirectlyToDatabaseTable> FindRootObjects(IActivateItems
     /// </summary>
     /// <param name="key"></param>
     /// <returns></returns>
-    protected virtual bool IncludeObject(IMapsDirectlyToDatabaseTable key)
-    {
-        return Activator.FavouritesProvider.IsFavourite(key);
-    }
+    protected virtual bool IncludeObject(IMapsDirectlyToDatabaseTable key) =>
+        Activator.FavouritesProvider.IsFavourite(key);
 
-    public static bool IsRootObject(IActivateItems activator, object root)
-    {
+    public static bool IsRootObject(IActivateItems activator, object root) =>
         //never favourite
-        return false;
-    }
+        false;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs b/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs
index 377a199cba..5c7540f16b 100644
--- a/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs
+++ b/Rdmp.UI/Collections/LoadMetadataCollectionUI.cs
@@ -66,12 +66,12 @@ public LoadMetadataCollectionUI()
         tlvLoadMetadata.RowHeight = 19;
         olvValue.AspectGetter = s => (s as IArgument)?.Value;
     }
-        
-    public override void SetItemActivator(IActivateItems activator) 
+
+    public override void SetItemActivator(IActivateItems activator)
     {
         base.SetItemActivator(activator);
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
-            
+
         CommonTreeFunctionality.SetUp(
             RDMPCollection.DataLoad,
             tlvLoadMetadata,
@@ -79,17 +79,18 @@ public override void SetItemActivator(IActivateItems activator)
             olvName,
             olvName);
 
-        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a=>new IAtomicCommand[] {new ExecuteCommandCreateNewLoadMetadata(a)};
-            
+        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => new IAtomicCommand[]
+            { new ExecuteCommandCreateNewLoadMetadata(a) };
+
         tlvLoadMetadata.AddObject(Activator.CoreChildProvider.AllPermissionWindowsNode);
         tlvLoadMetadata.AddObject(Activator.CoreChildProvider.LoadMetadataRootFolder);
 
         BuildCommandList();
 
-        if(_isFirstTime)
+        if (_isFirstTime)
         {
-            CommonTreeFunctionality.SetupColumnTracking(olvName,new Guid("f84e8217-6b3c-4eb4-a314-fbd95b51c422"));
-            CommonTreeFunctionality.SetupColumnTracking(olvValue,new Guid("facab93a-6950-4815-9f5f-5f076277adb5"));
+            CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("f84e8217-6b3c-4eb4-a314-fbd95b51c422"));
+            CommonTreeFunctionality.SetupColumnTracking(olvValue, new Guid("facab93a-6950-4815-9f5f-5f076277adb5"));
 
             tlvLoadMetadata.Expand(Activator.CoreChildProvider.LoadMetadataRootFolder);
 
@@ -111,14 +112,11 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
 
         BuildCommandList();
     }
-        
+
     public static bool IsRootObject(object root)
     {
         // The root LoadMetadata FolderNode is a root element in this tree
-        if (root is FolderNode<LoadMetadata> f)
-        {
-            return f.Name == FolderHelper.Root;
-        }
+        if (root is FolderNode<LoadMetadata> f) return f.Name == FolderHelper.Root;
 
         return
             root is AllPermissionWindowsNode;
diff --git a/Rdmp.UI/Collections/Providers/CheckColumnProvider.cs b/Rdmp.UI/Collections/Providers/CheckColumnProvider.cs
index 8e0a721d3a..69665334ea 100644
--- a/Rdmp.UI/Collections/Providers/CheckColumnProvider.cs
+++ b/Rdmp.UI/Collections/Providers/CheckColumnProvider.cs
@@ -45,6 +45,7 @@ public OLVColumn CreateColumn()
     }
 
     private Task checkingTask;
+
     public void CheckCheckables()
     {
         if (checkingTask != null && !checkingTask.IsCompleted)
@@ -62,13 +63,15 @@ public void CheckCheckables()
         checkingTask = new Task(() =>
         {
             //only check the items that are visible int he listview
-            foreach (var checkable in GetCheckables())//make copy to prevent synchronization issues
+            foreach (var checkable in GetCheckables()) //make copy to prevent synchronization issues
             {
                 var notifier = new ToMemoryCheckNotifier();
                 checkable.Check(notifier);
 
                 lock (ocheckResultsDictionaryLock)
+                {
                     checkResultsDictionary.Add(checkable, notifier.GetWorst());
+                }
             }
         });
 
@@ -88,7 +91,7 @@ public void EnsureChecksColumnVisible()
             return;
         }
 
-        var checksCol = _tree.AllColumns.FirstOrDefault(c=>string.Equals(c.Text,ChecksColumnName));
+        var checksCol = _tree.AllColumns.FirstOrDefault(c => string.Equals(c.Text, ChecksColumnName));
 
         if (checksCol != null && !checksCol.IsVisible)
         {
@@ -124,14 +127,11 @@ private Bitmap CheckImageGetter(object rowobject)
         {
             if (checkResultsDictionary.TryGetValue(checkable, out var value))
                 return _iconProvider.GetImage(value).ImageToBitmap();
-
         }
+
         //not been checked yet
         return null;
     }
 
-    public IEnumerable<ICheckable> GetCheckables()
-    {
-        return _tree.FilteredObjects.OfType<ICheckable>();
-    }
+    public IEnumerable<ICheckable> GetCheckables() => _tree.FilteredObjects.OfType<ICheckable>();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/Copying/CopyPasteProvider.cs b/Rdmp.UI/Collections/Providers/Copying/CopyPasteProvider.cs
index 3be6ada18c..28bb5284f8 100644
--- a/Rdmp.UI/Collections/Providers/Copying/CopyPasteProvider.cs
+++ b/Rdmp.UI/Collections/Providers/Copying/CopyPasteProvider.cs
@@ -34,6 +34,5 @@ private void TreeOnKeyUp(object sender, KeyEventArgs keyEventArgs)
             if (command != null)
                 Clipboard.SetDataObject(command);
         }
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/Copying/DragDropProvider.cs b/Rdmp.UI/Collections/Providers/Copying/DragDropProvider.cs
index 6a34667c74..1ecf4a9f4a 100644
--- a/Rdmp.UI/Collections/Providers/Copying/DragDropProvider.cs
+++ b/Rdmp.UI/Collections/Providers/Copying/DragDropProvider.cs
@@ -22,13 +22,14 @@ namespace Rdmp.UI.Collections.Providers.Copying;
 /// Provides UI code for drag and drop in <see cref="TreeListView"/>.  The code for what is/isn't draggable onto what is determined
 /// by the <see cref="ICommandExecutionFactory"/>.
 /// </summary>
-public class DragDropProvider:SimpleDragSource
+public class DragDropProvider : SimpleDragSource
 {
     private readonly ICombineableFactory _commandFactory;
     private readonly ICommandExecutionFactory _commandExecutionFactory;
     private readonly TreeListView _treeView;
 
-    public DragDropProvider(ICombineableFactory commandFactory, ICommandExecutionFactory commandExecutionFactory, TreeListView treeView)
+    public DragDropProvider(ICombineableFactory commandFactory, ICommandExecutionFactory commandExecutionFactory,
+        TreeListView treeView)
     {
         _commandFactory = commandFactory;
         _commandExecutionFactory = commandExecutionFactory;
@@ -38,7 +39,7 @@ public DragDropProvider(ICombineableFactory commandFactory, ICommandExecutionFac
         _treeView.DragSource = this;
 
         _treeView.IsSimpleDropSink = true;
-            
+
         ((SimpleDropSink)_treeView.DropSink).CanDrop += DragDropProvider_CanDrop;
         ((SimpleDropSink)_treeView.DropSink).Dropped += DragDropProvider_Dropped;
 
@@ -50,17 +51,16 @@ private void DragDropProvider_CanDrop(object sender, OlvDropEventArgs e)
     {
         var dropTargetModel = e.DropTargetItem?.RowObject;
 
-        if(e.DataObject is not DataObject dataObject)
+        if (e.DataObject is not DataObject dataObject)
             return;
 
-        if(dataObject is OLVDataObject)
+        if (dataObject is OLVDataObject)
             return; //should be handled by ModelCanDrop
 
-        var execution = GetExecutionCommandIfAnyForNonModelObjects(dataObject,dropTargetModel);
+        var execution = GetExecutionCommandIfAnyForNonModelObjects(dataObject, dropTargetModel);
 
-        if(execution != null)
+        if (execution != null)
             DisplayFeedback(execution, e);
-
     }
 
     private void ModelCanDrop(object sender, ModelDropEventArgs e)
@@ -81,22 +81,21 @@ private void ModelCanDrop(object sender, ModelDropEventArgs e)
         var execution = _commandExecutionFactory.Create(cmd, e.TargetModel, GetDropLocation(e));
 
         DisplayFeedback(execution, e);
-
     }
 
     private void DragDropProvider_Dropped(object sender, OlvDropEventArgs e)
     {
         try
         {
-            var dataObject = (DataObject) e.DataObject;
+            var dataObject = (DataObject)e.DataObject;
 
-            if(dataObject is OLVDataObject)
-                return;  //should be handled by ModelDropped
+            if (dataObject is OLVDataObject)
+                return; //should be handled by ModelDropped
 
             //is it a non model drop (in which case ModelDropped won't be called) e.g. it could be a file drop
             var execution = GetExecutionCommandIfAnyForNonModelObjects(dataObject, e.DropTargetItem.RowObject);
 
-            if(execution != null && !execution.IsImpossible)
+            if (execution != null && !execution.IsImpossible)
                 execution.Execute();
         }
         catch (Exception exception)
@@ -124,7 +123,8 @@ private void ModelDropped(object sender, ModelDropEventArgs e)
             }
             catch (Exception exception)
             {
-                ExceptionViewer.Show($"ExecuteCommand {execution.GetType().Name} failed, See Exception for details", exception);
+                ExceptionViewer.Show($"ExecuteCommand {execution.GetType().Name} failed, See Exception for details",
+                    exception);
             }
     }
 
@@ -157,12 +157,12 @@ private ICommandExecution GetExecutionCommandIfAnyForNonModelObjects(DataObject
 
     public override object StartDrag(ObjectListView olv, MouseButtons button, OLVListItem item)
     {
-        var rowObject = item.RowObject;//get the dragged object
-            
-        if(olv.SelectedObjects.Count > 1)
+        var rowObject = item.RowObject; //get the dragged object
+
+        if (olv.SelectedObjects.Count > 1)
             rowObject = olv.SelectedObjects.Cast<object>().ToArray();
 
-        if(rowObject != null)
+        if (rowObject != null)
         {
             //get the drag operation data object olv does
             var toReturn = (OLVDataObject)base.StartDrag(olv, button, item);
@@ -171,7 +171,7 @@ public override object StartDrag(ObjectListView olv, MouseButtons button, OLVLis
             var command = _commandFactory.Create(toReturn);
 
             if (command == null)
-                return null;//it couldn't become a command so leave it as a model object
+                return null; //it couldn't become a command so leave it as a model object
 
             //yes, let's hot swap the data object in the drag command, that couldn't possibly go wrong right?
             toReturn.ModelObjects.Clear();
@@ -183,7 +183,6 @@ public override object StartDrag(ObjectListView olv, MouseButtons button, OLVLis
     }
 
 
-
     private static void DisplayFeedback(ICommandExecution execution, OlvDropEventArgs e)
     {
         //no command is even remotely possible
@@ -220,5 +219,4 @@ private static InsertOption GetDropLocation(ModelDropEventArgs e)
 
         return InsertOption.Default;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs b/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs
index b660bd891a..6df5f2ca17 100644
--- a/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs
+++ b/Rdmp.UI/Collections/Providers/FavouriteColumnProvider.cs
@@ -27,8 +27,7 @@ public class FavouriteColumnProvider
     private Bitmap _starHollow;
 
 
-
-    public FavouriteColumnProvider(IActivateItems activator,TreeListView tlv)
+    public FavouriteColumnProvider(IActivateItems activator, TreeListView tlv)
     {
         _activator = activator;
         _tlv = tlv;
@@ -78,7 +77,6 @@ private void OnCellClick(object sender, CellClickEventArgs cellClickEventArgs)
             }
             catch (ArgumentException)
             {
-
             }
         }
     }
@@ -91,6 +89,7 @@ private Bitmap FavouriteImageGetter(object rowobject)
 
         return null;
     }
+
     private object FavouriteAspectGetter(object rowobject)
     {
         if (rowobject is DatabaseEntity o)
@@ -99,5 +98,4 @@ private object FavouriteAspectGetter(object rowobject)
 
         return null;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/Filtering/CatalogueCollectionFilter.cs b/Rdmp.UI/Collections/Providers/Filtering/CatalogueCollectionFilter.cs
index 686a325fc3..d1e6804a7d 100644
--- a/Rdmp.UI/Collections/Providers/Filtering/CatalogueCollectionFilter.cs
+++ b/Rdmp.UI/Collections/Providers/Filtering/CatalogueCollectionFilter.cs
@@ -34,8 +34,7 @@ public CatalogueCollectionFilter(ICoreChildProvider childProvider)
         _isNonExtractable = UserSettings.ShowNonExtractableCatalogues;
     }
 
-    public bool Filter(object modelObject)
-    {
-        return SearchablesMatchScorer.Filter(modelObject, ChildProvider.GetDescendancyListIfAnyFor(modelObject), _isInternal, _isDeprecated, _isColdStorage, _isProjectSpecific, _isNonExtractable);
-    }
+    public bool Filter(object modelObject) => SearchablesMatchScorer.Filter(modelObject,
+        ChildProvider.GetDescendancyListIfAnyFor(modelObject), _isInternal, _isDeprecated, _isColdStorage,
+        _isProjectSpecific, _isNonExtractable);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/HistoryEntry.cs b/Rdmp.UI/Collections/Providers/HistoryEntry.cs
index 5999df4fef..bc3f0484fd 100644
--- a/Rdmp.UI/Collections/Providers/HistoryEntry.cs
+++ b/Rdmp.UI/Collections/Providers/HistoryEntry.cs
@@ -23,7 +23,6 @@ public class HistoryEntry : IMasqueradeAs
 
     private HistoryEntry()
     {
-            
     }
 
     public HistoryEntry(IMapsDirectlyToDatabaseTable o, DateTime date)
@@ -50,9 +49,9 @@ public static HistoryEntry Deserialize(string s, IRDMPPlatformRepositoryServiceL
             var objectString = s[..s.IndexOf(PersistStringHelper.ExtraText)];
 
 
-            e.Object = PersistStringHelper.GetObjectCollectionFromPersistString(objectString,locator).Single();
+            e.Object = PersistStringHelper.GetObjectCollectionFromPersistString(objectString, locator).Single();
         }
-        catch (PersistenceException )
+        catch (PersistenceException)
         {
             return null;
         }
@@ -61,26 +60,17 @@ public static HistoryEntry Deserialize(string s, IRDMPPlatformRepositoryServiceL
     }
 
 
-    protected bool Equals(HistoryEntry other)
-    {
-        return Equals(Object, other.Object);
-    }
+    protected bool Equals(HistoryEntry other) => Equals(Object, other.Object);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((HistoryEntry) obj);
+        return Equals((HistoryEntry)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return Object != null ? Object.GetHashCode() : 0;
-    }
+    public override int GetHashCode() => Object != null ? Object.GetHashCode() : 0;
 
-    public object MasqueradingAs()
-    {
-        return Object;
-    }
+    public object MasqueradingAs() => Object;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/Providers/HistoryProvider.cs b/Rdmp.UI/Collections/Providers/HistoryProvider.cs
index c7a22a3c59..fbb21a872f 100644
--- a/Rdmp.UI/Collections/Providers/HistoryProvider.cs
+++ b/Rdmp.UI/Collections/Providers/HistoryProvider.cs
@@ -26,19 +26,20 @@ public class HistoryProvider
     /// <summary>
     /// Collection of objects and when they were accessed, use <see cref="HistoryProvider.Add"/> instead of modifying this list directly
     /// </summary>
-    public List<HistoryEntry> History { get; set; } = new List<HistoryEntry>();
+    public List<HistoryEntry> History { get; set; } = new();
 
     /// <summary>
     /// What Types to track in <see cref="Add"/>
     /// </summary>
-    public Type[] TrackTypes { get; set; } = {
+    public Type[] TrackTypes { get; set; } =
+    {
         typeof(Catalogue),
         typeof(Project),
         typeof(ExtractionConfiguration),
         typeof(CohortIdentificationConfiguration),
         typeof(LoadMetadata)
     };
-        
+
     /// <summary>
     /// Creates a new history provider and loads the users history from the persistence file (<see cref="UserSettings.RecentHistory"/>)
     /// </summary>
@@ -48,20 +49,19 @@ public HistoryProvider(IRDMPPlatformRepositoryServiceLocator locator)
         try
         {
             var history = UserSettings.RecentHistory;
-            
+
             if (string.IsNullOrWhiteSpace(history))
                 return;
 
-            foreach (var s in history.Split(new []{Environment.NewLine},StringSplitOptions.RemoveEmptyEntries))
+            foreach (var s in history.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries))
             {
                 var entry = HistoryEntry.Deserialize(s, locator);
-                
-                if(entry != null)
+
+                if (entry != null)
                     History.Add(entry);
             }
-
         }
-        catch (Exception )
+        catch (Exception)
         {
             //error reading persisted history, maybe history file is corrupt or something
             return;
@@ -79,12 +79,11 @@ public void Save(int numberOfEntries = 20)
 
         foreach (var group in History.GroupBy(o => o.Object.GetType()))
         {
-            var recentsOfType = group.ToList().OrderByDescending(e=>e.Date).Take(numberOfEntries).ToList();
-                
+            var recentsOfType = group.ToList().OrderByDescending(e => e.Date).Take(numberOfEntries).ToList();
+
             //save x of each Type
-            sb.AppendLine(string.Join(Environment.NewLine,recentsOfType.Select(h=>h.Serialize())));
+            sb.AppendLine(string.Join(Environment.NewLine, recentsOfType.Select(h => h.Serialize())));
             newHistory.AddRange(recentsOfType);
-                
         }
 
         History = newHistory;
@@ -98,10 +97,10 @@ public void Save(int numberOfEntries = 20)
     /// <param name="o"></param>
     public void Add(IMapsDirectlyToDatabaseTable o)
     {
-        if(o == null)
+        if (o == null)
             return;
 
-        if(!TrackTypes.Contains(o.GetType()))
+        if (!TrackTypes.Contains(o.GetType()))
             return;
 
         var newEntry = new HistoryEntry(o, DateTime.Now);
@@ -126,7 +125,7 @@ public void Clear()
 
     public void Remove(IMapsDirectlyToDatabaseTable o)
     {
-        if(o == null)
+        if (o == null)
             return;
 
         foreach (var historyEntry in History.Where(h => h.Object.Equals(o)).ToArray())
diff --git a/Rdmp.UI/Collections/Providers/IDColumnProvider.cs b/Rdmp.UI/Collections/Providers/IDColumnProvider.cs
index 899f3a75c7..29eec78076 100644
--- a/Rdmp.UI/Collections/Providers/IDColumnProvider.cs
+++ b/Rdmp.UI/Collections/Providers/IDColumnProvider.cs
@@ -26,15 +26,9 @@ public IDColumnProvider(TreeListView tree)
     private object IDColumnAspectGetter(object rowObject)
     {
         // unwrap masqueraders to see if underlying object has an ID
-        if(rowObject is IMasqueradeAs m)
-        {
-            return IDColumnAspectGetter(m.MasqueradingAs());
-        }
+        if (rowObject is IMasqueradeAs m) return IDColumnAspectGetter(m.MasqueradingAs());
 
-        if (rowObject is IMapsDirectlyToDatabaseTable imaps)
-        {
-            return imaps.ID;
-        }
+        if (rowObject is IMapsDirectlyToDatabaseTable imaps) return imaps.ID;
 
         return null;
     }
diff --git a/Rdmp.UI/Collections/Providers/RenameProvider.cs b/Rdmp.UI/Collections/Providers/RenameProvider.cs
index 56cdefb198..305b673685 100644
--- a/Rdmp.UI/Collections/Providers/RenameProvider.cs
+++ b/Rdmp.UI/Collections/Providers/RenameProvider.cs
@@ -24,14 +24,17 @@ public class RenameProvider
     private readonly IActivateItems _activator;
     private readonly ObjectListView _olv;
     private readonly OLVColumn _columnThatSupportsRenaming;
-        
-    public bool AllowRenaming {  
+
+    public bool AllowRenaming
+    {
         get => _columnThatSupportsRenaming.IsEditable;
         set
         {
-            _olv.CellEditActivation = value ? ObjectListView.CellEditActivateMode.SingleClick : ObjectListView.CellEditActivateMode.None;
+            _olv.CellEditActivation =
+                value ? ObjectListView.CellEditActivateMode.SingleClick : ObjectListView.CellEditActivateMode.None;
             _columnThatSupportsRenaming.IsEditable = value;
-        } }
+        }
+    }
 
     public RenameProvider(IActivateItems activator, ObjectListView olv, OLVColumn columnThatSupportsRenaming)
     {
@@ -49,8 +52,8 @@ public void RegisterEvents()
         _columnThatSupportsRenaming.AutoCompleteEditorMode = AutoCompleteMode.None;
 
         AllowRenaming = true;
-
     }
+
     private void OlvOnCellEditStarting(object sender, CellEditEventArgs e)
     {
         //it's not for our name column
@@ -63,14 +66,14 @@ private void OlvOnCellEditStarting(object sender, CellEditEventArgs e)
 
     private void OlvOnCellEditFinishing(object sender, CellEditEventArgs e)
     {
-        if(e.RowObject == null)
+        if (e.RowObject == null)
             return;
-            
-        if(e.Column != _columnThatSupportsRenaming)
+
+        if (e.Column != _columnThatSupportsRenaming)
             return;
 
         //don't let them rename things to blank names
-        if (string.IsNullOrWhiteSpace((string) e.NewValue))
+        if (string.IsNullOrWhiteSpace((string)e.NewValue))
         {
             e.Cancel = true;
             return;
@@ -82,14 +85,13 @@ private void OlvOnCellEditFinishing(object sender, CellEditEventArgs e)
         {
             if (name != null)
             {
-                var cmd = new ExecuteCommandRename(_activator, name, (string) e.NewValue);
+                var cmd = new ExecuteCommandRename(_activator, name, (string)e.NewValue);
 
-                if(cmd.IsImpossible)
+                if (cmd.IsImpossible)
                     MessageBox.Show(cmd.ReasonCommandImpossible);
                 else
                     cmd.Execute();
             }
-                    
         }
         catch (Exception exception)
         {
@@ -101,5 +103,4 @@ private void OlvOnCellEditFinishing(object sender, CellEditEventArgs e)
                 name.Name = (string)e.Value;
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs
index fa56d30778..06067f54da 100644
--- a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs
+++ b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionality.cs
@@ -67,7 +67,7 @@ public partial class RDMPCollectionCommonFunctionality : IRefreshBusSubscriber
 
     public bool IsSetup { get; private set; }
 
-    public Func<IActivateItems,IAtomicCommand[]> WhitespaceRightClickMenuCommandsGetter { get; set; }
+    public Func<IActivateItems, IAtomicCommand[]> WhitespaceRightClickMenuCommandsGetter { get; set; }
 
     public IDColumnProvider IDColumnProvider { get; set; }
     public OLVColumn IDColumn { get; set; }
@@ -87,15 +87,15 @@ public partial class RDMPCollectionCommonFunctionality : IRefreshBusSubscriber
 
     public event EventHandler<MenuBuiltEventArgs> MenuBuilt;
 
-    private static readonly Dictionary<RDMPCollection,Guid> TreeGuids = new()
+    private static readonly Dictionary<RDMPCollection, Guid> TreeGuids = new()
     {
-        {RDMPCollection.Tables,new Guid("8f24d624-acad-45dd-862b-01b18dfdd9a2")},
-        {RDMPCollection.Catalogue,new Guid("d0f72b03-63f1-487e-9afa-51c03afa7819")},
-        {RDMPCollection.DataExport,new Guid("9fb651f6-3e4f-4629-b64e-f61551ae009e")},
-        {RDMPCollection.SavedCohorts,new Guid("6d0e4560-9357-4ee1-91b6-a182a57f7a6f")},
-        {RDMPCollection.Cohort,new Guid("5c7cceb3-4202-47b1-b271-e2eed869d9ef")},
-        {RDMPCollection.Favourites,new Guid("39d37439-ac7a-4346-8c79-9867384db92e")},
-        {RDMPCollection.DataLoad,new Guid("600aad33-df6c-4013-ad92-65de19d494cf")}
+        { RDMPCollection.Tables, new Guid("8f24d624-acad-45dd-862b-01b18dfdd9a2") },
+        { RDMPCollection.Catalogue, new Guid("d0f72b03-63f1-487e-9afa-51c03afa7819") },
+        { RDMPCollection.DataExport, new Guid("9fb651f6-3e4f-4629-b64e-f61551ae009e") },
+        { RDMPCollection.SavedCohorts, new Guid("6d0e4560-9357-4ee1-91b6-a182a57f7a6f") },
+        { RDMPCollection.Cohort, new Guid("5c7cceb3-4202-47b1-b271-e2eed869d9ef") },
+        { RDMPCollection.Favourites, new Guid("39d37439-ac7a-4346-8c79-9867384db92e") },
+        { RDMPCollection.DataLoad, new Guid("600aad33-df6c-4013-ad92-65de19d494cf") }
     };
 
     /// <summary>
@@ -109,6 +109,7 @@ public void SetupColumnTracking(OLVColumn col, Guid g)
     {
         SetupColumnTracking(Tree, col, g);
     }
+
     public void SetupColumnTracking(OLVColumn col, string columnUniqueIdentifier)
     {
         SetupColumnTracking(Tree, col, columnUniqueIdentifier);
@@ -125,13 +126,15 @@ public static void SetupColumnTracking(ObjectListView view, OLVColumn col, Guid
 
         view.RebuildColumns();
     }
-    public static void SetupColumnTracking(ObjectListView view, OLVColumn col,string columnUniqueIdentifier)
+
+    public static void SetupColumnTracking(ObjectListView view, OLVColumn col, string columnUniqueIdentifier)
     {
         col.Width = UserSettings.GetColumnWidth(columnUniqueIdentifier);
         view.ColumnWidthChanged += (s, e) => UserSettings.SetColumnWidth(columnUniqueIdentifier, col.Width);
 
         col.IsVisible = UserSettings.GetColumnVisible(columnUniqueIdentifier);
-        col.VisibilityChanged += (s, e) => UserSettings.SetColumnVisible(columnUniqueIdentifier, ((OLVColumn)s).IsVisible);
+        col.VisibilityChanged +=
+            (s, e) => UserSettings.SetColumnVisible(columnUniqueIdentifier, ((OLVColumn)s).IsVisible);
 
         view.RebuildColumns();
     }
@@ -165,9 +168,11 @@ public static void SetupColumnSortTracking(ObjectListView tree, Guid collectionG
     /// <param name="activator">The current activator, used to launch objects, register for refresh events etc </param>
     /// <param name="iconColumn">The column of tree view which should contain the icon for each row object</param>
     /// <param name="renameableColumn">Nullable field for specifying which column supports renaming on F2</param>
-    public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn, OLVColumn renameableColumn)
+    public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn,
+        OLVColumn renameableColumn)
     {
-        SetUp(collection,tree,activator,iconColumn,renameableColumn,new RDMPCollectionCommonFunctionalitySettings());
+        SetUp(collection, tree, activator, iconColumn, renameableColumn,
+            new RDMPCollectionCommonFunctionalitySettings());
     }
 
     /// <summary>
@@ -179,7 +184,8 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
     /// <param name="iconColumn">The column of tree view which should contain the icon for each row object</param>
     /// <param name="renameableColumn">Nullable field for specifying which column supports renaming on F2</param>
     /// <param name="settings">Customise which common behaviours are turned on</param>
-    public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn, OLVColumn renameableColumn,RDMPCollectionCommonFunctionalitySettings settings)
+    public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems activator, OLVColumn iconColumn,
+        OLVColumn renameableColumn, RDMPCollectionCommonFunctionalitySettings settings)
     {
         Settings = settings;
         _collection = collection;
@@ -195,7 +201,7 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
         Tree.KeyPress += Tree_KeyPress;
 
         Tree.CellToolTip.InitialDelay = UserSettings.TooltipAppearDelay;
-        Tree.CellToolTipShowing += (s,e)=>Tree_CellToolTipShowing(activator,e);
+        Tree.CellToolTipShowing += (s, e) => Tree_CellToolTipShowing(activator, e);
 
         Tree.RevealAfterExpand = true;
 
@@ -205,23 +211,23 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
             Tree.ChildrenGetter += ChildrenGetter;
         }
 
-        if(!Settings.SuppressActivate)
+        if (!Settings.SuppressActivate)
             Tree.ItemActivate += CommonItemActivation;
 
         Tree.CellRightClick += CommonRightClick;
         Tree.KeyUp += CommonKeyPress;
 
-        if(iconColumn != null)
+        if (iconColumn != null)
             iconColumn.ImageGetter += ImageGetter;
 
-        if(Tree.RowHeight != 19)
+        if (Tree.RowHeight != 19)
             Tree.RowHeight = 19;
 
         //add colour indicator bar
-        Tree.Location = Tree.Location with { Y = tree.Location.Y+3 };
+        Tree.Location = Tree.Location with { Y = tree.Location.Y + 3 };
         Tree.Height -= 3;
 
-        CreateColorIndicator(Tree,collection);
+        CreateColorIndicator(Tree, collection);
 
         //what does this do to performance?
         Tree.UseNotifyPropertyChanged = true;
@@ -233,7 +239,7 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
             _activator.CommandExecutionFactory,
             tree);
 
-        if(renameableColumn != null)
+        if (renameableColumn != null)
         {
             RenameProvider = new RenameProvider(_activator, tree, renameableColumn);
             RenameProvider.RegisterEvents();
@@ -267,6 +273,7 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
             Tree.AllColumns.Add(CheckColumn);
             Tree.RebuildColumns();
         }
+
         CoreIconProvider = activator.CoreIconProvider;
 
         CopyPasteProvider = new CopyPasteProvider();
@@ -282,10 +289,8 @@ public void SetUp(RDMPCollection collection, TreeListView tree, IActivateItems a
         Tree.FormatRow += Tree_FormatRow;
         Tree.KeyDown += Tree_KeyDown;
 
-        if(Settings.AllowSorting)
-        {
+        if (Settings.AllowSorting)
             SetupColumnSortTracking(Tree, TreeGuids.TryGetValue(collection, out var guid) ? guid : Guid.Empty);
-        }
         else
             foreach (var c in Tree.AllColumns)
                 c.Sortable = false;
@@ -300,14 +305,13 @@ public static void Tree_CellToolTipShowing(IActivateItems activator, ToolTipShow
 
         e.AutoPopDelay = 32767;
 
-        if(GetToolTip(activator, model,out var title, out var body, out var isBad))
+        if (GetToolTip(activator, model, out var title, out var body, out var isBad))
         {
             e.StandardIcon = isBad ? ToolTipControl.StandardIcons.Error : ToolTipControl.StandardIcons.Info;
             e.Title = title;
             e.Text = body;
             e.IsBalloon = true;
         }
-
     }
 
     /// <summary>
@@ -319,7 +323,8 @@ public static void Tree_CellToolTipShowing(IActivateItems activator, ToolTipShow
     /// <param name="body"></param>
     /// <param name="isBad"></param>
     /// <returns></returns>
-    public static bool GetToolTip(IActivateItems activator, object model, out string title, out string body, out bool isBad)
+    public static bool GetToolTip(IActivateItems activator, object model, out string title, out string body,
+        out bool isBad)
     {
         var problem = activator.DescribeProblemIfAny(model);
         title = GetToolTipTitle(model);
@@ -345,25 +350,21 @@ public static bool GetToolTip(IActivateItems activator, object model, out string
         return false;
     }
 
-    private static string GetToolTipTitle(object model)
-    {
-        return model is IMapsDirectlyToDatabaseTable d ?
-            $"{model} (ID: {d.ID})" :
-            model?.ToString();
-    }
+    private static string GetToolTipTitle(object model) =>
+        model is IMapsDirectlyToDatabaseTable d ? $"{model} (ID: {d.ID})" : model?.ToString();
 
     private static DateTime lastInvalidatedCache = DateTime.Now;
     private static Dictionary<object, string> cache = new();
 
     private static string GetToolTipBody(IActivateItems activator, ICanBeSummarised sum)
     {
-        if(DateTime.Now.Subtract(lastInvalidatedCache).TotalSeconds > 10)
+        if (DateTime.Now.Subtract(lastInvalidatedCache).TotalSeconds > 10)
         {
             cache.Clear();
             lastInvalidatedCache = DateTime.Now;
         }
 
-        if(cache.TryGetValue(sum, out var body))
+        if (cache.TryGetValue(sum, out var body))
             return body;
 
         var sb = new StringBuilder();
@@ -382,10 +383,7 @@ private static string GetToolTipBody(IActivateItems activator, ICanBeSummarised
 
                 var val = string.Join(", ", kvp.Value.Select(o => o.ToString()).ToArray());
 
-                if(val.Length>100)
-                {
-                    val = $"{val[..100]}...";
-                }
+                if (val.Length > 100) val = $"{val[..100]}...";
 
                 sb.AppendLine($"{kvp.Key}: {val}");
             }
@@ -405,12 +403,9 @@ private static string GetToolTipBody(IActivateItems activator, ICanBeSummarised
 
     private void Tree_KeyDown(object sender, KeyEventArgs e)
     {
-        if(_shortcutKeys.Contains(e.KeyCode))
-        {
-
+        if (_shortcutKeys.Contains(e.KeyCode))
             // Prevents bong sound
             e.SuppressKeyPress = true;
-        }
     }
 
     private void Tree_KeyPress(object sender, KeyPressEventArgs e)
@@ -422,12 +417,13 @@ private void Tree_KeyPress(object sender, KeyPressEventArgs e)
 
     private static void TreeOnAfterSorting(object sender, AfterSortingEventArgs e, Guid collectionGuid)
     {
-        UserSettings.SetLastColumnSortForCollection(collectionGuid, e.ColumnToSort?.Text, e.SortOrder == SortOrder.Ascending);
+        UserSettings.SetLastColumnSortForCollection(collectionGuid, e.ColumnToSort?.Text,
+            e.SortOrder == SortOrder.Ascending);
     }
 
     private void CreateColorIndicator(TreeListView tree, RDMPCollection collection)
     {
-        if(Tree.Parent == null || collection == RDMPCollection.None)
+        if (Tree.Parent == null || collection == RDMPCollection.None)
             return;
 
         var indicatorHeight = BackColorProvider.IndicatorBarSuggestedHeight;
@@ -454,34 +450,33 @@ private void Tree_FormatRow(object sender, FormatRowEventArgs e)
 
         if (e.Model is IDisableable disableable && disableable.IsDisabled)
         {
-            e.Item.ForeColor = Color.FromArgb(152,152,152);
+            e.Item.ForeColor = Color.FromArgb(152, 152, 152);
 
             //make it italic
-            if(!e.Item.Font.Italic)
-                e.Item.Font = new Font(e.Item.Font,FontStyle.Italic);
+            if (!e.Item.Font.Italic)
+                e.Item.Font = new Font(e.Item.Font, FontStyle.Italic);
 
-            e.Item.BackColor = Color.FromArgb(225,225,225);
+            e.Item.BackColor = Color.FromArgb(225, 225, 225);
         }
         else
         {
             //make it not italic
-            if(e.Item.Font.Italic)
-                e.Item.Font = new Font(e.Item.Font,FontStyle.Regular);
+            if (e.Item.Font.Italic)
+                e.Item.Font = new Font(e.Item.Font, FontStyle.Regular);
 
             e.Item.ForeColor = hasProblems ? Color.Red : Color.Black;
-            e.Item.BackColor = hasProblems ? Color.FromArgb(255,220,220) : Color.White;
+            e.Item.BackColor = hasProblems ? Color.FromArgb(255, 220, 220) : Color.White;
         }
     }
 
-    private TreeListView.Tree TreeFactoryGetter(TreeListView view)
-    {
-        return new RDMPCollectionCommonFunctionalityTreeHijacker(view);
-    }
+    private TreeListView.Tree TreeFactoryGetter(TreeListView view) =>
+        new RDMPCollectionCommonFunctionalityTreeHijacker(view);
 
     // Tracks when RefreshContextMenuStrip is called to prevent rebuilding on select and right click in rapid succession
     private object _lastMenuObject;
     private DateTime _lastMenuBuilt = DateTime.Now;
     private ContextMenuStrip _menu;
+
     private HashSet<Keys> _shortcutKeys = new()
     {
         Keys.I,
@@ -493,13 +488,15 @@ private TreeListView.Tree TreeFactoryGetter(TreeListView view)
     private void RefreshContextMenuStrip()
     {
         // appropriate menu has already been created recently
-        if(_lastMenuObject == Tree.SelectedObject && DateTime.Now.Subtract(_lastMenuBuilt) < TimeSpan.FromSeconds(2))
+        if (_lastMenuObject == Tree.SelectedObject && DateTime.Now.Subtract(_lastMenuBuilt) < TimeSpan.FromSeconds(2))
             return;
 
         //clear the old menu strip first so old shortcuts cannot be activated during
         _menu?.Dispose();
 
-        _menu = Tree.SelectedObjects.Count <= 1 ? GetMenuIfExists(_lastMenuObject = Tree.SelectedObject) : GetMenuIfExists(_lastMenuObject = Tree.SelectedObjects);
+        _menu = Tree.SelectedObjects.Count <= 1
+            ? GetMenuIfExists(_lastMenuObject = Tree.SelectedObject)
+            : GetMenuIfExists(_lastMenuObject = Tree.SelectedObjects);
 
         _lastMenuBuilt = DateTime.Now;
     }
@@ -507,24 +504,22 @@ private void RefreshContextMenuStrip()
     public void CommonRightClick(object sender, CellRightClickEventArgs e)
     {
         //if we aren't doing a multi select
-        if(Tree.SelectedObjects.Count <= 1)
-        {
-            Tree.SelectedObject = e.Model;
-        }
+        if (Tree.SelectedObjects.Count <= 1) Tree.SelectedObject = e.Model;
 
         RefreshContextMenuStrip();
         _menu?.Show(Tree.PointToScreen(e.Location));
     }
 
-    public void CommonKeyPress(object sender , KeyEventArgs e)
+    public void CommonKeyPress(object sender, KeyEventArgs e)
     {
-        if(_shortcutKeys.Contains(e.KeyCode))
+        if (_shortcutKeys.Contains(e.KeyCode))
         {
             RefreshContextMenuStrip();
 
-            if(_menu != null)
+            if (_menu != null)
             {
-                var options = _menu.Items.OfType<ToolStripMenuItem>().FirstOrDefault(mi=>mi.ShortcutKeys == (e.Control ? Keys.Control | e.KeyCode : e.KeyCode));
+                var options = _menu.Items.OfType<ToolStripMenuItem>().FirstOrDefault(mi =>
+                    mi.ShortcutKeys == (e.Control ? Keys.Control | e.KeyCode : e.KeyCode));
                 options?.PerformClick();
                 e.Handled = true;
                 e.SuppressKeyPress = true;
@@ -540,7 +535,6 @@ private void _activator_Emphasise(object sender, EmphasiseEventArgs args)
         var decendancyList = CoreChildProvider.GetDescendancyListIfAnyFor(args.Request.ObjectToEmphasise);
 
         if (decendancyList != null)
-        {
             //for each parent in the decendandy list
             foreach (var parent in decendancyList.Parents)
             {
@@ -551,12 +545,11 @@ private void _activator_Emphasise(object sender, EmphasiseEventArgs args)
                 //parent is in our tree so make sure it's expanded
                 Tree.Expand(parent);
             }
-        }
 
         //tree doesn't contain object even after expanding parents
         var index = Tree.IndexOf(args.Request.ObjectToEmphasise);
 
-        if(index == -1)
+        if (index == -1)
             return;
 
         if (args.Request.ExpansionDepth > 0)
@@ -588,13 +581,13 @@ private void _activator_Emphasise(object sender, EmphasiseEventArgs args)
     /// <param name="currentObject"></param>
     public void ExpandToDepth(int expansionDepth, object currentObject)
     {
-        if(expansionDepth == 0)
+        if (expansionDepth == 0)
             return;
 
         Tree.Expand(currentObject);
 
         foreach (var o in ChildrenGetter(currentObject))
-            ExpandToDepth(expansionDepth -1,o);
+            ExpandToDepth(expansionDepth - 1, o);
     }
 
     private IEnumerable ChildrenGetter(object model)
@@ -619,7 +612,8 @@ private Bitmap ImageGetter(object rowObject)
     {
         var hasProblems = _activator.HasProblem(rowObject);
 
-        return CoreIconProvider.GetImage(rowObject,hasProblems?OverlayKind.Problem:OverlayKind.None).ImageToBitmap();
+        return CoreIconProvider.GetImage(rowObject, hasProblems ? OverlayKind.Problem : OverlayKind.None)
+            .ImageToBitmap();
     }
 
     /// <summary>
@@ -635,23 +629,22 @@ public ContextMenuStrip GetMenuIfExists(object o)
         {
             if (o is ICollection many)
             {
-                var menu = new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(_activator,Tree,many),many);
+                var menu = new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(_activator, Tree, many), many);
 
                 var factory = new AtomicCommandUIFactory(_activator);
 
                 if (many.Cast<object>().All(d => d is IMapsDirectlyToDatabaseTable))
                 {
-                    menu.Items.Add(factory.CreateMenuItem(new ExecuteCommandStartSession(_activator, many.Cast<IMapsDirectlyToDatabaseTable>().ToArray(),null)));
-                    menu.Items.Add(factory.CreateMenuItem(new ExecuteCommandAddToSession(_activator, many.Cast<IMapsDirectlyToDatabaseTable>().ToArray(),null)));
+                    menu.Items.Add(factory.CreateMenuItem(new ExecuteCommandStartSession(_activator,
+                        many.Cast<IMapsDirectlyToDatabaseTable>().ToArray(), null)));
+                    menu.Items.Add(factory.CreateMenuItem(new ExecuteCommandAddToSession(_activator,
+                        many.Cast<IMapsDirectlyToDatabaseTable>().ToArray(), null)));
                 }
 
                 var cmdFactory = new AtomicCommandFactory(_activator);
-                foreach(var p in cmdFactory.CreateManyObjectCommands(many))
-                {
-                    menu.Add(p);
-                }
+                foreach (var p in cmdFactory.CreateManyObjectCommands(many)) menu.Add(p);
 
-                MenuBuilt?.Invoke(this,new MenuBuiltEventArgs(menu,o));
+                MenuBuilt?.Invoke(this, new MenuBuiltEventArgs(menu, o));
                 return Sort(menu);
             }
 
@@ -675,7 +668,7 @@ public ContextMenuStrip GetMenuIfExists(object o)
                 //found a menu with compatible constructor arguments
                 if (menu != null)
                 {
-                    MenuBuilt?.Invoke(this,new MenuBuiltEventArgs(menu,o));
+                    MenuBuilt?.Invoke(this, new MenuBuiltEventArgs(menu, o));
                     return Sort(menu);
                 }
 
@@ -683,7 +676,7 @@ public ContextMenuStrip GetMenuIfExists(object o)
                 var defaultMenu = new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(_activator, Tree, o), o);
                 defaultMenu.AddCommonMenuItems(this);
 
-                MenuBuilt?.Invoke(this,new MenuBuiltEventArgs(defaultMenu,o));
+                MenuBuilt?.Invoke(this, new MenuBuiltEventArgs(defaultMenu, o));
                 return Sort(defaultMenu);
             }
 
@@ -696,35 +689,32 @@ public ContextMenuStrip GetMenuIfExists(object o)
                 {
                     var toReturn = new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(_activator, Tree, this), this);
 
-                    foreach(var cmd in WhitespaceRightClickMenuCommandsGetter(_activator))
-                    {
-                        toReturn.Add(cmd);
-                    }
+                    foreach (var cmd in WhitespaceRightClickMenuCommandsGetter(_activator)) toReturn.Add(cmd);
 
                     toReturn.AddCommonMenuItems(this);
                     return Sort(toReturn);
-
                 }
             }
 
             return null;
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
-            if(_activator?.GlobalErrorCheckNotifier == null)
+            if (_activator?.GlobalErrorCheckNotifier == null)
                 throw;
 
-            _activator.GlobalErrorCheckNotifier.OnCheckPerformed(new CheckEventArgs($"Failed to build menu for {o} of Type {o?.GetType()}",CheckResult.Fail,ex));
+            _activator.GlobalErrorCheckNotifier.OnCheckPerformed(
+                new CheckEventArgs($"Failed to build menu for {o} of Type {o?.GetType()}", CheckResult.Fail, ex));
             return null;
         }
     }
 
     //once we find the best menu for object of Type x then we want to cache that knowledge and go directly to that menu every time
-    private readonly Dictionary<Type,Type> _cachedMenuCompatibility = new();
+    private readonly Dictionary<Type, Type> _cachedMenuCompatibility = new();
 
     private ContextMenuStrip GetMenuWithCompatibleConstructorIfExists(object o, IMasqueradeAs oMasquerader = null)
     {
-        var args = new RDMPContextMenuStripArgs(_activator,Tree,o)
+        var args = new RDMPContextMenuStripArgs(_activator, Tree, o)
         {
             Masquerader = oMasquerader ?? o as IMasqueradeAs
         };
@@ -732,11 +722,9 @@ private ContextMenuStrip GetMenuWithCompatibleConstructorIfExists(object o, IMas
         var oType = o.GetType();
 
         //if we have encountered this object type before
-        if (_cachedMenuCompatibility.TryGetValue(oType,out var compatibleMenu))
-        {
+        if (_cachedMenuCompatibility.TryGetValue(oType, out var compatibleMenu))
             //we know there are no menus compatible with o
             return compatibleMenu == null ? null : ConstructMenu(compatibleMenu, args, o);
-        }
 
 
         //now find the first RDMPContextMenuStrip with a compatible constructor
@@ -746,7 +734,7 @@ private ContextMenuStrip GetMenuWithCompatibleConstructorIfExists(object o, IMas
                 continue;
 
             //try constructing menu with:
-            var menu = ConstructMenu(menuType,args,o);
+            var menu = ConstructMenu(menuType, args, o);
 
             //find first menu that's compatible
             if (menu != null)
@@ -780,10 +768,7 @@ private RDMPContextMenuStrip ConstructMenu(Type type, RDMPContextMenuStripArgs a
 
     private ContextMenuStrip Sort(ContextMenuStrip menu)
     {
-        if (menu != null)
-        {
-            OrderMenuItems(menu.Items);
-        }
+        if (menu != null) OrderMenuItems(menu.Items);
         return menu;
     }
 
@@ -792,14 +777,11 @@ private void OrderMenuItems(ToolStripItemCollection coll)
         var itemsByBucket = new Dictionary<int, List<ToolStripItem>>();
 
         // Create buckets for every item in every context menu
-        foreach(ToolStripItem oItem in coll)
+        foreach (ToolStripItem oItem in coll)
         {
             var bucket = (int)GetWeight(oItem);
 
-            if (!itemsByBucket.ContainsKey(bucket))
-            {
-                itemsByBucket.Add(bucket, new List<ToolStripItem>());
-            }
+            if (!itemsByBucket.ContainsKey(bucket)) itemsByBucket.Add(bucket, new List<ToolStripItem>());
 
             itemsByBucket[bucket].Add(oItem);
         }
@@ -808,47 +790,38 @@ private void OrderMenuItems(ToolStripItemCollection coll)
 
         var buckets = itemsByBucket.OrderBy(kvp => kvp.Key).ToArray();
 
-        for(var i =0;i< buckets.Length;i++)
+        for (var i = 0; i < buckets.Length; i++)
         {
             // add all the items
-            foreach(var item in buckets[i].Value.OrderBy(i=>GetWeight(i)))
+            foreach (var item in buckets[i].Value.OrderBy(i => GetWeight(i)))
             {
                 coll.Add(item);
 
                 if (item is ToolStripMenuItem mi)
-                {
                     // if menu item has submenus
                     if (mi.DropDownItems.Count > 0)
-                    {
                         // sort those too - recurisvely
                         OrderMenuItems(mi.DropDownItems);
-                    }
-                }
             }
 
             // if there are more buckets to come
-            if(i != buckets.Length - 1)
-            {
-                coll.Add(new ToolStripSeparator());
-            }
+            if (i != buckets.Length - 1) coll.Add(new ToolStripSeparator());
         }
     }
 
     private float GetWeight(ToolStripItem oItem)
     {
-        if (oItem.Tag is IAtomicCommand cmd)
-        {
-            return cmd.Weight;
-        }
+        if (oItem.Tag is IAtomicCommand cmd) return cmd.Weight;
 
         if (oItem is ToolStripMenuItem mi)
         {
-            if(mi.DropDownItems.Count > 0)
+            if (mi.DropDownItems.Count > 0)
                 return mi.DropDownItems.Cast<ToolStripItem>().Min(GetWeight);
 
             if (mi.Tag is float f)
                 return f;
         }
+
         return 0;
     }
 
@@ -856,7 +829,7 @@ public void CommonItemActivation(object sender, EventArgs eventArgs)
     {
         var o = Tree.SelectedObject;
 
-        if(o == null)
+        if (o == null)
             return;
 
         if (UserSettings.DoubleClickToExpand)
@@ -866,6 +839,7 @@ public void CommonItemActivation(object sender, EventArgs eventArgs)
                 Tree.Expand(o);
                 return;
             }
+
             if (Tree.IsExpanded(o))
             {
                 Tree.Collapse(o);
@@ -874,13 +848,13 @@ public void CommonItemActivation(object sender, EventArgs eventArgs)
         }
 
         var cmd = new ExecuteCommandActivate(_activator, o);
-        if(!cmd.IsImpossible)
+        if (!cmd.IsImpossible)
             cmd.Execute();
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        RefreshObject(e.Object,e.Exists);
+        RefreshObject(e.Object, e.Exists);
 
         //now tell tree view to refresh the object
 
@@ -889,7 +863,6 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
         //also refresh anyone who is masquerading as e.Object
         foreach (var masquerader in _activator.CoreChildProvider.GetMasqueradersOf(e.Object))
             RefreshObject(masquerader, e.Exists);
-
     }
 
     private void RefreshObject(object o, bool exists)
@@ -924,11 +897,10 @@ private void RefreshObject(object o, bool exists)
 
     public void TearDown()
     {
-        if(IsSetup)
+        if (IsSetup)
         {
             _activator.RefreshBus.Unsubscribe(this);
             _activator.Emphasise -= _activator_Emphasise;
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalityTreeHijacker.cs b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalityTreeHijacker.cs
index 20870a4aa4..3aa29e2cf6 100644
--- a/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalityTreeHijacker.cs
+++ b/Rdmp.UI/Collections/RDMPCollectionCommonFunctionalityTreeHijacker.cs
@@ -24,7 +24,6 @@ internal class RDMPCollectionCommonFunctionalityTreeHijacker : TreeListView.Tree
 
     public RDMPCollectionCommonFunctionalityTreeHijacker(TreeListView treeView) : base(treeView)
     {
-                
     }
 
     public override void Sort(OLVColumn column, SortOrder order)
@@ -33,14 +32,11 @@ public override void Sort(OLVColumn column, SortOrder order)
         _lastSortOrder = order;
 
         base.Sort(column, order);
-
     }
 
-    protected override TreeListView.BranchComparer GetBranchComparer()
-    {   
-        return new TreeListView.BranchComparer(
+    protected override TreeListView.BranchComparer GetBranchComparer() =>
+        new(
             new OrderableComparer(
                 _lastSortColumn != null ? new ModelObjectComparer(_lastSortColumn, _lastSortOrder) : null)
         );
-    }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/RDMPCollectionUI.cs b/Rdmp.UI/Collections/RDMPCollectionUI.cs
index 10de08a6dc..2fb17c535f 100644
--- a/Rdmp.UI/Collections/RDMPCollectionUI.cs
+++ b/Rdmp.UI/Collections/RDMPCollectionUI.cs
@@ -17,10 +17,10 @@ namespace Rdmp.UI.Collections;
 /// </summary>
 [TechnicalUI]
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<RDMPCollectionUI, UserControl>))]
-public abstract class RDMPCollectionUI : RDMPCollectionUI_Design,IConsultableBeforeClosing
+public abstract class RDMPCollectionUI : RDMPCollectionUI_Design, IConsultableBeforeClosing
 {
     public RDMPCollectionCommonFunctionality CommonTreeFunctionality { get; private set; }
-        
+
     protected RDMPCollectionUI()
     {
         CommonTreeFunctionality = new RDMPCollectionCommonFunctionality();
@@ -31,7 +31,6 @@ public virtual void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
         CommonTreeFunctionality.TearDown();
     }
-
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<RDMPCollectionUI_Design, UserControl>))]
diff --git a/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs b/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs
index be3a752a60..a47a579f76 100644
--- a/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs
+++ b/Rdmp.UI/Collections/SavedCohortsCollectionUI.cs
@@ -48,17 +48,17 @@ public override void SetItemActivator(IActivateItems activator)
     {
         base.SetItemActivator(activator);
 
-        CommonTreeFunctionality.SetUp(RDMPCollection.SavedCohorts, tlvSavedCohorts,Activator,olvName,olvName);
-            
+        CommonTreeFunctionality.SetUp(RDMPCollection.SavedCohorts, tlvSavedCohorts, Activator, olvName, olvName);
+
         tlvSavedCohorts.AddObject(((DataExportChildProvider)Activator.CoreChildProvider).RootCohortsNode);
 
         SetupToolStrip();
 
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
 
-        CommonTreeFunctionality.SetupColumnTracking( olvName, new Guid("6857032b-4b28-4f92-8b38-f532f11c7a44"));
-        CommonTreeFunctionality.SetupColumnTracking( olvVersion, new Guid("637fcb62-8395-4b36-a5ce-76ed3194b4e0"));
-        CommonTreeFunctionality.SetupColumnTracking( olvProjectNumber, new Guid("8378f8cf-b08d-4656-a16e-760eed71fe3a"));
+        CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("6857032b-4b28-4f92-8b38-f532f11c7a44"));
+        CommonTreeFunctionality.SetupColumnTracking(olvVersion, new Guid("637fcb62-8395-4b36-a5ce-76ed3194b4e0"));
+        CommonTreeFunctionality.SetupColumnTracking(olvProjectNumber, new Guid("8378f8cf-b08d-4656-a16e-760eed71fe3a"));
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
@@ -69,12 +69,12 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     private void SetupToolStrip()
     {
         CommonFunctionality.ClearToolStrip();
-        CommonFunctionality.Add(new ExecuteCommandCreateNewCohortFromFile(Activator,null),GlobalStrings.FromFile,null,"New...");
-        CommonFunctionality.Add(new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator,null),"From Query",null,"New...");
+        CommonFunctionality.Add(new ExecuteCommandCreateNewCohortFromFile(Activator, null), GlobalStrings.FromFile,
+            null, "New...");
+        CommonFunctionality.Add(
+            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(Activator, null),
+            "From Query", null, "New...");
     }
 
-    public static bool IsRootObject(object root)
-    {
-        return root is AllCohortsNode;
-    }
+    public static bool IsRootObject(object root) => root is AllCohortsNode;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/SessionCollection.cs b/Rdmp.UI/Collections/SessionCollection.cs
index 47c70af224..f3021256bc 100644
--- a/Rdmp.UI/Collections/SessionCollection.cs
+++ b/Rdmp.UI/Collections/SessionCollection.cs
@@ -12,7 +12,7 @@ namespace Rdmp.UI.Collections;
 /// <summary>
 /// Collection of objects grouped into a session.  This is the persistence data object for <see cref="SessionCollectionUI"/> which tracks which objects are included in the session e.g. between RDMP GUI restarts
 /// </summary>
-public class SessionCollection :PersistableObjectCollection
+public class SessionCollection : PersistableObjectCollection
 {
     public string SessionName { get; private set; }
 
@@ -23,15 +23,13 @@ public SessionCollection()
     {
     }
 
-    public SessionCollection(string name): this()
+    public SessionCollection(string name) : this()
     {
         SessionName = name;
     }
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string> {{nameof(SessionName), SessionName}});
-    }
+    public override string SaveExtraText() => PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
+        { { nameof(SessionName), SessionName } });
 
     public override void LoadExtraText(string s)
     {
diff --git a/Rdmp.UI/Collections/SessionCollectionUI.cs b/Rdmp.UI/Collections/SessionCollectionUI.cs
index 472bade740..f582c4d8d2 100644
--- a/Rdmp.UI/Collections/SessionCollectionUI.cs
+++ b/Rdmp.UI/Collections/SessionCollectionUI.cs
@@ -31,35 +31,25 @@ public class SessionCollectionUI : RDMPUserControl, IObjectCollectionControl, IC
     private BrightIdeasSoftware.OLVColumn olvName;
     private bool _firstTime = true;
 
-    public SessionCollection Collection {get; private set;}
-    public RDMPCollectionCommonFunctionality CommonTreeFunctionality {get;} = new RDMPCollectionCommonFunctionality();
+    public SessionCollection Collection { get; private set; }
+    public RDMPCollectionCommonFunctionality CommonTreeFunctionality { get; } = new();
 
     public SessionCollectionUI()
     {
         InitializeComponent();
 
-        olvName.AspectGetter = o=>o.ToString();
-        CommonTreeFunctionality.AxeChildren = new Type[] { typeof(CohortIdentificationConfiguration)};
+        olvName.AspectGetter = o => o.ToString();
+        CommonTreeFunctionality.AxeChildren = new Type[] { typeof(CohortIdentificationConfiguration) };
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return Collection;
-    }
+    public IPersistableObjectCollection GetCollection() => Collection;
 
-    public string GetTabName()
-    {
-        return Collection?.SessionName ?? "Unamed Session";
-    }
+    public string GetTabName() => Collection?.SessionName ?? "Unamed Session";
 
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-            
     }
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
@@ -68,37 +58,32 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
 
         Collection = (SessionCollection)collection;
 
-        if(!CommonTreeFunctionality.IsSetup)
-        {
-            CommonTreeFunctionality.SetUp(RDMPCollection.None,olvTree,activator,olvName,olvName,new RDMPCollectionCommonFunctionalitySettings
-            {
-                // add custom options here
-                    
-            });
-        }
-                
+        if (!CommonTreeFunctionality.IsSetup)
+            CommonTreeFunctionality.SetUp(RDMPCollection.None, olvTree, activator, olvName, olvName,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    // add custom options here
+                });
+
         RefreshSessionObjects();
 
         CommonFunctionality.ClearToolStrip();
-        CommonFunctionality.Add(new ToolStripButton("Add...",null,AddObjectToSession));
+        CommonFunctionality.Add(new ToolStripButton("Add...", null, AddObjectToSession));
         CommonFunctionality.Add(new ToolStripButton("Remove...", null, RemoveObjectsFromSession));
 
-        if(_firstTime)
+        if (_firstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvName, new Guid("a6abe085-f5cc-4ce0-85ef-0d42e7dbfced"));
             _firstTime = false;
         }
-
     }
 
     private void RemoveObjectsFromSession(object sender, EventArgs e)
     {
-        var toRemove = Activator.SelectMany("Remove From Session", typeof(IMapsDirectlyToDatabaseTable), Collection.DatabaseObjects.ToArray());
+        var toRemove = Activator.SelectMany("Remove From Session", typeof(IMapsDirectlyToDatabaseTable),
+            Collection.DatabaseObjects.ToArray());
 
-        if(toRemove != null && toRemove.Length > 0)
-        {
-            Remove(toRemove);
-        }
+        if (toRemove != null && toRemove.Length > 0) Remove(toRemove);
     }
 
     /// <summary>
@@ -107,59 +92,54 @@ private void RemoveObjectsFromSession(object sender, EventArgs e)
     /// <param name="toAdd"></param>
     public void Add(params IMapsDirectlyToDatabaseTable[] toAdd)
     {
-        for(var i =0;i< toAdd.Length;i++)
-        {
+        for (var i = 0; i < toAdd.Length; i++)
             //unwrap pipelines
-            if(toAdd[i] is PipelineCompatibleWithUseCaseNode pcn)
-            {
+            if (toAdd[i] is PipelineCompatibleWithUseCaseNode pcn)
                 toAdd[i] = pcn.Pipeline;
-            }
-            else if(toAdd[i] is SpontaneousObject)
-            {
+            else if (toAdd[i] is SpontaneousObject)
                 throw new NotSupportedException("Object cannot be added to sessions");
-            }
-        }
 
         Collection.DatabaseObjects = toAdd.Union(Collection.DatabaseObjects).ToList();
         RefreshSessionObjects();
     }
+
     /// <summary>
     /// Removes <paramref name="toRemove"/> from the list of objects tracked in the session
     /// </summary>
     /// <param name="toRemove"></param>
     public void Remove(params IMapsDirectlyToDatabaseTable[] toRemove)
     {
-        foreach(var r in toRemove)
+        foreach (var r in toRemove)
         {
             Collection.DatabaseObjects.Remove(r);
             olvTree.RemoveObject(r);
         }
-            
+
         RefreshSessionObjects();
     }
+
     private void AddObjectToSession(object sender, EventArgs e)
     {
         var toAdd = Activator.SelectMany(new DialogArgs
-            {
-                WindowTitle = "Add to Session",
-                TaskDescription = "Pick which objects you want added to the session window."
-            }, typeof(IMapsDirectlyToDatabaseTable),
-            Activator.CoreChildProvider.GetAllSearchables().Keys.Except(Collection.DatabaseObjects).ToArray())?.ToList();
+                {
+                    WindowTitle = "Add to Session",
+                    TaskDescription = "Pick which objects you want added to the session window."
+                }, typeof(IMapsDirectlyToDatabaseTable),
+                Activator.CoreChildProvider.GetAllSearchables().Keys.Except(Collection.DatabaseObjects).ToArray())
+            ?.ToList();
 
         if (toAdd == null || toAdd.Count == 0)
-        {
             // user cancelled picking objects
             return;
-        }
 
         Add(toAdd.ToArray());
     }
 
     private void RefreshSessionObjects()
     {
-        var actualObjects = FavouritesCollectionUI.FindRootObjects(Activator,Collection.DatabaseObjects.Contains)
+        var actualObjects = FavouritesCollectionUI.FindRootObjects(Activator, Collection.DatabaseObjects.Contains)
             .Union(Collection.DatabaseObjects.OfType<Pipeline>()).ToList();
-            
+
         //no change in root favouratism
         if (actualObjects.SequenceEqual(olvTree.Objects.OfType<IMapsDirectlyToDatabaseTable>()))
             return;
@@ -177,12 +157,10 @@ private void RefreshSessionObjects()
         olvTree.RebuildAll(true);
     }
 
-    public override string ToString()
-    {
-        return Collection?.SessionName ?? "Unamed Session";
-    }
+    public override string ToString() => Collection?.SessionName ?? "Unamed Session";
 
     #region InitializeComponent
+
     private void InitializeComponent()
     {
         olvTree = new BrightIdeasSoftware.TreeListView();
@@ -194,8 +172,10 @@ private void InitializeComponent()
         // 
         olvTree.AllColumns.Add(olvName);
         olvTree.CellEditUseWholeCell = false;
-        olvTree.Columns.AddRange(new ColumnHeader[] {
-            olvName});
+        olvTree.Columns.AddRange(new ColumnHeader[]
+        {
+            olvName
+        });
         olvTree.Cursor = Cursors.Default;
         olvTree.Dock = DockStyle.Fill;
         olvTree.FullRowSelect = true;
@@ -222,15 +202,13 @@ private void InitializeComponent()
         Size = new System.Drawing.Size(487, 518);
         ((System.ComponentModel.ISupportInitialize)olvTree).EndInit();
         ResumeLayout(false);
-
     }
 
     public void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
-        if(e.CloseReason == CloseReason.UserClosing)
-        {
-            e.Cancel = !Activator.YesNo($"Close Session {Collection.SessionName}? (this will end the session)","End Session");
-        }
+        if (e.CloseReason == CloseReason.UserClosing)
+            e.Cancel = !Activator.YesNo($"Close Session {Collection.SessionName}? (this will end the session)",
+                "End Session");
     }
 
     #endregion
diff --git a/Rdmp.UI/Collections/TableInfoCollectionUI.cs b/Rdmp.UI/Collections/TableInfoCollectionUI.cs
index e8988da5a7..7843c2b00f 100644
--- a/Rdmp.UI/Collections/TableInfoCollectionUI.cs
+++ b/Rdmp.UI/Collections/TableInfoCollectionUI.cs
@@ -40,13 +40,12 @@ public partial class TableInfoCollectionUI : RDMPCollectionUI, ILifetimeSubscrib
     public TableInfoCollectionUI()
     {
         InitializeComponent();
-            
+
         tlvTableInfos.KeyUp += olvTableInfos_KeyUp;
 
         tlvTableInfos.ItemActivate += tlvTableInfos_ItemActivate;
         olvDataType.AspectGetter = tlvTableInfos_DataTypeAspectGetter;
-        olvValue.AspectGetter = s=> (s as IArgument)?.Value;
-
+        olvValue.AspectGetter = s => (s as IArgument)?.Value;
     }
 
 
@@ -67,7 +66,7 @@ private object tlvTableInfos_DataTypeAspectGetter(object rowobject)
     private void tlvTableInfos_ItemActivate(object sender, EventArgs e)
     {
         var o = tlvTableInfos.SelectedObject;
-            
+
         if (o is DecryptionPrivateKeyNode)
         {
             var c = new PasswordEncryptionKeyLocationUI();
@@ -75,7 +74,7 @@ private void tlvTableInfos_ItemActivate(object sender, EventArgs e)
             Activator.ShowWindow(c, true);
         }
     }
-        
+
     public void SelectTableInfo(TableInfo toSelect)
     {
         tlvTableInfos.SelectObject(toSelect);
@@ -96,28 +95,28 @@ public override void SetItemActivator(IActivateItems activator)
         base.SetItemActivator(activator);
 
         CommonTreeFunctionality.SetUp(
-            RDMPCollection.Tables, 
+            RDMPCollection.Tables,
             tlvTableInfos,
             activator,
             olvColumn1,
             olvColumn1
         );
-            
-        if(_isFirstTime)
+
+        if (_isFirstTime)
         {
             CommonTreeFunctionality.SetupColumnTracking(olvDataType, new Guid("c743eab7-1c07-41dd-bb10-68b25a437056"));
             CommonTreeFunctionality.SetupColumnTracking(olvValue, new Guid("157fde35-d084-42f6-97d1-13a00ba4d0c1"));
             CommonTreeFunctionality.SetupColumnTracking(olvColumn1, new Guid("3743e6dd-4166-4f71-b42f-c80ccda1446d"));
             _isFirstTime = false;
         }
-            
 
-        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a=> new IAtomicCommand[]
+
+        CommonTreeFunctionality.WhitespaceRightClickMenuCommandsGetter = a => new IAtomicCommand[]
         {
-            new ExecuteCommandImportTableInfo(a,null,false),
+            new ExecuteCommandImportTableInfo(a, null, false),
             new ExecuteCommandBulkImportTableInfos(a)
         };
-            
+
         Activator.RefreshBus.EstablishLifetimeSubscription(this);
 
 
@@ -132,35 +131,29 @@ public override void SetItemActivator(IActivateItems activator)
         tlvTableInfos.AddObject(Activator.CoreChildProvider.AllConnectionStringKeywordsNode);
         tlvTableInfos.AddObject(Activator.CoreChildProvider.AllStandardRegexesNode);
         tlvTableInfos.AddObject(Activator.CoreChildProvider.AllPluginsNode);
-
-
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        if(e.Object is DataAccessCredentials)
+        if (e.Object is DataAccessCredentials)
             tlvTableInfos.RefreshObject(tlvTableInfos.Objects.OfType<AllDataAccessCredentialsNode>());
-            
-        if(e.Object is Catalogue || e.Object is TableInfo) 
+
+        if (e.Object is Catalogue || e.Object is TableInfo)
             tlvTableInfos.RefreshObject(tlvTableInfos.Objects.OfType<AllServersNode>());
 
         if (tlvTableInfos.IndexOf(Activator.CoreChildProvider.AllPipelinesNode) != -1)
             tlvTableInfos.RefreshObject(Activator.CoreChildProvider.AllPipelinesNode);
     }
-        
-    public static bool IsRootObject(object root)
-    {
-        return
-            root is AllRDMPRemotesNode ||
-            root is AllObjectSharingNode ||
-            root is AllPipelinesNode ||
-            root is AllExternalServersNode ||
-            root is AllDataAccessCredentialsNode ||
-            root is AllANOTablesNode ||
-            root is AllServersNode ||
-            root is AllConnectionStringKeywordsNode || 
-            root is AllStandardRegexesNode ||
-            root is AllDashboardsNode;
 
-    }
+    public static bool IsRootObject(object root) =>
+        root is AllRDMPRemotesNode ||
+        root is AllObjectSharingNode ||
+        root is AllPipelinesNode ||
+        root is AllExternalServersNode ||
+        root is AllDataAccessCredentialsNode ||
+        root is AllANOTablesNode ||
+        root is AllServersNode ||
+        root is AllConnectionStringKeywordsNode ||
+        root is AllStandardRegexesNode ||
+        root is AllDashboardsNode;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Collections/TextMatchFilterWithAlwaysShowList.cs b/Rdmp.UI/Collections/TextMatchFilterWithAlwaysShowList.cs
index c61e124d5d..5eb4917656 100644
--- a/Rdmp.UI/Collections/TextMatchFilterWithAlwaysShowList.cs
+++ b/Rdmp.UI/Collections/TextMatchFilterWithAlwaysShowList.cs
@@ -16,19 +16,20 @@ namespace Rdmp.UI.Collections;
 /// </summary>
 public class TextMatchFilterWithAlwaysShowList : TextMatchFilter
 {
-    public HashSet<object>  AlwaysShow = new();
+    public HashSet<object> AlwaysShow = new();
     private string[] _tokens;
     private CompositeAllFilter _compositeFilter;
 
-    public TextMatchFilterWithAlwaysShowList(IEnumerable<object> alwaysShow ,ObjectListView olv, string text, StringComparison comparison): base(olv, text, comparison)
+    public TextMatchFilterWithAlwaysShowList(IEnumerable<object> alwaysShow, ObjectListView olv, string text,
+        StringComparison comparison) : base(olv, text, comparison)
     {
-        if(!string.IsNullOrWhiteSpace(text) && text.Contains(' '))
+        if (!string.IsNullOrWhiteSpace(text) && text.Contains(' '))
         {
             var filters = new List<IModelFilter>();
 
             _tokens = text.Split(' ');
             foreach (var token in _tokens)
-                filters.Add(new TextMatchFilter(olv,token,comparison));
+                filters.Add(new TextMatchFilter(olv, token, comparison));
 
             _compositeFilter = new CompositeAllFilter(filters);
         }
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/BasicUICommandExecution.cs b/Rdmp.UI/CommandExecution/AtomicCommands/BasicUICommandExecution.cs
index 0a98789213..31b2400789 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/BasicUICommandExecution.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/BasicUICommandExecution.cs
@@ -14,11 +14,11 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public abstract class BasicUICommandExecution:BasicCommandExecution
+public abstract class BasicUICommandExecution : BasicCommandExecution
 {
     protected readonly IActivateItems Activator;
 
-    protected BasicUICommandExecution(IActivateItems activator):base(activator)
+    protected BasicUICommandExecution(IActivateItems activator) : base(activator)
     {
         Activator = activator;
     }
@@ -47,14 +47,15 @@ protected static FileInfo SelectOpenFile(string filter)
         return null;
     }
 
-    internal void SetDefaultIfNotExists(ExternalDatabaseServer newServer, PermissableDefaults permissableDefault, bool askYesNo)
+    internal void SetDefaultIfNotExists(ExternalDatabaseServer newServer, PermissableDefaults permissableDefault,
+        bool askYesNo)
     {
         var defaults = Activator.RepositoryLocator.CatalogueRepository;
 
         var current = defaults.GetDefaultFor(permissableDefault);
-            
-        if(current == null)
-            if(!askYesNo || YesNo($"Set as the default {permissableDefault} server?", "Set as default"))
-                defaults.SetDefault(permissableDefault,newServer);
+
+        if (current == null)
+            if (!askYesNo || YesNo($"Set as the default {permissableDefault} server?", "Set as default"))
+                defaults.SetDefault(permissableDefault, newServer);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddJoinInfo.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddJoinInfo.cs
index 3fea40767c..f509ce7b6b 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddJoinInfo.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddJoinInfo.cs
@@ -20,31 +20,24 @@ public class ExecuteCommandAddJoinInfo : BasicUICommandExecution, IAtomicCommand
     private readonly TableInfo _tableInfo;
     private TableInfo _otherTableInfo;
 
-    public ExecuteCommandAddJoinInfo(IActivateItems activator, TableInfo tableInfo):base(activator)
+    public ExecuteCommandAddJoinInfo(IActivateItems activator, TableInfo tableInfo) : base(activator)
     {
         _tableInfo = tableInfo;
     }
 
-    public override string GetCommandName()
-    {
-        return $"Configure JoinInfo where '{_tableInfo}' is a Primary Key Table";
-    }
+    public override string GetCommandName() => $"Configure JoinInfo where '{_tableInfo}' is a Primary Key Table";
 
-    public override string GetCommandHelp()
-    {
-        return "Tells RDMP that two TableInfos can be joined together (including the direction LEFT/RIGHT/INNER, collation etc)";
-    }
+    public override string GetCommandHelp() =>
+        "Tells RDMP that two TableInfos can be joined together (including the direction LEFT/RIGHT/INNER, collation etc)";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Activator.CoreIconProvider.GetImage(RDMPConcept.JoinInfo, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Activator.CoreIconProvider.GetImage(RDMPConcept.JoinInfo, OverlayKind.Add);
 
     public void SetInitialJoinToTableInfo(TableInfo otherTableInfo)
     {
-        if(_tableInfo.Equals(otherTableInfo))
+        if (_tableInfo.Equals(otherTableInfo))
             SetImpossible("Cannot join a TableInfo to itself");
-            
+
         _otherTableInfo = otherTableInfo;
     }
 
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddNewLookupTableRelationship.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddNewLookupTableRelationship.cs
index 0a8be14179..a8a4153fe2 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddNewLookupTableRelationship.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddNewLookupTableRelationship.cs
@@ -17,56 +17,54 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandAddNewLookupTableRelationship : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandAddNewLookupTableRelationship : BasicUICommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogueIfKnown;
     private readonly TableInfo _lookupTableInfoIfKnown;
 
-    public ExecuteCommandAddNewLookupTableRelationship(IActivateItems activator, Catalogue catalogueIfKnown, TableInfo lookupTableInfoIfKnown) : base(activator)
+    public ExecuteCommandAddNewLookupTableRelationship(IActivateItems activator, Catalogue catalogueIfKnown,
+        TableInfo lookupTableInfoIfKnown) : base(activator)
     {
         _catalogueIfKnown = catalogueIfKnown;
         _lookupTableInfoIfKnown = lookupTableInfoIfKnown;
 
-        if(catalogueIfKnown != null && catalogueIfKnown.IsApiCall())
-        {
+        if (catalogueIfKnown != null && catalogueIfKnown.IsApiCall())
             SetImpossible("Lookups cannot be configured on API Catalogues");
-        }
-                
 
-        if(catalogueIfKnown == null && lookupTableInfoIfKnown == null)
-            throw new NotSupportedException("You must know either the lookup table or the Catalogue you want to configure it on");
-    }
 
-    public override string GetCommandHelp()
-    {
-        return "Tells RDMP that a table contains code/description mappings for one of the columns in your dataset and that you (may) want them linked in when extracting the dataset";
+        if (catalogueIfKnown == null && lookupTableInfoIfKnown == null)
+            throw new NotSupportedException(
+                "You must know either the lookup table or the Catalogue you want to configure it on");
     }
 
+    public override string GetCommandHelp() =>
+        "Tells RDMP that a table contains code/description mappings for one of the columns in your dataset and that you (may) want them linked in when extracting the dataset";
+
     public override void Execute()
     {
         base.Execute();
 
         var cata = _catalogueIfKnown;
         if (cata == null)
-        {
             try
             {
                 //make sure they really wanted to do this?
-                if (YesNo( GetLookupConfirmationText(), "Create Lookup"))
-                { 
+                if (YesNo(GetLookupConfirmationText(), "Create Lookup"))
+                {
                     //get them to pick a Catalogue the table provides descriptions for
-                    if(!SelectOne(_lookupTableInfoIfKnown.Repository, out cata))
+                    if (!SelectOne(_lookupTableInfoIfKnown.Repository, out cata))
                         return;
                 }
                 else
+                {
                     return;
+                }
             }
             catch (Exception exception)
             {
                 ExceptionViewer.Show("Error creating Lookup", exception);
                 return;
             }
-        }
 
         //they now deifnetly have a Catalogue!
         var t = Activator.Activate<LookupConfigurationUI, Catalogue>(cata);
@@ -75,15 +73,10 @@ public override void Execute()
             t.SetLookupTableInfo(_lookupTableInfoIfKnown);
     }
 
-    private string GetLookupConfirmationText()
-    {
-        return 
-            $@"You have chosen to make '{_lookupTableInfoIfKnown }' a Lookup Table (e.g T = Tayside, F=Fife etc).  In order to do this you will need to pick which Catalogue the column
+    private string GetLookupConfirmationText() =>
+        $@"You have chosen to make '{_lookupTableInfoIfKnown}' a Lookup Table (e.g T = Tayside, F=Fife etc).  In order to do this you will need to pick which Catalogue the column
 provides a description for (a given TableInfo can be a Lookup for many columns in many datasets).";
-    }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Lookup, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Lookup, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddToSession.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddToSession.cs
index 197393f72f..c6af70eec5 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddToSession.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAddToSession.cs
@@ -18,7 +18,8 @@ public class ExecuteCommandAddToSession : BasicUICommandExecution, IAtomicComman
     private IMapsDirectlyToDatabaseTable[] _toAdd;
     private readonly SessionCollectionUI session;
 
-    public ExecuteCommandAddToSession(IActivateItems activator, IMapsDirectlyToDatabaseTable[] toAdd, SessionCollectionUI session) : base(activator)
+    public ExecuteCommandAddToSession(IActivateItems activator, IMapsDirectlyToDatabaseTable[] toAdd,
+        SessionCollectionUI session) : base(activator)
     {
         _toAdd = toAdd;
         this.session = session;
@@ -27,8 +28,8 @@ public ExecuteCommandAddToSession(IActivateItems activator, IMapsDirectlyToDatab
             SetImpossible("There are no active Sessions");
 
         Weight = 100.2f;
-
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -39,16 +40,16 @@ public override void Execute()
             var sessions = Activator.GetSessions().ToArray();
 
             if (sessions.Length == 1)
+            {
                 ses = sessions[0];
+            }
             else
             {
-                if(BasicActivator.SelectObject(new DialogArgs
-                   {
-                       TaskDescription = "Choose which session to add the objects to"
-                   }, sessions,out var selected))
-                {
+                if (BasicActivator.SelectObject(new DialogArgs
+                    {
+                        TaskDescription = "Choose which session to add the objects to"
+                    }, sessions, out var selected))
                     ses = selected;
-                }
             }
         }
 
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAnonymiseColumnInfo.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAnonymiseColumnInfo.cs
index e0dac0caab..7b81696c70 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAnonymiseColumnInfo.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandAnonymiseColumnInfo.cs
@@ -18,26 +18,26 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandAnonymiseColumnInfo : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandAnonymiseColumnInfo : BasicUICommandExecution, IAtomicCommand
 {
     private readonly ColumnInfo _columnInfo;
 
-    public ExecuteCommandAnonymiseColumnInfo(IActivateItems activator, ColumnInfo columnInfo):base(activator)
+    public ExecuteCommandAnonymiseColumnInfo(IActivateItems activator, ColumnInfo columnInfo) : base(activator)
     {
         _columnInfo = columnInfo;
-        if (columnInfo.GetRuntimeName().StartsWith(ANOTable.ANOPrefix,StringComparison.CurrentCultureIgnoreCase))
+        if (columnInfo.GetRuntimeName().StartsWith(ANOTable.ANOPrefix, StringComparison.CurrentCultureIgnoreCase))
             SetImpossible($"ColumnInfo is already anonymised (Starts with \"{ANOTable.ANOPrefix}\"");
 
         if (columnInfo.ANOTable_ID != null)
             SetImpossible("ColumnInfo is already anonymised");
 
-        if(Activator.ServerDefaults.GetDefaultFor(PermissableDefaults.ANOStore) == null)
+        if (Activator.ServerDefaults.GetDefaultFor(PermissableDefaults.ANOStore) == null)
             SetImpossible("No Default ANOStore has been configured");
 
-        if(string.IsNullOrWhiteSpace(_columnInfo.TableInfo.Server))
+        if (string.IsNullOrWhiteSpace(_columnInfo.TableInfo.Server))
             SetImpossible("Parent TableInfo is missing a value for Server");
-            
-        if(string.IsNullOrWhiteSpace(_columnInfo.TableInfo.Database))
+
+        if (string.IsNullOrWhiteSpace(_columnInfo.TableInfo.Database))
             SetImpossible("Parent TableInfo is missing a value for Database");
     }
 
@@ -48,9 +48,6 @@ public override void Execute()
         Activator.Activate<ColumnInfoToANOTableConverterUI, ColumnInfo>(_columnInfo);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ANOColumnInfo);
-    }
-
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ANOColumnInfo);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBrowseLookup.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBrowseLookup.cs
index ca16b49416..fb3d8f1433 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBrowseLookup.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBrowseLookup.cs
@@ -16,11 +16,11 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandBrowseLookup : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandBrowseLookup : BasicUICommandExecution, IAtomicCommand
 {
     private Lookup _lookup;
 
-    public ExecuteCommandBrowseLookup(IActivateItems activator, Lookup lookup):base(activator)
+    public ExecuteCommandBrowseLookup(IActivateItems activator, Lookup lookup) : base(activator)
     {
         _lookup = lookup;
     }
@@ -30,7 +30,7 @@ public ExecuteCommandBrowseLookup(IActivateItems activator, IFilter filter) : ba
         var colInfo = filter.GetColumnInfoIfExists();
 
         if (colInfo != null)
-            _lookup = 
+            _lookup =
                 colInfo.GetAllLookupForColumnInfoWhereItIsA(LookupType.AnyKey).FirstOrDefault() ??
                 colInfo.GetAllLookupForColumnInfoWhereItIsA(LookupType.Description).FirstOrDefault();
 
@@ -38,15 +38,13 @@ public ExecuteCommandBrowseLookup(IActivateItems activator, IFilter filter) : ba
             SetImpossible("No Lookups found");
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Lookup,OverlayKind.Shortcut);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Lookup, OverlayKind.Shortcut);
 
     public override void Execute()
     {
         base.Execute();
-            
+
         Activator.Activate<LookupBrowserUI, Lookup>(_lookup);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBulkProcessCatalogueItems.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBulkProcessCatalogueItems.cs
index a06c845a8b..27b38ac556 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBulkProcessCatalogueItems.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandBulkProcessCatalogueItems.cs
@@ -15,19 +15,17 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandBulkProcessCatalogueItems : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandBulkProcessCatalogueItems : BasicUICommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogue;
 
-    public ExecuteCommandBulkProcessCatalogueItems(IActivateItems activator, Catalogue catalogue):base(activator)
+    public ExecuteCommandBulkProcessCatalogueItems(IActivateItems activator, Catalogue catalogue) : base(activator)
     {
         _catalogue = catalogue;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CatalogueItem, OverlayKind.Edit);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CatalogueItem, OverlayKind.Edit);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs
index 9ce60025f7..1391391e9f 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCheckAsync.cs
@@ -17,21 +17,23 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandCheckAsync : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandCheckAsync : BasicUICommandExecution, IAtomicCommand
 {
     private readonly ICheckable _checkable;
     private readonly Action<ICheckable, CheckResult> _reportWorstTo;
 
-    public ExecuteCommandCheckAsync(IActivateItems activator, DatabaseEntity checkable): base(activator)
+    public ExecuteCommandCheckAsync(IActivateItems activator, DatabaseEntity checkable) : base(activator)
     {
         _checkable = checkable as ICheckable;
 
-        if(_checkable == null)
+        if (_checkable == null)
             SetImpossible("Object is not checkable");
 
         Weight = 100.3f;
     }
-    public ExecuteCommandCheckAsync(IActivateItems activator, DatabaseEntity checkable,Action<ICheckable,CheckResult> reportWorst): this(activator,checkable)
+
+    public ExecuteCommandCheckAsync(IActivateItems activator, DatabaseEntity checkable,
+        Action<ICheckable, CheckResult> reportWorst) : this(activator, checkable)
     {
         _reportWorstTo = reportWorst;
 
@@ -40,17 +42,12 @@ public ExecuteCommandCheckAsync(IActivateItems activator, DatabaseEntity checkab
 
     public override string GetCommandName()
     {
-        if(_checkable == null)
-        {
-            return "Check";
-        }
+        if (_checkable == null) return "Check";
         return $"Check '{_checkable}'";
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Run validation checks for this item to ensure that easily checkable properties are valid";
-    }
+    public override string GetCommandHelp() =>
+        "Run validation checks for this item to ensure that easily checkable properties are valid";
 
     public override void Execute()
     {
@@ -58,14 +55,11 @@ public override void Execute()
 
         var popupChecksUI = new PopupChecksUI($"Checking {_checkable}", false);
 
-        if(_reportWorstTo != null)
-            popupChecksUI.AllChecksComplete += (s,a)=>_reportWorstTo(_checkable,a.CheckResults.GetWorst());
+        if (_reportWorstTo != null)
+            popupChecksUI.AllChecksComplete += (s, a) => _reportWorstTo(_checkable, a.CheckResults.GetWorst());
 
         popupChecksUI.StartChecking(_checkable);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.TinyYellow);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.TinyYellow);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChooseHICProjectDirectory.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChooseHICProjectDirectory.cs
index 44f06ac0cc..e42e965a70 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChooseHICProjectDirectory.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChooseHICProjectDirectory.cs
@@ -25,16 +25,14 @@ public ExecuteCommandChooseLoadDirectory(IActivateItems activator, LoadMetadata
         _loadMetadata = loadMetadata;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Changes the load location\\working directory for the DLE load configuration";
-    }
+    public override string GetCommandHelp() =>
+        "Changes the load location\\working directory for the DLE load configuration";
 
     public override void Execute()
     {
         base.Execute();
 
-        var dialog = new ChooseLoadDirectoryUI(Activator,_loadMetadata);
+        var dialog = new ChooseLoadDirectoryUI(Activator, _loadMetadata);
         if (dialog.ShowDialog() == DialogResult.OK)
         {
             _loadMetadata.LocationOfFlatFiles = dialog.Result;
@@ -43,8 +41,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.LoadDirectoryNode);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.LoadDirectoryNode);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChoosePlatformDatabase.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChoosePlatformDatabase.cs
index 65716c43b8..29830106fd 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChoosePlatformDatabase.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandChoosePlatformDatabase.cs
@@ -17,11 +17,11 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandChoosePlatformDatabase : BasicCommandExecution,IAtomicCommand
+public class ExecuteCommandChoosePlatformDatabase : BasicCommandExecution, IAtomicCommand
 {
     private IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
-        
-    public ExecuteCommandChoosePlatformDatabase(IActivateItems activator) 
+
+    public ExecuteCommandChoosePlatformDatabase(IActivateItems activator)
     {
         if (activator != null)
             Initialize(activator.RepositoryLocator);
@@ -39,11 +39,8 @@ private void Initialize(IRDMPPlatformRepositoryServiceLocator locator)
             SetImpossible("Platform databases location is read-only (probably passed as commandline parameter?).");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Change which RDMP platform metadata databases you are connected to";
-    }
-        
+    public override string GetCommandHelp() => "Change which RDMP platform metadata databases you are connected to";
+
     public override void Execute()
     {
         base.Execute();
@@ -52,8 +49,5 @@ public override void Execute()
         dialog.ShowDialog();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Database);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Database);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs
index 2b5f1725da..b40e4a1922 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandClearFavourites.cs
@@ -13,7 +13,7 @@ public class ExecuteCommandClearFavourites : BasicUICommandExecution
 {
     public ExecuteCommandClearFavourites(IActivateItems activator) : base(activator)
     {
-        if(!Activator.FavouritesProvider.CurrentFavourites.Any())
+        if (!Activator.FavouritesProvider.CurrentFavourites.Any())
             SetImpossible("You do not have any Favourites");
     }
 
@@ -26,16 +26,15 @@ public override void Execute()
         {
             var first = Activator.FavouritesProvider.CurrentFavourites.First();
 
-            foreach (var f in Activator.FavouritesProvider.CurrentFavourites) 
+            foreach (var f in Activator.FavouritesProvider.CurrentFavourites)
                 f.DeleteInDatabase();
-                
+
             //now that we have deleted them it is definitely not possible anymore
             SetImpossible("You do not have any Favourites");
 
             Activator.FavouritesProvider.CurrentFavourites.Clear();
 
             Publish(first);
-                
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs
index 0dce1df77f..7925b3ede7 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCollapseChildNodes.cs
@@ -15,21 +15,19 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCollapseChildNodes : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandCollapseChildNodes : BasicUICommandExecution, IAtomicCommand
 {
     private readonly RDMPCollectionCommonFunctionality _commonFunctionality;
     private readonly object _rootToCollapseTo;
 
-    public ExecuteCommandCollapseChildNodes(IActivateItems activator,RDMPCollectionCommonFunctionality commonFunctionality, object rootToCollapseTo) : base(activator)
+    public ExecuteCommandCollapseChildNodes(IActivateItems activator,
+        RDMPCollectionCommonFunctionality commonFunctionality, object rootToCollapseTo) : base(activator)
     {
         _commonFunctionality = commonFunctionality;
         _rootToCollapseTo = rootToCollapseTo;
 
         // collapse all with no node selected collapses whole tree
-        if (_rootToCollapseTo is RDMPCollection)
-        {
-            return;
-        }
+        if (_rootToCollapseTo is RDMPCollection) return;
 
         if (!_commonFunctionality.Tree.IsExpanded(rootToCollapseTo))
             SetImpossible("Node is not expanded");
@@ -40,9 +38,7 @@ public ExecuteCommandCollapseChildNodes(IActivateItems activator,RDMPCollectionC
     public override string GetCommandName()
     {
         if (_rootToCollapseTo is RDMPCollection && string.IsNullOrWhiteSpace(OverrideCommandName))
-        {
             return "Collapse All";
-        }
 
         return base.GetCommandName();
     }
@@ -50,11 +46,10 @@ public override string GetCommandName()
     public override void Execute()
     {
         base.Execute();
-            
+
         _commonFunctionality.Tree.BeginUpdate();
         try
         {
-
             if (_rootToCollapseTo is RDMPCollection)
             {
                 _commonFunctionality.Tree.CollapseAll();
@@ -70,10 +65,10 @@ public override void Execute()
             _commonFunctionality.Tree.Collapse(_rootToCollapseTo);
 
             //then expand it to depth 1
-            _commonFunctionality.ExpandToDepth(1,_rootToCollapseTo);
+            _commonFunctionality.ExpandToDepth(1, _rootToCollapseTo);
 
             var index = _commonFunctionality.Tree.IndexOf(_rootToCollapseTo);
-            if(index != -1)
+            if (index != -1)
                 _commonFunctionality.Tree.EnsureVisible(index);
         }
         finally
@@ -82,8 +77,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.collapseAllNodes);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.collapseAllNodes);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureCatalogueValidationRules.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureCatalogueValidationRules.cs
index 3e1db773de..258c0cc6ac 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureCatalogueValidationRules.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureCatalogueValidationRules.cs
@@ -15,33 +15,25 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandConfigureCatalogueValidationRules : BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandConfigureCatalogueValidationRules : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private Catalogue _catalogue;
 
     public ExecuteCommandConfigureCatalogueValidationRules(IActivateItems activator) : base(activator)
     {
-            
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Allows you to specify validation rules for columns in the dataset and pick the time coverage/pivot fields";
-    }
+    public override string GetCommandHelp() =>
+        "Allows you to specify validation rules for columns in the dataset and pick the time coverage/pivot fields";
 
-    public override string GetCommandName()
-    {
-        return "Validation Rules...";
-    }
+    public override string GetCommandName() => "Validation Rules...";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.DQE, OverlayKind.Edit);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.DQE, OverlayKind.Edit);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _catalogue = (Catalogue) target;
+        _catalogue = (Catalogue)target;
         return this;
     }
 
@@ -51,7 +43,7 @@ public override void Execute()
 
         _catalogue ??= SelectOne<Catalogue>(Activator.RepositoryLocator.CatalogueRepository);
 
-        if(_catalogue == null)
+        if (_catalogue == null)
             return;
 
         Activator.Activate<ValidationSetupUI, Catalogue>(_catalogue);
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureDefaultServers.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureDefaultServers.cs
index e5908582f8..d3380a8f68 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureDefaultServers.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandConfigureDefaultServers.cs
@@ -10,17 +10,14 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandConfigureDefaultServers : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandConfigureDefaultServers : BasicUICommandExecution, IAtomicCommand
 {
     public ExecuteCommandConfigureDefaultServers(IActivateItems activator) : base(activator)
     {
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Change which server is the default for a given use case e.g. Logging, DQE etc";
-    }
+    public override string GetCommandHelp() =>
+        "Change which server is the default for a given use case e.g. Logging, DQE etc";
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateANOVersion.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateANOVersion.cs
index 9342563acd..3e79e69be1 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateANOVersion.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateANOVersion.cs
@@ -17,46 +17,44 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateANOVersion:BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandCreateANOVersion : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private Catalogue _catalogue;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandCreateANOVersion(IActivateItems activator, Catalogue catalogue) : this(activator) => SetTarget(catalogue);
+    public ExecuteCommandCreateANOVersion(IActivateItems activator, Catalogue catalogue) : this(activator)
+    {
+        SetTarget(catalogue);
+    }
 
     public ExecuteCommandCreateANOVersion(IActivateItems activator) : base(activator)
     {
         UseTripleDotSuffix = true;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ANOTable);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.ANOTable);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _catalogue = (Catalogue) target;
+        _catalogue = (Catalogue)target;
 
-        if(!_catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Any())
+        if (!_catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Any())
             SetImpossible("Catalogue does not have any Extractable Columns");
 
         return this;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Create an anonymous version of the dataset.  This will be an initially empty anonymous schema and a load configuration for migrating the data.";
-    }
+    public override string GetCommandHelp() =>
+        "Create an anonymous version of the dataset.  This will be an initially empty anonymous schema and a load configuration for migrating the data.";
 
     public override void Execute()
     {
         if (_catalogue == null)
             SetTarget(SelectOne<Catalogue>(Activator.CoreChildProvider.AllCatalogues));
 
-        if(_catalogue == null)
+        if (_catalogue == null)
             return;
-            
+
         base.Execute();
 
         Activator.Activate<ForwardEngineerANOCatalogueUI, Catalogue>(_catalogue);
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCatalogueByImportingFileUI.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCatalogueByImportingFileUI.cs
index 802c12fd84..68be53ff60 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCatalogueByImportingFileUI.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCatalogueByImportingFileUI.cs
@@ -16,16 +16,18 @@ public class ExecuteCommandCreateNewCatalogueByImportingFileUI : ExecuteCommandC
 {
     private readonly IActivateItems _activator;
 
-    public ExecuteCommandCreateNewCatalogueByImportingFileUI(IActivateItems activator,FileInfo file = null) :base(activator,file)
+    public ExecuteCommandCreateNewCatalogueByImportingFileUI(IActivateItems activator, FileInfo file = null) : base(
+        activator, file)
     {
         _activator = activator;
     }
+
     public override void Execute()
     {
-        if(IsImpossible)
+        if (IsImpossible)
             throw new ImpossibleCommandException(this, ReasonCommandImpossible);
 
-        var ui = new CreateNewCatalogueByImportingFileUI(_activator,this);
+        var ui = new CreateNewCatalogueByImportingFileUI(_activator, this);
         ui.SetProjectSpecific(ProjectSpecific);
         ui.ShowDialog();
     }
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs
index b36bd39722..1e377c9dd2 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewCohortDatabaseUsingWizard.cs
@@ -14,17 +14,15 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewCohortDatabaseUsingWizard : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewCohortDatabaseUsingWizard : BasicUICommandExecution, IAtomicCommand
 {
-    public ExecuteCommandCreateNewCohortDatabaseUsingWizard(IActivateItems activator):base(activator)
+    public ExecuteCommandCreateNewCohortDatabaseUsingWizard(IActivateItems activator) : base(activator)
     {
         UseTripleDotSuffix = true;
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Create a new empty cohort list storage database with a private identifier that matches your datasets extraction identifier column name\\type (e.g. PatientId varchar(10)";
-    }
+    public override string GetCommandHelp() =>
+        "Create a new empty cohort list storage database with a private identifier that matches your datasets extraction identifier column name\\type (e.g. PatientId varchar(10)";
 
     public override void Execute()
     {
@@ -32,7 +30,7 @@ public override void Execute()
 
         var wizard = new CreateNewCohortDatabaseWizardUI(Activator);
         wizard.SetItemActivator(Activator);
-        var f = Activator.ShowWindow(wizard,true);
+        var f = Activator.ShowWindow(wizard, true);
         f.FormClosed += (s, e) =>
         {
             if (wizard.ExternalCohortTableCreatedIfAny != null)
@@ -40,8 +38,5 @@ public override void Execute()
         };
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.wand);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(FamFamFamIcons.wand);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDashboard.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDashboard.cs
index 8ca0785fc6..24bdcb26e4 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDashboard.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDashboard.cs
@@ -18,19 +18,16 @@ internal class ExecuteCommandCreateNewDashboard : BasicUICommandExecution, IAtom
 {
     public ExecuteCommandCreateNewDashboard(IActivateItems activator) : base(activator)
     {
-
-    }
-        
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.DashboardLayout, OverlayKind.Add);
     }
 
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.DashboardLayout, OverlayKind.Add);
+
     public override void Execute()
     {
         base.Execute();
 
-        if(TypeText("Dashboard Name","Name",out var name))
+        if (TypeText("Dashboard Name", "Name", out var name))
         {
             var l = new DashboardLayout(Activator.RepositoryLocator.CatalogueRepository, name);
             Publish(l);
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataExtractionProject.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataExtractionProject.cs
index 8376bb4477..0b7ac0fa44 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataExtractionProject.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewDataExtractionProject.cs
@@ -47,23 +47,19 @@ public override void Execute()
             if (wizard.ExtractionConfigurationCreatedIfAny != null)
             {
                 //now execute it
-                var executeCommand = new ExecuteCommandExecuteExtractionConfiguration(Activator).SetTarget(wizard.ExtractionConfigurationCreatedIfAny);
+                var executeCommand =
+                    new ExecuteCommandExecuteExtractionConfiguration(Activator).SetTarget(
+                        wizard.ExtractionConfigurationCreatedIfAny);
                 if (!executeCommand.IsImpossible)
                     executeCommand.Execute();
             }
-
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Project, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Project, OverlayKind.Add);
 
-    public override string GetCommandHelp()
-    {
-        return
-            "This will open a window which will guide you in the steps for creating a Data Extraction Project.\r\n" +
-            "You will be asked to choose a Cohort, the Catalogues to extract and the destination folder.";
-    }
+    public override string GetCommandHelp() =>
+        "This will open a window which will guide you in the steps for creating a Data Extraction Project.\r\n" +
+        "You will be asked to choose a Cohort, the Catalogues to extract and the destination folder.";
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPipeline.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPipeline.cs
index 3f31e8ba2a..61626455f8 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPipeline.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPipeline.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewPipeline : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewPipeline : BasicUICommandExecution, IAtomicCommand
 {
     private readonly PipelineUseCase _useCase;
 
@@ -22,7 +22,7 @@ public ExecuteCommandCreateNewPipeline(IActivateItems activator, PipelineUseCase
     {
         _useCase = useCase;
 
-        if(_useCase == null)
+        if (_useCase == null)
             SetImpossible("Pipelines can only be created under an established use case");
     }
 
@@ -35,8 +35,6 @@ public override void Execute()
         edit.Execute();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Pipeline, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.Pipeline, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPreLoadDiscardedColumn.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPreLoadDiscardedColumn.cs
index 504b283107..8a4c42746e 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPreLoadDiscardedColumn.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewPreLoadDiscardedColumn.cs
@@ -20,17 +20,19 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewPreLoadDiscardedColumn:BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewPreLoadDiscardedColumn : BasicUICommandExecution, IAtomicCommand
 {
     private readonly TableInfo _tableInfo;
     private ColumnInfo[] _prototypes;
 
-    public ExecuteCommandCreateNewPreLoadDiscardedColumn(IActivateItems activator,TableInfo tableInfo) : base(activator)
+    public ExecuteCommandCreateNewPreLoadDiscardedColumn(IActivateItems activator, TableInfo tableInfo) :
+        base(activator)
     {
         _tableInfo = tableInfo;
     }
 
-    public ExecuteCommandCreateNewPreLoadDiscardedColumn(IActivateItems activator, TableInfo tableInfo, ColumnInfoCombineable sourceColumnInfoCombineable):this(activator,tableInfo)
+    public ExecuteCommandCreateNewPreLoadDiscardedColumn(IActivateItems activator, TableInfo tableInfo,
+        ColumnInfoCombineable sourceColumnInfoCombineable) : this(activator, tableInfo)
     {
         _prototypes = sourceColumnInfoCombineable.ColumnInfos;
 
@@ -42,29 +44,29 @@ public ExecuteCommandCreateNewPreLoadDiscardedColumn(IActivateItems activator, T
             if (alreadyExists)
                 SetImpossible($"There is already a PreLoadDiscardedColumn called '{prototype.GetRuntimeName()}'");
         }
-          
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Creates a virtual column that will be created in RAW during data load but not your LIVE database";
-    }
+    public override string GetCommandHelp() =>
+        "Creates a virtual column that will be created in RAW during data load but not your LIVE database";
 
     public override void Execute()
     {
         base.Execute();
 
-        if(_prototypes == null)
+        if (_prototypes == null)
         {
-            var varcharMaxDataType = _tableInfo.GetQuerySyntaxHelper().TypeTranslater.GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof (string), int.MaxValue));
+            var varcharMaxDataType = _tableInfo.GetQuerySyntaxHelper().TypeTranslater
+                .GetSQLDBTypeForCSharpType(new DatabaseTypeRequest(typeof(string), int.MaxValue));
 
-            var textDialog = new TypeTextOrCancelDialog("Column Name","Enter name for column (this should NOT include any qualifiers e.g. database name)", 300);
+            var textDialog = new TypeTextOrCancelDialog("Column Name",
+                "Enter name for column (this should NOT include any qualifiers e.g. database name)", 300);
             if (textDialog.ShowDialog() != DialogResult.OK)
                 return;
 
             var name = textDialog.ResultText;
 
-            textDialog = new TypeTextOrCancelDialog("Column DataType", "Enter data type for column (e.g. 'varchar(10)')", 300, varcharMaxDataType);
+            textDialog = new TypeTextOrCancelDialog("Column DataType",
+                "Enter data type for column (e.g. 'varchar(10)')", 300, varcharMaxDataType);
             if (textDialog.ShowDialog() != DialogResult.OK)
                 return;
 
@@ -74,7 +76,6 @@ public override void Execute()
             Publish();
             Emphasise(created);
             Activate(created);
-
         }
         else
         {
@@ -93,20 +94,15 @@ private void Publish()
     private PreLoadDiscardedColumn Create(string name, string dataType)
     {
         var discCol = new PreLoadDiscardedColumn(Activator.RepositoryLocator.CatalogueRepository, _tableInfo, name)
-            {
-                SqlDataType = dataType
-            };
+        {
+            SqlDataType = dataType
+        };
         discCol.SaveToDatabase();
         return discCol;
     }
 
-    public override string GetCommandName()
-    {
-        return "Add New Load Discarded Column";
-    }
+    public override string GetCommandName() => "Add New Load Discarded Column";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.PreLoadDiscardedColumn, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.PreLoadDiscardedColumn, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewQueryCacheDatabase.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewQueryCacheDatabase.cs
index e6ccdd5fd8..e0e1a1a908 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewQueryCacheDatabase.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandCreateNewQueryCacheDatabase.cs
@@ -18,14 +18,15 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandCreateNewQueryCacheDatabase : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandCreateNewQueryCacheDatabase : BasicUICommandExecution, IAtomicCommand
 {
     private readonly CohortIdentificationConfiguration _cic;
-        
-    public ExecuteCommandCreateNewQueryCacheDatabase(IActivateItems activator, CohortIdentificationConfiguration configuration):base(activator)
+
+    public ExecuteCommandCreateNewQueryCacheDatabase(IActivateItems activator,
+        CohortIdentificationConfiguration configuration) : base(activator)
     {
         _cic = configuration;
-        if(_cic.QueryCachingServer_ID != null)
+        if (_cic.QueryCachingServer_ID != null)
             SetImpossible("CohortIdentificationConfiguration already has a Query Cache configured");
     }
 
@@ -41,20 +42,19 @@ public override void Execute()
         var db = createPlatform.DatabaseCreatedIfAny;
         if (db != null)
         {
-            var newServer = new ExternalDatabaseServer(Activator.RepositoryLocator.CatalogueRepository, "Caching Database", p);
+            var newServer =
+                new ExternalDatabaseServer(Activator.RepositoryLocator.CatalogueRepository, "Caching Database", p);
             newServer.SetProperties(db);
 
             _cic.QueryCachingServer_ID = newServer.ID;
             _cic.SaveToDatabase();
 
-            SetDefaultIfNotExists(newServer,PermissableDefaults.CohortIdentificationQueryCachingServer_ID,true);
-                
+            SetDefaultIfNotExists(newServer, PermissableDefaults.CohortIdentificationQueryCachingServer_ID, true);
+
             Publish(_cic);
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditCacheProgress.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditCacheProgress.cs
index 5505989971..2ba78be074 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditCacheProgress.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditCacheProgress.cs
@@ -14,11 +14,11 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandEditCacheProgress : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandEditCacheProgress : BasicUICommandExecution, IAtomicCommand
 {
     private readonly CacheProgress _cacheProgress;
 
-    public ExecuteCommandEditCacheProgress(IActivateItems activator, CacheProgress cacheProgress):base(activator)
+    public ExecuteCommandEditCacheProgress(IActivateItems activator, CacheProgress cacheProgress) : base(activator)
     {
         _cacheProgress = cacheProgress;
     }
@@ -29,13 +29,8 @@ public override void Execute()
         Activator.Activate<CacheProgressUI, CacheProgress>(_cacheProgress);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(_cacheProgress);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(_cacheProgress);
 
-    public override string GetCommandHelp()
-    {
-        return "Change which pipeline is used to fetch data, what date the cache has progressed to etc";
-    }
+    public override string GetCommandHelp() =>
+        "Change which pipeline is used to fetch data, what date the cache has progressed to etc";
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditLoadMetadataDescription.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditLoadMetadataDescription.cs
index 70b2edef2e..82969e978d 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditLoadMetadataDescription.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditLoadMetadataDescription.cs
@@ -15,24 +15,20 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandEditLoadMetadataDescription : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandEditLoadMetadataDescription : BasicUICommandExecution, IAtomicCommand
 {
     private LoadMetadata _loadMetadata;
 
-    public ExecuteCommandEditLoadMetadataDescription(IActivateItems activator, LoadMetadata loadMetadata):base(activator)
+    public ExecuteCommandEditLoadMetadataDescription(IActivateItems activator, LoadMetadata loadMetadata) :
+        base(activator)
     {
         _loadMetadata = loadMetadata;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.LoadMetadata,OverlayKind.Edit);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.LoadMetadata, OverlayKind.Edit);
 
-    public override string GetCommandName()
-    {
-        return "Edit Description";
-    }
+    public override string GetCommandName() => "Edit Description";
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditPipelineWithUseCase.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditPipelineWithUseCase.cs
index d854fa6951..9981fcb1e3 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditPipelineWithUseCase.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandEditPipelineWithUseCase.cs
@@ -11,12 +11,13 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandEditPipelineWithUseCase : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandEditPipelineWithUseCase : BasicUICommandExecution, IAtomicCommand
 {
     private readonly Pipeline _pipeline;
     private readonly PipelineUseCase _useCase;
 
-    public ExecuteCommandEditPipelineWithUseCase(IActivateItems itemActivator,Pipeline pipeline, PipelineUseCase useCase):base(itemActivator)
+    public ExecuteCommandEditPipelineWithUseCase(IActivateItems itemActivator, Pipeline pipeline,
+        PipelineUseCase useCase) : base(itemActivator)
     {
         _pipeline = pipeline;
         _useCase = useCase;
@@ -27,9 +28,10 @@ public override void Execute()
         base.Execute();
 
         //create pipeline UI with NO explicit destination/source (both must be configured within the extraction context by the user)
-        var dialog = new ConfigurePipelineUI(Activator,_pipeline, _useCase, Activator.RepositoryLocator.CatalogueRepository);
+        var dialog = new ConfigurePipelineUI(Activator, _pipeline, _useCase,
+            Activator.RepositoryLocator.CatalogueRepository);
         dialog.ShowDialog();
-            
+
         Publish(_pipeline);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteCacheProgress.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteCacheProgress.cs
index ebbd6546a7..7122c4b73d 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteCacheProgress.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteCacheProgress.cs
@@ -17,7 +17,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandExecuteCacheProgress:BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandExecuteCacheProgress : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private CacheProgress _cp;
 
@@ -26,26 +26,21 @@ public ExecuteCommandExecuteCacheProgress(IActivateItems activator, CacheProgres
     {
         _cp = cp;
     }
-        
+
     public ExecuteCommandExecuteCacheProgress(IActivateItems activator)
         : base(activator)
     {
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Runs the caching activity.  This usually involves long term incremental fetching and storing data ready for load";
-    }
+    public override string GetCommandHelp() =>
+        "Runs the caching activity.  This usually involves long term incremental fetching and storing data ready for load";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CacheProgress, OverlayKind.Execute);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CacheProgress, OverlayKind.Execute);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _cp = (CacheProgress) target;
+        _cp = (CacheProgress)target;
         return this;
     }
 
@@ -54,10 +49,10 @@ public override void Execute()
         base.Execute();
 
         _cp ??= SelectOne<CacheProgress>(Activator.RepositoryLocator.CatalogueRepository);
-            
-        if(_cp == null)
+
+        if (_cp == null)
             return;
-            
+
         Activator.Activate<ExecuteCacheProgressUI, CacheProgress>(_cp);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionAggregateGraph.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionAggregateGraph.cs
index 7304510466..a1777563a1 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionAggregateGraph.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionAggregateGraph.cs
@@ -14,11 +14,12 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandExecuteExtractionAggregateGraph : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandExecuteExtractionAggregateGraph : BasicUICommandExecution, IAtomicCommand
 {
     private readonly ExtractionAggregateGraphObjectCollection _collection;
 
-    public ExecuteCommandExecuteExtractionAggregateGraph(IActivateItems activator,ExtractionAggregateGraphObjectCollection collection) : base(activator)
+    public ExecuteCommandExecuteExtractionAggregateGraph(IActivateItems activator,
+        ExtractionAggregateGraphObjectCollection collection) : base(activator)
     {
         _collection = collection;
 
@@ -26,15 +27,11 @@ public ExecuteCommandExecuteExtractionAggregateGraph(IActivateItems activator,Ex
             SetImpossible(reason);
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Shows a subset of the main graph as it applies to the records that will be extracted";
-    }
+    public override string GetCommandHelp() =>
+        "Shows a subset of the main graph as it applies to the records that will be extracted";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AggregateGraph);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AggregateGraph);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionConfiguration.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionConfiguration.cs
index 5d41f6c569..e48147a1c8 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionConfiguration.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExecuteExtractionConfiguration.cs
@@ -18,14 +18,15 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandExecuteExtractionConfiguration:BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandExecuteExtractionConfiguration : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private ExtractionConfiguration _extractionConfiguration;
     private SelectedDataSets _selectedDataSet;
     private Project _project;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandExecuteExtractionConfiguration(IActivateItems activator, ExtractionConfiguration extractionConfiguration) : this(activator)
+    public ExecuteCommandExecuteExtractionConfiguration(IActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : this(activator)
     {
         _extractionConfiguration = extractionConfiguration;
     }
@@ -40,22 +41,18 @@ public ExecuteCommandExecuteExtractionConfiguration(IActivateItems activator) :
         OverrideCommandName = "Run Extraction...";
     }
 
-    public ExecuteCommandExecuteExtractionConfiguration(IActivateItems activator, SelectedDataSets selectedDataSet) : this(activator)
+    public ExecuteCommandExecuteExtractionConfiguration(IActivateItems activator, SelectedDataSets selectedDataSet) :
+        this(activator)
     {
         _extractionConfiguration = (ExtractionConfiguration)selectedDataSet.ExtractionConfiguration;
         _selectedDataSet = selectedDataSet;
-
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Extract all the datasets in the configuration linking each against the configuration's cohort";
-    }
+    public override string GetCommandHelp() =>
+        "Extract all the datasets in the configuration linking each against the configuration's cohort";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionConfiguration,OverlayKind.Execute);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionConfiguration, OverlayKind.Execute);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
@@ -63,7 +60,7 @@ public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
         _project = target as Project;
 
         //if target is ExtractionConfiguration
-        if(_extractionConfiguration != null && !_extractionConfiguration.IsExtractable(out var reason))
+        if (_extractionConfiguration != null && !_extractionConfiguration.IsExtractable(out var reason))
             SetImpossible(reason);
 
         if (_project != null && !_project.ExtractionConfigurations.Any(c => c.IsExtractable(out _)))
@@ -71,20 +68,21 @@ public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
 
         return this;
     }
-        
+
 
     public override void Execute()
     {
         base.Execute();
 
-        if(_project != null && _extractionConfiguration == null)
+        if (_project != null && _extractionConfiguration == null)
         {
-            var available = _project.ExtractionConfigurations.Where(c=>c.IsExtractable(out _)).Cast<ExtractionConfiguration>().ToArray();
-                
-            if(available.Any())
+            var available = _project.ExtractionConfigurations.Where(c => c.IsExtractable(out _))
+                .Cast<ExtractionConfiguration>().ToArray();
+
+            if (available.Any())
                 _extractionConfiguration = SelectOne(available);
 
-            if(_extractionConfiguration == null)
+            if (_extractionConfiguration == null)
                 return;
         }
 
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs
index faf3ccae6d..94d91be8fd 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandExpandAllNodes.cs
@@ -15,23 +15,21 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandExpandAllNodes : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandExpandAllNodes : BasicUICommandExecution, IAtomicCommand
 {
     private readonly RDMPCollectionCommonFunctionality _commonFunctionality;
     private object _rootToExpandFrom;
 
-    public ExecuteCommandExpandAllNodes(IActivateItems activator,RDMPCollectionCommonFunctionality commonFunctionality, object toExpand) : base(activator)
+    public ExecuteCommandExpandAllNodes(IActivateItems activator, RDMPCollectionCommonFunctionality commonFunctionality,
+        object toExpand) : base(activator)
     {
         _commonFunctionality = commonFunctionality;
         _rootToExpandFrom = toExpand;
 
         // if we are expanding everything in the tree that is ok
-        if (_rootToExpandFrom is RDMPCollection)
-        {
-            return;
-        }
+        if (_rootToExpandFrom is RDMPCollection) return;
 
-        if(!commonFunctionality.Tree.CanExpand(toExpand))
+        if (!commonFunctionality.Tree.CanExpand(toExpand))
             SetImpossible("Node cannot be expanded");
 
         Weight = 100.4f;
@@ -39,13 +37,11 @@ public ExecuteCommandExpandAllNodes(IActivateItems activator,RDMPCollectionCommo
 
     public override string GetCommandName()
     {
-        if (_rootToExpandFrom is RDMPCollection && string.IsNullOrWhiteSpace(OverrideCommandName))
-        {
-            return "Expand All";
-        }
+        if (_rootToExpandFrom is RDMPCollection && string.IsNullOrWhiteSpace(OverrideCommandName)) return "Expand All";
 
         return base.GetCommandName();
     }
+
     public override void Execute()
     {
         base.Execute();
@@ -53,13 +49,13 @@ public override void Execute()
         _commonFunctionality.Tree.Visible = false;
         try
         {
-            if(_rootToExpandFrom is RDMPCollection)
+            if (_rootToExpandFrom is RDMPCollection)
             {
                 _commonFunctionality.Tree.ExpandAll();
                 return;
             }
 
-            _commonFunctionality.ExpandToDepth(int.MaxValue,_rootToExpandFrom);
+            _commonFunctionality.ExpandToDepth(int.MaxValue, _rootToExpandFrom);
 
             var index = _commonFunctionality.Tree.IndexOf(_rootToExpandFrom);
             if (index != -1)
@@ -71,8 +67,6 @@ public override void Execute()
         }
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.ExpandAllNodes);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(CatalogueIcons.ExpandAllNodes);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateMetadataReport.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateMetadataReport.cs
index 70ade4e5da..a6a979cf6c 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateMetadataReport.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateMetadataReport.cs
@@ -11,12 +11,13 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandGenerateMetadataReport:BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandGenerateMetadataReport : BasicUICommandExecution, IAtomicCommand
 {
     private readonly ICatalogue[] _initialSelection;
 
 
-    public ExecuteCommandGenerateMetadataReport(IActivateItems activator, params ICatalogue[] initialSelection) : base(activator)
+    public ExecuteCommandGenerateMetadataReport(IActivateItems activator, params ICatalogue[] initialSelection) :
+        base(activator)
     {
         _initialSelection = initialSelection;
     }
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestDataUI.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestDataUI.cs
index 063ffac6ee..d7bb4bb493 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestDataUI.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandGenerateTestDataUI.cs
@@ -19,7 +19,7 @@ public override void Execute()
     {
         base.Execute();
 
-        var dialog = new GenerateTestDataUI(Activator,this);
+        var dialog = new GenerateTestDataUI(Activator, this);
         dialog.Show();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenExtractionDirectory.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenExtractionDirectory.cs
index 0efa341beb..d904897234 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenExtractionDirectory.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenExtractionDirectory.cs
@@ -22,23 +22,28 @@ internal class ExecuteCommandOpenExtractionDirectory : BasicUICommandExecution
     private FileInfo _file;
     private DirectoryInfo _dir;
 
-    public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, ISelectedDataSets sds):base(activator)
+    public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, ISelectedDataSets sds) : base(activator)
     {
         var result = sds.GetCumulativeExtractionResultsIfAny();
         try
         {
-            if(result == null)
+            if (result == null)
+            {
                 SetImpossible("Dataset has not been extracted");
-            else
-            if(result.DestinationType == null)
+            }
+            else if (result.DestinationType == null)
+            {
                 SetImpossible("This extraction has not been run");
+            }
             else if (!result.DestinationType.EndsWith("FlatFileDestination"))
+            {
                 SetImpossible($"Extraction destination was '{result.DestinationType}' so cannot be opened");
+            }
             else
             {
                 _file = new FileInfo(result.DestinationDescription);
 
-                if(!_file.Exists)
+                if (!_file.Exists)
                     SetImpossible($"File '{_file.FullName}' did not exist on disk");
             }
         }
@@ -46,19 +51,24 @@ public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, ISelected
         {
             SetImpossible("Could not determine file location");
         }
-
     }
 
-    public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, IExtractionConfiguration configuration) : base(activator)
+    public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, IExtractionConfiguration configuration) :
+        base(activator)
     {
-        var cumulativeExtractionResults = configuration.SelectedDataSets.Select(s=>s.GetCumulativeExtractionResultsIfAny()).Where(c=>c!=null).ToArray();
+        var cumulativeExtractionResults = configuration.SelectedDataSets
+            .Select(s => s.GetCumulativeExtractionResultsIfAny()).Where(c => c != null).ToArray();
         try
         {
             if (cumulativeExtractionResults.Length == 0)
+            {
                 SetImpossible("No datasets have ever been extracted");
-            else
-            if (!cumulativeExtractionResults.All(c=>c.DestinationType != null && c.DestinationType.EndsWith("FlatFileDestination")))
+            }
+            else if (!cumulativeExtractionResults.All(c =>
+                         c.DestinationType != null && c.DestinationType.EndsWith("FlatFileDestination")))
+            {
                 SetImpossible("Extraction destinations were not to disk");
+            }
             else
             {
                 // all datasets have been extracted to disk
@@ -66,38 +76,33 @@ public ExecuteCommandOpenExtractionDirectory(IActivateItems activator, IExtracti
                 // but do they have a shared parent dir?
                 var files = cumulativeExtractionResults.Select(c => new FileInfo(c.DestinationDescription)).ToArray();
 
-                var parents = files.Select(f => f.Directory?.Parent?.FullName).Where(d=>d != null).Distinct().ToArray();
+                var parents = files.Select(f => f.Directory?.Parent?.FullName).Where(d => d != null).Distinct()
+                    .ToArray();
 
                 if (parents.Length != 1)
                     SetImpossible($"Extracted files do not share a common extraction directory");
                 else
-                {
                     _dir = new DirectoryInfo(parents[0]);
-                }
-                        
             }
         }
         catch (Exception)
         {
             SetImpossible("Could not determine file location");
         }
-
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractionDirectoryNode);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractionDirectoryNode);
 
     public override void Execute()
     {
         base.Execute();
 
-        var cmd = _file != null?
-            new ExecuteCommandOpenInExplorer(Activator, _file):
-            new ExecuteCommandOpenInExplorer(Activator, _dir);
-            
-        if(!cmd.IsImpossible)
+        var cmd = _file != null
+            ? new ExecuteCommandOpenInExplorer(Activator, _file)
+            : new ExecuteCommandOpenInExplorer(Activator, _dir);
+
+        if (!cmd.IsImpossible)
             cmd.Execute();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenInExplorer.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenInExplorer.cs
index bff8677aed..9d3c24df4d 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenInExplorer.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandOpenInExplorer.cs
@@ -15,13 +15,13 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandOpenInExplorer:BasicUICommandExecution
+public class ExecuteCommandOpenInExplorer : BasicUICommandExecution
 {
     private readonly FileSystemInfo _info;
-        
-    public ExecuteCommandOpenInExplorer(IActivateItems activator,FileSystemInfo info) : base(activator)
+
+    public ExecuteCommandOpenInExplorer(IActivateItems activator, FileSystemInfo info) : base(activator)
     {
-        _info = info; 
+        _info = info;
 
         if (_info is not { Exists: true })
             SetImpossible("Path not found");
@@ -31,12 +31,10 @@ public override void Execute()
     {
         base.Execute();
 
-        if(_info != null)
+        if (_info != null)
             UsefulStuff.ShowPathInWindowsExplorer(_info);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.CatalogueFolder);
-    }
-}
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.CatalogueFolder);
+}
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandPublishFilter.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandPublishFilter.cs
index 52fc7dd645..cb91a4f1c9 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandPublishFilter.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandPublishFilter.cs
@@ -21,7 +21,8 @@ public class ExecuteCommandPublishFilter : BasicUICommandExecution, IAtomicComma
     private Catalogue _catalogue;
     private ExtractionInformation[] _allExtractionInformations;
 
-    public ExecuteCommandPublishFilter(IActivateItems activator, IFilter filter,Catalogue targetCatalogue):base(activator)
+    public ExecuteCommandPublishFilter(IActivateItems activator, IFilter filter, Catalogue targetCatalogue) :
+        base(activator)
     {
         _filter = filter;
         _catalogue = targetCatalogue;
@@ -55,11 +56,14 @@ public override void Execute()
 
         _catalogue ??= SelectOne<Catalogue>(Activator.RepositoryLocator.CatalogueRepository);
 
-        var toAddTo = SelectOne(new DialogArgs { 
+        var toAddTo = SelectOne(new DialogArgs
+        {
             WindowTitle = "Associated Column",
-            TaskDescription = "All filters must be associated with a single column.  Pick which column to associate this filter with."},_allExtractionInformations);
+            TaskDescription =
+                "All filters must be associated with a single column.  Pick which column to associate this filter with."
+        }, _allExtractionInformations);
 
-        if(toAddTo != null)
+        if (toAddTo != null)
         {
             //see if there is one with the same name that for some reason we are not known to be a child of already
             var duplicate = toAddTo.ExtractionFilters.FirstOrDefault(f => f.Name.Equals(_filter.Name));
@@ -73,9 +77,10 @@ public override void Execute()
                     _filter.ClonedFromExtractionFilter_ID = duplicate.ID;
                     _filter.SaveToDatabase();
                 }
+
                 return;
             }
-                
+
             new FilterImporter(new ExtractionFilterFactory(toAddTo), null).ImportFilter(null, _filter, null);
             MessageBox.Show("Publish successful");
         }
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregate.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregate.cs
index 72bbda3d34..ae5049b68a 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregate.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregate.cs
@@ -16,16 +16,18 @@ internal class ExecuteCommandReOrderAggregate : BasicUICommandExecution
 {
     private readonly AggregateConfigurationCombineable _sourceAggregateCommand;
     private CohortAggregateContainer _parentContainer;
-        
+
     private IOrderable _targetOrder;
     private readonly InsertOption _insertOption;
 
-    public ExecuteCommandReOrderAggregate(IActivateItems activator, AggregateConfigurationCombineable sourceAggregateCommand, AggregateConfiguration targetAggregateConfiguration, InsertOption insertOption) :this(activator,targetAggregateConfiguration,insertOption)
+    public ExecuteCommandReOrderAggregate(IActivateItems activator,
+        AggregateConfigurationCombineable sourceAggregateCommand, AggregateConfiguration targetAggregateConfiguration,
+        InsertOption insertOption) : this(activator, targetAggregateConfiguration, insertOption)
     {
         _sourceAggregateCommand = sourceAggregateCommand;
         _parentContainer = targetAggregateConfiguration.GetCohortAggregateContainerIfAny();
 
-        if(_parentContainer == null)
+        if (_parentContainer == null)
         {
             SetImpossible(
                 $"Target Aggregate {targetAggregateConfiguration} is not part of any cohort identification set containers");
@@ -34,29 +36,35 @@ public ExecuteCommandReOrderAggregate(IActivateItems activator, AggregateConfigu
 
         if (!sourceAggregateCommand.ContainerIfAny.Equals(_parentContainer))
         {
-            SetImpossible("Cannot ReOrder, you should first move both objects into the same container (UNION / EXCEPT / INTERSECT)");
+            SetImpossible(
+                "Cannot ReOrder, you should first move both objects into the same container (UNION / EXCEPT / INTERSECT)");
             return;
         }
     }
 
-    public ExecuteCommandReOrderAggregate(IActivateItems activator, AggregateConfigurationCombineable sourceAggregateCommand, CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption):this(activator,targetCohortAggregateContainer,insertOption)
+    public ExecuteCommandReOrderAggregate(IActivateItems activator,
+        AggregateConfigurationCombineable sourceAggregateCommand,
+        CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption) : this(activator,
+        targetCohortAggregateContainer, insertOption)
     {
         _sourceAggregateCommand = sourceAggregateCommand;
         _parentContainer = targetCohortAggregateContainer.GetParentContainerIfAny();
-            
+
         if (!sourceAggregateCommand.ContainerIfAny.Equals(_parentContainer))
         {
-            SetImpossible("Cannot ReOrder, you should first move both objects into the same container (UNION / EXCEPT / INTERSECT)");
+            SetImpossible(
+                "Cannot ReOrder, you should first move both objects into the same container (UNION / EXCEPT / INTERSECT)");
             return;
         }
     }
 
-    private ExecuteCommandReOrderAggregate(IActivateItems activator, IOrderable target, InsertOption insertOption):base(activator)
+    private ExecuteCommandReOrderAggregate(IActivateItems activator, IOrderable target, InsertOption insertOption) :
+        base(activator)
     {
         _targetOrder = target;
         _insertOption = insertOption;
-            
-        if(target is IMightBeReadOnly ro && ro.ShouldBeReadOnly(out var reason))
+
+        if (target is IMightBeReadOnly ro && ro.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
@@ -68,13 +76,11 @@ public override void Execute()
         _sourceAggregateCommand.ContainerIfAny.RemoveChild(source);
 
         var targetOrder = _targetOrder.Order;
-            
-        _parentContainer.CreateInsertionPointAtOrder(source,targetOrder , _insertOption == InsertOption.InsertAbove);
+
+        _parentContainer.CreateInsertionPointAtOrder(source, targetOrder, _insertOption == InsertOption.InsertAbove);
         _parentContainer.AddChild(source, targetOrder);
 
         //refresh the parent container
         Publish(_parentContainer);
-            
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregateContainer.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregateContainer.cs
index e9e1d0c511..915514c858 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregateContainer.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderAggregateContainer.cs
@@ -11,7 +11,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandReOrderAggregateContainer : BasicUICommandExecution 
+internal class ExecuteCommandReOrderAggregateContainer : BasicUICommandExecution
 {
     private readonly CohortAggregateContainerCombineable _sourceCohortAggregateContainerCombineable;
 
@@ -19,38 +19,44 @@ internal class ExecuteCommandReOrderAggregateContainer : BasicUICommandExecution
     private IOrderable _targetOrderable;
     private readonly InsertOption _insertOption;
 
-    public ExecuteCommandReOrderAggregateContainer(IActivateItems activator, CohortAggregateContainerCombineable sourceCohortAggregateContainerCombineable, CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption):this(activator,targetCohortAggregateContainer,insertOption)
+    public ExecuteCommandReOrderAggregateContainer(IActivateItems activator,
+        CohortAggregateContainerCombineable sourceCohortAggregateContainerCombineable,
+        CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption) : this(activator,
+        targetCohortAggregateContainer, insertOption)
     {
         _sourceCohortAggregateContainerCombineable = sourceCohortAggregateContainerCombineable;
-            
+
         _targetParent = targetCohortAggregateContainer.GetParentContainerIfAny();
-            
+
         //reorder is only possible within a container
         if (!_sourceCohortAggregateContainerCombineable.ParentContainerIfAny.Equals(_targetParent))
             SetImpossible("First move containers to share the same parent container");
 
-        if(_insertOption == InsertOption.Default)
+        if (_insertOption == InsertOption.Default)
             SetImpossible("Insert must be above/below");
-            
-        if(_targetParent.ShouldBeReadOnly(out var reason))
+
+        if (_targetParent.ShouldBeReadOnly(out var reason))
             SetImpossible(reason);
     }
 
-    public ExecuteCommandReOrderAggregateContainer(IActivateItems activator, CohortAggregateContainerCombineable sourceCohortAggregateContainerCombineable, AggregateConfiguration targetAggregate, InsertOption insertOption):this(activator,targetAggregate,insertOption)
+    public ExecuteCommandReOrderAggregateContainer(IActivateItems activator,
+        CohortAggregateContainerCombineable sourceCohortAggregateContainerCombineable,
+        AggregateConfiguration targetAggregate, InsertOption insertOption) : this(activator, targetAggregate,
+        insertOption)
     {
         _sourceCohortAggregateContainerCombineable = sourceCohortAggregateContainerCombineable;
         _targetParent = targetAggregate.GetCohortAggregateContainerIfAny();
 
         //if they do not share the same parent container
-        if(!_sourceCohortAggregateContainerCombineable.ParentContainerIfAny.Equals(_targetParent))
+        if (!_sourceCohortAggregateContainerCombineable.ParentContainerIfAny.Equals(_targetParent))
             SetImpossible("First move objects into the same parent container");
     }
 
-    private ExecuteCommandReOrderAggregateContainer(IActivateItems activator,IOrderable orderable, InsertOption insertOption) : base(activator)
+    private ExecuteCommandReOrderAggregateContainer(IActivateItems activator, IOrderable orderable,
+        InsertOption insertOption) : base(activator)
     {
         _targetOrderable = orderable;
         _insertOption = insertOption;
-
     }
 
     public override void Execute()
@@ -60,8 +66,8 @@ public override void Execute()
         var source = _sourceCohortAggregateContainerCombineable.AggregateContainer;
 
         var order = _targetOrderable.Order;
-            
-        _targetParent.CreateInsertionPointAtOrder(source,order,_insertOption == InsertOption.InsertAbove);
+
+        _targetParent.CreateInsertionPointAtOrder(source, order, _insertOption == InsertOption.InsertAbove);
         source.Order = order;
         source.SaveToDatabase();
 
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderColumns.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderColumns.cs
index e8abc41421..6b8366a97e 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderColumns.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderColumns.cs
@@ -15,19 +15,16 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandReOrderColumns:BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandReOrderColumns : BasicUICommandExecution, IAtomicCommand
 {
     private readonly Catalogue _catalogue;
 
-    public ExecuteCommandReOrderColumns(IActivateItems activator, Catalogue catalogue): base(activator)
+    public ExecuteCommandReOrderColumns(IActivateItems activator, Catalogue catalogue) : base(activator)
     {
         _catalogue = catalogue;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ReOrder);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.ReOrder);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderProcessTask.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderProcessTask.cs
index 5c33b78bb4..b1a7c2641c 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderProcessTask.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandReOrderProcessTask.cs
@@ -16,7 +16,9 @@ internal class ExecuteCommandReOrderProcessTask : BasicUICommandExecution
     private readonly InsertOption _insertOption;
     private ProcessTask _sourceProcessTask;
 
-    public ExecuteCommandReOrderProcessTask(IActivateItems activator, ProcessTaskCombineable sourceProcessTaskCombineable, ProcessTask targetProcessTask, InsertOption insertOption) : base(activator)
+    public ExecuteCommandReOrderProcessTask(IActivateItems activator,
+        ProcessTaskCombineable sourceProcessTaskCombineable, ProcessTask targetProcessTask,
+        InsertOption insertOption) : base(activator)
     {
         _targetProcessTask = targetProcessTask;
         _insertOption = insertOption;
@@ -24,11 +26,9 @@ public ExecuteCommandReOrderProcessTask(IActivateItems activator, ProcessTaskCom
 
         if (_sourceProcessTask.LoadMetadata_ID != targetProcessTask.LoadMetadata_ID)
             SetImpossible("ProcessTasks must belong to the same Load");
-        else
-        if (_sourceProcessTask.LoadStage != targetProcessTask.LoadStage)
+        else if (_sourceProcessTask.LoadStage != targetProcessTask.LoadStage)
             SetImpossible("ProcessTasks must belong in the same LoadStage to be ReOrdered");
-        else
-        if(_insertOption == InsertOption.Default)
+        else if (_insertOption == InsertOption.Default)
             SetImpossible("Drag above or below to ReOrder");
     }
 
@@ -42,9 +42,8 @@ public override void Execute()
 
         if (_insertOption == InsertOption.InsertAbove)
         {
-
             destinationOrder = _targetProcessTask.Order - 1;
-                
+
             foreach (var pt in lmd.ProcessTasks)
             {
                 //don't change the current one again
@@ -60,7 +59,6 @@ public override void Execute()
         }
         else
         {
-
             destinationOrder = _targetProcessTask.Order + 1;
 
             foreach (var pt in lmd.ProcessTasks)
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshExtractionConfigurationsCohort.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshExtractionConfigurationsCohort.cs
index 23d27fcc9a..3107ee783e 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshExtractionConfigurationsCohort.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshExtractionConfigurationsCohort.cs
@@ -23,26 +23,25 @@ public class ExecuteCommandRefreshExtractionConfigurationsCohort : BasicUIComman
     private readonly ExtractionConfiguration _extractionConfiguration;
     private Project _project;
 
-    public ExecuteCommandRefreshExtractionConfigurationsCohort(IActivateItems activator, ExtractionConfiguration extractionConfiguration) : base(activator)
+    public ExecuteCommandRefreshExtractionConfigurationsCohort(IActivateItems activator,
+        ExtractionConfiguration extractionConfiguration) : base(activator)
     {
         _extractionConfiguration = extractionConfiguration;
         _project = (Project)_extractionConfiguration.Project;
-            
-        if(extractionConfiguration.Cohort_ID == null)
+
+        if (extractionConfiguration.Cohort_ID == null)
             SetImpossible("No Cohort Set");
 
         if (extractionConfiguration.CohortRefreshPipeline_ID == null)
             SetImpossible("No Refresh Pipeline Set");
 
-        if(!_project.ProjectNumber.HasValue)
+        if (!_project.ProjectNumber.HasValue)
             SetImpossible($"Project '{_project}' does not have a Project Number");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Update the cohort to a new version by rerunning the associated Cohort Identification Configuration (query). " +
-               "This is useful if you have to do yearly\\monthly releases and update the cohort based on new data";
-    }
+    public override string GetCommandHelp() =>
+        "Update the cohort to a new version by rerunning the associated Cohort Identification Configuration (query). " +
+        "This is useful if you have to do yearly\\monthly releases and update the cohort based on new data";
 
     public override void Execute()
     {
@@ -53,15 +52,13 @@ public override void Execute()
         progressUi.ApplyTheme(Activator.Theme);
 
         progressUi.Text = $"Refreshing Cohort ({_extractionConfiguration})";
-        Activator.ShowWindow(progressUi,true);
+        Activator.ShowWindow(progressUi, true);
 
         var engine = new CohortRefreshEngine(progressUi, _extractionConfiguration);
         Task.Run(
-
             //run the pipeline in a Thread
             () =>
             {
-
                 progressUi.ShowRunning(true);
                 engine.Execute();
             }
@@ -70,18 +67,15 @@ public override void Execute()
             progressUi.ShowRunning(false);
 
             //then on the UI thread 
-            if(s.IsFaulted)
+            if (s.IsFaulted)
                 return;
 
             //issue save and refresh
             if (engine.Request.CohortCreatedIfAny != null)
                 Publish(_extractionConfiguration);
-
         }, TaskScheduler.FromCurrentSynchronizationContext());
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Add);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Add);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs
index ca4cdc81b4..394eaa99f0 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRefreshObject.cs
@@ -19,7 +19,7 @@ namespace Rdmp.UI.CommandExecution.AtomicCommands;
 /// Publishes the fact that changes have been made to a <see cref="DatabaseEntity"/> which mean that other user interfaces in the
 /// application may be now out of date (or no longer valid).  This will trigger the <see cref="RefreshBus"/> to call all listeners
 /// </summary>
-public class ExecuteCommandRefreshObject:BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandRefreshObject : BasicUICommandExecution, IAtomicCommand
 {
     private readonly DatabaseEntity _databaseEntity;
 
@@ -27,7 +27,7 @@ public ExecuteCommandRefreshObject(IActivateItems activator, DatabaseEntity data
     {
         _databaseEntity = databaseEntity;
 
-        if(_databaseEntity == null)
+        if (_databaseEntity == null)
             SetImpossible("No DatabaseEntity was specified");
 
         Weight = 100.5f;
@@ -42,8 +42,6 @@ public override void Execute()
         Publish(_databaseEntity);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(FamFamFamIcons.arrow_refresh);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        Image.Load<Rgba32>(FamFamFamIcons.arrow_refresh);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRelease.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRelease.cs
index 43e87a9a17..6884c17a01 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRelease.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRelease.cs
@@ -17,7 +17,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandRelease: BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandRelease : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private Project _project;
     private ExtractionConfiguration _configuration;
@@ -28,15 +28,10 @@ public ExecuteCommandRelease(IActivateItems activator) : base(activator)
         OverrideCommandName = "Run Release...";
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Gather all the extracted files into one releasable package and freeze the extraction configuration";
-    }
+    public override string GetCommandHelp() =>
+        "Gather all the extracted files into one releasable package and freeze the extraction configuration";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Release);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Release);
 
     /// <summary>
     /// Sets the thing being released, valid targets are <see cref="Project"/>, <see cref="ExtractionConfiguration"/> and <see cref="ISelectedDataSets"/>.
@@ -45,7 +40,7 @@ public override Image<Rgba32> GetImage(IIconProvider iconProvider)
     /// <returns></returns>
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _project =  target as Project;
+        _project = target as Project;
         _configuration = target as ExtractionConfiguration;
         _selectedDataSet = target as ISelectedDataSets;
 
@@ -54,25 +49,24 @@ public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
 
         if (_configuration != null)
         {
-
             _project = (Project)_configuration.Project;
 
             if (_configuration.IsReleased)
                 SetImpossible("ExtractionConfiguration has already been Released");
 
-            if(_configuration.Cohort_ID == null)
+            if (_configuration.Cohort_ID == null)
                 SetImpossible("No Cohort Defined");
 
             if (!_configuration.SelectedDataSets.Any())
                 SetImpossible("No datasets configured");
-
         }
+
         if (_selectedDataSet != null)
         {
-            _configuration = (ExtractionConfiguration) _selectedDataSet.ExtractionConfiguration;
-            _project = (Project) _configuration.Project;
+            _configuration = (ExtractionConfiguration)_selectedDataSet.ExtractionConfiguration;
+            _project = (Project)_configuration.Project;
 
-            if(_selectedDataSet.ExtractionConfiguration.IsReleased)
+            if (_selectedDataSet.ExtractionConfiguration.IsReleased)
                 SetImpossible("This dataset is part of an ExtractionConfiguration that has already been Released");
 
             if (_selectedDataSet.ExtractionConfiguration.Cohort_ID == null)
@@ -88,17 +82,15 @@ public override void Execute()
 
         var p = _project ?? SelectOne(Activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>());
         if (p == null)
-        {
             // user cancelled picking a Project
             return;
-        }
 
         var releaseUI = Activator.Activate<DataReleaseUI, Project>(p);
-            
-        if(_configuration != null)
+
+        if (_configuration != null)
             if (_selectedDataSet == null)
                 releaseUI.TickAllFor(_configuration);
             else
-                releaseUI.Tick(_selectedDataSet);            
+                releaseUI.Tick(_selectedDataSet);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRunDQEOnCatalogue.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRunDQEOnCatalogue.cs
index e600f4b1bb..c34a2acda5 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRunDQEOnCatalogue.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandRunDQEOnCatalogue.cs
@@ -16,33 +16,29 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandRunDQEOnCatalogue:BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandRunDQEOnCatalogue : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private Catalogue _catalogue;
-        
+
     [UseWithObjectConstructor]
-    public ExecuteCommandRunDQEOnCatalogue(IActivateItems activator,Catalogue catalogue): base(activator)
+    public ExecuteCommandRunDQEOnCatalogue(IActivateItems activator, Catalogue catalogue) : base(activator)
     {
         _catalogue = catalogue;
     }
 
-    public ExecuteCommandRunDQEOnCatalogue(IActivateItems activator):base(activator)
+    public ExecuteCommandRunDQEOnCatalogue(IActivateItems activator) : base(activator)
     {
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Runs the data quality engine on the dataset using the currently configured validation rules and stores the results in the default DQE results database";
-    }
+    public override string GetCommandHelp() =>
+        "Runs the data quality engine on the dataset using the currently configured validation rules and stores the results in the default DQE results database";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.DQE, OverlayKind.Execute);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.DQE, OverlayKind.Execute);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _catalogue = (Catalogue) target;
+        _catalogue = (Catalogue)target;
         return this;
     }
 
@@ -52,14 +48,11 @@ public override void Execute()
 
         var c = _catalogue ?? SelectOne<Catalogue>(BasicActivator.RepositoryLocator.CatalogueRepository);
 
-        if(c == null)
+        if (c == null)
             return;
 
         Activator.Activate<DQEExecutionControlUI, Catalogue>(c);
     }
 
-    public override string GetCommandName()
-    {
-        return "Data Quality Engine";
-    }
+    public override string GetCommandName() => "Data Quality Engine";
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowCacheFetchFailures.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowCacheFetchFailures.cs
index d8eef8db5c..fb4883544e 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowCacheFetchFailures.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowCacheFetchFailures.cs
@@ -17,18 +17,18 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandShowCacheFetchFailures : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandShowCacheFetchFailures : BasicUICommandExecution, IAtomicCommand
 {
     private CacheProgress _cacheProgress;
     private ICacheFetchFailure[] _failures;
 
-    public ExecuteCommandShowCacheFetchFailures(IActivateItems activator, CacheProgress cacheProgress):base(activator)
+    public ExecuteCommandShowCacheFetchFailures(IActivateItems activator, CacheProgress cacheProgress) : base(activator)
     {
         _cacheProgress = cacheProgress;
 
         _failures = _cacheProgress.CacheFetchFailures.Where(f => f.ResolvedOn == null).ToArray();
 
-        if(!_failures.Any())
+        if (!_failures.Any())
             SetImpossible("There are no unresolved CacheFetchFailures");
     }
 
@@ -48,12 +48,9 @@ public override void Execute()
         foreach (var f in _failures)
             dt.Rows.Add(f.FetchRequestStart, f.FetchRequestEnd, f.ExceptionText, f.LastAttempt, f.ResolvedOn);
 
-        var ui = new DataTableViewerUI(dt,"Cache Failures");
+        var ui = new DataTableViewerUI(dt, "Cache Failures");
         Activator.ShowWindow(ui, true);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(_cacheProgress);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(_cacheProgress);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowKeywordHelp.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowKeywordHelp.cs
index df5e01d258..6699c3bdb6 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowKeywordHelp.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowKeywordHelp.cs
@@ -23,44 +23,37 @@ public class ExecuteCommandShowKeywordHelp : BasicUICommandExecution, IAtomicCom
 {
     private RDMPContextMenuStripArgs _args;
 
-    public ExecuteCommandShowKeywordHelp(IActivateItems activator,  RDMPContextMenuStripArgs args) : base(activator)
+    public ExecuteCommandShowKeywordHelp(IActivateItems activator, RDMPContextMenuStripArgs args) : base(activator)
     {
         _args = args;
 
         Weight = 100.6f;
     }
 
-    public override string GetCommandName()
-    {
-        return "What is this?";
-    }
+    public override string GetCommandName() => "What is this?";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Help);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Help);
 
-    public override string GetCommandHelp()
-    {
-        return "Displays the code documentation for the menu object or the Type name of the object if it has none";
-    }
+    public override string GetCommandHelp() =>
+        "Displays the code documentation for the menu object or the Type name of the object if it has none";
 
     public override void Execute()
     {
         base.Execute();
-            
+
         string title = null;
         string docs = null;
-            
+
         //get docs from masquerader if it has any
         if (_args.Masquerader != null)
         {
             title = GetTypeName(_args.Masquerader.GetType());
-            docs = Activator.RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(_args.Masquerader.GetType());
+            docs = Activator.RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(
+                _args.Masquerader.GetType());
         }
-            
+
         //if not get them from the actual class
-        if(docs == null)
+        if (docs == null)
         {
             title = GetTypeName(_args.Model.GetType());
 
@@ -68,9 +61,10 @@ public override void Execute()
             if (_args.Model is IKnowWhatIAm knows)
                 docs = knows.WhatIsThis(); //yes
             else
-                docs = Activator.RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(_args.Model.GetType());
+                docs = Activator.RepositoryLocator.CatalogueRepository.CommentStore.GetTypeDocumentationIfExists(
+                    _args.Model.GetType());
         }
-            
+
         //if we have docs show them otherwise just the Type name
         if (docs != null)
             WideMessageBox.ShowKeywordHelp(title, docs);
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowSummaryOfCohorts.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowSummaryOfCohorts.cs
index 851cc5d428..d5076982e8 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowSummaryOfCohorts.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowSummaryOfCohorts.cs
@@ -18,7 +18,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandShowSummaryOfCohorts : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandShowSummaryOfCohorts : BasicUICommandExecution, IAtomicCommand
 {
     private readonly string _commandName;
     private readonly ExtractableCohort[] _onlyCohorts;
@@ -29,7 +29,8 @@ public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator)
         _commandName = "Show Cohort Summary";
     }
 
-    public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator,CohortSourceUsedByProjectNode projectSource) : base(activator)
+    public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator, CohortSourceUsedByProjectNode projectSource) :
+        base(activator)
     {
         _commandName = "Show Cohort Summary";
 
@@ -40,21 +41,18 @@ public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator,CohortSourceU
     }
 
     [UseWithObjectConstructor]
-    public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator, ExternalCohortTable externalCohortTable) : base(activator)
+    public ExecuteCommandShowSummaryOfCohorts(IActivateItems activator, ExternalCohortTable externalCohortTable) :
+        base(activator)
     {
         _commandName = "Show Detailed Summary of Cohorts";
-        _onlyCohorts = activator.CoreChildProvider.GetChildren(externalCohortTable).OfType<ExtractableCohort>().ToArray();
+        _onlyCohorts = activator.CoreChildProvider.GetChildren(externalCohortTable).OfType<ExtractableCohort>()
+            .ToArray();
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Show information about the cohort lists stored in your cohort database (number of patients etc)";
-    }
+    public override string GetCommandHelp() =>
+        "Show information about the cohort lists stored in your cohort database (number of patients etc)";
 
-    public override string GetCommandName()
-    {
-        return _commandName;
-    }
+    public override string GetCommandName() => _commandName;
 
     public override void Execute()
     {
@@ -68,8 +66,6 @@ public override void Execute()
             extractableCohortCollection.SetupForAllCohorts(Activator);
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AllCohortsNode);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AllCohortsNode);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowTooltip.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowTooltip.cs
index e17f6a6805..090443e5e0 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowTooltip.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowTooltip.cs
@@ -25,34 +25,25 @@ public ExecuteCommandShowTooltip(IActivateItems activator, object o) : base(acti
     {
         Weight = 100.5f;
 
-        var hasOne = RDMPCollectionCommonFunctionality.GetToolTip(activator,o, out _title, out _body, out _isBad);
+        var hasOne = RDMPCollectionCommonFunctionality.GetToolTip(activator, o, out _title, out _body, out _isBad);
 
         if (!hasOne)
             SetImpossible($"{o} does not have a tooltip/problem");
     }
 
-    public override string GetCommandName()
-    {
-        return _isBad ? "Show Problem" : "Show Tooltip";
-    }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return (Image<Rgba32>)(_isBad ? Image.Load(FamFamFamIcons.flag_red) : iconProvider.GetImage(RDMPConcept.Help));
-    }
+    public override string GetCommandName() => _isBad ? "Show Problem" : "Show Tooltip";
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        (Image<Rgba32>)(_isBad ? Image.Load(FamFamFamIcons.flag_red) : iconProvider.GetImage(RDMPConcept.Help));
 
 
     public override void Execute()
     {
         base.Execute();
 
-        if(_isBad)
-        {
+        if (_isBad)
             BasicActivator.ShowException(_title, new Exception(_body));
-        }
         else
-        {
             BasicActivator.Show(_title, _body);
-        }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowXmlDoc.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowXmlDoc.cs
index d92560ad4f..8b7cb2a989 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowXmlDoc.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandShowXmlDoc.cs
@@ -13,7 +13,7 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandShowXmlDoc : BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandShowXmlDoc : BasicUICommandExecution, IAtomicCommand
 {
     private readonly string _title;
     private string _help;
@@ -24,18 +24,17 @@ public class ExecuteCommandShowXmlDoc : BasicUICommandExecution,IAtomicCommand
     /// <param name="activator"></param>
     /// <param name="classOrProperty">Name of a documented class/interface/property (e.g. "CohortIdentificationConfiguration.QueryCachingServer_ID")</param>
     /// <param name="title"></param>
-    public ExecuteCommandShowXmlDoc(IActivateItems activator,string classOrProperty, string title):base(activator)
+    public ExecuteCommandShowXmlDoc(IActivateItems activator, string classOrProperty, string title) : base(activator)
     {
         _title = title;
-        _help = activator.RepositoryLocator.CatalogueRepository.CommentStore.GetDocumentationIfExists(classOrProperty, true,true);
+        _help = activator.RepositoryLocator.CatalogueRepository.CommentStore.GetDocumentationIfExists(classOrProperty,
+            true, true);
 
-        if(string.IsNullOrWhiteSpace(_help))
+        if (string.IsNullOrWhiteSpace(_help))
             SetImpossible($"No help available for keyword '{classOrProperty}'");
     }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Help);
-    }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Help);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandStartSession.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandStartSession.cs
index ca39a85c05..ab011b56d0 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandStartSession.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandStartSession.cs
@@ -24,9 +24,11 @@ public class ExecuteCommandStartSession : BasicUICommandExecution, IAtomicComman
     /// True if the command was cancelled before finishing <see cref="Execute"/>
     /// </summary>
     public bool Cancelled { get; set; } = true;
+
     public string InitialSearch { get; set; }
 
-    public ExecuteCommandStartSession(IActivateItems activator, IMapsDirectlyToDatabaseTable[] initialSelection, string sessionName) : base(activator)
+    public ExecuteCommandStartSession(IActivateItems activator, IMapsDirectlyToDatabaseTable[] initialSelection,
+        string sessionName) : base(activator)
     {
         _initialSelection = initialSelection;
         _sessionName = sessionName;
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCatalogueExtractionSqlUI.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCatalogueExtractionSqlUI.cs
index 329ace3af5..c3f33244fe 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCatalogueExtractionSqlUI.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCatalogueExtractionSqlUI.cs
@@ -17,12 +17,12 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandViewCatalogueExtractionSqlUI:BasicUICommandExecution,IAtomicCommandWithTarget
+public class ExecuteCommandViewCatalogueExtractionSqlUI : BasicUICommandExecution, IAtomicCommandWithTarget
 {
     private Catalogue _catalogue;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandViewCatalogueExtractionSqlUI(IActivateItems activator,Catalogue catalogue): this(activator)
+    public ExecuteCommandViewCatalogueExtractionSqlUI(IActivateItems activator, Catalogue catalogue) : this(activator)
     {
         _catalogue = catalogue;
     }
@@ -31,22 +31,17 @@ public ExecuteCommandViewCatalogueExtractionSqlUI(IActivateItems activator) : ba
     {
     }
 
-    public override string GetCommandHelp()
-    {
-        return "View the query that would be executed during extraction of the dataset with the current extractable columns/transforms";
-    }
+    public override string GetCommandHelp() =>
+        "View the query that would be executed during extraction of the dataset with the current extractable columns/transforms";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.SQL);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.SQL);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _catalogue = (Catalogue) target;
-            
+        _catalogue = (Catalogue)target;
+
         //if the catalogue has no extractable columns
-        if(!_catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Any())
+        if (!_catalogue.GetAllExtractionInformation(ExtractionCategory.Any).Any())
             SetImpossible("Catalogue has no ExtractionInformations");
 
         return this;
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCohortAggregateGraph.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCohortAggregateGraph.cs
index 3cebddc689..56634ba9f4 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCohortAggregateGraph.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCohortAggregateGraph.cs
@@ -14,35 +14,29 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-public class ExecuteCommandViewCohortAggregateGraph:BasicUICommandExecution,IAtomicCommand
+public class ExecuteCommandViewCohortAggregateGraph : BasicUICommandExecution, IAtomicCommand
 {
     private readonly CohortSummaryAggregateGraphObjectCollection _collection;
     private float DEFAULT_WEIGHT = 2.6f;
 
-    public ExecuteCommandViewCohortAggregateGraph(IActivateItems activator, CohortSummaryAggregateGraphObjectCollection collection) : base(activator)
+    public ExecuteCommandViewCohortAggregateGraph(IActivateItems activator,
+        CohortSummaryAggregateGraphObjectCollection collection) : base(activator)
     {
         Weight = DEFAULT_WEIGHT;
 
         _collection = collection;
 
-        if(collection.CohortIfAny != null && collection.CohortIfAny.IsJoinablePatientIndexTable())
+        if (collection.CohortIfAny != null && collection.CohortIfAny.IsJoinablePatientIndexTable())
             SetImpossible("Graphs cannot be generated for Patient Index tables");
     }
 
-    public override string GetCommandHelp()
-    {
-        return "Shows a subset of the main graph as it applies to the people in your cohort";
-    }
+    public override string GetCommandHelp() =>
+        "Shows a subset of the main graph as it applies to the people in your cohort";
 
-    public override string GetCommandName()
-    {
-        return _collection.Graph.Name;
-    }
+    public override string GetCommandName() => _collection.Graph.Name;
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AggregateGraph);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AggregateGraph);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCommits.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCommits.cs
index bf176c43e6..28cfa4b7c5 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCommits.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewCommits.cs
@@ -29,14 +29,11 @@ public ExecuteCommandViewCommits(IActivateItems activator, IMapsDirectlyToDataba
             !activator.RepositoryLocator.CatalogueRepository
                 .GetAllObjectsWhere<Memento>(nameof(Memento.ReferencedObjectID), o.ID)
                 .Any(m => m.IsReferenceTo(o)))
-        {
             SetImpossible("No commits have been made yet");
-        }
-    }
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Commit);
     }
+
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Commit);
+
     public override void Execute()
     {
         base.Execute();
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs
index 1519a548ff..3302a2fd9f 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewDQEResultsForCatalogue.cs
@@ -23,30 +23,25 @@ public class ExecuteCommandViewDQEResultsForCatalogue : BasicUICommandExecution,
     private Catalogue _catalogue;
 
     [UseWithObjectConstructor]
-    public ExecuteCommandViewDQEResultsForCatalogue(IActivateItems activator,Catalogue catalogue)
+    public ExecuteCommandViewDQEResultsForCatalogue(IActivateItems activator, Catalogue catalogue)
         : base(activator)
     {
         SetTarget(catalogue);
     }
 
-    public ExecuteCommandViewDQEResultsForCatalogue(IActivateItems activator):base(activator)
+    public ExecuteCommandViewDQEResultsForCatalogue(IActivateItems activator) : base(activator)
     {
     }
 
-    public override string GetCommandHelp()
-    {
-        return "View the results of all data quality engine runs that have ever been run on the dataset";
-    }
+    public override string GetCommandHelp() =>
+        "View the results of all data quality engine runs that have ever been run on the dataset";
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.DQE);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.DQE);
 
     public IAtomicCommandWithTarget SetTarget(DatabaseEntity target)
     {
-        _catalogue = (Catalogue) target;
-            
+        _catalogue = (Catalogue)target;
+
         //must have both of these things to be DQEd
         if (_catalogue.TimeCoverage_ExtractionInformation_ID == null)
         {
@@ -81,8 +76,6 @@ public override void Execute()
         Activator.Activate<CatalogueDQEResultsUI, Catalogue>(_catalogue);
     }
 
-    private bool ServerHasAtLeastOneEvaluation(Catalogue c)
-    {
-        return new DQERepository(Activator.RepositoryLocator.CatalogueRepository).HasEvaluations(c);
-    }
+    private bool ServerHasAtLeastOneEvaluation(Catalogue c) =>
+        new DQERepository(Activator.RepositoryLocator.CatalogueRepository).HasEvaluations(c);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchGraph.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchGraph.cs
index cc531fade1..fdeea64284 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchGraph.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewFilterMatchGraph.cs
@@ -19,17 +19,17 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandViewFilterMatchGraph : BasicUICommandExecution,IAtomicCommand
+internal class ExecuteCommandViewFilterMatchGraph : BasicUICommandExecution, IAtomicCommand
 {
     private readonly IFilter _filter;
     private AggregateConfiguration[] _compatibleGraphs;
 
-    public ExecuteCommandViewFilterMatchGraph(IActivateItems activator, IFilter filter):base(activator)
+    public ExecuteCommandViewFilterMatchGraph(IActivateItems activator, IFilter filter) : base(activator)
     {
         _filter = filter;
         var cata = filter.GetCatalogue();
 
-        if(cata == null)
+        if (cata == null)
         {
             SetImpossible("No Catalogue found for filter");
             return;
@@ -48,20 +48,18 @@ public ExecuteCommandViewFilterMatchGraph(IActivateItems activator, IFilter filt
         _compatibleGraphs = compatibleGraphs;
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Filter);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) =>
+        iconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Filter);
 
     public override void Execute()
     {
         base.Execute();
 
         var selected = SelectOne(_compatibleGraphs);
-            
-        if(selected == null)
+
+        if (selected == null)
             return;
-            
+
         //if it's a cohort set
         if (_filter is AggregateFilter aggFilter && aggFilter.GetAggregate().IsCohortIdentificationAggregate)
         {
@@ -73,7 +71,7 @@ public override void Execute()
                     selected,
                     CohortSummaryAdjustment.WhereRecordsIn,
                     aggFilter));
-                    
+
             cmd.Execute();
         }
         else
@@ -81,6 +79,5 @@ public override void Execute()
             var collection = new FilterGraphObjectCollection(selected, (ConcreteFilter)_filter);
             Activator.Activate<FilterGraphUI>(collection);
         }
-                
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs
index a79ee26ea8..0892d92745 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewLoadDiagram.cs
@@ -16,23 +16,19 @@
 
 namespace Rdmp.UI.CommandExecution.AtomicCommands;
 
-internal class ExecuteCommandViewLoadDiagram :BasicUICommandExecution, IAtomicCommand
+internal class ExecuteCommandViewLoadDiagram : BasicUICommandExecution, IAtomicCommand
 {
     private readonly LoadMetadata _loadMetadata;
 
     public ExecuteCommandViewLoadDiagram(IActivateItems activator, LoadMetadata loadMetadata) : base(activator)
     {
         _loadMetadata = loadMetadata;
-            
-        if(!_loadMetadata.GetAllCatalogues().Any())
-            SetImpossible("Load does not have any associated Catalogues (no tables are loaded by the load)");
 
+        if (!_loadMetadata.GetAllCatalogues().Any())
+            SetImpossible("Load does not have any associated Catalogues (no tables are loaded by the load)");
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return Image.Load<Rgba32>(CatalogueIcons.LoadBubble);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => Image.Load<Rgba32>(CatalogueIcons.LoadBubble);
 
     public override void Execute()
     {
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewThenVsNowSql.cs b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewThenVsNowSql.cs
index 484dd2fca9..92c6869403 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewThenVsNowSql.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/ExecuteCommandViewThenVsNowSql.cs
@@ -23,7 +23,7 @@ internal class ExecuteCommandViewThenVsNowSql : BasicUICommandExecution, IAtomic
     private readonly SelectedDataSets _selectedDataSet;
     private FlatFileReleasePotential _releasePotential;
 
-    public ExecuteCommandViewThenVsNowSql(IActivateItems activator, SelectedDataSets selectedDataSet):base(activator)
+    public ExecuteCommandViewThenVsNowSql(IActivateItems activator, SelectedDataSets selectedDataSet) : base(activator)
     {
         _selectedDataSet = selectedDataSet;
     }
@@ -38,11 +38,9 @@ public override void Execute()
 
         if (string.IsNullOrWhiteSpace(rp.SqlCurrentConfiguration))
             Show("Could not generate Sql for dataset");
-        else
-        if(string.IsNullOrWhiteSpace(rp.SqlExtracted))
+        else if (string.IsNullOrWhiteSpace(rp.SqlExtracted))
             Show("Dataset has never been extracted");
-        else
-        if(rp.SqlCurrentConfiguration == rp.SqlExtracted)
+        else if (rp.SqlCurrentConfiguration == rp.SqlExtracted)
             Show("No differences");
         else
             _releasePotential = rp;
@@ -51,12 +49,11 @@ public override void Execute()
             return;
 
 
-        var dialog = new SQLBeforeAndAfterViewer(_releasePotential.SqlCurrentConfiguration, _releasePotential.SqlExtracted, "Current Configuration", "Configuration when last run", "Sql Executed", MessageBoxButtons.OK);
+        var dialog = new SQLBeforeAndAfterViewer(_releasePotential.SqlCurrentConfiguration,
+            _releasePotential.SqlExtracted, "Current Configuration", "Configuration when last run", "Sql Executed",
+            MessageBoxButtons.OK);
         dialog.Show();
     }
 
-    public override Image<Rgba32> GetImage(IIconProvider iconProvider)
-    {
-        return iconProvider.GetImage(RDMPConcept.Diff);
-    }
+    public override Image<Rgba32> GetImage(IIconProvider iconProvider) => iconProvider.GetImage(RDMPConcept.Diff);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandLinkLabel.cs b/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandLinkLabel.cs
index 3f174bb439..bce7cce46b 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandLinkLabel.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandLinkLabel.cs
@@ -29,9 +29,9 @@ public AtomicCommandLinkLabel(IIconProvider iconProvider, IAtomicCommand command
         var name = command.GetCommandName();
         lblName.Text = name;
 
-        helpIcon1.SetHelpText(_command.GetCommandName(),command.GetCommandHelp());
+        helpIcon1.SetHelpText(_command.GetCommandName(), command.GetCommandHelp());
     }
-        
+
     private void label1_Click(object sender, EventArgs e)
     {
         _command.Execute();
diff --git a/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandUIFactory.cs b/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandUIFactory.cs
index a48983c9ad..ce5defe630 100644
--- a/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandUIFactory.cs
+++ b/Rdmp.UI/CommandExecution/AtomicCommands/UIFactory/AtomicCommandUIFactory.cs
@@ -25,20 +25,14 @@ public AtomicCommandUIFactory(IActivateItems activator)
         _iconProvider = activator.CoreIconProvider;
     }
 
-    public ToolStripMenuItem CreateMenuItem(IAtomicCommand command)
-    {
-        return new AtomicCommandMenuItem(command, _activator){Tag = command };
-    }
+    public ToolStripMenuItem CreateMenuItem(IAtomicCommand command) =>
+        new AtomicCommandMenuItem(command, _activator) { Tag = command };
 
-    public AtomicCommandLinkLabel CreateLinkLabel(IAtomicCommand command)
-    {
-        return new AtomicCommandLinkLabel(_iconProvider,command){Tag = command };
-    }
+    public AtomicCommandLinkLabel CreateLinkLabel(IAtomicCommand command) =>
+        new(_iconProvider, command) { Tag = command };
 
-    public ToolStripItem CreateToolStripItem(IAtomicCommand command)
-    {
-        return new AtomicCommandToolStripItem(command, _activator);
-    }
+    public ToolStripItem CreateToolStripItem(IAtomicCommand command) =>
+        new AtomicCommandToolStripItem(command, _activator);
 
     public Button CreateButton(IAtomicCommand cmd)
     {
diff --git a/Rdmp.UI/CommandExecution/CachedDropTarget.cs b/Rdmp.UI/CommandExecution/CachedDropTarget.cs
index 1d93197ac6..76ee5e2c6a 100644
--- a/Rdmp.UI/CommandExecution/CachedDropTarget.cs
+++ b/Rdmp.UI/CommandExecution/CachedDropTarget.cs
@@ -17,24 +17,22 @@ public CachedDropTarget(object target, InsertOption relativeLocation)
         RelativeLocation = relativeLocation;
     }
 
-    protected bool Equals(CachedDropTarget other)
-    {
-        return Equals(Target, other.Target) && RelativeLocation == other.RelativeLocation;
-    }
+    protected bool Equals(CachedDropTarget other) =>
+        Equals(Target, other.Target) && RelativeLocation == other.RelativeLocation;
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((CachedDropTarget) obj);
+        return Equals((CachedDropTarget)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((Target != null ? Target.GetHashCode() : 0)*397) ^ (int) RelativeLocation;
+            return ((Target != null ? Target.GetHashCode() : 0) * 397) ^ (int)RelativeLocation;
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/ICombineableFactory.cs b/Rdmp.UI/CommandExecution/ICombineableFactory.cs
index 00f68de0f3..debef347f5 100644
--- a/Rdmp.UI/CommandExecution/ICombineableFactory.cs
+++ b/Rdmp.UI/CommandExecution/ICombineableFactory.cs
@@ -57,5 +57,4 @@ public interface ICombineableFactory
     /// <param name="modelObject">A C# object e.g. <see cref="Rdmp.Core.Curation.Data.Catalogue"/> that dragging has begun on</param>
     /// <returns></returns>
     ICombineToMakeCommand Create(object modelObject);
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/ICommandExecutionFactory.cs b/Rdmp.UI/CommandExecution/ICommandExecutionFactory.cs
index fcd4cdd704..8af379fffc 100644
--- a/Rdmp.UI/CommandExecution/ICommandExecutionFactory.cs
+++ b/Rdmp.UI/CommandExecution/ICommandExecutionFactory.cs
@@ -23,7 +23,8 @@ public interface ICommandExecutionFactory
     /// <param name="targetModel"></param>
     /// <param name="insertOption"></param>
     /// <returns></returns>
-    ICommandExecution Create(ICombineToMakeCommand cmd, object targetModel,InsertOption insertOption = InsertOption.Default);
+    ICommandExecution Create(ICombineToMakeCommand cmd, object targetModel,
+        InsertOption insertOption = InsertOption.Default);
 
     void Activate(object target);
     bool CanActivate(object target);
diff --git a/Rdmp.UI/CommandExecution/Proposals/ICommandExecutionProposal.cs b/Rdmp.UI/CommandExecution/Proposals/ICommandExecutionProposal.cs
index 6dfa9b40be..6118f28f42 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ICommandExecutionProposal.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ICommandExecutionProposal.cs
@@ -11,7 +11,9 @@ namespace Rdmp.UI.CommandExecution.Proposals;
 public interface ICommandExecutionProposal
 {
     bool IsCompatibleTarget(object target);
-    ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, object target, InsertOption insertOption = InsertOption.Default);
+
+    ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, object target,
+        InsertOption insertOption = InsertOption.Default);
 
     bool CanActivate(object target);
     void Activate(object target);
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsANOTable.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsANOTable.cs
index aee5b569d9..0d683c9ee5 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsANOTable.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsANOTable.cs
@@ -11,25 +11,21 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsANOTable:RDMPCommandExecutionProposal<ANOTable>
+internal class ProposeExecutionWhenTargetIsANOTable : RDMPCommandExecutionProposal<ANOTable>
 {
     public ProposeExecutionWhenTargetIsANOTable(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ANOTable target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ANOTable target) => true;
 
     public override void Activate(ANOTable target)
     {
         ItemActivator.Activate<ANOTableUI, ANOTable>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ANOTable target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ANOTable target,
+        InsertOption insertOption = InsertOption.Default) =>
         //no drag and drop support
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAggregateConfiguration.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAggregateConfiguration.cs
index 5f856e3e0d..06d6ac61f7 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAggregateConfiguration.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAggregateConfiguration.cs
@@ -14,26 +14,25 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsAggregateConfiguration:RDMPCommandExecutionProposal<AggregateConfiguration>
+internal class ProposeExecutionWhenTargetIsAggregateConfiguration : RDMPCommandExecutionProposal<AggregateConfiguration>
 {
     public ProposeExecutionWhenTargetIsAggregateConfiguration(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(AggregateConfiguration target)
-    {
-        return true;
-    }
+    public override bool CanActivate(AggregateConfiguration target) => true;
 
     public override void Activate(AggregateConfiguration target)
     {
         ItemActivator.Activate<AggregateEditorUI, AggregateConfiguration>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, AggregateConfiguration targetAggregateConfiguration, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        AggregateConfiguration targetAggregateConfiguration, InsertOption insertOption = InsertOption.Default)
     {
-        if(cmd is ContainerCombineable cc)
-            return new ExecuteCommandImportFilterContainerTree(ItemActivator,targetAggregateConfiguration,cc.Container);
+        if (cmd is ContainerCombineable cc)
+            return new ExecuteCommandImportFilterContainerTree(ItemActivator, targetAggregateConfiguration,
+                cc.Container);
 
         //if it is an aggregate being dragged
         if (cmd is AggregateConfigurationCombineable sourceAggregateCommand)
@@ -44,7 +43,8 @@ public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Ag
 
             //that is part of cohort identification already and being dragged above/below the current aggregate
             if (sourceAggregateCommand.ContainerIfAny != null && insertOption != InsertOption.Default)
-                return new ExecuteCommandReOrderAggregate(ItemActivator, sourceAggregateCommand, targetAggregateConfiguration, insertOption);
+                return new ExecuteCommandReOrderAggregate(ItemActivator, sourceAggregateCommand,
+                    targetAggregateConfiguration, insertOption);
         }
 
         if (cmd is CohortAggregateContainerCombineable sourceCohortAggregateContainerCommand)
@@ -55,16 +55,16 @@ public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Ag
 
             //above or below
             if (insertOption != InsertOption.Default)
-                return new ExecuteCommandReOrderAggregateContainer(ItemActivator, sourceCohortAggregateContainerCommand, targetAggregateConfiguration, insertOption);
+                return new ExecuteCommandReOrderAggregateContainer(ItemActivator, sourceCohortAggregateContainerCommand,
+                    targetAggregateConfiguration, insertOption);
         }
 
-        if(cmd is ExtractionFilterParameterSetCombineable efps)
-        {
-            return new ExecuteCommandCreateNewFilter(ItemActivator,targetAggregateConfiguration){
+        if (cmd is ExtractionFilterParameterSetCombineable efps)
+            return new ExecuteCommandCreateNewFilter(ItemActivator, targetAggregateConfiguration)
+            {
                 BasedOn = efps.ParameterSet.ExtractionFilter,
                 ParameterSet = efps.ParameterSet
             };
-        }
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode.cs
index 72d98f0d65..ce87481ba5 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode.cs
@@ -13,31 +13,36 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode : RDMPCommandExecutionProposal<AllCataloguesUsedByLoadMetadataNode>
+internal class
+    ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode : RDMPCommandExecutionProposal<
+        AllCataloguesUsedByLoadMetadataNode>
 {
-    public ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode(IActivateItems itemActivator) : base(itemActivator)
+    public ProposeExecutionWhenTargetIsAllCataloguesUsedByLoadMetadataNode(IActivateItems itemActivator) : base(
+        itemActivator)
     {
     }
 
-    public override bool CanActivate(AllCataloguesUsedByLoadMetadataNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(AllCataloguesUsedByLoadMetadataNode target) => false;
 
     public override void Activate(AllCataloguesUsedByLoadMetadataNode target)
     {
         throw new NotSupportedException();
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, AllCataloguesUsedByLoadMetadataNode target,InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        AllCataloguesUsedByLoadMetadataNode target, InsertOption insertOption = InsertOption.Default)
     {
         ICommandExecution cmdExecution = null;
 
         if (cmd is CatalogueCombineable cata)
-            cmdExecution = new ExecuteCommandAssociateCatalogueWithLoadMetadata(ItemActivator,target.LoadMetadata).SetTarget(new[]{cata.Catalogue});
-
-        if(cmd is ManyCataloguesCombineable manyCata)
-            cmdExecution = new ExecuteCommandAssociateCatalogueWithLoadMetadata(ItemActivator, target.LoadMetadata).SetTarget(manyCata.Catalogues);
+            cmdExecution =
+                new ExecuteCommandAssociateCatalogueWithLoadMetadata(ItemActivator, target.LoadMetadata).SetTarget(new[]
+                    { cata.Catalogue });
+
+        if (cmd is ManyCataloguesCombineable manyCata)
+            cmdExecution =
+                new ExecuteCommandAssociateCatalogueWithLoadMetadata(ItemActivator, target.LoadMetadata).SetTarget(
+                    manyCata.Catalogues);
 
 
         return cmdExecution;
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllPluginsNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllPluginsNode.cs
index 9d58cf7c8f..e52e70574d 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllPluginsNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsAllPluginsNode.cs
@@ -17,25 +17,23 @@ internal class ProposeExecutionWhenTargetIsAllPluginsNode : RDMPCommandExecution
 {
     public ProposeExecutionWhenTargetIsAllPluginsNode(IActivateItems itemActivator) : base(itemActivator)
     {
-            
     }
 
     public override void Activate(AllPluginsNode target)
     {
-        if(ItemActivator.RepositoryLocator.CatalogueRepository.MEF.DownloadDirectory.Exists)
-            UsefulStuff.ShowPathInWindowsExplorer(ItemActivator.RepositoryLocator.CatalogueRepository.MEF.DownloadDirectory);
+        if (ItemActivator.RepositoryLocator.CatalogueRepository.MEF.DownloadDirectory.Exists)
+            UsefulStuff.ShowPathInWindowsExplorer(ItemActivator.RepositoryLocator.CatalogueRepository.MEF
+                .DownloadDirectory);
     }
 
-    public override bool CanActivate(AllPluginsNode target)
-    {
-        return true;
-    }
+    public override bool CanActivate(AllPluginsNode target) => true;
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, AllPluginsNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, AllPluginsNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
         //drop files on to attempt to upload plugins
-        if(cmd is FileCollectionCombineable f)
-            return new ExecuteCommandAddPlugins(ItemActivator,f);
+        if (cmd is FileCollectionCombineable f)
+            return new ExecuteCommandAddPlugins(ItemActivator, f);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCacheProgress.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCacheProgress.cs
index a0e1877d63..c50ac5db2c 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCacheProgress.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCacheProgress.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsCacheProgress:RDMPCommandExecutionProposal<CacheProgress>
+internal class ProposeExecutionWhenTargetIsCacheProgress : RDMPCommandExecutionProposal<CacheProgress>
 {
     public ProposeExecutionWhenTargetIsCacheProgress(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(CacheProgress target)
-    {
-        return true;
-    }
+    public override bool CanActivate(CacheProgress target) => true;
 
     public override void Activate(CacheProgress target)
     {
         ItemActivator.Activate<ExecuteCacheProgressUI, CacheProgress>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CacheProgress target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CacheProgress target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
index cb95037d57..b35d558f16 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogue.cs
@@ -14,27 +14,26 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsCatalogue:RDMPCommandExecutionProposal<Catalogue>
+internal class ProposeExecutionWhenTargetIsCatalogue : RDMPCommandExecutionProposal<Catalogue>
 {
     public ProposeExecutionWhenTargetIsCatalogue(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(Catalogue target)
-    {
-        return true;
-    }
+    public override bool CanActivate(Catalogue target) => true;
 
     public override void Activate(Catalogue c)
     {
         ItemActivator.Activate<CatalogueUI, Catalogue>(c);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Catalogue targetCatalogue, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Catalogue targetCatalogue,
+        InsertOption insertOption = InsertOption.Default)
     {
-        if(cmd is FileCollectionCombineable sourceFileCollection)
+        if (cmd is FileCollectionCombineable sourceFileCollection)
             if (sourceFileCollection.IsShareDefinition)
-                return new ExecuteCommandImportCatalogueDescriptionsFromShare(ItemActivator, sourceFileCollection,targetCatalogue);
+                return new ExecuteCommandImportCatalogueDescriptionsFromShare(ItemActivator, sourceFileCollection,
+                    targetCatalogue);
             else
                 return new ExecuteCommandAddNewSupportingDocument(ItemActivator, sourceFileCollection, targetCatalogue);
 
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItem.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItem.cs
index 5ec080aa94..0cda8eb594 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItem.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItem.cs
@@ -13,23 +13,21 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsCatalogueItem:RDMPCommandExecutionProposal<CatalogueItem>
+internal class ProposeExecutionWhenTargetIsCatalogueItem : RDMPCommandExecutionProposal<CatalogueItem>
 {
     public ProposeExecutionWhenTargetIsCatalogueItem(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(CatalogueItem target)
-    {
-        return true;
-    }
+    public override bool CanActivate(CatalogueItem target) => true;
 
     public override void Activate(CatalogueItem target)
     {
         ItemActivator.Activate<CatalogueItemUI, CatalogueItem>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CatalogueItem target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CatalogueItem target,
+        InsertOption insertOption = InsertOption.Default)
     {
         if (cmd is ColumnInfoCombineable sourceColumnInfo)
             return new ExecuteCommandLinkCatalogueItemToColumnInfo(ItemActivator, sourceColumnInfo, target);
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItemsNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItemsNode.cs
index 711033d277..e0cf54ee26 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItemsNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCatalogueItemsNode.cs
@@ -19,32 +19,30 @@ public ProposeExecutionWhenTargetIsCatalogueItemsNode(IActivateItems itemActivat
     {
     }
 
-    public override bool CanActivate(CatalogueItemsNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(CatalogueItemsNode target) => false;
 
     public override void Activate(CatalogueItemsNode target)
     {
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CatalogueItemsNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CatalogueItemsNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
         if (cmd is ColumnInfoCombineable colInfo)
-            return new ExecuteCommandAddNewCatalogueItem(ItemActivator, target.Catalogue, colInfo) { Category = target.Category };
+            return new ExecuteCommandAddNewCatalogueItem(ItemActivator, target.Catalogue, colInfo)
+                { Category = target.Category };
 
         if (cmd is TableInfoCombineable tableInfo)
-            return new ExecuteCommandAddNewCatalogueItem(ItemActivator, target.Catalogue, tableInfo.TableInfo.ColumnInfos) { Category = target.Category };
+            return new ExecuteCommandAddNewCatalogueItem(ItemActivator, target.Catalogue,
+                tableInfo.TableInfo.ColumnInfos) { Category = target.Category };
 
         // when dropping onto Core or Supplemental etc
-        if(cmd is CatalogueItemCombineable ciCombine && target.Category != null)
-        {
+        if (cmd is CatalogueItemCombineable ciCombine && target.Category != null)
             // drag to a new category to change the extractability
-            return new ExecuteCommandChangeExtractionCategory(ItemActivator, 
+            return new ExecuteCommandChangeExtractionCategory(ItemActivator,
                 ciCombine.CatalogueItems.Select(ci => ci.ExtractionInformation)
                     .Where(e => e != null).ToArray(),
                 target.Category);
-        }
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortAggregateContainer.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortAggregateContainer.cs
index ca33a16c0a..4065fbbe87 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortAggregateContainer.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortAggregateContainer.cs
@@ -14,66 +14,68 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsCohortAggregateContainer : RDMPCommandExecutionProposal<CohortAggregateContainer>
+internal class
+    ProposeExecutionWhenTargetIsCohortAggregateContainer : RDMPCommandExecutionProposal<CohortAggregateContainer>
 {
-    public ProposeExecutionWhenTargetIsCohortAggregateContainer(IActivateItems activator):base(activator)
+    public ProposeExecutionWhenTargetIsCohortAggregateContainer(IActivateItems activator) : base(activator)
     {
-            
     }
 
-    public override bool CanActivate(CohortAggregateContainer target)
-    {
-        return true;
-    }
+    public override bool CanActivate(CohortAggregateContainer target) => true;
 
     public override void Activate(CohortAggregateContainer target)
     {
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, target,null);
-        if(!cmd.IsImpossible)
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator, target, null);
+        if (!cmd.IsImpossible)
             cmd.Execute();
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        CohortAggregateContainer targetCohortAggregateContainer, InsertOption insertOption = InsertOption.Default)
     {
-           
         //Target is a cohort container (UNION / INTERSECT / EXCEPT)
 
         //source is catalogue
         if (cmd is CatalogueCombineable sourceCatalogueCombineable)
-            return new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,sourceCatalogueCombineable, targetCohortAggregateContainer);
+            return new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(ItemActivator,
+                sourceCatalogueCombineable, targetCohortAggregateContainer);
 
         //source is aggregate
 
         if (cmd is AggregateConfigurationCombineable sourceAggregateCommand)
         {
             //if it is not already involved in cohort identification 
-            if(!sourceAggregateCommand.Aggregate.IsCohortIdentificationAggregate)
-                return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(ItemActivator, sourceAggregateCommand, targetCohortAggregateContainer);
+            if (!sourceAggregateCommand.Aggregate.IsCohortIdentificationAggregate)
+                return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(ItemActivator,
+                    sourceAggregateCommand, targetCohortAggregateContainer);
 
 
             var cic = sourceAggregateCommand.CohortIdentificationConfigurationIfAny;
 
-            if(cic != null && !cic.Equals(targetCohortAggregateContainer.GetCohortIdentificationConfiguration()))
-            {
+            if (cic != null && !cic.Equals(targetCohortAggregateContainer.GetCohortIdentificationConfiguration()))
                 //its a cic aggregate but it is one outside of our tree so instead offer adding (not moving/reordering)
-                return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(ItemActivator,sourceAggregateCommand, targetCohortAggregateContainer);
-            }
+                return new ExecuteCommandAddAggregateConfigurationToCohortIdentificationSetContainer(ItemActivator,
+                    sourceAggregateCommand, targetCohortAggregateContainer);
             //we are dragging around inside our own tree
 
             //it is involved in cohort identification already, presumably it's a reorder?
-            if(sourceAggregateCommand.ContainerIfAny != null)
-                if(insertOption == InsertOption.Default)
-                    return new ExecuteCommandMoveAggregateIntoContainer(ItemActivator, sourceAggregateCommand, targetCohortAggregateContainer);
+            if (sourceAggregateCommand.ContainerIfAny != null)
+                if (insertOption == InsertOption.Default)
+                    return new ExecuteCommandMoveAggregateIntoContainer(ItemActivator, sourceAggregateCommand,
+                        targetCohortAggregateContainer);
                 else
-                    return new ExecuteCommandReOrderAggregate(ItemActivator, sourceAggregateCommand, targetCohortAggregateContainer, insertOption);
-                
+                    return new ExecuteCommandReOrderAggregate(ItemActivator, sourceAggregateCommand,
+                        targetCohortAggregateContainer, insertOption);
+
             //it's a patient index table
             if (sourceAggregateCommand.IsPatientIndexTable)
-                return new ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(ItemActivator, sourceAggregateCommand, targetCohortAggregateContainer);
-                
-                
+                return new ExecuteCommandMakePatientIndexTableIntoRegularCohortIdentificationSetAgain(ItemActivator,
+                    sourceAggregateCommand, targetCohortAggregateContainer);
+
+
             //ok it IS a cic aggregate but it doesn't have any container so it must be an orphan
-            return new ExecuteCommandMoveAggregateIntoContainer(ItemActivator, sourceAggregateCommand, targetCohortAggregateContainer);
+            return new ExecuteCommandMoveAggregateIntoContainer(ItemActivator, sourceAggregateCommand,
+                targetCohortAggregateContainer);
         }
 
         //source is another container (UNION / INTERSECT / EXCEPT)
@@ -89,13 +91,15 @@ public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Co
                 return null;
 
             //its being dragged into a container (move into new container)
-            if(insertOption == InsertOption.Default)
-                return new ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(ItemActivator, sourceCohortAggregateContainerCommand, targetCohortAggregateContainer);
-                
+            if (insertOption == InsertOption.Default)
+                return new ExecuteCommandMoveCohortAggregateContainerIntoSubContainer(ItemActivator,
+                    sourceCohortAggregateContainerCommand, targetCohortAggregateContainer);
+
             //its being dragged above/below a container (reorder)
-            return new ExecuteCommandReOrderAggregateContainer(ItemActivator, sourceCohortAggregateContainerCommand, targetCohortAggregateContainer, insertOption);
-                
+            return new ExecuteCommandReOrderAggregateContainer(ItemActivator, sourceCohortAggregateContainerCommand,
+                targetCohortAggregateContainer, insertOption);
         }
+
         return null;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortIdentificationConfiguration.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortIdentificationConfiguration.cs
index 6cef556845..c0c6ea0daa 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortIdentificationConfiguration.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsCohortIdentificationConfiguration.cs
@@ -11,25 +11,24 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsCohortIdentificationConfiguration:RDMPCommandExecutionProposal<CohortIdentificationConfiguration>
+internal class
+    ProposeExecutionWhenTargetIsCohortIdentificationConfiguration : RDMPCommandExecutionProposal<
+        CohortIdentificationConfiguration>
 {
-    public ProposeExecutionWhenTargetIsCohortIdentificationConfiguration(IActivateItems itemActivator) : base(itemActivator)
+    public ProposeExecutionWhenTargetIsCohortIdentificationConfiguration(IActivateItems itemActivator) : base(
+        itemActivator)
     {
     }
-        
-    public override bool CanActivate(CohortIdentificationConfiguration target)
-    {
-        return true;
-    }
+
+    public override bool CanActivate(CohortIdentificationConfiguration target) => true;
 
     public override void Activate(CohortIdentificationConfiguration target)
     {
         ItemActivator.Activate<CohortIdentificationConfigurationUI, CohortIdentificationConfiguration>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, CohortIdentificationConfiguration target,
-        InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        CohortIdentificationConfiguration target,
+        InsertOption insertOption = InsertOption.Default) =>
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConcreteFilter.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConcreteFilter.cs
index 756cc89ea7..93f6fb3c1c 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConcreteFilter.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConcreteFilter.cs
@@ -11,25 +11,21 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsConcreteFilter:RDMPCommandExecutionProposal<ConcreteFilter>
+internal class ProposeExecutionWhenTargetIsConcreteFilter : RDMPCommandExecutionProposal<ConcreteFilter>
 {
     public ProposeExecutionWhenTargetIsConcreteFilter(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ConcreteFilter target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ConcreteFilter target) => true;
 
     public override void Activate(ConcreteFilter target)
     {
         ItemActivator.Activate<ExtractionFilterUI, ConcreteFilter>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ConcreteFilter target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ConcreteFilter target,
+        InsertOption insertOption = InsertOption.Default) =>
         //currently nothing can be dropped onto a filter
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConnectionStringKeyword.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConnectionStringKeyword.cs
index b12bb3f80b..f3da7739d1 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConnectionStringKeyword.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsConnectionStringKeyword.cs
@@ -11,25 +11,22 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsConnectionStringKeyword :RDMPCommandExecutionProposal<ConnectionStringKeyword>
+internal class
+    ProposeExecutionWhenTargetIsConnectionStringKeyword : RDMPCommandExecutionProposal<ConnectionStringKeyword>
 {
     public ProposeExecutionWhenTargetIsConnectionStringKeyword(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ConnectionStringKeyword target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ConnectionStringKeyword target) => true;
 
     public override void Activate(ConnectionStringKeyword target)
     {
-        ItemActivator.Activate<ConnectionStringKeywordUI,ConnectionStringKeyword>(target);
+        ItemActivator.Activate<ConnectionStringKeywordUI, ConnectionStringKeyword>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ConnectionStringKeyword target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ConnectionStringKeyword target,
+        InsertOption insertOption = InsertOption.Default) =>
         //no drag and drop
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDashboardLayout.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDashboardLayout.cs
index 612f4488b8..b8f731f8c4 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDashboardLayout.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDashboardLayout.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsDashboardLayout:RDMPCommandExecutionProposal<DashboardLayout>
+internal class ProposeExecutionWhenTargetIsDashboardLayout : RDMPCommandExecutionProposal<DashboardLayout>
 {
     public ProposeExecutionWhenTargetIsDashboardLayout(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(DashboardLayout target)
-    {
-        return true;
-    }
+    public override bool CanActivate(DashboardLayout target) => true;
 
     public override void Activate(DashboardLayout target)
     {
         ItemActivator.Activate<DashboardLayoutUI, DashboardLayout>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, DashboardLayout target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, DashboardLayout target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode.cs
index 91ecd7ded7..da37633ef9 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode.cs
@@ -12,25 +12,22 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-public class ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode :RDMPCommandExecutionProposal<DataAccessCredentialUsageNode>
+public class
+    ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode : RDMPCommandExecutionProposal<
+        DataAccessCredentialUsageNode>
 {
     public ProposeExecutionWhenTargetIsDataAccessCredentialUsageNode(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(DataAccessCredentialUsageNode target)
-    {
-        return true;
-    }
+    public override bool CanActivate(DataAccessCredentialUsageNode target) => true;
 
     public override void Activate(DataAccessCredentialUsageNode target)
     {
-        ItemActivator.Activate<DataAccessCredentialsUI,DataAccessCredentials>(target.Credentials);
+        ItemActivator.Activate<DataAccessCredentialsUI, DataAccessCredentials>(target.Credentials);
     }
 
     public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, DataAccessCredentialUsageNode target,
-        InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+        InsertOption insertOption = InsertOption.Default) =>
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentials.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentials.cs
index 928d954ed4..277d2d0bcc 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentials.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsDataAccessCredentials.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsDataAccessCredentials(IActivateItems itemActi
     {
     }
 
-    public override bool CanActivate(DataAccessCredentials target)
-    {
-        return true;
-    }
+    public override bool CanActivate(DataAccessCredentials target) => true;
 
     public override void Activate(DataAccessCredentials target)
     {
         ItemActivator.Activate<DataAccessCredentialsUI, DataAccessCredentials>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, DataAccessCredentials target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, DataAccessCredentials target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalCohortTable.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalCohortTable.cs
index 868ce01b22..8b10d46e7f 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalCohortTable.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalCohortTable.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsExternalCohortTable:RDMPCommandExecutionProposal<ExternalCohortTable>
+internal class ProposeExecutionWhenTargetIsExternalCohortTable : RDMPCommandExecutionProposal<ExternalCohortTable>
 {
     public ProposeExecutionWhenTargetIsExternalCohortTable(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ExternalCohortTable target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ExternalCohortTable target) => true;
 
     public override void Activate(ExternalCohortTable target)
     {
         ItemActivator.Activate<ExternalCohortTableUI, ExternalCohortTable>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExternalCohortTable target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExternalCohortTable target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalDatabaseServer.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalDatabaseServer.cs
index e9e598d207..4879b9f139 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalDatabaseServer.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExternalDatabaseServer.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsExternalDatabaseServer(IActivateItems itemAct
     {
     }
 
-    public override bool CanActivate(ExternalDatabaseServer target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ExternalDatabaseServer target) => true;
 
     public override void Activate(ExternalDatabaseServer target)
     {
         ItemActivator.Activate<ExternalDatabaseServerUI, ExternalDatabaseServer>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExternalDatabaseServer target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExternalDatabaseServer target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractableCohort.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractableCohort.cs
index 5ad26e4489..7d79193291 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractableCohort.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractableCohort.cs
@@ -13,23 +13,19 @@ namespace Rdmp.UI.CommandExecution.Proposals;
 
 internal class ProposeExecutionWhenTargetIsExtractableCohort : RDMPCommandExecutionProposal<ExtractableCohort>
 {
-    public ProposeExecutionWhenTargetIsExtractableCohort(IActivateItems activator):base(activator)
+    public ProposeExecutionWhenTargetIsExtractableCohort(IActivateItems activator) : base(activator)
     {
     }
 
-    public override bool CanActivate(ExtractableCohort target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ExtractableCohort target) => true;
 
     public override void Activate(ExtractableCohort target)
     {
         ItemActivator.Activate<ExtractableCohortUI, ExtractableCohort>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractableCohort target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractableCohort target,
+        InsertOption insertOption = InsertOption.Default) =>
         //no command possible, dragged command must have been something else
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode.cs
index 9dd473d5fc..42c77abfb7 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode.cs
@@ -10,27 +10,24 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode : RDMPCommandExecutionProposal<ExtractionArbitraryFolderNode>
+internal class
+    ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode : RDMPCommandExecutionProposal<
+        ExtractionArbitraryFolderNode>
 {
-    public ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode(IActivateItems activator):base(activator)
+    public ProposeExecutionWhenTargetIsExtractionArbitraryFolderNode(IActivateItems activator) : base(activator)
     {
-
     }
+
     public override void Activate(ExtractionArbitraryFolderNode target)
     {
     }
 
-    public override bool CanActivate(ExtractionArbitraryFolderNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(ExtractionArbitraryFolderNode target) => false;
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionArbitraryFolderNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionArbitraryFolderNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
-        if (target.Configuration == null)
-        {
-            return null;
-        }
+        if (target.Configuration == null) return null;
 
         // for drag and drop onto this node the options are whatever they would be for dropping
         // onto the ExtractionConfiguration itself
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionConfiguration.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionConfiguration.cs
index b5b1bcf689..154473beff 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionConfiguration.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionConfiguration.cs
@@ -15,16 +15,14 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsExtractionConfiguration:RDMPCommandExecutionProposal<ExtractionConfiguration>
+internal class
+    ProposeExecutionWhenTargetIsExtractionConfiguration : RDMPCommandExecutionProposal<ExtractionConfiguration>
 {
     public ProposeExecutionWhenTargetIsExtractionConfiguration(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ExtractionConfiguration target)
-    {
-        return !target.IsReleased;
-    }
+    public override bool CanActivate(ExtractionConfiguration target) => !target.IsReleased;
 
     public override void Activate(ExtractionConfiguration target)
     {
@@ -32,27 +30,31 @@ public override void Activate(ExtractionConfiguration target)
             ItemActivator.Activate<ExecuteExtractionUI, ExtractionConfiguration>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionConfiguration targetExtractionConfiguration, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        ExtractionConfiguration targetExtractionConfiguration, InsertOption insertOption = InsertOption.Default)
     {
         //user is trying to set the cohort of the configuration
         if (cmd is CatalogueCombineable sourceCatalogueCombineable)
         {
             var dataExportChildProvider = (DataExportChildProvider)ItemActivator.CoreChildProvider;
-            var eds = dataExportChildProvider.ExtractableDataSets.SingleOrDefault(ds => ds.Catalogue_ID == sourceCatalogueCombineable.Catalogue.ID);
+            var eds = dataExportChildProvider.ExtractableDataSets.SingleOrDefault(ds =>
+                ds.Catalogue_ID == sourceCatalogueCombineable.Catalogue.ID);
 
             if (eds == null)
                 return new ImpossibleCommand("Catalogue is not Extractable");
-                
-            return new ExecuteCommandAddDatasetsToConfiguration(ItemActivator, eds,targetExtractionConfiguration);   
+
+            return new ExecuteCommandAddDatasetsToConfiguration(ItemActivator, eds, targetExtractionConfiguration);
         }
 
         if (cmd is ExtractableCohortCombineable sourceExtractableCohortCombineable)
-            return new ExecuteCommandAddCohortToExtractionConfiguration(ItemActivator, sourceExtractableCohortCombineable, targetExtractionConfiguration);
+            return new ExecuteCommandAddCohortToExtractionConfiguration(ItemActivator,
+                sourceExtractableCohortCombineable, targetExtractionConfiguration);
 
         //user is trying to add datasets to a configuration
 
         if (cmd is ExtractableDataSetCombineable sourceExtractableDataSetCommand)
-            return new ExecuteCommandAddDatasetsToConfiguration(ItemActivator, sourceExtractableDataSetCommand, targetExtractionConfiguration);
+            return new ExecuteCommandAddDatasetsToConfiguration(ItemActivator, sourceExtractableDataSetCommand,
+                targetExtractionConfiguration);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionFilterParameterSet.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionFilterParameterSet.cs
index ef21fb0c2f..f14976e6b0 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionFilterParameterSet.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionFilterParameterSet.cs
@@ -11,16 +11,15 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsExtractionFilterParameterSet:RDMPCommandExecutionProposal<ExtractionFilterParameterSet>
+internal class
+    ProposeExecutionWhenTargetIsExtractionFilterParameterSet : RDMPCommandExecutionProposal<
+        ExtractionFilterParameterSet>
 {
     public ProposeExecutionWhenTargetIsExtractionFilterParameterSet(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ExtractionFilterParameterSet target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ExtractionFilterParameterSet target) => true;
 
     public override void Activate(ExtractionFilterParameterSet target)
     {
@@ -28,8 +27,6 @@ public override void Activate(ExtractionFilterParameterSet target)
     }
 
     public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionFilterParameterSet target,
-        InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+        InsertOption insertOption = InsertOption.Default) =>
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionInformation.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionInformation.cs
index d0b77e6ebf..0c974532ad 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionInformation.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionInformation.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsExtractionInformation:RDMPCommandExecutionProposal<ExtractionInformation>
+internal class ProposeExecutionWhenTargetIsExtractionInformation : RDMPCommandExecutionProposal<ExtractionInformation>
 {
     public ProposeExecutionWhenTargetIsExtractionInformation(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ExtractionInformation target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ExtractionInformation target) => true;
 
     public override void Activate(ExtractionInformation target)
     {
         ItemActivator.Activate<ExtractionInformationUI, ExtractionInformation>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionInformation target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionInformation target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionProgress.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionProgress.cs
index 8312e4a0f9..f9f2fcc0c1 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionProgress.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsExtractionProgress.cs
@@ -15,21 +15,17 @@ internal class ProposeExecutionWhenTargetIsExtractionProgress : RDMPCommandExecu
 {
     public ProposeExecutionWhenTargetIsExtractionProgress(IActivateItems itemActivator) : base(itemActivator)
     {
-
-    }
-    public override bool CanActivate(ExtractionProgress target)
-    {
-        return true;
     }
 
+    public override bool CanActivate(ExtractionProgress target) => true;
+
     public override void Activate(ExtractionProgress target)
     {
         ItemActivator.Activate<ExtractionProgressUI, ExtractionProgress>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionProgress target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ExtractionProgress target,
+        InsertOption insertOption = InsertOption.Default) =>
         // no drag and drop support
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsFilterContainer.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsFilterContainer.cs
index 6db4b351e7..1f53bcfd14 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsFilterContainer.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsFilterContainer.cs
@@ -12,24 +12,20 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsFilterContainer:RDMPCommandExecutionProposal<IContainer>
+internal class ProposeExecutionWhenTargetIsFilterContainer : RDMPCommandExecutionProposal<IContainer>
 {
     public ProposeExecutionWhenTargetIsFilterContainer(IActivateItems itemActivator) : base(itemActivator)
     {
-
     }
 
-    public override bool CanActivate(IContainer target)
-    {
-        return false;
-    }
+    public override bool CanActivate(IContainer target) => false;
 
     public override void Activate(IContainer target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IContainer targetContainer, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IContainer targetContainer,
+        InsertOption insertOption = InsertOption.Default)
     {
         //drag a filter into a container
         if (cmd is FilterCombineable sourceFilterCommand)
@@ -41,17 +37,16 @@ public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IC
             //if the target container is one that is part of the filters tree then it's a move
             if (sourceFilterCommand.AllContainersInEntireTreeFromRootDown.Contains(targetContainer))
                 return new ExecuteCommandMoveFilterIntoContainer(ItemActivator, sourceFilterCommand, targetContainer);
-                
+
             //otherwise it's an import    
 
             //so instead let's let them create a new copy (possibly including changing the type e.g. importing a master
             //filter into a data export AND/OR container
-            return new ExecuteCommandCreateNewFilter(ItemActivator, targetContainer,sourceFilterCommand.Filter);
-                
+            return new ExecuteCommandCreateNewFilter(ItemActivator, targetContainer, sourceFilterCommand.Filter);
         }
 
         //drag a container into another container
-        if ( cmd is ContainerCombineable sourceContainerCommand)
+        if (cmd is ContainerCombineable sourceContainerCommand)
         {
             //if the source and target are the same container
             if (sourceContainerCommand.Container.Equals(targetContainer))
@@ -59,13 +54,13 @@ public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IC
 
             //is it a movement within the current container tree
             if (sourceContainerCommand.AllContainersInEntireTreeFromRootDown.Contains(targetContainer))
-                return new ExecuteCommandMoveContainerIntoContainer(ItemActivator, sourceContainerCommand, targetContainer);
+                return new ExecuteCommandMoveContainerIntoContainer(ItemActivator, sourceContainerCommand,
+                    targetContainer);
 
-            return new ExecuteCommandImportFilterContainerTree(ItemActivator,targetContainer,sourceContainerCommand.Container);
+            return new ExecuteCommandImportFilterContainerTree(ItemActivator, targetContainer,
+                sourceContainerCommand.Container);
         }
-            
-        return null;
-        
 
+        return null;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernanceDocument.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernanceDocument.cs
index 6074fc41fe..4c535f016e 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernanceDocument.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernanceDocument.cs
@@ -17,18 +17,13 @@ public ProposeExecutionWhenTargetIsGovernanceDocument(IActivateItems itemActivat
     {
     }
 
-    public override bool CanActivate(GovernanceDocument target)
-    {
-        return true;
-    }
+    public override bool CanActivate(GovernanceDocument target) => true;
 
     public override void Activate(GovernanceDocument target)
     {
         ItemActivator.Activate<GovernanceDocumentUI, GovernanceDocument>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, GovernanceDocument target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, GovernanceDocument target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernancePeriod.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernancePeriod.cs
index 0270de4b9d..cd3cff82e0 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernancePeriod.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsGovernancePeriod.cs
@@ -13,34 +13,30 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsGovernancePeriod:RDMPCommandExecutionProposal<GovernancePeriod>
+internal class ProposeExecutionWhenTargetIsGovernancePeriod : RDMPCommandExecutionProposal<GovernancePeriod>
 {
     public ProposeExecutionWhenTargetIsGovernancePeriod(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(GovernancePeriod target)
-    {
-        return true;
-    }
+    public override bool CanActivate(GovernancePeriod target) => true;
 
     public override void Activate(GovernancePeriod target)
     {
         ItemActivator.Activate<GovernancePeriodUI, GovernancePeriod>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, GovernancePeriod target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, GovernancePeriod target,
+        InsertOption insertOption = InsertOption.Default)
     {
-            
-
         if (cmd is FileCollectionCombineable files && files.Files.Length == 1)
             return new ExecuteCommandAddNewGovernanceDocument(ItemActivator, target, files.Files[0]);
 
-        if(cmd is CatalogueCombineable c)
-            return new ExecuteCommandAddCatalogueToGovernancePeriod(ItemActivator,target,c.Catalogue);
+        if (cmd is CatalogueCombineable c)
+            return new ExecuteCommandAddCatalogueToGovernancePeriod(ItemActivator, target, c.Catalogue);
 
-        if(cmd is ManyCataloguesCombineable mcat)
-            return new ExecuteCommandAddCatalogueToGovernancePeriod(ItemActivator,target,mcat.Catalogues);
+        if (cmd is ManyCataloguesCombineable mcat)
+            return new ExecuteCommandAddCatalogueToGovernancePeriod(ItemActivator, target, mcat.Catalogues);
 
         //no drag and drop support
         return null;
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsIDirectoryInfoNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsIDirectoryInfoNode.cs
index aaf686b66c..4444c1fdce 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsIDirectoryInfoNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsIDirectoryInfoNode.cs
@@ -11,25 +11,21 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsIDirectoryInfoNode:RDMPCommandExecutionProposal<IDirectoryInfoNode>
+internal class ProposeExecutionWhenTargetIsIDirectoryInfoNode : RDMPCommandExecutionProposal<IDirectoryInfoNode>
 {
-    public ProposeExecutionWhenTargetIsIDirectoryInfoNode(IActivateItems itemActivator): base(itemActivator)
+    public ProposeExecutionWhenTargetIsIDirectoryInfoNode(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(IDirectoryInfoNode target)
-    {
-        return target.GetDirectoryInfoIfAny() != null;
-    }
+    public override bool CanActivate(IDirectoryInfoNode target) => target.GetDirectoryInfoIfAny() != null;
 
     public override void Activate(IDirectoryInfoNode target)
     {
-        new ExecuteCommandOpenInExplorer(ItemActivator,target.GetDirectoryInfoIfAny()).Execute();
+        new ExecuteCommandOpenInExplorer(ItemActivator, target.GetDirectoryInfoIfAny()).Execute();
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IDirectoryInfoNode target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, IDirectoryInfoNode target,
+        InsertOption insertOption = InsertOption.Default) =>
         //no drag and drop support
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadMetadata.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadMetadata.cs
index f794c7946e..27bce92987 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadMetadata.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadMetadata.cs
@@ -17,19 +17,15 @@ public ProposeExecutionWhenTargetIsLoadMetadata(IActivateItems itemActivator) :
     {
     }
 
-    public override bool CanActivate(LoadMetadata target)
-    {
-        return true;
-    }
+    public override bool CanActivate(LoadMetadata target) => true;
 
     public override void Activate(LoadMetadata target)
     {
-        ItemActivator.Activate<ExecuteLoadMetadataUI,LoadMetadata>(target);
+        ItemActivator.Activate<ExecuteLoadMetadataUI, LoadMetadata>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadMetadata target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadMetadata target,
+        InsertOption insertOption = InsertOption.Default) =>
         //nothing can be dropped on Load Metadatas
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadProgress.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadProgress.cs
index 510647c5a7..90521f6a76 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadProgress.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadProgress.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsLoadProgress:RDMPCommandExecutionProposal<LoadProgress>
+internal class ProposeExecutionWhenTargetIsLoadProgress : RDMPCommandExecutionProposal<LoadProgress>
 {
     public ProposeExecutionWhenTargetIsLoadProgress(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(LoadProgress target)
-    {
-        return true;
-    }
+    public override bool CanActivate(LoadProgress target) => true;
 
     public override void Activate(LoadProgress target)
     {
         ItemActivator.Activate<LoadProgressUI, LoadProgress>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadProgress target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadProgress target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadStageNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadStageNode.cs
index 0ea0f31b04..f0c027e0bb 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadStageNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLoadStageNode.cs
@@ -14,38 +14,36 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsLoadStageNode:RDMPCommandExecutionProposal<LoadStageNode>
+internal class ProposeExecutionWhenTargetIsLoadStageNode : RDMPCommandExecutionProposal<LoadStageNode>
 {
     public ProposeExecutionWhenTargetIsLoadStageNode(IActivateItems itemActivator) : base(itemActivator)
     {
     }
-        
-    public override bool CanActivate(LoadStageNode target)
-    {
-        return false;
-    }
+
+    public override bool CanActivate(LoadStageNode target) => false;
 
     public override void Activate(LoadStageNode target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadStageNode targetStage, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, LoadStageNode targetStage,
+        InsertOption insertOption = InsertOption.Default)
     {
         if (cmd is ProcessTaskCombineable sourceProcessTaskCommand)
             return new ExecuteCommandChangeLoadStage(ItemActivator, sourceProcessTaskCommand, targetStage);
 
         if (cmd is FileCollectionCombineable sourceFileTaskCommand && sourceFileTaskCommand.Files.Length == 1)
         {
-
             var f = sourceFileTaskCommand.Files.Single();
 
-            if(f.Extension == ".sql")
-                return new ExecuteCommandCreateNewFileBasedProcessTask(ItemActivator, ProcessTaskType.SQLFile,targetStage.LoadMetadata, targetStage.LoadStage,f);
+            if (f.Extension == ".sql")
+                return new ExecuteCommandCreateNewFileBasedProcessTask(ItemActivator, ProcessTaskType.SQLFile,
+                    targetStage.LoadMetadata, targetStage.LoadStage, f);
 
 
             if (f.Extension == ".exe")
-                return new ExecuteCommandCreateNewFileBasedProcessTask(ItemActivator, ProcessTaskType.Executable, targetStage.LoadMetadata, targetStage.LoadStage, f);
+                return new ExecuteCommandCreateNewFileBasedProcessTask(ItemActivator, ProcessTaskType.Executable,
+                    targetStage.LoadMetadata, targetStage.LoadStage, f);
         }
 
 
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLookup.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLookup.cs
index 222fb0069a..eb8bb56708 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLookup.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsLookup.cs
@@ -17,18 +17,13 @@ public ProposeExecutionWhenTargetIsLookup(IActivateItems itemActivator) : base(i
     {
     }
 
-    public override bool CanActivate(Lookup target)
-    {
-        return true;
-    }
+    public override bool CanActivate(Lookup target) => true;
 
     public override void Activate(Lookup target)
     {
         ItemActivator.Activate<LookupUI, Lookup>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Lookup target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Lookup target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindow.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindow.cs
index ed855d1b60..12ed0390a5 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindow.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindow.cs
@@ -19,20 +19,19 @@ public ProposeExecutionWhenTargetIsPermissionWindow(IActivateItems itemActivator
     {
     }
 
-    public override bool CanActivate(PermissionWindow target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PermissionWindow target) => true;
 
     public override void Activate(PermissionWindow target)
     {
         ItemActivator.Activate<PermissionWindowUI, PermissionWindow>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PermissionWindow target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PermissionWindow target,
+        InsertOption insertOption = InsertOption.Default)
     {
-        if(cmd is CacheProgressCombineable cacheProgressCommand)
-            return new ExecuteCommandSetPermissionWindow(ItemActivator,cacheProgressCommand.CacheProgress).SetTarget(target);
+        if (cmd is CacheProgressCombineable cacheProgressCommand)
+            return new ExecuteCommandSetPermissionWindow(ItemActivator, cacheProgressCommand.CacheProgress)
+                .SetTarget(target);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode.cs
index 50875dbb13..1260309196 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode.cs
@@ -13,16 +13,16 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode : RDMPCommandExecutionProposal<PermissionWindowUsedByCacheProgressNode>
+internal class
+    ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode : RDMPCommandExecutionProposal<
+        PermissionWindowUsedByCacheProgressNode>
 {
-    public ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode(IActivateItems itemActivator) : base(itemActivator)
+    public ProposeExecutionWhenTargetIsPermissionWindowUsedByCacheProgressNode(IActivateItems itemActivator) :
+        base(itemActivator)
     {
     }
 
-    public override bool CanActivate(PermissionWindowUsedByCacheProgressNode target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PermissionWindowUsedByCacheProgressNode target) => true;
 
     public override void Activate(PermissionWindowUsedByCacheProgressNode target)
     {
@@ -32,9 +32,8 @@ public override void Activate(PermissionWindowUsedByCacheProgressNode target)
             ItemActivator.Activate<CacheProgressUI, CacheProgress>(target.CacheProgress);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PermissionWindowUsedByCacheProgressNode target,InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        PermissionWindowUsedByCacheProgressNode target, InsertOption insertOption = InsertOption.Default) =>
         //no drag and drop
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipeline.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipeline.cs
index f4784dc0ce..bd1273f99a 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipeline.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipeline.cs
@@ -7,7 +7,6 @@
 using Rdmp.Core.Curation.Data.Pipelines;
 using Rdmp.UI.CommandExecution.AtomicCommands;
 using Rdmp.UI.ItemActivation;
-
 using System.Linq;
 using Rdmp.Core.CommandExecution;
 
@@ -15,29 +14,25 @@ namespace Rdmp.UI.CommandExecution.Proposals;
 
 internal class ProposeExecutionWhenTargetIsPipeline : RDMPCommandExecutionProposal<Pipeline>
 {
-    public ProposeExecutionWhenTargetIsPipeline(IActivateItems itemActivator): base(itemActivator)
+    public ProposeExecutionWhenTargetIsPipeline(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
     public override void Activate(Pipeline target)
     {
-        if(ItemActivator.SelectObject(new DialogArgs
-           {
-               TaskDescription = $"The Pipeline '{target.Name}' is not compatible with any known Pipeline use cases.  Select which use case you want to edit it under (which activity best describes what how the Pipeline is supposed to be used?)."
-           }, ItemActivator.CoreChildProvider.PipelineUseCases.ToArray(), out var selected))
+        if (ItemActivator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    $"The Pipeline '{target.Name}' is not compatible with any known Pipeline use cases.  Select which use case you want to edit it under (which activity best describes what how the Pipeline is supposed to be used?)."
+            }, ItemActivator.CoreChildProvider.PipelineUseCases.ToArray(), out var selected))
         {
             var cmd = new ExecuteCommandEditPipelineWithUseCase(ItemActivator, target, selected.UseCase);
             cmd.Execute();
         }
     }
 
-    public override bool CanActivate(Pipeline target)
-    {
-        return true;
-    }
+    public override bool CanActivate(Pipeline target) => true;
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Pipeline target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode.cs
index d7606b4972..02c1c96231 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode.cs
@@ -11,25 +11,25 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode : RDMPCommandExecutionProposal<PipelineCompatibleWithUseCaseNode>
+internal class
+    ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode : RDMPCommandExecutionProposal<
+        PipelineCompatibleWithUseCaseNode>
 {
-    public ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode(IActivateItems itemActivator): base(itemActivator)
+    public ProposeExecutionWhenTargetIsPipelineCompatibleWithUseCaseNode(IActivateItems itemActivator) : base(
+        itemActivator)
     {
     }
 
-    public override bool CanActivate(PipelineCompatibleWithUseCaseNode target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PipelineCompatibleWithUseCaseNode target) => true;
 
     public override void Activate(PipelineCompatibleWithUseCaseNode target)
     {
-        var cmd = new ExecuteCommandEditPipelineWithUseCase(ItemActivator,target.Pipeline, target.UseCase);
+        var cmd = new ExecuteCommandEditPipelineWithUseCase(ItemActivator, target.Pipeline, target.UseCase);
         cmd.Execute();
     }
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PipelineCompatibleWithUseCaseNode target,
-        InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        PipelineCompatibleWithUseCaseNode target,
+        InsertOption insertOption = InsertOption.Default) =>
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponent.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponent.cs
index f2ba8bd2bd..3ae67870e0 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponent.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponent.cs
@@ -17,21 +17,17 @@ public ProposeExecutionWhenTargetIsPipelineComponent(IActivateItems itemActivato
     {
     }
 
-    public override bool CanActivate(PipelineComponent target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PipelineComponent target) => true;
 
     public override void Activate(PipelineComponent target)
     {
         var ui = new ArgumentCollectionUI();
-        ui.Setup(ItemActivator, target,target.GetClassAsSystemType(),ItemActivator.RepositoryLocator.CatalogueRepository);
-        ItemActivator.ShowWindow(ui,true);
+        ui.Setup(ItemActivator, target, target.GetClassAsSystemType(),
+            ItemActivator.RepositoryLocator.CatalogueRepository);
+        ItemActivator.ShowWindow(ui, true);
     }
 
     public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PipelineComponent target,
-        InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+        InsertOption insertOption = InsertOption.Default) =>
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponentArgument.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponentArgument.cs
index 6b20476ed4..efb508b240 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponentArgument.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPipelineComponentArgument.cs
@@ -11,18 +11,17 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsPipelineComponentArgument : RDMPCommandExecutionProposal<PipelineComponentArgument>
+internal class
+    ProposeExecutionWhenTargetIsPipelineComponentArgument : RDMPCommandExecutionProposal<PipelineComponentArgument>
 {
     private IActivateItems _activator;
+
     public ProposeExecutionWhenTargetIsPipelineComponentArgument(IActivateItems itemActivator) : base(itemActivator)
     {
         _activator = itemActivator;
     }
 
-    public override bool CanActivate(PipelineComponentArgument target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PipelineComponentArgument target) => true;
 
     public override void Activate(PipelineComponentArgument arg)
     {
@@ -30,8 +29,6 @@ public override void Activate(PipelineComponentArgument arg)
         setArgumentCommand.Execute();
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PipelineComponentArgument target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PipelineComponentArgument target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPreLoadDiscardedColumn.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPreLoadDiscardedColumn.cs
index 9551055238..d8c7b23bf0 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPreLoadDiscardedColumn.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsPreLoadDiscardedColumn.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsPreLoadDiscardedColumn(IActivateItems itemAct
     {
     }
 
-    public override bool CanActivate(PreLoadDiscardedColumn target)
-    {
-        return true;
-    }
+    public override bool CanActivate(PreLoadDiscardedColumn target) => true;
 
     public override void Activate(PreLoadDiscardedColumn target)
     {
         ItemActivator.Activate<PreLoadDiscardedColumnUI, PreLoadDiscardedColumn>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PreLoadDiscardedColumn target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, PreLoadDiscardedColumn target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTask.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTask.cs
index 486d02d01f..e275903263 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTask.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTask.cs
@@ -11,21 +11,16 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsProcessTask:RDMPCommandExecutionProposal<ProcessTask>
+internal class ProposeExecutionWhenTargetIsProcessTask : RDMPCommandExecutionProposal<ProcessTask>
 {
     public ProposeExecutionWhenTargetIsProcessTask(IActivateItems itemActivator) : base(itemActivator)
     {
-
     }
 
-    public override bool CanActivate(ProcessTask target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ProcessTask target) => true;
 
     public override void Activate(ProcessTask processTask)
     {
-
         if (processTask.IsPluginType())
             ItemActivator.Activate<PluginProcessTaskUI, ProcessTask>(processTask);
 
@@ -36,8 +31,6 @@ public override void Activate(ProcessTask processTask)
             ItemActivator.Activate<SqlProcessTaskUI, ProcessTask>(processTask);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProcessTask target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProcessTask target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTaskArgument.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTaskArgument.cs
index 33b8b4676d..205f2ae132 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTaskArgument.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProcessTaskArgument.cs
@@ -11,18 +11,16 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsProcessTaskArgument: RDMPCommandExecutionProposal<ProcessTaskArgument>
+internal class ProposeExecutionWhenTargetIsProcessTaskArgument : RDMPCommandExecutionProposal<ProcessTaskArgument>
 {
     private IActivateItems _activator;
+
     public ProposeExecutionWhenTargetIsProcessTaskArgument(IActivateItems itemActivator) : base(itemActivator)
     {
         _activator = itemActivator;
     }
 
-    public override bool CanActivate(ProcessTaskArgument target)
-    {
-        return true;
-    }
+    public override bool CanActivate(ProcessTaskArgument target) => true;
 
     public override void Activate(ProcessTaskArgument processTaskArgument)
     {
@@ -30,8 +28,6 @@ public override void Activate(ProcessTaskArgument processTaskArgument)
         setArgumentCommand.Execute();
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProcessTaskArgument target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProcessTaskArgument target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProject.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProject.cs
index d750ba7088..ff39aac547 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProject.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProject.cs
@@ -14,36 +14,38 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsProject:RDMPCommandExecutionProposal<Project>
+internal class ProposeExecutionWhenTargetIsProject : RDMPCommandExecutionProposal<Project>
 {
     public ProposeExecutionWhenTargetIsProject(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(Project target)
-    {
-        return true;
-    }
+    public override bool CanActivate(Project target) => true;
 
     public override void Activate(Project target)
     {
         ItemActivator.Activate<ProjectUI.ProjectUI, Project>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Project project, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, Project project,
+        InsertOption insertOption = InsertOption.Default)
     {
         //drop a cic on a Project to associate it with that project
-        if(cmd is CohortIdentificationConfigurationCommand cicCommand)
-            return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(ItemActivator).SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(project);
+        if (cmd is CohortIdentificationConfigurationCommand cicCommand)
+            return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(ItemActivator)
+                .SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(project);
 
         if (cmd is CatalogueCombineable cataCommand)
-            return new ExecuteCommandMakeCatalogueProjectSpecific(ItemActivator).SetTarget(cataCommand.Catalogue).SetTarget(project);
+            return new ExecuteCommandMakeCatalogueProjectSpecific(ItemActivator).SetTarget(cataCommand.Catalogue)
+                .SetTarget(project);
 
-        if(cmd is FileCollectionCombineable file && file.Files.Length == 1)
-            return new ExecuteCommandCreateNewCatalogueByImportingFileUI(ItemActivator,file.Files[0]).SetTarget(project);
+        if (cmd is FileCollectionCombineable file && file.Files.Length == 1)
+            return new ExecuteCommandCreateNewCatalogueByImportingFileUI(ItemActivator, file.Files[0])
+                .SetTarget(project);
 
-        if(cmd is AggregateConfigurationCombineable aggCommand)
-            return new ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration(ItemActivator,aggCommand.Aggregate).SetTarget(project);
+        if (cmd is AggregateConfigurationCombineable aggCommand)
+            return new ExecuteCommandCreateNewCatalogueByExecutingAnAggregateConfiguration(ItemActivator,
+                aggCommand.Aggregate).SetTarget(project);
 
 
         return null;
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCataloguesNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCataloguesNode.cs
index e3a3e7a914..077d88a551 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCataloguesNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCataloguesNode.cs
@@ -20,24 +20,21 @@ public ProposeExecutionWhenTargetIsProjectCataloguesNode(IActivateItems itemActi
         _projectFunctionality = new ProposeExecutionWhenTargetIsProject(itemActivator);
     }
 
-    public override bool CanActivate(ProjectCataloguesNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(ProjectCataloguesNode target) => false;
 
     public override void Activate(ProjectCataloguesNode target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProjectCataloguesNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProjectCataloguesNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
         //use the same drop options as Project except for this one
 
         if (cmd is CohortIdentificationConfigurationCommand)
             return null;
 
-            
+
         return _projectFunctionality.ProposeExecution(cmd, target.Project, insertOption);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode.cs
index 17516b1124..48e397dc19 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode.cs
@@ -12,29 +12,28 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode : RDMPCommandExecutionProposal<ProjectCohortIdentificationConfigurationAssociationsNode>
+internal class
+    ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode : RDMPCommandExecutionProposal<
+        ProjectCohortIdentificationConfigurationAssociationsNode>
 {
-    public ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode(IActivateItems itemActivator) : base(itemActivator)
+    public ProposeExecutionWhenTargetIsProjectCohortIdentificationConfigurationAssociationsNode(
+        IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ProjectCohortIdentificationConfigurationAssociationsNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(ProjectCohortIdentificationConfigurationAssociationsNode target) => false;
 
     public override void Activate(ProjectCohortIdentificationConfigurationAssociationsNode target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProjectCohortIdentificationConfigurationAssociationsNode target,
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        ProjectCohortIdentificationConfigurationAssociationsNode target,
         InsertOption insertOption = InsertOption.Default)
     {
         if (cmd is CohortIdentificationConfigurationCommand cicCommand)
-        {
-            return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(ItemActivator).SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(target.Project);
-        }
+            return new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(ItemActivator)
+                .SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(target.Project);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectSavedCohortsNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectSavedCohortsNode.cs
index 4f5359fe86..70b323a9c5 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectSavedCohortsNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsProjectSavedCohortsNode.cs
@@ -13,39 +13,40 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsProjectSavedCohortsNode:RDMPCommandExecutionProposal<ProjectSavedCohortsNode>
+internal class
+    ProposeExecutionWhenTargetIsProjectSavedCohortsNode : RDMPCommandExecutionProposal<ProjectSavedCohortsNode>
 {
     public ProposeExecutionWhenTargetIsProjectSavedCohortsNode(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(ProjectSavedCohortsNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(ProjectSavedCohortsNode target) => false;
 
     public override void Activate(ProjectSavedCohortsNode target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProjectSavedCohortsNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, ProjectSavedCohortsNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
         //drop a cic on a Saved Cohorts Node to commit it to that project
         if (cmd is CohortIdentificationConfigurationCommand cicCommand)
             return
-                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(ItemActivator,null).SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(target.Project);
-            
+                new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(ItemActivator, null)
+                    .SetTarget(cicCommand.CohortIdentificationConfiguration).SetTarget(target.Project);
+
         //drop a file on the SavedCohorts node to commit it
-        if(cmd is FileCollectionCombineable fileCommand && fileCommand.Files.Length == 1)
-            return new ExecuteCommandCreateNewCohortFromFile(ItemActivator,fileCommand.Files[0],null).SetTarget(target.Project);
+        if (cmd is FileCollectionCombineable fileCommand && fileCommand.Files.Length == 1)
+            return new ExecuteCommandCreateNewCohortFromFile(ItemActivator, fileCommand.Files[0], null).SetTarget(
+                target.Project);
 
         //drop a Project Specific Catalogue onto it
         if (cmd is CatalogueCombineable catalogueCombineable)
-            return new ExecuteCommandCreateNewCohortFromCatalogue(ItemActivator, catalogueCombineable.Catalogue).SetTarget(target.Project);
+            return new ExecuteCommandCreateNewCohortFromCatalogue(ItemActivator, catalogueCombineable.Catalogue)
+                .SetTarget(target.Project);
 
         if (cmd is ColumnCombineable columnCommand && columnCommand.Column is ExtractionInformation column)
-            return new ExecuteCommandCreateNewCohortFromCatalogue(ItemActivator,column);
+            return new ExecuteCommandCreateNewCohortFromCatalogue(ItemActivator, column);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsRemoteRDMP.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsRemoteRDMP.cs
index 09015c9c40..d748ac316a 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsRemoteRDMP.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsRemoteRDMP.cs
@@ -11,24 +11,19 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsRemoteRDMP:RDMPCommandExecutionProposal<RemoteRDMP>
+internal class ProposeExecutionWhenTargetIsRemoteRDMP : RDMPCommandExecutionProposal<RemoteRDMP>
 {
     public ProposeExecutionWhenTargetIsRemoteRDMP(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(RemoteRDMP target)
-    {
-        return true;
-    }
+    public override bool CanActivate(RemoteRDMP target) => true;
 
     public override void Activate(RemoteRDMP target)
     {
         ItemActivator.Activate<RemoteRDMPUI, RemoteRDMP>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, RemoteRDMP targetAggregateConfiguration, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd,
+        RemoteRDMP targetAggregateConfiguration, InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSelectedDataSets.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSelectedDataSets.cs
index ed9536d2ba..c84286738d 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSelectedDataSets.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSelectedDataSets.cs
@@ -13,35 +13,29 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsSelectedDataSets:RDMPCommandExecutionProposal<SelectedDataSets>
+internal class ProposeExecutionWhenTargetIsSelectedDataSets : RDMPCommandExecutionProposal<SelectedDataSets>
 {
-    public ProposeExecutionWhenTargetIsSelectedDataSets(IActivateItems itemActivator): base(itemActivator)
+    public ProposeExecutionWhenTargetIsSelectedDataSets(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(SelectedDataSets target)
-    {
-        return true;
-    }
+    public override bool CanActivate(SelectedDataSets target) => true;
 
     public override void Activate(SelectedDataSets target)
     {
         ItemActivator.Activate<ConfigureDatasetUI, SelectedDataSets>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SelectedDataSets target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SelectedDataSets target,
+        InsertOption insertOption = InsertOption.Default)
     {
         // if use drops a reusable template aggregate (e.g. from Cohort Builder)
-        if(cmd is AggregateConfigurationCombineable ac && ac.IsTemplate && ac.Aggregate.RootFilterContainer_ID != null)
-        {
+        if (cmd is AggregateConfigurationCombineable ac && ac.IsTemplate && ac.Aggregate.RootFilterContainer_ID != null)
             // offer to import the WHERE containers
             return new ExecuteCommandImportFilterContainerTree(ItemActivator, target, ac.Aggregate);
-        }
 
-        if(cmd is ContainerCombineable cc)
-        {
+        if (cmd is ContainerCombineable cc)
             return new ExecuteCommandImportFilterContainerTree(ItemActivator, target, cc.Container);
-        }
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode.cs
index 9858466bda..8924f7d75c 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode.cs
@@ -12,26 +12,25 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode :RDMPCommandExecutionProposal<StandardPipelineUseCaseNode>
+internal class
+    ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode : RDMPCommandExecutionProposal<StandardPipelineUseCaseNode>
 {
     public ProposeExecutionWhenTargetIsStandardPipelineUseCaseNode(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(StandardPipelineUseCaseNode target)
-    {
-        return false;
-    }
+    public override bool CanActivate(StandardPipelineUseCaseNode target) => false;
 
     public override void Activate(StandardPipelineUseCaseNode target)
     {
-            
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, StandardPipelineUseCaseNode target, InsertOption insertOption = InsertOption.Default)
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, StandardPipelineUseCaseNode target,
+        InsertOption insertOption = InsertOption.Default)
     {
-        if(cmd is PipelineCombineable sourcePipelineCommand)
-            return new ExecuteCommandEditPipelineWithUseCase(ItemActivator,sourcePipelineCommand.Pipeline, target.UseCase);
+        if (cmd is PipelineCombineable sourcePipelineCommand)
+            return new ExecuteCommandEditPipelineWithUseCase(ItemActivator, sourcePipelineCommand.Pipeline,
+                target.UseCase);
 
         return null;
     }
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardRegex.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardRegex.cs
index 8d28c01a14..ac4ed3dec4 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardRegex.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsStandardRegex.cs
@@ -11,25 +11,21 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-internal class ProposeExecutionWhenTargetIsStandardRegex:RDMPCommandExecutionProposal<StandardRegex>
+internal class ProposeExecutionWhenTargetIsStandardRegex : RDMPCommandExecutionProposal<StandardRegex>
 {
     public ProposeExecutionWhenTargetIsStandardRegex(IActivateItems itemActivator) : base(itemActivator)
     {
     }
 
-    public override bool CanActivate(StandardRegex target)
-    {
-        return true;
-    }
+    public override bool CanActivate(StandardRegex target) => true;
 
     public override void Activate(StandardRegex target)
     {
         ItemActivator.Activate<StandardRegexUI, StandardRegex>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, StandardRegex target, InsertOption insertOption = InsertOption.Default)
-    {
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, StandardRegex target,
+        InsertOption insertOption = InsertOption.Default) =>
         //no drag and drop support
-        return null;
-    }
+        null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingDocument.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingDocument.cs
index 0bcbe44904..d7de7b2d44 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingDocument.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingDocument.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsSupportingDocument(IActivateItems itemActivat
     {
     }
 
-    public override bool CanActivate(SupportingDocument target)
-    {
-        return true;
-    }
+    public override bool CanActivate(SupportingDocument target) => true;
 
     public override void Activate(SupportingDocument target)
     {
         ItemActivator.Activate<SupportingDocumentUI, SupportingDocument>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SupportingDocument target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SupportingDocument target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingSQLTable.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingSQLTable.cs
index fc3854555a..4285f24c0d 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingSQLTable.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsSupportingSQLTable.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsSupportingSQLTable(IActivateItems itemActivat
     {
     }
 
-    public override bool CanActivate(SupportingSQLTable target)
-    {
-        return true;
-    }
+    public override bool CanActivate(SupportingSQLTable target) => true;
 
     public override void Activate(SupportingSQLTable target)
     {
         ItemActivator.Activate<SupportingSQLTableUI, SupportingSQLTable>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SupportingSQLTable target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, SupportingSQLTable target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsTableInfo.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsTableInfo.cs
index e4f32025bf..19fc4fca0f 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsTableInfo.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsTableInfo.cs
@@ -18,18 +18,13 @@ public ProposeExecutionWhenTargetIsTableInfo(IActivateItems itemActivator)
     {
     }
 
-    public override bool CanActivate(TableInfo target)
-    {
-        return true;
-    }
+    public override bool CanActivate(TableInfo target) => true;
 
     public override void Activate(TableInfo target)
     {
         ItemActivator.Activate<TableInfoUI, TableInfo>(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, TableInfo target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, TableInfo target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsWindowLayout.cs b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsWindowLayout.cs
index b0fe4eeeda..e4859c5790 100644
--- a/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsWindowLayout.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/ProposeExecutionWhenTargetIsWindowLayout.cs
@@ -17,18 +17,13 @@ public ProposeExecutionWhenTargetIsWindowLayout(IActivateItems itemActivator)
     {
     }
 
-    public override bool CanActivate(WindowLayout target)
-    {
-        return true;
-    }
+    public override bool CanActivate(WindowLayout target) => true;
 
     public override void Activate(WindowLayout target)
     {
         ItemActivator.WindowArranger.Setup(target);
     }
 
-    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, WindowLayout target, InsertOption insertOption = InsertOption.Default)
-    {
-        return null;
-    }
+    public override ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, WindowLayout target,
+        InsertOption insertOption = InsertOption.Default) => null;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/Proposals/RDMPCommandExecutionProposal.cs b/Rdmp.UI/CommandExecution/Proposals/RDMPCommandExecutionProposal.cs
index 8567c313cd..a3b3eef144 100644
--- a/Rdmp.UI/CommandExecution/Proposals/RDMPCommandExecutionProposal.cs
+++ b/Rdmp.UI/CommandExecution/Proposals/RDMPCommandExecutionProposal.cs
@@ -11,7 +11,7 @@
 
 namespace Rdmp.UI.CommandExecution.Proposals;
 
-public abstract class RDMPCommandExecutionProposal<T>:ICommandExecutionProposal where T : class
+public abstract class RDMPCommandExecutionProposal<T> : ICommandExecutionProposal where T : class
 {
     protected readonly IActivateItems ItemActivator;
 
@@ -33,22 +33,18 @@ protected RDMPCommandExecutionProposal(IActivateItems itemActivator)
     /// <param name="target"> The object the cursor is currently hovering over </param>
     /// <param name="insertOption">Whether the cursor is above or below or ontop of your object (if the collection the object is in supports it)</param>
     /// <returns></returns>
-    public abstract ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, T target, InsertOption insertOption = InsertOption.Default);
+    public abstract ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, T target,
+        InsertOption insertOption = InsertOption.Default);
 
-    public bool IsCompatibleTarget(object target)
-    {
-        return target is T target1 && IsCompatibleTargetImpl(target1);
-    }
+    public bool IsCompatibleTarget(object target) => target is T target1 && IsCompatibleTargetImpl(target1);
 
-    protected virtual bool IsCompatibleTargetImpl(T target)
-    {
-        return true;
-    }
+    protected virtual bool IsCompatibleTargetImpl(T target) => true;
 
-    public ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, object target,InsertOption insertOption = InsertOption.Default)
+    public ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, object target,
+        InsertOption insertOption = InsertOption.Default)
     {
-        if(IsCompatibleTarget(target))
-            return ProposeExecution(cmd,(T)target, insertOption);
+        if (IsCompatibleTarget(target))
+            return ProposeExecution(cmd, (T)target, insertOption);
 
         return null;
     }
@@ -56,11 +52,8 @@ public ICommandExecution ProposeExecution(ICombineToMakeCommand cmd, object targ
     public void Activate(object target)
     {
         if (IsCompatibleTarget(target))
-            Activate((T) target);
+            Activate((T)target);
     }
 
-    public bool CanActivate(object target)
-    {
-        return IsCompatibleTarget(target) && CanActivate((T)target);
-    }
+    public bool CanActivate(object target) => IsCompatibleTarget(target) && CanActivate((T)target);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/CommandExecution/RDMPCommandExecutionFactory.cs b/Rdmp.UI/CommandExecution/RDMPCommandExecutionFactory.cs
index 31cbc3a4df..f075ee7d7f 100644
--- a/Rdmp.UI/CommandExecution/RDMPCommandExecutionFactory.cs
+++ b/Rdmp.UI/CommandExecution/RDMPCommandExecutionFactory.cs
@@ -32,13 +32,12 @@ public RDMPCommandExecutionFactory(IActivateItems activator)
     {
         _activator = activator;
 
-        foreach (var proposerType in _activator.RepositoryLocator.CatalogueRepository.MEF.GetTypes<ICommandExecutionProposal>())
-        {
+        foreach (var proposerType in _activator.RepositoryLocator.CatalogueRepository.MEF
+                     .GetTypes<ICommandExecutionProposal>())
             try
             {
                 var constructor = new ObjectConstructor();
-                _proposers.Add((ICommandExecutionProposal)ObjectConstructor.Construct(proposerType,activator));
-
+                _proposers.Add((ICommandExecutionProposal)ObjectConstructor.Construct(proposerType, activator));
             }
             catch (Exception ex)
             {
@@ -46,33 +45,37 @@ public RDMPCommandExecutionFactory(IActivateItems activator)
                     new CheckEventArgs($"Could not instantiate ICommandExecutionProposal '{proposerType}'",
                         CheckResult.Fail, ex));
             }
-        }
     }
 
-    public ICommandExecution Create(ICombineToMakeCommand cmd, object targetModel,InsertOption insertOption = InsertOption.Default)
+    public ICommandExecution Create(ICombineToMakeCommand cmd, object targetModel,
+        InsertOption insertOption = InsertOption.Default)
     {
         lock (oLockCachedAnswers)
         {
             var proposition = new CachedDropTarget(targetModel, insertOption);
 
             //typically user might start a drag and then drag it all over the place so cache answers to avoid hammering database/loading donuts
-            if (_cachedAnswers.TryGetValue(cmd,out var cacheLine))
+            if (_cachedAnswers.TryGetValue(cmd, out var cacheLine))
             {
                 //if we already have a cached execution for the command and the target
-                if (cacheLine.TryGetValue(proposition,out var hit))
-                    return hit;//return from cache
+                if (cacheLine.TryGetValue(proposition, out var hit))
+                    return hit; //return from cache
             }
             else
-                _cachedAnswers.Add(cmd, cacheLine=new Dictionary<CachedDropTarget, ICommandExecution>()); //novel command
+            {
+                _cachedAnswers.Add(cmd,
+                    cacheLine = new Dictionary<CachedDropTarget, ICommandExecution>()); //novel command
+            }
 
-            var result  = CreateNoCache(cmd, targetModel, insertOption);
-            cacheLine.Add(new CachedDropTarget(targetModel,insertOption), result);
+            var result = CreateNoCache(cmd, targetModel, insertOption);
+            cacheLine.Add(new CachedDropTarget(targetModel, insertOption), result);
 
             return result;
         }
     }
 
-    private ICommandExecution CreateNoCache(ICombineToMakeCommand cmd, object targetModel,InsertOption insertOption = InsertOption.Default)
+    private ICommandExecution CreateNoCache(ICombineToMakeCommand cmd, object targetModel,
+        InsertOption insertOption = InsertOption.Default)
     {
         ///////////////Catalogue or ambiguous Drop Targets ////////////////////////
         if (targetModel is IFolderNode folder)
@@ -85,7 +88,7 @@ private ICommandExecution CreateNoCache(ICombineToMakeCommand cmd, object target
         //////////////////////Cohort Drop Targets//////////////////
 
         if (targetModel is JoinableCollectionNode targetJoinableCollectionNode)
-            return CreateWhenTargetIsJoinableCollectionNode(cmd,targetJoinableCollectionNode);
+            return CreateWhenTargetIsJoinableCollectionNode(cmd, targetJoinableCollectionNode);
 
         ///////////////Data Loading Drop Targets ///////////////////
 
@@ -120,10 +123,12 @@ public bool CanActivate(object target)
         return _proposers.Any(p => p.CanActivate(target));
     }
 
-    private ICommandExecution CreateWhenTargetIsProcessTask(ICombineToMakeCommand cmd, ProcessTask targetProcessTask, InsertOption insertOption)
+    private ICommandExecution CreateWhenTargetIsProcessTask(ICombineToMakeCommand cmd, ProcessTask targetProcessTask,
+        InsertOption insertOption)
     {
         if (cmd is ProcessTaskCombineable sourceProcessTaskCommand)
-            return new ExecuteCommandReOrderProcessTask(_activator,sourceProcessTaskCommand, targetProcessTask, insertOption);
+            return new ExecuteCommandReOrderProcessTask(_activator, sourceProcessTaskCommand, targetProcessTask,
+                insertOption);
 
         return null;
     }
@@ -137,13 +142,13 @@ private ICommandExecution CreateWhenTargetIsFolder(ICombineToMakeCommand cmd, IF
         if (cmd is ManyCataloguesCombineable sourceManyCatalogues)
             return new ExecuteCommandPutIntoFolder(_activator, sourceManyCatalogues, targetFolder.FullName);
 
-        if(cmd is FileCollectionCombineable file)
-            if(file.Files.Length == 1)
+        if (cmd is FileCollectionCombineable file)
+            if (file.Files.Length == 1)
             {
-                var toReturn = new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator,file.Files[0])
-                    {
-                        TargetFolder = targetFolder.FullName
-                    };
+                var toReturn = new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator, file.Files[0])
+                {
+                    TargetFolder = targetFolder.FullName
+                };
                 return toReturn;
             }
 
@@ -153,29 +158,35 @@ private ICommandExecution CreateWhenTargetIsFolder(ICombineToMakeCommand cmd, IF
     private ICommandExecution CreateWhenTargetIsATableInfo(ICombineToMakeCommand cmd, TableInfo targetTableInfo)
     {
         if (cmd is DataAccessCredentialsCombineable sourceDataAccessCredentialsCombineable)
-            return new ExecuteCommandUseCredentialsToAccessTableInfoData(_activator,sourceDataAccessCredentialsCombineable.DataAccessCredentials, targetTableInfo);
+            return new ExecuteCommandUseCredentialsToAccessTableInfoData(_activator,
+                sourceDataAccessCredentialsCombineable.DataAccessCredentials, targetTableInfo);
 
         return null;
     }
 
 
-    private ICommandExecution CreateWhenTargetIsJoinableCollectionNode(ICombineToMakeCommand cmd, JoinableCollectionNode targetJoinableCollectionNode)
+    private ICommandExecution CreateWhenTargetIsJoinableCollectionNode(ICombineToMakeCommand cmd,
+        JoinableCollectionNode targetJoinableCollectionNode)
     {
-        if(cmd is AggregateConfigurationCombineable sourceAggregateConfigurationCombineable)
+        if (cmd is AggregateConfigurationCombineable sourceAggregateConfigurationCombineable)
             if (sourceAggregateConfigurationCombineable.Aggregate.IsCohortIdentificationAggregate)
-                return new ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(_activator,sourceAggregateConfigurationCombineable, targetJoinableCollectionNode.Configuration);
+                return new ExecuteCommandConvertAggregateConfigurationToPatientIndexTable(_activator,
+                    sourceAggregateConfigurationCombineable, targetJoinableCollectionNode.Configuration);
 
         if (cmd is CatalogueCombineable sourceCatalogueCombineable)
-            return new ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(_activator,sourceCatalogueCombineable, targetJoinableCollectionNode.Configuration);
+            return new ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(_activator,
+                sourceCatalogueCombineable, targetJoinableCollectionNode.Configuration);
 
         return null;
     }
 
 
-    private ICommandExecution CreateWhenTargetIsPreLoadDiscardedColumnsNode(ICombineToMakeCommand cmd, PreLoadDiscardedColumnsNode targetPreLoadDiscardedColumnsNode)
+    private ICommandExecution CreateWhenTargetIsPreLoadDiscardedColumnsNode(ICombineToMakeCommand cmd,
+        PreLoadDiscardedColumnsNode targetPreLoadDiscardedColumnsNode)
     {
-        if(cmd is ColumnInfoCombineable sourceColumnInfoCombineable)
-            return new ExecuteCommandCreateNewPreLoadDiscardedColumn(_activator,targetPreLoadDiscardedColumnsNode.TableInfo,sourceColumnInfoCombineable);
+        if (cmd is ColumnInfoCombineable sourceColumnInfoCombineable)
+            return new ExecuteCommandCreateNewPreLoadDiscardedColumn(_activator,
+                targetPreLoadDiscardedColumnsNode.TableInfo, sourceColumnInfoCombineable);
 
         return null;
     }
diff --git a/Rdmp.UI/Copying/RDMPCombineableFactory.cs b/Rdmp.UI/Copying/RDMPCombineableFactory.cs
index 8228dc3bee..7f622d953d 100644
--- a/Rdmp.UI/Copying/RDMPCombineableFactory.cs
+++ b/Rdmp.UI/Copying/RDMPCombineableFactory.cs
@@ -26,17 +26,11 @@
 namespace Rdmp.UI.Copying;
 
 /// <inheritdoc/>
-public class RDMPCombineableFactory:ICombineableFactory
+public class RDMPCombineableFactory : ICombineableFactory
 {
-    public ICombineToMakeCommand Create(ModelDropEventArgs e)
-    {
-        return Create((OLVDataObject)e.DataObject);
-    }
+    public ICombineToMakeCommand Create(ModelDropEventArgs e) => Create((OLVDataObject)e.DataObject);
 
-    public ICombineToMakeCommand Create(DragEventArgs e)
-    {
-        return Create(e.Data as OLVDataObject);
-    }
+    public ICombineToMakeCommand Create(DragEventArgs e) => Create(e.Data as OLVDataObject);
 
     public ICombineToMakeCommand Create(OLVDataObject o)
     {
@@ -45,7 +39,7 @@ public ICombineToMakeCommand Create(OLVDataObject o)
 
         //does the data object already contain a command?
         if (o.ModelObjects.OfType<ICombineToMakeCommand>().Count() == 1)
-            return o.ModelObjects.OfType<ICombineToMakeCommand>().Single();//yes
+            return o.ModelObjects.OfType<ICombineToMakeCommand>().Single(); //yes
 
         //otherwise is it something that can be turned into a command?
         if (o.ModelObjects.Count == 0)
@@ -59,10 +53,7 @@ public ICombineToMakeCommand Create(OLVDataObject o)
         return Create(o.ModelObjects.Cast<object>().ToArray());
     }
 
-    public ICombineToMakeCommand Create(FileInfo[] files)
-    {
-        return new FileCollectionCombineable(files);
-    }
+    public ICombineToMakeCommand Create(FileInfo[] files) => new FileCollectionCombineable(files);
 
     public ICombineToMakeCommand Create(object modelObject)
     {
@@ -75,44 +66,42 @@ public ICombineToMakeCommand Create(object modelObject)
 
         if (modelObject is Pipeline pipeline)
             return new PipelineCombineable(pipeline);
-                       
-        if (modelObject is  ExtractionFilterParameterSet efps)
+
+        if (modelObject is ExtractionFilterParameterSet efps)
             return new ExtractionFilterParameterSetCombineable(efps);
 
         if (modelObject is CatalogueItem ci)
             return new CatalogueItemCombineable(ci);
 
         var arrayOfCatalogueItems = IsArrayOf<CatalogueItem>(modelObject);
-        if (arrayOfCatalogueItems != null)
-        {
-            return new CatalogueItemCombineable(arrayOfCatalogueItems);
-        }
+        if (arrayOfCatalogueItems != null) return new CatalogueItemCombineable(arrayOfCatalogueItems);
 
         //table column pointers (not extractable)
-        var columnInfo = modelObject as ColumnInfo; //ColumnInfo is not an IColumn btw because it does not have column order or other extraction rule stuff (alias, hash etc)
+        var columnInfo =
+            modelObject as ColumnInfo; //ColumnInfo is not an IColumn btw because it does not have column order or other extraction rule stuff (alias, hash etc)
         var linkedColumnInfo = modelObject as LinkedColumnInfoNode;
-            
+
         if (columnInfo != null || linkedColumnInfo != null)
             return new ColumnInfoCombineable(columnInfo ?? linkedColumnInfo.ColumnInfo);
 
         var columnInfoArray = IsArrayOf<ColumnInfo>(modelObject);
-        if(columnInfoArray != null)
+        if (columnInfoArray != null)
             return new ColumnInfoCombineable(columnInfoArray);
 
         if (modelObject is TableInfo tableInfo)
             return new TableInfoCombineable(tableInfo);
 
-        if(modelObject is LoadMetadata lmd)
+        if (modelObject is LoadMetadata lmd)
             return new LoadMetadataCombineable(lmd);
-            
+
         if (modelObject is Project p)
             return new ProjectCombineable(p);
 
         //catalogues
         var catalogues = IsArrayOf<Catalogue>(modelObject);
-            
+
         if (catalogues != null)
-            if(catalogues.Length == 1)
+            if (catalogues.Length == 1)
                 return new CatalogueCombineable(catalogues[0]);
             else
                 return new ManyCataloguesCombineable(catalogues);
@@ -141,7 +130,7 @@ public ICombineToMakeCommand Create(object modelObject)
         if (extractableDataSets != null)
             return new ExtractableDataSetCombineable(extractableDataSets);
 
-        if(modelObject is ExtractableDataSetPackage extractableDataSetPackage)
+        if (modelObject is ExtractableDataSetPackage extractableDataSetPackage)
             return new ExtractableDataSetCombineable(extractableDataSetPackage);
 
         if (modelObject is DataAccessCredentials dataAccessCredentials)
@@ -156,7 +145,8 @@ public ICombineToMakeCommand Create(object modelObject)
         var cic = modelObject as CohortIdentificationConfiguration;
         var cicAssociation = modelObject as ProjectCohortIdentificationConfigurationAssociation;
         if (cic != null || cicAssociation != null)
-            return new CohortIdentificationConfigurationCommand(cic ?? cicAssociation.CohortIdentificationConfiguration);
+            return new CohortIdentificationConfigurationCommand(cic ??
+                                                                cicAssociation.CohortIdentificationConfiguration);
 
         if (modelObject is ICombineableSource commandSource)
             return commandSource.GetCombineable();
@@ -166,8 +156,8 @@ public ICombineToMakeCommand Create(object modelObject)
 
     private static T[] IsArrayOf<T>(object modelObject)
     {
-        if(modelObject is T modelObject1)
-            return new [] { modelObject1 };
+        if (modelObject is T modelObject1)
+            return new[] { modelObject1 };
 
         if (modelObject is not IEnumerable array)
             return null;
diff --git a/Rdmp.UI/CredentialsUIs/DataAccessCredentialsUI.cs b/Rdmp.UI/CredentialsUIs/DataAccessCredentialsUI.cs
index ef3940b165..61e58806a2 100644
--- a/Rdmp.UI/CredentialsUIs/DataAccessCredentialsUI.cs
+++ b/Rdmp.UI/CredentialsUIs/DataAccessCredentialsUI.cs
@@ -26,18 +26,18 @@ public DataAccessCredentialsUI()
 
         AssociatedCollection = RDMPCollection.Tables;
     }
-        
+
     protected override void SetBindings(BinderWithErrorProviderFactory rules, DataAccessCredentials databaseObject)
     {
         base.SetBindings(rules, databaseObject);
-            
-        Bind(tbName,"Text","Name",c=>c.Name);
+
+        Bind(tbName, "Text", "Name", c => c.Name);
         Bind(tbUsername, "Text", "Username", c => c.Username);
         Bind(tbPassword, "Text", "Password", c => c.Password);
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<DataAccessCredentialsUI_Design, UserControl>))]
-public abstract class DataAccessCredentialsUI_Design:RDMPSingleDatabaseObjectControl<DataAccessCredentials>
+public abstract class DataAccessCredentialsUI_Design : RDMPSingleDatabaseObjectControl<DataAccessCredentials>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DashboardTabs/Construction/DashboardControlFactory.cs b/Rdmp.UI/DashboardTabs/Construction/DashboardControlFactory.cs
index c45828cc49..e8804d0246 100644
--- a/Rdmp.UI/DashboardTabs/Construction/DashboardControlFactory.cs
+++ b/Rdmp.UI/DashboardTabs/Construction/DashboardControlFactory.cs
@@ -26,18 +26,13 @@ public DashboardControlFactory(IActivateItems activator, Point startLocationForN
         _startLocationForNewControls = startLocationForNewControls;
     }
 
-    public Type[] GetAvailableControlTypes()
-    {
-        return _activator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes().Where(IsCompatibleType).ToArray();
-    }
+    public Type[] GetAvailableControlTypes() => _activator.RepositoryLocator.CatalogueRepository.MEF.GetAllTypes()
+        .Where(IsCompatibleType).ToArray();
 
-    private bool IsCompatibleType(Type arg)
-    {
-        return
-            typeof (IDashboardableControl).IsAssignableFrom(arg)
-            &&
-            typeof(UserControl).IsAssignableFrom(arg);
-    }
+    private bool IsCompatibleType(Type arg) =>
+        typeof(IDashboardableControl).IsAssignableFrom(arg)
+        &&
+        typeof(UserControl).IsAssignableFrom(arg);
 
     /// <summary>
     /// Creates an instance of the user control described by the database record DashboardControl, including providing the control with a hydrated IPersistableObjectCollection that reflects
@@ -50,7 +45,7 @@ public DashboardableControlHostPanel Create(DashboardControl toCreate)
         var controlType = _activator.RepositoryLocator.CatalogueRepository.MEF.GetType(toCreate.ControlType);
 
         var instance = CreateControl(controlType);
-            
+
         return Hydrate((IDashboardableControl)instance, toCreate);
     }
 
@@ -62,7 +57,8 @@ public DashboardableControlHostPanel Create(DashboardControl toCreate)
     /// <param name="t"></param>
     /// <param name="theControlCreated"></param>
     /// <returns></returns>
-    public DashboardControl Create(DashboardLayout forLayout, Type t, out DashboardableControlHostPanel theControlCreated)
+    public DashboardControl Create(DashboardLayout forLayout, Type t,
+        out DashboardableControlHostPanel theControlCreated)
     {
         var instance = CreateControl(t);
 
@@ -70,8 +66,9 @@ public DashboardControl Create(DashboardLayout forLayout, Type t, out Dashboarda
         var w = instance.Width;
         var h = instance.Height;
 
-        var dbRecord = new DashboardControl(_activator.RepositoryLocator.CatalogueRepository, forLayout, t, _startLocationForNewControls.X, _startLocationForNewControls.Y, w, h, "");
-        theControlCreated = Hydrate((IDashboardableControl) instance, dbRecord);
+        var dbRecord = new DashboardControl(_activator.RepositoryLocator.CatalogueRepository, forLayout, t,
+            _startLocationForNewControls.X, _startLocationForNewControls.Y, w, h, "");
+        theControlCreated = Hydrate((IDashboardableControl)instance, dbRecord);
 
         return dbRecord;
     }
@@ -79,12 +76,14 @@ public DashboardControl Create(DashboardLayout forLayout, Type t, out Dashboarda
     private DashboardableControlHostPanel Hydrate(IDashboardableControl theControlCreated, DashboardControl dbRecord)
     {
         var emptyCollection = theControlCreated.ConstructEmptyCollection(dbRecord);
-            
+
         foreach (var objectUse in dbRecord.ObjectsUsed)
         {
-            var o = _activator.RepositoryLocator.GetArbitraryDatabaseObject(objectUse.ReferencedObjectRepositoryType, objectUse.ReferencedObjectType, objectUse.ReferencedObjectID);
+            var o = _activator.RepositoryLocator.GetArbitraryDatabaseObject(objectUse.ReferencedObjectRepositoryType,
+                objectUse.ReferencedObjectType, objectUse.ReferencedObjectID);
             emptyCollection.DatabaseObjects.Add(o);
         }
+
         try
         {
             emptyCollection.LoadExtraText(dbRecord.PersistenceString);
@@ -92,10 +91,10 @@ private DashboardableControlHostPanel Hydrate(IDashboardableControl theControlCr
         catch (Exception e)
         {
             throw new DashboardControlHydrationException(
-                $"Could not resolve extra text persistence string for control '{theControlCreated.GetType()}'",e);
+                $"Could not resolve extra text persistence string for control '{theControlCreated.GetType()}'", e);
         }
 
-        theControlCreated.SetCollection(_activator,emptyCollection);
+        theControlCreated.SetCollection(_activator, emptyCollection);
 
         var host = new DashboardableControlHostPanel(_activator, dbRecord, theControlCreated)
         {
@@ -117,8 +116,7 @@ private UserControl CreateControl(Type t)
 
         instance.Dock = DockStyle.None;
         instance.Anchor = AnchorStyles.Top | AnchorStyles.Left;
-            
+
         return instance;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DashboardTabs/Construction/Exceptions/DashboardControlHydrationException.cs b/Rdmp.UI/DashboardTabs/Construction/Exceptions/DashboardControlHydrationException.cs
index aeefb6c1df..45a2191d0a 100644
--- a/Rdmp.UI/DashboardTabs/Construction/Exceptions/DashboardControlHydrationException.cs
+++ b/Rdmp.UI/DashboardTabs/Construction/Exceptions/DashboardControlHydrationException.cs
@@ -10,7 +10,7 @@ namespace Rdmp.UI.DashboardTabs.Construction.Exceptions;
 
 public class DashboardControlHydrationException : Exception
 {
-    public DashboardControlHydrationException(string s, Exception exception):base(s,exception)
+    public DashboardControlHydrationException(string s, Exception exception) : base(s, exception)
     {
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DashboardTabs/Construction/IDashboardableControl.cs b/Rdmp.UI/DashboardTabs/Construction/IDashboardableControl.cs
index 338f953980..2e52ae3924 100644
--- a/Rdmp.UI/DashboardTabs/Construction/IDashboardableControl.cs
+++ b/Rdmp.UI/DashboardTabs/Construction/IDashboardableControl.cs
@@ -34,7 +34,7 @@ namespace Rdmp.UI.DashboardTabs.Construction;
 /// GoodBadCataloguePieChartObjectCollection</para>
 /// 
 /// </summary>
-public interface IDashboardableControl:IObjectCollectionControl,INotifyMeOfEditState
+public interface IDashboardableControl : IObjectCollectionControl, INotifyMeOfEditState
 {
     /// <summary>
     /// unlike regular Dashboardable controls
diff --git a/Rdmp.UI/DashboardTabs/DashboardEditModeFunctionality.cs b/Rdmp.UI/DashboardTabs/DashboardEditModeFunctionality.cs
index c726ce7fa2..aa995e2810 100644
--- a/Rdmp.UI/DashboardTabs/DashboardEditModeFunctionality.cs
+++ b/Rdmp.UI/DashboardTabs/DashboardEditModeFunctionality.cs
@@ -24,7 +24,7 @@ public bool EditMode
         get => _editMode;
         set
         {
-            _editMode = value; 
+            _editMode = value;
             EnableChanged();
         }
     }
@@ -46,7 +46,7 @@ private void EnableChanged()
 
     private EditModeAction _plannedAction = EditModeAction.None;
     private UserControl _plannedControl = null;
-        
+
     private EditModeAction _actionUnderway;
     private UserControl _actionUnderwayOnControl;
 
@@ -76,31 +76,27 @@ private void UnsubscribeControl(DashboardableControlHostPanel control)
     private void control_MouseUp(object sender, MouseEventArgs e)
     {
         //if we are changing a control currently
-        if(_actionUnderwayOnControl != null)
+        if (_actionUnderwayOnControl != null)
         {
-                
             _actionUnderwayOnControl.Location = new Point(
                 (int)(Math.Round(_actionUnderwayOnControl.Location.X / 5.0) * 5),
                 (int)(Math.Round(_actionUnderwayOnControl.Location.Y / 5.0) * 5));
-                
+
             _actionUnderwayOnControl.Size = new Size(
                 (int)(Math.Round(_actionUnderwayOnControl.Size.Width / 5.0) * 5),
                 (int)(Math.Round(_actionUnderwayOnControl.Size.Height / 5.0) * 5));
-                
-                
+
+
             //save changes
             foreach (var kvp in _layoutUI.ControlDictionary)
-            {
                 if (kvp.Value == _actionUnderwayOnControl)
                 {
                     kvp.Key.Width = _actionUnderwayOnControl.Width;
                     kvp.Key.Height = _actionUnderwayOnControl.Height;
-                    kvp.Key.X= _actionUnderwayOnControl.Location.X;
-                    kvp.Key.Y= _actionUnderwayOnControl.Location.Y;
+                    kvp.Key.X = _actionUnderwayOnControl.Location.X;
+                    kvp.Key.Y = _actionUnderwayOnControl.Location.Y;
                     kvp.Key.SaveToDatabase();
                 }
-            }
-                
         }
 
         _plannedAction = EditModeAction.Move;
@@ -122,7 +118,7 @@ private void control_MouseDown(object sender, MouseEventArgs e)
     private void control_MouseLeave(object sender, EventArgs e)
     {
         //if there is no action underway
-        if(_actionUnderway == EditModeAction.None)
+        if (_actionUnderway == EditModeAction.None)
         {
             //clear the proposed action
             Cursor.Current = Cursors.Default;
@@ -133,8 +129,7 @@ private void control_MouseLeave(object sender, EventArgs e)
 
     private void control_MouseMove(object sender, MouseEventArgs e)
     {
-
-        var s = (UserControl) sender;
+        var s = (UserControl)sender;
 
         var currentScreenCoordinate = s.PointToScreen(e.Location);
 
@@ -145,8 +140,8 @@ private void control_MouseMove(object sender, MouseEventArgs e)
         }
 
 
-        var layoutUIVisibleArea =  _layoutUI.GetVisibleArea();
-            
+        var layoutUIVisibleArea = _layoutUI.GetVisibleArea();
+
 
         if (_actionUnderway != EditModeAction.None)
         {
@@ -155,79 +150,74 @@ private void control_MouseMove(object sender, MouseEventArgs e)
                 currentScreenCoordinate.Y - lastKnownScreenCoordinate.Y);
 
             //move the control
-            if(_actionUnderway == EditModeAction.Move)
+            if (_actionUnderway == EditModeAction.Move)
             {
                 _actionUnderwayOnControl.Location
                     = new Point(
-                        Math.Max(0, Math.Min(layoutUIVisibleArea.Width - _actionUnderwayOnControl.Width, _actionUnderwayOnControl.Location.X + vector.X)),
-                        Math.Max(0, Math.Min(layoutUIVisibleArea.Height - _actionUnderwayOnControl.Height, _actionUnderwayOnControl.Location.Y + vector.Y))
+                        Math.Max(0,
+                            Math.Min(layoutUIVisibleArea.Width - _actionUnderwayOnControl.Width,
+                                _actionUnderwayOnControl.Location.X + vector.X)),
+                        Math.Max(0,
+                            Math.Min(layoutUIVisibleArea.Height - _actionUnderwayOnControl.Height,
+                                _actionUnderwayOnControl.Location.Y + vector.Y))
                     );
                 _actionUnderwayOnControl.Invalidate();
             }
-            else
-            if (_actionUnderway == EditModeAction.Resize)
+            else if (_actionUnderway == EditModeAction.Resize)
             {
-
                 _actionUnderwayOnControl.Size
                     = new Size(
-                            
                         //Do not resize below the minimum size
                         Math.Max(MinimumControlSize,
 
                             //do not allow resizing beyond the right of the control it is hosted in
-                            Math.Min(layoutUIVisibleArea.Width - _actionUnderwayOnControl.Location.X, 
+                            Math.Min(layoutUIVisibleArea.Width - _actionUnderwayOnControl.Location.X,
 
                                 //change width by the length of the vector X
                                 _actionUnderwayOnControl.Width + (int)vector.X))
-                            
                         ,
-                               
+
                         //Do not resize below the minimum size
                         Math.Max(MinimumControlSize,
 
                             //do not allow resizing beyond the bottom of the control it is hosted in
-                            Math.Min(layoutUIVisibleArea.Height - _actionUnderwayOnControl.Location.Y, 
-
+                            Math.Min(layoutUIVisibleArea.Height - _actionUnderwayOnControl.Location.Y,
                                 _actionUnderwayOnControl.Height + (int)vector.Y))
                     );
 
-                    
 
                 _actionUnderwayOnControl.Invalidate();
             }
         }
-            
+
         lastKnownScreenCoordinate = currentScreenCoordinate;
 
-        if(IsResizeLocation((UserControl)sender,e))
+        if (IsResizeLocation((UserControl)sender, e))
         {
             Cursor.Current = Cursors.SizeNWSE;
             _plannedAction = EditModeAction.Resize;
-            _plannedControl = (UserControl) sender;
+            _plannedControl = (UserControl)sender;
         }
         else
         {
-
             Cursor.Current = Cursors.SizeAll;
             _plannedAction = EditModeAction.Move;
-            _plannedControl = (UserControl) sender;
+            _plannedControl = (UserControl)sender;
         }
     }
-        
+
     /// <summary>
     /// Returns true if the cursor is within the bottom right 5 pixels of a control
     /// </summary>
     /// <param name="sender"></param>
     /// <param name="e"></param>
     /// <returns></returns>
-    private static bool IsResizeLocation(UserControl sender, MouseEventArgs e)
-    {
-        return e.X > sender.Width - 20 && e.Y > sender.Height - 20;
-    }
+    private static bool IsResizeLocation(UserControl sender, MouseEventArgs e) =>
+        e.X > sender.Width - 20 && e.Y > sender.Height - 20;
 
     private enum EditModeAction
     {
-        None=0,
+        None = 0,
         Move,
         Resize
     }
diff --git a/Rdmp.UI/DashboardTabs/DashboardLayoutUI.cs b/Rdmp.UI/DashboardTabs/DashboardLayoutUI.cs
index b6ab8d7753..83f036955e 100644
--- a/Rdmp.UI/DashboardTabs/DashboardLayoutUI.cs
+++ b/Rdmp.UI/DashboardTabs/DashboardLayoutUI.cs
@@ -33,7 +33,7 @@ public partial class DashboardLayoutUI : DashboardLayoutUI_Design
     private DashboardControlFactory _controlFactory;
     private readonly DashboardEditModeFunctionality _editModeFunctionality;
 
-    public Dictionary<DashboardControl,DashboardableControlHostPanel> ControlDictionary = new();
+    public Dictionary<DashboardControl, DashboardableControlHostPanel> ControlDictionary = new();
 
     public DashboardLayoutUI()
     {
@@ -52,8 +52,9 @@ public override void SetDatabaseObject(IActivateItems activator, DashboardLayout
     {
         base.SetDatabaseObject(activator, databaseObject);
 
-        _controlFactory = new DashboardControlFactory(activator,new Point(5,25));
-        btnAddDashboardControl.Image = activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add).ImageToBitmap();
+        _controlFactory = new DashboardControlFactory(activator, new Point(5, 25));
+        btnAddDashboardControl.Image = activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph, OverlayKind.Add)
+            .ImageToBitmap();
         _layout = databaseObject;
         ReLayout();
 
@@ -68,7 +69,7 @@ private void ReLayout()
 
         //restart audit of controls
         ControlDictionary.Clear();
-            
+
         tbDashboardName.Text = _layout.Name;
         cbxAvailableControls.Items.Clear();
         cbxAvailableControls.Items.AddRange(_controlFactory.GetAvailableControlTypes());
@@ -83,8 +84,9 @@ private void ReLayout()
             }
             catch (DashboardControlHydrationException e)
             {
-                if(Activator.YesNo(
-                       $"Error Hydrating Control '{c}', Do you want to delete the control? (No will attempt to clear the control state but leave it on the Dashboard).  Exception was:{Environment.NewLine}{e.Message}","Delete Broken Control?"))
+                if (Activator.YesNo(
+                        $"Error Hydrating Control '{c}', Do you want to delete the control? (No will attempt to clear the control state but leave it on the Dashboard).  Exception was:{Environment.NewLine}{e.Message}",
+                        "Delete Broken Control?"))
                 {
                     c.DeleteInDatabase();
                     continue;
@@ -96,7 +98,7 @@ private void ReLayout()
                 instance = _controlFactory.Create(c);
             }
 
-            ControlDictionary.Add(c,instance);
+            ControlDictionary.Add(c, instance);
             Controls.Add(instance);
 
             //let people know what the edit state is
@@ -122,27 +124,25 @@ private void tbDashboardName_LostFocus(object sender, EventArgs e)
         _layout.SaveToDatabase();
 
         Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_layout));
-            
     }
 
     private void btnAddDashboardControl_Click(object sender, EventArgs e)
     {
-        if(cbxAvailableControls.SelectedItem is not Type type)
+        if (cbxAvailableControls.SelectedItem is not Type type)
             return;
 
         var db = _controlFactory.Create(_layout, type, out var control);
         Controls.Add(control);
-        ControlDictionary.Add(db,control);
+        ControlDictionary.Add(db, control);
         Controls.Add(control);
         control.BringToFront();
-            
+
         //add the new control and tell it with the initial edit state is (also updates all the other controls)
         _editModeFunctionality.EditMode = btnEditMode.Checked;
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<DashboardLayoutUI_Design, UserControl>))]
-public abstract class DashboardLayoutUI_Design:RDMPSingleDatabaseObjectControl<DashboardLayout>
+public abstract class DashboardLayoutUI_Design : RDMPSingleDatabaseObjectControl<DashboardLayout>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs b/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs
index 42122d639d..50ba991d78 100644
--- a/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs
+++ b/Rdmp.UI/DashboardTabs/DashboardableControlHostPanel.cs
@@ -29,22 +29,23 @@ public partial class DashboardableControlHostPanel : RDMPUserControl
 
     private const float BorderWidth = 5;
 
-    public DashboardableControlHostPanel(IActivateItems activator, DashboardControl databaseRecord, IDashboardableControl hostedControl)
+    public DashboardableControlHostPanel(IActivateItems activator, DashboardControl databaseRecord,
+        IDashboardableControl hostedControl)
     {
         SetItemActivator(activator);
 
         _databaseRecord = databaseRecord;
         HostedControl = hostedControl;
         InitializeComponent();
-            
+
         pbDelete.Image = FamFamFamIcons.delete.ImageToBitmap();
 
         Margin = Padding.Empty;
 
         pbDelete.Visible = false;
-            
+
         Controls.Add((Control)HostedControl);
-            
+
         AdjustControlLocation();
     }
 
@@ -55,21 +56,19 @@ private void AdjustControlLocation()
         //center it on us with a gap of BorderWidth
         if (_editMode)
         {
-
-            control.Location = new Point((int) BorderWidth, (int) BorderWidth);
-            control.Width = (int) (Width - BorderWidth*2);
-            control.Height = (int) (Height - BorderWidth*2);
+            control.Location = new Point((int)BorderWidth, (int)BorderWidth);
+            control.Width = (int)(Width - BorderWidth * 2);
+            control.Height = (int)(Height - BorderWidth * 2);
         }
         else
         {
-            control.Location = new Point(0,0);
+            control.Location = new Point(0, 0);
             control.Width = Width;
             control.Height = Height;
         }
 
         //anchor to all
         control.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom;
-
     }
 
     protected override void OnPaint(PaintEventArgs e)
@@ -79,7 +78,7 @@ protected override void OnPaint(PaintEventArgs e)
         if (_editMode)
             e.Graphics.FillRectangle(Brushes.Black, 0, 0, Width, Height);
     }
-        
+
     public void NotifyEditModeChange(bool isEditModeOn)
     {
         _editMode = isEditModeOn;
@@ -87,8 +86,8 @@ public void NotifyEditModeChange(bool isEditModeOn)
         HostedControl.NotifyEditModeChange(isEditModeOn);
 
         pbDelete.Visible = isEditModeOn;
-            
-        if(isEditModeOn)
+
+        if (isEditModeOn)
             pbDelete.BringToFront();
 
         Invalidate();
@@ -97,11 +96,11 @@ public void NotifyEditModeChange(bool isEditModeOn)
 
     private void pbDelete_Click(object sender, EventArgs e)
     {
-        if(_editMode)
+        if (_editMode)
         {
             var layout = _databaseRecord.ParentLayout;
             Activator.DeleteWithConfirmation(_databaseRecord);
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(layout));
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(layout));
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUI.cs b/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUI.cs
index 85840e5a1d..b91a187f78 100644
--- a/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/ColumnInfoToANOTableConverterUI.cs
@@ -63,14 +63,14 @@ public partial class ColumnInfoToANOTableConverterUI : ColumnInfoToANOTableConve
 {
     private ColumnInfo _columnInfo;
     private bool _yesToAll = false;
-        
+
     public ColumnInfo ColumnInfo
     {
         get => _columnInfo;
         private set
         {
             _columnInfo = value;
-                
+
             lblName.Text = value.ToString();
             lblDataType.Text = value.Data_type;
         }
@@ -82,7 +82,7 @@ private ANOTable ANOTable
         set
         {
             _anoTable = value;
-                
+
             if (value == null)
                 return;
 
@@ -110,13 +110,13 @@ public ColumnInfoToANOTableConverterUI()
 
     public override void SetDatabaseObject(IActivateItems activator, ColumnInfo databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         ColumnInfo = databaseObject;
 
         //make sure we can connect to the server
-        if(!ColumnInfo.TableInfo.DiscoverExistence(DataAccessContext.DataLoad,out var reason))
+        if (!ColumnInfo.TableInfo.DiscoverExistence(DataAccessContext.DataLoad, out var reason))
         {
-            activator.KillForm(ParentForm,reason);
+            activator.KillForm(ParentForm, reason);
             return;
         }
 
@@ -131,28 +131,30 @@ public override void SetDatabaseObject(IActivateItems activator, ColumnInfo data
             {
                 checksUI1.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"Could not get rowcount of table {ColumnInfo.TableInfo.GetRuntimeName()} using data access context DataLoad", CheckResult.Fail, e));
+                        $"Could not get rowcount of table {ColumnInfo.TableInfo.GetRuntimeName()} using data access context DataLoad",
+                        CheckResult.Fail, e));
             }
 
 
             GeneratePreviews();
-                
+
             RefreshServers();
         }
         catch (Exception e)
         {
-            activator.KillForm(ParentForm,e);
+            activator.KillForm(ParentForm, e);
         }
     }
-        
+
     private void RefreshServers()
     {
         if (ColumnInfo == null)
             return;
-            
+
         ddExternalDatabaseServer.Items.Clear();
-            
-        ddExternalDatabaseServer.Items.AddRange(Activator.RepositoryLocator.CatalogueRepository.GetAllDatabases<ANOStorePatcher>());
+
+        ddExternalDatabaseServer.Items.AddRange(Activator.RepositoryLocator.CatalogueRepository
+            .GetAllDatabases<ANOStorePatcher>());
 
         var defaultServer = Activator.ServerDefaults.GetDefaultFor(PermissableDefaults.ANOStore);
 
@@ -168,7 +170,7 @@ private void RefreshServers()
     private void numericUpDown1_ValueChanged(object sender, EventArgs e)
     {
         ANOTable.NumberOfIntegersToUseInAnonymousRepresentation = Convert.ToInt32(numericUpDown1.Value);
-            
+
         GeneratePreviews();
     }
 
@@ -184,7 +186,7 @@ private void numericUpDown2_ValueChanged(object sender, EventArgs e)
 
     private void GeneratePreviews()
     {
-        if(preview == null)
+        if (preview == null)
         {
             preview = new DataTable();
             preview.Columns.Add(_columnInfo.GetRuntimeName(LoadStage.PostLoad));
@@ -192,13 +194,13 @@ private void GeneratePreviews()
 
             var server = DataAccessPortal.ExpectServer(ColumnInfo.TableInfo, DataAccessContext.DataLoad);
 
-            using(var con = server.GetConnection())
+            using (var con = server.GetConnection())
             {
                 con.Open();
 
                 lblPreviewDataIsFictional.Visible = false;
 
-                var qb = new QueryBuilder(null, null, new[] {ColumnInfo.TableInfo});
+                var qb = new QueryBuilder(null, null, new[] { ColumnInfo.TableInfo });
                 qb.AddColumn(new ColumnInfoToIColumn(new MemoryRepository(), _columnInfo));
                 qb.TopX = 10;
 
@@ -211,25 +213,24 @@ private void GeneratePreviews()
                     {
                         while (r.Read())
                         {
-                            preview.Rows.Add(r[_columnInfo.GetRuntimeName(LoadStage.PostLoad)],DBNull.Value);
+                            preview.Rows.Add(r[_columnInfo.GetRuntimeName(LoadStage.PostLoad)], DBNull.Value);
                             rowsRead = true;
                         }
                     }
                 }
-                    
-                if(!rowsRead)
+
+                if (!rowsRead)
                 {
                     lblPreviewDataIsFictional.Visible = true;
-                    if(_columnInfo.GetRuntimeDataType(LoadStage.AdjustRaw).ToLower().Contains("char"))
+                    if (_columnInfo.GetRuntimeDataType(LoadStage.AdjustRaw).ToLower().Contains("char"))
                     {
                         preview.Rows.Add("?", DBNull.Value);
                         preview.Rows.Add("?", DBNull.Value);
                         preview.Rows.Add("?", DBNull.Value);
                         preview.Rows.Add("?", DBNull.Value);
                     }
-                    else if(_columnInfo.GetRuntimeDataType(LoadStage.AdjustRaw).ToLower().Contains("date"))
+                    else if (_columnInfo.GetRuntimeDataType(LoadStage.AdjustRaw).ToLower().Contains("date"))
                     {
-
                         preview.Rows.Add("1977-08-16", DBNull.Value);
                         preview.Rows.Add("1977-08-16", DBNull.Value);
                         preview.Rows.Add("1977-08-16", DBNull.Value);
@@ -242,7 +243,6 @@ private void GeneratePreviews()
                         preview.Rows.Add("-1", DBNull.Value);
                         preview.Rows.Add("-1", DBNull.Value);
                     }
-                    
                 }
 
                 con.Close();
@@ -250,24 +250,22 @@ private void GeneratePreviews()
         }
 
         if (ANOTable != null)
-        {
             try
             {
-                if (preview.Rows.Count!=0)
+                if (preview.Rows.Count != 0)
                 {
                     checksUI1.Clear();
-                    var transformer = new ANOTransformer(ANOTable,new FromCheckNotifierToDataLoadEventListener(checksUI1));
-                    transformer.Transform(preview, preview.Columns[0],preview.Columns[1],true);
+                    var transformer =
+                        new ANOTransformer(ANOTable, new FromCheckNotifierToDataLoadEventListener(checksUI1));
+                    transformer.Transform(preview, preview.Columns[0], preview.Columns[1], true);
                 }
             }
             catch (Exception e)
             {
                 checksUI1.OnCheckPerformed(new CheckEventArgs(e.Message, CheckResult.Fail, e));
             }
-        }
-            
-        dgPreview.DataSource = preview;
 
+        dgPreview.DataSource = preview;
     }
 
     private void btnCreateNewANOTable_Click(object sender, EventArgs e)
@@ -276,19 +274,20 @@ private void btnCreateNewANOTable_Click(object sender, EventArgs e)
         {
             var server = ddExternalDatabaseServer.SelectedItem as ExternalDatabaseServer;
 
-            var a = new ANOTable(Activator.RepositoryLocator.CatalogueRepository, server, tbANOTableName.Text, tbSuffix.Text);
+            var a = new ANOTable(Activator.RepositoryLocator.CatalogueRepository, server, tbANOTableName.Text,
+                tbSuffix.Text);
 
             //if we know the type is e.g. varchar(5)
             var length = ColumnInfo.Discover(DataAccessContext.InternalDataProcessing).DataType.GetLengthIfString();
 
-            if (length>0)
+            if (length > 0)
             {
                 a.NumberOfIntegersToUseInAnonymousRepresentation = 0;
-                a.NumberOfCharactersToUseInAnonymousRepresentation = length;//give it a sensible maximal that will work
+                a.NumberOfCharactersToUseInAnonymousRepresentation = length; //give it a sensible maximal that will work
                 a.SaveToDatabase();
             }
 
-            ANOTable = a;//and set the property to it to populate the rest of the form
+            ANOTable = a; //and set the property to it to populate the rest of the form
 
             gbANOTable.Enabled = true;
             gbSelectExistingANOTable.Enabled = false;
@@ -302,22 +301,23 @@ private void btnCreateNewANOTable_Click(object sender, EventArgs e)
 
     private void ddExternalDatabaseServer_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(ddExternalDatabaseServer.SelectedItem is not ExternalDatabaseServer server)
+        if (ddExternalDatabaseServer.SelectedItem is not ExternalDatabaseServer server)
             return;
 
-        ANOTransformer.ConfirmDependencies(DataAccessPortal.ExpectDatabase(server, DataAccessContext.DataLoad), checksUI1);
+        ANOTransformer.ConfirmDependencies(DataAccessPortal.ExpectDatabase(server, DataAccessContext.DataLoad),
+            checksUI1);
     }
 
     private void ddANOTables_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(ddANOTables.SelectedItem == null)
+        if (ddANOTables.SelectedItem == null)
             return;
 
         //get ANOTable input datatype
         var anoTable = (ANOTable)ddANOTables.SelectedItem;
-            
+
         //if table is already on the ANO server
-        if(anoTable.IsTablePushed())
+        if (anoTable.IsTablePushed())
         {
             var anoDatatype = anoTable.GetRuntimeDataType(LoadStage.AdjustRaw);
             var colDatatype = _columnInfo.GetRuntimeDataType(LoadStage.PostLoad);
@@ -326,7 +326,8 @@ private void ddANOTables_SelectedIndexChanged(object sender, EventArgs e)
             {
                 checksUI1.OnCheckPerformed(
                     new CheckEventArgs(
-                        $"ANOTable  {anoTable} cannot be used because its input datatype is {anoDatatype} but the data in {_columnInfo} is of datatype {colDatatype}", CheckResult.Fail));
+                        $"ANOTable  {anoTable} cannot be used because its input datatype is {anoDatatype} but the data in {_columnInfo} is of datatype {colDatatype}",
+                        CheckResult.Fail));
                 ddANOTables.SelectedItem = null;
                 return;
             }
@@ -340,13 +341,14 @@ private void ddANOTables_SelectedIndexChanged(object sender, EventArgs e)
         gbCreateNewANOTable.Enabled = false;
     }
 
-     
+
     private void btnFinalise_Click(object sender, EventArgs e)
     {
         //if it is not pushed, push it now
         if (!ANOTable.IsTablePushed())
         {
-            ANOTable.PushToANOServerAsNewTable(_columnInfo.Data_type, new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
+            ANOTable.PushToANOServerAsNewTable(_columnInfo.Data_type,
+                new ThrowImmediatelyCheckNotifier { ThrowOnWarning = true });
             ANOTable.SaveToDatabase();
         }
 
@@ -368,7 +370,9 @@ private void btnFinalise_Click(object sender, EventArgs e)
         }
         catch (Exception exception)
         {
-            checksUI1.OnCheckPerformed(new CheckEventArgs("Failed to complete migration, your table is likely to be in a sorry state now - sorry", CheckResult.Fail, exception));
+            checksUI1.OnCheckPerformed(new CheckEventArgs(
+                "Failed to complete migration, your table is likely to be in a sorry state now - sorry",
+                CheckResult.Fail, exception));
         }
 
         //it worked (or didn't!) so notify changes to the TableInfo
@@ -394,7 +398,6 @@ private bool UserAcceptSql(string sql)
 
     private void tbANOTableName_TextChanged(object sender, EventArgs e)
     {
-            
         //don't enable the button unless he has typed something
         if (string.IsNullOrWhiteSpace(tbANOTableName.Text))
         {
@@ -440,13 +443,11 @@ private void tbSuffix_TextChanged(object sender, EventArgs e)
         }
     }
 
-    public override string GetTabName()
-    {
-        return $"Convert {base.GetTabName()} to ANOColumnInfo";
-    }
+    public override string GetTabName() => $"Convert {base.GetTabName()} to ANOColumnInfo";
 }
 
-[TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ColumnInfoToANOTableConverterUI_Design, UserControl>))]
+[TypeDescriptionProvider(
+    typeof(AbstractControlDescriptionProvider<ColumnInfoToANOTableConverterUI_Design, UserControl>))]
 public abstract class ColumnInfoToANOTableConverterUI_Design : RDMPSingleDatabaseObjectControl<ColumnInfo>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/PatternPredictor.cs b/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/PatternPredictor.cs
index dff885295b..c0d40d4600 100644
--- a/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/PatternPredictor.cs
+++ b/Rdmp.UI/DataLoadUIs/ANOUIs/ANOTableManagement/PatternPredictor.cs
@@ -14,6 +14,7 @@ internal class PatternPredictor
     private readonly ColumnInfo _columnInfo;
 
     #region horrible SQL code
+
     private const string SqlToCountLetters =
         @"
 SELECT  MAX(LEN(thing)), MAX(
@@ -125,6 +126,7 @@ SELECT  MAX(LEN(thing)), MAX(
 , 'z', '')))
 FROM 
 (select top 1000 FIELDTOEVALUATE as thing from TABLETOEVALUATE  order by newID()) bob";
+
     #endregion
 
     private TableInfo _parent;
@@ -137,10 +139,9 @@ public PatternPredictor(ColumnInfo columnInfo)
 
     public string GetPattern(int timeoutInMilliseconds)
     {
-
         var server = DataAccessPortal.ExpectServer(_parent, DataAccessContext.InternalDataProcessing);
 
-        using(var con = server.GetConnection())
+        using (var con = server.GetConnection())
         {
             con.Open();
 
diff --git a/Rdmp.UI/DataLoadUIs/ANOUIs/PreLoadDiscarding/PreLoadDiscardedColumnUI.cs b/Rdmp.UI/DataLoadUIs/ANOUIs/PreLoadDiscarding/PreLoadDiscardedColumnUI.cs
index 6e47f45745..77d86b01b7 100644
--- a/Rdmp.UI/DataLoadUIs/ANOUIs/PreLoadDiscarding/PreLoadDiscardedColumnUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ANOUIs/PreLoadDiscarding/PreLoadDiscardedColumnUI.cs
@@ -56,14 +56,14 @@ public partial class PreLoadDiscardedColumnUI : PreLoadDiscardedColumnUI_Design,
     public PreLoadDiscardedColumnUI()
     {
         InitializeComponent();
-        ddDestination.DataSource = Enum.GetValues(typeof (DiscardedColumnDestination));
+        ddDestination.DataSource = Enum.GetValues(typeof(DiscardedColumnDestination));
         AssociatedCollection = RDMPCollection.Tables;
     }
 
     public override void SetDatabaseObject(IActivateItems activator, PreLoadDiscardedColumn databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
-            
+
         CommonFunctionality.AddChecks(databaseObject);
         CommonFunctionality.StartChecking();
         CommonFunctionality.AddToMenu(new SetDumpServerMenuItem(Activator, databaseObject.TableInfo));
@@ -73,15 +73,14 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, PreLoa
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text", "ID",p=>p.ID);
-        Bind(tbRuntimeColumnName,"Text","RuntimeColumnName",p=>p.RuntimeColumnName);
-        Bind(tbSqlDataType,"Text","SqlDataType", p=>p.SqlDataType);
-        Bind(ddDestination,"SelectedItem", "Destination",p=>p.Destination);
+        Bind(tbID, "Text", "ID", p => p.ID);
+        Bind(tbRuntimeColumnName, "Text", "RuntimeColumnName", p => p.RuntimeColumnName);
+        Bind(tbSqlDataType, "Text", "SqlDataType", p => p.SqlDataType);
+        Bind(ddDestination, "SelectedItem", "Destination", p => p.Destination);
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<PreLoadDiscardedColumnUI_Design, UserControl>))]
 public abstract class PreLoadDiscardedColumnUI_Design : RDMPSingleDatabaseObjectControl<PreLoadDiscardedColumn>
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/CreateNewLoadMetadataUI.cs b/Rdmp.UI/DataLoadUIs/CreateNewLoadMetadataUI.cs
index 62d3fc7810..d71fc73985 100644
--- a/Rdmp.UI/DataLoadUIs/CreateNewLoadMetadataUI.cs
+++ b/Rdmp.UI/DataLoadUIs/CreateNewLoadMetadataUI.cs
@@ -26,11 +26,11 @@ public partial class CreateNewLoadMetadataUI : RDMPForm
     private readonly Catalogue _catalogue;
     public LoadMetadata LoadMetadataCreatedIfAny { get; set; }
 
-    public CreateNewLoadMetadataUI(Catalogue catalogue, IActivateItems activator):base(activator)
+    public CreateNewLoadMetadataUI(Catalogue catalogue, IActivateItems activator) : base(activator)
     {
         _catalogue = catalogue;
         InitializeComponent();
-            
+
         chooseLoggingTaskUI1.SetItemActivator(activator);
         chooseLoggingTaskUI1.Catalogue = catalogue;
     }
@@ -42,14 +42,15 @@ private void tbLoadMetadataNameToCreate_TextChanged(object sender, EventArgs e)
 
     private void btnCreate_Click(object sender, EventArgs e)
     {
-        if(string.IsNullOrWhiteSpace(_catalogue.LoggingDataTask))
+        if (string.IsNullOrWhiteSpace(_catalogue.LoggingDataTask))
         {
             MessageBox.Show("You must configure a logging task first");
             return;
         }
 
-        LoadMetadataCreatedIfAny = new LoadMetadata(Activator.RepositoryLocator.CatalogueRepository, tbLoadMetadataNameToCreate.Text);
-            
+        LoadMetadataCreatedIfAny = new LoadMetadata(Activator.RepositoryLocator.CatalogueRepository,
+            tbLoadMetadataNameToCreate.Text);
+
         DialogResult = DialogResult.OK;
         Close();
     }
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.cs
index f400571c8f..1f86e9b3f4 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ChooseLoadFolderUI.cs
@@ -40,14 +40,15 @@ public partial class ChooseLoadDirectoryUI : RDMPForm
     public ChooseLoadDirectoryUI(IActivateItems activator, ILoadMetadata loadMetadata)
     {
         InitializeComponent();
-            
+
         SetItemActivator(activator);
 
-        var help = loadMetadata.CatalogueRepository.CommentStore.GetDocumentationIfExists("ILoadMetadata.LocationOfFlatFiles",false,true);
-            
-        helpIcon1.SetHelpText("Location Of Flat Files",help);
+        var help = loadMetadata.CatalogueRepository.CommentStore.GetDocumentationIfExists(
+            "ILoadMetadata.LocationOfFlatFiles", false, true);
+
+        helpIcon1.SetHelpText("Location Of Flat Files", help);
 
-        if(!string.IsNullOrWhiteSpace(loadMetadata.LocationOfFlatFiles))
+        if (!string.IsNullOrWhiteSpace(loadMetadata.LocationOfFlatFiles))
         {
             tbUseExisting.Text = loadMetadata.LocationOfFlatFiles;
             CheckExistingProjectDirectory();
@@ -59,7 +60,6 @@ private void rb_CheckedChanged(object sender, EventArgs e)
         tbCreateNew.Enabled = rbCreateNew.Checked;
         tbUseExisting.Enabled = rbUseExisting.Checked;
         btnOk.Enabled = true;
-
     }
 
     private void tbUseExisting_Leave(object sender, EventArgs e)
@@ -85,15 +85,14 @@ private void CheckExistingProjectDirectory()
     private void btnOk_Click(object sender, EventArgs e)
     {
         if (rbCreateNew.Checked)
-        {
             try
             {
                 var dir = new DirectoryInfo(tbCreateNew.Text);
 
-                if(!dir.Exists)
+                if (!dir.Exists)
                     dir.Create();
 
-                Result = LoadDirectory.CreateDirectoryStructure(dir.Parent,dir.Name).RootPath.FullName;
+                Result = LoadDirectory.CreateDirectoryStructure(dir.Parent, dir.Name).RootPath.FullName;
 
                 DialogResult = DialogResult.OK;
                 Close();
@@ -102,10 +101,8 @@ private void btnOk_Click(object sender, EventArgs e)
             {
                 ExceptionViewer.Show(exception);
             }
-        }
 
         if (rbUseExisting.Checked)
-        {
             try
             {
                 var dir = new LoadDirectory(tbUseExisting.Text);
@@ -115,14 +112,13 @@ private void btnOk_Click(object sender, EventArgs e)
             }
             catch (Exception exception)
             {
-                if(Activator.YesNo($"Path is invalid, use anyway? ({exception.Message})","Invalid Path"))
+                if (Activator.YesNo($"Path is invalid, use anyway? ({exception.Message})", "Invalid Path"))
                 {
                     Result = tbUseExisting.Text;
                     DialogResult = DialogResult.OK;
                     Close();
                 }
             }
-        }
     }
 
     private void btnCancel_Click(object sender, EventArgs e)
@@ -134,7 +130,7 @@ private void btnCancel_Click(object sender, EventArgs e)
     private void btnCreateNewBrowse_Click(object sender, EventArgs e)
     {
         var fbd = new FolderBrowserDialog();
-            
+
         if (fbd.ShowDialog() == DialogResult.OK)
             tbCreateNew.Text = fbd.SelectedPath;
     }
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramColumnNode.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramColumnNode.cs
index 14fb63a8de..b4ad1e07bf 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramColumnNode.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramColumnNode.cs
@@ -24,7 +24,7 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadDiagram;
 /// Depicts a column in a given DLE <see cref="LoadBubble"/>.  Given the Create/Destroy nature of load stages this
 /// node may or may not map to an existing column in the database.
 /// </summary>
-public class LoadDiagramColumnNode : Node,ICombineableSource, IHasLoadDiagramState, IKnowWhatIAm
+public class LoadDiagramColumnNode : Node, ICombineableSource, IHasLoadDiagramState, IKnowWhatIAm
 {
     private readonly LoadDiagramTableNode _tableNode;
     private readonly IHasStageSpecificRuntimeName _column;
@@ -35,7 +35,7 @@ public class LoadDiagramColumnNode : Node,ICombineableSource, IHasLoadDiagramSta
 
     public LoadDiagramState State { get; set; }
 
-    public LoadDiagramColumnNode(LoadDiagramTableNode tableNode,IHasStageSpecificRuntimeName column,LoadBubble bubble)
+    public LoadDiagramColumnNode(LoadDiagramTableNode tableNode, IHasStageSpecificRuntimeName column, LoadBubble bubble)
     {
         _tableNode = tableNode;
         _column = column;
@@ -44,8 +44,7 @@ public LoadDiagramColumnNode(LoadDiagramTableNode tableNode,IHasStageSpecificRun
 
         if (_column is PreLoadDiscardedColumn preLoadDiscarded)
             _expectedDataType = preLoadDiscarded.SqlDataType;
-        else
-        if (_column is ColumnInfo colInfo)
+        else if (_column is ColumnInfo colInfo)
             _expectedDataType = colInfo.GetRuntimeDataType(_bubble.ToLoadStage());
         else
             throw new Exception(
@@ -65,27 +64,20 @@ public bool IsDynamicColumn
         }
     }
 
-    public override string ToString()
-    {
-        return ColumnName;
-    }
+    public override string ToString() => ColumnName;
 
-    public string GetDataType()
-    {
-        return State == LoadDiagramState.Different ? _discoveredDataType : _expectedDataType;
-    }
+    public string GetDataType() => State == LoadDiagramState.Different ? _discoveredDataType : _expectedDataType;
 
     public ICombineToMakeCommand GetCombineable()
     {
-
         var querySyntaxHelper = _tableNode.TableInfo.GetQuerySyntaxHelper();
 
-        return new SqlTextOnlyCombineable(querySyntaxHelper.EnsureFullyQualified(_tableNode.DatabaseName,null, _tableNode.TableName, ColumnName));
+        return new SqlTextOnlyCombineable(querySyntaxHelper.EnsureFullyQualified(_tableNode.DatabaseName, null,
+            _tableNode.TableName, ColumnName));
     }
 
     public Bitmap GetImage(ICoreIconProvider coreIconProvider)
     {
-
         //if its a ColumnInfo and RAW then use the basic ColumnInfo icon
         if (_column is ColumnInfo && _bubble <= LoadBubble.Raw)
             return coreIconProvider.GetImage(RDMPConcept.ColumnInfo).ImageToBitmap();
@@ -101,23 +93,20 @@ public void SetState(DiscoveredColumn discoveredColumn)
     }
 
     #region equality
-    protected bool Equals(LoadDiagramColumnNode other)
-    {
-        return _bubble == other._bubble && Equals(_tableNode, other._tableNode) && string.Equals(ColumnName, other.ColumnName);
-    }
+
+    protected bool Equals(LoadDiagramColumnNode other) => _bubble == other._bubble &&
+                                                          Equals(_tableNode, other._tableNode) &&
+                                                          string.Equals(ColumnName, other.ColumnName);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadDiagramColumnNode) obj);
+        return Equals((LoadDiagramColumnNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(_bubble, _tableNode, ColumnName);
-    }
+    public override int GetHashCode() => HashCode.Combine(_bubble, _tableNode, ColumnName);
 
     public string WhatIsThis()
     {
@@ -135,13 +124,14 @@ public string WhatIsThis()
                     _ => "A Column that is involved in the load (based on the Catalogues associated with the load)"
                 };
             case LoadDiagramState.NotFound:
-                return "A Column that was expected to exist in the given load stage but didn't.  This is probably because no load is currently underway/crashed.";
+                return
+                    "A Column that was expected to exist in the given load stage but didn't.  This is probably because no load is currently underway/crashed.";
             case LoadDiagramState.New:
-                return "A Column that was NOT expected to exist in the given load stage but did.  This may be a working table created by load scripts or a table that is part of another ongoing/crashed load";
+                return
+                    "A Column that was NOT expected to exist in the given load stage but did.  This may be a working table created by load scripts or a table that is part of another ongoing/crashed load";
             default:
                 throw new ArgumentOutOfRangeException();
         }
-        
     }
 
     #endregion
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramDatabaseNode.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramDatabaseNode.cs
index 709c8e0362..0ce5063f6a 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramDatabaseNode.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramDatabaseNode.cs
@@ -22,7 +22,7 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadDiagram;
 /// Depicts a database in a given DLE <see cref="LoadBubble"/>.  Given the Create/Destroy nature of load stages this
 /// database may or may not map to an existing database.
 /// </summary>
-public class LoadDiagramDatabaseNode : Node,IHasLoadDiagramState, IKnowWhatIAm
+public class LoadDiagramDatabaseNode : Node, IHasLoadDiagramState, IKnowWhatIAm
 {
     private readonly LoadBubble _bubble;
     public readonly DiscoveredDatabase Database;
@@ -37,7 +37,8 @@ public class LoadDiagramDatabaseNode : Node,IHasLoadDiagramState, IKnowWhatIAm
     public List<UnplannedTable> _unplannedChildren = new();
 
 
-    public LoadDiagramDatabaseNode(LoadBubble bubble, DiscoveredDatabase database, TableInfo[] loadTables, HICDatabaseConfiguration config)
+    public LoadDiagramDatabaseNode(LoadBubble bubble, DiscoveredDatabase database, TableInfo[] loadTables,
+        HICDatabaseConfiguration config)
     {
         _bubble = bubble;
         Database = database;
@@ -49,20 +50,11 @@ public LoadDiagramDatabaseNode(LoadBubble bubble, DiscoveredDatabase database, T
         _anticipatedChildren.AddRange(_loadTables.Select(t => new LoadDiagramTableNode(this, t, _bubble, _config)));
     }
 
-    public IEnumerable<object> GetChildren()
-    {
-        return _anticipatedChildren.Cast<object>().Union(_unplannedChildren);
-    }
+    public IEnumerable<object> GetChildren() => _anticipatedChildren.Cast<object>().Union(_unplannedChildren);
 
-    public override string ToString()
-    {
-        return DatabaseName;
-    }
+    public override string ToString() => DatabaseName;
 
-    public Bitmap GetImage(ICoreIconProvider coreIconProvider)
-    {
-        return coreIconProvider.GetImage(_bubble).ImageToBitmap();
-    }
+    public Bitmap GetImage(ICoreIconProvider coreIconProvider) => coreIconProvider.GetImage(_bubble).ImageToBitmap();
 
     public void DiscoverState()
     {
@@ -85,11 +77,13 @@ public void DiscoverState()
             plannedChild.DiscoverState();
 
         //also discover any unplanned tables if not live
-        if(_bubble != LoadBubble.Live)
+        if (_bubble != LoadBubble.Live)
             foreach (var discoveredTable in Database.DiscoverTables(true))
             {
                 //it's an anticipated one
-                if(_anticipatedChildren.Any(c=>c.TableName.Equals(discoveredTable.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase)))
+                if (_anticipatedChildren.Any(c =>
+                        c.TableName.Equals(discoveredTable.GetRuntimeName(),
+                            StringComparison.CurrentCultureIgnoreCase)))
                     continue;
 
                 //it's unplanned (maybe user created it as part of his load script or something)
@@ -98,24 +92,23 @@ public void DiscoverState()
     }
 
     #region equality
-    protected bool Equals(LoadDiagramDatabaseNode other)
-    {
-        return string.Equals(DatabaseName, other.DatabaseName) && _bubble == other._bubble;
-    }
+
+    protected bool Equals(LoadDiagramDatabaseNode other) =>
+        string.Equals(DatabaseName, other.DatabaseName) && _bubble == other._bubble;
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadDiagramDatabaseNode) obj);
+        return Equals((LoadDiagramDatabaseNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return ((DatabaseName != null ? DatabaseName.GetHashCode() : 0)*397) ^ (int) _bubble;
+            return ((DatabaseName != null ? DatabaseName.GetHashCode() : 0) * 397) ^ (int)_bubble;
         }
     }
 
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramServerNode.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramServerNode.cs
index eb86046377..a35265b5d4 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramServerNode.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramServerNode.cs
@@ -19,7 +19,7 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadDiagram;
 /// <summary>
 /// Depicts a server in a given DLE <see cref="LoadBubble"/> (e.g. the RAW server or the STAGING/LIVE server).
 /// </summary>
-public class LoadDiagramServerNode:TableInfoServerNode,IKnowWhatIAm, IOrderable
+public class LoadDiagramServerNode : TableInfoServerNode, IKnowWhatIAm, IOrderable
 {
     private readonly LoadBubble _bubble;
     private readonly DiscoveredDatabase _database;
@@ -33,10 +33,10 @@ public class LoadDiagramServerNode:TableInfoServerNode,IKnowWhatIAm, IOrderable
 
     public readonly List<LoadDiagramDatabaseNode> Children = new();
 
-    public LoadDiagramServerNode(LoadBubble bubble, DiscoveredDatabase database, TableInfo[] loadTables, HICDatabaseConfiguration config)
-        :base(database.Server.Name,database.Server.DatabaseType, loadTables)
+    public LoadDiagramServerNode(LoadBubble bubble, DiscoveredDatabase database, TableInfo[] loadTables,
+        HICDatabaseConfiguration config)
+        : base(database.Server.Name, database.Server.DatabaseType, loadTables)
     {
-
         _bubble = bubble;
         _database = database;
         _loadTables = loadTables;
@@ -67,50 +67,44 @@ public LoadDiagramServerNode(LoadBubble bubble, DiscoveredDatabase database, Tab
             _liveDatabaseDictionary = new Dictionary<DiscoveredDatabase, TableInfo[]>();
 
             foreach (var dbname in databases)
-                _liveDatabaseDictionary.Add(_database.Server.ExpectDatabase(dbname),_loadTables.Where(t => t.GetDatabaseRuntimeName().Equals(dbname,StringComparison.CurrentCultureIgnoreCase)).ToArray());
+                _liveDatabaseDictionary.Add(_database.Server.ExpectDatabase(dbname),
+                    _loadTables.Where(t =>
+                            t.GetDatabaseRuntimeName().Equals(dbname, StringComparison.CurrentCultureIgnoreCase))
+                        .ToArray());
         }
 
         //if it is live yield all the lookups
-        if(_bubble == LoadBubble.Live)
+        if (_bubble == LoadBubble.Live)
             foreach (var kvp in _liveDatabaseDictionary)
-                Children.Add(new LoadDiagramDatabaseNode(_bubble,kvp.Key,kvp.Value,_config));
+                Children.Add(new LoadDiagramDatabaseNode(_bubble, kvp.Key, kvp.Value, _config));
         else
-            Children.Add(new LoadDiagramDatabaseNode(_bubble,_database,_loadTables,_config));
+            Children.Add(new LoadDiagramDatabaseNode(_bubble, _database, _loadTables, _config));
     }
 
-    public IEnumerable<LoadDiagramDatabaseNode> GetChildren()
-    {
-        return Children;
-    }
+    public IEnumerable<LoadDiagramDatabaseNode> GetChildren() => Children;
 
-    public override string ToString()
-    {
-        return _description;
-    }
+    public override string ToString() => _description;
 
     public void DiscoverState()
     {
         foreach (var db in Children)
             db.DiscoverState();
     }
+
     #region equality
-    protected bool Equals(LoadDiagramServerNode other)
-    {
-        return base.Equals(other) && _bubble == other._bubble && Equals(_database, other._database);
-    }
+
+    protected bool Equals(LoadDiagramServerNode other) =>
+        base.Equals(other) && _bubble == other._bubble && Equals(_database, other._database);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadDiagramServerNode) obj);
+        return Equals((LoadDiagramServerNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(base.GetHashCode(), _bubble, _database);
-    }
+    public override int GetHashCode() => HashCode.Combine(base.GetHashCode(), _bubble, _database);
 
     public string WhatIsThis()
     {
@@ -130,6 +124,7 @@ public string WhatIsThis()
 
     public int Order
     {
-        get => (int) _bubble;
-        set{} }
+        get => (int)_bubble;
+        set { }
+    }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramTableNode.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramTableNode.cs
index 42c2b5c27f..f2f28b41d7 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramTableNode.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramTableNode.cs
@@ -23,7 +23,7 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadDiagram;
 /// Depicts a table in a given DLE <see cref="LoadBubble"/>.  Given the Create/Destroy nature of load stages this
 /// node may or may not map to an existing table in the database.
 /// </summary>
-public class LoadDiagramTableNode:Node,ICombineableSource, IHasLoadDiagramState, IMasqueradeAs, IKnowWhatIAm
+public class LoadDiagramTableNode : Node, ICombineableSource, IHasLoadDiagramState, IMasqueradeAs, IKnowWhatIAm
 {
     private readonly LoadDiagramDatabaseNode _databaseNode;
     public readonly TableInfo TableInfo;
@@ -35,9 +35,10 @@ public class LoadDiagramTableNode:Node,ICombineableSource, IHasLoadDiagramState,
     public readonly DiscoveredTable Table;
 
     private List<LoadDiagramColumnNode> _anticipatedChildren = new();
-    private List<DiscoveredColumn>  _unplannedChildren = new();
+    private List<DiscoveredColumn> _unplannedChildren = new();
 
-    public LoadDiagramTableNode(LoadDiagramDatabaseNode databaseNode,TableInfo tableInfo, LoadBubble bubble, HICDatabaseConfiguration config)
+    public LoadDiagramTableNode(LoadDiagramDatabaseNode databaseNode, TableInfo tableInfo, LoadBubble bubble,
+        HICDatabaseConfiguration config)
     {
         _databaseNode = databaseNode;
         TableInfo = tableInfo;
@@ -45,13 +46,13 @@ public LoadDiagramTableNode(LoadDiagramDatabaseNode databaseNode,TableInfo table
         _config = config;
 
         State = LoadDiagramState.Anticipated;
-            
+
         TableName = TableInfo.GetRuntimeName(Bubble);
 
         //only reference schema if it is LIVE
-        var schema = bubble >= LoadBubble.Live ? tableInfo.Schema: null;
+        var schema = bubble >= LoadBubble.Live ? tableInfo.Schema : null;
 
-        Table = databaseNode.Database.ExpectTable(TableName,schema);
+        Table = databaseNode.Database.ExpectTable(TableName, schema);
 
 
         var cols =
@@ -59,7 +60,6 @@ public LoadDiagramTableNode(LoadDiagramDatabaseNode databaseNode,TableInfo table
                 .Select(c => new LoadDiagramColumnNode(this, c, Bubble));
 
         _anticipatedChildren.AddRange(cols);
-
     }
 
     public string DatabaseName => _databaseNode.DatabaseName;
@@ -67,22 +67,20 @@ public LoadDiagramTableNode(LoadDiagramDatabaseNode databaseNode,TableInfo table
 
     public IEnumerable<object> GetChildren(bool dynamicColumnsOnly)
     {
-        foreach (var c in _anticipatedChildren.Where(c => !dynamicColumnsOnly || c.IsDynamicColumn || c.State == LoadDiagramState.Different || c.State == LoadDiagramState.New))
+        foreach (var c in _anticipatedChildren.Where(c =>
+                     !dynamicColumnsOnly || c.IsDynamicColumn || c.State == LoadDiagramState.Different ||
+                     c.State == LoadDiagramState.New))
             yield return c;
 
         foreach (var c in _unplannedChildren)
             yield return c;
     }
 
-    public override string ToString()
-    {
-        return TableName;
-    }
+    public override string ToString() => TableName;
 
-    public ICombineToMakeCommand GetCombineable()
-    {
-        return new SqlTextOnlyCombineable(TableInfo.GetQuerySyntaxHelper().EnsureFullyQualified(DatabaseName,null, TableName));
-    }
+    public ICombineToMakeCommand GetCombineable() =>
+        new SqlTextOnlyCombineable(TableInfo.GetQuerySyntaxHelper()
+            .EnsureFullyQualified(DatabaseName, null, TableName));
 
     public void DiscoverState()
     {
@@ -101,11 +99,12 @@ public void DiscoverState()
 
         //we do exist
         State = LoadDiagramState.Found;
-            
+
         //discover children and marry them up to planned/ new unplanned ones
         foreach (var discoveredColumn in Table.DiscoverColumns())
         {
-            var match = _anticipatedChildren.SingleOrDefault(c => c.ColumnName.Equals(discoveredColumn.GetRuntimeName(),StringComparison.CurrentCultureIgnoreCase));
+            var match = _anticipatedChildren.SingleOrDefault(c =>
+                c.ColumnName.Equals(discoveredColumn.GetRuntimeName(), StringComparison.CurrentCultureIgnoreCase));
             if (match != null)
                 match.SetState(discoveredColumn);
             else
@@ -113,8 +112,8 @@ public void DiscoverState()
         }
 
         //any NotFound or Different etc cols or any unplanned children
-        if(_anticipatedChildren.Any(c=>c.State > LoadDiagramState.Found) || _unplannedChildren.Any())
-            State = LoadDiagramState.Different;//elevate our state to Different
+        if (_anticipatedChildren.Any(c => c.State > LoadDiagramState.Found) || _unplannedChildren.Any())
+            State = LoadDiagramState.Different; //elevate our state to Different
     }
 
 
@@ -129,23 +128,20 @@ public void SetStateNotFound()
     }
 
     #region equality
-    protected bool Equals(LoadDiagramTableNode other)
-    {
-        return Equals(_databaseNode, other._databaseNode) && Bubble == other.Bubble && string.Equals(TableName, other.TableName);
-    }
+
+    protected bool Equals(LoadDiagramTableNode other) => Equals(_databaseNode, other._databaseNode) &&
+                                                         Bubble == other.Bubble &&
+                                                         string.Equals(TableName, other.TableName);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((LoadDiagramTableNode) obj);
+        return Equals((LoadDiagramTableNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return HashCode.Combine(_databaseNode, Bubble, TableName);
-    }
+    public override int GetHashCode() => HashCode.Combine(_databaseNode, Bubble, TableName);
 
     public string WhatIsThis()
     {
@@ -163,18 +159,17 @@ public string WhatIsThis()
                     _ => "A Table that is involved in the load (based on the Catalogues associated with the load)"
                 };
             case LoadDiagramState.NotFound:
-                return "A Table that was expected to exist in the given load stage but didn't.  This is probably because no load is currently underway/crashed.";
+                return
+                    "A Table that was expected to exist in the given load stage but didn't.  This is probably because no load is currently underway/crashed.";
             case LoadDiagramState.New:
-                return "A Table that was NOT expected to exist in the given load stage but did.  This may be a working table created by load scripts or a table that is part of another ongoing/crashed load";
+                return
+                    "A Table that was NOT expected to exist in the given load stage but did.  This may be a working table created by load scripts or a table that is part of another ongoing/crashed load";
             default:
                 throw new ArgumentOutOfRangeException();
         }
     }
 
-    public object MasqueradingAs()
-    {
-        return Bubble == LoadBubble.Live ? TableInfo: null;
-    }
+    public object MasqueradingAs() => Bubble == LoadBubble.Live ? TableInfo : null;
 
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs
index 460d30639c..e7f9a3dff6 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/LoadDiagramUI.cs
@@ -54,7 +54,8 @@ public partial class LoadDiagramUI : LoadDiagram_Design
     private DragDropProvider _dragDropProvider;
     private LoadDiagramServerNode _raw;
     private readonly RDMPCollectionCommonFunctionality _collectionCommonFunctionality = new();
-    private readonly ToolStripButton _btnFetchData = new("Fetch State",CatalogueIcons.DatabaseRefresh.ImageToBitmap())
+
+    private readonly ToolStripButton _btnFetchData = new("Fetch State", CatalogueIcons.DatabaseRefresh.ImageToBitmap())
     {
         DisplayStyle = ToolStripItemDisplayStyle.ImageAndText
     };
@@ -62,7 +63,7 @@ public partial class LoadDiagramUI : LoadDiagram_Design
     public LoadDiagramUI()
     {
         InitializeComponent();
-            
+
         tlvLoadedTables.CanExpandGetter += CanExpandGetter;
         tlvLoadedTables.ChildrenGetter += ChildrenGetter;
         olvName.ImageGetter += ImageGetter;
@@ -79,9 +80,12 @@ public LoadDiagramUI()
 
         _btnFetchData.Click += btnFetch_Click;
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvName, new Guid("d9fa87d8-537b-4d5c-8135-203b5790d8e5"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvState, new Guid("9bc71a44-5a59-4a6c-8a97-efc512dc23bf"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvDataType, new Guid("4cd3b1c5-c705-433c-a6b4-5ffd3a9b3ede"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvName,
+            new Guid("d9fa87d8-537b-4d5c-8135-203b5790d8e5"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvState,
+            new Guid("9bc71a44-5a59-4a6c-8a97-efc512dc23bf"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLoadedTables, olvDataType,
+            new Guid("4cd3b1c5-c705-433c-a6b4-5ffd3a9b3ede"));
     }
 
     private void tlvLoadedTables_ItemActivate(object sender, EventArgs e)
@@ -95,25 +99,26 @@ private void tlvLoadedTables_ItemActivate(object sender, EventArgs e)
             if (tableNode.Bubble == LoadBubble.Live)
             {
                 //for live just use the TableInfo!
-                Activator.Activate<ViewSQLAndResultsWithDataGridUI>(new ViewTableInfoExtractUICollection(tableNode.TableInfo, ViewType.TOP_100));
+                Activator.Activate<ViewSQLAndResultsWithDataGridUI>(
+                    new ViewTableInfoExtractUICollection(tableNode.TableInfo, ViewType.TOP_100));
                 return;
             }
             else
-                table = tableNode.Table; //otherwise it's a non Live bubble table or an unplanned table somewhere so use Arbitrary table Data Viewing
-            
-        if(table != null)
+            {
+                table = tableNode
+                    .Table; //otherwise it's a non Live bubble table or an unplanned table somewhere so use Arbitrary table Data Viewing
+            }
+
+        if (table != null)
             Activator.Activate<ViewSQLAndResultsWithDataGridUI>(new ArbitraryTableExtractionUICollection(table));
     }
 
     private void tlvLoadedTables_FormatCell(object sender, FormatCellEventArgs e)
     {
         if (e.Column == olvDataType && e.Model is LoadDiagramColumnNode { State: LoadDiagramState.Different })
-        {
             e.SubItem.ForeColor = Color.Red;
-        }
 
         if (e.Column == olvState && e.CellValue is LoadDiagramState state)
-        {
             e.SubItem.ForeColor = state switch
             {
                 LoadDiagramState.Anticipated => Color.LightGray,
@@ -125,7 +130,6 @@ private void tlvLoadedTables_FormatCell(object sender, FormatCellEventArgs e)
                 LoadDiagramState.New => Color.Red,
                 _ => throw new ArgumentOutOfRangeException()
             };
-        }
     }
 
     private object olvState_AspectGetter(object rowobject)
@@ -148,10 +152,8 @@ private object olvDataType_AspectGetter(object rowobject)
         return discCol?.DataType.SQLType;
     }
 
-    private string CellToolTipGetter(OLVColumn column, object modelObject)
-    {
-        return (modelObject as LoadDiagramServerNode)?.ErrorDescription;
-    }
+    private string CellToolTipGetter(OLVColumn column, object modelObject) =>
+        (modelObject as LoadDiagramServerNode)?.ErrorDescription;
 
     private Bitmap ImageGetter(object rowObject)
     {
@@ -202,7 +204,7 @@ public void RefreshUIFromDatabase()
     {
         tlvLoadedTables.ClearObjects();
 
-        if(_loadMetadata == null)
+        if (_loadMetadata == null)
             return;
 
         TableInfo[] allTables;
@@ -210,22 +212,25 @@ public void RefreshUIFromDatabase()
 
         try
         {
-            if(!_loadMetadata.GetAllCatalogues().Any())
-                throw new Exception("There are no Catalogues (Datasets) associated with this LoadMetadata, choose one or more Catalogues by clicking 'Edit..' in LoadMetadataUI ");
+            if (!_loadMetadata.GetAllCatalogues().Any())
+                throw new Exception(
+                    "There are no Catalogues (Datasets) associated with this LoadMetadata, choose one or more Catalogues by clicking 'Edit..' in LoadMetadataUI ");
 
             allTables = _loadMetadata.GetDistinctTableInfoList(true).ToArray();
             config = new HICDatabaseConfiguration(_loadMetadata);
         }
         catch (Exception e)
         {
-            CommonFunctionality.Fatal("Could not fetch data",e);
+            CommonFunctionality.Fatal("Could not fetch data", e);
             tlvLoadedTables.Visible = false;
             return;
         }
+
         tlvLoadedTables.Visible = true;
 
-        _raw = new LoadDiagramServerNode(LoadBubble.Raw,config.DeployInfo[LoadBubble.Raw],allTables,config);
-        var staging = new LoadDiagramServerNode(LoadBubble.Staging, config.DeployInfo[LoadBubble.Staging], allTables,config);
+        _raw = new LoadDiagramServerNode(LoadBubble.Raw, config.DeployInfo[LoadBubble.Raw], allTables, config);
+        var staging = new LoadDiagramServerNode(LoadBubble.Staging, config.DeployInfo[LoadBubble.Staging], allTables,
+            config);
         var live = new LoadDiagramServerNode(LoadBubble.Live, config.DeployInfo[LoadBubble.Live], allTables, config);
 
         tlvLoadedTables.AddObject(_raw);
@@ -241,13 +246,13 @@ public void RefreshUIFromDatabase()
 
     private void ExpandToDepth(int expansionDepth, object currentObject)
     {
-        if(expansionDepth == 0)
+        if (expansionDepth == 0)
             return;
 
         tlvLoadedTables.Expand(currentObject);
 
         foreach (var o in ChildrenGetter(currentObject))
-            ExpandToDepth(expansionDepth -1,o);
+            ExpandToDepth(expansionDepth - 1, o);
     }
 
     private void cbOnlyShowDynamicColumns_CheckedChanged(object sender, EventArgs e)
@@ -260,39 +265,40 @@ public override void SetDatabaseObject(IActivateItems activator, LoadMetadata da
         base.SetDatabaseObject(activator, databaseObject);
 
         if (!_collectionCommonFunctionality.IsSetup)
-            _collectionCommonFunctionality.SetUp(RDMPCollection.None, tlvLoadedTables,activator,null,null,new RDMPCollectionCommonFunctionalitySettings
-            {
-                AddFavouriteColumn = false,
-                AddIDColumn = false,
-                SuppressChildrenAdder = true,
-                SuppressActivate = true,
-                AddCheckColumn = false
-            });
-
-        _dragDropProvider ??= new DragDropProvider(new RDMPCombineableFactory(), new RDMPCommandExecutionFactory(Activator), tlvLoadedTables);
-            
+            _collectionCommonFunctionality.SetUp(RDMPCollection.None, tlvLoadedTables, activator, null, null,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    AddFavouriteColumn = false,
+                    AddIDColumn = false,
+                    SuppressChildrenAdder = true,
+                    SuppressActivate = true,
+                    AddCheckColumn = false
+                });
+
+        _dragDropProvider ??= new DragDropProvider(new RDMPCombineableFactory(),
+            new RDMPCommandExecutionFactory(Activator), tlvLoadedTables);
+
         _loadMetadata = databaseObject;
         RefreshUIFromDatabase();
 
         CommonFunctionality.Add(_btnFetchData);
     }
 
-    public override string GetTabName()
-    {
-        return $"Load Diagram ({_loadMetadata})";
-    }
+    public override string GetTabName() => $"Load Diagram ({_loadMetadata})";
 
     private Task taskDiscoverState;
+
     private void btnFetch_Click(object sender, EventArgs e)
     {
         //execution is already underway
-        if(taskDiscoverState != null && !taskDiscoverState.IsCompleted)
+        if (taskDiscoverState != null && !taskDiscoverState.IsCompleted)
             return;
 
         CommonFunctionality.ResetChecks();
         _btnFetchData.Enabled = false;
         pbLoading.Visible = true;
-        taskDiscoverState = Task.Run(() => DiscoverStates()).ContinueWith(UpdateStatesUI,TaskScheduler.FromCurrentSynchronizationContext());
+        taskDiscoverState = Task.Run(() => DiscoverStates())
+            .ContinueWith(UpdateStatesUI, TaskScheduler.FromCurrentSynchronizationContext());
     }
 
     private void UpdateStatesUI(Task task)
@@ -317,20 +323,19 @@ private void UpdateStatesUI(Task task)
         }
         catch (Exception exception)
         {
-            CommonFunctionality.Fatal("Failed to fetch status of load tables",exception);
+            CommonFunctionality.Fatal("Failed to fetch status of load tables", exception);
         }
         finally
         {
             pbLoading.Visible = false;
             _btnFetchData.Enabled = true;
         }
-
     }
 
     private void DiscoverStates()
     {
         if (tlvLoadedTables.Objects == null || !tlvLoadedTables.Objects.Cast<object>().Any())
-            CommonFunctionality.Fatal("There are no tables loaded by the load",null);
+            CommonFunctionality.Fatal("There are no tables loaded by the load", null);
 
 
         //update the states of the objects (do UI code happens here)
@@ -341,7 +346,8 @@ private void DiscoverStates()
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         tlvLoadedTables.UseFiltering = true;
-        tlvLoadedTables.ModelFilter = new TextMatchFilter(tlvLoadedTables,tbFilter.Text,StringComparison.CurrentCultureIgnoreCase);
+        tlvLoadedTables.ModelFilter =
+            new TextMatchFilter(tlvLoadedTables, tbFilter.Text, StringComparison.CurrentCultureIgnoreCase);
     }
 }
 
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadDiagramState.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadDiagramState.cs
index 04bb328bf8..82006ce15b 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadDiagramState.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadDiagramState.cs
@@ -13,5 +13,4 @@ public enum LoadDiagramState
     NotFound,
     Different,
     New
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs
index e7dbf2a56e..75b6388766 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/LoadStateUI.cs
@@ -23,6 +23,7 @@ public partial class LoadStateUI : UserControl
     private Bitmap _noLoadUnderway;
     private Bitmap _executingOrCrashed;
     public LoadState State { get; private set; }
+
     public LoadStateUI()
     {
         InitializeComponent();
@@ -57,7 +58,7 @@ public void SetStatus(LoadState state)
                 throw new ArgumentOutOfRangeException(nameof(state));
         }
     }
-        
+
     public enum LoadState
     {
         Unknown,
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/UnplannedTable.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/UnplannedTable.cs
index 0f75a51f42..729da9d243 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/UnplannedTable.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadDiagram/StateDiscovery/UnplannedTable.cs
@@ -12,7 +12,7 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadDiagram.StateDiscovery;
 /// Depicts a table which was found in the loading tables of a DLE load.  These tables are unexpected (i.e. not created by RDMP).  They may be
 /// temporary tables created as part of load scripts or they may reflect other ongoing/crashed loads (if in STAGING).
 /// </summary>
-public class UnplannedTable:IHasLoadDiagramState
+public class UnplannedTable : IHasLoadDiagramState
 {
     public DiscoveredTable Table { get; private set; }
     public readonly DiscoveredColumn[] Columns;
@@ -24,9 +24,5 @@ public UnplannedTable(DiscoveredTable table)
         Columns = table.DiscoverColumns();
     }
 
-    public override string ToString()
-    {
-        return Table.GetRuntimeName();
-    }
-
+    public override string ToString() => Table.GetRuntimeName();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadMetadataUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadMetadataUI.cs
index 222e31c439..0222ebd5d0 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadMetadataUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadMetadataUI.cs
@@ -25,19 +25,18 @@ public LoadMetadataUI()
         InitializeComponent();
         AssociatedCollection = RDMPCollection.DataLoad;
     }
-        
+
     protected override void SetBindings(BinderWithErrorProviderFactory rules, LoadMetadata databaseObject)
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",l=>l.ID);
-        Bind(tbName,"Text","Name",l=>l.Name);
-        Bind(tbDescription,"Text","Description",l=>l.Description);
+        Bind(tbID, "Text", "ID", l => l.ID);
+        Bind(tbName, "Text", "Name", l => l.Name);
+        Bind(tbDescription, "Text", "Description", l => l.Description);
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<LoadMetadataUI_Design, UserControl>))]
 public abstract class LoadMetadataUI_Design : RDMPSingleDatabaseObjectControl<LoadMetadata>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/CacheProgressUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/CacheProgressUI.cs
index 21eb73d02c..8c8d39e0a8 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/CacheProgressUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/CacheProgressUI.cs
@@ -33,10 +33,10 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadProgressAndCacheUIs;
 /// 
 /// <para>Setting a 'Permission Window' will create a restriction on the times of day in which caching can take place (e.g. between midnight and 4am only).</para>
 /// </summary>
-public partial class CacheProgressUI : CacheProgressUI_Design,ISaveableUI
+public partial class CacheProgressUI : CacheProgressUI_Design, ISaveableUI
 {
     private CacheProgress _cacheProgress;
-        
+
     public CacheProgressUI()
     {
         InitializeComponent();
@@ -47,7 +47,7 @@ public CacheProgressUI()
         ddCacheLagDelayDurationType.DataSource = Enum.GetValues(typeof(CacheLagPeriod.PeriodType));
 
         AssociatedCollection = RDMPCollection.DataLoad;
-            
+
         _bLoading = false;
     }
 
@@ -66,7 +66,8 @@ public override void SetDatabaseObject(IActivateItems activator, CacheProgress d
 
         _cacheProgress = databaseObject;
 
-        CommonFunctionality.AddToMenu(new ExecuteCommandExecuteCacheProgress(activator, databaseObject), "Go To Execute");
+        CommonFunctionality.AddToMenu(new ExecuteCommandExecuteCacheProgress(activator, databaseObject),
+            "Go To Execute");
 
         ragSmiley1.Reset();
 
@@ -84,10 +85,8 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, CacheP
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",c=>c.ID);
-        Bind(tbName,"Text","Name",c=>c.Name);
-
-
+        Bind(tbID, "Text", "ID", c => c.ID);
+        Bind(tbName, "Text", "Name", c => c.Name);
     }
 
     private void PopulateCacheProgressPanel(ICacheProgress cacheProgress)
@@ -114,19 +113,23 @@ private void PopulateCacheProgressPanel(ICacheProgress cacheProgress)
 
     private void SetupPipelineUI()
     {
-        if(_pipelineSelectionUI == null)
+        if (_pipelineSelectionUI == null)
         {
             var user = new PipelineUser(_cacheProgress);
             var useCase = CachingPipelineUseCase.DesignTime();
 
-            var selectionFactory = new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, user, useCase);
-            _pipelineSelectionUI = (Control)selectionFactory.Create(Activator,"Cache Pipeline",DockStyle.Fill,pPipeline);
+            var selectionFactory =
+                new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, user, useCase);
+            _pipelineSelectionUI =
+                (Control)selectionFactory.Create(Activator, "Cache Pipeline", DockStyle.Fill, pPipeline);
         }
     }
 
     private void SetCacheProgressTextBox()
     {
-        tbCacheProgress.Text = _cacheProgress.CacheFillProgress.HasValue ? _cacheProgress.CacheFillProgress.ToString() : "Caching not started";
+        tbCacheProgress.Text = _cacheProgress.CacheFillProgress.HasValue
+            ? _cacheProgress.CacheFillProgress.ToString()
+            : "Caching not started";
     }
 
     private void UpdateCacheLagPeriodControl()
@@ -147,15 +150,15 @@ private void UpdateCacheLagPeriodControl()
         var cacheLoadDelayPeriod = _cacheProgress.GetCacheLagPeriodLoadDelay();
         udCacheLagDelayPeriodDuration.Value = cacheLoadDelayPeriod.Duration;
         ddCacheLagDelayDurationType.SelectedItem = cacheLoadDelayPeriod.Type;
-
     }
-        
+
     private void udCacheLagDuration_ValueChanged(object sender, EventArgs e)
     {
         if (_bLoading)
             return;
 
-        _cacheProgress.SetCacheLagPeriod(CreateNewCacheLagPeriod(udCacheLagDuration.Value, ddCacheLagDurationType.SelectedItem));
+        _cacheProgress.SetCacheLagPeriod(CreateNewCacheLagPeriod(udCacheLagDuration.Value,
+            ddCacheLagDurationType.SelectedItem));
     }
 
     private void ddCacheLagDurationType_SelectedIndexChanged(object sender, EventArgs e)
@@ -163,7 +166,8 @@ private void ddCacheLagDurationType_SelectedIndexChanged(object sender, EventArg
         if (_bLoading)
             return;
 
-        _cacheProgress.SetCacheLagPeriod(CreateNewCacheLagPeriod(udCacheLagDuration.Value, ddCacheLagDurationType.SelectedItem));
+        _cacheProgress.SetCacheLagPeriod(CreateNewCacheLagPeriod(udCacheLagDuration.Value,
+            ddCacheLagDurationType.SelectedItem));
     }
 
     private void ddCacheLagDelayDurationType_SelectedIndexChanged(object sender, EventArgs e)
@@ -171,14 +175,17 @@ private void ddCacheLagDelayDurationType_SelectedIndexChanged(object sender, Eve
         if (_bLoading)
             return;
 
-        _cacheProgress.SetCacheLagPeriodLoadDelay(CreateNewCacheLagPeriod(udCacheLagDelayPeriodDuration.Value, ddCacheLagDelayDurationType.SelectedItem));    
+        _cacheProgress.SetCacheLagPeriodLoadDelay(CreateNewCacheLagPeriod(udCacheLagDelayPeriodDuration.Value,
+            ddCacheLagDelayDurationType.SelectedItem));
     }
+
     private void udCacheLagDelayPeriodDuration_ValueChanged(object sender, EventArgs e)
     {
         if (_bLoading)
             return;
 
-        _cacheProgress.SetCacheLagPeriodLoadDelay(CreateNewCacheLagPeriod(udCacheLagDelayPeriodDuration.Value, ddCacheLagDelayDurationType.SelectedItem));
+        _cacheProgress.SetCacheLagPeriodLoadDelay(CreateNewCacheLagPeriod(udCacheLagDelayPeriodDuration.Value,
+            ddCacheLagDelayDurationType.SelectedItem));
     }
 
     // Returns null if there is no duration, otherwise picks up the current state of both Duration and Type UI elements
@@ -203,28 +210,25 @@ private void tbCacheProgress_TextChanged(object sender, EventArgs e)
         RDMPControlCommonFunctionality.DoActionAndRedIfThrows(tbCacheProgress, () =>
         {
             if (string.IsNullOrWhiteSpace(tbCacheProgress.Text))
+            {
                 _cacheProgress.CacheFillProgress = null;
+            }
             else
             {
                 var dt = DateTime.Parse(tbCacheProgress.Text);
                 _cacheProgress.CacheFillProgress = dt;
             }
-                
         });
-
     }
 
     private void tbChunkPeriod_TextChanged(object sender, EventArgs e)
     {
-        RDMPControlCommonFunctionality.DoActionAndRedIfThrows(tbChunkPeriod, () =>
-        {
-            _cacheProgress.ChunkPeriod = TimeSpan.Parse(tbChunkPeriod.Text);
-        });
-
+        RDMPControlCommonFunctionality.DoActionAndRedIfThrows(tbChunkPeriod,
+            () => { _cacheProgress.ChunkPeriod = TimeSpan.Parse(tbChunkPeriod.Text); });
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CacheProgressUI_Design, UserControl>))]
-public abstract class CacheProgressUI_Design:RDMPSingleDatabaseObjectControl<CacheProgress>
+public abstract class CacheProgressUI_Design : RDMPSingleDatabaseObjectControl<CacheProgress>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressAnnotation.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressAnnotation.cs
index d48931a0c7..ba4e1160c3 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressAnnotation.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressAnnotation.cs
@@ -22,7 +22,7 @@ internal class LoadProgressAnnotation
     private readonly LoadProgress _lp;
     private readonly DataTable _dt;
 
-    public  LineAnnotation LineAnnotationOrigin { get; private set; }
+    public LineAnnotation LineAnnotationOrigin { get; private set; }
     public TextAnnotation TextAnnotationOrigin { get; private set; }
 
     public LineAnnotation LineAnnotationFillProgress { get; private set; }
@@ -31,12 +31,12 @@ internal class LoadProgressAnnotation
     public LineAnnotation LineAnnotationCacheProgress { get; private set; }
     public TextAnnotation TextAnnotationCacheProgress { get; private set; }
 
-    public LoadProgressAnnotation(LoadProgress lp,DataTable dt, Chart chart)
+    public LoadProgressAnnotation(LoadProgress lp, DataTable dt, Chart chart)
     {
         _lp = lp;
         _dt = dt;
 
-        GetAnnotations("OriginDate",0.9,lp.OriginDate, chart, out var line, out var text);
+        GetAnnotations("OriginDate", 0.9, lp.OriginDate, chart, out var line, out var text);
         LineAnnotationOrigin = line;
         TextAnnotationOrigin = text;
 
@@ -47,17 +47,16 @@ public LoadProgressAnnotation(LoadProgress lp,DataTable dt, Chart chart)
 
         var cp = lp.CacheProgress;
 
-        if(cp != null)
+        if (cp != null)
         {
             GetAnnotations("Cache Fill", 0.50, cp.CacheFillProgress, chart, out var line3, out var text3);
             LineAnnotationCacheProgress = line3;
             TextAnnotationCacheProgress = text3;
         }
-
-
     }
 
-    private void GetAnnotations(string label, double fractionalHeightOfLabel,DateTime? date, Chart chart, out LineAnnotation line, out TextAnnotation text)
+    private void GetAnnotations(string label, double fractionalHeightOfLabel, DateTime? date, Chart chart,
+        out LineAnnotation line, out TextAnnotation text)
     {
         string originText;
         double anchorX;
@@ -107,8 +106,6 @@ private void GetAnnotations(string label, double fractionalHeightOfLabel,DateTim
             ForeColor = date == null ? Color.Red : Color.Green
         };
         text.Font = new Font(text.Font, FontStyle.Bold);
-
-
     }
 
     private static int GetXForDate(DataTable dt, DateTime value)
@@ -159,7 +156,8 @@ public void OnAnnotationPositionChanged(object sender, EventArgs eventArgs)
         {
             var newDate = GetDateFromX((int)LineAnnotationOrigin.X);
 
-            if (MessageBox.Show($"Set new LoadProgress Origin date to {newDate}?", "Change Origin Date?", MessageBoxButtons.YesNo) == DialogResult.Yes)
+            if (MessageBox.Show($"Set new LoadProgress Origin date to {newDate}?", "Change Origin Date?",
+                    MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
                 _lp.OriginDate = newDate;
                 _lp.SaveToDatabase();
@@ -170,7 +168,8 @@ public void OnAnnotationPositionChanged(object sender, EventArgs eventArgs)
         {
             var newDate = GetDateFromX((int)LineAnnotationFillProgress.X);
 
-            if (MessageBox.Show($"Set new LoadProgress Fill date to {newDate}?", "Change Fill Date?", MessageBoxButtons.YesNo) == DialogResult.Yes)
+            if (MessageBox.Show($"Set new LoadProgress Fill date to {newDate}?", "Change Fill Date?",
+                    MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
                 _lp.DataLoadProgress = newDate;
                 _lp.SaveToDatabase();
@@ -181,12 +180,13 @@ public void OnAnnotationPositionChanged(object sender, EventArgs eventArgs)
         {
             var cp = _lp.CacheProgress;
 
-            if(cp == null)
+            if (cp == null)
                 return;
 
             var newDate = GetDateFromX((int)LineAnnotationCacheProgress.X);
 
-            if (MessageBox.Show($"Set new CacheProgress date to {newDate}?", "Change Cache Progress Date?", MessageBoxButtons.YesNo) == DialogResult.Yes)
+            if (MessageBox.Show($"Set new CacheProgress date to {newDate}?", "Change Cache Progress Date?",
+                    MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
                 cp.CacheFillProgress = newDate;
                 cp.SaveToDatabase();
@@ -196,13 +196,13 @@ public void OnAnnotationPositionChanged(object sender, EventArgs eventArgs)
 
     private DateTime? GetDateFromX(int x)
     {
-        x = Math.Max(0, x - 1);//subtract 1 because X axis on chart starts at 1 but data table starts at 0, also prevents them dragging it super negative
+        x = Math.Max(0,
+            x - 1); //subtract 1 because X axis on chart starts at 1 but data table starts at 0, also prevents them dragging it super negative
         x = Math.Min(x, _dt.Rows.Count - 1);
 
         var year = Convert.ToInt32(_dt.Rows[x]["Year"]);
         var month = Convert.ToInt32(_dt.Rows[x]["Month"]);
 
-        return  new DateTime(year, month, 1);
-
+        return new DateTime(year, month, 1);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressDiagramUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressDiagramUI.cs
index 6fd5f52c90..87df2aab68 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressDiagramUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/Diagrams/LoadProgressDiagramUI.cs
@@ -44,18 +44,17 @@ public LoadProgressDiagramUI()
         olvExecute.IsButton = true;
         olvExecute.ButtonSizing = OLVColumn.ButtonSizingMode.CellBounds;
         olvDQERuns.ButtonClick += olvDQERuns_ButtonClick;
-            
     }
 
     private void olvDQERuns_ButtonClick(object sender, CellClickEventArgs e)
     {
-        var c = (Catalogue) e.Model;
+        var c = (Catalogue)e.Model;
         new ExecuteCommandRunDQEOnCatalogue(Activator).SetTarget(c).Execute();
     }
 
     private object AspectGetterLastDQERun(object rowObject)
     {
-        var c = (Catalogue) rowObject;
+        var c = (Catalogue)rowObject;
 
         if (!_report.CataloguesWithDQERuns.ContainsKey(c))
             return "Never";
@@ -69,9 +68,9 @@ public void SetLoadProgress(LoadProgress lp, IActivateItems activator)
         _loadProgress = lp;
         RefreshUIFromDatabase();
 
-        DoTransparencyProperly.ThisHoversOver(pathLinkLabel1,cacheState);
+        DoTransparencyProperly.ThisHoversOver(pathLinkLabel1, cacheState);
     }
-        
+
     private void RefreshUIFromDatabase()
     {
         ragSmiley1.Reset();
@@ -110,7 +109,7 @@ private void RefreshUIFromDatabase()
         btnRefresh.Top = olvDQERuns.Top;
         ragSmiley1.Top = olvDQERuns.Top;
         cataloguesRowCountChart.Height = splitContainer1.Panel1.Height - olvDQERuns.Height;
-            
+
 
         if (_report.CataloguesPeriodictiyData == null)
         {
@@ -125,24 +124,23 @@ private void RefreshUIFromDatabase()
         cataloguesRowCountChart.Palette = ChartColorPalette.None;
         cataloguesRowCountChart.PaletteCustomColors = new[]
         {
-            Color.FromArgb(160,0,65),
-            Color.FromArgb(246,110,60),
-            Color.FromArgb(255,175,89),
-            Color.FromArgb(255,225,133),
-            Color.FromArgb(255,255,188),
-            Color.FromArgb(230,246,147),
-            Color.FromArgb(170,222,162),
-            Color.FromArgb(98,195,165),
-            Color.FromArgb(44,135,191),
-            Color.FromArgb(94,76,164)
-
-
+            Color.FromArgb(160, 0, 65),
+            Color.FromArgb(246, 110, 60),
+            Color.FromArgb(255, 175, 89),
+            Color.FromArgb(255, 225, 133),
+            Color.FromArgb(255, 255, 188),
+            Color.FromArgb(230, 246, 147),
+            Color.FromArgb(170, 222, 162),
+            Color.FromArgb(98, 195, 165),
+            Color.FromArgb(44, 135, 191),
+            Color.FromArgb(94, 76, 164)
         };
         try
         {
             //Catalogue periodicity chart
-            ChartLookAndFeelSetter.PopulateYearMonthChart(cataloguesRowCountChart, _report.CataloguesPeriodictiyData, "Count of records");
-            
+            ChartLookAndFeelSetter.PopulateYearMonthChart(cataloguesRowCountChart, _report.CataloguesPeriodictiyData,
+                "Count of records");
+
             //Annotations
             _annotations = new LoadProgressAnnotation(_loadProgress, _report.CataloguesPeriodictiyData,
                 cataloguesRowCountChart);
@@ -150,7 +148,7 @@ private void RefreshUIFromDatabase()
             cataloguesRowCountChart.Annotations.Add(_annotations.TextAnnotationOrigin);
             cataloguesRowCountChart.Annotations.Add(_annotations.LineAnnotationFillProgress);
             cataloguesRowCountChart.Annotations.Add(_annotations.TextAnnotationFillProgress);
-            
+
             //Cache annotation (still on the Catalogue periodicity chart)
             if (_annotations.LineAnnotationCacheProgress != null)
             {
@@ -160,14 +158,17 @@ private void RefreshUIFromDatabase()
 
             //Now onto the cache diagram which shows what files are in the cache directory and the failure states of old loads
             if (_report.CachePeriodictiyData == null)
+            {
                 splitContainer1.Panel2Collapsed = true;
+            }
             else
             {
                 pathLinkLabel1.Text = _report.ResolvedCachePath.FullName;
 
                 cacheState.Palette = ChartColorPalette.None;
-                cacheState.PaletteCustomColors = new[] { Color.Red,Color.Green };
-                ChartLookAndFeelSetter.PopulateYearMonthChart(cacheState, _report.CachePeriodictiyData, "Fetch Failure/Success");
+                cacheState.PaletteCustomColors = new[] { Color.Red, Color.Green };
+                ChartLookAndFeelSetter.PopulateYearMonthChart(cacheState, _report.CachePeriodictiyData,
+                    "Fetch Failure/Success");
                 splitContainer1.Panel2Collapsed = false;
 
                 cacheState.Series[0].ChartType = SeriesChartType.Column;
@@ -175,7 +176,6 @@ private void RefreshUIFromDatabase()
 
                 cacheState.Series[1].ChartType = SeriesChartType.Column;
                 cacheState.Series[1]["DrawingStyle"] = "Cylinder";
-
             }
         }
         catch (Exception e)
@@ -184,7 +184,6 @@ private void RefreshUIFromDatabase()
         }
     }
 
-        
 
     private void cataloguesRowCountChart_AnnotationPositionChanged(object sender, EventArgs e)
     {
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/LoadProgressUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/LoadProgressUI.cs
index 54191d9aac..aa050c7496 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/LoadProgressUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/LoadProgressUI.cs
@@ -29,25 +29,26 @@ namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.LoadProgressAndCacheUIs;
 public partial class LoadProgressUI : LoadProgressUI_Design, ISaveableUI
 {
     private LoadProgress _loadProgress;
-        
+
     public LoadProgressUI()
     {
         InitializeComponent();
         loadProgressDiagram1.LoadProgressChanged += ReloadUIFromDatabase;
         AssociatedCollection = RDMPCollection.DataLoad;
     }
-        
+
     private void ReloadUIFromDatabase()
     {
         loadProgressDiagram1.SetLoadProgress(_loadProgress, Activator);
         loadProgressDiagram1.Visible = true;
 
         tbDataLoadProgress.ReadOnly = true;
-                
-        if(_loadProgress.OriginDate != null)
+
+        if (_loadProgress.OriginDate != null)
             tbOriginDate.Text = _loadProgress.OriginDate.ToString();
-                
-        tbDataLoadProgress.Text = _loadProgress.DataLoadProgress != null ? _loadProgress.DataLoadProgress.ToString() : "";
+
+        tbDataLoadProgress.Text =
+            _loadProgress.DataLoadProgress != null ? _loadProgress.DataLoadProgress.ToString() : "";
     }
 
     private void btnEditLoadProgress_Click(object sender, EventArgs e)
@@ -93,14 +94,16 @@ public override void SetDatabaseObject(IActivateItems activator, LoadProgress da
     {
         base.SetDatabaseObject(activator, databaseObject);
         _loadProgress = databaseObject;
-            
+
         loadProgressDiagram1.SetItemActivator(activator);
 
         ReloadUIFromDatabase();
 
-        CommonFunctionality.AddHelp(nDefaultNumberOfDaysToLoadEachTime, "ILoadProgress.DefaultNumberOfDaysToLoadEachTime");
+        CommonFunctionality.AddHelp(nDefaultNumberOfDaysToLoadEachTime,
+            "ILoadProgress.DefaultNumberOfDaysToLoadEachTime");
 
-        CommonFunctionality.AddToMenu(new ExecuteCommandActivate(activator, databaseObject.LoadMetadata), "Execute Load");
+        CommonFunctionality.AddToMenu(new ExecuteCommandActivate(activator, databaseObject.LoadMetadata),
+            "Execute Load");
     }
 
 
@@ -108,13 +111,14 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, LoadPr
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",l=>l.ID);
+        Bind(tbID, "Text", "ID", l => l.ID);
         Bind(tbName, "Text", "Name", l => l.Name);
-        Bind(nDefaultNumberOfDaysToLoadEachTime, "Value", "DefaultNumberOfDaysToLoadEachTime", l => l.DefaultNumberOfDaysToLoadEachTime);
+        Bind(nDefaultNumberOfDaysToLoadEachTime, "Value", "DefaultNumberOfDaysToLoadEachTime",
+            l => l.DefaultNumberOfDaysToLoadEachTime);
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<LoadProgressUI_Design, UserControl>))]
-public abstract class LoadProgressUI_Design:RDMPSingleDatabaseObjectControl<LoadProgress>
+public abstract class LoadProgressUI_Design : RDMPSingleDatabaseObjectControl<LoadProgress>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/PermissionWindowUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/PermissionWindowUI.cs
index b742e3e606..a647f4b73e 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/PermissionWindowUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadProgressAndCacheUIs/PermissionWindowUI.cs
@@ -61,12 +61,13 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Permis
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbName,"Text","Name",w=>w.Name);
+        Bind(tbName, "Text", "Name", w => w.Name);
         Bind(tbDescription, "Text", "Description", w => w.Description);
-        Bind(tbID,"Text","ID",w=>w.ID);
+        Bind(tbID, "Text", "ID", w => w.ID);
     }
 
-    private static void PopulatePeriodTextBoxForDay(TextBox textBox, int dayNum, Dictionary<int, List<PermissionWindowPeriod>> periodsByDay)
+    private static void PopulatePeriodTextBoxForDay(TextBox textBox, int dayNum,
+        Dictionary<int, List<PermissionWindowPeriod>> periodsByDay)
     {
         if (periodsByDay.TryGetValue(dayNum, out var value)) PopulateTextBox(textBox, value);
     }
@@ -80,9 +81,9 @@ private static List<PermissionWindowPeriod> CreatePeriodListFromTextBox(int dayO
     {
         var listString = textBox.Text;
         var periodList = new List<PermissionWindowPeriod>();
-        foreach (var periodString in listString.Split(new[] {","}, StringSplitOptions.RemoveEmptyEntries))
+        foreach (var periodString in listString.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries))
         {
-            var parts = periodString.Split(new[] {"-"}, StringSplitOptions.RemoveEmptyEntries);
+            var parts = periodString.Split(new[] { "-" }, StringSplitOptions.RemoveEmptyEntries);
             if (!TimeSpan.TryParse(parts[0], out var start))
                 throw new Exception($"Could not parse {parts[0]} as a TimeSpan");
 
@@ -94,7 +95,7 @@ private static List<PermissionWindowPeriod> CreatePeriodListFromTextBox(int dayO
 
         return periodList;
     }
-        
+
     public void RebuildPermissionWindowPeriods()
     {
         var periodList = new List<PermissionWindowPeriod>();
@@ -108,7 +109,7 @@ public void RebuildPermissionWindowPeriods()
 
         _permissionWindow.SetPermissionWindowPeriods(periodList);
     }
-        
+
     private void tbDay_TextChanged(object sender, EventArgs e)
     {
         ragSmiley1.Reset();
@@ -124,7 +125,6 @@ private void tbDay_TextChanged(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<PermissionWindowUI_Design, UserControl>))]
-public abstract class PermissionWindowUI_Design:RDMPSingleDatabaseObjectControl<PermissionWindow>
+public abstract class PermissionWindowUI_Design : RDMPSingleDatabaseObjectControl<PermissionWindow>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadStageIconUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadStageIconUI.cs
index e7429f72cf..8ef534e690 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadStageIconUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/LoadStageIconUI.cs
@@ -21,7 +21,7 @@ public LoadStageIconUI()
         InitializeComponent();
     }
 
-    public void Setup(ICoreIconProvider iconProvider,LoadStage stage)
+    public void Setup(ICoreIconProvider iconProvider, LoadStage stage)
     {
         pictureBox1.Image = iconProvider.GetImage(stage).ImageToBitmap();
         lblLoadStage.Text = stage.ToString();
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs
index 5678fe7072..7f7436386d 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/ExeProcessTaskUI.cs
@@ -63,7 +63,7 @@ private void SetupForFile()
 
         lblID.Left = btnBrowse.Right;
         tbID.Left = lblID.Right;
-            
+
         tbID.Text = _processTask.ID.ToString();
 
         loadStageIconUI1.Setup(Activator.CoreIconProvider, _processTask.LoadStage);
@@ -76,9 +76,10 @@ private ExecutableRuntimeTask GetRuntimeTask()
 
         var lmd = _processTask.LoadMetadata;
         var argsDictionary = new LoadArgsDictionary(lmd, new HICDatabaseConfiguration(lmd).DeployInfo);
-            
+
         //populate the UI with the args
-        _runtimeTask = (ExecutableRuntimeTask)factory.Create(_processTask, argsDictionary.LoadArgs[_processTask.LoadStage]);
+        _runtimeTask =
+            (ExecutableRuntimeTask)factory.Create(_processTask, argsDictionary.LoadArgs[_processTask.LoadStage]);
         tbExeCommand.Text = $"{_runtimeTask.ExeFilepath} {_runtimeTask.CreateArgString()}";
 
         return _runtimeTask;
@@ -91,8 +92,8 @@ private void btnRunExe_Click(object sender, EventArgs e)
             MessageBox.Show("Exe is still running");
             return;
         }
-            
-        if(_runtimeTask == null)
+
+        if (_runtimeTask == null)
         {
             MessageBox.Show("Command could not be built,see Checks");
             return;
@@ -103,7 +104,9 @@ private void btnRunExe_Click(object sender, EventArgs e)
         {
             try
             {
-                _runtimeTask.Run(new ThrowImmediatelyDataLoadJob(new FromCheckNotifierToDataLoadEventListener(checksUI1)), new GracefulCancellationToken());
+                _runtimeTask.Run(
+                    new ThrowImmediatelyDataLoadJob(new FromCheckNotifierToDataLoadEventListener(checksUI1)),
+                    new GracefulCancellationToken());
             }
             catch (Exception ex)
             {
@@ -137,13 +140,13 @@ private void btnBrowse_Click(object sender, EventArgs e)
         {
             _processTask.Path = dialog.FileName;
             _processTask.SaveToDatabase();
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_processTask));
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_processTask));
             SetupForFile();
         }
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExeProcessTaskUI_Design, UserControl>))]
-public abstract class ExeProcessTaskUI_Design:RDMPSingleDatabaseObjectControl<ProcessTask>
+public abstract class ExeProcessTaskUI_Design : RDMPSingleDatabaseObjectControl<ProcessTask>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs
index f58c77e3d4..a62499dcb7 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/PluginProcessTaskUI.cs
@@ -21,7 +21,6 @@
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 
 
-
 namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.ProcessTasks;
 
 /// <summary>
@@ -61,7 +60,7 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat
         _processTask = databaseObject;
         base.SetDatabaseObject(activator, databaseObject);
 
-        if(_argumentCollection == null)
+        if (_argumentCollection == null)
         {
             var repo = databaseObject.CatalogueRepository;
 
@@ -69,9 +68,9 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat
 
             var className = databaseObject.GetClassNameWhoArgumentsAreFor();
 
-            if(string.IsNullOrWhiteSpace(className))
+            if (string.IsNullOrWhiteSpace(className))
             {
-                activator.KillForm(ParentForm,new Exception(
+                activator.KillForm(ParentForm, new Exception(
                     $"No class has been specified on ProcessTask '{databaseObject}'"));
                 return;
             }
@@ -80,18 +79,19 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat
             {
                 _underlyingType = repo.MEF.GetType(className);
 
-                if(_underlyingType == null)
-                    activator.KillForm(ParentForm,new Exception(
+                if (_underlyingType == null)
+                    activator.KillForm(ParentForm, new Exception(
                         $"Could not find Type '{className}' for ProcessTask '{databaseObject}'"));
             }
             catch (Exception e)
             {
-                activator.KillForm(ParentForm,new Exception(
-                    $"MEF crashed while trying to look up Type '{className}' for ProcessTask '{databaseObject}'",e));
+                activator.KillForm(ParentForm, new Exception(
+                    $"MEF crashed while trying to look up Type '{className}' for ProcessTask '{databaseObject}'", e));
                 return;
             }
 
-            _argumentCollection.Setup(Activator, databaseObject, _underlyingType,Activator.RepositoryLocator.CatalogueRepository);
+            _argumentCollection.Setup(Activator, databaseObject, _underlyingType,
+                Activator.RepositoryLocator.CatalogueRepository);
 
             _argumentCollection.Dock = DockStyle.Fill;
             pArguments.Controls.Add(_argumentCollection);
@@ -100,10 +100,11 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat
         CommonFunctionality.Add(_ragSmiley);
 
         CheckComponent();
-            
-        loadStageIconUI1.Setup(Activator.CoreIconProvider,_processTask.LoadStage);
 
-        CommonFunctionality.Add(new ToolStripButton("Check", FamFamFamIcons.arrow_refresh.ImageToBitmap(), (s, e) => CheckComponent()));
+        loadStageIconUI1.Setup(Activator.CoreIconProvider, _processTask.LoadStage);
+
+        CommonFunctionality.Add(new ToolStripButton("Check", FamFamFamIcons.arrow_refresh.ImageToBitmap(),
+            (s, e) => CheckComponent()));
     }
 
     protected override void SetBindings(BinderWithErrorProviderFactory rules, ProcessTask databaseObject)
@@ -122,8 +123,9 @@ private void CheckComponent()
 
             var lmd = _processTask.LoadMetadata;
             var argsDictionary = new LoadArgsDictionary(lmd, new HICDatabaseConfiguration(lmd).DeployInfo);
-            var mefTask = (IMEFRuntimeTask) factory.Create(_processTask, argsDictionary.LoadArgs[_processTask.LoadStage]);
-            
+            var mefTask =
+                (IMEFRuntimeTask)factory.Create(_processTask, argsDictionary.LoadArgs[_processTask.LoadStage]);
+
             _ragSmiley.StartChecking(mefTask.MEFPluginClassInstance);
         }
         catch (Exception e)
@@ -145,6 +147,6 @@ private void tbName_TextChanged(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<PluginProcessTaskUI_Design, UserControl>))]
-public abstract class PluginProcessTaskUI_Design:RDMPSingleDatabaseObjectControl<ProcessTask>
+public abstract class PluginProcessTaskUI_Design : RDMPSingleDatabaseObjectControl<ProcessTask>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.cs b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.cs
index 9312c78523..75668bf1d6 100644
--- a/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.cs
+++ b/Rdmp.UI/DataLoadUIs/LoadMetadataUIs/ProcessTasks/SqlProcessTaskUI.cs
@@ -19,7 +19,6 @@
 using Rdmp.UI.ScintillaHelper;
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using ScintillaNET;
 
 namespace Rdmp.UI.DataLoadUIs.LoadMetadataUIs.ProcessTasks;
@@ -47,11 +46,11 @@ public override void SetDatabaseObject(IActivateItems activator, ProcessTask dat
     {
         base.SetDatabaseObject(activator, databaseObject);
         _processTask = databaseObject;
-            
+
         LoadFile();
-            
+
         loadStageIconUI1.Setup(activator.CoreIconProvider, _processTask.LoadStage);
-        loadStageIconUI1.Left = tbID.Right +2;
+        loadStageIconUI1.Left = tbID.Right + 2;
 
         CommonFunctionality.AddChecks(_processTask);
     }
@@ -60,8 +59,8 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Proces
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",p=>p.ID);
-        Bind(tbName,"Text","Name",p=>p.Name);
+        Bind(tbID, "Text", "ID", p => p.ID);
+        Bind(tbName, "Text", "Name", p => p.Name);
         Bind(tbPath, "Text", "Path", p => p.Path);
     }
 
@@ -90,7 +89,7 @@ private void LoadFile()
             }
             catch (Exception e)
             {
-                CommonFunctionality.Fatal($"Could not open file {_processTask.Path}",e);
+                CommonFunctionality.Fatal($"Could not open file {_processTask.Path}", e);
             }
         }
         finally
@@ -116,9 +115,9 @@ private void SetupAutocomplete()
 
     private bool objectSaverButton1_BeforeSave(DatabaseEntity arg)
     {
-        File.WriteAllText(_processTask.Path,_scintilla.Text);
+        File.WriteAllText(_processTask.Path, _scintilla.Text);
         _scintilla.SetSavePoint();
-            
+
         return true;
     }
 
@@ -140,7 +139,7 @@ private void btnBrowse_Click(object sender, EventArgs e)
 
         string oldFileName = null;
         //open the browse dialog at the location of the currently specified file
-        if(!string.IsNullOrWhiteSpace(_processTask.Path))
+        if (!string.IsNullOrWhiteSpace(_processTask.Path))
         {
             var fi = new FileInfo(_processTask.Path);
             oldFileName = fi.Name;
@@ -151,20 +150,19 @@ private void btnBrowse_Click(object sender, EventArgs e)
 
         if (ofd.ShowDialog() == DialogResult.OK && !string.IsNullOrWhiteSpace(ofd.FileName))
         {
-
             //replace the old name with the new name for example if user specified task name is 'Run bob.sql to rename all 'Roberts' to 'Bob' then the user selects a different file e.g. "truncateAllTables.sql" then the new name becomes Run truncateAllTables.sql to rename all 'Roberts' to 'Bob'
-            if(oldFileName != null)
-                _processTask.Name = _processTask.Name.Replace(oldFileName,Path.GetFileName(ofd.FileName));
+            if (oldFileName != null)
+                _processTask.Name = _processTask.Name.Replace(oldFileName, Path.GetFileName(ofd.FileName));
 
             _processTask.Path = ofd.FileName;
             _processTask.SaveToDatabase();
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_processTask));
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_processTask));
             LoadFile();
         }
     }
 }
+
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<SqlProcessTaskUI_Design, UserControl>))]
 public abstract class SqlProcessTaskUI_Design : RDMPSingleDatabaseObjectControl<ProcessTask>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/AdjustColumnDataTypesUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/AdjustColumnDataTypesUI.cs
index b242764bc7..54e1715969 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/AdjustColumnDataTypesUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/AdjustColumnDataTypesUI.cs
@@ -42,7 +42,7 @@ private void btnDone_Click(object sender, EventArgs e)
     {
         if (_columns == null)
             throw new Exception("AdjustColumns was not called yet");
-            
+
         Close();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitColumnTypeUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitColumnTypeUI.cs
index 8a6ebfe92e..5be89567ab 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitColumnTypeUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitColumnTypeUI.cs
@@ -15,17 +15,16 @@ namespace Rdmp.UI.DataLoadUIs.ModuleUIs.DataFlowSources;
 /// </summary>
 public partial class ExplicitColumnTypeUI : UserControl
 {
-
     public string ColumnName => textBox1.Text;
 
-    public Type Type => (Type) ddType.SelectedItem;
+    public Type Type => (Type)ddType.SelectedItem;
 
     public ExplicitColumnTypeUI(string name, Type t)
     {
         InitializeComponent();
 
         ddType.Items.AddRange(
-            new []
+            new[]
             {
                 typeof(string),
                 typeof(double),
@@ -35,7 +34,6 @@ public ExplicitColumnTypeUI(string name, Type t)
 
         textBox1.Text = name;
         ddType.SelectedItem = t;
-
     }
 
     public event EventHandler DeletePressed;
@@ -43,12 +41,11 @@ public ExplicitColumnTypeUI(string name, Type t)
     private void btnDelete_Click(object sender, EventArgs e)
     {
         var h = DeletePressed;
-        if(h != null)
+        if (h != null)
             DeletePressed(this, EventArgs.Empty);
     }
 
     private void textBox1_TextChanged(object sender, EventArgs e)
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitTypingCollectionUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitTypingCollectionUI.cs
index 02418ace05..3f20e736ce 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitTypingCollectionUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataFlowSources/ExplicitTypingCollectionUI.cs
@@ -13,7 +13,6 @@
 using Rdmp.UI.SimpleDialogs;
 
 
-
 namespace Rdmp.UI.DataLoadUIs.ModuleUIs.DataFlowSources;
 
 /// <summary>
@@ -27,7 +26,7 @@ namespace Rdmp.UI.DataLoadUIs.ModuleUIs.DataFlowSources;
 public partial class ExplicitTypingCollectionUI : Form, ICustomUI<ExplicitTypingCollection>
 {
     public ICatalogueRepository CatalogueRepository { get; set; }
-        
+
     public ExplicitTypingCollectionUI()
     {
         InitializeComponent();
@@ -66,10 +65,7 @@ public void SetGenericUnderlyingObjectTo(ICustomUIDrivenClass value)
         SetUnderlyingObjectTo((ExplicitTypingCollection)value);
     }
 
-    public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
-    {
-        return GetToReturn();
-    }
+    public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject() => GetToReturn();
 
     private ExplicitTypingCollection GetToReturn()
     {
@@ -90,7 +86,7 @@ public void SetUnderlyingObjectTo(ExplicitTypingCollection value)
 
         ReLayoutTable();
     }
-        
+
     private void btnOk_Click(object sender, EventArgs e)
     {
         try
@@ -103,6 +99,7 @@ private void btnOk_Click(object sender, EventArgs e)
             ExceptionViewer.Show(exception);
             return;
         }
+
         Close();
     }
 
@@ -110,12 +107,10 @@ private void ExplicitTypingCollectionUI_FormClosing(object sender, FormClosingEv
     {
         if (CatalogueRepository == null)
             return;
-            
-        if(DialogResult != DialogResult.OK)
+
+        if (DialogResult != DialogResult.OK)
             if (MessageBox.Show("Close without saving?", "Cancel Changes", MessageBoxButtons.YesNo) !=
                 DialogResult.Yes)
                 e.Cancel = true;
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataProvider/WebServiceConfigurationUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataProvider/WebServiceConfigurationUI.cs
index 4fdf338133..a124b87917 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/DataProvider/WebServiceConfigurationUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/DataProvider/WebServiceConfigurationUI.cs
@@ -26,7 +26,7 @@ public WebServiceConfigurationUI()
         InitializeComponent();
         DialogResult = DialogResult.Cancel;
     }
-        
+
     public void SetGenericUnderlyingObjectTo(ICustomUIDrivenClass value)
     {
         SetUnderlyingObjectTo((WebServiceConfiguration)value);
@@ -51,13 +51,13 @@ public void SetUnderlyingObjectTo(WebServiceConfiguration value)
             else
                 throw;
         }
+
         tbMaxBufferSize.Text = config.MaxBufferSize.ToString();
         tbMaxReceivedMessageSize.Text = config.MaxReceivedMessageSize.ToString();
     }
 
-    public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
-    {
-        return new WebServiceConfiguration(CatalogueRepository)
+    public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject() =>
+        new WebServiceConfiguration(CatalogueRepository)
         {
             Endpoint = tbEndpoint.Text,
             Username = tbUsername.Text,
@@ -65,7 +65,6 @@ public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
             MaxBufferSize = Convert.ToInt32(tbMaxBufferSize.Text),
             MaxReceivedMessageSize = Convert.ToInt32(tbMaxReceivedMessageSize.Text)
         };
-    }
 
     private void btnSave_Click(object sender, EventArgs e)
     {
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/DatabaseColumnRequestUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/DatabaseColumnRequestUI.cs
index 66a9f1d62b..3dc39c5b25 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/DatabaseColumnRequestUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/DatabaseColumnRequestUI.cs
@@ -42,7 +42,7 @@ public DatabaseColumnRequestUI(DatabaseColumnRequest column)
         }
 
         tbExplicitDbType.Text = column.ExplicitDbType;
-            
+
         bLoaded = true;
         ResetVisibility();
     }
@@ -98,7 +98,7 @@ private void ResetVisibility()
     private void tbExplicitDbType_TextChanged(object sender, EventArgs e)
     {
         ResetVisibility();
-            
+
         if (!bLoaded)
             return;
 
@@ -112,8 +112,8 @@ private void ddManagedType_SelectedIndexChanged(object sender, EventArgs e)
         if (!bLoaded)
             return;
 
-        if(_column.TypeRequested != null)
-            _column.TypeRequested.CSharpType = (Type) ddManagedType.SelectedItem;
+        if (_column.TypeRequested != null)
+            _column.TypeRequested.CSharpType = (Type)ddManagedType.SelectedItem;
     }
 
     private void n_ValueChanged(object sender, EventArgs e)
@@ -123,11 +123,11 @@ private void n_ValueChanged(object sender, EventArgs e)
         if (!bLoaded)
             return;
 
-        var n = (NumericUpDown) sender;
+        var n = (NumericUpDown)sender;
 
         if (_column.TypeRequested != null)
         {
-            if(n == nLength)
+            if (n == nLength)
                 _column.TypeRequested.Width = (int)n.Value;
 
             if (n == nAfterDecimal)
diff --git a/Rdmp.UI/DataLoadUIs/ModuleUIs/LoadProgressUpdating/DataLoadProgressUpdateInfoUI.cs b/Rdmp.UI/DataLoadUIs/ModuleUIs/LoadProgressUpdating/DataLoadProgressUpdateInfoUI.cs
index 9851afb144..953e6e961e 100644
--- a/Rdmp.UI/DataLoadUIs/ModuleUIs/LoadProgressUpdating/DataLoadProgressUpdateInfoUI.cs
+++ b/Rdmp.UI/DataLoadUIs/ModuleUIs/LoadProgressUpdating/DataLoadProgressUpdateInfoUI.cs
@@ -29,26 +29,28 @@ namespace Rdmp.UI.DataLoadUIs.ModuleUIs.LoadProgressUpdating;
 /// </summary>
 public partial class DataLoadProgressUpdateInfoUI : Form, ICustomUI<DataLoadProgressUpdateInfo>
 {
+    private const string WarningLIVE =
+        "(Must return a single date value.  IMPORTANT: Since you are targetting LIVE, you MUST fully specify all table names with the correct database e.g. [MyDatabase]..[MyTable])";
+
+    private const string WarningRAW =
+        "(Must return a single date value.  IMPORTANT: Since you are targetting RAW, you MUST only specify table names, do not add a database qualifier e.g. [MyTable] NOT [MyLIVEDb]..[MyTable])";
 
-    private const string WarningLIVE = "(Must return a single date value.  IMPORTANT: Since you are targetting LIVE, you MUST fully specify all table names with the correct database e.g. [MyDatabase]..[MyTable])";
-    private const string WarningRAW = "(Must return a single date value.  IMPORTANT: Since you are targetting RAW, you MUST only specify table names, do not add a database qualifier e.g. [MyTable] NOT [MyLIVEDb]..[MyTable])";
-        
     public Scintilla QueryEditor { get; set; }
-        
+
     public DataLoadProgressUpdateInfoUI()
     {
         InitializeComponent();
-            
+
         QueryEditor = new ScintillaTextEditorFactory().Create(null);
 
         pSQL.Controls.Add(QueryEditor);
         QueryEditor.TextChanged += QueryEditor_TextChanged;
 
         ddStrategy.DataSource = Enum.GetValues(typeof(DataLoadProgressUpdateStrategy));
-
     }
 
     public ICatalogueRepository CatalogueRepository { get; set; }
+
     public void SetGenericUnderlyingObjectTo(ICustomUIDrivenClass value)
     {
         SetUnderlyingObjectTo((DataLoadProgressUpdateInfo)value);
@@ -59,10 +61,9 @@ public void SetUnderlyingObjectTo(DataLoadProgressUpdateInfo value)
         if (value == null)
             return;
 
-        QueryEditor.Text  = value.ExecuteScalarSQL;
+        QueryEditor.Text = value.ExecuteScalarSQL;
         tbTimeout.Text = value.Timeout.ToString();
         ddStrategy.SelectedItem = value.Strategy;
-
     }
 
     public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
@@ -71,7 +72,7 @@ public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
         {
             ExecuteScalarSQL = QueryEditor.Text,
             Timeout = _timeout,
-            Strategy = (DataLoadProgressUpdateStrategy) ddStrategy.SelectedItem
+            Strategy = (DataLoadProgressUpdateStrategy)ddStrategy.SelectedItem
         };
 
         return toReturn;
@@ -79,9 +80,10 @@ public ICustomUIDrivenClass GetFinalStateOfUnderlyingObject()
 
     private void ddStrategy_SelectedIndexChanged(object sender, EventArgs e)
     {
-        var selected = (DataLoadProgressUpdateStrategy) ddStrategy.SelectedItem;
+        var selected = (DataLoadProgressUpdateStrategy)ddStrategy.SelectedItem;
 
-        var setVisible = selected is DataLoadProgressUpdateStrategy.ExecuteScalarSQLInLIVE or DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW;
+        var setVisible = selected is DataLoadProgressUpdateStrategy.ExecuteScalarSQLInLIVE
+            or DataLoadProgressUpdateStrategy.ExecuteScalarSQLInRAW;
         pSQL.Visible = setVisible;
         tbTimeout.Visible = setVisible;
         lblTimeout.Visible = setVisible;
@@ -97,7 +99,7 @@ private void ddStrategy_SelectedIndexChanged(object sender, EventArgs e)
 
         CheckObject();
     }
-        
+
     private bool _programaticClose;
 
     private void btnCancel_Click(object sender, EventArgs e)
@@ -113,6 +115,7 @@ private void btnSave_Click(object sender, EventArgs e)
         DialogResult = DialogResult.OK;
         Close();
     }
+
     private void DataLoadProgressUpdateInfoUI_FormClosing(object sender, FormClosingEventArgs e)
     {
         //use pressed Ok or Cancel 
@@ -150,6 +153,7 @@ private void CheckObject()
     }
 
     private int _timeout;
+
     private void tbTimeout_TextChanged(object sender, EventArgs e)
     {
         try
diff --git a/Rdmp.UI/DataQualityUIs/DQEExecutionControlUI.cs b/Rdmp.UI/DataQualityUIs/DQEExecutionControlUI.cs
index aee5465292..4bb9d7fa83 100644
--- a/Rdmp.UI/DataQualityUIs/DQEExecutionControlUI.cs
+++ b/Rdmp.UI/DataQualityUIs/DQEExecutionControlUI.cs
@@ -28,11 +28,11 @@ namespace Rdmp.UI.DataQualityUIs;
 public partial class DQEExecutionControlUI : DQEExecutionControl_Design
 {
     private Catalogue _catalogue;
-        
+
     public DQEExecutionControlUI()
     {
         InitializeComponent();
-            
+
         AssociatedCollection = RDMPCollection.Catalogue;
         checkAndExecuteUI1.CommandGetter += CommandGetter;
         checkAndExecuteUI1.ExecutionFinished += checkAndExecuteUI1_ExecutionFinished;
@@ -41,13 +41,11 @@ public DQEExecutionControlUI()
     private void checkAndExecuteUI1_ExecutionFinished(object sender, ExecutionEventArgs e)
     {
         //refresh
-        SetDatabaseObject(Activator,_catalogue);
+        SetDatabaseObject(Activator, _catalogue);
     }
 
-    private RDMPCommandLineOptions CommandGetter(CommandLineActivity commandLineActivity)
-    {
-        return new DqeOptions { Catalogue = _catalogue.ID.ToString(), Command = commandLineActivity };
-    }
+    private RDMPCommandLineOptions CommandGetter(CommandLineActivity commandLineActivity) => new DqeOptions
+        { Catalogue = _catalogue.ID.ToString(), Command = commandLineActivity };
 
     public override void SetDatabaseObject(IActivateItems activator, Catalogue databaseObject)
     {
@@ -55,20 +53,19 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         _catalogue = databaseObject;
         checkAndExecuteUI1.SetItemActivator(activator);
 
-        CommonFunctionality.Add(new ExecuteCommandConfigureCatalogueValidationRules(Activator).SetTarget(_catalogue), "Validation Rules...");
-        CommonFunctionality.Add(new ExecuteCommandViewDQEResultsForCatalogue(Activator){OverrideCommandName = "View Results..."}.SetTarget(databaseObject));
+        CommonFunctionality.Add(new ExecuteCommandConfigureCatalogueValidationRules(Activator).SetTarget(_catalogue),
+            "Validation Rules...");
+        CommonFunctionality.Add(new ExecuteCommandViewDQEResultsForCatalogue(Activator)
+            { OverrideCommandName = "View Results..." }.SetTarget(databaseObject));
     }
-        
+
     public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
-        base.ConsultAboutClosing(sender,e);
-        checkAndExecuteUI1.ConsultAboutClosing(sender,e);
+        base.ConsultAboutClosing(sender, e);
+        checkAndExecuteUI1.ConsultAboutClosing(sender, e);
     }
 
-    public override string GetTabName()
-    {
-        return $"DQE Execution:{base.GetTabName()}";
-    }
+    public override string GetTabName() => $"DQE Execution:{base.GetTabName()}";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<DQEExecutionControl_Design, UserControl>))]
diff --git a/Rdmp.UI/DataRelease/DataReleaseUI.cs b/Rdmp.UI/DataRelease/DataReleaseUI.cs
index 453d3a2851..3ae2d959df 100644
--- a/Rdmp.UI/DataRelease/DataReleaseUI.cs
+++ b/Rdmp.UI/DataRelease/DataReleaseUI.cs
@@ -61,7 +61,7 @@ public partial class DataReleaseUI : DataReleaseUI_Design
     private IMapsDirectlyToDatabaseTable[] _globals;
     private DataExportChildProvider _childProvider;
 
-    private ArbitraryFolderNode _globalsNode = new(ExtractionDirectory.GLOBALS_DATA_NAME,-500);
+    private ArbitraryFolderNode _globalsNode = new(ExtractionDirectory.GLOBALS_DATA_NAME, -500);
 
 
     private bool _isExecuting;
@@ -97,10 +97,8 @@ private void CheckAndExecuteUI1OnStateChanged(object sender, EventArgs eventArgs
         tlvReleasePotentials.RefreshObjects(tlvReleasePotentials.Objects.Cast<object>().ToArray());
 
         if (_isExecuting && !checkAndExecuteUI1.IsExecuting)
-        {
             //if it was executing before and now no longer executing the status of the ExtractionConfigurations / Projects might have changed
-            Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_project));
-        }
+            Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_project));
 
         _isExecuting = checkAndExecuteUI1.IsExecuting;
     }
@@ -146,10 +144,14 @@ private RDMPCommandLineOptions CommandGetter(CommandLineActivity activityRequest
         {
             Pipeline = _pipelineSelectionUI1.Pipeline == null ? "0" : _pipelineSelectionUI1.Pipeline.ID.ToString(),
             Configurations = ToIdList(
-                _configurations.Where(c => tlvReleasePotentials.IsChecked(c) || tlvReleasePotentials.IsCheckedIndeterminate(c)).Select(ec => ec.ID).ToArray()
+                _configurations
+                    .Where(c => tlvReleasePotentials.IsChecked(c) || tlvReleasePotentials.IsCheckedIndeterminate(c))
+                    .Select(ec => ec.ID).ToArray()
             ),
             SelectedDataSets = ToIdList(
-                _selectedDataSets.All(tlvReleasePotentials.IsChecked) ? Array.Empty<int>() : tlvReleasePotentials.CheckedObjects.OfType<ISelectedDataSets>().Select(sds => sds.ID).ToArray()
+                _selectedDataSets.All(tlvReleasePotentials.IsChecked)
+                    ? Array.Empty<int>()
+                    : tlvReleasePotentials.CheckedObjects.OfType<ISelectedDataSets>().Select(sds => sds.ID).ToArray()
             ),
             Command = activityRequested,
             ReleaseGlobals = tlvReleasePotentials.IsChecked(_globalsNode)
@@ -174,6 +176,7 @@ private IEnumerable ChildrenGetter(object model)
 
         return null;
     }
+
     private bool CanExpandGetter(object model)
     {
         var c = ChildrenGetter(model);
@@ -184,18 +187,20 @@ private bool CanExpandGetter(object model)
     public override void SetDatabaseObject(IActivateItems activator, Project databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
-            
-        if(!_commonFunctionality.IsSetup)
+
+        if (!_commonFunctionality.IsSetup)
         {
-            _commonFunctionality.SetUp(RDMPCollection.None, tlvReleasePotentials, Activator, olvName, null, new RDMPCollectionCommonFunctionalitySettings
-            {
-                AddFavouriteColumn = false,
-                SuppressChildrenAdder = true,
-                AddCheckColumn = false
-            });
+            _commonFunctionality.SetUp(RDMPCollection.None, tlvReleasePotentials, Activator, olvName, null,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    AddFavouriteColumn = false,
+                    SuppressChildrenAdder = true,
+                    AddCheckColumn = false
+                });
 
             _commonFunctionality.SetupColumnTracking(olvName, new Guid("2d09c1d2-b4a7-400f-9003-d23e43cd3d75"));
-            _commonFunctionality.SetupColumnTracking(olvReleaseability, new Guid("2f0ca398-a0d5-4e13-bb40-a2c817d4179a"));
+            _commonFunctionality.SetupColumnTracking(olvReleaseability,
+                new Guid("2f0ca398-a0d5-4e13-bb40-a2c817d4179a"));
         }
 
         _childProvider = (DataExportChildProvider)Activator.CoreChildProvider;
@@ -208,7 +213,9 @@ public override void SetDatabaseObject(IActivateItems activator, Project databas
         if (_pipelineSelectionUI1 == null)
         {
             var context = ReleaseUseCase.DesignTime();
-            _pipelineSelectionUI1 = new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, null, context).Create(Activator,"Release", DockStyle.Fill);
+            _pipelineSelectionUI1 =
+                new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, null, context).Create(
+                    Activator, "Release", DockStyle.Fill);
             _pipelineSelectionUI1.CollapseToSingleLineMode();
             _pipelineSelectionUI1.Pipeline = null;
             _pipelineSelectionUI1.PipelineChanged += ResetChecksUI;
@@ -218,8 +225,9 @@ public override void SetDatabaseObject(IActivateItems activator, Project databas
 
         CommonFunctionality.Add(new ToolStripLabel("Release Pipeline:"));
         CommonFunctionality.Add(_pipelinePanel);
-        CommonFunctionality.AddHelpStringToToolStrip("Release Pipeline", "The sequence of components that will be executed in order to gather the extracted artifacts and assemble them into a single release folder/database. This will start with a source component that gathers the artifacts (from wherever they were extracted to) followed by subsequent components (if any) and then a destination component that generates the final releasable file/folder.");
-            
+        CommonFunctionality.AddHelpStringToToolStrip("Release Pipeline",
+            "The sequence of components that will be executed in order to gather the extracted artifacts and assemble them into a single release folder/database. This will start with a source component that gathers the artifacts (from wherever they were extracted to) followed by subsequent components (if any) and then a destination component that generates the final releasable file/folder.");
+
         checkAndExecuteUI1.SetItemActivator(activator);
 
         var checkedBefore = tlvReleasePotentials.CheckedObjects;
@@ -228,7 +236,7 @@ public override void SetDatabaseObject(IActivateItems activator, Project databas
         tlvReleasePotentials.AddObject(_globalsNode);
         tlvReleasePotentials.AddObject(_project);
         tlvReleasePotentials.ExpandAll();
-            
+
         if (_isFirstTime)
             tlvReleasePotentials.CheckAll();
         else if (checkedBefore.Count > 0)
@@ -246,10 +254,7 @@ public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
         checkAndExecuteUI1.ConsultAboutClosing(sender, e);
     }
 
-    public override string GetTabName()
-    {
-        return $"Release: {_project}";
-    }
+    public override string GetTabName() => $"Release: {_project}";
 
     public void TickAllFor(ExtractionConfiguration configuration)
     {
@@ -272,9 +277,7 @@ private void ResetChecksUI(object sender, EventArgs e)
     }
 }
 
-
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<DataReleaseUI_Design, UserControl>))]
 public abstract class DataReleaseUI_Design : RDMPSingleDatabaseObjectControl<Project>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs b/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs
index cd7334b9cc..e7156736e4 100644
--- a/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs
+++ b/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs
@@ -61,7 +61,7 @@ public ViewSQLAndResultsWithDataGridUI()
         InitializeComponent();
 
 
-        btnExecuteSql.Click += (s,e) => RunQuery();
+        btnExecuteSql.Click += (s, e) => RunQuery();
         btnResetSql.Click += btnResetSql_Click;
 
         dataGridView1.ColumnAdded += (s, e) => e.Column.FillWeight = 1;
@@ -78,18 +78,14 @@ public ViewSQLAndResultsWithDataGridUI()
         var distance = UserSettings.GetSplitterDistance(splitterGuid);
 
         if (distance == -1)
-        {
             splitContainer1.SplitterDistance = (int)(splitContainer1.Height * 0.75f);
-        }
         else
-        {
             // don't let them set the distance to greater/less than the control size
-            splitContainer1.SplitterDistance = Math.Max(5,Math.Min(distance ,(int)(splitContainer1.Height * 0.99f)));
-        }
+            splitContainer1.SplitterDistance = Math.Max(5, Math.Min(distance, (int)(splitContainer1.Height * 0.99f)));
 
-        splitContainer1.SplitterMoved += (s,e)=>
+        splitContainer1.SplitterMoved += (s, e) =>
         {
-            UserSettings.SetSplitterDistance(splitterGuid,splitContainer1.SplitterDistance);
+            UserSettings.SetSplitterDistance(splitterGuid, splitContainer1.SplitterDistance);
         };
     }
 
@@ -104,22 +100,21 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
         //if we don't exist!
         if (_collection.DatabaseObjects.Any())
-            if(!((IRevertable)_collection.DatabaseObjects[0]).Exists())
-            {
+            if (!((IRevertable)_collection.DatabaseObjects[0]).Exists())
                 ParentForm?.Close();
-            }
     }
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
     {
-        _collection = (IViewSQLAndResultsCollection) collection;
+        _collection = (IViewSQLAndResultsCollection)collection;
 
         CommonFunctionality.ClearToolStrip();
 
         btnExecuteSql.Image = activator.CoreIconProvider.GetImage(RDMPConcept.SQL, OverlayKind.Execute).ImageToBitmap();
 
         var overlayer = new IconOverlayProvider();
-        btnResetSql.Image = overlayer.GetOverlay(Image.Load<Rgba32>(FamFamFamIcons.text_align_left), OverlayKind.Problem).ImageToBitmap();
+        btnResetSql.Image = overlayer
+            .GetOverlay(Image.Load<Rgba32>(FamFamFamIcons.text_align_left), OverlayKind.Problem).ImageToBitmap();
 
         if (_scintilla == null)
         {
@@ -140,7 +135,7 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
         }
 
         SetItemActivator(activator);
-            
+
         CommonFunctionality.Add(btnExecuteSql);
         CommonFunctionality.Add(btnResetSql);
 
@@ -149,7 +144,7 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
 
         foreach (var d in _collection.GetToolStripObjects())
             CommonFunctionality.AddToMenu(new ExecuteCommandShow(activator, d, 0, true));
-            
+
         CommonFunctionality.Add(new ToolStripSeparator());
         CommonFunctionality.Add(_serverHeader);
 
@@ -163,7 +158,7 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
         {
             _serverHeader.Text = "Server:Unknown";
         }
-            
+
 
         RefreshUIFromDatabase();
     }
@@ -179,13 +174,10 @@ private void RefreshUIFromDatabase()
             _originalSql = sql;
             //update the editor to show the user the SQL
             _scintilla.Text = sql;
-                
+
             _server.TestConnection();
 
-            if(UserSettings.AutoRunSqlQueries)
-            {
-                LoadDataTableAsync(_server, sql);
-            }
+            if (UserSettings.AutoRunSqlQueries) LoadDataTableAsync(_server, sql);
         }
         catch (Exception ex)
         {
@@ -206,8 +198,8 @@ private void ShowFatal(Exception exception)
         tbErrors.Visible = true;
         tbErrors.Text = exception.Message;
         tbErrors.Dock = DockStyle.Fill;
-            
-        CommonFunctionality.Fatal("Query failed",exception);
+
+        CommonFunctionality.Fatal("Query failed", exception);
     }
 
     private void HideFatal()
@@ -221,7 +213,6 @@ private void HideFatal()
         splitContainer1.Panel2.Controls.Add(dataGridView1);
         splitContainer1.Panel2.Controls.Remove(tbErrors);
         CommonFunctionality.ResetChecks();
-
     }
 
     private void LoadDataTableAsync(DiscoveredServer server, string sql)
@@ -238,7 +229,6 @@ private void LoadDataTableAsync(DiscoveredServer server, string sql)
 
         _task = Task.Factory.StartNew(() =>
         {
-
             var timeout = 1000;
             while (!IsHandleCreated && timeout > 0)
             {
@@ -298,9 +288,7 @@ private static void MorphBinaryColumns(DataTable table)
 
             // fill in values in new column for every row
             foreach (DataRow row in table.Rows)
-            {
                 row[tmpName] = $"0x{string.Join("", ((byte[])row[colName]).Select(b => b.ToString("X2")).ToArray())}";
-            }
 
             // cleanup
             table.Columns.Remove(colName);
@@ -308,20 +296,11 @@ private static void MorphBinaryColumns(DataTable table)
         }
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
-    public string GetTabName()
-    {
-        return _collection.GetTabName();
-    }
+    public string GetTabName() => _collection.GetTabName();
 
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     private void llCancel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
     {
@@ -333,13 +312,13 @@ private void _scintilla_TextChanged(object sender, EventArgs e)
         //enable the reset button only if the SQL has changed (e.g. user is typing stuff)
         btnResetSql.Enabled = !_originalSql.Equals(_scintilla.Text);
     }
-        
+
     private void RunQuery()
     {
         var selected = _scintilla.SelectedText;
 
         //Run the full query or only the selected portion
-        LoadDataTableAsync(_server, string.IsNullOrWhiteSpace(selected)?_scintilla.Text:selected);
+        LoadDataTableAsync(_server, string.IsNullOrWhiteSpace(selected) ? _scintilla.Text : selected);
     }
 
     private void btnResetSql_Click(object sender, EventArgs e)
diff --git a/Rdmp.UI/ExceptionCounterUI.cs b/Rdmp.UI/ExceptionCounterUI.cs
index 259d36e14c..81dd43b0ee 100644
--- a/Rdmp.UI/ExceptionCounterUI.cs
+++ b/Rdmp.UI/ExceptionCounterUI.cs
@@ -21,12 +21,12 @@ namespace Rdmp.UI;
 /// but which should none the less be visible.
 /// </summary>
 [System.ComponentModel.DesignerCategory("")]
-public class ExceptionCounterUI : ToolStripButton,ICheckNotifier
+public class ExceptionCounterUI : ToolStripButton, ICheckNotifier
 {
     private const float EmSize = 8f;
 
-    private ToMemoryCheckNotifier _events = new(new NLogICheckNotifier(true,false));
-        
+    private ToMemoryCheckNotifier _events = new(new NLogICheckNotifier(true, false));
+
     private const float NotifyWidth = 15;
 
     public ExceptionCounterUI()
@@ -35,6 +35,7 @@ public ExceptionCounterUI()
         Enabled = false;
         ToolTipText = "Application Errors";
     }
+
     protected override void OnPaint(PaintEventArgs e)
     {
         e.Graphics.SmoothingMode = SmoothingMode.AntiAlias;
@@ -43,19 +44,19 @@ protected override void OnPaint(PaintEventArgs e)
 
         var exceptionCount = Math.Min(_events.Messages.Count, 10);
 
-        if(exceptionCount > 0)
+        if (exceptionCount > 0)
         {
-            var msg = exceptionCount == 10?"!":exceptionCount.ToString();
+            var msg = exceptionCount == 10 ? "!" : exceptionCount.ToString();
 
-            var f = new Font(FontFamily.GenericMonospace, EmSize,FontStyle.Bold);
+            var f = new Font(FontFamily.GenericMonospace, EmSize, FontStyle.Bold);
 
-            var xStart = (Width - NotifyWidth)/2;
+            var xStart = (Width - NotifyWidth) / 2;
             var yStart = (Height - NotifyWidth) / 2;
 
             var darkRed = new SolidBrush(Color.FromArgb(206, 10, 26));
 
-            e.Graphics.FillEllipse(darkRed, xStart, yStart+1, NotifyWidth-2, NotifyWidth-2);
-            e.Graphics.DrawString(msg,f,Brushes.White,new RectangleF(xStart + 2,yStart,NotifyWidth,NotifyWidth));
+            e.Graphics.FillEllipse(darkRed, xStart, yStart + 1, NotifyWidth - 2, NotifyWidth - 2);
+            e.Graphics.DrawString(msg, f, Brushes.White, new RectangleF(xStart + 2, yStart, NotifyWidth, NotifyWidth));
         }
     }
 
@@ -74,15 +75,15 @@ protected override void OnClick(EventArgs e)
             };
         }
     }
-        
+
     public bool OnCheckPerformed(CheckEventArgs args)
     {
         //handle cross thread invocations
         var p = GetCurrentParent();
 
-        if(p!= null && p.InvokeRequired)
+        if (p != null && p.InvokeRequired)
         {
-            p.BeginInvoke(new MethodInvoker(()=>{OnCheckPerformed(args);}));
+            p.BeginInvoke(new MethodInvoker(() => { OnCheckPerformed(args); }));
             return false;
         }
 
@@ -97,7 +98,7 @@ public bool OnCheckPerformed(CheckEventArgs args)
         {
             //thrown if cross thread
         }
-        return false;
 
+        return false;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/ExtractionInformationUI.cs b/Rdmp.UI/ExtractionUIs/ExtractionInformationUI.cs
index 33d8911d7d..84a76ec44a 100644
--- a/Rdmp.UI/ExtractionUIs/ExtractionInformationUI.cs
+++ b/Rdmp.UI/ExtractionUIs/ExtractionInformationUI.cs
@@ -54,7 +54,7 @@ namespace Rdmp.UI.ExtractionUIs;
 public partial class ExtractionInformationUI : ExtractionInformationUI_Design, ISaveableUI
 {
     public ExtractionInformation ExtractionInformation { get; private set; }
-        
+
     //Editor that user can type into
     private Scintilla QueryEditor;
 
@@ -66,22 +66,26 @@ public partial class ExtractionInformationUI : ExtractionInformationUI_Design, I
     private RAGSmileyToolStrip ragSmiley1;
     private bool _isLoading;
 
-    public ExtractionInformationUI()//For use with SetDatabaseObject
+    public ExtractionInformationUI() //For use with SetDatabaseObject
     {
         InitializeComponent();
-            
+
         if (VisualStudioDesignMode) //stop right here if in designer mode
             return;
 
         //note that we don't add the Any category
-        ddExtractionCategory.DataSource = new object[] { ExtractionCategory.Core, ExtractionCategory.Supplemental, ExtractionCategory.SpecialApprovalRequired, ExtractionCategory.Internal,ExtractionCategory.Deprecated, ExtractionCategory.ProjectSpecific};
+        ddExtractionCategory.DataSource = new object[]
+        {
+            ExtractionCategory.Core, ExtractionCategory.Supplemental, ExtractionCategory.SpecialApprovalRequired,
+            ExtractionCategory.Internal, ExtractionCategory.Deprecated, ExtractionCategory.ProjectSpecific
+        };
 
         ObjectSaverButton1.BeforeSave += BeforeSave;
 
         AssociatedCollection = RDMPCollection.Catalogue;
 
         ragSmiley1 = new RAGSmileyToolStrip(this);
-            
+
         UseCommitSystem = true;
     }
 
@@ -127,12 +131,12 @@ private void QueryEditorOnTextChanged(object sender, EventArgs eventArgs)
         }
     }
 
-    public override void SetDatabaseObject(IActivateItems activator,ExtractionInformation databaseObject)
+    public override void SetDatabaseObject(IActivateItems activator, ExtractionInformation databaseObject)
     {
         _isLoading = true;
         ExtractionInformation = databaseObject;
         base.SetDatabaseObject(activator, databaseObject);
-                        
+
         Setup(databaseObject);
 
         ObjectSaverButton1.BeforeSave += objectSaverButton1OnBeforeSave;
@@ -140,9 +144,11 @@ public override void SetDatabaseObject(IActivateItems activator,ExtractionInform
         CommonFunctionality.Add(ragSmiley1);
 
         CommonFunctionality.AddHelp(cbHashOnDataRelease, "IColumn.HashOnDataRelease", "Hash on Data Release");
-        CommonFunctionality.AddHelp(cbIsExtractionIdentifier, "IColumn.IsExtractionIdentifier", "Is Extraction Identifier");
+        CommonFunctionality.AddHelp(cbIsExtractionIdentifier, "IColumn.IsExtractionIdentifier",
+            "Is Extraction Identifier");
         CommonFunctionality.AddHelp(cbIsPrimaryKey, "IColumn.IsPrimaryKey", "Is Extraction Primary Key");
-        CommonFunctionality.AddHelpString(lblIsTransform, "Transforms Data", "When the extraction SQL is different from the column SQL then it is considered to 'transform' the data.  For example 'UPPER([mydb].[mycol]) as mycol'.  Transforms must always have an alias.");
+        CommonFunctionality.AddHelpString(lblIsTransform, "Transforms Data",
+            "When the extraction SQL is different from the column SQL then it is considered to 'transform' the data.  For example 'UPPER([mydb].[mycol]) as mycol'.  Transforms must always have an alias.");
 
         lblIsTransform.Text = $"Transforms Data: {(ExtractionInformation.IsProperTransform() ? "Yes" : "No")}";
 
@@ -173,7 +179,6 @@ private bool objectSaverButton1OnBeforeSave(DatabaseEntity databaseEntity)
                 // there was a problem working out the runtime name.  Maybe it is missing an alias or whatever
                 // so we can't do this rename - no big deal
             }
-                
         }
 
         return true;
@@ -206,12 +211,13 @@ private void Setup(ExtractionInformation extractionInformation)
 
             _querySyntaxHelper = ExtractionInformation.GetQuerySyntaxHelper();
 
-            QueryEditor = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL, _querySyntaxHelper);
+            QueryEditor = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL,
+                _querySyntaxHelper);
             QueryEditor.TextChanged += QueryEditorOnTextChanged;
 
             var autoComplete = new AutoCompleteProviderWin(_querySyntaxHelper);
             autoComplete.Add(ExtractionInformation.CatalogueItem.Catalogue);
-                
+
             autoComplete.RegisterForEvents(QueryEditor);
             isFirstTimeSetupCalled = false;
         }
@@ -224,18 +230,19 @@ private void Setup(ExtractionInformation extractionInformation)
             ExtractionInformation.SelectSQL = colInfo.Name.Trim();
             ExtractionInformation.SaveToDatabase();
         }
-            
-        QueryEditor.Text = ExtractionInformation.SelectSQL + (!string.IsNullOrWhiteSpace(ExtractionInformation.Alias) ? _querySyntaxHelper.AliasPrefix + ExtractionInformation.Alias : "");
 
-            
-        lblFromTable.Text = colInfo == null?"MISSING ColumnInfo":colInfo.TableInfo.Name;
+        QueryEditor.Text = ExtractionInformation.SelectSQL + (!string.IsNullOrWhiteSpace(ExtractionInformation.Alias)
+            ? _querySyntaxHelper.AliasPrefix + ExtractionInformation.Alias
+            : "");
+
+
+        lblFromTable.Text = colInfo == null ? "MISSING ColumnInfo" : colInfo.TableInfo.Name;
+
 
-            
         if (!pSql.Controls.Contains(QueryEditor))
             pSql.Controls.Add(QueryEditor);
-            
     }
-        
+
     private void cbHashOnDataRelease_CheckedChanged(object sender, EventArgs e)
     {
         //Create alias if it doesn't have one yet
@@ -246,6 +253,7 @@ private void cbHashOnDataRelease_CheckedChanged(object sender, EventArgs e)
             Setup(ExtractionInformation);
         }
     }
+
     /// <summary>
     /// Scans the query text for line comments and replaces any with block comments so the query will still work when flattened to a single line
     /// </summary>
@@ -257,11 +265,13 @@ private void SubstituteQueryEditorTextIfContainsLineComments()
         var commentRegex = new Regex($@"--\s*(?<comment>.*?)\s*{Environment.NewLine}");
         if (commentRegex.Matches(QueryEditor.Text).Count > 0)
         {
-            MessageBox.Show("Line comments are not allowed in the query, these will be automatically converted to block comments.", "Line comments");
+            MessageBox.Show(
+                "Line comments are not allowed in the query, these will be automatically converted to block comments.",
+                "Line comments");
             QueryEditor.Text = commentRegex.Replace(QueryEditor.Text, $"/* ${{comment}} */{Environment.NewLine}");
         }
     }
-        
+
     public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
         e.Cancel = false;
@@ -279,7 +289,7 @@ public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
 
     public override string GetTabName()
     {
-        if(ExtractionInformation == null)
+        if (ExtractionInformation == null)
             return "Loading...";
 
         string name;
@@ -293,10 +303,10 @@ public override string GetTabName()
             name = "unknown";
         }
 
-        return $"{name} ({ ExtractionInformation.CatalogueItem.Catalogue.Name } Extraction Logic)";
+        return $"{name} ({ExtractionInformation.CatalogueItem.Catalogue.Name} Extraction Logic)";
     }
 }
-    
+
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExtractionInformationUI_Design, UserControl>))]
 public abstract class ExtractionInformationUI_Design : RDMPSingleDatabaseObjectControl<ExtractionInformation>
 {
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ExtractionFilterUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ExtractionFilterUI.cs
index 817db10dea..3f3c711e5a 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/ExtractionFilterUI.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/ExtractionFilterUI.cs
@@ -22,8 +22,6 @@
 using Rdmp.UI.ScintillaHelper;
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
-
 using ScintillaNET;
 
 namespace Rdmp.UI.ExtractionUIs.FilterUIs;
@@ -46,7 +44,7 @@ namespace Rdmp.UI.ExtractionUIs.FilterUIs;
 /// <para>If you want to parameterise your query (e.g. a filter for 'Approved name of drug like X') then just type a parameter like you normally would e.g. 'Prescription.DrugName like @drugName'
 /// and save. This will automatically create an empty parameter (See ParameterCollectionUI).</para>
 /// </summary>
-public partial class ExtractionFilterUI :ExtractionFilterUI_Design, ILifetimeSubscriber, ISaveableUI
+public partial class ExtractionFilterUI : ExtractionFilterUI_Design, ILifetimeSubscriber, ISaveableUI
 {
     private IFilter _extractionFilter;
 
@@ -75,19 +73,17 @@ private void QueryEditor_TextChanged(object sender, EventArgs e)
 
     private void FigureOutGlobalsAndAutoComplete()
     {
-
         var factory = new FilterUIOptionsFactory();
         var options = FilterUIOptionsFactory.Create(_extractionFilter);
         GlobalFilterParameters = options.GetGlobalParametersInFilterScope();
 
-        if (QueryEditor != null)
-        {
-            return;
-        }
+        if (QueryEditor != null) return;
 
         var querySyntaxHelper = _extractionFilter.GetQuerySyntaxHelper();
 
-        QueryEditor = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL, querySyntaxHelper);
+        QueryEditor =
+            new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory(), SyntaxLanguage.SQL,
+                querySyntaxHelper);
         QueryEditor.TextChanged += QueryEditor_TextChanged;
         pQueryEditor.Controls.Add(QueryEditor);
         QueryEditor.Dock = DockStyle.Fill;
@@ -122,14 +118,14 @@ private bool BeforeSave(DatabaseEntity databaseEntity)
 
     private void OfferWrappingIfUserIncludesANDOrOR()
     {
-
         if (QueryEditor.Text.ToLower().Contains(" and ") || QueryEditor.Text.ToLower().Contains(" or "))
         {
             //user is creating a filter with boolean logic in it! better wrap their function if it isn't already
-            if(QueryEditor.Text.Trim().StartsWith("("))//it already does so no worries
+            if (QueryEditor.Text.Trim().StartsWith("(")) //it already does so no worries
                 return;
 
-            MessageBox.Show("Your Filter SQL has an AND / OR in it, so we are going to wrap it in brackets for you", "Filter contains AND/OR");
+            MessageBox.Show("Your Filter SQL has an AND / OR in it, so we are going to wrap it in brackets for you",
+                "Filter contains AND/OR");
 
             QueryEditor.Text = $"({QueryEditor.Text})";
         }
@@ -144,10 +140,12 @@ private void SubstituteQueryEditorTextIfContainsLineComments()
         // \s* = don't capture whitespace before or after the comment so we can consistently add a single space front and back for the block comment
         // .*? = lazy capture of comment text, so we don't eat repeated whitespace at the end of the comment (matched by the second \s* outside the capture group)
         var commentRegex = new Regex($@"--\s*(?<comment>.*?)\s*{Environment.NewLine}");
-            
+
         if (commentRegex.Matches(QueryEditor.Text).Count > 0)
         {
-            MessageBox.Show("Line comments are not allowed in the filter query, these will be automatically converted to block comments.", "Line comments");
+            MessageBox.Show(
+                "Line comments are not allowed in the filter query, these will be automatically converted to block comments.",
+                "Line comments");
             QueryEditor.Text = commentRegex.Replace(QueryEditor.Text, $"/* ${{comment}} */{Environment.NewLine}");
         }
     }
@@ -156,7 +154,7 @@ private void SubstituteQueryEditorTextIfContainsLineComments()
     public override void SetDatabaseObject(IActivateItems activator, ConcreteFilter databaseObject)
     {
         _loading = true;
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         Catalogue = databaseObject.GetCatalogue();
         _extractionFilter = databaseObject;
 
@@ -164,27 +162,31 @@ public override void SetDatabaseObject(IActivateItems activator, ConcreteFilter
         try
         {
             var factory = new ParameterCollectionUIOptionsFactory();
-            options = factory.Create(databaseObject,activator.CoreChildProvider);
+            options = factory.Create(databaseObject, activator.CoreChildProvider);
         }
         catch (Exception e)
         {
-            Activator.KillForm(ParentForm,e);
+            Activator.KillForm(ParentForm, e);
             return;
         }
 
         //collapse panel 1 unless there are parameters
-        splitContainer1.Panel1Collapsed = !options.ParameterManager.ParametersFoundSoFarInQueryGeneration.Values.Any(v => v.Any());
+        splitContainer1.Panel1Collapsed =
+            !options.ParameterManager.ParametersFoundSoFarInQueryGeneration.Values.Any(v => v.Any());
 
-        parameterCollectionUI1.SetUp(options,Activator);
+        parameterCollectionUI1.SetUp(options, Activator);
 
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewFilterMatchData(Activator, databaseObject, ViewType.TOP_100));
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewFilterMatchData(Activator, databaseObject, ViewType.Aggregate));
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewFilterMatchData(Activator, databaseObject, ViewType.TOP_100));
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewFilterMatchData(Activator, databaseObject, ViewType.Aggregate));
         CommonFunctionality.AddToMenu(new ExecuteCommandViewFilterMatchGraph(Activator, databaseObject));
         CommonFunctionality.AddToMenu(new ExecuteCommandBrowseLookup(Activator, databaseObject));
-        CommonFunctionality.AddToMenu(new ExecuteCommandPublishFilter(Activator, databaseObject, databaseObject.GetCatalogue()));
+        CommonFunctionality.AddToMenu(new ExecuteCommandPublishFilter(Activator, databaseObject,
+            databaseObject.GetCatalogue()));
 
         FigureOutGlobalsAndAutoComplete();
-            
+
         QueryEditor.Text = _extractionFilter.WhereSQL;
 
         CommonFunctionality.AddChecks(databaseObject);
@@ -202,7 +204,7 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Concre
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbFilterName,"Text","Name",f=>f.Name);
+        Bind(tbFilterName, "Text", "Name", f => f.Name);
         Bind(tbFilterDescription, "Text", "Description", f => f.Description);
         Bind(cbIsMandatory, "Checked", "IsMandatory", f => f.IsMandatory);
     }
@@ -214,7 +216,7 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Concre
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        if(e.Object is not IFilter filter)
+        if (e.Object is not IFilter filter)
             return;
 
         if (filter.Equals(_extractionFilter))
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphObjectCollection.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphObjectCollection.cs
index e7c1d99c35..a7cc18a1c3 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphObjectCollection.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphObjectCollection.cs
@@ -24,7 +24,7 @@ public FilterGraphObjectCollection()
     {
     }
 
-    public FilterGraphObjectCollection(AggregateConfiguration graph, ConcreteFilter filter):this()
+    public FilterGraphObjectCollection(AggregateConfiguration graph, ConcreteFilter filter) : this()
     {
         if (graph.IsCohortIdentificationAggregate)
             throw new ArgumentException(
@@ -35,8 +35,9 @@ public FilterGraphObjectCollection(AggregateConfiguration graph, ConcreteFilter
 
     public AggregateConfiguration GetGraph()
     {
-        return (AggregateConfiguration) DatabaseObjects.Single(o => o is AggregateConfiguration);
+        return (AggregateConfiguration)DatabaseObjects.Single(o => o is AggregateConfiguration);
     }
+
     public IFilter GetFilter()
     {
         return (IFilter)DatabaseObjects.Single(o => o is IFilter);
@@ -46,6 +47,6 @@ public void HandleRefreshObject(RefreshObjectEventArgs e)
     {
         foreach (var o in DatabaseObjects)
             if (o.Equals(e.Object))
-                ((IRevertable) o).RevertToDatabaseState();
+                ((IRevertable)o).RevertToDatabaseState();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphUI.cs
index 8c6e281fc0..fb22d94484 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphUI.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/FilterGraphUI.cs
@@ -29,17 +29,18 @@ public FilterGraphUI()
     {
         InitializeComponent();
     }
-        
+
     protected override AggregateBuilder GetQueryBuilder(AggregateConfiguration aggregateConfiguration)
     {
-        var basicQueryBuilder =  base.GetQueryBuilder(aggregateConfiguration);
+        var basicQueryBuilder = base.GetQueryBuilder(aggregateConfiguration);
 
         var rootContainer = basicQueryBuilder.RootFilterContainer;
 
         //stick our IFilter into the root container (actually create a new root container with our filter in it and move the old root if any into it)
         rootContainer =
-            new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(),rootContainer == null ? null : new[] { rootContainer },
-                new[] {_collection.GetFilter()}, FilterContainerOperation.AND);
+            new SpontaneouslyInventedFilterContainer(new MemoryCatalogueRepository(),
+                rootContainer == null ? null : new[] { rootContainer },
+                new[] { _collection.GetFilter() }, FilterContainerOperation.AND);
 
         basicQueryBuilder.RootFilterContainer = rootContainer;
 
@@ -55,19 +56,14 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
     {
         _collection = (FilterGraphObjectCollection)collection;
         SetItemActivator(activator);
-            
+
         BuildMenu(activator);
 
-        SetAggregate(Activator,_collection.GetGraph());
+        SetAggregate(Activator, _collection.GetGraph());
         LoadGraphAsync();
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
-    public override string GetTabName()
-    {
-        return $"Filter Graph '{_collection.GetFilter()}'";
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
+
+    public override string GetTabName() => $"Filter Graph '{_collection.GetFilter()}'";
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ExtractionFilterParameterSetUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ExtractionFilterParameterSetUI.cs
index e38bac2cc2..61bd90b717 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ExtractionFilterParameterSetUI.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ExtractionFilterParameterSetUI.cs
@@ -26,7 +26,7 @@ namespace Rdmp.UI.ExtractionUIs.FilterUIs.ParameterUIs;
 public partial class ExtractionFilterParameterSetUI : ExtractionFilterParameterSetUI_Design, ISaveableUI
 {
     private ExtractionFilterParameterSet _extractionFilterParameterSet;
-        
+
     public ExtractionFilterParameterSet ExtractionFilterParameterSet
     {
         get => _extractionFilterParameterSet;
@@ -45,7 +45,7 @@ private void RefreshUIFromDatabase()
 
         var factory = new ParameterCollectionUIOptionsFactory();
         var options = ParameterCollectionUIOptionsFactory.Create(ExtractionFilterParameterSet);
-        parameterCollectionUI1.SetUp(options,Activator);
+        parameterCollectionUI1.SetUp(options, Activator);
     }
 
     public ExtractionFilterParameterSetUI()
@@ -55,7 +55,6 @@ public ExtractionFilterParameterSetUI()
 
     private void ExtractionFilterParameterSetUI_Load(object sender, EventArgs e)
     {
-
     }
 
     private void tbName_TextChanged(object sender, EventArgs e)
@@ -76,12 +75,14 @@ private void btnRefreshParameters_Click(object sender, EventArgs e)
 
     public override void SetDatabaseObject(IActivateItems activator, ExtractionFilterParameterSet databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         ExtractionFilterParameterSet = databaseObject;
     }
 }
 
-[TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExtractionFilterParameterSetUI_Design, UserControl>))]
-public abstract class ExtractionFilterParameterSetUI_Design : RDMPSingleDatabaseObjectControl<ExtractionFilterParameterSet>
+[TypeDescriptionProvider(
+    typeof(AbstractControlDescriptionProvider<ExtractionFilterParameterSetUI_Design, UserControl>))]
+public abstract class
+    ExtractionFilterParameterSetUI_Design : RDMPSingleDatabaseObjectControl<ExtractionFilterParameterSet>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs
index e029b3fa07..7da1c5b426 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterCollectionUI.cs
@@ -55,7 +55,7 @@ public ParameterCollectionUI()
     {
         InitializeComponent();
         olvParameterName.GroupKeyGetter += GroupKeyGetter;
-        olvParameters.AboutToCreateGroups +=olvParameters_AboutToCreateGroups;
+        olvParameters.AboutToCreateGroups += olvParameters_AboutToCreateGroups;
         olvParameters.AddDecoration(new EditingCellBorderDecoration { UseLightbox = true });
 
         olvParameterName.ImageGetter += ImageGetter;
@@ -75,11 +75,16 @@ public ParameterCollectionUI()
         miAddNewParameter.Click += miAddParameter_Click;
         miOverrideParameter.Click += miOverride_Click;
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvComment, new Guid("8058e9c5-236e-443a-8586-6a21bf1a4562"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvOwner, new Guid("e2097029-e35f-4d56-a000-e8cca717b9ad"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvValue, new Guid("cfbab41b-8af1-480c-a7a0-0bbf42ee8cb9"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvParameterName, new Guid("eadfd8e8-db88-4632-badc-0c6dbec2f877"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvParameterSQL, new Guid("a9216170-621d-45c6-9d32-9046a054fc0f"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvComment,
+            new Guid("8058e9c5-236e-443a-8586-6a21bf1a4562"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvOwner,
+            new Guid("e2097029-e35f-4d56-a000-e8cca717b9ad"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvValue,
+            new Guid("cfbab41b-8af1-480c-a7a0-0bbf42ee8cb9"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvParameterName,
+            new Guid("eadfd8e8-db88-4632-badc-0c6dbec2f877"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvParameters, olvParameterSQL,
+            new Guid("a9216170-621d-45c6-9d32-9046a054fc0f"));
     }
 
     private object ParameterName_AspectGetter(object rowObject)
@@ -100,13 +105,12 @@ private object ParameterName_AspectGetter(object rowObject)
 
     private void olvParameters_AboutToCreateGroups(object sender, CreateGroupsEventArgs e)
     {
-
         var order = new Dictionary<string, int>
         {
-            {ParameterLevel.Global.ToString(),0},
-            {ParameterLevel.CompositeQueryLevel.ToString(),1},
-            {ParameterLevel.QueryLevel.ToString(),2},
-            {ParameterLevel.TableInfo.ToString(),3}
+            { ParameterLevel.Global.ToString(), 0 },
+            { ParameterLevel.CompositeQueryLevel.ToString(), 1 },
+            { ParameterLevel.QueryLevel.ToString(), 2 },
+            { ParameterLevel.TableInfo.ToString(), 3 }
         };
 
         foreach (var g in e.Groups)
@@ -117,7 +121,6 @@ private void olvParameters_AboutToCreateGroups(object sender, CreateGroupsEventA
             currentGroup.Header = $"{currentGroup.Header} (current)";
 
         e.Groups = e.Groups.OrderBy(g => g.SortValue).ToList();
-
     }
 
     public void Clear()
@@ -132,7 +135,7 @@ public void RefreshParametersFromDatabase()
         olvParameters.ClearObjects();
 
         //add all parameters from all levels
-        foreach (ParameterLevel level in Enum.GetValues(typeof (ParameterLevel)))
+        foreach (ParameterLevel level in Enum.GetValues(typeof(ParameterLevel)))
         {
             var parametersFoundAtThisLevel = Options.ParameterManager.ParametersFoundSoFarInQueryGeneration[level];
 
@@ -145,28 +148,26 @@ public void RefreshParametersFromDatabase()
         parameterEditorScintillaControl1.RegenerateSQL();
 
         UpdateTabVisibility();
-
     }
 
     private void UpdateTabVisibility()
     {
         if (parameterEditorScintillaControl1.IsBroken)
             tabControl1.TabPages.Remove(tpSql);
-        else
-        if (!tabControl1.TabPages.Contains(tpSql))
+        else if (!tabControl1.TabPages.Contains(tpSql))
             tabControl1.TabPages.Add(tpSql);
     }
 
     private void DisableRelevantObjects()
     {
-        if(olvParameters.Objects == null)//there are no parameters
+        if (olvParameters.Objects == null) //there are no parameters
             return;
 
         var parameters = olvParameters.Objects.Cast<ISqlParameter>().ToArray();
         var toDisable = parameters.Where(Options.ShouldBeDisabled);
 
         //These parameters are super special and in fact only have a Value (other properties are inherited from a parent ExtractionFilterParameter) so only let the user edit the Value textbox if there are any of these in the UI
-        if(parameters.Any(p=>p is ExtractionFilterParameterSetValue))
+        if (parameters.Any(p => p is ExtractionFilterParameterSetValue))
         {
             olvComment.IsEditable = false;
             olvParameterSQL.IsEditable = false;
@@ -192,7 +193,7 @@ private void DisableRelevantObjects()
     }
 
 
-    public static Form ShowAsDialog(IActivateItems activator,ParameterCollectionUIOptions options, bool modal = false)
+    public static Form ShowAsDialog(IActivateItems activator, ParameterCollectionUIOptions options, bool modal = false)
     {
         var f = new Form
         {
@@ -202,7 +203,7 @@ public static Form ShowAsDialog(IActivateItems activator,ParameterCollectionUIOp
         f.Width = ui.Width;
         f.Height = ui.Height;
 
-        ui.SetUp(options,activator);
+        ui.SetUp(options, activator);
         ui.Dock = DockStyle.Fill;
         f.Controls.Add(ui);
 
@@ -214,13 +215,13 @@ public static Form ShowAsDialog(IActivateItems activator,ParameterCollectionUIOp
         return f;
     }
 
-    public void SetUp(ParameterCollectionUIOptions options,IActivateItems activator)
+    public void SetUp(ParameterCollectionUIOptions options, IActivateItems activator)
     {
         Options = options;
 
         SetItemActivator(activator);
 
-        hiParameters.SetHelpText("Use Case",options.UseCase);
+        hiParameters.SetHelpText("Use Case", options.UseCase);
 
         parameterEditorScintillaControl1.Options = options;
         RefreshParametersFromDatabase();
@@ -231,7 +232,7 @@ private void miAddParameter_Click(object sender, EventArgs e)
         var r = new Random();
 
 #pragma warning disable SCS0005 // Weak random generator: This is only used to create an initial value for a parameter.
-        var dialog  = new TypeTextOrCancelDialog("Parameter Name", "Name", 100, $"@MyParam{r.Next()}");
+        var dialog = new TypeTextOrCancelDialog("Parameter Name", "Name", 100, $"@MyParam{r.Next()}");
 #pragma warning restore SCS0005 // Weak random generator
         if (dialog.ShowDialog() == DialogResult.OK)
         {
@@ -265,6 +266,7 @@ private void olvParameters_KeyDown(object sender, KeyEventArgs e)
             olvParameters.RemoveObject(d);
             Options.ParameterManager.RemoveParameter((ISqlParameter)d);
         }
+
         // Rebuild once after deleting all objects, instead of after each deletion
         DisableRelevantObjects();
         parameterEditorScintillaControl1.RegenerateSQL();
@@ -278,7 +280,6 @@ private void olvParameters_CellEditFinishing(object sender, CellEditEventArgs e)
         string newParameterName = null;
 
         if (parameter != null)
-        {
             try
             {
                 oldParameterName = parameter.ParameterName;
@@ -288,11 +289,11 @@ private void olvParameters_CellEditFinishing(object sender, CellEditEventArgs e)
                 oldParameterName = null;
             }
 
-        }
-
-        if(e.Column.Index == olvParameterSQL.Index)
-            if (!string.IsNullOrWhiteSpace((string) e.NewValue))
-                e.NewValue = e.NewValue.ToString().TrimEnd(';');//auto trim semicolons we automatically put those in ourselves we don't need user slapping them in too thanks
+        if (e.Column.Index == olvParameterSQL.Index)
+            if (!string.IsNullOrWhiteSpace((string)e.NewValue))
+                e.NewValue =
+                    e.NewValue.ToString()
+                        .TrimEnd(';'); //auto trim semicolons we automatically put those in ourselves we don't need user slapping them in too thanks
 
         e.Column.PutAspectByName(e.RowObject, e.NewValue);
 
@@ -343,7 +344,7 @@ private object GroupKeyGetter(object rowObject)
 
     private void RefreshProblemObjects()
     {
-        olvParameters.RefreshObjects(parameterEditorScintillaControl1.ProblemObjects.Select(kvp=>kvp.Key).ToList());
+        olvParameters.RefreshObjects(parameterEditorScintillaControl1.ProblemObjects.Select(kvp => kvp.Key).ToList());
     }
 
     private void olvParameters_CellToolTipShowing(object sender, ToolTipShowingEventArgs e)
@@ -367,7 +368,8 @@ private void olvParameters_CellToolTipShowing(object sender, ToolTipShowingEvent
         if (Options.IsOverridden(sqlParameter))
         {
             e.Title = "Parameter is overridden by a higher level";
-            e.Text = "You have defined a higher level parameter with the same name/datatype which will override this parameters value during query generation";
+            e.Text =
+                "You have defined a higher level parameter with the same name/datatype which will override this parameters value during query generation";
             return;
         }
 
@@ -380,11 +382,11 @@ private void olvParameters_CellToolTipShowing(object sender, ToolTipShowingEvent
             return;
         }
     }
+
     private string ImageGetter(object rowObject)
     {
         try
         {
-
             var sqlParameter = (ISqlParameter)rowObject;
 
             if (parameterEditorScintillaControl1.ProblemObjects.ContainsKey(sqlParameter))
@@ -393,19 +395,20 @@ private string ImageGetter(object rowObject)
             if (Options.IsOverridden(sqlParameter))
                 return "Overridden.png";
 
-            if(Options.IsHigherLevel(sqlParameter))
+            if (Options.IsHigherLevel(sqlParameter))
                 return "Locked.png";
         }
         catch (Exception)
         {
             return "Warning.png"; //if it crashed trying to get an image then ... bad times return warning
         }
+
         return null;
     }
 
     private static object OwnerAspectGetter(object rowobject)
     {
-        var parameter = (ISqlParameter) rowobject;
+        var parameter = (ISqlParameter)rowobject;
         var owner = parameter.GetOwnerIfAny();
 
         if (owner == null)
@@ -423,7 +426,7 @@ private void olvParameters_SelectedIndexChanged(object sender, EventArgs e)
 
     private bool CanOverride(ISqlParameter sqlParameter)
     {
-        if(sqlParameter != null)
+        if (sqlParameter != null)
             //if it is not already overridden
             if (!Options.IsOverridden(sqlParameter) &&
                 //and it exists at a lower level
@@ -457,5 +460,4 @@ private void olvParameters_CellEditStarting(object sender, CellEditEventArgs e)
         if (e.RowObject is ISqlParameter p && Options.ShouldBeReadOnly(p))
             e.Cancel = true;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaControlUI.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaControlUI.cs
index e86b5d347b..3914c45706 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaControlUI.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaControlUI.cs
@@ -39,7 +39,7 @@ public partial class ParameterEditorScintillaControlUI : RDMPUserControl
 
     public ParameterCollectionUIOptions Options { get; set; }
 
-    public Dictionary<ISqlParameter,Exception> ProblemObjects { get; private set; }
+    public Dictionary<ISqlParameter, Exception> ProblemObjects { get; private set; }
 
     public bool IsBroken { get; private set; }
 
@@ -57,7 +57,7 @@ public ParameterEditorScintillaControlUI()
         QueryEditor.KeyUp += new KeyEventHandler(QueryEditor_KeyUp);
         QueryEditor.MouseUp += new MouseEventHandler(QueryEditor_MouseUp);
 
-        QueryEditor.Leave += (s,e)=>RegenerateSQL();
+        QueryEditor.Leave += (s, e) => RegenerateSQL();
         ProblemObjects = new Dictionary<ISqlParameter, Exception>();
     }
 
@@ -66,10 +66,12 @@ private void QueryEditor_MouseUp(object sender, MouseEventArgs e)
     {
         UpdateEditability();
     }
+
     private void QueryEditor_KeyUp(object sender, KeyEventArgs e)
     {
         UpdateEditability();
     }
+
     private void QueryEditor_KeyDown(object sender, KeyEventArgs e)
     {
         UpdateEditability();
@@ -114,17 +116,17 @@ private void CheckForChanges()
             }
 
             if (changed == FreeTextParameterChangeResult.ChangeAccepted)
-                ParameterChanged(this,section.Parameter);
+                ParameterChanged(this, section.Parameter);
         }
     }
 
     private ParameterEditorScintillaSection GetParameterOnLine(int lineNumber)
     {
-        return Sections.SingleOrDefault(s=>s.IncludesLine(lineNumber));
+        return Sections.SingleOrDefault(s => s.IncludesLine(lineNumber));
     }
 
     private List<ParameterEditorScintillaSection> Sections = new();
-        
+
     /// <summary>
     /// Updates the Sql code for the current state of the <see cref="Options"/> 
     /// </summary>
@@ -147,9 +149,9 @@ public void RegenerateSQL()
             foreach (var parameter in finalParameters)
             {
                 //if it's a user one
-                if(AnyTableSqlParameter.HasProhibitedName(parameter) && !ProblemObjects.ContainsKey(parameter))
-                    ProblemObjects.Add(parameter,new Exception(
-                        $"Parameter name {parameter.ParameterName} is a reserved name for the RDMP software"));//advise them
+                if (AnyTableSqlParameter.HasProhibitedName(parameter) && !ProblemObjects.ContainsKey(parameter))
+                    ProblemObjects.Add(parameter, new Exception(
+                        $"Parameter name {parameter.ParameterName} is a reserved name for the RDMP software")); //advise them
 
                 try
                 {
@@ -165,10 +167,9 @@ public void RegenerateSQL()
 
                 var lineCount = GetLineCount(toAdd);
 
-                Sections.Add(new ParameterEditorScintillaSection(Options.Refactorer,currentLine, currentLine += lineCount - 1, parameter, 
-                        
+                Sections.Add(new ParameterEditorScintillaSection(Options.Refactorer, currentLine,
+                    currentLine += lineCount - 1, parameter,
                     !Options.ShouldBeReadOnly(parameter),
-                        
                     toAdd));
 
                 sql += toAdd;
@@ -176,12 +177,11 @@ public void RegenerateSQL()
             }
 
             QueryEditor.Text = sql.TrimEnd();
-
         }
         catch (Exception ex)
         {
             QueryEditor.Text = ex.ToString();
-                
+
             IsBroken = true;
 
             if (ex is QueryBuildingException exception)
@@ -191,6 +191,7 @@ public void RegenerateSQL()
                 ProblemObjectsFound();
             }
         }
+
         QueryEditor.ReadOnly = true;
 
         var highlighter = new ScintillaLineHighlightingHelper();
@@ -202,12 +203,9 @@ public void RegenerateSQL()
                     ScintillaLineHighlightingHelper.HighlightLine(QueryEditor, i, Color.LightGray);
     }
 
-        
 
     private static int GetLineCount(string s)
     {
         return s.Count(c => c.Equals('\n'));
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaSection.cs b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaSection.cs
index e85b737fb0..877d06b28e 100644
--- a/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaSection.cs
+++ b/Rdmp.UI/ExtractionUIs/FilterUIs/ParameterUIs/ParameterEditorScintillaSection.cs
@@ -21,7 +21,8 @@ public class ParameterEditorScintillaSection
     private readonly ParameterRefactorer _refactorer;
     private IQuerySyntaxHelper _querySyntaxHelper;
 
-    public ParameterEditorScintillaSection( ParameterRefactorer refactorer, int lineStart, int lineEnd, ISqlParameter parameter, bool editable, string originalText)
+    public ParameterEditorScintillaSection(ParameterRefactorer refactorer, int lineStart, int lineEnd,
+        ISqlParameter parameter, bool editable, string originalText)
     {
         _refactorer = refactorer;
         LineStart = lineStart;
@@ -31,7 +32,7 @@ public ParameterEditorScintillaSection( ParameterRefactorer refactorer, int line
         _querySyntaxHelper = parameter.GetQuerySyntaxHelper();
 
         var prototype = ConstantParameter.Parse(originalText, _querySyntaxHelper);
-        if(prototype.Value != parameter.Value)
+        if (prototype.Value != parameter.Value)
             throw new ArgumentException(
                 $"Parameter {parameter} was inconsistent with the SQL passed to us based on QueryBuilder.DeconstructStringIntoParameter, they had different Values");
 
@@ -42,7 +43,6 @@ public ParameterEditorScintillaSection( ParameterRefactorer refactorer, int line
         if (prototype.Comment != parameter.Comment)
             throw new ArgumentException(
                 $"Parameter {parameter} was inconsistent with the SQL passed to us based on QueryBuilder.DeconstructStringIntoParameter, they had different Comment");
-
     }
 
     public int LineStart { get; private set; }
@@ -51,10 +51,7 @@ public ParameterEditorScintillaSection( ParameterRefactorer refactorer, int line
     public ISqlParameter Parameter { get; private set; }
     public bool Editable { get; private set; }
 
-    public bool IncludesLine(int lineNumber)
-    {
-        return lineNumber >= LineStart && lineNumber <= LineEnd;
-    }
+    public bool IncludesLine(int lineNumber) => lineNumber >= LineStart && lineNumber <= LineEnd;
 
     public FreeTextParameterChangeResult CheckForChanges(string sql)
     {
@@ -64,7 +61,7 @@ public FreeTextParameterChangeResult CheckForChanges(string sql)
 
             var newPrototype = ConstantParameter.Parse(sql, _querySyntaxHelper);
 
-            if (string.Equals(newPrototype.Comment, Parameter.Comment)//can be null you see
+            if (string.Equals(newPrototype.Comment, Parameter.Comment) //can be null you see
                 &&
                 string.Equals(newPrototype.Value, Parameter.Value)
                 &&
@@ -80,7 +77,6 @@ public FreeTextParameterChangeResult CheckForChanges(string sql)
 
 
             return FreeTextParameterChangeResult.ChangeAccepted;
-
         }
         catch (Exception)
         {
diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/JoinConfigurationUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/JoinConfigurationUI.cs
index ab0cea3e19..74c67d94dd 100644
--- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/JoinConfigurationUI.cs
+++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/JoinConfigurationUI.cs
@@ -65,7 +65,7 @@ public JoinConfigurationUI()
         olvRightColumns.RowHeight = 19;
         AssociatedCollection = RDMPCollection.Tables;
     }
-        
+
     public override void SetDatabaseObject(IActivateItems activator, TableInfo databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
@@ -76,9 +76,10 @@ public override void SetDatabaseObject(IActivateItems activator, TableInfo datab
         _leftTableInfo = databaseObject;
         tbLeftTableInfo.Text = _leftTableInfo.ToString();
 
-        btnChooseRightTableInfo.Image = activator.CoreIconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Add).ImageToBitmap();
+        btnChooseRightTableInfo.Image = activator.CoreIconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Add)
+            .ImageToBitmap();
         UpdateValidityAssesment();
-            
+
         olvLeftColumns.ClearObjects();
         olvLeftColumns.AddObjects(_leftTableInfo.ColumnInfos);
 
@@ -88,28 +89,24 @@ public override void SetDatabaseObject(IActivateItems activator, TableInfo datab
             pk2.IsValidGetter = c => c.TableInfo_ID == databaseObject.ID;
             pk3.IsValidGetter = c => c.TableInfo_ID == databaseObject.ID;
         }
-
     }
 
     private void btnChooseRightTableInfo_Click(object sender, EventArgs e)
     {
-
         if (Activator.SelectObject(new DialogArgs
                 {
                     TaskDescription = $"Which other table should be joined to '{_leftTableInfo.Name}'?"
                 }, _leftTableInfo.Repository.GetAllObjects<TableInfo>().Where(t => t.ID != _leftTableInfo.ID).ToArray(),
                 out var selected))
-        {
             SetRightTableInfo(selected);
-        }
     }
 
     private void SetRightTableInfo(TableInfo t)
     {
         //it's the same as the last one!
-        if(_rightTableInfo != null && _rightTableInfo.ID == t.ID)
+        if (_rightTableInfo != null && _rightTableInfo.ID == t.ID)
             return;
-            
+
         _rightTableInfo = t;
         tbRightTableInfo.Text = t.ToString();
 
@@ -135,30 +132,34 @@ private void UpdateValidityAssesment(bool actuallyDoIt = false)
         ragSmiley1.Reset();
         try
         {
-            var fks = new ColumnInfo[] {fk1.SelectedColumn, fk2.SelectedColumn, fk3.SelectedColumn}.Where(f => f != null).ToArray();
-            var pks = new ColumnInfo[] { pk1.SelectedColumn, pk2.SelectedColumn, pk3.SelectedColumn }.Where(p => p != null).ToArray();
+            var fks = new ColumnInfo[] { fk1.SelectedColumn, fk2.SelectedColumn, fk3.SelectedColumn }
+                .Where(f => f != null).ToArray();
+            var pks = new ColumnInfo[] { pk1.SelectedColumn, pk2.SelectedColumn, pk3.SelectedColumn }
+                .Where(p => p != null).ToArray();
 
-            if(fk1.SelectedColumn == null || pk1.SelectedColumn == null)
-                throw new Exception("You must specify at least one pair of keys to join on, do this by dragging columns out of the collection into the key boxes");
+            if (fk1.SelectedColumn == null || pk1.SelectedColumn == null)
+                throw new Exception(
+                    "You must specify at least one pair of keys to join on, do this by dragging columns out of the collection into the key boxes");
 
-            if(
+            if (
                 pk2.SelectedColumn == null != (fk2.SelectedColumn == null)
                 ||
                 pk3.SelectedColumn == null != (fk3.SelectedColumn == null))
-                throw new Exception("You must have the same number of primary and foregin keys (they must come in pairs)");
+                throw new Exception(
+                    "You must have the same number of primary and foregin keys (they must come in pairs)");
 
-            if(pks.Any(p => p.TableInfo_ID != _leftTableInfo.ID))
+            if (pks.Any(p => p.TableInfo_ID != _leftTableInfo.ID))
                 throw new Exception("All Primary Keys must come from the Left hand TableInfo");
 
-            if(fks.Any(f => f.TableInfo_ID != _rightTableInfo.ID))
+            if (fks.Any(f => f.TableInfo_ID != _rightTableInfo.ID))
                 throw new Exception("All Foreign Keys must come from the Right hand TableInfo");
 
-                
+
             ExtractionJoinType joinType;
-            if(rbAllLeftHandTableRecords.Checked)
-                joinType = ExtractionJoinType.Right; //confusing I know, basically JoinInfo database record has fk,pk and direction field assuming fk joins via that direction to pk which is the opposite to the layout of this form
-            else
-            if(rbAllRightHandTableRecords.Checked)
+            if (rbAllLeftHandTableRecords.Checked)
+                joinType = ExtractionJoinType
+                    .Right; //confusing I know, basically JoinInfo database record has fk,pk and direction field assuming fk joins via that direction to pk which is the opposite to the layout of this form
+            else if (rbAllRightHandTableRecords.Checked)
                 joinType = ExtractionJoinType.Left;
             else if (rbJoinInner.Checked)
                 joinType = ExtractionJoinType.Inner;
@@ -168,23 +169,26 @@ private void UpdateValidityAssesment(bool actuallyDoIt = false)
             var cataRepo = _leftTableInfo.CatalogueRepository;
 
             for (var i = 0; i < pks.Length; i++)
-                if (cataRepo.GetAllObjects<JoinInfo>().Any(j => j.PrimaryKey_ID == pks[i].ID && j.ForeignKey_ID == fks[i].ID))
+                if (cataRepo.GetAllObjects<JoinInfo>()
+                    .Any(j => j.PrimaryKey_ID == pks[i].ID && j.ForeignKey_ID == fks[i].ID))
                     throw new Exception($"Join already exists between {fks[i]} and {pks[i].ID}");
 
-                
+
             if (actuallyDoIt)
             {
                 for (var i = 0; i < pks.Length; i++)
-                    new JoinInfo(cataRepo,fks[i], pks[i], joinType, tbCollation.Text);
+                    new JoinInfo(cataRepo, fks[i], pks[i], joinType, tbCollation.Text);
 
                 MessageBox.Show("Successfully Created Joins");
-                Activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_leftTableInfo));
+                Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_leftTableInfo));
 
-                foreach (var ui in new[] {pk1, pk2, pk3, fk1, fk2, fk3})
+                foreach (var ui in new[] { pk1, pk2, pk3, fk1, fk2, fk3 })
                     ui.Clear();
             }
             else
+            {
                 btnCreateJoinInfo.Enabled = true;
+            }
         }
         catch (Exception ex)
         {
@@ -197,18 +201,19 @@ private void btnCreateJoinInfo_Click(object sender, EventArgs e)
     {
         UpdateValidityAssesment(true);
     }
-        
+
     private void tbFilterLeft_TextChanged(object sender, EventArgs e)
     {
         olvLeftColumns.UseFiltering = true;
-        olvLeftColumns.ModelFilter = new TextMatchFilter(olvLeftColumns, tbFilterLeft.Text,StringComparison.CurrentCultureIgnoreCase);
+        olvLeftColumns.ModelFilter =
+            new TextMatchFilter(olvLeftColumns, tbFilterLeft.Text, StringComparison.CurrentCultureIgnoreCase);
     }
 
     private void tbFilterRight_TextChanged(object sender, EventArgs e)
     {
         olvRightColumns.UseFiltering = true;
-        olvRightColumns.ModelFilter = new TextMatchFilter(olvRightColumns, tbFilterRight.Text, StringComparison.CurrentCultureIgnoreCase);
-
+        olvRightColumns.ModelFilter = new TextMatchFilter(olvRightColumns, tbFilterRight.Text,
+            StringComparison.CurrentCultureIgnoreCase);
     }
 
     private void rb_CheckedChanged(object sender, EventArgs e)
@@ -232,8 +237,8 @@ private void olvRightColumns_DragEnter(object sender, DragEventArgs e)
     private void olvRightColumns_DragDrop(object sender, DragEventArgs e)
     {
         var tableInfo = GetTableInfoOrNullFromDrag(e);
-            
-        if(tableInfo != null)
+
+        if (tableInfo != null)
             SetRightTableInfo(tableInfo);
     }
 
@@ -255,7 +260,8 @@ private static TableInfo GetTableInfoOrNullFromDrag(DragEventArgs e)
 
     private void tbCollation_Leave(object sender, EventArgs e)
     {
-        if (tbCollation.Text != null && tbCollation.Text.StartsWith("collate", StringComparison.CurrentCultureIgnoreCase))
+        if (tbCollation.Text != null &&
+            tbCollation.Text.StartsWith("collate", StringComparison.CurrentCultureIgnoreCase))
             tbCollation.Text = tbCollation.Text["collate".Length..].Trim();
     }
 
@@ -263,12 +269,12 @@ private void olv_ItemActivate(object sender, EventArgs e)
     {
         var olv = (ObjectListView)sender;
 
-        if(olv.SelectedObject is IMapsDirectlyToDatabaseTable o)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(o));
+        if (olv.SelectedObject is IMapsDirectlyToDatabaseTable o)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(o));
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<JoinConfiguration_Design, UserControl>))]
-public abstract class JoinConfiguration_Design:RDMPSingleDatabaseObjectControl<TableInfo>
+public abstract class JoinConfiguration_Design : RDMPSingleDatabaseObjectControl<TableInfo>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs
index 8fa3cc9e7c..28022f3086 100644
--- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs
+++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/KeyDropLocationUI.cs
@@ -20,7 +20,7 @@ public partial class KeyDropLocationUI : UserControl
 {
     private JoinKeyType _keyType;
     public ColumnInfo SelectedColumn { get; private set; }
-        
+
     public JoinKeyType KeyType
     {
         get => _keyType;
@@ -49,7 +49,7 @@ public KeyDropLocationUI()
         btnClear.Image = FamFamFamIcons.delete.ImageToBitmap();
         btnClear.Enabled = false;
     }
-        
+
     private void tbPk1_DragEnter(object sender, DragEventArgs e)
     {
         e.Effect = DragDropEffects.None;
@@ -59,10 +59,10 @@ private void tbPk1_DragEnter(object sender, DragEventArgs e)
         if (col == null)
             return;
 
-        if(IsValidGetter != null && !IsValidGetter(col))
+        if (IsValidGetter != null && !IsValidGetter(col))
             return;
-            
-        if(col != null)
+
+        if (col != null)
             e.Effect = DragDropEffects.Copy;
     }
 
@@ -103,6 +103,7 @@ public void Clear()
         SelectedColumnChanged?.Invoke();
     }
 }
+
 public enum JoinKeyType
 {
     PrimaryKey,
diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupBrowserUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupBrowserUI.cs
index b88741f7db..ff870f10cb 100644
--- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupBrowserUI.cs
+++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupBrowserUI.cs
@@ -55,7 +55,7 @@ public override void SetDatabaseObject(IActivateItems activator, Lookup database
         }
         catch (System.Exception ex)
         {
-            CommonFunctionality.Fatal("Could not connect to database",ex);
+            CommonFunctionality.Fatal("Could not connect to database", ex);
         }
     }
 
@@ -64,27 +64,28 @@ public string GetCommand()
         var repo = new MemoryCatalogueRepository();
 
         var qb = new QueryBuilder("distinct", null);
-        qb.AddColumn(new ColumnInfoToIColumn(repo,_keyColumn) { Order = 0 });
-        qb.AddColumn(new ColumnInfoToIColumn(repo,_descriptionColumn) { Order = 1 });
+        qb.AddColumn(new ColumnInfoToIColumn(repo, _keyColumn) { Order = 0 });
+        qb.AddColumn(new ColumnInfoToIColumn(repo, _descriptionColumn) { Order = 1 });
         qb.TopX = 100;
 
 
-        var container = new SpontaneouslyInventedFilterContainer(repo,null, null, FilterContainerOperation.AND);
+        var container = new SpontaneouslyInventedFilterContainer(repo, null, null, FilterContainerOperation.AND);
 
-        if(!string.IsNullOrWhiteSpace(tbCode.Text))
+        if (!string.IsNullOrWhiteSpace(tbCode.Text))
         {
-            var codeFilter = new SpontaneouslyInventedFilter(repo,container,
+            var codeFilter = new SpontaneouslyInventedFilter(repo, container,
                 $"{_keyColumn.GetFullyQualifiedName()} LIKE '{tbCode.Text}%'", "Key Starts", "", null);
             container.AddChild(codeFilter);
         }
-            
-        if(!string.IsNullOrWhiteSpace(tbDescription.Text))
+
+        if (!string.IsNullOrWhiteSpace(tbDescription.Text))
         {
-            var codeFilter = new SpontaneouslyInventedFilter(repo,container,
-                $"{_descriptionColumn.GetFullyQualifiedName()} LIKE '%{tbDescription.Text}%'", "Description Contains", "", null);
+            var codeFilter = new SpontaneouslyInventedFilter(repo, container,
+                $"{_descriptionColumn.GetFullyQualifiedName()} LIKE '%{tbDescription.Text}%'", "Description Contains",
+                "", null);
             container.AddChild(codeFilter);
         }
-            
+
         qb.RootFilterContainer = container;
 
         return qb.SQL;
@@ -124,6 +125,6 @@ private void SendQuery()
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<LookupBrowserUI_Design, UserControl>))]
-public abstract class LookupBrowserUI_Design: RDMPSingleDatabaseObjectControl<Lookup>
+public abstract class LookupBrowserUI_Design : RDMPSingleDatabaseObjectControl<Lookup>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.cs
index 15cf7745b0..49b2a86e72 100644
--- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.cs
+++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupConfigurationUI.cs
@@ -75,7 +75,7 @@ public LookupConfigurationUI()
         olvExtractionInformations.IsSimpleDragSource = true;
 
         pk1.KeyType = JoinKeyType.PrimaryKey;
-        pk1.SelectedColumnChanged +=pk1_SelectedColumnChanged;
+        pk1.SelectedColumnChanged += pk1_SelectedColumnChanged;
 
         pk2.KeyType = JoinKeyType.PrimaryKey;
         pk2.SelectedColumnChanged += UpdateValidityAssesment;
@@ -102,12 +102,16 @@ private void UpdateValidityAssesment()
 
     private void fk1_SelectedColumnChanged()
     {
-        SetStage(pk1.SelectedColumn == null ? LookupCreationStage.DragAForeignKey:LookupCreationStage.DragADescription);
+        SetStage(
+            pk1.SelectedColumn == null ? LookupCreationStage.DragAForeignKey : LookupCreationStage.DragADescription);
         UpdateValidityAssesment();
     }
+
     private void pk1_SelectedColumnChanged()
     {
-        SetStage(pk1.SelectedColumn == null ? LookupCreationStage.DragAPrimaryKey : LookupCreationStage.DragAForeignKey);
+        SetStage(pk1.SelectedColumn == null
+            ? LookupCreationStage.DragAPrimaryKey
+            : LookupCreationStage.DragAForeignKey);
         UpdateValidityAssesment();
     }
 
@@ -122,13 +126,15 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         olvDescriptionsColumn.ImageGetter = o => activator.CoreIconProvider.GetImage(o).ImageToBitmap();
 
         //add the currently configured extraction informations in the order they appear in the dataset
-        var allExtractionInformationFromCatalogue = new List<ExtractionInformation>(_catalogue.GetAllExtractionInformation(ExtractionCategory.Any));
+        var allExtractionInformationFromCatalogue =
+            new List<ExtractionInformation>(_catalogue.GetAllExtractionInformation(ExtractionCategory.Any));
         allExtractionInformationFromCatalogue.Sort();
 
         olvExtractionInformations.ClearObjects();
         olvExtractionInformations.AddObjects(allExtractionInformationFromCatalogue.ToArray());
 
-        btnImportNewTableInfo.Image = activator.CoreIconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import).ImageToBitmap();
+        btnImportNewTableInfo.Image = activator.CoreIconProvider.GetImage(RDMPConcept.TableInfo, OverlayKind.Import)
+            .ImageToBitmap();
         toolTip.SetToolTip(btnImportNewTableInfo, "Import new...");
 
         btnPrimaryKeyCompositeHelp.Image = FamFamFamIcons.help.ImageToBitmap();
@@ -141,16 +147,16 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         UpdateValidityAssesment();
     }
 
-    public void SetLookupTableInfo(TableInfo t,bool setComboBox = true)
+    public void SetLookupTableInfo(TableInfo t, bool setComboBox = true)
     {
-        if(t != null && t.IsTableValuedFunction)
+        if (t != null && t.IsTableValuedFunction)
         {
             WideMessageBox.Show("Lookup table not valid",
                 $"Table '{t}' is a TableValuedFunction, you cannot use it as a lookup table");
             return;
         }
 
-        if(setComboBox)
+        if (setComboBox)
             cbxLookup.SelectedItem = t;
 
         olvLookupColumns.ClearObjects();
@@ -170,14 +176,16 @@ public void SetLookupTableInfo(TableInfo t,bool setComboBox = true)
             fk3.IsValidGetter = c => c.TableInfo_ID != t.ID;
         }
         else
+        {
             SetStage(LookupCreationStage.ChooseLookupTable);
+        }
     }
 
     private void btnImportNewTableInfo_Click(object sender, EventArgs e)
     {
-        var importDialog = new ImportSQLTableUI(Activator,false);
+        var importDialog = new ImportSQLTableUI(Activator, false);
 
-        if(importDialog.ShowDialog() == DialogResult.OK)
+        if (importDialog.ShowDialog() == DialogResult.OK)
             if (importDialog.TableInfoCreatedIfAny != null)
                 cbxLookup.SelectedItem = importDialog.TableInfoCreatedIfAny;
     }
@@ -200,7 +208,7 @@ private enum LookupCreationStage
 
     private void LookupConfiguration_Paint(object sender, PaintEventArgs e)
     {
-        var drawTaskListAt = new Point(580,10);
+        var drawTaskListAt = new Point(580, 10);
 
 
         var lines = new[]
@@ -216,9 +224,10 @@ private void LookupConfiguration_Paint(object sender, PaintEventArgs e)
         var lineHeight = e.Graphics.MeasureString(lines[0], Font).Height;
 
         for (var i = 0; i < lines.Length; i++)
-            e.Graphics.DrawString(lines[i], Font, Brushes.Black,new PointF(drawTaskListAt.X, drawTaskListAt.Y + lineHeight*i));
+            e.Graphics.DrawString(lines[i], Font, Brushes.Black,
+                new PointF(drawTaskListAt.X, drawTaskListAt.Y + lineHeight * i));
 
-        int bulletLineIndex = _currentStage switch
+        var bulletLineIndex = _currentStage switch
         {
             LookupCreationStage.ChooseLookupTable => 1,
             LookupCreationStage.DragAPrimaryKey => 2,
@@ -237,18 +246,18 @@ private void LookupConfiguration_Paint(object sender, PaintEventArgs e)
             //0,1
             //offset by the drawing start location + the appropriate line number
 
-            new PointF(drawTaskListAt.X, drawTaskListAt.Y + bulletLineIndex * lineHeight ),
-            new PointF(drawTaskListAt.X + lineHeight/2 , drawTaskListAt.Y + bulletLineIndex * lineHeight  + lineHeight/2),
-            new PointF(drawTaskListAt.X, drawTaskListAt.Y + lineHeight + bulletLineIndex *lineHeight)
+            new PointF(drawTaskListAt.X, drawTaskListAt.Y + bulletLineIndex * lineHeight),
+            new PointF(drawTaskListAt.X + lineHeight / 2,
+                drawTaskListAt.Y + bulletLineIndex * lineHeight + lineHeight / 2),
+            new PointF(drawTaskListAt.X, drawTaskListAt.Y + lineHeight + bulletLineIndex * lineHeight)
         };
 
-        e.Graphics.FillPolygon(Brushes.Black,triangleBasePoints);
-
+        e.Graphics.FillPolygon(Brushes.Black, triangleBasePoints);
     }
 
     private void DrawArrows(Graphics graphics)
     {
-        var arrowPen = new Pen(Color.DarkGray,2);
+        var arrowPen = new Pen(Color.DarkGray, 2);
 
         var capPath = new GraphicsPath();
 
@@ -256,7 +265,7 @@ private void DrawArrows(Graphics graphics)
         capPath.AddLine(new Point(0, 0), new Point(2, -2));
         capPath.AddLine(new Point(2, -2), new Point(0, 0));
         capPath.AddLine(new Point(0, 0), new Point(-2, -2));
-        capPath.AddLine(new Point(-2, -2),new Point(0, 0));
+        capPath.AddLine(new Point(-2, -2), new Point(0, 0));
 
         arrowPen.CustomEndCap = new CustomLineCap(null, capPath);
 
@@ -275,7 +284,8 @@ private void DrawArrows(Graphics graphics)
             case LookupCreationStage.DragAForeignKey:
 
                 DrawCurveWithLabel(
-                    new PointF(olvExtractionInformations.Right + 10, olvExtractionInformations.Bottom - olvExtractionInformations.Height / 10f),
+                    new PointF(olvExtractionInformations.Right + 10,
+                        olvExtractionInformations.Bottom - olvExtractionInformations.Height / 10f),
                     new PointF(olvSelectedDescriptionColumns.Right + 100, olvSelectedDescriptionColumns.Bottom + 200),
                     new PointF(fk1.Right + 500, fk1.Top + 100),
                     new PointF(fk1.Right + 15, fk1.Bottom - 10),
@@ -292,16 +302,18 @@ private void DrawArrows(Graphics graphics)
                 throw new ArgumentOutOfRangeException();
         }
     }
-    private void DrawCurveWithLabel(PointF start, PointF end, string label,Graphics g, Pen p)
+
+    private void DrawCurveWithLabel(PointF start, PointF end, string label, Graphics g, Pen p)
     {
         var w = end.X - start.X;
         var h = end.Y - start.Y;
 
-        DrawCurveWithLabel(start, start with { X = start.X + w },start with { Y = start.Y + h },end,label,g,p);
+        DrawCurveWithLabel(start, start with { X = start.X + w }, start with { Y = start.Y + h }, end, label, g, p);
     }
 
     private bool debugPoints = false;
-    private void DrawCurveWithLabel(PointF start,PointF mid1, PointF mid2, PointF end, string label, Graphics g, Pen p)
+
+    private void DrawCurveWithLabel(PointF start, PointF mid1, PointF mid2, PointF end, string label, Graphics g, Pen p)
     {
         g.DrawBezier(p,
             start,
@@ -311,10 +323,10 @@ private void DrawCurveWithLabel(PointF start,PointF mid1, PointF mid2, PointF en
 
         if (debugPoints)
         {
-            g.FillEllipse(Brushes.Red, start.X -2, start.Y -2, 5, 5);
+            g.FillEllipse(Brushes.Red, start.X - 2, start.Y - 2, 5, 5);
             g.FillEllipse(Brushes.Red, mid1.X - 2, mid1.Y - 2, 5, 5);
             g.FillEllipse(Brushes.Red, mid2.X - 2, mid2.Y - 2, 5, 5);
-            g.FillEllipse(Brushes.Red, end.X - 2, end.Y - 2, 5,5);
+            g.FillEllipse(Brushes.Red, end.X - 2, end.Y - 2, 5, 5);
         }
 
         g.DrawString(label, Font, Brushes.Black, new PointF(start.X, start.Y));
@@ -335,7 +347,7 @@ private void btnPrimaryKeyCompositeHelp_Click(object sender, EventArgs e)
 
     private void olvLookupColumns_CellRightClick(object sender, CellRightClickEventArgs e)
     {
-        if(e.Model is not ColumnInfo c)
+        if (e.Model is not ColumnInfo c)
             return;
 
         e.MenuStrip = new ColumnInfoMenu(new RDMPContextMenuStripArgs(Activator), c);
@@ -343,7 +355,7 @@ private void olvLookupColumns_CellRightClick(object sender, CellRightClickEventA
 
     private void olvSelectedDescriptionColumns_KeyUp(object sender, KeyEventArgs e)
     {
-        if(e.KeyCode == Keys.Delete)
+        if (e.KeyCode == Keys.Delete)
         {
             olvSelectedDescriptionColumns.RemoveObject(olvSelectedDescriptionColumns.SelectedObject);
             UpdateValidityAssesment();
@@ -359,8 +371,8 @@ private void olvSelectedDescriptionColumns_ModelDropped(object sender, ModelDrop
 
     private void olvSelectedDescriptionColumns_ModelCanDrop(object sender, ModelDropEventArgs e)
     {
-        if(e.SourceModels.Count == 1)
-            if(e.SourceModels[0] is ColumnInfo)
+        if (e.SourceModels.Count == 1)
+            if (e.SourceModels[0] is ColumnInfo)
             {
                 var c = e.SourceModels[0] as ColumnInfo;
 
@@ -394,7 +406,10 @@ private void UpdateValidityAssesment(bool actuallyDoIt)
                 throw new Exception("No Foreign key column selected");
 
             var allExtractionInformations = olvExtractionInformations.Objects.Cast<ExtractionInformation>().ToArray();
-            var foreignKeyExtractionInformation = allExtractionInformations.SingleOrDefault(e => e.ColumnInfo != null && e.ColumnInfo.Equals(fk1.SelectedColumn)) ?? throw new Exception("Foreign key column(s) must come from the Catalogue ExtractionInformation columns");
+            var foreignKeyExtractionInformation =
+                allExtractionInformations.SingleOrDefault(e =>
+                    e.ColumnInfo != null && e.ColumnInfo.Equals(fk1.SelectedColumn)) ??
+                throw new Exception("Foreign key column(s) must come from the Catalogue ExtractionInformation columns");
             if (pk2.SelectedColumn == null != (fk2.SelectedColumn == null))
                 throw new Exception("If you want to have secondary joins you must have them in pairs");
 
@@ -439,12 +454,13 @@ private void UpdateValidityAssesment(bool actuallyDoIt)
                 };
 
                 if (p2 != null)
-                    keyPairs.Add(Tuple.Create(f2,p2));
+                    keyPairs.Add(Tuple.Create(f2, p2));
 
-                if(p3 != null)
-                    keyPairs.Add(Tuple.Create(f3,p3));
+                if (p3 != null)
+                    keyPairs.Add(Tuple.Create(f3, p3));
 
-                var cmd = new ExecuteCommandCreateLookup(Activator.RepositoryLocator.CatalogueRepository,foreignKeyExtractionInformation, descs,
+                var cmd = new ExecuteCommandCreateLookup(Activator.RepositoryLocator.CatalogueRepository,
+                    foreignKeyExtractionInformation, descs,
                     keyPairs, tbCollation.Text, alsoCreateExtractionInformation);
 
                 cmd.Execute();
@@ -463,10 +479,9 @@ private void UpdateValidityAssesment(bool actuallyDoIt)
 
                 olvSelectedDescriptionColumns.ClearObjects();
                 SetStage(LookupCreationStage.DragAPrimaryKey);
-
             }
-            btnCreateLookup.Enabled = true;
 
+            btnCreateLookup.Enabled = true;
         }
         catch (Exception e)
         {
@@ -475,32 +490,27 @@ private void UpdateValidityAssesment(bool actuallyDoIt)
 
             ragSmiley1.Fatal(e);
         }
-
     }
 
-    public override string GetTabName()
-    {
-        return $"Add Lookup ({base.GetTabName()})";
-    }
+    public override string GetTabName() => $"Add Lookup ({base.GetTabName()})";
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         olvExtractionInformations.UseFiltering = true;
-        olvExtractionInformations.ModelFilter = new TextMatchFilter(olvExtractionInformations,tbFilter.Text);
+        olvExtractionInformations.ModelFilter = new TextMatchFilter(olvExtractionInformations, tbFilter.Text);
     }
 
     private void olv_ItemActivate(object sender, EventArgs e)
     {
         var olv = (ObjectListView)sender;
 
-        if(olv.SelectedObject is IMapsDirectlyToDatabaseTable o)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(o));
-
+        if (olv.SelectedObject is IMapsDirectlyToDatabaseTable o)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(o));
     }
 
     private void cbxLookup_SelectedItemChanged(object sender, EventArgs e)
     {
-        SetLookupTableInfo((TableInfo) cbxLookup.SelectedItem,false);
+        SetLookupTableInfo((TableInfo)cbxLookup.SelectedItem, false);
     }
 }
 
diff --git a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupUI.cs b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupUI.cs
index df59739e85..f8ec00c3e3 100644
--- a/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupUI.cs
+++ b/Rdmp.UI/ExtractionUIs/JoinsAndLookups/LookupUI.cs
@@ -26,15 +26,12 @@ public partial class LookupUI : LookupUI_Design
     public LookupUI()
     {
         InitializeComponent();
-            
+
         olvCompositeJoinColumn.ImageGetter = ImageGetter;
         olvExtractionInformationName.ImageGetter = ImageGetter;
     }
 
-    private Bitmap ImageGetter(object rowObject)
-    {
-        return Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
-    }
+    private Bitmap ImageGetter(object rowObject) => Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
 
     public override void SetDatabaseObject(IActivateItems activator, Lookup databaseObject)
     {
@@ -59,7 +56,8 @@ private void UpdateTreeViews()
         olvCompositeJoins.ClearObjects();
         olvExtractionDescriptions.ClearObjects();
 
-        var eis = Activator.CoreChildProvider.AllExtractionInformations.Where(ei => ei.CatalogueItem.ColumnInfo_ID == _lookup.Description_ID).ToArray();
+        var eis = Activator.CoreChildProvider.AllExtractionInformations
+            .Where(ei => ei.CatalogueItem.ColumnInfo_ID == _lookup.Description_ID).ToArray();
         olvExtractionDescriptions.AddObjects(eis);
 
         olvCompositeJoins.AddObjects(_lookup.GetSupplementalJoins().ToArray());
@@ -67,19 +65,17 @@ private void UpdateTreeViews()
 
     private void label2_Click(object sender, EventArgs e)
     {
-
     }
 
     private void olvExtractionDescriptions_ItemActivate(object sender, EventArgs e)
     {
-        if(olvExtractionDescriptions.SelectedObject is ExtractionInformation ei)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(ei));
-
+        if (olvExtractionDescriptions.SelectedObject is ExtractionInformation ei)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(ei));
     }
 
     private void olv_KeyUp(object sender, KeyEventArgs e)
     {
-        if(((ObjectListView)sender).SelectedObject is IDeleteable d)
+        if (((ObjectListView)sender).SelectedObject is IDeleteable d)
         {
             Activator.DeleteWithConfirmation(d);
             UpdateTreeViews();
diff --git a/Rdmp.UI/ExtractionUIs/ReOrderCatalogueItemsUI.cs b/Rdmp.UI/ExtractionUIs/ReOrderCatalogueItemsUI.cs
index 3ad9cf0ef4..104162ffce 100644
--- a/Rdmp.UI/ExtractionUIs/ReOrderCatalogueItemsUI.cs
+++ b/Rdmp.UI/ExtractionUIs/ReOrderCatalogueItemsUI.cs
@@ -48,6 +48,7 @@ public partial class ReOrderCatalogueItemsUI : ReOrderCatalogueItems_Design
     /// This is a collection of all the items found in the desired order and their offset in the desired order relative to the first one
     /// </summary>
     private List<ExtractionInformation> itemsToReOrderAndOffsetRelativeToFirst;
+
     private List<int> desiredColumnIndexesNotFound;
     private int indexOfStartOfReordingInNewOrderListbox;
 
@@ -60,10 +61,12 @@ public ReOrderCatalogueItemsUI()
             "Instructions: In simple mode you can view your columns and drag and drop them to reorder them.  In Advanced mode you can also Paste (Ctrl + V)  a list of column names into Desired Order (don't worry about trimming commas or table prefixes etc).  The first item in the list should be the point at which you want to start reordering at e.g. CHI or the last record if you want to move columns to the end then paste in the rest of the columns that you want to move after this first item."
         );
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvExtractionInformations,olvColumns, new Guid("35946a6e-ebe4-496a-a944-1ddb10b5f8c5"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvExtractionInformations, olvOrder, new Guid("d11d4b84-2464-4254-a3cb-b656c55dd0fc"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvExtractionInformations, olvColumns,
+            new Guid("35946a6e-ebe4-496a-a944-1ddb10b5f8c5"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvExtractionInformations, olvOrder,
+            new Guid("d11d4b84-2464-4254-a3cb-b656c55dd0fc"));
 
-        lbDesiredOrder.SelectedIndexChanged += (s,e)=>lbDesiredOrder.Refresh();
+        lbDesiredOrder.SelectedIndexChanged += (s, e) => lbDesiredOrder.Refresh();
     }
 
     public override void SetDatabaseObject(IActivateItems activator, Catalogue databaseObject)
@@ -91,33 +94,29 @@ private void RefreshUIFromDatabase()
     private void lbDesiredOrder_KeyUp(object sender, KeyEventArgs e)
     {
         if (e.KeyCode == Keys.Delete)
-        {
             lock (oDrawLock)
             {
-                var toDelete = lbDesiredOrder.SelectedIndices.Cast<int>().OrderByDescending(i=>i).ToArray();
+                var toDelete = lbDesiredOrder.SelectedIndices.Cast<int>().OrderByDescending(i => i).ToArray();
 
                 foreach (var r in toDelete)
                     lbDesiredOrder.Items.RemoveAt(r);
 
                 RecomputeOrderAndHighlight();
             }
-        }
-        else
-        if (e.KeyCode == Keys.V && e.Control)
-        {
+        else if (e.KeyCode == Keys.V && e.Control)
             lock (oDrawLock)
             {
-                lbDesiredOrder.Items.AddRange(UsefulStuff.GetArrayOfColumnNamesFromStringPastedInByUser(Clipboard.GetText()).ToArray());
+                lbDesiredOrder.Items.AddRange(UsefulStuff
+                    .GetArrayOfColumnNamesFromStringPastedInByUser(Clipboard.GetText()).ToArray());
                 RecomputeOrderAndHighlight();
             }
-        }
     }
-        
+
     private void RecomputeOrderAndHighlight()
     {
         WorkOutReOrderVariables();
 
-        WorkOutNewOrderAndAddToNewOrderListbox(); 
+        WorkOutNewOrderAndAddToNewOrderListbox();
 
         olvExtractionInformations.Invalidate();
     }
@@ -140,14 +139,15 @@ private void WorkOutReOrderVariables()
 
         //find the location of the first item in the desired order
         var extractionInformations = olvExtractionInformations.Objects.Cast<ExtractionInformation>().ToArray();
-            
+
         for (var i = 0; i < extractionInformations.Length; i++)
         {
             var extractionInformation = extractionInformations[i];
 
             //if either the runtime name or the display (UI) name matches then it is found - may be both of these are the same value sometimes
             //but sometimes people give things wierdo names eh
-            if (extractionInformation.GetRuntimeName().ToLower().Equals(startReorderingHere.ToLower()) || extractionInformation.ToString().ToLower().Equals(startReorderingHere.ToLower()))
+            if (extractionInformation.GetRuntimeName().ToLower().Equals(startReorderingHere.ToLower()) ||
+                extractionInformation.ToString().ToLower().Equals(startReorderingHere.ToLower()))
                 currentOrderStartReorderAtIndex = i;
         }
 
@@ -162,7 +162,6 @@ private void WorkOutReOrderVariables()
             var bFound = false;
 
             foreach (ExtractionInformation info in olvExtractionInformations.Objects)
-            {
                 //if either the runtime name or the display (UI) name matches then it is found - may be both of these are the same value sometimes
                 //but sometimes people give things wierdo names eh
                 if (info.GetRuntimeName().ToLower().Equals(lbDesiredOrder.Items[i].ToString().ToLower())
@@ -171,7 +170,6 @@ private void WorkOutReOrderVariables()
                     bFound = true;
                     itemsToReOrderAndOffsetRelativeToFirst.Add(info);
                 }
-            }
 
             if (!bFound)
                 desiredColumnIndexesNotFound.Add(i);
@@ -185,7 +183,7 @@ private void WorkOutNewOrderAndAddToNewOrderListbox()
         var extractionInformations = olvExtractionInformations.Objects.Cast<ExtractionInformation>().ToArray();
 
         //for all the things that appear above the thing the user wants first in his dream order
-        for (var i = 0;i < currentOrderStartReorderAtIndex;i++)
+        for (var i = 0; i < currentOrderStartReorderAtIndex; i++)
         {
             var considerMoving = extractionInformations[i];
 
@@ -201,7 +199,7 @@ private void WorkOutNewOrderAndAddToNewOrderListbox()
         //move the first one in the users dream order across
         lbNewOrder.Items.Add(extractionInformations[currentOrderStartReorderAtIndex]);
         //record the location of the 'start reordering at' item in the new listbox so we can highlight it in the draw method
-        indexOfStartOfReordingInNewOrderListbox = lbNewOrder.Items.Count-1;
+        indexOfStartOfReordingInNewOrderListbox = lbNewOrder.Items.Count - 1;
 
         //move everything in the users dream list
         foreach (var extractionInformation in itemsToReOrderAndOffsetRelativeToFirst)
@@ -226,7 +224,7 @@ private void lbCurrentOrder_DrawItem(object sender, DrawItemEventArgs e)
         {
             var listBox = sender as ListBox;
 
-            if(e.Index == -1)
+            if (e.Index == -1)
                 return;
 
             /*var extractionInformations = olvCurrentOrder.Objects.Cast<ExtractionInformation>().ToArray();
@@ -246,42 +244,41 @@ private void lbCurrentOrder_DrawItem(object sender, DrawItemEventArgs e)
             {
                 if (e.Index == indexOfStartOfReordingInNewOrderListbox)
                     e.Graphics.FillRectangle(new SolidBrush(Color.LawnGreen), e.Bounds);
-                else
-                if (itemsToReOrderAndOffsetRelativeToFirst != null 
-                    && e.Index <= itemsToReOrderAndOffsetRelativeToFirst.Count + indexOfStartOfReordingInNewOrderListbox
-                    && e.Index > indexOfStartOfReordingInNewOrderListbox)
+                else if (itemsToReOrderAndOffsetRelativeToFirst != null
+                         && e.Index <= itemsToReOrderAndOffsetRelativeToFirst.Count +
+                         indexOfStartOfReordingInNewOrderListbox
+                         && e.Index > indexOfStartOfReordingInNewOrderListbox)
                     e.Graphics.FillRectangle(new SolidBrush(Color.Purple), e.Bounds);
                 else
                     e.Graphics.FillRectangle(new SolidBrush(listBox.BackColor), e.Bounds);
-                
             }
 
-            e.Graphics.DrawString(listBox.Items[e.Index].ToString(), lbDesiredOrder.Font, new SolidBrush(Color.Black), e.Bounds);
-                
+            e.Graphics.DrawString(listBox.Items[e.Index].ToString(), lbDesiredOrder.Font, new SolidBrush(Color.Black),
+                e.Bounds);
         }
     }
 
     private object oDrawLock = new();
-        
+
 
     private void lbDesiredOrder_DrawItem(object sender, DrawItemEventArgs e)
     {
         lock (oDrawLock)
         {
-            if(e.Index == -1)
+            if (e.Index == -1)
                 return;
 
-            if (lbDesiredOrder.SelectedIndex == e.Index || lbDesiredOrder.SelectedIndices.Contains(e.Index) || desiredColumnIndexesNotFound == null)
-                e.Graphics.FillRectangle(new SolidBrush(SystemColors.Highlight),e.Bounds );
-            else
-            if(desiredColumnIndexesNotFound.Contains(e.Index))
-                e.Graphics.FillRectangle(new SolidBrush(Color.Red),e.Bounds);
+            if (lbDesiredOrder.SelectedIndex == e.Index || lbDesiredOrder.SelectedIndices.Contains(e.Index) ||
+                desiredColumnIndexesNotFound == null)
+                e.Graphics.FillRectangle(new SolidBrush(SystemColors.Highlight), e.Bounds);
+            else if (desiredColumnIndexesNotFound.Contains(e.Index))
+                e.Graphics.FillRectangle(new SolidBrush(Color.Red), e.Bounds);
             else
-                e.Graphics.FillRectangle(new SolidBrush(lbDesiredOrder.BackColor),e.Bounds );
+                e.Graphics.FillRectangle(new SolidBrush(lbDesiredOrder.BackColor), e.Bounds);
 
-            e.Graphics.DrawString(lbDesiredOrder.Items[e.Index] as string,lbDesiredOrder.Font,new SolidBrush(lbDesiredOrder.ForeColor),e.Bounds );  
+            e.Graphics.DrawString(lbDesiredOrder.Items[e.Index] as string, lbDesiredOrder.Font,
+                new SolidBrush(lbDesiredOrder.ForeColor), e.Bounds);
         }
-            
     }
 
     private void btnSaveNewOrder_Click(object sender, EventArgs e)
@@ -294,12 +291,13 @@ private void btnSaveNewOrder_Click(object sender, EventArgs e)
 
         for (var i = 0; i < lbNewOrder.Items.Count; i++)
         {
-            var info = (ExtractionInformation) lbNewOrder.Items[i];
+            var info = (ExtractionInformation)lbNewOrder.Items[i];
             info.Order = i + 1;
             info.SaveToDatabase();
         }
+
         RefreshUIFromDatabase();
-            
+
         MessageBox.Show("Reorder Applied");
         ClearAdvancedListboxes();
     }
@@ -315,13 +313,10 @@ private void olvExtractionInformations_ModelCanDrop(object sender, ModelDropEven
             return;
         }
 
-        if (e.DropTargetLocation != DropTargetLocation.AboveItem && e.DropTargetLocation != DropTargetLocation.BelowItem)
-        {
-            return;
-        }
+        if (e.DropTargetLocation != DropTargetLocation.AboveItem &&
+            e.DropTargetLocation != DropTargetLocation.BelowItem) return;
 
         e.Effect = DragDropEffects.Move;
-
     }
 
     private void olvExtractionInformations_ModelDropped(object sender, ModelDropEventArgs e)
@@ -335,9 +330,9 @@ private void olvExtractionInformations_ModelDropped(object sender, ModelDropEven
 
         var idxDrop = currentOrder.IndexOf(beingDroppedOnto);
 
-        if(idxDrop == -1)
+        if (idxDrop == -1)
             return;
-            
+
         if (e.DropTargetLocation == DropTargetLocation.AboveItem)
             currentOrder.Insert(idxDrop, beingDragged);
         else if (e.DropTargetLocation == DropTargetLocation.BelowItem)
@@ -364,7 +359,6 @@ private void rbSimple_CheckedChanged(object sender, EventArgs e)
     private void btnClear_Click(object sender, EventArgs e)
     {
         ClearAdvancedListboxes();
-
     }
 
     private void ClearAdvancedListboxes()
@@ -375,12 +369,12 @@ private void ClearAdvancedListboxes()
 
     private void olvExtractionInformations_ItemActivate(object sender, EventArgs e)
     {
-        if(olvExtractionInformations.SelectedObject is IMapsDirectlyToDatabaseTable o)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(o){ExpansionDepth = 1});
+        if (olvExtractionInformations.SelectedObject is IMapsDirectlyToDatabaseTable o)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(o) { ExpansionDepth = 1 });
     }
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ReOrderCatalogueItems_Design, UserControl>))]
-public abstract class ReOrderCatalogueItems_Design:RDMPSingleDatabaseObjectControl<Catalogue>
+public abstract class ReOrderCatalogueItems_Design : RDMPSingleDatabaseObjectControl<Catalogue>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs b/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs
index f7517ecb6a..939e400b3d 100644
--- a/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs
+++ b/Rdmp.UI/ExtractionUIs/ViewExtractionSqlUI.cs
@@ -41,18 +41,19 @@ public partial class ViewExtractionSqlUI : ViewExtractionSql_Design
 {
     private Catalogue _catalogue;
     private ToolStripButton rbCore = new("Core");
-    private ToolStripButton rbSupplemental = new("Supplemental"){Checked = true};
+    private ToolStripButton rbSupplemental = new("Supplemental") { Checked = true };
     private ToolStripButton rbSpecialApproval = new("Special Approval");
     private ToolStripButton rbInternal = new("Internal");
-    private ToolStripButton btnRun = new("Run",CatalogueIcons.ExecuteArrow.ImageToBitmap());
-        
+    private ToolStripButton btnRun = new("Run", CatalogueIcons.ExecuteArrow.ImageToBitmap());
+
     private Scintilla QueryPreview;
+
     public ViewExtractionSqlUI()
     {
         InitializeComponent();
-            
+
         #region Query Editor setup
-            
+
         QueryPreview = new ScintillaTextEditorFactory().Create();
         QueryPreview.ReadOnly = true;
 
@@ -76,19 +77,16 @@ public ViewExtractionSqlUI()
     private void rb_Click(object sender, EventArgs e)
     {
         //treat as radio button
-        foreach (var item in new[] {rbCore, rbSupplemental, rbSpecialApproval, rbInternal})
+        foreach (var item in new[] { rbCore, rbSupplemental, rbSpecialApproval, rbInternal })
             item.Checked = item == sender;
 
         RefreshUIFromDatabase();
     }
 
-    private Bitmap ImageGetter(object rowObject)
-    {
-        return Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
-    }
+    private Bitmap ImageGetter(object rowObject) => Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
 
     private bool bLoading = false;
-        
+
 
     private void RefreshUIFromDatabase()
     {
@@ -103,10 +101,10 @@ private void RefreshUIFromDatabase()
             bLoading = true;
 
             var extractionInformations = GetSelectedExtractionInformations();
-                
+
             //add the available filters
             SetupAvailableFilters(extractionInformations);
-                
+
             //generate SQL -- only make it readonly after setting the .Text otherwise it ignores the .Text setting even though it is programatical
             QueryPreview.ReadOnly = false;
 
@@ -119,14 +117,13 @@ private void RefreshUIFromDatabase()
         }
         catch (Exception ex)
         {
-            CommonFunctionality.ScintillaGoRed(QueryPreview,ex);
-            CommonFunctionality.Fatal(ex.Message,ex);
+            CommonFunctionality.ScintillaGoRed(QueryPreview, ex);
+            CommonFunctionality.Fatal(ex.Message, ex);
         }
         finally
         {
             bLoading = false;
         }
-
     }
 
     private void SetupAvailableFilters(List<ExtractionInformation> extractionInformations)
@@ -159,16 +156,17 @@ private List<ExtractionInformation> GetSelectedExtractionInformations()
             extractionInformations.AddRange(_catalogue.GetAllExtractionInformation(ExtractionCategory.Core));
 
             if (rbSupplemental.Checked || rbSpecialApproval.Checked)
-                extractionInformations.AddRange(_catalogue.GetAllExtractionInformation(ExtractionCategory.Supplemental));
+                extractionInformations.AddRange(
+                    _catalogue.GetAllExtractionInformation(ExtractionCategory.Supplemental));
 
             if (rbSpecialApproval.Checked)
-                extractionInformations.AddRange(_catalogue.GetAllExtractionInformation(ExtractionCategory.SpecialApprovalRequired));
-
+                extractionInformations.AddRange(
+                    _catalogue.GetAllExtractionInformation(ExtractionCategory.SpecialApprovalRequired));
         }
 
         //sort by Default Order
         extractionInformations.Sort();
-                
+
         //add to listbox
         olvExtractionInformations.ClearObjects();
         olvExtractionInformations.AddObjects(extractionInformations.ToArray());
@@ -193,14 +191,16 @@ private void BtnRun_Click(object sender, EventArgs e)
 
     public override void SetDatabaseObject(IActivateItems activator, Catalogue databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         _catalogue = databaseObject;
         RefreshUIFromDatabase();
 
         rbCore.Image = CatalogueIcons.ExtractionInformation.ImageToBitmap();
         rbSupplemental.Image = CatalogueIcons.ExtractionInformation_Supplemental.ImageToBitmap();
         rbSpecialApproval.Image = CatalogueIcons.ExtractionInformation_SpecialApproval.ImageToBitmap();
-        rbInternal.Image = activator.CoreIconProvider.GetImage(SixLabors.ImageSharp.Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval), OverlayKind.Internal).ImageToBitmap();
+        rbInternal.Image = activator.CoreIconProvider
+            .GetImage(SixLabors.ImageSharp.Image.Load<Rgba32>(CatalogueIcons.ExtractionInformation_SpecialApproval),
+                OverlayKind.Internal).ImageToBitmap();
 
         CommonFunctionality.Add(rbCore);
         CommonFunctionality.Add(rbSupplemental);
@@ -209,18 +209,14 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         CommonFunctionality.Add(btnRun);
 
         CommonFunctionality.AddToMenu(new ExecuteCommandReOrderColumns(Activator, _catalogue));
-            
-    }
-        
-    public override string GetTabName()
-    {
-        return $"{base.GetTabName()}(SQL)";
     }
 
+    public override string GetTabName() => $"{base.GetTabName()}(SQL)";
+
     private void olv_ItemActivate(object sender, EventArgs e)
     {
-        if(((ObjectListView)sender).SelectedObject is IMapsDirectlyToDatabaseTable o)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(o){ExpansionDepth = 1});
+        if (((ObjectListView)sender).SelectedObject is IMapsDirectlyToDatabaseTable o)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(o) { ExpansionDepth = 1 });
     }
 
     private void olvFilters_ItemChecked(object sender, ItemCheckedEventArgs e)
@@ -228,6 +224,7 @@ private void olvFilters_ItemChecked(object sender, ItemCheckedEventArgs e)
         RefreshUIFromDatabase();
     }
 }
+
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ViewExtractionSql_Design, UserControl>))]
 public abstract class ViewExtractionSql_Design : RDMPSingleDatabaseObjectControl<Catalogue>
 {
diff --git a/Rdmp.UI/FormsHelper.cs b/Rdmp.UI/FormsHelper.cs
index cbe202c9c9..9826a32e38 100644
--- a/Rdmp.UI/FormsHelper.cs
+++ b/Rdmp.UI/FormsHelper.cs
@@ -30,9 +30,8 @@ public static Rectangle GetVisibleArea(this Control c)
             rect = Rectangle.Intersect(rect, c.RectangleToScreen(c.ClientRectangle));
             c = c.Parent;
         }
+
         rect = originalControl.RectangleToClient(rect);
         return rect;
     }
-        
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/IconFactory.cs b/Rdmp.UI/IconFactory.cs
index d92779d45d..8b774b2251 100644
--- a/Rdmp.UI/IconFactory.cs
+++ b/Rdmp.UI/IconFactory.cs
@@ -20,10 +20,10 @@ public class IconFactory
     private readonly ConcurrentDictionary<Image<Rgba32>, Icon> _iconDictionary =
         new();
 
-    public static IconFactory Instance= new();
+    public static IconFactory Instance = new();
+
     private IconFactory()
     {
-
     }
 
     /// <summary>
@@ -32,10 +32,7 @@ private IconFactory()
     /// </summary>
     /// <param name="bmp"></param>
     /// <returns></returns>
-    public Icon GetIcon(Image<Rgba32> bmp)
-    {
-        return _iconDictionary.GetOrAdd(bmp, CreateIcon);
-    }
+    public Icon GetIcon(Image<Rgba32> bmp) => _iconDictionary.GetOrAdd(bmp, CreateIcon);
 
     private Icon CreateIcon(Image<Rgba32> bmp)
     {
diff --git a/Rdmp.UI/ImageTools.cs b/Rdmp.UI/ImageTools.cs
index b882664f46..ba05dfedfd 100644
--- a/Rdmp.UI/ImageTools.cs
+++ b/Rdmp.UI/ImageTools.cs
@@ -4,7 +4,7 @@
 // RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
-using ImageFormat=System.Drawing.Imaging.ImageFormat;
+using ImageFormat = System.Drawing.Imaging.ImageFormat;
 using Bitmap = System.Drawing.Bitmap;
 using System.IO;
 using SixLabors.ImageSharp;
@@ -15,7 +15,6 @@ namespace Rdmp.UI;
 
 public static class ImageTools
 {
-
     private static ConcurrentDictionary<Image<Rgba32>, Bitmap> ImageToBitmapCacheRgba32 =
         new();
 
@@ -33,7 +32,7 @@ public static Bitmap ImageToBitmap(this Image<Rgba32> img)
     private static ConcurrentDictionary<byte[], Bitmap> ImageToBitmapCacheByteArray =
         new();
 
-    public static Bitmap ImageToBitmap(this byte [] img)
+    public static Bitmap ImageToBitmap(this byte[] img)
     {
         return ImageToBitmapCacheByteArray.GetOrAdd(img, k =>
         {
@@ -45,7 +44,7 @@ public static Bitmap ImageToBitmap(this byte [] img)
     public static Image<Rgba32> LegacyToImage(this System.Drawing.Image img)
     {
         using var stream = new MemoryStream();
-        img.Save(stream,ImageFormat.Png);
+        img.Save(stream, ImageFormat.Png);
         stream.Seek(0, SeekOrigin.Begin);
         return Image.Load<Rgba32>(stream);
     }
diff --git a/Rdmp.UI/ItemActivation/IActivateItems.cs b/Rdmp.UI/ItemActivation/IActivateItems.cs
index 727fd1d3d7..85d60438db 100644
--- a/Rdmp.UI/ItemActivation/IActivateItems.cs
+++ b/Rdmp.UI/ItemActivation/IActivateItems.cs
@@ -29,7 +29,7 @@ namespace Rdmp.UI.ItemActivation;
 /// 
 /// <para>Also exposes the location of the Catalogue / Data Export repository databases via RepositoryLocator</para>
 /// </summary>
-public interface IActivateItems:IBasicActivateItems
+public interface IActivateItems : IBasicActivateItems
 {
     ITheme Theme { get; }
 
@@ -41,20 +41,20 @@ public interface IActivateItems:IBasicActivateItems
     /// <summary>
     /// Component for closing and opening multiple windows at once for optimal user experience for achieving a given task (e.g. running a data load)
     /// </summary>
-    IArrangeWindows WindowArranger { get;}
+    IArrangeWindows WindowArranger { get; }
 
     Form ShowWindow(Control singleControlForm, bool asDocument = false);
-        
+
     /// <summary>
     /// Component for starting drag or copy operations
     /// </summary>
-    ICombineableFactory CommandFactory { get;}
+    ICombineableFactory CommandFactory { get; }
 
     /// <summary>
     /// Component for suggesting completion options for an ongoing drag or paste
     /// </summary>
-    ICommandExecutionFactory CommandExecutionFactory { get;}
-        
+    ICommandExecutionFactory CommandExecutionFactory { get; }
+
     /// <summary>
     /// Records when objects are accessed by the user through the UI to allow navigation to recent objects
     /// </summary>
@@ -76,13 +76,13 @@ public interface IActivateItems:IBasicActivateItems
     /// <typeparam name="T"></typeparam>
     /// <param name="collection"></param>
     /// <returns></returns>
-    T Activate<T>(IPersistableObjectCollection collection) where T : Control,IObjectCollectionControl, new();
+    T Activate<T>(IPersistableObjectCollection collection) where T : Control, IObjectCollectionControl, new();
+
 
-        
     bool IsRootObjectOfCollection(RDMPCollection collection, object rootObject);
     bool HasProblem(object model);
     string DescribeProblemIfAny(object model);
-        
+
 
     /// <summary>
     /// Returns xml doc comments from the CommentStore for the given class (or null if it is undocumented)
@@ -102,7 +102,7 @@ public interface IActivateItems:IBasicActivateItems
     /// <param name="form"></param>
     /// <returns></returns>
     DialogResult ShowDialog(Form form);
-        
+
     /// <summary>
     /// Closes the Form <paramref name="f"/> and reports the <paramref name="reason"/> to the user
     /// in a highly visible way
@@ -139,8 +139,9 @@ public interface IActivateItems:IBasicActivateItems
     /// <param name="sessionName"></param>
     /// <param name="initialSelectionIfAny">Initial root objects to be in scope (or null if not known)</param>
     /// <param name="initialSearch">The value to set the search textbox to on load if objects are being selected during this operation, or null.</param>
-    void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialSelectionIfAny, string initialSearch);
-        
+    void StartSession(string sessionName, IEnumerable<IMapsDirectlyToDatabaseTable> initialSelectionIfAny,
+        string initialSearch);
+
     /// <summary>
     /// Returns all currently open session uis
     /// </summary>
diff --git a/Rdmp.UI/LinkLabels/PathLinkLabel.cs b/Rdmp.UI/LinkLabels/PathLinkLabel.cs
index cbb3c169cb..05fd0b051a 100644
--- a/Rdmp.UI/LinkLabels/PathLinkLabel.cs
+++ b/Rdmp.UI/LinkLabels/PathLinkLabel.cs
@@ -39,13 +39,13 @@ protected override void OnClick(EventArgs e)
             ExceptionViewer.Show(exception);
         }
     }
-        
+
     protected override void OnPaint(PaintEventArgs e)
     {
         //paint background
         using var b = new SolidBrush(BackColor);
         e.Graphics.FillRectangle(b, Bounds);
-            
+
         //paint text
         using var f = new Font(Font, FontStyle.Underline);
         TextRenderer.DrawText(e.Graphics, Text, f, ClientRectangle, Color.Blue, TextFormatFlags.PathEllipsis);
diff --git a/Rdmp.UI/LoadExecutionUIs/ExecuteCacheProgressUI.cs b/Rdmp.UI/LoadExecutionUIs/ExecuteCacheProgressUI.cs
index 7ee4048cae..fb3a2c1bcd 100644
--- a/Rdmp.UI/LoadExecutionUIs/ExecuteCacheProgressUI.cs
+++ b/Rdmp.UI/LoadExecutionUIs/ExecuteCacheProgressUI.cs
@@ -25,7 +25,7 @@ namespace Rdmp.UI.LoadExecutionUIs;
 public partial class ExecuteCacheProgressUI : CachingEngineUI_Design
 {
     private ICacheProgress _cacheProgress;
-        
+
     public ExecuteCacheProgressUI()
     {
         InitializeComponent();
@@ -33,15 +33,13 @@ public ExecuteCacheProgressUI()
         checkAndExecuteUI1.CommandGetter += CommandGetter;
     }
 
-    private RDMPCommandLineOptions CommandGetter(CommandLineActivity commandLineActivity)
-    {
-        return new CacheOptions
+    private RDMPCommandLineOptions CommandGetter(CommandLineActivity commandLineActivity) =>
+        new CacheOptions
         {
             CacheProgress = _cacheProgress.ID.ToString(),
             Command = commandLineActivity,
             RetryMode = cbFailures.Checked
         };
-    }
 
     public override void SetDatabaseObject(IActivateItems activator, CacheProgress databaseObject)
     {
@@ -50,13 +48,15 @@ public override void SetDatabaseObject(IActivateItems activator, CacheProgress d
         _cacheProgress = databaseObject;
 
         CommonFunctionality.AddToMenu(new ExecuteCommandEditCacheProgress(activator, databaseObject), "Edit");
-        CommonFunctionality.AddToMenu(new ExecuteCommandShowCacheFetchFailures(activator, databaseObject), "View Cache Failures");
+        CommonFunctionality.AddToMenu(new ExecuteCommandShowCacheFetchFailures(activator, databaseObject),
+            "View Cache Failures");
 
         var failures = _cacheProgress.CacheFetchFailures.Any(f => f.ResolvedOn == null);
         cbFailures.Enabled = failures;
-            
+
         checkAndExecuteUI1.SetItemActivator(activator);
     }
+
     public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
         base.ConsultAboutClosing(sender, e);
@@ -67,5 +67,4 @@ public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CachingEngineUI_Design, UserControl>))]
 public abstract class CachingEngineUI_Design : RDMPSingleDatabaseObjectControl<CacheProgress>
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/LoadExecutionUIs/ExecuteLoadMetadataUI.cs b/Rdmp.UI/LoadExecutionUIs/ExecuteLoadMetadataUI.cs
index 650644c358..38d302af29 100644
--- a/Rdmp.UI/LoadExecutionUIs/ExecuteLoadMetadataUI.cs
+++ b/Rdmp.UI/LoadExecutionUIs/ExecuteLoadMetadataUI.cs
@@ -48,13 +48,15 @@ private enum DebugOptions
         StopAfterSTAGING,
         SkipArchiving
     }
-               
+
     public ExecuteLoadMetadataUI()
     {
         InitializeComponent();
 
-        helpIconRunRepeatedly.SetHelpText("Run Repeatedly", "By default running a scheduled load will run the number of days specified as a single load (e.g. 5 days of data).  Ticking this box means that if the load is succesful a further 5 days will be executed and again until either a data load fails or the load is up to date.");
-        helpIconAbortShouldCancel.SetHelpText("Abort Behaviour", "By default clicking the Abort button (in Controls) will issue an Abort flag on a run which usually results in it completing the current stage (e.g. Migrate RAW to STAGING) then stop.  Ticking this button in a Load Progress based load will make the button instead issue a Cancel notification which means the data load will complete the current LoadProgress and then not start a new one.  This is only an option when you have ticked 'Run Repeatedly' (left)");
+        helpIconRunRepeatedly.SetHelpText("Run Repeatedly",
+            "By default running a scheduled load will run the number of days specified as a single load (e.g. 5 days of data).  Ticking this box means that if the load is succesful a further 5 days will be executed and again until either a data load fails or the load is up to date.");
+        helpIconAbortShouldCancel.SetHelpText("Abort Behaviour",
+            "By default clicking the Abort button (in Controls) will issue an Abort flag on a run which usually results in it completing the current stage (e.g. Migrate RAW to STAGING) then stop.  Ticking this button in a Load Progress based load will make the button instead issue a Cancel notification which means the data load will complete the current LoadProgress and then not start a new one.  This is only an option when you have ticked 'Run Repeatedly' (left)");
 
         AssociatedCollection = RDMPCollection.DataLoad;
 
@@ -64,28 +66,28 @@ public ExecuteLoadMetadataUI()
         dd_DebugOptions.ComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
         dd_DebugOptions.ComboBox.DataSource = Enum.GetValues(typeof(DebugOptions));
     }
-        
+
     public override void SetDatabaseObject(IActivateItems activator, LoadMetadata databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
         _loadMetadata = databaseObject;
 
         checkAndExecuteUI1.SetItemActivator(activator);
-            
-        SetButtonStates(null,null);
+
+        SetButtonStates(null, null);
 
         SetLoadProgressGroupBoxState();
-            
+
 
         CommonFunctionality.Add(new ExecuteCommandViewLoadDiagram(activator, _loadMetadata));
 
         CommonFunctionality.AddToMenu(new ExecuteCommandEditLoadMetadataDescription(activator, _loadMetadata));
-            
-        CommonFunctionality.Add(new ExecuteCommandViewLogs(activator, (LoadMetadata) databaseObject));
-            
+
+        CommonFunctionality.Add(new ExecuteCommandViewLogs(activator, (LoadMetadata)databaseObject));
+
         CommonFunctionality.Add(dd_DebugOptions);
     }
-        
+
     private void SetLoadProgressGroupBoxState()
     {
         _allLoadProgresses = _loadMetadata.LoadProgresses;
@@ -96,10 +98,10 @@ private void SetLoadProgressGroupBoxState()
             gbLoadProgresses.Visible = true;
 
             //give the user the dropdown options for which load progress he wants to run
-            var loadProgressData = new Dictionary<int, string>( );
+            var loadProgressData = new Dictionary<int, string>();
 
             //if there are more than 1 let them pick any
-            if(_allLoadProgresses.Length > 1)
+            if (_allLoadProgresses.Length > 1)
                 loadProgressData.Add(0, "Any Available");
 
             foreach (var loadProgress in _allLoadProgresses)
@@ -119,7 +121,7 @@ private void SetButtonStates(object sender, EventArgs e)
     {
         gbLoadProgresses.Enabled = checkAndExecuteUI1.ChecksPassed;
     }
-        
+
     private RDMPCommandLineOptions AutomationCommandGetter(CommandLineActivity activityRequested)
     {
         var lp = GetLoadProgressIfAny();
@@ -139,7 +141,7 @@ private RDMPCommandLineOptions AutomationCommandGetter(CommandLineActivity activ
 
         if (lp != null)
             options.LoadProgress = lp.ID.ToString();
-            
+
         return options;
     }
 
@@ -148,7 +150,7 @@ public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
         base.ConsultAboutClosing(sender, e);
         checkAndExecuteUI1.ConsultAboutClosing(sender, e);
     }
-        
+
     private LoadProgress GetLoadProgressIfAny()
     {
         if (ddLoadProgress.SelectedIndex == -1)
@@ -161,7 +163,7 @@ private LoadProgress GetLoadProgressIfAny()
         return Activator.RepositoryLocator.CatalogueRepository.GetObjectByID<LoadProgress>(scheduleItem.Key);
     }
 
-        
+
     private void ddLoadProgress_SelectedIndexChanged(object sender, EventArgs e)
     {
         var loadprogress = GetLoadProgressIfAny();
@@ -173,13 +175,12 @@ private void ddLoadProgress_SelectedIndexChanged(object sender, EventArgs e)
                 udDaysPerJob.Value = progresses[0].DefaultNumberOfDaysToLoadEachTime;
         }
         else
+        {
             udDaysPerJob.Value = loadprogress.DefaultNumberOfDaysToLoadEachTime;
+        }
     }
 
-    public override string GetTabName()
-    {
-        return $"Execution:{base.GetTabName()}";
-    }
+    public override string GetTabName() => $"Execution:{base.GetTabName()}";
 
     private void cbRunIteratively_CheckedChanged(object sender, EventArgs e)
     {
diff --git a/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.Designer.cs b/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.Designer.cs
index 81db0fbc68..fe75ce878d 100644
--- a/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.Designer.cs
+++ b/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.Designer.cs
@@ -1,4 +1,5 @@
 using System;
+using Rdmp.Core;
 using Rdmp.UI.SimpleControls;
 
 
@@ -70,6 +71,7 @@ private void InitializeComponent()
             this.label11 = new System.Windows.Forms.Label();
             this.tbRowCount = new System.Windows.Forms.TextBox();
             this.cbCreateExampleDatasets = new System.Windows.Forms.CheckBox();
+            this.cbCreateLoggingServer = new System.Windows.Forms.CheckBox();
             this.tbSeed = new System.Windows.Forms.TextBox();
             this.tbOtherKeywords = new System.Windows.Forms.TextBox();
             this.tbCreateDatabaseTimeout = new System.Windows.Forms.TextBox();
@@ -375,6 +377,7 @@ private void InitializeComponent()
             // gbCreateNew
             // 
             this.gbCreateNew.Controls.Add(this.cbCreateExampleDatasets);
+            this.gbCreateNew.Controls.Add(this.cbCreateLoggingServer);
             this.gbCreateNew.Controls.Add(this.gbSqlAuthentication);
             this.gbCreateNew.Controls.Add(this.gbExampleDatasets);
             this.gbCreateNew.Controls.Add(this.tbOtherKeywords);
@@ -522,7 +525,18 @@ private void InitializeComponent()
             this.cbCreateExampleDatasets.Text = "Example Datasets";
             this.cbCreateExampleDatasets.UseVisualStyleBackColor = true;
             this.cbCreateExampleDatasets.CheckedChanged += new System.EventHandler(this.cbCreateExampleDatasets_CheckedChanged);
-            // 
+            //
+            // cbCreateLoggingServer
+            // 
+            this.cbCreateLoggingServer.AutoSize = true;
+            this.cbCreateLoggingServer.Location = new System.Drawing.Point(543, 156);
+            this.cbCreateLoggingServer.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.cbCreateLoggingServer.Name = "cbCreateLoggingServer";
+            this.cbCreateLoggingServer.Size = new System.Drawing.Size(118, 19);
+            this.cbCreateLoggingServer.TabIndex = 9;
+            this.cbCreateLoggingServer.Checked = true;
+            this.cbCreateLoggingServer.Text = Core.GlobalStrings.CreateALoggingServer;
+            this.cbCreateLoggingServer.UseVisualStyleBackColor = true;
             // tbSeed
             // 
             this.tbSeed.Location = new System.Drawing.Point(94, 22);
@@ -672,6 +686,7 @@ private void InitializeComponent()
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox cbCreateExampleDatasets;
+        private System.Windows.Forms.CheckBox cbCreateLoggingServer;
         private System.Windows.Forms.TextBox tbSeed;
         private System.Windows.Forms.Label label10;
         private System.Windows.Forms.TextBox tbRowCount;
diff --git a/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs b/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs
index aea6f5dac7..c81b612611 100644
--- a/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs
+++ b/Rdmp.UI/LocationsMenu/ChoosePlatformDatabasesUI.cs
@@ -61,13 +61,14 @@ public ChoosePlatformDatabasesUI(IRDMPPlatformRepositoryServiceLocator repositor
         InitializeComponent();
 
         new RecentHistoryOfControls(tbCatalogueConnectionString, new Guid("75e6b0a3-03f2-49fc-9446-ebc1dae9f123"));
-        new RecentHistoryOfControls(tbDataExportManagerConnectionString, new Guid("9ce952d8-d629-454a-ab9b-a1af97548be6"));
+        new RecentHistoryOfControls(tbDataExportManagerConnectionString,
+            new Guid("9ce952d8-d629-454a-ab9b-a1af97548be6"));
 
         SetState(State.PickNewOrExisting);
 
         TableRepository cataDb = null;
         TableRepository dataExportDb = null;
-            
+
         try
         {
             //are we dealing with a database object repository?
@@ -162,21 +163,21 @@ private bool SaveConnectionStrings()
         }
         catch (Exception exception)
         {
-            checksUI1.OnCheckPerformed(new CheckEventArgs("Failed to save connection settings",CheckResult.Fail,exception));
+            checksUI1.OnCheckPerformed(new CheckEventArgs("Failed to save connection settings", CheckResult.Fail,
+                exception));
             return false;
         }
-            
     }
 
     private void ChooseDatabase_KeyUp(object sender, KeyEventArgs e)
     {
-        if(e.KeyCode == Keys.Enter)
-            btnSaveAndClose_Click(null,null);
+        if (e.KeyCode == Keys.Enter)
+            btnSaveAndClose_Click(null, null);
 
-        if(e.KeyCode == Keys.Escape)
+        if (e.KeyCode == Keys.Escape)
             Close();
-
     }
+
     private void tbCatalogueConnectionString_KeyUp(object sender, KeyEventArgs e)
     {
         //if user is doing a paste
@@ -189,7 +190,8 @@ private void tbCatalogueConnectionString_KeyUp(object sender, KeyEventArgs e)
             if (toPaste.Contains(Environment.NewLine))
             {
                 //see if he is trying to paste two lines at once, in whichcase surpress Windows and paste it across the two text boxes
-                var toPasteArray = toPaste.Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
+                var toPasteArray = toPaste.Split(Environment.NewLine.ToCharArray(),
+                    StringSplitOptions.RemoveEmptyEntries);
                 if (toPasteArray.Length == 2)
                 {
                     tbCatalogueConnectionString.Text = toPasteArray[0];
@@ -229,11 +231,13 @@ private void CheckRepository(bool catalogue)
             //save the settings
             SaveConnectionStrings();
 
-            var repo = catalogue?(TableRepository) _repositoryLocator.CatalogueRepository:(TableRepository)_repositoryLocator.DataExportRepository;
+            var repo = catalogue
+                ? (TableRepository)_repositoryLocator.CatalogueRepository
+                : (TableRepository)_repositoryLocator.DataExportRepository;
 
-            if(repo == null || string.IsNullOrWhiteSpace(repo.ConnectionString))
+            if (repo == null || string.IsNullOrWhiteSpace(repo.ConnectionString))
             {
-                checksUI1.OnCheckPerformed(new CheckEventArgs("No connection string has been set",CheckResult.Fail));
+                checksUI1.OnCheckPerformed(new CheckEventArgs("No connection string has been set", CheckResult.Fail));
                 return;
             }
 
@@ -242,13 +246,13 @@ private void CheckRepository(bool catalogue)
         }
         catch (Exception exception)
         {
-            checksUI1.OnCheckPerformed(new CheckEventArgs("Checking of Database failed", CheckResult.Fail,exception));
+            checksUI1.OnCheckPerformed(new CheckEventArgs("Checking of Database failed", CheckResult.Fail, exception));
         }
     }
 
     private void ShowNextStageOnChecksComplete(object sender, AllChecksCompleteHandlerArgs args)
     {
-        ((ChecksUI.ChecksUI) sender).AllChecksComplete -= ShowNextStageOnChecksComplete;
+        ((ChecksUI.ChecksUI)sender).AllChecksComplete -= ShowNextStageOnChecksComplete;
     }
 
     private void btnCreateSuite_Click(object sender, EventArgs e)
@@ -267,11 +271,12 @@ private void btnCreateSuite_Click(object sender, EventArgs e)
                 Username = tbUsername.Text,
                 Password = tbPassword.Text,
                 ExampleDatasets = cbCreateExampleDatasets.Checked,
+                CreateLoggingServer = cbCreateLoggingServer.Checked,
                 Seed = _seed,
                 NumberOfPeople = _peopleCount,
                 NumberOfRowsPerDataset = _rowCount,
                 OtherKeywords = tbOtherKeywords.Text,
-                CreateDatabaseTimeout = int.TryParse(tbCreateDatabaseTimeout.Text, out var timeout) ? timeout:30
+                CreateDatabaseTimeout = int.TryParse(tbCreateDatabaseTimeout.Text, out var timeout) ? timeout : 30
             };
 
             var failed = false;
@@ -320,13 +325,13 @@ private void btnCreateSuite_Click(object sender, EventArgs e)
             UserSettings.CatalogueConnectionString = cata.ConnectionString;
             UserSettings.DataExportConnectionString = export.ConnectionString;
 
-            if(!failed)
+            if (!failed)
                 RestartApplication();
-
         }
         catch (Exception exception)
         {
-            checksUI1.OnCheckPerformed(new CheckEventArgs("Database creation failed, check exception for details",CheckResult.Fail, exception));
+            checksUI1.OnCheckPerformed(new CheckEventArgs("Database creation failed, check exception for details",
+                CheckResult.Fail, exception));
         }
         finally
         {
@@ -342,7 +347,7 @@ private static void PostFixPipelines(PlatformDatabaseCreationOptions opts)
             .FirstOrDefault(p => p.Name == "BULK INSERT: CSV Import File (manual column-type editing)");
         if (bulkInsertCsvPipe != null)
         {
-            var d = (PipelineComponentArgument) bulkInsertCsvPipe.Destination.GetAllArguments()
+            var d = (PipelineComponentArgument)bulkInsertCsvPipe.Destination.GetAllArguments()
                 .Single(a => a.Name.Equals("Adjuster"));
             d.SetValue(typeof(AdjustColumnDataTypesUI));
             d.SaveToDatabase();
@@ -372,12 +377,10 @@ private void btnBack_Click(object sender, EventArgs e)
 
     private void btnBrowseForCatalogue_Click(object sender, EventArgs e)
     {
-        var dialog = new ServerDatabaseTableSelectorDialog("Catalogue Database",false,false,null);
+        var dialog = new ServerDatabaseTableSelectorDialog("Catalogue Database", false, false, null);
         dialog.LockDatabaseType(DatabaseType.MicrosoftSQLServer);
         if (dialog.ShowDialog() == DialogResult.OK && dialog.SelectedDatabase != null)
-        {
             tbCatalogueConnectionString.Text = dialog.SelectedDatabase.Server.Builder.ConnectionString;
-        }
     }
 
     private void btnBrowseForDataExport_Click(object sender, EventArgs e)
@@ -395,18 +398,18 @@ private void Tb_TextChanged(object sender, EventArgs e)
 
         try
         {
-            var result =  int.Parse(tb.Text);
+            var result = int.Parse(tb.Text);
 
-            if(sender == tbSeed)
+            if (sender == tbSeed)
                 _seed = result;
-            else if(sender == tbPeopleCount)
+            else if (sender == tbPeopleCount)
                 _peopleCount = result;
-            else if(sender == tbRowCount)
+            else if (sender == tbRowCount)
                 _rowCount = result;
 
             tb.ForeColor = Color.Black;
         }
-        catch(Exception)
+        catch (Exception)
         {
             tb.ForeColor = Color.Red;
         }
@@ -432,10 +435,7 @@ private void btnCreateYamlFile_Click(object sender, EventArgs e)
                 InitialDirectory = UsefulStuff.GetExecutableDirectory().FullName
             };
 
-            if (sfd.ShowDialog() == DialogResult.OK)
-            {
-                File.WriteAllText(sfd.FileName, yaml);
-            }
+            if (sfd.ShowDialog() == DialogResult.OK) File.WriteAllText(sfd.FileName, yaml);
         }
         catch (Exception ex)
         {
@@ -447,5 +447,4 @@ private void cbCreateExampleDatasets_CheckedChanged(object sender, EventArgs e)
     {
         gbExampleDatasets.Enabled = cbCreateExampleDatasets.Checked;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/LocationsMenu/PasswordEncryptionKeyLocationUI.cs b/Rdmp.UI/LocationsMenu/PasswordEncryptionKeyLocationUI.cs
index e69cc93539..d4cb05b8ba 100644
--- a/Rdmp.UI/LocationsMenu/PasswordEncryptionKeyLocationUI.cs
+++ b/Rdmp.UI/LocationsMenu/PasswordEncryptionKeyLocationUI.cs
@@ -47,7 +47,8 @@ protected override void OnLoad(EventArgs e)
         if (VisualStudioDesignMode) //don't go looking up the key if you are visual studio in designer mode!
             return;
 
-        _location = new PasswordEncryptionKeyLocation((CatalogueRepository) Activator.RepositoryLocator.CatalogueRepository);
+        _location = new PasswordEncryptionKeyLocation(
+            (CatalogueRepository)Activator.RepositoryLocator.CatalogueRepository);
 
         SetEnabledness();
     }
@@ -60,7 +61,6 @@ private void SetEnabledness()
         btnShowDirectory.Enabled = keyLocation != null;
         btnDeleteKeyLocation.Enabled = keyLocation != null;
         btnCreateKeyFile.Enabled = keyLocation == null;
-
     }
 
     private void tbCertificate_TextChanged(object sender, EventArgs e)
@@ -118,9 +118,10 @@ private void btnDeleteKeyLocation_Click(object sender, EventArgs e)
     {
         try
         {
-            if(MessageBox.Show(
-                   "You are about to delete the RDMPs record of where the key file is to decrypt passwords, if you do this all currently configured password will become inaccessible (EVEN IF YOU CREATE A NEW KEY, YOU WILL NOT BE ABLE TO GET THE CURRENT PASSWORDS BACK), are you sure you want to do this?",
-                   "Confirm deleting location of decryption key file", MessageBoxButtons.YesNo, MessageBoxIcon.Stop) == DialogResult.Yes)
+            if (MessageBox.Show(
+                    "You are about to delete the RDMPs record of where the key file is to decrypt passwords, if you do this all currently configured password will become inaccessible (EVEN IF YOU CREATE A NEW KEY, YOU WILL NOT BE ABLE TO GET THE CURRENT PASSWORDS BACK), are you sure you want to do this?",
+                    "Confirm deleting location of decryption key file", MessageBoxButtons.YesNo, MessageBoxIcon.Stop) ==
+                DialogResult.Yes)
                 _location.DeleteKey();
 
             SetEnabledness();
@@ -129,10 +130,5 @@ private void btnDeleteKeyLocation_Click(object sender, EventArgs e)
         {
             ExceptionViewer.Show(exception);
         }
-
-            
-
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/LocationsMenu/ServerDefaultsUI.cs b/Rdmp.UI/LocationsMenu/ServerDefaultsUI.cs
index 9acfdc56b5..d012fd5957 100644
--- a/Rdmp.UI/LocationsMenu/ServerDefaultsUI.cs
+++ b/Rdmp.UI/LocationsMenu/ServerDefaultsUI.cs
@@ -30,8 +30,8 @@ namespace Rdmp.UI.LocationsMenu;
 public partial class ServerDefaultsUI : RDMPForm
 {
     private IServerDefaults defaults;
-        
-    public ServerDefaultsUI(IActivateItems activator):base(activator)
+
+    public ServerDefaultsUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
     }
@@ -44,8 +44,6 @@ protected override void OnLoad(EventArgs e)
             return;
 
         RefreshUIFromDatabase();
-
-
     }
 
     private void RefreshUIFromDatabase()
@@ -54,12 +52,15 @@ private void RefreshUIFromDatabase()
         {
             defaults = Activator.RepositoryLocator.CatalogueRepository;
 
-            var allServers = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>().ToArray();
-                
+            var allServers = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
+                .ToArray();
+
             InitializeServerDropdown(ddDefaultLoggingServer, PermissableDefaults.LiveLoggingServer_ID, allServers);
             InitializeServerDropdown(ddDQEServer, PermissableDefaults.DQE, allServers);
-            InitializeServerDropdown(ddWebServiceQueryCacheServer, PermissableDefaults.WebServiceQueryCachingServer_ID, allServers);
-            InitializeServerDropdown(ddCohortIdentificationQueryCacheServer, PermissableDefaults.CohortIdentificationQueryCachingServer_ID, allServers);
+            InitializeServerDropdown(ddWebServiceQueryCacheServer, PermissableDefaults.WebServiceQueryCachingServer_ID,
+                allServers);
+            InitializeServerDropdown(ddCohortIdentificationQueryCacheServer,
+                PermissableDefaults.CohortIdentificationQueryCachingServer_ID, allServers);
             InitializeServerDropdown(ddDefaultIdentifierDump, PermissableDefaults.IdentifierDumpServer_ID, allServers);
             InitializeServerDropdown(ddOverrideRawServer, PermissableDefaults.RAWDataLoadServer, allServers);
             InitializeServerDropdown(ddDefaultANOStore, PermissableDefaults.ANOStore, allServers);
@@ -70,9 +71,10 @@ private void RefreshUIFromDatabase()
             btnCreateNewWebServiceQueryCache.Enabled = ddWebServiceQueryCacheServer.SelectedItem == null;
             btnClearWebServiceQueryCache.Enabled = ddWebServiceQueryCacheServer.SelectedItem != null;
 
-            btnCreateNewCohortIdentificationQueryCache.Enabled = ddCohortIdentificationQueryCacheServer.SelectedItem == null;
-            btnClearCohortIdentificationQueryCache.Enabled = ddCohortIdentificationQueryCacheServer.SelectedItem !=null;
-                
+            btnCreateNewCohortIdentificationQueryCache.Enabled =
+                ddCohortIdentificationQueryCacheServer.SelectedItem == null;
+            btnClearCohortIdentificationQueryCache.Enabled =
+                ddCohortIdentificationQueryCacheServer.SelectedItem != null;
         }
         catch (Exception ex)
         {
@@ -80,7 +82,8 @@ private void RefreshUIFromDatabase()
         }
     }
 
-    private void InitializeServerDropdown(ComboBox comboBox, PermissableDefaults permissableDefault, ExternalDatabaseServer[] allServers)
+    private void InitializeServerDropdown(ComboBox comboBox, PermissableDefaults permissableDefault,
+        ExternalDatabaseServer[] allServers)
     {
         comboBox.Items.Clear();
 
@@ -88,13 +91,16 @@ private void InitializeServerDropdown(ComboBox comboBox, PermissableDefaults per
         var patcher = permissableDefault.ToTier2DatabaseType();
 
         var toAdd = allServers;
-            
-        if(patcher != null) //we expect an explicit type e.g. a HIC.Logging.Database 
+
+        if (patcher != null) //we expect an explicit type e.g. a HIC.Logging.Database 
         {
-            var compatibles = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>().Where(s=>s.WasCreatedBy(patcher)).ToArray();
+            var compatibles = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
+                .Where(s => s.WasCreatedBy(patcher)).ToArray();
 
-            if (currentDefault == null || compatibles.Contains(currentDefault))//if there is not yet a default or the existing default is of the correct type
-                toAdd = compatibles;//then we can go ahead and use the restricted type
+            if (currentDefault == null ||
+                compatibles.Contains(
+                    currentDefault)) //if there is not yet a default or the existing default is of the correct type
+                toAdd = compatibles; //then we can go ahead and use the restricted type
 
             //otherwise what we have is a default of the wrong server type! eep.
         }
@@ -103,20 +109,20 @@ private void InitializeServerDropdown(ComboBox comboBox, PermissableDefaults per
 
         //select the server
         if (currentDefault != null)
-            comboBox.SelectedItem = comboBox.Items.Cast<ExternalDatabaseServer>().Single(s => s.ID == currentDefault.ID);
+            comboBox.SelectedItem =
+                comboBox.Items.Cast<ExternalDatabaseServer>().Single(s => s.ID == currentDefault.ID);
     }
 
-        
+
     private void ddDefault_SelectedIndexChanged(object sender, EventArgs e)
     {
         PermissableDefaults toChange;
 
-        if(sender == ddDefaultIdentifierDump)
+        if (sender == ddDefaultIdentifierDump)
             toChange = PermissableDefaults.IdentifierDumpServer_ID;
-        else
-        if (sender == ddDefaultLoggingServer)
+        else if (sender == ddDefaultLoggingServer)
             toChange = PermissableDefaults.LiveLoggingServer_ID;
-        else if(sender == ddOverrideRawServer)
+        else if (sender == ddOverrideRawServer)
             toChange = PermissableDefaults.RAWDataLoadServer;
         else if (sender == ddDefaultANOStore)
             toChange = PermissableDefaults.ANOStore;
@@ -128,7 +134,7 @@ private void ddDefault_SelectedIndexChanged(object sender, EventArgs e)
             throw new Exception($"Did not recognise sender:{sender}");
 
         //user selected nothing
-        if(((ComboBox) sender).SelectedItem is not ExternalDatabaseServer selectedItem)
+        if (((ComboBox)sender).SelectedItem is not ExternalDatabaseServer selectedItem)
             return;
 
         defaults.SetDefault(toChange, selectedItem);
@@ -138,13 +144,12 @@ private void btnClearServer_Click(object sender, EventArgs e)
     {
         PermissableDefaults toClear;
 
-        if(sender == btnClearLoggingServer)
+        if (sender == btnClearLoggingServer)
         {
             toClear = PermissableDefaults.LiveLoggingServer_ID;
             ddDefaultLoggingServer.SelectedItem = null;
         }
-        else
-        if(sender == btnClearIdentifierDump)
+        else if (sender == btnClearIdentifierDump)
         {
             toClear = PermissableDefaults.IdentifierDumpServer_ID;
             ddDefaultIdentifierDump.SelectedItem = null;
@@ -153,7 +158,6 @@ private void btnClearServer_Click(object sender, EventArgs e)
         {
             toClear = PermissableDefaults.DQE;
             ddDQEServer.SelectedItem = null;
-
         }
         else if (sender == btnClearRAWServer)
         {
@@ -176,29 +180,33 @@ private void btnClearServer_Click(object sender, EventArgs e)
             ddCohortIdentificationQueryCacheServer.SelectedItem = null;
         }
         else
+        {
             throw new Exception($"Did not recognise sender:{sender}");
+        }
 
         defaults.ClearDefault(toClear);
         RefreshUIFromDatabase();
     }
-        
+
     private void CreateNewExternalServer(PermissableDefaults defaultToSet, IPatcher patcher)
     {
-        if (CreatePlatformDatabase.CreateNewExternalServer(Activator.RepositoryLocator.CatalogueRepository, defaultToSet, patcher) != null)
+        if (CreatePlatformDatabase.CreateNewExternalServer(Activator.RepositoryLocator.CatalogueRepository,
+                defaultToSet, patcher) != null)
             RefreshUIFromDatabase();
     }
 
 
     private void ddDQEServer_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(ddDQEServer.SelectedItem != null)
-            defaults.SetDefault(PermissableDefaults.DQE, (ExternalDatabaseServer) ddDQEServer.SelectedItem);
+        if (ddDQEServer.SelectedItem != null)
+            defaults.SetDefault(PermissableDefaults.DQE, (ExternalDatabaseServer)ddDQEServer.SelectedItem);
     }
 
     private void btnCreateNewDQEServer_Click(object sender, EventArgs e)
     {
         CreateNewExternalServer(PermissableDefaults.DQE, new DataQualityEnginePatcher());
     }
+
     private void btnCreateNewWebServiceQueryCache_Click(object sender, EventArgs e)
     {
         CreateNewExternalServer(PermissableDefaults.WebServiceQueryCachingServer_ID, new QueryCachingPatcher());
@@ -208,7 +216,7 @@ private void btnCreateNewLoggingServer_Click(object sender, EventArgs e)
     {
         CreateNewExternalServer(PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher());
     }
-        
+
     private void btnCreateNewIdentifierDump_Click(object sender, EventArgs e)
     {
         CreateNewExternalServer(PermissableDefaults.IdentifierDumpServer_ID, new IdentifierDumpDatabasePatcher());
@@ -221,8 +229,7 @@ private void btnCreateNewANOStore_Click(object sender, EventArgs e)
 
     private void btnCreateNewCohortIdentificationQueryCache_Click(object sender, EventArgs e)
     {
-        CreateNewExternalServer(PermissableDefaults.CohortIdentificationQueryCachingServer_ID, new QueryCachingPatcher());
+        CreateNewExternalServer(PermissableDefaults.CohortIdentificationQueryCachingServer_ID,
+            new QueryCachingPatcher());
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/LocationsMenu/Ticketing/TicketingControlUI.cs b/Rdmp.UI/LocationsMenu/Ticketing/TicketingControlUI.cs
index f9d9bcc772..22e35854b5 100644
--- a/Rdmp.UI/LocationsMenu/Ticketing/TicketingControlUI.cs
+++ b/Rdmp.UI/LocationsMenu/Ticketing/TicketingControlUI.cs
@@ -9,7 +9,6 @@
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.SimpleDialogs;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using Color = System.Drawing.Color;
 
 namespace Rdmp.UI.LocationsMenu.Ticketing;
@@ -54,7 +53,7 @@ public override void SetItemActivator(IActivateItems activator)
     public void ReCheckTicketingSystemInCatalogue()
     {
         ragSmiley1.SetVisible(false);
-            
+
         try
         {
             if (VisualStudioDesignMode)
diff --git a/Rdmp.UI/LocationsMenu/Ticketing/TicketingSystemConfigurationUI.cs b/Rdmp.UI/LocationsMenu/Ticketing/TicketingSystemConfigurationUI.cs
index c55e5b89b1..5348f0b0a9 100644
--- a/Rdmp.UI/LocationsMenu/Ticketing/TicketingSystemConfigurationUI.cs
+++ b/Rdmp.UI/LocationsMenu/Ticketing/TicketingSystemConfigurationUI.cs
@@ -36,6 +36,7 @@ public partial class TicketingSystemConfigurationUI : RDMPUserControl
 {
     private TicketingSystemConfiguration _ticketingSystemConfiguration;
     private const string NoneText = "<<NONE>>";
+
     public TicketingSystemConfigurationUI()
     {
         InitializeComponent();
@@ -45,7 +46,7 @@ protected override void OnLoad(EventArgs e)
     {
         base.OnLoad(e);
 
-        if(VisualStudioDesignMode)
+        if (VisualStudioDesignMode)
             return;
 
         RefreshUIFromDatabase();
@@ -57,20 +58,23 @@ private void RefreshUIFromDatabase()
     {
         _bLoading = true;
 
-        var ticketing = _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<TicketingSystemConfiguration>().ToArray();
+        var ticketing = _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<TicketingSystemConfiguration>()
+            .ToArray();
 
-        if(ticketing.Length > 1)
-            throw new Exception("You have multiple TicketingSystemConfiguration configured, open the table TicketingSystemConfiguration and delete one of them");
+        if (ticketing.Length > 1)
+            throw new Exception(
+                "You have multiple TicketingSystemConfiguration configured, open the table TicketingSystemConfiguration and delete one of them");
 
         _ticketingSystemConfiguration = ticketing.SingleOrDefault();
         var mef = _activator.RepositoryLocator.CatalogueRepository.MEF;
-            
+
         cbxType.Items.Clear();
-        cbxType.Items.AddRange(mef.GetTypes<ITicketingSystem>().Select(t=>t.FullName).ToArray());
+        cbxType.Items.AddRange(mef.GetTypes<ITicketingSystem>().Select(t => t.FullName).ToArray());
 
         ddCredentials.Items.Clear();
         ddCredentials.Items.Add(NoneText);
-        ddCredentials.Items.AddRange(_activator.RepositoryLocator.CatalogueRepository.GetAllObjects<DataAccessCredentials>().ToArray());
+        ddCredentials.Items.AddRange(_activator.RepositoryLocator.CatalogueRepository
+            .GetAllObjects<DataAccessCredentials>().ToArray());
 
         if (_ticketingSystemConfiguration == null)
         {
@@ -101,6 +105,7 @@ private void RefreshUIFromDatabase()
             btnDelete.Enabled = true;
             btnSave.Enabled = false;
         }
+
         _bLoading = false;
     }
 
@@ -119,7 +124,9 @@ private void btnCreate_Click(object sender, EventArgs e)
 
     private void btnDelete_Click(object sender, EventArgs e)
     {
-        if (Activator.YesNo("Are you sure you want to delete the Ticketing system from this Catalogue database? there can be only one so be sure before you delete it.","Confirm deleting Ticketing system"))
+        if (Activator.YesNo(
+                "Are you sure you want to delete the Ticketing system from this Catalogue database? there can be only one so be sure before you delete it.",
+                "Confirm deleting Ticketing system"))
         {
             _ticketingSystemConfiguration.DeleteInDatabase();
             RefreshUIFromDatabase();
@@ -128,8 +135,8 @@ private void btnDelete_Click(object sender, EventArgs e)
 
     private void btnCheck_Click(object sender, EventArgs e)
     {
-        if(btnSave.Enabled)
-            btnSave_Click(null,null);
+        if (btnSave.Enabled)
+            btnSave_Click(null, null);
 
         ITicketingSystem instance;
         try
@@ -148,12 +155,13 @@ private void btnCheck_Click(object sender, EventArgs e)
                     CheckResult.Fail, exception));
             return;
         }
+
         checksUI1.StartChecking(instance);
     }
 
     private void btnEditCredentials_Click(object sender, EventArgs e)
     {
-        if(ddCredentials.SelectedItem is DataAccessCredentials creds)
+        if (ddCredentials.SelectedItem is DataAccessCredentials creds)
             _activator.CommandExecutionFactory.Activate(creds);
     }
 
@@ -167,11 +175,11 @@ private void btnDeleteCredentials_Click(object sender, EventArgs e)
     {
         try
         {
-            if(_ticketingSystemConfiguration.DataAccessCredentials_ID != null)
+            if (_ticketingSystemConfiguration.DataAccessCredentials_ID != null)
             {
                 var toDelete = _ticketingSystemConfiguration.DataAccessCredentials;
 
-                if (Activator.YesNo($"Confirm deleting Encrypted Credentials {toDelete.Name}?","Confirm delete?"))
+                if (Activator.YesNo($"Confirm deleting Encrypted Credentials {toDelete.Name}?", "Confirm delete?"))
                     toDelete.DeleteInDatabase();
             }
         }
@@ -179,6 +187,7 @@ private void btnDeleteCredentials_Click(object sender, EventArgs e)
         {
             ExceptionViewer.Show(ex);
         }
+
         RefreshUIFromDatabase();
     }
 
@@ -186,7 +195,7 @@ private void tb_TextChanged(object sender, EventArgs e)
     {
         if (_bLoading)
             return;
-            
+
         _ticketingSystemConfiguration.Name = tbName.Text;
         _ticketingSystemConfiguration.Url = tbUrl.Text;
         _ticketingSystemConfiguration.Type = cbxType.Text;
@@ -212,6 +221,7 @@ private void ddCredentials_SelectedIndexChanged(object sender, EventArgs e)
     }
 
     private IActivateItems _activator;
+
     public override void SetItemActivator(IActivateItems activator)
     {
         base.SetItemActivator(activator);
@@ -224,6 +234,6 @@ private void cbDisabled_CheckedChanged(object sender, EventArgs e)
         {
             _ticketingSystemConfiguration.IsActive = !cbDisabled.Checked;
             _ticketingSystemConfiguration.SaveToDatabase();
-        }   
+        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Logging/LoggingTabUI.cs b/Rdmp.UI/Logging/LoggingTabUI.cs
index f130d6b9b9..febb3ec06e 100644
--- a/Rdmp.UI/Logging/LoggingTabUI.cs
+++ b/Rdmp.UI/Logging/LoggingTabUI.cs
@@ -42,7 +42,7 @@ public class LoggingTabUI : LoggingTab_Design
     private ToolStripLabel label1 = new("Filter:");
     private ToolStripLabel label2 = new("Top:");
     private ToolStripTextBox tbTop = new() { Text = "10000" };
-    private ToolStripButton cbPreferNewer = new("Newest"){CheckOnClick =true,Checked = true};
+    private ToolStripButton cbPreferNewer = new("Newest") { CheckOnClick = true, Checked = true };
 
     private Label lblCurrentFilter;
     private PictureBox pbRemoveFilter;
@@ -116,7 +116,8 @@ private void DataGridView1OnCellMouseClick(object sender, DataGridViewCellMouseE
             if (menu.Items.Count != 0)
                 menu.Items.Add(new ToolStripSeparator());
 
-            menu.Items.Add("View as text", null, (s, ex) => WideMessageBox.Show("Full Text", dataGridView1.Rows[e.RowIndex]));
+            menu.Items.Add("View as text", null,
+                (s, ex) => WideMessageBox.Show("Full Text", dataGridView1.Rows[e.RowIndex]));
 
             menu.Show(Cursor.Position.X, Cursor.Position.Y);
         }
@@ -143,20 +144,25 @@ private IEnumerable<BasicCommandExecution> GetCommands(int rowIdnex)
         {
             case LoggingTables.DataLoadRun:
 
-                yield return new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.ProgressLog) { Run = rowId });
-                yield return new ExecuteCommandViewLogs(Activator,  new LogViewerFilter(LoggingTables.FatalError) { Run = rowId });
-                yield return new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.TableLoadRun) { Run = rowId });
+                yield return new ExecuteCommandViewLogs(Activator,
+                    new LogViewerFilter(LoggingTables.ProgressLog) { Run = rowId });
+                yield return new ExecuteCommandViewLogs(Activator,
+                    new LogViewerFilter(LoggingTables.FatalError) { Run = rowId });
+                yield return new ExecuteCommandViewLogs(Activator,
+                    new LogViewerFilter(LoggingTables.TableLoadRun) { Run = rowId });
 
-                yield return new ExecuteCommandExportLoggedDataToCsv(Activator, new LogViewerFilter(LoggingTables.ProgressLog) { Run = rowId });
+                yield return new ExecuteCommandExportLoggedDataToCsv(Activator,
+                    new LogViewerFilter(LoggingTables.ProgressLog) { Run = rowId });
                 break;
             case LoggingTables.DataLoadTask:
-                yield return new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.DataLoadRun) { Task = rowId });
+                yield return new ExecuteCommandViewLogs(Activator,
+                    new LogViewerFilter(LoggingTables.DataLoadRun) { Task = rowId });
                 break;
 
             case LoggingTables.TableLoadRun:
-                yield return new ExecuteCommandViewLogs(Activator, new LogViewerFilter(LoggingTables.DataSource) { Table = rowId });
+                yield return new ExecuteCommandViewLogs(Activator,
+                    new LogViewerFilter(LoggingTables.DataSource) { Table = rowId });
                 break;
-
         }
     }
 
@@ -171,10 +177,13 @@ private static void AddFreeTextSearchColumn(DataTable dt)
                 sb.Append(dataRow[i]);
                 sb.Append('\t');
             }
+
             dataRow[dcRowString] = sb.ToString();
         }
     }
+
     #region InitializeComponent
+
     private void InitializeComponent()
     {
         var resources = new ComponentResourceManager(typeof(LoggingTabUI));
@@ -221,7 +230,7 @@ private void InitializeComponent()
         // lblCurrentFilter
         // 
         lblCurrentFilter.Anchor = (AnchorStyles)(AnchorStyles.Top | AnchorStyles.Left
-                                                                           | AnchorStyles.Right);
+                                                                  | AnchorStyles.Right);
         lblCurrentFilter.BackColor = Color.Goldenrod;
         lblCurrentFilter.ForeColor = SystemColors.ControlLightLight;
         lblCurrentFilter.Location = new Point(3, 3);
@@ -261,8 +270,8 @@ private void InitializeComponent()
         pFilter.ResumeLayout(false);
         panel1.ResumeLayout(false);
         ResumeLayout(false);
-
     }
+
     #endregion
 
     private void LoadDataTable(DataTable dt)
@@ -283,22 +292,26 @@ private void tbContentFilter_TextChanged(object sender, EventArgs e)
 
     public void SetFilter(LogViewerFilter filter)
     {
-        if(
+        if (
             _navigationTrack != null && _navigationTrack.Current != null //there is a back navigation stack setup
                                      && filter != _navigationTrack.Current //we are not doing a Back operation
         )
-            _navigationTrack.Current.Tag = tbContentFilter.Text; //Since user is making a new navigation to a new location, record the current text filter to preserve it for Back operations.
-                        
+            _navigationTrack.Current.Tag =
+                tbContentFilter
+                    .Text; //Since user is making a new navigation to a new location, record the current text filter to preserve it for Back operations.
+
 
         Filter = filter;
-            
+
         //push the old filter
         _navigationTrack?.Append(Filter);
-        if(_back != null)
+        if (_back != null)
             _back.Enabled = _navigationTrack.CanBack();
 
         if (filter.IsEmpty)
+        {
             panel1.Controls.Remove(pFilter);
+        }
         else
         {
             panel1.Controls.Add(pFilter);
@@ -309,7 +322,7 @@ public void SetFilter(LogViewerFilter filter)
         FetchDataTable();
 
         //clear/restore the current user entered text filter
-        tbContentFilter.Text = filter.Tag as string ?? "";            
+        tbContentFilter.Text = filter.Tag as string ?? "";
     }
 
     private void RegenerateFilters()
@@ -321,23 +334,24 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalDatabas
     {
         base.SetDatabaseObject(activator, databaseObject);
 
-        if(_navigationTrack == null)
+        if (_navigationTrack == null)
         {
             //what happens when user clicks back/forward
-            _navigationTrack = new NavigationTrack<LogViewerFilter>(f=>true,f=>
+            _navigationTrack = new NavigationTrack<LogViewerFilter>(f => true, f =>
             {
-                if(f.LoggingTable != LoggingTables.None)
+                if (f.LoggingTable != LoggingTables.None)
                 {
-                    var cmd = new ExecuteCommandViewLogs(activator,f);
+                    var cmd = new ExecuteCommandViewLogs(activator, f);
                     cmd.Execute();
                 }
             });
 
             //set the initial filter
             _navigationTrack.Append(Filter);
-            _back = new ToolStripButton("Back",FamFamFamIcons.Back.ImageToBitmap(),(s,e)=>_navigationTrack.Back(true)){DisplayStyle = ToolStripItemDisplayStyle.Image };
+            _back = new ToolStripButton("Back", FamFamFamIcons.Back.ImageToBitmap(),
+                (s, e) => _navigationTrack.Back(true)) { DisplayStyle = ToolStripItemDisplayStyle.Image };
         }
-            
+
         CommonFunctionality.Add(_back);
 
         CommonFunctionality.Add(label1);
@@ -348,12 +362,24 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalDatabas
 
         CommonFunctionality.Add(cbPreferNewer);
 
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataLoadTask)) { OverrideCommandName = "All Tasks" });
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataLoadRun)) { OverrideCommandName = "All Runs" });
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.FatalError)) { OverrideCommandName = "All Errors" });
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.TableLoadRun)) { OverrideCommandName = "All Tables Loaded" });
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataSource)) { OverrideCommandName = "All Data Sources" });
-        CommonFunctionality.AddToMenu(new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.ProgressLog)) { OverrideCommandName = "All Progress Logs" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataLoadTask))
+                { OverrideCommandName = "All Tasks" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataLoadRun))
+                { OverrideCommandName = "All Runs" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.FatalError))
+                { OverrideCommandName = "All Errors" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.TableLoadRun))
+                { OverrideCommandName = "All Tables Loaded" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.DataSource))
+                { OverrideCommandName = "All Data Sources" });
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandViewLogs(activator, new LogViewerFilter(LoggingTables.ProgressLog))
+                { OverrideCommandName = "All Progress Logs" });
 
 
         if (!databaseObject.DiscoverExistence(DataAccessContext.Logging, out var reason))
@@ -366,10 +392,7 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalDatabas
         FetchDataTable();
     }
 
-    public override string GetTabName()
-    {
-        return "Log Viewer";
-    }
+    public override string GetTabName() => "Log Viewer";
 
     private void FetchDataTable()
     {
@@ -381,7 +404,6 @@ public void SelectRowWithID(int rowIDToSelect)
     {
         dataGridView1.ClearSelection();
         foreach (DataGridViewRow row in dataGridView1.Rows)
-        {
             if (Convert.ToInt32(row.Cells["ID"].Value) == rowIDToSelect)
             {
                 //scroll to it
@@ -394,7 +416,6 @@ public void SelectRowWithID(int rowIDToSelect)
 
                 break;
             }
-        }
     }
 
     private void pbRemoveFilter_Click(object sender, EventArgs e)
@@ -418,5 +439,4 @@ private void cbPreferNewer_CheckedChanged(object sender, EventArgs e)
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<LoggingTab_Design, UserControl>))]
 public abstract class LoggingTab_Design : RDMPSingleDatabaseObjectControl<ExternalDatabaseServer>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs
index b89ac69a43..552d11dea9 100644
--- a/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs
+++ b/Rdmp.UI/MainFormUITabs/CatalogueItemUI.cs
@@ -16,7 +16,6 @@
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.SimpleDialogs;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using ScintillaNET;
 
 namespace Rdmp.UI.MainFormUITabs;
@@ -39,21 +38,21 @@ public CatalogueItemUI()
         InitializeComponent();
         ObjectSaverButton1.BeforeSave += objectSaverButton1_BeforeSave;
         AssociatedCollection = RDMPCollection.Catalogue;
-            
+
         ci_ddPeriodicity.DataSource = Enum.GetValues(typeof(Catalogue.CataloguePeriodicity));
     }
 
     private bool objectSaverButton1_BeforeSave(DatabaseEntity databaseEntity)
     {
         //see if we need to display the dialog that lets the user sync up descriptions of multiuse columns e.g. CHI
-        var propagate = new PropagateCatalogueItemChangesToSimilarNamedUI(Activator, _catalogueItem, out bool shouldDialogBeDisplayed);
+        var propagate =
+            new PropagateCatalogueItemChangesToSimilarNamedUI(Activator, _catalogueItem,
+                out var shouldDialogBeDisplayed);
 
         //there are other CatalogueItems that share the same name as this one so give the user the option to propagate his changes to those too
         if (shouldDialogBeDisplayed)
-        {
             if (Activator.ShowDialog(propagate) == DialogResult.Cancel)
                 return false;
-        }
 
         return true;
     }
@@ -65,39 +64,37 @@ public override void SetDatabaseObject(IActivateItems activator, CatalogueItem d
         if (_scintillaDescription == null)
         {
             var f = new ScintillaTextEditorFactory();
-            _scintillaDescription = f.Create(null, SyntaxLanguage.None, null, true, false,activator.CurrentDirectory);
+            _scintillaDescription = f.Create(null, SyntaxLanguage.None, null, true, false, activator.CurrentDirectory);
             _scintillaDescription.Font = System.Drawing.SystemFonts.DefaultFont;
             _scintillaDescription.WrapMode = WrapMode.Word;
             panel1.Controls.Add(_scintillaDescription);
         }
 
-        base.SetDatabaseObject(activator,databaseObject);
-            
+        base.SetDatabaseObject(activator, databaseObject);
+
 
         if (_catalogueItem.ExtractionInformation == null)
-            CommonFunctionality.AddToMenu(new ExecuteCommandMakeCatalogueItemExtractable(activator, _catalogueItem), "Make Extractable");
+            CommonFunctionality.AddToMenu(new ExecuteCommandMakeCatalogueItemExtractable(activator, _catalogueItem),
+                "Make Extractable");
     }
 
     protected override void SetBindings(BinderWithErrorProviderFactory rules, CatalogueItem databaseObject)
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(ci_tbID,"Text","ID",ci=>ci.ID);
+        Bind(ci_tbID, "Text", "ID", ci => ci.ID);
         Bind(ci_tbName, "Text", "Name", ci => ci.Name);
-        Bind(ci_tbStatisticalConsiderations,"Text", "Statistical_cons",ci=>ci.Statistical_cons);
+        Bind(ci_tbStatisticalConsiderations, "Text", "Statistical_cons", ci => ci.Statistical_cons);
         Bind(ci_tbResearchRelevance, "Text", "Research_relevance", ci => ci.Research_relevance);
         Bind(_scintillaDescription, "Text", "Description", ci => ci.Description);
         Bind(ci_tbTopics, "Text", "Topic", ci => ci.Topic);
         Bind(ci_ddPeriodicity, "SelectedItem", "Periodicity", ci => ci.Periodicity);
         Bind(ci_tbAggregationMethod, "Text", "Agg_method", ci => ci.Agg_method);
         Bind(ci_tbLimitations, "Text", "Limitations", ci => ci.Limitations);
-        Bind(ci_tbComments,"Text", "Comments",ci=>ci.Comments);
+        Bind(ci_tbComments, "Text", "Comments", ci => ci.Comments);
     }
 
-    public override string GetTabName()
-    {
-        return $"{base.GetTabName()} ({_catalogueItem.Catalogue.Name})";
-    }
+    public override string GetTabName() => $"{base.GetTabName()} ({_catalogueItem.Catalogue.Name})";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CatalogueItemUI_Design, UserControl>))]
diff --git a/Rdmp.UI/MainFormUITabs/CatalogueUI.cs b/Rdmp.UI/MainFormUITabs/CatalogueUI.cs
index 19fa9505a2..b86a6e7de5 100644
--- a/Rdmp.UI/MainFormUITabs/CatalogueUI.cs
+++ b/Rdmp.UI/MainFormUITabs/CatalogueUI.cs
@@ -17,8 +17,6 @@
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.SimpleDialogs;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
-
 using ScintillaNET;
 
 namespace Rdmp.UI.MainFormUITabs;
@@ -46,7 +44,7 @@ public CatalogueUI()
         InitializeComponent();
 
         ticketingControl1.TicketTextChanged += ticketingControl1_TicketTextChanged;
-            
+
         AssociatedCollection = RDMPCollection.Catalogue;
 
         c_ddType.DataSource = Enum.GetValues(typeof(Catalogue.CatalogueType));
@@ -89,13 +87,12 @@ private void ddExplicitConsent_SelectedIndexChanged(object sender, EventArgs e)
     {
         if (ddExplicitConsent.Text.Equals("Yes"))
             _catalogue.Explicit_consent = true;
-                
+
         if (ddExplicitConsent.Text.Equals("No"))
             _catalogue.Explicit_consent = false;
 
         if (string.IsNullOrWhiteSpace(ddExplicitConsent.Text))
             _catalogue.Explicit_consent = null;
-
     }
 
     private void tbFolder_TextChanged(object sender, EventArgs e)
@@ -105,7 +102,7 @@ private void tbFolder_TextChanged(object sender, EventArgs e)
             _catalogue.Folder = tbFolder.Text;
             tbFolder.ForeColor = Color.Black;
         }
-        catch (Exception )
+        catch (Exception)
         {
             tbFolder.ForeColor = Color.Red;
         }
@@ -122,8 +119,8 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
             panel1.Controls.Add(_scintillaDescription);
         }
 
-        base.SetDatabaseObject(activator,databaseObject);
-            
+        base.SetDatabaseObject(activator, databaseObject);
+
         _catalogue = databaseObject;
 
         RefreshUIFromDatabase();
@@ -131,43 +128,45 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
 
     protected override void SetBindings(BinderWithErrorProviderFactory rules, Catalogue databaseObject)
     {
-        base.SetBindings(rules,databaseObject);
+        base.SetBindings(rules, databaseObject);
 
-        Bind(tbAcronym, "Text", "Acronym", c=>c.Acronym);
+        Bind(tbAcronym, "Text", "Acronym", c => c.Acronym);
         Bind(tbName, "Text", "Name", c => c.Name);
-        Bind(c_tbID,"Text","ID", c=>c.ID);
+        Bind(c_tbID, "Text", "ID", c => c.ID);
         Bind(_scintillaDescription, "Text", "Description", c => c.Description);
-            
-        Bind(c_ddType,"SelectedItem","Type",c=>c.Type);
-        Bind(c_ddGranularity,"SelectedItem","Granularity", c => c.Granularity);
+
+        Bind(c_ddType, "SelectedItem", "Type", c => c.Type);
+        Bind(c_ddGranularity, "SelectedItem", "Granularity", c => c.Granularity);
         Bind(c_ddPeriodicity, "SelectedItem", "Periodicity", c => c.Periodicity);
-            
+
         Bind(cbColdStorage, "Checked", "IsColdStorageDataset", c => c.IsColdStorageDataset);
         Bind(cbDeprecated, "Checked", "IsDeprecated", c => c.IsDeprecated);
         Bind(cbInternal, "Checked", "IsInternalDataset", c => c.IsInternalDataset);
 
-        Bind(c_tbGeographicalCoverage ,"Text","Geographical_coverage", c=>c.Geographical_coverage);
-        Bind(c_tbBackgroundSummary ,"Text","Background_summary", c=>c.Background_summary);
-        Bind(c_tbTopics ,"Text","Search_keywords", c=>c.Search_keywords);
-        Bind(c_tbUpdateFrequency ,"Text","Update_freq", c=>c.Update_freq);
-        Bind(c_tbUpdateSchedule ,"Text","Update_sched", c=>c.Update_sched);
-        Bind(c_tbTimeCoverage ,"Text","Time_coverage", c=>c.Time_coverage);
-        Bind(tbAdministrativeContactName ,"Text","Contact_details", c=>c.Contact_details);
-        Bind(c_tbResourceOwner ,"Text","Resource_owner", c=>c.Resource_owner);
-        Bind(c_tbAttributionCitation ,"Text","Attribution_citation", c=>c.Attribution_citation);
-        Bind(c_tbAccessOptions ,"Text","Access_options", c=>c.Access_options);
+        Bind(c_tbGeographicalCoverage, "Text", "Geographical_coverage", c => c.Geographical_coverage);
+        Bind(c_tbBackgroundSummary, "Text", "Background_summary", c => c.Background_summary);
+        Bind(c_tbTopics, "Text", "Search_keywords", c => c.Search_keywords);
+        Bind(c_tbUpdateFrequency, "Text", "Update_freq", c => c.Update_freq);
+        Bind(c_tbUpdateSchedule, "Text", "Update_sched", c => c.Update_sched);
+        Bind(c_tbTimeCoverage, "Text", "Time_coverage", c => c.Time_coverage);
+        Bind(tbAdministrativeContactName, "Text", "Contact_details", c => c.Contact_details);
+        Bind(c_tbResourceOwner, "Text", "Resource_owner", c => c.Resource_owner);
+        Bind(c_tbAttributionCitation, "Text", "Attribution_citation", c => c.Attribution_citation);
+        Bind(c_tbAccessOptions, "Text", "Access_options", c => c.Access_options);
         Bind(c_tbSubjectNumbers, "Text", "SubjectNumbers", c => c.SubjectNumbers);
 
-        Bind(tbDataStandards,"Text", "Data_standards",c=>c.Data_standards);
-        Bind(tbAdministrativeContactName,"Text", "Administrative_contact_name",c=>c.Administrative_contact_name);
-        Bind(tbAdministrativeContactEmail,"Text", "Administrative_contact_email",c=>c.Administrative_contact_email);
-        Bind(tbAdministrativeContactTelephone,"Text", "Administrative_contact_telephone",c=>c.Administrative_contact_telephone);
-        Bind(tbAdministrativeContactAddress,"Text", "Administrative_contact_address",c=>c.Administrative_contact_address);
-        Bind(tbCountryOfOrigin,"Text", "Country_of_origin",c=>c.Country_of_origin);
-        Bind(tbEthicsApprover,"Text", "Ethics_approver",c=>c.Ethics_approver);
-        Bind(tbSourceOfDataCollection,"Text", "Source_of_data_collection",c=>c.Source_of_data_collection);
-        Bind(c_tbAttributionCitation,"Text", "Attribution_citation",c=>c.Attribution_citation);
-        Bind(c_tbAccessOptions,"Text", "Access_options",c=>c.Access_options);
+        Bind(tbDataStandards, "Text", "Data_standards", c => c.Data_standards);
+        Bind(tbAdministrativeContactName, "Text", "Administrative_contact_name", c => c.Administrative_contact_name);
+        Bind(tbAdministrativeContactEmail, "Text", "Administrative_contact_email", c => c.Administrative_contact_email);
+        Bind(tbAdministrativeContactTelephone, "Text", "Administrative_contact_telephone",
+            c => c.Administrative_contact_telephone);
+        Bind(tbAdministrativeContactAddress, "Text", "Administrative_contact_address",
+            c => c.Administrative_contact_address);
+        Bind(tbCountryOfOrigin, "Text", "Country_of_origin", c => c.Country_of_origin);
+        Bind(tbEthicsApprover, "Text", "Ethics_approver", c => c.Ethics_approver);
+        Bind(tbSourceOfDataCollection, "Text", "Source_of_data_collection", c => c.Source_of_data_collection);
+        Bind(c_tbAttributionCitation, "Text", "Attribution_citation", c => c.Attribution_citation);
+        Bind(c_tbAccessOptions, "Text", "Access_options", c => c.Access_options);
     }
 
     public override void SetItemActivator(IActivateItems activator)
@@ -186,12 +185,12 @@ private void RefreshUIFromDatabase()
         {
             ExceptionViewer.Show(e);
         }
-            
+
         splitContainer1.Enabled = true;
         ticketingControl1.Enabled = true;
 
         ticketingControl1.TicketText = _catalogue.Ticket;
-            
+
         tbFolder.Text = _catalogue.Folder;
 
         if (_catalogue.Explicit_consent == null)
@@ -203,7 +202,7 @@ private void RefreshUIFromDatabase()
 
         c_tbLastRevisionDate.Text = _catalogue.Last_revision_date.ToString();
         tbDatasetStartDate.Text = _catalogue.DatasetStartDate.ToString();
-            
+
         c_tbAPIAccessURL.Text = _catalogue.API_access_URL != null ? _catalogue.API_access_URL.ToString() : "";
         c_tbBrowseUrl.Text = _catalogue.Browse_URL != null ? _catalogue.Browse_URL.ToString() : "";
         c_tbBulkDownloadUrl.Text = _catalogue.Bulk_Download_URL != null ? _catalogue.Bulk_Download_URL.ToString() : "";
@@ -213,7 +212,6 @@ private void RefreshUIFromDatabase()
     }
 
 
-
     private void c_tbLastRevisionDate_TextChanged(object sender, EventArgs e)
     {
         SetDate(c_tbLastRevisionDate, v => _catalogue.Last_revision_date = v);
@@ -221,12 +219,12 @@ private void c_tbLastRevisionDate_TextChanged(object sender, EventArgs e)
 
     private void tbDatasetStartDate_TextChanged(object sender, EventArgs e)
     {
-        SetDate(tbDatasetStartDate,v=>_catalogue.DatasetStartDate = v);
+        SetDate(tbDatasetStartDate, v => _catalogue.DatasetStartDate = v);
     }
 
     private void c_tbDetailPageURL_TextChanged(object sender, EventArgs e)
     {
-        SetUrl((TextBox)sender,v=>_catalogue.Detail_Page_URL = v);
+        SetUrl((TextBox)sender, v => _catalogue.Detail_Page_URL = v);
     }
 
     private void c_tbAPIAccessURL_TextChanged(object sender, EventArgs e)
@@ -258,5 +256,4 @@ private void c_tbSourceUrl_TextChanged(object sender, EventArgs e)
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CatalogueUI_Design, UserControl>))]
 public abstract class CatalogueUI_Design : RDMPSingleDatabaseObjectControl<Catalogue>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/MainFormUITabs/ConnectionStringKeywordUI.cs b/Rdmp.UI/MainFormUITabs/ConnectionStringKeywordUI.cs
index baafadac24..8ba575d491 100644
--- a/Rdmp.UI/MainFormUITabs/ConnectionStringKeywordUI.cs
+++ b/Rdmp.UI/MainFormUITabs/ConnectionStringKeywordUI.cs
@@ -56,14 +56,14 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Connec
         base.SetBindings(rules, databaseObject);
 
         Bind(tbID, "Text", "ID", k => k.ID);
-        Bind(tbName,"Text","Name",k=>k.Name);
+        Bind(tbName, "Text", "Name", k => k.Name);
         Bind(tbValue, "Text", "Value", k => k.Value);
         Bind(ddDatabaseType, "Text", "DatabaseType", k => k.DatabaseType);
     }
 
     private void ddDatabaseType_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(_keyword == null)
+        if (_keyword == null)
             return;
 
         var type = (DatabaseType)ddDatabaseType.SelectedValue;
@@ -72,6 +72,6 @@ private void ddDatabaseType_SelectedIndexChanged(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ConnectionStringKeywordUI_Design, UserControl>))]
-public abstract class ConnectionStringKeywordUI_Design: RDMPSingleDatabaseObjectControl<ConnectionStringKeyword>
+public abstract class ConnectionStringKeywordUI_Design : RDMPSingleDatabaseObjectControl<ConnectionStringKeyword>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/MainFormUITabs/DitaExtractorUI.cs b/Rdmp.UI/MainFormUITabs/DitaExtractorUI.cs
index 22a1468896..13667dbca6 100644
--- a/Rdmp.UI/MainFormUITabs/DitaExtractorUI.cs
+++ b/Rdmp.UI/MainFormUITabs/DitaExtractorUI.cs
@@ -33,7 +33,7 @@ public DitaExtractorUI()
     private void btnBrowse_Click(object sender, EventArgs e)
     {
         using var ofd = new FolderBrowserDialog();
-        
+
         if (ofd.ShowDialog() is DialogResult.OK or DialogResult.Yes)
             tbExtractionDirectory.Text = ofd.SelectedPath;
     }
@@ -44,11 +44,10 @@ private void btnExtract_Click(object sender, EventArgs e)
         {
             var outputPath = new DirectoryInfo(tbExtractionDirectory.Text);
 
-            if (outputPath.GetFiles("*.dita*").Any() && Activator.YesNo("There are files already in this directory, do you want to delete them?","Clear Directory?"))
-            {
+            if (outputPath.GetFiles("*.dita*").Any() && Activator.YesNo(
+                    "There are files already in this directory, do you want to delete them?", "Clear Directory?"))
                 foreach (var file in outputPath.GetFiles("*.dita*"))
                     file.Delete();
-            }
 
             var extractor = new DitaCatalogueExtractor(Activator.RepositoryLocator.CatalogueRepository, outputPath);
             extractor.Extract(progressBarsUI1);
@@ -57,12 +56,11 @@ private void btnExtract_Click(object sender, EventArgs e)
         {
             MessageBox.Show(ex.Message);
         }
-            
     }
 
     private void btnShowDirectory_Click(object sender, EventArgs e)
     {
-        if(string.IsNullOrWhiteSpace(tbExtractionDirectory.Text))
+        if (string.IsNullOrWhiteSpace(tbExtractionDirectory.Text))
             return;
 
         var d = new DirectoryInfo(tbExtractionDirectory.Text);
@@ -71,7 +69,7 @@ private void btnShowDirectory_Click(object sender, EventArgs e)
 
     private void btnCheck_Click(object sender, EventArgs e)
     {
-        var popup = new PopupChecksUI("Checking Dita extraction",false);
+        var popup = new PopupChecksUI("Checking Dita extraction", false);
 
         var extractor = new DitaCatalogueExtractor(Activator.RepositoryLocator.CatalogueRepository, null);
         popup.StartChecking(extractor);
diff --git a/Rdmp.UI/MainFormUITabs/ExtractionProgressUI.cs b/Rdmp.UI/MainFormUITabs/ExtractionProgressUI.cs
index 56f7000f1a..2e240a6dc2 100644
--- a/Rdmp.UI/MainFormUITabs/ExtractionProgressUI.cs
+++ b/Rdmp.UI/MainFormUITabs/ExtractionProgressUI.cs
@@ -25,7 +25,7 @@ public partial class ExtractionProgressUI : ExtractionProgressUI_Design, ISaveab
 {
     public ExtractionProgress ExtractionProgress => (ExtractionProgress)DatabaseObject;
     public IDetermineDatasetTimespan TimespanCalculator { get; set; } = new DatasetTimespanCalculator();
-        
+
     private Tuple<DateTime?, DateTime?> dqeResult;
 
     public ExtractionProgressUI()
@@ -48,7 +48,9 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionProgr
     {
         base.SetDatabaseObject(activator, databaseObject);
 
-        var result = TimespanCalculator.GetMachineReadableTimespanIfKnownOf(databaseObject.ExtractionInformation.CatalogueItem.Catalogue, false, out var date);
+        var result =
+            TimespanCalculator.GetMachineReadableTimespanIfKnownOf(
+                databaseObject.ExtractionInformation.CatalogueItem.Catalogue, false, out var date);
 
         btnFromDQE.Image = activator.CoreIconProvider.GetImage(RDMPConcept.DQE, OverlayKind.Import).ImageToBitmap();
 
@@ -63,11 +65,15 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionProgr
             lblEvaluationDate.Text = $"(DQE has not been run)";
             btnFromDQE.Enabled = false;
         }
-            
 
-        tbStartDate.Text = databaseObject.StartDate == null ? "" :databaseObject.StartDate.Value.ToString("yyyy-MM-dd") ?? "";
+
+        tbStartDate.Text = databaseObject.StartDate == null
+            ? ""
+            : databaseObject.StartDate.Value.ToString("yyyy-MM-dd") ?? "";
         tbEndDate.Text = databaseObject.EndDate == null ? "" : databaseObject.EndDate.Value.ToString("yyyy-MM-dd");
-        tbProgress.Text = databaseObject.ProgressDate == null ? "" : databaseObject.ProgressDate.Value.ToString("yyyy-MM-dd");
+        tbProgress.Text = databaseObject.ProgressDate == null
+            ? ""
+            : databaseObject.ProgressDate.Value.ToString("yyyy-MM-dd");
 
         ddRetry.SelectedItem = databaseObject.Retry;
 
@@ -91,27 +97,17 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionProgr
 
     private void tbDate_TextChanged(object sender, EventArgs e)
     {
-        if(sender == tbStartDate)
-        {
-            SetDate(tbStartDate, v => ExtractionProgress.StartDate = v);
-        }
+        if (sender == tbStartDate) SetDate(tbStartDate, v => ExtractionProgress.StartDate = v);
 
-        if (sender == tbEndDate)
-        {
-            SetDate(tbEndDate, v => ExtractionProgress.EndDate = v);
-        }
-
-        if (sender == tbProgress)
-        {
-            SetDate(tbProgress, v => ExtractionProgress.ProgressDate = v);
-        }
+        if (sender == tbEndDate) SetDate(tbEndDate, v => ExtractionProgress.EndDate = v);
 
+        if (sender == tbProgress) SetDate(tbProgress, v => ExtractionProgress.ProgressDate = v);
     }
 
     private void ddColumn_SelectionChangeCommitted(object sender, EventArgs e)
     {
         ragSmiley1.Reset();
-        if(ddColumn.SelectedItem is ExtractionInformation ei)
+        if (ddColumn.SelectedItem is ExtractionInformation ei)
         {
             ExtractionProgress.ValidateSelectedColumn(ragSmiley1, ei);
             ExtractionProgress.ExtractionInformation_ID = ei.ID;
@@ -120,9 +116,10 @@ private void ddColumn_SelectionChangeCommitted(object sender, EventArgs e)
 
     private void btnPickColumn_Click(object sender, EventArgs e)
     {
-        var col  = (ExtractionInformation)Activator.SelectOne("Column", ddColumn.Items.Cast<object>().OfType<ExtractionInformation>().ToArray());
+        var col = (ExtractionInformation)Activator.SelectOne("Column",
+            ddColumn.Items.Cast<object>().OfType<ExtractionInformation>().ToArray());
 
-        if(col != null)
+        if (col != null)
         {
             ddColumn.SelectedItem = col;
             ragSmiley1.Reset();
@@ -144,17 +141,12 @@ private void btnResetProgress_Click(object sender, EventArgs e)
 
     private void ddRetry_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(ExtractionProgress == null)
-        {
-            return;
-        }
+        if (ExtractionProgress == null) return;
         ExtractionProgress.Retry = (RetryStrategy)ddRetry.SelectedItem;
     }
 }
 
-
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExtractionProgressUI_Design, UserControl>))]
 public abstract class ExtractionProgressUI_Design : RDMPSingleDatabaseObjectControl<ExtractionProgress>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/MainFormUITabs/SubComponents/ExternalDatabaseServerUI.cs b/Rdmp.UI/MainFormUITabs/SubComponents/ExternalDatabaseServerUI.cs
index 2e4ca87e52..61752b094c 100644
--- a/Rdmp.UI/MainFormUITabs/SubComponents/ExternalDatabaseServerUI.cs
+++ b/Rdmp.UI/MainFormUITabs/SubComponents/ExternalDatabaseServerUI.cs
@@ -46,7 +46,7 @@ public override void SetDatabaseObject(IActivateItems activator, ExternalDatabas
         _server = databaseObject;
 
         bloading = true;
-            
+
         try
         {
             SetupDropdownItems();
@@ -69,8 +69,8 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Extern
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",s=>s.ID);
-        Bind(tbName,"Text","Name",s=>s.Name);
+        Bind(tbID, "Text", "ID", s => s.ID);
+        Bind(tbName, "Text", "Name", s => s.Name);
         Bind(tbServerName, "Text", "Server", s => s.Server);
         Bind(tbMappedDataPath, "Text", "MappedDataPath", s => s.MappedDataPath);
         Bind(tbDatabaseName, "Text", "Database", s => s.Database);
@@ -83,19 +83,19 @@ private void SetupDropdownItems()
         ddSetKnownType.Items.Clear();
 
         var manager = new PatcherManager();
-            
+
         ddSetKnownType.Items.AddRange(manager
             .GetAllPatchers(Activator.RepositoryLocator.CatalogueRepository.MEF)
             .Select(p => p.Name)
             .ToArray());
     }
-        
+
     private void tbPassword_TextChanged(object sender, EventArgs e)
     {
-        if(!bloading)
+        if (!bloading)
             _server.Password = tbPassword.Text;
     }
-        
+
     private void btnClearKnownType_Click(object sender, EventArgs e)
     {
         _server.CreatedByAssembly = null;
@@ -115,6 +115,6 @@ private void ddDatabaseType_SelectedIndexChanged(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExternalDatabaseServerUI_Design, UserControl>))]
-public abstract class ExternalDatabaseServerUI_Design:RDMPSingleDatabaseObjectControl<ExternalDatabaseServer>
+public abstract class ExternalDatabaseServerUI_Design : RDMPSingleDatabaseObjectControl<ExternalDatabaseServer>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/MainFormUITabs/SubComponents/ImportSQLTableUI.cs b/Rdmp.UI/MainFormUITabs/SubComponents/ImportSQLTableUI.cs
index 427fb042c6..de16c60b7f 100644
--- a/Rdmp.UI/MainFormUITabs/SubComponents/ImportSQLTableUI.cs
+++ b/Rdmp.UI/MainFormUITabs/SubComponents/ImportSQLTableUI.cs
@@ -42,7 +42,7 @@ public partial class ImportSQLTableUI : RDMPForm
 
     private Project _projectSpecific;
 
-    public ImportSQLTableUI(IActivateItems activator,bool allowImportAsCatalogue):base(activator)
+    public ImportSQLTableUI(IActivateItems activator, bool allowImportAsCatalogue) : base(activator)
     {
         _allowImportAsCatalogue = allowImportAsCatalogue;
         InitializeComponent();
@@ -50,8 +50,8 @@ public ImportSQLTableUI(IActivateItems activator,bool allowImportAsCatalogue):ba
         serverDatabaseTableSelector1.AllowTableValuedFunctionSelection = true;
         serverDatabaseTableSelector1.SelectionChanged += serverDatabaseTableSelector1_SelectionChanged;
 
-        ddContext.DataSource = Enum.GetValues(typeof (DataAccessContext));
-        ddContext.SelectedItem = DataAccessContext.Any;//default to any!
+        ddContext.DataSource = Enum.GetValues(typeof(DataAccessContext));
+        ddContext.SelectedItem = DataAccessContext.Any; //default to any!
 
         serverDatabaseTableSelector1.SetItemActivator(activator);
     }
@@ -76,12 +76,12 @@ private void AdjustImporter()
 
             //if it isn't a table valued function
             if (tbl is DiscoveredTableValuedFunction function)
-                Importer = new TableValuedFunctionImporter(cataRepo, function,(DataAccessContext) ddContext.SelectedValue);
+                Importer = new TableValuedFunctionImporter(cataRepo, function,
+                    (DataAccessContext)ddContext.SelectedValue);
             else
-                Importer = new TableInfoImporter(cataRepo, tbl, (DataAccessContext) ddContext.SelectedValue);
+                Importer = new TableInfoImporter(cataRepo, tbl, (DataAccessContext)ddContext.SelectedValue);
 
             btnImport.Enabled = true;
-
         }
         catch (Exception exception)
         {
@@ -91,8 +91,7 @@ private void AdjustImporter()
 
     private void btnImport_Click(object sender, EventArgs e)
     {
-
-        if(_allowImportAsCatalogue)
+        if (_allowImportAsCatalogue)
         {
             var ui = new ConfigureCatalogueExtractabilityUI(Activator, Importer, "Existing Table", _projectSpecific)
             {
@@ -107,7 +106,7 @@ private void btnImport_Click(object sender, EventArgs e)
             // parent.SetCredentials();
             Importer.DoImport(out var ti, out var cols);
 
-            if(ti is DatabaseEntity de)
+            if (ti is DatabaseEntity de)
                 Activator.Publish(de);
 
             TableInfoCreatedIfAny = ti;
@@ -121,11 +120,12 @@ private void btnImport_Click(object sender, EventArgs e)
 
             if (ti != null)
             {
-                if(ti.IsTableValuedFunction && ti.GetAllParameters().Any())
+                if (ti.IsTableValuedFunction && ti.GetAllParameters().Any())
                 {
                     var options = ParameterCollectionUIOptionsFactory.Create(ti);
-                    ParameterCollectionUI.ShowAsDialog(Activator,options,true);
+                    ParameterCollectionUI.ShowAsDialog(Activator, options, true);
                 }
+
                 MessageBox.Show($"Successfully imported table '{ti}'");
             }
 
diff --git a/Rdmp.UI/MainFormUITabs/SubComponents/TableInfoUI.cs b/Rdmp.UI/MainFormUITabs/SubComponents/TableInfoUI.cs
index a5ce23efaa..bbea48b6c0 100644
--- a/Rdmp.UI/MainFormUITabs/SubComponents/TableInfoUI.cs
+++ b/Rdmp.UI/MainFormUITabs/SubComponents/TableInfoUI.cs
@@ -20,8 +20,6 @@
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 
 
-
-
 namespace Rdmp.UI.MainFormUITabs.SubComponents;
 
 /// <summary>
@@ -75,12 +73,13 @@ public override void SetDatabaseObject(IActivateItems activator, TableInfo datab
                 cbIsPrimaryExtractionTable.Enabled = false;
     }
 
-        
+
     private void cbIsPrimaryExtractionTable_CheckedChanged(object sender, EventArgs e)
     {
         _tableInfo.IsPrimaryExtractionTable = cbIsPrimaryExtractionTable.Checked;
         _tableInfo.SaveToDatabase();
     }
+
     private void cbIsView_CheckedChanged(object sender, EventArgs e)
     {
         _tableInfo.IsView = cbIsView.Checked;
@@ -99,9 +98,11 @@ private bool objectSaverButton1_BeforeSave(DatabaseEntity arg)
 
             var oldName = _tableInfo.Repository.GetObjectByID<TableInfo>(_tableInfo.ID).GetFullyQualifiedName();
 
-            if (oldName != newName && Activator.YesNo("You have just renamed a TableInfo, would you like to refactor your changes into ExtractionInformations?", "Apply Code Refactoring?"))
+            if (oldName != newName &&
+                Activator.YesNo(
+                    "You have just renamed a TableInfo, would you like to refactor your changes into ExtractionInformations?",
+                    "Apply Code Refactoring?"))
                 DoRefactoring(oldName, newName);
-
         }
         catch (Exception)
         {
@@ -109,12 +110,13 @@ private bool objectSaverButton1_BeforeSave(DatabaseEntity arg)
             // just give up on trying to be helpful
             return true;
         }
-            
+
         return true;
     }
+
     private void DoRefactoring(string toReplace, string toReplaceWith)
     {
-        var updatesMade = SelectSQLRefactorer.RefactorTableName(_tableInfo,toReplace,toReplaceWith);
+        var updatesMade = SelectSQLRefactorer.RefactorTableName(_tableInfo, toReplace, toReplaceWith);
 
         MessageBox.Show($"Made {updatesMade} replacements in ExtractionInformation/ColumnInfos.");
     }
@@ -123,7 +125,7 @@ private void tbTableInfoName_TextChanged(object sender, EventArgs e)
     {
         _tableInfo.Name = tbTableInfoName.Text;
     }
-        
+
     private void tbTableInfoDatabaseAccess_TextChanged(object sender, EventArgs e)
     {
         _tableInfo.Server = tbTableInfoDatabaseAccess.Text;
@@ -131,24 +133,25 @@ private void tbTableInfoDatabaseAccess_TextChanged(object sender, EventArgs e)
 
     private void tbTableInfoDatabaseName_TextChanged(object sender, EventArgs e)
     {
-        _tableInfo.Database = ((TextBox) sender).Text;
+        _tableInfo.Database = ((TextBox)sender).Text;
     }
 
     private void tbSchema_TextChanged(object sender, EventArgs e)
     {
-        _tableInfo.Schema = ((TextBox) sender).Text;
+        _tableInfo.Schema = ((TextBox)sender).Text;
     }
 
     private void btnParameters_Click(object sender, EventArgs e)
     {
-        ParameterCollectionUI.ShowAsDialog(Activator,ParameterCollectionUIOptionsFactory.Create(_tableInfo));
+        ParameterCollectionUI.ShowAsDialog(Activator, ParameterCollectionUIOptionsFactory.Create(_tableInfo));
     }
 
     private void btnSynchronize_Click(object sender, EventArgs e)
     {
         try
         {
-            var isSync = new TableInfoSynchronizer(_tableInfo).Synchronize(new MakeChangePopup(new YesNoYesToAllDialog()));
+            var isSync =
+                new TableInfoSynchronizer(_tableInfo).Synchronize(new MakeChangePopup(new YesNoYesToAllDialog()));
 
             if (isSync)
                 MessageBox.Show("TableInfo is synchronized");
@@ -158,11 +161,9 @@ private void btnSynchronize_Click(object sender, EventArgs e)
             ExceptionViewer.Show(exception);
         }
     }
-
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<TableInfoUI_Design, UserControl>))]
 public abstract class TableInfoUI_Design : RDMPSingleDatabaseObjectControl<TableInfo>
 {
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/AggregateConfigurationMenu.cs b/Rdmp.UI/Menus/AggregateConfigurationMenu.cs
index 07226606c1..6ad968e6a5 100644
--- a/Rdmp.UI/Menus/AggregateConfigurationMenu.cs
+++ b/Rdmp.UI/Menus/AggregateConfigurationMenu.cs
@@ -17,9 +17,10 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class AggregateConfigurationMenu :RDMPContextMenuStrip
+internal class AggregateConfigurationMenu : RDMPContextMenuStrip
 {
-    public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfiguration aggregate): base(args, aggregate)
+    public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfiguration aggregate) : base(args,
+        aggregate)
     {
         if (aggregate.IsCohortIdentificationAggregate)
         {
@@ -31,11 +32,11 @@ public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfig
         }
 
         //if it is a cohort aggregate (but not joinables since they don't match patients they match records and select many columns)
-        if ( aggregate.IsCohortIdentificationAggregate && !aggregate.IsJoinablePatientIndexTable())
+        if (aggregate.IsCohortIdentificationAggregate && !aggregate.IsJoinablePatientIndexTable())
         {
             //with a cic (it really should do!)
             var cic = aggregate.GetCohortIdentificationConfigurationIfAny();
-                
+
             if (cic != null)
             {
                 //find other non cohort aggregates (graphs) 
@@ -43,7 +44,8 @@ public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfig
 
                 try
                 {
-                    graphsAvailableInCatalogue = CohortSummaryQueryBuilder.GetAllCompatibleSummariesForCohort(aggregate);
+                    graphsAvailableInCatalogue =
+                        CohortSummaryQueryBuilder.GetAllCompatibleSummariesForCohort(aggregate);
                 }
                 catch (Exception)
                 {
@@ -52,8 +54,10 @@ public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfig
                 }
 
                 //and offer graph generation for the cohort subsets
-                var matchRecords = new ToolStripMenuItem("Graph Matching Records Only",_activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
-                var matchIdentifiers = new ToolStripMenuItem("Graph All Records For Matching Patients",_activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
+                var matchRecords = new ToolStripMenuItem("Graph Matching Records Only",
+                    _activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
+                var matchIdentifiers = new ToolStripMenuItem("Graph All Records For Matching Patients",
+                    _activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
 
                 matchRecords.Enabled = graphsAvailableInCatalogue.Any();
                 matchIdentifiers.Enabled = graphsAvailableInCatalogue.Any() && cic.QueryCachingServer_ID != null;
@@ -61,13 +65,18 @@ public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfig
                 foreach (var graph in graphsAvailableInCatalogue)
                 {
                     //records in
-                    Add(new ExecuteCommandViewCohortAggregateGraph(_activator,new CohortSummaryAggregateGraphObjectCollection(aggregate, graph, CohortSummaryAdjustment.WhereRecordsIn)),
+                    Add(
+                        new ExecuteCommandViewCohortAggregateGraph(_activator,
+                            new CohortSummaryAggregateGraphObjectCollection(aggregate, graph,
+                                CohortSummaryAdjustment.WhereRecordsIn)),
                         Keys.None,
                         matchRecords);
 
                     //extraction identifiers in
                     Add(
-                        new ExecuteCommandViewCohortAggregateGraph(_activator, new CohortSummaryAggregateGraphObjectCollection(aggregate, graph, CohortSummaryAdjustment.WhereExtractionIdentifiersIn)),
+                        new ExecuteCommandViewCohortAggregateGraph(_activator,
+                            new CohortSummaryAggregateGraphObjectCollection(aggregate, graph,
+                                CohortSummaryAdjustment.WhereExtractionIdentifiersIn)),
                         Keys.None,
                         matchIdentifiers
                     );
@@ -80,6 +89,5 @@ public AggregateConfigurationMenu(RDMPContextMenuStripArgs args, AggregateConfig
                 Items.Add(miGraph);
             }
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/AllCohortsNodeMenu.cs b/Rdmp.UI/Menus/AllCohortsNodeMenu.cs
index 3033460565..477334cad4 100644
--- a/Rdmp.UI/Menus/AllCohortsNodeMenu.cs
+++ b/Rdmp.UI/Menus/AllCohortsNodeMenu.cs
@@ -16,7 +16,7 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class AllCohortsNodeMenu:RDMPContextMenuStrip
+internal class AllCohortsNodeMenu : RDMPContextMenuStrip
 {
     [UseWithObjectConstructor]
     public AllCohortsNodeMenu(RDMPContextMenuStripArgs args, AllCohortsNode node)
@@ -26,14 +26,15 @@ public AllCohortsNodeMenu(RDMPContextMenuStripArgs args, AllCohortsNode node)
 
         Add(new ExecuteCommandCreateNewCohortDatabaseUsingWizard(_activator));
 
-        Items.Add("Create blank cohort database (Not recommended)", _activator.CoreIconProvider.GetImage(RDMPConcept.ExternalCohortTable, OverlayKind.Problem).ImageToBitmap(), (s, e) => AddBlankExternalCohortTable());
-            
+        Items.Add("Create blank cohort database (Not recommended)",
+            _activator.CoreIconProvider.GetImage(RDMPConcept.ExternalCohortTable, OverlayKind.Problem).ImageToBitmap(),
+            (s, e) => AddBlankExternalCohortTable());
     }
-        
+
     private void AddBlankExternalCohortTable()
     {
         var newExternalCohortTable = new ExternalCohortTable(RepositoryLocator.DataExportRepository,
-            $"Blank Cohort Source {Guid.NewGuid()}",DatabaseType.MicrosoftSQLServer);
+            $"Blank Cohort Source {Guid.NewGuid()}", DatabaseType.MicrosoftSQLServer);
         Publish(newExternalCohortTable);
         Activate(newExternalCohortTable);
     }
diff --git a/Rdmp.UI/Menus/AllDashboardsNodeMenu.cs b/Rdmp.UI/Menus/AllDashboardsNodeMenu.cs
index dbb3c4ce2c..aac9173525 100644
--- a/Rdmp.UI/Menus/AllDashboardsNodeMenu.cs
+++ b/Rdmp.UI/Menus/AllDashboardsNodeMenu.cs
@@ -11,7 +11,6 @@ namespace Rdmp.UI.Menus;
 
 internal class AllDashboardsNodeMenu : RDMPContextMenuStrip
 {
-
     public AllDashboardsNodeMenu(RDMPContextMenuStripArgs args, AllDashboardsNode node)
         : base(args, node)
     {
diff --git a/Rdmp.UI/Menus/AllExternalServersNodeMenu.cs b/Rdmp.UI/Menus/AllExternalServersNodeMenu.cs
index 4d2d188537..66fa78b0fe 100644
--- a/Rdmp.UI/Menus/AllExternalServersNodeMenu.cs
+++ b/Rdmp.UI/Menus/AllExternalServersNodeMenu.cs
@@ -12,7 +12,7 @@ namespace Rdmp.UI.Menus;
 [System.ComponentModel.DesignerCategory("")]
 internal class AllExternalServersNodeMenu : RDMPContextMenuStrip
 {
-    public AllExternalServersNodeMenu(RDMPContextMenuStripArgs args, AllExternalServersNode node) : base(args,node)
+    public AllExternalServersNodeMenu(RDMPContextMenuStripArgs args, AllExternalServersNode node) : base(args, node)
     {
         Add(new ExecuteCommandConfigureDefaultServers(_activator));
     }
diff --git a/Rdmp.UI/Menus/CacheProgressMenu.cs b/Rdmp.UI/Menus/CacheProgressMenu.cs
index 4a173a2ac0..1afbeda7a7 100644
--- a/Rdmp.UI/Menus/CacheProgressMenu.cs
+++ b/Rdmp.UI/Menus/CacheProgressMenu.cs
@@ -17,7 +17,7 @@ public CacheProgressMenu(RDMPContextMenuStripArgs args, CacheProgress cacheProgr
         : base(args, cacheProgress)
     {
         Add(new ExecuteCommandEditCacheProgress(args.ItemActivator, cacheProgress));
-                        
-        ReBrandActivateAs("Execute Caching",RDMPConcept.CacheProgress,OverlayKind.Execute);
+
+        ReBrandActivateAs("Execute Caching", RDMPConcept.CacheProgress, OverlayKind.Execute);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/CatalogueFolderMenu.cs b/Rdmp.UI/Menus/CatalogueFolderMenu.cs
index 55ab7599c5..05b0885eae 100644
--- a/Rdmp.UI/Menus/CatalogueFolderMenu.cs
+++ b/Rdmp.UI/Menus/CatalogueFolderMenu.cs
@@ -17,7 +17,6 @@ internal class CatalogueFolderMenu : RDMPContextMenuStrip
 {
     public CatalogueFolderMenu(RDMPContextMenuStripArgs args, string folder) : base(args, folder)
     {
-
         //Things that are always visible regardless
         Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator)
         {
@@ -29,6 +28,7 @@ public CatalogueFolderMenu(RDMPContextMenuStripArgs args, string folder) : base(
 
         args.SkipCommand<ExecuteCommandCreateNewCatalogueByImportingFile>();
 
-        Add(new ExecuteCommandGenerateMetadataReport(_activator, _activator.CoreChildProvider.GetAllChildrenRecursively(folder).OfType<ICatalogue>().ToArray()));
+        Add(new ExecuteCommandGenerateMetadataReport(_activator,
+            _activator.CoreChildProvider.GetAllChildrenRecursively(folder).OfType<ICatalogue>().ToArray()));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/CatalogueItemsNodeMenu.cs b/Rdmp.UI/Menus/CatalogueItemsNodeMenu.cs
index 595d5e0307..34e6b7d624 100644
--- a/Rdmp.UI/Menus/CatalogueItemsNodeMenu.cs
+++ b/Rdmp.UI/Menus/CatalogueItemsNodeMenu.cs
@@ -11,9 +11,10 @@ namespace Rdmp.UI.Menus;
 
 internal class CatalogueItemsNodeMenu : RDMPContextMenuStrip
 {
-    public CatalogueItemsNodeMenu(RDMPContextMenuStripArgs args, CatalogueItemsNode node): base(args, node)
+    public CatalogueItemsNodeMenu(RDMPContextMenuStripArgs args, CatalogueItemsNode node) : base(args, node)
     {
-        if(node.Category != null)
-            Add(new ExecuteCommandChangeExtractionCategory(_activator,node.Catalogue.GetAllExtractionInformation(node.Category.Value)));
+        if (node.Category != null)
+            Add(new ExecuteCommandChangeExtractionCategory(_activator,
+                node.Catalogue.GetAllExtractionInformation(node.Category.Value)));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/CatalogueMenu.cs b/Rdmp.UI/Menus/CatalogueMenu.cs
index 05dcf21919..429b9ff3ab 100644
--- a/Rdmp.UI/Menus/CatalogueMenu.cs
+++ b/Rdmp.UI/Menus/CatalogueMenu.cs
@@ -17,54 +17,66 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class CatalogueMenu:RDMPContextMenuStrip
+internal class CatalogueMenu : RDMPContextMenuStrip
 {
     private const string CatalogueItems = "Catalogue Items";
 
-    public CatalogueMenu(RDMPContextMenuStripArgs args, Catalogue catalogue):base(args,catalogue)
+    public CatalogueMenu(RDMPContextMenuStripArgs args, Catalogue catalogue) : base(args, catalogue)
     {
         var isApiCall = catalogue.IsApiCall();
-            
-        Add(new ExecuteCommandGenerateMetadataReport(_activator, catalogue) {
+
+        Add(new ExecuteCommandGenerateMetadataReport(_activator, catalogue)
+        {
             Weight = -99.059f
-        },Keys.None,AtomicCommandFactory.Metadata);
+        }, Keys.None, AtomicCommandFactory.Metadata);
 
         Add(new ExecuteCommandImportCatalogueDescriptionsFromShare(_activator, catalogue)
         {
             Weight = -95.09f
-        },Keys.None,AtomicCommandFactory.Metadata);
-            
-            
+        }, Keys.None, AtomicCommandFactory.Metadata);
+
+
         Add(new ExecuteCommandExportInDublinCoreFormat(_activator, catalogue)
         {
             Weight = -90.10f
-        }, Keys.None,AtomicCommandFactory.Metadata);
+        }, Keys.None, AtomicCommandFactory.Metadata);
         Add(new ExecuteCommandImportDublinCoreFormat(_activator, catalogue)
         {
             Weight = -90.09f
         }, Keys.None, AtomicCommandFactory.Metadata);
 
-        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, catalogue,null) {
-            OverrideCommandName = "New Lookup Table Relationship", Weight = -86.9f}, Keys.None, AtomicCommandFactory.Add);
+        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, catalogue, null)
+        {
+            OverrideCommandName = "New Lookup Table Relationship", Weight = -86.9f
+        }, Keys.None, AtomicCommandFactory.Add);
 
         if (!isApiCall)
         {
             Items.Add(new DQEMenuItem(_activator, catalogue));
 
             //create right click context menu
-            Add(new ExecuteCommandViewCatalogueExtractionSqlUI(_activator) {
+            Add(new ExecuteCommandViewCatalogueExtractionSqlUI(_activator)
+            {
                 Weight = -99.001f,
                 OverrideCommandName = "Catalogue Extraction SQL",
-                SuggestedCategory = AtomicCommandFactory.View}.SetTarget(catalogue));
+                SuggestedCategory = AtomicCommandFactory.View
+            }.SetTarget(catalogue));
         }
 
         ////////////////// UI Commands for the CatalogueItems submenu of the Catalogue context menu ///////////////////
-        Add(new ExecuteCommandBulkProcessCatalogueItems(_activator, catalogue) { SuggestedCategory = CatalogueItems , Weight = -99.049f });
-        Add(new ExecuteCommandPasteClipboardAsNewCatalogueItems(_activator, catalogue,()=> Clipboard.GetText()) { SuggestedCategory = CatalogueItems, Weight = -99.047f });
-        Add(new ExecuteCommandReOrderColumns(_activator, catalogue) { SuggestedCategory = CatalogueItems, Weight = -99.046f });
-        Add(new ExecuteCommandGuessAssociatedColumns(_activator, catalogue,null) { SuggestedCategory = CatalogueItems, Weight = -99.045f, PromptForPartialMatching = true });
-        Add(new ExecuteCommandChangeExtractionCategory(_activator,catalogue.GetAllExtractionInformation(ExtractionCategory.Any)) { SuggestedCategory = CatalogueItems, Weight = -99.044f });
-        Add(new ExecuteCommandImportCatalogueItemDescriptions(_activator,catalogue, null/*pick at runtime*/) { SuggestedCategory = CatalogueItems, Weight = -99.043f });
+        Add(new ExecuteCommandBulkProcessCatalogueItems(_activator, catalogue)
+            { SuggestedCategory = CatalogueItems, Weight = -99.049f });
+        Add(new ExecuteCommandPasteClipboardAsNewCatalogueItems(_activator, catalogue, () => Clipboard.GetText())
+            { SuggestedCategory = CatalogueItems, Weight = -99.047f });
+        Add(new ExecuteCommandReOrderColumns(_activator, catalogue)
+            { SuggestedCategory = CatalogueItems, Weight = -99.046f });
+        Add(new ExecuteCommandGuessAssociatedColumns(_activator, catalogue, null)
+            { SuggestedCategory = CatalogueItems, Weight = -99.045f, PromptForPartialMatching = true });
+        Add(new ExecuteCommandChangeExtractionCategory(_activator,
+                catalogue.GetAllExtractionInformation(ExtractionCategory.Any))
+            { SuggestedCategory = CatalogueItems, Weight = -99.044f });
+        Add(new ExecuteCommandImportCatalogueItemDescriptions(_activator, catalogue, null /*pick at runtime*/)
+            { SuggestedCategory = CatalogueItems, Weight = -99.043f });
 
         if (catalogue.LoadMetadata_ID != null)
         {
@@ -81,7 +93,8 @@ public CatalogueMenu(RDMPContextMenuStripArgs args, Catalogue catalogue):base(ar
                 // if the directory name is bad or corrupt
                 return;
             }
-            Add(new ExecuteCommandOpenInExplorer(_activator, dirReal) { OverrideCommandName = "Open Load Directory"});
+
+            Add(new ExecuteCommandOpenInExplorer(_activator, dirReal) { OverrideCommandName = "Open Load Directory" });
         }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/CohortAggregateContainerMenu.cs b/Rdmp.UI/Menus/CohortAggregateContainerMenu.cs
index bbe8c90428..a230aa8f4f 100644
--- a/Rdmp.UI/Menus/CohortAggregateContainerMenu.cs
+++ b/Rdmp.UI/Menus/CohortAggregateContainerMenu.cs
@@ -18,7 +18,8 @@ internal class CohortAggregateContainerMenu : RDMPContextMenuStrip
 {
     private CohortAggregateContainer _container;
 
-    public CohortAggregateContainerMenu(RDMPContextMenuStripArgs args, CohortAggregateContainer container): base( args, container)
+    public CohortAggregateContainerMenu(RDMPContextMenuStripArgs args, CohortAggregateContainer container) : base(args,
+        container)
     {
         _container = container;
 
@@ -32,24 +33,26 @@ public CohortAggregateContainerMenu(RDMPContextMenuStripArgs args, CohortAggrega
         //this requires cache to exist (and be populated for the container)
         if (cic != null && cic.QueryCachingServer_ID != null)
         {
-            var matchIdentifiers = new ToolStripMenuItem("Graph All Records For Matching Patients", _activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
+            var matchIdentifiers = new ToolStripMenuItem("Graph All Records For Matching Patients",
+                _activator.CoreIconProvider.GetImage(RDMPConcept.AggregateGraph).ImageToBitmap());
 
-            var availableGraphs = _activator.CoreChildProvider.AllAggregateConfigurations.Where(g => !g.IsCohortIdentificationAggregate).ToArray();
+            var availableGraphs = _activator.CoreChildProvider.AllAggregateConfigurations
+                .Where(g => !g.IsCohortIdentificationAggregate).ToArray();
             var allCatalogues = _activator.CoreChildProvider.AllCatalogues;
 
             if (availableGraphs.Any())
             {
-
                 foreach (var cata in allCatalogues.OrderBy(c => c.Name))
                 {
                     var cataGraphs = availableGraphs.Where(g => g.Catalogue_ID == cata.ID).ToArray();
-                        
+
                     //if there are no graphs belonging to the Catalogue skip it
-                    if(!cataGraphs.Any())
+                    if (!cataGraphs.Any())
                         continue;
 
                     //otherwise create a subheading for it
-                    var catalogueSubheading = new ToolStripMenuItem(cata.Name, CatalogueIcons.Catalogue.ImageToBitmap());
+                    var catalogueSubheading =
+                        new ToolStripMenuItem(cata.Name, CatalogueIcons.Catalogue.ImageToBitmap());
 
                     //add graph for each in the Catalogue
                     foreach (var graph in cataGraphs)
@@ -65,5 +68,4 @@ public CohortAggregateContainerMenu(RDMPContextMenuStripArgs args, CohortAggrega
             }
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ColumnInfoMenu.cs b/Rdmp.UI/Menus/ColumnInfoMenu.cs
index 95cc52475e..1d93e0ea9e 100644
--- a/Rdmp.UI/Menus/ColumnInfoMenu.cs
+++ b/Rdmp.UI/Menus/ColumnInfoMenu.cs
@@ -14,8 +14,8 @@ namespace Rdmp.UI.Menus;
 internal class ColumnInfoMenu : RDMPContextMenuStrip
 {
     public ColumnInfoMenu(RDMPContextMenuStripArgs args, ColumnInfo columnInfo) : base(args, columnInfo)
-    {            
-        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, null,columnInfo.TableInfo));
+    {
+        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, null, columnInfo.TableInfo));
 
         Items.Add(new ToolStripSeparator());
 
diff --git a/Rdmp.UI/Menus/DocumentationNodeMenu.cs b/Rdmp.UI/Menus/DocumentationNodeMenu.cs
index 17829a0a83..2eaa5dfd03 100644
--- a/Rdmp.UI/Menus/DocumentationNodeMenu.cs
+++ b/Rdmp.UI/Menus/DocumentationNodeMenu.cs
@@ -13,7 +13,8 @@ internal class DocumentationNodeMenu : RDMPContextMenuStrip
 {
     public DocumentationNode DocumentationNode { get; set; }
 
-    public DocumentationNodeMenu(RDMPContextMenuStripArgs args, DocumentationNode documentationNode): base(args, documentationNode)
+    public DocumentationNodeMenu(RDMPContextMenuStripArgs args, DocumentationNode documentationNode) : base(args,
+        documentationNode)
     {
         DocumentationNode = documentationNode;
 
diff --git a/Rdmp.UI/Menus/ExternalCohortTableMenu.cs b/Rdmp.UI/Menus/ExternalCohortTableMenu.cs
index 9ed2f7ba25..bbf16140ff 100644
--- a/Rdmp.UI/Menus/ExternalCohortTableMenu.cs
+++ b/Rdmp.UI/Menus/ExternalCohortTableMenu.cs
@@ -12,11 +12,12 @@ namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
 internal class ExternalCohortTableMenu : RDMPContextMenuStrip
-{        
-    public ExternalCohortTableMenu(RDMPContextMenuStripArgs args, ExternalCohortTable externalCohortTable): base(args, externalCohortTable)
+{
+    public ExternalCohortTableMenu(RDMPContextMenuStripArgs args, ExternalCohortTable externalCohortTable) : base(args,
+        externalCohortTable)
     {
         if (args.Masquerader is CohortSourceUsedByProjectNode projectOnlyNode)
-            Add(new ExecuteCommandShowSummaryOfCohorts(_activator, projectOnlyNode) { Weight = -99.9f});
+            Add(new ExecuteCommandShowSummaryOfCohorts(_activator, projectOnlyNode) { Weight = -99.9f });
         else
             Add(new ExecuteCommandShowSummaryOfCohorts(_activator, externalCohortTable) { Weight = -99.9f });
     }
diff --git a/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs b/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs
index 01f4b4de96..d050cb43f2 100644
--- a/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs
+++ b/Rdmp.UI/Menus/ExternalDatabaseServerMenu.cs
@@ -28,25 +28,34 @@ public ExternalDatabaseServerMenu(RDMPContextMenuStripArgs args, ExternalDatabas
 
         if (server.WasCreatedBy(new LoggingDatabasePatcher()))
         {
-            var viewLogs = new ToolStripMenuItem("View Logs",CatalogueIcons.Logging.ImageToBitmap());
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadTask)), Keys.None,viewLogs);
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadRun)), Keys.None, viewLogs);
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.FatalError)), Keys.None, viewLogs);
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.TableLoadRun)), Keys.None, viewLogs);
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataSource)), Keys.None, viewLogs);
-            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.ProgressLog)), Keys.None, viewLogs);
+            var viewLogs = new ToolStripMenuItem("View Logs", CatalogueIcons.Logging.ImageToBitmap());
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadTask)), Keys.None,
+                viewLogs);
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataLoadRun)), Keys.None,
+                viewLogs);
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.FatalError)), Keys.None,
+                viewLogs);
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.TableLoadRun)), Keys.None,
+                viewLogs);
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.DataSource)), Keys.None,
+                viewLogs);
+            Add(new ExecuteCommandViewLogs(_activator, new LogViewerFilter(LoggingTables.ProgressLog)), Keys.None,
+                viewLogs);
 
             viewLogs.DropDownItems.Add(new ToolStripSeparator());
 
-            viewLogs.DropDownItems.Add(new ToolStripMenuItem("Query with SQL", CatalogueIcons.SQL.ImageToBitmap(), ExecuteSqlOnLoggingDatabase));
-                
+            viewLogs.DropDownItems.Add(new ToolStripMenuItem("Query with SQL", CatalogueIcons.SQL.ImageToBitmap(),
+                ExecuteSqlOnLoggingDatabase));
+
             Items.Add(viewLogs);
         }
     }
 
     private void ExecuteSqlOnLoggingDatabase(object sender, EventArgs e)
     {
-        var collection = new ArbitraryTableExtractionUICollection(_server.Discover(DataAccessContext.Logging).ExpectTable("DataLoadTask"));
+        var collection =
+            new ArbitraryTableExtractionUICollection(_server.Discover(DataAccessContext.Logging)
+                .ExpectTable("DataLoadTask"));
         _activator.Activate<ViewSQLAndResultsWithDataGridUI>(collection);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ExtractableDataSetPackageMenu.cs b/Rdmp.UI/Menus/ExtractableDataSetPackageMenu.cs
index 227d432ede..0896a7b42b 100644
--- a/Rdmp.UI/Menus/ExtractableDataSetPackageMenu.cs
+++ b/Rdmp.UI/Menus/ExtractableDataSetPackageMenu.cs
@@ -20,23 +20,28 @@ internal class ExtractableDataSetPackageMenu : RDMPContextMenuStrip
     private readonly ExtractableDataSetPackage _package;
     private readonly DataExportChildProvider _childProvider;
 
-    public ExtractableDataSetPackageMenu(RDMPContextMenuStripArgs args, ExtractableDataSetPackage package): base(args, package)
+    public ExtractableDataSetPackageMenu(RDMPContextMenuStripArgs args, ExtractableDataSetPackage package) : base(args,
+        package)
     {
         _package = package;
-        _childProvider = (DataExportChildProvider) _activator.CoreChildProvider;
-        Items.Add("Add ExtractableDataSet(s) to Package", _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSet, OverlayKind.Link).ImageToBitmap(), AddExtractableDatasetToPackage);
-
+        _childProvider = (DataExportChildProvider)_activator.CoreChildProvider;
+        Items.Add("Add ExtractableDataSet(s) to Package",
+            _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSet, OverlayKind.Link).ImageToBitmap(),
+            AddExtractableDatasetToPackage);
     }
 
     private void AddExtractableDatasetToPackage(object sender, EventArgs e)
     {
         var packageManager = _activator.RepositoryLocator.DataExportRepository;
-        var notInPackage = _childProvider.ExtractableDataSets.Except(packageManager.GetAllDataSets(_package, _childProvider.ExtractableDataSets));
-
-        if(_activator.SelectObjects(new DialogArgs
-           {
-               TaskDescription = "Which datasets should become part of the package.  When adding a package to an ExtractionConfiguration all datasets will be added at once."
-           }, notInPackage.ToArray(), out var selected))
+        var notInPackage =
+            _childProvider.ExtractableDataSets.Except(packageManager.GetAllDataSets(_package,
+                _childProvider.ExtractableDataSets));
+
+        if (_activator.SelectObjects(new DialogArgs
+            {
+                TaskDescription =
+                    "Which datasets should become part of the package.  When adding a package to an ExtractionConfiguration all datasets will be added at once."
+            }, notInPackage.ToArray(), out var selected))
         {
             foreach (ExtractableDataSet ds in selected)
                 packageManager.AddDataSetToPackage(_package, ds);
diff --git a/Rdmp.UI/Menus/ExtractableDatasetMenu.cs b/Rdmp.UI/Menus/ExtractableDatasetMenu.cs
index 2e19b7bb55..1b309f2a50 100644
--- a/Rdmp.UI/Menus/ExtractableDatasetMenu.cs
+++ b/Rdmp.UI/Menus/ExtractableDatasetMenu.cs
@@ -10,17 +10,18 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class ExtractableDatasetMenu:RDMPContextMenuStrip
+internal class ExtractableDatasetMenu : RDMPContextMenuStrip
 {
     private readonly ExtractableDataSet _dataset;
 
     public ExtractableDatasetMenu(RDMPContextMenuStripArgs args, ExtractableDataSet dataset)
-        : base(args,dataset)
+        : base(args, dataset)
     {
         _dataset = dataset;
 
         if (_dataset.DisableExtraction)
-            Items.Add("ReEnable Extraction", _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSet).ImageToBitmap(),
+            Items.Add("ReEnable Extraction",
+                _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSet).ImageToBitmap(),
                 (s, e) => SetDisabled(false));
         else
             Items.Add("Disable Extraction (temporarily)", CatalogueIcons.ExtractableDataSetDisabled.ImageToBitmap(),
diff --git a/Rdmp.UI/Menus/ExtractionConfigurationMenu.cs b/Rdmp.UI/Menus/ExtractionConfigurationMenu.cs
index 64af5c758f..3224e9c618 100644
--- a/Rdmp.UI/Menus/ExtractionConfigurationMenu.cs
+++ b/Rdmp.UI/Menus/ExtractionConfigurationMenu.cs
@@ -13,19 +13,19 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class ExtractionConfigurationMenu:RDMPContextMenuStrip
+internal class ExtractionConfigurationMenu : RDMPContextMenuStrip
 {
     public ExtractionConfigurationMenu(RDMPContextMenuStripArgs args, ExtractionConfiguration extractionConfiguration)
-        : base( args,extractionConfiguration)
+        : base(args, extractionConfiguration)
     {
-        Items.Add("Edit", null, (s, e) => _activator.Activate<ExtractionConfigurationUI, ExtractionConfiguration>(extractionConfiguration));
+        Items.Add("Edit", null,
+            (s, e) => _activator.Activate<ExtractionConfigurationUI, ExtractionConfiguration>(extractionConfiguration));
 
-        Add(new ExecuteCommandRelease(_activator) { Weight = -99.5f}.SetTarget(extractionConfiguration));
+        Add(new ExecuteCommandRelease(_activator) { Weight = -99.5f }.SetTarget(extractionConfiguration));
         Add(new ExecuteCommandRefreshExtractionConfigurationsCohort(_activator, extractionConfiguration));
 
         Add(new ExecuteCommandOpenExtractionDirectory(_activator, extractionConfiguration));
 
         ReBrandActivateAs("Configure/Run Extract...", RDMPConcept.ExtractionConfiguration, OverlayKind.Execute);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ExtractionConfigurationsNodeMenu.cs b/Rdmp.UI/Menus/ExtractionConfigurationsNodeMenu.cs
index 4b4abee39f..0e6aa5170d 100644
--- a/Rdmp.UI/Menus/ExtractionConfigurationsNodeMenu.cs
+++ b/Rdmp.UI/Menus/ExtractionConfigurationsNodeMenu.cs
@@ -9,11 +9,13 @@
 
 namespace Rdmp.UI.Menus;
 
-internal class ExtractionConfigurationsNodeMenu:RDMPContextMenuStrip
+internal class ExtractionConfigurationsNodeMenu : RDMPContextMenuStrip
 {
-    public ExtractionConfigurationsNodeMenu(RDMPContextMenuStripArgs args, ExtractionConfigurationsNode extractionConfigurationsNode): base(args, extractionConfigurationsNode)
+    public ExtractionConfigurationsNodeMenu(RDMPContextMenuStripArgs args,
+        ExtractionConfigurationsNode extractionConfigurationsNode) : base(args, extractionConfigurationsNode)
     {
-        Add(new ExecuteCommandExecuteExtractionConfiguration(_activator, extractionConfigurationsNode.Project) { Weight = -10.2f});
+        Add(new ExecuteCommandExecuteExtractionConfiguration(_activator, extractionConfigurationsNode.Project)
+            { Weight = -10.2f });
         Add(new ExecuteCommandRelease(_activator) { Weight = -10.1f }.SetTarget(extractionConfigurationsNode.Project));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ExtractionDirectoryNodeMenu.cs b/Rdmp.UI/Menus/ExtractionDirectoryNodeMenu.cs
index 877ee1cb21..ddc606b0f6 100644
--- a/Rdmp.UI/Menus/ExtractionDirectoryNodeMenu.cs
+++ b/Rdmp.UI/Menus/ExtractionDirectoryNodeMenu.cs
@@ -13,10 +13,11 @@ namespace Rdmp.UI.Menus;
 [System.ComponentModel.DesignerCategory("")]
 internal class ExtractionDirectoryNodeMenu : RDMPContextMenuStrip
 {
-    public ExtractionDirectoryNodeMenu(RDMPContextMenuStripArgs args, ExtractionDirectoryNode folder): base(args, folder)
+    public ExtractionDirectoryNodeMenu(RDMPContextMenuStripArgs args, ExtractionDirectoryNode folder) : base(args,
+        folder)
     {
-        ReBrandActivateAs("Open In Explorer",RDMPConcept.CatalogueFolder);
-            
+        ReBrandActivateAs("Open In Explorer", RDMPConcept.CatalogueFolder);
+
         Add(new ExecuteCommandSetProjectExtractionDirectory(_activator, folder.Project));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/FilterMenu.cs b/Rdmp.UI/Menus/FilterMenu.cs
index 24d0fcabb4..fce6b29aa1 100644
--- a/Rdmp.UI/Menus/FilterMenu.cs
+++ b/Rdmp.UI/Menus/FilterMenu.cs
@@ -13,10 +13,10 @@ namespace Rdmp.UI.Menus;
 
 internal class FilterMenu : RDMPContextMenuStrip
 {
-    public FilterMenu(RDMPContextMenuStripArgs args, IFilter filter): base(args, (DatabaseEntity)filter)
+    public FilterMenu(RDMPContextMenuStripArgs args, IFilter filter) : base(args, (DatabaseEntity)filter)
     {
         Add(new ExecuteCommandViewFilterMatchGraph(_activator, filter));
-        Add(new ExecuteCommandExportObjectsToFile(_activator, new[] {filter}));
+        Add(new ExecuteCommandExportObjectsToFile(_activator, new[] { filter }));
         Add(new ExecuteCommandImportFilterDescriptionsFromShare(_activator, filter));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/GovernancePeriodMenu.cs b/Rdmp.UI/Menus/GovernancePeriodMenu.cs
index 5cdd7d2945..5237b6bd6a 100644
--- a/Rdmp.UI/Menus/GovernancePeriodMenu.cs
+++ b/Rdmp.UI/Menus/GovernancePeriodMenu.cs
@@ -14,6 +14,6 @@ internal class GovernancePeriodMenu : RDMPContextMenuStrip
     public GovernancePeriodMenu(RDMPContextMenuStripArgs args, GovernancePeriod period)
         : base(args, period)
     {
-        Add(new ExecuteCommandAddNewGovernanceDocument(_activator,period));
+        Add(new ExecuteCommandAddNewGovernanceDocument(_activator, period));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/HICProjectDirectoryNodeMenu.cs b/Rdmp.UI/Menus/HICProjectDirectoryNodeMenu.cs
index 77d0e88759..4a686738c4 100644
--- a/Rdmp.UI/Menus/HICProjectDirectoryNodeMenu.cs
+++ b/Rdmp.UI/Menus/HICProjectDirectoryNodeMenu.cs
@@ -13,11 +13,11 @@ namespace Rdmp.UI.Menus;
 
 internal class LoadDirectoryNodeMenu : RDMPContextMenuStrip
 {
-    public LoadDirectoryNodeMenu(RDMPContextMenuStripArgs args,LoadDirectoryNode node) : base(args, node)
+    public LoadDirectoryNodeMenu(RDMPContextMenuStripArgs args, LoadDirectoryNode node) : base(args, node)
     {
         args.SkipCommand<ExecuteCommandCreateNewDataLoadDirectory>();
 
-        ReBrandActivateAs("Open In Explorer",RDMPConcept.CatalogueFolder);
+        ReBrandActivateAs("Open In Explorer", RDMPConcept.CatalogueFolder);
         Add(new ExecuteCommandChooseLoadDirectory(_activator, node.LoadMetadata));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/JoinableCollectionNodeMenu.cs b/Rdmp.UI/Menus/JoinableCollectionNodeMenu.cs
index 00891d5d6e..1498ed090b 100644
--- a/Rdmp.UI/Menus/JoinableCollectionNodeMenu.cs
+++ b/Rdmp.UI/Menus/JoinableCollectionNodeMenu.cs
@@ -11,9 +11,10 @@ namespace Rdmp.UI.Menus;
 
 internal class JoinableCollectionNodeMenu : RDMPContextMenuStrip
 {
-    public JoinableCollectionNodeMenu(RDMPContextMenuStripArgs args, JoinableCollectionNode patientIndexTablesNode): base(args, patientIndexTablesNode)
+    public JoinableCollectionNodeMenu(RDMPContextMenuStripArgs args, JoinableCollectionNode patientIndexTablesNode) :
+        base(args, patientIndexTablesNode)
     {
-        Add(new ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(_activator, patientIndexTablesNode.Configuration) { OverrideCommandName = "Add Catalogue" });
+        Add(new ExecuteCommandAddCatalogueToCohortIdentificationAsPatientIndexTable(_activator,
+            patientIndexTablesNode.Configuration) { OverrideCommandName = "Add Catalogue" });
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/LoadMetadataMenu.cs b/Rdmp.UI/Menus/LoadMetadataMenu.cs
index 8bae8a951c..044a769813 100644
--- a/Rdmp.UI/Menus/LoadMetadataMenu.cs
+++ b/Rdmp.UI/Menus/LoadMetadataMenu.cs
@@ -12,12 +12,12 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class LoadMetadataMenu:RDMPContextMenuStrip
+internal class LoadMetadataMenu : RDMPContextMenuStrip
 {
     public LoadMetadataMenu(RDMPContextMenuStripArgs args, LoadMetadata loadMetadata) : base(args, loadMetadata)
     {
         Add(new ExecuteCommandEditLoadMetadataDescription(_activator, loadMetadata));
         Add(new ExecuteCommandViewLoadDiagram(_activator, loadMetadata));
-        ReBrandActivateAs("Check and Execute",RDMPConcept.LoadMetadata,OverlayKind.Execute);
+        ReBrandActivateAs("Check and Execute", RDMPConcept.LoadMetadata, OverlayKind.Execute);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/LoadStageNodeMenu.cs b/Rdmp.UI/Menus/LoadStageNodeMenu.cs
index ee32125049..c2f39cfca8 100644
--- a/Rdmp.UI/Menus/LoadStageNodeMenu.cs
+++ b/Rdmp.UI/Menus/LoadStageNodeMenu.cs
@@ -29,9 +29,9 @@ public LoadStageNodeMenu(RDMPContextMenuStripArgs args, LoadStageNode loadStageN
         _mef = _activator.RepositoryLocator.CatalogueRepository.MEF;
 
         args.SkipCommand<ExecuteCommandCreateNewClassBasedProcessTask>();
-            
-        AddMenu<IDataProvider>("Add Cached Data Provider",t=>typeof(ICachedDataProvider).IsAssignableFrom(t));
-        AddMenu<IDataProvider>("Add Data Provider", t=> !typeof(ICachedDataProvider).IsAssignableFrom(t));
+
+        AddMenu<IDataProvider>("Add Cached Data Provider", t => typeof(ICachedDataProvider).IsAssignableFrom(t));
+        AddMenu<IDataProvider>("Add Data Provider", t => !typeof(ICachedDataProvider).IsAssignableFrom(t));
 
         AddMenu<IAttacher>("Add Attacher");
         AddMenu<IMutilateDataTables>("Add Mutilator");
@@ -46,8 +46,7 @@ private void AddMenu<T>(string menuName, Func<Type, bool> filterTypes)
 
         if (typeof(T) == typeof(IDataProvider))
             taskType = ProcessTaskType.DataProvider;
-        else
-        if (typeof(T) == typeof(IAttacher))
+        else if (typeof(T) == typeof(IAttacher))
             taskType = ProcessTaskType.Attacher;
         else if (typeof(T) == typeof(IMutilateDataTables))
             taskType = ProcessTaskType.MutilateDataTable;
@@ -76,10 +75,10 @@ private void AddMenu<T>(string menuName)
     }
 
 
-
     private void AddTypeIntoStage(Type type)
     {
-        var cmd = new ExecuteCommandCreateNewClassBasedProcessTask(_activator, _loadStageNode.LoadMetadata, _loadStageNode.LoadStage, type);
+        var cmd = new ExecuteCommandCreateNewClassBasedProcessTask(_activator, _loadStageNode.LoadMetadata,
+            _loadStageNode.LoadStage, type);
         cmd.Execute();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs b/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs
index 68b4c2471e..940d926480 100644
--- a/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/AtomicCommandMenuItem.cs
@@ -26,7 +26,7 @@ public class AtomicCommandMenuItem : ToolStripMenuItem
     private readonly IAtomicCommand _command;
     private readonly IActivateItems _activator;
 
-    public AtomicCommandMenuItem(IAtomicCommand command,IActivateItems activator)
+    public AtomicCommandMenuItem(IAtomicCommand command, IActivateItems activator)
     {
         _command = command;
         _activator = activator;
@@ -34,11 +34,13 @@ public AtomicCommandMenuItem(IAtomicCommand command,IActivateItems activator)
         Text = command.GetCommandName();
         Tag = command;
         Image = command.GetImage(activator.CoreIconProvider)?.ImageToBitmap();
-            
+
         //disable if impossible command
         Enabled = !command.IsImpossible;
 
-        ToolTipText = command.IsImpossible ? command.ReasonCommandImpossible : command.GetCommandHelp() ?? activator.GetDocumentation(command.GetType());
+        ToolTipText = command.IsImpossible
+            ? command.ReasonCommandImpossible
+            : command.GetCommandHelp() ?? activator.GetDocumentation(command.GetType());
     }
 
     protected override void OnClick(EventArgs e)
@@ -68,7 +70,8 @@ protected override void OnClick(EventArgs e)
                     if (helpDict != null && helpDict.ContainsKey(match.Value))
                     {
                         ExceptionViewer.Show(
-                            $"Rule Broken{Environment.NewLine}{helpDict[match.Value]}{Environment.NewLine}({match.Value})",ex);
+                            $"Rule Broken{Environment.NewLine}{helpDict[match.Value]}{Environment.NewLine}({match.Value})",
+                            ex);
                         return;
                     }
                 }
diff --git a/Rdmp.UI/Menus/MenuItems/AtomicCommandToolStripItem.cs b/Rdmp.UI/Menus/MenuItems/AtomicCommandToolStripItem.cs
index 3827430a43..adc28e2b8f 100644
--- a/Rdmp.UI/Menus/MenuItems/AtomicCommandToolStripItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/AtomicCommandToolStripItem.cs
@@ -35,7 +35,7 @@ public AtomicCommandToolStripItem(IAtomicCommand command, IActivateItems activat
     protected override void OnClick(EventArgs e)
     {
         base.OnClick(e);
-            
+
         _command.Execute();
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/MenuItems/DQEMenuItem.cs b/Rdmp.UI/Menus/MenuItems/DQEMenuItem.cs
index ed4b6650ed..a84f719b12 100644
--- a/Rdmp.UI/Menus/MenuItems/DQEMenuItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/DQEMenuItem.cs
@@ -17,11 +17,12 @@
 
 namespace Rdmp.UI.Menus.MenuItems;
 
-internal class DQEMenuItem:RDMPToolStripMenuItem
+internal class DQEMenuItem : RDMPToolStripMenuItem
 {
     private readonly Catalogue _catalogue;
     private readonly IExternalDatabaseServer _dqeServer;
-    public DQEMenuItem(IActivateItems activator, Catalogue catalogue): base(activator, "Data Quality Engine...")
+
+    public DQEMenuItem(IActivateItems activator, Catalogue catalogue) : base(activator, "Data Quality Engine...")
     {
         _catalogue = catalogue;
 
@@ -38,7 +39,8 @@ protected override void OnClick(EventArgs e)
 
         if (_dqeServer == null)
         {
-            var cmdCreateDb = new ExecuteCommandCreateNewExternalDatabaseServer(_activator, new DataQualityEnginePatcher(), PermissableDefaults.DQE);
+            var cmdCreateDb = new ExecuteCommandCreateNewExternalDatabaseServer(_activator,
+                new DataQualityEnginePatcher(), PermissableDefaults.DQE);
             cmdCreateDb.Execute();
         }
         else
@@ -48,7 +50,5 @@ protected override void OnClick(EventArgs e)
             else
                 new ExecuteCommandRunDQEOnCatalogue(_activator, _catalogue).Execute();
         }
-
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/MenuItems/RDMPToolStripMenuItem.cs b/Rdmp.UI/Menus/MenuItems/RDMPToolStripMenuItem.cs
index 2eb2549975..8aa55ff63e 100644
--- a/Rdmp.UI/Menus/MenuItems/RDMPToolStripMenuItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/RDMPToolStripMenuItem.cs
@@ -19,12 +19,12 @@ public abstract class RDMPToolStripMenuItem : ToolStripMenuItem
     protected AtomicCommandUIFactory AtomicCommandUIFactory;
     protected IActivateItems _activator;
 
-    protected RDMPToolStripMenuItem(IActivateItems activator,string text):base(text)
+    protected RDMPToolStripMenuItem(IActivateItems activator, string text) : base(text)
     {
         _activator = activator;
         AtomicCommandUIFactory = new AtomicCommandUIFactory(activator);
     }
-        
+
     protected void Activate(DatabaseEntity o)
     {
         var cmd = new ExecuteCommandActivate(_activator, o);
diff --git a/Rdmp.UI/Menus/MenuItems/SaveMenuItem.cs b/Rdmp.UI/Menus/MenuItems/SaveMenuItem.cs
index c0f1aeb0fd..7f1d6f89f2 100644
--- a/Rdmp.UI/Menus/MenuItems/SaveMenuItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/SaveMenuItem.cs
@@ -33,6 +33,7 @@ public SaveMenuItem() : base("Save")
     {
         ShortcutKeys = Keys.Control | Keys.S;
     }
+
     public SaveMenuItem(ISaveableUI saveable) : this()
     {
         Saveable = saveable;
diff --git a/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs b/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs
index 513fc6eba2..cc3ded4787 100644
--- a/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs
+++ b/Rdmp.UI/Menus/MenuItems/SetDumpServerMenuItem.cs
@@ -26,13 +26,14 @@ internal class SetDumpServerMenuItem : RDMPToolStripMenuItem
     private readonly ITableInfo _tableInfo;
     private ExternalDatabaseServer[] _availableServers;
 
-    public SetDumpServerMenuItem(IActivateItems activator, ITableInfo tableInfo): base(activator,"Add Dump Server")
+    public SetDumpServerMenuItem(IActivateItems activator, ITableInfo tableInfo) : base(activator, "Add Dump Server")
     {
         _tableInfo = tableInfo;
 
         //cannot set server if we already have one
         Enabled = tableInfo.IdentifierDumpServer_ID == null;
-        Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add).ImageToBitmap();
+        Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExternalDatabaseServer, OverlayKind.Add)
+            .ImageToBitmap();
 
         var img = SixLabors.ImageSharp.Image.Load<Rgba32>(CatalogueIcons.ExternalDatabaseServer_IdentifierDump);
         var overlay = new IconOverlayProvider();
@@ -41,22 +42,24 @@ public SetDumpServerMenuItem(IActivateItems activator, ITableInfo tableInfo): ba
 
         _availableServers = cataRepo.GetAllDatabases<IdentifierDumpDatabasePatcher>();
 
-        var miUseExisting = new ToolStripMenuItem("Use Existing...", overlay.GetOverlayNoCache(img, OverlayKind.Link).ImageToBitmap(), UseExisting)
+        var miUseExisting = new ToolStripMenuItem("Use Existing...",
+            overlay.GetOverlayNoCache(img, OverlayKind.Link).ImageToBitmap(), UseExisting)
         {
             Enabled = _availableServers.Any()
         };
 
         DropDownItems.Add(miUseExisting);
-        DropDownItems.Add("Create New...", overlay.GetOverlayNoCache(img, OverlayKind.Add).ImageToBitmap(), CreateNewIdentifierDumpServer);
-
+        DropDownItems.Add("Create New...", overlay.GetOverlayNoCache(img, OverlayKind.Add).ImageToBitmap(),
+            CreateNewIdentifierDumpServer);
     }
 
     private void UseExisting(object sender, EventArgs e)
     {
-        if(_activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "In which server should the table dump unloaded identifiable data during data loads.  This server must be already configured correctly to support identifier dumping (i.e. be an IdentifierDump)."
-           },_availableServers,out var selected))
+        if (_activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "In which server should the table dump unloaded identifiable data during data loads.  This server must be already configured correctly to support identifier dumping (i.e. be an IdentifierDump)."
+            }, _availableServers, out var selected))
         {
             _tableInfo.IdentifierDumpServer_ID = selected.ID;
             _tableInfo.SaveToDatabase();
@@ -67,7 +70,8 @@ private void UseExisting(object sender, EventArgs e)
 
     private void CreateNewIdentifierDumpServer(object sender, EventArgs e)
     {
-        var cmd = new ExecuteCommandCreateNewExternalDatabaseServer(_activator, new IdentifierDumpDatabasePatcher(), PermissableDefaults.IdentifierDumpServer_ID);
+        var cmd = new ExecuteCommandCreateNewExternalDatabaseServer(_activator, new IdentifierDumpDatabasePatcher(),
+            PermissableDefaults.IdentifierDumpServer_ID);
         cmd.Execute();
 
         if (cmd.ServerCreatedIfAny != null)
diff --git a/Rdmp.UI/Menus/PipelineCompatibleWithUseCaseNodeMenu.cs b/Rdmp.UI/Menus/PipelineCompatibleWithUseCaseNodeMenu.cs
index f779b3e5e2..2b22923142 100644
--- a/Rdmp.UI/Menus/PipelineCompatibleWithUseCaseNodeMenu.cs
+++ b/Rdmp.UI/Menus/PipelineCompatibleWithUseCaseNodeMenu.cs
@@ -13,19 +13,21 @@ namespace Rdmp.UI.Menus;
 
 internal class PipelineMenu : RDMPContextMenuStrip
 {
-    public PipelineMenu(RDMPContextMenuStripArgs args, PipelineCompatibleWithUseCaseNode node): base(args,node)
+    public PipelineMenu(RDMPContextMenuStripArgs args, PipelineCompatibleWithUseCaseNode node) : base(args, node)
     {
         // alternate create new that uses a windows UI form
         args.SkipCommand<ExecuteCommandNewObject>();
         Add(new ExecuteCommandCreateNewPipeline(_activator, node.UseCase));
     }
-    public PipelineMenu(RDMPContextMenuStripArgs args, StandardPipelineUseCaseNode node): base(args, node)
+
+    public PipelineMenu(RDMPContextMenuStripArgs args, StandardPipelineUseCaseNode node) : base(args, node)
     {
         // alternate create new that uses a windows UI form
         args.SkipCommand<ExecuteCommandNewObject>();
         Add(new ExecuteCommandCreateNewPipeline(_activator, node.UseCase));
     }
-    public PipelineMenu(RDMPContextMenuStripArgs args, Pipeline pipeline): base(args, pipeline)
+
+    public PipelineMenu(RDMPContextMenuStripArgs args, Pipeline pipeline) : base(args, pipeline)
     {
         // alternate create new that uses a windows UI form
         args.SkipCommand<ExecuteCommandNewObject>();
diff --git a/Rdmp.UI/Menus/PreLoadDiscardedColumnsNodeMenu.cs b/Rdmp.UI/Menus/PreLoadDiscardedColumnsNodeMenu.cs
index a7b0663107..1caaf73234 100644
--- a/Rdmp.UI/Menus/PreLoadDiscardedColumnsNodeMenu.cs
+++ b/Rdmp.UI/Menus/PreLoadDiscardedColumnsNodeMenu.cs
@@ -12,14 +12,15 @@ namespace Rdmp.UI.Menus;
 [System.ComponentModel.DesignerCategory("")]
 internal class PreLoadDiscardedColumnsNodeMenu : RDMPContextMenuStrip
 {
-    public PreLoadDiscardedColumnsNodeMenu(RDMPContextMenuStripArgs args, PreLoadDiscardedColumnsNode discardNode): base(args, discardNode)
+    public PreLoadDiscardedColumnsNodeMenu(RDMPContextMenuStripArgs args, PreLoadDiscardedColumnsNode discardNode) :
+        base(args, discardNode)
     {
         Add(new ExecuteCommandCreateNewPreLoadDiscardedColumn(_activator, discardNode.TableInfo));
     }
 
-    public PreLoadDiscardedColumnsNodeMenu(RDMPContextMenuStripArgs args, IdentifierDumpServerUsageNode discardUsageNode): base(args, discardUsageNode)
+    public PreLoadDiscardedColumnsNodeMenu(RDMPContextMenuStripArgs args,
+        IdentifierDumpServerUsageNode discardUsageNode) : base(args, discardUsageNode)
     {
         Add(new ExecuteCommandCreateNewPreLoadDiscardedColumn(_activator, discardUsageNode.TableInfo));
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ProjectCataloguesNodeMenu.cs b/Rdmp.UI/Menus/ProjectCataloguesNodeMenu.cs
index fbfe1967c4..2a19194d5b 100644
--- a/Rdmp.UI/Menus/ProjectCataloguesNodeMenu.cs
+++ b/Rdmp.UI/Menus/ProjectCataloguesNodeMenu.cs
@@ -18,6 +18,7 @@ public ProjectCataloguesNodeMenu(RDMPContextMenuStripArgs args, ProjectCatalogue
         args.SkipCommand<ExecuteCommandCreateNewCatalogueByImportingFile>();
 
         //use our fabulous UI
-        Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator) { OverrideCommandName = "Add New Catalogue From File", Weight = -9.5f }.SetTarget(node.Project));
+        Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator)
+            { OverrideCommandName = "Add New Catalogue From File", Weight = -9.5f }.SetTarget(node.Project));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/ProjectMenu.cs b/Rdmp.UI/Menus/ProjectMenu.cs
index 21272ecf4e..19dacd9f87 100644
--- a/Rdmp.UI/Menus/ProjectMenu.cs
+++ b/Rdmp.UI/Menus/ProjectMenu.cs
@@ -12,16 +12,20 @@
 namespace Rdmp.UI.Menus;
 
 [System.ComponentModel.DesignerCategory("")]
-internal class ProjectMenu:RDMPContextMenuStrip
+internal class ProjectMenu : RDMPContextMenuStrip
 {
     public ProjectMenu(RDMPContextMenuStripArgs args, Project project)
-        : base(args,project)
+        : base(args, project)
     {
         Add(new ExecuteCommandExecuteExtractionConfiguration(_activator) { Weight = -99.9f }.SetTarget(project));
         Add(new ExecuteCommandRelease(_activator) { Weight = -99.8f }.SetTarget(project));
 
         args.SkipCommand<ExecuteCommandCreateNewCatalogueByImportingFile>();
 
-        Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator) { OverrideCommandName = "New Project Specific Catalogue From File...", SuggestedCategory = AtomicCommandFactory.Add, Weight = -1.9f });
+        Add(new ExecuteCommandCreateNewCatalogueByImportingFileUI(_activator)
+        {
+            OverrideCommandName = "New Project Specific Catalogue From File...",
+            SuggestedCategory = AtomicCommandFactory.Add, Weight = -1.9f
+        });
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/RDMPContextMenuStrip.cs b/Rdmp.UI/Menus/RDMPContextMenuStrip.cs
index d474f687ce..03ce0bcaaf 100644
--- a/Rdmp.UI/Menus/RDMPContextMenuStrip.cs
+++ b/Rdmp.UI/Menus/RDMPContextMenuStrip.cs
@@ -32,7 +32,7 @@ namespace Rdmp.UI.Menus;
 /// when the selected object is changed.
 /// </summary>
 [System.ComponentModel.DesignerCategory("")]
-public class RDMPContextMenuStrip:ContextMenuStrip
+public class RDMPContextMenuStrip : ContextMenuStrip
 {
     private readonly object _o;
     public IRDMPPlatformRepositoryServiceLocator RepositoryLocator { get; private set; }
@@ -43,7 +43,7 @@ public class RDMPContextMenuStrip:ContextMenuStrip
     protected ToolStripMenuItem ActivateCommandMenuItem;
     private RDMPContextMenuStripArgs _args;
 
-    private Dictionary <string,ToolStripMenuItem> _subMenuDictionary = new();
+    private Dictionary<string, ToolStripMenuItem> _subMenuDictionary = new();
 
     public const string Checks = "Run Checks";
     public const string Tree = "Tree";
@@ -70,10 +70,8 @@ public RDMPContextMenuStrip(RDMPContextMenuStripArgs args, object o)
             var activateCommand = new ExecuteCommandActivate(_activator, args.Masquerader ?? o);
             ActivateCommandMenuItem = Add(activateCommand, Keys.None);
 
-            if (activateCommand.ReasonCommandImpossible?.Equals(GlobalStrings.ObjectCannotBeActivated)??false)
-            {
+            if (activateCommand.ReasonCommandImpossible?.Equals(GlobalStrings.ObjectCannotBeActivated) ?? false)
                 Items.Remove(ActivateCommandMenuItem);
-            }
         }
     }
 
@@ -85,16 +83,16 @@ public static void RegisterFetchGoToObjecstCallback(ToolStripMenuItem gotoMenu)
     {
         gotoMenu.DropDownOpening += (s, e) =>
         {
-            foreach(var mi in gotoMenu.DropDownItems.OfType<ToolStripMenuItem>())
+            foreach (var mi in gotoMenu.DropDownItems.OfType<ToolStripMenuItem>())
             {
-                if(mi.Tag is ExecuteCommandShow cmd)
+                if (mi.Tag is ExecuteCommandShow cmd)
                 {
                     cmd.FetchDestinationObjects();
                     mi.Enabled = !cmd.IsImpossible;
                     mi.ToolTipText = cmd.ReasonCommandImpossible;
                 }
 
-                if(mi.Tag is ExecuteCommandSimilar cmdSimilar)
+                if (mi.Tag is ExecuteCommandSimilar cmdSimilar)
                 {
                     cmdSimilar.FetchMatches();
                     mi.Enabled = !cmdSimilar.IsImpossible;
@@ -104,13 +102,11 @@ public static void RegisterFetchGoToObjecstCallback(ToolStripMenuItem gotoMenu)
         };
     }
 
-    protected void ReBrandActivateAs(string newTextForActivate, RDMPConcept newConcept, OverlayKind overlayKind = OverlayKind.None)
+    protected void ReBrandActivateAs(string newTextForActivate, RDMPConcept newConcept,
+        OverlayKind overlayKind = OverlayKind.None)
     {
         // if we are rebranding activate let's make sure its definitely in the menu
-        if(!Items.Contains(ActivateCommandMenuItem))
-        {
-            Items.Insert(0,ActivateCommandMenuItem);
-        }
+        if (!Items.Contains(ActivateCommandMenuItem)) Items.Insert(0, ActivateCommandMenuItem);
         ActivateCommandMenuItem.Image = _activator.CoreIconProvider.GetImage(newConcept, overlayKind).ImageToBitmap();
         ActivateCommandMenuItem.Text = newTextForActivate;
     }
@@ -140,16 +136,16 @@ protected ToolStripMenuItem Add(IAtomicCommand cmd, Keys shortcutKey = Keys.None
     /// <param name="image"></param>
     protected void Add(IAtomicCommand cmd, Keys shortcutKey, string submenu, Image image = null)
     {
-        Add(cmd,shortcutKey,AddMenuIfNotExists(submenu,image));
+        Add(cmd, shortcutKey, AddMenuIfNotExists(submenu, image));
     }
 
 
     private ToolStripMenuItem AddMenuIfNotExists(string submenu, Image image = null)
     {
-        if(!_subMenuDictionary.ContainsKey(submenu))
+        if (!_subMenuDictionary.ContainsKey(submenu))
         {
-            var m = new ToolStripMenuItem(submenu,image);
-            _subMenuDictionary.Add(submenu,m);
+            var m = new ToolStripMenuItem(submenu, image);
+            _subMenuDictionary.Add(submenu, m);
         }
 
         return _subMenuDictionary[submenu];
@@ -157,17 +153,13 @@ private ToolStripMenuItem AddMenuIfNotExists(string submenu, Image image = null)
 
     public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctionality)
     {
-
         AddFactoryMenuItems();
 
         var databaseEntity = _o as DatabaseEntity;
 
         var treeMenuItem = AddMenuIfNotExists(Tree);
 
-        if(_o is IMapsDirectlyToDatabaseTable m)
-        {
-            Add(new ExecuteCommandViewCommits(_activator, m));
-        }
+        if (_o is IMapsDirectlyToDatabaseTable m) Add(new ExecuteCommandViewCommits(_activator, m));
 
         //ensure all submenus appear in the same place
         foreach (var mi in _subMenuDictionary.Values)
@@ -175,7 +167,6 @@ public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctiona
 
         //add plugin menu items
         foreach (var plugin in _activator.PluginUserInterfaces)
-        {
             try
             {
                 foreach (var cmd in plugin.GetAdditionalRightClickMenuItems(
@@ -188,7 +179,6 @@ public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctiona
                     $"Plugin '{plugin.GetType().Name}' failed in call to 'GetAdditionalRightClickMenuItems':{Environment.NewLine}{ex.Message}",
                     CheckResult.Fail, ex));
             }
-        }
 
         //Check if we even want to display this
         if (commonFunctionality.CheckColumnProvider != null)
@@ -204,8 +194,9 @@ public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctiona
 
         if (databaseEntity != null)
         {
-            Add(new ExecuteCommandAddFavourite(_activator,databaseEntity));
-            Add(new ExecuteCommandAddToSession(_activator,new IMapsDirectlyToDatabaseTable[]{ databaseEntity },null));
+            Add(new ExecuteCommandAddFavourite(_activator, databaseEntity));
+            Add(new ExecuteCommandAddToSession(_activator, new IMapsDirectlyToDatabaseTable[] { databaseEntity },
+                null));
         }
 
         //add refresh and then finally help
@@ -215,9 +206,9 @@ public void AddCommonMenuItems(RDMPCollectionCommonFunctionality commonFunctiona
         Add(new ExecuteCommandShowTooltip(_activator, _args.Model));
         Add(new ExecuteCommandShowKeywordHelp(_activator, _args));
 
-        var gotoMenu = Items.OfType<ToolStripMenuItem>().FirstOrDefault(i=>i.Text.Equals(AtomicCommandFactory.GoTo));
+        var gotoMenu = Items.OfType<ToolStripMenuItem>().FirstOrDefault(i => i.Text.Equals(AtomicCommandFactory.GoTo));
 
-        if(gotoMenu != null)
+        if (gotoMenu != null)
             RegisterFetchGoToObjecstCallback(gotoMenu);
 
         //ensure any new submenus still appear
@@ -245,13 +236,14 @@ private void AddFactoryMenuItems()
 
         if (UserSettings.DebugPerformance)
         {
-            var timings = string.Join(Environment.NewLine, performance.Select(kvp => $"{kvp.Key}:{kvp.Value.TotalMilliseconds}ms"));
+            var timings = string.Join(Environment.NewLine,
+                performance.Select(kvp => $"{kvp.Key}:{kvp.Value.TotalMilliseconds}ms"));
 
             _activator.GlobalErrorCheckNotifier.OnCheckPerformed(
-                new CheckEventArgs($"Creating menu for '{forObject}' took {DateTime.Now.Subtract(start).Milliseconds}ms:{Environment.NewLine}{timings}",
+                new CheckEventArgs(
+                    $"Creating menu for '{forObject}' took {DateTime.Now.Subtract(start).Milliseconds}ms:{Environment.NewLine}{timings}",
                     CheckResult.Success));
         }
-
     }
 
     public void Add(IAtomicCommand toPresent)
@@ -274,20 +266,27 @@ private void PopulateTreeMenu(RDMPCollectionCommonFunctionality commonFunctional
     {
         if (_args.Tree != null && !commonFunctionality.Settings.SuppressChildrenAdder)
         {
-            Add(new ExecuteCommandExpandAllNodes(_activator, commonFunctionality, _args.Model), Keys.None, treeMenuItem);
-            Add(new ExecuteCommandCollapseChildNodes(_activator, commonFunctionality, _args.Model), Keys.None, treeMenuItem);
+            Add(new ExecuteCommandExpandAllNodes(_activator, commonFunctionality, _args.Model), Keys.None,
+                treeMenuItem);
+            Add(new ExecuteCommandCollapseChildNodes(_activator, commonFunctionality, _args.Model), Keys.None,
+                treeMenuItem);
         }
+
         treeMenuItem.Enabled = treeMenuItem.HasDropDown;
     }
 
-    private void PopulateChecksMenu(RDMPCollectionCommonFunctionality commonFunctionality, ToolStripMenuItem inspectionMenuItem)
+    private void PopulateChecksMenu(RDMPCollectionCommonFunctionality commonFunctionality,
+        ToolStripMenuItem inspectionMenuItem)
     {
         if (commonFunctionality.CheckColumnProvider != null)
         {
             if (_o is DatabaseEntity databaseEntity)
-                Add(new ExecuteCommandCheckAsync(_activator, databaseEntity, commonFunctionality.CheckColumnProvider.RecordWorst), Keys.None, inspectionMenuItem);
+                Add(
+                    new ExecuteCommandCheckAsync(_activator, databaseEntity,
+                        commonFunctionality.CheckColumnProvider.RecordWorst), Keys.None, inspectionMenuItem);
 
-            var checkAll = new ToolStripMenuItem("Check All", null, (s, e) => commonFunctionality.CheckColumnProvider.CheckCheckables())
+            var checkAll = new ToolStripMenuItem("Check All", null,
+                (s, e) => commonFunctionality.CheckColumnProvider.CheckCheckables())
             {
                 /* The Weight of ExecuteCommandCheckAsync to ensure there is no tool strip separator*/
                 Tag = 100.4f,
@@ -299,7 +298,8 @@ private void PopulateChecksMenu(RDMPCollectionCommonFunctionality commonFunction
         }
 
         // disable menu if checking is not supported in the collection or objects clicked are not checkable
-        inspectionMenuItem.Enabled = inspectionMenuItem.HasDropDown && inspectionMenuItem.DropDownItems.OfType<ToolStripMenuItem>().Any(m=>m.Enabled);
+        inspectionMenuItem.Enabled = inspectionMenuItem.HasDropDown &&
+                                     inspectionMenuItem.DropDownItems.OfType<ToolStripMenuItem>().Any(m => m.Enabled);
     }
 
     protected void Activate(DatabaseEntity o)
@@ -313,10 +313,8 @@ protected void Publish(DatabaseEntity o)
         _activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(o));
     }
 
-    protected Image GetImage(object concept, OverlayKind shortcut = OverlayKind.None)
-    {
-        return _activator.CoreIconProvider.GetImage(concept, shortcut).ImageToBitmap();
-    }
+    protected Image GetImage(object concept, OverlayKind shortcut = OverlayKind.None) =>
+        _activator.CoreIconProvider.GetImage(concept, shortcut).ImageToBitmap();
 
     protected void Emphasise(DatabaseEntity o, int expansionDepth = 0)
     {
diff --git a/Rdmp.UI/Menus/RDMPContextMenuStripArgs.cs b/Rdmp.UI/Menus/RDMPContextMenuStripArgs.cs
index 1bd6f0a16a..53db9fa8b5 100644
--- a/Rdmp.UI/Menus/RDMPContextMenuStripArgs.cs
+++ b/Rdmp.UI/Menus/RDMPContextMenuStripArgs.cs
@@ -32,7 +32,7 @@ public RDMPContextMenuStripArgs(IActivateItems itemActivator)
         ItemActivator = itemActivator;
     }
 
-    public RDMPContextMenuStripArgs(IActivateItems itemActivator, TreeListView tree, object model):this(itemActivator)
+    public RDMPContextMenuStripArgs(IActivateItems itemActivator, TreeListView tree, object model) : this(itemActivator)
     {
         Tree = tree;
         Model = model;
@@ -42,7 +42,7 @@ public RDMPContextMenuStripArgs(IActivateItems itemActivator, TreeListView tree,
     /// Notifies the menu builder that we do not want to show a given Type of command for this menu e.g. because we have a better UI we plan to make available instead
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public void SkipCommand<T>() where T:IAtomicCommand
+    public void SkipCommand<T>() where T : IAtomicCommand
     {
         _skipCommands.Add(typeof(T));
     }
@@ -52,10 +52,7 @@ public void SkipCommand<T>() where T:IAtomicCommand
     /// </summary>
     /// <param name="cmd"></param>
     /// <returns></returns>
-    public bool ShouldSkipCommand(IAtomicCommand cmd)
-    {
-        return _skipCommands.Contains(cmd.GetType());
-    }
+    public bool ShouldSkipCommand(IAtomicCommand cmd) => _skipCommands.Contains(cmd.GetType());
 
     /// <summary>
     /// Returns the first Parent control of <see cref="Tree"/> in the Windows Forms Controls Parent hierarchy which is Type T
diff --git a/Rdmp.UI/Menus/SelectedDataSetsMenu.cs b/Rdmp.UI/Menus/SelectedDataSetsMenu.cs
index 3a0c8519ca..b63cb01e7e 100644
--- a/Rdmp.UI/Menus/SelectedDataSetsMenu.cs
+++ b/Rdmp.UI/Menus/SelectedDataSetsMenu.cs
@@ -19,44 +19,42 @@ internal class SelectedDataSetsMenu : RDMPContextMenuStrip
     private readonly SelectedDataSets _selectedDataSet;
     private IExtractionConfiguration _extractionConfiguration;
 
-    public SelectedDataSetsMenu(RDMPContextMenuStripArgs args, SelectedDataSets selectedDataSet): base(args, selectedDataSet)
+    public SelectedDataSetsMenu(RDMPContextMenuStripArgs args, SelectedDataSets selectedDataSet) : base(args,
+        selectedDataSet)
     {
         _selectedDataSet = selectedDataSet;
         _extractionConfiguration = _selectedDataSet.ExtractionConfiguration;
 
         ReBrandActivateAs("Edit Extractable Columns", RDMPConcept.ExtractionConfiguration, OverlayKind.Edit);
 
-        Add(new ExecuteCommandExecuteExtractionConfiguration(_activator, selectedDataSet) { Weight = 4f});
+        Add(new ExecuteCommandExecuteExtractionConfiguration(_activator, selectedDataSet) { Weight = 4f });
 
         Add(new ExecuteCommandRelease(_activator) { Weight = 4.1f }.SetTarget(selectedDataSet));
 
 
-
         Add(new ExecuteCommandViewThenVsNowSql(_activator, selectedDataSet) { Weight = 5.1f });
 
 
         /////////////////// Extraction Graphs //////////////////////////////
         var cata = selectedDataSet.ExtractableDataSet.Catalogue;
-            
+
         // If the Catalogue has been deleted, don't build Catalogue specific menu items
-        if(cata == null)
+        if (cata == null)
             return;
 
         var availableGraphs = cata.AggregateConfigurations.Where(a => !a.IsCohortIdentificationAggregate).ToArray();
 
         foreach (var graph in availableGraphs)
-        {
-            Add(new ExecuteCommandExecuteExtractionAggregateGraph(_activator, new ExtractionAggregateGraphObjectCollection(_selectedDataSet, graph))
+            Add(new ExecuteCommandExecuteExtractionAggregateGraph(_activator,
+                new ExtractionAggregateGraphObjectCollection(_selectedDataSet, graph))
             {
                 SuggestedCategory = "Graph",
                 OverrideCommandName = graph.Name,
                 Weight = 5.2f
             });
-        }
         ////////////////////////////////////////////////////////////////////
-            
+
 
         Add(new ExecuteCommandOpenExtractionDirectory(_activator, selectedDataSet));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Menus/TableInfoMenu.cs b/Rdmp.UI/Menus/TableInfoMenu.cs
index ad2dbb5a70..72ceca3ff4 100644
--- a/Rdmp.UI/Menus/TableInfoMenu.cs
+++ b/Rdmp.UI/Menus/TableInfoMenu.cs
@@ -18,15 +18,14 @@ namespace Rdmp.UI.Menus;
 [System.ComponentModel.DesignerCategory("")]
 internal class TableInfoMenu : RDMPContextMenuStrip
 {
-
     public TableInfoMenu(RDMPContextMenuStripArgs args, TableInfo tableInfo)
         : base(args, tableInfo)
     {
+        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, null, tableInfo), Keys.None, "New");
+        Add(new ExecuteCommandAddJoinInfo(_activator, tableInfo), Keys.None, "New");
 
-        Add(new ExecuteCommandAddNewLookupTableRelationship(_activator, null, tableInfo),Keys.None,"New");
-        Add(new ExecuteCommandAddJoinInfo(_activator, tableInfo),Keys.None,"New");
-                                    
-        Items.Add("Configure Primary Key Collision Resolution ", CatalogueIcons.CollisionResolution.ImageToBitmap(), delegate { ConfigurePrimaryKeyCollisionResolution_Click(tableInfo); });
+        Items.Add("Configure Primary Key Collision Resolution ", CatalogueIcons.CollisionResolution.ImageToBitmap(),
+            delegate { ConfigurePrimaryKeyCollisionResolution_Click(tableInfo); });
 
         Items.Add(new ToolStripSeparator());
         Items.Add(new SetDumpServerMenuItem(_activator, tableInfo));
@@ -34,20 +33,20 @@ public TableInfoMenu(RDMPContextMenuStripArgs args, TableInfo tableInfo)
         Items.Add(new ToolStripSeparator());
 
         if (tableInfo != null && tableInfo.IsTableValuedFunction)
-            Items.Add("Configure Parameters...", _activator.CoreIconProvider.GetImage(RDMPConcept.ParametersNode).ImageToBitmap(), delegate { ConfigureTableInfoParameters(tableInfo); });
+            Items.Add("Configure Parameters...",
+                _activator.CoreIconProvider.GetImage(RDMPConcept.ParametersNode).ImageToBitmap(),
+                delegate { ConfigureTableInfoParameters(tableInfo); });
     }
 
     private void ConfigurePrimaryKeyCollisionResolution_Click(TableInfo tableInfo)
     {
-        var dialog = new ConfigurePrimaryKeyCollisionResolverUI(tableInfo,_activator);
+        var dialog = new ConfigurePrimaryKeyCollisionResolverUI(tableInfo, _activator);
         dialog.ShowDialog(this);
     }
 
 
-        
     private void ConfigureTableInfoParameters(TableInfo tableInfo)
     {
-        ParameterCollectionUI.ShowAsDialog(_activator,ParameterCollectionUIOptionsFactory.Create(tableInfo));
+        ParameterCollectionUI.ShowAsDialog(_activator, ParameterCollectionUIOptionsFactory.Create(tableInfo));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/NavigationTrack.cs b/Rdmp.UI/NavigationTrack.cs
index 37da067326..cb5fcdf031 100644
--- a/Rdmp.UI/NavigationTrack.cs
+++ b/Rdmp.UI/NavigationTrack.cs
@@ -56,6 +56,7 @@ public NavigationTrack(Func<T, bool> aliveDelegate, Action<T> activate)
         _isAlive = aliveDelegate;
         _activate = activate;
     }
+
     /// <summary>
     /// Removes all dead objects in the history (forward and backwards).  This is based on the alive delegate used to construct the <see cref="NavigationTrack{T}"/>
     /// </summary>
@@ -133,7 +134,7 @@ public T Back(bool show)
         if (show)
             Activate(newHead);
 
-        Changed?.Invoke(this,EventArgs.Empty);
+        Changed?.Invoke(this, EventArgs.Empty);
 
         return newHead;
     }
@@ -157,8 +158,8 @@ public T Forward(bool show)
             Activate(r);
 
         _navigationStack.Push(r);
-            
-        Changed?.Invoke(this,EventArgs.Empty);
+
+        Changed?.Invoke(this, EventArgs.Empty);
 
         return r;
     }
@@ -167,10 +168,7 @@ public T Forward(bool show)
     /// Returns true if there is a history that can be navigated back to
     /// </summary>
     /// <returns></returns>
-    public bool CanBack()
-    {
-        return GetHistory(1).Any();
-    }
+    public bool CanBack() => GetHistory(1).Any();
 
     /// <summary>
     /// Returns true if the current state is an exploration of the past history and therefore the user can navigate Forwards again
@@ -216,7 +214,7 @@ public void Append(T newHead)
 
         _navigationStack.Push(newHead);
 
-        Changed?.Invoke(this,EventArgs.Empty);
+        Changed?.Invoke(this, EventArgs.Empty);
     }
 
     /// <summary>
diff --git a/Rdmp.UI/Overview/DataLoadsGraph.cs b/Rdmp.UI/Overview/DataLoadsGraph.cs
index 2321753a2f..1ac0d77eb8 100644
--- a/Rdmp.UI/Overview/DataLoadsGraph.cs
+++ b/Rdmp.UI/Overview/DataLoadsGraph.cs
@@ -46,11 +46,16 @@ public DataLoadsGraph()
 
         olvViewLog.AspectGetter += s => "View Log";
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvName, new Guid("4a651e11-62f5-4d8f-8fe5-4db488ee7f3a"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvLastRun, new Guid("1aadf2e8-798d-4e85-8abc-7f45edb839b7"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvCategory, new Guid("406173bc-44a0-40b7-8bd1-d01a214c277d"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvStatus, new Guid("8c5cbcd2-9f06-4e24-9521-c3be7ea22eca"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvViewLog, new Guid("e9c04da0-0e91-442e-90a4-119a1b67ea06"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvName,
+            new Guid("4a651e11-62f5-4d8f-8fe5-4db488ee7f3a"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvLastRun,
+            new Guid("1aadf2e8-798d-4e85-8abc-7f45edb839b7"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvCategory,
+            new Guid("406173bc-44a0-40b7-8bd1-d01a214c277d"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvStatus,
+            new Guid("8c5cbcd2-9f06-4e24-9521-c3be7ea22eca"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvDataLoads, olvViewLog,
+            new Guid("e9c04da0-0e91-442e-90a4-119a1b67ea06"));
     }
 
     private void SetupOlvDelegates()
@@ -68,7 +73,7 @@ private void SetupOlvDelegates()
                     .SingleOrDefault(m => m.ID == loadSummary.ID);
 
             if (metadata != null)
-                new ExecuteCommandViewLogs(Activator,metadata).Execute();
+                new ExecuteCommandViewLogs(Activator, metadata).Execute();
         };
 
         olvDataLoads.DoubleClick += delegate(object sender, EventArgs args)
@@ -89,7 +94,7 @@ private void SetupOlvDelegates()
     private void olvDataLoads_FormatCell(object sender, FormatCellEventArgs e)
     {
         if (e.ColumnIndex == olvStatus.Index)
-            e.SubItem.ForeColor = ((DataLoadsGraphResult) e.Model).Status != DataLoadsGraphResultStatus.Succeeding
+            e.SubItem.ForeColor = ((DataLoadsGraphResult)e.Model).Status != DataLoadsGraphResultStatus.Succeeding
                 ? Color.Red
                 : Color.Black;
     }
@@ -119,7 +124,6 @@ public void RefreshChartAsync()
                 var countManualLoadFailure = 0;
 
                 foreach (var metadata in Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<LoadMetadata>())
-                {
                     try
                     {
                         LogManager logManager;
@@ -132,13 +136,14 @@ public void RefreshChartAsync()
                         catch (NotSupportedException e)
                         {
                             //sometimes a load metadata won't have any catalogues so we can't process its log history
-                            if(e.Message.Contains("does not have any Catalogues associated with it"))
+                            if (e.Message.Contains("does not have any Catalogues associated with it"))
                                 continue;
 
                             throw;
                         }
 
-                        var archivalDataLoadInfo = logManager.GetArchivalDataLoadInfos(metadata.GetDistinctLoggingTask()).FirstOrDefault();
+                        var archivalDataLoadInfo = logManager
+                            .GetArchivalDataLoadInfos(metadata.GetDistinctLoggingTask()).FirstOrDefault();
 
                         var loadSummary = new DataLoadsGraphResult
                         {
@@ -157,7 +162,8 @@ public void RefreshChartAsync()
                             continue; //has never been run (or has had test runs only)
                         }
 
-                        var lastLoadWasError = archivalDataLoadInfo.Errors.Any() || archivalDataLoadInfo.EndTime == null;
+                        var lastLoadWasError =
+                            archivalDataLoadInfo.Errors.Any() || archivalDataLoadInfo.EndTime == null;
 
                         //while we were fetching data from database the form was closed
                         if (IsDisposed || !IsHandleCreated)
@@ -170,7 +176,9 @@ public void RefreshChartAsync()
 
                         Invoke(new MethodInvoker(() =>
                         {
-                            loadSummary.Status = lastLoadWasError ? DataLoadsGraphResultStatus.Failing : DataLoadsGraphResultStatus.Succeeding;
+                            loadSummary.Status = lastLoadWasError
+                                ? DataLoadsGraphResultStatus.Failing
+                                : DataLoadsGraphResultStatus.Succeeding;
                             loadSummary.LastRun = archivalDataLoadInfo.EndTime.ToString();
 
                             olvDataLoads.AddObject(loadSummary);
@@ -179,12 +187,8 @@ public void RefreshChartAsync()
                     catch (Exception e)
                     {
                         ragSmiley1.Fatal(e);
-                        Invoke(new MethodInvoker(() =>
-                        {
-                            pbLoading.Visible = false;
-                        }));
+                        Invoke(new MethodInvoker(() => { pbLoading.Visible = false; }));
                     }
-                }
 
 
                 //if there have been no loads at all ever
@@ -225,7 +229,7 @@ public void RefreshChartAsync()
                         countManualLoadsuccessful
                     }.Max();
 
-                    var gridMarkEvery = max == 0 ? 1 : Math.Max(max/10, 1);
+                    var gridMarkEvery = max == 0 ? 1 : Math.Max(max / 10, 1);
 
 
                     chart1.ChartAreas[0].AxisY.Interval = gridMarkEvery;
@@ -246,12 +250,8 @@ public void RefreshChartAsync()
             catch (Exception e)
             {
                 ragSmiley1.Fatal(e);
-                Invoke(new MethodInvoker(() =>
-                {
-                    pbLoading.Visible = false;
-                }));
+                Invoke(new MethodInvoker(() => { pbLoading.Visible = false; }));
             }
-
         });
         //t.SetApartmentState(ApartmentState.STA);
         t.Start();
@@ -259,40 +259,27 @@ public void RefreshChartAsync()
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-
     }
 
-    public string GetTabName()
-    {
-        return Text;
-    }
+    public string GetTabName() => Text;
 
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
     {
         SetItemActivator(activator);
         _collection = (DataLoadsGraphObjectCollection)collection;
 
-        if(IsHandleCreated && !IsDisposed)
+        if (IsHandleCreated && !IsDisposed)
             RefreshChartAsync();
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
     public void NotifyEditModeChange(bool isEditModeOn)
     {
-
     }
 
-    public IPersistableObjectCollection ConstructEmptyCollection(DashboardControl databaseRecord)
-    {
-        return new DataLoadsGraphObjectCollection();
-    }
+    public IPersistableObjectCollection ConstructEmptyCollection(DashboardControl databaseRecord) =>
+        new DataLoadsGraphObjectCollection();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Performance/LastCommandUI.cs b/Rdmp.UI/Performance/LastCommandUI.cs
index c3d9f6199b..58ae5361a5 100644
--- a/Rdmp.UI/Performance/LastCommandUI.cs
+++ b/Rdmp.UI/Performance/LastCommandUI.cs
@@ -21,7 +21,7 @@ public LastCommandUI()
 
     private void btnCopyToClipboard_Click(object sender, EventArgs e)
     {
-        Clipboard.SetText(label1.Text);                
+        Clipboard.SetText(label1.Text);
     }
 
     private void timer1_Tick(object sender, EventArgs e)
diff --git a/Rdmp.UI/Performance/PerformanceCounterResultsUI.cs b/Rdmp.UI/Performance/PerformanceCounterResultsUI.cs
index d74f3436d0..e1116d97a1 100644
--- a/Rdmp.UI/Performance/PerformanceCounterResultsUI.cs
+++ b/Rdmp.UI/Performance/PerformanceCounterResultsUI.cs
@@ -37,22 +37,24 @@ public PerformanceCounterResultsUI()
         tlvLocations.ChildrenGetter += ChildrenGetter;
         tlvLocations.RowFormatter += RowFormatter;
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvQueryCount, new Guid("576c87c7-a324-45bb-a4bc-4757044f7c43"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvQueryCount, new Guid("905e5565-0428-4734-8582-9734546d55a3"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvStackFrame, new Guid("865f84a1-f0c4-48d9-8983-10d35cf4a513"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvQueryCount,
+            new Guid("576c87c7-a324-45bb-a4bc-4757044f7c43"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvQueryCount,
+            new Guid("905e5565-0428-4734-8582-9734546d55a3"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvLocations, olvStackFrame,
+            new Guid("865f84a1-f0c4-48d9-8983-10d35cf4a513"));
     }
 
     private void RowFormatter(OLVListItem olvItem)
     {
         var o = (StackFramesTree)olvItem.RowObject;
-            
+
         //bold the endpoints - where there are no children or they are all in database assemblies
-        if (!o.Children.Any() ||o.Children.Values.All(c => c.IsInDatabaseAccessAssembly))
-            olvItem.Font = new Font(olvItem.Font,FontStyle.Bold);
+        if (!o.Children.Any() || o.Children.Values.All(c => c.IsInDatabaseAccessAssembly))
+            olvItem.Font = new Font(olvItem.Font, FontStyle.Bold);
 
-        var fraction = (double) o.QueryCount/_worstOffenderCount;
+        var fraction = (double)o.QueryCount / _worstOffenderCount;
         olvItem.BackColor = GetHeat(fraction);
-
     }
 
     private IEnumerable ChildrenGetter(object model)
@@ -62,7 +64,7 @@ private IEnumerable ChildrenGetter(object model)
         if (!treeNode.Children.Any())
             return null;
 
-        return treeNode.Children.Values.Where(c=>!c.IsInDatabaseAccessAssembly);
+        return treeNode.Children.Values.Where(c => !c.IsInDatabaseAccessAssembly);
     }
 
     private bool CanExpandGetter(object model)
@@ -72,13 +74,13 @@ private bool CanExpandGetter(object model)
         if (!treeNode.Children.Any())
             return false;
 
-        return treeNode.Children.Values.Any(c=>!c.IsInDatabaseAccessAssembly);
+        return treeNode.Children.Values.Any(c => !c.IsInDatabaseAccessAssembly);
     }
 
     private List<StackFramesTree> Roots;
     private bool collapseToMethod = false;
     private ComprehensiveQueryPerformanceCounter _performanceCounter;
-        
+
     private int _worstOffenderCount;
 
     public static Color GetHeat(double fraction)
@@ -106,27 +108,27 @@ public void LoadState(ComprehensiveQueryPerformanceCounter performanceCounter)
             var query = performanceCounter.DictionaryOfQueries[stackTrace];
 
             //get the stack trace split by line reversed so the root is at the top
-            var lines = stackTrace.Split(new[] {Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries).Reverse().ToArray();
-                   
-            lines = lines.Where(l=>!isSystemCall.IsMatch(l)).ToArray();
-                
-            if(lines.Length == 0)
+            var lines = stackTrace.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).Reverse()
+                .ToArray();
+
+            lines = lines.Where(l => !isSystemCall.IsMatch(l)).ToArray();
+
+            if (lines.Length == 0)
                 continue;
-                
-            if(collapseToMethod)
-            {
 
+            if (collapseToMethod)
+            {
                 var uniqueMethodLines = new List<string>();
 
                 var lastMethodName = StackFramesTree.GetMethodName(lines[0]);
                 uniqueMethodLines.Add(lines[0]);
-                    
+
                 for (var i = 1; i < lines.Length; i++)
                 {
                     var currentMethodName = StackFramesTree.GetMethodName(lines[i]);
-                        
+
                     //if there is no method name or it is not new
-                    if(currentMethodName == null || lastMethodName.Equals(currentMethodName))
+                    if (currentMethodName == null || lastMethodName.Equals(currentMethodName))
                         continue;
 
                     lastMethodName = currentMethodName;
@@ -146,15 +148,17 @@ public void LoadState(ComprehensiveQueryPerformanceCounter performanceCounter)
             if (currentRoot == null)
             {
                 //add a new root level entrypoint
-                currentRoot = new StackFramesTree(lines, query,false);
+                currentRoot = new StackFramesTree(lines, query, false);
                 Roots.Add(currentRoot);
             }
             else
+            {
                 currentRoot.AddSubframes(lines, query);
+            }
         }
-            
+
         //if there is one root node
-        if(Roots.Count == 1)
+        if (Roots.Count == 1)
         {
             //find the first point at which it splits
             var firstBranch = Roots.Single();
@@ -164,11 +168,11 @@ public void LoadState(ComprehensiveQueryPerformanceCounter performanceCounter)
                 firstBranch = firstBranch.Children.Values.Single();
 
             //if it did split
-            if(firstBranch.Children.Count > 1)
-                Roots = new List<StackFramesTree>(new []{firstBranch});
+            if (firstBranch.Children.Count > 1)
+                Roots = new List<StackFramesTree>(new[] { firstBranch });
         }
 
-            
+
         tlvLocations.ClearObjects();
         tlvLocations.AddObjects(Roots);
         tlvLocations.ExpandAll();
@@ -177,14 +181,12 @@ public void LoadState(ComprehensiveQueryPerformanceCounter performanceCounter)
     private void tlvLocations_ItemActivate(object sender, EventArgs e)
     {
         if (tlvLocations.SelectedObject is StackFramesTree model)
-        {
-            if(model.HasSourceCode)
+            if (model.HasSourceCode)
             {
-                var dialog = new SimpleDialogs.ViewSourceCodeDialog(model.Filename,model.LineNumber, Color.GreenYellow);
+                var dialog =
+                    new SimpleDialogs.ViewSourceCodeDialog(model.Filename, model.LineNumber, Color.GreenYellow);
                 dialog.Show();
             }
-        }
-            
     }
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
@@ -196,7 +198,7 @@ private void tbFilter_TextChanged(object sender, EventArgs e)
         }
         else
         {
-            tlvLocations.ModelFilter = new TextMatchFilter(tlvLocations,tbFilter.Text);
+            tlvLocations.ModelFilter = new TextMatchFilter(tlvLocations, tbFilter.Text);
             tlvLocations.UseFiltering = true;
         }
     }
diff --git a/Rdmp.UI/Performance/StackTraceProcessing/StackFramesTree.cs b/Rdmp.UI/Performance/StackTraceProcessing/StackFramesTree.cs
index 3f3fa6067b..9537d507bd 100644
--- a/Rdmp.UI/Performance/StackTraceProcessing/StackFramesTree.cs
+++ b/Rdmp.UI/Performance/StackTraceProcessing/StackFramesTree.cs
@@ -16,7 +16,7 @@ namespace Rdmp.UI.Performance.StackTraceProcessing;
 internal class StackFramesTree
 {
     public string CurrentFrame { get; private set; }
-    public int QueryCount{ get; private set; }
+    public int QueryCount { get; private set; }
 
     public bool HasSourceCode { get; private set; }
 
@@ -24,25 +24,27 @@ internal class StackFramesTree
     public string Filename { get; private set; }
     public int LineNumber { get; private set; }
 
-    public bool IsInDatabaseAccessAssembly { get;private set; }
+    public bool IsInDatabaseAccessAssembly { get; private set; }
 
-    public Dictionary<string,StackFramesTree> Children = new();
+    public Dictionary<string, StackFramesTree> Children = new();
 
-    public StackFramesTree(string[] stackFrameAndSubframes,QueryPerformed performed, bool isInDatabaseAccessAssemblyYet)
+    public StackFramesTree(string[] stackFrameAndSubframes, QueryPerformed performed,
+        bool isInDatabaseAccessAssemblyYet)
     {
         QueryCount = 0;
 
         PopulateSourceCode(stackFrameAndSubframes[0]);
 
         CurrentFrame = stackFrameAndSubframes[0];
-        AddSubframes(stackFrameAndSubframes,performed);
+        AddSubframes(stackFrameAndSubframes, performed);
 
         IsInDatabaseAccessAssembly = isInDatabaseAccessAssemblyYet || CurrentFrame.Contains("DatabaseCommandHelper");
     }
 
     private bool PopulateSourceCode(string frame)
     {
-        HasSourceCode = ExceptionViewerStackTraceWithHyperlinks.MatchStackLine(frame, out var filenameMatch, out var lineNumberMatch, out var method);
+        HasSourceCode = ExceptionViewerStackTraceWithHyperlinks.MatchStackLine(frame, out var filenameMatch,
+            out var lineNumberMatch, out var method);
 
         Filename = filenameMatch;
         LineNumber = lineNumberMatch;
@@ -51,14 +53,11 @@ private bool PopulateSourceCode(string frame)
         return HasSourceCode;
     }
 
-    public static bool FindSourceCode(string frame)
-    {
+    public static bool FindSourceCode(string frame) =>
+        ExceptionViewerStackTraceWithHyperlinks.MatchStackLine(frame, out _, out _, out _);
 
-        return ExceptionViewerStackTraceWithHyperlinks.MatchStackLine(frame, out _, out _, out _);
-    }
     public static string GetMethodName(string frame)
     {
-
         ExceptionViewerStackTraceWithHyperlinks.MatchStackLine(frame, out _, out _, out var method);
 
         return method;
@@ -75,20 +74,19 @@ public override string ToString()
 
     public void AddSubframes(string[] lines, QueryPerformed query)
     {
-        if(!lines[0].Equals(CurrentFrame))
+        if (!lines[0].Equals(CurrentFrame))
             throw new Exception("Current frame did not match expected lines[0]");
 
         QueryCount += query.TimesSeen;
 
         //we are the last line
-        if(lines.Length == 1)
+        if (lines.Length == 1)
             return;
 
         //we know about the child
-        if (Children.TryGetValue(lines[1],out var child))
-            child.AddSubframes(lines.Skip(1).ToArray(), query);//tell child to audit the relevant subframes
+        if (Children.TryGetValue(lines[1], out var child))
+            child.AddSubframes(lines.Skip(1).ToArray(), query); //tell child to audit the relevant subframes
         else
             Children.Add(lines[1], new StackFramesTree(lines.Skip(1).ToArray(), query, IsInDatabaseAccessAssembly));
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs b/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs
index 0042912991..f97daae2ae 100644
--- a/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs
+++ b/Rdmp.UI/PieCharts/GoodBadCataloguePieChart.cs
@@ -32,11 +32,19 @@ namespace Rdmp.UI.PieCharts;
 /// </summary>
 public partial class GoodBadCataloguePieChart : RDMPUserControl, IDashboardableControl
 {
-    private ToolStripButton btnSingleCatalogue = new("Single",CatalogueIcons.Catalogue.ImageToBitmap()) { Name = "btnSingleCatalogue" };
-    private ToolStripButton btnAllCatalogues = new("All",CatalogueIcons.AllCataloguesUsedByLoadMetadataNode.ImageToBitmap()){Name= "btnAllCatalogues" };
-    private ToolStripButton btnRefresh = new("Refresh",FamFamFamIcons.text_list_bullets.ImageToBitmap()) { Name = "btnRefresh" };
-    private ToolStripLabel toolStripLabel1 = new("Type:"){Name= "toolStripLabel1" };
-    private ToolStripButton btnShowLabels = new("Labels",FamFamFamIcons.text_align_left.ImageToBitmap()) { Name = "btnShowLabels", CheckOnClick = true };
+    private ToolStripButton btnSingleCatalogue = new("Single", CatalogueIcons.Catalogue.ImageToBitmap())
+        { Name = "btnSingleCatalogue" };
+
+    private ToolStripButton btnAllCatalogues =
+        new("All", CatalogueIcons.AllCataloguesUsedByLoadMetadataNode.ImageToBitmap()) { Name = "btnAllCatalogues" };
+
+    private ToolStripButton btnRefresh = new("Refresh", FamFamFamIcons.text_list_bullets.ImageToBitmap())
+        { Name = "btnRefresh" };
+
+    private ToolStripLabel toolStripLabel1 = new("Type:") { Name = "toolStripLabel1" };
+
+    private ToolStripButton btnShowLabels = new("Labels", FamFamFamIcons.text_align_left.ImageToBitmap())
+        { Name = "btnShowLabels", CheckOnClick = true };
 
     private List<ToolStripMenuItem> _flagOptions = new();
 
@@ -50,39 +58,48 @@ public GoodBadCataloguePieChart()
         btnSingleCatalogue.Click += new EventHandler(btnSingleCatalogue_Click);
         btnShowLabels.CheckStateChanged += new EventHandler(btnShowLabels_CheckStateChanged);
         btnRefresh.Click += new EventHandler(btnRefresh_Click);
-            
+
         //put edit mode on for the designer
         NotifyEditModeChange(false);
     }
 
     private void SetupFlags()
     {
-        if(!firstTime)
+        if (!firstTime)
             return;
 
-        AddFlag("Non Extractable Catalogues", c=> c.IncludeNonExtractableCatalogues, (c,r) => c.IncludeNonExtractableCatalogues= r);
-        AddFlag("Deprecated Catalogues", c => c.IncludeDeprecatedCatalogues, (c, r) => c.IncludeDeprecatedCatalogues = r);
+        AddFlag("Non Extractable Catalogues", c => c.IncludeNonExtractableCatalogues,
+            (c, r) => c.IncludeNonExtractableCatalogues = r);
+        AddFlag("Deprecated Catalogues", c => c.IncludeDeprecatedCatalogues,
+            (c, r) => c.IncludeDeprecatedCatalogues = r);
         AddFlag("Internal Catalogues", c => c.IncludeInternalCatalogues, (c, r) => c.IncludeInternalCatalogues = r);
-        AddFlag("Cold Storage Catalogues", c => c.IncludeColdStorageCatalogues, (c, r) => c.IncludeColdStorageCatalogues = r);
-        AddFlag("Project Specific Catalogues", c => c.IncludeProjectSpecificCatalogues, (c, r) => c.IncludeProjectSpecificCatalogues = r);
-
-        AddFlag("Non Extractable CatalogueItems", c => c.IncludeNonExtractableCatalogueItems, (c, r) => c.IncludeNonExtractableCatalogueItems = r);
-        AddFlag("Internal Catalogue Items", c => c.IncludeInternalCatalogueItems, (c, r) => c.IncludeInternalCatalogueItems = r);
-        AddFlag("Deprecated Catalogue Items", c => c.IncludeDeprecatedCatalogueItems, (c, r) => c.IncludeDeprecatedCatalogueItems = r);
+        AddFlag("Cold Storage Catalogues", c => c.IncludeColdStorageCatalogues,
+            (c, r) => c.IncludeColdStorageCatalogues = r);
+        AddFlag("Project Specific Catalogues", c => c.IncludeProjectSpecificCatalogues,
+            (c, r) => c.IncludeProjectSpecificCatalogues = r);
+
+        AddFlag("Non Extractable CatalogueItems", c => c.IncludeNonExtractableCatalogueItems,
+            (c, r) => c.IncludeNonExtractableCatalogueItems = r);
+        AddFlag("Internal Catalogue Items", c => c.IncludeInternalCatalogueItems,
+            (c, r) => c.IncludeInternalCatalogueItems = r);
+        AddFlag("Deprecated Catalogue Items", c => c.IncludeDeprecatedCatalogueItems,
+            (c, r) => c.IncludeDeprecatedCatalogueItems = r);
         firstTime = false;
     }
 
-    private void AddFlag(string caption, Func<GoodBadCataloguePieChartObjectCollection,bool> getProp, Action<GoodBadCataloguePieChartObjectCollection,bool> setProp)
+    private void AddFlag(string caption, Func<GoodBadCataloguePieChartObjectCollection, bool> getProp,
+        Action<GoodBadCataloguePieChartObjectCollection, bool> setProp)
     {
         var btn = new ToolStripMenuItem(caption)
         {
             Checked = getProp(_collection)
         };
-        btn.CheckedChanged += (sender,e) =>{setProp(_collection,((ToolStripMenuItem)sender).Checked);};
+        btn.CheckedChanged += (sender, e) => { setProp(_collection, ((ToolStripMenuItem)sender).Checked); };
         btn.CheckedChanged += (s, e) => GenerateChart();
         btn.CheckOnClick = true;
         _flagOptions.Add(btn);
     }
+
     private DashboardControl _dashboardControlDatabaseRecord;
     private GoodBadCataloguePieChartObjectCollection _collection;
 
@@ -147,19 +164,21 @@ private CatalogueItem[] GetCatalogueItems()
     {
         if (!_collection.IsSingleCatalogueMode)
         {
-            var catalogues = Activator.CoreChildProvider.AllCatalogues.Where(c => _collection.Include(c, Activator.RepositoryLocator.DataExportRepository)).ToArray();
+            var catalogues = Activator.CoreChildProvider.AllCatalogues
+                .Where(c => _collection.Include(c, Activator.RepositoryLocator.DataExportRepository)).ToArray();
 
             //if there are some
-            return catalogues.Any() ? catalogues.SelectMany(c => c.CatalogueItems).Where(ci => _collection.Include(ci)).ToArray() : //get the extractable columns
+            return catalogues.Any()
+                ? catalogues.SelectMany(c => c.CatalogueItems).Where(ci => _collection.Include(ci)).ToArray()
+                : //get the extractable columns
                 Array.Empty<CatalogueItem>(); //there weren't any so Catalogues so won't be any ExtractionInformationsEither
         }
 
-        return  _collection.GetSingleCatalogueModeCatalogue().CatalogueItems;
+        return _collection.GetSingleCatalogueModeCatalogue().CatalogueItems;
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-            
     }
 
     private bool _bLoading;
@@ -172,7 +191,7 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
 
         _collection = (GoodBadCataloguePieChartObjectCollection)collection;
 
-        if(firstTime)
+        if (firstTime)
             SetupFlags();
 
         btnAllCatalogues.Checked = !_collection.IsSingleCatalogueMode;
@@ -186,27 +205,18 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
         CommonFunctionality.Add(btnShowLabels);
         CommonFunctionality.Add(btnRefresh);
 
-        foreach(var mi in _flagOptions)
+        foreach (var mi in _flagOptions)
             CommonFunctionality.AddToMenu(mi);
 
         GenerateChart();
         _bLoading = false;
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
-    public string GetTabName()
-    {
-        return Text;
-    }
+    public string GetTabName() => Text;
 
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     public IPersistableObjectCollection ConstructEmptyCollection(DashboardControl databaseRecord)
     {
@@ -217,15 +227,15 @@ public IPersistableObjectCollection ConstructEmptyCollection(DashboardControl da
 
     public void NotifyEditModeChange(bool isEditModeOn)
     {
-        var l = new Point(Margin.Left,Margin.Right);
+        var l = new Point(Margin.Left, Margin.Right);
         var s = new Size(Width - Margin.Horizontal, Height - Margin.Vertical);
 
         CommonFunctionality.ToolStrip.Visible = isEditModeOn;
 
         if (isEditModeOn)
         {
-            gbWhatThisIs.Location = l with { Y = l.Y + 25 };//move it down 25 to allow space for tool bar
-            gbWhatThisIs.Size = s with { Height = s.Height - 25 };//and adjust height accordingly
+            gbWhatThisIs.Location = l with { Y = l.Y + 25 }; //move it down 25 to allow space for tool bar
+            gbWhatThisIs.Size = s with { Height = s.Height - 25 }; //and adjust height accordingly
         }
         else
         {
@@ -245,11 +255,10 @@ private void btnAllCatalogues_Click(object sender, EventArgs e)
 
     private void btnSingleCatalogue_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "Which Catalogue should the graph depict?"
-
-           }, Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(),out var selected))
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription = "Which Catalogue should the graph depict?"
+            }, Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>(), out var selected))
         {
             _collection.SetSingleCatalogueMode(selected);
 
@@ -284,10 +293,11 @@ private void btnShowLabels_CheckStateChanged(object sender, EventArgs e)
 
     private void btnViewDataTable_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "The following CatalogueItem(s) do not currently have descriptions. Select one to navigate to it"
-           }, GetCatalogueItems().Where(ci => string.IsNullOrWhiteSpace(ci.Description)).ToArray(),out var selected))
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "The following CatalogueItem(s) do not currently have descriptions. Select one to navigate to it"
+            }, GetCatalogueItems().Where(ci => string.IsNullOrWhiteSpace(ci.Description)).ToArray(), out var selected))
         {
             var cmd = new ExecuteCommandShow(Activator, selected, 1);
             cmd.Execute();
diff --git a/Rdmp.UI/PieCharts/GoodBadCataloguePieChartObjectCollection.cs b/Rdmp.UI/PieCharts/GoodBadCataloguePieChartObjectCollection.cs
index 76be614976..bc703f2c07 100644
--- a/Rdmp.UI/PieCharts/GoodBadCataloguePieChartObjectCollection.cs
+++ b/Rdmp.UI/PieCharts/GoodBadCataloguePieChartObjectCollection.cs
@@ -21,7 +21,7 @@ public class GoodBadCataloguePieChartObjectCollection : PersistableObjectCollect
     public bool ShowLabels { get; set; }
 
     //Catalogue filters
-    public bool IncludeNonExtractableCatalogues { get;set;}
+    public bool IncludeNonExtractableCatalogues { get; set; }
     public bool IncludeDeprecatedCatalogues { get; set; }
     public bool IncludeInternalCatalogues { get; set; }
     public bool IncludeColdStorageCatalogues { get; set; }
@@ -51,19 +51,19 @@ public bool Include(Catalogue c, IDataExportRepository repo)
 
         var status = c.GetExtractabilityStatus(repo);
 
-        if(!status.IsExtractable)
+        if (!status.IsExtractable)
             returnValue &= IncludeNonExtractableCatalogues;
 
-        if(status.IsProjectSpecific)
+        if (status.IsProjectSpecific)
             returnValue &= IncludeProjectSpecificCatalogues;
 
-        if(c.IsColdStorageDataset)
+        if (c.IsColdStorageDataset)
             returnValue &= IncludeColdStorageCatalogues;
 
-        if(c.IsDeprecated)
+        if (c.IsDeprecated)
             returnValue &= IncludeDeprecatedCatalogues;
 
-        if(c.IsInternalDataset)
+        if (c.IsInternalDataset)
             returnValue &= IncludeInternalCatalogueItems;
 
 
@@ -80,7 +80,7 @@ public bool Include(CatalogueItem ci)
     {
         var ei = ci.ExtractionInformation;
 
-        if(ei == null)
+        if (ei == null)
             return IncludeNonExtractableCatalogueItems;
 
         return ei.ExtractionCategory switch
@@ -91,49 +91,47 @@ public bool Include(CatalogueItem ci)
         };
     }
 
-    public Catalogue GetSingleCatalogueModeCatalogue()
-    {
-        return (Catalogue) DatabaseObjects.SingleOrDefault();
-    }
+    public Catalogue GetSingleCatalogueModeCatalogue() => (Catalogue)DatabaseObjects.SingleOrDefault();
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
+    public override string SaveExtraText() =>
+        PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
         {
-            {nameof(ShowLabels), ShowLabels.ToString()},
+            { nameof(ShowLabels), ShowLabels.ToString() },
 
-            {nameof(IncludeNonExtractableCatalogues), IncludeNonExtractableCatalogues.ToString()},
-            {nameof(IncludeDeprecatedCatalogues), IncludeDeprecatedCatalogues.ToString()},
-            {nameof(IncludeInternalCatalogues), IncludeInternalCatalogues.ToString()},
-            {nameof(IncludeColdStorageCatalogues), IncludeColdStorageCatalogues.ToString()},
-            {nameof(IncludeProjectSpecificCatalogues), IncludeProjectSpecificCatalogues.ToString()},
-
-            {nameof(IncludeNonExtractableCatalogueItems), IncludeNonExtractableCatalogueItems.ToString()},
-            {nameof(IncludeInternalCatalogueItems), IncludeInternalCatalogueItems.ToString()},
-            {nameof(IncludeDeprecatedCatalogueItems), IncludeDeprecatedCatalogueItems.ToString()}
+            { nameof(IncludeNonExtractableCatalogues), IncludeNonExtractableCatalogues.ToString() },
+            { nameof(IncludeDeprecatedCatalogues), IncludeDeprecatedCatalogues.ToString() },
+            { nameof(IncludeInternalCatalogues), IncludeInternalCatalogues.ToString() },
+            { nameof(IncludeColdStorageCatalogues), IncludeColdStorageCatalogues.ToString() },
+            { nameof(IncludeProjectSpecificCatalogues), IncludeProjectSpecificCatalogues.ToString() },
 
+            { nameof(IncludeNonExtractableCatalogueItems), IncludeNonExtractableCatalogueItems.ToString() },
+            { nameof(IncludeInternalCatalogueItems), IncludeInternalCatalogueItems.ToString() },
+            { nameof(IncludeDeprecatedCatalogueItems), IncludeDeprecatedCatalogueItems.ToString() }
         });
-    }
 
     public override void LoadExtraText(string s)
     {
         var dict = PersistStringHelper.LoadDictionaryFromString(s);
 
         //if it's empty we just use the default values we are set up for
-        if(dict == null || !dict.Any())
+        if (dict == null || !dict.Any())
             return;
 
-        ShowLabels = PersistStringHelper.GetBool(dict,nameof(ShowLabels),true);
+        ShowLabels = PersistStringHelper.GetBool(dict, nameof(ShowLabels), true);
 
-        IncludeNonExtractableCatalogues = PersistStringHelper.GetBool(dict, nameof(IncludeNonExtractableCatalogues), true);
+        IncludeNonExtractableCatalogues =
+            PersistStringHelper.GetBool(dict, nameof(IncludeNonExtractableCatalogues), true);
         IncludeDeprecatedCatalogues = PersistStringHelper.GetBool(dict, nameof(IncludeDeprecatedCatalogues), true);
         IncludeInternalCatalogues = PersistStringHelper.GetBool(dict, nameof(IncludeInternalCatalogues), true);
         IncludeColdStorageCatalogues = PersistStringHelper.GetBool(dict, nameof(IncludeColdStorageCatalogues), true);
-        IncludeProjectSpecificCatalogues = PersistStringHelper.GetBool(dict, nameof(IncludeProjectSpecificCatalogues), true);
+        IncludeProjectSpecificCatalogues =
+            PersistStringHelper.GetBool(dict, nameof(IncludeProjectSpecificCatalogues), true);
 
-        IncludeNonExtractableCatalogueItems = PersistStringHelper.GetBool(dict, nameof(IncludeNonExtractableCatalogueItems), true);
+        IncludeNonExtractableCatalogueItems =
+            PersistStringHelper.GetBool(dict, nameof(IncludeNonExtractableCatalogueItems), true);
         IncludeInternalCatalogueItems = PersistStringHelper.GetBool(dict, nameof(IncludeInternalCatalogueItems), true);
-        IncludeDeprecatedCatalogueItems = PersistStringHelper.GetBool(dict, nameof(IncludeDeprecatedCatalogueItems), true);
+        IncludeDeprecatedCatalogueItems =
+            PersistStringHelper.GetBool(dict, nameof(IncludeDeprecatedCatalogueItems), true);
     }
 
     public void SetAllCataloguesMode()
@@ -143,8 +141,9 @@ public void SetAllCataloguesMode()
 
     public void SetSingleCatalogueMode(Catalogue catalogue)
     {
-        if(catalogue == null)
-            throw new ArgumentException("Catalogue must not be null to turn on SingleCatalogue mode",nameof(catalogue));
+        if (catalogue == null)
+            throw new ArgumentException("Catalogue must not be null to turn on SingleCatalogue mode",
+                nameof(catalogue));
 
         DatabaseObjects.Clear();
         DatabaseObjects.Add(catalogue);
diff --git a/Rdmp.UI/PipelineUIs/DataObjects/DataFlowComponentVisualisation.cs b/Rdmp.UI/PipelineUIs/DataObjects/DataFlowComponentVisualisation.cs
index 2fccafe1ff..e701df5939 100644
--- a/Rdmp.UI/PipelineUIs/DataObjects/DataFlowComponentVisualisation.cs
+++ b/Rdmp.UI/PipelineUIs/DataObjects/DataFlowComponentVisualisation.cs
@@ -36,21 +36,22 @@ public bool IsLocked
         get => pbPadlock.Visible;
         set => pbPadlock.Visible = value;
     }
+
     private readonly Func<DragEventArgs, DataFlowComponentVisualisation, DragDropEffects> _shouldAllowDrop;
 
     public DataFlowComponentVisualisation()
-        : this(PipelineComponentRole.Middle, null,null)
+        : this(PipelineComponentRole.Middle, null, null)
     {
-        if (LicenseManager.UsageMode != LicenseUsageMode.Designtime) //don't connect to database in design mode unless they passed in a fist full of nulls
+        if (LicenseManager.UsageMode !=
+            LicenseUsageMode
+                .Designtime) //don't connect to database in design mode unless they passed in a fist full of nulls
             throw new NotSupportedException("Do not use this constructor, it is for use by Visual Studio Designer");
     }
 
-    public PipelineComponentRole GetRole()
-    {
-        return _role;
-    }
+    public PipelineComponentRole GetRole() => _role;
 
-    public DataFlowComponentVisualisation(PipelineComponentRole role, object value, Func<DragEventArgs, DataFlowComponentVisualisation, DragDropEffects> shouldAllowDrop)
+    public DataFlowComponentVisualisation(PipelineComponentRole role, object value,
+        Func<DragEventArgs, DataFlowComponentVisualisation, DragDropEffects> shouldAllowDrop)
     {
         Value = value;
         _role = role;
@@ -63,7 +64,7 @@ public DataFlowComponentVisualisation(PipelineComponentRole role, object value,
 
         if (value == null)
         {
-            IsLocked = false;//cannot be locked AND empty!
+            IsLocked = false; //cannot be locked AND empty!
             _isEmpty = true;
             lblText.Text = "Empty";
             AllowDrop = _shouldAllowDrop != null;
@@ -72,7 +73,7 @@ public DataFlowComponentVisualisation(PipelineComponentRole role, object value,
         {
             _checkable = value as ICheckable;
             _mandatoryChecker = new MandatoryPropertyChecker(value);
-            lblText.Text = value.ToString();//.GetType().Name;
+            lblText.Text = value.ToString(); //.GetType().Name;
             GenerateToolTipBasedOnProperties(value);
         }
 
@@ -92,7 +93,7 @@ public DataFlowComponentVisualisation(PipelineComponentRole role, object value,
                 throw new ArgumentOutOfRangeException(nameof(role));
         }
 
-            
+
         Width = lblText.PreferredWidth + 80;
     }
 
@@ -119,17 +120,16 @@ private void GenerateToolTipBasedOnProperties(object value)
 
         var result = toolTip.ToString();
 
-        if(!string.IsNullOrWhiteSpace(result))
+        if (!string.IsNullOrWhiteSpace(result))
             _toolTip.SetToolTip(lblText,
                 $"{lblText.Text}{Environment.NewLine}Arguments:{Environment.NewLine}{result}");
     }
 
-    protected bool _isEmpty ;
+    protected bool _isEmpty;
     private Pen _emptyPen = new(new SolidBrush(Color.Black));
     protected Pen _fullPen = new(new SolidBrush(Color.Black));
 
 
-
     protected override void OnPaintBackground(PaintEventArgs e)
     {
         base.OnPaintBackground(e);
@@ -139,10 +139,10 @@ protected override void OnPaintBackground(PaintEventArgs e)
 
     private void DataFlowComponentVisualisation_DragEnter(object sender, DragEventArgs e)
     {
-        if(_shouldAllowDrop == null)
+        if (_shouldAllowDrop == null)
             return;
 
-        var shouldAllow = _shouldAllowDrop(e,this);
+        var shouldAllow = _shouldAllowDrop(e, this);
 
         if (shouldAllow != DragDropEffects.None)
             pbInsertHere.Visible = true;
@@ -178,5 +178,4 @@ public void CheckMandatoryProperties()
             ragSmiley1.Fatal(e);
         }
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/DataObjects/PipelineComponentVisualisation.cs b/Rdmp.UI/PipelineUIs/DataObjects/PipelineComponentVisualisation.cs
index eb5c3761db..d1a5be1190 100644
--- a/Rdmp.UI/PipelineUIs/DataObjects/PipelineComponentVisualisation.cs
+++ b/Rdmp.UI/PipelineUIs/DataObjects/PipelineComponentVisualisation.cs
@@ -23,7 +23,7 @@ namespace Rdmp.UI.PipelineUIs.DataObjects;
 /// itself is stored as a reusable resource in the Catalogue Database. </para>
 /// </summary>
 [TechnicalUI]
-internal class PipelineComponentVisualisation:DataFlowComponentVisualisation
+internal class PipelineComponentVisualisation : DataFlowComponentVisualisation
 {
     private bool _isSelected;
 
@@ -40,7 +40,7 @@ public bool IsSelected
         set
         {
             _isSelected = value;
-            _fullPen = value ? new Pen(new SolidBrush(Color.FromArgb(0,99,177)), 7.0f) : _origFullPen;
+            _fullPen = value ? new Pen(new SolidBrush(Color.FromArgb(0, 99, 177)), 7.0f) : _origFullPen;
             Invalidate(true);
         }
     }
@@ -53,18 +53,22 @@ public Exception ExInitialization
             _exInitialization = value;
 
             if (value != null)
-                ragSmiley1.OnCheckPerformed(new CheckEventArgs("Could not initialize object", CheckResult.Fail,_exInitialization));
+                ragSmiley1.OnCheckPerformed(new CheckEventArgs("Could not initialize object", CheckResult.Fail,
+                    _exInitialization));
         }
     }
 
 
-    public PipelineComponentVisualisation(IPipelineComponent component, PipelineComponentRole role, object valueOrNullIfBroken, Exception constructionExceptionIfAny, Func<DragEventArgs, DataFlowComponentVisualisation, DragDropEffects> shouldAllowDrop)
+    public PipelineComponentVisualisation(IPipelineComponent component, PipelineComponentRole role,
+        object valueOrNullIfBroken, Exception constructionExceptionIfAny,
+        Func<DragEventArgs, DataFlowComponentVisualisation, DragDropEffects> shouldAllowDrop)
         : base(role, valueOrNullIfBroken, shouldAllowDrop)
     {
         PipelineComponent = component;
 
         if (constructionExceptionIfAny != null)
-            ragSmiley1.OnCheckPerformed(new CheckEventArgs("Failed to construct component", CheckResult.Fail,constructionExceptionIfAny));
+            ragSmiley1.OnCheckPerformed(new CheckEventArgs("Failed to construct component", CheckResult.Fail,
+                constructionExceptionIfAny));
 
         _origFullPen = _fullPen;
 
@@ -72,7 +76,7 @@ public PipelineComponentVisualisation(IPipelineComponent component, PipelineComp
             return;
 
         lblText.Text = component.GetClassNameLastPart();
-            
+
         if (valueOrNullIfBroken == null)
             ragSmiley1.OnCheckPerformed(new CheckEventArgs("Could not construct object", CheckResult.Fail));
 
@@ -91,10 +95,10 @@ public PipelineComponentVisualisation(IPipelineComponent component, PipelineComp
 
 
     public event PipelineComponentSelectedHandler ComponentSelected;
-        
+
     private void Anywhere_MouseDown(object sender, MouseEventArgs e)
     {
-        if(e.Button != MouseButtons.Left)
+        if (e.Button != MouseButtons.Left)
             return;
 
         if (AllowSelection)
@@ -103,10 +107,6 @@ private void Anywhere_MouseDown(object sender, MouseEventArgs e)
             ComponentSelected(this, PipelineComponent);
         }
 
-        if (AllowDrag)
-        {
-            DoDragDrop(this, DragDropEffects.Move);
-        }
+        if (AllowDrag) DoDragDrop(this, DragDropEffects.Move);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentCollectionUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentCollectionUI.cs
index 60174c9724..17cd256212 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentCollectionUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentCollectionUI.cs
@@ -51,7 +51,8 @@ public ArgumentCollectionUI()
     /// <param name="parent"></param>
     /// <param name="argumentsAreForUnderlyingType"></param>
     /// <param name="catalogueRepository"></param>
-    public void Setup(IActivateItems activator,IArgumentHost parent, Type argumentsAreForUnderlyingType, ICatalogueRepository catalogueRepository)
+    public void Setup(IActivateItems activator, IArgumentHost parent, Type argumentsAreForUnderlyingType,
+        ICatalogueRepository catalogueRepository)
     {
         _parent = parent;
         _argumentsAreFor = argumentsAreForUnderlyingType;
@@ -85,7 +86,6 @@ public void Setup(IActivateItems activator,IArgumentHost parent, Type argumentsA
 
             RefreshArgumentList();
         }
-
     }
 
     private void RefreshArgumentList()
@@ -104,7 +104,7 @@ private void RefreshArgumentList()
 
         float maxArgNameWidth = 0;
 
-        if(DemandDictionary.Any())
+        if (DemandDictionary.Any())
         {
             var g = CreateGraphics();
             maxArgNameWidth = DemandDictionary.Select(a =>
@@ -135,13 +135,14 @@ private static Label GetLabelHeader(string caption)
         return label;
     }
 
-    private void CreateLine(IArgumentHost parent, IArgument argument, RequiredPropertyInfo required, float maxArgNameWidth)
+    private void CreateLine(IArgumentHost parent, IArgument argument, RequiredPropertyInfo required,
+        float maxArgNameWidth)
     {
-
         var name = new Label();
 
         var helpIcon = new HelpIcon();
-        helpIcon.SetHelpText(GetSystemTypeName(argument.GetSystemType())?? $"Unrecognised Type:{argument.Type}", required.Demand.Description);
+        helpIcon.SetHelpText(GetSystemTypeName(argument.GetSystemType()) ?? $"Unrecognised Type:{argument.Type}",
+            required.Demand.Description);
         helpIcon.Dock = DockStyle.Right;
 
         var spaceSeparatedArgumentName = UsefulStuff.PascalCaseStringToHumanReadable(argument.Name);
@@ -149,7 +150,7 @@ private void CreateLine(IArgumentHost parent, IArgument argument, RequiredProper
         name.Text = spaceSeparatedArgumentName;
         name.TextAlign = ContentAlignment.MiddleLeft;
         name.Dock = DockStyle.Left;
-        name.Width = (int)maxArgNameWidth+3 /*padding*/;
+        name.Width = (int)maxArgNameWidth + 3 /*padding*/;
 
         var ragSmiley = new RAGSmiley();
 
@@ -165,7 +166,6 @@ private void CreateLine(IArgumentHost parent, IArgument argument, RequiredProper
 
         try
         {
-
             args.InitialValue = argument.GetValueAsSystemType();
         }
         catch (Exception e)
@@ -190,12 +190,12 @@ private void CreateLine(IArgumentHost parent, IArgument argument, RequiredProper
 
                 argument.GetValueAsSystemType();
 
-                if(required.Demand.Mandatory && (v == null  || string.IsNullOrWhiteSpace(v.ToString())))
+                if (required.Demand.Mandatory && (v == null || string.IsNullOrWhiteSpace(v.ToString())))
                     ragSmiley.Fatal(new Exception($"Property {argument.Name} is Mandatory"));
             }
             catch (Exception ex)
             {
-                ragSmiley.OnCheckPerformed(new CheckEventArgs("Failed to set property properly",CheckResult.Fail,ex));
+                ragSmiley.OnCheckPerformed(new CheckEventArgs("Failed to set property properly", CheckResult.Fail, ex));
             }
         };
         args.Fatal = ragSmiley.Fatal;
@@ -209,7 +209,7 @@ private void CreateLine(IArgumentHost parent, IArgument argument, RequiredProper
             Dock = DockStyle.Top
         };
 
-        name.Location = new Point(0,0);
+        name.Location = new Point(0, 0);
         p.Controls.Add(name);
 
         helpIcon.Left = name.Right;
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueArrayUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueArrayUI.cs
index 14f6b607b4..8e6cda355d 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueArrayUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueArrayUI.cs
@@ -39,7 +39,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
     {
         _args = args;
 
-        var value = (Array) args.InitialValue;
+        var value = (Array)args.InitialValue;
         SetUp(value);
     }
 
@@ -48,7 +48,9 @@ private void SetUp(Array value)
         _value = value;
 
         if (value == null)
+        {
             tbArray.Text = "";
+        }
         else
         {
             var sb = new StringBuilder();
@@ -69,17 +71,19 @@ private void SetUp(Array value)
     private void btnPickDatabaseEntities_Click(object sender, EventArgs e)
     {
         var type = _args.Type;
-        var elementType = type.GetElementType() ?? throw new NotSupportedException($"No array element existed for DemandsInitialization Type {type}");
+        var elementType = type.GetElementType() ??
+                          throw new NotSupportedException(
+                              $"No array element existed for DemandsInitialization Type {type}");
         if (!_args.CatalogueRepository.SupportsObjectType(elementType))
             throw new NotSupportedException(
                 $"CatalogueRepository does not support element {elementType} for DemandsInitialization Type {type}");
 
-        if(_activator.SelectObjects(new DialogArgs
-           {
-               TaskDescription = $"Which objects should be selected for Argument '{_args.Required.Name}'",
-               InitialObjectSelection = _value is IEnumerable<IMapsDirectlyToDatabaseTable> v ? v.ToArray() : null,
-               AllowSelectingNull = true
-           }, _args.CatalogueRepository.GetAllObjects(elementType).ToArray(), out var selected))
+        if (_activator.SelectObjects(new DialogArgs
+            {
+                TaskDescription = $"Which objects should be selected for Argument '{_args.Required.Name}'",
+                InitialObjectSelection = _value is IEnumerable<IMapsDirectlyToDatabaseTable> v ? v.ToArray() : null,
+                AllowSelectingNull = true
+            }, _args.CatalogueRepository.GetAllObjects(elementType).ToArray(), out var selected))
         {
             _args.Setter(selected);
             SetUp(selected);
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueBoolUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueBoolUI.cs
index 7fa576e3fb..8c74263577 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueBoolUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueBoolUI.cs
@@ -25,7 +25,7 @@ public ArgumentValueBoolUI()
     {
         InitializeComponent();
     }
-        
+
     public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
     {
         _args = args;
@@ -38,14 +38,16 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             args.Setter(false);
         }
         else
-            cbValue.Checked = (bool)args.InitialValue;//otherwise use the previous value
+        {
+            cbValue.Checked = (bool)args.InitialValue; //otherwise use the previous value
+        }
 
         _bLoading = false;
     }
 
     private void cbValue_CheckedChanged(object sender, System.EventArgs e)
     {
-        if(_bLoading)
+        if (_bLoading)
             return;
 
         _args.Setter(cbValue.Checked);
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueComboBoxUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueComboBoxUI.cs
index 15c3fb920e..27dcc64444 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueComboBoxUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueComboBoxUI.cs
@@ -33,7 +33,7 @@ public partial class ArgumentValueComboBoxUI : UserControl, IArgumentValueUI
     private ArgumentValueUIArgs _args;
     private bool _isEnum;
 
-    public ArgumentValueComboBoxUI(IActivateItems activator,object[] objectsForComboBox)
+    public ArgumentValueComboBoxUI(IActivateItems activator, object[] objectsForComboBox)
     {
         _activator = activator;
         _objectsForComboBox = objectsForComboBox;
@@ -42,23 +42,22 @@ public ArgumentValueComboBoxUI(IActivateItems activator,object[] objectsForCombo
         //Stop mouse wheel scroll from scrolling the combobox when it's closed to avoid the value being changed without user noticing.
         RDMPControlCommonFunctionality.DisableMouseWheel(cbxValue);
 
-        if(objectsForComboBox == null || objectsForComboBox.Length == 0)
+        if (objectsForComboBox == null || objectsForComboBox.Length == 0)
             return;
 
         btnPick.Enabled = objectsForComboBox.All(o => o is IMapsDirectlyToDatabaseTable);
 
         //If it is a dropdown of Types
-        if (objectsForComboBox.All(o=>o is Type))
+        if (objectsForComboBox.All(o => o is Type))
         {
             //add only the names (not the full namespace)
             types = new HashSet<Type>(objectsForComboBox.Cast<Type>());
 
             cbxValue.DropDownStyle = ComboBoxStyle.DropDownList;
-            cbxValue.Items.AddRange(types.Select(t=>t.Name).ToArray());
+            cbxValue.Items.AddRange(types.Select(t => t.Name).ToArray());
             cbxValue.Items.Add(ClearSelection);
         }
-        else
-        if (objectsForComboBox.All(t=>t is Enum)) //don't offer "ClearSelection" if it is an Enum list
+        else if (objectsForComboBox.All(t => t is Enum)) //don't offer "ClearSelection" if it is an Enum list
         {
             _isEnum = true;
             cbxValue.DataSource = objectsForComboBox;
@@ -70,16 +69,13 @@ public ArgumentValueComboBoxUI(IActivateItems activator,object[] objectsForCombo
 
             cbxValue.DropDown += (s, e) => { LateLoad(objectsForComboBox); };
         }
-
     }
 
     private bool haveLateLoaded = false;
+
     private void LateLoad(object[] objectsForComboBox)
     {
-        if(haveLateLoaded)
-        {
-            return;
-        }
+        if (haveLateLoaded) return;
 
         cbxValue.BeginUpdate();
         cbxValue.Items.AddRange(objectsForComboBox.Except(cbxValue.Items.Cast<object>()).ToArray());
@@ -108,12 +104,9 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             _args.Fatal(e);
         }
 
-        if(cbxValue.Items.Count == 0 && _args.InitialValue != null)
-        {
-            cbxValue.Items.Add(_args.InitialValue);
-        }
+        if (cbxValue.Items.Count == 0 && _args.InitialValue != null) cbxValue.Items.Add(_args.InitialValue);
 
-        if (currentValue != null) cbxValue.Text = types != null ? ((Type) currentValue).Name : currentValue.ToString();
+        if (currentValue != null) cbxValue.Text = types != null ? ((Type)currentValue).Name : currentValue.ToString();
 
         _bLoading = false;
     }
@@ -126,8 +119,7 @@ private void cbxValue_TextChanged(object sender, EventArgs e)
         //user chose to clear selection from a combo box
         if (cbxValue.Text == ClearSelection)
             _args.Setter(null);
-        else
-        if (cbxValue.SelectedItem != null)
+        else if (cbxValue.SelectedItem != null)
             _args.Setter(
                 types != null ? types.Single(t => t.Name.Equals(cbxValue.SelectedItem)) : cbxValue.SelectedItem);
     }
@@ -138,19 +130,15 @@ private void btnPick_Click(object sender, EventArgs e)
             {
                 TaskDescription = $"Choose a new value for '{_args.Required.Name}'",
                 AllowSelectingNull = true
-            }, _objectsForComboBox,out var selected))
+            }, _objectsForComboBox, out var selected))
         {
-
             if (selected == null)
             {
                 cbxValue.Text = ClearSelection;
             }
             else
             {
-                if (!cbxValue.Items.Contains(selected))
-                {
-                    cbxValue.Items.Add(selected);
-                }
+                if (!cbxValue.Items.Contains(selected)) cbxValue.Items.Add(selected);
 
                 cbxValue.SelectedItem = selected;
             }
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueCustomUIDrivenClassUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueCustomUIDrivenClassUI.cs
index 2ee8af905f..f793bbe032 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueCustomUIDrivenClassUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueCustomUIDrivenClassUI.cs
@@ -12,7 +12,6 @@
 using Rdmp.UI.SimpleDialogs;
 
 
-
 namespace Rdmp.UI.PipelineUIs.DemandsInitializationUIs.ArgumentValueControls;
 
 /// <summary>
@@ -48,7 +47,8 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             if (_uiType == null)
             {
                 var shortUIClassName = $"{t.Name}UI";
-                var candidates = _args.CatalogueRepository.MEF.GetAllTypes().Where(type => type.Name.Equals(shortUIClassName)).ToArray();
+                var candidates = _args.CatalogueRepository.MEF.GetAllTypes()
+                    .Where(type => type.Name.Equals(shortUIClassName)).ToArray();
 
                 if (candidates.Length > 1)
                     throw new Exception(
@@ -61,7 +61,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
                 _uiType = candidates[0];
             }
 
-    
+
             btnLaunchCustomUI.Text = $"Launch Custom UI ({_uiType.Name})";
             btnLaunchCustomUI.Width = btnLaunchCustomUI.PreferredSize.Width;
         }
@@ -70,7 +70,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             btnLaunchCustomUI.Enabled = false;
         }
     }
-        
+
     private void btnLaunchCustomUI_Click(object sender, EventArgs e)
     {
         try
@@ -79,13 +79,13 @@ private void btnLaunchCustomUI_Click(object sender, EventArgs e)
 
             var uiInstance = Activator.CreateInstance(_uiType);
 
-            var instanceAsCustomUI = (ICustomUI) uiInstance;
+            var instanceAsCustomUI = (ICustomUI)uiInstance;
             instanceAsCustomUI.CatalogueRepository = _args.CatalogueRepository;
 
             instanceAsCustomUI.SetGenericUnderlyingObjectTo(dataClassInstance);
             var dr = ((Form)instanceAsCustomUI).ShowDialog();
 
-            if(dr != DialogResult.Cancel)
+            if (dr != DialogResult.Cancel)
             {
                 var result = instanceAsCustomUI.GetFinalStateOfUnderlyingObject();
                 _args.Setter(result);
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueDictionaryUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueDictionaryUI.cs
index ae08d2dde2..4a246e427a 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueDictionaryUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueDictionaryUI.cs
@@ -14,7 +14,6 @@
 using Rdmp.UI.SimpleDialogs;
 
 
-
 namespace Rdmp.UI.PipelineUIs.DemandsInitializationUIs.ArgumentValueControls;
 
 /// <summary>
@@ -40,28 +39,28 @@ public ArgumentValueDictionaryUI()
         _factory = new ArgumentValueUIFactory();
     }
 
-    public void SetUp(IActivateItems activator,ArgumentValueUIArgs args)
+    public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
     {
         _activator = activator;
         _args = args;
         var concreteType = args.Type;
 
         //get an IDictionary either from the object or a new empty one (e.g. if Value is null)
-        _dictionary = (IDictionary)(args.InitialValue??Activator.CreateInstance(concreteType));
+        _dictionary = (IDictionary)(args.InitialValue ?? Activator.CreateInstance(concreteType));
 
         _kType = concreteType.GenericTypeArguments[0];
         _vType = concreteType.GenericTypeArguments[1];
 
         foreach (DictionaryEntry kvp in _dictionary)
-            AddRow(kvp.Key,kvp.Value);
+            AddRow(kvp.Key, kvp.Value);
 
         btnSave.Enabled = false;
     }
 
     private List<object> keys = new();
     private List<object> values = new();
-    private Stack<Tuple<Control,Control>> controls = new();
-        
+    private Stack<Tuple<Control, Control>> controls = new();
+
 
     private void btnAdd_Click(object sender, EventArgs e)
     {
@@ -155,5 +154,4 @@ private void btnRemove_Click(object sender, EventArgs e)
         btnRemove.Enabled = keys.Any();
         btnSave.Enabled = true;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueLabelUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueLabelUI.cs
index b3e346fa41..d97ec97ac0 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueLabelUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueLabelUI.cs
@@ -28,6 +28,5 @@ public ArgumentValueLabelUI(string readonlyText)
 
     public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValuePipelineUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValuePipelineUI.cs
index 5f008c8325..5fa2b2a310 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValuePipelineUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValuePipelineUI.cs
@@ -15,7 +15,6 @@
 using Rdmp.UI.SimpleDialogs;
 
 
-
 namespace Rdmp.UI.PipelineUIs.DemandsInitializationUIs.ArgumentValueControls;
 
 /// <summary>
@@ -40,14 +39,14 @@ public ArgumentValuePipelineUI(ICatalogueRepository catalogueRepository, IArgume
 
         if (_typeOfUnderlyingClass == null)
             throw new Exception($"Could not identify a Type called {typeName} in any loaded assemblies");
-
     }
-        
+
     public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
     {
         var instanceOfParentType = Activator.CreateInstance(_typeOfUnderlyingClass);
 
-        var factory = new PipelineSelectionUIFactory(args.CatalogueRepository,args.Required,args, instanceOfParentType);
+        var factory =
+            new PipelineSelectionUIFactory(args.CatalogueRepository, args.Required, args, instanceOfParentType);
         _pipelineSelectionUIInstance = factory.Create(activator);
         _pipelineSelectionUIInstance.CollapseToSingleLineMode();
 
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueSqlUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueSqlUI.cs
index 82455cfcec..04cc3542a3 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueSqlUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueSqlUI.cs
@@ -49,7 +49,6 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
 
     private void btnSetSQL_Click(object sender, System.EventArgs e)
     {
-
         var dialog = new SetSQLDialog((string)_args.InitialValue, new RDMPCombineableFactory());
         var d = dialog.ShowDialog();
 
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueTextUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueTextUI.cs
index 401755c195..c690875398 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueTextUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueTextUI.cs
@@ -37,7 +37,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
         _bLoading = true;
         _args = args;
 
-        tbText.Text = args.InitialValue == null ? "":args.InitialValue.ToString();
+        tbText.Text = args.InitialValue == null ? "" : args.InitialValue.ToString();
 
         if (args.Type == typeof(DirectoryInfo))
         {
@@ -45,13 +45,13 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             tbText.AutoCompleteSource = AutoCompleteSource.FileSystemDirectories;
         }
 
-        if(args.Type == typeof(CultureInfo))
+        if (args.Type == typeof(CultureInfo))
         {
             tbText.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
             tbText.AutoCompleteSource = AutoCompleteSource.CustomSource;
 
             var collection = new AutoCompleteStringCollection();
-            collection.AddRange(CultureInfo.GetCultures(CultureTypes.AllCultures).Select(c=>c.Name).ToArray());
+            collection.AddRange(CultureInfo.GetCultures(CultureTypes.AllCultures).Select(c => c.Name).ToArray());
 
             tbText.AutoCompleteCustomSource = collection;
         }
@@ -61,7 +61,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
             tbText.AutoCompleteMode = AutoCompleteMode.SuggestAppend;
             tbText.AutoCompleteSource = AutoCompleteSource.FileSystem;
         }
-            
+
         if (_isPassword)
         {
             tbText.UseSystemPasswordChar = true;
@@ -74,7 +74,7 @@ public void SetUp(IActivateItems activator, ArgumentValueUIArgs args)
 
     private void tbText_TextChanged(object sender, System.EventArgs e)
     {
-        if(_bLoading)
+        if (_bLoading)
             return;
 
         _args.Setter(tbText.Text);
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueUIFactory.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueUIFactory.cs
index 894982b13a..4b3b8594a1 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueUIFactory.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/ArgumentValueUIFactory.cs
@@ -26,7 +26,7 @@ public class ArgumentValueUIFactory
 {
     private IActivateItems _activator;
 
-    public IArgumentValueUI Create(IActivateItems activator,ArgumentValueUIArgs args)
+    public IArgumentValueUI Create(IActivateItems activator, ArgumentValueUIArgs args)
     {
         _activator = activator;
         var argumentType = args.Type;
@@ -35,30 +35,37 @@ public IArgumentValueUI Create(IActivateItems activator,ArgumentValueUIArgs args
         try
         {
             //if it's an array
-            if(typeof(IDictionary).IsAssignableFrom(argumentType))
+            if (typeof(IDictionary).IsAssignableFrom(argumentType))
+            {
                 toReturn = new ArgumentValueDictionaryUI();
-            else
-            if (typeof (Array).IsAssignableFrom(argumentType))
+            }
+            else if (typeof(Array).IsAssignableFrom(argumentType))
+            {
                 toReturn = new ArgumentValueArrayUI(activator);
+            }
             else
                 //if it's a pipeline
-            if (typeof (IPipeline).IsAssignableFrom(argumentType))
+            if (typeof(IPipeline).IsAssignableFrom(argumentType))
+            {
                 toReturn = new ArgumentValuePipelineUI(catalogueRepository, args.Parent, argumentType);
-            else if (typeof (bool) == argumentType)
+            }
+            else if (typeof(bool) == argumentType)
+            {
                 toReturn = new ArgumentValueBoolUI();
+            }
             else if (args.Required.Demand.DemandType == DemandType.SQL) //if it is SQL
             {
-                if (typeof (string) != argumentType)
+                if (typeof(string) != argumentType)
                     throw new NotSupportedException(
                         $"Demanded type (of DemandsInitialization) was DemandType.SQL but the ProcessTaskArgument Property was of type {argumentType} (Expected String)");
 
                 toReturn = new ArgumentValueSqlUI();
             }
-            else if (typeof (ICustomUIDrivenClass).IsAssignableFrom(argumentType))
+            else if (typeof(ICustomUIDrivenClass).IsAssignableFrom(argumentType))
             {
                 toReturn = new ArgumentValueCustomUIDrivenClassUI();
             }
-            else if (argumentType == typeof (Type))
+            else if (argumentType == typeof(Type))
             {
                 //Handle case where Demand is for the user to pick a Type (derived from a given parent Type/Interface).  Use case for this is when you want them to pick e.g. a IDilutionOperation where these are a list of classes corrupt data to greater or lesser degree and can be plugin Types but all share the same parent interface IDilutionOperation
 
@@ -73,7 +80,7 @@ public IArgumentValueUI Create(IActivateItems activator,ArgumentValueUIArgs args
                             .Where(t => args.Required.Demand.TypeOf.IsAssignableFrom(t))
                             .ToArray());
             }
-            else if (typeof (IMapsDirectlyToDatabaseTable).IsAssignableFrom(argumentType))
+            else if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(argumentType))
             {
                 toReturn = HandleCreateForIMapsDirectlyToDatabaseTable(args);
             }
@@ -83,24 +90,25 @@ public IArgumentValueUI Create(IActivateItems activator,ArgumentValueUIArgs args
                     new ArgumentValueComboBoxUI(activator,
                         Enum.GetValues(argumentType).Cast<object>().ToArray());
             }
-            else if (typeof (ICatalogueRepository).IsAssignableFrom(argumentType))
+            else if (typeof(ICatalogueRepository).IsAssignableFrom(argumentType))
             {
                 toReturn = new ArgumentValueLabelUI("<this value cannot be set manually>");
             }
             else //type is simple
             {
                 toReturn =
-                    new ArgumentValueTextUI(isPassword: typeof (IEncryptedString).IsAssignableFrom(argumentType));
+                    new ArgumentValueTextUI(typeof(IEncryptedString).IsAssignableFrom(argumentType));
             }
         }
         catch (Exception e)
         {
             throw new Exception(
-                $"A problem occured trying to create an ArgumentUI for Property '{args.Required.Name}' of Type '{argumentType}' on parent class of Type '{args.Parent.GetClassNameWhoArgumentsAreFor()}'", e);
+                $"A problem occured trying to create an ArgumentUI for Property '{args.Required.Name}' of Type '{argumentType}' on parent class of Type '{args.Parent.GetClassNameWhoArgumentsAreFor()}'",
+                e);
         }
 
         ((Control)toReturn).Dock = DockStyle.Fill;
-            
+
         toReturn.SetUp(activator, args);
         return toReturn;
     }
@@ -122,42 +130,45 @@ public IArgumentValueUI HandleCreateForIMapsDirectlyToDatabaseTable(ArgumentValu
 
         //Populate dropdown with the appropriate types
         if (argumentType == typeof(TableInfo))
-            array = GetTableInfosInScope(args.CatalogueRepository, args.Parent).ToArray(); //explicit cases where selection is constrained somehow
-        else if (argumentType == typeof (ColumnInfo))
+            array = GetTableInfosInScope(args.CatalogueRepository, args.Parent)
+                .ToArray(); //explicit cases where selection is constrained somehow
+        else if (argumentType == typeof(ColumnInfo))
             array = GetColumnInfosInScope(args.CatalogueRepository, args.Parent).ToArray();
-        else if (argumentType == typeof (PreLoadDiscardedColumn))
+        else if (argumentType == typeof(PreLoadDiscardedColumn))
             array = GetAllPreloadDiscardedColumnsInScope(args.CatalogueRepository, args.Parent).ToArray();
-        else if (argumentType == typeof (LoadProgress) && args.Parent is ProcessTask pt)
+        else if (argumentType == typeof(LoadProgress) && args.Parent is ProcessTask pt)
             array = pt.LoadMetadata.LoadProgresses;
         else
-            array = args.CatalogueRepository.GetAllObjects(argumentType).ToArray(); //Default case fetch all the objects of the Type
+            array = args.CatalogueRepository.GetAllObjects(argumentType)
+                .ToArray(); //Default case fetch all the objects of the Type
 
-        return new ArgumentValueComboBoxUI(_activator,array);
+        return new ArgumentValueComboBoxUI(_activator, array);
     }
 
     private static IEnumerable<TableInfo> GetTableInfosInScope(ICatalogueRepository repository, IArgumentHost parent)
     {
-        if(parent is ProcessTask pt)
+        if (parent is ProcessTask pt)
             return pt.GetTableInfos();
 
-        if(parent is LoadMetadata lmd)
+        if (parent is LoadMetadata lmd)
             return lmd.GetDistinctTableInfoList(true);
 
         return repository.GetAllObjects<TableInfo>();
     }
 
-        
-    private static IEnumerable<ColumnInfo> GetColumnInfosInScope(ICatalogueRepository repository,IArgumentHost parent)
+
+    private static IEnumerable<ColumnInfo> GetColumnInfosInScope(ICatalogueRepository repository, IArgumentHost parent)
     {
-        if(parent is ProcessTask || parent is LoadMetadata)
-            return GetTableInfosInScope(repository,parent).SelectMany(ti => ti.ColumnInfos);
-            
+        if (parent is ProcessTask || parent is LoadMetadata)
+            return GetTableInfosInScope(repository, parent).SelectMany(ti => ti.ColumnInfos);
+
         return repository.GetAllObjects<ColumnInfo>();
     }
-        
-    private static IEnumerable<PreLoadDiscardedColumn> GetAllPreloadDiscardedColumnsInScope(ICatalogueRepository repository, IArgumentHost parent)
+
+    private static IEnumerable<PreLoadDiscardedColumn> GetAllPreloadDiscardedColumnsInScope(
+        ICatalogueRepository repository, IArgumentHost parent)
     {
-        if(parent is ProcessTask || parent is LoadMetadata)
+        if (parent is ProcessTask || parent is LoadMetadata)
             return GetTableInfosInScope(repository, parent).SelectMany(t => t.PreLoadDiscardedColumns);
 
         return repository.GetAllObjects<PreLoadDiscardedColumn>();
@@ -169,8 +180,7 @@ private static IEnumerable<PreLoadDiscardedColumn> GetAllPreloadDiscardedColumns
     /// </summary>
     /// <param name="argsType"></param>
     /// <returns></returns>
-    public static bool CanHandleInvalidStringData(Type argsType)
-    {
-        return argsType.IsValueType && !typeof(bool).IsAssignableFrom(argsType)&& !typeof(Enum).IsAssignableFrom(argsType);
-    }
+    public static bool CanHandleInvalidStringData(Type argsType) => argsType.IsValueType &&
+                                                                    !typeof(bool).IsAssignableFrom(argsType) &&
+                                                                    !typeof(Enum).IsAssignableFrom(argsType);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/IArgumentValueUI.cs b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/IArgumentValueUI.cs
index f7d1b9b191..a3b6ae88c7 100644
--- a/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/IArgumentValueUI.cs
+++ b/Rdmp.UI/PipelineUIs/DemandsInitializationUIs/ArgumentValueControls/IArgumentValueUI.cs
@@ -18,5 +18,5 @@ namespace Rdmp.UI.PipelineUIs.DemandsInitializationUIs.ArgumentValueControls;
 /// </summary>
 public interface IArgumentValueUI : IContainerControl
 {
-    void SetUp(IActivateItems activator,ArgumentValueUIArgs args);
+    void SetUp(IActivateItems activator, ArgumentValueUIArgs args);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/ConfigureAndExecutePipelineUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/ConfigureAndExecutePipelineUI.cs
index aa0ec52057..31ded6b857 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/ConfigureAndExecutePipelineUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/ConfigureAndExecutePipelineUI.cs
@@ -69,7 +69,7 @@ public ConfigureAndExecutePipelineUI(DialogArgs args, IPipelineUseCase useCase,
         taskDescriptionLabel1.SetupFor(args);
 
         //designer mode
-        if(useCase == null && activator == null)
+        if (useCase == null && activator == null)
             return;
         Text = args.WindowTitle;
 
@@ -86,7 +86,7 @@ public ConfigureAndExecutePipelineUI(DialogArgs args, IPipelineUseCase useCase,
 
         var context = useCase.GetContext();
 
-        if(context.GetFlowType() != typeof(DataTable))
+        if (context.GetFlowType() != typeof(DataTable))
             throw new NotSupportedException("Only DataTable flow contexts can be used with this class");
 
         foreach (var o in useCase.GetInitializationObjects())
@@ -96,7 +96,7 @@ public ConfigureAndExecutePipelineUI(DialogArgs args, IPipelineUseCase useCase,
             _initializationObjects.Add(o);
         }
 
-        SetPipelineOptions( activator.RepositoryLocator.CatalogueRepository);
+        SetPipelineOptions(activator.RepositoryLocator.CatalogueRepository);
     }
 
     private bool _pipelineOptionsSet = false;
@@ -107,9 +107,10 @@ public ConfigureAndExecutePipelineUI(DialogArgs args, IPipelineUseCase useCase,
     private void SetPipelineOptions(ICatalogueRepository repository)
     {
         if (_pipelineOptionsSet)
-            throw new Exception("CreateDatabase SetPipelineOptions has already been called, it should only be called once per instance lifetime");
+            throw new Exception(
+                "CreateDatabase SetPipelineOptions has already been called, it should only be called once per instance lifetime");
+
 
-            
         _pipelineOptionsSet = true;
 
         _pipelineSelectionUI = new PipelineSelectionUI(Activator, _useCase, repository)
@@ -118,11 +119,11 @@ private void SetPipelineOptions(ICatalogueRepository repository)
         };
         _pipelineSelectionUI.PipelineChanged += _pipelineSelectionUI_PipelineChanged;
         _pipelineSelectionUI.PipelineDeleted += () => pipelineDiagram1.Clear();
-            
+
         _pipelineSelectionUI.CollapseToSingleLineMode();
 
         pPipelineSelection.Controls.Add(_pipelineSelectionUI);
-            
+
         //setup factory
         PipelineFactory = new DataFlowPipelineEngineFactory(_useCase, repository.MEF);
 
@@ -146,7 +147,7 @@ private void RefreshDiagram()
         if (!_pipelineOptionsSet)
             return;
 
-        if(_pipelineSelectionUI.Pipeline != null)
+        if (_pipelineSelectionUI.Pipeline != null)
         {
             btnPreviewSource.Enabled = true;
             btnExecute.Enabled = true;
@@ -172,7 +173,7 @@ private void btnExecute_Click(object sender, EventArgs e)
         //if it is already executing
         if (btnExecute.Text == "Stop")
         {
-            _cancel.Cancel();//set the cancellation token
+            _cancel.Cancel(); //set the cancellation token
             return;
         }
 
@@ -183,7 +184,7 @@ private void btnExecute_Click(object sender, EventArgs e)
         //clear any old results
         progressUI1.Clear();
 
-        PipelineExecutionStarted?.Invoke(this,new PipelineEngineEventArgs(pipeline));
+        PipelineExecutionStarted?.Invoke(this, new PipelineEngineEventArgs(pipeline));
 
         progressUI1.ShowRunning(true);
 
@@ -203,20 +204,14 @@ private void btnExecute_Click(object sender, EventArgs e)
                     fork.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Pipeline execution failed", ex));
                     exception = ex;
                 }
-
             }
-
-
-
         );
 
         t.ContinueWith(x =>
         {
             if (success)
-            {
                 //if it successfully got here then Thread has run the engine to completion successfully
                 PipelineExecutionFinishedsuccessfully?.Invoke(this, new PipelineEngineEventArgs(pipeline));
-            }
 
             progressUI1.ShowRunning(false);
 
@@ -225,10 +220,7 @@ private void btnExecute_Click(object sender, EventArgs e)
             if (success)
             {
                 if (UserSettings.ShowPipelineCompletedPopup)
-                {
                     WideMessageBox.Show("Pipeline Completed", "Pipeline execution completed", WideMessageBoxTheme.Help);
-
-                }
                 progressUI1.SetSuccess();
             }
             else
@@ -237,11 +229,8 @@ private void btnExecute_Click(object sender, EventArgs e)
                 progressUI1.SetFatal();
 
                 if (UserSettings.ShowPipelineCompletedPopup)
-                {
                     ExceptionViewer.Show("Pipeline Failed", exception ?? worst?.Exception);
-                }
             }
-
         }, TaskScheduler.FromCurrentSynchronizationContext());
 
         t.Start();
@@ -251,16 +240,17 @@ private void btnExecute_Click(object sender, EventArgs e)
     private void btnPreviewSource_Click(object sender, EventArgs e)
     {
         var pipeline = CreateAndInitializePipeline();
-            
+
         if (pipeline != null)
             try
             {
-                var dtv = new DataTableViewerUI(((IDataFlowSource<DataTable>) pipeline.SourceObject).TryGetPreview(),"Preview");
+                var dtv = new DataTableViewerUI(((IDataFlowSource<DataTable>)pipeline.SourceObject).TryGetPreview(),
+                    "Preview");
                 SingleControlForm.ShowDialog(dtv);
             }
             catch (Exception exception)
             {
-                ExceptionViewer.Show("Preview Generation Failed",exception);
+                ExceptionViewer.Show("Preview Generation Failed", exception);
             }
     }
 
@@ -275,7 +265,8 @@ private IDataFlowPipelineEngine CreateAndInitializePipeline()
         }
         catch (Exception exception)
         {
-            fork.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Could not instantiate pipeline", exception));
+            fork.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Could not instantiate pipeline", exception));
             return null;
         }
 
@@ -286,7 +277,8 @@ private IDataFlowPipelineEngine CreateAndInitializePipeline()
         }
         catch (Exception exception)
         {
-            fork.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error, "Failed to Initialize pipeline", exception));
+            fork.OnNotify(this,
+                new NotifyEventArgs(ProgressEventType.Error, "Failed to Initialize pipeline", exception));
             return null;
         }
 
@@ -295,26 +287,25 @@ private IDataFlowPipelineEngine CreateAndInitializePipeline()
 
     private void tabControl2_SelectedIndexChanged(object sender, EventArgs e)
     {
-
     }
 
     private void tpConfigure_Click(object sender, EventArgs e)
     {
-
     }
 
     public void CancelIfRunning()
     {
-        if(_cancel != null && !_cancel.IsCancellationRequested)
+        if (_cancel != null && !_cancel.IsCancellationRequested)
             _cancel.Cancel();
     }
 
     public void SetAdditionalProgressListener(IDataLoadEventListener listener)
     {
-        fork = new ForkDataLoadEventListener(progressUI1,listener);
+        fork = new ForkDataLoadEventListener(progressUI1, listener);
     }
 
-    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         Activator.ShowDialog(new SingleControlForm(this));
         return 0;
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/ConfigurePipelineUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/ConfigurePipelineUI.cs
index 4f2208c4d0..e3830ef8be 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/ConfigurePipelineUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/ConfigurePipelineUI.cs
@@ -19,27 +19,28 @@ namespace Rdmp.UI.PipelineUIs.Pipelines;
 /// are trying to build a pipeline to import a FlatFileToLoad into your database then you might use a DelimitedFlatFileDataFlowSource component to read the file (assuming it wasn't fixed 
 /// width or a database file or anything wierd) and a DataTableUploadDestination to put it into the endpoint.  
 /// </summary>
-public partial class ConfigurePipelineUI : Form 
+public partial class ConfigurePipelineUI : Form
 {
     private readonly IPipeline _pipeline;
     private readonly IPipelineUseCase _useCase;
-        
+
     private PipelineWorkAreaUI _workArea;
-        
-    public ConfigurePipelineUI(IActivateItems activator,IPipeline pipeline, IPipelineUseCase useCase, ICatalogueRepository repository)
+
+    public ConfigurePipelineUI(IActivateItems activator, IPipeline pipeline, IPipelineUseCase useCase,
+        ICatalogueRepository repository)
     {
         _pipeline = pipeline;
         _useCase = useCase;
         InitializeComponent();
-            
-        _workArea = new PipelineWorkAreaUI(activator,pipeline, useCase,repository) {Dock = DockStyle.Fill};
+
+        _workArea = new PipelineWorkAreaUI(activator, pipeline, useCase, repository) { Dock = DockStyle.Fill };
         panelWorkArea.Controls.Add(_workArea);
 
         tbName.Text = pipeline.Name;
         tbDescription.Text = pipeline.Description;
 
         RefreshUIFromDatabase();
-         
+
         KeyPreview = true;
     }
 
@@ -54,7 +55,7 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         return base.ProcessCmdKey(ref msg, keyData);
     }
 
-  
+
     private void RefreshUIFromDatabase()
     {
         _workArea.SetTo(_pipeline, _useCase);
@@ -81,7 +82,7 @@ private void tbName_TextChanged(object sender, EventArgs e)
             tbName.ForeColor = Color.Red;
         }
     }
-        
+
     private void tbDescription_TextChanged(object sender, EventArgs e)
     {
         _pipeline.Description = tbDescription.Text;
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/IPipelineSelectionUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/IPipelineSelectionUI.cs
index 1c70487c88..e1cdca909b 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/IPipelineSelectionUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/IPipelineSelectionUI.cs
@@ -22,6 +22,6 @@ public interface IPipelineSelectionUI
 {
     event EventHandler PipelineChanged;
     IPipeline Pipeline { get; set; }
-        
+
     void CollapseToSingleLineMode();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/Models/DividerLineControl.cs b/Rdmp.UI/PipelineUIs/Pipelines/Models/DividerLineControl.cs
index 8657e638a0..a114855747 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/Models/DividerLineControl.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/Models/DividerLineControl.cs
@@ -37,12 +37,11 @@ protected override void OnPaintBackground(PaintEventArgs e)
     {
         base.OnPaintBackground(e);
 
-        e.Graphics.DrawRectangle(_pen, 2,2,Width -4,Height -4);
+        e.Graphics.DrawRectangle(_pen, 2, 2, Width - 4, Height - 4);
     }
 
     private void DividerLineControl_DragOver(object sender, DragEventArgs e)
     {
-            
     }
 
     private void DividerLineControl_DragLeave(object sender, EventArgs e)
@@ -63,5 +62,4 @@ private void DividerLineControl_DragEnter(object sender, DragEventArgs e)
 
         e.Effect = shouldAllow;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs
index 5eb8b3ddc4..1cb1caa97f 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineDiagramUI.cs
@@ -24,7 +24,7 @@
 namespace Rdmp.UI.PipelineUIs.Pipelines;
 
 public delegate void PipelineComponentSelectedHandler(object sender, IPipelineComponent selected);
-    
+
 /// <summary>
 /// Used to visualise an IPipeline (See ConfigurePipelineUI and ConfigureAndExecutePipelineUI for what these are).  This control has a readonly/editable setting on it.  In dialogs where
 /// you are selecting an IPipeline you will see the diagram rendered readonly.  If you are editting  (See PipelineWorkAreaUI and ConfigurePipelineUI) then you will be able to select
@@ -33,12 +33,12 @@ namespace Rdmp.UI.PipelineUIs.Pipelines;
 public partial class PipelineDiagramUI : UserControl
 {
     private IPipeline _pipeline;
-        
+
     public bool AllowSelection { get; set; }
     public bool AllowReOrdering { get; set; }
 
     private RAGSmiley pipelineSmiley = new();
-        
+
     public IPipelineComponent SelectedComponent;
     public event PipelineComponentSelectedHandler SelectedComponentChanged;
 
@@ -56,12 +56,12 @@ public PipelineDiagramUI(IActivateItems activator)
         AllowSelection = false;
 
         Controls.Add(pipelineSmiley);
-        pipelineSmiley.Anchor = AnchorStyles.Top|AnchorStyles.Right;
+        pipelineSmiley.Anchor = AnchorStyles.Top | AnchorStyles.Right;
         pipelineSmiley.Left = Width - pipelineSmiley.Width - 1;
         pipelineSmiley.Top = 1;
         pipelineSmiley.BringToFront();
 
-        _deleteSelectedMenuItem = new ToolStripMenuItem("Delete selected component",null, DeleteSelectedComponent)
+        _deleteSelectedMenuItem = new ToolStripMenuItem("Delete selected component", null, DeleteSelectedComponent)
         {
             ShortcutKeys = Keys.Delete,
             Enabled = false
@@ -74,8 +74,8 @@ public PipelineDiagramUI(IActivateItems activator)
     private void DeleteSelectedComponent(object sender, EventArgs e)
     {
         if (SelectedComponent != null)
-        {
-            if(MessageBox.Show($"Do you want to delete {SelectedComponent.Class}?","Confirm Delete",MessageBoxButtons.YesNo) == DialogResult.Yes)
+            if (MessageBox.Show($"Do you want to delete {SelectedComponent.Class}?", "Confirm Delete",
+                    MessageBoxButtons.YesNo) == DialogResult.Yes)
             {
                 //if they are deleting the destination
                 if (SelectedComponent.ID == _pipeline.DestinationPipelineComponent_ID)
@@ -97,22 +97,21 @@ private void DeleteSelectedComponent(object sender, EventArgs e)
                 SelectedComponent = null;
                 _deleteSelectedMenuItem.Enabled = false;
             }
-        }
     }
 
 
     public void RefreshUIFromDatabase()
     {
-        SetTo(_pipeline,_useCase);
+        SetTo(_pipeline, _useCase);
     }
 
 
     public void Clear()
     {
         _pipeline = null;
-        if (_useCase == null)//it is already cleared?
+        if (_useCase == null) //it is already cleared?
             return;
-        SetTo(null,_useCase);
+        SetTo(null, _useCase);
     }
 
     public void SetTo(IPipeline pipeline, IPipelineUseCase useCase)
@@ -124,17 +123,17 @@ public void SetTo(IPipeline pipeline, IPipelineUseCase useCase)
 
         //clear the diagram
         flpPipelineDiagram.Controls.Clear();
-            
+
         pipelineSmiley.Reset();
-            
+
         pInitializationObjects.Controls.Clear();
 
         var factory = new AtomicCommandUIFactory(_activator);
-            
-        foreach(var o in _useCase.GetInitializationObjects().Reverse())
+
+        foreach (var o in _useCase.GetInitializationObjects().Reverse())
         {
             var b = factory.CreateButton(new ExecuteCommandDescribe(_activator, o));
-            pInitializationObjects.Controls.Add(b);                    
+            pInitializationObjects.Controls.Add(b);
         }
 
         try
@@ -147,54 +146,62 @@ public void SetTo(IPipeline pipeline, IPipelineUseCase useCase)
                     _pipelineFactory = new DataFlowPipelineEngineFactory(_useCase, _pipeline);
 
                     //create it
-                    var pipelineInstance = _pipelineFactory.Create(pipeline, new ThrowImmediatelyDataLoadEventListener());
-                    
+                    var pipelineInstance =
+                        _pipelineFactory.Create(pipeline, new ThrowImmediatelyDataLoadEventListener());
+
                     //initialize it (unless it is design time)
-                    if(!_useCase.IsDesignTime)
+                    if (!_useCase.IsDesignTime)
                         pipelineInstance.Initialize(_useCase.GetInitializationObjects().ToArray());
-                        
                 }
                 catch (Exception ex)
                 {
                     pipelineSmiley.Fatal(ex);
                 }
-                
+
                 //There is a pipeline set but we might have been unable to fully realize it so setup stuff based on PipelineComponents
-                
+
                 //was there an explicit instance?
                 if (_useCase.ExplicitSource != null)
-                    AddExplicit(_useCase.ExplicitSource);//if so add it
-                else 
+                    AddExplicit(_useCase.ExplicitSource); //if so add it
+                else
                     //there wasn't an explicit one so there was a PipelineComponent maybe? albiet one that might be broken?
                 if (pipeline.SourcePipelineComponent_ID != null)
-                    AddPipelineComponent((int) pipeline.SourcePipelineComponent_ID, PipelineComponentRole.Source, pipeline.Repository);//add the possibly broken PipelineComponent to the diagram
+                    AddPipelineComponent((int)pipeline.SourcePipelineComponent_ID, PipelineComponentRole.Source,
+                        pipeline.Repository); //add the possibly broken PipelineComponent to the diagram
                 else
-                    AddBlankComponent(PipelineComponentRole.Source);//the user hasn't put one in yet 
+                    AddBlankComponent(PipelineComponentRole.Source); //the user hasn't put one in yet 
+
 
+                foreach (var middleComponent in pipeline.PipelineComponents.Where(c =>
+                             c.ID != pipeline.SourcePipelineComponent_ID &&
+                             c.ID != pipeline.DestinationPipelineComponent_ID).OrderBy(comp => comp.Order))
+                    AddPipelineComponent(middleComponent,
+                        PipelineComponentRole.Middle); //add the possibly broken PipelineComponent to the diagram
 
-                foreach (var middleComponent in pipeline.PipelineComponents.Where( c=>c.ID!= pipeline.SourcePipelineComponent_ID && c.ID != pipeline.DestinationPipelineComponent_ID).OrderBy(comp=>comp.Order))
-                    AddPipelineComponent(middleComponent, PipelineComponentRole.Middle);//add the possibly broken PipelineComponent to the diagram
-               
                 //was there an explicit instance?
                 if (_useCase.ExplicitDestination != null)
                 {
                     AddDividerIfReorderingAvailable();
-                    AddExplicit(_useCase.ExplicitDestination);//if so add it
+                    AddExplicit(_useCase.ExplicitDestination); //if so add it
                 }
                 else
                     //there wasn't an explicit one so there was a PipelineComponent maybe? albiet one that might be broken?
                 if (pipeline.DestinationPipelineComponent_ID != null)
-                    AddPipelineComponent((int)pipeline.DestinationPipelineComponent_ID, PipelineComponentRole.Destination, pipeline.Repository);//add the possibly broken PipelineComponent to the diagram
+                {
+                    AddPipelineComponent((int)pipeline.DestinationPipelineComponent_ID,
+                        PipelineComponentRole.Destination,
+                        pipeline.Repository); //add the possibly broken PipelineComponent to the diagram
+                }
                 else
                 {
                     AddDividerIfReorderingAvailable();
-                    AddBlankComponent(PipelineComponentRole.Destination);//the user hasn't put one in yet 
+                    AddBlankComponent(PipelineComponentRole.Destination); //the user hasn't put one in yet 
                 }
 
 
                 return;
             }
-            
+
 
             //Fallback 
             //user has not picked a pipeline yet, show him the shell (factory)
@@ -232,9 +239,10 @@ private void AddPipelineComponent(IPipelineComponent toRealize, PipelineComponen
             AddDividerIfReorderingAvailable();
 
         //create the visualization
-        var component = new PipelineComponentVisualisation(toRealize, role, value, exConstruction, component_shouldAllowDrop);
+        var component =
+            new PipelineComponentVisualisation(toRealize, role, value, exConstruction, component_shouldAllowDrop);
         component.DragDrop += component_DragDrop;
-        flpPipelineDiagram.Controls.Add(component);//add the component
+        flpPipelineDiagram.Controls.Add(component); //add the component
 
         //try to initialize the realization (we do this after creating visualization so that when the events come in we can record where on UI the consumption events happen and also because later on it might be that initialization takes ages and we want to use a Thread)
         if (value != null)
@@ -242,7 +250,8 @@ private void AddPipelineComponent(IPipelineComponent toRealize, PipelineComponen
             {
                 if (!_useCase.IsDesignTime)
                 {
-                    _useCase.GetContext().PreInitializeGeneric(new ThrowImmediatelyDataLoadEventListener(), value, _useCase.GetInitializationObjects().ToArray());
+                    _useCase.GetContext().PreInitializeGeneric(new ThrowImmediatelyDataLoadEventListener(), value,
+                        _useCase.GetInitializationObjects().ToArray());
                     component.Check();
                 }
 
@@ -261,15 +270,15 @@ private void AddPipelineComponent(IPipelineComponent toRealize, PipelineComponen
             component.AllowSelection = true;
             component.ComponentSelected += component_Selected;
         }
-                
+
 
         //PipelineComponents can never be locked because they are user setup things
         component.IsLocked = false;
     }
-        
+
     private void AddDividerIfReorderingAvailable()
     {
-        if(!AllowReOrdering)
+        if (!AllowReOrdering)
             return;
 
         var divider = new DividerLineControl(dividerLine_shouldAllowDrop);
@@ -283,15 +292,15 @@ private void component_Selected(object sender, IPipelineComponent selected)
             return;
 
         SelectedComponent = selected;
-            
+
         //update the Del menu item
         _deleteSelectedMenuItem.Enabled = SelectedComponent != null;
-            
+
         //clear old selections
         foreach (var componentVisualisation in flpPipelineDiagram.Controls.OfType<PipelineComponentVisualisation>())
             componentVisualisation.IsSelected = false;
 
-        ((PipelineComponentVisualisation) sender).IsSelected = true;
+        ((PipelineComponentVisualisation)sender).IsSelected = true;
         SelectedComponentChanged?.Invoke(this, selected);
 
         Focus();
@@ -299,24 +308,24 @@ private void component_Selected(object sender, IPipelineComponent selected)
 
     private void AddExplicit(object value)
     {
-
         var role = PipelineComponent.GetRoleFor(value.GetType());
 
-        var component = new DataFlowComponentVisualisation(role,value,null);
-        flpPipelineDiagram.Controls.Add(component);//add the explicit component
+        var component = new DataFlowComponentVisualisation(role, value, null);
+        flpPipelineDiagram.Controls.Add(component); //add the explicit component
         component.IsLocked = true;
         try
         {
             if (!_useCase.IsDesignTime)
-                _useCase.GetContext().PreInitializeGeneric(new ThrowImmediatelyDataLoadEventListener(), component.Value, _useCase.GetInitializationObjects().ToArray());
+                _useCase.GetContext().PreInitializeGeneric(new ThrowImmediatelyDataLoadEventListener(), component.Value,
+                    _useCase.GetInitializationObjects().ToArray());
         }
         catch (Exception e)
         {
             ExceptionViewer.Show(
-                $"PreInitialize failed on Explicit (locked component) {component.Value.GetType().Name}",e);
+                $"PreInitialize failed on Explicit (locked component) {component.Value.GetType().Name}", e);
         }
     }
-        
+
     private void AddBlankComponent(PipelineComponentRole role)
     {
         var toAdd = new DataFlowComponentVisualisation(role, null, component_shouldAllowDrop);
@@ -324,12 +333,12 @@ private void AddBlankComponent(PipelineComponentRole role)
         flpPipelineDiagram.Controls.Add(toAdd);
     }
 
-    private DragDropEffects component_shouldAllowDrop(DragEventArgs arg,DataFlowComponentVisualisation sender)
+    private DragDropEffects component_shouldAllowDrop(DragEventArgs arg, DataFlowComponentVisualisation sender)
     {
         var obj = GetAdvertisedObjectFromDragOperation(arg);
-            
+
         //if they are dragging a new component
-        if(obj != null)
+        if (obj != null)
             //of the correct role and the source/destination is empty
             if (sender.Value == null && obj.GetRole() == sender.GetRole())
                 return DragDropEffects.Move;
@@ -350,7 +359,7 @@ private DragDropEffects dividerLine_shouldAllowDrop(DragEventArgs arg)
         //if they are dropping a new component
         if (GetAdvertisedObjectFromDragOperation(arg) != null)
             return DragDropEffects.Copy;
-            
+
         //if its something else entirely
         if (!arg.Data.GetDataPresent(typeof(PipelineComponentVisualisation)))
             return DragDropEffects.None;
@@ -361,7 +370,7 @@ private DragDropEffects dividerLine_shouldAllowDrop(DragEventArgs arg)
         //only middle components can be reordered
         if (vis.GetRole() == PipelineComponentRole.Middle)
             return DragDropEffects.Move;
-            
+
         return DragDropEffects.None;
     }
 
@@ -371,23 +380,25 @@ private void divider_DragDrop(object sender, DragEventArgs e)
         var divider = (DividerLineControl)sender;
 
         if (GetAdvertisedObjectFromDragOperation(e) != null)
-            AddAdvertisedComponent(e,divider);
+        {
+            AddAdvertisedComponent(e, divider);
+        }
         else
         {
             var forReorder = (PipelineComponentVisualisation)e.Data.GetData(typeof(PipelineComponentVisualisation));
-            HandleReorder(forReorder,divider);
+            HandleReorder(forReorder, divider);
         }
 
         RefreshUIFromDatabase();
     }
-        
+
     private void HandleReorder(PipelineComponentVisualisation forReorder, DividerLineControl divider)
     {
-        forReorder.PipelineComponent.Order =  GetOrderMakingSpaceIfNessesary(forReorder,divider);
+        forReorder.PipelineComponent.Order = GetOrderMakingSpaceIfNessesary(forReorder, divider);
         forReorder.PipelineComponent.SaveToDatabase();
     }
 
-    private void AddAdvertisedComponent(DragEventArgs e,DividerLineControl divider)
+    private void AddAdvertisedComponent(DragEventArgs e, DividerLineControl divider)
     {
         var advert = GetAdvertisedObjectFromDragOperation(e);
 
@@ -420,11 +431,11 @@ private void AddAdvertisedComponent(DragEventArgs e,DividerLineControl divider)
             Order = GetOrderMakingSpaceIfNessesary(null, divider)
         };
 
-           
+
         newcomp.CreateArgumentsForClassIfNotExists(underlyingComponentType);
-          
+
         newcomp.SaveToDatabase();
-            
+
         if (advert.GetRole() == PipelineComponentRole.Source)
         {
             _pipeline.SourcePipelineComponent_ID = newcomp.ID;
@@ -435,18 +446,20 @@ private void AddAdvertisedComponent(DragEventArgs e,DividerLineControl divider)
         {
             _pipeline.DestinationPipelineComponent_ID = newcomp.ID;
             _pipeline.SaveToDatabase();
-        } 
+        }
 
         RefreshUIFromDatabase();
 
 
-        var viz = flpPipelineDiagram.Controls.OfType<PipelineComponentVisualisation>().Single(v => Equals(v.PipelineComponent, newcomp));
+        var viz = flpPipelineDiagram.Controls.OfType<PipelineComponentVisualisation>()
+            .Single(v => Equals(v.PipelineComponent, newcomp));
 
         component_Selected(viz, newcomp);
     }
 
 
-    private int GetOrderMakingSpaceIfNessesary(PipelineComponentVisualisation beingReorderedIfAny, DividerLineControl divider)
+    private int GetOrderMakingSpaceIfNessesary(PipelineComponentVisualisation beingReorderedIfAny,
+        DividerLineControl divider)
     {
         var newOrder = 0;
         var toReturn = 0;
@@ -474,7 +487,7 @@ private int GetOrderMakingSpaceIfNessesary(PipelineComponentVisualisation beingR
             {
                 //found divider  so mark this as the insertion order point
                 toReturn = newOrder;
-                newOrder++;   
+                newOrder++;
             }
         }
 
@@ -491,6 +504,7 @@ private static AdvertisedPipelineComponentTypeUnderContext GetAdvertisedObjectFr
 
             return null;
         }
+
         return null;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs
index 64a316c738..c288420c32 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineSelectionUI.cs
@@ -32,6 +32,7 @@ public partial class PipelineSelectionUI : UserControl, IPipelineSelectionUI
     private ToolTip tt = new();
     private const string ShowAll = "Show All/Incompatible Pipelines";
     public bool showAll = false;
+
     public IPipeline Pipeline
     {
         get => _pipeline;
@@ -60,7 +61,7 @@ private void RefreshPipelineList()
         var context = _useCase.GetContext();
 
         //add pipelines sorted alphabetically
-        var allPipelines = _repository.GetAllObjects<Pipeline>().OrderBy(p=>p.Name).ToArray();
+        var allPipelines = _repository.GetAllObjects<Pipeline>().OrderBy(p => p.Name).ToArray();
 
         ddPipelines.Items.Add("<<None>>");
 
@@ -85,11 +86,11 @@ private void RefreshPipelineList()
 
         //if there is only one pipeline select it
         ddPipelines.SelectedItem = ddPipelines.Items.OfType<Pipeline>().Count() == 1
-            ? (object) ddPipelines.Items.OfType<Pipeline>().Single()
+            ? (object)ddPipelines.Items.OfType<Pipeline>().Single()
             : "<<None>>";
     }
 
-    public PipelineSelectionUI(IActivateItems activator,IPipelineUseCase useCase, ICatalogueRepository repository)
+    public PipelineSelectionUI(IActivateItems activator, IPipelineUseCase useCase, ICatalogueRepository repository)
     {
         _activator = activator;
         _useCase = useCase;
@@ -101,12 +102,11 @@ public PipelineSelectionUI(IActivateItems activator,IPipelineUseCase useCase, IC
 
         RefreshPipelineList();
 
-        tt.SetToolTip(btnClonePipeline,"Create a new copy of the selected pipeline");
+        tt.SetToolTip(btnClonePipeline, "Create a new copy of the selected pipeline");
         tt.SetToolTip(btnEditPipeline, "Change which components are run in the Pipeline and with what settings");
 
         ddPipelines.DrawMode = DrawMode.OwnerDrawFixed;
         ddPipelines.DrawItem += new DrawItemEventHandler(cmb_Type_DrawItem);
-
     }
 
     private void cmb_Type_DrawItem(object sender, DrawItemEventArgs e)
@@ -118,7 +118,9 @@ private void cmb_Type_DrawItem(object sender, DrawItemEventArgs e)
         if (e.Index == -1)
         {
             e.Graphics.FillRectangle(new SolidBrush(Color.Pink), e.Bounds);
-            TextRenderer.DrawText(e.Graphics, "Select Pipeline", italic, new Rectangle(new Point(e.Bounds.Left, e.Bounds.Top + 1), e.Bounds.Size), Color.Black, TextFormatFlags.Left);
+            TextRenderer.DrawText(e.Graphics, "Select Pipeline", italic,
+                new Rectangle(new Point(e.Bounds.Left, e.Bounds.Top + 1), e.Bounds.Size), Color.Black,
+                TextFormatFlags.Left);
             return;
         }
 
@@ -126,33 +128,34 @@ private void cmb_Type_DrawItem(object sender, DrawItemEventArgs e)
         var isIncompatible = e.Index > ddPipelines.Items.IndexOf(ShowAll);
 
 
-        if (Equals(ddPipelines.Items[e.Index],ShowAll))
+        if (Equals(ddPipelines.Items[e.Index], ShowAll))
         {
             // draw a line along the top
-            e.Graphics.DrawLine(Pens.CornflowerBlue, new Point(e.Bounds.Left, e.Bounds.Top + 1), new Point(e.Bounds.Right, e.Bounds.Top + 1));
+            e.Graphics.DrawLine(Pens.CornflowerBlue, new Point(e.Bounds.Left, e.Bounds.Top + 1),
+                new Point(e.Bounds.Right, e.Bounds.Top + 1));
 
-            if(showAll)
-            {
-                render = $"\u2713 {render}";
-            }
+            if (showAll) render = $"\u2713 {render}";
 
-            TextRenderer.DrawText(e.Graphics, render, italic , new Rectangle(new Point(e.Bounds.Left, e.Bounds.Top + 1), e.Bounds.Size), Color.CornflowerBlue, TextFormatFlags.Left);
+            TextRenderer.DrawText(e.Graphics, render, italic,
+                new Rectangle(new Point(e.Bounds.Left, e.Bounds.Top + 1), e.Bounds.Size), Color.CornflowerBlue,
+                TextFormatFlags.Left);
         }
         else
         {
-            TextRenderer.DrawText(e.Graphics, render, isIncompatible ? italic : ddPipelines.Font, e.Bounds, ddPipelines.ForeColor, TextFormatFlags.Left);
+            TextRenderer.DrawText(e.Graphics, render, isIncompatible ? italic : ddPipelines.Font, e.Bounds,
+                ddPipelines.ForeColor, TextFormatFlags.Left);
         }
 
         e.DrawFocusRectangle();
     }
+
     private void groupBox1_Enter(object sender, EventArgs e)
     {
-
     }
 
     private void ddPipelines_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(Equals(ddPipelines.SelectedItem , ShowAll))
+        if (Equals(ddPipelines.SelectedItem, ShowAll))
         {
             // toggle show all
             showAll = !showAll;
@@ -170,12 +173,11 @@ private void ddPipelines_SelectedIndexChanged(object sender, EventArgs e)
         btnDeletePipeline.Enabled = Pipeline != null;
         btnClonePipeline.Enabled = Pipeline != null;
 
-        if(!Equals(_previousSelection,Pipeline))
+        if (!Equals(_previousSelection, Pipeline))
         {
-            PipelineChanged?.Invoke(this,EventArgs.Empty);
+            PipelineChanged?.Invoke(this, EventArgs.Empty);
             _previousSelection = Pipeline;
         }
-
     }
 
     private void btnEditPipeline_Click(object sender, EventArgs e)
@@ -195,7 +197,7 @@ private void btnCreateNewPipeline_Click(object sender, EventArgs e)
     private void ShowEditPipelineDialog()
     {
         //create pipeline UI with NO explicit destination/source (both must be configured within the extraction context by the user)
-        var dialog = new ConfigurePipelineUI(_activator,Pipeline,_useCase, _repository);
+        var dialog = new ConfigurePipelineUI(_activator, Pipeline, _useCase, _repository);
         dialog.ShowDialog();
 
         ddPipelines.Items.Remove(Pipeline);
@@ -210,7 +212,8 @@ private void ShowEditPipelineDialog()
 
     private void btnDeletePipeline_Click(object sender, EventArgs e)
     {
-        if(MessageBox.Show($"Are you sure you want to delete {Pipeline.Name}? ","Confirm deleting pipeline?",MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
+        if (MessageBox.Show($"Are you sure you want to delete {Pipeline.Name}? ", "Confirm deleting pipeline?",
+                MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
         {
             Pipeline.DeleteInDatabase();
             Pipeline = null;
@@ -246,7 +249,8 @@ public void CollapseToSingleLineMode()
         ddPipelines.Location = new Point(0, 3);
         ddPipelines.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
 
-        foreach (var button in new Control[] { btnEditPipeline, btnCreateNewPipeline, btnClonePipeline, btnDeletePipeline })
+        foreach (var button in new Control[]
+                     { btnEditPipeline, btnCreateNewPipeline, btnClonePipeline, btnDeletePipeline })
         {
             Controls.Add(button);
             button.Location = new Point(2, 2);
@@ -259,6 +263,5 @@ public void CollapseToSingleLineMode()
         btnEditPipeline.Left = btnCreateNewPipeline.Left - btnEditPipeline.Width;
 
         ddPipelines.Width = btnEditPipeline.Left - 2;
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.cs b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.cs
index 6ed138b688..cf44cd33ed 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/PipelineWorkAreaUI.cs
@@ -17,8 +17,6 @@
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.PipelineUIs.DemandsInitializationUIs;
 using Rdmp.UI.SimpleDialogs;
-
-
 using WideMessageBox = Rdmp.UI.SimpleDialogs.WideMessageBox;
 
 namespace Rdmp.UI.PipelineUIs.Pipelines;
@@ -39,7 +37,8 @@ public partial class PipelineWorkAreaUI : UserControl
     private readonly ICatalogueRepository _catalogueRepository;
 
 
-    public PipelineWorkAreaUI(IActivateItems activator,IPipeline pipeline, IPipelineUseCase useCase, ICatalogueRepository catalogueRepository)
+    public PipelineWorkAreaUI(IActivateItems activator, IPipeline pipeline, IPipelineUseCase useCase,
+        ICatalogueRepository catalogueRepository)
     {
         _activator = activator;
         _pipeline = pipeline;
@@ -47,7 +46,7 @@ public PipelineWorkAreaUI(IActivateItems activator,IPipeline pipeline, IPipeline
         _catalogueRepository = catalogueRepository;
 
         InitializeComponent();
-            
+
         olvComponents.BuildGroups(olvRole, SortOrder.Ascending);
         olvComponents.AlwaysGroupByColumn = olvRole;
         olvComponents.FullRowSelect = true;
@@ -67,35 +66,44 @@ public PipelineWorkAreaUI(IActivateItems activator,IPipeline pipeline, IPipeline
         };
         gbArguments.Controls.Add(_arumentsCollection1);
 
-        olvComponents.RowFormatter+= RowFormatter;
+        olvComponents.RowFormatter += RowFormatter;
         var context = _useCase.GetContext();
 
         try
         {
             //middle and destination components
-            var allComponentTypes = _catalogueRepository.MEF.GetGenericTypes(typeof (IDataFlowComponent<>),context.GetFlowType());
+            var allComponentTypes =
+                _catalogueRepository.MEF.GetGenericTypes(typeof(IDataFlowComponent<>), context.GetFlowType());
 
             //source components (list of all types with MEF exports of )
-            var allSourceTypes = _catalogueRepository.MEF.GetGenericTypes(typeof(IDataFlowSource<>), context.GetFlowType());
+            var allSourceTypes =
+                _catalogueRepository.MEF.GetGenericTypes(typeof(IDataFlowSource<>), context.GetFlowType());
 
             _allComponents = new List<AdvertisedPipelineComponentTypeUnderContext>();
 
-            _allComponents.AddRange(allComponentTypes.Select(t => new AdvertisedPipelineComponentTypeUnderContext(t, _useCase)).ToArray());
-            _allComponents.AddRange(allSourceTypes.Select(t => new AdvertisedPipelineComponentTypeUnderContext(t, useCase)).ToArray());
+            _allComponents.AddRange(allComponentTypes
+                .Select(t => new AdvertisedPipelineComponentTypeUnderContext(t, _useCase)).ToArray());
+            _allComponents.AddRange(allSourceTypes
+                .Select(t => new AdvertisedPipelineComponentTypeUnderContext(t, useCase)).ToArray());
 
             RefreshComponentList();
         }
         catch (Exception exception)
         {
-            ExceptionViewer.Show("Failed to get list of supported MEF components that could be added to the pipeline ", exception);
+            ExceptionViewer.Show("Failed to get list of supported MEF components that could be added to the pipeline ",
+                exception);
         }
 
         gbArguments.Enabled = false;
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvCompatible, new Guid("1b8737cb-75d6-401b-b8a2-441e3e4322ac"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvNamespace, new Guid("35c0497e-3c04-46be-a6d6-eb02111aadb3"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvRole, new Guid("fb1205f3-049e-4fe3-89c5-d07b55fa2e17"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvName, new Guid("b7e797e8-ef6a-45d9-b51d-c2f12dbacead"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvCompatible,
+            new Guid("1b8737cb-75d6-401b-b8a2-441e3e4322ac"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvNamespace,
+            new Guid("35c0497e-3c04-46be-a6d6-eb02111aadb3"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvRole,
+            new Guid("fb1205f3-049e-4fe3-89c5-d07b55fa2e17"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvComponents, olvName,
+            new Guid("b7e797e8-ef6a-45d9-b51d-c2f12dbacead"));
     }
 
     /// <summary>
@@ -113,7 +121,7 @@ private void _pipelineDiagram_SelectedComponentChanged(object sender, IPipelineC
         gbArguments.Enabled = true;
 
         if (selected == null)
-            _arumentsCollection1.Setup(_activator, null, null,_catalogueRepository);
+            _arumentsCollection1.Setup(_activator, null, null, _catalogueRepository);
         else
             _arumentsCollection1.Setup(_activator, selected, selected.GetClassAsSystemType(), _catalogueRepository);
     }
@@ -126,9 +134,9 @@ private void RowFormatter(OLVListItem olvItem)
             olvItem.ForeColor = Color.Red;
     }
 
-    public void SetTo(IPipeline pipeline,IPipelineUseCase useCase)
+    public void SetTo(IPipeline pipeline, IPipelineUseCase useCase)
     {
-        _pipelineDiagram.SetTo(pipeline,useCase);
+        _pipelineDiagram.SetTo(pipeline, useCase);
     }
 
 
@@ -137,17 +145,16 @@ private void olvComponents_CellRightClick(object sender, CellRightClickEventArgs
         var model = (AdvertisedPipelineComponentTypeUnderContext)e.Model;
 
         var RightClickMenu = new ContextMenuStrip();
-            
+
         if (model != null)
-        {
-            if(!model.IsCompatible())
-                RightClickMenu.Items.Add("Component incompatible",null, (s,v) => WideMessageBox.Show(model.ToString(),model.GetReasonIncompatible(),WideMessageBoxTheme.Help));
-        }
+            if (!model.IsCompatible())
+                RightClickMenu.Items.Add("Component incompatible", null,
+                    (s, v) => WideMessageBox.Show(model.ToString(), model.GetReasonIncompatible(),
+                        WideMessageBoxTheme.Help));
 
         //show it
-        if(RightClickMenu.Items.Count != 0)
+        if (RightClickMenu.Items.Count != 0)
             RightClickMenu.Show(this, e.Location);
-
     }
 
     private void btnReRunChecks_Click(object sender, EventArgs e)
@@ -157,7 +164,8 @@ private void btnReRunChecks_Click(object sender, EventArgs e)
 
     private void tbSearchComponents_TextChanged(object sender, EventArgs e)
     {
-        olvComponents.ModelFilter = new TextMatchFilter(olvComponents, tbSearchComponents.Text, StringComparison.CurrentCultureIgnoreCase);
+        olvComponents.ModelFilter = new TextMatchFilter(olvComponents, tbSearchComponents.Text,
+            StringComparison.CurrentCultureIgnoreCase);
         olvComponents.UseFiltering = !string.IsNullOrWhiteSpace(tbSearchComponents.Text);
     }
 
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PipelineSelectionUIFactory.cs b/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PipelineSelectionUIFactory.cs
index 7755fa31c4..76fb157986 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PipelineSelectionUIFactory.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PipelineSelectionUIFactory.cs
@@ -32,7 +32,8 @@ public PipelineSelectionUIFactory(ICatalogueRepository repository, IPipelineUser
         _useCase = useCase;
     }
 
-    public PipelineSelectionUIFactory(ICatalogueRepository repository, RequiredPropertyInfo requirement, ArgumentValueUIArgs args, object demanderInstance)
+    public PipelineSelectionUIFactory(ICatalogueRepository repository, RequiredPropertyInfo requirement,
+        ArgumentValueUIArgs args, object demanderInstance)
     {
         _repository = repository;
 
@@ -41,16 +42,17 @@ public PipelineSelectionUIFactory(ICatalogueRepository repository, RequiredPrope
         _useCase = pluginUserAndCase;
     }
 
-    public IPipelineSelectionUI Create(IActivateItems activator,string text = null, DockStyle dock = DockStyle.None, Control containerControl = null)
+    public IPipelineSelectionUI Create(IActivateItems activator, string text = null, DockStyle dock = DockStyle.None,
+        Control containerControl = null)
     {
         //setup getter as an event handler for the selection ui
-        _pipelineSelectionUIInstance = new PipelineSelectionUI(activator, _useCase,_repository);
+        _pipelineSelectionUIInstance = new PipelineSelectionUI(activator, _useCase, _repository);
 
         if (_user != null)
         {
             _pipelineSelectionUIInstance.Pipeline = _user.Getter();
 
-            _pipelineSelectionUIInstance.PipelineChanged += 
+            _pipelineSelectionUIInstance.PipelineChanged +=
                 (sender, args) =>
                     _user.Setter(((IPipelineSelectionUI)sender).Pipeline as Pipeline);
         }
@@ -69,5 +71,4 @@ public IPipelineSelectionUI Create(IActivateItems activator,string text = null,
 
         return _pipelineSelectionUIInstance;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PluginPipelineUser.cs b/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PluginPipelineUser.cs
index 6703d84596..9f943b9a0f 100644
--- a/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PluginPipelineUser.cs
+++ b/Rdmp.UI/PipelineUIs/Pipelines/PluginPipelineUsers/PluginPipelineUser.cs
@@ -15,7 +15,7 @@ namespace Rdmp.UI.PipelineUIs.Pipelines.PluginPipelineUsers;
 /// <summary>
 /// Turns an IDemandToUseAPipeline plugin class into an IPipelineUser and IPipelineUseCase (both) for use with PipelineSelectionUIFactory
 /// </summary>
-public sealed class PluginPipelineUser : PipelineUseCase,IPipelineUser
+public sealed class PluginPipelineUser : PipelineUseCase, IPipelineUser
 {
     private IPipelineUseCase _useCase;
     public PipelineGetter Getter { get; private set; }
@@ -30,25 +30,22 @@ public PluginPipelineUser(RequiredPropertyInfo demand, ArgumentValueUIArgs args,
             return p;
         };
 
-        Setter = v =>args.Setter(v);
+        Setter = v => args.Setter(v);
 
         if (demanderInstance is not IDemandToUseAPipeline pipeDemander)
             throw new NotSupportedException(
                 $"Class {demanderInstance.GetType().Name} does not implement interface IDemandToUseAPipeline despite having a property which is a Pipeline");
 
         _useCase = pipeDemander.GetDesignTimePipelineUseCase(demand);
-            
+
         ExplicitSource = _useCase.ExplicitSource;
         ExplicitDestination = _useCase.ExplicitDestination;
-            
+
         foreach (var o in _useCase.GetInitializationObjects())
             AddInitializationObject(o);
 
         GenerateContext();
     }
-        
-    protected override IDataFlowPipelineContext GenerateContextImpl()
-    {
-        return _useCase.GetContext();
-    }
+
+    protected override IDataFlowPipelineContext GenerateContextImpl() => _useCase.GetContext();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PluginManagement/CodeGeneration/CodeGenerationException.cs b/Rdmp.UI/PluginManagement/CodeGeneration/CodeGenerationException.cs
index 6048b425e9..064fa8c4d5 100644
--- a/Rdmp.UI/PluginManagement/CodeGeneration/CodeGenerationException.cs
+++ b/Rdmp.UI/PluginManagement/CodeGeneration/CodeGenerationException.cs
@@ -15,8 +15,7 @@ namespace Rdmp.UI.PluginManagement.CodeGeneration;
 /// </summary>
 public class CodeGenerationException : Exception
 {
-    public CodeGenerationException(string message):base(message)
+    public CodeGenerationException(string message) : base(message)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/PluginManagement/CodeGeneration/GenerateClassCodeFromTableUI.cs b/Rdmp.UI/PluginManagement/CodeGeneration/GenerateClassCodeFromTableUI.cs
index d2a69d7297..c255937771 100644
--- a/Rdmp.UI/PluginManagement/CodeGeneration/GenerateClassCodeFromTableUI.cs
+++ b/Rdmp.UI/PluginManagement/CodeGeneration/GenerateClassCodeFromTableUI.cs
@@ -8,7 +8,6 @@
 using System.Windows.Forms;
 using Rdmp.UI.ScintillaHelper;
 using Rdmp.UI.SimpleDialogs;
-
 using ScintillaNET;
 
 namespace Rdmp.UI.PluginManagement.CodeGeneration;
@@ -32,13 +31,11 @@ public GenerateClassCodeFromTableUI()
 
     private void btnGenerateCode_Click(object sender, EventArgs e)
     {
-
         try
         {
             var table = serverDatabaseTableSelector1.GetDiscoveredTable();
             var generator = new MapsDirectlyToDatabaseTableClassCodeGenerator(table);
             _codeEditor.Text = generator.GetCode();
-
         }
         catch (Exception exception)
         {
diff --git a/Rdmp.UI/PluginManagement/CodeGeneration/MapsDirectlyToDatabaseTableClassCodeGenerator.cs b/Rdmp.UI/PluginManagement/CodeGeneration/MapsDirectlyToDatabaseTableClassCodeGenerator.cs
index 3465f3c56f..dd18053038 100644
--- a/Rdmp.UI/PluginManagement/CodeGeneration/MapsDirectlyToDatabaseTableClassCodeGenerator.cs
+++ b/Rdmp.UI/PluginManagement/CodeGeneration/MapsDirectlyToDatabaseTableClassCodeGenerator.cs
@@ -29,7 +29,8 @@ public string GetCode()
         var columns = _table.DiscoverColumns();
 
         if (!columns.Any(c => c.GetRuntimeName().Equals("ID")))
-            throw new CodeGenerationException("Table must have an ID automnum column to become an IMapsDirectlyToDatabaseTable class");
+            throw new CodeGenerationException(
+                "Table must have an ID automnum column to become an IMapsDirectlyToDatabaseTable class");
 
         var classStart = new StringBuilder();
 
@@ -66,10 +67,10 @@ public string GetCode()
         constructors.AppendLine(
             $"\tpublic {_table.GetRuntimeName()}(IRepository repository, DbDataReader r): base(repository, r)");
         constructors.AppendLine("\t{");
-            
-        foreach (var col in columns.Where(c=>c.GetRuntimeName() != "ID"))
+
+        foreach (var col in columns.Where(c => c.GetRuntimeName() != "ID"))
         {
-            var type = GetCSharpTypeFor(col,out var setCode);
+            var type = GetCSharpTypeFor(col, out var setCode);
             var propertyName = col.GetRuntimeName();
             var fieldString = col.GetRuntimeName();
 
@@ -89,7 +90,7 @@ public string GetCode()
 
         databaseFields.AppendLine("\t#endregion");
         databaseFields.AppendLine();
-            
+
         constructors.AppendLine("\t}");
 
         if (isINamed)
@@ -99,10 +100,9 @@ public string GetCode()
     }");
 
         return $"{classStart}{databaseFields}{databaseProperties}{constructors}}}";
-
     }
 
-    private static string GetCSharpTypeFor(DiscoveredColumn col,out string setCode)
+    private static string GetCSharpTypeFor(DiscoveredColumn col, out string setCode)
     {
         var r = $"r[\"{col.GetRuntimeName()}\"]";
 
@@ -136,7 +136,7 @@ private static string GetCSharpTypeFor(DiscoveredColumn col,out string setCode)
                 setCode = $"Convert.ToInt32({r});";
                 return "int";
             }
-            
+
         if (col.DataType.SQLType.Contains("bit"))
             if (col.AllowNulls)
             {
@@ -148,7 +148,7 @@ private static string GetCSharpTypeFor(DiscoveredColumn col,out string setCode)
                 setCode = $"Convert.ToBoolean({r});";
                 return "bool";
             }
-            
+
 
         setCode = "TODO Unrecognised Type";
         return "TODO  Unrecognised Type";
diff --git a/Rdmp.UI/Progress/ProgressBarsUI.cs b/Rdmp.UI/Progress/ProgressBarsUI.cs
index ff747c2e8a..5b5d65c235 100644
--- a/Rdmp.UI/Progress/ProgressBarsUI.cs
+++ b/Rdmp.UI/Progress/ProgressBarsUI.cs
@@ -18,9 +18,9 @@ namespace Rdmp.UI.Progress;
 /// it will be a Marquee bar (one with a moving unknown progress animation).  All Notify events are displayed under the smiley face (or frowning if the process
 /// has crashed)
 /// </summary>
-public partial class ProgressBarsUI : UserControl,IDataLoadEventListener
+public partial class ProgressBarsUI : UserControl, IDataLoadEventListener
 {
-    private Dictionary<string,ProgressBar> progressBars = new();
+    private Dictionary<string, ProgressBar> progressBars = new();
     private ToolTip tt = new();
 
     public float EmSize = 9f;
@@ -29,7 +29,8 @@ public ProgressBarsUI()
     {
         InitializeComponent();
     }
-    public ProgressBarsUI(string caption,bool showClose = false)
+
+    public ProgressBarsUI(string caption, bool showClose = false)
     {
         InitializeComponent();
         btnClose.Visible = showClose;
@@ -41,14 +42,12 @@ public void Done()
         btnClose.Enabled = true;
 
         foreach (var pb in progressBars.Values)
-        {
             if (pb.Style == ProgressBarStyle.Marquee)
             {
                 pb.Style = ProgressBarStyle.Continuous;
                 pb.Maximum = 1;
                 pb.Value = 1;
             }
-        }
     }
 
     public void OnNotify(object sender, NotifyEventArgs e)
@@ -65,7 +64,9 @@ public void OnProgress(object sender, ProgressEventArgs e)
         }
 
         if (progressBars.TryGetValue(e.TaskDescription, out var bar))
+        {
             UpdateProgressBar(bar, e);
+        }
         else
         {
             var y = GetRowYForNewProgressBar();
@@ -86,9 +87,9 @@ public void OnProgress(object sender, ProgressEventArgs e)
             };
             Controls.Add(pb);
 
-            UpdateProgressBar(pb,e);
+            UpdateProgressBar(pb, e);
 
-            progressBars.Add(e.TaskDescription,pb);
+            progressBars.Add(e.TaskDescription, pb);
         }
     }
 
@@ -104,21 +105,23 @@ private void UpdateProgressBar(ProgressBar progressBar, ProgressEventArgs progre
     {
         var text = $"{progressEventArgs.Progress.Value} {progressEventArgs.Progress.UnitOfMeasurement}";
 
-        tt.SetToolTip(progressBar,text);
+        tt.SetToolTip(progressBar, text);
 
         if (progressEventArgs.Progress.KnownTargetValue != 0)
         {
             progressBar.Maximum = progressEventArgs.Progress.KnownTargetValue;
-            progressBar.Value = Math.Min(progressBar.Maximum,progressEventArgs.Progress.Value);
+            progressBar.Value = Math.Min(progressBar.Maximum, progressEventArgs.Progress.Value);
             progressBar.Style = ProgressBarStyle.Continuous;
         }
         else
+        {
             progressBar.Style = ProgressBarStyle.Marquee;
+        }
     }
 
     private void btnClose_Click(object sender, EventArgs e)
     {
-        if(ParentForm != null && ParentForm.IsHandleCreated)
+        if (ParentForm != null && ParentForm.IsHandleCreated)
             ParentForm.Close();
     }
 
diff --git a/Rdmp.UI/Progress/ProgressUI.cs b/Rdmp.UI/Progress/ProgressUI.cs
index 14eea5d3bc..8cf8f90421 100644
--- a/Rdmp.UI/Progress/ProgressUI.cs
+++ b/Rdmp.UI/Progress/ProgressUI.cs
@@ -62,11 +62,11 @@ public ProgressUI()
         dataGridView1.DataSource = progress;
 
         progress.Columns.Add("Job");
-        progress.PrimaryKey = new []{progress.Columns[0]};
+        progress.PrimaryKey = new[] { progress.Columns[0] };
 
-        progress.Columns.Add("Count",typeof(int));
+        progress.Columns.Add("Count", typeof(int));
         progress.Columns.Add("Unit");
-        progress.Columns.Add("Processing Time",typeof(TimeSpan));
+        progress.Columns.Add("Processing Time", typeof(TimeSpan));
 
         var t = new Timer
         {
@@ -100,9 +100,12 @@ public ProgressUI()
 
         if (!UserSettings.AutoResizeColumns)
         {
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvSender, new Guid("2731d3cb-703c-4743-96d9-f16abff1dbbf"));
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvEventDate, new Guid("f3580392-e5b5-41d0-a1da-2751172d5517"));
-            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvMessage, new Guid("d698faf6-2ff1-4f71-96e2-9a889c2e3f13"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvSender,
+                new Guid("2731d3cb-703c-4743-96d9-f16abff1dbbf"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvEventDate,
+                new Guid("f3580392-e5b5-41d0-a1da-2751172d5517"));
+            RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProgressEvents, olvMessage,
+                new Guid("d698faf6-2ff1-4f71-96e2-9a889c2e3f13"));
         }
     }
 
@@ -129,7 +132,7 @@ private Bitmap ImageGetter(object rowObject)
 
     private void dataGridView1_CellFormatting(object sender, DataGridViewCellFormattingEventArgs e)
     {
-        if(e.ColumnIndex == _processingTimeColIndex && e.Value != null && e.Value != DBNull.Value)
+        if (e.ColumnIndex == _processingTimeColIndex && e.Value != null && e.Value != DBNull.Value)
             e.Value =
                 $"{((TimeSpan)e.Value).Hours:00}:{((TimeSpan)e.Value).Minutes:00}:{((TimeSpan)e.Value).Seconds:00}";
     }
@@ -153,26 +156,29 @@ public void Clear()
     private readonly object _oNotifyQueLock = new();
     private readonly List<ProgressUIEntry> _notificationQueue = new();
 
-    public void Progress(object sender,ProgressEventArgs args)
+    public void Progress(object sender, ProgressEventArgs args)
     {
         lock (_oProgressQueueLock)
         {
             //we have received an update to this message
-            if (_progressQueue.TryGetValue(args.TaskDescription,out var message))
+            if (_progressQueue.TryGetValue(args.TaskDescription, out var message))
             {
                 message.DateTime = DateTime.Now;
                 message.ProgressEventArgs = args;
                 message.Sender = sender;
             }
             else
-                _progressQueue.Add(args.TaskDescription,new QueuedProgressMessage(DateTime.Now, args, sender));
+            {
+                _progressQueue.Add(args.TaskDescription, new QueuedProgressMessage(DateTime.Now, args, sender));
+            }
         }
     }
+
     private void Notify(object sender, NotifyEventArgs notifyEventArgs)
     {
         lock (_oNotifyQueLock)
         {
-            _notificationQueue.Add(new ProgressUIEntry(sender,DateTime.Now, notifyEventArgs));
+            _notificationQueue.Add(new ProgressUIEntry(sender, DateTime.Now, notifyEventArgs));
         }
     }
 
@@ -188,11 +194,14 @@ public void ShowRunning(bool isRunning)
             {
                 ExceptionViewer.Show(e);
             }
+
             return;
         }
 
         if (isRunning)
+        {
             progressBar1.Style = ProgressBarStyle.Marquee;
+        }
         else
         {
             progressBar1.Style = ProgressBarStyle.Continuous;
@@ -206,7 +215,7 @@ private void ProcessAndClearQueuedProgressMessages(object sender, EventArgs e)
     {
         lock (_oProgressQueueLock)
         {
-            while(_progressQueue.Any())
+            while (_progressQueue.Any())
             {
                 var message = _progressQueue.First();
                 var args = message.Value.ProgressEventArgs;
@@ -218,9 +227,10 @@ private void ProcessAndClearQueuedProgressMessages(object sender, EventArgs e)
                     _ => throw new ArgumentOutOfRangeException("type")
                 };
 
-                var handledByFlood = HandleFloodOfMessagesFromJob(message.Value.Sender, args.TaskDescription, args.Progress.Value, label);
+                var handledByFlood = HandleFloodOfMessagesFromJob(message.Value.Sender, args.TaskDescription,
+                    args.Progress.Value, label);
 
-                if(!handledByFlood)
+                if (!handledByFlood)
                     if (!progress.Rows.Contains(args.TaskDescription))
                     {
                         progress.Rows.Add(new object[] { args.TaskDescription, args.Progress.Value, label });
@@ -261,9 +271,8 @@ private void AutoReizeColumns()
         }
     }
 
-    private bool HandleFloodOfMessagesFromJob(object sender, string job,int progressAmount,string label)
+    private bool HandleFloodOfMessagesFromJob(object sender, string job, int progressAmount, string label)
     {
-
         //ensure we have a records of the sender
         if (!_jobsReceivedFromSender.ContainsKey(sender))
             _jobsReceivedFromSender.Add(sender, new HashSet<string>());
@@ -273,7 +282,8 @@ private bool HandleFloodOfMessagesFromJob(object sender, string job,int progress
             _jobsReceivedFromSender[sender].Add(job); //add it - even if sender has a bad rep for sending lots of jobs
 
         //see if sender has been sending loads of unique job messages
-        if (_jobsReceivedFromSender[sender].Count > MaxNumberOfJobsAcceptableFromSenderBeforeThrottlingKicksIn) //it has told us about more than 5 jobs so far
+        if (_jobsReceivedFromSender[sender].Count >
+            MaxNumberOfJobsAcceptableFromSenderBeforeThrottlingKicksIn) //it has told us about more than 5 jobs so far
         {
             MergeAllJobsForSenderIntoSingleRowAndCumulateResult(sender, job, progressAmount, label);
             return true;
@@ -282,7 +292,8 @@ private bool HandleFloodOfMessagesFromJob(object sender, string job,int progress
         return false;
     }
 
-    private void MergeAllJobsForSenderIntoSingleRowAndCumulateResult(object sender  , string jobToAdd,int progressAmountToAdd, string label)
+    private void MergeAllJobsForSenderIntoSingleRowAndCumulateResult(object sender, string jobToAdd,
+        int progressAmountToAdd, string label)
     {
         var startAtProgressAmount = 0;
 
@@ -290,8 +301,8 @@ private void MergeAllJobsForSenderIntoSingleRowAndCumulateResult(object sender
             if (progress.Rows.Contains(jobsAlreadySeen))
             {
                 startAtProgressAmount += Convert.ToInt32(progress.Rows.Find(jobsAlreadySeen)["Count"]);
-                progress.Rows.Remove(progress.Rows.Find(jobsAlreadySeen)); //discard the flood of messages that might be in data table
-
+                progress.Rows.Remove(
+                    progress.Rows.Find(jobsAlreadySeen)); //discard the flood of messages that might be in data table
             }
 
         var i = 1;
@@ -307,25 +318,22 @@ private void MergeAllJobsForSenderIntoSingleRowAndCumulateResult(object sender
         }
         catch (ArgumentException)
         {
-            i = 1;//one of them is a dodgy length or empty length or otherwise they are sending us some dodgy messages
+            i = 1; //one of them is a dodgy length or empty length or otherwise they are sending us some dodgy messages
         }
 
         var floodJob =
             //no shared prefix
-            i ==1 ? $"{sender} FloodOfMessages" : $"{_jobsReceivedFromSender[sender].First()[..(i - 1)]}... FloodOfMessages";
+            i == 1
+                ? $"{sender} FloodOfMessages"
+                : $"{_jobsReceivedFromSender[sender].First()[..(i - 1)]}... FloodOfMessages";
 
         //add a new row (or edit existing) for the flood of messages from sender
         if (progress.Rows.Contains(floodJob))
-        {
             //update with progress
-            progress.Rows.Find(floodJob)["Count"] = Convert.ToInt32(progress.Rows.Find(floodJob)["Count"]) + progressAmountToAdd;
-
-        }
+            progress.Rows.Find(floodJob)["Count"] =
+                Convert.ToInt32(progress.Rows.Find(floodJob)["Count"]) + progressAmountToAdd;
         else
-        {
             progress.Rows.Add(new object[] { floodJob, startAtProgressAmount + progressAmountToAdd, label });
-        }
-
     }
 
     private void olvProgressEvents_ItemActivate(object sender, EventArgs e)
@@ -335,7 +343,8 @@ private void olvProgressEvents_ItemActivate(object sender, EventArgs e)
             if (model.Exception != null)
                 ExceptionViewer.Show(model.Message, model.Exception, false);
             else
-                WideMessageBox.Show("Progress Message",model.Message, model.Args.StackTrace, false,theme:model.GetTheme());
+                WideMessageBox.Show("Progress Message", model.Message, model.Args.StackTrace, false,
+                    theme: model.GetTheme());
         }
     }
 
@@ -344,9 +353,10 @@ public void OnProgress(object sender, ProgressEventArgs e)
     {
         Progress(sender, e);
     }
+
     public void OnNotify(object sender, NotifyEventArgs e)
     {
-        Notify(sender,e);
+        Notify(sender, e);
     }
 
     private void tbTopX_TextChanged(object sender, EventArgs e)
@@ -356,11 +366,10 @@ private void tbTopX_TextChanged(object sender, EventArgs e)
 
     private void SetTopX()
     {
-
         try
         {
             var topX = int.Parse(tbTopX.Text);
-            if(topX <=0)
+            if (topX <= 0)
                 throw new Exception("Must be positive");
 
             olvProgressEvents.ListFilter = new TailFilter(topX);
@@ -379,7 +388,6 @@ private void tbTextFilter_TextChanged(object sender, EventArgs e)
     }
 
 
-
     private void ddGroupBy_SelectedIndexChanged(object sender, EventArgs e)
     {
         var dd = ddGroupBy.SelectedItem as string;
@@ -403,10 +411,13 @@ public void GroupBySender(string filter = null)
 
     private void SetFilterFromTextBox()
     {
-        var alwaysShow = olvProgressEvents.Objects == null ? Array.Empty<ProgressUIEntry>() :
-            olvProgressEvents.Objects.OfType<ProgressUIEntry>().Where(p => p.Sender == GlobalRunError).ToArray();
-        olvProgressEvents.ModelFilter = new TextMatchFilterWithAlwaysShowList(alwaysShow, olvProgressEvents, tbTextFilter.Text, StringComparison.CurrentCultureIgnoreCase);
+        var alwaysShow = olvProgressEvents.Objects == null
+            ? Array.Empty<ProgressUIEntry>()
+            : olvProgressEvents.Objects.OfType<ProgressUIEntry>().Where(p => p.Sender == GlobalRunError).ToArray();
+        olvProgressEvents.ModelFilter = new TextMatchFilterWithAlwaysShowList(alwaysShow, olvProgressEvents,
+            tbTextFilter.Text, StringComparison.CurrentCultureIgnoreCase);
     }
+
     public void SetFatal()
     {
         lblCrashed.Visible = true;
@@ -425,15 +436,16 @@ internal void SetSuccess()
     /// <returns></returns>
     public NotifyEventArgs GetWorst()
     {
+        var worstEntry = (olvProgressEvents.Objects ?? Array.Empty<object>()).OfType<ProgressUIEntry>()
+            .Union(_notificationQueue).OrderByDescending(e => e.ProgressEventType).FirstOrDefault();
 
-        var worstEntry = (olvProgressEvents.Objects ?? Array.Empty<object>()).OfType<ProgressUIEntry>().Union(_notificationQueue).OrderByDescending(e=>e.ProgressEventType).FirstOrDefault();
-
-        if(worstEntry == null)
+        if (worstEntry == null)
             return null;
 
-        return new NotifyEventArgs(worstEntry.ProgressEventType,worstEntry.Message,worstEntry.Exception);
+        return new NotifyEventArgs(worstEntry.ProgressEventType, worstEntry.Message, worstEntry.Exception);
     }
 }
+
 internal class QueuedProgressMessage
 {
     public QueuedProgressMessage(DateTime dateTime, ProgressEventArgs progressEventArgs, object sender)
@@ -446,5 +458,4 @@ public QueuedProgressMessage(DateTime dateTime, ProgressEventArgs progressEventA
     public DateTime DateTime { get; set; }
     public ProgressEventArgs ProgressEventArgs { get; set; }
     public object Sender { get; set; }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Progress/ProgressUIEntry.cs b/Rdmp.UI/Progress/ProgressUIEntry.cs
index e629712e71..22e2641489 100644
--- a/Rdmp.UI/Progress/ProgressUIEntry.cs
+++ b/Rdmp.UI/Progress/ProgressUIEntry.cs
@@ -22,10 +22,10 @@ public class ProgressUIEntry
     public ProgressEventType ProgressEventType { get; }
     public DateTime EventDate { get; private set; }
 
-    public NotifyEventArgs Args { get;private set; }
+    public NotifyEventArgs Args { get; private set; }
     public Exception Exception { get; set; }
 
-    public ProgressUIEntry(object sender,DateTime eventDate, NotifyEventArgs args)
+    public ProgressUIEntry(object sender, DateTime eventDate, NotifyEventArgs args)
     {
         Sender = FormatSender(sender);
         Message = args.Message;
@@ -35,10 +35,7 @@ public ProgressUIEntry(object sender,DateTime eventDate, NotifyEventArgs args)
         Args = args;
     }
 
-    private static string FormatSender(object sender)
-    {
-        return sender as string ?? sender?.GetType().Name ?? "Unknown";
-    }
+    private static string FormatSender(object sender) => sender as string ?? sender?.GetType().Name ?? "Unknown";
 
     public WideMessageBoxTheme GetTheme()
     {
diff --git a/Rdmp.UI/ProjectUI/Datasets/ConfigureDatasetUI.cs b/Rdmp.UI/ProjectUI/Datasets/ConfigureDatasetUI.cs
index 52212df169..458e12d5cd 100644
--- a/Rdmp.UI/ProjectUI/Datasets/ConfigureDatasetUI.cs
+++ b/Rdmp.UI/ProjectUI/Datasets/ConfigureDatasetUI.cs
@@ -44,7 +44,7 @@ namespace Rdmp.UI.ProjectUI.Datasets;
 /// <para>Depending on which columns you have selected the QueryBuilder may be unable to generate a query (for example if you do not add the IsExtractionIdentifier column - See
 /// ExtractionInformationUI).</para>
 /// </summary>
-public partial class ConfigureDatasetUI : ConfigureDatasetUI_Design,ILifetimeSubscriber
+public partial class ConfigureDatasetUI : ConfigureDatasetUI_Design, ILifetimeSubscriber
 {
     public SelectedDataSets SelectedDataSet { get; private set; }
     private IExtractableDataSet _dataSet;
@@ -59,7 +59,7 @@ public ConfigureDatasetUI()
 
         olvAvailableColumnName.ImageGetter += ImageGetter;
         olvSelectedColumnName.ImageGetter += ImageGetter;
-            
+
         olvSelected.ItemActivate += OlvSelected_ItemActivate;
 
         olvAvailableColumnCategory.AspectGetter += AvailableColumnCategoryAspectGetter;
@@ -67,8 +67,8 @@ public ConfigureDatasetUI()
         olvSelectedCatalogue.AspectGetter += SelectedCatalogue_AspectGetter;
         olvSelectedCategory.AspectGetter += SelectedCategory_AspectGetter;
 
-        var dropSink = (SimpleDropSink) olvSelected.DropSink;
-            
+        var dropSink = (SimpleDropSink)olvSelected.DropSink;
+
         dropSink.CanDropOnItem = false;
         dropSink.CanDropBetween = true;
         AssociatedCollection = RDMPCollection.DataExport;
@@ -84,26 +84,37 @@ public ConfigureDatasetUI()
         olvJoinColumn.EnableButtonWhenItemIsDisabled = true;
 
         olvIssues.AspectGetter += Issues_AspectGetter;
-            
+
         olvSelected.UseCellFormatEvents = true;
         olvSelected.FormatCell += olvSelected_FormatCell;
         olvSelected.CellRightClick += olvSelected_CellRightClick;
 
-        helpIconJoin.SetHelpText("Configure JoinInfos","Your query involves more than 1 table and RDMP does not yet know which columns to use to join the tables on.  Click the 'Configure' button below on any ticked tables for which no joins are shown");
-
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableColumnCategory, new Guid("e515dd51-6ab4-4e62-8d58-0081dde77646"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableColumnName, new Guid("f40a31b5-4a64-44b5-9d21-54595f8671b1"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableIsExtractionIdentifier, new Guid("6741ea5c-5a1e-482a-943e-5d9bcfde4a1f"));
-
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvJoin, olvJoinColumn, new Guid("7e034241-9d7a-48a6-869c-a0831303839a"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvJoin, olvJoinTableName, new Guid("7b0b0c8f-b648-47cc-a14f-6dce54333d0b"));
-
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedCatalogue, new Guid("7ec2a0b8-cc84-4759-8f78-0f2c492ae408"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedCategory, new Guid("e0cc6915-15ad-4148-adf1-978489e36940"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedColumnName, new Guid("061b5ef1-d0bd-4be6-9e9a-1a6a9c13a01c"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedColumnOrder, new Guid("2b4db0ee-3768-4e0e-a62b-e5a9b19e91a7"));
-            
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvIssues, new Guid("741f0cff-1d2e-46a7-a5da-9ce13e0960cf"));
+        helpIconJoin.SetHelpText("Configure JoinInfos",
+            "Your query involves more than 1 table and RDMP does not yet know which columns to use to join the tables on.  Click the 'Configure' button below on any ticked tables for which no joins are shown");
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableColumnCategory,
+            new Guid("e515dd51-6ab4-4e62-8d58-0081dde77646"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableColumnName,
+            new Guid("f40a31b5-4a64-44b5-9d21-54595f8671b1"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvAvailable, olvAvailableIsExtractionIdentifier,
+            new Guid("6741ea5c-5a1e-482a-943e-5d9bcfde4a1f"));
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvJoin, olvJoinColumn,
+            new Guid("7e034241-9d7a-48a6-869c-a0831303839a"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvJoin, olvJoinTableName,
+            new Guid("7b0b0c8f-b648-47cc-a14f-6dce54333d0b"));
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedCatalogue,
+            new Guid("7ec2a0b8-cc84-4759-8f78-0f2c492ae408"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedCategory,
+            new Guid("e0cc6915-15ad-4148-adf1-978489e36940"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedColumnName,
+            new Guid("061b5ef1-d0bd-4be6-9e9a-1a6a9c13a01c"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvSelectedColumnOrder,
+            new Guid("2b4db0ee-3768-4e0e-a62b-e5a9b19e91a7"));
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvSelected, olvIssues,
+            new Guid("741f0cff-1d2e-46a7-a5da-9ce13e0960cf"));
 
         cbShowProjectSpecific.CheckedChanged += CbShowProjectSpecific_CheckedChanged;
     }
@@ -114,7 +125,8 @@ private void olvSelected_CellRightClick(object sender, CellRightClickEventArgs e
         {
             var ms = new ContextMenuStrip();
             ms.Items.Add(
-                new ToolStripMenuItem("Update With Catalogue Settings", null,(s,x)=> ec.UpdateValuesToMatch(ec.CatalogueExtractionInformation))
+                new ToolStripMenuItem("Update With Catalogue Settings", null,
+                    (s, x) => ec.UpdateValuesToMatch(ec.CatalogueExtractionInformation))
                 {
                     Enabled = !ReadOnly
                 });
@@ -125,10 +137,10 @@ private void olvSelected_CellRightClick(object sender, CellRightClickEventArgs e
 
     private void olvSelected_FormatCell(object sender, FormatCellEventArgs e)
     {
-        if(e.Column == olvIssues)
-            if((string) e.CellValue == "None")
+        if (e.Column == olvIssues)
+            if ((string)e.CellValue == "None")
                 e.SubItem.ForeColor = Color.Gray;
-            else if ((string) e.CellValue == "Different")
+            else if ((string)e.CellValue == "Different")
                 e.SubItem.ForeColor = Color.Red;
     }
 
@@ -142,7 +154,7 @@ private object Issues_AspectGetter(object rowObject)
 
     private object SelectedCatalogue_AspectGetter(object rowObject)
     {
-        var c = (ExtractableColumn) rowObject;
+        var c = (ExtractableColumn)rowObject;
         var ei = c.CatalogueExtractionInformation;
 
         return ei?.CatalogueItem.Catalogue.Name;
@@ -150,7 +162,7 @@ private object SelectedCatalogue_AspectGetter(object rowObject)
 
     private object SelectedCategory_AspectGetter(object rowObject)
     {
-        var c = (ExtractableColumn) rowObject;
+        var c = (ExtractableColumn)rowObject;
         var ei = c.CatalogueExtractionInformation;
 
         return ei?.ExtractionCategory;
@@ -163,10 +175,7 @@ private void SortSelectedByOrder()
         olvSelected.Sort(olvSelectedColumnOrder, SortOrder.Ascending);
     }
 
-    private Bitmap ImageGetter(object rowObject)
-    {
-        return Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
-    }
+    private Bitmap ImageGetter(object rowObject) => Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
 
     private object AvailableColumnCategoryAspectGetter(object rowObject)
     {
@@ -176,7 +185,8 @@ private object AvailableColumnCategoryAspectGetter(object rowObject)
 
         string toReturn = null;
 
-        toReturn = ei.ExtractionCategory == ExtractionCategory.ProjectSpecific ? $"{ei.ExtractionCategory}::{cata.Name}"
+        toReturn = ei.ExtractionCategory == ExtractionCategory.ProjectSpecific
+            ? $"{ei.ExtractionCategory}::{cata.Name}"
             : ei.ExtractionCategory.ToString();
 
         toReturn = cata.IsDeprecated ? $"{toReturn} (DEPRECATED)" : toReturn;
@@ -194,7 +204,7 @@ private void SetupUserInterface()
         //clear the UI
         olvAvailable.ClearObjects();
         olvSelected.ClearObjects();
-            
+
         //get the catalogue and then all the items
         ICatalogue cata;
         try
@@ -204,7 +214,7 @@ private void SetupUserInterface()
         catch (Exception e)
         {
             //catalogue has probably been deleted!
-            ExceptionViewer.Show("Unable to find Catalogue for ExtractableDataSet",e);
+            ExceptionViewer.Show("Unable to find Catalogue for ExtractableDataSet", e);
             return;
         }
 
@@ -216,12 +226,11 @@ private void SetupUserInterface()
         foreach (var e in cata.GetAllExtractionInformation(ExtractionCategory.Any))
             toAdd.Add(e);
 
-        if(UserSettings.ShowProjectSpecificColumns)
-        {
+        if (UserSettings.ShowProjectSpecificColumns)
             //plus all the Project Specific columns
-            foreach (var e in _config.Project.GetAllProjectCatalogueColumns(Activator.CoreChildProvider, ExtractionCategory.ProjectSpecific))
+            foreach (var e in _config.Project.GetAllProjectCatalogueColumns(Activator.CoreChildProvider,
+                         ExtractionCategory.ProjectSpecific))
                 toAdd.Add(e);
-        }
 
 
         // Tell our columns about their CatalogueItems/ColumnInfos by using CoreChildProvider
@@ -239,7 +248,7 @@ private void SetupUserInterface()
 
         //add the stuff that is in Project Catalogues so they can pick these too
         olvAvailable.AddObjects(toAdd.ToArray());
-            
+
         olvAvailable.EndUpdate();
 
         //on the right
@@ -250,8 +259,7 @@ private void SetupUserInterface()
         // Tell our columns about their CatalogueItems by using CoreChildProvider
         // Prevents later queries to db to figure out things like column name etc
         foreach (var ec in allExtractableColumns)
-        {
-            if(ec.CatalogueExtractionInformation_ID != null)
+            if (ec.CatalogueExtractionInformation_ID != null)
             {
                 var eiDict = Activator.CoreChildProvider.AllExtractionInformationsDictionary;
                 var ciDict = Activator.CoreChildProvider.AllCatalogueItemsDictionary;
@@ -261,15 +269,9 @@ private void SetupUserInterface()
                     ec.InjectKnown(ei);
                     ec.InjectKnown(ei.ColumnInfo);
 
-                    if(ciDict.TryGetValue(ei.CatalogueItem_ID, out var value))
-                    {
-                        ec.InjectKnown(value);
-                    }
+                    if (ciDict.TryGetValue(ei.CatalogueItem_ID, out var value)) ec.InjectKnown(value);
                 }
-
-
             }
-        }
 
 
         //now get all the ExtractableColumns that are already configured for this configuration (previously)
@@ -285,8 +287,8 @@ private void RefreshDisabledObjectStatus()
         // olvAvailable.RefreshObjects(olvAvailable.Objects.OfType<IColumn>().ToArray());
 
         UpdateJoins();
-            
-        olvJoin.DisabledObjects = olvJoin.Objects.OfType<AvailableForceJoinNode>().Where(n=>n.IsMandatory).ToArray();
+
+        olvJoin.DisabledObjects = olvJoin.Objects.OfType<AvailableForceJoinNode>().Where(n => n.IsMandatory).ToArray();
         olvJoin.RefreshObjects(olvJoin.Objects.OfType<AvailableForceJoinNode>().ToArray());
     }
 
@@ -312,7 +314,7 @@ private void btnInclude_Click(object sender, EventArgs e)
 
     private void btnExclude_Click(object sender, EventArgs e)
     {
-        if(olvSelected.SelectedObjects != null)
+        if (olvSelected.SelectedObjects != null)
             Exclude(olvSelected.SelectedObjects.Cast<ConcreteColumn>().ToArray());
     }
 
@@ -334,15 +336,16 @@ public void ExcludeAll()
     /// </summary>
     public void IncludeAll()
     {
-        Include(olvAvailable.Objects.OfType<ConcreteColumn>().Where(o=> !olvAvailable.IsDisabled(o)).ToArray());
+        Include(olvAvailable.Objects.OfType<ConcreteColumn>().Where(o => !olvAvailable.IsDisabled(o)).ToArray());
     }
+
     private void Exclude(params ConcreteColumn[] concreteColumn)
     {
         olvSelected.BeginUpdate();
         try
         {
             foreach (var c in concreteColumn)
-                if(c != null)
+                if (c != null)
                 {
                     c.DeleteInDatabase();
                     olvSelected.RemoveObject(c);
@@ -379,7 +382,7 @@ private void Include(params IColumn[] columns)
 
                 //if the column is out of date
                 if (c is IRevertable r && r.HasLocalChanges().Evaluation == ChangeDescription.DatabaseCopyDifferent)
-                    r.RevertToDatabaseState();//get a fresh copy
+                    r.RevertToDatabaseState(); //get a fresh copy
 
                 //add to the config
                 var addMe = _config.AddColumnToExtraction(_dataSet, c);
@@ -398,24 +401,26 @@ private void Include(params IColumn[] columns)
 
         Publish(SelectedDataSet);
     }
+
     public override void SetDatabaseObject(IActivateItems activator, SelectedDataSets databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
 
         activator.RefreshBus.EstablishLifetimeSubscription(this);
 
         SelectedDataSet = databaseObject;
         _dataSet = SelectedDataSet.ExtractableDataSet;
         _config = (ExtractionConfiguration)SelectedDataSet.ExtractionConfiguration;
-            
+
         SetupUserInterface();
 
         SortSelectedByOrder();
 
-        CommonFunctionality.AddToMenu(new ExecuteCommandShow(activator, databaseObject.ExtractableDataSet.Catalogue, 0, true), "Show Catalogue");
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandShow(activator, databaseObject.ExtractableDataSet.Catalogue, 0, true), "Show Catalogue");
         CommonFunctionality.Add(new ExecuteCommandExecuteExtractionConfiguration(activator, databaseObject));
 
-        CommonFunctionality.AddChecks(new SelectedDataSetsChecker(activator,SelectedDataSet));
+        CommonFunctionality.AddChecks(new SelectedDataSetsChecker(activator, SelectedDataSet));
 
         btnExclude.Enabled = !ReadOnly;
         btnExcludeAll.Enabled = !ReadOnly;
@@ -423,16 +428,13 @@ public override void SetDatabaseObject(IActivateItems activator, SelectedDataSet
         olvJoin.Enabled = !ReadOnly;
     }
 
-    public override string GetTabName()
-    {
-        return $"Edit:{base.GetTabName()}";
-    }
+    public override string GetTabName() => $"Edit:{base.GetTabName()}";
 
     private void olvAvailable_ItemActivate(object sender, EventArgs e)
     {
         var cmd = new ExecuteCommandActivate(Activator, olvAvailable.SelectedObject);
 
-        if(!cmd.IsImpossible)
+        if (!cmd.IsImpossible)
             cmd.Execute();
     }
 
@@ -441,11 +443,11 @@ private void OlvSelected_ItemActivate(object sender, EventArgs e)
     {
         var ei = (olvSelected.SelectedObject as ExtractableColumn)?.CatalogueExtractionInformation;
 
-        if(ei != null)
+        if (ei != null)
         {
-            var cmd = new ExecuteCommandShow(Activator,ei,1);
+            var cmd = new ExecuteCommandShow(Activator, ei, 1);
 
-            if(!cmd.IsImpossible)
+            if (!cmd.IsImpossible)
                 cmd.Execute();
         }
     }
@@ -453,7 +455,7 @@ private void OlvSelected_ItemActivate(object sender, EventArgs e)
     private void olvSelected_ModelCanDrop(object sender, ModelDropEventArgs e)
     {
         e.Effect = DragDropEffects.None;
-            
+
         //dragging within our own control
         if (e.SourceListView == olvSelected)
         {
@@ -465,11 +467,7 @@ private void olvSelected_ModelCanDrop(object sender, ModelDropEventArgs e)
         }
 
         //allow dragging multiple from the left hand side though
-        if (e.SourceListView == olvAvailable)
-        {
-            e.Effect = DragDropEffects.Move;
-
-        }
+        if (e.SourceListView == olvAvailable) e.Effect = DragDropEffects.Move;
     }
 
     private void olvSelected_ModelDropped(object sender, ModelDropEventArgs e)
@@ -493,8 +491,8 @@ private void HandleReorder(ModelDropEventArgs e)
             return;
 
         var sourceColumn = (ExtractableColumn)e.SourceModels[0];
-            
-        HandleReorder(sourceColumn,(IOrderable) e.TargetModel,e.DropTargetLocation);
+
+        HandleReorder(sourceColumn, (IOrderable)e.TargetModel, e.DropTargetLocation);
     }
 
     private void HandleReorder(ExtractableColumn sourceColumn, IOrderable targetOrderable, DropTargetLocation location)
@@ -555,9 +553,11 @@ private void btnSelectCore_Click(object sender, EventArgs e)
                     //select core columns
                     ei.ExtractionCategory == ExtractionCategory.Core
                     // or ProjectSpecific ones if it is the main dataset
-                    || (extractionIsFor == ei.CatalogueItem.Catalogue_ID && ei.ExtractionCategory == ExtractionCategory.ProjectSpecific)
+                    || (extractionIsFor == ei.CatalogueItem.Catalogue_ID &&
+                        ei.ExtractionCategory == ExtractionCategory.ProjectSpecific)
                 ).ToArray());
     }
+
     #region Joins
 
     private CheckState ForceJoinCheckStateGetter(object rowobject)
@@ -580,17 +580,20 @@ private CheckState ForceJoinCheckStatePutter(object rowobject, CheckState newval
             return CheckState.Checked;
 
         //user is checking a force join
-        if(node.ForcedJoin == null)
+        if (node.ForcedJoin == null)
             if (newvalue == CheckState.Checked)
             {
-                var forceJoin = new SelectedDataSetsForcedJoin(Activator.RepositoryLocator.DataExportRepository,SelectedDataSet, node.TableInfo);
+                var forceJoin = new SelectedDataSetsForcedJoin(Activator.RepositoryLocator.DataExportRepository,
+                    SelectedDataSet, node.TableInfo);
                 node.ForcedJoin = forceJoin;
                 return CheckState.Checked;
             }
             else
+            {
                 return CheckState.Unchecked; //user is unchecking but there already isn't a forced join... very strange
+            }
 
-        if(node.ForcedJoin != null)
+        if (node.ForcedJoin != null)
             if (newvalue == CheckState.Unchecked)
             {
                 node.ForcedJoin.DeleteInDatabase();
@@ -616,13 +619,13 @@ private void UpdateJoins()
 
         //identify those we are already joining to based on the columns selected
         var tablesInQuery = GetTablesUsedInQuery();
-            
+
         //add those as readonly (you cant unjoin from those)
         foreach (TableInfo tableInfo in tablesInQuery)
             nodes.Add(new AvailableForceJoinNode(tableInfo, true));
 
         SelectedDataSet.GetCatalogue().GetTableInfos(Activator.CoreChildProvider, out var normal, out _);
-            
+
         // Add all tables as optional joins that the Catalogue has
         foreach (var t in normal)
         {
@@ -636,7 +639,7 @@ private void UpdateJoins()
         foreach (var projectCatalogue in SelectedDataSet.ExtractionConfiguration.Project.GetAllProjectCatalogues())
         {
             // find tables
-            projectCatalogue.GetTableInfos(Activator.CoreChildProvider,out var projNormal, out _);
+            projectCatalogue.GetTableInfos(Activator.CoreChildProvider, out var projNormal, out _);
 
             // that are not lookups
             foreach (TableInfo projectSpecificTables in projNormal)
@@ -652,7 +655,8 @@ private void UpdateJoins()
 
 
         //identify the existing force joins
-        var existingForceJoins = new HashSet<SelectedDataSetsForcedJoin>(SelectedDataSet.Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(SelectedDataSet));
+        var existingForceJoins = new HashSet<SelectedDataSetsForcedJoin>(
+            SelectedDataSet.Repository.GetAllObjectsWithParent<SelectedDataSetsForcedJoin>(SelectedDataSet));
 
         foreach (var node in nodes)
         {
@@ -671,10 +675,11 @@ private void UpdateJoins()
             node.FindJoinsBetween(Activator.CoreChildProvider, nodes);
 
         //highlight to user the fact that there are unlinkable tables
-            
+
         //if there are 2+ tables in the query and at least 1 of them doesn't have any join logic configured for it
-        flpCouldNotJoinTables.Visible = nodes.Count(n => n.IsIncludedInQuery) > 1 && nodes.Any(n => n.IsIncludedInQuery && !n.JoinInfos.Any());
-            
+        flpCouldNotJoinTables.Visible = nodes.Count(n => n.IsIncludedInQuery) > 1 &&
+                                        nodes.Any(n => n.IsIncludedInQuery && !n.JoinInfos.Any());
+
         olvJoin.AddObjects(nodes.ToArray());
     }
 
@@ -693,8 +698,8 @@ private IEnumerable<ITableInfo> GetTablesUsedInQuery()
 
     private void olvJoin_ButtonClick(object sender, CellClickEventArgs e)
     {
-        var node = (AvailableForceJoinNode) e.Model;
-        if(e.Column == olvJoinColumn)
+        var node = (AvailableForceJoinNode)e.Model;
+        if (e.Column == olvJoinColumn)
         {
             //if it has Join Infos
             if (node.JoinInfos.Any())
@@ -706,27 +711,29 @@ private void olvJoin_ButtonClick(object sender, CellClickEventArgs e)
 
                 //if there's only one column involved in the join
                 if (cols.Length == 1)
+                {
                     toEmphasise = cols[0]; //emphasise it to the user
+                }
                 else
                 {
-                    if(Activator.SelectObject(new DialogArgs
-                       {
-                           TaskDescription = "There are multiple columns involved in the join, which do you want to navigate to?"
-                       },cols,out var selected))
-                    {
+                    if (Activator.SelectObject(new DialogArgs
+                        {
+                            TaskDescription =
+                                "There are multiple columns involved in the join, which do you want to navigate to?"
+                        }, cols, out var selected))
                         toEmphasise = selected;
-                    }
                 }
 
-                if(toEmphasise != null)
+                if (toEmphasise != null)
                     Activator.RequestItemEmphasis(this, new EmphasiseRequest(toEmphasise, 1));
 
                 return;
             }
 
-            var otherTables = olvJoin.Objects.OfType<AvailableForceJoinNode>().Where(n=> !Equals(n, node)).Select(n => n.TableInfo).ToArray();
+            var otherTables = olvJoin.Objects.OfType<AvailableForceJoinNode>().Where(n => !Equals(n, node))
+                .Select(n => n.TableInfo).ToArray();
 
-            if(otherTables.Length == 0)
+            if (otherTables.Length == 0)
             {
                 MessageBox.Show("There are no other tables so no join is required");
                 return;
@@ -734,20 +741,19 @@ private void olvJoin_ButtonClick(object sender, CellClickEventArgs e)
 
             TableInfo otherTable = null;
             if (otherTables.Length == 1)
+            {
                 otherTable = otherTables[0];
+            }
             else
             {
-                if(Activator.SelectObject(new DialogArgs
-                   {
-                       TaskDescription = "Which table do you want to join to?"
-                   }, otherTables, out var selected))
-                {
+                if (Activator.SelectObject(new DialogArgs
+                    {
+                        TaskDescription = "Which table do you want to join to?"
+                    }, otherTables, out var selected))
                     otherTable = selected;
-                }
-
             }
 
-            if(otherTable != null)
+            if (otherTable != null)
             {
                 var cmd = new ExecuteCommandAddJoinInfo(Activator, node.TableInfo);
                 cmd.SetInitialJoinToTableInfo(otherTable);
@@ -771,9 +777,9 @@ private object JoinColumn_AspectGetter(object rowObject)
     private void tbSearch_TextChanged(object sender, EventArgs e)
     {
         ObjectListView tree;
-        var senderTb = (TextBox) sender;
+        var senderTb = (TextBox)sender;
 
-        if(sender == tbSearchAvailable)
+        if (sender == tbSearchAvailable)
             tree = olvAvailable;
         else if (sender == tbSearchSelected)
             tree = olvSelected;
@@ -800,15 +806,13 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
 
         //if an ExtractionInformation is being refreshed
         if (e.Object is ExtractionInformation ei)
-        {
             //We should clear any old cached values for this ExtractionInformation amongst selected column
             foreach (var c in olvSelected.Objects.OfType<ExtractableColumn>().ToArray())
-                if(c.CatalogueExtractionInformation_ID == ei.ID)
+                if (c.CatalogueExtractionInformation_ID == ei.ID)
                 {
                     c.InjectKnown(ei);
                     olvSelected.RefreshObject(c);
                 }
-        }
 
         UpdateJoins();
     }
@@ -816,13 +820,11 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     private void CbShowProjectSpecific_CheckedChanged(object sender, EventArgs e)
     {
         UserSettings.ShowProjectSpecificColumns = cbShowProjectSpecific.Checked;
-        SetupUserInterface();            
+        SetupUserInterface();
     }
-
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ConfigureDatasetUI_Design, UserControl>))]
 public abstract class ConfigureDatasetUI_Design : RDMPSingleDatabaseObjectControl<SelectedDataSets>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ProjectUI/Datasets/Node/AvailableForceJoinNode.cs b/Rdmp.UI/ProjectUI/Datasets/Node/AvailableForceJoinNode.cs
index e09768c554..5b29e9db56 100644
--- a/Rdmp.UI/ProjectUI/Datasets/Node/AvailableForceJoinNode.cs
+++ b/Rdmp.UI/ProjectUI/Datasets/Node/AvailableForceJoinNode.cs
@@ -14,8 +14,7 @@ namespace Rdmp.UI.ProjectUI.Datasets.Node;
 
 internal class AvailableForceJoinNode : IMasqueradeAs
 {
-    [CanBeNull]
-    public SelectedDataSetsForcedJoin ForcedJoin { get; set; }
+    [CanBeNull] public SelectedDataSetsForcedJoin ForcedJoin { get; set; }
 
     public TableInfo TableInfo { get; set; }
     public JoinInfo[] JoinInfos { get; set; }
@@ -32,34 +31,23 @@ public AvailableForceJoinNode(TableInfo tableInfo, bool isMandatory)
         IsMandatory = isMandatory;
     }
 
-    public object MasqueradingAs()
-    {
-        return TableInfo;
-    }
+    public object MasqueradingAs() => TableInfo;
 
-    public override string ToString()
-    {
-        return TableInfo.ToString();
-    }
+    public override string ToString() => TableInfo.ToString();
 
     #region Equality Members
-    protected bool Equals(AvailableForceJoinNode other)
-    {
-        return TableInfo.Equals(other.TableInfo);
-    }
+
+    protected bool Equals(AvailableForceJoinNode other) => TableInfo.Equals(other.TableInfo);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((AvailableForceJoinNode) obj);
+        return Equals((AvailableForceJoinNode)obj);
     }
 
-    public override int GetHashCode()
-    {
-        return TableInfo.GetHashCode();
-    }
+    public override int GetHashCode() => TableInfo.GetHashCode();
 
     #endregion
 
@@ -78,13 +66,15 @@ public void FindJoinsBetween(ICoreChildProvider coreChildProvider, HashSet<Avail
         foreach (var otherNode in otherNodes)
         {
             //don't look for self joins
-            if(Equals(otherNode , this))
+            if (Equals(otherNode, this))
                 continue;
 
             var theirCols = coreChildProvider.TableInfosToColumnInfos[otherNode.TableInfo.ID].ToArray();
 
 
-            foundJoinInfos.AddRange(TableInfo.CatalogueRepository.JoinManager.GetAllJoinInfosBetweenColumnInfoSets(allJoins, mycols, theirCols));
+            foundJoinInfos.AddRange(
+                TableInfo.CatalogueRepository.JoinManager.GetAllJoinInfosBetweenColumnInfoSets(allJoins, mycols,
+                    theirCols));
         }
 
         JoinInfos = foundJoinInfos.ToArray();
diff --git a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs
index 19e6299622..61bbc338b0 100644
--- a/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs
+++ b/Rdmp.UI/ProjectUI/ExecuteExtractionUI.cs
@@ -62,14 +62,14 @@ public partial class ExecuteExtractionUI : ExecuteExtractionUI_Design
     private const string CoreDatasets = "Core";
     private const string ProjectSpecificDatasets = "Project Specific";
 
-    private ExtractionArbitraryFolderNode _coreDatasetsFolder = new(CoreDatasets,1);
-    private ExtractionArbitraryFolderNode _projectSpecificDatasetsFolder = new(ProjectSpecificDatasets,2);
-    private ArbitraryFolderNode _globalsFolder = new(ExtractionDirectory.GLOBALS_DATA_NAME,0);
+    private ExtractionArbitraryFolderNode _coreDatasetsFolder = new(CoreDatasets, 1);
+    private ExtractionArbitraryFolderNode _projectSpecificDatasetsFolder = new(ProjectSpecificDatasets, 2);
+    private ArbitraryFolderNode _globalsFolder = new(ExtractionDirectory.GLOBALS_DATA_NAME, 0);
 
     private ToolStripControlHost _pipelinePanel;
 
     private ToolStripLabel lblMaxConcurrent = new("Concurrent:");
-    private ToolStripTextBox tbMaxConcurrent = new() { Text="3"};
+    private ToolStripTextBox tbMaxConcurrent = new() { Text = "3" };
 
     public ExecuteExtractionUI()
     {
@@ -79,7 +79,7 @@ public ExecuteExtractionUI()
         checkAndExecuteUI1.CommandGetter = CommandGetter;
         checkAndExecuteUI1.StateChanged += CheckAndExecuteUI1OnStateChanged;
         checkAndExecuteUI1.GroupBySender();
-            
+
         olvState.ImageGetter = State_ImageGetter;
         olvState.AspectGetter = State_AspectGetter;
 
@@ -87,7 +87,7 @@ public ExecuteExtractionUI()
         tlvDatasets.CanExpandGetter = CanExpandGetter;
         tlvDatasets.HierarchicalCheckboxes = true;
         tlvDatasets.ItemActivate += TlvDatasets_ItemActivate;
-            
+
         checkAndExecuteUI1.BackColor = Color.FromArgb(240, 240, 240);
 
         tlvDatasets.CellClick += tlvDatasets_CellClick;
@@ -95,12 +95,14 @@ public ExecuteExtractionUI()
         _coreDatasetsFolder.CommandGetter = () =>
             new IAtomicCommand[]
             {
-                new ExecuteCommandAddDatasetsToConfiguration(Activator,_extractionConfiguration),
-                new ExecuteCommandAddPackageToConfiguration(Activator,_extractionConfiguration)
+                new ExecuteCommandAddDatasetsToConfiguration(Activator, _extractionConfiguration),
+                new ExecuteCommandAddPackageToConfiguration(Activator, _extractionConfiguration)
             };
-            
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvDatasets, olvName, new Guid("57c60bc1-9935-49b2-bb32-58e4c20ad666"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvDatasets, olvState, new Guid("22642c7d-342b-4a6c-b2c4-7ca581877cb2"));
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvDatasets, olvName,
+            new Guid("57c60bc1-9935-49b2-bb32-58e4c20ad666"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvDatasets, olvState,
+            new Guid("22642c7d-342b-4a6c-b2c4-7ca581877cb2"));
     }
 
     private void TlvDatasets_ItemActivate(object sender, EventArgs e)
@@ -115,7 +117,7 @@ private void tlvDatasets_CellClick(object sender, CellClickEventArgs e)
         {
             var notifier = GetCheckNotifier(e.Model);
 
-            if(notifier == null)
+            if (notifier == null)
                 return;
 
             var popup = new PopupChecksUI(e.Model.ToString(), false);
@@ -125,20 +127,19 @@ private void tlvDatasets_CellClick(object sender, CellClickEventArgs e)
 
     private HelpWorkflow BuildHelpFlow()
     {
-        var helpWorkflow = new HelpWorkflow(this, new ExecuteCommandExecuteExtractionConfiguration(Activator), new NullHelpWorkflowProgressProvider());
+        var helpWorkflow = new HelpWorkflow(this, new ExecuteCommandExecuteExtractionConfiguration(Activator),
+            new NullHelpWorkflowProgressProvider());
 
         //////Normal work flow
         var root = new HelpStage(tlvDatasets, "Choose the datasets and Globals you want to extract here.\r\n" +
                                               "\r\n" +
                                               "Click on the red icon to disable this help.");
         var stage2 = new HelpStage(_pipelinePanel.Control, "Select the pipeline to run for extracting the data.\r\n");
-            
+
         root.SetOption(">>", stage2);
         stage2.SetOption(">>", checkAndExecuteUI1.HelpStages.First());
         for (var i = 0; i < checkAndExecuteUI1.HelpStages.Count - 1; i++)
-        {
-            checkAndExecuteUI1.HelpStages[i].SetOption(">>", checkAndExecuteUI1.HelpStages[i+1]);
-        }
+            checkAndExecuteUI1.HelpStages[i].SetOption(">>", checkAndExecuteUI1.HelpStages[i + 1]);
 
         checkAndExecuteUI1.HelpStages.Last().SetOption("|<<", root);
 
@@ -154,7 +155,7 @@ private void CheckAndExecuteUI1OnStateChanged(object sender, EventArgs eventArgs
     private bool CanExpandGetter(object model)
     {
         var e = ChildrenGetter(model);
-        return  e != null && e.Cast<object>().Any();
+        return e != null && e.Cast<object>().Any();
     }
 
     private IEnumerable ChildrenGetter(object model)
@@ -195,7 +196,7 @@ private object GetState(object rowObject)
 
         if (extractionRunner != null && rowObject is SelectedDataSets sds)
             return extractionRunner.GetState(sds.ExtractableDataSet);
-            
+
         return null;
     }
 
@@ -208,18 +209,17 @@ private ToMemoryCheckNotifier GetCheckNotifier(object rowObject)
 
         if (extractionRunner != null && rowObject is SelectedDataSets sds)
             return extractionRunner.GetCheckNotifier(sds.ExtractableDataSet);
-            
+
         return null;
     }
+
     private object State_AspectGetter(object rowobject)
     {
         var state = GetState(rowobject);
 
-        if(state is ExtractCommandState ecs)
-        {
-            if(ecs == ExtractCommandState.WaitingForSQLServer)
+        if (state is ExtractCommandState ecs)
+            if (ecs == ExtractCommandState.WaitingForSQLServer)
                 return "WaitingForDatabase";
-        }
 
         return state?.ToString();
     }
@@ -237,13 +237,17 @@ private RDMPCommandLineOptions CommandGetter(CommandLineActivity activityRequest
             ExtractGlobals = tlvDatasets.IsChecked(_globalsFolder),
             MaxConcurrentExtractions = max,
             ExtractionConfiguration = _extractionConfiguration.ID.ToString(),
-            Pipeline = _pipelineSelectionUI1.Pipeline == null? "0" : _pipelineSelectionUI1.Pipeline.ID.ToString(),
-            Datasets = _datasets.All(tlvDatasets.IsChecked) ? "" :
-                string.Join(",",_datasets.Where(tlvDatasets.IsChecked).Select(sds => sds.ExtractableDataSet.ID.ToString()).ToArray())
+            Pipeline = _pipelineSelectionUI1.Pipeline == null ? "0" : _pipelineSelectionUI1.Pipeline.ID.ToString(),
+            Datasets = _datasets.All(tlvDatasets.IsChecked)
+                ? ""
+                : string.Join(",",
+                    _datasets.Where(tlvDatasets.IsChecked).Select(sds => sds.ExtractableDataSet.ID.ToString())
+                        .ToArray())
         };
     }
 
     private bool _isFirstTime = true;
+
     public override void SetDatabaseObject(IActivateItems activator, ExtractionConfiguration databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
@@ -255,13 +259,14 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi
 
 
         if (!_commonFunctionality.IsSetup)
-            _commonFunctionality.SetUp(RDMPCollection.None, tlvDatasets,activator,olvName,null,new RDMPCollectionCommonFunctionalitySettings
-            {
-                AddFavouriteColumn = false,
-                SuppressChildrenAdder=true,
-                SuppressActivate = true,
-                AddCheckColumn = false
-            });
+            _commonFunctionality.SetUp(RDMPCollection.None, tlvDatasets, activator, olvName, null,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    AddFavouriteColumn = false,
+                    SuppressChildrenAdder = true,
+                    SuppressActivate = true,
+                    AddCheckColumn = false
+                });
 
         var checkedBefore = tlvDatasets.CheckedObjects;
 
@@ -292,9 +297,10 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi
         {
             //create a new selection UI (pick an extraction pipeliene UI)
             var useCase = ExtractionPipelineUseCase.DesignTime();
-            var factory = new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, null, useCase);
+            var factory =
+                new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, null, useCase);
 
-            _pipelineSelectionUI1 = factory.Create(activator,"Extraction Pipeline", DockStyle.Fill);
+            _pipelineSelectionUI1 = factory.Create(activator, "Extraction Pipeline", DockStyle.Fill);
             _pipelineSelectionUI1.CollapseToSingleLineMode();
 
             //if the configuration has a default then use that pipeline
@@ -303,36 +309,40 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi
 
             _pipelineSelectionUI1.PipelineChanged += ResetChecksUI;
 
-            _pipelinePanel = new ToolStripControlHost((Control) _pipelineSelectionUI1);
+            _pipelinePanel = new ToolStripControlHost((Control)_pipelineSelectionUI1);
 
-            helpIcon1.SetHelpText("Extraction", "It is a wise idea to click here if you don't know what this screen can do for you...", BuildHelpFlow());
+            helpIcon1.SetHelpText("Extraction",
+                "It is a wise idea to click here if you don't know what this screen can do for you...",
+                BuildHelpFlow());
         }
 
         CommonFunctionality.Add(new ToolStripLabel("Extraction Pipeline:"));
         CommonFunctionality.Add(_pipelinePanel);
-        CommonFunctionality.AddHelpStringToToolStrip("Extraction Pipeline","The sequence of components that will be executed in order to enable the datasets to be extracted. This will start with a source component that performs the linkage against the cohort followed by subsequent components (if any) and then a destination component that writes the final records (e.g. to database / csv file etc).");
+        CommonFunctionality.AddHelpStringToToolStrip("Extraction Pipeline",
+            "The sequence of components that will be executed in order to enable the datasets to be extracted. This will start with a source component that performs the linkage against the cohort followed by subsequent components (if any) and then a destination component that writes the final records (e.g. to database / csv file etc).");
 
         CommonFunctionality.AddToMenu(new ExecuteCommandRelease(activator).SetTarget(_extractionConfiguration));
 
         CommonFunctionality.Add(lblMaxConcurrent);
         CommonFunctionality.Add(tbMaxConcurrent);
-        CommonFunctionality.AddHelpStringToToolStrip("Concurrent", "The maximum number of datasets to extract at once.  Once this number is reached the remainder will be queued and only started when one of the other extracting datasets completes.");
+        CommonFunctionality.AddHelpStringToToolStrip("Concurrent",
+            "The maximum number of datasets to extract at once.  Once this number is reached the remainder will be queued and only started when one of the other extracting datasets completes.");
 
         checkAndExecuteUI1.SetItemActivator(activator);
 
-        foreach(var o in new[] { _globalsFolder, _coreDatasetsFolder, _projectSpecificDatasetsFolder})
+        foreach (var o in new[] { _globalsFolder, _coreDatasetsFolder, _projectSpecificDatasetsFolder })
             tlvDatasets.Expand(o);
 
         if (_isFirstTime)
         {
             tlvDatasets.CheckAll();
             foreach (var disabledObject in tlvDatasets.DisabledObjects.OfType<ArbitraryFolderNode>())
-            {
                 tlvDatasets.UncheckObject(disabledObject);
-            }
         }
         else if (checkedBefore.Count > 0)
+        {
             tlvDatasets.CheckObjects(checkedBefore);
+        }
 
         _isFirstTime = false;
     }
@@ -345,7 +355,7 @@ private void ResetChecksUI(object sender, EventArgs e)
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
-        tlvDatasets.ModelFilter = new TextMatchFilter(tlvDatasets,tbFilter.Text);
+        tlvDatasets.ModelFilter = new TextMatchFilter(tlvDatasets, tbFilter.Text);
         tlvDatasets.UseFiltering = true;
     }
 
@@ -358,13 +368,18 @@ private void GetBundledStuff()
             var eds = sds.ExtractableDataSet;
 
             foreach (var document in eds.Catalogue.GetAllSupportingDocuments(FetchOptions.ExtractableLocals))
-                _bundledStuff.Add( new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds,document));
+                _bundledStuff.Add(
+                    new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds, document));
 
-            foreach (var supportingSQLTable in eds.Catalogue.GetAllSupportingSQLTablesForCatalogue(FetchOptions.ExtractableLocals))
-                _bundledStuff.Add(new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds, supportingSQLTable));
+            foreach (var supportingSQLTable in eds.Catalogue.GetAllSupportingSQLTablesForCatalogue(FetchOptions
+                         .ExtractableLocals))
+                _bundledStuff.Add(
+                    new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds,
+                        supportingSQLTable));
 
             foreach (var lookup in eds.Catalogue.GetLookupTableInfoList())
-                _bundledStuff.Add(new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds, lookup));
+                _bundledStuff.Add(
+                    new ObjectUsedByOtherObjectNode<ISelectedDataSets, IMapsDirectlyToDatabaseTable>(sds, lookup));
         }
     }
 
@@ -385,17 +400,13 @@ private void tlvDatasets_ItemChecked(object sender, ItemCheckedEventArgs e)
         checkAndExecuteUI1.Enabled = tlvDatasets.CheckedObjects.Cast<object>().OfType<SelectedDataSets>().Any();
     }
 
-    public override string GetTabName()
-    {
-        return $"{_extractionConfiguration.GetProjectHint(true)} {base.GetTabName()}";
-    }
-    public override string GetTabToolTip()
-    {
-        return $"'{base.GetTabName()}' - {_extractionConfiguration.GetProjectHint(false)}";
-    }
+    public override string GetTabName() => $"{_extractionConfiguration.GetProjectHint(true)} {base.GetTabName()}";
+
+    public override string GetTabToolTip() =>
+        $"'{base.GetTabName()}' - {_extractionConfiguration.GetProjectHint(false)}";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExecuteExtractionUI_Design, UserControl>))]
-public abstract class ExecuteExtractionUI_Design:RDMPSingleDatabaseObjectControl<ExtractionConfiguration>
+public abstract class ExecuteExtractionUI_Design : RDMPSingleDatabaseObjectControl<ExtractionConfiguration>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ProjectUI/ExtractCommandStateMonitor.cs b/Rdmp.UI/ProjectUI/ExtractCommandStateMonitor.cs
index 6300a02bf0..84e72b5476 100644
--- a/Rdmp.UI/ProjectUI/ExtractCommandStateMonitor.cs
+++ b/Rdmp.UI/ProjectUI/ExtractCommandStateMonitor.cs
@@ -13,20 +13,17 @@ namespace Rdmp.UI.ProjectUI;
 
 internal class ExtractCommandStateMonitor
 {
-    private Dictionary<IExtractCommand,ExtractCommandState> CommandStates = new();
+    private Dictionary<IExtractCommand, ExtractCommandState> CommandStates = new();
     private Dictionary<IExtractCommand, Dictionary<object, ExtractCommandState>> CommandSubStates = new();
 
     private Dictionary<object, ExtractCommandState> GlobalsStates = new();
 
-    public bool Contains(IExtractCommand cmd)
-    {
-        return CommandStates.ContainsKey(cmd);
-    }
+    public bool Contains(IExtractCommand cmd) => CommandStates.ContainsKey(cmd);
 
     public void Add(IExtractDatasetCommand cmd)
     {
-        CommandStates.Add(cmd,cmd.State);
-        CommandSubStates.Add(cmd,cmd.DatasetBundle.States);
+        CommandStates.Add(cmd, cmd.State);
+        CommandSubStates.Add(cmd, cmd.DatasetBundle.States);
     }
 
     public void SaveState(IExtractDatasetCommand cmd)
@@ -42,7 +39,7 @@ public void SaveState(IExtractDatasetCommand cmd)
             toUpdateSubstates[substate.Key] = substate.Value;
         }
     }
-        
+
     public IEnumerable<object> GetAllChangedObjects(IExtractDatasetCommand cmd)
     {
         if (CommandStates[cmd] != cmd.State)
@@ -52,6 +49,7 @@ public IEnumerable<object> GetAllChangedObjects(IExtractDatasetCommand cmd)
             if (CommandSubStates[cmd][substate.Key] != substate.Value)
                 yield return substate.Key;
     }
+
     public void SaveState(GlobalsBundle globals)
     {
         foreach (var gkvp in globals.States)
@@ -65,17 +63,16 @@ public void SaveState(GlobalsBundle globals)
     public IEnumerable<object> GetAllChangedObjects(GlobalsBundle globals)
     {
         foreach (var gkvp in globals.States)
-        {
             if (!GlobalsStates.ContainsKey(gkvp.Key))
             {
                 GlobalsStates.Add(gkvp.Key, gkvp.Value);
-                yield return gkvp.Key;//new objects also are returned as changed
+                yield return gkvp.Key; //new objects also are returned as changed
             }
             else
                 //State has changed since last save
             if (GlobalsStates[gkvp.Key] != gkvp.Value)
+            {
                 yield return gkvp.Key;
-        }
-            
+            }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ProjectUI/ExtractionConfigurationUI.cs b/Rdmp.UI/ProjectUI/ExtractionConfigurationUI.cs
index 7870745ff4..a854847faf 100644
--- a/Rdmp.UI/ProjectUI/ExtractionConfigurationUI.cs
+++ b/Rdmp.UI/ProjectUI/ExtractionConfigurationUI.cs
@@ -50,14 +50,15 @@ public partial class ExtractionConfigurationUI : ExtractionConfigurationUI_Desig
     public ExtractionConfigurationUI()
     {
         InitializeComponent();
-            
+
         tcRequest.Title = "Request Ticket";
         tcRequest.TicketTextChanged += tcRequest_TicketTextChanged;
 
         tcRelease.Title = "Release Ticket";
         tcRelease.TicketTextChanged += tcRelease_TicketTextChanged;
 
-        cbxCohortIdentificationConfiguration.PropertySelector = sel => sel.Cast<CohortIdentificationConfiguration>().Select(cic=> cic == null? "<<None>>":cic.Name);
+        cbxCohortIdentificationConfiguration.PropertySelector = sel =>
+            sel.Cast<CohortIdentificationConfiguration>().Select(cic => cic == null ? "<<None>>" : cic.Name);
         AssociatedCollection = RDMPCollection.DataExport;
     }
 
@@ -67,7 +68,8 @@ private void tcRequest_TicketTextChanged(object sender, EventArgs e)
             return;
 
         //don't change if it is already that
-        if (_extractionConfiguration.RequestTicket != null && _extractionConfiguration.RequestTicket.Equals(tcRequest.TicketText))
+        if (_extractionConfiguration.RequestTicket != null &&
+            _extractionConfiguration.RequestTicket.Equals(tcRequest.TicketText))
             return;
 
         _extractionConfiguration.RequestTicket = tcRequest.TicketText;
@@ -81,7 +83,8 @@ private void tcRelease_TicketTextChanged(object sender, EventArgs e)
             return;
 
         //don't change if it is already that
-        if (_extractionConfiguration.ReleaseTicket != null && _extractionConfiguration.ReleaseTicket.Equals(tcRelease.TicketText))
+        if (_extractionConfiguration.ReleaseTicket != null &&
+            _extractionConfiguration.ReleaseTicket.Equals(tcRelease.TicketText))
             return;
 
         _extractionConfiguration.ReleaseTicket = tcRelease.TicketText;
@@ -89,10 +92,10 @@ private void tcRelease_TicketTextChanged(object sender, EventArgs e)
     }
 
     private bool _bLoading = false;
-        
+
     public override void SetDatabaseObject(IActivateItems activator, ExtractionConfiguration databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         _bLoading = true;
         _extractionConfiguration = databaseObject;
 
@@ -100,9 +103,10 @@ public override void SetDatabaseObject(IActivateItems activator, ExtractionConfi
 
         SetupPipelineSelectionExtraction();
         SetupPipelineSelectionCohortRefresh();
-            
-        pbCic.Image = activator.CoreIconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration,OverlayKind.Link).ImageToBitmap();
-            
+
+        pbCic.Image = activator.CoreIconProvider
+            .GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Link).ImageToBitmap();
+
         tbCreated.Text = _extractionConfiguration.dtCreated.ToString();
         tcRelease.TicketText = _extractionConfiguration.ReleaseTicket;
         tcRequest.TicketText = _extractionConfiguration.RequestTicket;
@@ -115,8 +119,8 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Extrac
         base.SetBindings(rules, databaseObject);
 
         Bind(tbUsername, "Text", "Username", c => c.Username);
-        Bind(tbID,"Text", "ID",c=>c.ID);
-        Bind(tbDescription,"Text","Description",c=>c.Description);
+        Bind(tbID, "Text", "ID", c => c.ID);
+        Bind(tbDescription, "Text", "Description", c => c.Description);
     }
 
     public override void SetItemActivator(IActivateItems activator)
@@ -128,7 +132,8 @@ public override void SetItemActivator(IActivateItems activator)
 
     private void SetupCohortIdentificationConfiguration()
     {
-        cbxCohortIdentificationConfiguration.DataSource = Activator.CoreChildProvider.AllCohortIdentificationConfigurations;
+        cbxCohortIdentificationConfiguration.DataSource =
+            Activator.CoreChildProvider.AllCohortIdentificationConfigurations;
         cbxCohortIdentificationConfiguration.SelectedItem = _extractionConfiguration.CohortIdentificationConfiguration;
     }
 
@@ -144,13 +149,17 @@ private void SetupPipelineSelectionCohortRefresh()
             var useCase = new CohortCreationRequest(_extractionConfiguration);
 
             //the user is DefaultPipeline_ID field of ExtractionConfiguration
-            var user = new PipelineUser(typeof(ExtractionConfiguration).GetProperty("CohortRefreshPipeline_ID"), _extractionConfiguration);
+            var user = new PipelineUser(typeof(ExtractionConfiguration).GetProperty("CohortRefreshPipeline_ID"),
+                _extractionConfiguration);
 
             //create the UI for this situation
-            var factory = new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, user, useCase);
-            _cohortRefreshingPipelineSelectionUI = factory.Create(Activator,"Cohort Refresh Pipeline", DockStyle.Fill,pChooseCohortRefreshPipeline);
+            var factory =
+                new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, user, useCase);
+            _cohortRefreshingPipelineSelectionUI = factory.Create(Activator, "Cohort Refresh Pipeline", DockStyle.Fill,
+                pChooseCohortRefreshPipeline);
             _cohortRefreshingPipelineSelectionUI.Pipeline = _extractionConfiguration.CohortRefreshPipeline;
-            _cohortRefreshingPipelineSelectionUI.PipelineChanged += _cohortRefreshingPipelineSelectionUI_PipelineChanged;
+            _cohortRefreshingPipelineSelectionUI.PipelineChanged +=
+                _cohortRefreshingPipelineSelectionUI_PipelineChanged;
             _cohortRefreshingPipelineSelectionUI.CollapseToSingleLineMode();
         }
         catch (Exception e)
@@ -164,7 +173,8 @@ private void _cohortRefreshingPipelineSelectionUI_PipelineChanged(object sender,
         ragSmiley1Refresh.Reset();
         try
         {
-            new CohortCreationRequest(_extractionConfiguration).GetEngine(_cohortRefreshingPipelineSelectionUI.Pipeline, new ThrowImmediatelyDataLoadEventListener());
+            new CohortCreationRequest(_extractionConfiguration).GetEngine(_cohortRefreshingPipelineSelectionUI.Pipeline,
+                new ThrowImmediatelyDataLoadEventListener());
         }
         catch (Exception ex)
         {
@@ -182,17 +192,19 @@ private void SetupPipelineSelectionExtraction()
         var useCase = ExtractionPipelineUseCase.DesignTime();
 
         //the user is DefaultPipeline_ID field of ExtractionConfiguration
-        var user = new PipelineUser(typeof(ExtractionConfiguration).GetProperty("DefaultPipeline_ID"), _extractionConfiguration);
+        var user = new PipelineUser(typeof(ExtractionConfiguration).GetProperty("DefaultPipeline_ID"),
+            _extractionConfiguration);
 
         //create the UI for this situation
         var factory = new PipelineSelectionUIFactory(Activator.RepositoryLocator.CatalogueRepository, user, useCase);
-        _extractionPipelineSelectionUI = factory.Create(Activator,"Extraction Pipeline", DockStyle.Fill, pChooseExtractionPipeline);
+        _extractionPipelineSelectionUI =
+            factory.Create(Activator, "Extraction Pipeline", DockStyle.Fill, pChooseExtractionPipeline);
         _extractionPipelineSelectionUI.CollapseToSingleLineMode();
     }
 
     private void cbxCohortIdentificationConfiguration_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(_bLoading)
+        if (_bLoading)
             return;
 
         if (cbxCohortIdentificationConfiguration.SelectedItem is not CohortIdentificationConfiguration cic)
@@ -208,14 +220,10 @@ private void btnClearCic_Click(object sender, EventArgs e)
         cbxCohortIdentificationConfiguration.SelectedItem = null;
     }
 
-    public override string GetTabName()
-    {
-        return $"{_extractionConfiguration.GetProjectHint(true)} {base.GetTabName()}";
-    }
-    public override string GetTabToolTip()
-    {
-        return $"'{base.GetTabName()}' - {_extractionConfiguration.GetProjectHint(false)}";
-    }
+    public override string GetTabName() => $"{_extractionConfiguration.GetProjectHint(true)} {base.GetTabName()}";
+
+    public override string GetTabToolTip() =>
+        $"'{base.GetTabName()}' - {_extractionConfiguration.GetProjectHint(false)}";
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ExtractionConfigurationUI_Design, UserControl>))]
diff --git a/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraph.cs b/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraph.cs
index 2b0ec3c4bf..0ee5078442 100644
--- a/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraph.cs
+++ b/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraph.cs
@@ -33,36 +33,36 @@ namespace Rdmp.UI.ProjectUI.Graphs;
 /// 
 /// <para>You can speed up these graphs by viewing the SQL generated by the system and running it in SQL Management Studio with the Query Analyser turned on and creating appropriate indexes.</para>
 /// </summary>
-public sealed class ExtractionAggregateGraphUI:AggregateGraphUI ,IObjectCollectionControl
+public sealed class ExtractionAggregateGraphUI : AggregateGraphUI, IObjectCollectionControl
 {
     public ExtractDatasetCommand Request { get; private set; }
     private ExtractionAggregateGraphObjectCollection _collection;
 
     protected override AggregateBuilder GetQueryBuilder(AggregateConfiguration aggregateConfiguration)
     {
-        if(Request == null)
+        if (Request == null)
             throw new Exception("Request has not been initialized yet, has SetCollection not yet been called?");
 
         var repo = new MemoryCatalogueRepository();
 
         //we are hijacking the query builder creation for this graph
-        var toReturn =  base.GetQueryBuilder(aggregateConfiguration);
+        var toReturn = base.GetQueryBuilder(aggregateConfiguration);
 
         //instead of only filtering on the filters of the Aggregate, also filter on the configurations data extraction filters AND on the cohort ID
-        var spontedContainer = new SpontaneouslyInventedFilterContainer(repo,null, null, FilterContainerOperation.AND);
+        var spontedContainer = new SpontaneouslyInventedFilterContainer(repo, null, null, FilterContainerOperation.AND);
 
         //the aggregate has filters (it probably does)
         if (toReturn.RootFilterContainer != null)
-            spontedContainer.AddChild(toReturn.RootFilterContainer);//add it
+            spontedContainer.AddChild(toReturn.RootFilterContainer); //add it
 
         //the cohort extraction request has filters?
-        if(Request.QueryBuilder.RootFilterContainer != null)
-            spontedContainer.AddChild(Request.QueryBuilder.RootFilterContainer);//add those too
+        if (Request.QueryBuilder.RootFilterContainer != null)
+            spontedContainer.AddChild(Request.QueryBuilder.RootFilterContainer); //add those too
 
         //now also add the cohort where statement
         var cohortWhereSql = Request.ExtractableCohort.WhereSQL();
 
-        var spontedFilter = new SpontaneouslyInventedFilter(repo,spontedContainer, cohortWhereSql, "Cohort ID Filter",
+        var spontedFilter = new SpontaneouslyInventedFilter(repo, spontedContainer, cohortWhereSql, "Cohort ID Filter",
             $"Cohort ID Filter ({Request.ExtractableCohort})", null);
 
         //now we need to figure out what impromptu joins are going on in the main query extraction 
@@ -77,15 +77,17 @@ protected override AggregateBuilder GetQueryBuilder(AggregateConfiguration aggre
         customLines = customLines.Where(c => c.Text != Request.ExtractableCohort.WhereSQL()).ToArray();
 
         //now all that should be left are custom lines which are joins (in theory, otherwise complain)
-        if(customLines.Any(c => c.LocationToInsert != QueryComponent.JoinInfoJoin))
-            throw new QueryBuildingException("We were busy hijacking the ISqlQueryBuilder returned by Request.GetQueryBuilder and were looking for the custom table / cohort table join custom lines but then we noticed there were other custom lines in the query (like non join ones!)");
+        if (customLines.Any(c => c.LocationToInsert != QueryComponent.JoinInfoJoin))
+            throw new QueryBuildingException(
+                "We were busy hijacking the ISqlQueryBuilder returned by Request.GetQueryBuilder and were looking for the custom table / cohort table join custom lines but then we noticed there were other custom lines in the query (like non join ones!)");
 
-        if(!customLines.Any())
-            throw new Exception("Expected there to be at least 1 custom join line returned by the ISqlQueryBuilder fetched with Request.GetQueryBuilder but it had 0 so how did it know what cohort table to join against?");
+        if (!customLines.Any())
+            throw new Exception(
+                "Expected there to be at least 1 custom join line returned by the ISqlQueryBuilder fetched with Request.GetQueryBuilder but it had 0 so how did it know what cohort table to join against?");
 
         foreach (var line in customLines)
-            toReturn.AddCustomLine(line.Text,QueryComponent.JoinInfoJoin);
-            
+            toReturn.AddCustomLine(line.Text, QueryComponent.JoinInfoJoin);
+
         spontedContainer.AddChild(spontedFilter);
 
         //now set the original aggregate that we are hijacking to have the new sponted container (which includes the original filters + the extraction ones + the cohort ID one)
@@ -93,20 +95,22 @@ protected override AggregateBuilder GetQueryBuilder(AggregateConfiguration aggre
 
         return toReturn;
     }
-        
+
     protected override object[] GetRibbonObjects()
     {
         if (_collection == null)
             return base.GetRibbonObjects();
 
-        return new object[] { Request.Configuration,"Graphing Extraction Query"};
+        return new object[] { Request.Configuration, "Graphing Extraction Query" };
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
         if (e.Object.Equals(_collection.SelectedDataSets))
             if (e.Exists)
+            {
                 _collection.SelectedDataSets.RevertToDatabaseState();
+            }
             else
             {
                 Close();
@@ -114,14 +118,16 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
             }
         else if (e.Object.Equals(_collection.Graph))
             if (e.Exists)
+            {
                 _collection.Graph.RevertToDatabaseState();
+            }
             else
             {
                 Close();
                 return;
             }
         else
-            return;//change was not to a relevant object
+            return; //change was not to a relevant object
 
         //now reload the graph because the change was to a relevant object
         LoadGraphAsync();
@@ -131,32 +137,26 @@ private void Close()
     {
         var parent = ParentForm;
         if (parent != null && !parent.IsDisposed)
-            parent.Close();//self destruct because object was deleted
+            parent.Close(); //self destruct because object was deleted
     }
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
     {
-        _collection = (ExtractionAggregateGraphObjectCollection) collection;
+        _collection = (ExtractionAggregateGraphObjectCollection)collection;
         SetItemActivator(activator);
 
         var config = _collection.SelectedDataSets.ExtractionConfiguration;
         var ds = _collection.SelectedDataSets.ExtractableDataSet;
 
-        Request = new ExtractDatasetCommand( config, new ExtractableDatasetBundle(ds));
+        Request = new ExtractDatasetCommand(config, new ExtractableDatasetBundle(ds));
         Request.GenerateQueryBuilder();
         BuildMenu(activator);
 
-        SetAggregate(activator,_collection.Graph);
+        SetAggregate(activator, _collection.Graph);
         LoadGraphAsync();
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
-    public override string GetTabName()
-    {
-        return _collection.SelectedDataSets.ToString();
-    }
+    public override string GetTabName() => _collection.SelectedDataSets.ToString();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraphObjectCollection.cs b/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraphObjectCollection.cs
index 9d488877f3..da72bcb488 100644
--- a/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraphObjectCollection.cs
+++ b/Rdmp.UI/ProjectUI/Graphs/ExtractionAggregateGraphObjectCollection.cs
@@ -20,12 +20,12 @@ public class ExtractionAggregateGraphObjectCollection : PersistableObjectCollect
     /// The extraction dataset (in a given <see cref="ExtractionConfiguration"/>) to which the <see cref="Graph"/> results
     /// should be limited.  The graph should only depict records appearing in this extract.
     /// </summary>
-    public SelectedDataSets SelectedDataSets => (SelectedDataSets) DatabaseObjects[0];
+    public SelectedDataSets SelectedDataSets => (SelectedDataSets)DatabaseObjects[0];
 
     /// <summary>
     /// The graph to be shown
     /// </summary>
-    public AggregateConfiguration Graph => (AggregateConfiguration) DatabaseObjects[1];
+    public AggregateConfiguration Graph => (AggregateConfiguration)DatabaseObjects[1];
 
 
     /// <summary>
@@ -33,7 +33,6 @@ public class ExtractionAggregateGraphObjectCollection : PersistableObjectCollect
     /// </summary>
     public ExtractionAggregateGraphObjectCollection()
     {
-
     }
 
     /// <summary>
@@ -41,7 +40,8 @@ public ExtractionAggregateGraphObjectCollection()
     /// </summary>
     /// <param name="selectedDataSet"></param>
     /// <param name="graph"></param>
-    public ExtractionAggregateGraphObjectCollection(SelectedDataSets selectedDataSet, AggregateConfiguration graph):this()
+    public ExtractionAggregateGraphObjectCollection(SelectedDataSets selectedDataSet, AggregateConfiguration graph) :
+        this()
     {
         DatabaseObjects.Add(selectedDataSet);
         DatabaseObjects.Add(graph);
@@ -56,7 +56,7 @@ public ExtractionAggregateGraphObjectCollection(SelectedDataSets selectedDataSet
     /// <returns></returns>
     public bool IsImpossible(out string reason)
     {
-        if(SelectedDataSets.ExtractionConfiguration.Cohort_ID == null)
+        if (SelectedDataSets.ExtractionConfiguration.Cohort_ID == null)
         {
             reason = "ExtractionConfiguration does not have a cohort";
             return true;
diff --git a/Rdmp.UI/ProjectUI/ProjectUI.cs b/Rdmp.UI/ProjectUI/ProjectUI.cs
index 445c04fd05..a5b9a17387 100644
--- a/Rdmp.UI/ProjectUI/ProjectUI.cs
+++ b/Rdmp.UI/ProjectUI/ProjectUI.cs
@@ -46,26 +46,19 @@ namespace Rdmp.UI.ProjectUI;
 public partial class ProjectUI : ProjectUI_Design, ISaveableUI
 {
     private Project _project;
-        
+
     private void SetCohorts()
     {
-        if(_project == null || _project.ProjectNumber == null)
+        if (_project == null || _project.ProjectNumber == null)
             return;
 
-        if(Activator.CoreChildProvider is not DataExportChildProvider dxChildProvider)
-        {
-            return;
-        }
+        if (Activator.CoreChildProvider is not DataExportChildProvider dxChildProvider) return;
 
         var toShow = new List<ExtractableCohort>();
 
-        foreach(var c in dxChildProvider.Cohorts)
-        {
+        foreach (var c in dxChildProvider.Cohorts)
             if (c.ExternalProjectNumber == _project.ProjectNumber)
-            {
                 toShow.Add(c);
-            }
-        }
 
         extractableCohortCollection1.SetupFor(toShow.ToArray());
     }
@@ -79,7 +72,6 @@ private void SetCohorts()
     /// </summary>
     private int _rightClickedRowExtractionConfigurationID = -1;
 
-        
 
     public ProjectUI()
     {
@@ -87,14 +79,13 @@ public ProjectUI()
 
         dataGridView1.ColumnAdded += (s, e) => e.Column.FillWeight = 1;
         mi_SetDescription.Click += new EventHandler(mi_SetDescription_Click);
-            
+
         tcMasterTicket.Title = "Master Ticket";
         tcMasterTicket.TicketTextChanged += tcMasterTicket_TicketTextChanged;
 
         AssociatedCollection = RDMPCollection.DataExport;
     }
 
-      
 
     public void RefreshLists()
     {
@@ -106,13 +97,13 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Projec
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID, "Text", "ID", p => p.ID); 
+        Bind(tbID, "Text", "ID", p => p.ID);
         Bind(tbName, "Text", "Name", p => p.Name);
     }
 
     public override void SetDatabaseObject(IActivateItems activator, Project databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         //now load the UI form 
         _project = databaseObject;
 
@@ -194,8 +185,7 @@ private static DataTable LoadDatagridFor(Project value)
 
 
             r["Datasets"] =
-                string.Join(",",configuration.GetAllExtractableDataSets().Select(ds=>ds.ToString()));
-
+                string.Join(",", configuration.GetAllExtractableDataSets().Select(ds => ds.ToString()));
         }
 
         return dtToReturn;
@@ -207,12 +197,15 @@ private static DataTable LoadDatagridFor(Project value)
 
     private void mi_SetDescription_Click(object sender, EventArgs e)
     {
-        var toSetDescriptionOn = Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(_rightClickedRowExtractionConfigurationID);
+        var toSetDescriptionOn =
+            Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(
+                _rightClickedRowExtractionConfigurationID);
 
         if (toSetDescriptionOn.IsReleased)
             return;
 
-        var dialog = new TypeTextOrCancelDialog("Description", "Enter a Description for the Extraction:", 1000, toSetDescriptionOn.Description);
+        var dialog = new TypeTextOrCancelDialog("Description", "Enter a Description for the Extraction:", 1000,
+            toSetDescriptionOn.Description);
 
         dialog.ShowDialog(this);
 
@@ -226,12 +219,15 @@ private void mi_SetDescription_Click(object sender, EventArgs e)
 
     private void mi_ChooseFileSeparator_Click(object sender, EventArgs e)
     {
-        var toSetDescriptionOn = Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(_rightClickedRowExtractionConfigurationID);
+        var toSetDescriptionOn =
+            Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(
+                _rightClickedRowExtractionConfigurationID);
 
         if (toSetDescriptionOn.IsReleased)
             return;
 
-        var dialog = new TypeTextOrCancelDialog("Separator", "Choose a character(s) separator",3,toSetDescriptionOn.Separator);
+        var dialog = new TypeTextOrCancelDialog("Separator", "Choose a character(s) separator", 3,
+            toSetDescriptionOn.Separator);
 
         dialog.ShowDialog(this);
 
@@ -250,34 +246,31 @@ private void mi_ChooseFileSeparator_Click(object sender, EventArgs e)
 
     private void dataGridView1_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e)
     {
-
         //note that this only deals with clicking cells, to see what happens hwen user clicks in blank area of datagrid see dataGridView1_MouseClick
         if (e.RowIndex >= 0)
             if (e.Button == MouseButtons.Right)
             {
-                    
                 menu.Items.Clear();
 
-                   
-                _rightClickedRowExtractionConfigurationID = int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
 
-                var selectedExtractionConfiguration = Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(_rightClickedRowExtractionConfigurationID);
-                    
+                _rightClickedRowExtractionConfigurationID =
+                    int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
+
+                var selectedExtractionConfiguration =
+                    Activator.RepositoryLocator.DataExportRepository.GetObjectByID<ExtractionConfiguration>(
+                        _rightClickedRowExtractionConfigurationID);
+
                 menu.Items.Clear();
-                    
+
                 if (!selectedExtractionConfiguration.IsReleased)
                     menu.Items.Add(mi_SetDescription);
 
                 menu.Show(Cursor.Position.X, Cursor.Position.Y);
-                    
             }
     }
 
-        
-
     #endregion
 
-
     #endregion
 
 
@@ -299,7 +292,9 @@ private void tbExtractionDirectory_TextChanged(object sender, EventArgs e)
         try
         {
             if (!tbExtractionDirectory.Text.StartsWith("\\") && !Directory.Exists(tbExtractionDirectory.Text))
+            {
                 tbExtractionDirectory.ForeColor = Color.Red;
+            }
             else
             {
                 _project.ExtractionDirectory = tbExtractionDirectory.Text;
@@ -308,37 +303,34 @@ private void tbExtractionDirectory_TextChanged(object sender, EventArgs e)
         }
         catch (Exception)
         {
-
             tbExtractionDirectory.ForeColor = Color.Red;
         }
-            
     }
 
     private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
     {
-        if(e.ColumnIndex == -1 || e.RowIndex == -1)
+        if (e.ColumnIndex == -1 || e.RowIndex == -1)
             return;
 
         if (dataGridView1.Columns[e.ColumnIndex].Name == "Description")
         {
             //simulate a right click by setting the ID and calling the handler directly
-            _rightClickedRowExtractionConfigurationID = int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
+            _rightClickedRowExtractionConfigurationID =
+                int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
             mi_SetDescription_Click(null, null);
         }
 
         if (dataGridView1.Columns[e.ColumnIndex].Name == "Separator")
         {
             //simulate a right click by setting the ID and calling the handler directly
-            _rightClickedRowExtractionConfigurationID = int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
+            _rightClickedRowExtractionConfigurationID =
+                int.Parse(dataGridView1.Rows[e.RowIndex].Cells["ID"].Value.ToString());
             mi_ChooseFileSeparator_Click(null, null);
         }
-
-
     }
 
     private void tbProjectNumber_TextChanged(object sender, EventArgs e)
     {
-            
         if (string.IsNullOrWhiteSpace(tbProjectNumber.Text))
         {
             _project.ProjectNumber = null;
@@ -351,11 +343,10 @@ private void tbProjectNumber_TextChanged(object sender, EventArgs e)
             tbProjectNumber.ForeColor = Color.Black;
             _project.SaveToDatabase();
         }
-        catch (Exception )
+        catch (Exception)
         {
             tbProjectNumber.ForeColor = Color.Red;
         }
-            
     }
 
     private void tcMasterTicket_TicketTextChanged(object sender, EventArgs e)
@@ -380,6 +371,6 @@ private void btnBrowse_Click(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ProjectUI_Design, UserControl>))]
-public abstract class ProjectUI_Design:RDMPSingleDatabaseObjectControl<Project>
+public abstract class ProjectUI_Design : RDMPSingleDatabaseObjectControl<Project>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Raceway/DatasetRaceway.cs b/Rdmp.UI/Raceway/DatasetRaceway.cs
index 240e85869f..f4381ca5ad 100644
--- a/Rdmp.UI/Raceway/DatasetRaceway.cs
+++ b/Rdmp.UI/Raceway/DatasetRaceway.cs
@@ -38,9 +38,14 @@ namespace Rdmp.UI.Raceway;
 /// </summary>
 public partial class DatasetRaceway : RDMPUserControl, IDashboardableControl
 {
-    private ToolStripButton btnAddCatalogue = new("Add Catalogue"){Name= "btnAddCatalogue" };
-    private ToolStripButton btnRemoveAll = new("Clear",FamFamFamIcons.delete_multi.ImageToBitmap()) { Name = "btnRemoveAll" };
-    private ToolStripButton btnAddExtractableDatasetPackage = new("Add Package") { Name = "btnAddExtractableDatasetPackage" };
+    private ToolStripButton btnAddCatalogue = new("Add Catalogue") { Name = "btnAddCatalogue" };
+
+    private ToolStripButton btnRemoveAll = new("Clear", FamFamFamIcons.delete_multi.ImageToBitmap())
+        { Name = "btnRemoveAll" };
+
+    private ToolStripButton btnAddExtractableDatasetPackage =
+        new("Add Package") { Name = "btnAddExtractableDatasetPackage" };
+
     private ToolStripLabel toolStripLabel1 = new("Show Period") { Name = "toolStripLabel1" };
     private ToolStripComboBox ddShowPeriod = new() { Name = "ddShowPeriod", Size = new Size(121, 25) };
     private ToolStripButton cbIgnoreRowCounts = new() { Name = "cbIgnoreRowCounts" };
@@ -57,7 +62,7 @@ public DatasetRaceway()
         cbIgnoreRowCounts.CheckedChanged += cbIgnoreRowCounts_CheckedChanged;
         btnAddExtractableDatasetPackage.Click += btnAddExtractableDatasetPackage_Click;
 
-        ddShowPeriod.ComboBox.DataSource = Enum.GetValues(typeof (RacewayShowPeriod));
+        ddShowPeriod.ComboBox.DataSource = Enum.GetValues(typeof(RacewayShowPeriod));
 
         btnRemoveAll.Image = FamFamFamIcons.delete_multi.ImageToBitmap();
         _ignoreRowCounts = CatalogueIcons.RowCounts_Ignore.ImageToBitmap();
@@ -89,7 +94,7 @@ public void GenerateChart()
         }
         catch (NotSupportedException e)
         {
-            CommonFunctionality.Fatal("Failed to get DQE Repository",e);
+            CommonFunctionality.Fatal("Failed to get DQE Repository", e);
             return;
         }
 
@@ -100,7 +105,7 @@ public void GenerateChart()
             Dictionary<DateTime, ArchivalPeriodicityCount> dictionary = null;
 
             if (eval != null)
-                dictionary = PeriodicityState.GetPeriodicityCountsForEvaluation(eval,true);
+                dictionary = PeriodicityState.GetPeriodicityCountsForEvaluation(eval, true);
 
             cataloguesToAdd.Add(cata, dictionary);
         }
@@ -108,13 +113,14 @@ public void GenerateChart()
         //every month seen in every dataset ever
         var buckets = GetBuckets(cataloguesToAdd);
 
-        racewayRenderArea.AddTracks(_activator,cataloguesToAdd, buckets, _collection.IgnoreRows);
+        racewayRenderArea.AddTracks(_activator, cataloguesToAdd, buckets, _collection.IgnoreRows);
         racewayRenderArea.Refresh();
 
         Invalidate();
     }
 
-    private DateTime[] GetBuckets(Dictionary<Catalogue, Dictionary<DateTime, ArchivalPeriodicityCount>> cataloguesDictionary)
+    private DateTime[] GetBuckets(
+        Dictionary<Catalogue, Dictionary<DateTime, ArchivalPeriodicityCount>> cataloguesDictionary)
     {
         var buckets = new List<DateTime>();
 
@@ -156,24 +162,25 @@ public enum RacewayShowPeriod
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-
     }
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
     {
         _activator = activator;
-        _collection = (DatasetRacewayObjectCollection) collection;
+        _collection = (DatasetRacewayObjectCollection)collection;
 
         SetItemActivator(activator);
 
-        btnAddCatalogue.Image = _activator.CoreIconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Import).ImageToBitmap();
-        btnAddExtractableDatasetPackage.Image = _activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage, OverlayKind.Import).ImageToBitmap();
+        btnAddCatalogue.Image = _activator.CoreIconProvider.GetImage(RDMPConcept.Catalogue, OverlayKind.Import)
+            .ImageToBitmap();
+        btnAddExtractableDatasetPackage.Image = _activator.CoreIconProvider
+            .GetImage(RDMPConcept.ExtractableDataSetPackage, OverlayKind.Import).ImageToBitmap();
 
         ddShowPeriod.ComboBox.SelectedItem = _collection.ShowPeriod;
         cbIgnoreRowCounts.Checked = _collection.IgnoreRows;
         UpdateIgnoreRowCountCheckBoxIconAndText();
 
-        if(isFirstTime)
+        if (isFirstTime)
         {
             isFirstTime = false;
             racewayRenderArea.RequestDeletion += c =>
@@ -192,23 +199,13 @@ public void SetCollection(IActivateItems activator, IPersistableObjectCollection
         CommonFunctionality.Add(cbIgnoreRowCounts);
 
         GenerateChart();
-
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
-    public string GetTabName()
-    {
-        return Text;
-    }
+    public string GetTabName() => Text;
 
-    public string GetTabToolTip()
-    {
-        return null;
-    }
+    public string GetTabToolTip() => null;
 
     public IPersistableObjectCollection ConstructEmptyCollection(DashboardControl databaseRecord)
     {
@@ -228,13 +225,14 @@ public void NotifyEditModeChange(bool isEditModeOn)
 
     private void btnAddCatalogue_Click(object sender, EventArgs e)
     {
-        if(_activator.SelectObjects(new DialogArgs {
-                   TaskDescription = "Choose which new Catalogues should be represented in the diagram."
-               },
-               _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>()
-                   .Except(_collection.GetCatalogues())
-                   .ToArray(),
-               out var selected))
+        if (_activator.SelectObjects(new DialogArgs
+                {
+                    TaskDescription = "Choose which new Catalogues should be represented in the diagram."
+                },
+                _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Catalogue>()
+                    .Except(_collection.GetCatalogues())
+                    .ToArray(),
+                out var selected))
         {
             foreach (var catalogue in selected)
                 AddCatalogue(catalogue);
@@ -259,27 +257,25 @@ private void btnRemoveAll_Click(object sender, EventArgs e)
 
     private void btnAddExtractableDatasetPackage_Click(object sender, EventArgs e)
     {
-        if(_activator.CoreChildProvider is not DataExportChildProvider dataExportChildProvider)
+        if (_activator.CoreChildProvider is not DataExportChildProvider dataExportChildProvider)
             return;
 
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "Choose a Package.  All Catalogues in the Package will be added to the diagram."
-
-           }, dataExportChildProvider.AllPackages,out var packageToAdd))
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription = "Choose a Package.  All Catalogues in the Package will be added to the diagram."
+            }, dataExportChildProvider.AllPackages, out var packageToAdd))
         {
-            var contents = _activator.RepositoryLocator.DataExportRepository.GetAllDataSets(packageToAdd, dataExportChildProvider.ExtractableDataSets);
+            var contents =
+                _activator.RepositoryLocator.DataExportRepository.GetAllDataSets(packageToAdd,
+                    dataExportChildProvider.ExtractableDataSets);
 
             foreach (var cata in contents.Select(ds => ds.Catalogue))
-            {
-                if(!_collection.GetCatalogues().Contains(cata))
-                    AddCatalogue((Catalogue) cata);
-            }
+                if (!_collection.GetCatalogues().Contains(cata))
+                    AddCatalogue((Catalogue)cata);
 
             SaveCollectionChanges();
             GenerateChart();
         }
-
     }
 
     private void AddCatalogue(Catalogue cata)
@@ -305,7 +301,6 @@ private void ddShowPeriod_DropDownClosed(object sender, EventArgs e)
 
     private void cbIgnoreRowCounts_CheckedChanged(object sender, EventArgs e)
     {
-
         UpdateIgnoreRowCountCheckBoxIconAndText();
         _collection.IgnoreRows = cbIgnoreRowCounts.Checked;
         GenerateChart();
diff --git a/Rdmp.UI/Raceway/DatasetRacewayObjectCollection.cs b/Rdmp.UI/Raceway/DatasetRacewayObjectCollection.cs
index 292e9759f1..2901f93503 100644
--- a/Rdmp.UI/Raceway/DatasetRacewayObjectCollection.cs
+++ b/Rdmp.UI/Raceway/DatasetRacewayObjectCollection.cs
@@ -27,19 +27,14 @@ public DatasetRacewayObjectCollection()
         IgnoreRows = false;
     }
 
-    public Catalogue[] GetCatalogues()
-    {
-        return DatabaseObjects.Cast<Catalogue>().ToArray();
-    }
+    public Catalogue[] GetCatalogues() => DatabaseObjects.Cast<Catalogue>().ToArray();
 
-    public override string SaveExtraText()
-    {
-        return PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
+    public override string SaveExtraText() =>
+        PersistStringHelper.SaveDictionaryToString(new Dictionary<string, string>
         {
-            {"ShowPeriod", ShowPeriod.ToString()},
-            {"IgnoreRows", IgnoreRows.ToString()}
+            { "ShowPeriod", ShowPeriod.ToString() },
+            { "IgnoreRows", IgnoreRows.ToString() }
         });
-    }
 
     public override void LoadExtraText(string s)
     {
@@ -49,13 +44,15 @@ public override void LoadExtraText(string s)
         if (dict == null || !dict.Any())
             return;
 
-        ShowPeriod = (DatasetRaceway.RacewayShowPeriod)Enum.Parse(typeof(DatasetRaceway.RacewayShowPeriod), dict["ShowPeriod"], true);
+        ShowPeriod =
+            (DatasetRaceway.RacewayShowPeriod)Enum.Parse(typeof(DatasetRaceway.RacewayShowPeriod), dict["ShowPeriod"],
+                true);
         IgnoreRows = Convert.ToBoolean(dict["IgnoreRows"]);
     }
 
     public void AddCatalogue(Catalogue catalogue)
     {
-        if(catalogue == null)
+        if (catalogue == null)
             throw new ArgumentException("Catalogue must not be null", nameof(catalogue));
 
         DatabaseObjects.Add(catalogue);
@@ -63,7 +60,7 @@ public void AddCatalogue(Catalogue catalogue)
 
     public void RemoveCatalogue(Catalogue catalogue)
     {
-        if(catalogue == null)
+        if (catalogue == null)
             throw new ArgumentException("Catalogue must not be null", nameof(catalogue));
 
         DatabaseObjects.Remove(catalogue);
diff --git a/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs b/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs
index 669f7b042a..682df38050 100644
--- a/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs
+++ b/Rdmp.UI/Raceway/RacewayRenderAreaUI.cs
@@ -33,7 +33,7 @@ namespace Rdmp.UI.Raceway;
 /// if there are any gaps or periods of duplication (e.g. where the bars double in height for a period).</para>
 /// </summary>
 [TechnicalUI]
-public partial class RacewayRenderAreaUI : UserControl,INotifyMeOfEditState
+public partial class RacewayRenderAreaUI : UserControl, INotifyMeOfEditState
 {
     private DateTime[] _buckets;
     private Pen _verticalLinesPen = new(Color.FromArgb(150, Color.White));
@@ -44,14 +44,13 @@ public RacewayRenderAreaUI()
     {
         InitializeComponent();
 
-        var colorPicker = new RainbowColorPicker(Color.Red, Color.LawnGreen,101);
-        _brushes = colorPicker.Colors.Select(c=> new SolidBrush(c)).ToArray();
+        var colorPicker = new RainbowColorPicker(Color.Red, Color.LawnGreen, 101);
+        _brushes = colorPicker.Colors.Select(c => new SolidBrush(c)).ToArray();
         DoubleBuffered = true;
 
         _mouseHeldDownTimer.Interval = 100;
         _mouseHeldDownTimer.Tick += _mouseHeldDownTimer_Tick;
         _mouseHeldDownTimer.Start();
-            
     }
 
     public event Action<Catalogue> RequestDeletion;
@@ -69,7 +68,7 @@ public void NotifyEditModeChange(bool isEditmodeOn)
     private const float MaximumRaceLaneRenderSpace = 30f;
     private SolidBrush[] _brushes;
 
-    private Dictionary<Rectangle,Catalogue> rectNoDQE = new();
+    private Dictionary<Rectangle, Catalogue> rectNoDQE = new();
     private Dictionary<Rectangle, Catalogue> rectDeleteButtons = new();
     private IActivateItems _activator;
 
@@ -83,7 +82,9 @@ public void NotifyEditModeChange(bool isEditmodeOn)
     private Dictionary<Catalogue, Dictionary<DateTime, ArchivalPeriodicityCount>> _periodicityDictionary;
     private const float MinimumRowHeight = 20;
 
-    public void AddTracks(IActivateItems activator, Dictionary<Catalogue, Dictionary<DateTime, ArchivalPeriodicityCount>> periodicityDictionary, DateTime[] buckets, bool ignoreRows)
+    public void AddTracks(IActivateItems activator,
+        Dictionary<Catalogue, Dictionary<DateTime, ArchivalPeriodicityCount>> periodicityDictionary, DateTime[] buckets,
+        bool ignoreRows)
     {
         _activator = activator;
         _buckets = buckets;
@@ -95,6 +96,7 @@ public void AddTracks(IActivateItems activator, Dictionary<Catalogue, Dictionary
     }
 
     private long frameLimiter = 0;
+
     protected override void OnMouseMove(MouseEventArgs e)
     {
         base.OnMouseMove(e);
@@ -118,7 +120,6 @@ protected override void OnMouseMove(MouseEventArgs e)
     }
 
 
-
     protected override void OnMouseClick(MouseEventArgs e)
     {
         base.OnMouseClick(e);
@@ -127,23 +128,17 @@ protected override void OnMouseClick(MouseEventArgs e)
             _activator.RequestItemEmphasis(this, new EmphasiseRequest(kvp.Value));
 
         foreach (var kvp in rectDeleteButtons.Where(r => r.Key.Contains(e.Location)).ToList())
-        {
             if (RequestDeletion != null)
-            {
                 lock (oPeriodicityDictionaryLock)
                 {
                     RequestDeletion(kvp.Value);
                     //stop rendering this Catalogue
                     _periodicityDictionary.Remove(kvp.Value);
                     Invalidate();
-
                 }
-            }
-        }
     }
 
 
-
     protected override void OnMouseDown(MouseEventArgs e)
     {
         base.OnMouseDown(e);
@@ -167,13 +162,13 @@ protected override void OnMouseDown(MouseEventArgs e)
 
         if (_allowScrollDown || _allowScrollUp)
         {
-            var scrollBarMiddle = new RectangleF(_rectScrollUp.Left, _rectScrollUp.Bottom, 20, _rectScrollDown.Top - _rectScrollUp.Bottom);
+            var scrollBarMiddle = new RectangleF(_rectScrollUp.Left, _rectScrollUp.Bottom, 20,
+                _rectScrollDown.Top - _rectScrollUp.Bottom);
             if (scrollBarMiddle.Contains(e.Location))
             {
                 _currentScrollActionBegan = DateTime.Now;
                 _currentScrollAction = ScrollActionUnderway.ScrollDragging;
                 ScrollToMouseLocation();
-
             }
         }
     }
@@ -186,14 +181,15 @@ protected override void OnMouseUp(MouseEventArgs e)
 
     private void _mouseHeldDownTimer_Tick(object sender, EventArgs e)
     {
-        if(IsDisposed)
+        if (IsDisposed)
         {
             _mouseHeldDownTimer.Stop();
             _mouseHeldDownTimer.Dispose();
             return;
         }
 
-        if (_currentScrollAction == ScrollActionUnderway.None || DateTime.Now.Subtract(_currentScrollActionBegan).TotalMilliseconds < 200)
+        if (_currentScrollAction == ScrollActionUnderway.None ||
+            DateTime.Now.Subtract(_currentScrollActionBegan).TotalMilliseconds < 200)
             return;
 
         if (_currentScrollAction == ScrollActionUnderway.ScrollingUp)
@@ -206,14 +202,13 @@ private void _mouseHeldDownTimer_Tick(object sender, EventArgs e)
             ScrollToMouseLocation();
 
         Invalidate();
-
     }
 
     protected override void OnMouseWheel(MouseEventArgs e)
     {
         base.OnMouseWheel(e);
 
-        if(e.Delta < 0)
+        if (e.Delta < 0)
             ScrollDown();
         else
             ScrollUp();
@@ -228,7 +223,7 @@ private void ScrollUp()
 
     private void ScrollDown()
     {
-        _scrollDownIndexOffset = Math.Min(GetMaxScrollDownToIndex()+1, _scrollDownIndexOffset + 1);
+        _scrollDownIndexOffset = Math.Min(GetMaxScrollDownToIndex() + 1, _scrollDownIndexOffset + 1);
     }
 
     private void ScrollToMouseLocation()
@@ -250,15 +245,15 @@ private int GetMaxScrollDownToIndex()
     {
         var indexesVisibleOnScreen = Height / MinimumRowHeight;
         var indexes = _periodicityDictionary.Count + 1;
-            
-        return (int) Math.Max(0,indexes - indexesVisibleOnScreen);
+
+        return (int)Math.Max(0, indexes - indexesVisibleOnScreen);
     }
 
     protected override void OnPaint(PaintEventArgs e)
     {
         base.OnPaint(e);
 
-        e.Graphics.FillRectangle(Brushes.Black,0,0,Width,Height);
+        e.Graphics.FillRectangle(Brushes.Black, 0, 0, Width, Height);
 
         //draw buckets
         if (_buckets == null)
@@ -266,10 +261,10 @@ protected override void OnPaint(PaintEventArgs e)
 
         var eachBucketHasThisManyPixelsOfX = (float)Width / _buckets.Length;
 
-        var heightReservedForAxis = e.Graphics.MeasureString("TEST",Font).Height + 2;
+        var heightReservedForAxis = e.Graphics.MeasureString("TEST", Font).Height + 2;
 
         var mousePosition = PointToClient(new Point(MousePosition.X, MousePosition.Y));
-            
+
         rectNoDQE.Clear();
         rectDeleteButtons.Clear();
 
@@ -278,25 +273,25 @@ protected override void OnPaint(PaintEventArgs e)
 
         _allowScrollUp = _scrollDownIndexOffset > 0;
 
-            
-            
+
         //draw the tracks
         lock (oPeriodicityDictionaryLock)
         {
-
-            var eachRaceLaneHasThisMuchYSpace = Math.Max(MinimumRowHeight,Math.Min(MaximumRaceLaneRenderSpace, (float)Height/(_periodicityDictionary.Count +1)));
+            var eachRaceLaneHasThisMuchYSpace = Math.Max(MinimumRowHeight,
+                Math.Min(MaximumRaceLaneRenderSpace, (float)Height / (_periodicityDictionary.Count + 1)));
 
 
             float startDrawingLaneAtY = 0;
             _allowScrollDown = false;
 
             var index = 0;
-            foreach (var (catalogue, dictionary) in _periodicityDictionary.OrderBy(kvp => kvp.Value == null ? $"zzzzzz{kvp.Key.Name}" : kvp.Key.Name))
+            foreach (var (catalogue, dictionary) in _periodicityDictionary.OrderBy(kvp =>
+                         kvp.Value == null ? $"zzzzzz{kvp.Key.Name}" : kvp.Key.Name))
             {
                 index++;
 
                 //skip it because of scrolling
-                if(index<=_scrollDownIndexOffset)
+                if (index <= _scrollDownIndexOffset)
                     continue;
 
                 //we have run out of space stop drawing
@@ -306,46 +301,51 @@ protected override void OnPaint(PaintEventArgs e)
                     break;
                 }
 
-                var middleLineOfCatalogueLabelY = eachRaceLaneHasThisMuchYSpace / 2 - Font.Height / 2.0 + startDrawingLaneAtY;
+                var middleLineOfCatalogueLabelY =
+                    eachRaceLaneHasThisMuchYSpace / 2 - Font.Height / 2.0 + startDrawingLaneAtY;
 
                 if (!_buckets.Any())
                 {
-                    DrawErrorText("No DQE data exists for 'Show Period'",false, e, startDrawingLaneAtY, eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
+                    DrawErrorText("No DQE data exists for 'Show Period'", false, e, startDrawingLaneAtY,
+                        eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
                 }
-                else
-                if (dictionary == null)
+                else if (dictionary == null)
                 {
-                    var textWidth = DrawErrorText($"No DQE Evaluation for {catalogue}",true,e, startDrawingLaneAtY, eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
-                    rectNoDQE.Add(new Rectangle(0, (int)startDrawingLaneAtY, (int)textWidth, (int)eachRaceLaneHasThisMuchYSpace),catalogue);
+                    var textWidth = DrawErrorText($"No DQE Evaluation for {catalogue}", true, e, startDrawingLaneAtY,
+                        eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
+                    rectNoDQE.Add(
+                        new Rectangle(0, (int)startDrawingLaneAtY, (int)textWidth, (int)eachRaceLaneHasThisMuchYSpace),
+                        catalogue);
                 }
-                else
-                if (!dictionary.Any())
+                else if (!dictionary.Any())
                 {
-                    var textWidth = DrawErrorText($"Table(s) were empty for {catalogue}", true, e, startDrawingLaneAtY, eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
-                    rectNoDQE.Add(new Rectangle(0, (int)startDrawingLaneAtY, (int)textWidth, (int)eachRaceLaneHasThisMuchYSpace), catalogue);
+                    var textWidth = DrawErrorText($"Table(s) were empty for {catalogue}", true, e, startDrawingLaneAtY,
+                        eachRaceLaneHasThisMuchYSpace, middleLineOfCatalogueLabelY);
+                    rectNoDQE.Add(
+                        new Rectangle(0, (int)startDrawingLaneAtY, (int)textWidth, (int)eachRaceLaneHasThisMuchYSpace),
+                        catalogue);
                 }
                 else
                 {
                     //get the maximum number of rows regardless of consequence found in any data month
-                    var maxRowsInAnyMonth = dictionary.Max(r=>r.Value.Total);
+                    var maxRowsInAnyMonth = dictionary.Max(r => r.Value.Total);
 
                     for (var i = 0; i < _buckets.Length; i++)
                     {
-
                         Brush brush;
                         float lineHeightPercentage;
 
                         var good = 0;
                         var total = 0;
 
-                        if (dictionary.TryGetValue(_buckets[i],out var apcCount))
+                        if (dictionary.TryGetValue(_buckets[i], out var apcCount))
                         {
                             good = apcCount.CountGood;
                             total = apcCount.Total;
 
                             var ratioGood = (float)good / total;
 
-                            brush = _brushes[(int) (ratioGood*100)];
+                            brush = _brushes[(int)(ratioGood * 100)];
 
                             lineHeightPercentage = (float)total / maxRowsInAnyMonth;
                         }
@@ -364,10 +364,12 @@ protected override void OnPaint(PaintEventArgs e)
 
                         var widthOfBarToDraw = eachBucketHasThisManyPixelsOfX;
 
-                        var rectToFill = new RectangleF(i*widthOfBarToDraw,startDrawingLaneAtY + emptyYSpace,widthOfBarToDraw, heightOfBarToDraw);
+                        var rectToFill = new RectangleF(i * widthOfBarToDraw, startDrawingLaneAtY + emptyYSpace,
+                            widthOfBarToDraw, heightOfBarToDraw);
                         e.Graphics.FillRectangle(brush, rectToFill);
 
-                        var fullRectHitbox = new RectangleF(rectToFill.X, startDrawingLaneAtY, widthOfBarToDraw, eachRaceLaneHasThisMuchYSpace);
+                        var fullRectHitbox = new RectangleF(rectToFill.X, startDrawingLaneAtY, widthOfBarToDraw,
+                            eachRaceLaneHasThisMuchYSpace);
                         if (fullRectHitbox.Contains(mousePosition))
                         {
                             hoverLabel = _buckets[i].ToString("Y");
@@ -376,7 +378,8 @@ protected override void OnPaint(PaintEventArgs e)
                         }
                     }
 
-                    e.Graphics.DrawString(catalogue.Name, Font, Brushes.White, new Point(0, (int)middleLineOfCatalogueLabelY));
+                    e.Graphics.DrawString(catalogue.Name, Font, Brushes.White,
+                        new Point(0, (int)middleLineOfCatalogueLabelY));
                 }
 
                 if (hoverLabel != null)
@@ -390,7 +393,7 @@ protected override void OnPaint(PaintEventArgs e)
                         valueSize.Width += 20;
 
                     var rectHoverLabel = new
-                        RectangleF(Width - (labelSize.Width + valueSize.Width + 2*labelPadding),
+                        RectangleF(Width - (labelSize.Width + valueSize.Width + 2 * labelPadding),
                             Height - (heightReservedForAxis + labelSize.Height),
                             labelSize.Width,
                             labelSize.Height);
@@ -408,12 +411,14 @@ protected override void OnPaint(PaintEventArgs e)
                 if (_isEditModeOn)
                 {
                     var deleteIcon = FamFamFamIcons.delete.ImageToBitmap();
-                    var middleLineOfDeleteButtonY = eachRaceLaneHasThisMuchYSpace / 2 - deleteIcon.Height / 2.0 + startDrawingLaneAtY;
+                    var middleLineOfDeleteButtonY = eachRaceLaneHasThisMuchYSpace / 2 - deleteIcon.Height / 2.0 +
+                                                    startDrawingLaneAtY;
                     var buttonPoint = new Point(Width / 2, (int)middleLineOfDeleteButtonY);
 
                     e.Graphics.DrawImage(deleteIcon, buttonPoint);
 
-                    rectDeleteButtons.Add(new Rectangle(buttonPoint.X, buttonPoint.Y, deleteIcon.Width, deleteIcon.Height), catalogue);
+                    rectDeleteButtons.Add(
+                        new Rectangle(buttonPoint.X, buttonPoint.Y, deleteIcon.Width, deleteIcon.Height), catalogue);
                 }
 
                 //move to next lane on graph
@@ -429,9 +434,9 @@ protected override void OnPaint(PaintEventArgs e)
             var bucket = _buckets[i];
             var bucketLabel = bucket.ToString("yyyy-MM");
 
-            var idealBucketRenderLocation = i*eachBucketHasThisManyPixelsOfX;
+            var idealBucketRenderLocation = i * eachBucketHasThisManyPixelsOfX;
 
-            if(currentX > idealBucketRenderLocation)
+            if (currentX > idealBucketRenderLocation)
                 continue; //had to skip bucket because we don't have space to render it
 
             var requiredSpaceForLabel = e.Graphics.MeasureString(bucketLabel, Font).Width;
@@ -454,53 +459,54 @@ protected override void OnPaint(PaintEventArgs e)
             e.Graphics.FillRectangle(Brushes.Black, _rectScrollUp.X + 2, _rectScrollUp.Y + 2, 16, 16);
             Point[] points =
             {
-                new Point((int) (_rectScrollUp.X + 5),(int) (_rectScrollUp.Y +15)),
-                new Point((int) (_rectScrollUp.X + 15),(int) (_rectScrollUp.Y +15)),
-                new Point((int) (_rectScrollUp.X + 10),(int) (_rectScrollUp.Y + 5))
+                new((int)(_rectScrollUp.X + 5), (int)(_rectScrollUp.Y + 15)),
+                new((int)(_rectScrollUp.X + 15), (int)(_rectScrollUp.Y + 15)),
+                new((int)(_rectScrollUp.X + 10), (int)(_rectScrollUp.Y + 5))
             };
 
-            e.Graphics.DrawPolygon(new Pen(_allowScrollUp?Color.LawnGreen:Color.Green), points);
+            e.Graphics.DrawPolygon(new Pen(_allowScrollUp ? Color.LawnGreen : Color.Green), points);
 
-            _rectScrollDown = new RectangleF(Width - 20, startDrawingAxisAtY-20, 20, 20);
+            _rectScrollDown = new RectangleF(Width - 20, startDrawingAxisAtY - 20, 20, 20);
             e.Graphics.FillRectangle(Brushes.Green, _rectScrollDown);
             e.Graphics.FillRectangle(Brushes.Black, _rectScrollDown.X + 2, _rectScrollDown.Y + 2, 16, 16);
 
-            points = new []
+            points = new[]
             {
-                new Point((int) (_rectScrollDown.X + 5),(int) (_rectScrollDown.Y +5)),
-                new Point((int) (_rectScrollDown.X + 15),(int) (_rectScrollDown.Y +5)),
-                new Point((int) (_rectScrollDown.X + 10),(int) (_rectScrollDown.Y + 15))
+                new Point((int)(_rectScrollDown.X + 5), (int)(_rectScrollDown.Y + 5)),
+                new Point((int)(_rectScrollDown.X + 15), (int)(_rectScrollDown.Y + 5)),
+                new Point((int)(_rectScrollDown.X + 10), (int)(_rectScrollDown.Y + 15))
             };
-            e.Graphics.DrawPolygon(new Pen(_allowScrollDown?Color.LawnGreen:Color.Green), points);
+            e.Graphics.DrawPolygon(new Pen(_allowScrollDown ? Color.LawnGreen : Color.Green), points);
         }
 
         if (_allowScrollDown && _allowScrollUp && GetMaxScrollDownToIndex() != 0)
         {
             //draw the progress tab
             var scrollFloatOffset = (float)_scrollDownIndexOffset / GetMaxScrollDownToIndex();
-            var progressScrolling = (_rectScrollDown.Top - _rectScrollUp.Bottom)*scrollFloatOffset;
+            var progressScrolling = (_rectScrollDown.Top - _rectScrollUp.Bottom) * scrollFloatOffset;
 
             var yHeightOfScrollIndicator = (int)(progressScrolling + _rectScrollUp.Bottom);
 
-            e.Graphics.FillRectangle(Brushes.LawnGreen, Width - 20,yHeightOfScrollIndicator, 20, 3);
-            e.Graphics.DrawLine(Pens.Black, Width - 20, yHeightOfScrollIndicator+1, Width - 1, yHeightOfScrollIndicator+1);
+            e.Graphics.FillRectangle(Brushes.LawnGreen, Width - 20, yHeightOfScrollIndicator, 20, 3);
+            e.Graphics.DrawLine(Pens.Black, Width - 20, yHeightOfScrollIndicator + 1, Width - 1,
+                yHeightOfScrollIndicator + 1);
         }
     }
 
-    private float DrawErrorText(string text, bool underLine, PaintEventArgs e, float startDrawingLaneAtY, float eachRaceLaneHasThisMuchYSpace, double middleLineOfCatalogueLabelY)
+    private float DrawErrorText(string text, bool underLine, PaintEventArgs e, float startDrawingLaneAtY,
+        float eachRaceLaneHasThisMuchYSpace, double middleLineOfCatalogueLabelY)
     {
-
         var redGradientBrush = new LinearGradientBrush(
-            new Point(0, (int) startDrawingLaneAtY),
-            new Point((int) Width, (int) eachRaceLaneHasThisMuchYSpace)
+            new Point(0, (int)startDrawingLaneAtY),
+            new Point((int)Width, (int)eachRaceLaneHasThisMuchYSpace)
             , Color.FromArgb(255, Color.Red), Color.FromArgb(50, Color.Red)
         );
 
         e.Graphics.FillRectangle(redGradientBrush, 0, startDrawingLaneAtY, Width, eachRaceLaneHasThisMuchYSpace);
 
-            
-        e.Graphics.DrawString(text, underLine?new Font(Font, FontStyle.Underline):Font, Brushes.White,
-            new Point(0, (int) middleLineOfCatalogueLabelY));
+
+        e.Graphics.DrawString(text, underLine ? new Font(Font, FontStyle.Underline) : Font, Brushes.White,
+            new Point(0, (int)middleLineOfCatalogueLabelY));
 
         return e.Graphics.MeasureString(text, Font).Width;
     }
@@ -517,6 +523,5 @@ private enum ScrollActionUnderway
         ScrollingUp,
         ScrollingDown,
         ScrollDragging
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/RecentHistoryOfControls.cs b/Rdmp.UI/RecentHistoryOfControls.cs
index 254245d125..4befb27f04 100644
--- a/Rdmp.UI/RecentHistoryOfControls.cs
+++ b/Rdmp.UI/RecentHistoryOfControls.cs
@@ -22,7 +22,7 @@ public class RecentHistoryOfControls
     private readonly HashSet<string> _rvContents;
     private readonly List<string> _recentValues;
 
-    public RecentHistoryOfControls(TextBox c, Guid controlGuid):this(controlGuid)
+    public RecentHistoryOfControls(TextBox c, Guid controlGuid) : this(controlGuid)
     {
         var values = new AutoCompleteStringCollection();
         values.AddRange(_recentValues.ToArray());
@@ -33,7 +33,7 @@ public RecentHistoryOfControls(TextBox c, Guid controlGuid):this(controlGuid)
         c.Leave += (sender, args) => AddResult(c.Text);
     }
 
-    public RecentHistoryOfControls(ComboBox c, Guid controlGuid):this(controlGuid)
+    public RecentHistoryOfControls(ComboBox c, Guid controlGuid) : this(controlGuid)
     {
         var values = new AutoCompleteStringCollection();
         values.AddRange(_recentValues.ToArray());
@@ -59,10 +59,10 @@ private RecentHistoryOfControls(Guid controlGuid)
         _rvContents = new HashSet<string>(_recentValues);
     }
 
-    public void AddResult( string value,bool save = true)
+    public void AddResult(string value, bool save = true)
     {
         // bump it to the top
-        if(_rvContents.Contains(value))
+        if (_rvContents.Contains(value))
             _recentValues.Remove(value);
         else
             _rvContents.Add(value);
@@ -70,13 +70,14 @@ public void AddResult( string value,bool save = true)
         if (save)
             Save();
     }
-        
+
     public void Clear()
     {
         //clear the selected key only
         _recentValues.Clear();
         Save();
     }
+
     private void Save()
     {
         UserSettings.SetHistoryForControl(_controlGuid, _recentValues);
@@ -87,6 +88,7 @@ public static void SetValueToMostRecentlySavedValue(TextBox c)
         if (c.AutoCompleteCustomSource.Count > 0)
             c.Text = c.AutoCompleteCustomSource[^1]; //set the current text to the last used text
     }
+
     public static void SetValueToMostRecentlySavedValue(ComboBox c)
     {
         if (c.AutoCompleteCustomSource.Count > 0)
@@ -96,7 +98,7 @@ public static void SetValueToMostRecentlySavedValue(ComboBox c)
     public static void AddHistoryAsItemsToComboBox(ComboBox c)
     {
         if (c.AutoCompleteCustomSource.Count <= 0) return;
-        var items =new string[c.AutoCompleteCustomSource.Count];
+        var items = new string[c.AutoCompleteCustomSource.Count];
         c.AutoCompleteCustomSource.CopyTo(items, 0);
         c.Items.AddRange(items.Cast<object>().ToArray());
     }
diff --git a/Rdmp.UI/Refreshing/ILifetimeSubscriber.cs b/Rdmp.UI/Refreshing/ILifetimeSubscriber.cs
index 78b5a0e2fe..b3492b2a9e 100644
--- a/Rdmp.UI/Refreshing/ILifetimeSubscriber.cs
+++ b/Rdmp.UI/Refreshing/ILifetimeSubscriber.cs
@@ -16,6 +16,6 @@ namespace Rdmp.UI.Refreshing;
 ///
 /// <para>See <see cref="RefreshBus.EstablishLifetimeSubscription"/></para>
 /// </summary>
-public interface ILifetimeSubscriber:IContainerControl,IRefreshBusSubscriber
+public interface ILifetimeSubscriber : IContainerControl, IRefreshBusSubscriber
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Refreshing/RefreshBus.cs b/Rdmp.UI/Refreshing/RefreshBus.cs
index b58a6803e9..68c2359a01 100644
--- a/Rdmp.UI/Refreshing/RefreshBus.cs
+++ b/Rdmp.UI/Refreshing/RefreshBus.cs
@@ -26,6 +26,7 @@ public class RefreshBus
     /// know when stuff has changed, instead use the Subscribe and Unsubscribe methods
     /// </summary>
     public event RefreshObjectEventHandler BeforePublish;
+
     public event RefreshObjectEventHandler AfterPublish;
     private event RefreshObjectEventHandler RefreshObject;
 
@@ -37,7 +38,7 @@ public class RefreshBus
 
     public void Publish(object sender, RefreshObjectEventArgs e)
     {
-        if(PublishInProgress)
+        if (PublishInProgress)
             throw new SubscriptionException(
                 $"Refresh Publish Cascade error.  Subscriber {sender} just attempted a publish during an existing publish execution, cylic inception publishing is not allowed, you cannot respond to a refresh callback by issuing more refresh publishes");
 
@@ -58,10 +59,8 @@ public void Publish(object sender, RefreshObjectEventArgs e)
                 }
                 else
                 {
-                    if(ChildProvider != null && e.DeletedObjectDescendancy == null)
-                    {
+                    if (ChildProvider != null && e.DeletedObjectDescendancy == null)
                         e.DeletedObjectDescendancy = ChildProvider.GetDescendancyListIfAnyFor(e.Object);
-                    }
                 }
 
                 RefreshObject?.Invoke(sender, e);
@@ -82,7 +81,7 @@ public void Subscribe(IRefreshBusSubscriber subscriber)
         if (subscribers.Contains(subscriber))
             throw new SubscriptionException(
                 $"You cannot subscribe to the RefreshBus more than once. Subscriber '{subscriber}' just attempted to register a second time its type was({subscriber.GetType().Name})");
-            
+
         RefreshObject += subscriber.RefreshBus_RefreshObject;
 
         subscribers.Add(subscriber);
@@ -90,7 +89,7 @@ public void Subscribe(IRefreshBusSubscriber subscriber)
 
     public void Unsubscribe(IRefreshBusSubscriber unsubscriber)
     {
-        if(!subscribers.Contains(unsubscriber))
+        if (!subscribers.Contains(unsubscriber))
             throw new SubscriptionException(
                 $"You cannot unsubscribe from the RefreshBus if never subscribed in the first place. '{unsubscriber}' just attempted to unsubscribe when it wasn't subscribed in the first place its type was ({unsubscriber.GetType().Name})");
 
@@ -101,16 +100,19 @@ public void Unsubscribe(IRefreshBusSubscriber unsubscriber)
     public void EstablishLifetimeSubscription(ILifetimeSubscriber c)
     {
         if (c is not IRefreshBusSubscriber subscriber)
-            throw new ArgumentException("Control must be an IRefreshBusSubscriber to establish a lifetime subscription", nameof(c));
+            throw new ArgumentException("Control must be an IRefreshBusSubscriber to establish a lifetime subscription",
+                nameof(c));
 
         //ignore double requests for subscription
         if (subscribers.Contains(subscriber))
             return;
 
-        if(c is not ContainerControl containerControl)
+        if (c is not ContainerControl containerControl)
             throw new ArgumentOutOfRangeException();
 
-        var parentForm = containerControl.ParentForm ?? throw new ArgumentException("Control must have an established ParentForm, you should not attempt to establish a lifetime subscription until your control is loaded (i.e. don't call this in your constructor)",nameof(c));
+        var parentForm = containerControl.ParentForm ?? throw new ArgumentException(
+            "Control must have an established ParentForm, you should not attempt to establish a lifetime subscription until your control is loaded (i.e. don't call this in your constructor)",
+            nameof(c));
         Subscribe(subscriber);
         parentForm.FormClosing += (s, e) => Unsubscribe(subscriber);
     }
@@ -134,21 +136,25 @@ public void EstablishLifetimeSubscription(ILifetimeSubscriber c)
     /// <param name="user"></param>
     /// <param name="activator"></param>
     /// <param name="originalObject"></param>
-    public void EstablishSelfDestructProtocol<T>(RDMPSingleDatabaseObjectControl<T> user, IActivateItems activator,T originalObject) where T : DatabaseEntity
+    public void EstablishSelfDestructProtocol<T>(RDMPSingleDatabaseObjectControl<T> user, IActivateItems activator,
+        T originalObject) where T : DatabaseEntity
     {
         //they already subscribed to self destruct protocols - repeat subscriptions can be caused by registering in SetDatabaseObject and then refresh callbacks triggering more calls to SetDatabaseObject within the Controls lifetime
-        var existingSubscription = _selfDestructors.OfType<SelfDestructProtocol<T>>().SingleOrDefault(s => s.User == user);
+        var existingSubscription =
+            _selfDestructors.OfType<SelfDestructProtocol<T>>().SingleOrDefault(s => s.User == user);
 
         //they have subscribed for this before
-        if(existingSubscription != null)
-            if (!existingSubscription.OriginalObject.Equals(originalObject))//wait a minute! they subscribed for a different object!
+        if (existingSubscription != null)
+            if (!existingSubscription.OriginalObject
+                    .Equals(originalObject)) //wait a minute! they subscribed for a different object!
                 throw new ArgumentException(
-                    $"user {user} attempted to subscribe twice for self destruct but with two different objects '{existingSubscription.OriginalObject}' and '{originalObject}'", nameof(user));
+                    $"user {user} attempted to subscribe twice for self destruct but with two different objects '{existingSubscription.OriginalObject}' and '{originalObject}'",
+                    nameof(user));
             else
-                return;//they subscribed for the same object it's all ok
+                return; //they subscribed for the same object it's all ok
 
         //The anonymous refresh callback that updates the user when the object changes or deletes
-        var subscriber = new SelfDestructProtocol<T>(user,activator,originalObject);
+        var subscriber = new SelfDestructProtocol<T>(user, activator, originalObject);
 
         //keep track of the self destructors independently of the subscription list
         _selfDestructors.Add(subscriber);
@@ -156,7 +162,9 @@ public void EstablishSelfDestructProtocol<T>(RDMPSingleDatabaseObjectControl<T>
         //subscribe them now
         Subscribe(subscriber);
 
-        var parentForm = user.ParentForm ?? throw new ArgumentException("Control must have an established ParentForm, you should not attempt to establish a lifetime subscription until your control is loaded (i.e. don't call this in your constructor)", "c");
+        var parentForm = user.ParentForm ?? throw new ArgumentException(
+            "Control must have an established ParentForm, you should not attempt to establish a lifetime subscription until your control is loaded (i.e. don't call this in your constructor)",
+            "c");
 
         //when their parent closes we unsubscribe them
         parentForm.FormClosed += (s, e) =>
@@ -166,5 +174,4 @@ public void EstablishSelfDestructProtocol<T>(RDMPSingleDatabaseObjectControl<T>
             _selfDestructors.Remove(toRemove);
         };
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Refreshing/RefreshObjectEventArgs.cs b/Rdmp.UI/Refreshing/RefreshObjectEventArgs.cs
index 6d3332244d..010563b75d 100644
--- a/Rdmp.UI/Refreshing/RefreshObjectEventArgs.cs
+++ b/Rdmp.UI/Refreshing/RefreshObjectEventArgs.cs
@@ -25,8 +25,8 @@ public RefreshObjectEventArgs(DatabaseEntity o)
     {
         Object = o;
 
-        if(o == null)
-            throw new ArgumentException("You cannot create a refresh on a null object",nameof(o));
+        if (o == null)
+            throw new ArgumentException("You cannot create a refresh on a null object", nameof(o));
 
         Exists = Object.Exists();
     }
diff --git a/Rdmp.UI/Refreshing/SelfDestructProtocol.cs b/Rdmp.UI/Refreshing/SelfDestructProtocol.cs
index 4e83cfd52d..0e58ef34ca 100644
--- a/Rdmp.UI/Refreshing/SelfDestructProtocol.cs
+++ b/Rdmp.UI/Refreshing/SelfDestructProtocol.cs
@@ -17,16 +17,19 @@ internal class SelfDestructProtocol<T> : IRefreshBusSubscriber where T : Databas
     public RDMPSingleDatabaseObjectControl<T> User { get; private set; }
     public T OriginalObject { get; set; }
 
-    public SelfDestructProtocol(RDMPSingleDatabaseObjectControl<T> user,IActivateItems activator, T originalObject)
+    public SelfDestructProtocol(RDMPSingleDatabaseObjectControl<T> user, IActivateItems activator, T originalObject)
     {
         _activator = activator;
         User = user;
-        OriginalObject = originalObject ?? throw new System.Exception($"Could not construct tab for a null object. Control was '{User?.GetType()}'");
+        OriginalObject = originalObject ??
+                         throw new System.Exception(
+                             $"Could not construct tab for a null object. Control was '{User?.GetType()}'");
     }
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        var descendancy = e.DeletedObjectDescendancy ?? _activator.CoreChildProvider.GetDescendancyListIfAnyFor(e.Object);
+        var descendancy = e.DeletedObjectDescendancy ??
+                          _activator.CoreChildProvider.GetDescendancyListIfAnyFor(e.Object);
 
         //implementation of the anoymous callback
         var o = e.Object as T;
@@ -36,21 +39,21 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
             o = (T)descendancy.Parents.LastOrDefault(p => p is T);
 
         //don't respond to events raised by the user themself!
-        if(sender == User)
+        if (sender == User)
             return;
 
         //if the original object does not exist anymore (could be a CASCADE event so we do have to check it every time regardless of what object type is refreshing)
-        if (!OriginalObject.Exists())//object no longer exists!
+        if (!OriginalObject.Exists()) //object no longer exists!
         {
             var parent = User.ParentForm;
             if (parent != null && !parent.IsDisposed)
-                parent.Close();//self destruct because object was deleted
+                parent.Close(); //self destruct because object was deleted
 
             return;
         }
-            
-        if (o != null && o.ID == OriginalObject.ID && o.GetType() == OriginalObject.GetType())//object was refreshed, probably an update to some fields in it
+
+        if (o != null && o.ID == OriginalObject.ID &&
+            o.GetType() == OriginalObject.GetType()) //object was refreshed, probably an update to some fields in it
             User.SetDatabaseObject(_activator, o); //give it the new object
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Refreshing/SubscriptionException.cs b/Rdmp.UI/Refreshing/SubscriptionException.cs
index b8da57dec3..10fea81abe 100644
--- a/Rdmp.UI/Refreshing/SubscriptionException.cs
+++ b/Rdmp.UI/Refreshing/SubscriptionException.cs
@@ -14,8 +14,7 @@ namespace Rdmp.UI.Refreshing;
 /// </summary>
 public class SubscriptionException : Exception
 {
-    public SubscriptionException(string message): base(message)
+    public SubscriptionException(string message) : base(message)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ResearchDataManagementPlatformOptions.cs b/Rdmp.UI/ResearchDataManagementPlatformOptions.cs
index 319a174ee9..6c7322f170 100644
--- a/Rdmp.UI/ResearchDataManagementPlatformOptions.cs
+++ b/Rdmp.UI/ResearchDataManagementPlatformOptions.cs
@@ -13,8 +13,5 @@ namespace Rdmp.UI;
 /// </summary>
 public class ResearchDataManagementPlatformOptions : RDMPCommandLineOptions
 {
-    protected override bool ShouldLoadHelp()
-    {
-        return true;
-    }
+    protected override bool ShouldLoadHelp() => true;
 }
\ No newline at end of file
diff --git a/Rdmp.UI/RichTextBoxEx.cs b/Rdmp.UI/RichTextBoxEx.cs
index c71d7ae87b..9a417a3e28 100644
--- a/Rdmp.UI/RichTextBoxEx.cs
+++ b/Rdmp.UI/RichTextBoxEx.cs
@@ -18,7 +18,8 @@ namespace Rdmp.UI;
 public class RichTextBoxEx : RichTextBox
 {
     #region Interop-Defines
-    [ StructLayout( LayoutKind.Sequential )]
+
+    [StructLayout(LayoutKind.Sequential)]
     private struct CHARFORMAT2_STRUCT
     {
         public uint cbSize;
@@ -27,91 +28,94 @@ private struct CHARFORMAT2_STRUCT
         public int yHeight;
         public int yOffset;
         public int crTextColor;
-        public byte     bCharSet;
-        public byte     bPitchAndFamily;
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst=32)]
-        public char[]   szFaceName;
+        public byte bCharSet;
+        public byte bPitchAndFamily;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public char[] szFaceName;
+
         public ushort wWeight;
         public ushort sSpacing;
-        public int		crBackColor; // Color.ToArgb() -> int
-        public int		lcid;
-        public int		dwReserved;
+        public int crBackColor; // Color.ToArgb() -> int
+        public int lcid;
+        public int dwReserved;
         public short sStyle;
         public short wKerning;
-        public byte		bUnderlineType;
-        public byte		bAnimation;
-        public byte		bRevAuthor;
-        public byte		bReserved1;
+        public byte bUnderlineType;
+        public byte bAnimation;
+        public byte bRevAuthor;
+        public byte bReserved1;
     }
 
-    [DllImport("user32.dll", CharSet=CharSet.Auto)]
+    [DllImport("user32.dll", CharSet = CharSet.Auto)]
     private static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
 
-    private const int WM_USER			 = 0x0400;
-    private const int EM_GETCHARFORMAT	 = WM_USER+58;
-    private const int EM_SETCHARFORMAT	 = WM_USER+68;
+    private const int WM_USER = 0x0400;
+    private const int EM_GETCHARFORMAT = WM_USER + 58;
+    private const int EM_SETCHARFORMAT = WM_USER + 68;
 
-    private const int SCF_SELECTION	= 0x0001;
-    private const int SCF_WORD		= 0x0002;
-    private const int SCF_ALL		= 0x0004;
+    private const int SCF_SELECTION = 0x0001;
+    private const int SCF_WORD = 0x0002;
+    private const int SCF_ALL = 0x0004;
 
     #region CHARFORMAT2 Flags
-    private const uint CFE_BOLD		= 0x0001;
-    private const uint CFE_ITALIC		= 0x0002;
-    private const uint CFE_UNDERLINE	= 0x0004;
-    private const uint CFE_STRIKEOUT	= 0x0008;
-    private const uint CFE_PROTECTED	= 0x0010;
-    private const uint CFE_LINK		= 0x0020;
-    private const uint CFE_AUTOCOLOR	= 0x40000000;
-    private const uint CFE_SUBSCRIPT	= 0x00010000;		/* Superscript and subscript are */
-    private const uint CFE_SUPERSCRIPT = 0x00020000;		/*  mutually exclusive			 */
-
-    private const int CFM_SMALLCAPS		= 0x0040;			/* (*)	*/
-    private const int CFM_ALLCAPS		= 0x0080;			/* Displayed by 3.0	*/
-    private const int CFM_HIDDEN		= 0x0100;			/* Hidden by 3.0 */
-    private const int CFM_OUTLINE		= 0x0200;			/* (*)	*/
-    private const int CFM_SHADOW		= 0x0400;			/* (*)	*/
-    private const int CFM_EMBOSS		= 0x0800;			/* (*)	*/
-    private const int CFM_IMPRINT		= 0x1000;			/* (*)	*/
-    private const int CFM_DISABLED		= 0x2000;
-    private const int CFM_REVISED		= 0x4000;
-
-    private const int CFM_BACKCOLOR		= 0x04000000;
-    private const int CFM_LCID			= 0x02000000;
-    private const int CFM_UNDERLINETYPE	= 0x00800000;		/* Many displayed by 3.0 */
-    private const int CFM_WEIGHT		= 0x00400000;
-    private const int CFM_SPACING		= 0x00200000;		/* Displayed by 3.0	*/
-    private const int CFM_KERNING		= 0x00100000;		/* (*)	*/
-    private const int CFM_STYLE			= 0x00080000;		/* (*)	*/
-    private const int CFM_ANIMATION		= 0x00040000;		/* (*)	*/
-    private const int CFM_REVAUTHOR		= 0x00008000;
-
-
-    private const uint CFM_BOLD		= 0x00000001;
-    private const uint CFM_ITALIC		= 0x00000002;
-    private const uint CFM_UNDERLINE	= 0x00000004;
-    private const uint CFM_STRIKEOUT	= 0x00000008;
-    private const uint CFM_PROTECTED	= 0x00000010;
-    private const uint CFM_LINK		= 0x00000020;
-    private const uint CFM_SIZE		= 0x80000000;
-    private const uint CFM_COLOR		= 0x40000000;
-    private const uint CFM_FACE		= 0x20000000;
-    private const uint CFM_OFFSET		= 0x10000000;
-    private const uint CFM_CHARSET	= 0x08000000;
-    private const uint CFM_SUBSCRIPT	= CFE_SUBSCRIPT | CFE_SUPERSCRIPT;
+
+    private const uint CFE_BOLD = 0x0001;
+    private const uint CFE_ITALIC = 0x0002;
+    private const uint CFE_UNDERLINE = 0x0004;
+    private const uint CFE_STRIKEOUT = 0x0008;
+    private const uint CFE_PROTECTED = 0x0010;
+    private const uint CFE_LINK = 0x0020;
+    private const uint CFE_AUTOCOLOR = 0x40000000;
+    private const uint CFE_SUBSCRIPT = 0x00010000; /* Superscript and subscript are */
+    private const uint CFE_SUPERSCRIPT = 0x00020000; /*  mutually exclusive			 */
+
+    private const int CFM_SMALLCAPS = 0x0040; /* (*)	*/
+    private const int CFM_ALLCAPS = 0x0080; /* Displayed by 3.0	*/
+    private const int CFM_HIDDEN = 0x0100; /* Hidden by 3.0 */
+    private const int CFM_OUTLINE = 0x0200; /* (*)	*/
+    private const int CFM_SHADOW = 0x0400; /* (*)	*/
+    private const int CFM_EMBOSS = 0x0800; /* (*)	*/
+    private const int CFM_IMPRINT = 0x1000; /* (*)	*/
+    private const int CFM_DISABLED = 0x2000;
+    private const int CFM_REVISED = 0x4000;
+
+    private const int CFM_BACKCOLOR = 0x04000000;
+    private const int CFM_LCID = 0x02000000;
+    private const int CFM_UNDERLINETYPE = 0x00800000; /* Many displayed by 3.0 */
+    private const int CFM_WEIGHT = 0x00400000;
+    private const int CFM_SPACING = 0x00200000; /* Displayed by 3.0	*/
+    private const int CFM_KERNING = 0x00100000; /* (*)	*/
+    private const int CFM_STYLE = 0x00080000; /* (*)	*/
+    private const int CFM_ANIMATION = 0x00040000; /* (*)	*/
+    private const int CFM_REVAUTHOR = 0x00008000;
+
+
+    private const uint CFM_BOLD = 0x00000001;
+    private const uint CFM_ITALIC = 0x00000002;
+    private const uint CFM_UNDERLINE = 0x00000004;
+    private const uint CFM_STRIKEOUT = 0x00000008;
+    private const uint CFM_PROTECTED = 0x00000010;
+    private const uint CFM_LINK = 0x00000020;
+    private const uint CFM_SIZE = 0x80000000;
+    private const uint CFM_COLOR = 0x40000000;
+    private const uint CFM_FACE = 0x20000000;
+    private const uint CFM_OFFSET = 0x10000000;
+    private const uint CFM_CHARSET = 0x08000000;
+    private const uint CFM_SUBSCRIPT = CFE_SUBSCRIPT | CFE_SUPERSCRIPT;
     private const uint CFM_SUPERSCRIPT = CFM_SUBSCRIPT;
 
-    private const byte CFU_UNDERLINENONE		= 0x00000000;
-    private const byte CFU_UNDERLINE			= 0x00000001;
-    private const byte CFU_UNDERLINEWORD		= 0x00000002; /* (*) displayed as ordinary underline	*/
-    private const byte CFU_UNDERLINEDOUBLE		= 0x00000003; /* (*) displayed as ordinary underline	*/
-    private const byte CFU_UNDERLINEDOTTED		= 0x00000004;
-    private const byte CFU_UNDERLINEDASH		= 0x00000005;
-    private const byte CFU_UNDERLINEDASHDOT		= 0x00000006;
-    private const byte CFU_UNDERLINEDASHDOTDOT	= 0x00000007;
-    private const byte CFU_UNDERLINEWAVE		= 0x00000008;
-    private const byte CFU_UNDERLINETHICK		= 0x00000009;
-    private const byte CFU_UNDERLINEHAIRLINE	= 0x0000000A; /* (*) displayed as ordinary underline	*/
+    private const byte CFU_UNDERLINENONE = 0x00000000;
+    private const byte CFU_UNDERLINE = 0x00000001;
+    private const byte CFU_UNDERLINEWORD = 0x00000002; /* (*) displayed as ordinary underline	*/
+    private const byte CFU_UNDERLINEDOUBLE = 0x00000003; /* (*) displayed as ordinary underline	*/
+    private const byte CFU_UNDERLINEDOTTED = 0x00000004;
+    private const byte CFU_UNDERLINEDASH = 0x00000005;
+    private const byte CFU_UNDERLINEDASHDOT = 0x00000006;
+    private const byte CFU_UNDERLINEDASHDOTDOT = 0x00000007;
+    private const byte CFU_UNDERLINEWAVE = 0x00000008;
+    private const byte CFU_UNDERLINETHICK = 0x00000009;
+    private const byte CFU_UNDERLINEHAIRLINE = 0x0000000A; /* (*) displayed as ordinary underline	*/
 
     #endregion
 
@@ -186,7 +190,8 @@ public void InsertLink(string text, string hyperlink, int position)
             throw new ArgumentOutOfRangeException(nameof(position));
 
         //if it ends with whitespace then we have to put that outside the RTF
-        var suffix = string.Concat(text.Reverse().TakeWhile(c => c == '\r' || c == '\n' || c == ' ' || c == '\t').Reverse());
+        var suffix = string.Concat(text.Reverse().TakeWhile(c => c == '\r' || c == '\n' || c == ' ' || c == '\t')
+            .Reverse());
 
         SelectionStart = position;
         SelectedRtf = $@"{{\rtf1\ansi {text.TrimEnd()}\v #{hyperlink}\v0}}";
@@ -195,9 +200,8 @@ public void InsertLink(string text, string hyperlink, int position)
         Select(position + text.Length + hyperlink.Length + 1, 0);
 
         //avoids bong
-        if(suffix != "")
+        if (suffix != "")
             SelectedText = suffix;
-
     }
 
     /// <summary>
@@ -208,14 +212,12 @@ public void SetSelectionLink(bool link)
     {
         SetSelectionStyle(CFM_LINK, link ? CFE_LINK : 0);
     }
+
     /// <summary>
     /// Get the link style for the current selection
     /// </summary>
     /// <returns>0: link style not set, 1: link style set, -1: mixed</returns>
-    public int GetSelectionLink()
-    {
-        return GetSelectionStyle(CFM_LINK, CFE_LINK);
-    }
+    public int GetSelectionLink() => GetSelectionStyle(CFM_LINK, CFE_LINK);
 
 
     private void SetSelectionStyle(uint mask, uint effect)
@@ -226,7 +228,7 @@ private void SetSelectionStyle(uint mask, uint effect)
         cf.dwEffects = effect;
 
         var wpar = new IntPtr(SCF_SELECTION);
-        var lpar = Marshal.AllocCoTaskMem( Marshal.SizeOf( cf ) );
+        var lpar = Marshal.AllocCoTaskMem(Marshal.SizeOf(cf));
         Marshal.StructureToPtr(cf, lpar, false);
 
         var res = SendMessage(Handle, EM_SETCHARFORMAT, wpar, lpar);
@@ -241,7 +243,7 @@ private int GetSelectionStyle(uint mask, uint effect)
         cf.szFaceName = new char[32];
 
         var wpar = new IntPtr(SCF_SELECTION);
-        var lpar = 	Marshal.AllocCoTaskMem( Marshal.SizeOf( cf ) );
+        var lpar = Marshal.AllocCoTaskMem(Marshal.SizeOf(cf));
         Marshal.StructureToPtr(cf, lpar, false);
 
         var res = SendMessage(Handle, EM_GETCHARFORMAT, wpar, lpar);
@@ -251,13 +253,9 @@ private int GetSelectionStyle(uint mask, uint effect)
         int state;
         // dwMask holds the information which properties are consistent throughout the selection:
         if ((cf.dwMask & mask) == mask)
-        {
             state = (cf.dwEffects & effect) == effect ? 1 : 0;
-        }
         else
-        {
             state = -1;
-        }
 
         Marshal.FreeCoTaskMem(lpar);
         return state;
diff --git a/Rdmp.UI/Rules/BinderRule.cs b/Rdmp.UI/Rules/BinderRule.cs
index e88caf27ea..02b175153a 100644
--- a/Rdmp.UI/Rules/BinderRule.cs
+++ b/Rdmp.UI/Rules/BinderRule.cs
@@ -24,7 +24,9 @@ internal abstract class BinderRule<T> : IBinderRule where T : IMapsDirectlyToDat
     /// The member on <see cref="ToTest"/> that
     /// </summary>
     protected readonly string PropertyToCheckName;
-    protected BinderRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control, string propertyToCheckName)
+
+    protected BinderRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control,
+        string propertyToCheckName)
     {
         ErrorProvider = new ErrorProvider();
         Activator = activator;
@@ -41,10 +43,7 @@ protected BinderRule(IActivateItems activator, T toTest, Func<T, object> propert
     private void ToTest_PropertyChanged(object sender, PropertyChangedEventArgs e)
     {
         // the property being changed is not ours
-        if (!string.Equals(e.PropertyName, PropertyToCheckName))
-        {
-            return;
-        }
+        if (!string.Equals(e.PropertyName, PropertyToCheckName)) return;
 
         var currentValue = PropertyToCheck(ToTest);
         var typeToTest = ToTest.GetType();
diff --git a/Rdmp.UI/Rules/BinderWithErrorProviderFactory.cs b/Rdmp.UI/Rules/BinderWithErrorProviderFactory.cs
index 72e51a5327..d615d898ab 100644
--- a/Rdmp.UI/Rules/BinderWithErrorProviderFactory.cs
+++ b/Rdmp.UI/Rules/BinderWithErrorProviderFactory.cs
@@ -27,23 +27,24 @@ public BinderWithErrorProviderFactory(IActivateItems activator)
         _activator = activator;
     }
 
-    public void Bind<T>(Control c, string propertyName, T databaseObject, string dataMember, bool formattingEnabled, DataSourceUpdateMode updateMode,Func<T,object> getter) where T:IMapsDirectlyToDatabaseTable
+    public void Bind<T>(Control c, string propertyName, T databaseObject, string dataMember, bool formattingEnabled,
+        DataSourceUpdateMode updateMode, Func<T, object> getter) where T : IMapsDirectlyToDatabaseTable
     {
         c.DataBindings.Clear();
         c.DataBindings.Add(propertyName, databaseObject, dataMember, formattingEnabled, updateMode);
 
         var property = databaseObject.GetType().GetProperty(dataMember);
 
-        if (property.GetCustomAttributes(typeof (UniqueAttribute), true).Any())
+        if (property.GetCustomAttributes(typeof(UniqueAttribute), true).Any())
             new UniqueRule<T>(_activator, databaseObject, getter, c, dataMember);
-            
+
         if (property.GetCustomAttributes(typeof(NotNullAttribute), true).Any())
             new NotNullRule<T>(_activator, databaseObject, getter, c, dataMember);
 
         if (property.PropertyType == typeof(string))
             new MaxLengthRule<T>(_activator, databaseObject, getter, c, dataMember);
 
-        if(dataMember.Equals("Name") && databaseObject is INamed)
+        if (dataMember.Equals("Name") && databaseObject is INamed)
             new NoBadNamesRule<T>(_activator, databaseObject, getter, c, dataMember);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Rules/IBinderRule.cs b/Rdmp.UI/Rules/IBinderRule.cs
index fe30cacb02..a5cc4099a7 100644
--- a/Rdmp.UI/Rules/IBinderRule.cs
+++ b/Rdmp.UI/Rules/IBinderRule.cs
@@ -14,5 +14,5 @@ namespace Rdmp.UI.Rules;
 /// </summary>
 public interface IBinderRule
 {
-    ErrorProvider ErrorProvider { get;}
+    ErrorProvider ErrorProvider { get; }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Rules/MaxLengthRule.cs b/Rdmp.UI/Rules/MaxLengthRule.cs
index 5850ea9a91..92da28f7f9 100644
--- a/Rdmp.UI/Rules/MaxLengthRule.cs
+++ b/Rdmp.UI/Rules/MaxLengthRule.cs
@@ -21,7 +21,8 @@ internal class MaxLengthRule<T> : BinderRule<T> where T : IMapsDirectlyToDatabas
     private string _problemDescription;
     private int? _maxLength;
 
-    public MaxLengthRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control, string propertyToCheckName)
+    public MaxLengthRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control,
+        string propertyToCheckName)
         : base(activator, toTest, propertyToCheck, control, propertyToCheckName)
     {
         _problemDescription = "Value is too long";
@@ -32,36 +33,25 @@ public MaxLengthRule(IActivateItems activator, T toTest, Func<T, object> propert
 
     private int? TryGetMaxLengthFrom(IRepository repo, T toTest)
     {
-        if(repo is not TableRepository tr)
-        {
-            return null;
-        }
+        if (repo is not TableRepository tr) return null;
 
-        if (!tr.SupportsObjectType(toTest.GetType()))
-        {
-            return null;
-        }
+        if (!tr.SupportsObjectType(toTest.GetType())) return null;
 
         var table = tr.DiscoveredServer.GetCurrentDatabase().ExpectTable(toTest.GetType().Name);
 
-        if(!table.Exists())
-        {
-            return null;
-        }
+        if (!table.Exists()) return null;
         try
         {
             var col = table.DiscoverColumn(PropertyToCheckName);
-                
-            return col.DataType.GetCSharpDataType() == typeof(string) ? 
-                col.DataType.GetLengthIfString() : 
-                null;
+
+            return col.DataType.GetCSharpDataType() == typeof(string) ? col.DataType.GetLengthIfString() : null;
         }
         catch (Exception)
         {
-
             return null;
         }
     }
+
     protected override string IsValid(object currentValue, Type typeToTest)
     {
         //never check null/empty values
@@ -69,12 +59,8 @@ protected override string IsValid(object currentValue, Type typeToTest)
             return null;
 
         if (_maxLength.HasValue && currentValue is string s)
-        {
-            if(s.Length > _maxLength.Value)
-            {
+            if (s.Length > _maxLength.Value)
                 return _problemDescription;
-            }
-        }
 
         return null;
     }
diff --git a/Rdmp.UI/Rules/NoBadNamesRule.cs b/Rdmp.UI/Rules/NoBadNamesRule.cs
index 02ac4a6146..440a5ba834 100644
--- a/Rdmp.UI/Rules/NoBadNamesRule.cs
+++ b/Rdmp.UI/Rules/NoBadNamesRule.cs
@@ -14,20 +14,20 @@
 
 namespace Rdmp.UI.Rules;
 
-internal class NoBadNamesRule<T>:BinderRule<T> where T:IMapsDirectlyToDatabaseTable
+internal class NoBadNamesRule<T> : BinderRule<T> where T : IMapsDirectlyToDatabaseTable
 {
-    public NoBadNamesRule(IActivateItems activator, T databaseObject, Func<T, object> getter, Control control,string propertyToCheckName) : base(activator,databaseObject,getter,control, propertyToCheckName)
+    public NoBadNamesRule(IActivateItems activator, T databaseObject, Func<T, object> getter, Control control,
+        string propertyToCheckName) : base(activator, databaseObject, getter, control, propertyToCheckName)
     {
-            
     }
 
     protected override string IsValid(object currentValue, Type typeToTest)
     {
-        if(ProblemProvider.IgnoreBadNamesFor.Any(t=>t.IsAssignableFrom(typeof(T))))
+        if (ProblemProvider.IgnoreBadNamesFor.Any(t => t.IsAssignableFrom(typeof(T))))
             return null;
 
-        if(currentValue is string s)
-            return UsefulStuff.IsBadName(s) ? "Name contains illegal characters":null;
+        if (currentValue is string s)
+            return UsefulStuff.IsBadName(s) ? "Name contains illegal characters" : null;
 
         return null;
     }
diff --git a/Rdmp.UI/Rules/NotNullRule.cs b/Rdmp.UI/Rules/NotNullRule.cs
index d3c629a30d..ea4c89d9d4 100644
--- a/Rdmp.UI/Rules/NotNullRule.cs
+++ b/Rdmp.UI/Rules/NotNullRule.cs
@@ -13,9 +13,9 @@ namespace Rdmp.UI.Rules;
 
 internal class NotNullRule<T> : BinderRule<T> where T : IMapsDirectlyToDatabaseTable
 {
-    public NotNullRule(IActivateItems activator, T databaseObject, Func<T, object> getter, Control control,string propertyToCheckName) : base(activator,databaseObject,getter,control, propertyToCheckName)
+    public NotNullRule(IActivateItems activator, T databaseObject, Func<T, object> getter, Control control,
+        string propertyToCheckName) : base(activator, databaseObject, getter, control, propertyToCheckName)
     {
-            
     }
 
     protected override string IsValid(object currentValue, Type typeToTest)
diff --git a/Rdmp.UI/Rules/UniqueRule.cs b/Rdmp.UI/Rules/UniqueRule.cs
index 98e88c85aa..5b4c777eee 100644
--- a/Rdmp.UI/Rules/UniqueRule.cs
+++ b/Rdmp.UI/Rules/UniqueRule.cs
@@ -16,11 +16,11 @@ internal class UniqueRule<T> : BinderRule<T> where T : IMapsDirectlyToDatabaseTa
 {
     private readonly string _problemDescription;
 
-    public UniqueRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control, string propertyToCheckName)
+    public UniqueRule(IActivateItems activator, T toTest, Func<T, object> propertyToCheck, Control control,
+        string propertyToCheckName)
         : base(activator, toTest, propertyToCheck, control, propertyToCheckName)
     {
         _problemDescription = $"Must be unique amongst all {toTest.GetType().Name}s";
-
     }
 
     protected override string IsValid(object currentValue, Type typeToTest)
diff --git a/Rdmp.UI/ScintillaHelper/CSharpLexer.cs b/Rdmp.UI/ScintillaHelper/CSharpLexer.cs
index f074fd4d66..72d7241a84 100644
--- a/Rdmp.UI/ScintillaHelper/CSharpLexer.cs
+++ b/Rdmp.UI/ScintillaHelper/CSharpLexer.cs
@@ -70,6 +70,7 @@ public void Style(Scintilla scintilla, int startPos, int endPos)
                         // Everything else
                         scintilla.SetStyling(1, StyleDefault);
                     }
+
                     break;
 
                 case STATE_STRING:
@@ -84,10 +85,11 @@ public void Style(Scintilla scintilla, int startPos, int endPos)
                     {
                         length++;
                     }
+
                     break;
 
                 case STATE_NUMBER:
-                    if (char.IsDigit(c) || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F' || c == 'x')
+                    if (char.IsDigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F') || c == 'x')
                     {
                         length++;
                     }
@@ -98,6 +100,7 @@ public void Style(Scintilla scintilla, int startPos, int endPos)
                         state = STATE_UNKNOWN;
                         goto REPROCESS;
                     }
+
                     break;
 
                 case STATE_IDENTIFIER:
@@ -117,6 +120,7 @@ public void Style(Scintilla scintilla, int startPos, int endPos)
                         state = STATE_UNKNOWN;
                         goto REPROCESS;
                     }
+
                     break;
             }
 
@@ -131,6 +135,6 @@ public CSharpLexer(string keywords)
         this.keywords = new HashSet<string>(list);
     }
 
-    [GeneratedRegex("\\s+",RegexOptions.CultureInvariant)]
+    [GeneratedRegex("\\s+", RegexOptions.CultureInvariant)]
     private static partial Regex Spaces();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ScintillaHelper/ScintillaMenu.cs b/Rdmp.UI/ScintillaHelper/ScintillaMenu.cs
index d6cb6aa550..987d128724 100644
--- a/Rdmp.UI/ScintillaHelper/ScintillaMenu.cs
+++ b/Rdmp.UI/ScintillaHelper/ScintillaMenu.cs
@@ -14,9 +14,8 @@
 namespace Rdmp.UI.ScintillaHelper;
 
 [DesignerCategory("")]
-internal class ScintillaMenu:ContextMenuStrip
+internal class ScintillaMenu : ContextMenuStrip
 {
-
     private readonly Scintilla _scintilla;
     private ToolStripMenuItem _miUndo;
     private ToolStripMenuItem _miRedo;
@@ -42,7 +41,7 @@ public ScintillaMenu(Scintilla scintilla, bool spellCheck) : base()
 
     private void InitContextMenu(bool spellCheck)
     {
-        _miUndo = new ToolStripMenuItem("Undo",null, (s, ea) => _scintilla.Undo());
+        _miUndo = new ToolStripMenuItem("Undo", null, (s, ea) => _scintilla.Undo());
         Items.Add(_miUndo);
         _miRedo = new ToolStripMenuItem("Redo", null, (s, ea) => _scintilla.Redo());
 
@@ -57,7 +56,7 @@ private void InitContextMenu(bool spellCheck)
             };
 
             Items.Add(_miCheckSpelling);
-        }         
+        }
 
         Items.Add(new ToolStripSeparator());
 
@@ -94,8 +93,8 @@ private void InitContextMenu(bool spellCheck)
 
     private void SetWordWrapMode(object sender, EventArgs e)
     {
-        var mode = (WrapMode) ((ToolStripMenuItem) sender).Tag;
-        UserSettings.WrapMode = (int) mode;
+        var mode = (WrapMode)((ToolStripMenuItem)sender).Tag;
+        UserSettings.WrapMode = (int)mode;
         _scintilla.WrapMode = mode;
     }
 
@@ -114,7 +113,7 @@ protected override void OnOpening(CancelEventArgs e)
 
         //check the current wrap mode and uncheck the rest
         foreach (ToolStripMenuItem item in _miWordwrap.DropDownItems)
-            item.Checked = (WrapMode) item.Tag == _scintilla.WrapMode;
+            item.Checked = (WrapMode)item.Tag == _scintilla.WrapMode;
 
         _miSpelling.DropDown.Items.Clear();
         _miSpelling.Enabled = false;
@@ -125,9 +124,9 @@ protected override void OnOpening(CancelEventArgs e)
         var word = GetCurrentWord();
 
         if (string.IsNullOrWhiteSpace(word) || Hunspell.Check(word)) return;
-        foreach(var suggested in Hunspell.Suggest(word))
+        foreach (var suggested in Hunspell.Suggest(word))
         {
-            var mi = new ToolStripMenuItem(suggested, null, (s, ev) => { SetWord( word, suggested);});
+            var mi = new ToolStripMenuItem(suggested, null, (s, ev) => { SetWord(word, suggested); });
             _miSpelling.DropDownItems.Add(mi);
             _miSpelling.Enabled = true;
         }
@@ -146,15 +145,14 @@ private void SetWord(string oldWord, string newWord)
     {
         //make sure the current word matches the old word we are replacing
         //(I guess somehow an async something could have changed the text while the menu was open)
-        if(!string.Equals(GetCurrentWord(),oldWord))
+        if (!string.Equals(GetCurrentWord(), oldWord))
             return;
 
         var pos = _scintilla.CurrentPosition;
         var wordStart = _scintilla.WordStartPosition(pos, true);
         var wordEnd = _scintilla.WordEndPosition(pos, true);
 
-        _scintilla.DeleteRange(wordStart,wordEnd-wordStart);
-        _scintilla.InsertText(wordStart,newWord);
-
+        _scintilla.DeleteRange(wordStart, wordEnd - wordStart);
+        _scintilla.InsertText(wordStart, newWord);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ScintillaHelper/ScintillaTextEditorFactory.cs b/Rdmp.UI/ScintillaHelper/ScintillaTextEditorFactory.cs
index f80190f28a..e5a996bf81 100644
--- a/Rdmp.UI/ScintillaHelper/ScintillaTextEditorFactory.cs
+++ b/Rdmp.UI/ScintillaHelper/ScintillaTextEditorFactory.cs
@@ -48,7 +48,9 @@ public partial class ScintillaTextEditorFactory
     /// <param name="lineNumbers"></param>
     /// <param name="currentDirectory"></param>
     /// <returns></returns>
-    public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguage language = SyntaxLanguage.SQL, IQuerySyntaxHelper syntaxHelper = null, bool spellCheck = false, bool lineNumbers = true, string currentDirectory = null)
+    public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguage language = SyntaxLanguage.SQL,
+        IQuerySyntaxHelper syntaxHelper = null, bool spellCheck = false, bool lineNumbers = true,
+        string currentDirectory = null)
     {
         Scintilla toReturn = null;
 
@@ -58,7 +60,8 @@ public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguag
         }
         catch (Win32Exception ex)
         {
-            throw new Exception("Could not load Scintilla.  Check that the latest Visual C++ 2015 Redistributable is installed",ex);
+            throw new Exception(
+                "Could not load Scintilla.  Check that the latest Visual C++ 2015 Redistributable is installed", ex);
         }
 
         toReturn.Dock = DockStyle.Fill;
@@ -71,8 +74,10 @@ public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguag
             toReturn.Margins[1].Type = MarginType.Number;
         }
         else
+        {
             foreach (var margin in toReturn.Margins)
                 margin.Width = 0;
+        }
 
         toReturn.ClearCmdKey(Keys.Control | Keys.S); //prevent Ctrl+S displaying ascii code
         toReturn.ClearCmdKey(Keys.Control | Keys.R); //prevent Ctrl+R displaying ascii code
@@ -107,16 +112,19 @@ public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguag
 
         try
         {
-            if(spellCheck)
+            if (spellCheck)
             {
                 if (hUnSpell == null)
                 {
-                    using var dic = typeof(ScintillaTextEditorFactory).Assembly.GetManifestResourceStream("Rdmp.UI.en_GB.dic");
-                    using var aff = typeof(ScintillaTextEditorFactory).Assembly.GetManifestResourceStream("Rdmp.UI.en_GB.aff");
+                    using var dic =
+                        typeof(ScintillaTextEditorFactory).Assembly.GetManifestResourceStream("Rdmp.UI.en_GB.dic");
+                    using var aff =
+                        typeof(ScintillaTextEditorFactory).Assembly.GetManifestResourceStream("Rdmp.UI.en_GB.aff");
                     hUnSpell = WordList.CreateFromStreams(
                         dic ?? throw new InvalidOperationException("Dictionary not found"),
                         aff ?? throw new InvalidOperationException("Dictionary not found"));
                 }
+
                 var lastCheckedSpelling = DateTime.MinValue;
 
                 toReturn.KeyPress += (s, e) =>
@@ -126,7 +134,7 @@ public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguag
                     CheckSpelling((Scintilla)s, hUnSpell);
                 };
 
-                toReturn.Leave += (s,e)=> CheckSpelling((Scintilla)s,hUnSpell);
+                toReturn.Leave += (s, e) => CheckSpelling((Scintilla)s, hUnSpell);
                 scintillaMenu.Hunspell = hUnSpell;
             }
         }
@@ -134,7 +142,7 @@ public Scintilla Create(ICombineableFactory commandFactory = null, SyntaxLanguag
         {
             if (!DictionaryExceptionShown)
             {
-                ExceptionViewer.Show("Could not load dictionary",e);
+                ExceptionViewer.Show("Could not load dictionary", e);
                 DictionaryExceptionShown = true;
             }
         }
@@ -154,22 +162,21 @@ public static void CheckSpelling(Scintilla scintilla, WordList hunspell)
 
         foreach (Match m in WordRegex().Matches(scintilla.Text))
             if (!hunspell.Check(m.Value))
-            {
                 scintilla.IndicatorFillRange(m.Index, m.Length);
-            }
     }
 
     private static void OnDragEnter(object sender, DragEventArgs dragEventArgs, ICombineableFactory commandFactory)
     {
         var command = commandFactory.Create(dragEventArgs);
 
-        if(command != null)
+        if (command != null)
             dragEventArgs.Effect = DragDropEffects.Copy;
     }
+
     private static void OnDragDrop(object sender, DragEventArgs dragEventArgs, ICombineableFactory commandFactory)
     {
         //point they are dragged over
-        var editor = (Scintilla) sender;
+        var editor = (Scintilla)sender;
 
         if (editor.ReadOnly)
             return;
@@ -186,13 +193,13 @@ private static void OnDragDrop(object sender, DragEventArgs dragEventArgs, IComb
         //if it has a Form give it focus
         var form = editor.FindForm();
 
-        if(form != null)
+        if (form != null)
         {
             form.Activate();
             editor.Focus();
         }
 
-        editor.InsertText(pos,command.GetSqlString());
+        editor.InsertText(pos, command.GetSqlString());
     }
 
     private static void SetSQLHighlighting(Scintilla scintilla, IQuerySyntaxHelper syntaxHelper)
@@ -210,8 +217,8 @@ private static void SetSQLHighlighting(Scintilla scintilla, IQuerySyntaxHelper s
         scintilla.Margins[0].Width = 20;
 
         // Set the Styles
-        scintilla.Styles[Style.LineNumber].ForeColor = Color.FromArgb(255, 128, 128, 128);  //Dark Gray
-        scintilla.Styles[Style.LineNumber].BackColor = Color.FromArgb(255, 228, 228, 228);  //Light Gray
+        scintilla.Styles[Style.LineNumber].ForeColor = Color.FromArgb(255, 128, 128, 128); //Dark Gray
+        scintilla.Styles[Style.LineNumber].BackColor = Color.FromArgb(255, 228, 228, 228); //Light Gray
         scintilla.Styles[Style.Sql.Comment].ForeColor = Color.Green;
         scintilla.Styles[Style.Sql.CommentLine].ForeColor = Color.Green;
         scintilla.Styles[Style.Sql.CommentLineDoc].ForeColor = Color.Green;
@@ -219,7 +226,7 @@ private static void SetSQLHighlighting(Scintilla scintilla, IQuerySyntaxHelper s
         scintilla.Styles[Style.Sql.Word].ForeColor = Color.Blue;
         scintilla.Styles[Style.Sql.Word2].ForeColor = Color.Fuchsia;
         scintilla.Styles[Style.Sql.User1].ForeColor = Color.BlueViolet;
-        scintilla.Styles[Style.Sql.User2].ForeColor = Color.FromArgb(255, 00, 128, 192);    //Medium Blue-Green
+        scintilla.Styles[Style.Sql.User2].ForeColor = Color.FromArgb(255, 00, 128, 192); //Medium Blue-Green
         scintilla.Styles[Style.Sql.String].ForeColor = Color.Red;
         scintilla.Styles[Style.Sql.Character].ForeColor = Color.Red;
         scintilla.Styles[Style.Sql.Operator].ForeColor = Color.Black;
@@ -227,7 +234,8 @@ private static void SetSQLHighlighting(Scintilla scintilla, IQuerySyntaxHelper s
 
         // Set keyword lists
         // Word = 0
-        scintilla.SetKeywords(0, @"add alter as authorization backup begin bigint binary bit break browse bulk by cascade case catch char check checkpoint close clustered column commit compute constraint containstable continue create current current_date cursor cursor database date datetime datetime2 datetimeoffset dbcc deallocate decimal declare default delete deny desc disk distinct distributed double drop dump else end errlvl escape except exec execute exit external fetch file fillfactor float for foreign freetext freetexttable from full function goto grant group having hierarchyid holdlock identity identity_insert identitycol if image index insert int intersect into key kill lineno load merge money national nchar nocheck nocount nolock nonclustered ntext numeric nvarchar of off offsets on open opendatasource openquery openrowset openxml option order over percent plan precision primary print proc procedure public raiserror read readtext real reconfigure references replication restore restrict return revert revoke rollback rowcount rowguidcol rule save schema securityaudit select set setuser shutdown smalldatetime smallint smallmoney sql_variant statistics table table tablesample text textsize then time timestamp tinyint to top tran transaction trigger truncate try union unique uniqueidentifier update updatetext use user values varbinary varchar varying view waitfor when where while with writetext xml go ");
+        scintilla.SetKeywords(0,
+            @"add alter as authorization backup begin bigint binary bit break browse bulk by cascade case catch char check checkpoint close clustered column commit compute constraint containstable continue create current current_date cursor cursor database date datetime datetime2 datetimeoffset dbcc deallocate decimal declare default delete deny desc disk distinct distributed double drop dump else end errlvl escape except exec execute exit external fetch file fillfactor float for foreign freetext freetexttable from full function goto grant group having hierarchyid holdlock identity identity_insert identitycol if image index insert int intersect into key kill lineno load merge money national nchar nocheck nocount nolock nonclustered ntext numeric nvarchar of off offsets on open opendatasource openquery openrowset openxml option order over percent plan precision primary print proc procedure public raiserror read readtext real reconfigure references replication restore restrict return revert revoke rollback rowcount rowguidcol rule save schema securityaudit select set setuser shutdown smalldatetime smallint smallmoney sql_variant statistics table table tablesample text textsize then time timestamp tinyint to top tran transaction trigger truncate try union unique uniqueidentifier update updatetext use user values varbinary varchar varying view waitfor when where while with writetext xml go ");
 
         var word2 =
             @"ascii cast charindex ceiling coalesce collate contains convert current_time current_timestamp current_user floor isnull max min nullif object_id session_user substring system_user tsequal";
@@ -238,7 +246,8 @@ private static void SetSQLHighlighting(Scintilla scintilla, IQuerySyntaxHelper s
         // Word2 = 1
         scintilla.SetKeywords(1, word2);
         // User1 = 4
-        scintilla.SetKeywords(4, @"all and any between cross exists in inner is join left like not null or outer pivot right some unpivot");
+        scintilla.SetKeywords(4,
+            @"all and any between cross exists in inner is join left like not null or outer pivot right some unpivot");
         // User2 = 5
         scintilla.SetKeywords(5, @"sys objects sysobjects ");
     }
@@ -267,7 +276,7 @@ private void SetCSharpHighlighting(Scintilla scintilla)
         scintilla.Styles[CSharpLexer.StyleString].ForeColor = Color.Red;
 
         scintilla.LexerName = null;
-        scintilla.StyleNeeded += (s,e)=>scintilla_StyleNeeded(scintilla,e);
+        scintilla.StyleNeeded += (s, e) => scintilla_StyleNeeded(scintilla, e);
     }
 
     private static void SetLexerEnumHighlighting(Scintilla scintilla, string lexer)
diff --git a/Rdmp.UI/SimpleControls/CheckAndExecuteUI.cs b/Rdmp.UI/SimpleControls/CheckAndExecuteUI.cs
index 95ec0bf19f..af593ebcb7 100644
--- a/Rdmp.UI/SimpleControls/CheckAndExecuteUI.cs
+++ b/Rdmp.UI/SimpleControls/CheckAndExecuteUI.cs
@@ -64,10 +64,7 @@ public override void SetItemActivator(IActivateItems activator)
         loadProgressUI1.ApplyTheme(activator.Theme);
     }
 
-    private RDMPCommandLineOptions Detatch_CommandGetter()
-    {
-        return CommandGetter(CommandLineActivity.run);
-    }
+    private RDMPCommandLineOptions Detatch_CommandGetter() => CommandGetter(CommandLineActivity.run);
 
     public List<HelpStage> HelpStages { get; private set; }
 
@@ -84,12 +81,12 @@ private List<HelpStage> BuildHelpStages()
     {
         var stages = new List<HelpStage>
         {
-            new HelpStage(btnRunChecks,
+            new(btnRunChecks,
                 "Once you are happy with the selections, use this button to run the checks for the selected options."),
-            new HelpStage(btnExecute, "This button will execute the required operation in the RDMP UI.\r\n" +
-                                      "Results will be shown below.")
+            new(btnExecute, "This button will execute the required operation in the RDMP UI.\r\n" +
+                            "Results will be shown below.")
         };
-            
+
         return stages;
     }
 
@@ -104,17 +101,18 @@ private void btnRunChecks_Click(object sender, EventArgs e)
         try
         {
             var command = CommandGetter(CommandLineActivity.check);
-            runner = RunnerFactory.CreateRunner(Activator,command);
+            runner = RunnerFactory.CreateRunner(Activator, command);
         }
         catch (Exception ex)
         {
             ragChecks.Fatal(ex);
             return;
         }
+
         CurrentRunner = runner;
 
         btnRunChecks.Enabled = false;
-            
+
         //reset the visualisations
         ragChecks.Reset();
         checksUI1.Clear();
@@ -126,21 +124,20 @@ private void btnRunChecks_Click(object sender, EventArgs e)
         //create a to memory that passes the events to checksui since that's the only one that can respond to proposed fixes
         var toMemory = new ToMemoryCheckNotifier(checksUI1);
 
-        Task.Factory.StartNew(() => Check(runner,toMemory)).ContinueWith(
-            t=>
+        Task.Factory.StartNew(() => Check(runner, toMemory)).ContinueWith(
+            t =>
             {
                 //once Thread completes do this on the main UI Thread
 
                 //find the worst check state
                 var worst = toMemory.GetWorst();
                 //update the rag smiley to reflect whether it has passed
-                ragChecks.OnCheckPerformed(new CheckEventArgs($"Checks resulted in {worst}",worst));
+                ragChecks.OnCheckPerformed(new CheckEventArgs($"Checks resulted in {worst}", worst));
                 //update the bit flag
                 ChecksPassed = worst <= CheckResult.Warning;
 
                 //enable other buttons now based on the new state
                 SetButtonStates();
-
             }, TaskScheduler.FromCurrentSynchronizationContext());
 
         _runningTask = null;
@@ -151,7 +148,8 @@ private void Check(IRunner runner, ToMemoryCheckNotifier toMemory)
     {
         try
         {
-            runner.Run(Activator.RepositoryLocator, new FromCheckNotifierToDataLoadEventListener(toMemory), toMemory,new GracefulCancellationToken());
+            runner.Run(Activator.RepositoryLocator, new FromCheckNotifierToDataLoadEventListener(toMemory), toMemory,
+                new GracefulCancellationToken());
         }
         catch (Exception e)
         {
@@ -168,20 +166,21 @@ private void btnExecute_Click(object sender, EventArgs e)
         try
         {
             var command = CommandGetter(CommandLineActivity.run);
-            runner = RunnerFactory.CreateRunner(Activator,command);
+            runner = RunnerFactory.CreateRunner(Activator, command);
         }
         catch (Exception ex)
         {
             ragChecks.Fatal(ex);
             return;
         }
+
         CurrentRunner = runner;
 
         loadProgressUI1.Clear();
         loadProgressUI1.ShowRunning(true);
 
         var exitCode = 0;
-            
+
         _runningTask =
             //run the data load in a Thread
             Task.Factory.StartNew(() => { exitCode = Run(runner); });
@@ -196,13 +195,9 @@ private void btnExecute_Click(object sender, EventArgs e)
                     loadProgressUI1.ShowRunning(false);
 
                     if (exitCode != 0)
-                    {
                         loadProgressUI1.SetFatal();
-                    }
                     else
-                    {
                         loadProgressUI1.SetSuccess();
-                    }
 
                     ExecutionFinished?.Invoke(this, new ExecutionEventArgs(exitCode));
 
@@ -218,16 +213,19 @@ private int Run(IRunner runner)
     {
         try
         {
-            var exitCode = runner.Run(Activator.RepositoryLocator, loadProgressUI1, new FromDataLoadEventListenerToCheckNotifier(loadProgressUI1), _cancellationTokenSource.Token);
+            var exitCode = runner.Run(Activator.RepositoryLocator, loadProgressUI1,
+                new FromDataLoadEventListenerToCheckNotifier(loadProgressUI1), _cancellationTokenSource.Token);
 
-            loadProgressUI1.OnNotify(this,new NotifyEventArgs(exitCode == 0 ? ProgressEventType.Information : ProgressEventType.Error,
+            loadProgressUI1.OnNotify(this, new NotifyEventArgs(
+                exitCode == 0 ? ProgressEventType.Information : ProgressEventType.Error,
                 $"Exit code was {exitCode}"));
 
             return exitCode;
         }
         catch (Exception ex)
         {
-            loadProgressUI1.OnNotify(ProgressUI.GlobalRunError,new NotifyEventArgs(ProgressEventType.Error, "Fatal Error",ex));
+            loadProgressUI1.OnNotify(ProgressUI.GlobalRunError,
+                new NotifyEventArgs(ProgressEventType.Error, "Fatal Error", ex));
         }
 
         return -1;
@@ -256,7 +254,7 @@ private void SetButtonStates()
             checksUI1.Visible = false;
             loadProgressUI1.Visible = true;
         }
-            
+
         //checks have passed is there a load underway already?
         if (_runningTask == null || _runningTask.IsCompleted)
         {
@@ -285,7 +283,7 @@ public void GroupBySender(string filter = null)
     private void btnAbortLoad_Click(object sender, EventArgs e)
     {
         _cancellationTokenSource.Abort();
-        loadProgressUI1.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning,"Abort request issued"));
+        loadProgressUI1.OnNotify(this, new NotifyEventArgs(ProgressEventType.Warning, "Abort request issued"));
     }
 
     public void Reset()
diff --git a/Rdmp.UI/SimpleControls/ConnectionStringTextBox.cs b/Rdmp.UI/SimpleControls/ConnectionStringTextBox.cs
index 7f9d96c09a..11add03a06 100644
--- a/Rdmp.UI/SimpleControls/ConnectionStringTextBox.cs
+++ b/Rdmp.UI/SimpleControls/ConnectionStringTextBox.cs
@@ -56,8 +56,8 @@ private void SetSupportedKeywords()
                 supportedKeywords.Add("Addr");
                 supportedKeywords.Add("Network Address");
                 supportedKeywords.Add("Application Name");
-                    
-                    
+
+
                 break;
             case DatabaseType.MySql:
                 throw new NotImplementedException();
@@ -77,7 +77,7 @@ protected override void OnTextChanged(EventArgs e)
         try
         {
             base.OnTextChanged(e);
-            
+
             //set text color to black by default
             ForeColor = Color.Black;
 
@@ -112,13 +112,14 @@ protected override void OnTextChanged(EventArgs e)
 
             if (string.IsNullOrWhiteSpace(lastBitBeingTyped) //user has not typed anything or has just put in a ;
                 ||
-                lastBitBeingTyped.Contains('='))//user has typed Password=bobsca <- i.e. he is midway through typing a value not a key
+                lastBitBeingTyped
+                    .Contains('=')) //user has typed Password=bobsca <- i.e. he is midway through typing a value not a key
                 return;
 
             //we will suggest Server because user typed se
             var keywordToSuggest = candidates.FirstOrDefault(c => c.ToLower().StartsWith(lastBitBeingTyped.ToLower()));
 
-            if (keywordToSuggest == null)//nothing to suggest, user is typing crazy fool stuff
+            if (keywordToSuggest == null) //nothing to suggest, user is typing crazy fool stuff
             {
                 ForeColor = Color.DarkRed;
                 return;
@@ -136,8 +137,9 @@ protected override void OnTextChanged(EventArgs e)
             Text = Text.Insert(whereUserIsCurrently, bitToSuggest);
             SelectionStart = whereUserIsCurrently;
             SelectionLength = TextLength - whereUserIsCurrently;
-            suppressAutocomplete = false;//we are done
-        } catch (Exception ex) 
+            suppressAutocomplete = false; //we are done
+        }
+        catch (Exception ex)
         {
             ExceptionViewer.Show(ex);
         }
@@ -147,17 +149,16 @@ protected override void OnKeyDown(KeyEventArgs e)
     {
         base.OnKeyDown(e);
 
-        if(e.Handled)//someone else suppressed it
+        if (e.Handled) //someone else suppressed it
             return;
 
         //if user is doing control c or control v or something
         if (e.Control)
             suppressAutocomplete = true;
-        else
-        if (char.IsLetterOrDigit((char)e.KeyCode) || e.KeyCode == Keys.Space)
+        else if (char.IsLetterOrDigit((char)e.KeyCode) || e.KeyCode == Keys.Space)
             suppressAutocomplete = false;
         else
-            suppressAutocomplete = true;//user is pressing some arrow keys or delete keys or something, don't suggest anything until 
+            suppressAutocomplete =
+                true; //user is pressing some arrow keys or delete keys or something, don't suggest anything until 
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleControls/DatabaseTypeUI.cs b/Rdmp.UI/SimpleControls/DatabaseTypeUI.cs
index a4b69da181..9d4aadf1de 100644
--- a/Rdmp.UI/SimpleControls/DatabaseTypeUI.cs
+++ b/Rdmp.UI/SimpleControls/DatabaseTypeUI.cs
@@ -24,16 +24,16 @@ public DatabaseType DatabaseType
         {
             _databaseType = value;
 
-            if(bLoading)
+            if (bLoading)
                 return;
 
             ddDatabaseType.SelectedItem = value;
             pbDatabaseProvider.Image = _databaseIconProvider.GetImage(value).ImageToBitmap();
-                
         }
     }
 
     private bool bLoading = true;
+
     public DatabaseTypeUI()
     {
         InitializeComponent();
@@ -43,7 +43,6 @@ public DatabaseTypeUI()
         pbDatabaseProvider.Image = _databaseIconProvider.GetImage(DatabaseType.MicrosoftSQLServer).ImageToBitmap();
 
         bLoading = false;
-
     }
 
     public void LockDatabaseType(DatabaseType databaseType)
@@ -53,16 +52,17 @@ public void LockDatabaseType(DatabaseType databaseType)
     }
 
     private bool changing = false;
+
     private void ddDatabaseType_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(changing )
+        if (changing)
             return;
 
         changing = true;
 
         DatabaseType = (DatabaseType)ddDatabaseType.SelectedItem;
 
-        DatabaseTypeChanged?.Invoke(this,EventArgs.Empty);
+        DatabaseTypeChanged?.Invoke(this, EventArgs.Empty);
 
         changing = false;
     }
diff --git a/Rdmp.UI/SimpleControls/ExecutionEventArgs.cs b/Rdmp.UI/SimpleControls/ExecutionEventArgs.cs
index d0c9427aad..df59018932 100644
--- a/Rdmp.UI/SimpleControls/ExecutionEventArgs.cs
+++ b/Rdmp.UI/SimpleControls/ExecutionEventArgs.cs
@@ -13,7 +13,7 @@ namespace Rdmp.UI.SimpleControls;
 /// EventArgs describing the final exit code of an <see cref="IRunner"/> running in <see cref="CheckAndExecuteUI"/> (this will be the exit code that
 /// would have been returned had the <see cref="IRunner"/> been running on the command line rdmp.exe).
 /// </summary>
-public class ExecutionEventArgs:EventArgs
+public class ExecutionEventArgs : EventArgs
 {
     public int? ExitCode { get; set; }
 
diff --git a/Rdmp.UI/SimpleControls/HeatmapUI.cs b/Rdmp.UI/SimpleControls/HeatmapUI.cs
index 9f6496478c..955433cf41 100644
--- a/Rdmp.UI/SimpleControls/HeatmapUI.cs
+++ b/Rdmp.UI/SimpleControls/HeatmapUI.cs
@@ -28,8 +28,6 @@ namespace Rdmp.UI.SimpleControls;
 /// </summary>
 public partial class HeatmapUI : UserControl
 {
-
-
     /*/////////////////////////////////////////EXPECTED DATA TABLE FORMAT/////////////////////////////
     * Date   | HeatLine1 | HeatLine2| HeatLine3 | HeatLine4 | etc
     * 2001   |    30     |   40     |    30     |   40      | ...
@@ -40,7 +38,7 @@ public partial class HeatmapUI : UserControl
     * 2006   |    17     |   99     |    10     |   45      | ...
     * 2007   |    19     |   40     |    30     |   40      | ...
     * ...    |   ...     |    ...   |   ...     |   ...     | ...
-    * 
+    *
     * */
 
     //Control Layout:
@@ -62,8 +60,8 @@ public partial class HeatmapUI : UserControl
     ///Table is interpreted in the following way: 
     /// - First column is the axis in direction X (horizontally) containing (in order) the axis label values that will be each pixel in each heat lane
     /// - Each subsequent column (HeatLine1, HeatLine2 etc above) is a horizontal line of the heatmap with each pixel intensity being determined by the value on the corresponding date (in the first column)
-        
     private RainbowColorPicker _rainbow = new(NumberOfColors);
+
     private const double MinPixelHeight = 15.0;
     private const double MaxPixelHeight = 20.0;
 
@@ -81,32 +79,32 @@ public HeatmapUI()
 
     public void SetDataTable(DataTable dataTable)
     {
-        if(!string.IsNullOrWhiteSpace(UserSettings.HeatMapColours))
+        if (!string.IsNullOrWhiteSpace(UserSettings.HeatMapColours))
         {
             var colorRegex = new Regex("#([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])([0-9A-F][0-9A-F])");
 
-            var tokens = UserSettings.HeatMapColours.Split(new string[]{"->" },StringSplitOptions.None);
+            var tokens = UserSettings.HeatMapColours.Split(new string[] { "->" }, StringSplitOptions.None);
 
-            if(tokens.Length == 2)
+            if (tokens.Length == 2)
             {
                 var m1 = colorRegex.Match(tokens[0]);
                 var m2 = colorRegex.Match(tokens[1]);
-                    
-                if(m1.Success && m2.Success)
+
+                if (m1.Success && m2.Success)
                 {
                     var fromColor = Color.FromArgb(
-                        (int)Convert.ToByte(m1.Groups[1].Value,16),
-                        (int)Convert.ToByte(m1.Groups[2].Value,16),
-                        (int)Convert.ToByte(m1.Groups[3].Value,16)
+                        (int)Convert.ToByte(m1.Groups[1].Value, 16),
+                        (int)Convert.ToByte(m1.Groups[2].Value, 16),
+                        (int)Convert.ToByte(m1.Groups[3].Value, 16)
                     );
 
                     var toColor = Color.FromArgb(
-                        (int)Convert.ToByte(m2.Groups[1].Value,16),
-                        (int)Convert.ToByte(m2.Groups[2].Value,16),
-                        (int)Convert.ToByte(m2.Groups[3].Value,16)
+                        (int)Convert.ToByte(m2.Groups[1].Value, 16),
+                        (int)Convert.ToByte(m2.Groups[2].Value, 16),
+                        (int)Convert.ToByte(m2.Groups[3].Value, 16)
                     );
 
-                    _rainbow = new RainbowColorPicker(fromColor,toColor,NumberOfColors);
+                    _rainbow = new RainbowColorPicker(fromColor, toColor, NumberOfColors);
                 }
             }
         }
@@ -117,15 +115,14 @@ public void SetDataTable(DataTable dataTable)
 
             //skip the first column (which will be the X axis values)  then compute the maximum value in any cell in the data table, this is the brightest pixel in heatmap
             //the minimum value will be the darkest pixel
-            
+
             _maxValueInDataTable = double.MinValue;
             _minValueInDataTable = double.MaxValue;
 
             for (var x = 0; x < _dataTable.Rows.Count; x++)
             for (var y = 1; y < _dataTable.Columns.Count; y++)
             {
-
-                    var cellValue = ToDouble(_dataTable.Rows[x][y]);
+                var cellValue = ToDouble(_dataTable.Rows[x][y]);
 
                 if (cellValue < _minValueInDataTable)
                     _minValueInDataTable = cellValue;
@@ -136,20 +133,17 @@ public void SetDataTable(DataTable dataTable)
 
             Height = (int)Math.Max(Height, _dataTable.Columns.Count * MinPixelHeight);
         }
-            
+
         Invalidate();
     }
 
-    private static double ToDouble(object o)
-    {
-        return o == DBNull.Value ? 0 : Convert.ToDouble(o);
-    }
+    private static double ToDouble(object o) => o == DBNull.Value ? 0 : Convert.ToDouble(o);
 
     private DataTable _dataTable;
     private double _maxValueInDataTable;
     private double _minValueInDataTable;
     private bool _crashedPainting;
-        
+
 
     private const int NumberOfColors = 256;
 
@@ -170,9 +164,9 @@ protected override void OnResize(EventArgs e)
     private void hoverToolTipTimer_Tick(object sender, EventArgs e)
     {
         var pos = PointToClient(Cursor.Position);
-            
+
         //if we moved
-        if(!_lastHoverPoint.Equals(pos))
+        if (!_lastHoverPoint.Equals(pos))
         {
             _lastHoverPoint = pos;
             _lastHoverTickCount = Environment.TickCount;
@@ -183,23 +177,25 @@ private void hoverToolTipTimer_Tick(object sender, EventArgs e)
 
         //we didn't move, have we been here a while?
         if (Environment.TickCount - _lastHoverTickCount < toolTipDelayInTicks)
-            return;//no
+            return; //no
 
         //yes we have been here a while so show the tool tip
         _lastHoverTickCount = Environment.TickCount;
         object value = null;
 
         lock (oDataTableLock)
+        {
             value = GetValueFromClientPosition(pos);
+        }
 
         //there wasn't anything to display anyway
-        if(value == null)
+        if (value == null)
             return;
-            
-        if(Visible)
+
+        if (Visible)
             //show the tool tip
-            tt.Show(value.ToString(), this, new Point(pos.X+20,pos.Y - 10));//allow room for cusor to not overdraw the tool tip
-            
+            tt.Show(value.ToString(), this,
+                new Point(pos.X + 20, pos.Y - 10)); //allow room for cusor to not overdraw the tool tip
     }
 
     private object GetValueFromClientPosition(Point pos)
@@ -218,8 +214,9 @@ private object GetValueFromClientPosition(Point pos)
         var pixelWidth = GetHeatPixelWidth();
 
 
-        var dataTableCol = (int) (pos.Y/pixelHeight); //heat map line number + 1 because first column is the axis label
-        var dataTableRow = (int) (pos.X/pixelWidth); //the pixel width corresponds to the number of axis values in the first column
+        var dataTableCol = (int)(pos.Y / pixelHeight); //heat map line number + 1 because first column is the axis label
+        var dataTableRow =
+            (int)(pos.X / pixelWidth); //the pixel width corresponds to the number of axis values in the first column
 
         if (dataTableCol >= _dataTable.Columns.Count)
             return null;
@@ -228,7 +225,7 @@ private object GetValueFromClientPosition(Point pos)
         if (dataTableRow >= _dataTable.Rows.Count)
             return _dataTable.Columns[dataTableCol].ColumnName;
 
-        if(dataTableCol == 0)
+        if (dataTableCol == 0)
             return _dataTable.Rows[dataTableRow][dataTableCol];
 
         return
@@ -238,8 +235,8 @@ private object GetValueFromClientPosition(Point pos)
     protected override void OnPaint(PaintEventArgs e)
     {
         base.OnPaint(e);
-            
-        if(_dataTable == null)
+
+        if (_dataTable == null)
             return;
         if (_crashedPainting)
             return;
@@ -248,7 +245,7 @@ protected override void OnPaint(PaintEventArgs e)
             lock (oDataTableLock)
             {
                 //draw background
-                e.Graphics.FillRectangle(Brushes.White, new Rectangle(0,0,Width,Height));
+                e.Graphics.FillRectangle(Brushes.White, new Rectangle(0, 0, Width, Height));
 
                 //decide how tall to make pixels
                 var heatPixelHeight = GetHeatPixelHeight();
@@ -263,50 +260,55 @@ protected override void OnPaint(PaintEventArgs e)
                 var heatPixelWidth = GetHeatPixelWidth();
 
                 var brush = new SolidBrush(Color.Black);
-                    
+
                 //for each line of pixels in heatmap
                 for (var x = 0; x < _dataTable.Rows.Count; x++)
-                {
                     //draw the line this way -------------> with pixels of width heatPixelWidth/Height
-                    
                     //skip the first y value which is the x axis value
-                    for (var y = 1; y < _dataTable.Columns.Count; y++)
+                for (var y = 1; y < _dataTable.Columns.Count; y++)
+                {
+                    //the value we are drawing
+                    var cellValue = ToDouble(_dataTable.Rows[x][y]);
+
+                    //if the cell value is 0 render it as black
+                    if (Math.Abs(cellValue - _minValueInDataTable) < 0.0000000001 &&
+                        Math.Abs(_minValueInDataTable) < 0.0000000001)
                     {
-                        //the value we are drawing
-                        var cellValue = ToDouble(_dataTable.Rows[x][y]);
-                        
-                        //if the cell value is 0 render it as black
-                        if (Math.Abs(cellValue - _minValueInDataTable) < 0.0000000001 && Math.Abs(_minValueInDataTable) < 0.0000000001)
-                            brush.Color = Color.Black;
-                        else
-                        {
-                            var brightness = (cellValue - _minValueInDataTable) / (_maxValueInDataTable - _minValueInDataTable);
-                            var brightnessIndex = (int)(brightness * (NumberOfColors - 1));
-
-                            brush.Color = _rainbow.Colors[brightnessIndex];
-                        }
-
-                        e.Graphics.FillRectangle(brush, (float)(x * heatPixelWidth), (float)(y * heatPixelHeight), (float)heatPixelWidth, (float)heatPixelHeight);
+                        brush.Color = Color.Black;
                     }
+                    else
+                    {
+                        var brightness = (cellValue - _minValueInDataTable) /
+                                         (_maxValueInDataTable - _minValueInDataTable);
+                        var brightnessIndex = (int)(brightness * (NumberOfColors - 1));
+
+                        brush.Color = _rainbow.Colors[brightnessIndex];
+                    }
+
+                    e.Graphics.FillRectangle(brush, (float)(x * heatPixelWidth), (float)(y * heatPixelHeight),
+                        (float)heatPixelWidth, (float)heatPixelHeight);
                 }
 
                 var labelStartX = Width - _currentLabelsWidth;
-                
-                
+
+
                 //draw the labels
                 for (var i = 1; i < _dataTable.Columns.Count; i++)
                 {
-                    var labelStartY = i*heatPixelHeight;
+                    var labelStartY = i * heatPixelHeight;
 
                     var name = _dataTable.Columns[i].ColumnName;
 
-                    e.Graphics.DrawString(name, font, Brushes.Black, new PointF((float)labelStartX, (float)labelStartY));
+                    e.Graphics.DrawString(name, font, Brushes.Black,
+                        new PointF((float)labelStartX, (float)labelStartY));
                 }
-    
+
                 double lastAxisStart = -500;
                 double lastAxisLabelWidth = -500;
 
-                var visibleArea = _useEntireControlAsVisibleArea ? new Rectangle(0,0,Width,Height) : this.GetVisibleArea();
+                var visibleArea = _useEntireControlAsVisibleArea
+                    ? new Rectangle(0, 0, Width, Height)
+                    : this.GetVisibleArea();
 
 
                 var visibleClipBoundsTop = visibleArea.Top;
@@ -314,7 +316,7 @@ protected override void OnPaint(PaintEventArgs e)
                 //now draw the axis 
                 //axis starts at the first visible pixel
                 double axisYStart = Math.Max(0, visibleClipBoundsTop);
-                    
+
                 e.Graphics.FillRectangle(Brushes.White, 0, (int)axisYStart, Width, (int)heatPixelHeight);
 
                 //draw the axis labels
@@ -323,7 +325,7 @@ protected override void OnPaint(PaintEventArgs e)
                     var axisXStart = i * heatPixelWidth;
 
                     //skip labels if the axis would result in a label overdrawing its mate
-                    if (axisXStart  < lastAxisStart + lastAxisLabelWidth)
+                    if (axisXStart < lastAxisStart + lastAxisLabelWidth)
                         continue;
 
                     lastAxisStart = axisXStart;
@@ -331,22 +333,22 @@ protected override void OnPaint(PaintEventArgs e)
                     var label = _dataTable.Rows[i][0].ToString();
 
                     //draw the axis label text with 1 pixel left and right so that there is space for the axis black line
-                    e.Graphics.DrawString(label, font, Brushes.Black, new PointF((float) axisXStart + 1, (float) axisYStart));
+                    e.Graphics.DrawString(label, font, Brushes.Black,
+                        new PointF((float)axisXStart + 1, (float)axisYStart));
                     lastAxisLabelWidth = (int)e.Graphics.MeasureString(label, font).Width + 2;
 
 
                     //draw axis black line
-                    e.Graphics.DrawLine(Pens.Black, new PointF((float) axisXStart, (float)axisYStart), new PointF((float) axisXStart, Height));
+                    e.Graphics.DrawLine(Pens.Black, new PointF((float)axisXStart, (float)axisYStart),
+                        new PointF((float)axisXStart, Height));
                 }
             }
-
         }
         catch (Exception exception)
         {
             _crashedPainting = true;
             ExceptionViewer.Show(exception);
         }
-
     }
 
     private double GetLabelWidth(Graphics g, Font font)
@@ -364,7 +366,7 @@ private double GetLabelWidth(Graphics g, Font font)
     private double GetHeatPixelWidth()
     {
         var plotAreaWidth = Width - _currentLabelsWidth;
-        return plotAreaWidth/_dataTable.Rows.Count;
+        return plotAreaWidth / _dataTable.Rows.Count;
     }
 
     /// <summary>
@@ -387,35 +389,29 @@ private static Font GetFontSizeThatWillFitPixelHeight(double heightInPixels, Gra
         do
         {
             font = new Font(new FontFamily("Tahoma"), (float)(emSize -= 0.5), FontStyle.Regular);
-
         } while (graphics.MeasureString("testing", font).Height > heightInPixels);
 
         return font;
     }
 
 
-
-
     public static void CalculateLayout()
     {
-            
     }
 
     public void Clear()
     {
-            
-        lock(oDataTableLock)
+        lock (oDataTableLock)
+        {
             _dataTable = null;
+        }
     }
 
-    public bool HasDataTable()
-    {
-        return _dataTable != null;
-    }
+    public bool HasDataTable() => _dataTable != null;
 
     public Bitmap GetImage(int maxHeight)
     {
-        var h = Math.Min(maxHeight,Height);
+        var h = Math.Min(maxHeight, Height);
 
         var isClipped = maxHeight < Height;
 
@@ -430,10 +426,10 @@ public Bitmap GetImage(int maxHeight)
         if (isClipped)
         {
             //number of heat map lines
-            var numberOfHeatLinesVisible = (int) (h/GetHeatPixelHeight());
+            var numberOfHeatLinesVisible = (int)(h / GetHeatPixelHeight());
 
             //total number of heatmap lines
-            var totalHeatMapLinesAvailable = _dataTable.Columns.Count -1;
+            var totalHeatMapLinesAvailable = _dataTable.Columns.Count - 1;
 
             if (numberOfHeatLinesVisible < totalHeatMapLinesAvailable)
             {
@@ -445,13 +441,9 @@ public Bitmap GetImage(int maxHeight)
                 var fontSize = g.MeasureString(clippedRowsComment, Font);
 
                 //centre it on the bottom of the image
-                g.FillRectangle(Brushes.WhiteSmoke,0, h - fontSize.Height,fontSize.Width,fontSize.Height);
-                g.DrawString(clippedRowsComment,Font,Brushes.Black,0,h-fontSize.Height);
-
+                g.FillRectangle(Brushes.WhiteSmoke, 0, h - fontSize.Height, fontSize.Width, fontSize.Height);
+                g.DrawString(clippedRowsComment, Font, Brushes.Black, 0, h - fontSize.Height);
             }
-
-
-
         }
 
         return bmp;
@@ -463,8 +455,8 @@ public void SaveImage(string heatmapPath, ImageFormat imageFormat)
 
         _useEntireControlAsVisibleArea = true;
 
-        DrawToBitmap(bmp, new Rectangle(0,0,Width,Height));
-        bmp.Save(heatmapPath,imageFormat);
+        DrawToBitmap(bmp, new Rectangle(0, 0, Width, Height));
+        bmp.Save(heatmapPath, imageFormat);
 
         _useEntireControlAsVisibleArea = false;
     }
diff --git a/Rdmp.UI/SimpleControls/HelpIcon.cs b/Rdmp.UI/SimpleControls/HelpIcon.cs
index dbed0ce7e7..87e42be854 100644
--- a/Rdmp.UI/SimpleControls/HelpIcon.cs
+++ b/Rdmp.UI/SimpleControls/HelpIcon.cs
@@ -29,7 +29,7 @@ public partial class HelpIcon : UserControl
     private HelpWorkflow _workFlow;
     private string _originalHoverText;
     private ToolTip tt;
-    public bool SuppressClick{get;set;}
+    public bool SuppressClick { get; set; }
 
     public HelpIcon()
     {
@@ -49,7 +49,7 @@ public void SetHelpText(string title, string hoverText, HelpWorkflow workflow =
         //If TT is null create new tooltip
         tt ??= new ToolTip
         {
-            AutoPopDelay = 15000,  // Warning! MSDN states this is Int32, but anything over 32767 will fail.
+            AutoPopDelay = 15000, // Warning! MSDN states this is Int32, but anything over 32767 will fail.
             ShowAlways = true,
             ToolTipTitle = _title,
             InitialDelay = 200,
@@ -59,6 +59,7 @@ public void SetHelpText(string title, string hoverText, HelpWorkflow workflow =
         tt.SetToolTip(this, _hoverText);
         Cursor = Cursors.Hand;
     }
+
     public void ClearHelpText()
     {
         SetHelpText(null, null);
@@ -66,7 +67,7 @@ public void ClearHelpText()
 
     private string GetShortText(string hoverText)
     {
-        if(string.IsNullOrWhiteSpace(_hoverText))
+        if (string.IsNullOrWhiteSpace(_hoverText))
             return null;
 
         if (hoverText.Length <= MaxHoverTextLength)
@@ -78,11 +79,10 @@ private string GetShortText(string hoverText)
 
     private void HelpIcon_MouseClick(object sender, MouseEventArgs e)
     {
-        if(!SuppressClick)
+        if (!SuppressClick)
             if (_workFlow != null)
                 _workFlow.Start(true);
-            else
-            if(_title != null && _originalHoverText != null)
+            else if (_title != null && _originalHoverText != null)
                 WideMessageBox.Show(_title, _originalHoverText, WideMessageBoxTheme.Help);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleControls/ObjectSaverButton.cs b/Rdmp.UI/SimpleControls/ObjectSaverButton.cs
index a3ab4709cf..8f9f5a4602 100644
--- a/Rdmp.UI/SimpleControls/ObjectSaverButton.cs
+++ b/Rdmp.UI/SimpleControls/ObjectSaverButton.cs
@@ -30,7 +30,7 @@ public partial class ObjectSaverButton
     private Bitmap _undoImage;
     private Bitmap _redoImage;
 
-    private ToolStripButton btnSave  = new("Save",FamFamFamIcons.disk.ImageToBitmap());
+    private ToolStripButton btnSave = new("Save", FamFamFamIcons.disk.ImageToBitmap());
     private ToolStripButton btnUndoRedo = new("Undo", FamFamFamIcons.Undo.ImageToBitmap());
 
     private RevertableObjectReport _undoneChanges;
@@ -41,7 +41,7 @@ public ObjectSaverButton()
     {
         btnSave.Click += new EventHandler(btnSave_Click);
         btnUndoRedo.Click += new EventHandler(btnUndoRedo_Click);
-            
+
         _undoImage = FamFamFamIcons.Undo.ImageToBitmap();
         _redoImage = FamFamFamIcons.Redo.ImageToBitmap();
 
@@ -55,7 +55,7 @@ public ObjectSaverButton()
     /// <summary>
     /// Function to carry out some kind of proceedure before the object is saved.  Return true if you want the save to carry on and be applied or false to abandon the save attempt.
     /// </summary>
-    public event Func<DatabaseEntity,bool> BeforeSave;
+    public event Func<DatabaseEntity, bool> BeforeSave;
 
     private bool _isEnabled;
     private bool _undo = true;
@@ -65,29 +65,31 @@ public void SetupFor(IRDMPControl control, DatabaseEntity o, IActivateItems acti
         control.CommonFunctionality.Add(btnSave);
         control.CommonFunctionality.Add(btnUndoRedo);
 
-        var f = (control as Form ?? ((Control)control).FindForm()) ?? throw new NotSupportedException("Cannot call SetupFor before the control has been added to its parent form");
+        var f = (control as Form ?? ((Control)control).FindForm()) ??
+                throw new NotSupportedException(
+                    "Cannot call SetupFor before the control has been added to its parent form");
         _parent = control;
 
         Enable(false);
 
         //if it is a fresh instance
-        if(!ReferenceEquals(_o,o))
+        if (!ReferenceEquals(_o, o))
         {
             //subscribe to property change events
-            if(_o != null)
+            if (_o != null)
                 _o.PropertyChanged -= PropertyChanged;
             _o = o;
             _o.PropertyChanged += PropertyChanged;
         }
-            
+
         //already set up before
         if (_activator != null)
             return;
-            
+
         _activator = activator;
 
         f.Enter += ParentForm_Enter;
-            
+
         //the first time it is set up it could still be out of date!
         CheckForOutOfDateObjectAndOfferToFix();
     }
@@ -112,7 +114,7 @@ public void Enable(bool b)
         }
 
         _parent.SetUnSavedChanges(b);
-            
+
         btnSave.Enabled = b;
         btnUndoRedo.Enabled = b;
 
@@ -122,15 +124,16 @@ public void Enable(bool b)
 
     public void Save()
     {
-        if(_o == null)
-            throw new Exception("Cannot Save because ObjectSaverButton has not been set up yet, call SetupFor first (e.g. in your SetDatabaseObject method) ");
-            
-        if(BeforeSave != null)
+        if (_o == null)
+            throw new Exception(
+                "Cannot Save because ObjectSaverButton has not been set up yet, call SetupFor first (e.g. in your SetDatabaseObject method) ");
+
+        if (BeforeSave != null)
             if (!BeforeSave(_o))
                 return;
 
         _o.SaveToDatabase();
-        _activator.RefreshBus.Publish(this,new RefreshObjectEventArgs(_o));
+        _activator.RefreshBus.Publish(this, new RefreshObjectEventArgs(_o));
         Enable(false);
 
         SetReadyToUndo();
@@ -144,7 +147,6 @@ private void btnSave_Click(object sender, EventArgs e)
     }
 
 
-
     private void btnUndoRedo_Click(object sender, EventArgs e)
     {
         if (_undo)
@@ -188,12 +190,13 @@ public void Undo()
     private void SetReadyToRedo(RevertableObjectReport changes)
     {
         //record the changes prior to the revert
-        _undoneChanges = changes; 
+        _undoneChanges = changes;
 
         _undo = false;
         btnUndoRedo.Image = _redoImage;
         btnUndoRedo.Text = "Redo";
     }
+
     private void SetReadyToUndo()
     {
         _undo = true;
@@ -205,7 +208,7 @@ private void SetReadyToUndo()
     public void CheckForOutOfDateObjectAndOfferToFix()
     {
         if (IsDifferent())
-            if(
+            if (
                 //if we didn't think there were changes
                 !_isEnabled &&
 
@@ -238,12 +241,11 @@ public void CheckForUnsavedChangesAnOfferToSave()
         // If there is no object or it does not exist don't try to save it
         if (_o == null || !_o.Exists())
             return;
-            
+
         if (_isEnabled)
             if (_activator.YesNo($"Save Changes To '{_o}'?", "Save Changes"))
                 Save();
             else
                 _o.RevertToDatabaseState();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleControls/RainbowColorPicker.cs b/Rdmp.UI/SimpleControls/RainbowColorPicker.cs
index f5399da14f..f4f5fe6f08 100644
--- a/Rdmp.UI/SimpleControls/RainbowColorPicker.cs
+++ b/Rdmp.UI/SimpleControls/RainbowColorPicker.cs
@@ -17,6 +17,7 @@ namespace Rdmp.UI.SimpleControls;
 public class RainbowColorPicker
 {
     public List<Color> Colors { get; private set; }
+
     public RainbowColorPicker(int numberOfColors)
     {
         Colors = new List<Color>();
@@ -29,7 +30,7 @@ public RainbowColorPicker(int numberOfColors)
             Color.Yellow,
             Color.Orange,
             Color.Red
-        };  // create a color list
+        }; // create a color list
         Colors = interpolateColors(baseColors, numberOfColors);
     }
 
@@ -41,7 +42,7 @@ public RainbowColorPicker(Color color1, Color color2, int numberOfColors)
         {
             color1,
             color2
-        };  // create a color list
+        }; // create a color list
         Colors = interpolateColors(baseColors, numberOfColors);
     }
 
@@ -70,6 +71,7 @@ private static List<Color> interpolateColors(List<Color> stopColors, int count)
             for (var i = 0; i < count; i++) ColorList.Add(bmp.GetPixel(i, 0));
             br.Dispose();
         }
+
         return ColorList;
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleControls/SelectIMapsDirectlyToDatabaseTableComboBox.cs b/Rdmp.UI/SimpleControls/SelectIMapsDirectlyToDatabaseTableComboBox.cs
index bc29f32cbc..05589e437e 100644
--- a/Rdmp.UI/SimpleControls/SelectIMapsDirectlyToDatabaseTableComboBox.cs
+++ b/Rdmp.UI/SimpleControls/SelectIMapsDirectlyToDatabaseTableComboBox.cs
@@ -33,14 +33,14 @@ public IMapsDirectlyToDatabaseTable SelectedItem
             }
 
             //avoids circular event calls
-            if(!Equals(suggestComboBox1.SelectedItem,value))
+            if (!Equals(suggestComboBox1.SelectedItem, value))
             {
                 if (value != null)
                     suggestComboBox1.SelectedItem = value;
                 else
                     suggestComboBox1.SelectedIndex = -1;
 
-                suggestComboBox1_SelectedIndexChanged(this,EventArgs.Empty);
+                suggestComboBox1_SelectedIndexChanged(this, EventArgs.Empty);
             }
         }
     }
@@ -54,16 +54,16 @@ public SelectIMapsDirectlyToDatabaseTableComboBox()
     {
         InitializeComponent();
 
-        suggestComboBox1.PropertySelector = s => s.Cast<object>().Select(o => o == null ? "<None>>": o.ToString());
+        suggestComboBox1.PropertySelector = s => s.Cast<object>().Select(o => o == null ? "<None>>" : o.ToString());
         suggestComboBox1.SelectedIndexChanged += suggestComboBox1_SelectedIndexChanged;
     }
 
     private void suggestComboBox1_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(_settingUp)
+        if (_settingUp)
             return;
 
-        SelectedItemChanged?.Invoke(this,EventArgs.Empty);
+        SelectedItemChanged?.Invoke(this, EventArgs.Empty);
     }
 
     public void SetUp(IEnumerable<IMapsDirectlyToDatabaseTable> available)
@@ -77,7 +77,7 @@ public void SetUp(IEnumerable<IMapsDirectlyToDatabaseTable> available)
             suggestComboBox1.DataSource = available;
 
             //if it was clear before don't take item 0
-            if(before == -1)
+            if (before == -1)
                 suggestComboBox1.SelectedIndex = -1;
         }
         finally
@@ -88,21 +88,16 @@ public void SetUp(IEnumerable<IMapsDirectlyToDatabaseTable> available)
 
     private void lPick_Click(object sender, EventArgs e)
     {
-        if(_activator.SelectObject(new DialogArgs
-           {
-               WindowTitle = "Select New Value"
-           }, _available.ToArray(),out var selected))
-        {
+        if (_activator.SelectObject(new DialogArgs
+            {
+                WindowTitle = "Select New Value"
+            }, _available.ToArray(), out var selected))
             suggestComboBox1.SelectedItem = selected;
-        }
     }
 
     private void suggestComboBox1_TextUpdate(object sender, EventArgs e)
     {
         if (string.IsNullOrWhiteSpace(suggestComboBox1.Text))
             suggestComboBox1.SelectedIndex = -1;
-
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs
index 29401d49fd..5ef3d20440 100644
--- a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs
+++ b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs
@@ -23,7 +23,6 @@ namespace Rdmp.UI.SimpleControls;
 
 public delegate void IntegratedSecurityUseChangedHandler(bool use);
 
-
 /// <summary>
 /// Lets you select a server database or table.  Includes auto population of database/table lists.  This is a reusable component.
 /// </summary>
@@ -82,12 +81,12 @@ public ServerDatabaseTableSelector()
     {
         InitializeComponent();
 
-        if(LicenseManager.UsageMode == LicenseUsageMode.Designtime)
+        if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
             return;
 
         _workerRefreshDatabases.DoWork += UpdateDatabaseListAsync;
         _workerRefreshDatabases.WorkerSupportsCancellation = true;
-        _workerRefreshDatabases.RunWorkerCompleted+=UpdateDatabaseAsyncCompleted;
+        _workerRefreshDatabases.RunWorkerCompleted += UpdateDatabaseAsyncCompleted;
 
         _workerRefreshTables.DoWork += UpdateTablesListAsync;
         _workerRefreshTables.WorkerSupportsCancellation = true;
@@ -105,7 +104,7 @@ public ServerDatabaseTableSelector()
         btnPickCredentials.Enabled = false;
     }
 
-        
+
     #region Async Stuff
 
     private void UpdateTablesListAsync(object sender, DoWorkEventArgs e)
@@ -129,12 +128,13 @@ private void UpdateTablesListAsync(object sender, DoWorkEventArgs e)
                 var result = new List<DiscoveredTable>();
 
                 result.AddRange(databaseHelper.ListTables(discoveredDatabase, syntaxHelper, con, database, true));
-                result.AddRange(databaseHelper.ListTableValuedFunctions(discoveredDatabase, syntaxHelper, con, database));
+                result.AddRange(
+                    databaseHelper.ListTableValuedFunctions(discoveredDatabase, syntaxHelper, con, database));
 
                 _listTablesAsyncResult = result;
             }
         }
-        catch (OperationCanceledException)//user cancels
+        catch (OperationCanceledException) //user cancels
         {
             _listTablesAsyncResult = new List<DiscoveredTable>();
         }
@@ -142,7 +142,6 @@ private void UpdateTablesListAsync(object sender, DoWorkEventArgs e)
 
     private void UpdateTablesAsyncCompleted(object sender, RunWorkerCompletedEventArgs e)
     {
-
         //success?
         ResetState();
 
@@ -150,21 +149,20 @@ private void UpdateTablesAsyncCompleted(object sender, RunWorkerCompletedEventAr
         {
             SetState(e.Error);
         }
-        else
-        if (!e.Cancelled)
+        else if (!e.Cancelled)
         {
-            cbxTable.Items.AddRange(_listTablesAsyncResult.Where(static t => t is not DiscoveredTableValuedFunction).ToArray());
-            cbxTableValueFunctions.Items.AddRange(_listTablesAsyncResult.Where(static t => t is DiscoveredTableValuedFunction).ToArray());
+            cbxTable.Items.AddRange(_listTablesAsyncResult.Where(static t => t is not DiscoveredTableValuedFunction)
+                .ToArray());
+            cbxTableValueFunctions.Items.AddRange(_listTablesAsyncResult
+                .Where(static t => t is DiscoveredTableValuedFunction).ToArray());
         }
-                
+
 
         SetLoading(false);
 
         cbxTable.Focus();
     }
 
-        
-
 
     //do work
     private void UpdateDatabaseListAsync(object sender, DoWorkEventArgs e)
@@ -182,15 +180,17 @@ private void UpdateDatabaseListAsync(object sender, DoWorkEventArgs e)
         {
             _listDatabasesAsyncResult = Array.Empty<string>();
         }
-        catch (AggregateException ex )//user cancels
+        catch (AggregateException ex) //user cancels
         {
             if (ex.GetExceptionIfExists<OperationCanceledException>() != null)
+            {
                 _listDatabasesAsyncResult = Array.Empty<string>();
+            }
             else
             {
                 SetState(ex);
                 _listDatabasesAsyncResult = Array.Empty<string>();
-            }   
+            }
         }
     }
 
@@ -199,6 +199,7 @@ private void ResetState()
         _exception = null;
         SetText(CancelConnection);
     }
+
     private void SetState(Exception ex)
     {
         _exception = ex;
@@ -207,36 +208,27 @@ private void SetState(Exception ex)
 
     private void SetText(string v)
     {
-
         if (llLoading.InvokeRequired)
-        {
             llLoading.Invoke(new MethodInvoker(() => llLoading.Text = v));
-        }
         else
-        {
             llLoading.Text = v;
-        }
     }
 
     //handle complete
     private void UpdateDatabaseAsyncCompleted(object sender, RunWorkerCompletedEventArgs e)
     {
         if (e.Error != null)
-        {
             SetState(e.Error);
-        }
         else if (!e.Cancelled)
             cbxDatabase.Items.AddRange(_listDatabasesAsyncResult);
         else
-        {
             // user cancelled
             ResetState();
-        }
 
         SetLoading(false);
         cbxDatabase.Focus();
     }
-        
+
     //aborting
     private void AbortWorkers()
     {
@@ -252,6 +244,7 @@ private void AbortWorkers()
             _workerRefreshTablesToken?.Cancel();
         }
     }
+
     #endregion
 
     public void SetDefaultServers(string[] defaultServers)
@@ -265,14 +258,15 @@ public bool AllowTableValuedFunctionSelection
         set
         {
             _allowTableValuedFunctionSelection = value;
-                
+
             lblOr.Visible = value;
             lblTableValuedFunction.Visible = value;
             cbxTableValueFunctions.Visible = value;
         }
     }
 
-    public DatabaseType DatabaseType {
+    public DatabaseType DatabaseType
+    {
         get => databaseTypeUI1.DatabaseType;
         set => databaseTypeUI1.DatabaseType = value;
     }
@@ -303,6 +297,7 @@ private void cbxDatabase_SelectedIndexChanged(object sender, EventArgs e)
     }
 
     private bool _clearingTable = false;
+
     private void cbxTable_SelectedIndexChanged(object sender, EventArgs e)
     {
         //don't clear both!
@@ -341,7 +336,7 @@ private void cbxServer_Leave(object sender, EventArgs e)
     {
         UpdateDatabaseList();
     }
-        
+
     private void UpdateTableList()
     {
         if (string.IsNullOrWhiteSpace(cbxServer.Text) || string.IsNullOrWhiteSpace(cbxDatabase.Text))
@@ -383,7 +378,7 @@ private void UpdateDatabaseList()
         SelectionChanged?.Invoke();
 
 
-        if(!_workerRefreshDatabases.IsBusy)
+        if (!_workerRefreshDatabases.IsBusy)
             _workerRefreshDatabases.RunWorkerAsync(new object[]
             {
                 GetBuilder()
@@ -400,7 +395,6 @@ private void SetLoading(bool isLoading)
         databaseTypeUI1.Enabled = !isLoading;
         btnRefreshDatabases.Enabled = !isLoading;
         btnRefreshTables.Enabled = !isLoading;
-
     }
 
     public event IntegratedSecurityUseChangedHandler IntegratedSecurityUseChanged;
@@ -457,37 +451,30 @@ public DiscoveredTable GetDiscoveredTable()
             return null;
 
         //They made up a table that may or may not exist 
-        if(!string.IsNullOrWhiteSpace(Table))
+        if (!string.IsNullOrWhiteSpace(Table))
             return db.ExpectTable(Table);
 
         //They made up a table valued function which may or may not exist
-        if(!string.IsNullOrWhiteSpace(TableValuedFunction))
+        if (!string.IsNullOrWhiteSpace(TableValuedFunction))
             return db.ExpectTableValuedFunction(TableValuedFunction);
 
         //they haven't entered anything
         return null;
     }
 
-    public DbConnectionStringBuilder GetBuilder()
-    {
-        return _helper.GetConnectionStringBuilder(cbxServer.Text, cbxDatabase.Text, tbUsername.Text, tbPassword.Text);
-    }
-        
+    public DbConnectionStringBuilder GetBuilder() =>
+        _helper.GetConnectionStringBuilder(cbxServer.Text, cbxDatabase.Text, tbUsername.Text, tbPassword.Text);
+
     private void llLoading_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
     {
-        if(llLoading.Text == CancelConnection)
+        if (llLoading.Text == CancelConnection)
         {
             AbortWorkers();
         }
         else
         {
-            if(_exception != null)
-            {
-                ExceptionViewer.Show(_exception);
-            }
-                
+            if (_exception != null) ExceptionViewer.Show(_exception);
         }
-            
     }
 
     private void btnRefreshDatabases_Click(object sender, EventArgs e)
@@ -540,22 +527,18 @@ public void LockDatabaseType(DatabaseType databaseType)
 
     private void btnPickCredentials_Click(object sender, EventArgs e)
     {
-        if(_activator == null)
-        {
-            return;
-        }
+        if (_activator == null) return;
 
         var creds = _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<DataAccessCredentials>();
 
-        if(!creds.Any())
+        if (!creds.Any())
         {
             _activator.Show("You do not have any DataAccessCredentials configured");
             return;
         }
 
         var cred = (DataAccessCredentials)_activator.SelectOne("Select Credentials", creds);
-        if(cred != null)
-        {
+        if (cred != null)
             try
             {
                 tbUsername.Text = cred.Username;
@@ -565,6 +548,5 @@ private void btnPickCredentials_Click(object sender, EventArgs e)
             {
                 _activator.ShowException("Error decrypting password", ex);
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleCounterButton.cs b/Rdmp.UI/SimpleCounterButton.cs
index 70360446d0..bd3bcab6dd 100644
--- a/Rdmp.UI/SimpleCounterButton.cs
+++ b/Rdmp.UI/SimpleCounterButton.cs
@@ -24,7 +24,7 @@ public int? Count
         get => _count;
         set
         {
-            _count = value; 
+            _count = value;
             Invalidate();
         }
     }
@@ -49,17 +49,14 @@ protected override void OnPaint(PaintEventArgs e)
 
             var labelSize = e.Graphics.MeasureString(label, labelFont);
 
-            var labelXStart = (Width - labelSize.Width)/2;
+            var labelXStart = (Width - labelSize.Width) / 2;
 
-            var labelRect = new RectangleF(new PointF(labelXStart,Height - (labelSize.Height + LabelPadding)), labelSize);
-                
-            e.Graphics.FillRectangle(Brushes.White,labelRect);
-            e.Graphics.DrawRectangle(Pens.Gray,Rectangle.Round(labelRect));
-            e.Graphics.DrawString(label,labelFont,Brushes.Black,labelRect);
-    
+            var labelRect = new RectangleF(new PointF(labelXStart, Height - (labelSize.Height + LabelPadding)),
+                labelSize);
+
+            e.Graphics.FillRectangle(Brushes.White, labelRect);
+            e.Graphics.DrawRectangle(Pens.Gray, Rectangle.Round(labelRect));
+            e.Graphics.DrawString(label, labelFont, Brushes.Black, labelRect);
         }
-            
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/BulkProcessCatalogueItemsUI.cs b/Rdmp.UI/SimpleDialogs/BulkProcessCatalogueItemsUI.cs
index 0e7ddb846b..948ebcc79e 100644
--- a/Rdmp.UI/SimpleDialogs/BulkProcessCatalogueItemsUI.cs
+++ b/Rdmp.UI/SimpleDialogs/BulkProcessCatalogueItemsUI.cs
@@ -52,8 +52,8 @@ public BulkProcessCatalogueItemsUI()
         InitializeComponent();
 
         olvName.ImageGetter += ImageGetter;
-            
-        ddExtractionCategory.DataSource = Enum.GetValues(typeof (ExtractionCategory));
+
+        ddExtractionCategory.DataSource = Enum.GetValues(typeof(ExtractionCategory));
     }
 
     public override void SetDatabaseObject(IActivateItems activator, Catalogue databaseObject)
@@ -61,7 +61,7 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
         base.SetDatabaseObject(activator, databaseObject);
 
         _catalogue = databaseObject;
-            
+
         RefreshUIFromDatabase();
     }
 
@@ -76,14 +76,10 @@ private void RefreshUIFromDatabase()
         cbTableInfos.Items.AddRange(_catalogue.GetTableInfoList(true));
     }
 
-    private Bitmap ImageGetter(object rowObject)
-    {
-        return Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
-    }
+    private Bitmap ImageGetter(object rowObject) => Activator.CoreIconProvider.GetImage(rowObject).ImageToBitmap();
 
     private void groupBox2_Enter(object sender, EventArgs e)
     {
-
     }
 
     private void lbPastedColumns_KeyUp(object sender, KeyEventArgs e)
@@ -93,7 +89,7 @@ private void lbPastedColumns_KeyUp(object sender, KeyEventArgs e)
             case Keys.V when e.Control:
                 lbPastedColumns.Items.AddRange(
                     UsefulStuff.GetArrayOfColumnNamesFromStringPastedInByUser(Clipboard.GetText()).ToArray());
-                
+
                 UpdateFilter();
                 break;
             case Keys.Delete when lbPastedColumns.SelectedItem != null:
@@ -102,12 +98,12 @@ private void lbPastedColumns_KeyUp(object sender, KeyEventArgs e)
                 break;
         }
     }
-        
+
     private void btnApplyTransform_Click(object sender, EventArgs e)
     {
-
-        if(rbDelete.Checked)
-            if(MessageBox.Show("Are you sure you want to delete?","Confirm delete",MessageBoxButtons.YesNo) != DialogResult.Yes)
+        if (rbDelete.Checked)
+            if (MessageBox.Show("Are you sure you want to delete?", "Confirm delete", MessageBoxButtons.YesNo) !=
+                DialogResult.Yes)
                 return;
 
         ColumnInfo[] guessPoolColumnInfo = null;
@@ -129,11 +125,10 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
         var countOfColumnInfoAssociationsCreated = 0;
 
         foreach (CatalogueItem catalogueItem in olvCatalogueItems.Objects)
-        {
             if (ShouldTransformCatalogueItem(catalogueItem))
             {
                 //bulk operation is delete
-                if(rbDelete.Checked)
+                if (rbDelete.Checked)
                 {
                     catalogueItem.DeleteInDatabase();
                     deleteCount++;
@@ -161,7 +156,7 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
                     var guesses = catalogueItem.GuessAssociatedColumn(guessPoolColumnInfo).ToArray();
 
                     //exact matches are straight up accepted
-                    if(guesses.Length == 1)
+                    if (guesses.Length == 1)
                     {
                         catalogueItem.SetColumnInfo(guesses[0]);
                         countOfColumnInfoAssociationsCreated++;
@@ -169,16 +164,17 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
                     else
                     {
                         //multiple matches so ask the user what one he wants
-                        for (var i = 0; i < guesses.Length; i++) //note that this sneakily also deals with case where guesses is empty
-                        {
+                        for (var i = 0;
+                             i < guesses.Length;
+                             i++) //note that this sneakily also deals with case where guesses is empty
                             if (Activator.YesNo(
-                                    $"Found multiple matches, approve match?:{Environment.NewLine}{catalogueItem.Name}{Environment.NewLine}{guesses[i]}", "Multiple matched guesses"))
+                                    $"Found multiple matches, approve match?:{Environment.NewLine}{catalogueItem.Name}{Environment.NewLine}{guesses[i]}",
+                                    "Multiple matched guesses"))
                             {
                                 catalogueItem.SetColumnInfo(guesses[i]);
                                 countOfColumnInfoAssociationsCreated++;
                                 break;
                             }
-                        }
                     }
                 }
 
@@ -196,11 +192,10 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
                     if (catalogueItem.ExtractionInformation != null)
                     {
                         //unless user wants to do reckless recategorisation
-                        if(cbRecategorise.Checked)
+                        if (cbRecategorise.Checked)
                         {
-
                             var ei = catalogueItem.ExtractionInformation;
-                            ei.ExtractionCategory = (ExtractionCategory) ddExtractionCategory.SelectedItem;
+                            ei.ExtractionCategory = (ExtractionCategory)ddExtractionCategory.SelectedItem;
                             ei.SaveToDatabase();
                         }
 
@@ -208,25 +203,25 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
                     }
 
                     //we got to here so we have a legit 1 column info to cataitem we can enable for extraction
-                    var created = new ExtractionInformation((CatalogueRepository) catalogueItem.Repository, catalogueItem, col, null);
+                    var created = new ExtractionInformation((CatalogueRepository)catalogueItem.Repository,
+                        catalogueItem, col, null);
 
-                    if(ddExtractionCategory.SelectedItem != null)
+                    if (ddExtractionCategory.SelectedItem != null)
                     {
-                        created.ExtractionCategory = (ExtractionCategory) ddExtractionCategory.SelectedItem;
+                        created.ExtractionCategory = (ExtractionCategory)ddExtractionCategory.SelectedItem;
                         created.SaveToDatabase();
                     }
 
                     countExtractionInformationsCreated++;
                 }
             }
-        }
 
         var message = "";
-            
+
         if (deleteCount != 0)
             message += $"Performed {deleteCount} delete operations{Environment.NewLine}";
 
-        if (countExtractionInformationsCreated !=0)
+        if (countExtractionInformationsCreated != 0)
             message += $"Created  {countExtractionInformationsCreated} ExtractionInformations{Environment.NewLine}";
 
         if (countOfColumnInfoAssociationsCreated != 0)
@@ -242,10 +237,8 @@ private void btnApplyTransform_Click(object sender, EventArgs e)
     }
 
 
-    private bool ShouldTransformCatalogueItem(CatalogueItem catalogueItem)
-    {
-        return olvCatalogueItems.FilteredObjects.Cast<CatalogueItem>().Contains(catalogueItem);
-    }
+    private bool ShouldTransformCatalogueItem(CatalogueItem catalogueItem) =>
+        olvCatalogueItems.FilteredObjects.Cast<CatalogueItem>().Contains(catalogueItem);
 
     private void btnClear_Click(object sender, EventArgs e)
     {
@@ -265,7 +258,6 @@ private void cbTableInfos_SelectedIndexChanged(object sender, EventArgs e)
 
     private void rbMarkExtractable_CheckedChanged(object sender, EventArgs e)
     {
-
     }
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
@@ -288,11 +280,12 @@ private void UpdateFilter()
                 filter.RegexOptions = RegexOptions.IgnoreCase;
                 filter.RegexStrings = new List<string> { $"^{item}$" };
             }
+
             orFilters.Add(filter);
         }
-                
 
-        filters.Add(new TextMatchFilter(olvCatalogueItems, tbFilter.Text,StringComparison.CurrentCultureIgnoreCase));
+
+        filters.Add(new TextMatchFilter(olvCatalogueItems, tbFilter.Text, StringComparison.CurrentCultureIgnoreCase));
 
         if (orFilters.Any())
             filters.Add(new CompositeAnyFilter(orFilters));
diff --git a/Rdmp.UI/SimpleDialogs/ChooseLoggingTaskUI.cs b/Rdmp.UI/SimpleDialogs/ChooseLoggingTaskUI.cs
index c8e6f19314..63865edf36 100644
--- a/Rdmp.UI/SimpleDialogs/ChooseLoggingTaskUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ChooseLoggingTaskUI.cs
@@ -35,6 +35,7 @@ public partial class ChooseLoggingTaskUI : RDMPUserControl, ICheckNotifier
 {
     private Catalogue _catalogue;
     private string expectedDatabaseTypeString = "HIC.Logging.Database";
+
     public Catalogue Catalogue
     {
         get => _catalogue;
@@ -47,10 +48,11 @@ public Catalogue Catalogue
 
     private void RefreshUIFromDatabase()
     {
-        if( _catalogue == null)
+        if (_catalogue == null)
             return;
 
-        var servers = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>().Where(s => string.Equals(expectedDatabaseTypeString, s.CreatedByAssembly)).ToArray();
+        var servers = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
+            .Where(s => string.Equals(expectedDatabaseTypeString, s.CreatedByAssembly)).ToArray();
 
         ddLoggingServer.Items.Clear();
         ddLoggingServer.Items.AddRange(servers);
@@ -62,13 +64,13 @@ private void RefreshUIFromDatabase()
             liveserver = ddLoggingServer.Items.Cast<ExternalDatabaseServer>()
                 .SingleOrDefault(i => i.ID == (int)_catalogue.LiveLoggingServer_ID);
 
-            if(liveserver == null)
+            if (liveserver == null)
                 throw new Exception(
                     $"Catalogue '{_catalogue}' lists its Live Logging Server as '{_catalogue.LiveLoggingServer}' did not appear in combo box, possibly it is not marked as a '{expectedDatabaseTypeString}' server? Try editting it in Locations=>Manage External Servers");
 
             ddLoggingServer.SelectedItem = liveserver;
         }
-            
+
         try
         {
             //load data tasks (new architecture)
@@ -81,11 +83,9 @@ private void RefreshUIFromDatabase()
                     if (!cbxDataLoadTasks.Items.Contains(t))
                         cbxDataLoadTasks.Items.Add(t);
             }
-
         }
         catch (Exception ex)
         {
-
             MessageBox.Show($"Problem getting the list of DataTasks from the new logging architecture:{ex.Message}");
         }
 
@@ -104,9 +104,9 @@ protected override void OnLoad(EventArgs e)
     {
         base.OnLoad(e);
 
-        if(Activator == null)
+        if (Activator == null)
             return;
-            
+
         RefreshUIFromDatabase();
     }
 
@@ -134,19 +134,17 @@ private void RefreshTasks()
                 ExceptionViewer.Show(e);
             }
         }
-
     }
 
 
     private void cbxDataLoadTasks_SelectedIndexChanged(object sender, EventArgs e)
     {
-        _catalogue.LoggingDataTask = (string) cbxDataLoadTasks.SelectedItem;
+        _catalogue.LoggingDataTask = (string)cbxDataLoadTasks.SelectedItem;
         _catalogue.SaveToDatabase();
     }
 
     private void label1_Click(object sender, EventArgs e)
     {
-
     }
 
     private void ddLoggingServer_SelectedIndexChanged(object sender, EventArgs e)
@@ -176,7 +174,7 @@ private void btnCreateNewLoggingTask_Click(object sender, EventArgs e)
     {
         try
         {
-            var liveServer =  ddLoggingServer.SelectedItem as ExternalDatabaseServer;
+            var liveServer = ddLoggingServer.SelectedItem as ExternalDatabaseServer;
 
             var target = "";
 
@@ -184,27 +182,25 @@ private void btnCreateNewLoggingTask_Click(object sender, EventArgs e)
 
             if (liveServer != null)
                 target = $"{liveServer.Server}.{liveServer.Database}";
-                
+
             if (string.IsNullOrEmpty(target))
             {
-
                 MessageBox.Show("You must select a logging server");
                 return;
             }
 
-            if(Activator.YesNo($"Create a new dataset and new data task called \"{toCreate}\" in {target}", "Create new logging task"))
+            if (Activator.YesNo($"Create a new dataset and new data task called \"{toCreate}\" in {target}",
+                    "Create new logging task"))
             {
                 if (liveServer != null)
                 {
-
                     var checker = new LoggingDatabaseChecker(liveServer);
                     checker.Check(this);
 
                     new LogManager(liveServer)
                         .CreateNewLoggingTaskIfNotExists(toCreate);
-                        
                 }
-                    
+
                 MessageBox.Show("Done");
 
                 RefreshTasks();
@@ -220,16 +216,15 @@ private void btnCreateNewLoggingTask_Click(object sender, EventArgs e)
 
     public bool OnCheckPerformed(CheckEventArgs args)
     {
-
         if (args.ProposedFix != null)
             return MakeChangePopup.ShowYesNoMessageBoxToApplyFix(null, args.Message, args.ProposedFix);
         //if it is sucessful user doesn't need to be spammed with messages
-        if(args.Result == CheckResult.Success)
+        if (args.Result == CheckResult.Success)
             return true;
 
         //its a warning or an error possibly with an exception attached
         if (args.Ex != null)
-            ExceptionViewer.Show(args.Message,args.Ex);
+            ExceptionViewer.Show(args.Message, args.Ex);
         else
             MessageBox.Show(args.Message);
 
@@ -250,17 +245,17 @@ private void CheckNameExists()
     {
         ragSmiley1.Reset();
 
-        if(string.IsNullOrWhiteSpace(cbxDataLoadTasks.Text))
+        if (string.IsNullOrWhiteSpace(cbxDataLoadTasks.Text))
             ragSmiley1.Warning(new Exception("You must provide a Data Task name e.g. 'Loading my cool dataset'"));
-        else
-        if (!cbxDataLoadTasks.Items.Contains(cbxDataLoadTasks.Text))
+        else if (!cbxDataLoadTasks.Items.Contains(cbxDataLoadTasks.Text))
             ragSmiley1.Fatal(new Exception(
                 $"Task '{cbxDataLoadTasks.Text}' does not exist yet, select 'Create' to create it"));
     }
 
     private void btnCreateNewLoggingServer_Click(object sender, EventArgs e)
     {
-        CreatePlatformDatabase.CreateNewExternalServer(Activator.RepositoryLocator.CatalogueRepository,PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher());
+        CreatePlatformDatabase.CreateNewExternalServer(Activator.RepositoryLocator.CatalogueRepository,
+            PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher());
         RefreshUIFromDatabase();
     }
 
diff --git a/Rdmp.UI/SimpleDialogs/CommitsUI.cs b/Rdmp.UI/SimpleDialogs/CommitsUI.cs
index b3730fe219..fbc4ce770a 100644
--- a/Rdmp.UI/SimpleDialogs/CommitsUI.cs
+++ b/Rdmp.UI/SimpleDialogs/CommitsUI.cs
@@ -25,7 +25,8 @@ public partial class CommitsUI : CommitsUI_Design
     private List<Commit> _commits;
     private RDMPCollectionCommonFunctionality CommonCollectionFunctionality = new();
 
-    public const string GeneralAdviceAboutWhatIsShown = "Only includes changes made while 'Commit' system was enabled.  Does not include changes made by processes/commands that do not support Commit system.";
+    public const string GeneralAdviceAboutWhatIsShown =
+        "Only includes changes made while 'Commit' system was enabled.  Does not include changes made by processes/commands that do not support Commit system.";
 
     private CommitsUI()
     {
@@ -58,9 +59,9 @@ public CommitsUI(IActivateItems activator) : this()
             TaskDescription = $"Showing all commits. {GeneralAdviceAboutWhatIsShown}"
         });
     }
-    public CommitsUI(IActivateItems activator, IMapsDirectlyToDatabaseTable o):this()
-    {
 
+    public CommitsUI(IActivateItems activator, IMapsDirectlyToDatabaseTable o) : this()
+    {
         SetItemActivator(activator);
 
         SetupCommonCollectionFunctionality();
@@ -69,7 +70,7 @@ public CommitsUI(IActivateItems activator, IMapsDirectlyToDatabaseTable o):this(
         var commitsInvolvingObject = activator.RepositoryLocator.CatalogueRepository
             .GetAllObjectsWhere<Memento>(nameof(Memento.ReferencedObjectID), o.ID)
             .Where(m => m.IsReferenceTo(o))
-            .Select(m=>m.Commit_ID)
+            .Select(m => m.Commit_ID)
             .Distinct()
             .ToList();
 
@@ -86,41 +87,46 @@ public CommitsUI(IActivateItems activator, IMapsDirectlyToDatabaseTable o):this(
 
     private void SetupCommonCollectionFunctionality()
     {
-        CommonCollectionFunctionality.SetUp(Core.RDMPCollection.None, treeListView1, Activator, olvName, null, new RDMPCollectionCommonFunctionalitySettings
-        {
-            SuppressActivate = true,
-            SuppressChildrenAdder = true,
-            AddCheckColumn = false,
-            AddIDColumn = false,
-            AddFavouriteColumn = false
-        });
-
-        RDMPCollectionCommonFunctionality.SetupColumnSortTracking(treeListView1, new Guid("6199b509-a52a-4d38-ae47-023dbe891c7d"));
+        CommonCollectionFunctionality.SetUp(Core.RDMPCollection.None, treeListView1, Activator, olvName, null,
+            new RDMPCollectionCommonFunctionalitySettings
+            {
+                SuppressActivate = true,
+                SuppressChildrenAdder = true,
+                AddCheckColumn = false,
+                AddIDColumn = false,
+                AddFavouriteColumn = false
+            });
+
+        RDMPCollectionCommonFunctionality.SetupColumnSortTracking(treeListView1,
+            new Guid("6199b509-a52a-4d38-ae47-023dbe891c7d"));
 
         CommonCollectionFunctionality.SetupColumnTracking(olvName, new Guid("c502c0bb-eda6-4703-b6bd-8124d7792a57"));
         CommonCollectionFunctionality.SetupColumnTracking(olvDate, new Guid("b438cb32-9610-4bc8-8590-9288e1cc0ef7"));
         CommonCollectionFunctionality.SetupColumnTracking(olvUser, new Guid("c544ad0a-4ccf-4874-8269-b64465c6010f"));
-        CommonCollectionFunctionality.SetupColumnTracking(olvDescription, new Guid("a53f80a5-c0a2-40c0-a8ec-1d3a897fcce4"));
+        CommonCollectionFunctionality.SetupColumnTracking(olvDescription,
+            new Guid("a53f80a5-c0a2-40c0-a8ec-1d3a897fcce4"));
     }
 
     private void TreeListView1_ItemActivate(object sender, EventArgs e)
     {
-        if(treeListView1.SelectedObject is not Memento m)
+        if (treeListView1.SelectedObject is not Memento m)
             return;
 
-        var dialog = new SQLBeforeAndAfterViewer(m.BeforeYaml,m.AfterYaml,"Before","After",m.ToString(),MessageBoxButtons.OK);
+        var dialog = new SQLBeforeAndAfterViewer(m.BeforeYaml, m.AfterYaml, "Before", "After", m.ToString(),
+            MessageBoxButtons.OK);
         dialog.Show();
     }
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
-        if(string.IsNullOrWhiteSpace(tbFilter.Text))
+        if (string.IsNullOrWhiteSpace(tbFilter.Text))
         {
             treeListView1.ModelFilter = null;
         }
         else
         {
-            treeListView1.ModelFilter = new TextMatchFilter(treeListView1,tbFilter.Text) { StringComparison = StringComparison.CurrentCultureIgnoreCase};
+            treeListView1.ModelFilter = new TextMatchFilter(treeListView1, tbFilter.Text)
+                { StringComparison = StringComparison.CurrentCultureIgnoreCase };
             treeListView1.UseFiltering = true;
         }
     }
@@ -134,5 +140,4 @@ private void btnExpandAll_Click(object sender, EventArgs e)
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CommitsUI_Design, UserControl>))]
 public abstract class CommitsUI_Design : RDMPUserControl
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ConfigureDisclaimerUI.cs b/Rdmp.UI/SimpleDialogs/ConfigureDisclaimerUI.cs
index 3ac432e1e1..4e846630fb 100644
--- a/Rdmp.UI/SimpleDialogs/ConfigureDisclaimerUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ConfigureDisclaimerUI.cs
@@ -22,18 +22,20 @@ namespace Rdmp.UI.SimpleDialogs;
 public partial class ConfigureDisclaimerUI : RDMPForm
 {
     private bool _allowClose = false;
-        
-    public ConfigureDisclaimerUI(IActivateItems activator):base(activator)
+
+    public ConfigureDisclaimerUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
     }
 
     protected override void OnLoad(EventArgs e)
     {
-        if(VisualStudioDesignMode)
+        if (VisualStudioDesignMode)
             return;
 
-        var value = Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.ReleaseDocumentDisclaimer);
+        var value =
+            Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty
+                .ReleaseDocumentDisclaimer);
 
         tb.Text = value ?? GetDefaultText();
 
@@ -42,52 +44,52 @@ protected override void OnLoad(EventArgs e)
         base.OnLoad(e);
     }
 
-    private static string GetDefaultText()
-    {
-        return
-            @"*****************************************************************************************************************************
+    private static string GetDefaultText() =>
+        @"*****************************************************************************************************************************
 Please acknowledge HIC as a data source in any publications/reports which contain results generated from our data.  We suggest adding the following:
 We acknowledge the support of the Health Informatics Centre, University of Dundee for managing and supplying the anonymised data.
 Once you have finished your project, please inform HIC who will make arrangements to recover and archive your project.
 *****************************************************************************************************************************";
-    }
 
     private void btnCancelChanges_Click(object sender, EventArgs e)
     {
         _allowClose = true;
-        DialogResult = DialogResult.Cancel; 
+        DialogResult = DialogResult.Cancel;
         Close();
     }
 
     private void btnSaveAndClose_Click(object sender, EventArgs e)
     {
-        Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.ReleaseDocumentDisclaimer, tb.Text);
+        Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.SetValue(
+            DataExportProperty.ReleaseDocumentDisclaimer, tb.Text);
         _allowClose = true;
         DialogResult = DialogResult.OK;
         Close();
     }
+
     private void ConfigureDisclaimer_FormClosing(object sender, FormClosingEventArgs e)
     {
         if (VisualStudioDesignMode)
             return;
 
         if (!_allowClose)
-            switch (MessageBox.Show("Save changes? Yes - save and close, No - discard changes and close, Cancel - Do not close", "Save Changes?", MessageBoxButtons.YesNoCancel))
+            switch (MessageBox.Show(
+                        "Save changes? Yes - save and close, No - discard changes and close, Cancel - Do not close",
+                        "Save Changes?", MessageBoxButtons.YesNoCancel))
             {
                 case DialogResult.Cancel:
                     e.Cancel = true;
                     break;
                 case DialogResult.Yes:
-                    btnSaveAndClose_Click(null,null);
+                    btnSaveAndClose_Click(null, null);
                     break;
                 case DialogResult.No:
-                    btnCancelChanges_Click(null,null);
+                    btnCancelChanges_Click(null, null);
                     break;
                 default:
                     e.Cancel = true;
                     break;
             }
-
     }
 
 
diff --git a/Rdmp.UI/SimpleDialogs/ConfigureHashingAlgorithmUI.cs b/Rdmp.UI/SimpleDialogs/ConfigureHashingAlgorithmUI.cs
index b69c8cb3d0..bf2ce7aab2 100644
--- a/Rdmp.UI/SimpleDialogs/ConfigureHashingAlgorithmUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ConfigureHashingAlgorithmUI.cs
@@ -32,29 +32,30 @@ public partial class ConfigureHashingAlgorithmUI : RDMPForm
     [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public Scintilla QueryPreview { get; set; }
 
-    public ConfigureHashingAlgorithmUI(IActivateItems activator):base(activator)
+    public ConfigureHashingAlgorithmUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
-            
-        if(VisualStudioDesignMode)
+
+        if (VisualStudioDesignMode)
             return;
 
         QueryPreview = new ScintillaTextEditorFactory().Create(new RDMPCombineableFactory());
         QueryPreview.ReadOnly = true;
 
         panel2.Controls.Add(QueryPreview);
-
     }
 
     protected override void OnLoad(EventArgs e)
     {
         base.OnLoad(e);
 
-        if(VisualStudioDesignMode)
+        if (VisualStudioDesignMode)
             return;
 
         //get the current hashing algorithm
-        var value = Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty.HashingAlgorithmPattern);
+        var value =
+            Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.GetValue(DataExportProperty
+                .HashingAlgorithmPattern);
         tbHashingAlgorithm.Text = value;
     }
 
@@ -66,13 +67,12 @@ private void tbHashingAlgorithm_TextChanged(object sender, EventArgs e)
         {
             QueryPreview.ReadOnly = false;
             QueryPreview.Text = pattern.Replace("{0}", "[TEST]..[ExampleColumn]").Replace("{1}", "123");
-            Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.SetValue(DataExportProperty.HashingAlgorithmPattern, pattern);
-                
+            Activator.RepositoryLocator.DataExportRepository.DataExportPropertyManager.SetValue(
+                DataExportProperty.HashingAlgorithmPattern, pattern);
         }
         catch (Exception exception)
         {
             QueryPreview.Text = ExceptionHelper.ExceptionToListOfInnerMessages(exception);
-
         }
         finally
         {
diff --git a/Rdmp.UI/SimpleDialogs/ConfigurePrimaryKeyCollisionResolverUI.cs b/Rdmp.UI/SimpleDialogs/ConfigurePrimaryKeyCollisionResolverUI.cs
index 6c7b66851f..1b673107c0 100644
--- a/Rdmp.UI/SimpleDialogs/ConfigurePrimaryKeyCollisionResolverUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ConfigurePrimaryKeyCollisionResolverUI.cs
@@ -14,8 +14,6 @@
 using Rdmp.Core.QueryBuilding;
 using Rdmp.UI.ItemActivation;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
-
 using Rdmp.Core.DataLoad.Triggers;
 using Rdmp.UI.ScintillaHelper;
 
@@ -50,12 +48,13 @@ public partial class ConfigurePrimaryKeyCollisionResolverUI : RDMPForm
 
     private ScintillaNET.Scintilla QueryEditor;
 
-    public ConfigurePrimaryKeyCollisionResolverUI(TableInfo table, IActivateItems activator):base(activator)
+    public ConfigurePrimaryKeyCollisionResolverUI(TableInfo table, IActivateItems activator) : base(activator)
     {
         _table = table;
         InitializeComponent();
 
-        if (VisualStudioDesignMode || table == null) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
+        if (VisualStudioDesignMode ||
+            table == null) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
             return;
 
         QueryEditor = new ScintillaTextEditorFactory().Create();
@@ -68,7 +67,6 @@ public ConfigurePrimaryKeyCollisionResolverUI(TableInfo table, IActivateItems ac
 
     private void listBox1_SelectedIndexChanged(object sender, EventArgs e)
     {
-
     }
 
     private void RefreshUIFromDatabase()
@@ -95,7 +93,7 @@ private void RefreshUIFromDatabase()
         resolvers.AddRange(_table.PreLoadDiscardedColumns);
 
         //if there is no order yet
-        if(resolvers.All(r=>r.DuplicateRecordResolutionOrder == null))
+        if (resolvers.All(r => r.DuplicateRecordResolutionOrder == null))
             for (var i = 0; i < resolvers.Count; i++)
             {
                 //set one up
@@ -105,7 +103,6 @@ private void RefreshUIFromDatabase()
 
 
         foreach (var resolver in resolvers.OrderBy(o => o.DuplicateRecordResolutionOrder).ToArray())
-        {
             //if it starts with hic_
             if (SpecialFieldNames.IsHicPrefixed(resolver))
             {
@@ -115,7 +112,6 @@ private void RefreshUIFromDatabase()
                 resolver.SaveToDatabase();
                 resolvers.Remove(resolver);
             }
-        }
 
         foreach (var resolver in resolvers.OrderBy(c => c.DuplicateRecordResolutionOrder))
             lbConflictResolutionColumns.Items.Add(resolver);
@@ -124,19 +120,17 @@ private void RefreshUIFromDatabase()
 
         try
         {
-
             //this is used only to generate the SQL preview of how to resolve primary key collisions so no username/password is required - hence the null,null
             var resolver = new PrimaryKeyCollisionResolver(_table);
             QueryEditor.Text = resolver.GenerateSQL();
-            CommonFunctionality.ScintillaGoRed(QueryEditor,false);
+            CommonFunctionality.ScintillaGoRed(QueryEditor, false);
         }
         catch (Exception e)
         {
-            CommonFunctionality.ScintillaGoRed(QueryEditor,e);
+            CommonFunctionality.ScintillaGoRed(QueryEditor, e);
         }
 
         QueryEditor.ReadOnly = true;
-
     }
 
     #region Drag and Drop reordering
@@ -148,7 +142,6 @@ private void listBox1_MouseDown(object sender, MouseEventArgs e)
         if (e.Button == MouseButtons.Left)
             lbConflictResolutionColumns.DoDragDrop(lbConflictResolutionColumns.SelectedItem,
                 DragDropEffects.Move);
-
     }
 
     private Point draggingOldLeftPoint;
@@ -162,7 +155,7 @@ private void listBox1_DragOver(object sender, DragEventArgs e)
 
         var g = lbConflictResolutionColumns.CreateGraphics();
 
-        var top = lbConflictResolutionColumns.Font.Height*idxHoverOver;
+        var top = lbConflictResolutionColumns.Font.Height * idxHoverOver;
 
         top += lbConflictResolutionColumns.AutoScrollOffset.Y;
 
@@ -183,7 +176,6 @@ private void listBox1_DragOver(object sender, DragEventArgs e)
 
         draggingOldLeftPoint = left;
         draggingOldRightPoint = right;
-
     }
 
     private void listBox1_DragDrop(object sender, DragEventArgs e)
@@ -198,7 +190,7 @@ private void listBox1_DragDrop(object sender, DragEventArgs e)
         //get the thing they are dragging
         var data =
             (IResolveDuplication)
-            (e.Data.GetData(typeof (ColumnInfo)) ?? e.Data.GetData(typeof (PreLoadDiscardedColumn)));
+            (e.Data.GetData(typeof(ColumnInfo)) ?? e.Data.GetData(typeof(PreLoadDiscardedColumn)));
 
         //find original index because if we are dragging down then we will want to adjust the index so that insert point is correct even after removing the object further up the list
         var originalIndex = lbConflictResolutionColumns.Items.IndexOf(data);
@@ -208,7 +200,6 @@ private void listBox1_DragDrop(object sender, DragEventArgs e)
         lbConflictResolutionColumns.Items.Insert(originalIndex < index ? Math.Max(0, index - 1) : index, data);
 
         SaveOrderIntoDatabase();
-
     }
 
 
@@ -216,7 +207,7 @@ private void SaveOrderIntoDatabase()
     {
         for (var i = 0; i < lbConflictResolutionColumns.Items.Count; i++)
         {
-            var extractionInformation = (IResolveDuplication) lbConflictResolutionColumns.Items[i];
+            var extractionInformation = (IResolveDuplication)lbConflictResolutionColumns.Items[i];
             extractionInformation.DuplicateRecordResolutionOrder = i;
             extractionInformation.SaveToDatabase();
         }
@@ -224,7 +215,6 @@ private void SaveOrderIntoDatabase()
         RefreshUIFromDatabase();
     }
 
-
     #endregion
 
     private void btnClose_Click(object sender, EventArgs e)
@@ -243,13 +233,14 @@ private void lbConflictResolutionColumns_MouseUp(object sender, MouseEventArgs e
                 var RightClickMenu = new ContextMenuStrip();
 
                 var resolver =
-                    (IResolveDuplication) lbConflictResolutionColumns.Items[indexFromPoint];
+                    (IResolveDuplication)lbConflictResolutionColumns.Items[indexFromPoint];
 
                 var target = resolver.DuplicateRecordResolutionIsAscending ? "DESC" : "ASC";
                 var currently = resolver.DuplicateRecordResolutionIsAscending ? "ASC" : "DESC";
 
                 RightClickMenu.Items.Add(
-                    $"Set {resolver.GetRuntimeName()} to {target} (Currently resolution order is {currently})", null, delegate
+                    $"Set {resolver.GetRuntimeName()} to {target} (Currently resolution order is {currently})", null,
+                    delegate
                     {
                         //flip its bit
                         resolver.DuplicateRecordResolutionIsAscending =
@@ -262,7 +253,6 @@ private void lbConflictResolutionColumns_MouseUp(object sender, MouseEventArgs e
 
                 RightClickMenu.Show(lbConflictResolutionColumns.PointToScreen(e.Location));
             }
-
         }
     }
 
@@ -300,6 +290,7 @@ private void lbConflictResolutionColumns_DrawItem(object sender, DrawItemEventAr
                 g.DrawString(toDisplay, new Font(e.Font, FontStyle.Regular), new SolidBrush(Color.Black),
                     new PointF(e.Bounds.X, e.Bounds.Y));
         }
+
         e.DrawFocusRectangle();
     }
 
@@ -310,12 +301,11 @@ private void btnSelectToClipboard_Click(object sender, EventArgs e)
             //this is used only to generate the SQL preview of how to resolve primary key collisions so no username/password is required - hence the null,null
             var resolver = new PrimaryKeyCollisionResolver(_table);
 
-            if(sender == btnCopyPreview)
+            if (sender == btnCopyPreview)
                 Clipboard.SetText(resolver.GeneratePreviewSQL());
 
-            if(sender == btnCopyDetection)
+            if (sender == btnCopyDetection)
                 Clipboard.SetText(resolver.GenerateCollisionDetectionSQL());
-
         }
         catch (Exception exception)
         {
@@ -326,7 +316,9 @@ private void btnSelectToClipboard_Click(object sender, EventArgs e)
     private void btnSetAllAscending_Click(object sender, EventArgs e)
     {
         if (!AllAreSameDirection())
-            if(!Activator.YesNo("Are you sure you want to override the current resolution direction(s) with ASC , You will loose any currently configured column specific directions.", "Override current directions?"))
+            if (!Activator.YesNo(
+                    "Are you sure you want to override the current resolution direction(s) with ASC , You will loose any currently configured column specific directions.",
+                    "Override current directions?"))
                 return;
 
         foreach (IResolveDuplication item in lbConflictResolutionColumns.Items)
@@ -334,12 +326,16 @@ private void btnSetAllAscending_Click(object sender, EventArgs e)
             item.DuplicateRecordResolutionIsAscending = true;
             item.SaveToDatabase();
         }
+
         RefreshUIFromDatabase();
     }
+
     private void btnSetAllDescending_Click(object sender, EventArgs e)
     {
         if (!AllAreSameDirection())
-            if (!Activator.YesNo("Are you sure you want to override the current resolution direction(s) with DESC, You will loose any currently configured column specific directions.", "Override current directions?"))
+            if (!Activator.YesNo(
+                    "Are you sure you want to override the current resolution direction(s) with DESC, You will loose any currently configured column specific directions.",
+                    "Override current directions?"))
                 return;
 
         foreach (IResolveDuplication item in lbConflictResolutionColumns.Items)
@@ -347,6 +343,7 @@ private void btnSetAllDescending_Click(object sender, EventArgs e)
             item.DuplicateRecordResolutionIsAscending = false;
             item.SaveToDatabase();
         }
+
         RefreshUIFromDatabase();
     }
 
@@ -358,9 +355,6 @@ private bool AllAreSameDirection()
             lbConflictResolutionColumns.Items.Cast<IResolveDuplication>()
                 .Select(resolver => resolver.DuplicateRecordResolutionOrder)
                 .Distinct()
-                .Count() ==1; //if count of distinct directions is 1 then they are all in the same direction
-
+                .Count() == 1; //if count of distinct directions is 1 then they are all in the same direction
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/DataTableViewerUI.cs b/Rdmp.UI/SimpleDialogs/DataTableViewerUI.cs
index 55e74f2cb0..d2b523b717 100644
--- a/Rdmp.UI/SimpleDialogs/DataTableViewerUI.cs
+++ b/Rdmp.UI/SimpleDialogs/DataTableViewerUI.cs
@@ -21,7 +21,7 @@ public partial class DataTableViewerUI : UserControl
     public DataTableViewerUI(DataTable source, string caption)
     {
         InitializeComponent();
-            
+
         Text = caption;
         dataGridView1.ColumnAdded += (s, e) => e.Column.FillWeight = 1;
         dataGridView1.DataSource = source;
@@ -37,7 +37,7 @@ public DataTableViewerUI(IDataAccessPoint source, string sql, string caption)
             {
                 con.Open();
 
-                using(var cmd = DatabaseCommandHelper.GetCommand(sql, con))
+                using (var cmd = DatabaseCommandHelper.GetCommand(sql, con))
                 using (var da = DatabaseCommandHelper.GetDataAdapter(cmd))
                 {
                     var dt = new DataTable();
@@ -48,10 +48,10 @@ public DataTableViewerUI(IDataAccessPoint source, string sql, string caption)
         }
         catch (Exception e)
         {
-            ExceptionViewer.Show($"Failed to connect to source {source} and execute SQL: {Environment.NewLine}{sql}",e);
+            ExceptionViewer.Show($"Failed to connect to source {source} and execute SQL: {Environment.NewLine}{sql}",
+                e);
         }
 
         Text = caption;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ExceptionViewer.cs b/Rdmp.UI/SimpleDialogs/ExceptionViewer.cs
index 35ea0d8843..a13ea823ad 100644
--- a/Rdmp.UI/SimpleDialogs/ExceptionViewer.cs
+++ b/Rdmp.UI/SimpleDialogs/ExceptionViewer.cs
@@ -19,7 +19,8 @@ public class ExceptionViewer : WideMessageBox
 {
     private readonly Exception _exception;
 
-    public ExceptionViewer(string title, string message, Exception exception):base(new WideMessageBoxArgs(title,message,GetStackTrace(exception,Environment.StackTrace),null,WideMessageBoxTheme.Exception))
+    public ExceptionViewer(string title, string message, Exception exception) : base(new WideMessageBoxArgs(title,
+        message, GetStackTrace(exception, Environment.StackTrace), null, WideMessageBoxTheme.Exception))
     {
         _exception = exception;
 
@@ -27,7 +28,7 @@ public ExceptionViewer(string title, string message, Exception exception):base(n
         {
             _exception = aggregateException.Flatten();
 
-            if(aggregateException.InnerExceptions.Count == 1)
+            if (aggregateException.InnerExceptions.Count == 1)
                 _exception = aggregateException.InnerExceptions[0];
         }
     }
@@ -56,8 +57,8 @@ public static void Show(Exception exception, bool isModalDialog = true)
     {
         var longMessage = "";
 
-        if(exception.InnerException != null)
-            longMessage = ExceptionHelper.ExceptionToListOfInnerMessages(exception.InnerException );
+        if (exception.InnerException != null)
+            longMessage = ExceptionHelper.ExceptionToListOfInnerMessages(exception.InnerException);
 
         var ev = longMessage == ""
             ? new ExceptionViewer(exception.GetType().Name, exception.Message, exception)
@@ -68,6 +69,7 @@ public static void Show(Exception exception, bool isModalDialog = true)
         else
             ev.Show();
     }
+
     public static void Show(string message, Exception exception, bool isModalDialog = true)
     {
         var longMessage = "";
@@ -79,14 +81,17 @@ public static void Show(string message, Exception exception, bool isModalDialog
                 longMessage = ExceptionHelper.ExceptionToListOfInnerMessages(exception.InnerException);
         }
         else
+        {
             longMessage = ExceptionHelper.ExceptionToListOfInnerMessages(exception);
+        }
 
         if (message.Trim().Contains('\n'))
         {
             var split = message.Trim().Split('\n');
             message = split[0];
 
-            longMessage = string.Join(Environment.NewLine,split.Skip(1)) + Environment.NewLine + Environment.NewLine + longMessage;
+            longMessage = string.Join(Environment.NewLine, split.Skip(1)) + Environment.NewLine + Environment.NewLine +
+                          longMessage;
         }
 
         //if there's still no body to the error make the title the body and put a generic title in
@@ -96,9 +101,9 @@ public static void Show(string message, Exception exception, bool isModalDialog
             message = "Error";
         }
 
-        var ev = new ExceptionViewer(message,longMessage,exception);
+        var ev = new ExceptionViewer(message, longMessage, exception);
 
-        if(isModalDialog)
+        if (isModalDialog)
             ev.ShowDialog();
         else
             ev.Show();
diff --git a/Rdmp.UI/SimpleDialogs/ExceptionViewerStackTraceWithHyperlinks.cs b/Rdmp.UI/SimpleDialogs/ExceptionViewerStackTraceWithHyperlinks.cs
index 2165871bbd..0e189614ec 100644
--- a/Rdmp.UI/SimpleDialogs/ExceptionViewerStackTraceWithHyperlinks.cs
+++ b/Rdmp.UI/SimpleDialogs/ExceptionViewerStackTraceWithHyperlinks.cs
@@ -33,17 +33,18 @@ private ExceptionViewerStackTraceWithHyperlinks()
     {
         InitializeComponent();
     }
-    public ExceptionViewerStackTraceWithHyperlinks(string environmentDotStackTrace):this()
+
+    public ExceptionViewerStackTraceWithHyperlinks(string environmentDotStackTrace) : this()
     {
         AddTextToForm(environmentDotStackTrace);
     }
 
-    public ExceptionViewerStackTraceWithHyperlinks(Exception exception): this()
+    public ExceptionViewerStackTraceWithHyperlinks(Exception exception) : this()
     {
         AddTextToForm(ExceptionHelper.ExceptionToListOfInnerMessages(exception, true));
     }
 
-    public ExceptionViewerStackTraceWithHyperlinks(StackTrace stackTrace): this()
+    public ExceptionViewerStackTraceWithHyperlinks(StackTrace stackTrace) : this()
     {
         AddTextToForm(stackTrace.ToString());
     }
@@ -54,9 +55,9 @@ public static void MatchStackLine(string line, out Match filenameMatch, out Matc
         filenameMatch = SourceFilePath.Match(line);
     }
 
-    public static bool MatchStackLine(string line, out string filenameMatch, out int lineNumberMatch,out string methodMatch)
+    public static bool MatchStackLine(string line, out string filenameMatch, out int lineNumberMatch,
+        out string methodMatch)
     {
-
         var mline = SourceCodeAvailable.Match(line);
         var mfilename = SourceFilePath.Match(line);
         var m3 = MethodName.Match(line);
@@ -92,12 +93,10 @@ private void AddTextToForm(string s)
 
         for (var i = 0; i < lines.Length; i++)
         {
-
-
             //Any other things you want to not be a hyperlink because they give no useful context to the error can be added here and they will not appear as hyperlinks
             var lineIsMessageConstructor = lines[i].Contains("ReusableLibraryCode.Checks.CheckEventArgs..ctor");
 
-            MatchStackLine(lines[i],out var filenameMatch, out var lineNumberMatch);
+            MatchStackLine(lines[i], out var filenameMatch, out var lineNumberMatch);
 
             if (!(lineNumberMatch.Success || filenameMatch.Success) || lineIsMessageConstructor)
             {
@@ -108,7 +107,7 @@ private void AddTextToForm(string s)
                 };
 
                 //it is a message not a stack trace line (stack trace lines start with <whitespace>at X
-                if (!Regex.IsMatch(lines[i],@"^\s*at "))
+                if (!Regex.IsMatch(lines[i], @"^\s*at "))
                 {
                     l.ForeColor = Color.Red;
                     l.Font = new Font(FontFamily.GenericMonospace, l.Font.Size);
@@ -147,14 +146,12 @@ private void button2_Click(object sender, EventArgs e)
         Clipboard.SetText(_s);
     }
 
-    public static bool IsSourceCodeAvailable(Exception exception)
-    {
-        return exception != null  //exception exists
-               &&
-               !string.IsNullOrWhiteSpace(exception.StackTrace)  //and has a stack trace
-               &&
-               SourceCodeAvailable.IsMatch(exception.StackTrace); //and stack trace contains line numbers
-    }
+    public static bool IsSourceCodeAvailable(Exception exception) =>
+        exception != null //exception exists
+        &&
+        !string.IsNullOrWhiteSpace(exception.StackTrace) //and has a stack trace
+        &&
+        SourceCodeAvailable.IsMatch(exception.StackTrace); //and stack trace contains line numbers
 
 
     private static void OpenVisualStudio(string filename, int lineNumber)
@@ -163,7 +160,7 @@ private static void OpenVisualStudio(string filename, int lineNumber)
         {
             Clipboard.SetText($"{Path.GetFileName(filename)}:{lineNumber}");
 
-            var viewer = new ViewSourceCodeDialog(filename, lineNumber,Color.LawnGreen);
+            var viewer = new ViewSourceCodeDialog(filename, lineNumber, Color.LawnGreen);
             viewer.ShowDialog();
         }
         catch (FileNotFoundException)
@@ -174,7 +171,6 @@ private static void OpenVisualStudio(string filename, int lineNumber)
         {
             ExceptionViewer.Show(ex);
         }
-            
     }
 
     private void button1_Click(object sender, EventArgs e)
diff --git a/Rdmp.UI/SimpleDialogs/FindAndReplaceNode.cs b/Rdmp.UI/SimpleDialogs/FindAndReplaceNode.cs
index 5e32ac1c80..f34abcf152 100644
--- a/Rdmp.UI/SimpleDialogs/FindAndReplaceNode.cs
+++ b/Rdmp.UI/SimpleDialogs/FindAndReplaceNode.cs
@@ -14,7 +14,7 @@
 
 namespace Rdmp.UI.SimpleDialogs;
 
-internal class FindAndReplaceNode:IMasqueradeAs
+internal class FindAndReplaceNode : IMasqueradeAs
 {
     private object _currentValue;
     public IMapsDirectlyToDatabaseTable Instance { get; set; }
@@ -30,54 +30,48 @@ public FindAndReplaceNode(IMapsDirectlyToDatabaseTable instance, PropertyInfo pr
         _currentValue = Property.GetValue(Instance);
     }
 
-    public override string ToString()
-    {
-        return Instance.ToString();
-    }
+    public override string ToString() => Instance.ToString();
 
-    public object MasqueradingAs()
-    {
-        return Instance;
-    }
+    public object MasqueradingAs() => Instance;
 
-    public object GetCurrentValue()
-    {
-        return _currentValue;
-    }
+    public object GetCurrentValue() => _currentValue;
 
     public void SetValue(object newValue)
     {
-        Property.SetValue(Instance,newValue);
+        Property.SetValue(Instance, newValue);
         ((ISaveable)Instance).SaveToDatabase();
         _currentValue = newValue;
     }
 
     public void FindAndReplace(string find, string replace, bool ignoreCase)
     {
-        var current =_currentValue.ToString();
-        if(current?.Contains(find,ignoreCase?StringComparison.CurrentCultureIgnoreCase:StringComparison.CurrentCulture)==true)
-            SetValue(current.Replace(find, replace,ignoreCase ? StringComparison.CurrentCultureIgnoreCase:StringComparison.CurrentCulture));
+        var current = _currentValue.ToString();
+        if (current?.Contains(find,
+                ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture) == true)
+            SetValue(current.Replace(find, replace,
+                ignoreCase ? StringComparison.CurrentCultureIgnoreCase : StringComparison.CurrentCulture));
     }
+
     #region Equality Members
-    protected bool Equals(FindAndReplaceNode other)
-    {
-        return Instance.Equals(other.Instance) && Property.Equals(other.Property);
-    }
+
+    protected bool Equals(FindAndReplaceNode other) =>
+        Instance.Equals(other.Instance) && Property.Equals(other.Property);
 
     public override bool Equals(object obj)
     {
         if (obj is null) return false;
         if (ReferenceEquals(this, obj)) return true;
         if (obj.GetType() != GetType()) return false;
-        return Equals((FindAndReplaceNode) obj);
+        return Equals((FindAndReplaceNode)obj);
     }
 
     public override int GetHashCode()
     {
         unchecked
         {
-            return (Instance.GetHashCode()*397) ^ Property.GetHashCode();
+            return (Instance.GetHashCode() * 397) ^ Property.GetHashCode();
         }
     }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/FindAndReplaceUI.cs b/Rdmp.UI/SimpleDialogs/FindAndReplaceUI.cs
index 008605db1d..9046ba1c72 100644
--- a/Rdmp.UI/SimpleDialogs/FindAndReplaceUI.cs
+++ b/Rdmp.UI/SimpleDialogs/FindAndReplaceUI.cs
@@ -58,7 +58,7 @@ public FindAndReplaceUI(IActivateItems activator)
         olvObject.ImageGetter += ImageGetter;
         olvProperty.AspectGetter += PropertyAspectGetter;
         olvValue.AspectGetter += ValueAspectGetter;
-            
+
         olvAllObjects.AlwaysGroupByColumn = olvProperty;
 
         //allow editing
@@ -67,7 +67,7 @@ public FindAndReplaceUI(IActivateItems activator)
         //Create all the nodes up front
         foreach (var o in _allObjects.Where(_adjustableLocationPropertyFinder.ObjectContainsProperty))
         foreach (var propertyInfo in _adjustableLocationPropertyFinder.GetProperties(o))
-            _locationNodes.Add( new FindAndReplaceNode(o,propertyInfo));
+            _locationNodes.Add(new FindAndReplaceNode(o, propertyInfo));
 
         foreach (var o in _allObjects.Where(_sqlPropertyFinder.ObjectContainsProperty))
         foreach (var propertyInfo in _sqlPropertyFinder.GetProperties(o))
@@ -80,7 +80,6 @@ public FindAndReplaceUI(IActivateItems activator)
 
     private void GetAllObjects(IActivateItems activator)
     {
-
         var g = new Gatherer(activator.RepositoryLocator);
 
         //We get these from the child provider because some objects (those below go off looking stuff up if you get them
@@ -92,7 +91,8 @@ private void GetAllObjects(IActivateItems activator)
             _allObjects.Add(o);
 
         if (Activator.CoreChildProvider is DataExportChildProvider dxmChildProvider)
-            foreach (var o in dxmChildProvider.GetAllExtractableColumns(Activator.RepositoryLocator.DataExportRepository))
+            foreach (var o in dxmChildProvider.GetAllExtractableColumns(
+                         Activator.RepositoryLocator.DataExportRepository))
                 _allObjects.Add(o);
 
         foreach (var o in g.GetAllObjectsInAllDatabases())
@@ -101,7 +101,7 @@ private void GetAllObjects(IActivateItems activator)
 
     private void OlvAllObjectsCellEditFinished(object sender, CellEditEventArgs e)
     {
-        if( e == null || e.RowObject == null)
+        if (e == null || e.RowObject == null)
             return;
 
         var node = (FindAndReplaceNode)e.RowObject;
@@ -109,21 +109,18 @@ private void OlvAllObjectsCellEditFinished(object sender, CellEditEventArgs e)
         Activator.RefreshBus.Publish(this, new RefreshObjectEventArgs((DatabaseEntity)node.Instance));
     }
 
-    private object ValueAspectGetter(object rowobject)
-    {
-        return ((FindAndReplaceNode)rowobject).GetCurrentValue();
-    }
+    private object ValueAspectGetter(object rowobject) => ((FindAndReplaceNode)rowobject).GetCurrentValue();
 
     private object PropertyAspectGetter(object rowobject)
     {
-        var node = (FindAndReplaceNode) rowobject;
+        var node = (FindAndReplaceNode)rowobject;
 
         return node.PropertyName;
     }
 
     private Bitmap ImageGetter(object rowObject)
     {
-        if(rowObject == null)
+        if (rowObject == null)
             return null;
 
         return Activator.CoreIconProvider.GetImage(((FindAndReplaceNode)rowObject).Instance).ImageToBitmap();
@@ -135,7 +132,7 @@ private void CheckedChanged(object sender, EventArgs e)
         var cb = (RadioButton)sender;
 
         olvAllObjects.BeginUpdate();
-        if(cb.Checked)
+        if (cb.Checked)
         {
             olvAllObjects.ClearObjects();
             olvAllObjects.SuspendLayout();
@@ -144,19 +141,17 @@ private void CheckedChanged(object sender, EventArgs e)
 
             olvAllObjects.ResumeLayout();
         }
+
         olvAllObjects.EndUpdate();
     }
 
     private void btnReplaceAll_Click(object sender, EventArgs e)
     {
-        if (Activator.YesNo("Are you sure you want to do a system wide find and replace? This operation cannot be undone","Are you sure"))
-        {
+        if (Activator.YesNo(
+                "Are you sure you want to do a system wide find and replace? This operation cannot be undone",
+                "Are you sure"))
             foreach (FindAndReplaceNode node in olvAllObjects.FilteredObjects)
-            {
-                node.FindAndReplace(tbFind.Text, tbReplace.Text,!cbMatchCase.Checked);
-
-            }
-        }
+                node.FindAndReplace(tbFind.Text, tbReplace.Text, !cbMatchCase.Checked);
     }
 
     private void tlvAllObjects_ItemActivate(object sender, EventArgs e)
@@ -164,21 +159,23 @@ private void tlvAllObjects_ItemActivate(object sender, EventArgs e)
         if (olvAllObjects.SelectedObject is FindAndReplaceNode node)
         {
             var cmd = new ExecuteCommandActivate(Activator, node.Instance);
-            if(!cmd.IsImpossible)
+            if (!cmd.IsImpossible)
                 cmd.Execute();
         }
     }
 
     private TextMatchFilter _textMatchFilter;
+
     private void btnFind_Click(object sender, EventArgs e)
     {
-        if(olvAllObjects.ModelFilter is not CompositeAllFilter all)
+        if (olvAllObjects.ModelFilter is not CompositeAllFilter all)
             olvAllObjects.ModelFilter = all = new CompositeAllFilter(new List<IModelFilter>());
-            
+
         if (_textMatchFilter != null && all.Filters.Contains(_textMatchFilter))
             all.Filters.Remove(_textMatchFilter);
 
-        _textMatchFilter = new TextMatchFilter(olvAllObjects, tbFind.Text, cbMatchCase.Checked ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase);
+        _textMatchFilter = new TextMatchFilter(olvAllObjects, tbFind.Text,
+            cbMatchCase.Checked ? StringComparison.CurrentCulture : StringComparison.CurrentCultureIgnoreCase);
 
         all.Filters.Add(_textMatchFilter);
 
diff --git a/Rdmp.UI/SimpleDialogs/FindSearchTailFilterWithAlwaysShowList.cs b/Rdmp.UI/SimpleDialogs/FindSearchTailFilterWithAlwaysShowList.cs
index b3644ad8ee..6c9c2c39f5 100644
--- a/Rdmp.UI/SimpleDialogs/FindSearchTailFilterWithAlwaysShowList.cs
+++ b/Rdmp.UI/SimpleDialogs/FindSearchTailFilterWithAlwaysShowList.cs
@@ -23,12 +23,14 @@ internal class FindSearchTailFilterWithAlwaysShowList : IListFilter
     public IEnumerable<object> AlwaysShow { get; }
     public CancellationToken CancellationToken { get; }
 
-    public FindSearchTailFilterWithAlwaysShowList(IBasicActivateItems activator, IEnumerable<object> alwaysShow, IEnumerable<IMapsDirectlyToDatabaseTable> allObjects, string text,int maxToTake, CancellationToken cancellationToken) 
+    public FindSearchTailFilterWithAlwaysShowList(IBasicActivateItems activator, IEnumerable<object> alwaysShow,
+        IEnumerable<IMapsDirectlyToDatabaseTable> allObjects, string text, int maxToTake,
+        CancellationToken cancellationToken)
     {
         AlwaysShow = alwaysShow;
         CancellationToken = cancellationToken;
 
-        if(string.IsNullOrEmpty(text))
+        if (string.IsNullOrEmpty(text))
         {
             _scoringObjects = allObjects.Take(maxToTake).ToList();
         }
@@ -38,9 +40,10 @@ public FindSearchTailFilterWithAlwaysShowList(IBasicActivateItems activator, IEn
 
             var scorer = new SearchablesMatchScorer
             {
-                TypeNames = new HashSet<string>(allObjects.Select(m => m.GetType().Name).Distinct(), StringComparer.CurrentCultureIgnoreCase)
+                TypeNames = new HashSet<string>(allObjects.Select(m => m.GetType().Name).Distinct(),
+                    StringComparer.CurrentCultureIgnoreCase)
             };
-            var matches = scorer.ScoreMatches(searchThese, text, cancellationToken,null);
+            var matches = scorer.ScoreMatches(searchThese, text, cancellationToken, null);
 
             // we were cancelled
             if (matches == null)
@@ -51,12 +54,8 @@ public FindSearchTailFilterWithAlwaysShowList(IBasicActivateItems activator, IEn
 
             _scoringObjects = SearchablesMatchScorer.ShortList(matches, maxToTake, activator);
         }
-
     }
 
 
-    public IEnumerable Filter(IEnumerable modelObjects)
-    {
-        return _scoringObjects.Union(AlwaysShow);
-    }
+    public IEnumerable Filter(IEnumerable modelObjects) => _scoringObjects.Union(AlwaysShow);
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ForwardEngineering/ConfigureCatalogueExtractabilityUI.cs b/Rdmp.UI/SimpleDialogs/ForwardEngineering/ConfigureCatalogueExtractabilityUI.cs
index d7b6962240..ac66b194f7 100644
--- a/Rdmp.UI/SimpleDialogs/ForwardEngineering/ConfigureCatalogueExtractabilityUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ForwardEngineering/ConfigureCatalogueExtractabilityUI.cs
@@ -81,24 +81,27 @@ public partial class ConfigureCatalogueExtractabilityUI : RDMPForm, ISaveableUI
     /// True if we are making programatic changes to values and shouldn't respond to control events (e.g. dropdown changes)
     /// </summary>
     private bool isLoading;
+
     private const string None = "<<None>>";
 
-    public ConfigureCatalogueExtractabilityUI(IActivateItems activator, ITableInfo tableInfo,string initialDescription, IProject projectSpecificIfAny):this(activator)
+    public ConfigureCatalogueExtractabilityUI(IActivateItems activator, ITableInfo tableInfo, string initialDescription,
+        IProject projectSpecificIfAny) : this(activator)
     {
         _tableInfo = tableInfo;
         Initialize(activator, initialDescription, projectSpecificIfAny);
     }
 
-    public ConfigureCatalogueExtractabilityUI(IActivateItems activator, ITableInfoImporter importer, string initialDescription, IProject projectSpecificIfAny):this(activator)
+    public ConfigureCatalogueExtractabilityUI(IActivateItems activator, ITableInfoImporter importer,
+        string initialDescription, IProject projectSpecificIfAny) : this(activator)
     {
-        importer.DoImport(out _tableInfo, out ColumnInfo[] cols);
+        importer.DoImport(out _tableInfo, out var cols);
 
         _importedNewTable = true;
 
-        Initialize(activator,initialDescription,projectSpecificIfAny);
+        Initialize(activator, initialDescription, projectSpecificIfAny);
     }
 
-    private ConfigureCatalogueExtractabilityUI(IActivateItems activator):base(activator)
+    private ConfigureCatalogueExtractabilityUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
 
@@ -106,7 +109,7 @@ private ConfigureCatalogueExtractabilityUI(IActivateItems activator):base(activa
         ContextMenuStrip.Items.Add(new SaveMenuItem(this));
     }
 
-    private void Initialize(IActivateItems activator,  string initialDescription, IProject projectSpecificIfAny)
+    private void Initialize(IActivateItems activator, string initialDescription, IProject projectSpecificIfAny)
     {
         CommonFunctionality.SetItemActivator(activator);
         var cols = _tableInfo.ColumnInfos;
@@ -117,19 +120,23 @@ private void Initialize(IActivateItems activator,  string initialDescription, IP
         tbDescription.Text = $"{initialDescription} ({Environment.UserName} - {DateTime.Now})";
         tbTableName.Text = _tableInfo.Name;
         _catalogue.SaveToDatabase();
-        objectSaverButton1.SetupFor(this,(DatabaseEntity)_catalogue,activator);
+        objectSaverButton1.SetupFor(this, (DatabaseEntity)_catalogue, activator);
 
         if (_binder == null)
         {
             _binder = new BinderWithErrorProviderFactory(activator);
-            _binder.Bind(tbCatalogueName,"Text",_catalogue,"Name",false,DataSourceUpdateMode.OnPropertyChanged, c=>c.Name);
-            _binder.Bind(tbAcronym, "Text", _catalogue, "Acronym", false, DataSourceUpdateMode.OnPropertyChanged, c => c.Acronym);
-            _binder.Bind(tbDescription, "Text", _catalogue, "Description", false, DataSourceUpdateMode.OnPropertyChanged, c => c.Description);
+            _binder.Bind(tbCatalogueName, "Text", _catalogue, "Name", false, DataSourceUpdateMode.OnPropertyChanged,
+                c => c.Name);
+            _binder.Bind(tbAcronym, "Text", _catalogue, "Acronym", false, DataSourceUpdateMode.OnPropertyChanged,
+                c => c.Acronym);
+            _binder.Bind(tbDescription, "Text", _catalogue, "Description", false,
+                DataSourceUpdateMode.OnPropertyChanged, c => c.Description);
         }
 
         //Every CatalogueItem is either mapped to a ColumnInfo (not extractable) or a ExtractionInformation (extractable).  To start out with they are not extractable
         foreach (var ci in _catalogueItems)
-            olvColumnExtractability.AddObject(new ColPair(ci, cols.Single(col => ci.ColumnInfo_ID == col.ID), eis.SingleOrDefault(e=>e.CatalogueItem_ID == ci.ID)));
+            olvColumnExtractability.AddObject(new ColPair(ci, cols.Single(col => ci.ColumnInfo_ID == col.ID),
+                eis.SingleOrDefault(e => e.CatalogueItem_ID == ci.ID)));
 
         _extractionCategories = new object[]
         {
@@ -161,7 +168,9 @@ private void Initialize(IActivateItems activator,  string initialDescription, IP
         olvColumnExtractability.RebuildColumns();
 
         if (Activator.RepositoryLocator.DataExportRepository == null)
+        {
             gbProjectSpecific.Enabled = false;
+        }
         else
         {
             SelectProject(projectSpecificIfAny);
@@ -174,12 +183,17 @@ private void Initialize(IActivateItems activator,  string initialDescription, IP
         RDMPControlCommonFunctionality.DisableMouseWheel(ddIsExtractionIdentifier);
 
         CommonFunctionality.AddHelp(btnPickProject, "IExtractableDataSet.Project_ID", "Project Specific Datasets");
-        CommonFunctionality.AddHelpString(btnAddToExisting,"Add to existing catalogue","Use this option if you want to create a Catalogue which extracts from multiple tables (via a JOIN).  Once used you will still need to configure a JoinInfo between column(s) in all the tables the Catalogue draws data from.");
-
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvColumnInfoName, new Guid("86e7bf77-8829-4f72-aa47-29a30710621f"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvExtractionCategory, new Guid("ad106fe4-bea0-4670-9ded-61967699269f"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvIsExtractionIdentifier, new Guid("f9a87191-9676-4c86-a292-608dc95e8eef"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvIsHashOnRelease, new Guid("d3590a68-ee78-40c6-b073-eea32cac49ec"));
+        CommonFunctionality.AddHelpString(btnAddToExisting, "Add to existing catalogue",
+            "Use this option if you want to create a Catalogue which extracts from multiple tables (via a JOIN).  Once used you will still need to configure a JoinInfo between column(s) in all the tables the Catalogue draws data from.");
+
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvColumnInfoName,
+            new Guid("86e7bf77-8829-4f72-aa47-29a30710621f"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvExtractionCategory,
+            new Guid("ad106fe4-bea0-4670-9ded-61967699269f"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvIsExtractionIdentifier,
+            new Guid("f9a87191-9676-4c86-a292-608dc95e8eef"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvColumnExtractability, olvIsHashOnRelease,
+            new Guid("d3590a68-ee78-40c6-b073-eea32cac49ec"));
     }
 
     protected override void OnLoad(EventArgs e)
@@ -195,7 +209,7 @@ protected override void OnLoad(EventArgs e)
 
     private void IsExtractionIdentifier_AspectPutter(object rowobject, object newvalue)
     {
-        var n = (ColPair) rowobject;
+        var n = (ColPair)rowobject;
 
         if (n.ExtractionInformation == null)
             MakeExtractable(n, true, ExtractionCategory.Core);
@@ -206,7 +220,8 @@ private void IsExtractionIdentifier_AspectPutter(object rowobject, object newval
 
 
         // if there is now exactly 1 IsExtractionIdentifier
-        var identifiers = olvColumnExtractability.Objects.OfType<ColPair>().Where(c => c.ExtractionInformation?.IsExtractionIdentifier ?? false).ToArray();
+        var identifiers = olvColumnExtractability.Objects.OfType<ColPair>()
+            .Where(c => c.ExtractionInformation?.IsExtractionIdentifier ?? false).ToArray();
         isLoading = true;
 
         if (identifiers.Length == 1)
@@ -225,14 +240,15 @@ private void IsExtractionIdentifier_AspectPutter(object rowobject, object newval
             // let them pick one with the dropdown if it is 0 but if it is 2+ then they have to use the checkboxes
             ddIsExtractionIdentifier.Enabled = identifiers.Length < 2;
         }
+
         isLoading = false;
     }
 
     private Bitmap ImageGetter(object rowObject)
     {
-        var n = (ColPair) rowObject;
+        var n = (ColPair)rowObject;
 
-        return Activator.CoreIconProvider.GetImage((object) n.ExtractionInformation ?? n.ColumnInfo).ImageToBitmap();
+        return Activator.CoreIconProvider.GetImage((object)n.ExtractionInformation ?? n.ColumnInfo).ImageToBitmap();
     }
 
     private object IsExtractionIdentifier_AspectGetter(object rowObject)
@@ -257,10 +273,7 @@ private void IsHashOnRelease_AspectPutter(object rowobject, object newvalue)
         n.ExtractionInformation.HashOnDataRelease = (bool)newvalue;
 
         // if we are turning on hashing then ensure the column has an alias
-        if((bool)newvalue)
-        {
-            n.ExtractionInformation.Alias = n.ExtractionInformation.GetRuntimeName();
-        }
+        if ((bool)newvalue) n.ExtractionInformation.Alias = n.ExtractionInformation.GetRuntimeName();
 
         n.ExtractionInformation.SaveToDatabase();
     }
@@ -280,9 +293,9 @@ private void MakeExtractable(object o, bool shouldBeExtractable, ExtractionCateg
         var n = (ColPair)o;
 
         //if it has extraction information
-        if(n.ExtractionInformation != null)
+        if (n.ExtractionInformation != null)
         {
-            if(shouldBeExtractable)
+            if (shouldBeExtractable)
             {
                 //if they want to change the extraction category
                 if (category.HasValue && n.ExtractionInformation.ExtractionCategory != category.Value)
@@ -292,6 +305,7 @@ private void MakeExtractable(object o, bool shouldBeExtractable, ExtractionCateg
                     n.ExtractionInformation.SaveToDatabase();
                     olvColumnExtractability.RefreshObject(n);
                 }
+
                 return;
             }
 
@@ -303,10 +317,11 @@ private void MakeExtractable(object o, bool shouldBeExtractable, ExtractionCateg
         {
             //it doesn't have ExtractionInformation
 
-            if(!shouldBeExtractable) //it's already not extractable job done
+            if (!shouldBeExtractable) //it's already not extractable job done
                 return;
             //make it extractable
-            var newExtractionInformation = new ExtractionInformation((ICatalogueRepository) n.ColumnInfo.Repository, n.CatalogueItem, n.ColumnInfo,n.ColumnInfo.Name);
+            var newExtractionInformation = new ExtractionInformation((ICatalogueRepository)n.ColumnInfo.Repository,
+                n.CatalogueItem, n.ColumnInfo, n.ColumnInfo.Name);
 
             if (category.HasValue)
             {
@@ -349,23 +364,25 @@ private void TlvColumnExtractabilityOnCellEditStarting(object sender, CellEditEv
             };
 
             cbx.Items.AddRange(_extractionCategories);
-            cbx.SelectedItem = n.ExtractionInformation != null ? (object) n.ExtractionInformation.ExtractionCategory : NotExtractable;
+            cbx.SelectedItem = n.ExtractionInformation != null
+                ? (object)n.ExtractionInformation.ExtractionCategory
+                : NotExtractable;
             cellEditEventArgs.Control = cbx;
         }
     }
 
     private void TlvColumnExtractabilityOnCellEditFinishing(object sender, CellEditEventArgs cellEditEventArgs)
     {
-        var n = (ColPair) cellEditEventArgs.RowObject;
+        var n = (ColPair)cellEditEventArgs.RowObject;
 
         if (cellEditEventArgs.Column == olvExtractionCategory)
         {
-            var cbx = (ComboBox) cellEditEventArgs.Control;
+            var cbx = (ComboBox)cellEditEventArgs.Control;
 
             if (Equals(cbx.SelectedItem, NotExtractable))
                 MakeExtractable(n, false, null);
             else
-                MakeExtractable(n, true, (ExtractionCategory) cbx.SelectedItem);
+                MakeExtractable(n, true, (ExtractionCategory)cbx.SelectedItem);
         }
     }
 
@@ -375,7 +392,7 @@ private void tbFilter_TextChanged(object sender, EventArgs e)
 
         var textFilter = new TextMatchFilter(olvColumnExtractability, tbFilter.Text)
         {
-            Columns = new[] {olvColumnInfoName}
+            Columns = new[] { olvColumnInfoName }
         };
         olvColumnExtractability.ModelFilter = textFilter;
     }
@@ -388,14 +405,11 @@ private void ddCategoriseMany_SelectedIndexChanged(object sender, EventArgs e)
         if (MessageBox.Show($"Set {filteredObjects.Length} to '{toChangeTo}'?",
                 "Confirm Overwrite?", MessageBoxButtons.OKCancel) == DialogResult.OK)
         {
-
             foreach (object o in filteredObjects)
-            {
                 if (toChangeTo.Equals(NotExtractable))
                     MakeExtractable(o, false);
                 else
-                    MakeExtractable(o, true, (ExtractionCategory) toChangeTo);
-            }
+                    MakeExtractable(o, true, (ExtractionCategory)toChangeTo);
 
             _ddChangeAllChanged = true;
         }
@@ -407,7 +421,8 @@ private void FinaliseExtractability()
 
         if (_projectSpecific == null) return;
 
-        IAtomicCommandWithTarget cmd = new ExecuteCommandMakeCatalogueProjectSpecific(Activator,_catalogue,_projectSpecific);
+        IAtomicCommandWithTarget cmd =
+            new ExecuteCommandMakeCatalogueProjectSpecific(Activator, _catalogue, _projectSpecific);
 
         if (cmd.IsImpossible)
             MessageBox.Show($"Could not make Catalogue ProjectSpecific:{cmd.ReasonCommandImpossible}");
@@ -421,18 +436,17 @@ private void btnAddToExisting_Click(object sender, EventArgs e)
 
         if (!eis.Any())
         {
-            MessageBox.Show("You must set at least one column to extractable before you can add them to another Catalogue");
+            MessageBox.Show(
+                "You must set at least one column to extractable before you can add them to another Catalogue");
             return;
         }
 
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "You are about to add the newly imported table columns to an existing Catalogue.  This will mean that your Catalogue draws data from 2+ tables.  You will need to also create a join between the underlying columns for this to work properly."
-           }, Activator.CoreChildProvider.AllCatalogues,out var selected))
-        {
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "You are about to add the newly imported table columns to an existing Catalogue.  This will mean that your Catalogue draws data from 2+ tables.  You will need to also create a join between the underlying columns for this to work properly."
+            }, Activator.CoreChildProvider.AllCatalogues, out var selected))
             AddToExistingCatalogue(selected, eis);
-        }
-
     }
 
     private void AddToExistingCatalogue(Catalogue addToInstead, ExtractionInformation[] eis)
@@ -472,15 +486,16 @@ private void AddToExistingCatalogue(Catalogue addToInstead, ExtractionInformatio
         }
         else
         {
-            joinFrom = (ITableInfo)Activator.SelectOne(new DialogArgs {
+            joinFrom = (ITableInfo)Activator.SelectOne(new DialogArgs
+            {
                 WindowTitle = "Pick Table for Join",
-                TaskDescription = $"Your Catalogue '{addToInstead}' has {existingTables.Length} tables already associated with it.  Which of these can be joined to your new table '{TableInfoCreated}'"
-            },existingTables);
+                TaskDescription =
+                    $"Your Catalogue '{addToInstead}' has {existingTables.Length} tables already associated with it.  Which of these can be joined to your new table '{TableInfoCreated}'"
+            }, existingTables);
 
             // user cancelled joining
             if (joinFrom == null)
                 return;
-
         }
 
         var existingJoins = Activator.RepositoryLocator.CatalogueRepository.JoinManager
@@ -495,9 +510,10 @@ private void AddToExistingCatalogue(Catalogue addToInstead, ExtractionInformatio
         var cmdAddJoin = new ExecuteCommandAddJoinInfo(Activator, (TableInfo)joinFrom);
         cmdAddJoin.SetInitialJoinToTableInfo((TableInfo)TableInfoCreated);
 
-        if(!cmdAddJoin.IsImpossible)
+        if (!cmdAddJoin.IsImpossible)
         {
-            Activator.Show("Configure Join", "You will now be taken to the join configuration screen to define how your new table is linked to in SQL queries");
+            Activator.Show("Configure Join",
+                "You will now be taken to the join configuration screen to define how your new table is linked to in SQL queries");
             cmdAddJoin.Execute();
         }
         else
@@ -519,15 +535,19 @@ private void btnOk_Click(object sender, EventArgs e)
 
         if (!eis.Any())
         {
-            if(!Activator.YesNo("You have not marked any columns as extractable, are you sure you want to create a dataset with no extractable columns?","Create with no extractable columns?"))
+            if (!Activator.YesNo(
+                    "You have not marked any columns as extractable, are you sure you want to create a dataset with no extractable columns?",
+                    "Create with no extractable columns?"))
                 return;
         }
-        else
-        if (eis.Any(ei=>ei.IsExtractionIdentifier))
+        else if (eis.Any(ei => ei.IsExtractionIdentifier))
+        {
             FinaliseExtractability();
+        }
         else
         {
-            if (MessageBox.Show("You have not chosen a column to be IsExtractionIdentifier, do you wish to continue?", "Confirm", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
+            if (MessageBox.Show("You have not chosen a column to be IsExtractionIdentifier, do you wish to continue?",
+                    "Confirm", MessageBoxButtons.OKCancel) == DialogResult.Cancel)
                 return;
         }
 
@@ -550,11 +570,12 @@ private ExtractionInformation[] GetExtractionInformations()
 
     private void ConfigureCatalogueExtractabilityUI_FormClosing(object sender, FormClosingEventArgs e)
     {
-        if(!_choicesFinalised)
+        if (!_choicesFinalised)
         {
             if (_importedNewTable)
             {
-                var confirm = MessageBox.Show("The database table was created as part of this import. Do you want to keep that?",
+                var confirm = MessageBox.Show(
+                    "The database table was created as part of this import. Do you want to keep that?",
                     "Confirm", MessageBoxButtons.YesNoCancel);
                 if (confirm != DialogResult.Cancel)
                 {
@@ -569,39 +590,51 @@ private void ConfigureCatalogueExtractabilityUI_FormClosing(object sender, FormC
                             TableCreated.Drop();
                     }
                     else
+                    {
                         Activator.Publish(TableInfoCreated);
+                    }
                 }
                 else
+                {
                     e.Cancel = true;
+                }
             }
             else
             {
-                if(MessageBox.Show(
-                       "Are you sure you want to Cancel?",
-                       "Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes)
+                if (MessageBox.Show(
+                        "Are you sure you want to Cancel?",
+                        "Confirm", MessageBoxButtons.YesNo) == DialogResult.Yes)
                 {
                     DialogResult = DialogResult.Cancel;
                     _catalogue.DeleteInDatabase();
                     _catalogue = null;
                 }
                 else
+                {
                     e.Cancel = true;
+                }
             }
         }
         else
         {
-            if(CatalogueCreatedIfAny != null)
+            if (CatalogueCreatedIfAny != null)
                 Activator.Publish(CatalogueCreatedIfAny);
         }
     }
 
     private void ConfigureCatalogueExtractabilityUI_Load(object sender, EventArgs e)
     {
-        _workflow = new HelpWorkflow(this, new Guid("74e6943e-1ed8-4c43-89c2-96158c1360fa"), new TutorialTracker(Activator));
-        var stage1 = new HelpStage(olvColumnExtractability, "This is a collection of all the column definitions imported, change the Extractable status of one of the columns to make it extractable", () => GetExtractionInformations().Any());
-        var stage2 = new HelpStage(ddIsExtractionIdentifier, "One of your columns should contain a patient identifier, select it here", () => GetExtractionInformations().Any(ei=>ei.IsExtractionIdentifier));
-        var stage3 = new HelpStage(pChangeAll, "Change this dropdown to change all at once", () =>  _ddChangeAllChanged);
-        var stage4 = new HelpStage(pFilter, "Type in here if you are trying to find a specific column", () => !string.IsNullOrWhiteSpace(tbFilter.Text));
+        _workflow = new HelpWorkflow(this, new Guid("74e6943e-1ed8-4c43-89c2-96158c1360fa"),
+            new TutorialTracker(Activator));
+        var stage1 = new HelpStage(olvColumnExtractability,
+            "This is a collection of all the column definitions imported, change the Extractable status of one of the columns to make it extractable",
+            () => GetExtractionInformations().Any());
+        var stage2 = new HelpStage(ddIsExtractionIdentifier,
+            "One of your columns should contain a patient identifier, select it here",
+            () => GetExtractionInformations().Any(ei => ei.IsExtractionIdentifier));
+        var stage3 = new HelpStage(pChangeAll, "Change this dropdown to change all at once", () => _ddChangeAllChanged);
+        var stage4 = new HelpStage(pFilter, "Type in here if you are trying to find a specific column",
+            () => !string.IsNullOrWhiteSpace(tbFilter.Text));
 
         stage1.SetNext(stage2);
         stage2.SetNext(stage3);
@@ -627,10 +660,7 @@ public ColPair(CatalogueItem ci, ColumnInfo col, ExtractionInformation ei)
             ExtractionInformation = ei;
         }
 
-        public override string ToString()
-        {
-            return CatalogueItem.Name;
-        }
+        public override string ToString() => CatalogueItem.Name;
     }
 
     private void SelectProject(IProject projectSpecificIfAny)
@@ -652,43 +682,38 @@ private void SelectProject(IProject projectSpecificIfAny)
     private void btnPickProject_Click(object sender, EventArgs e)
     {
         if (_projectSpecific != null)
+        {
             SelectProject(null);
+        }
         else
         {
-            if(Activator.SelectObject(new DialogArgs
-                   {
-                       TaskDescription = "Which Project should this Catalogue be associated with? ProjectSpecific Catalogues can only be extracted in extractions of that Project and will not appear in the main Catalogues tree."
-                   }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>().ToArray(),
-                   out var selected))
-            {
+            if (Activator.SelectObject(new DialogArgs
+                    {
+                        TaskDescription =
+                            "Which Project should this Catalogue be associated with? ProjectSpecific Catalogues can only be extracted in extractions of that Project and will not appear in the main Catalogues tree."
+                    }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>().ToArray(),
+                    out var selected))
                 SelectProject(selected);
-            }
         }
-
     }
 
     private void ddIsExtractionIdentifier_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(isLoading)
-        {
-            return;
-        }
+        if (isLoading) return;
 
 
         //turn off all IsExtractionIdentifierness
         foreach (var node in ddIsExtractionIdentifier.Items.OfType<ColPair>())
-        {
             if (node.ExtractionInformation != null && node.ExtractionInformation.IsExtractionIdentifier)
             {
                 node.ExtractionInformation.IsExtractionIdentifier = false;
                 node.ExtractionInformation.SaveToDatabase();
             }
-        }
 
         //we cleared them all, now did they want one selected (i.e. they selected anythign except <<None>>)
         if (ddIsExtractionIdentifier.SelectedItem is ColPair n)
         {
-            if(n.ExtractionInformation == null)
+            if (n.ExtractionInformation == null)
                 MakeExtractable(n, true, ExtractionCategory.Core);
 
             Debug.Assert(n.ExtractionInformation != null, "n.ExtractionInformation != null");
@@ -699,17 +724,16 @@ private void ddIsExtractionIdentifier_SelectedIndexChanged(object sender, EventA
         olvColumnExtractability.RebuildColumns();
     }
 
-    public ObjectSaverButton GetObjectSaverButton()
-    {
-        return objectSaverButton1;
-    }
+    public ObjectSaverButton GetObjectSaverButton() => objectSaverButton1;
 
     private void BtnRenameTableInfo_Click(object sender, EventArgs e)
     {
-        var cmd = new ExecuteCommandAlterTableName(Activator,_tableInfo);
+        var cmd = new ExecuteCommandAlterTableName(Activator, _tableInfo);
 
-        if(cmd.IsImpossible)
+        if (cmd.IsImpossible)
+        {
             MessageBox.Show(cmd.ReasonCommandImpossible);
+        }
         else
         {
             cmd.Execute();
diff --git a/Rdmp.UI/SimpleDialogs/Governance/GovernanceDocumentUI.cs b/Rdmp.UI/SimpleDialogs/Governance/GovernanceDocumentUI.cs
index 33b071d61d..2b2ef59fdb 100644
--- a/Rdmp.UI/SimpleDialogs/Governance/GovernanceDocumentUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Governance/GovernanceDocumentUI.cs
@@ -37,7 +37,7 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Govern
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID, "Text", "ID", g=>g.ID);
+        Bind(tbID, "Text", "ID", g => g.ID);
         Bind(tbName, "Text", "Name", g => g.Name);
         Bind(tbDescription, "Text", "Description", g => g.Description);
         Bind(tbPath, "Text", "URL", g => g.URL);
@@ -50,12 +50,9 @@ private void btnBrowse_Click(object sender, EventArgs e)
             CheckFileExists = true
         };
 
-        if (ofd.ShowDialog() == DialogResult.OK)
-        {
-            tbPath.Text = ofd.FileName;
-        }
+        if (ofd.ShowDialog() == DialogResult.OK) tbPath.Text = ofd.FileName;
     }
-        
+
     private void btnOpenContainingFolder_Click(object sender, EventArgs e)
     {
         try
diff --git a/Rdmp.UI/SimpleDialogs/Governance/GovernancePeriodUI.cs b/Rdmp.UI/SimpleDialogs/Governance/GovernancePeriodUI.cs
index 9f289e3684..44dae137bb 100644
--- a/Rdmp.UI/SimpleDialogs/Governance/GovernancePeriodUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Governance/GovernancePeriodUI.cs
@@ -21,7 +21,6 @@
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 
 
-
 namespace Rdmp.UI.SimpleDialogs.Governance;
 
 /// <summary>
@@ -37,7 +36,7 @@ namespace Rdmp.UI.SimpleDialogs.Governance;
 /// <para>If a GovernancePeriod expires all datasets (Catalogues) in the period will be assumed to have expired governance and will appear in the Dashboard as expired unless there is a new
 /// GovernancePeriod that is active.</para>
 /// </summary>
-public partial class GovernancePeriodUI : GovernancePeriodUI_Design,ISaveableUI
+public partial class GovernancePeriodUI : GovernancePeriodUI_Design, ISaveableUI
 {
     private GovernancePeriod _governancePeriod;
 
@@ -48,7 +47,8 @@ public GovernancePeriodUI()
 
         olvName.ImageGetter = s => Activator.CoreIconProvider.GetImage(s).ImageToBitmap();
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvName, new Guid("6702de5f-490f-4235-bce4-dea0cbd23f06"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvName,
+            new Guid("6702de5f-490f-4235-bce4-dea0cbd23f06"));
     }
 
     public override void SetDatabaseObject(IActivateItems activator, GovernancePeriod databaseObject)
@@ -56,7 +56,7 @@ public override void SetDatabaseObject(IActivateItems activator, GovernancePerio
         base.SetDatabaseObject(activator, databaseObject);
 
         _governancePeriod = databaseObject;
-            
+
         //clear related catalogues
         olvCatalogues.ClearObjects();
 
@@ -67,7 +67,9 @@ public override void SetDatabaseObject(IActivateItems activator, GovernancePerio
         dtpStartDate.Value = _governancePeriod.StartDate;
 
         if (_governancePeriod.EndDate == null)
+        {
             rbNeverExpires.Checked = true;
+        }
         else
         {
             rbExpiresOn.Checked = true;
@@ -118,8 +120,8 @@ private void dtpStartDate_ValueChanged(object sender, EventArgs e)
 
     private void dtpEndDate_ValueChanged(object sender, EventArgs e)
     {
-        if(_governancePeriod != null)
-            if(rbExpiresOn.Checked)
+        if (_governancePeriod != null)
+            if (rbExpiresOn.Checked)
                 _governancePeriod.EndDate = dtpEndDate.Value;
     }
 
@@ -131,11 +133,10 @@ private void btnAddCatalogue_Click(object sender, EventArgs e)
         var availableToSelect =
             allCatalogues.Where(c => !alreadyMappedCatalogues.Contains(c)).ToArray();
 
-        if(Activator.SelectObjects(new DialogArgs
-           {
-               TaskDescription = "Which Catalogue(s) should become part of this GovernancePeriod"
-           },availableToSelect,out var selected))
-        {
+        if (Activator.SelectObjects(new DialogArgs
+            {
+                TaskDescription = "Which Catalogue(s) should become part of this GovernancePeriod"
+            }, availableToSelect, out var selected))
             try
             {
                 AddCatalogues(selected.ToArray());
@@ -145,12 +146,11 @@ private void btnAddCatalogue_Click(object sender, EventArgs e)
                 ExceptionViewer.Show(
                     $"Could not add relationship to Catalogues:{string.Join(',', selected.Select(c => c.Name))}", ex);
             }
-        }
     }
 
     private void AddCatalogues(ICatalogue[] catalogues)
     {
-        var cmd = new ExecuteCommandAddCatalogueToGovernancePeriod(Activator,_governancePeriod,catalogues);
+        var cmd = new ExecuteCommandAddCatalogueToGovernancePeriod(Activator, _governancePeriod, catalogues);
         cmd.Execute();
     }
 
@@ -158,9 +158,10 @@ private void lbCatalogues_KeyUp(object sender, KeyEventArgs e)
     {
         if (e.KeyCode == Keys.Delete)
         {
-            if(olvCatalogues.SelectedObject is Catalogue toDelete)
-                if(Activator.YesNo(
-                       $"Are you sure you want to erase the fact that '{_governancePeriod.Name}' provides governance over Catalogue '{toDelete}'","Confirm Deleting Governance Relationship?"))
+            if (olvCatalogues.SelectedObject is Catalogue toDelete)
+                if (Activator.YesNo(
+                        $"Are you sure you want to erase the fact that '{_governancePeriod.Name}' provides governance over Catalogue '{toDelete}'",
+                        "Confirm Deleting Governance Relationship?"))
                 {
                     _governancePeriod.DeleteGovernanceRelationshipTo(toDelete);
                     olvCatalogues.RemoveObject(toDelete);
@@ -169,7 +170,7 @@ private void lbCatalogues_KeyUp(object sender, KeyEventArgs e)
             Publish(_governancePeriod);
         }
     }
-        
+
     private void btnImportCatalogues_Click(object sender, EventArgs e)
     {
         var toImportFrom = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<GovernancePeriod>()
@@ -178,16 +179,15 @@ private void btnImportCatalogues_Click(object sender, EventArgs e)
 
         if (!toImportFrom.Any())
         {
-
-
             MessageBox.Show("You do not have any other GovernancePeriods in your Catalogue");
             return;
         }
-            
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "Select another GovernancePeriod.  All Catalogues currently associated with that period will be added to this period (they will still be covered by their previous period(s) too)"
-           }, toImportFrom,out var selected))
+
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "Select another GovernancePeriod.  All Catalogues currently associated with that period will be added to this period (they will still be covered by their previous period(s) too)"
+            }, toImportFrom, out var selected))
         {
             var toAdd = selected.GovernedCatalogues.ToArray();
 
@@ -195,8 +195,10 @@ private void btnImportCatalogues_Click(object sender, EventArgs e)
             toAdd = toAdd.Except(olvCatalogues.Objects.Cast<Catalogue>()).ToArray();
 
             if (!toAdd.Any())
+            {
                 MessageBox.Show(
                     $"Selected GovernancePeriod '{selected.Name}' does not govern any novel Catalogues (Catalogues already in your configuration are not repeat imported)");
+            }
             else
             {
                 AddCatalogues(toAdd);
@@ -209,15 +211,14 @@ private void btnImportCatalogues_Click(object sender, EventArgs e)
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         olvCatalogues.UseFiltering = true;
-        olvCatalogues.ModelFilter = new TextMatchFilter(olvCatalogues,tbFilter.Text);
+        olvCatalogues.ModelFilter = new TextMatchFilter(olvCatalogues, tbFilter.Text);
     }
 
     private void olvCatalogues_ItemActivate(object sender, EventArgs e)
     {
-        if(olvCatalogues.SelectedObject is Catalogue cata)
-            Activator.RequestItemEmphasis(this,new EmphasiseRequest(cata));
+        if (olvCatalogues.SelectedObject is Catalogue cata)
+            Activator.RequestItemEmphasis(this, new EmphasiseRequest(cata));
     }
-
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<GovernancePeriodUI_Design, UserControl>))]
diff --git a/Rdmp.UI/SimpleDialogs/NavigateTo/RunUI.cs b/Rdmp.UI/SimpleDialogs/NavigateTo/RunUI.cs
index 954da23ae8..cfce7cb174 100644
--- a/Rdmp.UI/SimpleDialogs/NavigateTo/RunUI.cs
+++ b/Rdmp.UI/SimpleDialogs/NavigateTo/RunUI.cs
@@ -24,19 +24,19 @@ public partial class RunUI : RDMPForm
     private readonly Dictionary<string, Type> _commandsDictionary;
 
     private readonly CommandInvoker _commandCaller;
-                
-    public RunUI(IActivateItems activator):base(activator)
+
+    public RunUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
-            
+
         _commandsDictionary = new Dictionary<string, Type>(StringComparer.CurrentCultureIgnoreCase);
 
         _commandCaller = new CommandInvoker(activator);
-        _commandCaller.CommandImpossible += (s,e) =>MessageBox.Show(e.Command.ReasonCommandImpossible);
+        _commandCaller.CommandImpossible += (s, e) => MessageBox.Show(e.Command.ReasonCommandImpossible);
         _commandCaller.CommandCompleted += (s, e) => Close();
 
         var commands = _commandCaller.GetSupportedCommands();
-            
+
         foreach (var c in commands)
         {
             var name = BasicCommandExecution.GetCommandName(c.Name);
@@ -46,21 +46,21 @@ public RunUI(IActivateItems activator):base(activator)
 
         comboBox1.Items.AddRange(_commandsDictionary.Keys.ToArray());
     }
+
     public static void OnCommandExecutionException(IAtomicCommand instance, Exception exception)
     {
         ExceptionViewer.Show(exception);
     }
+
     private void comboBox1_KeyUp(object sender, KeyEventArgs e)
     {
         var key = (string)comboBox1.SelectedItem;
 
         if (key == null)
             return;
-            
+
         if (e.KeyCode == Keys.Enter)
-        {
             if (_commandsDictionary.TryGetValue(key, out var type))
-            {
                 try
                 {
                     _commandCaller.ExecuteCommand(type, null);
@@ -72,7 +72,5 @@ private void comboBox1_KeyUp(object sender, KeyEventArgs e)
                 {
                     ExceptionViewer.Show(ex);
                 }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/PerformanceCounterUI.cs b/Rdmp.UI/SimpleDialogs/PerformanceCounterUI.cs
index c84d4efc79..e8a59f006e 100644
--- a/Rdmp.UI/SimpleDialogs/PerformanceCounterUI.cs
+++ b/Rdmp.UI/SimpleDialogs/PerformanceCounterUI.cs
@@ -35,7 +35,7 @@ private void timer1_Tick(object sender, EventArgs e)
         }
         else
         {
-            var timesSeen = DatabaseCommandHelper.PerformanceCounter.DictionaryOfQueries.Values.Sum(s=>s.TimesSeen);
+            var timesSeen = DatabaseCommandHelper.PerformanceCounter.DictionaryOfQueries.Values.Sum(s => s.TimesSeen);
 
             lblCommandsAudited.Text =
                 $"Commands Audited:{timesSeen} ({DatabaseCommandHelper.PerformanceCounter.DictionaryOfQueries.Keys.Count} distinct)";
@@ -44,8 +44,7 @@ private void timer1_Tick(object sender, EventArgs e)
 
     private void btnToggleCommandAuditing_Click(object sender, EventArgs e)
     {
-
-        if(DatabaseCommandHelper.PerformanceCounter == null)
+        if (DatabaseCommandHelper.PerformanceCounter == null)
         {
             DatabaseCommandHelper.PerformanceCounter = new ComprehensiveQueryPerformanceCounter();
             btnToggleCommandAuditing.Text = "Stop Command Auditing";
@@ -67,9 +66,9 @@ private void CatalogueLibraryPerformanceCounterUI_FormClosing(object sender, For
 
     private void btnViewPerformanceResults_Click(object sender, EventArgs e)
     {
-
         //if there aren't any results don't show
-        if (DatabaseCommandHelper.PerformanceCounter == null || !DatabaseCommandHelper.PerformanceCounter.DictionaryOfQueries.Keys.Any())
+        if (DatabaseCommandHelper.PerformanceCounter == null ||
+            !DatabaseCommandHelper.PerformanceCounter.DictionaryOfQueries.Keys.Any())
             return;
 
         var f = new Form();
diff --git a/Rdmp.UI/SimpleDialogs/PropagateCatalogueItemChangesToSimilarNamedUI.cs b/Rdmp.UI/SimpleDialogs/PropagateCatalogueItemChangesToSimilarNamedUI.cs
index 2246155fec..dacd672220 100644
--- a/Rdmp.UI/SimpleDialogs/PropagateCatalogueItemChangesToSimilarNamedUI.cs
+++ b/Rdmp.UI/SimpleDialogs/PropagateCatalogueItemChangesToSimilarNamedUI.cs
@@ -43,8 +43,9 @@ public partial class PropagateCatalogueItemChangesToSimilarNamedUI : RDMPForm
     private readonly CatalogueItem _catalogueItemBeingSaved;
     private Scintilla previewOldValue;
     private Scintilla previewNewValue;
-        
-    public PropagateCatalogueItemChangesToSimilarNamedUI(IActivateItems activator, CatalogueItem catalogueItemBeingSaved, out bool shouldDialogBeDisplayed): base(activator)
+
+    public PropagateCatalogueItemChangesToSimilarNamedUI(IActivateItems activator,
+        CatalogueItem catalogueItemBeingSaved, out bool shouldDialogBeDisplayed) : base(activator)
     {
         _catalogueItemBeingSaved = catalogueItemBeingSaved;
         InitializeComponent();
@@ -57,7 +58,7 @@ public PropagateCatalogueItemChangesToSimilarNamedUI(IActivateItems activator, C
 
         olvCatalogueItemName.AspectGetter = CatalogueItemName_AspectGetter;
         olvCatalogueItemState.AspectGetter = CatalogueItemState_AspectGetter;
-        olvCatalogueItemName.ImageGetter += ci=>activator.CoreIconProvider.GetImage(ci).ImageToBitmap();
+        olvCatalogueItemName.ImageGetter += ci => activator.CoreIconProvider.GetImage(ci).ImageToBitmap();
 
         var changedProperties = DetermineChangedProperties(catalogueItemBeingSaved);
 
@@ -72,7 +73,7 @@ public PropagateCatalogueItemChangesToSimilarNamedUI(IActivateItems activator, C
         if (!changedProperties.Any())
             shouldDialogBeDisplayed = false;
 
-        if(!shouldDialogBeDisplayed)
+        if (!shouldDialogBeDisplayed)
             return;
 
         previewOldValue = new ScintillaTextEditorFactory().Create();
@@ -98,21 +99,24 @@ public PropagateCatalogueItemChangesToSimilarNamedUI(IActivateItems activator, C
             olvCatalogues.CheckAll();
             olvCatalogues.SelectedObject = otherCatalogueItemsThatShareName[0];
         }
-            
+
         olvCatalogues.CellRightClick += olvCatalogues_CellRightClick;
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvCatalogueItemName, new Guid("c5741da2-07d9-4bfb-952d-8b6df77271bf"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvCatalogueItemState, new Guid("fd7ad4a8-7448-4fff-8059-3759fe0c4d87"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvCatalogueItemName,
+            new Guid("c5741da2-07d9-4bfb-952d-8b6df77271bf"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvCatalogues, olvCatalogueItemState,
+            new Guid("fd7ad4a8-7448-4fff-8059-3759fe0c4d87"));
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProperties, olvPropertyName, new Guid("b56adceb-2cd5-4f77-9be7-07fb38baad18"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olvProperties, olvPropertyName,
+            new Guid("b56adceb-2cd5-4f77-9be7-07fb38baad18"));
     }
 
     private void olvCatalogues_CellRightClick(object sender, CellRightClickEventArgs e)
     {
-        if(olvCatalogues.SelectedObject is not CatalogueItem ci)
+        if (olvCatalogues.SelectedObject is not CatalogueItem ci)
             return;
 
-        var menu =  new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(Activator), ci);
+        var menu = new RDMPContextMenuStrip(new RDMPContextMenuStripArgs(Activator), ci);
         menu.Show(Cursor.Position);
     }
 
@@ -151,8 +155,8 @@ public static List<PropertyInfo> DetermineChangedProperties(CatalogueItem newVer
     private CatalogueItem[] GetAllCatalogueItemsSharingNameWith(CatalogueItem catalogueItemBeingSaved)
     {
         return Activator.CoreChildProvider.AllCatalogueItems
-            .Where(ci=>
-                ci.Name.Equals(catalogueItemBeingSaved.Name,StringComparison.CurrentCultureIgnoreCase) 
+            .Where(ci =>
+                ci.Name.Equals(catalogueItemBeingSaved.Name, StringComparison.CurrentCultureIgnoreCase)
                 && ci.ID != catalogueItemBeingSaved.ID)
             .ToArray();
     }
@@ -165,12 +169,10 @@ private void clbCatalogues_SelectedIndexChanged(object sender, EventArgs e)
     private void clbChangedProperties_SelectedIndexChanged(object sender, EventArgs e)
     {
         displayPreview();
-
     }
 
     public void displayPreview()
     {
-
         var pi = olvProperties.SelectedObject as PropertyInfo;
 
         if (pi != null && olvCatalogues.SelectedObject is CatalogueItem ci)
@@ -184,13 +186,12 @@ public void displayPreview()
             previewNewValue.ReadOnly = true;
 
             highlightDifferencesBetweenPreviewPanes();
-
         }
     }
 
     private void cbSelectAllCatalogues_CheckedChanged(object sender, EventArgs e)
     {
-        if(cbSelectAllCatalogues.Checked)
+        if (cbSelectAllCatalogues.Checked)
             olvCatalogues.CheckAll();
         else
             olvCatalogues.UncheckAll();
@@ -217,14 +218,12 @@ private void highlightDifferencesBetweenPreviewPanes()
         var diff = new Diff();
         foreach (var item in Diff.DiffText(sOld, sNew))
         {
-                
             for (var i = item.StartA; i < item.StartA + item.deletedA; i++)
-                ScintillaLineHighlightingHelper.HighlightLine(previewOldValue,i,Color.Pink);
-                
+                ScintillaLineHighlightingHelper.HighlightLine(previewOldValue, i, Color.Pink);
+
             //if it is single line change
             for (var i = item.StartB; i < item.StartB + item.insertedB; i++)
                 ScintillaLineHighlightingHelper.HighlightLine(previewNewValue, i, Color.LawnGreen);
-
         }
     }
 
@@ -233,7 +232,7 @@ private void btnYes_Click(object sender, EventArgs e)
     {
         DialogResult = DialogResult.Yes;
 
-            
+
         foreach (CatalogueItem ci in olvCatalogues.CheckedObjects)
         {
             foreach (PropertyInfo p in olvProperties.CheckedObjects)
@@ -257,14 +256,12 @@ private void btnCancel_Click(object sender, EventArgs e)
     {
         DialogResult = DialogResult.Cancel;
         Close();
-            
     }
 
     private void olv_ItemActivate(object sender, EventArgs e)
     {
         var olv = (ObjectListView)sender;
-        if(olv.SelectedObject != null)
+        if (olv.SelectedObject != null)
             olv.ToggleCheckObject(olv.SelectedObject);
     }
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/Remoting/RemoteRDMPUI.cs b/Rdmp.UI/SimpleDialogs/Remoting/RemoteRDMPUI.cs
index b80a25d47e..d5d81456d6 100644
--- a/Rdmp.UI/SimpleDialogs/Remoting/RemoteRDMPUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Remoting/RemoteRDMPUI.cs
@@ -30,7 +30,7 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Remote
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",r=>r.ID);
+        Bind(tbID, "Text", "ID", r => r.ID);
         Bind(tbName, "Text", "Name", r => r.Name);
         Bind(tbBaseUrl, "Text", "URL", r => r.URL);
         Bind(tbUsername, "Text", "Username", r => r.Username);
diff --git a/Rdmp.UI/SimpleDialogs/Reports/DataGeneratorUI.cs b/Rdmp.UI/SimpleDialogs/Reports/DataGeneratorUI.cs
index 42984daede..da1a45cd80 100644
--- a/Rdmp.UI/SimpleDialogs/Reports/DataGeneratorUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Reports/DataGeneratorUI.cs
@@ -20,7 +20,6 @@ namespace Rdmp.UI.SimpleDialogs.Reports;
 /// </summary>
 public partial class DataGeneratorUI : UserControl
 {
-
     public DataGeneratorUI()
     {
         InitializeComponent();
@@ -35,17 +34,14 @@ public IDataGenerator Generator
         {
             _generator = value;
 
-            if(value != null)
+            if (value != null)
                 value.RowsGenerated += ValueOnRowsGenerated;
 
-            cbGenerate.Text = value != null ? value.GetType().Name:"";
+            cbGenerate.Text = value != null ? value.GetType().Name : "";
         }
     }
-        
-    public int GetSize()
-    {
-        return 10* (int)Math.Pow(10, trackBar1.Value);
-    }
+
+    public int GetSize() => 10 * (int)Math.Pow(10, trackBar1.Value);
 
     private int sizeAtBeginGeneration = -1;
     public Thread Thread;
@@ -56,7 +52,7 @@ public int GetSize()
     public void BeginGeneration(IPersonCollection cohort, DirectoryInfo target)
     {
         //already running
-        if(sizeAtBeginGeneration != -1)
+        if (sizeAtBeginGeneration != -1)
             return;
 
         sizeAtBeginGeneration = GetSize();
@@ -65,9 +61,8 @@ public void BeginGeneration(IPersonCollection cohort, DirectoryInfo target)
 
         Thread = new Thread(() => Generator.GenerateTestDataFile(cohort, fi, sizeAtBeginGeneration));
         Thread.Start();
-
     }
-        
+
     private void ValueOnRowsGenerated(object sender, RowsGeneratedEventArgs e)
     {
         if (InvokeRequired)
@@ -76,13 +71,10 @@ private void ValueOnRowsGenerated(object sender, RowsGeneratedEventArgs e)
             return;
         }
 
-        var percentProgress = e.RowsWritten/(double)sizeAtBeginGeneration * 100.0;
+        var percentProgress = e.RowsWritten / (double)sizeAtBeginGeneration * 100.0;
         progressBar1.Value = (int)percentProgress;
 
-        if (e.IsFinished)
-        {
-            Completed?.Invoke();
-        }
+        if (e.IsFinished) Completed?.Invoke();
     }
 
     private void trackBar1_MouseUp(object sender, MouseEventArgs e)
@@ -90,7 +82,9 @@ private void trackBar1_MouseUp(object sender, MouseEventArgs e)
         TrackBarMouseUp?.Invoke();
     }
 
-    public bool Generate { get => cbGenerate.Checked;
+    public bool Generate
+    {
+        get => cbGenerate.Checked;
         set => cbGenerate.Checked = value;
     }
 
diff --git a/Rdmp.UI/SimpleDialogs/Reports/GenerateTestDataUI.cs b/Rdmp.UI/SimpleDialogs/Reports/GenerateTestDataUI.cs
index 95500cb456..afaf7bdbd7 100644
--- a/Rdmp.UI/SimpleDialogs/Reports/GenerateTestDataUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Reports/GenerateTestDataUI.cs
@@ -39,7 +39,7 @@ public partial class GenerateTestDataUI : RDMPForm
 
     private int? _seed;
 
-    public GenerateTestDataUI(IActivateItems activator, ICommandExecution command):base(activator)
+    public GenerateTestDataUI(IActivateItems activator, ICommandExecution command) : base(activator)
     {
         InitializeComponent();
 
@@ -47,7 +47,7 @@ public GenerateTestDataUI(IActivateItems activator, ICommandExecution command):b
 
         var yLoc = 0;
 
-        foreach(var t in dataGeneratorFactory.GetAvailableGenerators())
+        foreach (var t in dataGeneratorFactory.GetAvailableGenerators())
         {
             var ui = new DataGeneratorUI
             {
@@ -57,29 +57,29 @@ public GenerateTestDataUI(IActivateItems activator, ICommandExecution command):b
             yLoc += ui.Height;
             pDatasets.Controls.Add(ui);
         }
-            
+
         lblDirectory.Visible = false;
 
         EnableOrDisableGoButton();
 
-        if(command != null)
+        if (command != null)
             BuildHelpWorkflow(command);
 
-        helpIcon1.SetHelpText("Tutorial","Click for tutorial",HelpWorkflow);
+        helpIcon1.SetHelpText("Tutorial", "Click for tutorial", HelpWorkflow);
     }
 
     private void BuildHelpWorkflow(ICommandExecution command)
     {
-
         HelpWorkflow = new HelpWorkflow(this, command, new TutorialTracker(Activator));
 
         var ds =
             new HelpStage(pDatasets,
                 "This control will allow you to create flat comma separated files with fictional data for a shared pool of patient identifiers.  Start by choosing the number of rows you want in each dataset e.g. 1,000,000");
         var pop =
-            new HelpStage(pPopulationSize, "Now choose how many unique identifiers you want generated.  If your population pool is smaller than the number of records per dataset there will be a large overlap of patients between datasets while if it is larger the crossover will be sparser.");
+            new HelpStage(pPopulationSize,
+                "Now choose how many unique identifiers you want generated.  If your population pool is smaller than the number of records per dataset there will be a large overlap of patients between datasets while if it is larger the crossover will be sparser.");
 
-        var location = new HelpStage(pOutputDirectory,@"Click browse to select a directory to create the 3 files in");
+        var location = new HelpStage(pOutputDirectory, @"Click browse to select a directory to create the 3 files in");
 
         var execute = new HelpStage(btnGenerate, "Click to start generating the flat files");
 
@@ -100,7 +100,6 @@ protected override void OnLoad(EventArgs e)
 
     private void groupBox1_Enter(object sender, EventArgs e)
     {
-
     }
 
     private int populationSize;
@@ -110,14 +109,13 @@ private void tbPopulationSize_TextChanged(object sender, EventArgs e)
         try
         {
             populationSize = int.Parse(tbPopulationSize.Text);
-            if(populationSize < 1)
+            if (populationSize < 1)
                 throw new IndexOutOfRangeException();
 
             tbPopulationSize.ForeColor = Color.Black;
 
             ragSmileyPopulation.Visible = true;
             ragSmileyPopulation.Reset();
-
         }
         catch (Exception ex)
         {
@@ -125,6 +123,7 @@ private void tbPopulationSize_TextChanged(object sender, EventArgs e)
             ragSmileyPopulation.Visible = true;
             ragSmileyPopulation.Fatal(ex);
         }
+
         EnableOrDisableGoButton();
     }
 
@@ -132,12 +131,10 @@ private void EnableOrDisableGoButton()
     {
         if (tbPopulationSize.ForeColor == Color.Red)
             btnGenerate.Enabled = false;
-        else
-        if (string.IsNullOrWhiteSpace(tbPopulationSize.Text) || !lblDirectory.Visible)
+        else if (string.IsNullOrWhiteSpace(tbPopulationSize.Text) || !lblDirectory.Visible)
             btnGenerate.Enabled = false;
         else
             btnGenerate.Enabled = true;
-
     }
 
     private bool started = false;
@@ -147,15 +144,14 @@ private void EnableOrDisableGoButton()
 
     private void btnGenerate_Click(object sender, EventArgs e)
     {
+        var uis = pDatasets.Controls.OfType<DataGeneratorUI>().Where(ui => ui.Generate).ToArray();
 
-        var uis = pDatasets.Controls.OfType<DataGeneratorUI>().Where(ui=>ui.Generate).ToArray();
-            
-        if(!uis.Any())
+        if (!uis.Any())
         {
             MessageBox.Show("At least one dataset must be selected");
             return;
         }
-            
+
         try
         {
             if (started)
@@ -167,30 +163,34 @@ private void btnGenerate_Click(object sender, EventArgs e)
             started = true;
 
 
-            var r = _seed.HasValue ? new Random(_seed.Value):new Random();
+            var r = _seed.HasValue ? new Random(_seed.Value) : new Random();
 
 
             var identifiers = new PersonCollection();
-            identifiers.GeneratePeople(populationSize,r);
+            identifiers.GeneratePeople(populationSize, r);
 
-            if(cbLookups.Checked)
+            if (cbLookups.Checked)
                 DataGenerator.WriteLookups(_extractDirectory);
 
             //run them at the same time
-            if(!_seed.HasValue)
+            if (!_seed.HasValue)
             {
                 foreach (var ui in uis)
                 {
                     Executing.Add(ui);
                     ui.BeginGeneration(identifiers, _extractDirectory);
                     var ui1 = ui;
-                    ui.Completed += () => { Executing.Remove(ui1); AnnounceIfComplete();};
+                    ui.Completed += () =>
+                    {
+                        Executing.Remove(ui1);
+                        AnnounceIfComplete();
+                    };
                 }
             }
             else
             {
                 var queue = new Queue<DataGeneratorUI>(uis);
-                Execute(identifiers,queue,queue.Dequeue(),r);
+                Execute(identifiers, queue, queue.Dequeue(), r);
             }
         }
         catch (Exception exception)
@@ -201,7 +201,7 @@ private void btnGenerate_Click(object sender, EventArgs e)
 
     private void Execute(PersonCollection identifiers, Queue<DataGeneratorUI> queue, DataGeneratorUI current, Random r)
     {
-        if(current == null)
+        if (current == null)
             return;
 
         //tell form it is running
@@ -210,7 +210,7 @@ private void Execute(PersonCollection identifiers, Queue<DataGeneratorUI> queue,
         var dataGeneratorFactory = new DataGeneratorFactory();
 
         //reset the current generator to use the seed provided
-        current.Generator = dataGeneratorFactory.Create(current.Generator.GetType(),r);
+        current.Generator = dataGeneratorFactory.Create(current.Generator.GetType(), r);
 
 
         current.BeginGeneration(identifiers, _extractDirectory);
@@ -218,8 +218,8 @@ private void Execute(PersonCollection identifiers, Queue<DataGeneratorUI> queue,
         //when it is complete
         current.Completed += () =>
         {
-            if(queue.Count != 0)
-                Execute(identifiers,queue,queue.Dequeue(),r);
+            if (queue.Count != 0)
+                Execute(identifiers, queue, queue.Dequeue(), r);
 
             Executing.Remove(current);
             AnnounceIfComplete();
@@ -228,7 +228,7 @@ private void Execute(PersonCollection identifiers, Queue<DataGeneratorUI> queue,
 
     private void AnnounceIfComplete()
     {
-        if(!Executing.Any())
+        if (!Executing.Any())
         {
             MessageBox.Show("Finished generating test data");
             Close();
@@ -238,7 +238,7 @@ private void AnnounceIfComplete()
     private void UserExercisesUI_FormClosing(object sender, FormClosingEventArgs e)
     {
         //if it hasn't started let them close
-        if(!started)
+        if (!started)
             return;
 
         //warn them and cancel if any of them are still generating data
@@ -278,13 +278,12 @@ private void TbSeed_TextChanged(object sender, EventArgs e)
         try
         {
             _seed = int.Parse(tbSeed.Text);
-            tbSeed.ForeColor= Color.Black;
-
-        }catch(Exception )
+            tbSeed.ForeColor = Color.Black;
+        }
+        catch (Exception)
         {
             _seed = null;
-            tbSeed.ForeColor= Color.Red;
+            tbSeed.ForeColor = Color.Red;
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/Reports/MetadataReportUI.cs b/Rdmp.UI/SimpleDialogs/Reports/MetadataReportUI.cs
index 2dc62c3f74..74f90f8dfb 100644
--- a/Rdmp.UI/SimpleDialogs/Reports/MetadataReportUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Reports/MetadataReportUI.cs
@@ -45,14 +45,14 @@ public partial class MetadataReportUI : RDMPForm
     private readonly Catalogue[] _catalogues;
     private bool _firstTime = true;
 
-    public MetadataReportUI(IActivateItems activator,ICatalogue[] initialSelection = null):base(activator)
+    public MetadataReportUI(IActivateItems activator, ICatalogue[] initialSelection = null) : base(activator)
     {
         InitializeComponent();
 
         _catalogues = Activator.CoreChildProvider.AllCatalogues;
         cbxCatalogues.Items.AddRange(_catalogues);
 
-        if (initialSelection != null) 
+        if (initialSelection != null)
             SetCatalogueSelection(initialSelection);
 
         aggregateGraph1.Silent = true;
@@ -66,8 +66,9 @@ private void btnGenerateReport_Click(object sender, EventArgs e)
 
         IEnumerable<Catalogue> toReportOn = _catalogues;
 
-        if(rbAllCatalogues.Checked)
-            toReportOn = toReportOn.Where(c => !c.IsInternalDataset && !c.IsColdStorageDataset && !c.IsDeprecated).ToArray();
+        if (rbAllCatalogues.Checked)
+            toReportOn = toReportOn.Where(c => !c.IsInternalDataset && !c.IsColdStorageDataset && !c.IsDeprecated)
+                .ToArray();
         else if (_cataloguesToRun == null || !_catalogues.Any())
             return;
         else
@@ -77,8 +78,8 @@ private void btnGenerateReport_Click(object sender, EventArgs e)
         {
             Timeout = _timeout,
             IncludeRowCounts = cbIncludeRowCounts.Checked,
-            IncludeDistinctIdentifierCounts =  cbIncludeDistinctIdentifiers.Checked,
-            SkipImages =  !cbIncludeGraphs.Checked,
+            IncludeDistinctIdentifierCounts = cbIncludeDistinctIdentifiers.Checked,
+            SkipImages = !cbIncludeGraphs.Checked,
             TimespanCalculator = new DatasetTimespanCalculator(),
             IncludeDeprecatedItems = cbIncludeDeprecatedCatalogueItems.Checked,
             IncludeInternalItems = cbIncludeInternalCatalogueItems.Checked,
@@ -89,7 +90,7 @@ private void btnGenerateReport_Click(object sender, EventArgs e)
         _report = new MetadataReport(Activator.RepositoryLocator.CatalogueRepository, args);
 
         _report.RequestCatalogueImages += report_RequestCatalogueImages;
-        _report.GenerateWordFileAsync(progressBarsUI1,true);
+        _report.GenerateWordFileAsync(progressBarsUI1, true);
 
         btnGenerateReport.Enabled = false;
         btnStop.Enabled = true;
@@ -99,17 +100,18 @@ public BitmapWithDescription[] report_RequestCatalogueImages(Catalogue catalogue
     {
         //cross thread
         if (InvokeRequired)
-            return (BitmapWithDescription[])Invoke(new RequestCatalogueImagesHandler(report_RequestCatalogueImages), catalogue);
+            return (BitmapWithDescription[])Invoke(new RequestCatalogueImagesHandler(report_RequestCatalogueImages),
+                catalogue);
 
         var toReturn = new List<BitmapWithDescription>();
-                
-            
-        aggregateGraph1.Width = (int) _report.PageWidthInPixels;
+
+
+        aggregateGraph1.Width = (int)_report.PageWidthInPixels;
         aggregateGraph1.Visible = true;
 
 
         //only graph extractable aggregates
-        foreach (var aggregate in catalogue.AggregateConfigurations.Where(config=>config.IsExtractable))
+        foreach (var aggregate in catalogue.AggregateConfigurations.Where(config => config.IsExtractable))
         {
             if (_firstTime)
             {
@@ -117,11 +119,13 @@ public BitmapWithDescription[] report_RequestCatalogueImages(Catalogue catalogue
                 _firstTime = false;
             }
             else
-                aggregateGraph1.SetAggregate(Activator,aggregate);
+            {
+                aggregateGraph1.SetAggregate(Activator, aggregate);
+            }
 
             aggregateGraph1.LoadGraphAsync();
-                
-            while(aggregateGraph1.Done == false && aggregateGraph1.Crashed == false)
+
+            while (aggregateGraph1.Done == false && aggregateGraph1.Crashed == false)
             {
                 Thread.Sleep(100);
                 Application.DoEvents();
@@ -130,7 +134,7 @@ public BitmapWithDescription[] report_RequestCatalogueImages(Catalogue catalogue
             if (aggregateGraph1.Crashed)
             {
                 progressBarsUI1.OnNotify(this, new NotifyEventArgs(ProgressEventType.Error,
-                    $"Aggregate with ID {aggregate.ID} crashed",aggregateGraph1.Exception));
+                    $"Aggregate with ID {aggregate.ID} crashed", aggregateGraph1.Exception));
                 continue;
             }
 
@@ -143,9 +147,8 @@ public BitmapWithDescription[] report_RequestCatalogueImages(Catalogue catalogue
         aggregateGraph1.Visible = false;
 
         return toReturn.ToArray();
-
     }
-        
+
     private void btnStop_Click(object sender, EventArgs e)
     {
         _report.Abort();
@@ -164,7 +167,7 @@ private void ConfigureMetadataReport_FormClosing(object sender, FormClosingEvent
 
     private void rbAllCatalogues_CheckedChanged(object sender, EventArgs e)
     {
-        if(bLoading)
+        if (bLoading)
             return;
 
         cbxCatalogues.Enabled = false;
@@ -173,7 +176,7 @@ private void rbAllCatalogues_CheckedChanged(object sender, EventArgs e)
 
     private void rbSpecificCatalogue_CheckedChanged(object sender, EventArgs e)
     {
-        if(bLoading)
+        if (bLoading)
             return;
 
         cbxCatalogues.Enabled = true;
@@ -200,22 +203,19 @@ private void tbTimeout_TextChanged(object sender, EventArgs e)
 
     private void cbIncludeDistinctIdentifiers_CheckedChanged(object sender, EventArgs e)
     {
-
     }
 
     private void btnPick_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObjects(new DialogArgs
-           {
-               TaskDescription = "Which Catalogue(s) do you want to generate metadata for?"
-           }, cbxCatalogues.Items.OfType<Catalogue>().ToArray(),out var selected))
-        {
+        if (Activator.SelectObjects(new DialogArgs
+            {
+                TaskDescription = "Which Catalogue(s) do you want to generate metadata for?"
+            }, cbxCatalogues.Items.OfType<Catalogue>().ToArray(), out var selected))
             SetCatalogueSelection(selected);
-        }
-                
     }
 
     private bool bLoading = false;
+
     private void SetCatalogueSelection(ICatalogue[] array)
     {
         bLoading = true;
@@ -226,7 +226,7 @@ private void SetCatalogueSelection(ICatalogue[] array)
             cbxCatalogues.Enabled = false;
             _cataloguesToRun = array;
         }
-        else if(array.Length == 1)
+        else if (array.Length == 1)
         {
             rbSpecificCatalogue.Checked = true;
             cbxCatalogues.SelectedItem = array[0];
@@ -246,11 +246,11 @@ private void SetCatalogueSelection(ICatalogue[] array)
 
     private void cbxCatalogues_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(bLoading)
+        if (bLoading)
             return;
 
-        if (cbxCatalogues.SelectedItem != null) 
-            _cataloguesToRun = new[] {(ICatalogue) cbxCatalogues.SelectedItem};
+        if (cbxCatalogues.SelectedItem != null)
+            _cataloguesToRun = new[] { (ICatalogue)cbxCatalogues.SelectedItem };
     }
 
     private void btnFolder_Click(object sender, EventArgs e)
@@ -261,16 +261,15 @@ private void btnFolder_Click(object sender, EventArgs e)
             .Distinct()
             .ToArray();
 
-        if(Activator.SelectObject(new DialogArgs
-           {
-               TaskDescription = "Which folder do you want to generate metadata for? All Catalogues in that folder will be included in the metadata report generated"
-           }, folders,out var selected))
-        {
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "Which folder do you want to generate metadata for? All Catalogues in that folder will be included in the metadata report generated"
+            }, folders, out var selected))
             SetCatalogueSelection(
                 Activator.CoreChildProvider
                     .AllCatalogues
                     .Where(c => c.Folder.Equals(selected))
                     .ToArray());
-        }   
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/Revertable/OfferChanceToSaveDialogUI.cs b/Rdmp.UI/SimpleDialogs/Revertable/OfferChanceToSaveDialogUI.cs
index f5c9ba7601..49786f2804 100644
--- a/Rdmp.UI/SimpleDialogs/Revertable/OfferChanceToSaveDialogUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Revertable/OfferChanceToSaveDialogUI.cs
@@ -37,7 +37,7 @@ private OfferChanceToSaveDialogUI(IRevertable revertable, RevertableObjectReport
 
         lblFirstPrompt.Text =
             $"Would you like to save changes to {revertable.GetType().Name} '{revertable}' (ID={revertable.ID})";
-            
+
         tableLayoutPanel1.RowCount = differences.Differences.Count;
         for (var index = 0; index < differences.Differences.Count; index++)
         {
@@ -46,7 +46,7 @@ private OfferChanceToSaveDialogUI(IRevertable revertable, RevertableObjectReport
             {
                 Dock = DockStyle.Fill
             };
-            tableLayoutPanel1.Controls.Add(toAdd,0,index);
+            tableLayoutPanel1.Controls.Add(toAdd, 0, index);
         }
 
         for (var i = 0; i < tableLayoutPanel1.RowStyles.Count; i++)
@@ -65,7 +65,7 @@ private OfferChanceToSaveDialogUI(IRevertable revertable, RevertableObjectReport
         var differences = revertable.HasLocalChanges();
 
         if (differences.Evaluation == ChangeDescription.DatabaseCopyDifferent)
-            return new OfferChanceToSaveDialogUI(revertable,differences).ShowDialog();
+            return new OfferChanceToSaveDialogUI(revertable, differences).ShowDialog();
 
         return null;
     }
@@ -88,7 +88,5 @@ private void btnViewStackTrace_Click(object sender, EventArgs e)
     {
         var dialog = new ExceptionViewerStackTraceWithHyperlinks(Environment.StackTrace);
         dialog.Show();
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/Revertable/RevertablePropertyDifferenceUI.cs b/Rdmp.UI/SimpleDialogs/Revertable/RevertablePropertyDifferenceUI.cs
index 0e5c13890e..96f8526f15 100644
--- a/Rdmp.UI/SimpleDialogs/Revertable/RevertablePropertyDifferenceUI.cs
+++ b/Rdmp.UI/SimpleDialogs/Revertable/RevertablePropertyDifferenceUI.cs
@@ -22,17 +22,18 @@ namespace Rdmp.UI.SimpleDialogs.Revertable;
 public partial class RevertablePropertyDifferenceUI : RDMPUserControl
 {
     private readonly RevertablePropertyDifference _difference;
-        
+
     public RevertablePropertyDifferenceUI(RevertablePropertyDifference difference)
     {
         _difference = difference;
         InitializeComponent();
-            
+
         if (VisualStudioDesignMode) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
             return;
-            
+
         //For documentation/control previewing
-        _difference ??= new RevertablePropertyDifference(typeof(Catalogue).GetProperty("Name"), "Biochemistry", "byochemistry");
+        _difference ??=
+            new RevertablePropertyDifference(typeof(Catalogue).GetProperty("Name"), "Biochemistry", "byochemistry");
 
         CreateScintillaComponents(
             _difference.DatabaseValue != null ? _difference.DatabaseValue.ToString() : "<Null>",
@@ -41,12 +42,13 @@ public RevertablePropertyDifferenceUI(RevertablePropertyDifference difference)
         lblDbProperty.Text = $"{_difference.Property.Name} in Database";
         lblMemoryProperty.Text = $"{_difference.Property.Name} in Memory";
     }
-        
+
     private Scintilla QueryEditorBefore;
     private Scintilla QueryEditorAfter;
 
 
-    public void CreateScintillaComponents(string textBefore, string textAfter, SyntaxLanguage language = SyntaxLanguage.SQL)
+    public void CreateScintillaComponents(string textBefore, string textAfter,
+        SyntaxLanguage language = SyntaxLanguage.SQL)
     {
         QueryEditorBefore = new ScintillaTextEditorFactory().Create();
         QueryEditorBefore.Text = textBefore;
@@ -59,7 +61,7 @@ public void CreateScintillaComponents(string textBefore, string textAfter, Synta
         QueryEditorAfter.ReadOnly = true;
 
         splitContainer1.Panel2.Controls.Add(QueryEditorAfter);
-            
+
         //compute difference
         textBefore ??= "";
         textAfter ??= "";
@@ -74,12 +76,10 @@ public void CreateScintillaComponents(string textBefore, string textAfter, Synta
         foreach (var item in Diff.DiffText(textBefore, textAfter))
         {
             for (var i = item.StartA; i < item.StartA + item.deletedA; i++)
-                ScintillaLineHighlightingHelper.HighlightLine(QueryEditorBefore,i, Color.Pink);
-                    
-            for (var i = item.StartB; i < item.StartB+item.insertedB; i++)
+                ScintillaLineHighlightingHelper.HighlightLine(QueryEditorBefore, i, Color.Pink);
+
+            for (var i = item.StartB; i < item.StartB + item.insertedB; i++)
                 ScintillaLineHighlightingHelper.HighlightLine(QueryEditorAfter, i, Color.LawnGreen);
         }
-            
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/SelectDialog.cs b/Rdmp.UI/SimpleDialogs/SelectDialog.cs
index c9c55b4323..3055a21cd0 100644
--- a/Rdmp.UI/SimpleDialogs/SelectDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/SelectDialog.cs
@@ -60,6 +60,7 @@ public partial class SelectDialog<T> : Form, IVirtualListDataSource where T : cl
     /// All the objects when T is not an IMapsDirectlyToDatabaseTable.
     /// </summary>
     private T[] _allObjects;
+
     private List<T> _objectsToDisplay = new();
     private List<IMapsDirectlyToDatabaseTable> _tempMatches;
     private List<IMapsDirectlyToDatabaseTable> _matches;
@@ -72,6 +73,7 @@ public partial class SelectDialog<T> : Form, IVirtualListDataSource where T : cl
     /// The users final selection when not using mutli select mode
     /// </summary>
     public T Selected;
+
     public HashSet<T> MultiSelected { get; private set; }
 
     /// <summary>
@@ -91,6 +93,7 @@ public Type AlwaysFilterOn
             tbFilter_TextChanged(this, null);
         }
     }
+
     public bool AllowMultiSelect
     {
         get => olv.MultiSelect;
@@ -99,10 +102,7 @@ public bool AllowMultiSelect
             olv.MultiSelect = value;
             if (value)
             {
-                if (!olv.AllColumns.Contains(olvSelected))
-                {
-                    olv.AllColumns.Add(olvSelected);
-                }
+                if (!olv.AllColumns.Contains(olvSelected)) olv.AllColumns.Add(olvSelected);
             }
             else
             {
@@ -119,16 +119,16 @@ public bool AllowMultiSelect
     /// </summary>
     private Dictionary<Type, RDMPCollection> EasyFilterTypesAndAssociatedCollections = new()
     {
-        {typeof (Catalogue),RDMPCollection.Catalogue},
-        {typeof (CatalogueItem),RDMPCollection.Catalogue},
-        {typeof (SupportingDocument),RDMPCollection.Catalogue},
-        {typeof (Project),RDMPCollection.DataExport},
-        {typeof (ExtractionConfiguration),RDMPCollection.DataExport},
-        {typeof (ExtractableCohort),RDMPCollection.SavedCohorts},
-        {typeof (CohortIdentificationConfiguration),RDMPCollection.Cohort},
-        {typeof (TableInfo),RDMPCollection.Tables},
-        {typeof (ColumnInfo),RDMPCollection.Tables},
-        {typeof (LoadMetadata),RDMPCollection.DataLoad}
+        { typeof(Catalogue), RDMPCollection.Catalogue },
+        { typeof(CatalogueItem), RDMPCollection.Catalogue },
+        { typeof(SupportingDocument), RDMPCollection.Catalogue },
+        { typeof(Project), RDMPCollection.DataExport },
+        { typeof(ExtractionConfiguration), RDMPCollection.DataExport },
+        { typeof(ExtractableCohort), RDMPCollection.SavedCohorts },
+        { typeof(CohortIdentificationConfiguration), RDMPCollection.Cohort },
+        { typeof(TableInfo), RDMPCollection.Tables },
+        { typeof(ColumnInfo), RDMPCollection.Tables },
+        { typeof(LoadMetadata), RDMPCollection.DataLoad }
     };
 
 
@@ -138,17 +138,20 @@ public bool AllowMultiSelect
     public Dictionary<RDMPCollection, Type[]> StartingEasyFilters
         = new()
         {
-            {RDMPCollection.Catalogue, new[] {typeof (Catalogue)}},
-            {RDMPCollection.Cohort, new[] {typeof (CohortIdentificationConfiguration)}},
-            {RDMPCollection.DataExport, new[] {typeof (Project), typeof (ExtractionConfiguration)}},
-            {RDMPCollection.DataLoad, new[] {typeof (LoadMetadata)}},
-            {RDMPCollection.SavedCohorts, new[] {typeof (ExtractableCohort)}},
-            {RDMPCollection.Tables, new[] {typeof (TableInfo)}},
-            {RDMPCollection.None,new []{typeof(SupportingDocument),typeof(CatalogueItem)}} //Add all other Type checkboxes here so that they are recognised as Typenames
+            { RDMPCollection.Catalogue, new[] { typeof(Catalogue) } },
+            { RDMPCollection.Cohort, new[] { typeof(CohortIdentificationConfiguration) } },
+            { RDMPCollection.DataExport, new[] { typeof(Project), typeof(ExtractionConfiguration) } },
+            { RDMPCollection.DataLoad, new[] { typeof(LoadMetadata) } },
+            { RDMPCollection.SavedCohorts, new[] { typeof(ExtractableCohort) } },
+            { RDMPCollection.Tables, new[] { typeof(TableInfo) } },
+            {
+                RDMPCollection.None, new[] { typeof(SupportingDocument), typeof(CatalogueItem) }
+            } //Add all other Type checkboxes here so that they are recognised as Typenames
         };
 
 
-    public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> toSelectFrom, bool allowDeleting, RDMPCollection focusedCollection = RDMPCollection.None)
+    public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> toSelectFrom, bool allowDeleting,
+        RDMPCollection focusedCollection = RDMPCollection.None)
     {
         _args = args;
         _activator = activator;
@@ -156,10 +159,11 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
 
         InitializeComponent();
 
-        if(IsDatabaseObjects())
+        if (IsDatabaseObjects())
         {
             _allObjects = toSelectFrom.ToArray();
-            _searchables = _allObjects.Cast<IMapsDirectlyToDatabaseTable>().ToDictionary(k => k, activator.CoreChildProvider.GetDescendancyListIfAnyFor);
+            _searchables = _allObjects.Cast<IMapsDirectlyToDatabaseTable>()
+                .ToDictionary(k => k, activator.CoreChildProvider.GetDescendancyListIfAnyFor);
             _usefulPropertyFinder = new AttributePropertyFinder<UsefulPropertyAttribute>(_searchables.Keys);
 
             AddUsefulPropertiesIfHomogeneousTypes(_allObjects);
@@ -179,10 +183,7 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
         Text = args.WindowTitle;
         label1.Text = args.IsFind ? "Find:" : "Filter:";
 
-        if(args.IsFind)
-        {
-            pFilter.Dock = DockStyle.Top;
-        }
+        if (args.IsFind) pFilter.Dock = DockStyle.Top;
 
         tbFilter.Text = args.InitialSearchText;
         tbFilter.KeyPress += (s, e) =>
@@ -200,10 +201,7 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
         olvID.AspectGetter = m => (m as IMapsDirectlyToDatabaseTable)?.ID ?? null;
 
         // don't add the ID column if we aren't talking about database objects
-        if (!IsDatabaseObjects())
-        {
-            olv.AllColumns.Remove(olvID);
-        }
+        if (!IsDatabaseObjects()) olv.AllColumns.Remove(olvID);
 
         olvName.AspectGetter = m => m?.ToString();
         olvHierarchy.AspectGetter = GetHierarchy;
@@ -216,10 +214,8 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
         olv.RowHeight = 19;
 
         if (!args.AllowSelectingNull)
-        {
             //disable the option to select NULL
             btnSelectNULL.Visible = false;
-        }
 
         //default to not allowing multi selection
         olv.MultiSelect = false;
@@ -235,9 +231,12 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
 
         MultiSelected = new HashSet<T>();
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvName, new Guid("298cda00-5ec8-423c-9230-71d78bec6bc4"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvID, new Guid("bb0fe2f0-1e73-4b00-a5b7-4b6ce3510bab"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvHierarchy, new Guid("9393c6f0-b2c5-4bf8-8675-3a0117a2c850"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvName,
+            new Guid("298cda00-5ec8-423c-9230-71d78bec6bc4"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvID,
+            new Guid("bb0fe2f0-1e73-4b00-a5b7-4b6ce3510bab"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, olvHierarchy,
+            new Guid("9393c6f0-b2c5-4bf8-8675-3a0117a2c850"));
 
         btnCancel.KeyPress += BtnKeypress;
         btnSelect.KeyPress += BtnKeypress;
@@ -251,10 +250,7 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
                 e.Handled = true;
         };
 
-        if(args.InitialObjectSelection != null)
-        {
-            SetInitialSelection(args.InitialObjectSelection.Cast<T>());
-        }
+        if (args.InitialObjectSelection != null) SetInitialSelection(args.InitialObjectSelection.Cast<T>());
 
 
         if (args.InitialSearchTextGuid != null)
@@ -263,10 +259,7 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
             RecentHistoryOfControls.SetValueToMostRecentlySavedValue(tbFilter);
         }
 
-        if (IsDatabaseObjects())
-        {
-            tbFilter_TextChanged(null,null);
-        }
+        if (IsDatabaseObjects()) tbFilter_TextChanged(null, null);
 
         olv.VirtualListDataSource = this;
 
@@ -281,7 +274,7 @@ public SelectDialog(DialogArgs args, IActivateItems activator, IEnumerable<T> to
 
         tbFilter.TextChanged += tbFilter_TextChanged;
 
-        if(IsDatabaseObjects())
+        if (IsDatabaseObjects())
         {
             olv.CellToolTip.InitialDelay = UserSettings.TooltipAppearDelay;
             olv.CellToolTipShowing += (s, e) => RDMPCollectionCommonFunctionality.Tree_CellToolTipShowing(activator, e);
@@ -318,7 +311,6 @@ private void AddUsefulPropertiesIfHomogeneousTypes(T[] mapsDirectlyToDatabaseTab
                 RDMPCollectionCommonFunctionality.SetupColumnTracking(olv, newCol, $"Useful_{propertyInfo.Name}");
             }
         }
-
     }
 
     protected override void OnShown(EventArgs e)
@@ -328,12 +320,10 @@ protected override void OnShown(EventArgs e)
         tbFilter.SelectAll();
         tbFilter.Focus();
     }
+
     private void Olv_FormatCell(object sender, FormatCellEventArgs e)
     {
-        if(e.Column == olvHierarchy)
-        {
-            e.SubItem.ForeColor = Color.Gray;
-        }
+        if (e.Column == olvHierarchy) e.SubItem.ForeColor = Color.Gray;
     }
 
     private IconOverlayProvider provider = new();
@@ -367,15 +357,15 @@ private object GetHierarchy(object rowObject)
         if (rowObject is not IMapsDirectlyToDatabaseTable m)
             return null;
 
-        lock(oMatches)
+        lock (oMatches)
         {
             if (_searchables == null)
                 return null;
 
             if (_searchables.TryGetValue(m, out var searchable))
-            {
-                return searchable != null ? Regex.Replace(string.Join('\\', searchable.GetUsefulParents()), "\\\\+", "\\").Trim('\\') : null;
-            }
+                return searchable != null
+                    ? Regex.Replace(string.Join('\\', searchable.GetUsefulParents()), "\\\\+", "\\").Trim('\\')
+                    : null;
         }
 
         return null;
@@ -387,18 +377,16 @@ private void BuildToolStripForDatabaseObjects(RDMPCollection focusedCollection)
         _typeNames = new HashSet<string>(_types.Select(t => t.Name));
 
         foreach (var t in StartingEasyFilters.SelectMany(v => v.Value))
-        {
             if (!_typeNames.Contains(t.Name))
                 _typeNames.Add(t.Name);
-        }
         Type[] startingFilters = null;
 
-        if (focusedCollection != RDMPCollection.None && StartingEasyFilters.TryGetValue(focusedCollection, out var filter))
+        if (focusedCollection != RDMPCollection.None &&
+            StartingEasyFilters.TryGetValue(focusedCollection, out var filter))
             startingFilters = filter;
 
         // if there are at least 2 Types of object let them filter
-        if(_types.Length > 1)
-        {
+        if (_types.Length > 1)
             foreach (var t in EasyFilterTypesAndAssociatedCollections.Keys)
             {
                 var shortCode = SearchablesMatchScorer.ShortCodes.Single(kvp => kvp.Value == t).Key;
@@ -412,16 +400,14 @@ private void BuildToolStripForDatabaseObjects(RDMPCollection focusedCollection)
                     Text = $"{t.Name} ({shortCode})"
                 };
 
-                b.BackgroundImage = BackColorProvider.GetBackgroundImage(b.Size, EasyFilterTypesAndAssociatedCollections[t]);
+                b.BackgroundImage =
+                    BackColorProvider.GetBackgroundImage(b.Size, EasyFilterTypesAndAssociatedCollections[t]);
                 b.CheckedChanged += CollectionCheckedChanged;
 
                 toolStrip1.Items.Add(b);
             }
-        }
         else
-        {
             toolStripLabel1.Visible = false;
-        }
 
         toolStrip1.Items.Add(new ToolStripLabel("ID:"));
         toolStrip1.Items.Add(_lblId = new ToolStripTextBox());
@@ -429,11 +415,16 @@ private void BuildToolStripForDatabaseObjects(RDMPCollection focusedCollection)
 
         if (UserSettings.AdvancedFindFilters)
         {
-            AddUserSettingCheckbox(() => UserSettings.ShowInternalCatalogues, v => UserSettings.ShowInternalCatalogues = v, "I", "Include Internal");
-            AddUserSettingCheckbox(() => UserSettings.ShowDeprecatedCatalogues, v => UserSettings.ShowDeprecatedCatalogues = v, "D", "Include Deprecated");
-            AddUserSettingCheckbox(() => UserSettings.ShowColdStorageCatalogues, v => UserSettings.ShowColdStorageCatalogues = v, "C", "Include Cold Storage");
-            AddUserSettingCheckbox(() => UserSettings.ShowProjectSpecificCatalogues, v => UserSettings.ShowProjectSpecificCatalogues = v, "P", "Include Project Specific");
-            AddUserSettingCheckbox(() => UserSettings.ShowNonExtractableCatalogues, v => UserSettings.ShowNonExtractableCatalogues = v, "E", "Include Extractable");
+            AddUserSettingCheckbox(() => UserSettings.ShowInternalCatalogues,
+                v => UserSettings.ShowInternalCatalogues = v, "I", "Include Internal");
+            AddUserSettingCheckbox(() => UserSettings.ShowDeprecatedCatalogues,
+                v => UserSettings.ShowDeprecatedCatalogues = v, "D", "Include Deprecated");
+            AddUserSettingCheckbox(() => UserSettings.ShowColdStorageCatalogues,
+                v => UserSettings.ShowColdStorageCatalogues = v, "C", "Include Cold Storage");
+            AddUserSettingCheckbox(() => UserSettings.ShowProjectSpecificCatalogues,
+                v => UserSettings.ShowProjectSpecificCatalogues = v, "P", "Include Project Specific");
+            AddUserSettingCheckbox(() => UserSettings.ShowNonExtractableCatalogues,
+                v => UserSettings.ShowNonExtractableCatalogues = v, "E", "Include Extractable");
         }
     }
 
@@ -447,6 +438,7 @@ private void BtnKeypress(object sender, KeyPressEventArgs e)
             tbFilter.Focus();
         }
     }
+
     private void tbFilter_KeyUp(object sender, KeyEventArgs e)
     {
         if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down)
@@ -497,8 +489,8 @@ protected override void OnFormClosed(FormClosedEventArgs e)
 
         _isClosed = true;
         recentHistoryOfSearches?.AddResult(tbFilter.Text);
-
     }
+
     private void UpdateButtonEnabledness()
     {
         if (AllowMultiSelect)
@@ -528,15 +520,9 @@ private void FetchMatches(string text, CancellationToken cancellationToken)
             BumpMatches = _activator.HistoryProvider.History.Select(h => h.Object).ToList()
         };
 
-        if (_lblId != null && int.TryParse(_lblId.Text, out var requireId))
-        {
-            scorer.ID = requireId;
-        }
+        if (_lblId != null && int.TryParse(_lblId.Text, out var requireId)) scorer.ID = requireId;
 
-        if (AlwaysFilterOn != null)
-        {
-            showOnlyTypes = new List<Type>(new[] { AlwaysFilterOn });
-        }
+        if (AlwaysFilterOn != null) showOnlyTypes = new List<Type>(new[] { AlwaysFilterOn });
 
         var scores = scorer.ScoreMatches(_searchables, text, cancellationToken, showOnlyTypes);
 
@@ -576,12 +562,12 @@ private void listBox1_CellClick(object sender, CellClickEventArgs e)
             Close();
         }
     }
+
     private void listBox1_KeyUp(object sender, KeyEventArgs e)
     {
         if (e.KeyCode == Keys.Delete && _allowDeleting && olv.SelectedObject is IDeleteable deletable)
-        {
-            if (MessageBox.Show($"Confirm deleting {deletable}", "Really delete?", MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
-            {
+            if (MessageBox.Show($"Confirm deleting {deletable}", "Really delete?", MessageBoxButtons.YesNoCancel) ==
+                DialogResult.Yes)
                 try
                 {
                     deletable.DeleteInDatabase();
@@ -591,8 +577,6 @@ private void listBox1_KeyUp(object sender, KeyEventArgs e)
                 {
                     ExceptionViewer.Show(exception);
                 }
-            }
-        }
 
         if (e.KeyCode == Keys.Enter && olv.SelectedObject != null)
         {
@@ -600,7 +584,7 @@ private void listBox1_KeyUp(object sender, KeyEventArgs e)
             Selected = olv.SelectedObject as T ?? default;
 
             // if there are some multi selected items already
-            if(AllowMultiSelect && MultiSelected.Any())
+            if (AllowMultiSelect && MultiSelected.Any())
             {
                 // select only those
                 Close();
@@ -618,15 +602,12 @@ private void listBox1_KeyUp(object sender, KeyEventArgs e)
         if (e.KeyCode == Keys.Space && AllowMultiSelect && olv.SelectedObjects != null)
         {
             foreach (T o in olv.SelectedObjects)
-            {
                 if (MultiSelected.Contains(o))
                     MultiSelected.Remove(o);
                 else
                     MultiSelected.Add(o);
-            }
 
             UpdateButtonEnabledness();
-
         }
     }
 
@@ -650,10 +631,7 @@ private void CollectionCheckedChanged(object sender, EventArgs e)
         tbFilter_TextChanged(null, null);
     }
 
-    private static bool IsDatabaseObjects()
-    {
-        return typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(typeof(T));
-    }
+    private static bool IsDatabaseObjects() => typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(typeof(T));
 
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
@@ -676,11 +654,7 @@ private void tbFilter_TextChanged(object sender, EventArgs e)
             .ContinueWith(
                 s =>
                 {
-
-                    if(Interlocked.Decrement(ref _runCount) == 0)
-                    {
-                        pbLoading.Visible = false;
-                    }
+                    if (Interlocked.Decrement(ref _runCount) == 0) pbLoading.Visible = false;
 
                     if (_isClosed)
                         return;
@@ -693,27 +667,22 @@ private void tbFilter_TextChanged(object sender, EventArgs e)
                         if (_isClosed)
                             return;
 
-                        if(s.IsCompleted)
-                        {
+                        if (s.IsCompleted)
                             lock (oMatches)
                             {
                                 // updates the list
                                 _matches = _tempMatches;
                                 StateChanged();
                             }
-                        }
                     }
                     catch (ObjectDisposedException)
                     {
-
                     }
                 }, TaskScheduler.FromCurrentSynchronizationContext());
-
     }
 
     public void AddObjects(ICollection modelObjects)
     {
-
     }
 
     public object GetNthObject(int n)
@@ -738,7 +707,8 @@ public int GetObjectCount()
                         return 0;
 
                     // when returning search results always put checked items first
-                    var toDisplay = new List<IMapsDirectlyToDatabaseTable>(MultiSelected.Cast<IMapsDirectlyToDatabaseTable>());
+                    var toDisplay =
+                        new List<IMapsDirectlyToDatabaseTable>(MultiSelected.Cast<IMapsDirectlyToDatabaseTable>());
 
                     toDisplay.AddRange(_matches.Cast<IMapsDirectlyToDatabaseTable>().Except(toDisplay));
                     _objectsToDisplay = toDisplay.Cast<T>().ToList();
@@ -747,32 +717,28 @@ public int GetObjectCount()
                 {
                     var searchText = tbFilter.Text;
 
-                    _objectsToDisplay = string.IsNullOrWhiteSpace(searchText) ?
-                        _allObjects.ToList() :
-                        _allObjects.Where(o=> IsSimpleTextMatch(o, searchText)).ToList();
+                    _objectsToDisplay = string.IsNullOrWhiteSpace(searchText)
+                        ? _allObjects.ToList()
+                        : _allObjects.Where(o => IsSimpleTextMatch(o, searchText)).ToList();
                 }
 
                 stateChanged = false;
             }
 
-            return Math.Min(_objectsToDisplay.Count,MaxMatches);
+            return Math.Min(_objectsToDisplay.Count, MaxMatches);
         }
     }
 
     private static bool IsSimpleTextMatch(T arg, string searchText)
     {
-        var terms = searchText.Split(' ',StringSplitOptions.RemoveEmptyEntries);
-        return terms.All(t=>arg.ToString().Contains(t,StringComparison.CurrentCultureIgnoreCase));
+        var terms = searchText.Split(' ', StringSplitOptions.RemoveEmptyEntries);
+        return terms.All(t => arg.ToString().Contains(t, StringComparison.CurrentCultureIgnoreCase));
     }
 
-    public int GetObjectIndex(object model)
-    {
-        return _objectsToDisplay.IndexOf((T)model);
-    }
+    public int GetObjectIndex(object model) => _objectsToDisplay.IndexOf((T)model);
 
     public void InsertObjects(int index, ICollection modelObjects)
     {
-
     }
 
     public void PrepareCache(int first, int last)
@@ -783,11 +749,9 @@ public void RemoveObjects(ICollection modelObjects)
     {
     }
 
-    public int SearchText(string value, int first, int last, OLVColumn column)
-    {
+    public int SearchText(string value, int first, int last, OLVColumn column) =>
         // TODO: figure this out
-        return 0;
-    }
+        0;
 
     public void SetObjects(IEnumerable collection)
     {
@@ -799,8 +763,8 @@ public void Sort(OLVColumn column, SortOrder order)
 
     public void UpdateObject(int index, object modelObject)
     {
-
     }
+
     private void AddUserSettingCheckbox(Func<bool> getter, Action<bool> setter, string name, string toolTip)
     {
         var b = new ToolStripButton(name)
@@ -820,6 +784,7 @@ private void AddUserSettingCheckbox(Func<bool> getter, Action<bool> setter, stri
 
         toolStrip1.Items.Add(b);
     }
+
     private void btnSelect_Click(object sender, EventArgs e)
     {
         if (!AllowMultiSelect)
@@ -844,9 +809,10 @@ private void btnCancel_Click(object sender, EventArgs e)
         DialogResult = DialogResult.Cancel;
         Close();
     }
+
     public void SetInitialSelection(IEnumerable<T> toSelect)
     {
         MultiSelected = new HashSet<T>(toSelect);
-        tbFilter_TextChanged(null,null);
+        tbFilter_TextChanged(null, null);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ServerDatabaseTableSelectorDialog.cs b/Rdmp.UI/SimpleDialogs/ServerDatabaseTableSelectorDialog.cs
index 215b0dbb3a..714dc29287 100644
--- a/Rdmp.UI/SimpleDialogs/ServerDatabaseTableSelectorDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/ServerDatabaseTableSelectorDialog.cs
@@ -18,16 +18,17 @@ namespace Rdmp.UI.SimpleDialogs;
 /// </summary>
 public partial class ServerDatabaseTableSelectorDialog : Form
 {
-    public ServerDatabaseTableSelectorDialog(string taskDescription, bool includeTable, bool tableShouldBeNovel, IBasicActivateItems activator)
+    public ServerDatabaseTableSelectorDialog(string taskDescription, bool includeTable, bool tableShouldBeNovel,
+        IBasicActivateItems activator)
     {
         //start at cancel so if they hit the X nothing is selected
         DialogResult = DialogResult.Cancel;
-            
+
         InitializeComponent();
 
         lblTaskDescription.Text = taskDescription;
-            
-        if(!includeTable)
+
+        if (!includeTable)
             serverDatabaseTableSelector1.HideTableComponents();
 
         serverDatabaseTableSelector1.TableShouldBeNovel = tableShouldBeNovel;
@@ -37,7 +38,9 @@ public ServerDatabaseTableSelectorDialog(string taskDescription, bool includeTab
     public DiscoveredDatabase SelectedDatabase => serverDatabaseTableSelector1.GetDiscoveredDatabase();
     public DiscoveredTable SelectedTable => serverDatabaseTableSelector1.GetDiscoveredTable();
 
-    public bool AllowTableValuedFunctionSelection { get => serverDatabaseTableSelector1.AllowTableValuedFunctionSelection;
+    public bool AllowTableValuedFunctionSelection
+    {
+        get => serverDatabaseTableSelector1.AllowTableValuedFunctionSelection;
         set => serverDatabaseTableSelector1.AllowTableValuedFunctionSelection = value;
     }
 
@@ -59,7 +62,7 @@ private void btnCreate_Click(object sender, EventArgs e)
         {
             var db = serverDatabaseTableSelector1.GetDiscoveredDatabase();
 
-            if(db == null)
+            if (db == null)
             {
                 MessageBox.Show("You must specify a database name");
                 return;
diff --git a/Rdmp.UI/SimpleDialogs/ShowSQLUI.cs b/Rdmp.UI/SimpleDialogs/ShowSQLUI.cs
index 4d761fa87a..d0949b7c7b 100644
--- a/Rdmp.UI/SimpleDialogs/ShowSQLUI.cs
+++ b/Rdmp.UI/SimpleDialogs/ShowSQLUI.cs
@@ -16,7 +16,6 @@ namespace Rdmp.UI.SimpleDialogs;
 /// </summary>
 public partial class ShowSQLUI : Form
 {
-
     private ScintillaNET.Scintilla QueryEditor;
     private bool _designMode;
 
@@ -35,6 +34,5 @@ public ShowSQLUI(string sql, bool isReadOnly = false)
         QueryEditor.ReadOnly = isReadOnly;
 
         Controls.Add(QueryEditor);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs
index 181a1d5a3f..e312795f88 100644
--- a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs
+++ b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI.cs
@@ -50,7 +50,8 @@ public partial class CreateNewCatalogueByImportingFileUI : RDMPForm
     public HelpWorkflow HelpWorkflow { get; set; }
     public string TargetFolder { get; set; }
 
-    public CreateNewCatalogueByImportingFileUI(IActivateItems activator, ExecuteCommandCreateNewCatalogueByImportingFile command):base(activator)
+    public CreateNewCatalogueByImportingFileUI(IActivateItems activator,
+        ExecuteCommandCreateNewCatalogueByImportingFile command) : base(activator)
     {
         _command = command;
         InitializeComponent();
@@ -60,7 +61,7 @@ public CreateNewCatalogueByImportingFileUI(IActivateItems activator, ExecuteComm
         serverDatabaseTableSelector1.SelectionChanged += serverDatabaseTableSelector1_SelectionChanged;
         serverDatabaseTableSelector1.SetItemActivator(activator);
         SetupState(State.SelectFile);
-            
+
         if (command.File != null)
             SelectFile(command.File);
 
@@ -85,8 +86,9 @@ private void BuildHelpFlow()
                                                   "A Table with the same name will be created in the database selected above.\r\n" +
                                                   "Please note that the chosen pipeline can alter the created Table name. If a table with the same name already exists " +
                                                   "in the selected Database, the execution may fail.");
-        var pickPipeline = new HelpStage(gbPickPipeline, "4. Select the pipeline to execute in order to transfer the data from the files into the DB.\r\n" +
-                                                         "If you are not sure, ask the admin which one to use.");
+        var pickPipeline = new HelpStage(gbPickPipeline,
+            "4. Select the pipeline to execute in order to transfer the data from the files into the DB.\r\n" +
+            "If you are not sure, ask the admin which one to use.");
         var execute = new HelpStage(gbExecute, "5. Click Preview to peek at what data is in the selected file.\r\n" +
                                                "Click Execute to run the process and import your file.");
 
@@ -96,7 +98,7 @@ private void BuildHelpFlow()
         pickPipeline.SetOption(">>", execute);
         execute.SetOption("|<<", pickFile);
         //stage4.SetOption("next...", stage2);
-            
+
         HelpWorkflow.RootStage = pickFile;
     }
 
@@ -220,12 +222,14 @@ private void IdentifyCompatibleServers()
                 SetupState(State.DatabaseSelected);
             }
             else
+            {
                 serverDatabaseTableSelector1.SetExplicitServer(s.ServerName);
+            }
         }
-        else if(servers.Length > 1)
+        else if (servers.Length > 1)
         {
             serverDatabaseTableSelector1.SetDefaultServers(
-                servers.Select(s=>s.ServerName).ToArray()
+                servers.Select(s => s.ServerName).ToArray()
             );
         }
     }
@@ -244,25 +248,18 @@ private void IdentifyCompatiblePipelines()
         _context.MustHaveDestination = typeof(DataTableUploadDestination);
 
         if (cbOther.Checked)
-        {
             _context.MustHaveSource = typeof(IDataFlowSource<DataTable>);
-        }
-        else
-        if (_selectedFile.Extension == ".csv" || _selectedFile.Extension == ".txt")
-        {
+        else if (_selectedFile.Extension == ".csv" || _selectedFile.Extension == ".txt")
             _context.MustHaveSource = typeof(DelimitedFlatFileDataFlowSource);
-        }
-        else
-        if (_selectedFile.Extension.StartsWith(".xls"))
-        {
-            _context.MustHaveSource = typeof(ExcelDataFlowSource);
-        }
+        else if (_selectedFile.Extension.StartsWith(".xls")) _context.MustHaveSource = typeof(ExcelDataFlowSource);
 
-        var compatiblePipelines = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>().Where(_context.IsAllowable).ToArray();
+        var compatiblePipelines = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>()
+            .Where(_context.IsAllowable).ToArray();
 
         if (compatiblePipelines.Length == 0)
         {
-            ragSmileyFile.OnCheckPerformed(new CheckEventArgs("No Pipelines are compatible with the selected file",CheckResult.Fail));
+            ragSmileyFile.OnCheckPerformed(new CheckEventArgs("No Pipelines are compatible with the selected file",
+                CheckResult.Fail));
             return;
         }
 
@@ -279,16 +276,16 @@ private enum State
 
     private void ddPipeline_SelectedIndexChanged(object sender, EventArgs e)
     {
-
         var factory = GetFactory();
 
-        if(ddPipeline.SelectedItem is not Pipeline p)
+        if (ddPipeline.SelectedItem is not Pipeline p)
             return;
         try
         {
             var source = DataFlowPipelineEngineFactory.CreateSourceIfExists(p);
-            ((IPipelineRequirement<FlatFileToLoad>)source).PreInitialize(new FlatFileToLoad(_selectedFile),new FromCheckNotifierToDataLoadEventListener(ragSmileyFile));
-            ((ICheckable) source).Check(ragSmileyFile);
+            ((IPipelineRequirement<FlatFileToLoad>)source).PreInitialize(new FlatFileToLoad(_selectedFile),
+                new FromCheckNotifierToDataLoadEventListener(ragSmileyFile));
+            ((ICheckable)source).Check(ragSmileyFile);
         }
         catch (Exception exception)
         {
@@ -303,13 +300,16 @@ private void btnConfirmDatabase_Click(object sender, EventArgs e)
         var db = serverDatabaseTableSelector1.GetDiscoveredDatabase();
 
         if (db == null)
+        {
             MessageBox.Show("You must select a Database");
-        else
-        if(db.Exists())
+        }
+        else if (db.Exists())
+        {
             SetupState(State.DatabaseSelected);
+        }
         else
         {
-            if(Activator.YesNo($"Create Database '{db.GetRuntimeName()}'","Create Database"))
+            if (Activator.YesNo($"Create Database '{db.GetRuntimeName()}'", "Create Database"))
             {
                 db.Server.CreateDatabase(db.GetRuntimeName());
                 SetupState(State.DatabaseSelected);
@@ -327,28 +327,25 @@ private void btnPreview_Click(object sender, EventArgs e)
 
         var source = (IDataFlowSource<DataTable>)DataFlowPipelineEngineFactory.CreateSourceIfExists(p);
 
-        ((IPipelineRequirement<FlatFileToLoad>)source).PreInitialize(new FlatFileToLoad(_selectedFile), new FromCheckNotifierToDataLoadEventListener(ragSmileyFile));
-            
+        ((IPipelineRequirement<FlatFileToLoad>)source).PreInitialize(new FlatFileToLoad(_selectedFile),
+            new FromCheckNotifierToDataLoadEventListener(ragSmileyFile));
+
         Cursor.Current = Cursors.WaitCursor;
         var preview = source.TryGetPreview();
         Cursor.Current = Cursors.Default;
 
-        if(preview != null)
+        if (preview != null)
         {
-            var dtv = new DataTableViewerUI(preview,"Preview");
+            var dtv = new DataTableViewerUI(preview, "Preview");
             SingleControlForm.ShowDialog(dtv);
         }
     }
 
-    private UploadFileUseCase GetUseCase()
-    {
-        return new UploadFileUseCase(_selectedFile, serverDatabaseTableSelector1.GetDiscoveredDatabase(),Activator);
-    }
+    private UploadFileUseCase GetUseCase() =>
+        new(_selectedFile, serverDatabaseTableSelector1.GetDiscoveredDatabase(), Activator);
 
-    private DataFlowPipelineEngineFactory GetFactory()
-    {
-        return new DataFlowPipelineEngineFactory(GetUseCase(), Activator.RepositoryLocator.CatalogueRepository.MEF);
-    }
+    private DataFlowPipelineEngineFactory GetFactory() =>
+        new(GetUseCase(), Activator.RepositoryLocator.CatalogueRepository.MEF);
 
     private void btnExecute_Click(object sender, EventArgs e)
     {
@@ -357,8 +354,8 @@ private void btnExecute_Click(object sender, EventArgs e)
             MessageBox.Show("No Pipeline Selected");
             return;
         }
-            
-        if(string.IsNullOrWhiteSpace(tbTableName.Text))
+
+        if (string.IsNullOrWhiteSpace(tbTableName.Text))
         {
             MessageBox.Show("Enter Catalogue name");
             return;
@@ -369,15 +366,15 @@ private void btnExecute_Click(object sender, EventArgs e)
         {
             var db = serverDatabaseTableSelector1.GetDiscoveredDatabase();
             var engine = GetFactory().Create(p, new FromCheckNotifierToDataLoadEventListener(ragSmileyExecute));
-            engine.Initialize(new FlatFileToLoad(_selectedFile), db,Activator);
+            engine.Initialize(new FlatFileToLoad(_selectedFile), db, Activator);
 
             var crashed = false;
 
-            var dest = (DataTableUploadDestination) engine.DestinationObject;
+            var dest = (DataTableUploadDestination)engine.DestinationObject;
             dest.TableNamerDelegate = () => tbTableName.Text;
 
             var cts = new CancellationTokenSource();
-            var t =Task.Run(() =>
+            var t = Task.Run(() =>
                 {
                     try
                     {
@@ -385,14 +382,14 @@ private void btnExecute_Click(object sender, EventArgs e)
                     }
                     catch (PipelineCrashedException ex)
                     {
-                        Activator.ShowException("Error uploading",ex.InnerException ?? ex);
+                        Activator.ShowException("Error uploading", ex.InnerException ?? ex);
                         if (dest.CreatedTable)
                             ConfirmTableDeletion(db.ExpectTable(dest.TargetTableName));
                         crashed = true;
                     }
                     catch (Exception ex)
                     {
-                        Activator.ShowException("Error uploading",ex);
+                        Activator.ShowException("Error uploading", ex);
                         if (dest.CreatedTable)
                             ConfirmTableDeletion(db.ExpectTable(dest.TargetTableName));
                         crashed = true;
@@ -400,15 +397,15 @@ private void btnExecute_Click(object sender, EventArgs e)
                 }
             );
 
-            Activator.Wait("Uploading Table...",t,cts);
+            Activator.Wait("Uploading Table...", t, cts);
 
-            if(crashed)
+            if (crashed)
                 return;
 
             if (t.IsFaulted)
-                throw t.Exception?? new Exception("Task Failed");
+                throw t.Exception ?? new Exception("Task Failed");
 
-            if(t.IsCanceled || cts.IsCancellationRequested)
+            if (t.IsCanceled || cts.IsCancellationRequested)
                 return;
 
             ForwardEngineer(db.ExpectTable(dest.TargetTableName));
@@ -433,7 +430,8 @@ private static void ConfirmTableDeletion(DiscoveredTable expectTable)
 
     private void ForwardEngineer(DiscoveredTable targetTableName)
     {
-        var extractionPicker = new ConfigureCatalogueExtractabilityUI(Activator, new TableInfoImporter(Activator.RepositoryLocator.CatalogueRepository, targetTableName),
+        var extractionPicker = new ConfigureCatalogueExtractabilityUI(Activator,
+            new TableInfoImporter(Activator.RepositoryLocator.CatalogueRepository, targetTableName),
             $"File '{_selectedFile.FullName}'", _projectSpecific)
         {
             TargetFolder = TargetFolder,
@@ -450,17 +448,18 @@ private void ForwardEngineer(DiscoveredTable targetTableName)
                 $"Successfully imported new Dataset '{catalogue}'.\r\nThe edit functionality will now open.");
 
             Activator.WindowArranger.SetupEditAnything(this, catalogue);
-
         }
+
         if (cbAutoClose.Checked)
             Close();
         else
-            MessageBox.Show("Creation completed successfully, close the Form when you are finished reviewing the output");
+            MessageBox.Show(
+                "Creation completed successfully, close the Form when you are finished reviewing the output");
     }
 
     private void pbHelp_Click(object sender, EventArgs e)
     {
-        HelpWorkflow.Start(force: true);
+        HelpWorkflow.Start(true);
     }
 
     public void SetProjectSpecific(IProject project)
@@ -470,10 +469,12 @@ public void SetProjectSpecific(IProject project)
 
     private void tbTableName_TextChanged(object sender, EventArgs e)
     {
-        if(!string.IsNullOrWhiteSpace(tbTableName.Text))
+        if (!string.IsNullOrWhiteSpace(tbTableName.Text))
             //if the sane name doesn't match the
             tbTableName.ForeColor = !tbTableName.Text.Equals(QuerySyntaxHelper.MakeHeaderNameSensible(tbTableName.Text),
-                StringComparison.CurrentCultureIgnoreCase) ? Color.Red : Color.Black;
+                StringComparison.CurrentCultureIgnoreCase)
+                ? Color.Red
+                : Color.Black;
     }
 
     private void cbOther_CheckedChanged(object sender, EventArgs e)
diff --git a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI_Advanced.cs b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI_Advanced.cs
index ccf9867594..cf581b735f 100644
--- a/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI_Advanced.cs
+++ b/Rdmp.UI/SimpleDialogs/SimpleFileImporting/CreateNewCatalogueByImportingFileUI_Advanced.cs
@@ -43,7 +43,8 @@ public partial class CreateNewCatalogueByImportingFileUI_Advanced : UserControl
 
     public ICatalogue CatalogueCreatedIfAny { get; private set; }
 
-    public CreateNewCatalogueByImportingFileUI_Advanced(IActivateItems activator,DiscoveredDatabase database,FileInfo file, bool alsoForwardEngineerCatalogue,Project projectSpecific)
+    public CreateNewCatalogueByImportingFileUI_Advanced(IActivateItems activator, DiscoveredDatabase database,
+        FileInfo file, bool alsoForwardEngineerCatalogue, Project projectSpecific)
     {
         _repositoryLocator = activator.RepositoryLocator;
         _activator = activator;
@@ -52,10 +53,10 @@ public CreateNewCatalogueByImportingFileUI_Advanced(IActivateItems activator,Dis
         _projectSpecific = projectSpecific;
 
         InitializeComponent();
-            
+
         configureAndExecutePipeline1 = new ConfigureAndExecutePipelineUI(
             ExecuteCommandCreateNewCatalogueByImportingFile.GetCreateCatalogueFromFileDialogArgs()
-            ,new UploadFileUseCase(file,database,activator),activator);
+            , new UploadFileUseCase(file, database, activator), activator);
         _file = file;
         // 
         // configureAndExecutePipeline1
@@ -67,12 +68,13 @@ public CreateNewCatalogueByImportingFileUI_Advanced(IActivateItems activator,Dis
         configureAndExecutePipeline1.TabIndex = 14;
         Controls.Add(configureAndExecutePipeline1);
 
-        configureAndExecutePipeline1.PipelineExecutionFinishedsuccessfully += ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully;
-
+        configureAndExecutePipeline1.PipelineExecutionFinishedsuccessfully +=
+            ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully;
     }
 
 
-    private void ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully(object sender, PipelineEngineEventArgs args)
+    private void ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully(object sender,
+        PipelineEngineEventArgs args)
     {
         //pipeline executed successfully
         if (_alsoForwardEngineerCatalogue)
@@ -85,7 +87,8 @@ private void ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully
                 targetTable = dest.TargetTableName;
                 var table = _database.ExpectTable(targetTable);
 
-                var ui = new ConfigureCatalogueExtractabilityUI(_activator, new TableInfoImporter(_repositoryLocator.CatalogueRepository, table),
+                var ui = new ConfigureCatalogueExtractabilityUI(_activator,
+                    new TableInfoImporter(_repositoryLocator.CatalogueRepository, table),
                     $"File '{_file.FullName}'", _projectSpecific);
                 ui.ShowDialog();
 
@@ -100,7 +103,8 @@ private void ConfigureAndExecutePipeline1OnPipelineExecutionFinishedsuccessfully
             catch (Exception e)
             {
                 ExceptionViewer.Show(
-                    $"Failed to import TableInfo/Forward Engineer Catalogue from {_database}(Table was {targetTable ?? "Null!"}) - see Exception for details", e);
+                    $"Failed to import TableInfo/Forward Engineer Catalogue from {_database}(Table was {targetTable ?? "Null!"}) - see Exception for details",
+                    e);
             }
         }
     }
diff --git a/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLBeforeAndAfterViewer.cs b/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLBeforeAndAfterViewer.cs
index 14b765e6c5..7c8dd0ae17 100644
--- a/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLBeforeAndAfterViewer.cs
+++ b/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLBeforeAndAfterViewer.cs
@@ -25,7 +25,9 @@ public partial class SQLBeforeAndAfterViewer : Form
     private Scintilla QueryEditorAfter;
 
 
-    public SQLBeforeAndAfterViewer(string sqlBefore, string sqlAfter, string headerTextForBefore, string headerTextForAfter, string caption, MessageBoxButtons buttons, SyntaxLanguage language = SyntaxLanguage.SQL)
+    public SQLBeforeAndAfterViewer(string sqlBefore, string sqlAfter, string headerTextForBefore,
+        string headerTextForAfter, string caption, MessageBoxButtons buttons,
+        SyntaxLanguage language = SyntaxLanguage.SQL)
     {
         InitializeComponent();
 
@@ -52,7 +54,7 @@ public SQLBeforeAndAfterViewer(string sqlBefore, string sqlAfter, string headerT
         var highlighter = new ScintillaLineHighlightingHelper();
         ScintillaLineHighlightingHelper.ClearAll(QueryEditorAfter);
         ScintillaLineHighlightingHelper.ClearAll(QueryEditorBefore);
-            
+
         sqlBefore ??= "";
         sqlAfter ??= "";
 
@@ -60,12 +62,11 @@ public SQLBeforeAndAfterViewer(string sqlBefore, string sqlAfter, string headerT
 
         foreach (var item in Diff.DiffText(sqlBefore, sqlAfter))
         {
-            for (var i = item.StartA; i < item.StartA+item.deletedA; i++)
-                ScintillaLineHighlightingHelper.HighlightLine(QueryEditorBefore,i,Color.Pink);
-                    
-            for (var i = item.StartB; i < item.StartB+item.insertedB; i++)
+            for (var i = item.StartA; i < item.StartA + item.deletedA; i++)
+                ScintillaLineHighlightingHelper.HighlightLine(QueryEditorBefore, i, Color.Pink);
+
+            for (var i = item.StartB; i < item.StartB + item.insertedB; i++)
                 ScintillaLineHighlightingHelper.HighlightLine(QueryEditorAfter, i, Color.LawnGreen);
-                
         }
 
         switch (buttons)
@@ -88,7 +89,7 @@ public SQLBeforeAndAfterViewer(string sqlBefore, string sqlAfter, string headerT
 
         Text = caption;
     }
-        
+
     private void btnYes_Click(object sender, EventArgs e)
     {
         DialogResult = DialogResult.Yes;
@@ -100,6 +101,4 @@ private void btnNo_Click(object sender, EventArgs e)
         DialogResult = DialogResult.No;
         Close();
     }
-
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLPreviewWindow.cs b/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLPreviewWindow.cs
index 5740d0e263..43adc3b682 100644
--- a/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLPreviewWindow.cs
+++ b/Rdmp.UI/SimpleDialogs/SqlDialogs/SQLPreviewWindow.cs
@@ -52,13 +52,13 @@ private void btnOk_Click(object sender, EventArgs e)
 
     private void btnCancel_Click(object sender, EventArgs e)
     {
-        DialogResult=DialogResult.Cancel;
+        DialogResult = DialogResult.Cancel;
         Close();
     }
 
-    public static DialogResult Show(string title,string message, string sql)
+    public static DialogResult Show(string title, string message, string sql)
     {
-        var dialog = new SQLPreviewWindow(title,message, sql);
+        var dialog = new SQLPreviewWindow(title, message, sql);
         dialog.ShowDialog();
 
         return dialog.DialogResult;
diff --git a/Rdmp.UI/SimpleDialogs/SqlDialogs/SetSQLDialog.cs b/Rdmp.UI/SimpleDialogs/SqlDialogs/SetSQLDialog.cs
index afc3e6918a..7b482d3362 100644
--- a/Rdmp.UI/SimpleDialogs/SqlDialogs/SetSQLDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/SqlDialogs/SetSQLDialog.cs
@@ -18,7 +18,7 @@ namespace Rdmp.UI.SimpleDialogs.SqlDialogs;
 /// caller will store/use somehow.
 /// </summary>
 public partial class SetSQLDialog : Form
-{   
+{
     public Scintilla QueryEditor;
     private bool _designMode;
 
@@ -27,7 +27,7 @@ public partial class SetSQLDialog : Form
     public SetSQLDialog(string originalSQL, ICombineableFactory commandFactory)
     {
         InitializeComponent();
-            
+
         _designMode = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
 
         if (_designMode) //don't add the QueryEditor if we are in design time (visual studio) because it breaks
@@ -35,14 +35,12 @@ public SetSQLDialog(string originalSQL, ICombineableFactory commandFactory)
 
         QueryEditor = new ScintillaTextEditorFactory().Create(commandFactory);
         QueryEditor.Text = originalSQL;
-            
+
         panel1.Controls.Add(QueryEditor);
-        
     }
 
     private void button1_Click(object sender, EventArgs e)
     {
-
         DialogResult = DialogResult.OK;
         Close();
     }
diff --git a/Rdmp.UI/SimpleDialogs/SupportingDocumentUI.cs b/Rdmp.UI/SimpleDialogs/SupportingDocumentUI.cs
index 5d2c2985af..19e74aaf09 100644
--- a/Rdmp.UI/SimpleDialogs/SupportingDocumentUI.cs
+++ b/Rdmp.UI/SimpleDialogs/SupportingDocumentUI.cs
@@ -48,7 +48,7 @@ public SupportingDocumentUI()
 
     public override void SetDatabaseObject(IActivateItems activator, SupportingDocument databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
 
         _supportingDocument = databaseObject;
 
@@ -58,7 +58,6 @@ public override void SetDatabaseObject(IActivateItems activator, SupportingDocum
 
         CommonFunctionality.AddHelp(cbExtractable, "SupportingDocument.Extractable");
         CommonFunctionality.AddHelp(cbIsGlobal, "SupportingSqlTable.IsGlobal");
-
     }
 
     public override void SetItemActivator(IActivateItems activator)
@@ -71,11 +70,11 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Suppor
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text", "ID",s=>s.ID);
-        Bind(tbDescription,"Text","Description",s=>s.Description);
-        Bind(tbName,"Text","Name",s=>s.Name);
-        Bind(cbExtractable,"Checked","Extractable", s=>s.Extractable);
-        Bind(cbIsGlobal,"Checked","IsGlobal",s=>s.IsGlobal);
+        Bind(tbID, "Text", "ID", s => s.ID);
+        Bind(tbDescription, "Text", "Description", s => s.Description);
+        Bind(tbName, "Text", "Name", s => s.Name);
+        Bind(cbExtractable, "Checked", "Extractable", s => s.Extractable);
+        Bind(cbIsGlobal, "Checked", "IsGlobal", s => s.IsGlobal);
     }
 
     private void tbUrl_TextChanged(object sender, EventArgs e)
@@ -96,7 +95,7 @@ private void btnOpen_Click(object sender, EventArgs e)
         }
     }
 
-    private static void SetUriPropertyOn( TextBox tb,string propertyToSet,object toSetOn)
+    private static void SetUriPropertyOn(TextBox tb, string propertyToSet, object toSetOn)
     {
         if (toSetOn == null) return;
         try
@@ -131,11 +130,9 @@ private void btnBrowse_Click(object sender, EventArgs e)
         if (ofd.ShowDialog() == DialogResult.OK)
             tbUrl.Text = ofd.FileName;
     }
-
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<SupportingDocumentUI_Design, UserControl>))]
 public abstract class SupportingDocumentUI_Design : RDMPSingleDatabaseObjectControl<SupportingDocument>
 {
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/SupportingSQLTableUI.cs b/Rdmp.UI/SimpleDialogs/SupportingSQLTableUI.cs
index 4d02f4f376..3c7021a915 100644
--- a/Rdmp.UI/SimpleDialogs/SupportingSQLTableUI.cs
+++ b/Rdmp.UI/SimpleDialogs/SupportingSQLTableUI.cs
@@ -18,7 +18,6 @@
 using Rdmp.UI.ScintillaHelper;
 using Rdmp.UI.SimpleControls;
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
-
 using ScintillaNET;
 
 namespace Rdmp.UI.SimpleDialogs;
@@ -51,6 +50,7 @@ public SupportingSQLTableUI()
         InitializeComponent();
 
         #region Query Editor setup
+
         if (VisualStudioDesignMode)
             return;
 
@@ -59,6 +59,7 @@ public SupportingSQLTableUI()
         QueryPreview.TextChanged += new EventHandler(QueryPreview_TextChanged);
 
         pSQL.Controls.Add(QueryPreview);
+
         #endregion
 
         tcTicket.TicketTextChanged += TcTicketOnTicketTextChanged;
@@ -68,7 +69,7 @@ public SupportingSQLTableUI()
 
     public override void SetDatabaseObject(IActivateItems activator, SupportingSQLTable databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         _supportingSQLTable = databaseObject;
 
         _bLoading = true;
@@ -94,11 +95,11 @@ protected override void SetBindings(BinderWithErrorProviderFactory rules, Suppor
     {
         base.SetBindings(rules, databaseObject);
 
-        Bind(tbID,"Text","ID",s=>s.ID);
-        Bind(tbName,"Text","Name",s=>s.Name);
-        Bind(tbDescription,"Text","Description",s=>s.Description);
-        Bind(cbExtractable,"Checked","Extractable",s=>s.Extractable);
-        Bind(cbGlobal,"Checked","IsGlobal",s=>s.IsGlobal);
+        Bind(tbID, "Text", "ID", s => s.ID);
+        Bind(tbName, "Text", "Name", s => s.Name);
+        Bind(tbDescription, "Text", "Description", s => s.Description);
+        Bind(cbExtractable, "Checked", "Extractable", s => s.Extractable);
+        Bind(cbGlobal, "Checked", "IsGlobal", s => s.IsGlobal);
     }
 
     public override void SetItemActivator(IActivateItems activator)
@@ -112,7 +113,8 @@ private void RefreshUIFromDatabase()
     {
         ddExternalServers.Items.Clear();
         ddExternalServers.Items.Add(NoExternalServer);
-        ddExternalServers.Items.AddRange(_supportingSQLTable.Repository.GetAllObjects<ExternalDatabaseServer>().ToArray());
+        ddExternalServers.Items.AddRange(_supportingSQLTable.Repository.GetAllObjects<ExternalDatabaseServer>()
+            .ToArray());
 
         if (_supportingSQLTable != null)
             ddExternalServers.SelectedItem = _supportingSQLTable.ExternalDatabaseServer;
@@ -128,13 +130,15 @@ private void QueryPreview_TextChanged(object sender, EventArgs e)
 
     private void cbGlobal_CheckedChanged(object sender, EventArgs e)
     {
-        if(_bLoading)
+        if (_bLoading)
             return;
 
         if (_supportingSQLTable != null)
         {
             if (cbGlobal.Checked)
+            {
                 _supportingSQLTable.IsGlobal = true;
+            }
             else
             {
                 if (
@@ -145,20 +149,19 @@ private void cbGlobal_CheckedChanged(object sender, EventArgs e)
                 else
                     cbGlobal.Checked = true;
             }
-
         }
     }
 
     private void tbDescription_KeyPress(object sender, KeyPressEventArgs e)
     {
         //apparently that is S when the control key is held down
-        if(e.KeyChar == 19 && ModifierKeys == Keys.Control)
+        if (e.KeyChar == 19 && ModifierKeys == Keys.Control)
             e.Handled = true;
     }
 
     private void ddExternalServers_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(_supportingSQLTable == null)
+        if (_supportingSQLTable == null)
             return;
 
         //user selected NONE
@@ -184,6 +187,6 @@ private void btnAdd_Click(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<SupportingSQLTableUI_Design, UserControl>))]
-public abstract class SupportingSQLTableUI_Design:RDMPSingleDatabaseObjectControl<SupportingSQLTable>
+public abstract class SupportingSQLTableUI_Design : RDMPSingleDatabaseObjectControl<SupportingSQLTable>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/TaskDescriptionLabel.cs b/Rdmp.UI/SimpleDialogs/TaskDescriptionLabel.cs
index 951e2cf3d2..e038de1b1e 100644
--- a/Rdmp.UI/SimpleDialogs/TaskDescriptionLabel.cs
+++ b/Rdmp.UI/SimpleDialogs/TaskDescriptionLabel.cs
@@ -16,6 +16,7 @@ public partial class TaskDescriptionLabel : UserControl
 {
     private Color _backColour;
     private Color _foreColour;
+
     public TaskDescriptionLabel()
     {
         InitializeComponent();
@@ -25,7 +26,7 @@ public void SetupFor(DialogArgs args)
     {
         var task = args.TaskDescription;
         var entryLabel = args.EntryLabel;
-            
+
 
         tbTaskDescription.Visible = pnlTaskDescription.Visible = !string.IsNullOrWhiteSpace(task);
         tbTaskDescription.Text = task;
@@ -38,8 +39,8 @@ public void SetupFor(DialogArgs args)
         // set prompt text. If theres a TaskDescription too then leave a bit of extra space
         tbEntryLabel.Text = entryLabel;
 
-        Height = (!string.IsNullOrWhiteSpace(entryLabel) ? tbEntryLabel.Height : 0) + 
-                      (!string.IsNullOrWhiteSpace(task) ? tbTaskDescription.Height : 0);
+        Height = (!string.IsNullOrWhiteSpace(entryLabel) ? tbEntryLabel.Height : 0) +
+                 (!string.IsNullOrWhiteSpace(task) ? tbTaskDescription.Height : 0);
 
         //Switch style based on args.DesciptionSeverity
         switch (args.DesciptionSeverity)
@@ -68,6 +69,7 @@ public void SetupFor(DialogArgs args)
     /// Returns the width this control would ideally like to take up
     /// </summary>
     public int PreferredWidth => Math.Max(tbEntryLabel.Width, tbTaskDescription.Width);
+
     public int PreferredHeight => Height;
 
     private void textBox1_Resize(object sender, EventArgs e)
diff --git a/Rdmp.UI/SimpleDialogs/TypeTextOrCancelDialog.cs b/Rdmp.UI/SimpleDialogs/TypeTextOrCancelDialog.cs
index 4afa524caa..2a2023b4a8 100644
--- a/Rdmp.UI/SimpleDialogs/TypeTextOrCancelDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/TypeTextOrCancelDialog.cs
@@ -29,21 +29,22 @@ public partial class TypeTextOrCancelDialog : Form
     /// <summary>
     /// True to require that text typed be sane for usage as a column name, table name etc e.g. "bob" but not "bob::bbbbb".
     /// </summary>
-    public bool RequireSaneHeaderText{get;set; }
+    public bool RequireSaneHeaderText { get; set; }
 
     //"Column Name","Enter name for column (this should NOT include any qualifiers e.g. database name)", 300);
 
-    public TypeTextOrCancelDialog(string title, string prompt, int maxCharacters, string startingTextForInputBox = null, bool allowBlankText = false, bool multiLine = false)
+    public TypeTextOrCancelDialog(string title, string prompt, int maxCharacters, string startingTextForInputBox = null,
+        bool allowBlankText = false, bool multiLine = false)
         : this(new DialogArgs
         {
             WindowTitle = title,
             EntryLabel = prompt
-        },maxCharacters,startingTextForInputBox,allowBlankText,multiLine)
+        }, maxCharacters, startingTextForInputBox, allowBlankText, multiLine)
     {
-            
     }
 
-    public TypeTextOrCancelDialog(DialogArgs args, int maxCharacters, string startingTextForInputBox = null, bool allowBlankText = false, bool multiLine = false)
+    public TypeTextOrCancelDialog(DialogArgs args, int maxCharacters, string startingTextForInputBox = null,
+        bool allowBlankText = false, bool multiLine = false)
     {
         _allowBlankText = allowBlankText;
         _multiline = multiLine;
@@ -51,7 +52,7 @@ public TypeTextOrCancelDialog(DialogArgs args, int maxCharacters, string startin
         InitializeComponent();
 
         var header = args.WindowTitle;
-           
+
 
         if (header != null && header.Length > WideMessageBox.MAX_LENGTH_TITLE)
             header = header[..WideMessageBox.MAX_LENGTH_TITLE];
@@ -64,7 +65,7 @@ public TypeTextOrCancelDialog(DialogArgs args, int maxCharacters, string startin
         if (_multiline)
         {
             var editor = new ScintillaTextEditorFactory();
-            _scintilla = editor.Create(null,SyntaxLanguage.None,null,true,false);
+            _scintilla = editor.Create(null, SyntaxLanguage.None, null, true, false);
             _scintilla.Dock = DockStyle.Fill;
             _scintilla.TextChanged += _scintilla_TextChanged;
             _scintilla.KeyDown += _scintilla_KeyDown;
@@ -93,7 +94,7 @@ public TypeTextOrCancelDialog(DialogArgs args, int maxCharacters, string startin
             ActiveControl = textBox1;
         }
 
-        SetEnabledness();          
+        SetEnabledness();
     }
 
     private void _scintilla_KeyDown(object sender, KeyEventArgs e)
@@ -133,16 +134,15 @@ private void SetEnabledness()
         textBox1.ForeColor = Color.Black;
 
         //if there's some text typed and we want typed text to be sane
-        if(RequireSaneHeaderText && !string.IsNullOrWhiteSpace(textBox1.Text))
-        {
+        if (RequireSaneHeaderText && !string.IsNullOrWhiteSpace(textBox1.Text))
             //if the sane name doesn't match the 
-            if(!textBox1.Text.Equals(QuerySyntaxHelper.MakeHeaderNameSensible(textBox1.Text),StringComparison.CurrentCultureIgnoreCase))
+            if (!textBox1.Text.Equals(QuerySyntaxHelper.MakeHeaderNameSensible(textBox1.Text),
+                    StringComparison.CurrentCultureIgnoreCase))
             {
                 btnOk.Enabled = false;
                 textBox1.ForeColor = Color.Red;
                 return;
             }
-        }
 
         btnOk.Enabled = !string.IsNullOrWhiteSpace(ResultText) || _allowBlankText;
     }
@@ -151,33 +151,26 @@ private void FinishedKeyCheck(KeyEventArgs e)
     {
         //If they've pressed enter...
         if (e.KeyCode == Keys.Enter)
-        {
             //If the OK button is enabled AND... (we're not multiline OR we are multiline but they're holding shift)
-            if(btnOk.Enabled && (!_multiline || (_multiline && e.Shift)))
+            if (btnOk.Enabled && (!_multiline || (_multiline && e.Shift)))
             {
                 //Supress the enter key (so a new line isn't created) and press the OK button
                 e.Handled = true;
                 e.SuppressKeyPress = true;
                 btnOk_Click(null, null);
             }
-        }
 
         //Escape should work for all controls
         if (e.KeyCode == Keys.Escape)
             btnCancel_Click(null, null);
-
     }
 
     private void TypeTextOrCancelDialog_Resize(object sender, EventArgs e)
     {
         // Set the height by taking the designer height and adding on the height that the task description label wants to be
         if (_multiline)
-        {
             Height = taskDescriptionLabel1.PreferredHeight + 220;
-        }
         else
-        {
             Height = taskDescriptionLabel1.PreferredHeight + 100;
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs b/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs
index 7dbfe6724b..6c63a208e4 100644
--- a/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs
+++ b/Rdmp.UI/SimpleDialogs/UserSettingsUI.cs
@@ -77,28 +77,32 @@ public UserSettingsFileUI(IActivateItems activator)
         tbArchiveTriggerTimeout.Text = UserSettings.ArchiveTriggerTimeout.ToString();
         tbTooltipAppearDelay.Text = UserSettings.TooltipAppearDelay.ToString();
 
-        RegisterCheckbox(cbShowHomeOnStartup,nameof(UserSettings.ShowHomeOnStartup));
-        RegisterCheckbox(cbEmphasiseOnTabChanged,nameof(UserSettings.EmphasiseOnTabChanged));
-        RegisterCheckbox(cbConfirmExit,nameof(UserSettings.ConfirmApplicationExiting));
-        RegisterCheckbox(cbFindShouldPin,nameof(UserSettings.FindShouldPin));
-        RegisterCheckbox(cbThemeMenus,nameof(UserSettings.ApplyThemeToMenus));
-        RegisterCheckbox(cbWait5Seconds,nameof(UserSettings.Wait5SecondsAfterStartupUI));
-        RegisterCheckbox(cbShowCohortWizard,nameof(UserSettings.ShowCohortWizard));
-        RegisterCheckbox(cbStrictValidationForCohortBuilderContainers, nameof(UserSettings.StrictValidationForCohortBuilderContainers));
-        RegisterCheckbox(cbDoubleClickToExpand,nameof(UserSettings.DoubleClickToExpand));
-        RegisterCheckbox(cbDebugPerformance,nameof(UserSettings.DebugPerformance));
+        RegisterCheckbox(cbShowHomeOnStartup, nameof(UserSettings.ShowHomeOnStartup));
+        RegisterCheckbox(cbEmphasiseOnTabChanged, nameof(UserSettings.EmphasiseOnTabChanged));
+        RegisterCheckbox(cbConfirmExit, nameof(UserSettings.ConfirmApplicationExiting));
+        RegisterCheckbox(cbFindShouldPin, nameof(UserSettings.FindShouldPin));
+        RegisterCheckbox(cbThemeMenus, nameof(UserSettings.ApplyThemeToMenus));
+        RegisterCheckbox(cbWait5Seconds, nameof(UserSettings.Wait5SecondsAfterStartupUI));
+        RegisterCheckbox(cbShowCohortWizard, nameof(UserSettings.ShowCohortWizard));
+        RegisterCheckbox(cbStrictValidationForCohortBuilderContainers,
+            nameof(UserSettings.StrictValidationForCohortBuilderContainers));
+        RegisterCheckbox(cbDoubleClickToExpand, nameof(UserSettings.DoubleClickToExpand));
+        RegisterCheckbox(cbDebugPerformance, nameof(UserSettings.DebugPerformance));
         RegisterCheckbox(cbAutoResizeColumns, nameof(UserSettings.AutoResizeColumns));
-        RegisterCheckbox(cbShowPipelineCompletedPopup,nameof(UserSettings.ShowPipelineCompletedPopup));
-        RegisterCheckbox(cbSkipCohortBuilderValidationOnCommit, nameof(UserSettings.SkipCohortBuilderValidationOnCommit));
-        RegisterCheckbox(cbHideEmptyTableLoadRunAudits,nameof(UserSettings.HideEmptyTableLoadRunAudits));
-        RegisterCheckbox(cbScoreZeroForCohortAggregateContainers,nameof(UserSettings.ScoreZeroForCohortAggregateContainers));
-        RegisterCheckbox(cbAdvancedFindFilters,nameof(UserSettings.AdvancedFindFilters));
-        RegisterCheckbox(cbIncludeZeroSeriesInGraphs,nameof(UserSettings.IncludeZeroSeriesInGraphs));
+        RegisterCheckbox(cbShowPipelineCompletedPopup, nameof(UserSettings.ShowPipelineCompletedPopup));
+        RegisterCheckbox(cbSkipCohortBuilderValidationOnCommit,
+            nameof(UserSettings.SkipCohortBuilderValidationOnCommit));
+        RegisterCheckbox(cbHideEmptyTableLoadRunAudits, nameof(UserSettings.HideEmptyTableLoadRunAudits));
+        RegisterCheckbox(cbScoreZeroForCohortAggregateContainers,
+            nameof(UserSettings.ScoreZeroForCohortAggregateContainers));
+        RegisterCheckbox(cbAdvancedFindFilters, nameof(UserSettings.AdvancedFindFilters));
+        RegisterCheckbox(cbIncludeZeroSeriesInGraphs, nameof(UserSettings.IncludeZeroSeriesInGraphs));
         RegisterCheckbox(cbSelectiveRefresh, nameof(UserSettings.SelectiveRefresh));
-        RegisterCheckbox(cbAlwaysJoinEverything,nameof(UserSettings.AlwaysJoinEverything));
+        RegisterCheckbox(cbAlwaysJoinEverything, nameof(UserSettings.AlwaysJoinEverything));
         RegisterCheckbox(cbAutoRunSqlQueries, nameof(UserSettings.AutoRunSqlQueries));
         RegisterCheckbox(cbExpandAllInCohortBuilder, nameof(UserSettings.ExpandAllInCohortBuilder));
-        RegisterCheckbox(cbUseAliasInsteadOfTransformInGroupByAggregateGraphs, nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs));
+        RegisterCheckbox(cbUseAliasInsteadOfTransformInGroupByAggregateGraphs,
+            nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs));
 
         AddTooltip(label7, nameof(UserSettings.CreateDatabaseTimeout));
         AddTooltip(tbCreateDatabaseTimeout, nameof(UserSettings.CreateDatabaseTimeout));
@@ -106,7 +110,7 @@ public UserSettingsFileUI(IActivateItems activator)
         AddTooltip(tbArchiveTriggerTimeout, nameof(UserSettings.ArchiveTriggerTimeout));
         AddTooltip(tbTooltipAppearDelay, nameof(UserSettings.TooltipAppearDelay));
         AddTooltip(label4, nameof(UserSettings.WrapMode));
-        AddTooltip(ddWordWrap,nameof(UserSettings.WrapMode));
+        AddTooltip(ddWordWrap, nameof(UserSettings.WrapMode));
         AddTooltip(ddTheme, nameof(UserSettings.Theme));
         AddTooltip(label2, nameof(UserSettings.Theme));
         AddTooltip(label5, nameof(UserSettings.HeatMapColours));
@@ -120,7 +124,7 @@ public UserSettingsFileUI(IActivateItems activator)
         olvMessage.MaximumWidth = olvMessage.Width;
         olvMessage.MinimumWidth = olvMessage.Width;
 
-        ddTheme.DataSource = new []
+        ddTheme.DataSource = new[]
         {
             "ResearchDataManagementPlatform.Theme.MyVS2015BlueTheme",
             "ResearchDataManagementPlatform.Theme.MyVS2015DarkTheme",
@@ -168,7 +172,7 @@ public UserSettingsFileUI(IActivateItems activator)
     private void RegisterCheckbox(CheckBox cb, string propertyName)
     {
         // remember about this checkbox for later
-        var prop = typeof(UserSettings).GetProperty(propertyName,BindingFlags.Static | BindingFlags.Public);
+        var prop = typeof(UserSettings).GetProperty(propertyName, BindingFlags.Static | BindingFlags.Public);
         checkboxDictionary.Add(cb, prop);
 
         // set initial value from UserSettings
@@ -183,11 +187,9 @@ private void RegisterCheckbox(CheckBox cb, string propertyName)
 
     private void AddTooltip(Control c, string propertyName)
     {
-        var helpText = _activator.CommentStore.GetDocumentationIfExists($"{ nameof(UserSettings)}.{propertyName}", false);
-        if(string.IsNullOrWhiteSpace(helpText))
-        {
-            return;
-        }
+        var helpText =
+            _activator.CommentStore.GetDocumentationIfExists($"{nameof(UserSettings)}.{propertyName}", false);
+        if (string.IsNullOrWhiteSpace(helpText)) return;
 
         userSettingsToolTips.SetToolTip(c, UsefulStuff.SplitByLength(helpText, MaxTooltipWidth));
     }
@@ -197,10 +199,7 @@ private void Treatment_Putter(object rowObject, object newValue)
         UserSettings.SetErrorReportingLevelFor((ErrorCode)rowObject, (CheckResult)newValue);
     }
 
-    private object Treatment_Getter(object rowObject)
-    {
-        return UserSettings.GetErrorReportingLevelFor((ErrorCode)rowObject);
-    }
+    private object Treatment_Getter(object rowObject) => UserSettings.GetErrorReportingLevelFor((ErrorCode)rowObject);
 
     private void CheckboxCheckedChanged(object sender, EventArgs e)
     {
@@ -213,10 +212,10 @@ private void CheckboxCheckedChanged(object sender, EventArgs e)
 
     private void ddTheme_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(!_bLoaded)
+        if (!_bLoaded)
             return;
 
-        if(ddTheme.SelectedItem is string t)
+        if (ddTheme.SelectedItem is string t)
             UserSettings.Theme = t;
     }
 
@@ -236,25 +235,17 @@ private void TbHeatmapColours_TextChanged(object sender, EventArgs e)
 
     private void tbCreateDatabaseTimeout_TextChanged(object sender, EventArgs e)
     {
-        if(int.TryParse(tbCreateDatabaseTimeout.Text,out var result))
-        {
-            UserSettings.CreateDatabaseTimeout = result;
-        }
+        if (int.TryParse(tbCreateDatabaseTimeout.Text, out var result)) UserSettings.CreateDatabaseTimeout = result;
     }
+
     private void tbArchiveTriggerTimeout_TextChanged(object sender, EventArgs e)
     {
-
-        if (int.TryParse(tbArchiveTriggerTimeout.Text, out var result))
-        {
-            UserSettings.ArchiveTriggerTimeout = result;
-        }
+        if (int.TryParse(tbArchiveTriggerTimeout.Text, out var result)) UserSettings.ArchiveTriggerTimeout = result;
     }
+
     private void tbTooltipAppearDelay_TextChanged(object sender, EventArgs e)
     {
-        if (int.TryParse(tbTooltipAppearDelay.Text, out var result))
-        {
-            UserSettings.TooltipAppearDelay = result;
-        }
+        if (int.TryParse(tbTooltipAppearDelay.Text, out var result)) UserSettings.TooltipAppearDelay = result;
     }
 
     private void tbFind_TextChanged(object sender, EventArgs e)
@@ -264,11 +255,9 @@ private void tbFind_TextChanged(object sender, EventArgs e)
 
     private void Find(string text)
     {
-        foreach(var cb in checkboxDictionary)
-        {
+        foreach (var cb in checkboxDictionary)
             cb.Key.Visible = string.IsNullOrWhiteSpace(text) ||
-                             cb.Key.Text.Contains(text,StringComparison.CurrentCultureIgnoreCase) ||
+                             cb.Key.Text.Contains(text, StringComparison.CurrentCultureIgnoreCase) ||
                              cb.Value.Name.Contains(text, StringComparison.CurrentCultureIgnoreCase);
-        }
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ViewSourceCodeDialog.cs b/Rdmp.UI/SimpleDialogs/ViewSourceCodeDialog.cs
index 793c39118e..95d6faf6f5 100644
--- a/Rdmp.UI/SimpleDialogs/ViewSourceCodeDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/ViewSourceCodeDialog.cs
@@ -42,10 +42,10 @@ public static void AddSupplementalSourceZipFile(FileInfo f)
     public ViewSourceCodeDialog(string filename, int lineNumber, Color highlightColor)
     {
         var toFind = Path.GetFileName(filename);
-            
+
         InitializeComponent();
 
-        if(filename == null)
+        if (filename == null)
             return;
 
         var designMode = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
@@ -57,7 +57,7 @@ public ViewSourceCodeDialog(string filename, int lineNumber, Color highlightColo
 
         panel1.Controls.Add(QueryEditor);
 
-        LoadSourceCode(toFind,lineNumber,highlightColor);
+        LoadSourceCode(toFind, lineNumber, highlightColor);
 
         var worker = new BackgroundWorker();
         worker.DoWork += WorkerOnDoWork;
@@ -82,7 +82,9 @@ private void LoadSourceCode(string toFind, int lineNumber, Color highlightColor)
                 }
             }
             else
+            {
                 throw new FileNotFoundException($"Could not find file called '{toFind}' in any of the zip archives");
+            }
         }
 
         Text = toFind;
@@ -94,19 +96,20 @@ private void WorkerOnDoWork(object sender, DoWorkEventArgs doWorkEventArgs)
 
         var zipArchive = new FileInfo(MainSourceCodeRepo);
         foreach (var zipFile in new[] { zipArchive }.Union(SupplementalSourceZipFiles))
-        {
             //if the zip exists
             if (zipFile.Exists)
                 //read the entry (if it is there)
                 using (var z = ZipFile.OpenRead(zipFile.FullName))
+                {
                     foreach (var entry in z.Entries)
                         entries.Add(entry.Name);
-        }
+                }
 
 
         olvSourceFiles.AddObjects(entries.ToArray());
     }
-    public ViewSourceCodeDialog(string filename):this(filename,-1,Color.White)
+
+    public ViewSourceCodeDialog(string filename) : this(filename, -1, Color.White)
     {
     }
 
@@ -118,10 +121,8 @@ public static string GetSourceForFile(string toFind)
 
             //for each zip file (starting with the main archive)
             foreach (var zipFile in new[] { zipArchive }.Union(SupplementalSourceZipFiles))
-            {
                 //if the zip exists
                 if (zipFile.Exists)
-                {
                     //read the entry (if it is there)
                     using (var z = ZipFile.OpenRead(zipFile.FullName))
                     {
@@ -130,13 +131,12 @@ public static string GetSourceForFile(string toFind)
                         if (readToEnd != null) //the entry was found and read
                             return readToEnd;
                     }
-                }
-            }
         }
         catch (Exception)
         {
             return null;
         }
+
         //couldn't find any text
         return null;
     }
@@ -152,7 +152,8 @@ public static bool SourceCodeIsAvailableFor(string s)
             return false;
         }
     }
-    private static string GetEntryFromZipFile(ZipArchive z,string toFind)
+
+    private static string GetEntryFromZipFile(ZipArchive z, string toFind)
     {
         var entry = z.Entries.FirstOrDefault(e => e.Name == toFind);
 
@@ -165,7 +166,8 @@ private static string GetEntryFromZipFile(ZipArchive z,string toFind)
     private void textBox1_TextChanged(object sender, EventArgs e)
     {
         olvSourceFiles.UseFiltering = true;
-        olvSourceFiles.ModelFilter = new TextMatchFilter(olvSourceFiles,textBox1.Text,StringComparison.CurrentCultureIgnoreCase);
+        olvSourceFiles.ModelFilter =
+            new TextMatchFilter(olvSourceFiles, textBox1.Text, StringComparison.CurrentCultureIgnoreCase);
     }
 
     private void olvSourceFiles_ItemActivate(object sender, EventArgs e)
@@ -173,5 +175,4 @@ private void olvSourceFiles_ItemActivate(object sender, EventArgs e)
         if (olvSourceFiles.SelectedObject is string str)
             LoadSourceCode(str, -1, Color.White);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/ViewSourceCodeToolTip.cs b/Rdmp.UI/SimpleDialogs/ViewSourceCodeToolTip.cs
index 108b2d5572..e5061152be 100644
--- a/Rdmp.UI/SimpleDialogs/ViewSourceCodeToolTip.cs
+++ b/Rdmp.UI/SimpleDialogs/ViewSourceCodeToolTip.cs
@@ -34,10 +34,10 @@ public ViewSourceCodeToolTip()
 
     private void OnPopup(object sender, PopupEventArgs e)
     {
-        if(Screen.PrimaryScreen != null && Screen.PrimaryScreen.Bounds != Rectangle.Empty)
+        if (Screen.PrimaryScreen != null && Screen.PrimaryScreen.Bounds != Rectangle.Empty)
         {
             //use half the screen width or 600 if they are playing on a gameboy advanced
-            WIDTH = Math.Max(600,Screen.PrimaryScreen.Bounds.Width/2);
+            WIDTH = Math.Max(600, Screen.PrimaryScreen.Bounds.Width / 2);
             HEIGHT = Math.Max(450, Screen.PrimaryScreen.Bounds.Height / 2);
         }
 
@@ -50,35 +50,38 @@ private void OnDraw(object sender, DrawToolTipEventArgs e)
     {
         try
         {
-            var elements = e.ToolTipText.Split(new string[]{"|"}, StringSplitOptions.RemoveEmptyEntries);
+            var elements = e.ToolTipText.Split(new string[] { "|" }, StringSplitOptions.RemoveEmptyEntries);
             var filename = elements[0];
             var linenumber = int.Parse(elements[1]);
 
-            linenumber = Math.Max(0,linenumber-1);
+            linenumber = Math.Max(0, linenumber - 1);
 
-            var lines = ReadAllLinesCached(filename) ?? throw new FileNotFoundException($"Could not find source code for file:{Path.GetFileName(filename)}");
+            var lines = ReadAllLinesCached(filename) ??
+                        throw new FileNotFoundException(
+                            $"Could not find source code for file:{Path.GetFileName(filename)}");
 
             //get height of any given line
-            var coreLineHeight = e.Graphics.MeasureString("I've got a lovely bunch of coconuts" , e.Font).Height + LINE_PADDING*2f;
+            var coreLineHeight = e.Graphics.MeasureString("I've got a lovely bunch of coconuts", e.Font).Height +
+                                 LINE_PADDING * 2f;
 
-            var midpointY = HEIGHT/2;
+            var midpointY = HEIGHT / 2;
 
             //white background
             e.Graphics.FillRectangle(Brushes.White, 0, 0, WIDTH, HEIGHT);
 
             //the highlighted line
-            e.Graphics.FillRectangle(Brushes.LawnGreen, 0,midpointY - LINE_PADDING,WIDTH,coreLineHeight);
-            e.Graphics.DrawString(lines[linenumber],e.Font,Brushes.Black,0,midpointY);
+            e.Graphics.FillRectangle(Brushes.LawnGreen, 0, midpointY - LINE_PADDING, WIDTH, coreLineHeight);
+            e.Graphics.DrawString(lines[linenumber], e.Font, Brushes.Black, 0, midpointY);
 
             var index = linenumber - 1;
             var currentLineY = midpointY - coreLineHeight;
 
             //any other lines we can fit on above the current line
-            while(currentLineY > 0 && index >= 0)
+            while (currentLineY > 0 && index >= 0)
             {
-                e.Graphics.DrawString(lines[index],e.Font,Brushes.Black,0,currentLineY);
+                e.Graphics.DrawString(lines[index], e.Font, Brushes.Black, 0, currentLineY);
                 currentLineY -= coreLineHeight;
-                index --;
+                index--;
             }
 
             index = linenumber + 1;
@@ -93,26 +96,28 @@ private void OnDraw(object sender, DrawToolTipEventArgs e)
             }
 
             //draw the name of the file
-            e.Graphics.FillRectangle(Brushes.DarkBlue,0,0,WIDTH,coreLineHeight);
-            e.Graphics.DrawString(Path.GetFileName(filename) ,e.Font,Brushes.White,LINE_PADDING,LINE_PADDING);
+            e.Graphics.FillRectangle(Brushes.DarkBlue, 0, 0, WIDTH, coreLineHeight);
+            e.Graphics.DrawString(Path.GetFileName(filename), e.Font, Brushes.White, LINE_PADDING, LINE_PADDING);
         }
         catch (Exception exception)
         {
             //white background
             e.Graphics.FillRectangle(Brushes.White, 0, 0, WIDTH, HEIGHT);
-            e.Graphics.DrawString(exception.Message,e.Font,Brushes.Red,new RectangleF(0,0,WIDTH,HEIGHT));
+            e.Graphics.DrawString(exception.Message, e.Font, Brushes.Red, new RectangleF(0, 0, WIDTH, HEIGHT));
         }
     }
 
     private static string[] ReadAllLinesCached(string filename)
     {
-        if(!SourceFileCache.ContainsKey(filename))
+        if (!SourceFileCache.ContainsKey(filename))
         {
             string[] fileContents;
 
             //if you have the original file
             if (File.Exists(filename))
+            {
                 fileContents = File.ReadLines(filename).ToArray();
+            }
             //otherwise get it from SourceCodeForSelfAwareness.zip / Plugin zip source codes
             else
             {
@@ -122,12 +127,11 @@ private static string[] ReadAllLinesCached(string filename)
                     return null;
 
                 fileContents = contentsInOneLine.Split('\n');
-
             }
 
-            SourceFileCache.Add(filename,fileContents);
+            SourceFileCache.Add(filename, fileContents);
         }
-            
+
         return SourceFileCache[filename];
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/WaitUI.cs b/Rdmp.UI/SimpleDialogs/WaitUI.cs
index 58965f19ac..a5955937e6 100644
--- a/Rdmp.UI/SimpleDialogs/WaitUI.cs
+++ b/Rdmp.UI/SimpleDialogs/WaitUI.cs
@@ -43,7 +43,7 @@ private void TimerTick(object sender, EventArgs e)
             Close();
         }
     }
-        
+
     private void button1_Click(object sender, EventArgs e)
     {
         _cancellationTokenSource.Cancel();
diff --git a/Rdmp.UI/SimpleDialogs/WideMessageBox.cs b/Rdmp.UI/SimpleDialogs/WideMessageBox.cs
index 333b4ef7aa..8b49dd61b1 100644
--- a/Rdmp.UI/SimpleDialogs/WideMessageBox.cs
+++ b/Rdmp.UI/SimpleDialogs/WideMessageBox.cs
@@ -53,7 +53,9 @@ public partial class WideMessageBox : Form
     };
 
     #region Static setup of dictionary of keywords
+
     public static CommentStore CommentStore;
+
     #endregion
 
     private Regex className = new(@"^\w+$");
@@ -61,15 +63,15 @@ public partial class WideMessageBox : Form
     public WideMessageBox(WideMessageBoxArgs args)
     {
         InitializeComponent();
-            
+
         Setup(args);
-            
+
         //can only write to clipboard in STA threads
         btnCopyToClipboard.Visible = Thread.CurrentThread.GetApartmentState() == ApartmentState.STA;
 
         //try to resize form to fit bounds
         Size = GetPreferredSizeOfTextControl(richTextBox1);
-        Size = new Size(Size.Width + 10, Size.Height + 150);//leave a bit of padding
+        Size = new Size(Size.Width + 10, Size.Height + 150); //leave a bit of padding
 
         richTextBox1.LinkClicked += richTextBox1_LinkClicked;
         btnViewSourceCode.Click += (s, e) => new ViewSourceCodeDialog((string)btnViewSourceCode.Tag).Show();
@@ -91,6 +93,7 @@ protected override void OnShown(EventArgs e)
             WindowState = FormWindowState.Maximized;
         }
     }
+
     protected void Setup(WideMessageBoxArgs args)
     {
         Args = args;
@@ -98,7 +101,7 @@ protected void Setup(WideMessageBoxArgs args)
         btnBack.Enabled = _navigationStack.Any();
 
         btnViewStackTrace.Visible = args.EnvironmentDotStackTrace != null;
-            
+
         richTextBox1.Font = new Font(FontFamily.GenericMonospace, richTextBox1.Font.Size);
         richTextBox1.Select(0, 0);
         richTextBox1.WordWrap = true;
@@ -113,7 +116,7 @@ protected void Setup(WideMessageBoxArgs args)
             message = title;
             title = null;
         }
-            
+
         //Replace single newlines with double new lines 
         if (Args.FormatAsParagraphs && CommentStore != null)
             message = CommentStore.FormatAsParagraphs(message);
@@ -121,7 +124,7 @@ protected void Setup(WideMessageBoxArgs args)
         //if there is a title
         if (!string.IsNullOrWhiteSpace(title))
         {
-            lblMainMessage.Text = title.Length > MAX_LENGTH_TITLE ? title[..MAX_LENGTH_TITLE]: title;
+            lblMainMessage.Text = title.Length > MAX_LENGTH_TITLE ? title[..MAX_LENGTH_TITLE] : title;
         }
         else
         {
@@ -133,7 +136,7 @@ protected void Setup(WideMessageBoxArgs args)
         SetMessage(message, args.KeywordNotToAdd);
 
         ApplyTheme(args.Theme);
-            
+
         if (args.Theme == WideMessageBoxTheme.Help)
             SetViewSourceCodeButton(args.Title);
     }
@@ -148,17 +151,21 @@ private void SetViewSourceCodeButton(string title)
             btnViewSourceCode.Tag = $"{title}.cs";
         }
         else
+        {
             btnViewSourceCode.Enabled = false;
+        }
     }
 
-    public static void Show(IHasSummary summary,bool isModalDialog = true)
+    public static void Show(IHasSummary summary, bool isModalDialog = true)
     {
         summary.GetSummary(out var title, out var body, out var stackTrace, out var level);
-        Show(title,body,stackTrace,isModalDialog,null,GetTheme(level));
+        Show(title, body, stackTrace, isModalDialog, null, GetTheme(level));
     }
-    public static void Show(string title, DataGridViewRow row, bool isModalDialog = true, WideMessageBoxTheme theme = WideMessageBoxTheme.Help)
+
+    public static void Show(string title, DataGridViewRow row, bool isModalDialog = true,
+        WideMessageBoxTheme theme = WideMessageBoxTheme.Help)
     {
-        Show(title, GetText(row), null,isModalDialog,null, theme);
+        Show(title, GetText(row), null, isModalDialog, null, theme);
     }
 
     private static string GetText(DataGridViewRow row)
@@ -172,35 +179,38 @@ private static string GetText(DataGridViewRow row)
                 var v = row.Cells[c.Name].Value;
                 var stringval = v == null || v == DBNull.Value ? "NULL" : v.ToString();
 
-                if(stringval.Length > MAX_LENGTH_ELEMENT)
+                if (stringval.Length > MAX_LENGTH_ELEMENT)
                     stringval = $"{stringval[..MAX_LENGTH_ELEMENT]}...";
 
                 sb.AppendLine($"{c.Name}:{stringval}");
             }
-                    
-        if(sb.Length >= MAX_LENGTH_BODY)
+
+        if (sb.Length >= MAX_LENGTH_BODY)
             return sb.ToString(0, MAX_LENGTH_BODY);
 
         return sb.ToString();
     }
-    public static void Show(string title, string message, string environmentDotStackTrace = null, bool isModalDialog = true, string keywordNotToAdd = null,WideMessageBoxTheme theme = WideMessageBoxTheme.Exception)
+
+    public static void Show(string title, string message, string environmentDotStackTrace = null,
+        bool isModalDialog = true, string keywordNotToAdd = null,
+        WideMessageBoxTheme theme = WideMessageBoxTheme.Exception)
     {
-        var wmb = new WideMessageBox(new WideMessageBoxArgs(title,message, environmentDotStackTrace, keywordNotToAdd, theme));
+        var wmb = new WideMessageBox(new WideMessageBoxArgs(title, message, environmentDotStackTrace, keywordNotToAdd,
+            theme));
 
         if (isModalDialog)
             wmb.ShowDialog();
         else
             wmb.Show();
-            
     }
 
     public static void Show(string title, string message, WideMessageBoxTheme theme)
     {
-        Show(title, message,null,theme:theme);
+        Show(title, message, null, theme: theme);
     }
+
     private void ApplyTheme(WideMessageBoxTheme theme)
     {
-
         pbIcon.Image = theme switch
         {
             WideMessageBoxTheme.Exception => (Image)Images.ErrorIcon.ImageToBitmap(),
@@ -245,17 +255,17 @@ protected virtual void OnViewStackTrace()
 
     private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
     {
-        if(e.LinkText.Contains('#'))
+        if (e.LinkText.Contains('#'))
         {
             var split = e.LinkText.Split('#');
-            if(split.Length >=2 && CommentStore.ContainsKey(split[1]))
+            if (split.Length >= 2 && CommentStore.ContainsKey(split[1]))
                 NavigateTo(split[1]);
         }
         else
         {
-            var text = e.LinkText.TrimEnd('.',')');
+            var text = e.LinkText.TrimEnd('.', ')');
 
-            if(CommentStore.ContainsKey(text))
+            if (CommentStore.ContainsKey(text))
                 NavigateTo(text);
         }
     }
@@ -263,16 +273,17 @@ private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
     private void NavigateTo(string keyword)
     {
         _navigationStack.Push(Args);
-            
-        Setup(new WideMessageBoxArgs(keyword,CommentStore[keyword],null,keyword,WideMessageBoxTheme.Help){FormatAsParagraphs = true});
+
+        Setup(new WideMessageBoxArgs(keyword, CommentStore[keyword], null, keyword, WideMessageBoxTheme.Help)
+            { FormatAsParagraphs = true });
     }
 
     private void SetMessage(string message, string keywordNotToAdd = null)
     {
-        if(string.IsNullOrWhiteSpace(message))
-            message = "";            
+        if (string.IsNullOrWhiteSpace(message))
+            message = "";
 
-        if(message.Length > MAX_LENGTH_BODY)
+        if (message.Length > MAX_LENGTH_BODY)
             message = message[..MAX_LENGTH_BODY];
 
         //if we don't have help documentation available just set the message without looking for hyperlinks
@@ -287,7 +298,8 @@ private void SetMessage(string message, string keywordNotToAdd = null)
         foreach (var word in Regex.Split(message, @"(?<=[. ,;)(<>\n-])"))
         {
             //Try to match the trimmed keyword or the trimmed keyword without an s
-            var keyword = GetDocumentationKeyword(keywordNotToAdd, word.Trim('.', ' ', ',', ';', '(', ')','<','>','-','\r','\n'));
+            var keyword = GetDocumentationKeyword(keywordNotToAdd,
+                word.Trim('.', ' ', ',', ';', '(', ')', '<', '>', '-', '\r', '\n'));
 
             if (keyword != null)
                 richTextBox1.InsertLink(word, keyword);
@@ -310,7 +322,7 @@ private void SetMessage(string message, string keywordNotToAdd = null)
     /// <returns></returns>
     private static string GetDocumentationKeyword(string keywordNotToAdd, string word)
     {
-        if(string.IsNullOrWhiteSpace(word))
+        if (string.IsNullOrWhiteSpace(word))
             return null;
 
         //do not highlight common words like "example"
@@ -318,7 +330,7 @@ private static string GetDocumentationKeyword(string keywordNotToAdd, string wor
             return null;
 
         var keyword = CommentStore.GetDocumentationKeywordIfExists(word.Trim(), true);
-            
+
         if (keyword == keywordNotToAdd)
             return null;
 
@@ -327,7 +339,8 @@ private static string GetDocumentationKeyword(string keywordNotToAdd, string wor
 
     private static void ShowHelpSection(HelpSection hs)
     {
-        new WideMessageBox(new WideMessageBoxArgs(hs.Keyword, hs.HelpText, Environment.StackTrace, hs.Keyword, WideMessageBoxTheme.Help)
+        new WideMessageBox(new WideMessageBoxArgs(hs.Keyword, hs.HelpText, Environment.StackTrace, hs.Keyword,
+            WideMessageBoxTheme.Help)
         {
             FormatAsParagraphs = true
         }).Show();
@@ -361,7 +374,7 @@ private void btnBack_Click(object sender, EventArgs e)
 
     private void Back()
     {
-        if(!_navigationStack.Any())
+        if (!_navigationStack.Any())
             return;
 
         Setup(_navigationStack.Pop());
@@ -370,21 +383,22 @@ private void Back()
     private void richTextBox1_KeyDown(object sender, KeyEventArgs e)
     {
         if (
-            richTextBox1.GetLineFromCharIndex(richTextBox1.SelectionStart) == 0 && e.KeyData == Keys.Up ||
-            richTextBox1.GetLineFromCharIndex(richTextBox1.SelectionStart) == richTextBox1.GetLineFromCharIndex(richTextBox1.TextLength) && e.KeyData == Keys.Down ||
-            richTextBox1.SelectionStart == richTextBox1.TextLength && e.KeyData == Keys.Right ||
-            richTextBox1.SelectionStart == 0 && e.KeyData == Keys.Left
+            (richTextBox1.GetLineFromCharIndex(richTextBox1.SelectionStart) == 0 && e.KeyData == Keys.Up) ||
+            (richTextBox1.GetLineFromCharIndex(richTextBox1.SelectionStart) ==
+                richTextBox1.GetLineFromCharIndex(richTextBox1.TextLength) && e.KeyData == Keys.Down) ||
+            (richTextBox1.SelectionStart == richTextBox1.TextLength && e.KeyData == Keys.Right) ||
+            (richTextBox1.SelectionStart == 0 && e.KeyData == Keys.Left)
         ) e.Handled = true;
 
         if (e.KeyCode == Keys.Back || e.KeyCode == Keys.Escape || (e.KeyData == Keys.W && e.Control))
             e.Handled = true;
 
-        if(e.KeyCode == Keys.C && e.Control)
+        if (e.KeyCode == Keys.C && e.Control)
         {
             e.Handled = true;
 
             //Ctrl+C with nothing selected copies it all
-            if(richTextBox1.SelectedText.Length == 0)
+            if (richTextBox1.SelectedText.Length == 0)
             {
                 //gets around formatting of hyperlinks appearing in Ctrl+C
                 Clipboard.SetText(Args.Title + Environment.NewLine + Environment.NewLine + Args.Message);
@@ -407,10 +421,8 @@ Grab the hyperlinks
                 var rtfHyperlinks = new Regex(@"\\v #([^\\]*)\\v");
 
                 foreach (Match m in rtfHyperlinks.Matches(richTextBox1.SelectedRtf))
-                {
                     //replace the hyperlink text in the 'unformatted' text
-                    text = text.Replace($"#{m.Groups[1].Value}","");
-                }
+                    text = text.Replace($"#{m.Groups[1].Value}", "");
 
                 Clipboard.SetText(text);
             }
@@ -426,11 +438,11 @@ private static Size GetPreferredSizeOfTextControl(Control c)
         var minimumHeight = 150;
 
         var maxSize = Screen.GetBounds(c);
-        maxSize.Height = Math.Min(maxSize.Height,800);
+        maxSize.Height = Math.Min(maxSize.Height, 800);
         maxSize.Width = Math.Min(maxSize.Width, 1024);
 
         return new Size(
-            (int)Math.Min(maxSize.Width, Math.Max(measureString.Width + 50,minimumWidth)),
-            (int)Math.Min(maxSize.Height,Math.Max(measureString.Height + 100,minimumHeight)));
+            (int)Math.Min(maxSize.Width, Math.Max(measureString.Width + 50, minimumWidth)),
+            (int)Math.Min(maxSize.Height, Math.Max(measureString.Height + 100, minimumHeight)));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SimpleDialogs/WideMessageBoxArgs.cs b/Rdmp.UI/SimpleDialogs/WideMessageBoxArgs.cs
index ffd3563b61..93a08261be 100644
--- a/Rdmp.UI/SimpleDialogs/WideMessageBoxArgs.cs
+++ b/Rdmp.UI/SimpleDialogs/WideMessageBoxArgs.cs
@@ -5,8 +5,6 @@
 // You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
 
 
-
-
 namespace Rdmp.UI.SimpleDialogs;
 
 /// <summary>
@@ -21,7 +19,8 @@ public class WideMessageBoxArgs
     public WideMessageBoxTheme Theme { get; set; }
     public bool FormatAsParagraphs { get; set; }
 
-    public WideMessageBoxArgs(string title, string message,string environmentDotStackTrace,string keywordNotToAdd,WideMessageBoxTheme theme)
+    public WideMessageBoxArgs(string title, string message, string environmentDotStackTrace, string keywordNotToAdd,
+        WideMessageBoxTheme theme)
     {
         Title = title;
         Message = message;
diff --git a/Rdmp.UI/SimpleDialogs/YesNoYesToAllDialog.cs b/Rdmp.UI/SimpleDialogs/YesNoYesToAllDialog.cs
index e141f5c624..cbe451009e 100644
--- a/Rdmp.UI/SimpleDialogs/YesNoYesToAllDialog.cs
+++ b/Rdmp.UI/SimpleDialogs/YesNoYesToAllDialog.cs
@@ -14,30 +14,29 @@ namespace Rdmp.UI.SimpleDialogs;
 /// Asks you if you want to carry out a particular activity with the option to say Yes to this activity or 'Yes to All' (activities that are similar to this one).
 /// </summary>
 [TechnicalUI]
-public  class YesNoYesToAllDialog : WideMessageBox
+public class YesNoYesToAllDialog : WideMessageBox
 {
     private bool YesToAllClicked = false;
     private bool NoToAllClicked = false;
     private object lockShowDialog = new();
     private FlowLayoutPanel p = new();
-    private Button btnYes = new() { Text ="Yes"};
-    private Button btnYesToAll = new() { Text = "Yes To All"};
-    private Button btnNo = new() { Text="No"};
-    private Button btnNoToAll = new() { Text = "No To All"};
+    private Button btnYes = new() { Text = "Yes" };
+    private Button btnYesToAll = new() { Text = "Yes To All" };
+    private Button btnNo = new() { Text = "No" };
+    private Button btnNoToAll = new() { Text = "No To All" };
 
     /// <summary>
     /// The number of pixels to allow outside of the text width when auto sizing buttons
     /// </summary>
     private const int ButtonXPadding = 10;
 
-    public YesNoYesToAllDialog():this(new WideMessageBoxArgs("YesNo","Unknown",Environment.StackTrace,null,WideMessageBoxTheme.Help))
+    public YesNoYesToAllDialog() : this(new WideMessageBoxArgs("YesNo", "Unknown", Environment.StackTrace, null,
+        WideMessageBoxTheme.Help))
     {
-            
     }
 
     private YesNoYesToAllDialog(WideMessageBoxArgs wideMessageBoxArgs) : base(wideMessageBoxArgs)
     {
-            
         AddButton(btnYes);
         AddButton(btnYesToAll);
         AddButton(btnNo);
@@ -48,7 +47,7 @@ private YesNoYesToAllDialog(WideMessageBoxArgs wideMessageBoxArgs) : base(wideMe
         ButtonsPanel.Controls.Clear();
         ButtonsPanel.Controls.Add(p);
 
-        MinimumSize = new Size(600,300);
+        MinimumSize = new Size(600, 300);
 
         //start at no in case they close with X button
         DialogResult = DialogResult.No;
@@ -69,7 +68,7 @@ private void AddButton(Button button)
         if (YesToAllClicked)
             return DialogResult.Yes;
 
-        if(NoToAllClicked)
+        if (NoToAllClicked)
             return DialogResult.No;
 
         return base.ShowDialog();
@@ -77,23 +76,29 @@ private void AddButton(Button button)
 
     public DialogResult ShowDialog(string message, string caption)
     {
-        if(InvokeRequired)
-            return (DialogResult)Invoke(new Func<DialogResult>(() => ShowDialog(message,caption)));
+        if (InvokeRequired)
+            return (DialogResult)Invoke(new Func<DialogResult>(() => ShowDialog(message, caption)));
 
         Args.Title = caption;
         Args.Message = message;
         Setup(Args);
-            
+
         lock (lockShowDialog)
+        {
             return ShowDialog();
+        }
     }
 
     private void btn_Click(object sender, EventArgs e)
     {
-        if(sender == btnYes)
+        if (sender == btnYes)
+        {
             DialogResult = DialogResult.Yes;
+        }
         else if (sender == btnNo)
+        {
             DialogResult = DialogResult.No;
+        }
         else if (sender == btnYesToAll)
         {
             YesToAllClicked = true;
diff --git a/Rdmp.UI/SingleControlForms/SingleControlForm.cs b/Rdmp.UI/SingleControlForms/SingleControlForm.cs
index abcf989a1a..cd8043f54f 100644
--- a/Rdmp.UI/SingleControlForms/SingleControlForm.cs
+++ b/Rdmp.UI/SingleControlForms/SingleControlForm.cs
@@ -14,20 +14,20 @@ namespace Rdmp.UI.SingleControlForms;
 /// </summary>
 [TechnicalUI]
 [System.ComponentModel.DesignerCategory("")]
-public class SingleControlForm:Form
+public class SingleControlForm : Form
 {
     public SingleControlForm(Control control, bool showOkButton = false)
     {
         SetClientSizeCore(control.Width, control.Height);
-        Text = !string.IsNullOrWhiteSpace(control.Text)?control.Text:control.Name;
+        Text = !string.IsNullOrWhiteSpace(control.Text) ? control.Text : control.Name;
 
         Controls.Add(control);
-        control.Anchor = AnchorStyles.Top | AnchorStyles.Left| AnchorStyles.Right | AnchorStyles.Bottom;
+        control.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom;
 
         if (control is IConsultableBeforeClosing consult)
             FormClosing += consult.ConsultAboutClosing;
 
-        if(showOkButton)
+        if (showOkButton)
         {
             var okButton = new Button
             {
@@ -52,8 +52,6 @@ public SingleControlForm(Control control, bool showOkButton = false)
         }
     }
 
-    public static DialogResult ShowDialog(Control control,bool showOkButton = false)
-    {
-        return new SingleControlForm(control,showOkButton).ShowDialog();
-    }
+    public static DialogResult ShowDialog(Control control, bool showOkButton = false) =>
+        new SingleControlForm(control, showOkButton).ShowDialog();
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs
index a7294e5f63..8b02f10703 100644
--- a/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs
+++ b/Rdmp.UI/SubComponents/CohortIdentificationConfigurationUI.cs
@@ -62,7 +62,8 @@ namespace Rdmp.UI.SubComponents;
 /// <para>    Filter 2 - Date of Death - Date of Birth > 16 years</para>
 ///  
 /// </summary>
-public partial class CohortIdentificationConfigurationUI : CohortIdentificationConfigurationUI_Design,IRefreshBusSubscriber
+public partial class CohortIdentificationConfigurationUI : CohortIdentificationConfigurationUI_Design,
+    IRefreshBusSubscriber
 {
     private ToolStripMenuItem cbIncludeCumulative = new("Calculate Cumulative Totals") { CheckOnClick = true };
     private ToolTip tt = new();
@@ -84,7 +85,7 @@ public CohortIdentificationConfigurationUI()
         tlvCic.RowHeight = 19;
         olvExecute.AspectGetter += Common.ExecuteAspectGetter;
         tlvCic.ButtonClick += tlvCic_ButtonClick;
-        olvOrder.AspectGetter += static o=> o is IOrderable orderable ? orderable.Order : null;
+        olvOrder.AspectGetter += static o => o is IOrderable orderable ? orderable.Order : null;
         olvOrder.IsEditable = false;
         tlvCic.ItemActivate += TlvCic_ItemActivate;
         AssociatedCollection = RDMPCollection.Cohort;
@@ -111,15 +112,24 @@ public CohortIdentificationConfigurationUI()
         olvNameCol.Sortable = true;
         tlvCic.Sort(olvNameCol);
 
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCached, new Guid("59c6eda9-dcf3-4a24-801f-4c5467c76f94"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCatalogue, new Guid("59c6f9a6-4a93-4167-a268-9ea755d0ad94"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCount, new Guid("4ca6588f-2511-4082-addd-ec42e9d75b39"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCumulativeTotal, new Guid("a3e901e2-c6b8-4365-bea8-5666b9b74821"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvExecute, new Guid("f8ad1751-b273-42d7-a6d1-0c580099ceee"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvNameCol, new Guid("63db1af5-061c-42b9-873c-7d3d3ac21cd8"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvOrder, new Guid("5be4e6e7-bad6-4bd5-821c-a235bc056053"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvTime, new Guid("88f88d4a-6204-4f83-b9a7-5421186808b7"));
-        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvWorking, new Guid("cfe55a4f-9e17-4205-9016-ae506667f22d"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCached,
+            new Guid("59c6eda9-dcf3-4a24-801f-4c5467c76f94"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCatalogue,
+            new Guid("59c6f9a6-4a93-4167-a268-9ea755d0ad94"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCount,
+            new Guid("4ca6588f-2511-4082-addd-ec42e9d75b39"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvCumulativeTotal,
+            new Guid("a3e901e2-c6b8-4365-bea8-5666b9b74821"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvExecute,
+            new Guid("f8ad1751-b273-42d7-a6d1-0c580099ceee"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvNameCol,
+            new Guid("63db1af5-061c-42b9-873c-7d3d3ac21cd8"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvOrder,
+            new Guid("5be4e6e7-bad6-4bd5-821c-a235bc056053"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvTime,
+            new Guid("88f88d4a-6204-4f83-b9a7-5421186808b7"));
+        RDMPCollectionCommonFunctionality.SetupColumnTracking(tlvCic, olvWorking,
+            new Guid("cfe55a4f-9e17-4205-9016-ae506667f22d"));
 
         tt.SetToolTip(btnExecute, "Starts running and caches all cohort sets and containers");
         tt.SetToolTip(btnAbortLoad, "Cancells execution of any running cohort sets");
@@ -135,14 +145,14 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
         //if publish event was for a child of the cic (_cic is in the objects descendancy i.e. it sits below our cic)
         if (descendancy != null && descendancy.Parents.Contains(Common.Configuration))
         {
-
             //Go up descendency list clearing out the tasks above (and including) e.Object because it has changed
-            foreach (var o in descendancy.Parents.Union(new[] {e.Object}))
+            foreach (var o in descendancy.Parents.Union(new[] { e.Object }))
             {
                 var key = Common.GetKey(o);
-                if(key != null)
-                    Common.Compiler.CancelTask(key,true);
+                if (key != null)
+                    Common.Compiler.CancelTask(key, true);
             }
+
             //TODO: this doesn't clear the compiler
             Common.RecreateAllTasks();
         }
@@ -150,13 +160,13 @@ public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
 
     private void refreshColumnValues(object sender, EventArgs e)
     {
-        if(!tlvCic.IsDisposed)
+        if (!tlvCic.IsDisposed)
             tlvCic.RefreshObjects(tlvCic.Objects.Cast<object>().ToArray());
     }
 
     public override void SetDatabaseObject(IActivateItems activator, CohortIdentificationConfiguration databaseObject)
     {
-        base.SetDatabaseObject(activator,databaseObject);
+        base.SetDatabaseObject(activator, databaseObject);
         Common.Configuration = databaseObject;
         Common.Compiler.CohortIdentificationConfiguration = databaseObject;
 
@@ -171,17 +181,19 @@ public override void SetDatabaseObject(IActivateItems activator, CohortIdentific
             activator.RefreshBus.Subscribe(this);
             _commonFunctionality = new RDMPCollectionCommonFunctionality();
 
-            _commonFunctionality.SetUp(RDMPCollection.Cohort, tlvCic, activator, olvNameCol, olvNameCol, new RDMPCollectionCommonFunctionalitySettings
-            {
-                SuppressActivate = true,
-                AddFavouriteColumn = false,
-                AddCheckColumn = false,
-                AllowSorting =  true //important, we need sorting on so that we can override sort order with our OrderableComparer
-            });
+            _commonFunctionality.SetUp(RDMPCollection.Cohort, tlvCic, activator, olvNameCol, olvNameCol,
+                new RDMPCollectionCommonFunctionalitySettings
+                {
+                    SuppressActivate = true,
+                    AddFavouriteColumn = false,
+                    AddCheckColumn = false,
+                    AllowSorting =
+                        true //important, we need sorting on so that we can override sort order with our OrderableComparer
+                });
             _commonFunctionality.MenuBuilt += MenuBuilt;
             tlvCic.AddObject(databaseObject);
 
-            if(UserSettings.ExpandAllInCohortBuilder)
+            if (UserSettings.ExpandAllInCohortBuilder)
                 tlvCic.ExpandAll();
         }
 
@@ -197,10 +209,14 @@ public override void SetDatabaseObject(IActivateItems activator, CohortIdentific
                     Activator.CoreIconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration, OverlayKind.Edit)
             });
         CommonFunctionality.AddToMenu(new ToolStripSeparator());
-        CommonFunctionality.AddToMenu(new ExecuteCommandShowXmlDoc(activator, "CohortIdentificationConfiguration.QueryCachingServer_ID", "Query Caching"), "Help (What is Query Caching)");
-        CommonFunctionality.Add(new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(activator, null).SetTarget(databaseObject),
+        CommonFunctionality.AddToMenu(
+            new ExecuteCommandShowXmlDoc(activator, "CohortIdentificationConfiguration.QueryCachingServer_ID",
+                "Query Caching"), "Help (What is Query Caching)");
+        CommonFunctionality.Add(
+            new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(activator, null).SetTarget(
+                databaseObject),
             "Commit Cohort",
-            activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableCohort,OverlayKind.Add));
+            activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableCohort, OverlayKind.Add));
 
         foreach (var c in _timeoutControls.GetControls())
             CommonFunctionality.Add(c);
@@ -215,7 +231,7 @@ public override void SetDatabaseObject(IActivateItems activator, CohortIdentific
     /// </summary>
     private void RebuildClearCacheCommand()
     {
-        if(InvokeRequired)
+        if (InvokeRequired)
         {
             Invoke(new MethodInvoker(RebuildClearCacheCommand));
             return;
@@ -225,12 +241,14 @@ private void RebuildClearCacheCommand()
         btnClearCache.Enabled = !_clearCacheCommand.IsImpossible;
         btnClearCache.Image = _clearCacheCommand.GetImage(Activator.CoreIconProvider).ImageToBitmap();
 
-        tt.SetToolTip(btnClearCache, _clearCacheCommand.IsImpossible ? _clearCacheCommand.ReasonCommandImpossible : "Clears any cached results (stale or otherwise) from the query cache");
+        tt.SetToolTip(btnClearCache,
+            _clearCacheCommand.IsImpossible
+                ? _clearCacheCommand.ReasonCommandImpossible
+                : "Clears any cached results (stale or otherwise) from the query cache");
     }
 
     private void TlvCic_ItemActivate(object sender, EventArgs e)
     {
-
         var o = tlvCic.SelectedObject;
         if (o != null)
         {
@@ -251,10 +269,7 @@ public override void SetItemActivator(IActivateItems activator)
         ticket.SetItemActivator(activator);
     }
 
-    public override string GetTabName()
-    {
-        return $"Execute:{base.GetTabName()}";
-    }
+    public override string GetTabName() => $"Execute:{base.GetTabName()}";
 
     private void ticket_TicketTextChanged(object sender, EventArgs e)
     {
@@ -278,6 +293,7 @@ public void StartAll()
 
         Common.StartAll(RebuildClearCacheCommand, RunnerOnPhaseChanged);
     }
+
     private void RunnerOnPhaseChanged(object sender, EventArgs eventArgs)
     {
         if (InvokeRequired)
@@ -318,6 +334,7 @@ private void btnAbortLoad_Click(object sender, EventArgs e)
     {
         Common.CancelAll();
     }
+
     private void btnClearCache_Click(object sender, EventArgs e)
     {
         try
@@ -342,10 +359,7 @@ private void MenuBuilt(object sender, MenuBuiltEventArgs e)
 
             e.Menu.Items.Add(
                 BuildItem("View Results", c, a => a.Identifiers != null,
-                    a =>
-                    {
-                        Activator.ShowWindow(new DataTableViewerUI(a.Identifiers, $"Results {c}"));
-                    })
+                    a => { Activator.ShowWindow(new DataTableViewerUI(a.Identifiers, $"Results {c}")); })
             );
 
             e.Menu.Items.Add(
@@ -359,20 +373,21 @@ private void MenuBuilt(object sender, MenuBuiltEventArgs e)
 
             e.Menu.Items.Add(
                 new ToolStripMenuItem("View Crash Message", null,
-                    (s, ev) => ViewCrashMessage(c)){Enabled = c.CrashMessage != null });
+                    (s, ev) => ViewCrashMessage(c)) { Enabled = c.CrashMessage != null });
 
             e.Menu.Items.Add(
                 BuildItem("Clear Object from Cache", c, a => a.SubqueriesCached > 0,
                     a =>
                     {
                         if (c is ICacheableTask cacheable)
-                            Common.ClearCacheFor(new[] {cacheable});
+                            Common.ClearCacheFor(new[] { cacheable });
                     })
             );
         }
-
     }
-    private ToolStripMenuItem BuildItem(string title, ICompileable c,Func<CohortIdentificationTaskExecution,bool> enabledFunc, Action<CohortIdentificationTaskExecution> action)
+
+    private ToolStripMenuItem BuildItem(string title, ICompileable c,
+        Func<CohortIdentificationTaskExecution, bool> enabledFunc, Action<CohortIdentificationTaskExecution> action)
     {
         var menuItem = new ToolStripMenuItem(title);
 
@@ -384,17 +399,22 @@ private ToolStripMenuItem BuildItem(string title, ICompileable c,Func<CohortIden
                 menuItem.Enabled = false;
         }
         else
+        {
             menuItem.Enabled = false;
+        }
 
         return menuItem;
     }
+
     private static void ViewCrashMessage(ICompileable compileable)
     {
         ExceptionViewer.Show(compileable.CrashMessage);
     }
 }
 
-[TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<CohortIdentificationConfigurationUI_Design, UserControl>))]
-public abstract class CohortIdentificationConfigurationUI_Design : RDMPSingleDatabaseObjectControl<CohortIdentificationConfiguration>
+[TypeDescriptionProvider(
+    typeof(AbstractControlDescriptionProvider<CohortIdentificationConfigurationUI_Design, UserControl>))]
+public abstract class
+    CohortIdentificationConfigurationUI_Design : RDMPSingleDatabaseObjectControl<CohortIdentificationConfiguration>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SubComponents/EmptyLineElements/CohortIdentificationHeader.cs b/Rdmp.UI/SubComponents/EmptyLineElements/CohortIdentificationHeader.cs
index 53843615a1..053db003c0 100644
--- a/Rdmp.UI/SubComponents/EmptyLineElements/CohortIdentificationHeader.cs
+++ b/Rdmp.UI/SubComponents/EmptyLineElements/CohortIdentificationHeader.cs
@@ -11,41 +11,20 @@ namespace Rdmp.UI.SubComponents.EmptyLineElements;
 
 internal class CohortIdentificationHeader
 {
-    public static string GetCatalogueName()
-    {
-        return "";
-    }
+    public static string GetCatalogueName() => "";
 
     public static IMapsDirectlyToDatabaseTable Child => null;
 
-    public static IDataAccessPoint[] GetDataAccessPoints()
-    {
-        return null;
-    }
+    public static IDataAccessPoint[] GetDataAccessPoints() => null;
 
-    public override string ToString()
-    {
-        return "Cohort Query Results (Counts are unique people)";
-    }
+    public override string ToString() => "Cohort Query Results (Counts are unique people)";
 
-    public static string FinalRowCount()
-    {
-        return "";
-    }
+    public static string FinalRowCount() => "";
     public int? CumulativeRowCount { set; get; }
 
-    public static string GetStateDescription()
-    {
-        return "";
-    }
-
-    public static string Order()
-    {
-        return "";
-    }
-        
-    public static string GetCachedQueryUseCount()
-    {
-        return "";
-    }
+    public static string GetStateDescription() => "";
+
+    public static string Order() => "";
+
+    public static string GetCachedQueryUseCount() => "";
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphObjectCollection.cs b/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphObjectCollection.cs
index fdd519cb57..6328e82840 100644
--- a/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphObjectCollection.cs
+++ b/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphObjectCollection.cs
@@ -19,7 +19,7 @@ namespace Rdmp.UI.SubComponents.Graphs;
 /// Input/Persistence object for <see cref="CohortSummaryAggregateGraphUI"/> which records which filter (if any) should be shown for patients
 /// matching the <see cref="CohortContainerIfAny"/> or <see cref="CohortIfAny"/> in the graph.
 /// </summary>
-public class CohortSummaryAggregateGraphObjectCollection:PersistableObjectCollection
+public class CohortSummaryAggregateGraphObjectCollection : PersistableObjectCollection
 {
     public CohortSummaryAdjustment Adjustment;
     public AggregateFilter SingleFilterOnly => DatabaseObjects.OfType<AggregateFilter>().SingleOrDefault();
@@ -42,19 +42,23 @@ public CohortSummaryAggregateGraphObjectCollection()
     /// <param name="cohort"></param>
     /// <param name="graph"></param>
     /// <param name="adjustment"></param>
-    public CohortSummaryAggregateGraphObjectCollection(AggregateConfiguration cohort, AggregateConfiguration graph,CohortSummaryAdjustment adjustment):this()
+    public CohortSummaryAggregateGraphObjectCollection(AggregateConfiguration cohort, AggregateConfiguration graph,
+        CohortSummaryAdjustment adjustment) : this()
     {
-        if(!cohort.IsCohortIdentificationAggregate)
+        if (!cohort.IsCohortIdentificationAggregate)
             throw new ArgumentException(
-                $"Parameter cohort was AggregateConfiguration '{cohort}' which is not a Cohort Aggregate (not allowed)",nameof(cohort));
+                $"Parameter cohort was AggregateConfiguration '{cohort}' which is not a Cohort Aggregate (not allowed)",
+                nameof(cohort));
         if (graph.IsCohortIdentificationAggregate)
             throw new ArgumentException(
-                $"Parameter graph was AggregateConfiguration '{graph}' which is a Cohort Aggregate (not allowed)", nameof(graph));
+                $"Parameter graph was AggregateConfiguration '{graph}' which is a Cohort Aggregate (not allowed)",
+                nameof(graph));
 
         DatabaseObjects.Add(cohort);
         DatabaseObjects.Add(graph);
         Adjustment = adjustment;
     }
+
     /// <summary>
     /// Overload that does the operation on a container with (WhereExtractionIdentifiersIn - the only permissable option)
     /// </summary>
@@ -65,26 +69,25 @@ public CohortSummaryAggregateGraphObjectCollection(CohortAggregateContainer cont
     {
         if (graph.IsCohortIdentificationAggregate)
             throw new ArgumentException(
-                $"Parameter graph was AggregateConfiguration '{graph}' which is a Cohort Aggregate (not allowed)", nameof(graph));
+                $"Parameter graph was AggregateConfiguration '{graph}' which is a Cohort Aggregate (not allowed)",
+                nameof(graph));
 
         DatabaseObjects.Add(container);
         DatabaseObjects.Add(graph);
         Adjustment = CohortSummaryAdjustment.WhereExtractionIdentifiersIn;
     }
 
-    public CohortSummaryAggregateGraphObjectCollection(AggregateConfiguration cohort, AggregateConfiguration graph, CohortSummaryAdjustment adjustment, AggregateFilter singleFilterOnly):this(cohort,graph,adjustment)
+    public CohortSummaryAggregateGraphObjectCollection(AggregateConfiguration cohort, AggregateConfiguration graph,
+        CohortSummaryAdjustment adjustment, AggregateFilter singleFilterOnly) : this(cohort, graph, adjustment)
     {
         DatabaseObjects.Add(singleFilterOnly);
     }
 
-    public override string SaveExtraText()
-    {
-        return Adjustment.ToString();
-    }
+    public override string SaveExtraText() => Adjustment.ToString();
 
     public override void LoadExtraText(string s)
     {
-        if(!Enum.TryParse(s, out CohortSummaryAdjustment a))
+        if (!Enum.TryParse(s, out CohortSummaryAdjustment a))
             throw new Exception($"Could not parse '{s}' into a valid CohortSummaryAdjustment");
 
         Adjustment = a;
@@ -95,12 +98,10 @@ public void RevertIfMatchedInCollectionObjects(DatabaseEntity oTriggeringRefresh
         shouldClose = false;
 
         //matched object in our collection
-        if(DatabaseObjects.SingleOrDefault(o => o.Equals(oTriggeringRefresh)) is IRevertable matchingObject)
-            if (matchingObject.Exists()) 
+        if (DatabaseObjects.SingleOrDefault(o => o.Equals(oTriggeringRefresh)) is IRevertable matchingObject)
+            if (matchingObject.Exists())
                 matchingObject.RevertToDatabaseState();
             else
-                shouldClose = true;//object doesn't exist anymore so close control
-
-            
+                shouldClose = true; //object doesn't exist anymore so close control
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphUI.cs b/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphUI.cs
index b082fd03b4..68760b2c2e 100644
--- a/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphUI.cs
+++ b/Rdmp.UI/SubComponents/Graphs/CohortSummaryAggregateGraphUI.cs
@@ -32,7 +32,7 @@ namespace Rdmp.UI.SubComponents.Graphs;
 /// query).</para>
 ///  
 /// </summary>
-public class CohortSummaryAggregateGraphUI:AggregateGraphUI, IObjectCollectionControl
+public class CohortSummaryAggregateGraphUI : AggregateGraphUI, IObjectCollectionControl
 {
     private CohortSummaryAggregateGraphObjectCollection _collection;
 
@@ -43,40 +43,34 @@ public CohortSummaryAggregateGraphUI()
 
     public void RefreshBus_RefreshObject(object sender, RefreshObjectEventArgs e)
     {
-        _collection.RevertIfMatchedInCollectionObjects(e.Object,out var shouldCloseInstead);
+        _collection.RevertIfMatchedInCollectionObjects(e.Object, out var shouldCloseInstead);
 
         if (shouldCloseInstead)
-        {
             ParentForm?.Close();
-        }
         else
             //now reload the graph because the change was to a relevant object
             LoadGraphAsync();
-            
     }
 
     public void SetCollection(IActivateItems activator, IPersistableObjectCollection collection)
     {
-        _collection = (CohortSummaryAggregateGraphObjectCollection) collection;
+        _collection = (CohortSummaryAggregateGraphObjectCollection)collection;
         SetItemActivator(activator);
-            
+
         BuildMenu(activator);
 
-        SetAggregate(activator,_collection.Graph);
+        SetAggregate(activator, _collection.Graph);
         LoadGraphAsync();
     }
 
-    public IPersistableObjectCollection GetCollection()
-    {
-        return _collection;
-    }
+    public IPersistableObjectCollection GetCollection() => _collection;
 
     public override string GetTabName()
     {
-        if(_collection.CohortIfAny != null)
+        if (_collection.CohortIfAny != null)
             return $"Cohort Graph {_collection.CohortIfAny}({_collection.Adjustment})";
 
-        if(_collection.CohortContainerIfAny != null)
+        if (_collection.CohortContainerIfAny != null)
             return $"Cohort Container Graph {_collection.CohortContainerIfAny}";
 
         return "Loading...";
@@ -104,7 +98,7 @@ protected override string GetDescription()
 
     protected override object[] GetRibbonObjects()
     {
-        return new object[]{ GetAdjustmentDescription(_collection.Adjustment)};
+        return new object[] { GetAdjustmentDescription(_collection.Adjustment) };
     }
 
     private static string GetAdjustmentDescription(CohortSummaryAdjustment adjustment)
@@ -123,7 +117,6 @@ protected override AggregateBuilder GetQueryBuilder(AggregateConfiguration summa
             ? new CohortSummaryQueryBuilder(summary, _collection.CohortIfAny, Activator.CoreChildProvider)
             : new CohortSummaryQueryBuilder(summary, _collection.CohortContainerIfAny);
 
-        return builder.GetAdjustedAggregateBuilder(_collection.Adjustment,_collection.SingleFilterOnly);
+        return builder.GetAdjustedAggregateBuilder(_collection.Adjustment, _collection.SingleFilterOnly);
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/SuggestComboBox.cs b/Rdmp.UI/SuggestComboBox.cs
index 4d7aec28d9..33774b9561 100644
--- a/Rdmp.UI/SuggestComboBox.cs
+++ b/Rdmp.UI/SuggestComboBox.cs
@@ -33,7 +33,10 @@ public class SuggestComboBox : ComboBox
     public int SuggestBoxHeight
     {
         get => _suggLb.Height;
-        set { if (value > 0) _suggLb.Height = value; }
+        set
+        {
+            if (value > 0) _suggLb.Height = value;
+        }
     }
 
     /// <summary>
@@ -110,7 +113,7 @@ private bool DefaultFilterRule(string arg)
         if (string.IsNullOrWhiteSpace(Text))
             return false;
 
-        var keywords = Text.Split(new []{" "}, StringSplitOptions.RemoveEmptyEntries);
+        var keywords = Text.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries);
 
         return keywords.All(k => arg.ToLower().Contains(k.ToLower()));
     }
@@ -120,7 +123,7 @@ private bool DefaultFilterRule(string arg)
     private void _suggLb_VisibleChanged(object sender, EventArgs e)
     {
         //don't fire event if its already being fired (needed because Controls.Remove will make visible false)
-        if(_changingVisibility)
+        if (_changingVisibility)
             return;
 
         _changingVisibility = true;
@@ -131,9 +134,8 @@ private void _suggLb_VisibleChanged(object sender, EventArgs e)
 
             if (form != null)
             {
-                if(_suggLb.Parent != form)
+                if (_suggLb.Parent != form)
                 {
-                     
                     //move it to the parent form
                     _suggLb.Parent.Controls.Remove(_suggLb);
                     form.Controls.Add(_suggLb);
@@ -297,10 +299,12 @@ protected override void OnKeyDown(KeyEventArgs e)
             e.SuppressKeyPress = true;
             return;
         }
+
         base.OnKeyDown(e);
     }
 
     private static readonly Keys[] KeysToHandle = { Keys.Down, Keys.Up, Keys.Enter, Keys.Escape };
+
     protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
     {
         // the keysstrokes of our interest should not be processed be base class:
diff --git a/Rdmp.UI/TestsAndSetup/GlobalExceptionHandler.cs b/Rdmp.UI/TestsAndSetup/GlobalExceptionHandler.cs
index e387fbc3ab..e7a22b7685 100644
--- a/Rdmp.UI/TestsAndSetup/GlobalExceptionHandler.cs
+++ b/Rdmp.UI/TestsAndSetup/GlobalExceptionHandler.cs
@@ -15,26 +15,25 @@ namespace Rdmp.UI.TestsAndSetup;
 /// </summary>
 public class GlobalExceptionHandler
 {
-    public static GlobalExceptionHandler Instance {get;} = new GlobalExceptionHandler();
+    public static GlobalExceptionHandler Instance { get; } = new();
 
     /// <summary>
     /// What to do when errors occur, changing this discards the old action and sets a new one.  Defaults to launching a non modal <see cref="ExceptionViewer"/>
     /// </summary>
-    public Action<Exception> Handler {get;set;}
+    public Action<Exception> Handler { get; set; }
 
     public GlobalExceptionHandler()
     {
-        Handler = e=>ExceptionViewer.Show(e,false);
+        Handler = e => ExceptionViewer.Show(e, false);
     }
-    internal void Handle(object sender, UnhandledExceptionEventArgs  args)
+
+    internal void Handle(object sender, UnhandledExceptionEventArgs args)
     {
         Handler((Exception)args.ExceptionObject);
-
     }
+
     internal void Handle(object sender, ThreadExceptionEventArgs args)
     {
         Handler(args.Exception);
     }
-
-        
 }
\ No newline at end of file
diff --git a/Rdmp.UI/TestsAndSetup/RDMPBootStrapper.cs b/Rdmp.UI/TestsAndSetup/RDMPBootStrapper.cs
index 149e92cf9c..b97d8e2580 100644
--- a/Rdmp.UI/TestsAndSetup/RDMPBootStrapper.cs
+++ b/Rdmp.UI/TestsAndSetup/RDMPBootStrapper.cs
@@ -19,26 +19,26 @@ namespace Rdmp.UI.TestsAndSetup;
     private readonly EnvironmentInfo _environmentInfo;
     private string catalogueConnection;
     private string dataExportConnection;
-        
+
     /// <summary>
     /// The last used connection string arguments when launching using this factory class.  Typically the boot strapper
     /// should only ever be used once so you can safely query this field but best to check that it is not null anyway.
     /// </summary>
     public static ResearchDataManagementPlatformOptions ApplicationArguments;
+
     private readonly ResearchDataManagementPlatformOptions _args;
     private T _mainForm;
 
-        
+
     public RDMPBootStrapper(EnvironmentInfo environmentInfo, ResearchDataManagementPlatformOptions args)
     {
         ApplicationArguments = args;
         _args = args;
         _environmentInfo = environmentInfo;
-
     }
 
-    private readonly HashSet<string> IgnoreExceptions = new(StringComparer.InvariantCultureIgnoreCase){ 
-            
+    private readonly HashSet<string> IgnoreExceptions = new(StringComparer.InvariantCultureIgnoreCase)
+    {
         // This error seems to come from ObjectTreeView but seems harmless
         "Value cannot be null. (Parameter 'owningItem')"
     };
@@ -49,15 +49,12 @@ public void Show(bool requiresDataExportDatabaseToo)
         Application.SetCompatibleTextRenderingDefault(false);
 
         //tell me when you blow up somewhere in the windows API instead of somewhere sensible
-        Application.ThreadException += (s,e)=>{
-
+        Application.ThreadException += (s, e) =>
+        {
             var msg = e.Exception?.Message;
-            if(msg != null && IgnoreExceptions.Contains(msg))
-            {
-                return;
-            }
+            if (msg != null && IgnoreExceptions.Contains(msg)) return;
 
-            GlobalExceptionHandler.Instance.Handle(s,e);
+            GlobalExceptionHandler.Instance.Handle(s, e);
         };
         Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
         AppDomain.CurrentDomain.UnhandledException += GlobalExceptionHandler.Instance.Handle;
@@ -70,13 +67,18 @@ public void Show(bool requiresDataExportDatabaseToo)
         }
         catch (Exception ex)
         {
-            if(!string.IsNullOrWhiteSpace(_args.ConnectionStringsFile))
+            if (!string.IsNullOrWhiteSpace(_args.ConnectionStringsFile))
             {
-                var viewer = new ExceptionViewer("Failed to get connection strings", $"ConnectionStringsFile was '{_args.ConnectionStringsFile}'{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(ex)}", ex);
+                var viewer = new ExceptionViewer("Failed to get connection strings",
+                    $"ConnectionStringsFile was '{_args.ConnectionStringsFile}'{Environment.NewLine}{ExceptionHelper.ExceptionToListOfInnerMessages(ex)}",
+                    ex);
                 viewer.ShowDialog();
             }
             else
+            {
                 ExceptionViewer.Show("Failed to get connection strings", ex);
+            }
+
             return;
         }
 
@@ -85,12 +87,12 @@ public void Show(bool requiresDataExportDatabaseToo)
             //show the startup dialog
             var startup = new Startup(_environmentInfo) { SkipPatching = _args.SkipPatching };
 
-            if(!string.IsNullOrWhiteSpace(_args.Dir))
+            if (!string.IsNullOrWhiteSpace(_args.Dir))
             {
                 startup.RepositoryLocator = _args.GetRepositoryLocator();
             }
-            else
-            if (!string.IsNullOrWhiteSpace(catalogueConnection) && !string.IsNullOrWhiteSpace(dataExportConnection))
+            else if (!string.IsNullOrWhiteSpace(catalogueConnection) &&
+                     !string.IsNullOrWhiteSpace(dataExportConnection))
             {
                 startup.RepositoryLocator = new LinkedRepositoryProvider(catalogueConnection, dataExportConnection);
                 startup.RepositoryLocator.CatalogueRepository.TestConnection();
@@ -109,7 +111,7 @@ public void Show(bool requiresDataExportDatabaseToo)
             //launch the main application form T
             _mainForm = new T();
 
-            typeof (T).GetMethod("SetRepositoryLocator").Invoke(_mainForm,new object[]{startup.RepositoryLocator});
+            typeof(T).GetMethod("SetRepositoryLocator").Invoke(_mainForm, new object[] { startup.RepositoryLocator });
 
             if (startupUI.DoNotContinue)
                 return;
@@ -119,9 +121,7 @@ public void Show(bool requiresDataExportDatabaseToo)
         catch (Exception e)
         {
             if (!string.IsNullOrWhiteSpace(_args.ConnectionStringsFile))
-            {
-                ExceptionViewer.Show($"Startup failed for '{_args.ConnectionStringsFile}'",e);
-            }
+                ExceptionViewer.Show($"Startup failed for '{_args.ConnectionStringsFile}'", e);
             else
                 ExceptionViewer.Show(e);
             return;
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/BeforeCheckingEventArgs.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/BeforeCheckingEventArgs.cs
index aa04828d0b..e9407ae4cb 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/BeforeCheckingEventArgs.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/BeforeCheckingEventArgs.cs
@@ -14,7 +14,7 @@ namespace Rdmp.UI.TestsAndSetup.ServicePropogation;
 public class BeforeCheckingEventArgs : EventArgs
 {
     public ICheckable Checkable { get; private set; }
-    public ICheckNotifier CheckNotifier{ get; private set; }
+    public ICheckNotifier CheckNotifier { get; private set; }
 
     /// <summary>
     /// True to cancel the checking process
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/IObjectCollectionControl.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/IObjectCollectionControl.cs
index 7060051ea5..646d14d1bc 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/IObjectCollectionControl.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/IObjectCollectionControl.cs
@@ -20,7 +20,7 @@ namespace Rdmp.UI.TestsAndSetup.ServicePropogation;
 /// into the persistence text file when the application is exited (via PersistableObjectCollectionDockContent)</para>
 /// 
 /// </summary>
-public interface IObjectCollectionControl:IRDMPControl,ILifetimeSubscriber,INamedTab
+public interface IObjectCollectionControl : IRDMPControl, ILifetimeSubscriber, INamedTab
 {
     /// <summary>
     /// Provides a fully hydrated collection either created by a user action or by deserializing a persistence string in PersistableObjectCollectionDockContent.  Either way the
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/IRDMPSingleDatabaseObjectControl.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/IRDMPSingleDatabaseObjectControl.cs
index 49b3ae5e60..decdd74aa0 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/IRDMPSingleDatabaseObjectControl.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/IRDMPSingleDatabaseObjectControl.cs
@@ -12,7 +12,8 @@
 
 namespace Rdmp.UI.TestsAndSetup.ServicePropogation;
 
-public interface IRDMPSingleDatabaseObjectControl : IContainerControl, INamedTab, IConsultableBeforeClosing,IRDMPControl
+public interface IRDMPSingleDatabaseObjectControl : IContainerControl, INamedTab, IConsultableBeforeClosing,
+    IRDMPControl
 {
     DatabaseEntity DatabaseObject { get; }
 
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs
index 1ac11d903d..7f3b0f5347 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPControlCommonFunctionality.cs
@@ -60,11 +60,14 @@ public class RDMPControlCommonFunctionality
     private AtomicCommandUIFactory atomicCommandUIFactory;
 
     private readonly RAGSmileyToolStrip _ragSmileyToolStrip;
-    private readonly ToolStripButton _runChecksToolStripButton = new("Run Checks", FamFamFamIcons.arrow_refresh.ImageToBitmap());
+
+    private readonly ToolStripButton _runChecksToolStripButton =
+        new("Run Checks", FamFamFamIcons.arrow_refresh.ImageToBitmap());
+
     private ICheckable _checkable;
     private IActivateItems _activator;
 
-    private Dictionary<string,ToolStripDropDownButton> _dropDownButtons = new();
+    private Dictionary<string, ToolStripDropDownButton> _dropDownButtons = new();
     private Dictionary<string, ToolStripMenuItem> _addToMenuSubmenus = new();
 
 
@@ -84,7 +87,7 @@ public RDMPControlCommonFunctionality(IRDMPControl hostControl)
             Visible = false
         };
         ToolStrip.Items.Add(_menuDropDown);
-                        
+
         _ragSmileyToolStrip = new RAGSmileyToolStrip((Control)_hostControl);
         ToolStrip.Items.Add(_ragSmileyToolStrip);
 
@@ -113,7 +116,8 @@ public void SetItemActivator(IActivateItems activator)
     /// <param name="overrideCommandName"></param>
     /// <param name="overrideImage"></param>
     /// <param name="underMenu">If the command should appear under a submenu dropdown then this should be the name of that root button</param>
-    public void Add(IAtomicCommand cmd, string overrideCommandName = null, Image<Rgba32> overrideImage = null, string underMenu = null)
+    public void Add(IAtomicCommand cmd, string overrideCommandName = null, Image<Rgba32> overrideImage = null,
+        string underMenu = null)
     {
         var p = _hostControl.GetTopmostRDMPUserControl();
         if (p != _hostControl)
@@ -124,14 +128,16 @@ public void Add(IAtomicCommand cmd, string overrideCommandName = null, Image<Rgb
 
         InitializeToolStrip();
 
-        var button = string.IsNullOrWhiteSpace(underMenu)? atomicCommandUIFactory.CreateToolStripItem(cmd) : atomicCommandUIFactory.CreateMenuItem(cmd);
+        var button = string.IsNullOrWhiteSpace(underMenu)
+            ? atomicCommandUIFactory.CreateToolStripItem(cmd)
+            : atomicCommandUIFactory.CreateMenuItem(cmd);
         if (!string.IsNullOrWhiteSpace(overrideCommandName))
             button.Text = overrideCommandName;
 
         if (overrideImage != null)
             button.Image = overrideImage.ImageToBitmap();
 
-        Add(button,underMenu);
+        Add(button, underMenu);
     }
 
     /// <summary>
@@ -154,13 +160,16 @@ public void Add(ToolStripItem item, string underMenu = null)
         if (!string.IsNullOrWhiteSpace(underMenu))
         {
             if (!_dropDownButtons.ContainsKey(underMenu))
-                _dropDownButtons.Add(underMenu,new ToolStripDropDownButton {Text = underMenu,DisplayStyle = ToolStripItemDisplayStyle.Text});
+                _dropDownButtons.Add(underMenu,
+                    new ToolStripDropDownButton { Text = underMenu, DisplayStyle = ToolStripItemDisplayStyle.Text });
 
             _dropDownButtons[underMenu].DropDownItems.Add(item);
             ToolStrip.Items.Add(_dropDownButtons[underMenu]);
         }
         else
+        {
             ToolStrip.Items.Add(item);
+        }
     }
 
     /// <summary>
@@ -213,9 +222,9 @@ public void StartChecking()
             _ragSmileyToolStrip.Enabled = true;
 
             var e = new BeforeCheckingEventArgs(_ragSmileyToolStrip, _checkable);
-            BeforeChecking(this,e);
+            BeforeChecking(this, e);
 
-            if(e.Cancel)
+            if (e.Cancel)
                 return;
         }
 
@@ -266,10 +275,12 @@ public void AddHelpStringToToolStrip(string title, string body)
     public void AddHelp(Control c, string propertyName, string title = null, AnchorStyles anchor = AnchorStyles.None)
     {
         if (_activator == null)
-            throw new Exception("Control not initialized yet, call SetItemActivator before trying to add items to the ToolStrip");
+            throw new Exception(
+                "Control not initialized yet, call SetItemActivator before trying to add items to the ToolStrip");
 
         if (c.Parent == null)
-            throw new NotSupportedException("Control is not in a container.  HelpIcon cannot be added to top level controls");
+            throw new NotSupportedException(
+                "Control is not in a container.  HelpIcon cannot be added to top level controls");
 
         title ??= propertyName;
         var body = _activator.CommentStore.GetDocumentationIfExists(propertyName, false, true);
@@ -309,7 +320,9 @@ public void AddHelpString(Control c, string title, string body, AnchorStyles anc
                 help.Anchor = AnchorStyles.Right | AnchorStyles.Bottom;
         }
         else
+        {
             help.Anchor = anchor;
+        }
 
         c.Parent.Controls.Add(help);
     }
@@ -326,7 +339,7 @@ public void ClearToolStrip()
 
         _menuDropDown.DropDownItems.Clear();
         _menuDropDown.Visible = false;
-            
+
         _addToMenuSubmenus.Clear();
 
         ToolStrip.Items.Add(_menuDropDown);
@@ -344,7 +357,8 @@ public void ClearToolStrip()
     /// <param name="overrideCommandName"></param>
     /// <param name="overrideImage"></param>
     /// <param name="underMenu"></param>
-    public void AddToMenu(IAtomicCommand cmd, string overrideCommandName = null, Image<Rgba32> overrideImage = null,string underMenu = null)
+    public void AddToMenu(IAtomicCommand cmd, string overrideCommandName = null, Image<Rgba32> overrideImage = null,
+        string underMenu = null)
     {
         var p = _hostControl.GetTopmostRDMPUserControl();
         if (p != _hostControl)
@@ -362,7 +376,7 @@ public void AddToMenu(IAtomicCommand cmd, string overrideCommandName = null, Ima
         if (overrideImage != null)
             menuItem.Image = overrideImage.ImageToBitmap();
 
-        AddToMenu(menuItem,underMenu);
+        AddToMenu(menuItem, underMenu);
     }
 
     /// <summary>
@@ -396,8 +410,10 @@ public void AddToMenu(ToolStripItem menuItem, string underMenu = null)
             _menuDropDown.DropDownItems.Add(_addToMenuSubmenus[underMenu]);
         }
         else
+        {
             _menuDropDown.DropDownItems.Add(menuItem);
-    
+        }
+
         _menuDropDown.Visible = true;
     }
 
@@ -419,7 +435,8 @@ public void Add(string label, bool showIcon = true)
     /// <param name="overrideCommandName"></param>
     /// <param name="overrideImage"></param>
     /// <param name="overlayKind"></param>
-    protected void Add(IAtomicCommand cmd, string overrideCommandName, RDMPConcept overrideImage, OverlayKind overlayKind = OverlayKind.None)
+    protected void Add(IAtomicCommand cmd, string overrideCommandName, RDMPConcept overrideImage,
+        OverlayKind overlayKind = OverlayKind.None)
     {
         Add(cmd, overrideCommandName, _activator.CoreIconProvider.GetImage(overrideImage, overlayKind));
     }
@@ -427,11 +444,12 @@ protected void Add(IAtomicCommand cmd, string overrideCommandName, RDMPConcept o
     protected virtual void InitializeToolStrip()
     {
         if (_activator == null)
-            throw new Exception("Control not initialized yet, call SetItemActivator before trying to add items to the ToolStrip");
+            throw new Exception(
+                "Control not initialized yet, call SetItemActivator before trying to add items to the ToolStrip");
 
         ((Control)_hostControl).Controls.Add(ToolStrip);
 
-        ToolStripAddedToHost?.Invoke(this,EventArgs.Empty);
+        ToolStripAddedToHost?.Invoke(this, EventArgs.Empty);
     }
 
     /// <summary>
@@ -462,7 +480,8 @@ public static void DoActionAndRedIfThrows(TextBox tb, Action action)
         }
     }
 
-    private Dictionary<Scintilla,Color> _oldColours = new();
+    private Dictionary<Scintilla, Color> _oldColours = new();
+
     /// <summary>
     /// Sets the text color in the <paramref name="queryEditor"/> to red (or back to normal if <paramref name="red"/> is false).
     /// </summary>
@@ -497,11 +516,11 @@ public void ScintillaGoRed(Scintilla queryEditor, Exception exception)
 Technical Detail:
 Type:{exception.GetType()}
 Stack Trace:{exception.StackTrace}";
-            
+
         queryEditor.ReadOnly = true;
 
         //go red after you have set the text
-        ScintillaGoRed(queryEditor,true);
+        ScintillaGoRed(queryEditor, true);
     }
 
     /// <summary>
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPForm.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPForm.cs
index 5aa6c0c5a6..1279e182f3 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPForm.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPForm.cs
@@ -25,7 +25,7 @@ public class RDMPForm : Form, IRDMPControl
     /// Whether escape keystrokes should trigger form closing (defaults to true).
     /// </summary>
     public bool CloseOnEscape { get; set; }
-        
+
     protected readonly bool VisualStudioDesignMode;
     public IActivateItems Activator { get; private set; }
 
@@ -47,7 +47,7 @@ public RDMPForm()
     /// Constructs the form and initializes the activator
     /// </summary>
     /// <param name="activator"></param>
-    public RDMPForm(IActivateItems activator):this()
+    public RDMPForm(IActivateItems activator) : this()
     {
         SetItemActivator(activator);
     }
@@ -56,7 +56,7 @@ public void SetItemActivator(IActivateItems activator)
     {
         Activator = activator;
     }
-        
+
     private void RDMPForm_KeyDown(object sender, KeyEventArgs e)
     {
         if (((e.KeyCode == Keys.W && e.Control) || e.KeyCode == Keys.Escape) && CloseOnEscape)
@@ -74,15 +74,12 @@ private void RDMPForm_KeyDown(object sender, KeyEventArgs e)
     /// Returns this since RDMPForm is a Form and therefore a top level control
     /// </summary>
     /// <returns></returns>
-    public IRDMPControl GetTopmostRDMPUserControl()
-    {
-        return this;
-    }
+    public IRDMPControl GetTopmostRDMPUserControl() => this;
 
     public event EventHandler<bool> UnSavedChanges;
 
     public void SetUnSavedChanges(bool b)
     {
-        UnSavedChanges?.Invoke(this,b);
+        UnSavedChanges?.Invoke(this, b);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs
index 1878e2a073..457575fbae 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPSingleDatabaseObjectControl.cs
@@ -29,7 +29,8 @@ namespace Rdmp.UI.TestsAndSetup.ServicePropogation;
 /// </summary>
 /// <typeparam name="T"></typeparam>
 [TechnicalUI]
-public abstract class RDMPSingleDatabaseObjectControl<T> : RDMPUserControl, IRDMPSingleDatabaseObjectControl where T : DatabaseEntity
+public abstract class RDMPSingleDatabaseObjectControl<T> : RDMPUserControl, IRDMPSingleDatabaseObjectControl
+    where T : DatabaseEntity
 {
     /// <summary>
     /// True to track changes made to the <see cref="DatabaseObject"/> hosted by this control
@@ -68,12 +69,12 @@ protected RDMPSingleDatabaseObjectControl()
     public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject)
     {
         SetItemActivator(activator);
-        Activator.RefreshBus.EstablishSelfDestructProtocol(this,activator,databaseObject);
+        Activator.RefreshBus.EstablishSelfDestructProtocol(this, activator, databaseObject);
         DatabaseObject = databaseObject;
 
         CommonFunctionality.ClearToolStrip();
 
-        if(_colorIndicator == null && AssociatedCollection != RDMPCollection.None)
+        if (_colorIndicator == null && AssociatedCollection != RDMPCollection.None)
         {
             _colorIndicator = new Control
             {
@@ -87,16 +88,16 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject
         }
 
         _readonlyIndicator ??= new Label
-            {
-                Dock = DockStyle.Top,
-                Location = new Point(0, 0),
-                Size = new Size(150, 20),
-                TabIndex = 0,
-                TextAlign = ContentAlignment.MiddleLeft,
-                BackColor = SystemColors.HotTrack,
-                Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold, GraphicsUnit.Point, (byte)0),
-                ForeColor = Color.Moccasin
-            };
+        {
+            Dock = DockStyle.Top,
+            Location = new Point(0, 0),
+            Size = new Size(150, 20),
+            TabIndex = 0,
+            TextAlign = ContentAlignment.MiddleLeft,
+            BackColor = SystemColors.HotTrack,
+            Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold, GraphicsUnit.Point, (byte)0),
+            ForeColor = Color.Moccasin
+        };
 
         if (databaseObject is IMightBeReadOnly ro)
         {
@@ -118,11 +119,12 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject
 
         SetBindings(_binder, databaseObject);
 
-        if(this is ISaveableUI)
+        if (this is ISaveableUI)
         {
-            if(UseCommitSystem && CurrentCommit == null && Activator.UseCommits())
+            if (UseCommitSystem && CurrentCommit == null && Activator.UseCommits())
             {
-                CurrentCommit = new CommitInProgress(activator.RepositoryLocator, new CommitInProgressSettings(databaseObject));
+                CurrentCommit = new CommitInProgress(activator.RepositoryLocator,
+                    new CommitInProgressSettings(databaseObject));
                 ObjectSaverButton1.BeforeSave += BeforeSave_FinishCommitInProgressIfAny;
                 ObjectSaverButton1.AfterSave += AfterSave_BeginNewCommitIfApplicable;
             }
@@ -135,7 +137,7 @@ public virtual void SetDatabaseObject(IActivateItems activator, T databaseObject
         foreach (var cmd in gotoFactory.GetCommands(databaseObject).OfType<ExecuteCommandShow>())
         {
             cmd.SuggestedCategory = AtomicCommandFactory.GoTo;
-            CommonFunctionality.AddToMenu(cmd,null,null,AtomicCommandFactory.GoTo);
+            CommonFunctionality.AddToMenu(cmd, null, null, AtomicCommandFactory.GoTo);
         }
     }
 
@@ -151,13 +153,9 @@ protected bool BeforeSave_FinishCommitInProgressIfAny(DatabaseEntity _)
             return true;
 
         if (CurrentCommit != null)
-        {
             if (CurrentCommit.TryFinish(Activator) == null)
-            {
                 // No changes were actually made or user cancelled
                 return false;
-            }
-        }
 
         // before starting a new commit cleanup old one
         CurrentCommit?.Dispose();
@@ -171,10 +169,9 @@ protected bool BeforeSave_FinishCommitInProgressIfAny(DatabaseEntity _)
     private void AfterSave_BeginNewCommitIfApplicable()
     {
         if (CurrentCommit == null && UseCommitSystem && Activator.UseCommits())
-        {
             // start a new commit for the next changes the user commits
-            CurrentCommit = new CommitInProgress(Activator.RepositoryLocator, new CommitInProgressSettings(DatabaseObject));
-        }
+            CurrentCommit =
+                new CommitInProgress(Activator.RepositoryLocator, new CommitInProgressSettings(DatabaseObject));
     }
 
     private void CommonFunctionality_ToolStripAddedToHost(object sender, EventArgs e)
@@ -184,7 +181,6 @@ private void CommonFunctionality_ToolStripAddedToHost(object sender, EventArgs e
 
     protected virtual void SetBindings(BinderWithErrorProviderFactory rules, T databaseObject)
     {
-
     }
 
     /// <summary>
@@ -197,13 +193,12 @@ protected virtual void SetBindings(BinderWithErrorProviderFactory rules, T datab
     /// <param name="getter"></param>
     /// <param name="formattingEnabled"></param>
     /// <param name="updateMode"></param>
-    protected void Bind(Control c, string propertyName, string dataMember, Func<T, object> getter, bool formattingEnabled = true,DataSourceUpdateMode updateMode = DataSourceUpdateMode.OnPropertyChanged)
+    protected void Bind(Control c, string propertyName, string dataMember, Func<T, object> getter,
+        bool formattingEnabled = true, DataSourceUpdateMode updateMode = DataSourceUpdateMode.OnPropertyChanged)
     {
         //workaround for only comitting lists on loose focus
         if (c is ComboBox box && box.DropDownStyle == ComboBoxStyle.DropDownList && propertyName.Equals("SelectedItem"))
-        {
-            box.SelectionChangeCommitted += (s,e)=>box.DataBindings["SelectedItem"].WriteValue();
-        }
+            box.SelectionChangeCommitted += (s, e) => box.DataBindings["SelectedItem"].WriteValue();
 
         _binder.Bind(c, propertyName, (T)DatabaseObject, dataMember, formattingEnabled, updateMode, getter);
     }
@@ -219,7 +214,6 @@ protected void SetDate(TextBox tb, Action<DateTime?> action)
     {
         try
         {
-
             if (string.IsNullOrWhiteSpace(tb.Text))
             {
                 action(null);
@@ -230,7 +224,6 @@ protected void SetDate(TextBox tb, Action<DateTime?> action)
             action(dateTime);
 
             tb.ForeColor = Color.Black;
-
         }
         catch (Exception)
         {
@@ -257,7 +250,6 @@ protected void SetUrl(TextBox tb, Action<Uri> action)
             var u = new Uri(tb.Text);
             action(u);
             tb.ForeColor = Color.Black;
-
         }
         catch (UriFormatException)
         {
@@ -267,13 +259,10 @@ protected void SetUrl(TextBox tb, Action<Uri> action)
 
     public void SetDatabaseObject(IActivateItems activator, DatabaseEntity databaseObject)
     {
-        SetDatabaseObject(activator,(T)databaseObject);
+        SetDatabaseObject(activator, (T)databaseObject);
     }
 
-    public Type GetTypeOfT()
-    {
-        return typeof (T);
-    }
+    public Type GetTypeOfT() => typeof(T);
 
     public virtual string GetTabName()
     {
@@ -287,10 +276,7 @@ public virtual string GetTabName()
         return "Unamed Tab";
     }
 
-    public virtual string GetTabToolTip()
-    {
-        return null;
-    }
+    public virtual string GetTabToolTip() => null;
 
     /// <summary>
     /// Triggers an application refresh because a change has been made to <paramref name="e"/>
@@ -315,19 +301,20 @@ protected void PublishToSelfOnly()
     {
         SetDatabaseObject(Activator, DatabaseObject);
     }
-    public virtual void ConsultAboutClosing(object sender, FormClosingEventArgs e) {}
 
-    public virtual ObjectSaverButton GetObjectSaverButton()
+    public virtual void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
-        return ObjectSaverButton1;
     }
+
+    public virtual ObjectSaverButton GetObjectSaverButton() => ObjectSaverButton1;
+
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
 
         CurrentCommit?.Dispose();
 
-        if(ObjectSaverButton1 != null)
+        if (ObjectSaverButton1 != null)
         {
             ObjectSaverButton1.BeforeSave -= BeforeSave_FinishCommitInProgressIfAny;
             ObjectSaverButton1.AfterSave -= AfterSave_BeginNewCommitIfApplicable;
diff --git a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPUserControl.cs b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPUserControl.cs
index 070d48b5c7..d5583bb0b1 100644
--- a/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPUserControl.cs
+++ b/Rdmp.UI/TestsAndSetup/ServicePropogation/RDMPUserControl.cs
@@ -27,7 +27,7 @@ public abstract class RDMPUserControl : UserControl, IRDMPControl
 
     protected readonly bool VisualStudioDesignMode;
 
-        
+
     //constructor
     protected RDMPUserControl()
     {
@@ -47,21 +47,18 @@ public virtual void SetItemActivator(IActivateItems activator)
     /// </summary>
     protected virtual void OnBeforeChecking()
     {
-            
     }
 
     /// <summary>
     /// Returns the topmost control which implements <see cref="RDMPUserControl"/>
     /// </summary>
-    public IRDMPControl GetTopmostRDMPUserControl()
-    {
-        return GetTopmostRDMPUserControl(this, this);
-    }
-        
+    public IRDMPControl GetTopmostRDMPUserControl() => GetTopmostRDMPUserControl(this, this);
+
     public event EventHandler<bool> UnSavedChanges;
+
     public void SetUnSavedChanges(bool b)
     {
-        UnSavedChanges?.Invoke(this,b);
+        UnSavedChanges?.Invoke(this, b);
     }
 
     private IRDMPControl GetTopmostRDMPUserControl(Control c, RDMPUserControl found)
diff --git a/Rdmp.UI/TestsAndSetup/StartupUI.cs b/Rdmp.UI/TestsAndSetup/StartupUI.cs
index 26e003bc4c..c0283a1015 100644
--- a/Rdmp.UI/TestsAndSetup/StartupUI.cs
+++ b/Rdmp.UI/TestsAndSetup/StartupUI.cs
@@ -36,18 +36,19 @@ public partial class StartupUI : Form, ICheckNotifier
     public bool CouldNotReachTier1Database { get; private set; }
 
     private readonly Startup _startup;
+
     //Constructor
     public StartupUI(Startup startup)
     {
         _startup = startup;
-            
+
         InitializeComponent();
-            
-        if(_startup == null)
+
+        if (_startup == null)
             return;
 
         Text = $"RDMP - v{GetVersion()}";
-            
+
         _startup.DatabaseFound += StartupDatabaseFound;
         _startup.MEFFileDownloaded += StartupMEFFileDownloaded;
         _startup.PluginPatcherFound += StartupPluginPatcherFound;
@@ -77,7 +78,7 @@ public static string GetVersion()
 
     private void StartupDatabaseFound(object sender, PlatformDatabaseFoundEventArgs eventArgs)
     {
-        if(IsDisposed || !IsHandleCreated)
+        if (IsDisposed || !IsHandleCreated)
             return;
 
         if (InvokeRequired)
@@ -96,12 +97,13 @@ private void StartupMEFFileDownloaded(object sender, MEFFileDownloadProgressEven
             Invoke(new MethodInvoker(() => StartupMEFFileDownloaded(sender, eventArgs)));
             return;
         }
-                        
+
         //25% to 50% is downloading MEF
-        pbLoadProgress.Value = (int) (250 + (float)eventArgs.CurrentDllNumber / (float)eventArgs.DllsSeenInCatalogue * 250f);
+        pbLoadProgress.Value =
+            (int)(250 + (float)eventArgs.CurrentDllNumber / (float)eventArgs.DllsSeenInCatalogue * 250f);
 
         lblProgress.Text = $"Downloading MEF File {eventArgs.FileBeingProcessed}";
-            
+
         if (eventArgs.Status == MEFFileDownloadEventStatus.OtherError)
             ragSmiley1.Fatal(eventArgs.Exception);
     }
@@ -113,8 +115,8 @@ private void StartupPluginPatcherFound(object sender, PluginPatcherFoundEventArg
             Invoke(new MethodInvoker(() => StartupPluginPatcherFound(sender, eventArgs)));
             return;
         }
-                        
-        pbLoadProgress.Value = 800;//80% done
+
+        pbLoadProgress.Value = 800; //80% done
     }
 
     private bool escapePressed = false;
@@ -122,17 +124,17 @@ private void StartupPluginPatcherFound(object sender, PluginPatcherFoundEventArg
 
     private void StartupComplete()
     {
-        if(InvokeRequired)
+        if (InvokeRequired)
         {
             Invoke(new MethodInvoker(StartupComplete));
             return;
         }
-            
+
         if (_startup is { RepositoryLocator.CatalogueRepository: not null })
             WideMessageBox.CommentStore = _startup.RepositoryLocator.CatalogueRepository.CommentStore;
-            
+
         //when things go badly leave the form
-        if(ragSmiley1.IsFatal() || CouldNotReachTier1Database)
+        if (ragSmiley1.IsFatal() || CouldNotReachTier1Database)
             return;
 
         var t = new Timer
@@ -147,15 +149,15 @@ private void StartupComplete()
 
     private void TimerTick(object sender, EventArgs e)
     {
-        var t = (Timer) sender;
-            
-        if(escapePressed)
+        var t = (Timer)sender;
+
+        if (escapePressed)
         {
             t.Stop();
             return;
         }
 
-        countDownToClose --;
+        countDownToClose--;
 
         lblProgress.Text = $"Startup Complete... Closing in {countDownToClose}s (Esc to cancel)";
 
@@ -172,7 +174,6 @@ protected override void OnLoad(EventArgs e)
             return;
 
         StartOrRestart(false);
-            
     }
 
     private void StartOrRestart(bool forceClearRepositorySettings)
@@ -180,7 +181,6 @@ private void StartOrRestart(bool forceClearRepositorySettings)
         pbLoadProgress.Maximum = 1000;
 
         if (_startup.RepositoryLocator == null || forceClearRepositorySettings)
-        {
             try
             {
                 lblProgress.Text = "Constructing UserSettingsRepositoryFinder";
@@ -192,12 +192,11 @@ private void StartOrRestart(bool forceClearRepositorySettings)
                 lblProgress.Text = "Constructing UserSettingsRepositoryFinder Failed";
                 ragSmiley1.Fatal(ex);
             }
-        }
 
         escapePressed = false;
         countDownToClose = 5;
         lastStatus = RDMPPlatformDatabaseStatus.Healthy;
-            
+
         //10% progress because we connected to user settings
         pbLoadProgress.Value = 100;
 
@@ -213,12 +212,11 @@ private void StartOrRestart(bool forceClearRepositorySettings)
                 }
                 catch (Exception ex)
                 {
-                    if(IsDisposed || !IsHandleCreated)
+                    if (IsDisposed || !IsHandleCreated)
                         ExceptionViewer.Show(ex);
                     else
                         Invoke(new MethodInvoker(() => ragSmiley1.Fatal(ex)));
                 }
-
             }
         );
         t.Start();
@@ -231,11 +229,11 @@ private void StartOrRestart(bool forceClearRepositorySettings)
     private void HandleDatabaseFoundOnSimpleUI(PlatformDatabaseFoundEventArgs eventArgs)
     {
         //if status got worse
-        if (eventArgs.Status < lastStatus )
+        if (eventArgs.Status < lastStatus)
             lastStatus = eventArgs.Status;
 
         //if we are unable to reach a tier 1 database don't report anything else
-        if(CouldNotReachTier1Database)
+        if (CouldNotReachTier1Database)
             return;
 
         lblProgress.Text = $"{eventArgs.Patcher.Name} database status was {eventArgs.Status}";
@@ -248,29 +246,38 @@ private void HandleDatabaseFoundOnSimpleUI(PlatformDatabaseFoundEventArgs eventA
                 {
                     pbDisconnected.Visible = true;
 
-                    lblProgress.Text = eventArgs.Repository == null ? "RDMP Platform Databases are not set" : $"Could not reach {eventArgs.Patcher.Name}";
+                    lblProgress.Text = eventArgs.Repository == null
+                        ? "RDMP Platform Databases are not set"
+                        : $"Could not reach {eventArgs.Patcher.Name}";
 
                     CouldNotReachTier1Database = true;
 
                     ragSmiley1.Fatal(new Exception(
-                        $"Core Platform Database was {eventArgs.Status} ({eventArgs.Patcher.Name})", eventArgs.Exception));
+                        $"Core Platform Database was {eventArgs.Status} ({eventArgs.Patcher.Name})",
+                        eventArgs.Exception));
                 }
                 else
+                {
                     ragSmiley1.Warning(new Exception(
-                        $"Tier {eventArgs.Patcher.Tier} Database was {eventArgs.Status} ({eventArgs.Patcher.Name})", eventArgs.Exception));
+                        $"Tier {eventArgs.Patcher.Tier} Database was {eventArgs.Status} ({eventArgs.Patcher.Name})",
+                        eventArgs.Exception));
+                }
+
                 break;
 
             case RDMPPlatformDatabaseStatus.Broken:
                 if (eventArgs.Patcher.Tier == 1)
                     ragSmiley1.Fatal(new Exception(
-                        $"Core Platform Database was {eventArgs.Status} ({eventArgs.Patcher.Name})", eventArgs.Exception));
+                        $"Core Platform Database was {eventArgs.Status} ({eventArgs.Patcher.Name})",
+                        eventArgs.Exception));
                 else
                     ragSmiley1.Warning(new Exception(
-                        $"Tier {eventArgs.Patcher.Tier} Database was {eventArgs.Status} ({eventArgs.Patcher.Name})", eventArgs.Exception));
+                        $"Tier {eventArgs.Patcher.Tier} Database was {eventArgs.Status} ({eventArgs.Patcher.Name})",
+                        eventArgs.Exception));
                 break;
 
             case RDMPPlatformDatabaseStatus.RequiresPatching:
-                    
+
                 if (MessageBox.Show($"Patching Required on database of type {eventArgs.Patcher.Name}", "Patch",
                         MessageBoxButtons.YesNo) == DialogResult.Yes)
                 {
@@ -287,14 +294,16 @@ private void HandleDatabaseFoundOnSimpleUI(PlatformDatabaseFoundEventArgs eventA
 
                 break;
             case RDMPPlatformDatabaseStatus.Healthy:
-                ragSmiley1.OnCheckPerformed(new CheckEventArgs(eventArgs.SummariseAsString(),CheckResult.Success));
+                ragSmiley1.OnCheckPerformed(new CheckEventArgs(eventArgs.SummariseAsString(), CheckResult.Success));
                 return;
             case RDMPPlatformDatabaseStatus.SoftwareOutOfDate:
-                if(!_haveWarnedAboutOutOfDate)
+                if (!_haveWarnedAboutOutOfDate)
                 {
-                    MessageBox.Show("The RDMP database you are connecting to is running a newer schema to your software, please consider updating the software to the latest version");
+                    MessageBox.Show(
+                        "The RDMP database you are connecting to is running a newer schema to your software, please consider updating the software to the latest version");
                     _haveWarnedAboutOutOfDate = true;
                 }
+
                 return;
             default:
                 throw new ArgumentOutOfRangeException();
@@ -304,9 +313,8 @@ private void HandleDatabaseFoundOnSimpleUI(PlatformDatabaseFoundEventArgs eventA
     //MEF only!
     public bool OnCheckPerformed(CheckEventArgs args)
     {
-        if(InvokeRequired)
+        if (InvokeRequired)
         {
-
             Invoke(new MethodInvoker(() => OnCheckPerformed(args)));
             return false;
         }
@@ -318,28 +326,29 @@ public bool OnCheckPerformed(CheckEventArgs args)
         if (match.Success)
         {
             var percent = float.Parse(match.Groups[1].Value);
-            pbLoadProgress.Value = (int) (500 + percent*2.5);//500-750
+            pbLoadProgress.Value = (int)(500 + percent * 2.5); //500-750
         }
-             
+
         switch (args.Result)
         {
             case CheckResult.Success:
                 break;
             case CheckResult.Warning:
             case CheckResult.Fail:
-                    
+
                 //MEF failures are only really warnings
                 args.Result = CheckResult.Warning;
                 break;
             default:
                 throw new ArgumentOutOfRangeException();
         }
+
         lblProgress.Text = args.Message;
 
         return ragSmiley1.OnCheckPerformed(args);
     }
 
-        
+
     private void StartupUIMainForm_KeyUp(object sender, KeyEventArgs e)
     {
         if (e.KeyCode == Keys.Escape)
@@ -348,19 +357,18 @@ private void StartupUIMainForm_KeyUp(object sender, KeyEventArgs e)
 
     private void StartupUIMainForm_FormClosing(object sender, FormClosingEventArgs e)
     {
-        if(_choosePlatformsUI is { ChangesMade: true })
+        if (_choosePlatformsUI is { ChangesMade: true })
             DoNotContinue = true;
 
         if (e.CloseReason == CloseReason.UserClosing)
-            if ( ragSmiley1.IsFatal())
+            if (ragSmiley1.IsFatal())
                 DoNotContinue = true;
     }
-        
+
     private void BtnChoosePlatformDatabases_Click(object sender, EventArgs e)
     {
         _choosePlatformsUI = new ChoosePlatformDatabasesUI(_startup.RepositoryLocator);
         _choosePlatformsUI.ShowDialog();
-            
     }
 
     private void pbDisconnected_Click(object sender, EventArgs e)
diff --git a/Rdmp.UI/Theme/BackColorProvider.cs b/Rdmp.UI/Theme/BackColorProvider.cs
index 2ce0333962..998ab19f86 100644
--- a/Rdmp.UI/Theme/BackColorProvider.cs
+++ b/Rdmp.UI/Theme/BackColorProvider.cs
@@ -38,9 +38,11 @@ public static Image GetBackgroundImage(Size size, RDMPCollection collection)
         var bmp = new Bitmap(size.Width, size.Height);
 
         using (var g = Graphics.FromImage(bmp))
-            g.FillRectangle(new SolidBrush(GetColor(collection)), 2, size.Height - IndicatorBarSuggestedHeight, size.Width - 4, IndicatorBarSuggestedHeight);
+        {
+            g.FillRectangle(new SolidBrush(GetColor(collection)), 2, size.Height - IndicatorBarSuggestedHeight,
+                size.Width - 4, IndicatorBarSuggestedHeight);
+        }
 
         return bmp;
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/ToolStripTimeout.cs b/Rdmp.UI/ToolStripTimeout.cs
index 26c96d5888..5e841d6bfe 100644
--- a/Rdmp.UI/ToolStripTimeout.cs
+++ b/Rdmp.UI/ToolStripTimeout.cs
@@ -17,7 +17,7 @@ namespace Rdmp.UI;
 public class ToolStripTimeout
 {
     private ToolStripLabel timeoutLabel = new("Timeout:");
-    private ToolStripTextBox tbTimeout = new() { Text = "300"};
+    private ToolStripTextBox tbTimeout = new() { Text = "300" };
     private int _timeout;
 
     public int Timeout
@@ -34,6 +34,7 @@ public ToolStripTimeout()
     {
         tbTimeout.TextChanged += tbTimeout_TextChanged;
     }
+
     public IEnumerable<ToolStripItem> GetControls()
     {
         yield return timeoutLabel;
diff --git a/Rdmp.UI/TransparentHelpSystem/HelpBox.cs b/Rdmp.UI/TransparentHelpSystem/HelpBox.cs
index 8b9ae5f4e6..6d04bb9224 100644
--- a/Rdmp.UI/TransparentHelpSystem/HelpBox.cs
+++ b/Rdmp.UI/TransparentHelpSystem/HelpBox.cs
@@ -20,6 +20,7 @@ public partial class HelpBox : UserControl
     public const int FixedFormWidth = 400;
 
     public event Action OptionTaken;
+
     public HelpBox(HelpWorkflow workFlow, string text, string optionIfAny)
     {
         _workFlow = workFlow;
@@ -30,29 +31,25 @@ public HelpBox(HelpWorkflow workFlow, string text, string optionIfAny)
             text = "Some useful text which will help guide the user to perform an activity";
             optionIfAny = "Some alternate option button the user can click";
         }
-            
+
         lblHelp.Text = text;
 
         btnOption1.Text = optionIfAny;
         btnOption1.Visible = !string.IsNullOrWhiteSpace(optionIfAny);
 
         if (string.IsNullOrWhiteSpace(optionIfAny))
-        {
             //make label fill whole form
             lblHelp.Height = panel1.Height;
-        }
 
-        btnOption1.Click += (s, e) =>
-        {
-            OptionTaken?.Invoke();
-        };
-            
-        Size = GetSizeOfHelpBoxFor(text,!string.IsNullOrWhiteSpace(optionIfAny));
+        btnOption1.Click += (s, e) => { OptionTaken?.Invoke(); };
+
+        Size = GetSizeOfHelpBoxFor(text, !string.IsNullOrWhiteSpace(optionIfAny));
     }
 
     private Size GetSizeOfHelpBoxFor(string text, bool hasOptionButtons)
     {
-        var basicSize =  TextRenderer.MeasureText(text, SystemFonts.DefaultFont, new Size(FixedFormWidth, 0),TextFormatFlags.WordBreak);
+        var basicSize = TextRenderer.MeasureText(text, SystemFonts.DefaultFont, new Size(FixedFormWidth, 0),
+            TextFormatFlags.WordBreak);
 
         //if there's an option button and very little text then widen the box
         if (btnOption1.Visible)
diff --git a/Rdmp.UI/TransparentHelpSystem/HelpStage.cs b/Rdmp.UI/TransparentHelpSystem/HelpStage.cs
index 20fc4b0390..842ceea415 100644
--- a/Rdmp.UI/TransparentHelpSystem/HelpStage.cs
+++ b/Rdmp.UI/TransparentHelpSystem/HelpStage.cs
@@ -28,6 +28,7 @@ public class HelpStage
     /// surrounding available placement space on the host Form.
     /// </summary>
     public bool UseDefaultPosition { get; set; }
+
     public readonly Point HostLocationForStageBox;
 
     public string OptionButtonText;
@@ -45,7 +46,8 @@ public HelpStage(Control highlightControl, string helpText, params HelpStage[] n
         HandleParams(nextStagesInOrder);
     }
 
-    public HelpStage(Control highlightControl, string helpText, Point hostLocationForStageBox, params HelpStage[] nextStagesInOrder)
+    public HelpStage(Control highlightControl, string helpText, Point hostLocationForStageBox,
+        params HelpStage[] nextStagesInOrder)
     {
         HighlightControl = highlightControl;
         HelpText = helpText;
@@ -55,7 +57,9 @@ public HelpStage(Control highlightControl, string helpText, Point hostLocationFo
         HandleParams(nextStagesInOrder);
     }
 
-    public HelpStage(Control highlightControl, string helpText, Func<bool> moveOnWhenConditionMet,int pollMilliseconds = 300, params HelpStage[] nextStagesInOrder):this(highlightControl,helpText,nextStagesInOrder)
+    public HelpStage(Control highlightControl, string helpText, Func<bool> moveOnWhenConditionMet,
+        int pollMilliseconds = 300, params HelpStage[] nextStagesInOrder) : this(highlightControl, helpText,
+        nextStagesInOrder)
     {
         _moveOnWhenConditionMet = moveOnWhenConditionMet;
         _pollMilliseconds = pollMilliseconds;
@@ -69,11 +73,11 @@ public HelpStage(Control highlightControl, string helpText, Func<bool> moveOnWhe
     /// <returns></returns>
     public async Task<bool> Await(CancellationToken token)
     {
-        if(_moveOnWhenConditionMet == null)
+        if (_moveOnWhenConditionMet == null)
             return false;
 
         while (!token.IsCancellationRequested && !_moveOnWhenConditionMet())
-            await Task.Delay(_pollMilliseconds,token);
+            await Task.Delay(_pollMilliseconds, token);
 
         return !token.IsCancellationRequested;
     }
diff --git a/Rdmp.UI/TransparentHelpSystem/HelpWorkflow.cs b/Rdmp.UI/TransparentHelpSystem/HelpWorkflow.cs
index 4ec48ebd89..c3c40f0dc9 100644
--- a/Rdmp.UI/TransparentHelpSystem/HelpWorkflow.cs
+++ b/Rdmp.UI/TransparentHelpSystem/HelpWorkflow.cs
@@ -27,8 +27,9 @@ public class HelpWorkflow
     private CancellationTokenSource _cancellationTokenSource;
     public HelpStage RootStage { get; set; }
     public HelpStage CurrentStage { get; set; }
-        
-    public HelpWorkflow(Control hostControl, Guid workflowGuid, IHelpWorkflowProgressProvider progressProvider):this(hostControl,null,progressProvider)
+
+    public HelpWorkflow(Control hostControl, Guid workflowGuid, IHelpWorkflowProgressProvider progressProvider) : this(
+        hostControl, null, progressProvider)
     {
         WorkflowGuid = workflowGuid;
     }
@@ -47,10 +48,10 @@ public void Start(bool force = false)
     {
         if (RootStage == null)
             throw new Exception("No RootStage exists for Help, you will need to create one");
-            
-        if(!force && !ProgressProvider.ShouldShowUserWorkflow(this))
+
+        if (!force && !ProgressProvider.ShouldShowUserWorkflow(this))
             return;
-            
+
         _cancellationTokenSource = new CancellationTokenSource();
 
         _help = new TransparentHelpForm(HostControl);
@@ -61,7 +62,7 @@ public void Start(bool force = false)
             _helpClosed = true;
             _cancellationTokenSource.Cancel();
         };
-            
+
         ShowStage(RootStage);
     }
 
@@ -73,24 +74,24 @@ public void ShowStage(HelpStage stage)
 
         if (HostControl.InvokeRequired)
         {
-            HostControl.Invoke(new MethodInvoker(()=>ShowStage(stage)));
+            HostControl.Invoke(new MethodInvoker(() => ShowStage(stage)));
             return;
         }
 
         CurrentStage = stage;
 
-        var helpBox = _help.ShowStage(this,CurrentStage);
+        var helpBox = _help.ShowStage(this, CurrentStage);
         helpBox.OptionTaken += () => ShowStage(CurrentStage.OptionDestination);
 
         var t = stage.Await(_cancellationTokenSource.Token);
         t.ContinueWith(r =>
         {
-            if(r.IsFaulted || r.IsCanceled)
+            if (r.IsFaulted || r.IsCanceled)
                 Abandon();
             else
                 try
                 {
-                    if(r.Result)
+                    if (r.Result)
                         ShowNextStageOrClose();
                 }
                 catch (Exception)
@@ -107,7 +108,7 @@ public bool ShowNextStageOrClose()
             return false;
 
         if (HostControl.InvokeRequired)
-            return (bool) HostControl.Invoke(new Func<bool>(ShowNextStageOrClose));
+            return (bool)HostControl.Invoke(new Func<bool>(ShowNextStageOrClose));
 
         //if there is a next stage and help hasn't been closed
         if (CurrentStage != null && CurrentStage.Next != null && !_helpClosed)
@@ -115,7 +116,7 @@ public bool ShowNextStageOrClose()
             ShowStage(CurrentStage.Next);
             return true;
         }
-            
+
         _help.Close();
         return false;
     }
@@ -125,7 +126,7 @@ public bool ShowNextStageOrClose()
     /// </summary>
     public void Abandon()
     {
-        if(_help == null)
+        if (_help == null)
             return;
 
         if (HostControl.InvokeRequired)
@@ -133,6 +134,7 @@ public void Abandon()
             HostControl.Invoke(new MethodInvoker(Abandon));
             return;
         }
+
         ProgressProvider.Completed(this);
         _help.Close();
         _help = null;
diff --git a/Rdmp.UI/TransparentHelpSystem/ProgressTracking/NullHelpWorkflowProgressProvider.cs b/Rdmp.UI/TransparentHelpSystem/ProgressTracking/NullHelpWorkflowProgressProvider.cs
index 88c75e0381..ec20f0b34d 100644
--- a/Rdmp.UI/TransparentHelpSystem/ProgressTracking/NullHelpWorkflowProgressProvider.cs
+++ b/Rdmp.UI/TransparentHelpSystem/ProgressTracking/NullHelpWorkflowProgressProvider.cs
@@ -11,10 +11,7 @@ namespace Rdmp.UI.TransparentHelpSystem.ProgressTracking;
 /// </summary>
 public class NullHelpWorkflowProgressProvider : IHelpWorkflowProgressProvider
 {
-    public bool ShouldShowUserWorkflow(HelpWorkflow workflow)
-    {
-        return true;
-    }
+    public bool ShouldShowUserWorkflow(HelpWorkflow workflow) => true;
 
     public void Completed(HelpWorkflow helpWorkflow)
     {
diff --git a/Rdmp.UI/TransparentHelpSystem/TransparentHelpForm.cs b/Rdmp.UI/TransparentHelpSystem/TransparentHelpForm.cs
index 99e7745652..8b5aebb9b1 100644
--- a/Rdmp.UI/TransparentHelpSystem/TransparentHelpForm.cs
+++ b/Rdmp.UI/TransparentHelpSystem/TransparentHelpForm.cs
@@ -17,7 +17,7 @@ namespace Rdmp.UI.TransparentHelpSystem;
 /// </summary>
 [TechnicalUI]
 [System.ComponentModel.DesignerCategory("")]
-public class TransparentHelpForm:Form
+public class TransparentHelpForm : Form
 {
     private readonly Control _host;
     private Control _highlight;
@@ -46,7 +46,7 @@ public TransparentHelpForm(Control host)
         ShowInTaskbar = false;
         TopMost = true;
 
-        if(Environment.OSVersion.Version.Major >= 6 && DwmIsCompositionEnabled())
+        if (Environment.OSVersion.Version.Major >= 6 && DwmIsCompositionEnabled())
         {
             _transparencyColor = Color.Magenta;
             Opacity = 0.5f;
@@ -62,40 +62,37 @@ public TransparentHelpForm(Control host)
         TransparencyKey = _transparencyColor;
 
         timer.Interval = 100;
-        timer.Tick +=(s,e)=> UpdateLocation();
+        timer.Tick += (s, e) => UpdateLocation();
         timer.Start();
         DoubleBuffered = true;
 
         //if the host is a Form and it closes we should close too
         if (host is Form form)
-            form.FormClosed +=(s,e)=> Close();
+            form.FormClosed += (s, e) => Close();
     }
+
     private void UpdateLocation()
     {
         //move ourself over the hosted control
         if (_host is Form)
         {
-
-            Location =  _host.PointToScreen(new Point(0,0));
+            Location = _host.PointToScreen(new Point(0, 0));
             Width = _host.ClientRectangle.Width;
             Height = _host.ClientRectangle.Height;
         }
         else
         {
-            Location = _host.PointToScreen(_host.Location);//host is not a top level control but an embedded control so get the screen coordinate of the control;
+            Location = _host.PointToScreen(_host
+                .Location); //host is not a top level control but an embedded control so get the screen coordinate of the control;
             Width = _host.Width;
             Height = _host.Height;
         }
 
 
         if (_host.ContainsFocus)
-        {
             ShowWithoutActivate();
-        }
         else
-        {
             Visible = false;
-        }
 
         Invalidate(true);
     }
@@ -104,14 +101,15 @@ protected override void OnPaint(PaintEventArgs e)
     {
         base.OnPaint(e);
 
-        e.Graphics.FillRectangle(Brushes.Black,0,0,Width,Height);
+        e.Graphics.FillRectangle(Brushes.Black, 0, 0, Width, Height);
 
         if (_highlight != null)
         {
-            var screenLocation = _highlight.PointToScreen(new Point(0,0));
+            var screenLocation = _highlight.PointToScreen(new Point(0, 0));
             var clientLocation = PointToClient(screenLocation);
 
-            e.Graphics.FillRectangle(_highlightBrush, clientLocation.X, clientLocation.Y, _highlight.Width, _highlight.Height);
+            e.Graphics.FillRectangle(_highlightBrush, clientLocation.X, clientLocation.Y, _highlight.Width,
+                _highlight.Height);
         }
 
         if (_currentHelpBox != null)
@@ -119,7 +117,8 @@ protected override void OnPaint(PaintEventArgs e)
             var screenLocation = _currentHelpBox.PointToScreen(new Point(0, 0));
             var clientLocation = PointToClient(screenLocation);
 
-            e.Graphics.FillRectangle(_highlightBrush, clientLocation.X, clientLocation.Y, _currentHelpBox.Width, _currentHelpBox.Height);
+            e.Graphics.FillRectangle(_highlightBrush, clientLocation.X, clientLocation.Y, _currentHelpBox.Width,
+                _currentHelpBox.Height);
         }
     }
 
@@ -149,15 +148,18 @@ protected override void WndProc(ref Message m)
     }
 
     private HelpBox _currentHelpBox = null;
-    public HelpBox ShowStage(HelpWorkflow workflow,HelpStage stage)
+
+    public HelpBox ShowStage(HelpWorkflow workflow, HelpStage stage)
     {
-        if(_currentHelpBox != null)
+        if (_currentHelpBox != null)
             _host.Controls.Remove(_currentHelpBox);
 
         _highlight = stage.HighlightControl;
         _currentHelpBox = new HelpBox(workflow, stage.HelpText, stage.OptionButtonText);
 
-        _currentHelpBox.Location = stage.UseDefaultPosition ? GetGoodLocationForHelpBox(_currentHelpBox) : stage.HostLocationForStageBox;
+        _currentHelpBox.Location = stage.UseDefaultPosition
+            ? GetGoodLocationForHelpBox(_currentHelpBox)
+            : stage.HostLocationForStageBox;
 
         _host.Controls.Add(_currentHelpBox);
         _currentHelpBox.BringToFront();
@@ -175,22 +177,22 @@ private Point GetGoodLocationForHelpBox(HelpBox currentHelpBox)
 
         //First let's try to place it like this
         /**************HOST CONTROL BOUNDS*************
-         * 
+         *
          *       HIGHLIGHT
          *       HIGHLIGHT
          *       MSG
-         * 
+         *
          *********************************************/
 
 
         /**************HOST CONTROL BOUNDS*************
-        * 
-        *       HIGHLIGHT
-        *     _ HIGHLIGHT
-        *     ^  MSG<------availableSpaceHorizontally->
-        *     |
-        *     V availableSpaceBelowHighlight
-        *********************************************/
+         *
+         *       HIGHLIGHT
+         *     _ HIGHLIGHT
+         *     ^  MSG<------availableSpaceHorizontally->
+         *     |
+         *     V availableSpaceBelowHighlight
+         *********************************************/
 
         var availableSpaceBelowHighlight = _host.ClientRectangle.Height - highlightBottomLeft.Y;
         var availableSpaceHorizontally = _host.ClientRectangle.Width - highlightBottomLeft.X;
@@ -201,17 +203,17 @@ private Point GetGoodLocationForHelpBox(HelpBox currentHelpBox)
         //there is enough space below
         if (currentHelpBox.Height < availableSpaceBelowHighlight)
         {
-            if(_currentHelpBox.Width < availableSpaceHorizontally)
+            if (_currentHelpBox.Width < availableSpaceHorizontally)
                 return highlightBottomLeft;
 
             //not enough space horizontally so try to move MSG to left till there is enough space
             /**************HOST CONTROL BOUNDS***********
-            * 
-            *       HIGHLIGHT
-            *  <---|HIGHLIGHT
-            *  MSG_MSG_MSGMSG_MSG_MSGMSG_MSG_MSGMSG_MSG_MSG
-            *    
-            *********************************************/
+             *
+             *       HIGHLIGHT
+             *  <---|HIGHLIGHT
+             *  MSG_MSG_MSGMSG_MSG_MSGMSG_MSG_MSGMSG_MSG_MSG
+             *
+             *********************************************/
             return highlightBottomLeft with { X = Math.Max(0, _host.ClientRectangle.Width - currentHelpBox.Width) };
         }
 
@@ -224,7 +226,8 @@ private Point GetGoodLocationForHelpBox(HelpBox currentHelpBox)
                 return highlightTopLeft with { Y = highlightTopLeft.Y - currentHelpBox.Height };
 
             //consider moving X back because message box is so wide (See diagram above)
-            return new Point(Math.Max(0, _host.ClientRectangle.Width - currentHelpBox.Width), highlightTopLeft.Y - currentHelpBox.Height);
+            return new Point(Math.Max(0, _host.ClientRectangle.Width - currentHelpBox.Width),
+                highlightTopLeft.Y - currentHelpBox.Height);
         }
 
         var screenCoordinatesTopRight = _highlight.PointToScreen(new Point(_highlight.ClientRectangle.Width, 0));
@@ -234,16 +237,13 @@ private Point GetGoodLocationForHelpBox(HelpBox currentHelpBox)
         var spaceToRight = _host.ClientRectangle.Width - highlightTopRight.X;
 
         //there is no space at all for this help box (so just overlap it on the bottom left of the screen space available)
-        if(spaceToRight < _currentHelpBox.Width && spaceToLeft < _currentHelpBox.Width)
+        if (spaceToRight < _currentHelpBox.Width && spaceToLeft < _currentHelpBox.Width)
             return new Point(0, _host.ClientRectangle.Height - _currentHelpBox.Height);
 
         //there is space to the right or left so put it in whichever is greater
         if (spaceToRight > spaceToLeft)
             return highlightTopRight;
 
-        return new Point(highlightTopLeft.X - _currentHelpBox.Width,0);
-
-
-
+        return new Point(highlightTopLeft.X - _currentHelpBox.Width, 0);
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/TreeHelper/TreeNodeParentFinder.cs b/Rdmp.UI/TreeHelper/TreeNodeParentFinder.cs
index 817657466a..11054b44c2 100644
--- a/Rdmp.UI/TreeHelper/TreeNodeParentFinder.cs
+++ b/Rdmp.UI/TreeHelper/TreeNodeParentFinder.cs
@@ -19,6 +19,7 @@ public TreeNodeParentFinder(TreeListView tree)
     {
         _tree = tree;
     }
+
     public T GetFirstOrNullParentRecursivelyOfType<T>(object modelObject) where T : class
     {
         //get parent of node
@@ -26,8 +27,8 @@ public T GetFirstOrNullParentRecursivelyOfType<T>(object modelObject) where T :
 
         //if there is no parent
         if (parent == null)
-            return default;//return null
-            
+            return default; //return null
+
         //if parent is correct type return it
         if (parent is T correctType)
             return correctType;
@@ -36,14 +37,14 @@ public T GetFirstOrNullParentRecursivelyOfType<T>(object modelObject) where T :
         return GetFirstOrNullParentRecursivelyOfType<T>(parent);
     }
 
-    public T GetLastOrNullParentRecursivelyOfType<T>(object modelObject,T lastOneFound = null) where T:class
+    public T GetLastOrNullParentRecursivelyOfType<T>(object modelObject, T lastOneFound = null) where T : class
     {
         //get parent of node
         var parent = _tree.GetParent(modelObject);
 
         //if there are no parents
         if (parent == null)
-            return lastOneFound;//return what we found (if any)
+            return lastOneFound; //return what we found (if any)
 
         //found a parent of the correct type
         if (parent is T correctType)
@@ -51,6 +52,5 @@ public T GetLastOrNullParentRecursivelyOfType<T>(object modelObject,T lastOneFou
 
         //but either way we need to look further up for the last one
         return GetLastOrNullParentRecursivelyOfType<T>(parent, lastOneFound);
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Tutorials/Tutorial.cs b/Rdmp.UI/Tutorials/Tutorial.cs
index 73338da840..0439ba0986 100644
--- a/Rdmp.UI/Tutorials/Tutorial.cs
+++ b/Rdmp.UI/Tutorials/Tutorial.cs
@@ -29,7 +29,7 @@ public class Tutorial
     public bool UserHasSeen
     {
         get => UserSettings.GetTutorialDone(Guid);
-        set => UserSettings.SetTutorialDone(Guid,value);
+        set => UserSettings.SetTutorialDone(Guid, value);
     }
 
     public Tutorial(string name, ICommandExecution commandExecutionExecution, Guid guid)
@@ -39,5 +39,4 @@ public Tutorial(string name, ICommandExecution commandExecutionExecution, Guid g
         Guid = guid;
         CommandType = commandExecutionExecution.GetType();
     }
-
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Tutorials/TutorialTracker.cs b/Rdmp.UI/Tutorials/TutorialTracker.cs
index a07f25e4c1..4b785ed23b 100644
--- a/Rdmp.UI/Tutorials/TutorialTracker.cs
+++ b/Rdmp.UI/Tutorials/TutorialTracker.cs
@@ -28,7 +28,7 @@ public class TutorialTracker : IHelpWorkflowProgressProvider
     public TutorialTracker(IActivateItems activator)
     {
         _activator = activator;
-            
+
         BuildTutorialList();
     }
 
@@ -36,8 +36,10 @@ private void BuildTutorialList()
     {
         TutorialsAvailable = new List<Tutorial>
         {
-            new Tutorial("1. Generate Test Data", new ExecuteCommandGenerateTestDataUI(_activator), new Guid("8255fb4e-94a4-4bbc-9e8d-edec5ecebab0")),
-            new Tutorial("2. Import a file", new ExecuteCommandCreateNewCatalogueByImportingFile(_activator), new Guid("5d71a169-5c08-4c33-8f88-8ee123222a3b"))
+            new("1. Generate Test Data", new ExecuteCommandGenerateTestDataUI(_activator),
+                new Guid("8255fb4e-94a4-4bbc-9e8d-edec5ecebab0")),
+            new("2. Import a file", new ExecuteCommandCreateNewCatalogueByImportingFile(_activator),
+                new Guid("5d71a169-5c08-4c33-8f88-8ee123222a3b"))
         };
 
         //var executeExtraction = new Tutorial("4. Execute DataSet Extraction",
@@ -54,7 +56,7 @@ public bool ShouldShowUserWorkflow(HelpWorkflow workflow)
         //all tutorials disabled
         if (UserSettings.DisableTutorials)
             return false;
-            
+
         return !UserSettings.GetTutorialDone(GetTutorialGuidFromWorkflow(workflow));
     }
 
@@ -75,7 +77,7 @@ private Guid GetTutorialGuidFromWorkflow(HelpWorkflow workflow)
 
     public void Completed(HelpWorkflow helpWorkflow)
     {
-        UserSettings.SetTutorialDone(GetTutorialGuidFromWorkflow(helpWorkflow),true);
+        UserSettings.SetTutorialDone(GetTutorialGuidFromWorkflow(helpWorkflow), true);
     }
 
     public void ClearCompleted()
@@ -95,10 +97,7 @@ public static void DisableAllTutorials()
         UserSettings.DisableTutorials = true;
     }
 
-    public static bool HasSeen(Tutorial tutorial)
-    {
-        return UserSettings.GetTutorialDone(tutorial.Guid);
-    }
+    public static bool HasSeen(Tutorial tutorial) => UserSettings.GetTutorialDone(tutorial.Guid);
 
     public static void LaunchTutorial(Tutorial tutorial)
     {
@@ -108,6 +107,6 @@ public static void LaunchTutorial(Tutorial tutorial)
     public bool IsClearable()
     {
         //any that are true
-        return TutorialsAvailable.Any(t=>UserSettings.GetTutorialDone(t.Guid));
+        return TutorialsAvailable.Any(t => UserSettings.GetTutorialDone(t.Guid));
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Validation/ResolveMissingTargetPropertiesUI.cs b/Rdmp.UI/Validation/ResolveMissingTargetPropertiesUI.cs
index b5413d9442..bce17b1ca9 100644
--- a/Rdmp.UI/Validation/ResolveMissingTargetPropertiesUI.cs
+++ b/Rdmp.UI/Validation/ResolveMissingTargetPropertiesUI.cs
@@ -24,18 +24,18 @@ public partial class ResolveMissingTargetPropertiesUI : Form
 {
     private string[] AvailableColumns { get; set; }
 
-    public ResolveMissingTargetPropertiesUI( Validator validator, ExtractionInformation[] availableColumns)
+    public ResolveMissingTargetPropertiesUI(Validator validator, ExtractionInformation[] availableColumns)
     {
         if (validator == null && availableColumns == null)
             return;
 
-        AvailableColumns = availableColumns.Select(e=>e.GetRuntimeName()).ToArray();
+        AvailableColumns = availableColumns.Select(e => e.GetRuntimeName()).ToArray();
 
         AdjustedValidator = validator;
         InitializeComponent();
-            
-        lbAvailableColumns.Items.AddRange(GetUnReferencedColumns(validator,AvailableColumns).ToArray());
-        lbMissingReferences.Items.AddRange(GetMissingReferences(validator,availableColumns).ToArray());
+
+        lbAvailableColumns.Items.AddRange(GetUnReferencedColumns(validator, AvailableColumns).ToArray());
+        lbMissingReferences.Items.AddRange(GetMissingReferences(validator, availableColumns).ToArray());
     }
 
     public Validator AdjustedValidator { get; set; }
@@ -45,26 +45,22 @@ public static IEnumerable<string> GetUnReferencedColumns(Validator v, IEnumerabl
         return columns.Where(col => !v.ItemValidators.Any(iv => iv.TargetProperty.Equals(col)));
     }
 
-    public static IEnumerable<ItemValidator> GetMissingReferences(Validator v, IEnumerable<ExtractionInformation> columns)
+    public static IEnumerable<ItemValidator> GetMissingReferences(Validator v,
+        IEnumerable<ExtractionInformation> columns)
     {
-        return v.ItemValidators.Where(iv => !columns.Any(c=>c.GetRuntimeName().Equals(iv.TargetProperty)));
+        return v.ItemValidators.Where(iv => !columns.Any(c => c.GetRuntimeName().Equals(iv.TargetProperty)));
     }
 
     private void lbMissingReferences_KeyUp(object sender, KeyEventArgs e)
     {
-        if (e.KeyCode == Keys.Delete)
-        {
-            DeleteSelectedReferences();
-        }
-           
+        if (e.KeyCode == Keys.Delete) DeleteSelectedReferences();
     }
 
     private void DeleteSelectedReferences()
     {
         var itemValidators = lbMissingReferences.SelectedItems.Cast<ItemValidator>().ToArray();
-            
+
         if (itemValidators.Length > 0)
-        {
             foreach (var iv in itemValidators)
             {
                 AdjustedValidator.RemoveItemValidator(iv.TargetProperty);
@@ -72,11 +68,10 @@ private void DeleteSelectedReferences()
                 tbOperations.AppendText($"Deleted Missing Reference:{Environment.NewLine}");
                 tbOperations.AppendText(iv.TargetProperty + Environment.NewLine);
             }
-
-        }
     }
 
     #region drag and drop
+
     private ItemValidator _dragTarget = null;
 
     private void lbMissingReferences_MouseDown(object sender, MouseEventArgs e)
@@ -84,9 +79,7 @@ private void lbMissingReferences_MouseDown(object sender, MouseEventArgs e)
         var indexFromPoint = lbMissingReferences.IndexFromPoint(e.X, e.Y);
 
         if (indexFromPoint != ListBox.NoMatches)
-        {
             _dragTarget = lbMissingReferences.Items[indexFromPoint] as ItemValidator;
-        }
     }
 
     private void lbMissingReferences_MouseUp(object sender, MouseEventArgs e)
@@ -97,7 +90,7 @@ private void lbMissingReferences_MouseUp(object sender, MouseEventArgs e)
 
     private void lbMissingReferences_MouseMove(object sender, MouseEventArgs e)
     {
-        if(_dragTarget != null && MouseButtons == MouseButtons.Left)
+        if (_dragTarget != null && MouseButtons == MouseButtons.Left)
             DoDragDrop(_dragTarget, DragDropEffects.Link);
     }
 
@@ -110,12 +103,13 @@ private void lbAvailableColumns_DragDrop(object sender, DragEventArgs e)
     {
         var indexFromPoint = lbAvailableColumns.IndexFromPoint(lbAvailableColumns.PointToClient(new Point(e.X, e.Y)));
 
-        if (indexFromPoint != ListBox.NoMatches && e.Data.GetData(typeof (ItemValidator)) is ItemValidator missingReference)
+        if (indexFromPoint != ListBox.NoMatches &&
+            e.Data.GetData(typeof(ItemValidator)) is ItemValidator missingReference)
         {
             var oldName = missingReference.TargetProperty;
-            var newName = (string) lbAvailableColumns.Items[indexFromPoint];
+            var newName = (string)lbAvailableColumns.Items[indexFromPoint];
 
-            AdjustedValidator.RenameColumn(oldName,newName);
+            AdjustedValidator.RenameColumn(oldName, newName);
 
             tbOperations.AppendText($"Renamed Missing Reference:{Environment.NewLine}");
             tbOperations.AppendText(oldName + Environment.NewLine);
@@ -125,22 +119,19 @@ private void lbAvailableColumns_DragDrop(object sender, DragEventArgs e)
             lbMissingReferences.Items.Remove(missingReference);
             lbAvailableColumns.Items.Remove(newName);
         }
-
-
     }
 
     private static void ResolveMissingReferenceAs(ItemValidator missingReference, string newTarget)
     {
         missingReference.TargetProperty = newTarget;
-            
     }
 
     #endregion
 
     private void cbSelectAll_CheckedChanged(object sender, EventArgs e)
     {
-        for(var i = 0;i<lbMissingReferences.Items.Count;i++)
-            lbMissingReferences.SetSelected(i,cbSelectAll.Checked);
+        for (var i = 0; i < lbMissingReferences.Items.Count; i++)
+            lbMissingReferences.SetSelected(i, cbSelectAll.Checked);
     }
 
     private void btnCancel_Click(object sender, EventArgs e)
diff --git a/Rdmp.UI/Validation/SecondaryConstraintUI.cs b/Rdmp.UI/Validation/SecondaryConstraintUI.cs
index dc4a000608..a8fd246343 100644
--- a/Rdmp.UI/Validation/SecondaryConstraintUI.cs
+++ b/Rdmp.UI/Validation/SecondaryConstraintUI.cs
@@ -56,20 +56,21 @@ public partial class SecondaryConstraintUI : UserControl
     internal event RequestDeletionHandler RequestDeletion;
 
 
-
     private bool loadingComplete = false;
-    public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint secondaryConstriant, string[] otherColumns)
+
+    public SecondaryConstraintUI(ICatalogueRepository repository, SecondaryConstraint secondaryConstriant,
+        string[] otherColumns)
     {
         const int rowHeight = 30;
         //the amount of additional space required to accomodate description labels
         var inflation = 0;
         _repository = repository;
         SecondaryConstriant = secondaryConstriant;
-            
+
         _otherColumns = otherColumns;
 
         InitializeComponent();
-            
+
         if (repository == null)
             return;
 
@@ -81,17 +82,16 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
 
         lblConsequence.Left = lblType.Right + 5;
         cbxConsequence.Left = lblConsequence.Right + 5;
-            
+
         //work out what properties can be set on this constraint and create the relevant controls using reflection
         _requiredProperties = secondaryConstriant.GetType().GetProperties().Where(p =>
             p.CanRead && p.CanWrite && p.GetSetMethod(true).IsPublic
-
-            && p.Name != "Name"//skip this one, it is Writeable in order to support XMLSerialization...
-            && p.Name != "Consequence"//skip this one because it is dealt with explicitly
-            && !p.IsDefined(typeof (HideOnValidationUI), true)
+            && p.Name != "Name" //skip this one, it is Writeable in order to support XMLSerialization...
+            && p.Name != "Consequence" //skip this one because it is dealt with explicitly
+            && !p.IsDefined(typeof(HideOnValidationUI), true)
         ).ToArray();
 
-        for (var i = 0; i < _requiredProperties.Length;i++ )
+        for (var i = 0; i < _requiredProperties.Length; i++)
         {
             var currentRowPanel = new Panel
             {
@@ -102,7 +102,7 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
 
             tableLayoutPanel1.CellBorderStyle = TableLayoutPanelCellBorderStyle.Inset;
 
-            tableLayoutPanel1.Controls.Add(currentRowPanel,0,i+1);
+            tableLayoutPanel1.Controls.Add(currentRowPanel, 0, i + 1);
 
 
             var lblName = new Label
@@ -124,11 +124,11 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     Checked = (bool)currentValue
                 };
 
-                boolControl.CheckStateChanged += (s, e) => _requiredProperties[(int) boolControl.Tag].SetValue(SecondaryConstriant, boolControl.Checked,null);
+                boolControl.CheckStateChanged += (s, e) =>
+                    _requiredProperties[(int)boolControl.Tag].SetValue(SecondaryConstriant, boolControl.Checked, null);
                 currentRowPanel.Controls.Add(boolControl);
             }
-            else
-            if (_requiredProperties[i].PropertyType == typeof(PredictionRule))//Hard Typed property PredictionRule
+            else if (_requiredProperties[i].PropertyType == typeof(PredictionRule)) //Hard Typed property PredictionRule
             {
                 //for prediction rules fields
                 var cbx = new ComboBox();
@@ -137,7 +137,8 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                 cbx.DropDownStyle = ComboBoxStyle.DropDownList;
                 cbx.DisplayMember = "Name";
                 cbx.Tag = i;
-                cbx.SelectedIndexChanged += (s, e) => _requiredProperties[(int)cbx.Tag].SetValue(SecondaryConstriant, cbx.SelectedItem is Type type ? Activator.CreateInstance(type) : null);
+                cbx.SelectedIndexChanged += (s, e) => _requiredProperties[(int)cbx.Tag].SetValue(SecondaryConstriant,
+                    cbx.SelectedItem is Type type ? Activator.CreateInstance(type) : null);
                 cbx.Width = 200;
 
                 //The dropdown box is a list of Types but we are actually instantiating a value when user selects it (for XML Serialization).  Consequently we must now get the Type for selection purposes
@@ -151,12 +152,11 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
             }
             else
             {
-
                 //it's a value control (basically anything that can be represented by text (i.e. not a boolean))
                 Control valueControl;
 
                 //if it is expects a column then create a dropdown box
-                if (_requiredProperties[i].IsDefined(typeof (ExpectsColumnNameAsInput), true))
+                if (_requiredProperties[i].IsDefined(typeof(ExpectsColumnNameAsInput), true))
                 {
                     //for column fields
                     var cbx = new ComboBox();
@@ -164,14 +164,16 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     cbx.Items.Add("");
                     cbx.DropDownStyle = ComboBoxStyle.DropDownList;
                     cbx.Tag = i;
-                    cbx.SelectedIndexChanged += (s, e) => _requiredProperties[(int)cbx.Tag].SetValue(SecondaryConstriant, UsefulStuff.ChangeType(cbx.SelectedItem, _requiredProperties[(int)cbx.Tag].PropertyType), null);
+                    cbx.SelectedIndexChanged += (s, e) =>
+                        _requiredProperties[(int)cbx.Tag].SetValue(SecondaryConstriant,
+                            UsefulStuff.ChangeType(cbx.SelectedItem, _requiredProperties[(int)cbx.Tag].PropertyType),
+                            null);
                     cbx.Width = 350;
 
                     valueControl = cbx;
-
                 }
-                else
-                if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(_requiredProperties[i].PropertyType))//it is a Catalogue type
+                else if (typeof(IMapsDirectlyToDatabaseTable).IsAssignableFrom(_requiredProperties[i]
+                             .PropertyType)) //it is a Catalogue type
                 {
                     var dd = new ComboBox
                     {
@@ -185,17 +187,21 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     if (!entities.Any())
                     {
                         if (_requiredProperties[i].PropertyType == typeof(StandardRegex))
-                            MessageBox.Show("You currently do not have any standard regex concepts in your database.  These can be created from the Table(Advanced) collection.",
+                            MessageBox.Show(
+                                "You currently do not have any standard regex concepts in your database.  These can be created from the Table(Advanced) collection.",
                                 "No StandardRegex configured in your Catalogue");
                         else
                             MessageBox.Show(
-                                $"You currently do not have any {_requiredProperties[i].PropertyType} in your database","Catalogue Entity Collection Empty");
+                                $"You currently do not have any {_requiredProperties[i].PropertyType} in your database",
+                                "Catalogue Entity Collection Empty");
                     }
                     else
                     {
                         dd.Items.Add("<<Clear>>");
                         dd.Items.AddRange(entities);
-                        dd.SelectedIndexChanged += (s, e) => _requiredProperties[(int)dd.Tag].SetValue(SecondaryConstriant, dd.SelectedItem as IMapsDirectlyToDatabaseTable, null);
+                        dd.SelectedIndexChanged += (s, e) =>
+                            _requiredProperties[(int)dd.Tag].SetValue(SecondaryConstriant,
+                                dd.SelectedItem as IMapsDirectlyToDatabaseTable, null);
                     }
 
                     //See if it has a value
@@ -205,7 +211,6 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     v?.RevertToDatabaseState();
 
                     valueControl = dd;
-
                 }
                 else //otherwise create a textbox
                 {
@@ -218,13 +223,13 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     };
                     valueControl.TextChanged += setTextOrParseableProperty;
 
-                    if (_requiredProperties[i].IsDefined(typeof (ExpectsLotsOfText), true))
+                    if (_requiredProperties[i].IsDefined(typeof(ExpectsLotsOfText), true))
                         valueControl.Width = 300;
-
                 }
 
                 if (currentValue != null)
-                    valueControl.Text = _requiredProperties[i].GetValue(SecondaryConstriant, null).ToString().Replace("00:00:00","");
+                    valueControl.Text = _requiredProperties[i].GetValue(SecondaryConstriant, null).ToString()
+                        .Replace("00:00:00", "");
 
                 currentRowPanel.Controls.Add(lblName);
 
@@ -242,10 +247,10 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
                     Text = desc.Description
                 };
 
-                lbl.Font = new Font(lbl.Font,FontStyle.Italic);
+                lbl.Font = new Font(lbl.Font, FontStyle.Italic);
 
                 //make some space for it
-                inflation += lbl.Height -7;
+                inflation += lbl.Height - 7;
                 lbl.Top = rowHeight - 7;
 
                 currentRowPanel.Controls.Add(lbl);
@@ -259,26 +264,27 @@ public SecondaryConstraintUI(ICatalogueRepository repository,SecondaryConstraint
         Height = _requiredProperties.Length * rowHeight + 45 + inflation;
 
         loadingComplete = true;
-
     }
 
     private void setTextOrParseableProperty(object sender, EventArgs e)
     {
-        var senderAsControl = (Control) sender;
-        var propertyIdx = (int) senderAsControl.Tag;
+        var senderAsControl = (Control)sender;
+        var propertyIdx = (int)senderAsControl.Tag;
 
         try
         {
             if (string.IsNullOrWhiteSpace(senderAsControl.Text))
+            {
                 _requiredProperties[propertyIdx].SetValue(SecondaryConstriant, null, null);
+            }
             else
             {
                 var underlyingType = _requiredProperties[propertyIdx].PropertyType;
-                _requiredProperties[propertyIdx].SetValue(SecondaryConstriant, UsefulStuff.ChangeType(senderAsControl.Text, underlyingType), null);
+                _requiredProperties[propertyIdx].SetValue(SecondaryConstriant,
+                    UsefulStuff.ChangeType(senderAsControl.Text, underlyingType), null);
             }
 
 
-
             senderAsControl.ForeColor = Color.Black;
             lblException.Text = "";
         }
@@ -293,7 +299,7 @@ private void setTextOrParseableProperty(object sender, EventArgs e)
             {
                 ex = ex.InnerException;
 
-                if(ex != null)
+                if (ex != null)
                     msg += $",{ex.Message}";
 
                 overflow++;
@@ -301,7 +307,6 @@ private void setTextOrParseableProperty(object sender, EventArgs e)
 
             lblException.Text = msg.Trim(',');
         }
-            
     }
 
     private void btnDelete_Click(object sender, EventArgs e)
diff --git a/Rdmp.UI/Validation/StandardRegexUI.cs b/Rdmp.UI/Validation/StandardRegexUI.cs
index 78ec876093..321c733f08 100644
--- a/Rdmp.UI/Validation/StandardRegexUI.cs
+++ b/Rdmp.UI/Validation/StandardRegexUI.cs
@@ -35,6 +35,7 @@ public StandardRegexUI()
     {
         InitializeComponent();
     }
+
     public override void SetDatabaseObject(IActivateItems activator, StandardRegex databaseObject)
     {
         base.SetDatabaseObject(activator, databaseObject);
@@ -48,22 +49,22 @@ public override void SetDatabaseObject(IActivateItems activator, StandardRegex d
     protected override void SetBindings(BinderWithErrorProviderFactory rules, StandardRegex databaseObject)
     {
         base.SetBindings(rules, databaseObject);
-            
-        Bind(tbID,"Text","ID",r=>r.ID);
-        Bind(tbConceptName,"Text","ConceptName", r=>r.ConceptName);
-        Bind(tbRegex,"Text","Regex", r=>r.Regex);
-        Bind(tbDescription,"Text","Description", r => r.Description);
+
+        Bind(tbID, "Text", "ID", r => r.ID);
+        Bind(tbConceptName, "Text", "ConceptName", r => r.ConceptName);
+        Bind(tbRegex, "Text", "Regex", r => r.Regex);
+        Bind(tbDescription, "Text", "Description", r => r.Description);
     }
-        
+
     private void btnTest_Click(object sender, EventArgs e)
     {
         if (string.IsNullOrWhiteSpace(tbTesting.Text))
         {
-            lblResultOfTest.Text = "The test text box is blank, null values will automatically pass validation (use a NotNull constraint to do null related evaluations)";
+            lblResultOfTest.Text =
+                "The test text box is blank, null values will automatically pass validation (use a NotNull constraint to do null related evaluations)";
             lblResultOfTest.ForeColor = Color.Green;
         }
-        else
-        if (Regex.IsMatch(tbTesting.Text, _standardRegex.Regex))
+        else if (Regex.IsMatch(tbTesting.Text, _standardRegex.Regex))
         {
             lblResultOfTest.Text =
                 $"The text '{tbTesting.Text}' matches the Regex pattern '{_standardRegex.Regex}' meaning that the value will pass validation and not be flagged as a validation failure";
diff --git a/Rdmp.UI/Validation/ValidationSetupUI.cs b/Rdmp.UI/Validation/ValidationSetupUI.cs
index c9427069cd..224b981dbd 100644
--- a/Rdmp.UI/Validation/ValidationSetupUI.cs
+++ b/Rdmp.UI/Validation/ValidationSetupUI.cs
@@ -24,7 +24,6 @@
 using Rdmp.UI.TestsAndSetup.ServicePropogation;
 
 
-
 namespace Rdmp.UI.Validation;
 
 /// <summary>
@@ -49,20 +48,25 @@ public partial class ValidationSetupUI : ValidationSetupForm_Design, ISaveableUI
 
     private string ClearSelection = "<<Clear Selection>>";
 
-    private ItemValidator SelectedColumnItemValidator {get
+    private ItemValidator SelectedColumnItemValidator
     {
-        //The user has not selected a column
-        if (olvColumns.SelectedObject is not ExtractionInformation ei)
-            return null;
+        get
+        {
+            //The user has not selected a column
+            if (olvColumns.SelectedObject is not ExtractionInformation ei)
+                return null;
 
-        var c = ei.GetRuntimeName();
+            var c = ei.GetRuntimeName();
 
-        //The validator can contains all the columns in the Catalogue (Dataset) but columns which don't have any validation on them yet might not be in its ItemValidators collection
-        if (!Validator.ItemValidators.Any(iv => iv.TargetProperty.Equals(c)))
-            Validator.ItemValidators.Add(new ItemValidator(c));//It's a novel column, so create an empty ItemValidator for the column name so the user can configure new validation
+            //The validator can contains all the columns in the Catalogue (Dataset) but columns which don't have any validation on them yet might not be in its ItemValidators collection
+            if (!Validator.ItemValidators.Any(iv => iv.TargetProperty.Equals(c)))
+                Validator.ItemValidators.Add(
+                    new ItemValidator(
+                        c)); //It's a novel column, so create an empty ItemValidator for the column name so the user can configure new validation
 
-        return Validator.GetItemValidator(c);
-    }}
+            return Validator.GetItemValidator(c);
+        }
+    }
 
     public ValidationSetupUI()
     {
@@ -71,7 +75,7 @@ public ValidationSetupUI()
         SetupAvailableOperations();
 
         olvColumns.RowHeight = 19;
-        ddConsequence.DataSource = Enum.GetValues(typeof (Consequence));
+        ddConsequence.DataSource = Enum.GetValues(typeof(Consequence));
 
         var vertScrollWidth = SystemInformation.VerticalScrollBarWidth;
         tableLayoutPanel1.Padding = new Padding(0, 0, vertScrollWidth, 0);
@@ -89,14 +93,16 @@ public override void SetDatabaseObject(IActivateItems activator, Catalogue datab
 
         CommonFunctionality.AddToMenu(new ExecuteCommandRunDQEOnCatalogue(activator).SetTarget(databaseObject));
         CommonFunctionality.AddToMenu(new ExecuteCommandViewDQEResultsForCatalogue(activator)
-            {OverrideCommandName = "View Results..."}.SetTarget(databaseObject));
+            { OverrideCommandName = "View Results..." }.SetTarget(databaseObject));
 
         _catalogue = databaseObject;
 
         SetupComboBoxes(databaseObject);
 
         //get the validation XML
-        Validator = string.IsNullOrWhiteSpace(databaseObject.ValidatorXML) ? new Validator() : Validator.LoadFromXml(databaseObject.ValidatorXML);
+        Validator = string.IsNullOrWhiteSpace(databaseObject.ValidatorXML)
+            ? new Validator()
+            : Validator.LoadFromXml(databaseObject.ValidatorXML);
 
         var extractionInformations = databaseObject.GetAllExtractionInformation(ExtractionCategory.Any).ToArray();
         Array.Sort(extractionInformations);
@@ -133,11 +139,13 @@ private void SetupComboBoxes(Catalogue catalogue)
     private void ValidateConfiguration()
     {
         //if there are any item validators that do not map to an existing column in the dataset then we must show the resolve missing references dialog.
-        if (ResolveMissingTargetPropertiesUI.GetMissingReferences(Validator,olvColumns.Objects.Cast<ExtractionInformation>()).Any())
+        if (ResolveMissingTargetPropertiesUI
+            .GetMissingReferences(Validator, olvColumns.Objects.Cast<ExtractionInformation>()).Any())
         {
-            var dialog = new ResolveMissingTargetPropertiesUI(Validator,olvColumns.Objects.Cast<ExtractionInformation>().ToArray());
+            var dialog = new ResolveMissingTargetPropertiesUI(Validator,
+                olvColumns.Objects.Cast<ExtractionInformation>().ToArray());
 
-            if(dialog.ShowDialog() == DialogResult.OK)
+            if (dialog.ShowDialog() == DialogResult.OK)
                 Validator = dialog.AdjustedValidator;
         }
     }
@@ -167,7 +175,7 @@ private void lbColumns_SelectedIndexChanged(object sender, EventArgs e)
 
     private void PopulateFormForSelectedColumn()
     {
-        if(IsDisposed)
+        if (IsDisposed)
             return;
 
         bSuppressChangeEvents = true;
@@ -180,7 +188,8 @@ private void PopulateFormForSelectedColumn()
         else
         {
             ddPrimaryConstraints.Text = SelectedColumnItemValidator.PrimaryConstraint.GetType().Name;
-            ddConsequence.SelectedItem = SelectedColumnItemValidator.PrimaryConstraint.Consequence ?? Consequence.Missing;
+            ddConsequence.SelectedItem =
+                SelectedColumnItemValidator.PrimaryConstraint.Consequence ?? Consequence.Missing;
         }
 
         //Make consequence selection only possible if there is a primary constraint selected
@@ -199,7 +208,7 @@ private void PopulateFormForSelectedColumn()
 
     private void ddPrimaryConstraints_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(bSuppressChangeEvents)
+        if (bSuppressChangeEvents)
             return;
 
         if (SelectedColumnItemValidator == null)
@@ -213,15 +222,18 @@ private void ddPrimaryConstraints_SelectedIndexChanged(object sender, EventArgs
             ddConsequence.SelectedItem = Consequence.Missing;
         }
         else
+        {
             try
             {
                 SelectedColumnItemValidator.PrimaryConstraint =
-                    Validator.CreateConstraint(ddPrimaryConstraints.Text,(Consequence)ddConsequence.SelectedValue) as PrimaryConstraint;
+                    Validator.CreateConstraint(ddPrimaryConstraints.Text, (Consequence)ddConsequence.SelectedValue) as
+                        PrimaryConstraint;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                ExceptionViewer.Show($"Failed to create PrimaryConstraint '{ddPrimaryConstraints.Text}'",ex);
+                ExceptionViewer.Show($"Failed to create PrimaryConstraint '{ddPrimaryConstraints.Text}'", ex);
             }
+        }
 
         //Make consequence selection only possible if there is a priary constraint selected
         ddConsequence.Enabled = ddPrimaryConstraints.Text != _noPrimaryConstraintText;
@@ -242,7 +254,7 @@ private void btnAddSecondaryConstraint_Click(object sender, EventArgs e)
         if (ddSecondaryConstraints.SelectedItem != null)
         {
             var secondaryConstriant =
-                Validator.CreateConstraint(ddSecondaryConstraints.Text,Consequence.Missing) as SecondaryConstraint;
+                Validator.CreateConstraint(ddSecondaryConstraints.Text, Consequence.Missing) as SecondaryConstraint;
 
             SelectedColumnItemValidator.SecondaryConstraints.Add(secondaryConstriant);
             AddSecondaryConstraintControl(secondaryConstriant);
@@ -263,13 +275,14 @@ private void AddSecondaryConstraintControl(SecondaryConstraint secondaryConstria
     {
         tableLayoutPanel1.RowCount++;
 
-        var toAdd = new SecondaryConstraintUI(Activator.RepositoryLocator.CatalogueRepository, secondaryConstriant, olvColumns.Objects.Cast<ExtractionInformation>().Select(c => c.GetRuntimeName()).ToArray())
+        var toAdd = new SecondaryConstraintUI(Activator.RepositoryLocator.CatalogueRepository, secondaryConstriant,
+            olvColumns.Objects.Cast<ExtractionInformation>().Select(c => c.GetRuntimeName()).ToArray())
         {
             Width = splitContainer1.Panel2.Width,
             Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top
         };
         toAdd.RequestDeletion += SecondaryConstraintRequestDelete;
-        tableLayoutPanel1.Controls.Add(toAdd, tableLayoutPanel1.RowCount - 1,0);
+        tableLayoutPanel1.Controls.Add(toAdd, tableLayoutPanel1.RowCount - 1, 0);
 
         //this array always seems to be 1 element long..
         tableLayoutPanel1.RowStyles[0].SizeType = SizeType.AutoSize;
@@ -278,13 +291,13 @@ private void AddSecondaryConstraintControl(SecondaryConstraint secondaryConstria
 
     private void ddConsequence_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(bSuppressChangeEvents)
+        if (bSuppressChangeEvents)
             return;
 
         if (SelectedColumnItemValidator != null)
             if (SelectedColumnItemValidator.PrimaryConstraint != null)
             {
-                SelectedColumnItemValidator.PrimaryConstraint.Consequence = (Consequence) ddConsequence.SelectedValue;
+                SelectedColumnItemValidator.PrimaryConstraint.Consequence = (Consequence)ddConsequence.SelectedValue;
                 ObjectSaverButton1.Enable(true);
             }
             else
@@ -300,14 +313,16 @@ private void ddConsequence_SelectedIndexChanged(object sender, EventArgs e)
     private void tbFilter_TextChanged(object sender, EventArgs e)
     {
         olvColumns.UseFiltering = true;
-        olvColumns.ModelFilter = new TextMatchFilter(olvColumns,tbFilter.Text,StringComparison.CurrentCultureIgnoreCase);
+        olvColumns.ModelFilter =
+            new TextMatchFilter(olvColumns, tbFilter.Text, StringComparison.CurrentCultureIgnoreCase);
     }
 
     public override void ConsultAboutClosing(object sender, FormClosingEventArgs e)
     {
-        if(HasChanges())
+        if (HasChanges())
         {
-            var dr = MessageBox.Show($"Save Validation rule changes for Catalogue '{_catalogue}'?", "Save Changes",MessageBoxButtons.YesNoCancel);
+            var dr = MessageBox.Show($"Save Validation rule changes for Catalogue '{_catalogue}'?", "Save Changes",
+                MessageBoxButtons.YesNoCancel);
 
             switch (dr)
             {
@@ -367,6 +382,7 @@ private void cbxPivotColumn_SelectedIndexChanged(object sender, EventArgs e)
     {
         SetPivot(cbxPivotColumn.SelectedItem as ExtractionInformation);
     }
+
     private void SetTimePeriod(ExtractionInformation selected)
     {
         _catalogue.TimeCoverage_ExtractionInformation_ID = selected?.ID;
@@ -379,10 +395,12 @@ private void SetPivot(ExtractionInformation selected)
 
     private void lblPickTimePeriodColumn_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObject(new DialogArgs {
-               TaskDescription = "Which date column in the Catalogue should provide the time element of the data when generating graphs, DQE etc?",
-               AllowSelectingNull = true
-           }, _catalogue.GetAllExtractionInformation(ExtractionCategory.Any),out var selected))
+        if (Activator.SelectObject(new DialogArgs
+            {
+                TaskDescription =
+                    "Which date column in the Catalogue should provide the time element of the data when generating graphs, DQE etc?",
+                AllowSelectingNull = true
+            }, _catalogue.GetAllExtractionInformation(ExtractionCategory.Any), out var selected))
         {
             cbxTimePeriodColumn.SelectedItem = selected;
             SetTimePeriod(selected);
@@ -393,7 +411,8 @@ private void lblPickPivotColumn_Click(object sender, EventArgs e)
     {
         if (Activator.SelectObject(new DialogArgs
             {
-                TaskDescription = "Which column in the Catalogue provides the most useful subdivision of the data when viewing in DQE? The column should have a relatively small number of unique values e.g. healthboard.",
+                TaskDescription =
+                    "Which column in the Catalogue provides the most useful subdivision of the data when viewing in DQE? The column should have a relatively small number of unique values e.g. healthboard.",
                 AllowSelectingNull = true
             }, _catalogue.GetAllExtractionInformation(ExtractionCategory.Any), out var selected))
         {
@@ -404,6 +423,6 @@ private void lblPickPivotColumn_Click(object sender, EventArgs e)
 }
 
 [TypeDescriptionProvider(typeof(AbstractControlDescriptionProvider<ValidationSetupForm_Design, UserControl>))]
-public abstract class ValidationSetupForm_Design:RDMPSingleDatabaseObjectControl<Catalogue>
+public abstract class ValidationSetupForm_Design : RDMPSingleDatabaseObjectControl<Catalogue>
 {
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Versioning/CreatePlatformDatabase.cs b/Rdmp.UI/Versioning/CreatePlatformDatabase.cs
index 1010d46c89..56a6ae87e3 100644
--- a/Rdmp.UI/Versioning/CreatePlatformDatabase.cs
+++ b/Rdmp.UI/Versioning/CreatePlatformDatabase.cs
@@ -35,7 +35,7 @@ public partial class CreatePlatformDatabase : Form
 
     private bool _programaticClose;
     private IPatcher _patcher;
-        
+
     private Task _tCreateDatabase;
     public DiscoveredDatabase DatabaseCreatedIfAny { get; private set; } = null;
 
@@ -50,11 +50,11 @@ public CreatePlatformDatabase(IPatcher patcher)
         //show only Database section
         serverDatabaseTableSelector1.HideTableComponents();
 
-        if(patcher.SqlServerOnly)
+        if (patcher.SqlServerOnly)
             serverDatabaseTableSelector1.LockDatabaseType(DatabaseType.MicrosoftSQLServer);
     }
 
-        
+
     private void btnCreate_Click(object sender, EventArgs e)
     {
         var db = serverDatabaseTableSelector1.GetDiscoveredDatabase();
@@ -85,11 +85,10 @@ private void btnCreate_Click(object sender, EventArgs e)
             "The following SQL is about to be executed:", createSql.EntireScript);
 
         var executor = new MasterDatabaseScriptExecutor(db);
-            
+
         if (preview.ShowDialog() == DialogResult.OK)
-        {
-            _tCreateDatabase = Task.Run(()=>
-                    
+            _tCreateDatabase = Task.Run(() =>
+
                 {
                     var memory = new ToMemoryCheckNotifier(checksUI1);
 
@@ -100,43 +99,44 @@ private void btnCreate_Click(object sender, EventArgs e)
                         DatabaseCreatedIfAny = db;
 
                         var worst = memory.GetWorst();
-                        if(worst == CheckResult.Success || worst == CheckResult.Warning)
-                            if (MessageBox.Show("Succesfully created database, close form?", "Success",MessageBoxButtons.YesNo) == DialogResult.Yes)
+                        if (worst == CheckResult.Success || worst == CheckResult.Warning)
+                            if (MessageBox.Show("Succesfully created database, close form?", "Success",
+                                    MessageBoxButtons.YesNo) == DialogResult.Yes)
                             {
                                 _programaticClose = true;
                                 Invoke(new MethodInvoker(Close));
                             }
                     }
                     else
-                        _completed = false;//failed to create database
+                    {
+                        _completed = false; //failed to create database
+                    }
                 }
             );
-        }
     }
 
-        
 
     private bool silentlyApplyPatchCallback(Patch p)
     {
-        checksUI1.OnCheckPerformed(new CheckEventArgs($"About to apply patch {p.locationInAssembly}", CheckResult.Success, null));
+        checksUI1.OnCheckPerformed(new CheckEventArgs($"About to apply patch {p.locationInAssembly}",
+            CheckResult.Success, null));
         return true;
     }
-        
+
     private void CreatePlatformDatabase_FormClosing(object sender, FormClosingEventArgs e)
     {
-        if(_tCreateDatabase != null)
-        {
+        if (_tCreateDatabase != null)
             if (!_tCreateDatabase.IsCompleted && !_programaticClose)
-            {
-                if(
-                    MessageBox.Show("CreateDatabase Task is still running.  Are you sure you want to close the form? If you close the form your database may be left in a half finished state.","Really Close?",MessageBoxButtons.YesNoCancel) 
+                if (
+                    MessageBox.Show(
+                        "CreateDatabase Task is still running.  Are you sure you want to close the form? If you close the form your database may be left in a half finished state.",
+                        "Really Close?", MessageBoxButtons.YesNoCancel)
                     != DialogResult.Yes)
                     e.Cancel = true;
-            }
-        }
     }
-        
-    public static ExternalDatabaseServer CreateNewExternalServer(ICatalogueRepository repository,PermissableDefaults defaultToSet, IPatcher patcher)
+
+    public static ExternalDatabaseServer CreateNewExternalServer(ICatalogueRepository repository,
+        PermissableDefaults defaultToSet, IPatcher patcher)
     {
         var createPlatform = new CreatePlatformDatabase(patcher);
         createPlatform.ShowDialog();
@@ -147,8 +147,8 @@ public static ExternalDatabaseServer CreateNewExternalServer(ICatalogueRepositor
         {
             var newServer = new ExternalDatabaseServer(repository, db.GetRuntimeName(), patcher);
             newServer.SetProperties(db);
-                
-            if(defaultToSet != PermissableDefaults.None)
+
+            if (defaultToSet != PermissableDefaults.None)
                 repository.SetDefault(defaultToSet, newServer);
 
             return newServer;
diff --git a/Rdmp.UI/Versioning/PatchingUI.cs b/Rdmp.UI/Versioning/PatchingUI.cs
index e57b71e4a2..6d700d2cd7 100644
--- a/Rdmp.UI/Versioning/PatchingUI.cs
+++ b/Rdmp.UI/Versioning/PatchingUI.cs
@@ -38,7 +38,7 @@ private PatchingUI(DiscoveredDatabase database, ITableRepository repository, IPa
         _database = database;
         _repository = repository;
         _patcher = patcher;
-            
+
         InitializeComponent();
 
         if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
@@ -46,7 +46,7 @@ private PatchingUI(DiscoveredDatabase database, ITableRepository repository, IPa
 
         var name = $"{patcher.Name} v{patcher.GetDbAssembly().GetName().Version.ToString(3)}";
 
-        tbPatch.Text =  $"{name}";
+        tbPatch.Text = $"{name}";
 
         if (_database == null)
         {
@@ -68,24 +68,26 @@ private void btnAttemptPatching_Click(object sender, EventArgs e)
             var mds = new MasterDatabaseScriptExecutor(_database);
 
 
-            mds.PatchDatabase(_patcher,toMem,PreviewPatch,
-                ()=>MessageBox.Show("Backup Database First", "Backup", MessageBoxButtons.YesNo) == DialogResult.Yes);
+            mds.PatchDatabase(_patcher, toMem, PreviewPatch,
+                () => MessageBox.Show("Backup Database First", "Backup", MessageBoxButtons.YesNo) == DialogResult.Yes);
 
             //if it crashed during patching
-            if(toMem.GetWorst() == CheckResult.Fail)
+            if (toMem.GetWorst() == CheckResult.Fail)
             {
                 btnAttemptPatching.Enabled = true;
                 return;
             }
 
-            toMem.OnCheckPerformed(new CheckEventArgs("Patching completed without exception, disabling the patching button", CheckResult.Success, null));
+            toMem.OnCheckPerformed(new CheckEventArgs(
+                "Patching completed without exception, disabling the patching button", CheckResult.Success, null));
             //patching worked so prevent them doing it again!
             btnAttemptPatching.Enabled = false;
 
             if (_repository != null)
             {
                 _repository.ClearUpdateCommandCache();
-                checksUI1.OnCheckPerformed(new CheckEventArgs("Cleared UPDATE commands cache", CheckResult.Success, null));
+                checksUI1.OnCheckPerformed(new CheckEventArgs("Cleared UPDATE commands cache", CheckResult.Success,
+                    null));
             }
 
             checksUI1.OnCheckPerformed(new CheckEventArgs("Patching Succesful", CheckResult.Success, null));
@@ -111,15 +113,15 @@ private bool PreviewPatch(Patch patch)
         if (_yesToAll)
             return true;
 
-        var preview = new SQLPreviewWindow(patch.locationInAssembly,"The following SQL Patch will be run:", patch.GetScriptBody());
+        var preview = new SQLPreviewWindow(patch.locationInAssembly, "The following SQL Patch will be run:",
+            patch.GetScriptBody());
         try
         {
-            return preview.ShowDialog()==DialogResult.OK;
+            return preview.ShowDialog() == DialogResult.OK;
         }
         finally
         {
             _yesToAll = preview.YesToAll;
         }
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Wizard/CreateNewCohortIdentificationConfigurationUI.cs b/Rdmp.UI/Wizard/CreateNewCohortIdentificationConfigurationUI.cs
index 2aa38113fa..4a8da3a0a0 100644
--- a/Rdmp.UI/Wizard/CreateNewCohortIdentificationConfigurationUI.cs
+++ b/Rdmp.UI/Wizard/CreateNewCohortIdentificationConfigurationUI.cs
@@ -28,13 +28,13 @@ public partial class CreateNewCohortIdentificationConfigurationUI : RDMPForm
     private Size _smallSize = new(755, 140);
     private Size _bigSize = new(1368, 876);
 
-    public CohortIdentificationConfiguration CohortIdentificationCriteriaCreatedIfAny { get;private set; }
+    public CohortIdentificationConfiguration CohortIdentificationCriteriaCreatedIfAny { get; private set; }
 
-    public CreateNewCohortIdentificationConfigurationUI(IActivateItems activator):base(activator)
+    public CreateNewCohortIdentificationConfigurationUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
-            
-        if(VisualStudioDesignMode)
+
+        if (VisualStudioDesignMode)
             return;
 
         inclusionCriteria1.SetupFor(Activator);
@@ -60,8 +60,10 @@ private void CheckBoxChanged(object sender, EventArgs e)
                 cb.Checked = false;
                 return;
             }
+
             target = exclusionCriteria2;
         }
+
         if (sender == cbInclusion2)
         {
             if (inclusionCriteria1.Catalogue == null && cb.Checked)
@@ -69,13 +71,14 @@ private void CheckBoxChanged(object sender, EventArgs e)
                 cb.Checked = false;
                 return;
             }
+
             target = inclusionCriteria2;
         }
 
-        if(target == null)
+        if (target == null)
             throw new ArgumentException("sender");
 
-        if(cb.Checked)
+        if (cb.Checked)
         {
             target.SetupFor(Activator);
             target.Enabled = true;
@@ -88,7 +91,6 @@ private void CheckBoxChanged(object sender, EventArgs e)
 
         setOperationInclude.Enabled = cbInclusion2.Checked;
         setOperationExclude.Enabled = cbExclusion1.Checked && cbExclusion2.Checked;
-
     }
 
     private void btnGo_Click(object sender, EventArgs e)
@@ -98,8 +100,11 @@ private void btnGo_Click(object sender, EventArgs e)
             MessageBox.Show("Enter a name for your Cohort Identification Criteria");
             return;
         }
-            
-        if(cbUseWizard.Checked && !Activator.YesNo("Are you sure you are happy with your configuration, this wizard will close after creating?","Confirm"))
+
+        if (cbUseWizard.Checked &&
+            !Activator.YesNo(
+                "Are you sure you are happy with your configuration, this wizard will close after creating?",
+                "Confirm"))
             return;
 
         var cic = CreateCohortIdentificationConfiguration();
@@ -121,7 +126,7 @@ private CohortIdentificationConfiguration CreateCohortIdentificationConfiguratio
         root.Name = ExecuteCommandCreateNewCohortIdentificationConfiguration.RootContainerName;
 
         //If we're not using the wizard then just return an empty CIC
-        if(!cbUseWizard.Checked)
+        if (!cbUseWizard.Checked)
         {
             root.Operation = SetOperation.UNION;
             root.SaveToDatabase();
@@ -163,10 +168,7 @@ private void CreateNewCohortIdentificationConfigurationUI_Load(object sender, Ev
 
     private void tbName_KeyDown(object sender, KeyEventArgs e)
     {
-        if (e.KeyCode == Keys.Enter)
-        {
-            btnGo_Click(this, EventArgs.Empty);
-        }
+        if (e.KeyCode == Keys.Enter) btnGo_Click(this, EventArgs.Empty);
     }
 
     private void cbUseWizard_CheckedChanged(object sender, EventArgs e)
diff --git a/Rdmp.UI/Wizard/CreateNewDataExtractionProjectUI.cs b/Rdmp.UI/Wizard/CreateNewDataExtractionProjectUI.cs
index 8f1380bd1b..3ff870bdb1 100644
--- a/Rdmp.UI/Wizard/CreateNewDataExtractionProjectUI.cs
+++ b/Rdmp.UI/Wizard/CreateNewDataExtractionProjectUI.cs
@@ -42,6 +42,7 @@ public partial class CreateNewDataExtractionProjectUI : RDMPForm
     private Project _project;
     private ExtractionConfiguration _configuration;
     private ExtractableCohort _cohortCreated;
+
     /// <summary>
     /// Datasets that should be added to the <see cref="Project"/> when executed
     /// </summary>
@@ -52,16 +53,17 @@ public partial class CreateNewDataExtractionProjectUI : RDMPForm
     public ExtractionConfiguration ExtractionConfigurationCreatedIfAny { get; private set; }
     public Project ProjectCreatedIfAny => _project;
 
-    public CreateNewDataExtractionProjectUI(IActivateItems activator):base(activator)
+    public CreateNewDataExtractionProjectUI(IActivateItems activator) : base(activator)
     {
         InitializeComponent();
-            
+
         _existingProjects = activator.RepositoryLocator.DataExportRepository.GetAllObjects<Project>();
         var highestNumber = _existingProjects.Max(p => p.ProjectNumber);
 
         tbProjectNumber.Text = highestNumber == null ? "1" : (highestNumber.Value + 1).ToString();
 
-        pbCohort.Image = activator.CoreIconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration).ImageToBitmap();
+        pbCohort.Image = activator.CoreIconProvider.GetImage(RDMPConcept.CohortIdentificationConfiguration)
+            .ImageToBitmap();
         pbCohortFile.Image = activator.CoreIconProvider.GetImage(RDMPConcept.File).ImageToBitmap();
         pbCohortSources.Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExternalCohortTable).ImageToBitmap();
 
@@ -69,23 +71,31 @@ public CreateNewDataExtractionProjectUI(IActivateItems activator):base(activator
 
         IdentifyCompatibleCohortSources();
 
-        cbxDatasets.Items.AddRange(activator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableDataSet>());
+        cbxDatasets.Items.AddRange(activator.RepositoryLocator.DataExportRepository
+            .GetAllObjects<ExtractableDataSet>());
         btnPackage.Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExtractableDataSetPackage).ImageToBitmap();
         btnPackage.Enabled =
             activator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableDataSetPackage>().Any();
 
-        cbxCohort.DataSource = activator.RepositoryLocator.CatalogueRepository.GetAllObjects<CohortIdentificationConfiguration>();
-        cbxCohort.PropertySelector = collection => collection.Cast<CohortIdentificationConfiguration>().Select(c => c.ToString());
+        cbxCohort.DataSource = activator.RepositoryLocator.CatalogueRepository
+            .GetAllObjects<CohortIdentificationConfiguration>();
+        cbxCohort.PropertySelector = collection =>
+            collection.Cast<CohortIdentificationConfiguration>().Select(c => c.ToString());
         ClearCic();
 
-        hlpDatasets.SetHelpText("Datasets","Pick which datasets should be extracted when this Project ExtractionConfiguration is run.  You can always change this later on.");
-        hlpDefineCohortAndDatasets.SetHelpText("Define Cohort and Datasets", "If you have a cohort (list of identifiers to extract) in a file or defined in an RDMP CohortIdentificationConfiguration you can commit this to the Project here.  You can always commit the cohort later on and/or update the cohort etc.");
-        hlpExtractionPipeline.SetHelpText("Extraction Pipeline", "Choose the default pipeline that should be used to extract the data.  This determines what the output format is e.g. CSV / to database.  If unsure you can leave this blank and choose it later on");
-        hlpIdentifierAllocation.SetHelpText("Identifier Allocation","Choose where to store the cohort (if you have multiple cohort databases) and the name.");
-
-        hlpCicPipe.SetHelpText("Pipeline","Choose which Pipeline to use to read the RDMP CohortIdentificationConfiguration and commit it to your cohort database.  Pipeline selection affects which operations are run including which identifier allocation method is used to allocate release identifiers");
-        hlpFlatFilePipe.SetHelpText("Pipeline","Choose which Pipeline to use to read the cohort flat file and commit it to your cohort database.  Pipeline selection must be for a source compatible with the file type e.g. CSV / fixed width.  Selection also affects which operations are run including which identifier allocation method is used to allocate release identifiers");
-
+        hlpDatasets.SetHelpText("Datasets",
+            "Pick which datasets should be extracted when this Project ExtractionConfiguration is run.  You can always change this later on.");
+        hlpDefineCohortAndDatasets.SetHelpText("Define Cohort and Datasets",
+            "If you have a cohort (list of identifiers to extract) in a file or defined in an RDMP CohortIdentificationConfiguration you can commit this to the Project here.  You can always commit the cohort later on and/or update the cohort etc.");
+        hlpExtractionPipeline.SetHelpText("Extraction Pipeline",
+            "Choose the default pipeline that should be used to extract the data.  This determines what the output format is e.g. CSV / to database.  If unsure you can leave this blank and choose it later on");
+        hlpIdentifierAllocation.SetHelpText("Identifier Allocation",
+            "Choose where to store the cohort (if you have multiple cohort databases) and the name.");
+
+        hlpCicPipe.SetHelpText("Pipeline",
+            "Choose which Pipeline to use to read the RDMP CohortIdentificationConfiguration and commit it to your cohort database.  Pipeline selection affects which operations are run including which identifier allocation method is used to allocate release identifiers");
+        hlpFlatFilePipe.SetHelpText("Pipeline",
+            "Choose which Pipeline to use to read the cohort flat file and commit it to your cohort database.  Pipeline selection must be for a source compatible with the file type e.g. CSV / fixed width.  Selection also affects which operations are run including which identifier allocation method is used to allocate release identifiers");
     }
 
     private void IdentifyCompatibleCohortSources()
@@ -99,15 +109,14 @@ private void IdentifyCompatibleCohortSources()
             ddCohortSources.SelectedItem = sources[0];
             ddCohortSources.Enabled = false;
         }
-            
-        btnCreateNewCohortSource.Enabled = sources.Length == 0; 
 
+        btnCreateNewCohortSource.Enabled = sources.Length == 0;
     }
 
     private void IdentifyCompatiblePipelines()
     {
         var p = Activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>();
-            
+
         foreach (var pipeline in p)
         {
             var source = pipeline.Source;
@@ -115,18 +124,18 @@ private void IdentifyCompatiblePipelines()
 
 
             //pipeline doesn't have a source / destination
-            if(source == null || destination == null)
+            if (source == null || destination == null)
                 continue;
 
             //source defines use case
             var sourceType = source.GetClassAsSystemType();
             var destinationType = destination.GetClassAsSystemType();
 
-            if (typeof (ExecuteDatasetExtractionSource).IsAssignableFrom(sourceType))
+            if (typeof(ExecuteDatasetExtractionSource).IsAssignableFrom(sourceType))
                 ddExtractionPipeline.Items.Add(pipeline);
 
             //destination is not a cohort destination
-            if(!typeof(ICohortPipelineDestination).IsAssignableFrom(destinationType))
+            if (!typeof(ICohortPipelineDestination).IsAssignableFrom(destinationType))
                 continue;
 
             //cic
@@ -139,12 +148,9 @@ private void IdentifyCompatiblePipelines()
         }
 
         //for each dropdown if there's only one option
-        foreach (var dd in new ComboBox[]{ddCicPipeline,ddExtractionPipeline,ddFilePipeline})
-        {
+        foreach (var dd in new ComboBox[] { ddCicPipeline, ddExtractionPipeline, ddFilePipeline })
             if (dd.Items.Count == 1)
                 dd.SelectedItem = dd.Items[0]; //select it
-        }
-            
     }
 
     private void btnBrowse_Click(object sender, EventArgs e)
@@ -156,7 +162,6 @@ private void btnBrowse_Click(object sender, EventArgs e)
 
     private void CreateNewDataExtractionProjectUI_Load(object sender, EventArgs e)
     {
-
     }
 
     private void tbProjectNumber_TextChanged(object sender, EventArgs e)
@@ -164,19 +169,19 @@ private void tbProjectNumber_TextChanged(object sender, EventArgs e)
         ragProjectNumber.Reset();
 
         //if there is no project number
-        if(string.IsNullOrWhiteSpace(tbProjectNumber.Text))
+        if (string.IsNullOrWhiteSpace(tbProjectNumber.Text))
         {
             ragProjectNumber.Warning(new Exception("Project Number is required"));
             _projectNumber = -1;
             return;
         }
-            
+
         try
         {
             _projectNumber = int.Parse(tbProjectNumber.Text);
 
             var collisionProject = _existingProjects.FirstOrDefault(p => p.ProjectNumber == _projectNumber);
-            if(collisionProject != null)
+            if (collisionProject != null)
                 ragProjectNumber.Warning(new Exception(
                     $"There is already an existing Project ('{collisionProject}') with ProjectNumber {_projectNumber}"));
         }
@@ -211,7 +216,8 @@ private void ClearFile()
 
         lblCohortFile.Text = "Cohort File...";
         btnSelectClearCohortFile.Text = "Browse...";
-        btnSelectClearCohortFile.Left = Math.Min(gbFile.Width - btnSelectClearCohortFile.Width, lblCohortFile.Right + 5);
+        btnSelectClearCohortFile.Left =
+            Math.Min(gbFile.Width - btnSelectClearCohortFile.Width, lblCohortFile.Right + 5);
     }
 
     private void SelectFile(FileInfo fileInfo)
@@ -223,15 +229,15 @@ private void SelectFile(FileInfo fileInfo)
 
         lblCohortFile.Text = _cohortFile.Name;
         btnSelectClearCohortFile.Text = "Clear";
-        btnSelectClearCohortFile.Left = Math.Min(gbFile.Width - btnSelectClearCohortFile.Width, lblCohortFile.Right + 5);
-            
+        btnSelectClearCohortFile.Left =
+            Math.Min(gbFile.Width - btnSelectClearCohortFile.Width, lblCohortFile.Right + 5);
     }
 
     private void cbxCohort_SelectionChangeCommitted(object sender, EventArgs e)
     {
         var cic = cbxCohort.SelectedItem as CohortIdentificationConfiguration;
 
-        if(cic != null)
+        if (cic != null)
         {
             Cursor.Current = Cursors.WaitCursor;
             try
@@ -244,20 +250,18 @@ private void cbxCohort_SelectionChangeCommitted(object sender, EventArgs e)
                 {
                     Timeout = 5
                 };
-                source.PreInitialize(cic,new ThrowImmediatelyDataLoadEventListener());
+                source.PreInitialize(cic, new ThrowImmediatelyDataLoadEventListener());
                 source.Check(ragCic);
 
                 ClearFile();
-
             }
             finally
             {
                 Cursor.Current = Cursors.Default;
             }
         }
-            
+
         gbFile.Enabled = cic == null;
-            
     }
 
     private void btnClearCohort_Click(object sender, EventArgs e)
@@ -316,7 +320,7 @@ private void btnExecute_Click(object sender, EventArgs e)
             if (_cohortCreated == null && cbDefineCohort.Checked)
             {
                 var cohortDefinition = new CohortDefinition(null, tbCohortName.Text, 1, _project.ProjectNumber.Value,
-                    (ExternalCohortTable) ddCohortSources.SelectedItem);
+                    (ExternalCohortTable)ddCohortSources.SelectedItem);
 
                 //execute the cohort creation bit
                 var cohortRequest = new CohortCreationRequest(_project, cohortDefinition,
@@ -333,21 +337,23 @@ private void btnExecute_Click(object sender, EventArgs e)
                 {
                     //execute cohort creation from cic
                     cohortRequest.CohortIdentificationConfiguration =
-                        (CohortIdentificationConfiguration) cbxCohort.SelectedItem;
+                        (CohortIdentificationConfiguration)cbxCohort.SelectedItem;
                     dd = ddCicPipeline;
 
 
                     //since we are about to execute a cic and store the results we should associate it with the Project (if successful)
-                    cmdAssociateCicWithProject = new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(Activator).SetTarget(
-                        _project).SetTarget(cohortRequest.CohortIdentificationConfiguration);
+                    cmdAssociateCicWithProject =
+                        new ExecuteCommandAssociateCohortIdentificationConfigurationWithProject(Activator).SetTarget(
+                            _project).SetTarget(cohortRequest.CohortIdentificationConfiguration);
                 }
 
-                var engine = cohortRequest.GetEngine((Pipeline) dd.SelectedItem,new ThrowImmediatelyDataLoadEventListener());
+                var engine = cohortRequest.GetEngine((Pipeline)dd.SelectedItem,
+                    new ThrowImmediatelyDataLoadEventListener());
                 engine.ExecutePipeline(new GracefulCancellationToken());
                 _cohortCreated = cohortRequest.CohortCreatedIfAny;
             }
 
-            if(cbDefineCohort.Checked)
+            if (cbDefineCohort.Checked)
             {
                 //associate the configuration with the cohort
                 _configuration.Cohort_ID = _cohortCreated.ID;
@@ -380,7 +386,6 @@ private void btnExecute_Click(object sender, EventArgs e)
         {
             Cursor = Cursors.Default;
         }
-            
     }
 
     private string AllRequiredDataPresent()
@@ -415,10 +420,10 @@ private string AllRequiredDataPresent()
         if (ddExtractionPipeline.SelectedItem == null)
             return "You must select an extraction pipeline";
 
-        if(ddCohortSources.SelectedItem == null)
+        if (ddCohortSources.SelectedItem == null)
             return "You must choose an Identifier Allocation database (to put your cohort / anonymous mappings)";
 
-        if(cbxCohort.SelectedItem == null && _cohortFile == null)
+        if (cbxCohort.SelectedItem == null && _cohortFile == null)
             return "You must choose either a file or a cohort identification query to build the cohort from";
 
         //no problems
@@ -431,7 +436,6 @@ private void btnCreateNewCohortSource_Click(object sender, EventArgs e)
         wizard.SetItemActivator(Activator);
         SingleControlForm.ShowDialog(wizard);
         IdentifyCompatibleCohortSources();
-
     }
 
     private void cbDefineCohort_CheckedChanged(object sender, EventArgs e)
@@ -442,20 +446,21 @@ private void cbDefineCohort_CheckedChanged(object sender, EventArgs e)
 
     private void cbxDatasets_SelectedIndexChanged(object sender, EventArgs e)
     {
-        if(_bLoading)
+        if (_bLoading)
             return;
 
-        _selectedDatasets = cbxDatasets.SelectedItem != null ? new[] {(IExtractableDataSet) cbxDatasets.SelectedItem} : Array.Empty<IExtractableDataSet>();
+        _selectedDatasets = cbxDatasets.SelectedItem != null
+            ? new[] { (IExtractableDataSet)cbxDatasets.SelectedItem }
+            : Array.Empty<IExtractableDataSet>();
     }
 
     private void btnPick_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObjects(new DialogArgs
-           {
-               InitialObjectSelection = _selectedDatasets,
-               TaskDescription = "Which datasets should be extracted in this Project?"
-
-           }, cbxDatasets.Items.Cast<ExtractableDataSet>().ToArray(), out var selected))
+        if (Activator.SelectObjects(new DialogArgs
+            {
+                InitialObjectSelection = _selectedDatasets,
+                TaskDescription = "Which datasets should be extracted in this Project?"
+            }, cbxDatasets.Items.Cast<ExtractableDataSet>().ToArray(), out var selected))
         {
             _selectedDatasets = selected;
             UpdateDatasetControlVisibility();
@@ -465,10 +470,12 @@ private void btnPick_Click(object sender, EventArgs e)
 
     private void btnPackage_Click(object sender, EventArgs e)
     {
-        if(Activator.SelectObjects(new DialogArgs
-           {
-               TaskDescription = "Which Package(s) should be added to the Project.  Datasets in all packages chosen will be added to the Project"
-           }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableDataSetPackage>(), out var selected))
+        if (Activator.SelectObjects(new DialogArgs
+                {
+                    TaskDescription =
+                        "Which Package(s) should be added to the Project.  Datasets in all packages chosen will be added to the Project"
+                }, Activator.RepositoryLocator.DataExportRepository.GetAllObjects<ExtractableDataSetPackage>(),
+                out var selected))
         {
             _selectedDatasets = selected
                 .SelectMany(p =>
@@ -479,7 +486,6 @@ private void btnPackage_Click(object sender, EventArgs e)
 
             UpdateDatasetControlVisibility();
         }
-
     }
 
     /// <summary>
diff --git a/Rdmp.UI/Wizard/SimpleCohortSetUI.cs b/Rdmp.UI/Wizard/SimpleCohortSetUI.cs
index ae695e80bc..0ff5ea17d1 100644
--- a/Rdmp.UI/Wizard/SimpleCohortSetUI.cs
+++ b/Rdmp.UI/Wizard/SimpleCohortSetUI.cs
@@ -57,7 +57,8 @@ public void SetupFor(IActivateItems activator)
         _activator = activator;
         cbxCatalogues.SetUp(activator.CoreChildProvider.AllCatalogues);
         pbCatalogue.Image = activator.CoreIconProvider.GetImage(RDMPConcept.Catalogue).ImageToBitmap();
-        pbExtractionIdentifier.Image = activator.CoreIconProvider.GetImage(RDMPConcept.ExtractionInformation).ImageToBitmap();
+        pbExtractionIdentifier.Image =
+            activator.CoreIconProvider.GetImage(RDMPConcept.ExtractionInformation).ImageToBitmap();
         pbFilters.Image = activator.CoreIconProvider.GetImage(RDMPConcept.Filter).ImageToBitmap();
         cbxCatalogues.SetItemActivator(activator);
     }
@@ -72,19 +73,23 @@ private void cbxCatalogues_SelectedIndexChanged(object sender, EventArgs e)
             return;
 
         //if the Catalogue changes clear the old filters because they apply to the last dataset
-        if(_lastCatalogue != null)
-            if(!Equals(_lastCatalogue, cata))//catalogue has changed
+        if (_lastCatalogue != null)
+            if (!Equals(_lastCatalogue, cata)) //catalogue has changed
             {
                 //if there are no user specified ones clear the mandatory filters (if there are any)
                 if (_filterUIs.All(f => f.Mandatory))
+                {
                     ClearFilters();
+                }
                 else //there are some user specified ones
                 if (
                     //confirm with user before we erase these
                     _activator.YesNo(
                         "Changing the dataset will clear the Filters you have configured, is this what you want?",
                         "Change Dataset"))
+                {
                     ClearFilters();
+                }
                 else
                 {
                     cbxCatalogues.SelectedItem = _lastCatalogue;
@@ -94,7 +99,7 @@ private void cbxCatalogues_SelectedIndexChanged(object sender, EventArgs e)
 
         //add any mandatory filters that are not yet part of the configuration
         foreach (var mandatoryFilter in cata.GetAllMandatoryFilters())
-            if(!_filterUIs.Any(f=>f.Filter.Equals(mandatoryFilter)))
+            if (!_filterUIs.Any(f => f.Filter.Equals(mandatoryFilter)))
             {
                 var m = AddFilter(mandatoryFilter);
                 m.Mandatory = true; //mandatory ones cannot be changed or gotten rid of
@@ -109,10 +114,13 @@ private void cbxCatalogues_SelectedIndexChanged(object sender, EventArgs e)
 
         //if no columns have yet been marked as IsExtractionIdentifier then we show all columns and demand that the user lock one in
         if (identifiers.Length == 0)
+        {
             UnlockIdentifier(null);
-        else
-        if (identifiers.Length == 1)
-            LockIdentifier(identifiers[0]);//there is only one IsExtractionIdentifier so lock it in automatically
+        }
+        else if (identifiers.Length == 1)
+        {
+            LockIdentifier(identifiers[0]); //there is only one IsExtractionIdentifier so lock it in automatically
+        }
         else
         {
             _knownIdentifiersMode = true;
@@ -143,7 +151,7 @@ private void LockIdentifier(ExtractionInformation extractionInformation)
         btnLockExtractionIdentifier.Image = _unlinkImage;
 
         //if it isn't yet marked as an extraction identifier save it as one for next time
-        if(!extractionInformation.IsExtractionIdentifier)
+        if (!extractionInformation.IsExtractionIdentifier)
         {
             extractionInformation.IsExtractionIdentifier = true;
             extractionInformation.SaveToDatabase();
@@ -178,11 +186,10 @@ private void btnLockExtractionIdentifier_Click(object sender, EventArgs e)
 
     private void btnAddFilter_Click(object sender, EventArgs e)
     {
-        if(ddAvailableFilters.SelectedItem is not ExtractionFilter f)
+        if (ddAvailableFilters.SelectedItem is not ExtractionFilter f)
             return;
 
         AddFilter(f);
-
     }
 
     private SimpleFilterUI AddFilter(ExtractionFilter f)
@@ -228,15 +235,16 @@ public void CreateCohortSet(CohortAggregateContainer targetContainer)
             ResolveMultipleExtractionIdentifiers = (s, e) => cbxColumns.SelectedItem as ExtractionInformation
         };
 
-        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(_activator,cataCommand ,targetContainer)
-            {
-                SkipMandatoryFilterCreation = true
-            };
+        var cmd = new ExecuteCommandAddCatalogueToCohortIdentificationSetContainer(_activator, cataCommand,
+            targetContainer)
+        {
+            SkipMandatoryFilterCreation = true
+        };
         cmd.Execute();
 
         var aggregate = cmd.AggregateCreatedIfAny;
 
-        var filterOp = (FilterContainerOperation) ddAndOr.SelectedItem;
+        var filterOp = (FilterContainerOperation)ddAndOr.SelectedItem;
 
         IContainer filterContainer;
         if (aggregate.RootFilterContainer_ID != null)
@@ -256,7 +264,8 @@ public void CreateCohortSet(CohortAggregateContainer targetContainer)
             var filtersAddedSoFar = new List<IFilter>();
             foreach (var ui in _filterUIs)
             {
-                var f = ui.CreateFilter(new AggregateFilterFactory(_activator.RepositoryLocator.CatalogueRepository), filterContainer, filtersAddedSoFar.ToArray());
+                var f = ui.CreateFilter(new AggregateFilterFactory(_activator.RepositoryLocator.CatalogueRepository),
+                    filterContainer, filtersAddedSoFar.ToArray());
                 filtersAddedSoFar.Add(f);
             }
         }
@@ -264,6 +273,5 @@ public void CreateCohortSet(CohortAggregateContainer targetContainer)
 
     private void ddAndOr_SelectedIndexChanged(object sender, EventArgs e)
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Wizard/SimpleFilterUI.cs b/Rdmp.UI/Wizard/SimpleFilterUI.cs
index feaff58244..bcdd2b619c 100644
--- a/Rdmp.UI/Wizard/SimpleFilterUI.cs
+++ b/Rdmp.UI/Wizard/SimpleFilterUI.cs
@@ -55,15 +55,13 @@ public bool Mandatory
                 btnDelete.Enabled = true;
                 lblFilterName.Enabled = true;
             }
-
-
         }
     }
 
-    private List<SimpleParameterUI>  parameterUis = new();
+    private List<SimpleParameterUI> parameterUis = new();
     private bool _mandatory;
 
-    public SimpleFilterUI(IActivateItems activator,ExtractionFilter filter)
+    public SimpleFilterUI(IActivateItems activator, ExtractionFilter filter)
     {
         _activator = activator;
         _filter = filter;
@@ -75,7 +73,7 @@ public SimpleFilterUI(IActivateItems activator,ExtractionFilter filter)
         var parameters = filter.ExtractionFilterParameters.ToArray();
 
         SetupKnownGoodValues();
-            
+
         for (var i = 0; i < parameters.Length; i++)
         {
             var currentRowPanel = new Panel
@@ -85,12 +83,12 @@ public SimpleFilterUI(IActivateItems activator,ExtractionFilter filter)
                 Margin = Padding.Empty
             };
 
-            var p = new SimpleParameterUI(activator,parameters[i]);
+            var p = new SimpleParameterUI(activator, parameters[i]);
             currentRowPanel.Controls.Add(p);
             p.tbValue.TextChanged += (s, e) =>
             {
                 //we are here because user is selecting a value from the dropdown not because he is editting the text field manually
-                if(_settingAKnownGoodValue)
+                if (_settingAKnownGoodValue)
                     return;
 
                 //user is manually editting a Parameters so it no longer matches a Known value
@@ -98,17 +96,18 @@ public SimpleFilterUI(IActivateItems activator,ExtractionFilter filter)
             };
             parameterUis.Add(p);
 
-            tableLayoutPanel1.Controls.Add(currentRowPanel,0,i+1);
+            tableLayoutPanel1.Controls.Add(currentRowPanel, 0, i + 1);
             tableLayoutPanel1.CellBorderStyle = TableLayoutPanelCellBorderStyle.Inset;
         }
 
-        Height = 50 + parameters.Length*rowHeight;
+        Height = 50 + parameters.Length * rowHeight;
     }
 
     private void SetupKnownGoodValues()
     {
-        var knownGoodValues = _activator.RepositoryLocator.CatalogueRepository.GetAllObjectsWithParent<ExtractionFilterParameterSet>(_filter);
-            
+        var knownGoodValues = _activator.RepositoryLocator.CatalogueRepository
+            .GetAllObjectsWithParent<ExtractionFilterParameterSet>(_filter);
+
         if (knownGoodValues.Any())
         {
             pbKnownValueSets.Visible = true;
@@ -126,15 +125,12 @@ private void SetupKnownGoodValues()
 
             pbKnownValueSets.Left = lblFilterName.Right;
             ddKnownGoodValues.Left = pbKnownValueSets.Right;
-
         }
         else
         {
             pbKnownValueSets.Visible = false;
             ddKnownGoodValues.Visible = false;
         }
- 
-
     }
 
     private void btnDelete_Click(object sender, EventArgs e)
@@ -144,7 +140,6 @@ private void btnDelete_Click(object sender, EventArgs e)
 
     private void lblFilterName_Click(object sender, EventArgs e)
     {
-
     }
 
     private bool _settingAKnownGoodValue = false;
@@ -159,19 +154,19 @@ private void ddKnownGoodValues_SelectedIndexChanged(object sender, EventArgs e)
         _settingAKnownGoodValue = false;
     }
 
-    public IFilter CreateFilter(IFilterFactory factory ,IContainer filterContainer, IFilter[] alreadyExisting)
+    public IFilter CreateFilter(IFilterFactory factory, IContainer filterContainer, IFilter[] alreadyExisting)
     {
         var importer = new FilterImporter(factory, null);
-        var newFilter = importer.ImportFilter(filterContainer,_filter, alreadyExisting);
-            
+        var newFilter = importer.ImportFilter(filterContainer, _filter, alreadyExisting);
+
         foreach (var parameterUi in parameterUis)
             parameterUi.HandleSettingParameters(newFilter);
 
         //if there are known good values
         if (ddKnownGoodValues.SelectedItem != null && ddKnownGoodValues.SelectedItem as string != string.Empty)
             newFilter.Name += $"_{ddKnownGoodValues.SelectedItem}";
-            
-           
+
+
         newFilter.FilterContainer_ID = filterContainer.ID;
         newFilter.SaveToDatabase();
 
diff --git a/Rdmp.UI/Wizard/SimpleParameterUI.cs b/Rdmp.UI/Wizard/SimpleParameterUI.cs
index 411c9a63f5..e0b0c84bd6 100644
--- a/Rdmp.UI/Wizard/SimpleParameterUI.cs
+++ b/Rdmp.UI/Wizard/SimpleParameterUI.cs
@@ -22,7 +22,7 @@ public partial class SimpleParameterUI : UserControl
     private readonly IActivateItems _activator;
     private readonly ISqlParameter _parameter;
 
-    public SimpleParameterUI(IActivateItems activator,ISqlParameter parameter)
+    public SimpleParameterUI(IActivateItems activator, ISqlParameter parameter)
     {
         _activator = activator;
         _parameter = parameter;
@@ -34,7 +34,7 @@ public SimpleParameterUI(IActivateItems activator,ISqlParameter parameter)
         tbValue.Text = parameter.Value;
 
         //move the text box to the right of the parameter name but make sure it is minimum visible
-        tbValue.Left = Math.Min(Width - tbValue.Width,lblParameterName.Right);
+        tbValue.Left = Math.Min(Width - tbValue.Width, lblParameterName.Right);
     }
 
     public void SetValueTo(ExtractionFilterParameterSet set)
@@ -42,27 +42,27 @@ public void SetValueTo(ExtractionFilterParameterSet set)
         if (set == null)
             return;
 
-        var correctValue = set.GetAllParameters().FirstOrDefault(p=>p.ParameterName.Equals(_parameter.ParameterName));
+        var correctValue = set.GetAllParameters().FirstOrDefault(p => p.ParameterName.Equals(_parameter.ParameterName));
 
-        if(correctValue == null)
+        if (correctValue == null)
         {
             tbValue.Text = "";
             return;
         }
-            
+
         tbValue.Text = correctValue.Value;
     }
 
     public void HandleSettingParameters(IFilter filter)
     {
         //rename operations can have happened
-        var parameterToSet = filter.GetAllParameters().Single(p => p.ParameterName.StartsWith(_parameter.ParameterName));
+        var parameterToSet =
+            filter.GetAllParameters().Single(p => p.ParameterName.StartsWith(_parameter.ParameterName));
         parameterToSet.Value = tbValue.Text;
         parameterToSet.SaveToDatabase();
     }
 
     private void tbValue_TextChanged(object sender, EventArgs e)
     {
-
     }
 }
\ No newline at end of file
diff --git a/Rdmp.UI/Wizard/SimpleSetOperation.cs b/Rdmp.UI/Wizard/SimpleSetOperation.cs
index 60afdf075a..742ae31919 100644
--- a/Rdmp.UI/Wizard/SimpleSetOperation.cs
+++ b/Rdmp.UI/Wizard/SimpleSetOperation.cs
@@ -21,7 +21,7 @@ namespace Rdmp.UI.Wizard;
 public partial class SimpleSetOperation : UserControl
 {
     private IActivateItems _activator;
-    private string _unionText ;
+    private string _unionText;
     private string _intersectText = "Records Must Appear In BOTH Datasets To Match ";
     private bool _isInclusionCriteria;
 
@@ -30,7 +30,7 @@ public SimpleSetOperation()
         InitializeComponent();
     }
 
-    public void SetupFor(IActivateItems activator,bool isInclusionCriteria)
+    public void SetupFor(IActivateItems activator, bool isInclusionCriteria)
     {
         _activator = activator;
         _isInclusionCriteria = isInclusionCriteria;
@@ -53,15 +53,13 @@ public void SetupFor(IActivateItems activator,bool isInclusionCriteria)
 
     private void ddSetOperation_SelectedIndexChanged(object sender, EventArgs e)
     {
-
         var op = GetSetOperation();
         pbSetOperation.Image = _activator.CoreIconProvider.GetImage(op).ImageToBitmap();
-
     }
 
     private SetOperation GetSetOperation()
     {
-        if((string) ddSetOperation.SelectedItem == _intersectText)
+        if ((string)ddSetOperation.SelectedItem == _intersectText)
             return SetOperation.INTERSECT;
 
         return SetOperation.UNION;
@@ -84,7 +82,7 @@ public CohortAggregateContainer CreateCohortAggregateContainer(CohortAggregateCo
         else
         {
             container.Order = 2;
-            container.Name = "Exclusion Criteria";    
+            container.Name = "Exclusion Criteria";
         }
 
         container.SaveToDatabase();
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
index a0c1e97019..0037aee515 100644
--- a/SharedAssemblyInfo.cs
+++ b/SharedAssemblyInfo.cs
@@ -12,4 +12,4 @@
 
 [assembly: AssemblyVersion("8.1.0")]
 [assembly: AssemblyFileVersion("8.1.0")]
-[assembly: AssemblyInformationalVersion("8.1.0-rc3")]
+[assembly: AssemblyInformationalVersion("8.1.0-rc3")]
\ No newline at end of file
diff --git a/Tests.Common/All.cs b/Tests.Common/All.cs
index 334a368d69..e623e53088 100644
--- a/Tests.Common/All.cs
+++ b/Tests.Common/All.cs
@@ -14,7 +14,8 @@ public class All
     /// <summary>
     /// <see cref="TestCaseSourceAttribute"/> for tests that should run on all DBMS
     /// </summary>
-    public static DatabaseType[] DatabaseTypes = {
+    public static DatabaseType[] DatabaseTypes =
+    {
         DatabaseType.MicrosoftSQLServer,
         DatabaseType.MySql,
         DatabaseType.Oracle,
@@ -25,14 +26,15 @@ public class All
     /// <see cref="TestCaseSourceAttribute"/> for tests that should run on all DBMS
     /// with both permutations of true/false.  Matches exhaustively method signature (DatabaseType,bool)
     /// </summary>
-    public static object[] DatabaseTypesWithBoolFlags = {
-        new object[] {DatabaseType.MicrosoftSQLServer,true},
-        new object[] {DatabaseType.MySql,true},
-        new object[] {DatabaseType.Oracle,true},
-        new object[] {DatabaseType.PostgreSql,true},
-        new object[] {DatabaseType.MicrosoftSQLServer,false},
-        new object[] {DatabaseType.MySql,false},
-        new object[] {DatabaseType.Oracle,false},
-        new object[] {DatabaseType.PostgreSql,false}
+    public static object[] DatabaseTypesWithBoolFlags =
+    {
+        new object[] { DatabaseType.MicrosoftSQLServer, true },
+        new object[] { DatabaseType.MySql, true },
+        new object[] { DatabaseType.Oracle, true },
+        new object[] { DatabaseType.PostgreSql, true },
+        new object[] { DatabaseType.MicrosoftSQLServer, false },
+        new object[] { DatabaseType.MySql, false },
+        new object[] { DatabaseType.Oracle, false },
+        new object[] { DatabaseType.PostgreSql, false }
     };
 }
\ No newline at end of file
diff --git a/Tests.Common/DatabaseTests.cs b/Tests.Common/DatabaseTests.cs
index 2f6f71b523..1926da9819 100644
--- a/Tests.Common/DatabaseTests.cs
+++ b/Tests.Common/DatabaseTests.cs
@@ -70,8 +70,8 @@ public class DatabaseTests
     /// </summary>
     public CatalogueRepository CatalogueTableRepository
     {
-        get {
-
+        get
+        {
             if (RepositoryLocator.CatalogueRepository is CatalogueRepository tableRepository)
                 return tableRepository;
 
@@ -79,6 +79,7 @@ public CatalogueRepository CatalogueTableRepository
             return null;
         }
     }
+
     public IDataExportRepository DataExportRepository => RepositoryLocator.DataExportRepository;
 
     /// <summary>
@@ -89,7 +90,6 @@ public DataExportRepository DataExportTableRepository
     {
         get
         {
-
             if (RepositoryLocator.DataExportRepository is DataExportRepository tableRepository)
                 return tableRepository;
 
@@ -97,6 +97,7 @@ public DataExportRepository DataExportTableRepository
             return null;
         }
     }
+
     protected SqlConnectionStringBuilder UnitTestLoggingConnectionString;
     protected SqlConnectionStringBuilder DataQualityEngineConnectionString;
 
@@ -113,14 +114,15 @@ public DataExportRepository DataExportTableRepository
     static DatabaseTests()
     {
         Rdmp.Core.Repositories.CatalogueRepository.SuppressHelpLoading = true;
-            
+
         ImplementationManager.Load<MicrosoftSQLImplementation>();
         ImplementationManager.Load<MySqlImplementation>();
         ImplementationManager.Load<OracleImplementation>();
         ImplementationManager.Load<PostgreSqlImplementation>();
 
         // Always ignore SSL when running tests
-        DiscoveredServerHelper.AddConnectionStringKeyword(DatabaseType.MicrosoftSQLServer, "TrustServerCertificate", "true", ConnectionStringKeywordPriority.ApiRule);
+        DiscoveredServerHelper.AddConnectionStringKeyword(DatabaseType.MicrosoftSQLServer, "TrustServerCertificate",
+            "true", ConnectionStringKeywordPriority.ApiRule);
 
         ReadSettingsFile();
     }
@@ -130,7 +132,7 @@ private static void ReadSettingsFile()
         const string settingsFile = "TestDatabases.txt";
 
         //see if there is a local text file first
-        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory,settingsFile));
+        var f = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, settingsFile));
 
         if (!f.Exists)
             throw new FileNotFoundException($"Could not find file '{f.FullName}'");
@@ -144,7 +146,6 @@ private static void ReadSettingsFile()
 
     public DatabaseTests()
     {
-
         var opts = new PlatformDatabaseCreationOptions
         {
             ServerName = TestDatabaseSettings.ServerName,
@@ -154,56 +155,53 @@ public DatabaseTests()
             ValidateCertificate = false
         };
 
-        RepositoryLocator = TestDatabaseSettings.UseFileSystemRepo ?
-            new RepositoryProvider(global::Tests.Common.DatabaseTests.GetFreshYamlRepository()) :
-            new PlatformDatabaseCreationRepositoryFinder(opts);
-                    
-        if(CatalogueRepository is TableRepository cataRepo)
+        RepositoryLocator = TestDatabaseSettings.UseFileSystemRepo
+            ? new RepositoryProvider(GetFreshYamlRepository())
+            : new PlatformDatabaseCreationRepositoryFinder(opts);
+
+        if (CatalogueRepository is TableRepository cataRepo)
         {
             Console.WriteLine(
                 $"Expecting Unit Test Catalogue To Be At Server={cataRepo.DiscoveredServer.Name} Database={cataRepo.DiscoveredServer.GetCurrentDatabase()}");
 
-            if(!cataRepo.DiscoveredServer.Exists())
-            {
-                DealWithMissingTestDatabases(opts,cataRepo);
-            }
-
+            if (!cataRepo.DiscoveredServer.Exists()) DealWithMissingTestDatabases(opts, cataRepo);
         }
-                
+
 
         Console.WriteLine("Found Catalogue");
 
-            
 
-        if(DataExportRepository is TableRepository tblRepo)
+        if (DataExportRepository is TableRepository tblRepo)
         {
             Console.WriteLine(
                 $"Expecting Unit Test Data Export To Be At Server={tblRepo.DiscoveredServer.Name} Database= {tblRepo.DiscoveredServer.GetCurrentDatabase()}");
-            Assert.IsTrue(tblRepo.DiscoveredServer.Exists(), "Data Export database does not exist, run 'rdmp.exe install ...' to create it (Ensure that servername and prefix in TestDatabases.txt match those you provide to CreateDatabases.exe e.g. 'rdmp.exe install localhost\\sqlexpress TEST_')");
+            Assert.IsTrue(tblRepo.DiscoveredServer.Exists(),
+                "Data Export database does not exist, run 'rdmp.exe install ...' to create it (Ensure that servername and prefix in TestDatabases.txt match those you provide to CreateDatabases.exe e.g. 'rdmp.exe install localhost\\sqlexpress TEST_')");
         }
-                
+
 
         Console.WriteLine("Found DataExport");
-            
+
         Console.Write(Environment.NewLine + Environment.NewLine + Environment.NewLine);
 
         RunBlitzDatabases(RepositoryLocator);
 
         var defaults = CatalogueRepository;
 
-        DataQualityEngineConnectionString = CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix, PlatformDatabaseCreation.DefaultDQEDatabaseName, PermissableDefaults.DQE,new DataQualityEnginePatcher());
-        UnitTestLoggingConnectionString = CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix, PlatformDatabaseCreation.DefaultLoggingDatabaseName, PermissableDefaults.LiveLoggingServer_ID, new LoggingDatabasePatcher());
-        DiscoveredServerICanCreateRandomDatabasesAndTablesOn = new DiscoveredServer(CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix, null, PermissableDefaults.RAWDataLoadServer, null));
+        DataQualityEngineConnectionString = CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix,
+            PlatformDatabaseCreation.DefaultDQEDatabaseName, PermissableDefaults.DQE, new DataQualityEnginePatcher());
+        UnitTestLoggingConnectionString = CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix,
+            PlatformDatabaseCreation.DefaultLoggingDatabaseName, PermissableDefaults.LiveLoggingServer_ID,
+            new LoggingDatabasePatcher());
+        DiscoveredServerICanCreateRandomDatabasesAndTablesOn = new DiscoveredServer(
+            CreateServerPointerInCatalogue(defaults, TestDatabaseNames.Prefix, null,
+                PermissableDefaults.RAWDataLoadServer, null));
         if (DiscoveredServerICanCreateRandomDatabasesAndTablesOn.Builder is SqlConnectionStringBuilder dsiccrdatocsb)
-        {
             dsiccrdatocsb.TrustServerCertificate = true;
-        }
 
-        _discoveredSqlServer = new DiscoveredServer(TestDatabaseSettings.ServerName,null,DatabaseType.MicrosoftSQLServer,TestDatabaseSettings.Username,TestDatabaseSettings.Password);
-        if (_discoveredSqlServer.Builder is SqlConnectionStringBuilder csb)
-        {
-            csb.TrustServerCertificate = true;
-        }
+        _discoveredSqlServer = new DiscoveredServer(TestDatabaseSettings.ServerName, null,
+            DatabaseType.MicrosoftSQLServer, TestDatabaseSettings.Username, TestDatabaseSettings.Password);
+        if (_discoveredSqlServer.Builder is SqlConnectionStringBuilder csb) csb.TrustServerCertificate = true;
 
         if (TestDatabaseSettings.MySql != null)
         {
@@ -216,13 +214,14 @@ public DatabaseTests()
 
                 new ConnectionStringKeyword(CatalogueRepository, DatabaseType.MySql, k, builder[k].ToString());
             }
+
             _discoveredMySqlServer = new DiscoveredServer(builder);
         }
 
         if (TestDatabaseSettings.Oracle != null)
             _discoveredOracleServer = new DiscoveredServer(TestDatabaseSettings.Oracle, DatabaseType.Oracle);
 
-        if(TestDatabaseSettings.PostgreSql != null)
+        if (TestDatabaseSettings.PostgreSql != null)
             _discoveredPostgresServer = new DiscoveredServer(TestDatabaseSettings.PostgreSql, DatabaseType.PostgreSql);
     }
 
@@ -231,13 +230,12 @@ private static void DealWithMissingTestDatabases(PlatformDatabaseCreationOptions
         var mainDb = cataRepo.DiscoveredServer.ExpectDatabase("master");
 
         if (HaveTriedCreatingTestDatabases || !mainDb.Server.Exists())
-        {
-            Assert.Inconclusive("Test database server does not exist.  You must install SQL Server LocalDb or Sql Server Express to run DatabaseTests. Or update TestDatabases.txt to point to your existing server.");
-        }
+            Assert.Inconclusive(
+                "Test database server does not exist.  You must install SQL Server LocalDb or Sql Server Express to run DatabaseTests. Or update TestDatabases.txt to point to your existing server.");
 
         // if user is trying to connect to a test database
         // and that server exists (but TEST_ databases don't)
-        if (opts.Prefix.Contains("TEST",StringComparison.InvariantCultureIgnoreCase))
+        if (opts.Prefix.Contains("TEST", StringComparison.InvariantCultureIgnoreCase))
         {
             // then create them
             TestContext.Out.WriteLine($"Creating TEST databases on {mainDb.Server} using prefix {opts.Prefix}");
@@ -251,7 +249,7 @@ private static void DealWithMissingTestDatabases(PlatformDatabaseCreationOptions
     private static IDataExportRepository GetFreshYamlRepository()
     {
         var dir = new DirectoryInfo(Path.Combine(TestContext.CurrentContext.WorkDirectory, "Repo"));
-            
+
         // clear out any test remnants
         if (dir.Exists)
             dir.Delete(true);
@@ -259,7 +257,8 @@ private static IDataExportRepository GetFreshYamlRepository()
         return new YamlRepository(dir);
     }
 
-    private SqlConnectionStringBuilder CreateServerPointerInCatalogue(IServerDefaults defaults, string prefix, string databaseName, PermissableDefaults defaultToSet,IPatcher patcher)
+    private SqlConnectionStringBuilder CreateServerPointerInCatalogue(IServerDefaults defaults, string prefix,
+        string databaseName, PermissableDefaults defaultToSet, IPatcher patcher)
     {
         var opts = new PlatformDatabaseCreationOptions
         {
@@ -276,7 +275,7 @@ private SqlConnectionStringBuilder CreateServerPointerInCatalogue(IServerDefault
             builder.InitialCatalog = "";
 
         //create a new pointer
-        var externalServerPointer = new ExternalDatabaseServer(CatalogueRepository, databaseName??"RAW",patcher)
+        var externalServerPointer = new ExternalDatabaseServer(CatalogueRepository, databaseName ?? "RAW", patcher)
         {
             Server = builder.DataSource,
             Database = builder.InitialCatalog,
@@ -288,7 +287,7 @@ private SqlConnectionStringBuilder CreateServerPointerInCatalogue(IServerDefault
 
         //now make it the default DQE
         defaults.SetDefault(defaultToSet, externalServerPointer);
-            
+
         return builder;
     }
 
@@ -298,22 +297,21 @@ private SqlConnectionStringBuilder CreateServerPointerInCatalogue(IServerDefault
     /// <param name="repositoryLocator"></param>
     protected void RunBlitzDatabases(IRDMPPlatformRepositoryServiceLocator repositoryLocator)
     {
-        if(CatalogueRepository is YamlRepository y)
-        {
-            foreach(var o in y.AllObjects)
-            {
+        if (CatalogueRepository is YamlRepository y)
+            foreach (var o in y.AllObjects)
                 o.DeleteInDatabase();
-            }
-        }
 
         if (CatalogueRepository is not TableRepository cataTblRepo)
             return;
 
         using var con = cataTblRepo.GetConnection();
-        var catalogueDatabaseName = ((TableRepository) repositoryLocator.CatalogueRepository).DiscoveredServer.GetCurrentDatabase().GetRuntimeName();
-        var dataExportDatabaseName = ((TableRepository) repositoryLocator.DataExportRepository).DiscoveredServer.GetCurrentDatabase().GetRuntimeName();
+        var catalogueDatabaseName = ((TableRepository)repositoryLocator.CatalogueRepository).DiscoveredServer
+            .GetCurrentDatabase().GetRuntimeName();
+        var dataExportDatabaseName = ((TableRepository)repositoryLocator.DataExportRepository).DiscoveredServer
+            .GetCurrentDatabase().GetRuntimeName();
 
-        UsefulStuff.ExecuteBatchNonQuery(string.Format(BlitzDatabases, catalogueDatabaseName, dataExportDatabaseName),con.Connection,con.Transaction);
+        UsefulStuff.ExecuteBatchNonQuery(string.Format(BlitzDatabases, catalogueDatabaseName, dataExportDatabaseName),
+            con.Connection, con.Transaction);
     }
 
     /// <summary>
@@ -322,19 +320,20 @@ protected void RunBlitzDatabases(IRDMPPlatformRepositoryServiceLocator repositor
     /// </summary>
     protected void BlitzMainDataTables()
     {
-        if (CatalogueRepository is YamlRepository y)
-        {
-            BlitzMainDataTables(y);
-        }
+        if (CatalogueRepository is YamlRepository y) BlitzMainDataTables(y);
 
         if (CatalogueRepository is not TableRepository cataTblRepo)
             return;
 
         using var con = cataTblRepo.GetConnection();
-        var catalogueDatabaseName = ((TableRepository)RepositoryLocator.CatalogueRepository).DiscoveredServer.GetCurrentDatabase().GetRuntimeName();
-        var dataExportDatabaseName = ((TableRepository)RepositoryLocator.DataExportRepository).DiscoveredServer.GetCurrentDatabase().GetRuntimeName();
+        var catalogueDatabaseName = ((TableRepository)RepositoryLocator.CatalogueRepository).DiscoveredServer
+            .GetCurrentDatabase().GetRuntimeName();
+        var dataExportDatabaseName = ((TableRepository)RepositoryLocator.DataExportRepository).DiscoveredServer
+            .GetCurrentDatabase().GetRuntimeName();
 
-        UsefulStuff.ExecuteBatchNonQuery(string.Format(BlitzDatabasesLite, catalogueDatabaseName, dataExportDatabaseName), con.Connection, con.Transaction);
+        UsefulStuff.ExecuteBatchNonQuery(
+            string.Format(BlitzDatabasesLite, catalogueDatabaseName, dataExportDatabaseName), con.Connection,
+            con.Transaction);
     }
 
     private void BlitzMainDataTables(YamlRepository y)
@@ -368,11 +367,10 @@ private void BlitzMainDataTables(YamlRepository y)
         DeleteAll<TableInfo>(y);
         DeleteAll<DataAccessCredentials>(y);
 
-        foreach(var c in CatalogueRepository.GetAllObjects<Catalogue>())
+        foreach (var c in CatalogueRepository.GetAllObjects<Catalogue>())
         {
             c.PivotCategory_ExtractionInformation_ID = null;
             c.TimeCoverage_ExtractionInformation_ID = null;
-
         }
 
         DeleteAll<ExtractionFilterParameterSetValue>(y);
@@ -426,10 +424,7 @@ private void BlitzMainDataTables(YamlRepository y)
 
     private static void DeleteAll<T>(YamlRepository y) where T : IMapsDirectlyToDatabaseTable
     {
-        foreach (var o in y.GetAllObjects<T>())
-        {
-            o.DeleteInDatabase();
-        }
+        foreach (var o in y.GetAllObjects<T>()) o.DeleteInDatabase();
     }
 
     protected void RunBlitzDatabases()
@@ -443,7 +438,7 @@ protected virtual void OneTimeSetUp()
         //if it is the first time
         if (_startup == null)
         {
-            _startup = new Startup(new EnvironmentInfo(),RepositoryLocator);
+            _startup = new Startup(new EnvironmentInfo(), RepositoryLocator);
 
             _startup.DatabaseFound += StartupOnDatabaseFound;
             _startup.MEFFileDownloaded += StartupOnMEFFileDownloaded;
@@ -460,7 +455,6 @@ protected virtual void OneTimeSetUp()
     [SetUp]
     protected virtual void SetUp()
     {
-
     }
 
     [TearDown]
@@ -478,10 +472,11 @@ protected void TearDown()
             }
     }
 
-        private void StartupOnDatabaseFound(object sender, PlatformDatabaseFoundEventArgs args)
-        {
-            if (args.Exception != null && args.Status!=RDMPPlatformDatabaseStatus.Healthy && args.Status!=RDMPPlatformDatabaseStatus.SoftwareOutOfDate)
-                Assert.Fail(args.SummariseAsString());
+    private void StartupOnDatabaseFound(object sender, PlatformDatabaseFoundEventArgs args)
+    {
+        if (args.Exception != null && args.Status != RDMPPlatformDatabaseStatus.Healthy &&
+            args.Status != RDMPPlatformDatabaseStatus.SoftwareOutOfDate)
+            Assert.Fail(args.SummariseAsString());
 
         switch (args.Status)
         {
@@ -489,7 +484,8 @@ private void StartupOnDatabaseFound(object sender, PlatformDatabaseFoundEventArg
             case RDMPPlatformDatabaseStatus.Healthy:
                 return;
             case RDMPPlatformDatabaseStatus.SoftwareOutOfDate:
-                Assert.Fail(@"Your TEST database schema is out of date with the API version you are testing with, 'run rdmp.exe install ...' to install the version which matches your nuget package.");
+                Assert.Fail(
+                    @"Your TEST database schema is out of date with the API version you are testing with, 'run rdmp.exe install ...' to install the version which matches your nuget package.");
                 break;
             //it's a tier appropriate fatal error message
             case RDMPPlatformDatabaseStatus.Broken:
@@ -503,12 +499,18 @@ private void StartupOnDatabaseFound(object sender, PlatformDatabaseFoundEventArg
 
     private void StartupOnPluginPatcherFound(object sender, PluginPatcherFoundEventArgs args)
     {
-        Assert.IsTrue(args.Status == PluginPatcherStatus.Healthy, "PluginPatcherStatus is {0} for plugin {1}{2}{3}", args.Status, args.Type.Name, Environment.NewLine, args.Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(args.Exception));
+        Assert.IsTrue(args.Status == PluginPatcherStatus.Healthy, "PluginPatcherStatus is {0} for plugin {1}{2}{3}",
+            args.Status, args.Type.Name, Environment.NewLine,
+            args.Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(args.Exception));
     }
 
     private void StartupOnMEFFileDownloaded(object sender, MEFFileDownloadProgressEventArgs args)
     {
-        Assert.IsTrue(args.Status is MEFFileDownloadEventStatus.Success or MEFFileDownloadEventStatus.FailedDueToFileLock, "MEFFileDownloadEventStatus is {0} for plugin {1}{2}{3}", args.Status, args.FileBeingProcessed, Environment.NewLine, args.Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(args.Exception));
+        Assert.IsTrue(
+            args.Status is MEFFileDownloadEventStatus.Success or MEFFileDownloadEventStatus.FailedDueToFileLock,
+            "MEFFileDownloadEventStatus is {0} for plugin {1}{2}{3}", args.Status, args.FileBeingProcessed,
+            Environment.NewLine,
+            args.Exception == null ? "No exception" : ExceptionHelper.ExceptionToListOfInnerMessages(args.Exception));
     }
 
 
@@ -599,7 +601,6 @@ delete from {1}..Project
 ";
 
 
-
     public const string BlitzDatabasesLite = @"
 --If you want to blitz everything out of your test catalogue and data export database(s) then run the following SQL (adjusting for database names):
 
@@ -690,11 +691,9 @@ delete from {1}..Project
     /// </summary>
     /// <param name="sql"></param>
     /// <returns></returns>
-    protected static string CollapseWhitespace(string sql)
-    {
+    protected static string CollapseWhitespace(string sql) =>
         //replace all whitespace with single spaces
-        return Regex.Replace(sql, @"\s+", " ").Trim();
-    }
+        Regex.Replace(sql, @"\s+", " ").Trim();
 
     private HashSet<DiscoveredDatabase> forCleanup = new();
 
@@ -711,7 +710,7 @@ protected DiscoveredDatabase GetCleanedServer(DatabaseType type, string dbnName
 
         //if user specified the standard name or no name
         var isStandardDb = dbnName == null || dbnName == standardName;
-            
+
         //use the standard name if they haven't specified one
         dbnName ??= standardName;
 
@@ -759,7 +758,8 @@ protected DiscoveredDatabase GetCleanedServer(DatabaseType type, string dbnName
         return database;
     }
 
-    private static DiscoveredServer MsScratch,MyScratch,PostScratch,OracleScratch;
+    private static DiscoveredServer MsScratch, MyScratch, PostScratch, OracleScratch;
+
     protected (IManagedConnection trans, DiscoveredDatabase) GetScratchDatabase(DatabaseType type)
     {
         var server = type switch
@@ -771,7 +771,7 @@ protected DiscoveredDatabase GetCleanedServer(DatabaseType type, string dbnName
             _ => throw new ArgumentOutOfRangeException(nameof(type))
         };
         var trans = server.BeginNewTransactedConnection();
-        return (trans,server.GetCurrentDatabase());
+        return (trans, server.GetCurrentDatabase());
     }
 
     protected static void DeleteTables(DiscoveredDatabase database)
@@ -783,7 +783,6 @@ protected static void DeleteTables(DiscoveredDatabase database)
             {
                 con.Open();
                 foreach (var t in database.DiscoverTables(false))
-                {
                     //disable system versioning on any temporal tables otherwise drop fails
                     try
                     {
@@ -796,7 +795,6 @@ protected static void DeleteTables(DiscoveredDatabase database)
                         TestContext.Out.WriteLine(
                             $"Failed to generate disable System Versioning check for table {t} (nevermind)");
                     }
-                }
             }
 
         var tables = new RelationshipTopologicalSort(database.DiscoverTables(true));
@@ -804,48 +802,42 @@ protected static void DeleteTables(DiscoveredDatabase database)
         foreach (var t in tables.Order.Reverse())
             try
             {
-
                 t.Drop();
             }
             catch (Exception ex)
             {
-                throw new Exception( $"Failed to drop table '{t.GetFullyQualifiedName()} during cleanup",ex);
+                throw new Exception($"Failed to drop table '{t.GetFullyQualifiedName()} during cleanup", ex);
             }
-            
+
         foreach (var t in database.DiscoverTableValuedFunctions())
             try
             {
-
                 t.Drop();
             }
             catch (Exception ex)
             {
-                throw new Exception( $"Failed to drop table '{t.GetFullyQualifiedName()} during cleanup",ex);
+                throw new Exception($"Failed to drop table '{t.GetFullyQualifiedName()} during cleanup", ex);
             }
-
     }
 
-    protected ICatalogue Import(DiscoveredTable tbl, out ITableInfo tableInfoCreated, out ColumnInfo[] columnInfosCreated, out CatalogueItem[] catalogueItems, out ExtractionInformation[] extractionInformations)
+    protected ICatalogue Import(DiscoveredTable tbl, out ITableInfo tableInfoCreated,
+        out ColumnInfo[] columnInfosCreated, out CatalogueItem[] catalogueItems,
+        out ExtractionInformation[] extractionInformations)
     {
         var importer = new TableInfoImporter(CatalogueRepository, tbl);
-        importer.DoImport(out tableInfoCreated,out columnInfosCreated);
+        importer.DoImport(out tableInfoCreated, out columnInfosCreated);
 
         var forwardEngineer = new ForwardEngineerCatalogue(tableInfoCreated, columnInfosCreated);
-        forwardEngineer.ExecuteForwardEngineering(out var catalogue,out catalogueItems,out extractionInformations);
+        forwardEngineer.ExecuteForwardEngineering(out var catalogue, out catalogueItems, out extractionInformations);
 
         return catalogue;
     }
 
-    protected ICatalogue Import(DiscoveredTable tbl)
-    {
-        return Import(tbl, out _, out _, out _,out _);
-    }
-
-    protected ICatalogue Import(DiscoveredTable tbl, out ITableInfo tableInfoCreated,out ColumnInfo[] columnInfosCreated)
-    {
+    protected ICatalogue Import(DiscoveredTable tbl) => Import(tbl, out _, out _, out _, out _);
 
-        return Import(tbl, out tableInfoCreated, out columnInfosCreated, out CatalogueItem[] catalogueItems, out ExtractionInformation[] extractionInformations);
-    }
+    protected ICatalogue Import(DiscoveredTable tbl, out ITableInfo tableInfoCreated,
+        out ColumnInfo[] columnInfosCreated) => Import(tbl, out tableInfoCreated, out columnInfosCreated,
+        out var catalogueItems, out var extractionInformations);
 
     protected static void VerifyRowExist(DataTable resultTable, params object[] rowObjects)
     {
@@ -857,10 +849,8 @@ protected static void VerifyRowExist(DataTable resultTable, params object[] rowO
         {
             var matchAll = true;
             for (var i = 0; i < rowObjects.Length; i++)
-            {
                 if (!AreBasicallyEquals(rowObjects[i], r[i]))
                     matchAll = false;
-            }
 
             //found a row that matches on all params
             if (matchAll)
@@ -886,8 +876,9 @@ public static bool AreBasicallyEquals(object o, object o2, bool handleSlashRSlas
 
         //they are not null so tostring them deals with int vs long etc that DbDataAdapters can be a bit flaky on
         if (handleSlashRSlashN)
-            return string.Equals(o.ToString().Replace("\r","").Replace("\n",""), o2.ToString().Replace("\r","").Replace("\n",""));
-            
+            return string.Equals(o.ToString().Replace("\r", "").Replace("\n", ""),
+                o2.ToString().Replace("\r", "").Replace("\n", ""));
+
         return string.Equals(o.ToString(), o2.ToString());
     }
 
@@ -899,20 +890,22 @@ public enum TestLowPrivilegePermissions
         Writer = 2,
         CreateAndDropTables = 4,
 
-        All = Reader|Writer|CreateAndDropTables
+        All = Reader | Writer | CreateAndDropTables
     }
 
-    protected void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db,TestLowPrivilegePermissions permissions)
+    protected void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db, TestLowPrivilegePermissions permissions)
     {
         SetupLowPrivilegeUserRightsFor(db, permissions, null);
     }
+
     protected void SetupLowPrivilegeUserRightsFor(ITableInfo ti, TestLowPrivilegePermissions permissions)
     {
         var db = DataAccessPortal.ExpectDatabase(ti, DataAccessContext.InternalDataProcessing);
         SetupLowPrivilegeUserRightsFor(db, permissions, ti);
     }
 
-    private void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db, TestLowPrivilegePermissions permissions, ITableInfo ti)
+    private void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db, TestLowPrivilegePermissions permissions,
+        ITableInfo ti)
     {
         var dbType = db.Server.DatabaseType;
 
@@ -927,7 +920,9 @@ private void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db, TestLowPrivil
         var sql = GrantAccessSql(username, dbType, permissions);
 
         using (var con = db.Server.GetConnection())
+        {
             UsefulStuff.ExecuteBatchNonQuery(sql, con);
+        }
 
         if (ti != null)
         {
@@ -939,7 +934,6 @@ private void SetupLowPrivilegeUserRightsFor(DiscoveredDatabase db, TestLowPrivil
             var credentialsFactory = new DataAccessCredentialsFactory(CatalogueRepository);
             credentialsFactory.Create(ti, username, password, DataAccessContext.Any);
         }
-            
     }
 
 
@@ -989,16 +983,11 @@ protected static void DeleteFilesIn(DirectoryInfo dir)
         foreach (var d in dir.GetDirectories())
             d.Delete(true);
     }
-
 }
 
-
 public static class TestDatabaseNames
 {
     public static string Prefix;
 
-    public static string GetConsistentName(string databaseName)
-    {
-        return Prefix + databaseName;
-    }
+    public static string GetConsistentName(string databaseName) => Prefix + databaseName;
 }
\ No newline at end of file
diff --git a/Tests.Common/Helpers/TestDataInventor.cs b/Tests.Common/Helpers/TestDataInventor.cs
index 7120df6548..30c806dad5 100644
--- a/Tests.Common/Helpers/TestDataInventor.cs
+++ b/Tests.Common/Helpers/TestDataInventor.cs
@@ -24,14 +24,15 @@ namespace Tests.Common.Helpers;
 public class TestDataInventor : CacheSource<TestDataWriterChunk>
 {
     private Random r = new();
-        
+
     /// <summary>
     /// The path in which to create random files
     /// </summary>
-    [DemandsInitialization("Directory to create files into",Mandatory=true)]
+    [DemandsInitialization("Directory to create files into", Mandatory = true)]
     public string WorkingFolder { get; set; }
 
-    public override TestDataWriterChunk DoGetChunk(ICacheFetchRequest request,IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public override TestDataWriterChunk DoGetChunk(ICacheFetchRequest request, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         // don't load anything for today onwards
         var today = DateTime.Now.Subtract(DateTime.Now.TimeOfDay);
@@ -42,13 +43,13 @@ public override TestDataWriterChunk DoGetChunk(ICacheFetchRequest request,IDataL
 
         var toReturn = new List<FileInfo>();
 
-        while(currentDay <= Request.End)
+        while (currentDay <= Request.End)
         {
             toReturn.Add(GetFileForDay(currentDay));
             currentDay = currentDay.AddDays(1);
         }
 
-        return new TestDataWriterChunk(Request,toReturn.ToArray());
+        return new TestDataWriterChunk(Request, toReturn.ToArray());
     }
 
     private FileInfo GetFileForDay(DateTime currentDay)
@@ -64,19 +65,18 @@ private FileInfo GetFileForDay(DateTime currentDay)
 
     public override void Dispose(IDataLoadEventListener listener, Exception pipelineFailureExceptionIfAny)
     {
-            
     }
 
     public override void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public override TestDataWriterChunk TryGetPreview()
     {
         var dt = DateTime.Now.AddYears(-200);
 
-        return new TestDataWriterChunk(new CacheFetchRequest(null, dt){ChunkPeriod = new TimeSpan(1,0,0)}, new []{GetFileForDay(dt)});
+        return new TestDataWriterChunk(new CacheFetchRequest(null, dt) { ChunkPeriod = new TimeSpan(1, 0, 0) },
+            new[] { GetFileForDay(dt) });
     }
 
     public override void Check(ICheckNotifier notifier)
diff --git a/Tests.Common/Helpers/TestDataPipelineAssembler.cs b/Tests.Common/Helpers/TestDataPipelineAssembler.cs
index 555eedb2dd..5e152686b9 100644
--- a/Tests.Common/Helpers/TestDataPipelineAssembler.cs
+++ b/Tests.Common/Helpers/TestDataPipelineAssembler.cs
@@ -17,7 +17,6 @@ namespace Tests.Common.Helpers;
 /// </summary>
 public class TestDataPipelineAssembler
 {
-        
     /// <summary>
     /// Blueprint for a <see cref="TestDataWriter"/>
     /// </summary>
@@ -27,16 +26,19 @@ public class TestDataPipelineAssembler
     /// Blueprint for a <see cref="TestDataInventor"/>
     /// </summary>
     public PipelineComponent Source { get; set; }
+
     public Pipeline Pipeline { get; set; }
 
     public TestDataPipelineAssembler(string pipeName, ICatalogueRepository catalogueRepository)
     {
         Pipeline = new Pipeline(catalogueRepository, pipeName);
-        Source = new PipelineComponent(catalogueRepository, Pipeline, typeof(TestDataInventor), 1, "DataInventorSource");
-        Destination = new PipelineComponent(catalogueRepository, Pipeline, typeof(TestDataWriter), 2, "DataInventorDestination");
+        Source = new PipelineComponent(catalogueRepository, Pipeline, typeof(TestDataInventor), 1,
+            "DataInventorSource");
+        Destination = new PipelineComponent(catalogueRepository, Pipeline, typeof(TestDataWriter), 2,
+            "DataInventorDestination");
 
         Destination.CreateArgumentsForClassIfNotExists<TestDataWriter>();
-            
+
         Pipeline.SourcePipelineComponent_ID = Source.ID;
         Pipeline.DestinationPipelineComponent_ID = Destination.ID;
         Pipeline.SaveToDatabase();
diff --git a/Tests.Common/Helpers/TestDataWriter.cs b/Tests.Common/Helpers/TestDataWriter.cs
index 8001e70c72..915913861e 100644
--- a/Tests.Common/Helpers/TestDataWriter.cs
+++ b/Tests.Common/Helpers/TestDataWriter.cs
@@ -16,17 +16,18 @@ namespace Tests.Common.Helpers;
 
 public class TestDataWriter : CacheFilesystemDestination
 {
-    public TestDataWriterChunk ProcessPipelineData(TestDataWriterChunk toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
+    public TestDataWriterChunk ProcessPipelineData(TestDataWriterChunk toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken)
     {
         var layout = CreateCacheLayout();
 
         var toCreateFilesIn = layout.Resolver.GetLoadCacheDirectory(CacheDirectory);
-            
+
         foreach (var file in toProcess.Files)
         {
             var destination = Path.Combine(toCreateFilesIn.FullName, file.Name);
 
-            if(File.Exists(destination))
+            if (File.Exists(destination))
                 File.Delete(destination);
 
             file.MoveTo(destination);
@@ -35,25 +36,20 @@ public TestDataWriterChunk ProcessPipelineData(TestDataWriterChunk toProcess, ID
         return null;
     }
 
-    public override ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener, GracefulCancellationToken cancellationToken)
-    {
-        return ProcessPipelineData((TestDataWriterChunk)toProcess, listener, cancellationToken);
-    }
+    public override ICacheChunk ProcessPipelineData(ICacheChunk toProcess, IDataLoadEventListener listener,
+        GracefulCancellationToken cancellationToken) =>
+        ProcessPipelineData((TestDataWriterChunk)toProcess, listener, cancellationToken);
 
-    public override ICacheLayout CreateCacheLayout()
-    {
-        return new BasicCacheLayout(CacheDirectory);
-    }
+    public override ICacheLayout CreateCacheLayout() => new BasicCacheLayout(CacheDirectory);
 
     public override void Abort(IDataLoadEventListener listener)
     {
-            
     }
 
     public override void Check(ICheckNotifier notifier)
     {
         if (CacheDirectory == null)
-            notifier.OnCheckPerformed(new CheckEventArgs("PreInitialize was not called? (CacheDirectory == null)", CheckResult.Fail));
+            notifier.OnCheckPerformed(new CheckEventArgs("PreInitialize was not called? (CacheDirectory == null)",
+                CheckResult.Fail));
     }
-
 }
\ No newline at end of file
diff --git a/Tests.Common/Helpers/TestDataWriterChunk.cs b/Tests.Common/Helpers/TestDataWriterChunk.cs
index 698e909df1..e5634a0ed6 100644
--- a/Tests.Common/Helpers/TestDataWriterChunk.cs
+++ b/Tests.Common/Helpers/TestDataWriterChunk.cs
@@ -19,6 +19,4 @@ public TestDataWriterChunk(ICacheFetchRequest request, FileInfo[] files)
         Request = request;
         Files = files;
     }
-
-        
 }
\ No newline at end of file
diff --git a/Tests.Common/RdmpMockFactory.cs b/Tests.Common/RdmpMockFactory.cs
index 1592550dba..d86fdea672 100644
--- a/Tests.Common/RdmpMockFactory.cs
+++ b/Tests.Common/RdmpMockFactory.cs
@@ -25,29 +25,26 @@ public class RdmpMockFactory
     /// <param name="databaseNameToReturn">Database name to return regardless of what <see cref="LoadBubble"/> is asked for by the DLE</param>
     /// <param name="tableNameToReturn">Table name to return regardless of what <see cref="LoadBubble"/> is asked for by the DLE</param>
     /// <returns></returns>
-    public static INameDatabasesAndTablesDuringLoads Mock_INameDatabasesAndTablesDuringLoads(string databaseNameToReturn,string tableNameToReturn )
+    public static INameDatabasesAndTablesDuringLoads Mock_INameDatabasesAndTablesDuringLoads(
+        string databaseNameToReturn, string tableNameToReturn)
     {
-        return  Mock.Of<INameDatabasesAndTablesDuringLoads>(x=>
-            x.GetDatabaseName(It.IsAny<string>(), It.IsAny<LoadBubble>())==databaseNameToReturn &&
-            x.GetName(It.IsAny<string>(), It.IsAny<LoadBubble>())==tableNameToReturn);
-
+        return Mock.Of<INameDatabasesAndTablesDuringLoads>(x =>
+            x.GetDatabaseName(It.IsAny<string>(), It.IsAny<LoadBubble>()) == databaseNameToReturn &&
+            x.GetName(It.IsAny<string>(), It.IsAny<LoadBubble>()) == tableNameToReturn);
     }
 
     /// <inheritdoc cref="Mock_INameDatabasesAndTablesDuringLoads(string, string)"/>
-    public static INameDatabasesAndTablesDuringLoads Mock_INameDatabasesAndTablesDuringLoads(DiscoveredDatabase databaseNameToReturn, string tableNameToReturn)
-    {
-        return Mock_INameDatabasesAndTablesDuringLoads(databaseNameToReturn.GetRuntimeName(), tableNameToReturn);
-    }
+    public static INameDatabasesAndTablesDuringLoads
+        Mock_INameDatabasesAndTablesDuringLoads(DiscoveredDatabase databaseNameToReturn, string tableNameToReturn) =>
+        Mock_INameDatabasesAndTablesDuringLoads(databaseNameToReturn.GetRuntimeName(), tableNameToReturn);
 
     /// <summary>
     /// Creates a mock implementation of <see cref="ILoadMetadata"/> which loads the supplied <paramref name="table"/>
     /// </summary>
     /// <param name="table"></param>
     /// <returns></returns>
-    public static ILoadMetadata Mock_LoadMetadataLoadingTable(DiscoveredTable table)
-    {
-        return Mock_LoadMetadataLoadingTable(Mock_TableInfo(table));
-    }
+    public static ILoadMetadata Mock_LoadMetadataLoadingTable(DiscoveredTable table) =>
+        Mock_LoadMetadataLoadingTable(Mock_TableInfo(table));
 
     /// <summary>
     /// Creates a mock implementation of <see cref="ILoadMetadata"/> which loads the supplied <paramref name="tableInfo"/>
@@ -59,10 +56,11 @@ public static ILoadMetadata Mock_LoadMetadataLoadingTable(ITableInfo tableInfo)
         var lmd = new Mock<ILoadMetadata>();
         var cata = new Mock<ICatalogue>();
 
-        lmd.Setup(m => m.GetDistinctLiveDatabaseServer()).Returns(tableInfo.Discover(DataAccessContext.DataLoad).Database.Server);
+        lmd.Setup(m => m.GetDistinctLiveDatabaseServer())
+            .Returns(tableInfo.Discover(DataAccessContext.DataLoad).Database.Server);
         lmd.Setup(m => m.GetAllCatalogues()).Returns(new[] { cata.Object });
         lmd.Setup(p => p.GetDistinctLoggingTask()).Returns(TestLoggingTask);
-            
+
         cata.Setup(m => m.GetTableInfoList(It.IsAny<bool>())).Returns(new[] { tableInfo });
         cata.Setup(m => m.LoggingDataTask).Returns(TestLoggingTask);
         return lmd.Object;
@@ -75,11 +73,11 @@ public static ILoadMetadata Mock_LoadMetadataLoadingTable(ITableInfo tableInfo)
     /// <returns></returns>
     public static ITableInfo Mock_TableInfo(DiscoveredTable table)
     {
-        return Mock.Of<ITableInfo>(p=>
+        return Mock.Of<ITableInfo>(p =>
             p.Name == table.GetFullyQualifiedName() &&
-            p.Database==table.Database.GetRuntimeName() && 
-            p.DatabaseType==table.Database.Server.DatabaseType &&
+            p.Database == table.Database.GetRuntimeName() &&
+            p.DatabaseType == table.Database.Server.DatabaseType &&
             p.IsTableValuedFunction == (table.TableType == TableType.TableValuedFunction) &&
-            p.Discover(It.IsAny<DataAccessContext>())==table);
+            p.Discover(It.IsAny<DataAccessContext>()) == table);
     }
 }
\ No newline at end of file
diff --git a/Tests.Common/Scenarios/BulkTestsData.cs b/Tests.Common/Scenarios/BulkTestsData.cs
index a1db4c88e2..2349a878b5 100644
--- a/Tests.Common/Scenarios/BulkTestsData.cs
+++ b/Tests.Common/Scenarios/BulkTestsData.cs
@@ -32,12 +32,12 @@ public class BulkTestsData
     /// The database in which to create the test data table
     /// </summary>
     public readonly DiscoveredDatabase BulkDataDatabase;
-        
+
     /// <summary>
     /// The name of the test table that will be created
     /// </summary>
     public const string BulkDataTable = "BulkData";
-        
+
     /// <summary>
     /// The number of rows that are to be created
     /// </summary>
@@ -77,7 +77,7 @@ public class BulkTestsData
     /// <summary>
     /// the bulk test data created during <see cref="SetupTestData"/>
     /// </summary>
-    public DiscoveredTable Table {get;private set; }
+    public DiscoveredTable Table { get; private set; }
 
     /// <summary>
     /// Prepares to create a new table in the <paramref name="targetDatabase"/> of test data using <see cref="Demography"/>. To actually generate the data
@@ -93,7 +93,6 @@ public BulkTestsData(ICatalogueRepository repository, DiscoveredDatabase targetD
         ExpectedNumberOfRowsInTestData = numberOfRows;
 
         _dataGenerator = new Demography(new Random(500));
-
     }
 
     /// <summary>
@@ -108,34 +107,32 @@ public void SetupTestData()
 
         //generate some people
         var people = new PersonCollection();
-        people.GeneratePeople(5000,r);
+        people.GeneratePeople(5000, r);
 
         //generate the test data
-        var dt = _dataGenerator.GetDataTable(people,ExpectedNumberOfRowsInTestData);
+        var dt = _dataGenerator.GetDataTable(people, ExpectedNumberOfRowsInTestData);
 
         var tbl = BulkDataDatabase.ExpectTable(BulkDataTable);
 
-        if(tbl.Exists())
+        if (tbl.Exists())
             tbl.Drop();
 
         //create the table but make sure the chi is a primary key and the correct data type and that we have a sensible primary key
-        Table = BulkDataDatabase.CreateTable(BulkDataTable,dt,new DatabaseColumnRequest[]{ 
-            new DatabaseColumnRequest("chi",new DatabaseTypeRequest(typeof(string),10)){IsPrimaryKey=true},
-            new DatabaseColumnRequest("dtCreated",new DatabaseTypeRequest(typeof(DateTime))){IsPrimaryKey=true},
-            new DatabaseColumnRequest("hb_extract",new DatabaseTypeRequest(typeof(string),1)){IsPrimaryKey=true}
-
+        Table = BulkDataDatabase.CreateTable(BulkDataTable, dt, new DatabaseColumnRequest[]
+        {
+            new("chi", new DatabaseTypeRequest(typeof(string), 10)) { IsPrimaryKey = true },
+            new("dtCreated", new DatabaseTypeRequest(typeof(DateTime))) { IsPrimaryKey = true },
+            new("hb_extract", new DatabaseTypeRequest(typeof(string), 1)) { IsPrimaryKey = true }
         });
     }
-                
+
     /// <summary>
     /// Returns up to <paramref name="numberOfRows"/> rows from the table
     /// </summary>
     /// <param name="numberOfRows"></param>
     /// <returns></returns>
-    public DataTable GetDataTable(int numberOfRows)
-    {
-        return BulkDataDatabase.ExpectTable(BulkDataTable).GetDataTable(numberOfRows);
-    }
+    public DataTable GetDataTable(int numberOfRows) =>
+        BulkDataDatabase.ExpectTable(BulkDataTable).GetDataTable(numberOfRows);
 
     /// <summary>
     /// Creates Rdmp metadata objects (<see cref="catalogue"/>, <see cref="tableInfo"/> etc) which point to the <see cref="BulkDataTable"/>
@@ -144,10 +141,10 @@ public DataTable GetDataTable(int numberOfRows)
     public ICatalogue ImportAsCatalogue()
     {
         var f = new TableInfoImporter(_repository, BulkDataDatabase.ExpectTable(BulkDataTable));
-        f.DoImport(out tableInfo,out columnInfos);
+        f.DoImport(out tableInfo, out columnInfos);
 
-        var forwardEngineer = new ForwardEngineerCatalogue(tableInfo,columnInfos);
-        forwardEngineer.ExecuteForwardEngineering(out var c,out catalogueItems, out extractionInformations);
+        var forwardEngineer = new ForwardEngineerCatalogue(tableInfo, columnInfos);
+        forwardEngineer.ExecuteForwardEngineering(out var c, out catalogueItems, out extractionInformations);
         catalogue = c;
 
         var chi = extractionInformations.Single(e => e.GetRuntimeName().Equals("chi"));
@@ -164,10 +161,10 @@ public void DeleteCatalogue()
     {
         var creds = (DataAccessCredentials)tableInfo.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
 
-        if(tableInfo.Exists())
+        if (tableInfo.Exists())
             tableInfo.DeleteInDatabase();
 
-        if(creds != null)
+        if (creds != null)
             try
             {
                 creds.DeleteInDatabase();
@@ -177,7 +174,7 @@ public void DeleteCatalogue()
                 Console.WriteLine($"Ignored Potential Exception:{e}");
             }
 
-        if(catalogue.Exists())
+        if (catalogue.Exists())
             catalogue.DeleteInDatabase();
     }
 
diff --git a/Tests.Common/Scenarios/FromToDatabaseTests.cs b/Tests.Common/Scenarios/FromToDatabaseTests.cs
index a25f5919de..15bd4d7a69 100644
--- a/Tests.Common/Scenarios/FromToDatabaseTests.cs
+++ b/Tests.Common/Scenarios/FromToDatabaseTests.cs
@@ -13,7 +13,7 @@ namespace Tests.Common.Scenarios;
 /// <summary>
 /// Tests which require two test databases and handles moving data from one to the other
 /// </summary>
-public class FromToDatabaseTests:DatabaseTests
+public class FromToDatabaseTests : DatabaseTests
 {
     private readonly string _suffix;
     protected DiscoveredDatabase From;
@@ -47,9 +47,9 @@ protected void SetupFromTo(DatabaseType dbType)
     {
         To = GetCleanedServer(dbType);
         From = To.Server.ExpectDatabase(To.GetRuntimeName() + _suffix);
-            
+
         // ensure the test staging and live databases are empty
-        if(!From.Exists())
+        if (!From.Exists())
             From.Create();
         else
             DeleteTables(From);
diff --git a/Tests.Common/Scenarios/TestsRequiringA.cs b/Tests.Common/Scenarios/TestsRequiringA.cs
index b4e77fef8c..92388c7490 100644
--- a/Tests.Common/Scenarios/TestsRequiringA.cs
+++ b/Tests.Common/Scenarios/TestsRequiringA.cs
@@ -23,25 +23,22 @@ public abstract class TestsRequiringA : FromToDatabaseTests, IDatabaseColumnRequ
     public void AdjustColumns(List<DatabaseColumnRequest> columns)
     {
         //create string columns as varchar(500) to avoid load errors  when creating new csv files you want to load into the database
-        foreach(var c in columns)
-        {
-            if(c.TypeRequested.CSharpType == typeof(string) && c.TypeRequested.Width.HasValue)
-                c.TypeRequested.Width = Math.Max(500,c.TypeRequested.Width.Value);
-
-        }
+        foreach (var c in columns)
+            if (c.TypeRequested.CSharpType == typeof(string) && c.TypeRequested.Width.HasValue)
+                c.TypeRequested.Width = Math.Max(500, c.TypeRequested.Width.Value);
     }
 
-    protected DiscoveredTable CreateDataset<T>(DiscoveredDatabase db,int people, int rows,Random r, out PersonCollection peopleGenerated) where T:IDataGenerator
+    protected DiscoveredTable CreateDataset<T>(DiscoveredDatabase db, int people, int rows, Random r,
+        out PersonCollection peopleGenerated) where T : IDataGenerator
     {
         peopleGenerated = new PersonCollection();
         peopleGenerated.GeneratePeople(people, r);
-        return CreateDataset<T>(db, peopleGenerated, rows,r);
-    }
-    protected DiscoveredTable CreateDataset<T>(DiscoveredDatabase db, int people, int rows,Random r) where T:IDataGenerator
-    {
-        return CreateDataset<T>(db,people,rows,r,out _);
+        return CreateDataset<T>(db, peopleGenerated, rows, r);
     }
 
+    protected DiscoveredTable CreateDataset<T>(DiscoveredDatabase db, int people, int rows, Random r)
+        where T : IDataGenerator => CreateDataset<T>(db, people, rows, r, out _);
+
     protected DiscoveredTable CreateDataset<T>(DiscoveredDatabase db, PersonCollection people, int rows, Random r)
         where T : IDataGenerator
     {
diff --git a/Tests.Common/Scenarios/TestsRequiringACohort.cs b/Tests.Common/Scenarios/TestsRequiringACohort.cs
index 8a2a69d75c..4aeb682227 100644
--- a/Tests.Common/Scenarios/TestsRequiringACohort.cs
+++ b/Tests.Common/Scenarios/TestsRequiringACohort.cs
@@ -37,6 +37,7 @@ public class TestsRequiringACohort : TestsRequiringA
     /// Set the Project_ID to your project to make this 'custom data'
     /// </summary>
     protected ExtractableDataSet CustomExtractableDataSet;
+
     protected ICatalogue CustomCatalogue;
     protected DiscoveredTable CustomTable;
     protected ITableInfo CustomTableInfo;
@@ -47,14 +48,13 @@ public class TestsRequiringACohort : TestsRequiringA
     protected readonly Dictionary<string, string> _cohortKeysGenerated = new();
 
 
-
     [OneTimeSetUp]
     protected override void OneTimeSetUp()
     {
         base.OneTimeSetUp();
-            
+
         CreateCohortDatabase();
-            
+
         EmptyCohortTables();
         SetupCohortDefinitionAndCustomTable();
 
@@ -79,7 +79,7 @@ private void CreateCohortDatabase()
     {
         _cohortDatabase = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(CohortDatabaseName);
 
-        if(_cohortDatabase.Exists())
+        if (_cohortDatabase.Exists())
             DeleteTables(_cohortDatabase);
         else
             _cohortDatabase.Create();
@@ -135,7 +135,8 @@ private void CreateExternalCohortTableReference()
         if (alreadyExisting != null)
         {
             //remove dependencies cohorts
-            var toCleanup = DataExportRepository.GetAllObjects<ExtractableCohort>().SingleOrDefault(ec => ec.OriginID == cohortIDInTestData);
+            var toCleanup = DataExportRepository.GetAllObjects<ExtractableCohort>()
+                .SingleOrDefault(ec => ec.OriginID == cohortIDInTestData);
 
 
             if (toCleanup != null)
@@ -152,19 +153,20 @@ var configToCleanup in DataExportRepository.GetAllObjects<ExtractionConfiguratio
             alreadyExisting.DeleteInDatabase();
         }
 
-        var newExternal = new ExternalCohortTable(DataExportRepository, "TestExternalCohort",DatabaseType.MicrosoftSQLServer)
-        {
-            Database = CohortDatabaseName,
-            Server = _cohortDatabase.Server.Name,
-            DefinitionTableName = definitionTableName,
-            TableName = cohortTableName,
-            Name = ExternalCohortTableNameInCatalogue,
-            Username = _cohortDatabase.Server.ExplicitUsernameIfAny,
-            Password = _cohortDatabase.Server.ExplicitPasswordIfAny,
-            PrivateIdentifierField = "PrivateID",
-            ReleaseIdentifierField = "ReleaseID",
-            DefinitionTableForeignKeyField = "cohortDefinition_id"
-        };
+        var newExternal =
+            new ExternalCohortTable(DataExportRepository, "TestExternalCohort", DatabaseType.MicrosoftSQLServer)
+            {
+                Database = CohortDatabaseName,
+                Server = _cohortDatabase.Server.Name,
+                DefinitionTableName = definitionTableName,
+                TableName = cohortTableName,
+                Name = ExternalCohortTableNameInCatalogue,
+                Username = _cohortDatabase.Server.ExplicitUsernameIfAny,
+                Password = _cohortDatabase.Server.ExplicitPasswordIfAny,
+                PrivateIdentifierField = "PrivateID",
+                ReleaseIdentifierField = "ReleaseID",
+                DefinitionTableForeignKeyField = "cohortDefinition_id"
+            };
 
         newExternal.SaveToDatabase();
 
@@ -174,7 +176,7 @@ var configToCleanup in DataExportRepository.GetAllObjects<ExtractionConfiguratio
     private void CreateExtractableCohort()
     {
         _extractableCohort = new ExtractableCohort(DataExportRepository, _externalCohortTable, cohortIDInTestData);
-        Assert.AreEqual(_extractableCohort.OriginID,cohortIDInTestData);
+        Assert.AreEqual(_extractableCohort.OriginID, cohortIDInTestData);
     }
 
     private void SetupCohortDefinitionAndCustomTable()
@@ -183,17 +185,18 @@ private void SetupCohortDefinitionAndCustomTable()
         dt.Columns.Add("SuperSecretThing");
         dt.Columns.Add("PrivateID");
 
-        dt.Rows.Add(new[] {"monkeys can all secretly fly", "Priv_12345"});
+        dt.Rows.Add(new[] { "monkeys can all secretly fly", "Priv_12345" });
         dt.Rows.Add(new[] { "the wizard of OZ was a man behind a machine", "Priv_wtf11" });
 
         CustomTable = _cohortDatabase.CreateTable("custTable99", dt);
 
         new TableInfoImporter(CatalogueRepository, CustomTable).DoImport(out CustomTableInfo, out var cols);
 
-        new ForwardEngineerCatalogue(CustomTableInfo, cols).ExecuteForwardEngineering(out CustomCatalogue, out CatalogueItem[] cis, out var eis);
+        new ForwardEngineerCatalogue(CustomTableInfo, cols).ExecuteForwardEngineering(out CustomCatalogue, out var cis,
+            out var eis);
 
         CustomExtractableDataSet = new ExtractableDataSet(DataExportRepository, CustomCatalogue);
-            
+
         foreach (var e in eis)
         {
             e.ExtractionCategory = ExtractionCategory.ProjectSpecific;
@@ -211,30 +214,33 @@ private void SetupCohortDefinitionAndCustomTable()
                 $"INSERT INTO {definitionTableName} (id,projectNumber,description,version) VALUES ({cohortIDInTestData},{projectNumberInTestData},'unitTestDataForCohort',1)";
 
             con.Open();
-            using(var cmd = _cohortDatabase.Server.GetCommand(insertSQL, con))
+            using (var cmd = _cohortDatabase.Server.GetCommand(insertSQL, con))
+            {
                 cmd.ExecuteNonQuery();
+            }
         }
     }
 
 
     protected void EmptyCohortTables()
     {
-
         using (var con = _cohortDatabase.Server.GetConnection())
         {
             con.Open();
 
             //clear out old data
-            using(var cmdDelete =
-                  _cohortDatabase.Server.GetCommand(
-                      $"DELETE FROM {cohortTableName}; DELETE FROM {definitionTableName};", con))
+            using (var cmdDelete =
+                   _cohortDatabase.Server.GetCommand(
+                       $"DELETE FROM {cohortTableName}; DELETE FROM {definitionTableName};", con))
+            {
                 cmdDelete.ExecuteNonQuery();
+            }
         }
     }
 
     private void InsertIntoCohortTable(string privateID, string publicID)
     {
-        _cohortKeysGenerated.Add(privateID,publicID);
+        _cohortKeysGenerated.Add(privateID, publicID);
 
         using (var con = _cohortDatabase.Server.GetConnection())
         {
@@ -243,9 +249,10 @@ private void InsertIntoCohortTable(string privateID, string publicID)
             var insertIntoList =
                 $"INSERT INTO Cohort(PrivateID,ReleaseID,cohortDefinition_id) VALUES ('{privateID}','{publicID}',{cohortIDInTestData})";
 
-            using(var insertRecord = _cohortDatabase.Server.GetCommand(insertIntoList, con))
+            using (var insertRecord = _cohortDatabase.Server.GetCommand(insertIntoList, con))
+            {
                 Assert.AreEqual(1, insertRecord.ExecuteNonQuery());
+            }
         }
     }
-
 }
\ No newline at end of file
diff --git a/Tests.Common/Scenarios/TestsRequiringADle.cs b/Tests.Common/Scenarios/TestsRequiringADle.cs
index 22069da044..bb6b9080b2 100644
--- a/Tests.Common/Scenarios/TestsRequiringADle.cs
+++ b/Tests.Common/Scenarios/TestsRequiringADle.cs
@@ -27,9 +27,8 @@ namespace Tests.Common.Scenarios;
 /// <summary>
 /// Scenario where you want to run a full DLE load of records into a table
 /// </summary>
-public class TestsRequiringADle:TestsRequiringA
+public class TestsRequiringADle : TestsRequiringA
 {
-                
     protected int RowsBefore;
     protected int RowsNow => LiveTable.GetRowCount();
 
@@ -41,21 +40,21 @@ public class TestsRequiringADle:TestsRequiringA
     public DiscoveredDatabase Database { get; private set; }
 
     [SetUp]
-
     protected override void SetUp()
     {
         base.SetUp();
-            
+
         Database = GetCleanedServer(FAnsi.DatabaseType.MicrosoftSQLServer);
 
         var rootFolder = new DirectoryInfo(TestContext.CurrentContext.TestDirectory);
         var subdir = rootFolder.CreateSubdirectory("TestsRequiringADle");
-        LoadDirectory = LoadDirectory.CreateDirectoryStructure(rootFolder,subdir.FullName,true);
+        LoadDirectory = LoadDirectory.CreateDirectoryStructure(rootFolder, subdir.FullName, true);
 
         Clear(LoadDirectory);
 
-        LiveTable = CreateDataset<Demography>(Database,500, 5000,new Random(190));
-        LiveTable.CreatePrimaryKey(new DiscoveredColumn[]{
+        LiveTable = CreateDataset<Demography>(Database, 500, 5000, new Random(190));
+        LiveTable.CreatePrimaryKey(new DiscoveredColumn[]
+        {
             LiveTable.DiscoverColumn("chi"),
             LiveTable.DiscoverColumn("dtCreated"),
             LiveTable.DiscoverColumn("hb_extract")
@@ -64,7 +63,7 @@ protected override void SetUp()
         TestCatalogue = Import(LiveTable);
         RowsBefore = 5000;
 
-        TestLoadMetadata = new LoadMetadata (CatalogueRepository,"Loading Test Catalogue")
+        TestLoadMetadata = new LoadMetadata(CatalogueRepository, "Loading Test Catalogue")
         {
             LocationOfFlatFiles = LoadDirectory.RootPath.FullName
         };
@@ -75,11 +74,13 @@ protected override void SetUp()
         TestCatalogue.LoadMetadata_ID = TestLoadMetadata.ID;
         TestCatalogue.SaveToDatabase();
 
-        CreateFlatFileAttacher(TestLoadMetadata,"*.csv",TestCatalogue.GetTableInfoList(false).Single(),",");
+        CreateFlatFileAttacher(TestLoadMetadata, "*.csv", TestCatalogue.GetTableInfoList(false).Single(), ",");
 
         //Get DleRunner to run pre load checks (includes trigger creation etc)
-        var runner = new DleRunner(new DleOptions { LoadMetadata = TestLoadMetadata.ID.ToString(),Command = CommandLineActivity.check});
-        runner.Run(RepositoryLocator,new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(), new GracefulCancellationToken());
+        var runner = new DleRunner(new DleOptions
+            { LoadMetadata = TestLoadMetadata.ID.ToString(), Command = CommandLineActivity.check });
+        runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(),
+            new GracefulCancellationToken());
     }
 
     /// <summary>
@@ -92,27 +93,28 @@ protected override void SetUp()
     /// <param name="separator">The separator of the files e.g. ','</param>
     /// <param name="ignoreColumns">Columns to ignore in the load</param>
     /// <returns></returns>
-    protected ProcessTask CreateFlatFileAttacher(LoadMetadata lmd, string pattern, ITableInfo ti, string separator = ",", string ignoreColumns="hic_dataLoadRunID")
+    protected ProcessTask CreateFlatFileAttacher(LoadMetadata lmd, string pattern, ITableInfo ti,
+        string separator = ",", string ignoreColumns = "hic_dataLoadRunID")
     {
-        var csvProcessTask  = new ProcessTask(CatalogueRepository,lmd,LoadStage.Mounting);
+        var csvProcessTask = new ProcessTask(CatalogueRepository, lmd, LoadStage.Mounting);
         var args = csvProcessTask.CreateArgumentsForClassIfNotExists<AnySeparatorFileAttacher>();
         csvProcessTask.Path = typeof(AnySeparatorFileAttacher).FullName;
         csvProcessTask.ProcessTaskType = ProcessTaskType.Attacher;
         csvProcessTask.SaveToDatabase();
 
-        var filePattern = args.Single(a=>a.Name == "FilePattern");
+        var filePattern = args.Single(a => a.Name == "FilePattern");
         filePattern.SetValue(pattern);
         filePattern.SaveToDatabase();
 
-        var tableToLoad = args.Single(a=>a.Name == "TableToLoad");
+        var tableToLoad = args.Single(a => a.Name == "TableToLoad");
         tableToLoad.SetValue(ti);
         tableToLoad.SaveToDatabase();
 
-        var separatorArg = args.Single(a=>a.Name == "Separator");
+        var separatorArg = args.Single(a => a.Name == "Separator");
         separatorArg.SetValue(separator);
         separatorArg.SaveToDatabase();
 
-        var ignoreDataLoadRunIDCol = args.Single(a=>a.Name == "IgnoreColumns");
+        var ignoreDataLoadRunIDCol = args.Single(a => a.Name == "IgnoreColumns");
         ignoreDataLoadRunIDCol.SetValue(ignoreColumns);
         ignoreDataLoadRunIDCol.SaveToDatabase();
 
@@ -126,15 +128,15 @@ protected ProcessTask CreateFlatFileAttacher(LoadMetadata lmd, string pattern, I
     /// <param name="filename">Filename to generate in ForLoading e.g. "bob.csv" (cannot be relative)</param>
     /// <param name="rows"></param>
     /// <param name="r">Seed random to ensure tests are reproducible</param>
-    protected FileInfo CreateFileInForLoading(string filename,int rows, Random r)
+    protected FileInfo CreateFileInForLoading(string filename, int rows, Random r)
     {
-        var fi = new FileInfo(Path.Combine(LoadDirectory.ForLoading.FullName,Path.GetFileName(filename)));
+        var fi = new FileInfo(Path.Combine(LoadDirectory.ForLoading.FullName, Path.GetFileName(filename)));
 
         var demog = new Demography(r);
         var people = new PersonCollection();
-        people.GeneratePeople(500,r);
+        people.GeneratePeople(500, r);
 
-        demog.GenerateTestDataFile(people,fi,rows);
+        demog.GenerateTestDataFile(people, fi, rows);
 
         return fi;
     }
@@ -147,14 +149,14 @@ protected FileInfo CreateFileInForLoading(string filename,int rows, Random r)
     /// <returns></returns>
     protected FileInfo CreateFileInForLoading(string filename, string[] contents)
     {
-        var fi = new FileInfo(Path.Combine(LoadDirectory.ForLoading.FullName,Path.GetFileName(filename)));
-        File.WriteAllLines(fi.FullName,contents);
+        var fi = new FileInfo(Path.Combine(LoadDirectory.ForLoading.FullName, Path.GetFileName(filename)));
+        File.WriteAllLines(fi.FullName, contents);
         return fi;
     }
-               
+
     public void RunDLE(int timeoutInMilliseconds)
     {
-        RunDLE(TestLoadMetadata,timeoutInMilliseconds,false);
+        RunDLE(TestLoadMetadata, timeoutInMilliseconds, false);
     }
 
     /// <summary>
@@ -166,14 +168,18 @@ public void RunDLE(int timeoutInMilliseconds)
     public void RunDLE(LoadMetadata lmd, int timeoutInMilliseconds, bool checks)
     {
         var timeout = new CancellationTokenSource(timeoutInMilliseconds).Token;
-        if(checks)
+        if (checks)
         {
             //Get DleRunner to run pre load checks (includes trigger creation etc)
-            var checker = new DleRunner(new DleOptions { LoadMetadata = lmd.ID.ToString(), Command = CommandLineActivity.check});
-            checker.Run(RepositoryLocator,new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(), new GracefulCancellationToken(timeout,timeout));
+            var checker = new DleRunner(new DleOptions
+                { LoadMetadata = lmd.ID.ToString(), Command = CommandLineActivity.check });
+            checker.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new AcceptAllCheckNotifier(),
+                new GracefulCancellationToken(timeout, timeout));
         }
 
-        var runner = new DleRunner(new DleOptions { LoadMetadata = lmd.ID.ToString(), Command = CommandLineActivity.run});
-        runner.Run(RepositoryLocator,new ThrowImmediatelyDataLoadEventListener(), new ThrowImmediatelyCheckNotifier(), new GracefulCancellationToken(timeout,timeout));
+        var runner = new DleRunner(new DleOptions
+            { LoadMetadata = lmd.ID.ToString(), Command = CommandLineActivity.run });
+        runner.Run(RepositoryLocator, new ThrowImmediatelyDataLoadEventListener(), new ThrowImmediatelyCheckNotifier(),
+            new GracefulCancellationToken(timeout, timeout));
     }
 }
\ No newline at end of file
diff --git a/Tests.Common/Scenarios/TestsRequiringANOStore.cs b/Tests.Common/Scenarios/TestsRequiringANOStore.cs
index 6b5987162b..2edde4c4a7 100644
--- a/Tests.Common/Scenarios/TestsRequiringANOStore.cs
+++ b/Tests.Common/Scenarios/TestsRequiringANOStore.cs
@@ -17,7 +17,7 @@
 
 namespace Tests.Common.Scenarios;
 
-public class TestsRequiringANOStore:TestsRequiringA
+public class TestsRequiringANOStore : TestsRequiringA
 {
     protected ExternalDatabaseServer ANOStore_ExternalDatabaseServer { get; set; }
     protected DiscoveredDatabase ANOStore_Database { get; set; }
@@ -29,19 +29,19 @@ protected override void OneTimeSetUp()
         base.OneTimeSetUp();
 
         ANOStore_Database = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(ANOStore_DatabaseName);
-            
+
         CreateANODatabase();
 
         CreateReferenceInCatalogueToANODatabase();
     }
-        
+
     private void CreateANODatabase()
     {
         if (ANOStore_Database.Exists())
             ANOStore_Database.Drop();
 
         var scriptCreate = new MasterDatabaseScriptExecutor(ANOStore_Database);
-            
+
         scriptCreate.CreateAndPatchDatabase(new ANOStorePatcher(), new ThrowImmediatelyCheckNotifier());
     }
 
@@ -50,7 +50,8 @@ private void CreateReferenceInCatalogueToANODatabase()
         RemovePreExistingReference();
 
         //now create a new reference!
-        ANOStore_ExternalDatabaseServer = new ExternalDatabaseServer(CatalogueRepository, ANOStore_DatabaseName,new ANOStorePatcher());
+        ANOStore_ExternalDatabaseServer =
+            new ExternalDatabaseServer(CatalogueRepository, ANOStore_DatabaseName, new ANOStorePatcher());
         ANOStore_ExternalDatabaseServer.SetProperties(ANOStore_Database);
 
         CatalogueRepository.SetDefault(PermissableDefaults.ANOStore, ANOStore_ExternalDatabaseServer);
@@ -59,22 +60,25 @@ private void CreateReferenceInCatalogueToANODatabase()
     private void RemovePreExistingReference()
     {
         //There will likely be an old reference to the external database server
-        var preExisting = CatalogueRepository.GetAllObjects<ExternalDatabaseServer>().SingleOrDefault(e => e.Name.Equals(ANOStore_DatabaseName));
+        var preExisting = CatalogueRepository.GetAllObjects<ExternalDatabaseServer>()
+            .SingleOrDefault(e => e.Name.Equals(ANOStore_DatabaseName));
 
         if (preExisting == null) return;
 
         //Some child tests will likely create ANOTables that reference this server so we need to cleanup those for them so that we can cleanup the old server reference too
-        foreach (var lingeringTablesReferencingServer in CatalogueRepository.GetAllObjects<ANOTable>().Where(a => a.Server_ID == preExisting.ID))
+        foreach (var lingeringTablesReferencingServer in CatalogueRepository.GetAllObjects<ANOTable>()
+                     .Where(a => a.Server_ID == preExisting.ID))
         {
             //unhook the anonymisation transform from any ColumnInfos using it
-            foreach (var colWithANOTransform in CatalogueRepository.GetAllObjects<ColumnInfo>().Where(c => c.ANOTable_ID == lingeringTablesReferencingServer.ID))
+            foreach (var colWithANOTransform in CatalogueRepository.GetAllObjects<ColumnInfo>()
+                         .Where(c => c.ANOTable_ID == lingeringTablesReferencingServer.ID))
             {
                 Console.WriteLine(
                     $"Unhooked ColumnInfo {colWithANOTransform} from ANOTable {lingeringTablesReferencingServer}");
                 colWithANOTransform.ANOTable_ID = null;
                 colWithANOTransform.SaveToDatabase();
             }
-                
+
             TruncateANOTable(lingeringTablesReferencingServer);
             lingeringTablesReferencingServer.DeleteInDatabase();
         }
@@ -91,11 +95,14 @@ protected void TruncateANOTable(ANOTable anoTable)
         using (var con = server.GetConnection())
         {
             con.Open();
-            using(var cmdDelete = server.GetCommand(
-                      $"if exists (select top 1 * from sys.tables where name ='{anoTable.TableName}') TRUNCATE TABLE {anoTable.TableName}", con))
+            using (var cmdDelete = server.GetCommand(
+                       $"if exists (select top 1 * from sys.tables where name ='{anoTable.TableName}') TRUNCATE TABLE {anoTable.TableName}",
+                       con))
+            {
                 cmdDelete.ExecuteNonQuery();
+            }
+
             con.Close();
         }
-        
     }
 }
\ No newline at end of file
diff --git a/Tests.Common/Scenarios/TestsRequiringAnExtractionConfiguration.cs b/Tests.Common/Scenarios/TestsRequiringAnExtractionConfiguration.cs
index 6d9a833dbc..f2a93e0587 100644
--- a/Tests.Common/Scenarios/TestsRequiringAnExtractionConfiguration.cs
+++ b/Tests.Common/Scenarios/TestsRequiringAnExtractionConfiguration.cs
@@ -84,7 +84,8 @@ protected void Reset()
         _configuration.SaveToDatabase();
 
 
-        _request = new ExtractDatasetCommand(_configuration, _extractableCohort, new ExtractableDatasetBundle(_extractableDataSet),
+        _request = new ExtractDatasetCommand(_configuration, _extractableCohort,
+            new ExtractableDatasetBundle(_extractableDataSet),
             _extractableColumns, new HICProjectSalt(_project),
             new ExtractionDirectory(ProjectDirectory, _configuration));
     }
@@ -100,18 +101,20 @@ private void SetupDataExport()
 
         Directory.CreateDirectory(ProjectDirectory);
         _project.ExtractionDirectory = ProjectDirectory;
-            
+
         _project.SaveToDatabase();
 
         _configuration = new ExtractionConfiguration(DataExportRepository, _project);
-            
+
         //select the dataset for extraction under this configuration
-        _selectedDataSet = new SelectedDataSets(RepositoryLocator.DataExportRepository,_configuration,_extractableDataSet,null);
+        _selectedDataSet = new SelectedDataSets(RepositoryLocator.DataExportRepository, _configuration,
+            _extractableDataSet, null);
 
         //select all the columns for extraction
         foreach (var toSelect in _extractionInformations)
         {
-            var col = new ExtractableColumn(DataExportRepository, _extractableDataSet, _configuration, toSelect, toSelect.Order, toSelect.SelectSQL);
+            var col = new ExtractableColumn(DataExportRepository, _extractableDataSet, _configuration, toSelect,
+                toSelect.Order, toSelect.SelectSQL);
 
             if (col.GetRuntimeName().Equals("PrivateID"))
                 col.IsExtractionIdentifier = true;
@@ -131,23 +134,23 @@ private void SetupCatalogueConfigurationEtc()
         dt.Columns.Add("Name");
         dt.Columns.Add("DateOfBirth");
 
-        dt.Rows.Add(new object[] {_cohortKeysGenerated.Keys.First(), "Dave", "2001-01-01"});
+        dt.Rows.Add(new object[] { _cohortKeysGenerated.Keys.First(), "Dave", "2001-01-01" });
 
-        var tbl = Database.CreateTable("TestTable", dt, new[] { new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),50))});
+        var tbl = Database.CreateTable("TestTable", dt,
+            new[] { new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string), 50)) });
 
-        _catalogue = Import(tbl, out _tableInfo, out _columnInfos, out CatalogueItem[] cataItems, out _extractionInformations);
+        _catalogue = Import(tbl, out _tableInfo, out _columnInfos, out var cataItems, out _extractionInformations);
 
         var _privateID = _extractionInformations.First(e => e.GetRuntimeName().Equals("PrivateID"));
         _privateID.IsExtractionIdentifier = true;
         _privateID.SaveToDatabase();
-            
     }
 
     protected void ExecuteRunner()
     {
         var pipeline = SetupPipeline();
 
-        var runner = new ExtractionRunner(new ThrowImmediatelyActivator(RepositoryLocator),new ExtractionOptions
+        var runner = new ExtractionRunner(new ThrowImmediatelyActivator(RepositoryLocator), new ExtractionOptions
         {
             Command = CommandLineActivity.run, ExtractionConfiguration = _configuration.ID.ToString(),
             ExtractGlobals = true, Pipeline = pipeline.ID.ToString()
@@ -159,14 +162,16 @@ protected void ExecuteRunner()
             new ThrowImmediatelyCheckNotifier(),
             new GracefulCancellationToken());
 
-        Assert.AreEqual(0,returnCode,"Return code from runner was non zero");
+        Assert.AreEqual(0, returnCode, "Return code from runner was non zero");
     }
 
-    protected void Execute(out ExtractionPipelineUseCase pipelineUseCase, out IExecuteDatasetExtractionDestination results, IDataLoadEventListener listener = null)
+    protected void Execute(out ExtractionPipelineUseCase pipelineUseCase,
+        out IExecuteDatasetExtractionDestination results, IDataLoadEventListener listener = null)
     {
         listener ??= new ThrowImmediatelyDataLoadEventListener();
 
-        var d = new DataLoadInfo("Internal", _testDatabaseName, "IgnoreMe", "", true, new DiscoveredServer(UnitTestLoggingConnectionString));
+        var d = new DataLoadInfo("Internal", _testDatabaseName, "IgnoreMe", "", true,
+            new DiscoveredServer(UnitTestLoggingConnectionString));
 
         Pipeline pipeline = null;
 
@@ -176,7 +181,8 @@ protected void Execute(out ExtractionPipelineUseCase pipelineUseCase, out IExecu
         try
         {
             pipeline = SetupPipeline();
-            pipelineUseCase = new ExtractionPipelineUseCase(new ThrowImmediatelyActivator(RepositoryLocator),_request.Configuration.Project, _request, pipeline, d);
+            pipelineUseCase = new ExtractionPipelineUseCase(new ThrowImmediatelyActivator(RepositoryLocator),
+                _request.Configuration.Project, _request, pipeline, d);
 
             pipelineUseCase.Execute(listener);
 
@@ -189,22 +195,24 @@ protected void Execute(out ExtractionPipelineUseCase pipelineUseCase, out IExecu
             pipeline?.DeleteInDatabase();
         }
 
-        results =  pipelineUseCase.Destination;
+        results = pipelineUseCase.Destination;
         _extractableColumns = new List<IColumn>(before);
     }
 
 
-
     protected virtual Pipeline SetupPipeline()
     {
         var repository = RepositoryLocator.CatalogueRepository;
         var pipeline = new Pipeline(repository, "Empty extraction pipeline");
 
-        var component = new PipelineComponent(repository, pipeline, typeof(ExecuteDatasetExtractionFlatFileDestination), 0, "Destination");
-        var arguments = component.CreateArgumentsForClassIfNotExists<ExecuteDatasetExtractionFlatFileDestination>().ToArray();
-            
-        if(arguments.Length < 3)
-            throw new Exception("Expected only 2 arguments for type ExecuteDatasetExtractionFlatFileDestination, did somebody add another [DemandsInitialization]? if so handle it below");
+        var component = new PipelineComponent(repository, pipeline, typeof(ExecuteDatasetExtractionFlatFileDestination),
+            0, "Destination");
+        var arguments = component.CreateArgumentsForClassIfNotExists<ExecuteDatasetExtractionFlatFileDestination>()
+            .ToArray();
+
+        if (arguments.Length < 3)
+            throw new Exception(
+                "Expected only 2 arguments for type ExecuteDatasetExtractionFlatFileDestination, did somebody add another [DemandsInitialization]? if so handle it below");
 
         arguments.Single(a => a.Name.Equals("DateFormat")).SetValue("yyyy-MM-dd");
         arguments.Single(a => a.Name.Equals("DateFormat")).SaveToDatabase();
@@ -214,7 +222,8 @@ protected virtual Pipeline SetupPipeline()
 
         AdjustPipelineComponentDelegate?.Invoke(component);
 
-        var component2 = new PipelineComponent(repository, pipeline, typeof(ExecuteDatasetExtractionSource), -1, "Source");
+        var component2 =
+            new PipelineComponent(repository, pipeline, typeof(ExecuteDatasetExtractionSource), -1, "Source");
         var arguments2 = component2.CreateArgumentsForClassIfNotExists<ExecuteDatasetExtractionSource>().ToArray();
 
         arguments2.Single(a => a.Name.Equals("AllowEmptyExtractions")).SetValue(AllowEmptyExtractions);
diff --git a/Tests.Common/Scenarios/TestsRequiringFullAnonymisationSuite.cs b/Tests.Common/Scenarios/TestsRequiringFullAnonymisationSuite.cs
index 755f14b1fb..9f58214c73 100644
--- a/Tests.Common/Scenarios/TestsRequiringFullAnonymisationSuite.cs
+++ b/Tests.Common/Scenarios/TestsRequiringFullAnonymisationSuite.cs
@@ -28,7 +28,8 @@ protected override void OneTimeSetUp()
     {
         base.OneTimeSetUp();
 
-        IdentifierDump_Database = DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(IdentifierDump_DatabaseName);
+        IdentifierDump_Database =
+            DiscoveredServerICanCreateRandomDatabasesAndTablesOn.ExpectDatabase(IdentifierDump_DatabaseName);
 
         if (IdentifierDump_Database.Exists())
             IdentifierDump_Database.Drop();
@@ -38,11 +39,11 @@ protected override void OneTimeSetUp()
         scriptCreate.CreateAndPatchDatabase(p, new ThrowImmediatelyCheckNotifier());
 
         //now create a new reference!
-        IdentifierDump_ExternalDatabaseServer = new ExternalDatabaseServer(CatalogueRepository,IdentifierDump_DatabaseName,p);
+        IdentifierDump_ExternalDatabaseServer =
+            new ExternalDatabaseServer(CatalogueRepository, IdentifierDump_DatabaseName, p);
         IdentifierDump_ExternalDatabaseServer.SetProperties(IdentifierDump_Database);
 
-        CatalogueRepository.SetDefault(PermissableDefaults.IdentifierDumpServer_ID, IdentifierDump_ExternalDatabaseServer);
-
+        CatalogueRepository.SetDefault(PermissableDefaults.IdentifierDumpServer_ID,
+            IdentifierDump_ExternalDatabaseServer);
     }
-
 }
\ No newline at end of file
diff --git a/Tests.Common/TestCaseNotWrittenYetException.cs b/Tests.Common/TestCaseNotWrittenYetException.cs
index e66830d687..86ae7280ff 100644
--- a/Tests.Common/TestCaseNotWrittenYetException.cs
+++ b/Tests.Common/TestCaseNotWrittenYetException.cs
@@ -10,12 +10,11 @@ namespace Tests.Common;
 
 public class TestCaseNotWrittenYetException : Exception
 {
-    public TestCaseNotWrittenYetException(Type t):base($"No test case is written for Type '{t}'")
+    public TestCaseNotWrittenYetException(Type t) : base($"No test case is written for Type '{t}'")
     {
     }
 
-    public TestCaseNotWrittenYetException(string msg, Exception ex):base(msg,ex)
+    public TestCaseNotWrittenYetException(string msg, Exception ex) : base(msg, ex)
     {
-            
     }
 }
\ No newline at end of file
diff --git a/Tests.Common/TestDatabasesSettings.cs b/Tests.Common/TestDatabasesSettings.cs
index 2cd4acf744..7363546c0c 100644
--- a/Tests.Common/TestDatabasesSettings.cs
+++ b/Tests.Common/TestDatabasesSettings.cs
@@ -12,7 +12,9 @@ namespace Tests.Common;
 public class TestDatabasesSettings
 {
 #pragma warning disable CA1822 // Mark members as static - that upsets the YAML hack used for loading settings
-    public string Prefix { get => TestDatabaseNames.Prefix;
+    public string Prefix
+    {
+        get => TestDatabaseNames.Prefix;
         set => TestDatabaseNames.Prefix = value;
     }
 #pragma warning restore CA1822 // Mark members as static
@@ -23,7 +25,7 @@ public class TestDatabasesSettings
 
     public string SqlServerLowPrivilegeUsername { get; set; }
     public string SqlServerLowPrivilegePassword { get; set; }
-        
+
     public string MySql { get; set; }
     public string MySqlLowPrivilegeUsername { get; set; }
     public string MySqlLowPrivilegePassword { get; set; }
@@ -31,7 +33,7 @@ public class TestDatabasesSettings
     public string Oracle { get; set; }
     public string OracleLowPrivilegeUsername { get; set; }
     public string OracleLowPrivilegePassword { get; set; }
-        
+
     public string PostgreSql { get; set; }
     public string PostgreSqlLowPrivilegeUsername { get; set; }
     public string PostgreSqlLowPrivilegePassword { get; set; }
@@ -51,7 +53,6 @@ public string GetLowPrivilegeUsername(DatabaseType databaseType)
         };
     }
 
-        
 
     public string GetLowPrivilegePassword(DatabaseType databaseType)
     {
diff --git a/Tests.Common/TestDirectoryHelper.cs b/Tests.Common/TestDirectoryHelper.cs
index 8982bdb450..b8a7043c22 100644
--- a/Tests.Common/TestDirectoryHelper.cs
+++ b/Tests.Common/TestDirectoryHelper.cs
@@ -32,7 +32,8 @@ public void SetUp()
     public void TearDown()
     {
         if (Directory == null)
-            throw new Exception("You have called TearDown without calling SetUp (the directory has not been initialised)");
+            throw new Exception(
+                "You have called TearDown without calling SetUp (the directory has not been initialised)");
 
         Directory.Delete(true);
     }
diff --git a/Tests.Common/TestLoadDirectory.cs b/Tests.Common/TestLoadDirectory.cs
index 29977a66a8..b8278849d0 100644
--- a/Tests.Common/TestLoadDirectory.cs
+++ b/Tests.Common/TestLoadDirectory.cs
@@ -9,15 +9,15 @@
 
 namespace Tests.Common;
 
-public class TestLoadDirectory :ILoadDirectory{
-
+public class TestLoadDirectory : ILoadDirectory
+{
     /// <summary>
     /// Creates a new blank/null implementation of <see cref="ILoadDirectory"/>
     /// </summary>
     public TestLoadDirectory()
     {
-
     }
+
     public DirectoryInfo ForLoading { get; set; }
     public DirectoryInfo ForArchiving { get; set; }
     public DirectoryInfo Cache { get; set; }
diff --git a/Tests.Common/TestableTableValuedFunction.cs b/Tests.Common/TestableTableValuedFunction.cs
index e273180883..ffcef5a2fe 100644
--- a/Tests.Common/TestableTableValuedFunction.cs
+++ b/Tests.Common/TestableTableValuedFunction.cs
@@ -25,7 +25,6 @@ public class TestableTableValuedFunction
 
     public void Create(DiscoveredDatabase databaseICanCreateRandomTablesIn, ICatalogueRepository catalogueRepository)
     {
-
         CreateFunctionSQL = @"
 if exists (select 1 from sys.objects where name = 'MyAwesomeFunction')
     drop function MyAwesomeFunction
@@ -65,6 +64,7 @@ Name varchar(50)
             con.Open();
             UsefulStuff.ExecuteBatchNonQuery(CreateFunctionSQL, con);
         }
+
         var tbl = databaseICanCreateRandomTablesIn.ExpectTableValuedFunction("MyAwesomeFunction");
         var importer = new TableValuedFunctionImporter(catalogueRepository, tbl);
         importer.DoImport(out TableInfoCreated, out ColumnInfosCreated);
@@ -85,7 +85,8 @@ Name varchar(50)
 
     public void Destroy()
     {
-        var credentials = (DataAccessCredentials)TableInfoCreated.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
+        var credentials =
+            (DataAccessCredentials)TableInfoCreated.GetCredentialsIfExists(DataAccessContext.InternalDataProcessing);
 
         TableInfoCreated.DeleteInDatabase();
 
diff --git a/Tests.Common/Tests.Common.csproj b/Tests.Common/Tests.Common.csproj
index 6583cbea71..3fd7764db6 100644
--- a/Tests.Common/Tests.Common.csproj
+++ b/Tests.Common/Tests.Common.csproj
@@ -39,8 +39,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Moq" Version="4.20.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
   </ItemGroup>
 </Project>
diff --git a/Tests.Common/UnitTests.cs b/Tests.Common/UnitTests.cs
index 5092e33e8e..805947db2e 100644
--- a/Tests.Common/UnitTests.cs
+++ b/Tests.Common/UnitTests.cs
@@ -75,10 +75,9 @@ public UnitTests()
     /// <see cref="IBasicActivateItems.YesNo(DialogArgs)"/>)
     /// </summary>
     /// <returns></returns>
-    protected IBasicActivateItems GetActivator(IRDMPPlatformRepositoryServiceLocator locator = null)
-    {
-        return new ConsoleInputManager(locator ?? RepositoryLocator, new ThrowImmediatelyCheckNotifier()) { DisallowInput = true};
-    }
+    protected IBasicActivateItems GetActivator(IRDMPPlatformRepositoryServiceLocator locator = null) =>
+        new ConsoleInputManager(locator ?? RepositoryLocator, new ThrowImmediatelyCheckNotifier())
+            { DisallowInput = true };
 
     /// <summary>
     /// Override to do stuff before your first instance is constructed
@@ -108,10 +107,7 @@ protected virtual void SetUp()
     /// <returns></returns>
     /// <exception cref="NotSupportedException">If there is not yet an implementation for the given T.  Feel free to write one.</exception>
     //[MethodImpl(MethodImplOptions.AggressiveInlining)]
-    protected T WhenIHaveA<T>() where T : DatabaseEntity
-    {
-        return WhenIHaveA<T>(Repository);
-    }
+    protected T WhenIHaveA<T>() where T : DatabaseEntity => WhenIHaveA<T>(Repository);
 
 
     /// <summary>
@@ -126,12 +122,11 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
         if (typeof(T) == typeof(Catalogue))
             return (T)(object)Save(new Catalogue(repository, "Mycata"));
 
-            
+
         if (typeof(T) == typeof(ExtendedProperty))
-        {
-            return (T)(object)new ExtendedProperty(repository,Save(new Catalogue(repository, "Mycata")),"TestProp",0);
-        }
-                
+            return (T)(object)new ExtendedProperty(repository, Save(new Catalogue(repository, "Mycata")), "TestProp",
+                0);
+
 
         if (typeof(T) == typeof(CatalogueItem))
         {
@@ -151,7 +146,7 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
 
         if (typeof(T) == typeof(TableInfo))
         {
-            var table = new TableInfo(repository, "My_Table"){DatabaseType = DatabaseType.MicrosoftSQLServer};
+            var table = new TableInfo(repository, "My_Table") { DatabaseType = DatabaseType.MicrosoftSQLServer };
             return (T)(object)table;
         }
 
@@ -163,19 +158,12 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
         }
 
         if (typeof(T) == typeof(AggregateConfiguration))
-        {
-            return (T)(object)WhenIHaveA<AggregateConfiguration>(repository, out ExtractionInformation dateEi, out ExtractionInformation otherEi);
-        }
+            return (T)(object)WhenIHaveA<AggregateConfiguration>(repository, out var dateEi, out var otherEi);
 
         if (typeof(T) == typeof(ExternalDatabaseServer))
-        {
-            return (T)(object)Save(new ExternalDatabaseServer(repository, "My Server",null));
-        }
+            return (T)(object)Save(new ExternalDatabaseServer(repository, "My Server", null));
 
-        if (typeof(T) == typeof(ANOTable))
-        {
-            return (T)(object)WhenIHaveA<ANOTable>(repository, out ExternalDatabaseServer server);
-        }
+        if (typeof(T) == typeof(ANOTable)) return (T)(object)WhenIHaveA<ANOTable>(repository, out var server);
 
         if (typeof(T) == typeof(LoadMetadata))
         {
@@ -194,30 +182,31 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
             return (T)(object)lmd;
         }
 
-        if (typeof (T) == typeof (AggregateTopX))
+        if (typeof(T) == typeof(AggregateTopX))
         {
             var agg = WhenIHaveA<AggregateConfiguration>(repository);
-            return (T)(object) new AggregateTopX(repository, agg, 10);
+            return (T)(object)new AggregateTopX(repository, agg, 10);
         }
 
-        if (typeof (T) == typeof (ConnectionStringKeyword))
-        {
-            return (T)(object)new ConnectionStringKeyword(repository, DatabaseType.MicrosoftSQLServer, "MultipleActiveResultSets", "true");
-        }
+        if (typeof(T) == typeof(ConnectionStringKeyword))
+            return (T)(object)new ConnectionStringKeyword(repository, DatabaseType.MicrosoftSQLServer,
+                "MultipleActiveResultSets", "true");
 
-        if (typeof (T) == typeof (DashboardLayout))
+        if (typeof(T) == typeof(DashboardLayout))
             return (T)(object)new DashboardLayout(repository, "My Layout");
 
         if (typeof(T) == typeof(DashboardControl))
         {
             var layout = WhenIHaveA<DashboardLayout>(repository);
-            return (T)(object)Save(new DashboardControl(repository, layout, typeof(int), 0, 0, 100, 100, "") { ControlType = "GoodBadCataloguePieChart" });
+            return (T)(object)Save(new DashboardControl(repository, layout, typeof(int), 0, 0, 100, 100, "")
+                { ControlType = "GoodBadCataloguePieChart" });
         }
 
         if (typeof(T) == typeof(DashboardObjectUse))
         {
             var layout = WhenIHaveA<DashboardLayout>(repository);
-            var control = Save(new DashboardControl(repository, layout, typeof(int), 0, 0, 100, 100, "") { ControlType = "GoodBadCataloguePieChart" });
+            var control = Save(new DashboardControl(repository, layout, typeof(int), 0, 0, 100, 100, "")
+                { ControlType = "GoodBadCataloguePieChart" });
             var use = new DashboardObjectUse(repository, control, WhenIHaveA<Catalogue>(repository));
             return (T)(object)use;
         }
@@ -233,7 +222,7 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
             var filter = WhenIHaveA<ExtractionFilter>(repository);
             filter.WhereSQL = "@myParam = 'T'";
 
-            return (T)(object)new ExtractionFilterParameter(repository,"DECLARE @myParam varchar(10)",filter);
+            return (T)(object)new ExtractionFilterParameter(repository, "DECLARE @myParam varchar(10)", filter);
         }
 
         if (typeof(T) == typeof(ExtractionFilterParameterSetValue))
@@ -243,90 +232,89 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
             return (T)(object)new ExtractionFilterParameterSetValue(repository, set, parameter);
         }
 
-        if (typeof (T) == typeof(ExtractionFilterParameterSet))
-        {
+        if (typeof(T) == typeof(ExtractionFilterParameterSet))
             return (T)(object)WhenIHaveA<ExtractionFilterParameterSetValue>(repository).ExtractionFilterParameterSet;
-        }
 
-        if (typeof (T) == typeof (Favourite))
-            return (T) (object) new Favourite(repository, WhenIHaveA<Catalogue>(repository));
+        if (typeof(T) == typeof(Favourite))
+            return (T)(object)new Favourite(repository, WhenIHaveA<Catalogue>(repository));
 
-        if (typeof (T) == typeof(ObjectExport))
-        {
-            return (T)(object)WhenIHaveA<ObjectExport>(repository, out ShareManager sm);
-        }
-            
-        if (typeof (T) == typeof(ObjectImport))
+        if (typeof(T) == typeof(ObjectExport)) return (T)(object)WhenIHaveA<ObjectExport>(repository, out var sm);
+
+        if (typeof(T) == typeof(ObjectImport))
         {
             var export = WhenIHaveA<ObjectExport>(repository, out var sm);
             return (T)(object)sm.GetImportAs(export.SharingUID, WhenIHaveA<Catalogue>(repository));
         }
-            
-        if (typeof (T) == typeof(WindowLayout))
-            return (T)(object)new WindowLayout(repository,"My window arrangement","<html><body>ignore this</body></html>");
 
-        if (typeof (T) == typeof(RemoteRDMP))
+        if (typeof(T) == typeof(WindowLayout))
+            return (T)(object)new WindowLayout(repository, "My window arrangement",
+                "<html><body>ignore this</body></html>");
+
+        if (typeof(T) == typeof(RemoteRDMP))
             return (T)(object)new RemoteRDMP(repository);
-            
-        if (typeof (T) == typeof(CohortIdentificationConfiguration))
-            return (T)(object)new CohortIdentificationConfiguration(repository,"My cic");
 
-        if (typeof (T) == typeof(JoinableCohortAggregateConfiguration))
+        if (typeof(T) == typeof(CohortIdentificationConfiguration))
+            return (T)(object)new CohortIdentificationConfiguration(repository, "My cic");
+
+        if (typeof(T) == typeof(JoinableCohortAggregateConfiguration))
         {
             var config = WhenIHaveCohortAggregateConfiguration(repository, "PatientIndexTable");
             var cic = WhenIHaveA<CohortIdentificationConfiguration>(repository);
             cic.EnsureNamingConvention(config);
-            return (T)(object)new JoinableCohortAggregateConfiguration(repository,cic,config);
+            return (T)(object)new JoinableCohortAggregateConfiguration(repository, cic, config);
         }
-            
-        if (typeof (T) == typeof(JoinableCohortAggregateConfigurationUse))
+
+        if (typeof(T) == typeof(JoinableCohortAggregateConfigurationUse))
         {
             var joinable = WhenIHaveA<JoinableCohortAggregateConfiguration>(repository);
             var config = WhenIHaveCohortAggregateConfiguration(repository, "Aggregate");
             return (T)(object)joinable.AddUser(config);
         }
-            
-        if (typeof (T) == typeof(Rdmp.Core.Curation.Data.Plugin))
-            return (T)(object)new Rdmp.Core.Curation.Data.Plugin(repository,new FileInfo("bob.nupkg"),new Version(1,1,1),new Version(1,1,1));
-            
-        if (typeof (T) == typeof(LoadModuleAssembly))
+
+        if (typeof(T) == typeof(Rdmp.Core.Curation.Data.Plugin))
+            return (T)(object)new Rdmp.Core.Curation.Data.Plugin(repository, new FileInfo("bob.nupkg"),
+                new Version(1, 1, 1), new Version(1, 1, 1));
+
+        if (typeof(T) == typeof(LoadModuleAssembly))
         {
-            var dll = Path.Combine(TestContext.CurrentContext.TestDirectory,"a.nupkg");
-            File.WriteAllBytes(dll,new byte[] {0x11});
+            var dll = Path.Combine(TestContext.CurrentContext.TestDirectory, "a.nupkg");
+            File.WriteAllBytes(dll, new byte[] { 0x11 });
 
-            return (T)(object)new LoadModuleAssembly(repository,new FileInfo(dll),WhenIHaveA<Rdmp.Core.Curation.Data.Plugin>(repository));
+            return (T)(object)new LoadModuleAssembly(repository, new FileInfo(dll),
+                WhenIHaveA<Rdmp.Core.Curation.Data.Plugin>(repository));
         }
-            
-        if (typeof (T) == typeof(AggregateContinuousDateAxis))
+
+        if (typeof(T) == typeof(AggregateContinuousDateAxis))
         {
-            var config = WhenIHaveA<AggregateConfiguration>(repository, out var dateEi, out ExtractionInformation otherEi);
+            var config = WhenIHaveA<AggregateConfiguration>(repository, out var dateEi, out var otherEi);
 
             //remove the other Ei
             config.AggregateDimensions[0].DeleteInDatabase();
             //add the date one
             var dim = new AggregateDimension(repository, dateEi, config);
 
-            return (T)(object)new AggregateContinuousDateAxis(repository,dim);
+            return (T)(object)new AggregateContinuousDateAxis(repository, dim);
         }
-            
-        if (typeof (T) == typeof(AggregateDimension))
-            return (T)(object) WhenIHaveA<AggregateConfiguration>(repository).AggregateDimensions[0];
-            
-        if (typeof (T) == typeof(AggregateFilterContainer))
+
+        if (typeof(T) == typeof(AggregateDimension))
+            return (T)(object)WhenIHaveA<AggregateConfiguration>(repository).AggregateDimensions[0];
+
+        if (typeof(T) == typeof(AggregateFilterContainer))
         {
             var config = WhenIHaveA<AggregateConfiguration>(repository);
-            var container = new AggregateFilterContainer(repository,FilterContainerOperation.AND);
+            var container = new AggregateFilterContainer(repository, FilterContainerOperation.AND);
             config.RootFilterContainer_ID = container.ID;
             config.SaveToDatabase();
-            return (T) (object) container;
+            return (T)(object)container;
         }
-        if (typeof (T) == typeof(AggregateFilter))
+
+        if (typeof(T) == typeof(AggregateFilter))
         {
             var container = WhenIHaveA<AggregateFilterContainer>(repository);
-            return (T)(object)new AggregateFilter(repository,"My Filter",container);
+            return (T)(object)new AggregateFilter(repository, "My Filter", container);
         }
-            
-        if (typeof (T) == typeof(AggregateFilterParameter))
+
+        if (typeof(T) == typeof(AggregateFilterParameter))
         {
             var filter = WhenIHaveA<AggregateFilter>(repository);
             filter.WhereSQL = "@MyP = 'mnnn apples'";
@@ -335,107 +323,113 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
             return (T)filter.GetFilterFactory().CreateNewParameter(filter, "DECLARE @MyP as varchar(10)");
         }
 
-        if (typeof (T) == typeof (LoadProgress))
-            return (T) (object) new LoadProgress(repository, WhenIHaveA<LoadMetadata>(repository));
+        if (typeof(T) == typeof(LoadProgress))
+            return (T)(object)new LoadProgress(repository, WhenIHaveA<LoadMetadata>(repository));
+
+        if (typeof(T) == typeof(CacheProgress))
+            return (T)(object)new CacheProgress(repository, WhenIHaveA<LoadProgress>(repository));
 
-        if (typeof (T) == typeof(CacheProgress))
-            return (T)(object)new CacheProgress(repository,WhenIHaveA<LoadProgress>(repository));
+        if (typeof(T) == typeof(CacheFetchFailure))
+            return (T)(object)new CacheFetchFailure(repository, WhenIHaveA<CacheProgress>(repository),
+                DateTime.Now.Subtract(new TimeSpan(1, 0, 0, 0)), DateTime.Now, new Exception("It didn't work"));
 
-        if (typeof (T) == typeof(CacheFetchFailure))
-            return (T)(object)new CacheFetchFailure(repository,WhenIHaveA<CacheProgress>(repository),DateTime.Now.Subtract(new TimeSpan(1,0,0,0)),DateTime.Now,new Exception("It didn't work"));
-            
-        if (typeof (T) == typeof(CohortAggregateContainer))
+        if (typeof(T) == typeof(CohortAggregateContainer))
         {
             var cic = WhenIHaveA<CohortIdentificationConfiguration>(repository);
             cic.CreateRootContainerIfNotExists();
             return (T)(object)cic.RootCohortAggregateContainer;
         }
-            
-        if (typeof (T) == typeof(AnyTableSqlParameter))
+
+        if (typeof(T) == typeof(AnyTableSqlParameter))
         {
             var cic = WhenIHaveA<CohortIdentificationConfiguration>(repository);
-            return (T)(object)new AnyTableSqlParameter(repository,cic,"DECLARE @myGlobal as varchar(10)");
+            return (T)(object)new AnyTableSqlParameter(repository, cic, "DECLARE @myGlobal as varchar(10)");
         }
 
-        if (typeof (T) == typeof(DataAccessCredentials))
-            return (T)(object)new DataAccessCredentials(repository,"My credentials");
-            
-        if (typeof (T) == typeof(GovernancePeriod))
+        if (typeof(T) == typeof(DataAccessCredentials))
+            return (T)(object)new DataAccessCredentials(repository, "My credentials");
+
+        if (typeof(T) == typeof(GovernancePeriod))
             return (T)(object)new GovernancePeriod(repository);
-            
-        if (typeof (T) == typeof(GovernanceDocument))
+
+        if (typeof(T) == typeof(GovernanceDocument))
         {
             var fi = new FileInfo(Path.Combine(TestContext.CurrentContext.TestDirectory, "myfile.txt"));
-            return (T)(object)new GovernanceDocument(repository,WhenIHaveA<GovernancePeriod>(repository),fi);
+            return (T)(object)new GovernanceDocument(repository, WhenIHaveA<GovernancePeriod>(repository), fi);
         }
 
-        if (typeof (T) == typeof(PermissionWindow))
+        if (typeof(T) == typeof(PermissionWindow))
             return (T)(object)new PermissionWindow(repository);
-            
 
-        if (typeof (T) == typeof(JoinInfo))
+
+        if (typeof(T) == typeof(JoinInfo))
         {
-            WhenIHaveTwoTables(repository, out var col1, out var col2, out ColumnInfo col3);
+            WhenIHaveTwoTables(repository, out var col1, out var col2, out var col3);
 
-            return (T)(object)new JoinInfo(repository,col1,col2,ExtractionJoinType.Left, null);
+            return (T)(object)new JoinInfo(repository, col1, col2, ExtractionJoinType.Left, null);
         }
-        if (typeof (T) == typeof(Lookup))
+
+        if (typeof(T) == typeof(Lookup))
         {
             WhenIHaveTwoTables(repository, out var col1, out var col2, out var col3);
 
-            return (T)(object)new Lookup(repository,col3,col1,col2,ExtractionJoinType.Left, null);
+            return (T)(object)new Lookup(repository, col3, col1, col2, ExtractionJoinType.Left, null);
         }
-        if (typeof (T) == typeof(LookupCompositeJoinInfo))
+
+        if (typeof(T) == typeof(LookupCompositeJoinInfo))
         {
             var lookup = WhenIHaveA<Lookup>(repository);
 
-            var otherJoinFk = new ColumnInfo(repository,"otherJoinKeyForeign","int",lookup.ForeignKey.TableInfo);
-            var otherJoinPk = new ColumnInfo(repository,"otherJoinKeyPrimary","int",lookup.PrimaryKey.TableInfo);
+            var otherJoinFk = new ColumnInfo(repository, "otherJoinKeyForeign", "int", lookup.ForeignKey.TableInfo);
+            var otherJoinPk = new ColumnInfo(repository, "otherJoinKeyPrimary", "int", lookup.PrimaryKey.TableInfo);
 
-            return (T)(object)new LookupCompositeJoinInfo(repository,lookup,otherJoinFk,otherJoinPk);
+            return (T)(object)new LookupCompositeJoinInfo(repository, lookup, otherJoinFk, otherJoinPk);
         }
-        if (typeof (T) == typeof(Pipeline))
-            return (T)(object)new Pipeline(repository,"My Pipeline");
 
-        if (typeof (T) == typeof(PipelineComponent))
-            return (T)(object)new PipelineComponent(repository, WhenIHaveA<Pipeline>(repository), typeof(ColumnForbidder),0,"My Component");
-            
-        if (typeof (T) == typeof(PipelineComponentArgument))
+        if (typeof(T) == typeof(Pipeline))
+            return (T)(object)new Pipeline(repository, "My Pipeline");
+
+        if (typeof(T) == typeof(PipelineComponent))
+            return (T)(object)new PipelineComponent(repository, WhenIHaveA<Pipeline>(repository),
+                typeof(ColumnForbidder), 0, "My Component");
+
+        if (typeof(T) == typeof(PipelineComponentArgument))
         {
             var comp = WhenIHaveA<PipelineComponent>(repository);
             return (T)comp.CreateArgumentsForClassIfNotExists<ColumnForbidder>().First();
         }
 
-        if (typeof (T) == typeof(PreLoadDiscardedColumn))
-            return (T)(object)new PreLoadDiscardedColumn(repository,WhenIHaveA<TableInfo>(repository),"MyDiscardedColum");
-                        
-                       
-        if (typeof (T) == typeof(ProcessTask))
-            return (T)(object)new ProcessTask(repository,WhenIHaveA<LoadMetadata>(repository),LoadStage.AdjustRaw);
+        if (typeof(T) == typeof(PreLoadDiscardedColumn))
+            return (T)(object)new PreLoadDiscardedColumn(repository, WhenIHaveA<TableInfo>(repository),
+                "MyDiscardedColum");
 
-        if (typeof (T) == typeof(ProcessTaskArgument))
-            return (T)(object)new ProcessTaskArgument(repository,WhenIHaveA<ProcessTask>(repository));
 
-                
-        if (typeof (T) == typeof(StandardRegex))
+        if (typeof(T) == typeof(ProcessTask))
+            return (T)(object)new ProcessTask(repository, WhenIHaveA<LoadMetadata>(repository), LoadStage.AdjustRaw);
+
+        if (typeof(T) == typeof(ProcessTaskArgument))
+            return (T)(object)new ProcessTaskArgument(repository, WhenIHaveA<ProcessTask>(repository));
+
+
+        if (typeof(T) == typeof(StandardRegex))
             return (T)(object)new StandardRegex(repository);
 
-        if (typeof (T) == typeof(SupportingSQLTable))
-            return (T)(object)new SupportingSQLTable(repository,WhenIHaveA<Catalogue>(repository),"Some Handy Query");
+        if (typeof(T) == typeof(SupportingSQLTable))
+            return (T)(object)new SupportingSQLTable(repository, WhenIHaveA<Catalogue>(repository), "Some Handy Query");
+
+        if (typeof(T) == typeof(TicketingSystemConfiguration))
+            return (T)(object)new TicketingSystemConfiguration(repository, "My Ticketing System");
 
-        if (typeof (T) == typeof(TicketingSystemConfiguration))
-            return (T)(object)new TicketingSystemConfiguration(repository,"My Ticketing System");
+        if (typeof(T) == typeof(SupportingDocument))
+            return (T)(object)new SupportingDocument(repository, WhenIHaveA<Catalogue>(repository), "HelpFile.docx");
 
-        if (typeof (T) == typeof(SupportingDocument))
-            return (T)(object)new SupportingDocument(repository,WhenIHaveA<Catalogue>(repository),"HelpFile.docx");
+        if (typeof(T) == typeof(Project))
+            return (T)(object)new Project(repository, "My Project");
 
-        if (typeof (T) == typeof(Project))
-            return (T)(object)new Project(repository,"My Project");
-            
-        if (typeof (T) == typeof(ExtractionConfiguration))
-            return (T)(object)new ExtractionConfiguration(repository,WhenIHaveA<Project>(repository));
-            
-        if (typeof (T) == typeof(ExtractableDataSet))
+        if (typeof(T) == typeof(ExtractionConfiguration))
+            return (T)(object)new ExtractionConfiguration(repository, WhenIHaveA<Project>(repository));
+
+        if (typeof(T) == typeof(ExtractableDataSet))
         {
             //To make an extractable dataset we need an extraction identifier (e.g. chi) that will be linked in the cohort
             var ei = WhenIHaveA<ExtractionInformation>(repository);
@@ -443,37 +437,40 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
             ei.SaveToDatabase();
 
             //And we need another column too just for sanity sakes (in the same table)
-            var ci2 = new CatalogueItem(repository,ei.CatalogueItem.Catalogue,"ci2");
+            var ci2 = new CatalogueItem(repository, ei.CatalogueItem.Catalogue, "ci2");
             var col2 = new ColumnInfo(repository, "My_Col2", "varchar(10)", ei.ColumnInfo.TableInfo);
-            var ei2 = new ExtractionInformation(repository,ci2,col2,col2.GetFullyQualifiedName());
+            var ei2 = new ExtractionInformation(repository, ci2, col2, col2.GetFullyQualifiedName());
 
-            return (T)(object)new ExtractableDataSet(repository,ei.CatalogueItem.Catalogue);
+            return (T)(object)new ExtractableDataSet(repository, ei.CatalogueItem.Catalogue);
         }
-            
-        if (typeof (T) == typeof(CumulativeExtractionResults))
-            return (T)(object)new CumulativeExtractionResults(repository,WhenIHaveA<ExtractionConfiguration>(repository),WhenIHaveA<ExtractableDataSet>(repository),"SELECT * FROM Anywhere");
-            
-        if (typeof (T) == typeof(SelectedDataSets))
+
+        if (typeof(T) == typeof(CumulativeExtractionResults))
+            return (T)(object)new CumulativeExtractionResults(repository,
+                WhenIHaveA<ExtractionConfiguration>(repository), WhenIHaveA<ExtractableDataSet>(repository),
+                "SELECT * FROM Anywhere");
+
+        if (typeof(T) == typeof(SelectedDataSets))
         {
             var eds = WhenIHaveA<ExtractableDataSet>(repository);
             var config = WhenIHaveA<ExtractionConfiguration>(repository);
 
             foreach (var ei in eds.Catalogue.GetAllExtractionInformation(ExtractionCategory.Any))
             {
-                var ec = new ExtractableColumn(repository, eds, config,ei,ei.Order,ei.SelectSQL);
+                var ec = new ExtractableColumn(repository, eds, config, ei, ei.Order, ei.SelectSQL);
             }
 
-            return (T)(object)new SelectedDataSets(repository,config,eds, null);
+            return (T)(object)new SelectedDataSets(repository, config, eds, null);
         }
-                
 
-        if (typeof (T) == typeof(ReleaseLog))
+
+        if (typeof(T) == typeof(ReleaseLog))
         {
-            var file = Path.Combine(TestContext.CurrentContext.TestDirectory,"myDataset.csv");
-            File.WriteAllText(file,"omg rows");
+            var file = Path.Combine(TestContext.CurrentContext.TestDirectory, "myDataset.csv");
+            File.WriteAllText(file, "omg rows");
 
             var sds = WhenIHaveA<SelectedDataSets>(repository);
-            new CumulativeExtractionResults(repository,sds.ExtractionConfiguration,sds.ExtractableDataSet,"SELECT * FROM ANYWHERE");
+            new CumulativeExtractionResults(repository, sds.ExtractionConfiguration, sds.ExtractableDataSet,
+                "SELECT * FROM ANYWHERE");
             var potential = new FlatFileReleasePotential(new RepositoryProvider(repository), sds);
 
             return (T)(object)new ReleaseLog(repository,
@@ -482,28 +479,29 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
                 false,
                 new DirectoryInfo(TestContext.CurrentContext.TestDirectory),
                 new FileInfo(file));
-
         }
 
-        if (typeof (T) == typeof(ExtractableDataSetPackage))
-            return (T)(object)new ExtractableDataSetPackage(repository,"My Cool Package");
-            
-            
-        if (typeof (T) == typeof(SupplementalExtractionResults))
-        {
-            return (T)(object)new SupplementalExtractionResults(repository,WhenIHaveA<CumulativeExtractionResults>(repository),"Select * from Lookup",WhenIHaveA<SupportingSQLTable>(repository));
-        }
+        if (typeof(T) == typeof(ExtractableDataSetPackage))
+            return (T)(object)new ExtractableDataSetPackage(repository, "My Cool Package");
+
+
+        if (typeof(T) == typeof(SupplementalExtractionResults))
+            return (T)(object)new SupplementalExtractionResults(repository,
+                WhenIHaveA<CumulativeExtractionResults>(repository), "Select * from Lookup",
+                WhenIHaveA<SupportingSQLTable>(repository));
 
-        if (typeof (T) == typeof(SelectedDataSetsForcedJoin))
-            return (T)(object)new SelectedDataSetsForcedJoin(repository,WhenIHaveA<SelectedDataSets>(repository),WhenIHaveA<TableInfo>(repository));
-            
-        if (typeof (T) == typeof(ProjectCohortIdentificationConfigurationAssociation))
-            return (T)(object)new ProjectCohortIdentificationConfigurationAssociation(repository,WhenIHaveA<Project>(repository),WhenIHaveA<CohortIdentificationConfiguration>(repository));
-            
-        if (typeof (T) == typeof(ExternalCohortTable))
-            return Save((T)(object)new ExternalCohortTable(repository,"My cohorts",DatabaseType.MicrosoftSQLServer)
+        if (typeof(T) == typeof(SelectedDataSetsForcedJoin))
+            return (T)(object)new SelectedDataSetsForcedJoin(repository, WhenIHaveA<SelectedDataSets>(repository),
+                WhenIHaveA<TableInfo>(repository));
+
+        if (typeof(T) == typeof(ProjectCohortIdentificationConfigurationAssociation))
+            return (T)(object)new ProjectCohortIdentificationConfigurationAssociation(repository,
+                WhenIHaveA<Project>(repository), WhenIHaveA<CohortIdentificationConfiguration>(repository));
+
+        if (typeof(T) == typeof(ExternalCohortTable))
+            return Save((T)(object)new ExternalCohortTable(repository, "My cohorts", DatabaseType.MicrosoftSQLServer)
             {
-                Database="MyCohortsDb",
+                Database = "MyCohortsDb",
                 DefinitionTableForeignKeyField = "c_id",
                 PrivateIdentifierField = "priv",
                 ReleaseIdentifierField = "rel",
@@ -512,25 +510,27 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
                 Server = "localhost\\sqlexpress"
             });
 
-        if (typeof (T) == typeof(ExtractableCohort))
-            throw new NotSupportedException("You should inherit from TestsRequiringACohort instead, cohorts have to exist to be constructed");
+        if (typeof(T) == typeof(ExtractableCohort))
+            throw new NotSupportedException(
+                "You should inherit from TestsRequiringACohort instead, cohorts have to exist to be constructed");
 
-        if (typeof (T) == typeof(GlobalExtractionFilterParameter))
-            return (T)(object)new GlobalExtractionFilterParameter(repository,WhenIHaveA<ExtractionConfiguration>(repository),"DECLARE @ExtractionGlobal as varchar(100)");
+        if (typeof(T) == typeof(GlobalExtractionFilterParameter))
+            return (T)(object)new GlobalExtractionFilterParameter(repository,
+                WhenIHaveA<ExtractionConfiguration>(repository), "DECLARE @ExtractionGlobal as varchar(100)");
 
 
-        if (typeof (T) == typeof(ExtractableColumn))
+        if (typeof(T) == typeof(ExtractableColumn))
         {
             var ei = WhenIHaveA<ExtractionInformation>(repository);
 
             var eds = new ExtractableDataSet(repository, ei.CatalogueItem.Catalogue);
-            var config  = WhenIHaveA<ExtractionConfiguration>(repository);
+            var config = WhenIHaveA<ExtractionConfiguration>(repository);
             config.AddDatasetToConfiguration(eds);
 
-            return (T)(object) config.GetAllExtractableColumnsFor(eds).Single();
+            return (T)(object)config.GetAllExtractableColumnsFor(eds).Single();
         }
-            
-        if (typeof (T) == typeof(FilterContainer))
+
+        if (typeof(T) == typeof(FilterContainer))
         {
             var sds = WhenIHaveA<SelectedDataSets>(repository);
             var container = new FilterContainer(repository, FilterContainerOperation.AND);
@@ -539,21 +539,22 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
 
             return (T)(object)container;
         }
-                              
-            
-        if (typeof (T) == typeof(DeployedExtractionFilter))
+
+
+        if (typeof(T) == typeof(DeployedExtractionFilter))
         {
             var container = WhenIHaveA<FilterContainer>(repository);
-            return (T)(object)new DeployedExtractionFilter(repository,"Fish = 'haddock'",container);
+            return (T)(object)new DeployedExtractionFilter(repository, "Fish = 'haddock'", container);
         }
-        if (typeof (T) == typeof(DeployedExtractionFilterParameter))
+
+        if (typeof(T) == typeof(DeployedExtractionFilterParameter))
         {
             var filter = WhenIHaveA<DeployedExtractionFilter>(repository);
             filter.WhereSQL = "@had = 'enough'";
             return (T)(object)filter.GetFilterFactory().CreateNewParameter(filter, "DECLARE @had as varchar(100)");
         }
 
-        if(typeof(T)== typeof(ExtractionProgress))
+        if (typeof(T) == typeof(ExtractionProgress))
         {
             var cata = new Catalogue(repository, "MyCata");
             var cataItem = new CatalogueItem(repository, cata, "MyCol");
@@ -573,10 +574,7 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
         }
 
 
-        if (typeof(T) == typeof(Commit))
-        {
-            return (T)(object)new Commit(repository, Guid.NewGuid(),"Breaking stuff");
-        }
+        if (typeof(T) == typeof(Commit)) return (T)(object)new Commit(repository, Guid.NewGuid(), "Breaking stuff");
 
         if (typeof(T) == typeof(Memento))
         {
@@ -590,19 +588,21 @@ public static T WhenIHaveA<T>(MemoryDataExportRepository repository) where T : D
         throw new TestCaseNotWrittenYetException(typeof(T));
     }
 
-    private static void WhenIHaveTwoTables(MemoryDataExportRepository repository,out ColumnInfo col1, out ColumnInfo col2, out ColumnInfo col3)
+    private static void WhenIHaveTwoTables(MemoryDataExportRepository repository, out ColumnInfo col1,
+        out ColumnInfo col2, out ColumnInfo col3)
     {
-        WhenIHaveTwoTables(repository, out TableInfo ti1, out TableInfo ti2, out col1, out col2, out col3);
+        WhenIHaveTwoTables(repository, out var ti1, out var ti2, out col1, out col2, out col3);
     }
 
-    private static void WhenIHaveTwoTables(MemoryDataExportRepository repository,out TableInfo ti1, out TableInfo ti2, out ColumnInfo col1, out ColumnInfo col2, out ColumnInfo col3)
+    private static void WhenIHaveTwoTables(MemoryDataExportRepository repository, out TableInfo ti1, out TableInfo ti2,
+        out ColumnInfo col1, out ColumnInfo col2, out ColumnInfo col3)
     {
         ti1 = WhenIHaveA<TableInfo>(repository);
         ti1.Name = "ParentTable";
         ti1.Database = "MyDb";
         ti1.SaveToDatabase();
         col1 = new ColumnInfo(repository, "ParentCol", "varchar(10)", ti1);
-         
+
         ti2 = WhenIHaveA<TableInfo>(repository);
         ti2.Name = "ChildTable";
         ti2.Database = "MyDb";
@@ -610,7 +610,8 @@ private static void WhenIHaveTwoTables(MemoryDataExportRepository repository,out
         col3 = new ColumnInfo(repository, "Desc", "varchar(10)", ti2);
     }
 
-    private static AggregateConfiguration WhenIHaveCohortAggregateConfiguration(MemoryDataExportRepository repository, string name)
+    private static AggregateConfiguration WhenIHaveCohortAggregateConfiguration(MemoryDataExportRepository repository,
+        string name)
     {
         var config = WhenIHaveA<AggregateConfiguration>(repository);
         config.Name = name;
@@ -623,7 +624,8 @@ private static AggregateConfiguration WhenIHaveCohortAggregateConfiguration(Memo
     }
 
     /// <inheritdoc cref="WhenIHaveA{T}()"/>
-    protected static AggregateConfiguration WhenIHaveA<T>(MemoryDataExportRepository repository, out ExtractionInformation dateEi, out ExtractionInformation otherEi) where T : AggregateConfiguration
+    protected static AggregateConfiguration WhenIHaveA<T>(MemoryDataExportRepository repository,
+        out ExtractionInformation dateEi, out ExtractionInformation otherEi) where T : AggregateConfiguration
     {
         var ti = WhenIHaveA<TableInfo>(repository);
         var dateCol = new ColumnInfo(repository, "MyDateCol", "datetime2", ti);
@@ -641,7 +643,8 @@ protected static AggregateConfiguration WhenIHaveA<T>(MemoryDataExportRepository
     }
 
     /// <inheritdoc cref="WhenIHaveA{T}()"/>
-    protected static ANOTable WhenIHaveA<T>(MemoryDataExportRepository repository, out ExternalDatabaseServer server) where T : ANOTable
+    protected static ANOTable WhenIHaveA<T>(MemoryDataExportRepository repository, out ExternalDatabaseServer server)
+        where T : ANOTable
     {
         server = new ExternalDatabaseServer(repository, "ANO Server", new ANOStorePatcher());
         var anoTable = new ANOTable(repository, server, "ANOFish", "F");
@@ -649,7 +652,8 @@ protected static ANOTable WhenIHaveA<T>(MemoryDataExportRepository repository, o
     }
 
     /// <inheritdoc cref="WhenIHaveA{T}()"/>
-    protected static ObjectExport WhenIHaveA<T>(MemoryDataExportRepository repository, out ShareManager shareManager) where T : ObjectExport
+    protected static ObjectExport WhenIHaveA<T>(MemoryDataExportRepository repository, out ShareManager shareManager)
+        where T : ObjectExport
     {
         shareManager = new ShareManager(new RepositoryProvider(repository));
         return shareManager.GetNewOrExistingExportFor(WhenIHaveA<Catalogue>(repository));
@@ -671,15 +675,18 @@ private static T Save<T>(T s) where T : ISaveable
     protected void SetupMEF()
     {
         MEF = new MEF();
-        MEF.Setup(new SafeDirectoryCatalog(new IgnoreAllErrorsCheckNotifier(),TestContext.CurrentContext.TestDirectory));
+        MEF.Setup(
+            new SafeDirectoryCatalog(new IgnoreAllErrorsCheckNotifier(), TestContext.CurrentContext.TestDirectory));
         Repository.CatalogueRepository.MEF = MEF;
 
-        Validator.RefreshExtraTypes(MEF.SafeDirectoryCatalog,new ThrowImmediatelyCheckNotifier());
+        Validator.RefreshExtraTypes(MEF.SafeDirectoryCatalog, new ThrowImmediatelyCheckNotifier());
     }
 
     //Fields that can be safely ignored when comparing an object created in memory with one created into the database.
-    private static readonly string[] IgnorePropertiesWhenDiffing = {"ID","Repository","CatalogueRepository","SoftwareVersion"};
-    public static Dictionary<PropertyInfo,HashSet<object>> _alreadyChecked = new();
+    private static readonly string[] IgnorePropertiesWhenDiffing =
+        { "ID", "Repository", "CatalogueRepository", "SoftwareVersion" };
+
+    public static Dictionary<PropertyInfo, HashSet<object>> _alreadyChecked = new();
 
     /// <summary>
     /// Asserts that the two objects are basically the same except for IDs/Repositories.  This includes checking all public properties
@@ -689,9 +696,10 @@ protected void SetupMEF()
     /// <param name="memObj"></param>
     /// <param name="dbObj"></param>
     /// <param name="firstIteration"></param>
-    public static void AssertAreEqual(IMapsDirectlyToDatabaseTable memObj, IMapsDirectlyToDatabaseTable dbObj,bool firstIteration = true)
+    public static void AssertAreEqual(IMapsDirectlyToDatabaseTable memObj, IMapsDirectlyToDatabaseTable dbObj,
+        bool firstIteration = true)
     {
-        if(firstIteration)
+        if (firstIteration)
             _alreadyChecked.Clear();
 
         foreach (var property in memObj.GetType().GetProperties())
@@ -700,10 +708,10 @@ public static void AssertAreEqual(IMapsDirectlyToDatabaseTable memObj, IMapsDire
                 continue;
 
             if (!_alreadyChecked.ContainsKey(property))
-                _alreadyChecked.Add(property,new HashSet<object>());
+                _alreadyChecked.Add(property, new HashSet<object>());
 
             //if we have already checked this property
-            if(_alreadyChecked[property].Contains(memObj))
+            if (_alreadyChecked[property].Contains(memObj))
                 return; //don't check it again
 
             _alreadyChecked[property].Add(memObj);
@@ -716,31 +724,36 @@ public static void AssertAreEqual(IMapsDirectlyToDatabaseTable memObj, IMapsDire
             }
             catch (Exception e)
             {
-                Assert.Fail("{0} Property {1} could not be read from Memory:\r\n{2}", memObj.GetType().Name, property.Name,e);
+                Assert.Fail("{0} Property {1} could not be read from Memory:\r\n{2}", memObj.GetType().Name,
+                    property.Name, e);
             }
+
             try
             {
                 dbValue = property.GetValue(dbObj);
             }
             catch (Exception e)
             {
-                Assert.Fail("{0} Property {1} could not be read from Database:\r\n{2}", dbObj.GetType().Name, property.Name, e);
+                Assert.Fail("{0} Property {1} could not be read from Database:\r\n{2}", dbObj.GetType().Name,
+                    property.Name, e);
             }
 
-            if(memValue is IMapsDirectlyToDatabaseTable table)
+            if (memValue is IMapsDirectlyToDatabaseTable table)
             {
-                AssertAreEqual(table, (IMapsDirectlyToDatabaseTable)dbValue,false);
+                AssertAreEqual(table, (IMapsDirectlyToDatabaseTable)dbValue, false);
                 return;
             }
+
             if (memValue is IEnumerable<IMapsDirectlyToDatabaseTable> value)
             {
-                AssertAreEqual(value, (IEnumerable<IMapsDirectlyToDatabaseTable>)dbValue,false);
+                AssertAreEqual(value, (IEnumerable<IMapsDirectlyToDatabaseTable>)dbValue, false);
                 return;
             }
 
             if (memValue is DateTime time && dbValue is DateTime dateTime)
                 if (!AreAboutTheSameTime(time, dateTime))
-                    Assert.Fail("Dates differed, {0} Property {1} differed Memory={2} and Db={3}",memObj.GetType().Name, property.Name, time, dateTime);
+                    Assert.Fail("Dates differed, {0} Property {1} differed Memory={2} and Db={3}",
+                        memObj.GetType().Name, property.Name, time, dateTime);
                 else
                     return;
 
@@ -749,10 +762,13 @@ public static void AssertAreEqual(IMapsDirectlyToDatabaseTable memObj, IMapsDire
             dbValue = dbValue as string == string.Empty ? null : dbValue;
 
             //all other properties should be legit
-            Assert.AreEqual(memValue, dbValue, "{0} Property {1} differed Memory={2} and Db={3}", memObj.GetType().Name,property.Name, memValue, dbValue);
+            Assert.AreEqual(memValue, dbValue, "{0} Property {1} differed Memory={2} and Db={3}", memObj.GetType().Name,
+                property.Name, memValue, dbValue);
         }
     }
-    public static void AssertAreEqual(IEnumerable<IMapsDirectlyToDatabaseTable> memObjects, IEnumerable<IMapsDirectlyToDatabaseTable> dbObjects,bool firstIteration=true)
+
+    public static void AssertAreEqual(IEnumerable<IMapsDirectlyToDatabaseTable> memObjects,
+        IEnumerable<IMapsDirectlyToDatabaseTable> dbObjects, bool firstIteration = true)
     {
         var memObjectsArr = memObjects.OrderBy(o => o.ID).ToArray();
         var dbObjectsArr = dbObjects.OrderBy(o => o.ID).ToArray();
@@ -760,7 +776,7 @@ public static void AssertAreEqual(IEnumerable<IMapsDirectlyToDatabaseTable> memO
         Assert.AreEqual(memObjectsArr.Length, dbObjectsArr.Length);
 
         for (var i = 0; i < memObjectsArr.Length; i++)
-            AssertAreEqual(memObjectsArr[i], dbObjectsArr[i],firstIteration);
+            AssertAreEqual(memObjectsArr[i], dbObjectsArr[i], firstIteration);
     }
 
     /// <summary>
@@ -769,10 +785,8 @@ public static void AssertAreEqual(IEnumerable<IMapsDirectlyToDatabaseTable> memO
     /// </summary>
     private const double TimeThresholdInSeconds = 60;
 
-    private static bool AreAboutTheSameTime(DateTime memValue, DateTime dbValue)
-    {
-        return Math.Abs(memValue.Subtract(dbValue).TotalSeconds) < TimeThresholdInSeconds;
-    }
+    private static bool AreAboutTheSameTime(DateTime memValue, DateTime dbValue) =>
+        Math.Abs(memValue.Subtract(dbValue).TotalSeconds) < TimeThresholdInSeconds;
 
 
     /// <summary>
@@ -782,20 +796,21 @@ private static bool AreAboutTheSameTime(DateTime memValue, DateTime dbValue)
     public IEnumerable<DatabaseEntity> WhenIHaveAll()
     {
         var types = typeof(Catalogue).Assembly.GetTypes()
-            .Where(t => t != null && typeof (DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface).ToArray();
+            .Where(t => t != null && typeof(DatabaseEntity).IsAssignableFrom(t) && !t.IsAbstract && !t.IsInterface)
+            .ToArray();
 
         var methodWhenIHaveA = GetWhenIHaveAMethod();
-            
+
         foreach (var t in types)
         {
             //ignore these types too
             if (SkipTheseTypes.Contains(t.Name) || t.Name.StartsWith("Spontaneous") ||
-                typeof (SpontaneousObject).IsAssignableFrom(t))
+                typeof(SpontaneousObject).IsAssignableFrom(t))
                 continue;
 
             //ensure that the method supports the Type
             var genericWhenIHaveA = methodWhenIHaveA.MakeGenericMethod(t);
-            yield return (DatabaseEntity) genericWhenIHaveA.Invoke(this, null);
+            yield return (DatabaseEntity)genericWhenIHaveA.Invoke(this, null);
         }
     }
 
@@ -810,13 +825,13 @@ public IMapsDirectlyToDatabaseTable WhenIHaveA(Type t)
         var methodWhenIHaveA = GetWhenIHaveAMethod();
         //ensure that the method supports the Type
         var genericWhenIHaveA = methodWhenIHaveA.MakeGenericMethod(t);
-        return (DatabaseEntity) genericWhenIHaveA.Invoke(this, null);
+        return (DatabaseEntity)genericWhenIHaveA.Invoke(this, null);
     }
 
     private MethodInfo GetWhenIHaveAMethod()
     {
-        var methods = typeof (UnitTests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+        var methods =
+            typeof(UnitTests).GetMethods(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
         return methods.Single(m => m.Name.Equals(nameof(WhenIHaveA)) && !m.GetParameters().Any());
     }
-
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/ColorSettings.cs b/Tools/rdmp/CommandLine/ColorSettings.cs
index 9cf042ec48..e433890bc4 100644
--- a/Tools/rdmp/CommandLine/ColorSettings.cs
+++ b/Tools/rdmp/CommandLine/ColorSettings.cs
@@ -22,6 +22,7 @@ public class ColorSettings
 {
     private static object oLockInstance = new();
     private static ColorSettings _instance;
+
     public static ColorSettings Instance
     {
         get
@@ -31,7 +32,6 @@ public static ColorSettings Instance
                 // if not first time, return existing value
                 if (_instance != null) return _instance;
                 if (File.Exists("ColorSettings.yaml"))
-                {
                     try
                     {
                         var d = new Deserializer();
@@ -42,7 +42,6 @@ public static ColorSettings Instance
                     {
                         // could not load the yaml color settings, just use the default
                     }
-                }
 
                 _instance = new ColorSettings();
                 return _instance;
@@ -57,7 +56,8 @@ public static ColorSettings Instance
         Focus = new Attribute(RedForegroundFocus, RedBackgroundFocus),
         Disabled = new Attribute(RedForegroundDisabled, RedBackgroundDisabled),
         HotFocus = new Attribute(RedForegroundHotFocus, RedBackgroundHotFocus)
-    };     
+    };
+
     public Color RedForegroundNormal { get; set; }
     public Color RedBackgroundNormal { get; set; }
     public Color RedForegroundFocus { get; set; }
@@ -76,6 +76,7 @@ public static ColorSettings Instance
         Disabled = new Attribute(YellowForegroundDisabled, YellowBackgroundDisabled),
         HotFocus = new Attribute(YellowForegroundHotFocus, YellowBackgroundHotFocus)
     };
+
     public Color YellowForegroundNormal { get; set; }
     public Color YellowBackgroundNormal { get; set; }
     public Color YellowForegroundFocus { get; set; }
@@ -94,6 +95,7 @@ public static ColorSettings Instance
         Disabled = new Attribute(WhiteForegroundDisabled, WhiteBackgroundDisabled),
         HotFocus = new Attribute(WhiteForegroundHotFocus, WhiteBackgroundHotFocus)
     };
+
     public Color WhiteForegroundNormal { get; set; }
     public Color WhiteBackgroundNormal { get; set; }
     public Color WhiteForegroundFocus { get; set; }
@@ -132,4 +134,4 @@ public ColorSettings()
         WhiteForegroundHotFocus = Color.White;
         WhiteBackgroundHotFocus = Color.Black;
     }
-}
+}
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiActivator.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiActivator.cs
index 1b3e8da8c2..d35aee1d52 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiActivator.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiActivator.cs
@@ -37,7 +37,8 @@ internal class ConsoleGuiActivator : BasicActivateItems
     /// </summary>
     public event Action<IMapsDirectlyToDatabaseTable> Published;
 
-    public ConsoleGuiActivator(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ICheckNotifier globalErrorCheckNotifier) : base(repositoryLocator, globalErrorCheckNotifier)
+    public ConsoleGuiActivator(IRDMPPlatformRepositoryServiceLocator repositoryLocator,
+        ICheckNotifier globalErrorCheckNotifier) : base(repositoryLocator, globalErrorCheckNotifier)
     {
         InteractiveDeletes = true;
     }
@@ -48,7 +49,8 @@ protected override bool SelectValueTypeImpl(DialogArgs args, Type paramType, obj
         var dlg = new ConsoleGuiTextDialog(args, initialValue?.ToString());
         if (dlg.ShowDialog())
         {
-            if (string.IsNullOrWhiteSpace(dlg.ResultText) || dlg.ResultText.Equals("null", StringComparison.CurrentCultureIgnoreCase))
+            if (string.IsNullOrWhiteSpace(dlg.ResultText) ||
+                dlg.ResultText.Equals("null", StringComparison.CurrentCultureIgnoreCase))
             {
                 chosen = null;
             }
@@ -85,17 +87,17 @@ public override void Show(string title, string message)
                 ReadOnly = true,
                 AllowsTab = false,
                 WordWrap = true
-
             });
             Application.Run(dlg, ConsoleMainWindow.ExceptionPopup);
         }
     }
+
     public override bool YesNo(DialogArgs args, out bool chosen)
     {
         GetDialogDimensions(out var w, out var h);
 
         // don't use the full height if you're just asking a yes/no question with no big description
-        h = Math.Min(5+(args.TaskDescription?.Length ??0) / 20, h);
+        h = Math.Min(5 + (args.TaskDescription?.Length ?? 0) / 20, h);
 
         var result = MessageBox.Query(w, h, args.WindowTitle ?? "", args.TaskDescription ?? "", "yes", "no", "cancel");
         chosen = result == 0;
@@ -105,19 +107,18 @@ public override bool YesNo(DialogArgs args, out bool chosen)
 
     private static void GetDialogDimensions(out int w, out int h)
     {
-        w = Application.Top?.Frame.Width??0;
-        h = Application.Top?.Frame.Height??0;
+        w = Application.Top?.Frame.Width ?? 0;
+        h = Application.Top?.Frame.Height ?? 0;
 
-        w = Math.Max(64,Math.Min(80,  w - 4));
-        h = Math.Max(10,Math.Min(20,  h - 2));
+        w = Math.Max(64, Math.Min(80, w - 4));
+        h = Math.Max(10, Math.Min(20, h - 2));
     }
 
 
-
     public override bool TypeText(DialogArgs args, int maxLength, string initialText, out string text,
         bool requireSaneHeaderText)
     {
-        var dlg = new ConsoleGuiTextDialog(args, initialText) { MaxLength = maxLength};
+        var dlg = new ConsoleGuiTextDialog(args, initialText) { MaxLength = maxLength };
         if (dlg.ShowDialog())
         {
             text = dlg.ResultText;
@@ -127,6 +128,7 @@ public override bool TypeText(DialogArgs args, int maxLength, string initialText
         text = null;
         return false;
     }
+
     public override void Publish(IMapsDirectlyToDatabaseTable databaseEntity)
     {
         base.Publish(databaseEntity);
@@ -158,10 +160,13 @@ public override IMapsDirectlyToDatabaseTable[] SelectMany(DialogArgs args, Type
         var dlg = new ConsoleGuiSelectMany(this, args.WindowTitle, availableObjects);
         Application.Run(dlg, ConsoleMainWindow.ExceptionPopup);
 
-        return dlg.ResultOk ? dlg.Result.Cast<IMapsDirectlyToDatabaseTable>().ToArray() : Array.Empty<IMapsDirectlyToDatabaseTable>();
+        return dlg.ResultOk
+            ? dlg.Result.Cast<IMapsDirectlyToDatabaseTable>().ToArray()
+            : Array.Empty<IMapsDirectlyToDatabaseTable>();
     }
 
-    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args, IMapsDirectlyToDatabaseTable[] availableObjects)
+    public override IMapsDirectlyToDatabaseTable SelectOne(DialogArgs args,
+        IMapsDirectlyToDatabaseTable[] availableObjects)
     {
         if (args.AllowAutoSelect && availableObjects.Length == 1)
             return availableObjects[0];
@@ -183,7 +188,7 @@ public override bool SelectObject<T>(DialogArgs args, T[] available, out T selec
             return true;
         }
 
-        var dlg = new ConsoleGuiBigListBox<T>(args.WindowTitle ?? "","Ok",true,available,t=>t.ToString(),true);
+        var dlg = new ConsoleGuiBigListBox<T>(args.WindowTitle ?? "", "Ok", true, available, t => t.ToString(), true);
 
         if (dlg.ShowDialog())
         {
@@ -206,7 +211,8 @@ public override bool SelectObjects<T>(DialogArgs args, T[] available, out T[] se
 
     public override DirectoryInfo SelectDirectory(string prompt)
     {
-        var openDir = new OpenDialog(prompt,"Directory"){
+        var openDir = new OpenDialog(prompt, "Directory")
+        {
             AllowsMultipleSelection = false,
             CanCreateDirectories = true,
             CanChooseDirectories = true,
@@ -218,12 +224,11 @@ public override DirectoryInfo SelectDirectory(string prompt)
         var selected = openDir.FilePath?.ToString();
 
         return selected == null ? null : new DirectoryInfo(selected);
-
     }
 
     public override FileInfo SelectFile(string prompt)
     {
-        using var openDir = new OpenDialog(prompt,"Directory"){AllowsMultipleSelection = false};
+        using var openDir = new OpenDialog(prompt, "Directory") { AllowsMultipleSelection = false };
 
         Application.Run(openDir, ConsoleMainWindow.ExceptionPopup);
 
@@ -234,10 +239,10 @@ public override FileInfo SelectFile(string prompt)
 
     public override FileInfo SelectFile(string prompt, string patternDescription, string pattern)
     {
-        using var openDir = new OpenDialog(prompt,"File")
+        using var openDir = new OpenDialog(prompt, "File")
         {
             AllowsMultipleSelection = false,
-            AllowedFileTypes = pattern == null ? null : new []{pattern.TrimStart('*')}
+            AllowedFileTypes = pattern == null ? null : new[] { pattern.TrimStart('*') }
         };
 
         Application.Run(openDir, ConsoleMainWindow.ExceptionPopup);
@@ -245,27 +250,29 @@ public override FileInfo SelectFile(string prompt, string patternDescription, st
         var selected = openDir.FilePaths.Count == 1 ? openDir.FilePaths[0] : null;
 
         // entering "null" in a file dialog may return something like "D:\Blah\null"
-        if (string.Equals(Path.GetFileName(selected),"null", StringComparison.CurrentCultureIgnoreCase))
+        if (string.Equals(Path.GetFileName(selected), "null", StringComparison.CurrentCultureIgnoreCase))
             return null;
 
         return selected == null ? null : new FileInfo(selected);
     }
+
     public override FileInfo[] SelectFiles(string prompt, string patternDescription, string pattern)
     {
-        var openDir = new OpenDialog(prompt,"Directory")
+        var openDir = new OpenDialog(prompt, "Directory")
         {
             AllowsMultipleSelection = true,
-            AllowedFileTypes = pattern == null ? null : new []{pattern.TrimStart('*')}
+            AllowedFileTypes = pattern == null ? null : new[] { pattern.TrimStart('*') }
         };
 
         Application.Run(openDir, ConsoleMainWindow.ExceptionPopup);
 
-        return openDir.FilePaths?.Select(f=>new FileInfo(f))?.ToArray();
+        return openDir.FilePaths?.Select(f => new FileInfo(f))?.ToArray();
     }
 
     public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
     {
-        var dlg = new ConsoleGuiBigListBox<Enum>(args.WindowTitle, "Ok", false, Enum.GetValues(enumType).Cast<Enum>().ToList(), null,false);
+        var dlg = new ConsoleGuiBigListBox<Enum>(args.WindowTitle, "Ok", false,
+            Enum.GetValues(enumType).Cast<Enum>().ToList(), null, false);
 
         if (dlg.ShowDialog())
         {
@@ -277,9 +284,9 @@ public override bool SelectEnum(DialogArgs args, Type enumType, out Enum chosen)
         return false;
     }
 
-    public override bool SelectType(DialogArgs args, Type[] available,out Type chosen)
+    public override bool SelectType(DialogArgs args, Type[] available, out Type chosen)
     {
-        var dlg = new ConsoleGuiBigListBox<Type>(args.WindowTitle, "Ok", true, available.ToList(), null,true);
+        var dlg = new ConsoleGuiBigListBox<Type>(args.WindowTitle, "Ok", true, available.ToList(), null, true);
 
         if (dlg.ShowDialog())
         {
@@ -293,7 +300,7 @@ public override bool SelectType(DialogArgs args, Type[] available,out Type chose
 
     public override void ShowException(string errorText, Exception exception)
     {
-        var msg = GetExceptionText(errorText,exception,false);
+        var msg = GetExceptionText(errorText, exception, false);
 
         var textView = new TextView
         {
@@ -310,7 +317,7 @@ public override void ShowException(string errorText, Exception exception)
         var toggleStack = true;
 
         var btnOk = new Button("Ok", true);
-        btnOk.Clicked += ()=>Application.RequestStop();
+        btnOk.Clicked += () => Application.RequestStop();
         var btnStack = new Button("Stack");
         btnStack.Clicked += () =>
         {
@@ -322,7 +329,7 @@ public override void ShowException(string errorText, Exception exception)
 
         GetDialogDimensions(out var w, out var h);
 
-        var dlg = new Dialog("Error",w,h,btnOk,btnStack);
+        var dlg = new Dialog("Error", w, h, btnOk, btnStack);
         dlg.Add(textView);
 
         Application.MainLoop.Invoke(() =>
@@ -330,19 +337,17 @@ public override void ShowException(string errorText, Exception exception)
         );
     }
 
-    private static ustring GetExceptionText(string errorText, Exception exception, bool includeStackTrace)
-    {
-        return Wrap($"{errorText}\n{ExceptionHelper.ExceptionToListOfInnerMessages(exception, includeStackTrace)}", 76);
-    }
+    private static ustring GetExceptionText(string errorText, Exception exception, bool includeStackTrace) =>
+        Wrap($"{errorText}\n{ExceptionHelper.ExceptionToListOfInnerMessages(exception, includeStackTrace)}", 76);
 
     private static string Wrap(string longString, int width)
     {
-        return string.Join("\n",Regex.Matches( longString, $".{{1,{width}}}").Select( m => m.Value ).ToArray());
+        return string.Join("\n", Regex.Matches(longString, $".{{1,{width}}}").Select(m => m.Value).ToArray());
     }
 
     public override void ShowData(IViewSQLAndResultsCollection collection)
     {
-        var view = new ConsoleGuiSqlEditor(this,collection){Modal = true };
+        var view = new ConsoleGuiSqlEditor(this, collection) { Modal = true };
         Application.Run(view, ConsoleMainWindow.ExceptionPopup);
     }
 
@@ -352,39 +357,31 @@ public override void ShowData(DataTable table)
         Application.Run(view, ConsoleMainWindow.ExceptionPopup);
     }
 
-    public override bool CanActivate(object o)
-    {
-        return o is IMapsDirectlyToDatabaseTable || o is IMasqueradeAs;
-    }
+    public override bool CanActivate(object o) => o is IMapsDirectlyToDatabaseTable || o is IMasqueradeAs;
 
     protected override void ActivateImpl(object o)
     {
         var m = o as IRevertable;
 
         if (o is IMasqueradeAs masq)
-        {
-            if(masq.MasqueradingAs() is IRevertable underlyingObject)
-            {
+            if (masq.MasqueradingAs() is IRevertable underlyingObject)
                 m = underlyingObject;
-            }
-        }
 
-        if(m is CohortIdentificationConfiguration cic)
+        if (m is CohortIdentificationConfiguration cic)
         {
             var view = new ConsoleGuiCohortIdentificationConfigurationUI(this, cic);
             Application.Run(view, ConsoleMainWindow.ExceptionPopup);
         }
-        else
-        if(m != null)
+        else if (m != null)
         {
-            var view = new ConsoleGuiEdit(this,m){Modal = true };
+            var view = new ConsoleGuiEdit(this, m) { Modal = true };
             Application.Run(view, ConsoleMainWindow.ExceptionPopup);
         }
     }
 
     public override void ShowLogs(ILoggedActivityRootObject rootObject)
     {
-        var view = new ConsoleGuiViewLogs(this,rootObject);
+        var view = new ConsoleGuiViewLogs(this, rootObject);
         Application.Run(view, ConsoleMainWindow.ExceptionPopup);
     }
 
@@ -395,10 +392,8 @@ public override void ShowGraph(AggregateConfiguration aggregate)
     }
 
 
-    public override IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline)
-    {
-        return new ConsoleGuiRunPipeline(this,useCase, pipeline);
-    }
+    public override IPipelineRunner GetPipelineRunner(DialogArgs args, IPipelineUseCase useCase, IPipeline pipeline) =>
+        new ConsoleGuiRunPipeline(this, useCase, pipeline);
 
     public override void LaunchSubprocess(ProcessStartInfo startInfo)
     {
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiBigListBox.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiBigListBox.cs
index 1b3ad7431b..9852cd71b6 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiBigListBox.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiBigListBox.cs
@@ -39,6 +39,7 @@ internal class ConsoleGuiBigListBox<T>
     /// Ongoing filtering of a large collection should be cancelled when the user changes the filter even if it is not completed yet
     /// </summary>
     private ConcurrentBag<CancellationTokenSource> _cancelFiltering = new();
+
     private Task _currentFilterTask;
     private object _taskCancellationLock = new();
 
@@ -60,7 +61,7 @@ protected ConsoleGuiBigListBox(string prompt, string okText, bool addSearch, Fun
         _okText = okText;
         _addSearch = addSearch;
         _prompt = prompt;
-            
+
         AspectGetter = displayMember ?? (arg => arg?.ToString() ?? string.Empty);
     }
 
@@ -74,7 +75,7 @@ protected ConsoleGuiBigListBox(string prompt, string okText, bool addSearch, Fun
     /// <param name="displayMember">What to display in the list box (defaults to <see cref="object.ToString"/></param>
     /// <param name="addNull">Creates a selection option "Null" that returns a null selection</param>
     public ConsoleGuiBigListBox(string prompt, string okText, bool addSearch, IList<T> collection,
-        Func<T, string> displayMember, bool addNull):this(prompt,okText,addSearch,displayMember)
+        Func<T, string> displayMember, bool addNull) : this(prompt, okText, addSearch, displayMember)
     {
         ArgumentNullException.ThrowIfNull(collection);
 
@@ -82,32 +83,26 @@ public ConsoleGuiBigListBox(string prompt, string okText, bool addSearch, IList<
         _addNull = addNull;
     }
 
-    private class ListViewObject<T2> where T2:T
+    private class ListViewObject<T2> where T2 : T
     {
         private readonly Func<T2, string> _displayFunc;
         public T2 Object { get; }
 
-        public ListViewObject(T2 o, Func<T2,string> displayFunc)
+        public ListViewObject(T2 o, Func<T2, string> displayFunc)
         {
             _displayFunc = displayFunc;
             Object = o;
         }
 
-        public override string ToString()
-        {
-            return _displayFunc(Object);
-        }
+        public override string ToString() => _displayFunc(Object);
 
-        public override int GetHashCode()
-        {
-            return Object.GetHashCode();
-        }
+        public override int GetHashCode() => Object.GetHashCode();
 
         public override bool Equals(object obj)
         {
-            if(obj is ListViewObject<T2> other)
+            if (obj is ListViewObject<T2> other)
                 return Object.Equals(other.Object);
-                
+
             return false;
         }
     }
@@ -120,18 +115,19 @@ public bool ShowDialog()
     {
         var okClicked = false;
 
-        var win = new Window (_prompt) {
+        var win = new Window(_prompt)
+        {
             X = 0,
             Y = 0,
 
             // By using Dim.Fill(), it will automatically resize without manual intervention
-            Width = Dim.Fill (),
-            Height = Dim.Fill (),
+            Width = Dim.Fill(),
+            Height = Dim.Fill(),
             Modal = true,
             ColorScheme = ConsoleMainWindow.ColorScheme
         };
 
-        _listView = new ListView(new List<string>(new []{"Error"}))
+        _listView = new ListView(new List<string>(new[] { "Error" }))
         {
             X = 0,
             Y = 0,
@@ -140,10 +136,10 @@ public bool ShowDialog()
         };
 
         _listView.KeyPress += _listView_KeyPress;
-        _listView.SetSource( (_collection = BuildList(GetInitialSource())).ToList());
+        _listView.SetSource((_collection = BuildList(GetInitialSource())).ToList());
         win.Add(_listView);
 
-        var btnOk = new Button(_okText,true)
+        var btnOk = new Button(_okText, true)
         {
             Y = Pos.Bottom(_listView),
             Width = 8,
@@ -165,7 +161,7 @@ public bool ShowDialog()
             Width = 10,
             Height = 1
         };
-        btnCancel.Clicked += ()=>Application.RequestStop();
+        btnCancel.Clicked += () => Application.RequestStop();
 
         if (_addSearch)
         {
@@ -177,7 +173,8 @@ public bool ShowDialog()
 
             win.Add(searchLabel);
 
-            _mainInput = new TextField ("") {
+            _mainInput = new TextField("")
+            {
                 X = Pos.Right(searchLabel),
                 Y = Pos.Bottom(_listView),
                 Width = 30
@@ -198,19 +195,19 @@ public bool ShowDialog()
         }
         else
         {
-            btnOk.X = Pos.Center()-5;
+            btnOk.X = Pos.Center() - 5;
             btnCancel.X = Pos.Center() + 5;
         }
 
-            
+
         win.Add(btnOk);
         win.Add(btnCancel);
 
-        AddMoreButtonsAfter(win,btnCancel);
+        AddMoreButtonsAfter(win, btnCancel);
 
-        var callback = Application.MainLoop.AddTimeout(TimeSpan.FromMilliseconds (500), Timer);
+        var callback = Application.MainLoop.AddTimeout(TimeSpan.FromMilliseconds(500), Timer);
 
-        Application.Run(win,ConsoleMainWindow.ExceptionPopup);
+        Application.Run(win, ConsoleMainWindow.ExceptionPopup);
 
         Application.MainLoop.RemoveTimeout(callback);
 
@@ -220,10 +217,7 @@ public bool ShowDialog()
     private void _listView_KeyPress(View.KeyEventEventArgs obj)
     {
         // if user types in some text change the focus to the text box to enable searching
-        if (char.IsLetterOrDigit((char)obj.KeyEvent.KeyValue))
-        {
-            _mainInput.FocusFirst();
-        }
+        if (char.IsLetterOrDigit((char)obj.KeyEvent.KeyValue)) _mainInput.FocusFirst();
     }
 
     /// <summary>
@@ -234,25 +228,24 @@ protected virtual void AddMoreButtonsAfter(Window win, Button btnCancel)
     {
     }
 
-    private bool Timer (MainLoop caller)
+    private bool Timer(MainLoop caller)
     {
-        if(_changes && DateTime.Now.Subtract(_lastKeypress) > TimeSpan.FromSeconds(1))
-        {
-            lock(_taskCancellationLock)
+        if (_changes && DateTime.Now.Subtract(_lastKeypress) > TimeSpan.FromSeconds(1))
+            lock (_taskCancellationLock)
             {
                 var oldSelected = _listView.SelectedItem;
                 _listView.SetSource(_collection.ToList());
 
-                if(oldSelected < _collection.Count)
-                    _listView.SelectedItem = oldSelected ;
+                if (oldSelected < _collection.Count)
+                    _listView.SelectedItem = oldSelected;
 
                 _changes = false;
                 return true;
             }
-        }           
-            
+
         return true;
     }
+
     protected void RestartFiltering()
     {
         RestartFiltering(_mainInput.Text.ToString());
@@ -260,13 +253,12 @@ protected void RestartFiltering()
 
     protected void RestartFiltering(string searchTerm)
     {
-
         var cts = new CancellationTokenSource();
 
-        lock(_taskCancellationLock)
+        lock (_taskCancellationLock)
         {
             //cancel any previous searches
-            foreach(var c in _cancelFiltering)
+            foreach (var c in _cancelFiltering)
                 c.Cancel();
 
             _cancelFiltering.Clear();
@@ -274,47 +266,49 @@ protected void RestartFiltering(string searchTerm)
             _cancelFiltering.Add(cts);
         }
 
-        _currentFilterTask = Task.Run(()=>
+        _currentFilterTask = Task.Run(() =>
         {
-            var result = BuildList(GetListAfterSearch(searchTerm,cts.Token));
+            var result = BuildList(GetListAfterSearch(searchTerm, cts.Token));
 
-            lock(_taskCancellationLock)
+            lock (_taskCancellationLock)
             {
                 _collection = result;
                 _changes = true;
             }
-
-        });       
+        });
     }
 
     private IList<ListViewObject<T>> BuildList(IList<T> listOfT)
     {
-        var toReturn = listOfT.Select(o=>new ListViewObject<T>(o,AspectGetter)).ToList();
+        var toReturn = listOfT.Select(o => new ListViewObject<T>(o, AspectGetter)).ToList();
 
-        if(_addNull)
-            toReturn.Add(new ListViewObject<T>((T)(object)null,o=>"Null"));
+        if (_addNull)
+            toReturn.Add(new ListViewObject<T>((T)(object)null, o => "Null"));
 
         return toReturn;
     }
 
     protected virtual IList<T> GetListAfterSearch(string searchString, CancellationToken token)
     {
-        if(_publicCollection == null)
-            throw new InvalidOperationException("When using the protected constructor derived classes must override this method ");
+        if (_publicCollection == null)
+            throw new InvalidOperationException(
+                "When using the protected constructor derived classes must override this method ");
 
         var searchTerms = searchString.Split(' ');
 
         //stop the Contains searching when the user cancels the search
         return _publicCollection.Where(o => !token.IsCancellationRequested &&
                                             // must have all search terms
-                                            searchTerms.All(t=>AspectGetter(o).Contains(t, StringComparison.CurrentCultureIgnoreCase))
+                                            searchTerms.All(t =>
+                                                AspectGetter(o).Contains(t, StringComparison.CurrentCultureIgnoreCase))
         ).ToList();
     }
 
     protected virtual IList<T> GetInitialSource()
     {
-        if(_publicCollection == null)
-            throw new InvalidOperationException("When using the protected constructor derived classes must override this method ");
+        if (_publicCollection == null)
+            throw new InvalidOperationException(
+                "When using the protected constructor derived classes must override this method ");
 
         return _publicCollection;
     }
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs
index c6b0bfa8b2..b39d6478d7 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiCohortIdentificationConfigurationUI.cs
@@ -20,30 +20,30 @@
 
 namespace Rdmp.Core.CommandLine.Gui;
 
-public partial class ConsoleGuiCohortIdentificationConfigurationUI {
+public partial class ConsoleGuiCohortIdentificationConfigurationUI
+{
     private readonly IBasicActivateItems _activator;
     private CohortIdentificationConfigurationUICommon Common = new();
     private bool _isDisposed;
     private List<object> RowObjects = new();
     private bool _contextMenuShowing = false;
 
-    public ConsoleGuiCohortIdentificationConfigurationUI(IBasicActivateItems activator, CohortIdentificationConfiguration cic) {
+    public ConsoleGuiCohortIdentificationConfigurationUI(IBasicActivateItems activator,
+        CohortIdentificationConfiguration cic)
+    {
         InitializeComponent();
-            
+
         Modal = true;
 
         _activator = activator;
         Common.Activator = activator;
-            
+
         Common.Compiler.CoreChildProvider = activator.CoreChildProvider;
 
         Common.Configuration = cic;
         Common.Compiler.CohortIdentificationConfiguration = cic;
 
-        cbCumulativeTotals.Toggled += e =>
-        {
-            Common.SetShowCumulativeTotals(cbCumulativeTotals.Checked);
-        };
+        cbCumulativeTotals.Toggled += e => { Common.SetShowCumulativeTotals(cbCumulativeTotals.Checked); };
         btnClearCache.Clicked += () =>
         {
             var cmd = new ExecuteCommandClearQueryCache(activator, Common.Configuration);
@@ -55,38 +55,24 @@ public ConsoleGuiCohortIdentificationConfigurationUI(IBasicActivateItems activat
         tableview1.KeyPress += Tableview1_KeyPress;
         tbTimeout.TextChanged += s =>
         {
-            if (int.TryParse(tbTimeout.Text.ToString(), out var t))
-            {
-                Common.Timeout = t;
-            }
+            if (int.TryParse(tbTimeout.Text.ToString(), out var t)) Common.Timeout = t;
         };
 
-        btnRun.Clicked += () =>
-        {
-            Common.StartAll(() => { }, RunnerOnPhaseChanged);
-        };
+        btnRun.Clicked += () => { Common.StartAll(() => { }, RunnerOnPhaseChanged); };
         btnClose.Clicked += () =>
         {
             if (!Common.ConsultAboutClosing())
                 Application.RequestStop();
         };
-        btnAbort.Clicked += () =>
-        {
-            Common.CancelAll();
-        };
+        btnAbort.Clicked += () => { Common.CancelAll(); };
         btnCommitCohort.Clicked += () =>
         {
             var cmd = new ExecuteCommandCreateNewCohortByExecutingACohortIdentificationConfiguration(activator, null)
                 .SetTarget(cic);
-            if(!cmd.IsImpossible)
-            {
+            if (!cmd.IsImpossible)
                 cmd.Execute();
-            }
             else
-            {
                 MessageBox.ErrorQuery("Cannot Commit", cmd.ReasonCommandImpossible);
-            }
-                
         };
         Application.MainLoop.AddTimeout(TimeSpan.FromSeconds(2), RefreshTableCallback);
 
@@ -112,6 +98,7 @@ private void Activator_Published(IMapsDirectlyToDatabaseTable obj)
                 if (key != null)
                     Common.Compiler.CancelTask(key, true);
             }
+
             //TODO: this doesn't clear the compiler
             Common.RecreateAllTasks();
         }
@@ -130,7 +117,7 @@ private void Tableview1_KeyPress(KeyEventEventArgs obj)
         if (obj.KeyEvent.Key == Key.DeleteChar && o is IDeleteable d)
         {
             var cmdDelete = new ExecuteCommandDelete(_activator, d);
-            if(!cmdDelete.IsImpossible)
+            if (!cmdDelete.IsImpossible)
                 cmdDelete.Execute();
         }
     }
@@ -141,7 +128,7 @@ private void RunnerOnPhaseChanged(object sender, EventArgs e)
         {
             lblState.Text = UsefulStuff.PascalCaseStringToHumanReadable(Common.Runner.ExecutionPhase.ToString());
         });
-            
+
         Common.RecreateAllTasks(false);
     }
 
@@ -159,8 +146,8 @@ private void Tableview1_CellActivated(TableView.CellActivatedEventArgs obj)
         {
             var factory = new ConsoleGuiContextMenuFactory(_activator);
             var menu = factory.Create(Array.Empty<object>(), o);
-                
-            if(menu != null)
+
+            if (menu != null)
             {
                 var p = tableview1.CellToScreen(obj.Col, obj.Row);
 
@@ -184,10 +171,7 @@ private void Tableview1_CellActivated(TableView.CellActivatedEventArgs obj)
             }
         }
 
-        if (col.ColumnName.Equals("Execute"))
-        {
-            Common.ExecuteOrCancel(o);
-        }
+        if (col.ColumnName.Equals("Execute")) Common.ExecuteOrCancel(o);
     }
 
     private bool IsValidSelection(int col, int row)
@@ -206,6 +190,7 @@ protected override void Dispose(bool disposing)
         _isDisposed = true;
         base.Dispose(disposing);
     }
+
     private bool RefreshTableCallback(MainLoop m)
     {
         // suspend rebuilding the table while other views are showing
@@ -240,7 +225,7 @@ private void AddToTable(DataTable tbl, object o, ICoreChildProvider childProvide
         var r = tbl.Rows.Add();
         RowObjects.Add(o);
 
-        r["Name"] = new string(' ',indents) + o.ToString();
+        r["Name"] = new string(' ', indents) + o.ToString();
         r["Execute"] = Common.ExecuteAspectGetter(o);
         r["Cached"] = Common.Cached_AspectGetter(o);
         r["Count"] = Common.Count_AspectGetter(o);
@@ -253,9 +238,6 @@ private void AddToTable(DataTable tbl, object o, ICoreChildProvider childProvide
         var children = childProvider.GetChildren(o).ToList();
         children.Sort(new OrderableComparer(null));
 
-        foreach (var c in children)
-        {
-            AddToTable(tbl, c, childProvider, indents++);
-        }
+        foreach (var c in children) AddToTable(tbl, c, childProvider, indents++);
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs
index ebe6e96bb2..037d3aecb3 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiContextMenuFactory.cs
@@ -28,7 +28,7 @@ public ConsoleGuiContextMenuFactory(IBasicActivateItems activator)
         this.activator = activator;
     }
 
-    public  ContextMenu Create(object[] many, object single)
+    public ContextMenu Create(object[] many, object single)
     {
         var commands = GetCommands(activator, many, single).ToArray();
 
@@ -55,13 +55,9 @@ public  ContextMenu Create(object[] many, object single)
             order.Add(item, cmd.Weight);
 
             if (cmd.SuggestedCategory != null)
-            {
                 miCategories[cmd.SuggestedCategory].Add(item);
-            }
             else
-            {
                 items.Add(item);
-            }
         }
 
         foreach (var kvp in miCategories)
@@ -110,7 +106,7 @@ private static MenuItem[] AddSpacers(List<MenuItem> items, Dictionary<MenuItem,
         return withSpacers.ToArray();
     }
 
-    private  void ExecuteWithCatch(IAtomicCommand cmd)
+    private void ExecuteWithCatch(IAtomicCommand cmd)
     {
         try
         {
@@ -118,7 +114,6 @@ private  void ExecuteWithCatch(IAtomicCommand cmd)
         }
         catch (Exception ex)
         {
-
             activator.ShowException($"Error running command '{cmd.GetCommandName()}'", ex);
         }
     }
@@ -127,38 +122,31 @@ private static IEnumerable<IAtomicCommand> GetCommands(IBasicActivateItems activ
     {
         var factory = new AtomicCommandFactory(activator);
 
-        if (many.Length > 1)
-        {
-            return factory.CreateManyObjectCommands(many).ToArray();
-        }
+        if (many.Length > 1) return factory.CreateManyObjectCommands(many).ToArray();
 
         var o = single;
 
         if (ReferenceEquals(o, ConsoleMainWindow.Catalogues))
-        {
-            return new IAtomicCommand[] {
+            return new IAtomicCommand[]
+            {
                 new ExecuteCommandCreateNewCatalogueByImportingFile(activator),
                 new ExecuteCommandCreateNewCatalogueByImportingExistingDataTable(activator)
             };
-        }
         if (ReferenceEquals(o, ConsoleMainWindow.Loads))
-        {
-            return new IAtomicCommand[] {
+            return new IAtomicCommand[]
+            {
                 new ExecuteCommandCreateNewLoadMetadata(activator)
             };
-        }
         if (ReferenceEquals(o, ConsoleMainWindow.Projects))
-        {
-            return new IAtomicCommand[] {
-                new ExecuteCommandNewObject(activator,typeof(Project)){OverrideCommandName = "New Project" }
+            return new IAtomicCommand[]
+            {
+                new ExecuteCommandNewObject(activator, typeof(Project)) { OverrideCommandName = "New Project" }
             };
-        }
         if (ReferenceEquals(o, ConsoleMainWindow.CohortConfigs))
-        {
-            return new IAtomicCommand[] {
+            return new IAtomicCommand[]
+            {
                 new ExecuteCommandCreateNewCohortIdentificationConfiguration(activator)
             };
-        }
 
         if (o == null)
             return Array.Empty<IAtomicCommand>();
@@ -173,18 +161,14 @@ private static IEnumerable<IAtomicCommand> GetCommands(IBasicActivateItems activ
     private static IEnumerable<IAtomicCommand> GetExtraCommands(IBasicActivateItems activator, object o)
     {
         if (CommandFactoryBase.Is(o, out LoadMetadata lmd))
-        {
             yield return new ExecuteCommandRunConsoleGuiView(activator,
                     () => new RunDleWindow(activator, lmd))
                 { OverrideCommandName = "Execute Load..." };
-        }
 
         if (CommandFactoryBase.Is(o, out Project p))
-        {
             yield return new ExecuteCommandRunConsoleGuiView(activator,
                     () => new RunReleaseWindow(activator, p))
                 { OverrideCommandName = "Release..." };
-        }
         if (CommandFactoryBase.Is(o, out ExtractionConfiguration ec))
         {
             yield return new ExecuteCommandRunConsoleGuiView(activator,
@@ -197,18 +181,13 @@ private static IEnumerable<IAtomicCommand> GetExtraCommands(IBasicActivateItems
         }
 
         if (CommandFactoryBase.Is(o, out CacheProgress cp))
-        {
             yield return new ExecuteCommandRunConsoleGuiView(activator,
                     () => new RunCacheWindow(activator, cp))
                 { OverrideCommandName = "Run Cache..." };
-        }
 
         if (CommandFactoryBase.Is(o, out Catalogue c) && !c.IsApiCall())
-        {
             yield return new ExecuteCommandRunConsoleGuiView(activator,
                     () => new RunDataQualityEngineWindow(activator, c))
                 { OverrideCommandName = "Run DQE..." };
-        }
     }
-
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiDataTableViewerUI.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiDataTableViewerUI.cs
index ebc6295a06..045040465c 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiDataTableViewerUI.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiDataTableViewerUI.cs
@@ -12,13 +12,15 @@
 //      You can make changes to this file and they will not be overwritten when saving.
 //  </auto-generated>
 // -----------------------------------------------------------------------------
+
 using System.Data;
 
 namespace Rdmp.Core.CommandLine.Gui;
 
-public partial class ConsoleGuiDataTableViewerUI {
-        
-    public ConsoleGuiDataTableViewerUI(DataTable tbl) {
+public partial class ConsoleGuiDataTableViewerUI
+{
+    public ConsoleGuiDataTableViewerUI(DataTable tbl)
+    {
         InitializeComponent();
 
         tableview1.Table = tbl;
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiOptions.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiOptions.cs
index bf6798ac81..16e155f502 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiOptions.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiOptions.cs
@@ -12,13 +12,14 @@ namespace Rdmp.Core.CommandLine.Gui;
 /// <summary>
 /// Runs a the RDMP console gui.
 /// </summary>
-[Verb("gui",HelpText = "Run the RDMP console user interface")]
+[Verb("gui", HelpText = "Run the RDMP console user interface")]
 public class ConsoleGuiOptions : RDMPCommandLineOptions
 {
-
     /// <summary>
     /// Sets UseSystemConsole to true for Terminal.gui (i.e. uses the NetDriver which is based on System.Console)
     /// </summary>
-    [Option("usc", HelpText = "Sets UseSystemConsole to true for Terminal.gui (i.e. uses the NetDriver which is based on System.Console)")]
+    [Option("usc",
+        HelpText =
+            "Sets UseSystemConsole to true for Terminal.gui (i.e. uses the NetDriver which is based on System.Console)")]
     public bool UseSystemConsole { get; internal set; }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunPipeline.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunPipeline.cs
index 8bf71042ab..7097e7f328 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunPipeline.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunPipeline.cs
@@ -65,15 +65,14 @@ public ConsoleGuiRunPipeline(IBasicActivateItems activator, IPipelineUseCase use
         _pipeline = pipeline;
 
         ColorScheme = ConsoleMainWindow.ColorScheme;
-        _compatiblePipelines = useCase.FilterCompatiblePipelines(activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>()).ToArray();
+        _compatiblePipelines = useCase
+            .FilterCompatiblePipelines(activator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>())
+            .ToArray();
 
         Width = Dim.Fill();
         Height = Dim.Fill();
 
-        if (pipeline == null && _compatiblePipelines.Length == 1)
-        {
-            _pipeline = _compatiblePipelines[0];
-        }
+        if (pipeline == null && _compatiblePipelines.Length == 1) _pipeline = _compatiblePipelines[0];
 
         combobox1.Source = new ListWrapper(_compatiblePipelines);
         combobox1.AddKeyBinding(Key.CursorDown, Command.Expand);
@@ -101,13 +100,9 @@ private void Results_KeyPress(KeyEventEventArgs obj)
                 var selected = notifyEventArgs[_results.SelectedItem];
 
                 if (selected.Exception != null || selected.ProgressEventType == ProgressEventType.Error)
-                {
                     activator.ShowException(selected.Message, selected.Exception);
-                }
                 else
-                {
                     activator.Show(selected.Message);
-                }
             }
 
             obj.Handled = true;
@@ -123,13 +118,9 @@ private void BtnCancel_Clicked()
         }
 
         if (cancellation.Token.IsAbortRequested)
-        {
             MessageBox.ErrorQuery("Already Cancelled", "Cancellation already issued", "Ok");
-        }
         else
-        {
             cancellation.Abort();
-        }
     }
 
     private void BtnRun_Clicked()
@@ -146,20 +137,15 @@ private void BtnRun_Clicked()
         try
         {
             p = combobox1.Source.ToList()[combobox1.SelectedItem] as IPipeline ?? _pipeline;
-
         }
         catch (Exception)
         {
-
             MessageBox.ErrorQuery("No pipeline selected", "Select which Pipeline to use to run the data", "Ok");
             return;
         }
 
         runner = new PipelineRunner(_useCase, p);
-        foreach (var l in additionals)
-        {
-            runner.AdditionalListeners.Add(l);
-        }
+        foreach (var l in additionals) runner.AdditionalListeners.Add(l);
 
         runner.PipelineExecutionFinishedsuccessfully += Runner_PipelineExecutionFinishedsuccessfully;
 
@@ -171,7 +157,8 @@ private void BtnRun_Clicked()
             try
             {
                 cancellation = new GracefulCancellationTokenSource();
-                exitCode = runner.Run(activator.RepositoryLocator, this, new FromDataLoadEventListenerToCheckNotifier(this), cancellation.Token);
+                exitCode = runner.Run(activator.RepositoryLocator, this,
+                    new FromDataLoadEventListenerToCheckNotifier(this), cancellation.Token);
                 cancellation = null;
             }
             catch (Exception ex)
@@ -180,27 +167,20 @@ private void BtnRun_Clicked()
                 cancellation = null;
             }
         });
-
     }
 
     private void Runner_PipelineExecutionFinishedsuccessfully(object sender, PipelineEngineEventArgs args)
     {
         successArgs = args;
         if (UserSettings.ShowPipelineCompletedPopup)
-        {
             Application.MainLoop.Invoke(() =>
             {
                 if (MessageBox.Query("Pipeline completed successfully", "Close Window?", "Yes", "No") == 0)
-                {
                     Application.RequestStop();
-                }
             });
-        }
         else
-        {
             // auto close because user wants no popup
             Application.RequestStop();
-        }
     }
 
 
@@ -214,35 +194,29 @@ public void OnNotify(object sender, NotifyEventArgs e)
     }
 
 
-
     public void OnProgress(object sender, ProgressEventArgs e)
     {
         lock (progressDataTable)
         {
-            var existing = progressDataTable.Rows.Cast<DataRow>().FirstOrDefault(r => Equals(r["Name"], e.TaskDescription));
+            var existing = progressDataTable.Rows.Cast<DataRow>()
+                .FirstOrDefault(r => Equals(r["Name"], e.TaskDescription));
             if (existing != null)
-            {
                 existing["Progress"] = e.Progress.Value;
-            }
             else
-            {
                 progressDataTable.Rows.Add(e.TaskDescription, e.Progress.Value);
-            }
         }
 
         Application.MainLoop.Invoke(() => _tableView.Update());
     }
 
-    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         // this blocks while the window is run
         Application.Run(this, ConsoleMainWindow.ExceptionPopup);
 
         // run the event after the window has closed
-        if (successArgs != null)
-        {
-            PipelineExecutionFinishedsuccessfully?.Invoke(this, successArgs);
-        }
+        if (successArgs != null) PipelineExecutionFinishedsuccessfully?.Invoke(this, successArgs);
 
         return exitCode ?? throw new OperationCanceledException();
     }
@@ -250,21 +224,15 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
     public void SetAdditionalProgressListener(IDataLoadEventListener toAdd)
     {
         if (runner != null)
-        {
             runner.AdditionalListeners.Add(toAdd);
-        }
         else
-        {
             additionals.Add(toAdd);
-        }
     }
 
-    public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width, int start = 0)
+    public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width,
+        int start = 0)
     {
-        if (item >= notifyEventArgs.Count)
-        {
-            return;
-        }
+        if (item >= notifyEventArgs.Count) return;
 
         var str = $"{notifyEventArgs[item].ProgressEventType} {notifyEventArgs[item].Message}";
 
@@ -276,23 +244,17 @@ public void Render(ListView container, ConsoleDriver driver, bool selected, int
             ProgressEventType.Warning => _yellow,
             _ => _white
         };
-        driver.SetAttribute(selected?colour.Focus:colour.Normal);
+        driver.SetAttribute(selected ? colour.Focus : colour.Normal);
 
         _results.Move(col, line);
         driver.AddStr(str);
     }
 
-    public bool IsMarked(int item)
-    {
-        return false;
-    }
+    public bool IsMarked(int item) => false;
 
     public void SetMark(int item, bool value)
     {
     }
 
-    public IList ToList()
-    {
-        return notifyEventArgs;
-    }
+    public IList ToList() => notifyEventArgs;
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunner.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunner.cs
index e61a409713..1f1df669fb 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunner.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiRunner.cs
@@ -24,14 +24,13 @@ public ConsoleGuiRunner(ConsoleGuiOptions options)
     {
         this.options = options;
     }
-    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener, ICheckNotifier checkNotifier, GracefulCancellationToken token)
+
+    public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoadEventListener listener,
+        ICheckNotifier checkNotifier, GracefulCancellationToken token)
     {
         Program.DisableConsoleLogging();
 
-        if (options.UseSystemConsole)
-        {
-            Application.UseSystemConsole = true;
-        }
+        if (options.UseSystemConsole) Application.UseSystemConsole = true;
 
         Application.Init();
 
@@ -52,7 +51,7 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
             Application.Shutdown();
             return -2;
         }
-            
+
         try
         {
             Application.Run();
@@ -70,5 +69,4 @@ public int Run(IRDMPPlatformRepositoryServiceLocator repositoryLocator, IDataLoa
 
         return 0;
     }
-
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiSelectOne.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiSelectOne.cs
index 2d619e5a8e..48ac01f6e5 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiSelectOne.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiSelectOne.cs
@@ -27,14 +27,17 @@ internal class ConsoleGuiSelectOne : ConsoleGuiBigListBox<IMapsDirectlyToDatabas
     /// </summary>
     public const int MaxMatches = 100;
 
-    public ConsoleGuiSelectOne(IBasicActivateItems activator, IEnumerable<IMapsDirectlyToDatabaseTable> available):base("Open","Ok",
-        true,null)
+    public ConsoleGuiSelectOne(IBasicActivateItems activator, IEnumerable<IMapsDirectlyToDatabaseTable> available) :
+        base("Open", "Ok",
+            true, null)
     {
         _activator = activator;
 
-        _masterCollection = available != null ? available.ToDictionary(k=>k,v=>activator.CoreChildProvider.GetDescendancyListIfAnyFor(v)) : _activator.CoreChildProvider.GetAllSearchables();
+        _masterCollection = available != null
+            ? available.ToDictionary(k => k, v => activator.CoreChildProvider.GetDescendancyListIfAnyFor(v))
+            : _activator.CoreChildProvider.GetAllSearchables();
 
-        _publicCollection = _masterCollection.Select(v=>v.Key).ToList();
+        _publicCollection = _masterCollection.Select(v => v.Key).ToList();
         SetAspectGet(_activator.CoreChildProvider);
     }
 
@@ -52,13 +55,15 @@ private void SetAspectGet(ICoreChildProvider childProvider)
 
         _scorer = new SearchablesMatchScorer
         {
-            TypeNames = new HashSet<string>(_masterCollection.Select(m => m.Key.GetType().Name).Distinct(),StringComparer.CurrentCultureIgnoreCase)
+            TypeNames = new HashSet<string>(_masterCollection.Select(m => m.Key.GetType().Name).Distinct(),
+                StringComparer.CurrentCultureIgnoreCase)
         };
     }
 
     protected override void AddMoreButtonsAfter(Window win, Button btnCancel)
     {
-        var lbl = new Label("ID:"){
+        var lbl = new Label("ID:")
+        {
             X = Pos.Right(btnCancel) + 1,
             Y = Pos.Top(btnCancel)
         };
@@ -71,28 +76,29 @@ protected override void AddMoreButtonsAfter(Window win, Button btnCancel)
             Width = 5
         };
 
-        txtId.TextChanged += s=>RestartFiltering();
+        txtId.TextChanged += s => RestartFiltering();
 
         win.Add(txtId);
     }
 
 
-    protected override IList<IMapsDirectlyToDatabaseTable> GetListAfterSearch(string searchText, CancellationToken token)
+    protected override IList<IMapsDirectlyToDatabaseTable> GetListAfterSearch(string searchText,
+        CancellationToken token)
     {
-        if(token.IsCancellationRequested)
+        if (token.IsCancellationRequested)
             return new List<IMapsDirectlyToDatabaseTable>();
 
-        if(int.TryParse(txtId.Text.ToString(), out var searchForID))
+        if (int.TryParse(txtId.Text.ToString(), out var searchForID))
             _scorer.ID = searchForID;
         else
             _scorer.ID = null;
 
-        var dict = _scorer.ScoreMatches(_masterCollection, searchText, token,null);
+        var dict = _scorer.ScoreMatches(_masterCollection, searchText, token, null);
 
         //can occur if user punches many keys at once
-        if(dict == null)
+        if (dict == null)
             return new List<IMapsDirectlyToDatabaseTable>();
 
-        return SearchablesMatchScorer.ShortList(dict, MaxMatches,_activator);
+        return SearchablesMatchScorer.ShortList(dict, MaxMatches, _activator);
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiServerDatabaseTableSelector.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiServerDatabaseTableSelector.cs
index c8fbbc1946..791ddc155d 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiServerDatabaseTableSelector.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiServerDatabaseTableSelector.cs
@@ -20,8 +20,8 @@
 
 namespace Rdmp.Core.CommandLine.Gui;
 
-public partial class ConsoleGuiServerDatabaseTableSelector {
-
+public partial class ConsoleGuiServerDatabaseTableSelector
+{
     private readonly IBasicActivateItems _activator;
     public string Username => tbUsername.Text.ToString();
 
@@ -36,9 +36,10 @@ public partial class ConsoleGuiServerDatabaseTableSelector {
     /// Returns the DatabaseType that is selected in the dropdown or 
     /// <see cref="DatabaseType.MicrosoftSQLServer"/> if none selected
     /// </summary>
-    public DatabaseType DatabaseType => cbxDatabaseType.SelectedItem < 0 ? DatabaseType.MicrosoftSQLServer :
-        (DatabaseType)cbxDatabaseType.Source.ToList()[cbxDatabaseType.SelectedItem];
-        
+    public DatabaseType DatabaseType => cbxDatabaseType.SelectedItem < 0
+        ? DatabaseType.MicrosoftSQLServer
+        : (DatabaseType)cbxDatabaseType.Source.ToList()[cbxDatabaseType.SelectedItem];
+
     /// <summary>
     /// Returns the table type selected in the radio group or <see cref="TableType.Table"/> if none selected
     /// </summary>
@@ -53,8 +54,9 @@ public partial class ConsoleGuiServerDatabaseTableSelector {
 
     public bool OkClicked { get; private set; }
 
-        
-    public ConsoleGuiServerDatabaseTableSelector(IBasicActivateItems activator, string prompt, string okText, bool showTableComponents)
+
+    public ConsoleGuiServerDatabaseTableSelector(IBasicActivateItems activator, string prompt, string okText,
+        bool showTableComponents)
     {
         _activator = activator;
 
@@ -67,7 +69,7 @@ public ConsoleGuiServerDatabaseTableSelector(IBasicActivateItems activator, stri
         btnUseExisting.ColorScheme = ColorScheme;
 
         cbxDatabaseType.SetSource(Enum.GetValues<DatabaseType>());
-            
+
         cbxDatabaseType.AddKeyBinding(Key.CursorDown, Command.Expand);
 
         AddNoWordMeansShowAllAutocomplete(tbServer);
@@ -76,10 +78,11 @@ public ConsoleGuiServerDatabaseTableSelector(IBasicActivateItems activator, stri
 
         // Same guid as used by the windows client but probably the apps have different UserSettings files
         // so sadly won't share one anothers recent histories
-        tbServer.Autocomplete.AllSuggestions = UserSettings.GetHistoryForControl(new Guid("01ccc304-0686-4145-86a5-cc0468d40027"))
-            .Where(e=>!string.IsNullOrWhiteSpace(e))
+        tbServer.Autocomplete.AllSuggestions = UserSettings
+            .GetHistoryForControl(new Guid("01ccc304-0686-4145-86a5-cc0468d40027"))
+            .Where(e => !string.IsNullOrWhiteSpace(e))
             .ToList();
-            
+
         cbxDatabaseType.SelectedItem = cbxDatabaseType.Source.ToList().IndexOf(DatabaseType.MicrosoftSQLServer);
         btnCreateDatabase.Clicked += CreateDatabase;
 
@@ -120,7 +123,8 @@ public NoWordMeansShowAllAutocomplete(TextField tb)
             HostControl = tb;
             PopupInsideContainer = false;
         }
-        public override void GenerateSuggestions(int columnOffset=0)
+
+        public override void GenerateSuggestions(int columnOffset = 0)
         {
             // if there is something to pick
             if (AllSuggestions.Count > 0)
@@ -152,15 +156,14 @@ private void UpdateTableList()
         var open = new LoadingDialog("Fetching Tables...");
         List<string> tables = null;
 
-        Task.Run(() => {
-
+        Task.Run(() =>
+        {
             var db = new DiscoveredServer(GetBuilder()).ExpectDatabase(Database);
             tables = db.DiscoverTables(true).Union(db.DiscoverTableValuedFunctions())
                 .Select(t => t.GetRuntimeName())
                 .ToList();
         }).ContinueWith((t, o) =>
         {
-
             // no longer loading
             Application.MainLoop.Invoke(() => Application.RequestStop());
 
@@ -173,10 +176,8 @@ private void UpdateTableList()
 
             // if loaded correctly then 
             if (tables != null)
-            {
                 Application.MainLoop.Invoke(() =>
                     tbTable.Autocomplete.AllSuggestions = tables);
-            }
         }, TaskScheduler.FromCurrentSynchronizationContext());
 
         Application.Run(open, ConsoleMainWindow.ExceptionPopup);
@@ -187,15 +188,14 @@ private void RefreshDatabaseList()
         var open = new LoadingDialog("Fetching Databases...");
         List<string> databases = null;
 
-        Task.Run(() => {
-
+        Task.Run(() =>
+        {
             var server = new DiscoveredServer(GetBuilder());
             databases = server.DiscoverDatabases()
                 .Select(d => d.GetRuntimeName())
                 .ToList();
         }).ContinueWith((t, o) =>
         {
-
             // no longer loading
             Application.MainLoop.Invoke(() => Application.RequestStop());
 
@@ -208,11 +208,9 @@ private void RefreshDatabaseList()
 
             // if loaded correctly then 
             if (databases != null)
-            {
                 Application.MainLoop.Invoke(() =>
                     tbDatabase.Autocomplete.AllSuggestions = databases
                 );
-            }
         }, TaskScheduler.FromCurrentSynchronizationContext());
 
         Application.Run(open, ConsoleMainWindow.ExceptionPopup);
@@ -243,10 +241,12 @@ private void CreateDatabase()
         var open = new LoadingDialog($"Creating Database '{db}'");
         string message = null;
 
-        Task.Run(() => {
-
+        Task.Run(() =>
+        {
             if (db.Exists())
+            {
                 message = "Database already exists";
+            }
             else
             {
                 db.Create();
@@ -266,10 +266,8 @@ private void CreateDatabase()
 
             // if loaded correctly then 
             if (message != null)
-            {
                 Application.MainLoop.Invoke(() =>
-                    _activator.Show("Create Database",message));
-            }
+                    _activator.Show("Create Database", message));
         }, TaskScheduler.FromCurrentSynchronizationContext());
 
         Application.Run(open, ConsoleMainWindow.ExceptionPopup);
@@ -303,18 +301,17 @@ public DiscoveredTable GetDiscoveredTable()
             return null;
 
         if (TableType == TableType.TableValuedFunction)
-            return new DiscoveredServer(Server, Database, DatabaseType, Username, Password).ExpectDatabase(Database).ExpectTableValuedFunction(Table, Schema);
+            return new DiscoveredServer(Server, Database, DatabaseType, Username, Password).ExpectDatabase(Database)
+                .ExpectTableValuedFunction(Table, Schema);
 
-        return new DiscoveredServer(Server, Database, DatabaseType, Username, Password).ExpectDatabase(Database).ExpectTable(Table, Schema, TableType);
+        return new DiscoveredServer(Server, Database, DatabaseType, Username, Password).ExpectDatabase(Database)
+            .ExpectTable(Table, Schema, TableType);
     }
 
 
     private void BtnPickCredentials_Clicked()
     {
-        if (_activator == null)
-        {
-            return;
-        }
+        if (_activator == null) return;
 
         var creds = _activator.RepositoryLocator.CatalogueRepository.GetAllObjects<DataAccessCredentials>();
 
@@ -326,7 +323,6 @@ private void BtnPickCredentials_Clicked()
 
         var cred = (DataAccessCredentials)_activator.SelectOne("Select Credentials", creds);
         if (cred != null)
-        {
             try
             {
                 tbUsername.Text = cred.Username;
@@ -336,6 +332,5 @@ private void BtnPickCredentials_Clicked()
             {
                 _activator.ShowException("Error decrypting password", ex);
             }
-        }
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiSqlEditor.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiSqlEditor.cs
index 79baf5a6ed..d94c1d82b2 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiSqlEditor.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiSqlEditor.cs
@@ -45,6 +45,7 @@ internal class ConsoleGuiSqlEditor : Window
     /// The number of seconds to allow queries to run for, can be changed by user
     /// </summary>
     private int _timeout = DefaultTimeout;
+
     private Tab queryTab;
     private Tab resultTab;
 
@@ -53,7 +54,7 @@ internal class ConsoleGuiSqlEditor : Window
     /// </summary>
     public const int DefaultTimeout = 300;
 
-    public ConsoleGuiSqlEditor(IBasicActivateItems activator,IViewSQLAndResultsCollection collection)
+    public ConsoleGuiSqlEditor(IBasicActivateItems activator, IViewSQLAndResultsCollection collection)
     {
         Activator = activator;
         _collection = collection;
@@ -73,7 +74,7 @@ public ConsoleGuiSqlEditor(IBasicActivateItems activator,IViewSQLAndResultsColle
             AllowsTab = false
         };
 
-        TabView.AddTab(queryTab = new Tab("Query", textView),true);
+        TabView.AddTab(queryTab = new Tab("Query", textView), true);
 
         tableView = new TableView
         {
@@ -92,30 +93,34 @@ public ConsoleGuiSqlEditor(IBasicActivateItems activator,IViewSQLAndResultsColle
 
         // Buttons on top of control
 
-        _btnRunOrCancel = new Button("Run"){
-            X= 0,
-            Y= 0
+        _btnRunOrCancel = new Button("Run")
+        {
+            X = 0,
+            Y = 0
         };
 
-        _btnRunOrCancel.Clicked += ()=>RunOrCancel();
+        _btnRunOrCancel.Clicked += () => RunOrCancel();
         Add(_btnRunOrCancel);
 
-        var resetSql = new Button("Reset Sq_l"){
-            X= Pos.Right(_btnRunOrCancel)+1};
+        var resetSql = new Button("Reset Sq_l")
+        {
+            X = Pos.Right(_btnRunOrCancel) + 1
+        };
 
-        resetSql.Clicked += ()=>ResetSql();
+        resetSql.Clicked += () => ResetSql();
         Add(resetSql);
 
-        var clearSql = new Button("Clear S_ql"){
-            X= Pos.Right(resetSql)+1
+        var clearSql = new Button("Clear S_ql")
+        {
+            X = Pos.Right(resetSql) + 1
         };
 
-        clearSql.Clicked += ()=>ClearSql();
+        clearSql.Clicked += () => ClearSql();
         Add(clearSql);
 
         var lblTimeout = new Label("Timeout:")
         {
-            X = Pos.Right(clearSql)+1
+            X = Pos.Right(clearSql) + 1
         };
         Add(lblTimeout);
 
@@ -125,13 +130,14 @@ public ConsoleGuiSqlEditor(IBasicActivateItems activator,IViewSQLAndResultsColle
             Width = 5
         };
         tbTimeout.TextChanged += TbTimeout_TextChanged;
-            
+
         Add(tbTimeout);
 
-        var btnSave = new Button("Save"){
-            X= Pos.Right(tbTimeout)+1
+        var btnSave = new Button("Save")
+        {
+            X = Pos.Right(tbTimeout) + 1
         };
-        btnSave.Clicked += ()=>Save();
+        btnSave.Clicked += () => Save();
         Add(btnSave);
 
         var btnOpen = new Button("Open")
@@ -143,20 +149,20 @@ public ConsoleGuiSqlEditor(IBasicActivateItems activator,IViewSQLAndResultsColle
 
         Add(btnOpen);
 
-        var btnClose = new Button("Clos_e"){
-            X= Pos.Right(btnOpen) +1
+        var btnClose = new Button("Clos_e")
+        {
+            X = Pos.Right(btnOpen) + 1
         };
 
 
-        btnClose.Clicked += ()=>{
-            Application.RequestStop();
-        };
-                
+        btnClose.Clicked += () => { Application.RequestStop(); };
+
         Add(btnClose);
 
         var auto = new AutoCompleteProvider(collection.GetQuerySyntaxHelper());
         collection.AdjustAutocomplete(auto);
-        var bits = auto.Items.SelectMany(AutoCompleteProvider.GetBits).OrderBy(a => a).Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList();
+        var bits = auto.Items.SelectMany(AutoCompleteProvider.GetBits).OrderBy(a => a)
+            .Where(s => !string.IsNullOrWhiteSpace(s)).Distinct().ToList();
         textView.Autocomplete.AllSuggestions = bits;
         textView.Autocomplete.MaxWidth = 40;
     }
@@ -184,10 +190,7 @@ private void OpenFile()
     private void TableView_CellActivated(TableView.CellActivatedEventArgs obj)
     {
         var val = obj.Table.Rows[obj.Row][obj.Col];
-        if(val != null && val != DBNull.Value)
-        {
-            Activator.Show(val.ToString());
-        }
+        if (val != null && val != DBNull.Value) Activator.Show(val.ToString());
     }
 
     private void Save()
@@ -196,25 +199,25 @@ private void Save()
         {
             var tbl = tableView.Table;
 
-            if(tbl == null)
+            if (tbl == null)
             {
-                MessageBox.ErrorQuery("Cannot Save","No Table Loaded","Ok");
+                MessageBox.ErrorQuery("Cannot Save", "No Table Loaded", "Ok");
                 return;
             }
 
-            var sfd = new SaveDialog("Save","Pick file location to save");
+            var sfd = new SaveDialog("Save", "Pick file location to save");
             Application.Run(sfd, ConsoleMainWindow.ExceptionPopup);
 
-            if(sfd.Canceled)
+            if (sfd.Canceled)
                 return;
 
-            if(sfd.FilePath != null)
+            if (sfd.FilePath != null)
             {
-                using(var writer = new StreamWriter(File.OpenWrite(sfd.FilePath.ToString())))
-                using(var w = new CsvWriter(writer,CultureInfo.CurrentCulture))
+                using (var writer = new StreamWriter(File.OpenWrite(sfd.FilePath.ToString())))
+                using (var w = new CsvWriter(writer, CultureInfo.CurrentCulture))
                 {
                     // write headers
-                    foreach(DataColumn c in tbl.Columns)
+                    foreach (DataColumn c in tbl.Columns)
                         w.WriteField(c.ColumnName);
 
                     w.NextRecord();
@@ -222,28 +225,24 @@ private void Save()
                     // write rows
                     foreach (DataRow r in tbl.Rows)
                     {
-                        foreach (var item in r.ItemArray)
-                        {
-                            w.WriteField(item);
-                        }
+                        foreach (var item in r.ItemArray) w.WriteField(item);
 
                         w.NextRecord();
                     }
                 }
 
-                MessageBox.Query("File Saved","Save completed","Ok");
+                MessageBox.Query("File Saved", "Save completed", "Ok");
             }
         }
         catch (Exception ex)
         {
-            MessageBox.ErrorQuery("Save Failed",ex.Message,"Ok");
+            MessageBox.ErrorQuery("Save Failed", ex.Message, "Ok");
         }
-            
     }
 
     private void TbTimeout_TextChanged(NStack.ustring value)
     {
-        if(int.TryParse(value.ToString(),out var newTimeout))
+        if (int.TryParse(value.ToString(), out var newTimeout))
             _timeout = newTimeout < 0 ? DefaultTimeout : newTimeout;
         else
             _timeout = DefaultTimeout;
@@ -268,15 +267,15 @@ private void ResetSql()
     private void RunOrCancel()
     {
         // if task is still running we should cancel
-        if(_runSqlTask  != null && !_runSqlTask.IsCompleted)
+        if (_runSqlTask != null && !_runSqlTask.IsCompleted)
         {
             // Cancel the sql command and let that naturally end the task
             _runSqlCmd?.Cancel();
         }
         else
         {
-            Exception ex=null;
-            _runSqlTask = Task.Run(()=>
+            Exception ex = null;
+            _runSqlTask = Task.Run(() =>
             {
                 try
                 {
@@ -286,12 +285,10 @@ private void RunOrCancel()
                 {
                     ex = e;
                 }
-            }).ContinueWith((s,e)=> {
-                if(ex != null)
-                {
-                    Activator.ShowException("Failed to run query", ex);
-                }
-            },TaskScheduler.FromCurrentSynchronizationContext());
+            }).ContinueWith((s, e) =>
+            {
+                if (ex != null) Activator.ShowException("Failed to run query", ex);
+            }, TaskScheduler.FromCurrentSynchronizationContext());
 
             _btnRunOrCancel.Text = "Cancel";
             _btnRunOrCancel.SetNeedsDisplay();
@@ -303,33 +300,35 @@ private void SetReadyToRun()
         _btnRunOrCancel.Text = "Run";
         _btnRunOrCancel.SetNeedsDisplay();
     }
+
     private void RunSql()
     {
         try
         {
             var sql = textView.Text.ToString();
 
-            if(string.IsNullOrWhiteSpace(sql))
+            if (string.IsNullOrWhiteSpace(sql))
             {
                 tableView.Table = null;
                 return;
             }
 
-            var db = DataAccessPortal.ExpectDatabase(_collection.GetDataAccessPoint(),DataAccessContext.InternalDataProcessing);
+            var db = DataAccessPortal.ExpectDatabase(_collection.GetDataAccessPoint(),
+                DataAccessContext.InternalDataProcessing);
 
-            using(var con = db.Server.GetConnection())
+            using (var con = db.Server.GetConnection())
             {
                 con.Open();
-                _runSqlCmd = db.Server.GetCommand(sql,con);
+                _runSqlCmd = db.Server.GetCommand(sql, con);
                 _runSqlCmd.CommandTimeout = _timeout;
 
-                using(var da = db.Server.GetDataAdapter(_runSqlCmd))
+                using (var da = db.Server.GetDataAdapter(_runSqlCmd))
                 {
                     var dt = new DataTable();
                     da.Fill(dt);
 
-                    Application.MainLoop.Invoke(() => {
-
+                    Application.MainLoop.Invoke(() =>
+                    {
                         tableView.Table = dt;
 
                         // if query resulted in some data show it
@@ -353,20 +352,15 @@ private void RunSql()
 
     protected virtual void OnQueryCompleted(DataTable dt)
     {
-            
     }
 
     private class SqlAutocomplete : TextViewAutocomplete
     {
-        public override bool IsWordChar(Rune rune)
-        {
-            return (char)rune == '_' || base.IsWordChar(rune);
-        }
+        public override bool IsWordChar(Rune rune) => (char)rune == '_' || base.IsWordChar(rune);
     }
 
     private class SqlTextView : TextView
     {
-
         private readonly HashSet<string> _keywords = new(
             new[]
             {
@@ -378,6 +372,7 @@ private class SqlTextView : TextView
                 "truncate", "as", "order", "by", "asc", "desc", "between", "where", "and", "or", "not", "limit",
                 "null", "is", "drop", "database", "table", "having", "in", "join", "on", "union", "exists"
             }, StringComparer.CurrentCultureIgnoreCase);
+
         private readonly Attribute _blue;
         private readonly Attribute _white;
 
@@ -395,7 +390,6 @@ public SqlTextView()
 
             _blue = Driver.MakeAttribute(Color.Cyan, Color.Black);
             _white = Driver.MakeAttribute(Color.White, Color.Black);
-                
         }
 
         // The next two are renamed in 1.8.2 of Terminal.Gui.  But we could upgrade because of this issue:
@@ -417,10 +411,7 @@ private bool IsKeyword(IEnumerable<Rune> line, int idx)
         {
             var word = IdxToWord(line, idx);
 
-            if (string.IsNullOrWhiteSpace(word))
-            {
-                return false;
-            }
+            if (string.IsNullOrWhiteSpace(word)) return false;
 
             return _keywords.Contains(word);
         }
@@ -438,10 +429,7 @@ private static string IdxToWord(IEnumerable<Rune> line, int idx)
             {
                 current = word;
                 count += word.Length;
-                if (count > idx)
-                {
-                    break;
-                }
+                if (count > idx) break;
             }
 
             return current?.Trim();
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiTextDialog.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiTextDialog.cs
index eca5e0bc25..207efb0fcb 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiTextDialog.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiTextDialog.cs
@@ -28,7 +28,8 @@ public bool ShowDialog()
     {
         var okClicked = false;
 
-        var win = new Window(_args.WindowTitle) {
+        var win = new Window(_args.WindowTitle)
+        {
             X = 0,
             Y = 0,
 
@@ -68,7 +69,7 @@ public bool ShowDialog()
 
         win.Add(textField);
 
-        var btnOk = new Button("Ok",true)
+        var btnOk = new Button("Ok", true)
         {
             X = 0,
             Y = Pos.Bottom(textField),
@@ -83,7 +84,7 @@ public bool ShowDialog()
             Application.RequestStop();
         };
 
-        var btnCancel = new Button("Cancel",true)
+        var btnCancel = new Button("Cancel", true)
         {
             X = Pos.Right(btnOk),
             Y = Pos.Bottom(textField),
@@ -105,10 +106,7 @@ public bool ShowDialog()
             Height = 1,
             IsDefault = false
         };
-        btnClear.Clicked += () =>
-        {
-            textField.Text = "";
-        };
+        btnClear.Clicked += () => { textField.Text = ""; };
 
         win.Add(btnOk);
         win.Add(btnCancel);
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiUserSettings.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiUserSettings.cs
index f654640c51..d5c67399ce 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiUserSettings.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiUserSettings.cs
@@ -16,13 +16,14 @@
 
 namespace Rdmp.Core.CommandLine.Gui;
 
-public partial class ConsoleGuiUserSettings {
+public partial class ConsoleGuiUserSettings
+{
     private Dictionary<CheckBox, PropertyInfo> checkboxDictionary = new();
 
     public IBasicActivateItems _activator { get; }
 
-    public ConsoleGuiUserSettings(IBasicActivateItems activator) {
-
+    public ConsoleGuiUserSettings(IBasicActivateItems activator)
+    {
         Modal = true;
 
         InitializeComponent();
@@ -31,15 +32,19 @@ public ConsoleGuiUserSettings(IBasicActivateItems activator) {
 
         tableview1.Update();
 
-        RegisterCheckbox(cbHideCohortBuilderContainersInFind, nameof(UserSettings.ScoreZeroForCohortAggregateContainers));
+        RegisterCheckbox(cbHideCohortBuilderContainersInFind,
+            nameof(UserSettings.ScoreZeroForCohortAggregateContainers));
         RegisterCheckbox(cbEnableCommits, nameof(UserSettings.EnableCommits));
-        RegisterCheckbox(cbStrictValidationForContainers, nameof(UserSettings.StrictValidationForCohortBuilderContainers));
+        RegisterCheckbox(cbStrictValidationForContainers,
+            nameof(UserSettings.StrictValidationForCohortBuilderContainers));
         RegisterCheckbox(cbHideEmptyTableLoadRunAudits, nameof(UserSettings.HideEmptyTableLoadRunAudits));
         RegisterCheckbox(cbShowPipelineCompletedPopup, nameof(UserSettings.ShowPipelineCompletedPopup));
-        RegisterCheckbox(cbSkipCohortBuilderValidationOnCommit, nameof(UserSettings.SkipCohortBuilderValidationOnCommit));
+        RegisterCheckbox(cbSkipCohortBuilderValidationOnCommit,
+            nameof(UserSettings.SkipCohortBuilderValidationOnCommit));
         RegisterCheckbox(cbAlwaysJoinEverything, nameof(UserSettings.AlwaysJoinEverything));
         RegisterCheckbox(cbSelectiveRefresh, nameof(UserSettings.SelectiveRefresh));
-        RegisterCheckbox(cbUseAliasInsteadOfTransformInGroupByAggregateGraphs, nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs));
+        RegisterCheckbox(cbUseAliasInsteadOfTransformInGroupByAggregateGraphs,
+            nameof(UserSettings.UseAliasInsteadOfTransformInGroupByAggregateGraphs));
 
         tbCreateDatabaseTimeout.Text = UserSettings.CreateDatabaseTimeout.ToString();
         tbCreateDatabaseTimeout.TextChanged += tbCreateDatabaseTimeout_TextChanged;
@@ -48,10 +53,8 @@ public ConsoleGuiUserSettings(IBasicActivateItems activator) {
         tbArchiveTriggerTimeout.TextChanged += tbArchiveTriggerTimeout_TextChanged;
 
         var dt = tableview1.Table;
-        foreach(var ec in ErrorCodes.KnownCodes)
-        {
+        foreach (var ec in ErrorCodes.KnownCodes)
             dt.Rows.Add(ec.Code, UserSettings.GetErrorReportingLevelFor(ec).ToString(), ec.Message);
-        }
 
         tableview1.CellActivated += Tableview1_CellActivated;
         tableview1.FullRowSelect = true;
@@ -69,14 +72,15 @@ private void Tableview1_CellActivated(TableView.CellActivatedEventArgs e)
         if (code == null)
             return;
 
-        if(_activator.SelectEnum(new DialogArgs {
-               WindowTitle = "New Treatment"
-           }, typeof(CheckResult), out var newValue))
+        if (_activator.SelectEnum(new DialogArgs
+            {
+                WindowTitle = "New Treatment"
+            }, typeof(CheckResult), out var newValue))
         {
             UserSettings.SetErrorReportingLevelFor(code, (CheckResult)newValue);
             row[1] = newValue.ToString();
-                
-            Application.MainLoop.Invoke(()=>tableview1.Update());
+
+            Application.MainLoop.Invoke(() => tableview1.Update());
         }
     }
 
@@ -90,7 +94,7 @@ private void RegisterCheckbox(CheckBox cb, string propertyName)
         cb.Checked = (bool)prop.GetValue(null);
 
         // register callback
-        cb.Toggled += c=>CheckboxCheckedChanged(cb,c);
+        cb.Toggled += c => CheckboxCheckedChanged(cb, c);
 
         // add help
         AddTooltip(cb, propertyName);
@@ -101,14 +105,13 @@ private void CheckboxCheckedChanged(CheckBox cb, bool oldValue)
     {
         checkboxDictionary[cb].SetValue(null, cb.Checked);
     }
+
     private void AddTooltip(View cb, string propertyName)
     {
-        var helpText = _activator.CommentStore.GetDocumentationIfExists($"{ nameof(UserSettings)}.{propertyName}", false);
+        var helpText =
+            _activator.CommentStore.GetDocumentationIfExists($"{nameof(UserSettings)}.{propertyName}", false);
 
-        if (string.IsNullOrWhiteSpace(helpText))
-        {
-            return;
-        }
+        if (string.IsNullOrWhiteSpace(helpText)) return;
 
         var btn = new Button
         {
@@ -118,23 +121,19 @@ private void AddTooltip(View cb, string propertyName)
             Y = Pos.Top(cb)
         };
 
-        btn.Clicked += ()=>_activator.Show(propertyName,helpText);
+        btn.Clicked += () => _activator.Show(propertyName, helpText);
         tabView1.Tabs.First().View.Add(btn);
     }
 
     private void tbCreateDatabaseTimeout_TextChanged(ustring s)
     {
         if (int.TryParse(tbCreateDatabaseTimeout.Text.ToString(), out var result))
-        {
             UserSettings.CreateDatabaseTimeout = result;
-        }
     }
+
     private void tbArchiveTriggerTimeout_TextChanged(ustring s)
     {
-
         if (int.TryParse(tbArchiveTriggerTimeout.Text.ToString(), out var result))
-        {
             UserSettings.ArchiveTriggerTimeout = result;
-        }
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewGraph.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewGraph.cs
index 1584c1be49..02938a3c5d 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewGraph.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewGraph.cs
@@ -28,7 +28,7 @@ internal class ConsoleGuiViewGraph : ConsoleGuiSqlEditor
     private Tab graphTab;
 
     public ConsoleGuiViewGraph(IBasicActivateItems activator, AggregateConfiguration aggregate) :
-        base (activator, new ViewAggregateExtractUICollection(aggregate) { TopX = null })
+        base(activator, new ViewAggregateExtractUICollection(aggregate) { TopX = null })
     {
         graphView = new GraphView
         {
@@ -37,7 +37,7 @@ public ConsoleGuiViewGraph(IBasicActivateItems activator, AggregateConfiguration
         };
 
         ColorScheme = ConsoleMainWindow.ColorScheme;
-        TabView.AddTab(graphTab = new Tab("Graph",graphView), false);
+        TabView.AddTab(graphTab = new Tab("Graph", graphView), false);
         this.aggregate = aggregate;
     }
 
@@ -49,7 +49,7 @@ protected override void OnQueryCompleted(DataTable dt)
         TabView.SelectedTab = graphTab;
 
         string valueColumnName;
-                        
+
         try
         {
             valueColumnName = aggregate.GetQuerySyntaxHelper().GetRuntimeName(aggregate.CountSQL);
@@ -76,14 +76,8 @@ private void PopulateGraphResults(DataTable dt, string countColumnName, Aggregat
         var boundsWidth = graphView.Bounds.Width;
         var boundsHeight = graphView.Bounds.Height;
 
-        if (boundsWidth == 0)
-        {
-            boundsWidth = TabView.Bounds.Width - 4;
-        }
-        if (boundsHeight == 0)
-        {
-            boundsHeight = TabView.Bounds.Height - 4;
-        }
+        if (boundsWidth == 0) boundsWidth = TabView.Bounds.Width - 4;
+        if (boundsHeight == 0) boundsHeight = TabView.Bounds.Height - 4;
 
         var titleWidth = aggregate.Name.Sum(c => Rune.ColumnWidth(c));
         var titleStartX = boundsWidth / 2 - titleWidth / 2;
@@ -100,29 +94,25 @@ private void PopulateGraphResults(DataTable dt, string countColumnName, Aggregat
         // if no time axis then we have a regular bar chart
         if (axis == null)
         {
-            if(dt.Columns.Count == 2)
-            {
+            if (dt.Columns.Count == 2)
                 SetupBarSeries(dt, countColumnName, boundsWidth, boundsHeight);
-            }
             else
-            {
                 SetupMultiBarSeries(dt, countColumnName, boundsWidth, boundsHeight);
-            }
         }
         else
         {
-            SetupLineGraph(dt, axis,countColumnName, boundsWidth, boundsHeight);
+            SetupLineGraph(dt, axis, countColumnName, boundsWidth, boundsHeight);
         }
-
     }
 
-    private void SetupLineGraph(DataTable dt, AggregateContinuousDateAxis axis, string countColumnName, int boundsWidth, int boundsHeight)
+    private void SetupLineGraph(DataTable dt, AggregateContinuousDateAxis axis, string countColumnName, int boundsWidth,
+        int boundsHeight)
     {
         graphView.AxisY.Text = countColumnName;
         graphView.GraphColor = Driver.MakeAttribute(Color.White, Color.Black);
 
-        var xIncrement = 1f/(boundsWidth / (float)dt.Rows.Count);
-            
+        var xIncrement = 1f / (boundsWidth / (float)dt.Rows.Count);
+
         graphView.MarginBottom = 2;
         graphView.AxisX.Increment = xIncrement * 10;
         graphView.AxisX.ShowLabelsEvery = 1;
@@ -138,10 +128,9 @@ private void SetupLineGraph(DataTable dt, AggregateContinuousDateAxis axis, stri
 
         var colors = GetColors(dt.Columns.Count - 1);
 
-        for (var i =1;i<dt.Columns.Count;i++)
+        for (var i = 1; i < dt.Columns.Count; i++)
         {
-
-            var series = new PathAnnotation { LineColor = colors[i - 1],BeforeSeries = true };
+            var series = new PathAnnotation { LineColor = colors[i - 1], BeforeSeries = true };
             var row = 0;
 
             foreach (DataRow dr in dt.Rows)
@@ -158,19 +147,18 @@ private void SetupLineGraph(DataTable dt, AggregateContinuousDateAxis axis, stri
             graphView.Annotations.Add(series);
         }
 
-        var yIncrement = 1/((boundsHeight- graphView.MarginBottom)/(maxY - minY));
+        var yIncrement = 1 / ((boundsHeight - graphView.MarginBottom) / (maxY - minY));
 
         graphView.CellSize = new PointF(xIncrement, yIncrement);
 
-        graphView.AxisY.LabelGetter = v => FormatValue(v.Value,minY,maxY);
-        graphView.MarginLeft = (uint)Math.Max(FormatValue(maxY, minY, maxY).Length, FormatValue(minY, minY, maxY).Length) + 1;
+        graphView.AxisY.LabelGetter = v => FormatValue(v.Value, minY, maxY);
+        graphView.MarginLeft =
+            (uint)Math.Max(FormatValue(maxY, minY, maxY).Length, FormatValue(minY, minY, maxY).Length) + 1;
 
-        var legend = GetLegend(dt,boundsWidth,boundsHeight);
+        var legend = GetLegend(dt, boundsWidth, boundsHeight);
 
         for (var i = 1; i < dt.Columns.Count; i++)
-        {
             legend.AddEntry(new GraphCellToRender('.', colors[i - 1]), dt.Columns[i].ColumnName);
-        }
     }
 
     /// <summary>
@@ -194,7 +182,7 @@ private LegendAnnotation GetLegend(DataTable dt, int boundsWidth, int boundsHeig
         return legend;
     }
 
-    private void SetupBarSeries(DataTable dt,string countColumnName, int boundsWidth, int boundsHeight)
+    private void SetupBarSeries(DataTable dt, string countColumnName, int boundsWidth, int boundsHeight)
     {
         var barSeries = new BarSeries();
 
@@ -211,10 +199,7 @@ private void SetupBarSeries(DataTable dt,string countColumnName, int boundsWidth
         {
             var label = dr[0].ToString();
 
-            if (string.IsNullOrWhiteSpace(label))
-            {
-                label = "<Null>";
-            }
+            if (string.IsNullOrWhiteSpace(label)) label = "<Null>";
 
             // treat nulls as 0
             var val = dr[1] == DBNull.Value ? 0 : (float)Convert.ToDouble(dr[1]);
@@ -280,10 +265,7 @@ private static List<Attribute> GetColors(int numberNeeded)
 
         var toReturn = new List<Attribute>();
 
-        for (var i = 0; i < numberNeeded; i++)
-        {
-            toReturn.Add(colors[i % colors.Length]);
-        }
+        for (var i = 0; i < numberNeeded; i++) toReturn.Add(colors[i % colors.Length]);
 
         return toReturn;
     }
@@ -296,12 +278,10 @@ private void SetupMultiBarSeries(DataTable dt, string countColumnName, int bound
         graphView.GraphColor = Driver.MakeAttribute(Color.White, Color.Black);
 
         // Configure legend
-        var legend = GetLegend(dt,boundsWidth,boundsHeight);
+        var legend = GetLegend(dt, boundsWidth, boundsHeight);
 
-        for(var i =1;i < dt.Columns.Count; i++)
-        {
-            legend.AddEntry(new GraphCellToRender(mediumStiple, colors[i-1]), dt.Columns[i].ColumnName);
-        }
+        for (var i = 1; i < dt.Columns.Count; i++)
+            legend.AddEntry(new GraphCellToRender(mediumStiple, colors[i - 1]), dt.Columns[i].ColumnName);
 
         // Configure multi bar series
         var barSeries = new MultiBarSeries(numberOfBars, numberOfBars + 1, 1, colors);
@@ -313,16 +293,13 @@ private void SetupMultiBarSeries(DataTable dt, string countColumnName, int bound
         {
             var label = dr[0].ToString();
 
-            if (string.IsNullOrWhiteSpace(label))
-            {
-                label = "<Null>";
-            }
+            if (string.IsNullOrWhiteSpace(label)) label = "<Null>";
             var vals = dr.ItemArray.Skip(1)
-                .Select(v=>v == DBNull.Value ? 0 : (float)Convert.ToDouble(v)).ToArray();
+                .Select(v => v == DBNull.Value ? 0 : (float)Convert.ToDouble(v)).ToArray();
 
             barSeries.AddBars(label, mediumStiple, vals);
 
-            foreach(var val in vals)
+            foreach (var val in vals)
             {
                 min = Math.Min(min, val);
                 max = Math.Max(max, val);
@@ -332,35 +309,33 @@ private void SetupMultiBarSeries(DataTable dt, string countColumnName, int bound
         // Configure Axis, Margins etc
 
         // make sure whole graph fits on axis
-        var yIncrement = (max - min) / (boundsHeight - 2/*MarginBottom*/);
+        var yIncrement = (max - min) / (boundsHeight - 2 /*MarginBottom*/);
 
         // 1 bar per row of console
         graphView.CellSize = new PointF(1, yIncrement);
 
         graphView.Series.Add(barSeries);
         graphView.MarginBottom = 2;
-        graphView.MarginLeft = (uint)Math.Max(FormatValue(max,min,max).Length, FormatValue(min, min, max).Length)+1;
-            
+        graphView.MarginLeft = (uint)Math.Max(FormatValue(max, min, max).Length, FormatValue(min, min, max).Length) + 1;
+
         // work out how to space x axis without scrolling
-        graphView.AxisY.Increment = yIncrement*5;
+        graphView.AxisY.Increment = yIncrement * 5;
         graphView.AxisY.ShowLabelsEvery = 1;
         graphView.AxisY.LabelGetter = v => FormatValue(v.Value, min, max);
         graphView.AxisY.Text = countColumnName;
 
-        graphView.AxisX.Increment = numberOfBars+1;
+        graphView.AxisX.Increment = numberOfBars + 1;
         graphView.AxisX.ShowLabelsEvery = 1;
         graphView.AxisX.Increment = 0;
         graphView.AxisX.Text = dt.Columns[0].ColumnName;
     }
+
     private static string FormatValue(float val, float min, float max)
     {
         if (val < min)
             return "";
 
-        if (val > 1)
-        {
-            return val.ToString("N0");
-        }
+        if (val > 1) return val.ToString("N0");
 
         if (val >= 0.01f)
             return val.ToString("N2");
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewLogs.cs b/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewLogs.cs
index 439d81d623..833e3345c6 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewLogs.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleGuiViewLogs.cs
@@ -148,29 +148,26 @@ private void Tbcontains_TextChanged(NStack.ustring obj)
 
     private void FetchLogs()
     {
-        if (!int.TryParse(_tbToFetch.Text.ToString(), out var fetch))
-        {
-            fetch = 1000;
-        }
+        if (!int.TryParse(_tbToFetch.Text.ToString(), out var fetch)) fetch = 1000;
 
         // no negative sized batches!
         fetch = Math.Max(0, fetch);
 
         try
         {
-
             var db = _rootObject.GetDistinctLoggingDatabase();
             var task = _rootObject.GetDistinctLoggingTask();
 
             var lm = new LogManager(db);
-            _archivalDataLoadInfos = _rootObject.FilterRuns(lm.GetArchivalDataLoadInfos(task, null, null, fetch)).ToArray();
+            _archivalDataLoadInfos =
+                _rootObject.FilterRuns(lm.GetArchivalDataLoadInfos(task, null, null, fetch)).ToArray();
 
             _treeView.ClearObjects();
             _treeView.AddObjects(_archivalDataLoadInfos);
         }
         catch (Exception ex)
         {
-            _activator.ShowException("Failed to fetch logs",ex);
+            _activator.ShowException("Failed to fetch logs", ex);
         }
     }
 
@@ -199,10 +196,9 @@ private void BtnAll_Clicked()
 
     public bool SupportsCanExpand => true;
 
-    public bool CanExpand(object model)
-    {
-        return model is ArchivalDataLoadInfo || (model is Category c && c.GetChildren().Any()) || model is ArchivalTableLoadInfo;
-    }
+    public bool CanExpand(object model) => model is ArchivalDataLoadInfo ||
+                                           (model is Category c && c.GetChildren().Any()) ||
+                                           model is ArchivalTableLoadInfo;
 
     public IEnumerable<object> GetChildren(object model)
     {
@@ -214,10 +210,8 @@ public IEnumerable<object> GetChildren(object model)
         }
 
         if (model is Category c)
-        {
             foreach (var child in c.GetChildren())
                 yield return child;
-        }
 
         if (model is ArchivalTableLoadInfo ti)
             foreach (var source in ti.DataSources)
@@ -239,6 +233,7 @@ public Category(ArchivalDataLoadInfo dli, LoggingTables type)
             _dli = dli;
             _type = type;
         }
+
         public override string ToString()
         {
             return _type switch
diff --git a/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs b/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs
index 24182273ba..9429ae73ec 100644
--- a/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/ConsoleMainWindow.cs
@@ -43,7 +43,7 @@ internal class ConsoleMainWindow
     private MouseFlags _rightClick = MouseFlags.Button3Clicked;
 
     // Last time the mouse moved and where it moved to
-    private Point _lastMousePos = new(0,0);
+    private Point _lastMousePos = new(0, 0);
     private DateTime _lastMouseMove = DateTime.Now;
 
     public const string Catalogues = "Catalogues";
@@ -53,7 +53,7 @@ internal class ConsoleMainWindow
     public const string BuiltCohorts = "Built Cohorts";
     public const string Other = "Other";
 
-    public View CurrentWindow {get;set;}
+    public View CurrentWindow { get; set; }
 
     /// <summary>
     /// Global scheme to apply to all windows
@@ -65,7 +65,7 @@ public ConsoleMainWindow(ConsoleGuiActivator activator)
         _activator = activator;
         StaticActivator = activator;
         activator.Published += Activator_Published;
-        activator.Emphasise += (s,e)=>Show(e.Request.ObjectToEmphasise);
+        activator.Emphasise += (s, e) => Show(e.Request.ObjectToEmphasise);
     }
 
     private void Activator_Published(IMapsDirectlyToDatabaseTable obj)
@@ -75,36 +75,49 @@ private void Activator_Published(IMapsDirectlyToDatabaseTable obj)
 
     private static void Quit()
     {
-        Application.RequestStop ();
+        Application.RequestStop();
     }
 
     internal void SetUp(Toplevel top)
     {
-        var menu = new MenuBar (new MenuBarItem [] {
-            new MenuBarItem ("_File (F9)", new MenuItem [] {
-                new MenuItem ("_New...", "", () => New()),
-                new MenuItem ("_Find...", "", () => Find()),
-                new MenuItem ("_User Settings...", "", () => ShowUserSettings()),
-                new MenuItem ("_Run...", "", () => Run()),
-                new MenuItem ("_Refresh...", "", () => Publish()),
-                new MenuItem ("_Quit", "", () => Quit())
+        var menu = new MenuBar(new MenuBarItem[]
+        {
+            new("_File (F9)", new MenuItem[]
+            {
+                new("_New...", "", () => New()),
+                new("_Find...", "", () => Find()),
+                new("_User Settings...", "", () => ShowUserSettings()),
+                new("_Run...", "", () => Run()),
+                new("_Refresh...", "", () => Publish()),
+                new("_Quit", "", () => Quit())
             }),
-            new MenuBarItem ("_Diagnostics", new MenuItem [] {
-                mi_default = new MenuItem {Title = "Query Catalogue", Action = ()=>Query(nameof(CataloguePatcher))},
-                mi_default = new MenuItem {Title = "Query Data Export", Action = ()=>Query(nameof(DataExportPatcher))}
+            new("_Diagnostics", new MenuItem[]
+            {
+                mi_default = new MenuItem { Title = "Query Catalogue", Action = () => Query(nameof(CataloguePatcher)) },
+                mi_default = new MenuItem
+                    { Title = "Query Data Export", Action = () => Query(nameof(DataExportPatcher)) }
             }),
-            new MenuBarItem ("_Color Scheme", new MenuItem [] {
-                mi_default = new MenuItem {Title = "Default", Checked = true, CheckType = MenuItemCheckStyle.Radio, Action = ()=>SetColorScheme(mi_default)},
-                mi_green = new MenuItem {Title = "Green", Checked = false, CheckType = MenuItemCheckStyle.Radio, Action = ()=>SetColorScheme(mi_green)}
+            new("_Color Scheme", new MenuItem[]
+            {
+                mi_default = new MenuItem
+                {
+                    Title = "Default", Checked = true, CheckType = MenuItemCheckStyle.Radio,
+                    Action = () => SetColorScheme(mi_default)
+                },
+                mi_green = new MenuItem
+                {
+                    Title = "Green", Checked = false, CheckType = MenuItemCheckStyle.Radio,
+                    Action = () => SetColorScheme(mi_green)
+                }
             })
         });
-        top.Add (menu);
-                
+        top.Add(menu);
+
         _win = new Window
         {
             X = 0,
             Y = 1, // menu
-            Width =  Dim.Fill(1),
+            Width = Dim.Fill(1),
             Height = Dim.Fill(1) // status bar
         };
 
@@ -129,16 +142,18 @@ internal void SetUp(Toplevel top)
             TreeBuilder = new DelegateTreeBuilder<object>(ChildGetter)
         };
         _treeView.AddObjects(
-            new string[]{
+            new string[]
+            {
                 Catalogues,
                 Projects,
                 Loads,
                 CohortConfigs,
                 BuiltCohorts,
-                Other});
+                Other
+            });
 
         _win.Add(_treeView);
-        top.Add(_win); 
+        top.Add(_win);
 
         Application.RootMouseEvent = OnRootMouseEvent;
 
@@ -148,22 +163,20 @@ internal void SetUp(Toplevel top)
         _treeView.SelectionChanged += _treeView_SelectionChanged;
         _treeView.AspectGetter = AspectGetter;
 
-        var statusBar = new StatusBar (new StatusItem [] {
-            new StatusItem(Key.Q | Key.CtrlMask, "~^Q~ Quit", () => Quit()),
-            new StatusItem(Key.R | Key.CtrlMask, "~^R~ Run", () => Run()),
-            new StatusItem(Key.F | Key.CtrlMask, "~^F~ Find", () => Find()),
-            new StatusItem(Key.N | Key.CtrlMask, "~^N~ New", () => New()),
-            new StatusItem(Key.F5, "~F5~ Refresh", () => Publish())
+        var statusBar = new StatusBar(new StatusItem[]
+        {
+            new(Key.Q | Key.CtrlMask, "~^Q~ Quit", () => Quit()),
+            new(Key.R | Key.CtrlMask, "~^R~ Run", () => Run()),
+            new(Key.F | Key.CtrlMask, "~^F~ Find", () => Find()),
+            new(Key.N | Key.CtrlMask, "~^N~ New", () => New()),
+            new(Key.F5, "~F5~ Refresh", () => Publish())
         });
 
-        top.Add (statusBar);
+        top.Add(statusBar);
 
         var scheme = UserSettings.ConsoleColorScheme;
 
-        if (scheme == "green")
-        {
-            SetColorScheme(mi_green);
-        }
+        if (scheme == "green") SetColorScheme(mi_green);
     }
 
     private void ShowUserSettings()
@@ -201,13 +214,13 @@ private void Query(string toQuery)
         }
         catch (Exception ex)
         {
-            _activator.ShowException("Failed to build query",ex);
+            _activator.ShowException("Failed to build query", ex);
         }
-            
     }
+
     private void SetColorScheme(MenuItem sender)
     {
-        if(sender == mi_default)
+        if (sender == mi_default)
         {
             _win.ColorScheme = ColorScheme = _defaultColorScheme;
             UserSettings.ConsoleColorScheme = "default";
@@ -219,10 +232,7 @@ private void SetColorScheme(MenuItem sender)
             UserSettings.ConsoleColorScheme = "green";
         }
 
-        foreach(var mi in new[] {mi_default , mi_green })
-        {
-            mi.Checked = mi == sender;
-        }
+        foreach (var mi in new[] { mi_default, mi_green }) mi.Checked = mi == sender;
 
         _win.SetNeedsDisplay();
     }
@@ -241,40 +251,19 @@ private void _treeView_ObjectActivated(ObjectActivatedEventArgs<object> obj)
 
     private string AspectGetter(object model)
     {
-        if (model is IContainer container)
-        {
-            return $"{container} ({container.Operation})";
-        }
+        if (model is IContainer container) return $"{container} ({container.Operation})";
 
-        if (model is CohortAggregateContainer setContainer)
-        {
-            return $"{setContainer} ({setContainer.Operation})";
-        }
+        if (model is CohortAggregateContainer setContainer) return $"{setContainer} ({setContainer.Operation})";
 
-        if (model is ExtractionInformation ei)
-        {
-            return $"{ei} ({ei.ExtractionCategory})";
-        }
+        if (model is ExtractionInformation ei) return $"{ei} ({ei.ExtractionCategory})";
 
-        if ( model is CatalogueItemsNode cin)
-        {
-            return $"{cin} ({cin.CatalogueItems.Length})";
-        }
+        if (model is CatalogueItemsNode cin) return $"{cin} ({cin.CatalogueItems.Length})";
 
-        if (model is TableInfoServerNode server)
-        {
-            return $"{server.ServerName} ({server.DatabaseType})";
-        }
+        if (model is TableInfoServerNode server) return $"{server.ServerName} ({server.DatabaseType})";
 
-        if (model is IDisableable d)
-        {
-            return d.IsDisabled ? $"{d} (Disabled)" : d.ToString();
-        }
+        if (model is IDisableable d) return d.IsDisabled ? $"{d} (Disabled)" : d.ToString();
 
-        if (model is IArgument arg)
-        {
-            return $"{arg} ({(string.IsNullOrWhiteSpace(arg.Value) ? "Null" : arg.Value)})";
-        }
+        if (model is IArgument arg) return $"{arg} ({(string.IsNullOrWhiteSpace(arg.Value) ? "Null" : arg.Value)})";
         return model?.ToString() ?? "Null Object";
     }
 
@@ -282,8 +271,10 @@ private void Publish()
     {
         var obj = GetObjectIfAnyBehind(_treeView.SelectedObject);
 
-        if(obj != null)
+        if (obj != null)
+        {
             _activator.Publish(obj);
+        }
         else
         {
             // Selected node is not refreshable
@@ -291,29 +282,25 @@ private void Publish()
             //refresh any object (to update core child provider)
             var anyObject = _activator.CoreChildProvider.GetAllSearchables().Keys.FirstOrDefault();
 
-            if(anyObject != null)
+            if (anyObject != null)
                 _activator.Publish(anyObject);
 
             //and refresh the selected tree node
-            _treeView.RefreshObject(_treeView.SelectedObject,true);
+            _treeView.RefreshObject(_treeView.SelectedObject, true);
         }
-                
     }
 
     private void Find()
     {
         try
         {
-            var dlg = new ConsoleGuiSelectOne(_activator,null);
+            var dlg = new ConsoleGuiSelectOne(_activator, null);
 
-            if (dlg.ShowDialog())
-            {
-                Show(dlg.Selected);
-            }
+            if (dlg.ShowDialog()) Show(dlg.Selected);
         }
         catch (Exception e)
         {
-            _activator.ShowException("Unexpected error in open/edit tree",e);
+            _activator.ShowException("Unexpected error in open/edit tree", e);
         }
     }
 
@@ -323,40 +310,34 @@ private void Show(object selected)
 
         // In main RDMP, Projects are root level items so have no descendancy.  But in the console
         // gui we have a root category so give it a descendancy now so that expansion works properly
-        if(selected is IProject)
-        {
-            desc = new DescendancyList(Projects);
-        }
+        if (selected is IProject) desc = new DescendancyList(Projects);
 
-        if(desc == null)
+        if (desc == null)
             return;
 
         // In the main RDMP, we have a specific node for these but in console gui we have a text
         // category, fix the descendency for these objects
-        if(desc.Parents.Length  > 0 && desc.Parents[0] is AllCohortsNode)
-        {
-            desc.Parents[0] = BuiltCohorts;
-        }
+        if (desc.Parents.Length > 0 && desc.Parents[0] is AllCohortsNode) desc.Parents[0] = BuiltCohorts;
 
-        if(desc.Parents.Any())
+        if (desc.Parents.Any())
         {
             var topLevelCategory = GetRootCategoryOf(desc.Parents[0]);
 
-            if(topLevelCategory != null)
+            if (topLevelCategory != null)
                 _treeView.Expand(topLevelCategory);
         }
 
-        foreach(var p in desc.Parents)
+        foreach (var p in desc.Parents)
             _treeView.Expand(p);
 
         _treeView.SelectedObject = selected;
-        _treeView.ScrollOffsetVertical = _treeView.GetScrollOffsetOf(selected)-1;
+        _treeView.ScrollOffsetVertical = _treeView.GetScrollOffsetOf(selected) - 1;
         _treeView.SetNeedsDisplay();
     }
 
     private void _treeView_SelectionChanged(object sender, SelectionChangedEventArgs<object> e)
     {
-        if(e.NewValue != null)
+        if (e.NewValue != null)
             _treeView.RefreshObject(e.NewValue);
     }
 
@@ -364,27 +345,24 @@ private void Menu()
     {
         var factory = new ConsoleGuiContextMenuFactory(_activator);
         var menu = factory.Create(_treeView.GetAllSelectedObjects().ToArray(), _treeView.SelectedObject);
-           
+
         if (menu == null)
             return;
-            
-        menu.Position = DateTime.Now.Subtract(_lastMouseMove).TotalSeconds<1 ? _lastMousePos: new Point(10, 5);
+
+        menu.Position = DateTime.Now.Subtract(_lastMouseMove).TotalSeconds < 1 ? _lastMousePos : new Point(10, 5);
         menu.Show();
     }
 
 
     private void treeView_KeyPress(View.KeyEventEventArgs obj)
     {
-        if(!_treeView.CanFocus || !_treeView.HasFocus)
-        {
-            return;
-        }
+        if (!_treeView.CanFocus || !_treeView.HasFocus) return;
 
         try
         {
-            switch(obj.KeyEvent.Key)
+            switch (obj.KeyEvent.Key)
             {
-                case Key.DeleteChar :
+                case Key.DeleteChar:
                     var many = _treeView.GetAllSelectedObjects().ToArray();
                     obj.Handled = true;
 
@@ -394,18 +372,13 @@ private void treeView_KeyPress(View.KeyEventEventArgs obj)
                         if (many.Cast<object>().All(d => d is IDeleteable))
                         {
                             var cmd = new ExecuteCommandDelete(_activator, many.Cast<IDeleteable>().ToArray());
-                            if(!cmd.IsImpossible)
-                            {
+                            if (!cmd.IsImpossible)
                                 cmd.Execute();
-                            }
                             else
-                            {
                                 _activator.Show("Cannot Delete", cmd.ReasonCommandImpossible);
-                            }
                         }
                     }
-                    else
-                    if(_treeView.SelectedObject is IDeleteable d)
+                    else if (_treeView.SelectedObject is IDeleteable d)
                     {
                         // it is a single object selection
                         _activator.DeleteWithConfirmation(d);
@@ -416,49 +389,48 @@ private void treeView_KeyPress(View.KeyEventEventArgs obj)
         }
         catch (Exception ex)
         {
-            _activator.ShowException("Error",ex);
+            _activator.ShowException("Error", ex);
         }
     }
 
     private static IMapsDirectlyToDatabaseTable GetObjectIfAnyBehind(object o)
     {
-        if(o is IMasqueradeAs masquerade)
+        if (o is IMasqueradeAs masquerade)
             return masquerade.MasqueradingAs() as IMapsDirectlyToDatabaseTable;
-            
+
         return o as IMapsDirectlyToDatabaseTable;
     }
 
 
     private IEnumerable<object> ChildGetter(object model)
     {
-        return ChildGetterUnordered(model).OrderBy(o=>o,new OrderableComparer(null));
+        return ChildGetterUnordered(model).OrderBy(o => o, new OrderableComparer(null));
     }
 
 
     private IEnumerable<object> ChildGetterUnordered(object model)
     {
-
         var dx = _activator.CoreChildProvider as DataExportChildProvider;
 
         try
         {
             // Top level brackets for the tree view
-            if (ReferenceEquals(model , Catalogues))
-                return new []{_activator.CoreChildProvider.CatalogueRootFolder };
+            if (ReferenceEquals(model, Catalogues))
+                return new[] { _activator.CoreChildProvider.CatalogueRootFolder };
 
-            if (ReferenceEquals(model , Projects)  && dx != null)
-                return new[] { dx.ProjectRootFolder};
+            if (ReferenceEquals(model, Projects) && dx != null)
+                return new[] { dx.ProjectRootFolder };
 
-            if (ReferenceEquals(model , Loads))
+            if (ReferenceEquals(model, Loads))
                 return new[] { _activator.CoreChildProvider.LoadMetadataRootFolder };
 
-            if (ReferenceEquals(model , CohortConfigs))
+            if (ReferenceEquals(model, CohortConfigs))
                 return new[] { _activator.CoreChildProvider.CohortIdentificationConfigurationRootFolder };
 
-            if (ReferenceEquals(model , BuiltCohorts) && dx != null)
+            if (ReferenceEquals(model, BuiltCohorts) && dx != null)
                 return dx.CohortSources;
 
-            if(ReferenceEquals(model,Other))
+            if (ReferenceEquals(model, Other))
                 return GetOtherCategoryChildren();
 
             // don't show cic children (this is consistent with 'AxeChildren' in main collection RDMP client for Cohort Builder)
@@ -470,7 +442,7 @@ private IEnumerable<object> ChildGetterUnordered(object model)
         }
         catch (Exception ex)
         {
-            _activator.ShowException("Error getting node children",ex);
+            _activator.ShowException("Error getting node children", ex);
             return Array.Empty<object>();
         }
     }
@@ -500,12 +472,12 @@ private string GetRootCategoryOf(object o)
     {
         var type = o.GetType();
 
-        if(type == typeof(FolderNode<Catalogue>) || type == typeof(FolderHelper))
+        if (type == typeof(FolderNode<Catalogue>) || type == typeof(FolderHelper))
             return Catalogues;
 
-        if(type == typeof(Project))
+        if (type == typeof(Project))
             return Projects;
-        if(type == typeof(LoadMetadata))
+        if (type == typeof(LoadMetadata))
             return Loads;
         if (type == typeof(FolderNode<LoadMetadata>))
             return Loads;
@@ -513,46 +485,54 @@ private string GetRootCategoryOf(object o)
         if (type == typeof(FolderNode<LoadMetadata>))
             return CohortConfigs;
 
-        if(type == typeof(ExtractableCohort))
+        if (type == typeof(ExtractableCohort))
             return BuiltCohorts;
-        if (GetOtherCategoryChildren().Any(a=>a.Equals(o)))
+        if (GetOtherCategoryChildren().Any(a => a.Equals(o)))
             return Other;
 
         return null;
     }
+
     private void Run()
     {
         var commandInvoker = new CommandInvoker(_activator);
-        commandInvoker.CommandImpossible += (o, e) => { _activator.Show(
-            $"Command Impossible because:{e.Command.ReasonCommandImpossible}");};
+        commandInvoker.CommandImpossible += (o, e) =>
+        {
+            _activator.Show(
+                $"Command Impossible because:{e.Command.ReasonCommandImpossible}");
+        };
 
         var commands = commandInvoker.GetSupportedCommands();
 
-        var dlg = new ConsoleGuiBigListBox<Type>("Choose Command","Run",true,commands.ToList(),t=>BasicCommandExecution.GetCommandName(t.Name),false);
+        var dlg = new ConsoleGuiBigListBox<Type>("Choose Command", "Run", true, commands.ToList(),
+            t => BasicCommandExecution.GetCommandName(t.Name), false);
         if (dlg.ShowDialog())
             try
             {
-                commandInvoker.ExecuteCommand(dlg.Selected,null);
+                commandInvoker.ExecuteCommand(dlg.Selected, null);
             }
             catch (Exception exception)
             {
-                _activator.ShowException("Run Failed",exception);
+                _activator.ShowException("Run Failed", exception);
             }
     }
+
     private void New()
     {
         var commandInvoker = new CommandInvoker(_activator);
-        commandInvoker.CommandImpossible += (o, e) => { _activator.Show(
-            $"Command Impossible because:{e.Command.ReasonCommandImpossible}");};
-            
+        commandInvoker.CommandImpossible += (o, e) =>
+        {
+            _activator.Show(
+                $"Command Impossible because:{e.Command.ReasonCommandImpossible}");
+        };
+
         try
         {
-            commandInvoker.ExecuteCommand(typeof(ExecuteCommandNewObject),null);
+            commandInvoker.ExecuteCommand(typeof(ExecuteCommandNewObject), null);
         }
         catch (Exception exception)
         {
-            _activator.ShowException("New Object Failed",exception);
+            _activator.ShowException("New Object Failed", exception);
         }
     }
-
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/ExecuteCommandRunConsoleGuiView.cs b/Tools/rdmp/CommandLine/Gui/ExecuteCommandRunConsoleGuiView.cs
index 61fb396177..2e7ee48eed 100644
--- a/Tools/rdmp/CommandLine/Gui/ExecuteCommandRunConsoleGuiView.cs
+++ b/Tools/rdmp/CommandLine/Gui/ExecuteCommandRunConsoleGuiView.cs
@@ -19,7 +19,8 @@ internal class ExecuteCommandRunConsoleGuiView : BasicCommandExecution
     /// </summary>
     /// <param name="activator"></param>
     /// <param name="windowConstructor">Called only when/if the command is executed</param>
-    public ExecuteCommandRunConsoleGuiView(IBasicActivateItems activator, Func<Window> windowConstructor):base(activator)
+    public ExecuteCommandRunConsoleGuiView(IBasicActivateItems activator, Func<Window> windowConstructor) :
+        base(activator)
     {
         this.windowConstructor = windowConstructor;
     }
diff --git a/Tools/rdmp/CommandLine/Gui/LoadingDialog.cs b/Tools/rdmp/CommandLine/Gui/LoadingDialog.cs
index fa49bf9455..5e9e0e11ce 100644
--- a/Tools/rdmp/CommandLine/Gui/LoadingDialog.cs
+++ b/Tools/rdmp/CommandLine/Gui/LoadingDialog.cs
@@ -8,10 +8,9 @@ namespace Rdmp.Core.CommandLine.Gui;
 
 public partial class LoadingDialog
 {
-
     public LoadingDialog(string message)
     {
         InitializeComponent();
         lblLoading.Text = message;
     }
-}
+}
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiEdit.cs b/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiEdit.cs
index 948f2c74f8..bdb59a9041 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiEdit.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiEdit.cs
@@ -31,7 +31,6 @@ public ConsoleGuiEdit(IBasicActivateItems activator, IRevertable databaseObject)
 
         ColorScheme = ConsoleMainWindow.ColorScheme;
         collection =
-
             TableRepository.GetPropertyInfos(DatabaseObject.GetType())
                 .Select(p => new PropertyInListView(p, DatabaseObject)).ToList();
 
@@ -49,20 +48,17 @@ public ConsoleGuiEdit(IBasicActivateItems activator, IRevertable databaseObject)
             X = 0,
             Y = Pos.Bottom(list),
             IsDefault = true
-        };            
-
-        btnSet.Clicked += () =>
-        {
-            SetProperty(false);
         };
 
+        btnSet.Clicked += () => { SetProperty(false); };
+
         var btnClose = new Button("Close")
         {
-            X =  Pos.Right(btnSet),
+            X = Pos.Right(btnSet),
             Y = Pos.Bottom(list)
         };
-        btnClose.Clicked += ()=>Application.RequestStop();
-            
+        btnClose.Clicked += () => Application.RequestStop();
+
         Add(list);
         Add(btnSet);
         Add(btnClose);
@@ -71,12 +67,12 @@ public ConsoleGuiEdit(IBasicActivateItems activator, IRevertable databaseObject)
     private void SetProperty(bool setNull)
     {
         if (list.SelectedItem != -1)
-        {
             try
             {
                 var p = collection[list.SelectedItem];
 
-                var cmd = setNull ? new ExecuteCommandSet(_activator, DatabaseObject, p.PropertyInfo.Name, "null")
+                var cmd = setNull
+                    ? new ExecuteCommandSet(_activator, DatabaseObject, p.PropertyInfo.Name, "null")
                     : new ExecuteCommandSet(_activator, DatabaseObject, p.PropertyInfo);
 
                 if (cmd.IsImpossible)
@@ -89,7 +85,6 @@ private void SetProperty(bool setNull)
 
                 if (cmd.Success)
                 {
-
                     //redraws the list and re selects the current item
                     DatabaseObject.RevertToDatabaseState();
                     p.UpdateValue();
@@ -99,21 +94,19 @@ private void SetProperty(bool setNull)
                     list.SelectedItem = oldSelected;
                     list.EnsureSelectedItemVisible();
                 }
-
             }
             catch (Exception e)
             {
                 _activator.ShowException("Failed to set Property", e);
             }
-        }
     }
 
     private void List_KeyPress(KeyEventEventArgs obj)
     {
-        if(obj.KeyEvent.Key == Key.DeleteChar)
+        if (obj.KeyEvent.Key == Key.DeleteChar)
         {
             var rly = MessageBox.Query("Clear", "Clear Property Value?", "Yes", "Cancel");
-            if(rly == 0)
+            if (rly == 0)
             {
                 obj.Handled = true;
                 SetProperty(true);
@@ -128,7 +121,7 @@ private class PropertyInListView
     {
         public PropertyInfo PropertyInfo;
         public string DisplayMember;
-            
+
         public IMapsDirectlyToDatabaseTable Object;
 
         public PropertyInListView(PropertyInfo p, IMapsDirectlyToDatabaseTable o)
@@ -136,13 +129,9 @@ public PropertyInListView(PropertyInfo p, IMapsDirectlyToDatabaseTable o)
             PropertyInfo = p;
             Object = o;
             UpdateValue();
-
         }
 
-        public override string ToString()
-        {
-            return DisplayMember;
-        }
+        public override string ToString() => DisplayMember;
 
         /// <summary>
         /// Updates the <see cref="DisplayMember"/> to indicate the new value
@@ -153,15 +142,11 @@ public void UpdateValue()
             var val = PropertyInfo.GetValue(Object) ?? string.Empty;
 
             // If it is a password property
-            if(PropertyInfo.Name.Contains("Password",StringComparison.InvariantCultureIgnoreCase))
-            {
+            if (PropertyInfo.Name.Contains("Password", StringComparison.InvariantCultureIgnoreCase))
                 // With a non null value
-                if(!string.IsNullOrWhiteSpace(val.ToString()))
-                {
+                if (!string.IsNullOrWhiteSpace(val.ToString()))
                     val = "****";
-                }
-            }
-                
+
             DisplayMember = $"{PropertyInfo.Name}:{val}";
         }
     }
@@ -172,12 +157,8 @@ public static class ListViewExtensions
     public static void EnsureSelectedItemVisible(this ListView list)
     {
         if (list.SelectedItem < list.TopItem)
-        {
             list.TopItem = list.SelectedItem;
-        }
         else if (list.Frame.Height > 0 && list.SelectedItem >= list.TopItem + list.Frame.Height)
-        {
             list.TopItem = Math.Max(list.SelectedItem - list.Frame.Height + 2, 0);
-        }
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiSelectMany.cs b/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiSelectMany.cs
index 2dacb03b5f..4465618e2e 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiSelectMany.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/ConsoleGuiSelectMany.cs
@@ -24,18 +24,22 @@ public class ConsoleGuiSelectMany : Window
     /// The final object selection made.  Note that you should
     /// also check <see cref="ResultOk"/> in case of user cancellation
     /// </summary>
-    public object[] Result { get { return _available.Where((e, idx) => lv.Source.IsMarked(idx)).ToArray(); } }
+    public object[] Result
+    {
+        get { return _available.Where((e, idx) => lv.Source.IsMarked(idx)).ToArray(); }
+    }
 
     /// <summary>
     /// True if the user made a final selection or False if they exited without
     /// making a choice e.g. Hit Ctrl+Q
     /// </summary>
     public bool ResultOk { get; internal set; }
+
     private object[] _available;
     private IReadOnlyCollection<object> _original;
     private TextField _tbSearch;
 
-    public ConsoleGuiSelectMany(IBasicActivateItems activator,string prompt, object[] available)
+    public ConsoleGuiSelectMany(IBasicActivateItems activator, string prompt, object[] available)
     {
         _available = available;
         _original = available.ToList().AsReadOnly();
@@ -74,7 +78,7 @@ public ConsoleGuiSelectMany(IBasicActivateItems activator,string prompt, object[
         Add(_tbSearch);
 
         Title = prompt;
-            
+
         _activator = activator;
     }
 
@@ -86,7 +90,8 @@ private void TbSearch_TextChanged(NStack.ustring obj)
 
         // plus everything else that matches on search text
         var matchingFilter = _original.Except(ticked)
-            .Where(o => string.IsNullOrWhiteSpace(search) || o.ToString().Contains(search, StringComparison.CurrentCultureIgnoreCase))
+            .Where(o => string.IsNullOrWhiteSpace(search) ||
+                        o.ToString().Contains(search, StringComparison.CurrentCultureIgnoreCase))
             .ToArray();
 
         // make a list of all marked followed by unmarked but matching filter
@@ -98,28 +103,23 @@ private void TbSearch_TextChanged(NStack.ustring obj)
         lv.SetSource(all);
 
         // since we changed the source we need to remark the originally ticked ones
-        for(var i =0;i<ticked.Length;i++)
-        {
-            lv.Source.SetMark(i, true);
-        }
+        for (var i = 0; i < ticked.Length; i++) lv.Source.SetMark(i, true);
         SetNeedsDisplay();
     }
 
     private void Lv_KeyPress(KeyEventEventArgs obj)
     {
-        if(obj.KeyEvent.Key == Key.Enter)
+        if (obj.KeyEvent.Key == Key.Enter)
         {
             // if there are no selected objects (user hits space to select many)
             // then they probably want a single object selection
-            if(Result.Length == 0)
-            {
-                lv.MarkUnmarkRow();
-            }
+            if (Result.Length == 0) lv.MarkUnmarkRow();
 
             obj.Handled = true;
             ResultOk = true;
             Application.RequestStop();
         }
+
         SetNeedsDisplay();
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunCacheWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunCacheWindow.cs
index 608a70712e..73117f93e3 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunCacheWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunCacheWindow.cs
@@ -17,8 +17,5 @@ public RunCacheWindow(IBasicActivateItems activator, ICacheProgress cp)
     {
     }
 
-    private static CacheOptions GetCommand(ICacheProgress cp)
-    {
-        return new CacheOptions { CacheProgress = cp.ID.ToString() };
-    }
+    private static CacheOptions GetCommand(ICacheProgress cp) => new() { CacheProgress = cp.ID.ToString() };
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDataQualityEngineWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDataQualityEngineWindow.cs
index e15e6266ab..617fb908e9 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDataQualityEngineWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDataQualityEngineWindow.cs
@@ -15,11 +15,7 @@ internal class RunDataQualityEngineWindow : RunEngineWindow<DqeOptions>
     public RunDataQualityEngineWindow(IBasicActivateItems activator, Catalogue c)
         : base(activator, () => GetCommand(c))
     {
-
     }
 
-    private static DqeOptions GetCommand(Catalogue c)
-    {
-        return new DqeOptions { Catalogue = c.ID.ToString() };
-    }
+    private static DqeOptions GetCommand(Catalogue c) => new() { Catalogue = c.ID.ToString() };
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDleWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDleWindow.cs
index 72459b3a38..c3ce3acb7b 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDleWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunDleWindow.cs
@@ -22,14 +22,12 @@ public RunDleWindow(IBasicActivateItems activator, LoadMetadata lmd)
         this.lmd = lmd;
     }
 
-    private static DleOptions GetCommand(LoadMetadata lmd)
-    {
-        return new DleOptions
+    private static DleOptions GetCommand(LoadMetadata lmd) =>
+        new()
         {
             LoadMetadata = lmd.ID.ToString(),
             Iterative = false
         };
-    }
 
     protected override void AdjustCommand(DleOptions opts, CommandLineActivity activity)
     {
@@ -43,11 +41,11 @@ protected override void AdjustCommand(DleOptions opts, CommandLineActivity activ
 
             opts.LoadProgress = lp.ID.ToString();
 
-            if (BasicActivator.SelectValueType("Days to Load", typeof(int), lp.DefaultNumberOfDaysToLoadEachTime, out var chosen))
+            if (BasicActivator.SelectValueType("Days to Load", typeof(int), lp.DefaultNumberOfDaysToLoadEachTime,
+                    out var chosen))
                 opts.DaysToLoad = (int)chosen;
             else
                 return;
         }
-
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunEngineWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunEngineWindow.cs
index 8d22b44e50..ecdebc56f0 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunEngineWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunEngineWindow.cs
@@ -34,6 +34,7 @@ internal class RunEngineWindow<T> : Window, IListDataSource where T : RDMPComman
 
     public int Count => consoleOutput.Count;
     public int Length => consoleOutput.Count;
+
     public RunEngineWindow(IBasicActivateItems activator, Func<T> commandGetter)
     {
         _red = ColorSettings.Instance.Red;
@@ -60,10 +61,7 @@ public RunEngineWindow(IBasicActivateItems activator, Func<T> commandGetter)
         Add(abort);
 
         var close = new Button("Cl_ose") { X = Pos.Right(abort) };
-        close.Clicked += () =>
-        {
-            Application.RequestStop();
-        };
+        close.Clicked += () => { Application.RequestStop(); };
 
         Add(close);
 
@@ -91,6 +89,7 @@ private void Results_KeyPress(KeyEventEventArgs obj)
             obj.Handled = true;
         }
     }
+
     private void ClearOutput()
     {
         lock (lockList)
@@ -136,7 +135,6 @@ private void Execute()
     /// <param name="opts"></param>
     protected virtual void AdjustCommand(T opts, CommandLineActivity activity)
     {
-
     }
 
     private void Check()
@@ -166,16 +164,15 @@ private void Run(Func<T> commandGetter)
         var binary = Path.Combine(UsefulStuff.GetExecutableDirectory().FullName, expectedFileName);
 
         if (!File.Exists(binary))
-        {
             // the program that launched this code isn't rdmp.exe.  Maybe rdmp is in the current directory though
             binary = $"./{expectedFileName}";
-        }
 
         if (!File.Exists(binary))
         {
             MessageBox.ErrorQuery("Could not find rdmp binary", $"Could not find {binary}", "Ok");
             return;
         }
+
         var cmd = new ExecuteCommandGenerateRunCommand(BasicActivator, commandGetter);
         var args = cmd.GetCommandText(true);
 
@@ -199,41 +196,33 @@ private void Run(Func<T> commandGetter)
             {
                 var line = process.StandardOutput.ReadLine().Trim();
 
-                lock(lockList)
+                lock (lockList)
                 {
-                    consoleOutput.Insert(0,line);
-                    Application.MainLoop.Invoke(()=>_results.SetNeedsDisplay());
+                    consoleOutput.Insert(0, line);
+                    Application.MainLoop.Invoke(() => _results.SetNeedsDisplay());
                 }
-
             }
         });
     }
 
-    public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width, int start = 0)
+    public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width,
+        int start = 0)
     {
-
         lock (lockList)
         {
-            if (item >= consoleOutput.Count)
-            {
-                return;
-            }
+            if (item >= consoleOutput.Count) return;
 
             var str = consoleOutput[item];
 
-            str = str.Length > width ? str[..width] : str.PadRight(width,' ');
+            str = str.Length > width ? str[..width] : str.PadRight(width, ' ');
 
             _results.Move(col, line);
 
             ColorScheme scheme;
             if (str.Contains("ERROR"))
-            {
                 scheme = _red;
-            }
             else if (str.Contains("WARN"))
-            {
                 scheme = _yellow;
-            }
             else
                 scheme = _white;
 
@@ -242,17 +231,11 @@ public void Render(ListView container, ConsoleDriver driver, bool selected, int
         }
     }
 
-    public bool IsMarked(int item)
-    {
-        return false;
-    }
+    public bool IsMarked(int item) => false;
 
     public void SetMark(int item, bool value)
     {
     }
 
-    public IList ToList()
-    {
-        return consoleOutput;
-    }
+    public IList ToList() => consoleOutput;
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunExtractionWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunExtractionWindow.cs
index 3cbc4974a6..0ab5e926f0 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunExtractionWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunExtractionWindow.cs
@@ -16,19 +16,17 @@ namespace Rdmp.Core.CommandLine.Gui.Windows.RunnerWindows;
 
 internal class RunExtractionWindow : RunEngineWindow<ExtractionOptions>
 {
-    public RunExtractionWindow(IBasicActivateItems activator, ExtractionConfiguration ec) : base(activator, () => GetRunCommand(ec))
+    public RunExtractionWindow(IBasicActivateItems activator, ExtractionConfiguration ec) : base(activator,
+        () => GetRunCommand(ec))
     {
-
     }
 
-    private static ExtractionOptions GetRunCommand(ExtractionConfiguration ec)
-    {
-        return new ExtractionOptions
+    private static ExtractionOptions GetRunCommand(ExtractionConfiguration ec) =>
+        new()
         {
             ExtractionConfiguration = ec.ID.ToString(),
             ExtractGlobals = true
         };
-    }
 
 
     protected override void AdjustCommand(ExtractionOptions opts, CommandLineActivity activity)
@@ -37,14 +35,14 @@ protected override void AdjustCommand(ExtractionOptions opts, CommandLineActivit
 
         var useCase = ExtractionPipelineUseCase.DesignTime();
 
-        var compatible = useCase.FilterCompatiblePipelines(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>()).ToArray();
+        var compatible = useCase
+            .FilterCompatiblePipelines(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>())
+            .ToArray();
 
-        if (!compatible.Any())
-        {
-            throw new Exception("No compatible pipelines");
-        }
+        if (!compatible.Any()) throw new Exception("No compatible pipelines");
 
-        var pipe = BasicActivator.SelectOne("Extraction Pipeline", compatible, null, true) ?? throw new OperationCanceledException();
+        var pipe = BasicActivator.SelectOne("Extraction Pipeline", compatible, null, true) ??
+                   throw new OperationCanceledException();
         opts.Pipeline = pipe.ID.ToString();
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunReleaseWindow.cs b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunReleaseWindow.cs
index da40619a31..a889e9f8f1 100644
--- a/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunReleaseWindow.cs
+++ b/Tools/rdmp/CommandLine/Gui/Windows/RunnerWindows/RunReleaseWindow.cs
@@ -18,11 +18,14 @@ internal class RunReleaseWindow : RunEngineWindow<ReleaseOptions>
 {
     private IExtractionConfiguration[] configs;
 
-    public RunReleaseWindow(IBasicActivateItems activator, IProject project):base(activator,()=>new ReleaseOptions())
+    public RunReleaseWindow(IBasicActivateItems activator, IProject project) : base(activator,
+        () => new ReleaseOptions())
     {
         configs = project.ExtractionConfigurations.Where(c => !c.IsReleased).ToArray();
     }
-    public RunReleaseWindow(IBasicActivateItems activator, ExtractionConfiguration ec) : base(activator, () => new ReleaseOptions())
+
+    public RunReleaseWindow(IBasicActivateItems activator, ExtractionConfiguration ec) : base(activator,
+        () => new ReleaseOptions())
     {
         configs = new IExtractionConfiguration[] { ec };
     }
@@ -34,16 +37,16 @@ protected override void AdjustCommand(ReleaseOptions opts, CommandLineActivity a
 
         var useCase = new ReleaseUseCase();
 
-        var compatible = useCase.FilterCompatiblePipelines(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>()).ToArray();
+        var compatible = useCase
+            .FilterCompatiblePipelines(BasicActivator.RepositoryLocator.CatalogueRepository.GetAllObjects<Pipeline>())
+            .ToArray();
 
-        if (!compatible.Any())
-        {
-            throw new Exception("No compatible pipelines");
-        }
+        if (!compatible.Any()) throw new Exception("No compatible pipelines");
 
-        var pipe = BasicActivator.SelectOne("Release Pipeline", compatible, null, true) ?? throw new OperationCanceledException();
+        var pipe = BasicActivator.SelectOne("Release Pipeline", compatible, null, true) ??
+                   throw new OperationCanceledException();
         opts.Pipeline = pipe.ID.ToString();
-        opts.Configurations = string.Join(",",configs.Select(c=>c.ID.ToString()).ToArray());
+        opts.Configurations = string.Join(",", configs.Select(c => c.ID.ToString()).ToArray());
         opts.ReleaseGlobals = true;
 
         // all datasets
diff --git a/Tools/rdmp/NLog.config b/Tools/rdmp/NLog.config
index 2d9f8995b5..58883cb5f4 100644
--- a/Tools/rdmp/NLog.config
+++ b/Tools/rdmp/NLog.config
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
@@ -9,13 +10,14 @@
   <targets>
     <target xsi:type="ColoredConsole" name="c"
             layout="${longdate} ${uppercase:${level}} ${message} ${all-event-properties}. ${exception:format=toString}" />
-  <target xsi:type="File" name="log4j" fileName="${basedir}/logs/${shortdate}-log4j.log" layout="${log4jxmlevent}" />
-  <target xsi:type="File" name="simple" fileName="${basedir}/logs/${shortdate}-simple.log" layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=toString}" />
-  <target xsi:type="Network" name="u" address="udp4://localhost:878" layout="${log4jxmlevent}" />
+    <target xsi:type="File" name="log4j" fileName="${basedir}/logs/${shortdate}-log4j.log" layout="${log4jxmlevent}" />
+    <target xsi:type="File" name="simple" fileName="${basedir}/logs/${shortdate}-simple.log"
+            layout="${longdate}|${level:uppercase=true}|${logger}|${message}|${exception:format=toString}" />
+    <target xsi:type="Network" name="u" address="udp4://localhost:878" layout="${log4jxmlevent}" />
   </targets>
   <rules>
     <logger name="*" minlevel="Trace" writeTo="c" />
     <!--<logger name="*" minlevel="Trace" writeTo="log4j" />-->
     <logger name="*" minlevel="Trace" writeTo="simple" />
   </rules>
-</nlog>
+</nlog>
\ No newline at end of file
diff --git a/Tools/rdmp/Program.cs b/Tools/rdmp/Program.cs
index 1d4724f534..798b5eba48 100644
--- a/Tools/rdmp/Program.cs
+++ b/Tools/rdmp/Program.cs
@@ -33,21 +33,21 @@ private static int Main(string[] args)
     {
         try
         {
-            var nlog = Path.Combine(AppContext.BaseDirectory ,"NLog.config");
+            var nlog = Path.Combine(AppContext.BaseDirectory, "NLog.config");
 
             if (File.Exists(nlog))
             {
                 LogManager.ThrowConfigExceptions = false;
                 LogManager.Configuration = new NLog.Config.XmlLoggingConfiguration(nlog);
             }
-                    
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             Console.WriteLine($"Could not load NLog.config:{ex.Message}");
         }
-            
-        if(args.Any(a=>a.Equals("-q")) || args.Any(a=>a.Equals("--quiet",StringComparison.CurrentCultureIgnoreCase)))
+
+        if (args.Any(a => a.Equals("-q")) ||
+            args.Any(a => a.Equals("--quiet", StringComparison.CurrentCultureIgnoreCase)))
         {
             Quiet = true;
 
@@ -61,7 +61,7 @@ private static int Main(string[] args)
 
         Startup.Startup.PreStartup();
 
-        return HandleArguments(args,logger);
+        return HandleArguments(args, logger);
     }
 
     /// <summary>
@@ -71,10 +71,8 @@ private static int Main(string[] args)
     public static void DisableConsoleLogging()
     {
         foreach (var t in LogManager.Configuration.AllTargets.ToArray())
-        {
             if (t.GetType().Name.Contains("Console", StringComparison.CurrentCultureIgnoreCase))
                 LogManager.Configuration.RemoveTarget(t.Name);
-        }
     }
 
     private static int HandleArguments(string[] args, Logger logger)
@@ -112,7 +110,8 @@ private static int HandleArguments(string[] args, Logger logger)
                         {
                             if (HasHelpArguments(args))
                                 return returnCode = 0;
-                            return returnCode = RdmpCommandLineBootStrapper.HandleArgumentsWithStandardRunner(args, logger);
+                            return returnCode =
+                                RdmpCommandLineBootStrapper.HandleArgumentsWithStandardRunner(args, logger);
                         });
 
             logger.Info($"Exiting with code {returnCode}");
@@ -141,7 +140,7 @@ private static int Run(PlatformDatabaseCreationOptions opts)
         var prefix = opts.Prefix;
 
         Console.WriteLine($"About to create on server '{serverName}' databases with prefix '{prefix}'");
-            
+
         try
         {
             PlatformDatabaseCreation.CreatePlatformDatabases(opts);
@@ -151,40 +150,39 @@ private static int Run(PlatformDatabaseCreationOptions opts)
             Console.WriteLine(e);
             return -1;
         }
+
         return 0;
     }
 
-        
+
     private static int Run(PatchDatabaseOptions opts)
     {
         opts.PopulateConnectionStringsFromYamlIfMissing(new ThrowImmediatelyCheckNotifier());
 
         var repo = opts.GetRepositoryLocator();
 
-        if(!RdmpCommandLineBootStrapper.CheckRepo(repo))
-        {
-            return RdmpCommandLineBootStrapper.REPO_ERROR;
-        }
+        if (!RdmpCommandLineBootStrapper.CheckRepo(repo)) return RdmpCommandLineBootStrapper.REPO_ERROR;
 
         var checker = new NLogICheckNotifier(true, false);
 
         var start = new Startup.Startup(RdmpCommandLineBootStrapper.GetEnvironmentInfo(), repo);
         var badTimes = false;
 
-        start.DatabaseFound += (s,e)=>{
-
+        start.DatabaseFound += (s, e) =>
+        {
             var db = e.Repository.DiscoveredServer.GetCurrentDatabase();
-                     
+
             switch (e.Status)
             {
                 case Startup.Events.RDMPPlatformDatabaseStatus.RequiresPatching:
                 {
-                        var mds = new MasterDatabaseScriptExecutor(db);
+                    var mds = new MasterDatabaseScriptExecutor(db);
                     mds.PatchDatabase(e.Patcher, checker, p => true, () => opts.BackupDatabase);
                     break;
                 }
                 case <= Startup.Events.RDMPPlatformDatabaseStatus.Broken:
-                    checker.OnCheckPerformed(new CheckEventArgs($"Database {db} had status {e.Status}",CheckResult.Fail));
+                    checker.OnCheckPerformed(new CheckEventArgs($"Database {db} had status {e.Status}",
+                        CheckResult.Fail));
                     badTimes = true;
                     break;
             }
@@ -192,6 +190,6 @@ private static int Run(PatchDatabaseOptions opts)
 
         start.DoStartup(new IgnoreAllErrorsCheckNotifier());
 
-        return badTimes ? -1 :0;
+        return badTimes ? -1 : 0;
     }
 }
\ No newline at end of file
diff --git a/Tools/rdmp/Properties/AssemblyInfo.cs b/Tools/rdmp/Properties/AssemblyInfo.cs
index 5413e0e7a1..2c209a36a9 100644
--- a/Tools/rdmp/Properties/AssemblyInfo.cs
+++ b/Tools/rdmp/Properties/AssemblyInfo.cs
@@ -6,4 +6,4 @@
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a6107ddc-8268-4902-a994-233b00480113")]
+[assembly: Guid("a6107ddc-8268-4902-a994-233b00480113")]
\ No newline at end of file
diff --git a/directory.build.props b/directory.build.props
index 236343a057..be9eb86797 100644
--- a/directory.build.props
+++ b/directory.build.props
@@ -3,4 +3,4 @@
     <LangVersion>11.0</LangVersion>
     <Version>8.1.0-rc4</Version>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/rdmp-client.xml b/rdmp-client.xml
index 54e79946ea..3b8a2390e8 100644
--- a/rdmp-client.xml
+++ b/rdmp-client.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <item>
-    <version>8.0.5.0</version>
-    <url>https://github.com/HicServices/RDMP/releases/download/v8.0.5/rdmp-8.0.5-client.zip</url>
-    <changelog>https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#805</changelog>
-    <mandatory>true</mandatory>
-</item>
+  <version>8.0.5.0</version>
+  <url>https://github.com/HicServices/RDMP/releases/download/v8.0.5/rdmp-8.0.5-client.zip</url>
+  <changelog>https://github.com/HicServices/RDMP/blob/main/CHANGELOG.md#805</changelog>
+  <mandatory>true</mandatory>
+</item>
\ No newline at end of file