diff --git a/.ci/code/UI_Test/Helpers/InstantiateCaller.cs b/.ci/code/UI_Test/Helpers/InstantiateCaller.cs
index a08507e..b316450 100644
--- a/.ci/code/UI_Test/Helpers/InstantiateCaller.cs
+++ b/.ci/code/UI_Test/Helpers/InstantiateCaller.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -92,3 +92,4 @@ public static Caller InstantiateCaller(Type type)
 }
 
 
+
diff --git a/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs b/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs
index a038920..73c7d4f 100644
--- a/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs
+++ b/.ci/code/UI_Test/Helpers/PossibleComponentItems.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public static List<SearchItem> PossibleComponentItems()
 }
 
 
+
diff --git a/.ci/code/UI_Test/Objects/DummyAccessor.cs b/.ci/code/UI_Test/Objects/DummyAccessor.cs
index 52c5293..0d26041 100644
--- a/.ci/code/UI_Test/Objects/DummyAccessor.cs
+++ b/.ci/code/UI_Test/Objects/DummyAccessor.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -130,3 +130,4 @@ private T GetDummyObject<T>()
 
 
 
+
diff --git a/.ci/code/UI_Test/Objects/DummyCaller.cs b/.ci/code/UI_Test/Objects/DummyCaller.cs
index ee757c7..4ff5a1a 100644
--- a/.ci/code/UI_Test/Objects/DummyCaller.cs
+++ b/.ci/code/UI_Test/Objects/DummyCaller.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -76,3 +76,4 @@ public override object Run(List<object> inputs)
 
 
 
+
diff --git a/.ci/code/UI_Test/Properties/AssemblyInfo.cs b/.ci/code/UI_Test/Properties/AssemblyInfo.cs
index 9350912..d9d5e28 100644
--- a/.ci/code/UI_Test/Properties/AssemblyInfo.cs
+++ b/.ci/code/UI_Test/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,5 +55,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+
 
diff --git a/.ci/code/UI_Test/Verify/ComponentInstantiation.cs b/.ci/code/UI_Test/Verify/ComponentInstantiation.cs
index 3070f56..1375818 100644
--- a/.ci/code/UI_Test/Verify/ComponentInstantiation.cs
+++ b/.ci/code/UI_Test/Verify/ComponentInstantiation.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -87,3 +87,4 @@ public static TestResult ComponentInstantiation(SearchItem item)
 }
 
 
+
diff --git a/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs b/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs
index f281f26..8352960 100644
--- a/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs
+++ b/.ci/code/UI_Test/Verify/ComponentReadWriteCycle.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -133,3 +133,4 @@ public static TestResult ComponentReadWriteCycle(SearchItem item)
 }
 
 
+
diff --git a/.ci/code/UI_Test/Verify/ComponentRunCycle.cs b/.ci/code/UI_Test/Verify/ComponentRunCycle.cs
index d6dd75f..e55c708 100644
--- a/.ci/code/UI_Test/Verify/ComponentRunCycle.cs
+++ b/.ci/code/UI_Test/Verify/ComponentRunCycle.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -145,3 +145,4 @@ public static TestResult ComponentRunCycle(SearchItem item)
 }
 
 
+
diff --git a/BHoM_UI.sln b/BHoM_UI.sln
index 26a9ac5..373ae8f 100644
--- a/BHoM_UI.sln
+++ b/BHoM_UI.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.1169
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34616.47
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHoM_UI", "BHoM_UI\BHoM_UI.csproj", "{69F4F042-E23A-4673-AB32-3D787CFA976C}"
 EndProject
@@ -12,6 +12,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI_Engine", "UI_Engine\UI_E
 		{50D4C1ED-C16C-4365-A742-938BF49EC4B0} = {50D4C1ED-C16C-4365-A742-938BF49EC4B0}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BHoM_Windows_UI", "BHoM_Windows_UI\BHoM_Windows_UI.csproj", "{9BA156D1-851D-4267-A94F-6F238D17B634}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,6 +32,10 @@ Global
 		{565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{565DDBD0-5C04-4BE9-B57D-CE54C2124ABB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BA156D1-851D-4267-A94F-6F238D17B634}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BA156D1-851D-4267-A94F-6F238D17B634}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BA156D1-851D-4267-A94F-6F238D17B634}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BA156D1-851D-4267-A94F-6F238D17B634}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BHoM_UI/Caller/AddToMenu.cs b/BHoM_UI/Caller/AddToMenu.cs
index 6458edb..df71abb 100644
--- a/BHoM_UI/Caller/AddToMenu.cs
+++ b/BHoM_UI/Caller/AddToMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -82,3 +82,4 @@ public void SetSelectorMenu<M>(ItemSelectorMenu<M> selectorMenu)
 
 
 
+
diff --git a/BHoM_UI/Caller/Compile.cs b/BHoM_UI/Caller/Compile.cs
index 54c3229..54fda34 100644
--- a/BHoM_UI/Caller/Compile.cs
+++ b/BHoM_UI/Caller/Compile.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -93,3 +93,4 @@ protected virtual void CompileMethod()
 
 
 
+
diff --git a/BHoM_UI/Caller/Core.cs b/BHoM_UI/Caller/Core.cs
index 0fd95ef..adaf128 100644
--- a/BHoM_UI/Caller/Core.cs
+++ b/BHoM_UI/Caller/Core.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -189,3 +189,4 @@ protected void MarkAsModified(CallerUpdate update)
 
 
 
+
diff --git a/BHoM_UI/Caller/IO_CRUD.cs b/BHoM_UI/Caller/IO_CRUD.cs
index 0c0b2d4..bf33a84 100644
--- a/BHoM_UI/Caller/IO_CRUD.cs
+++ b/BHoM_UI/Caller/IO_CRUD.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -197,3 +197,4 @@ public virtual bool CanUpdateInput(int index, string name)
 
 
 
+
diff --git a/BHoM_UI/Caller/Read.cs b/BHoM_UI/Caller/Read.cs
index 162820b..39916e8 100644
--- a/BHoM_UI/Caller/Read.cs
+++ b/BHoM_UI/Caller/Read.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -222,3 +222,4 @@ protected object OldCreateMethodToType(string json, List<ParamInfo> inputParams,
 
 
 
+
diff --git a/BHoM_UI/Caller/Run.cs b/BHoM_UI/Caller/Run.cs
index 384151e..ea35c6e 100644
--- a/BHoM_UI/Caller/Run.cs
+++ b/BHoM_UI/Caller/Run.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -78,7 +78,9 @@ public virtual object Run(List<object> inputs)
             {
                 try
                 {
-                    return m_CompiledFunc(inputs.ToArray());
+                    var result = m_CompiledFunc(inputs.ToArray());
+                    ResetLogSuppression();
+                    return result;
                 }
                 catch (InvalidCastException e)
                 {
@@ -88,10 +90,15 @@ public virtual object Run(List<object> inputs)
                         // Try to update the generic method to fit the input types
                         MethodInfo method = Engine.Base.Compute.MakeGenericFromInputs(originalMethod, inputs.Select(x => x?.GetType()).ToList());
                         m_CompiledFunc = method.ToFunc();
-                        return m_CompiledFunc(inputs.ToArray());
+                        var result = m_CompiledFunc(inputs.ToArray());
+                        ResetLogSuppression();
+                        return result;
                     }
                     else
+                    {
+                        ResetLogSuppression();
                         throw e;
+                    }
                 }
             }
             else if (InputParams.Count <= 0)
@@ -306,6 +313,14 @@ protected virtual bool ShouldCalculateNewResult(List<object> inputs, ref object
             return true;
         }
 
+        /*************************************/
+
+        protected void ResetLogSuppression()
+        {
+            BH.Engine.Base.Compute.StopSuppressRecordingEvents(); //Ensure suppression is reset in case the calling method forgot to do it
+            BH.Engine.Base.Compute.ThrowErrorsAsExceptions(false); //Reset throwing errors to whatever the user may have set it to prior to running this method
+        }
+
 
         /*************************************/
         /**** Private Fields              ****/
@@ -320,3 +335,4 @@ protected virtual bool ShouldCalculateNewResult(List<object> inputs, ref object
 
 
 
+
diff --git a/BHoM_UI/Caller/SetComponentDetails.cs b/BHoM_UI/Caller/SetComponentDetails.cs
index 6df059c..e9bdd45 100644
--- a/BHoM_UI/Caller/SetComponentDetails.cs
+++ b/BHoM_UI/Caller/SetComponentDetails.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -88,3 +88,4 @@ protected virtual void SetComponentDetails(object item)
 
 
 
+
diff --git a/BHoM_UI/Caller/SetInputs.cs b/BHoM_UI/Caller/SetInputs.cs
index c15d1ce..a67037f 100644
--- a/BHoM_UI/Caller/SetInputs.cs
+++ b/BHoM_UI/Caller/SetInputs.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -116,3 +116,4 @@ protected virtual void SetInputs(object item)
 
 
 
+
diff --git a/BHoM_UI/Caller/SetItem.cs b/BHoM_UI/Caller/SetItem.cs
index 52cf944..d5c7430 100644
--- a/BHoM_UI/Caller/SetItem.cs
+++ b/BHoM_UI/Caller/SetItem.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -120,3 +120,4 @@ protected virtual object FromGeneric(object item)
 
 
 
+
diff --git a/BHoM_UI/Caller/SetOutputs.cs b/BHoM_UI/Caller/SetOutputs.cs
index 3861363..d3c5fe7 100644
--- a/BHoM_UI/Caller/SetOutputs.cs
+++ b/BHoM_UI/Caller/SetOutputs.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -124,3 +124,4 @@ protected virtual void SetOutputs(object item)
 
 
 
+
diff --git a/BHoM_UI/Caller/SetParamSelectionMenu.cs b/BHoM_UI/Caller/SetParamSelectionMenu.cs
index d069bac..9f06a56 100644
--- a/BHoM_UI/Caller/SetParamSelectionMenu.cs
+++ b/BHoM_UI/Caller/SetParamSelectionMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -89,3 +89,4 @@ protected virtual void SetOutputSelectionMenu()
 
 
 
+
diff --git a/BHoM_UI/Caller/Write.cs b/BHoM_UI/Caller/Write.cs
index 9aada9d..66a256f 100644
--- a/BHoM_UI/Caller/Write.cs
+++ b/BHoM_UI/Caller/Write.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -64,3 +64,4 @@ public virtual string Write()
 
 
 
+
diff --git a/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs b/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs
index afa8d7b..35f8417 100644
--- a/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs
+++ b/BHoM_UI/CallerTemplates/MultiChoiceCaller.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -141,3 +141,4 @@ private void EnumValueSelected(object sender, object e)
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/CreateAdapter.cs b/BHoM_UI/Components/Adapter/CreateAdapter.cs
index 7619ea9..7a1d493 100644
--- a/BHoM_UI/Components/Adapter/CreateAdapter.cs
+++ b/BHoM_UI/Components/Adapter/CreateAdapter.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -65,3 +65,4 @@ public CreateAdapterCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/CreateRequest.cs b/BHoM_UI/Components/Adapter/CreateRequest.cs
index fbce313..c9d09f3 100644
--- a/BHoM_UI/Components/Adapter/CreateRequest.cs
+++ b/BHoM_UI/Components/Adapter/CreateRequest.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -69,3 +69,4 @@ public CreateRequestCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/Execute.cs b/BHoM_UI/Components/Adapter/Execute.cs
index 233cc9a..7d9fe80 100644
--- a/BHoM_UI/Components/Adapter/Execute.cs
+++ b/BHoM_UI/Components/Adapter/Execute.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -100,8 +100,17 @@ public static Output<List<object>, bool> Execute(BHoMAdapter adapter, IExecuteCo
                 return result;
             }
 
+            if(!adapter.BeforeExecute(command, executeConfig))
+            {
+                BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Execute. Please rectify those issues to use the Execute component.");
+                return result;
+            }
+
             result = adapter.Execute(command, executeConfig); // Item1 is the result of the Execute; Item2 the `success` bool.
 
+            if (!adapter.AfterExecute(command, executeConfig))
+                BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Execute. Please take note of any additional warnings/errors received from the Execute component.");
+
             return result != null ? result : new Output<List<object>, bool>() { Item1 = null, Item2 = false };
         }
 
@@ -112,3 +121,4 @@ public static Output<List<object>, bool> Execute(BHoMAdapter adapter, IExecuteCo
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/Move.cs b/BHoM_UI/Components/Adapter/Move.cs
index 724c844..b2561d9 100644
--- a/BHoM_UI/Components/Adapter/Move.cs
+++ b/BHoM_UI/Components/Adapter/Move.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -111,8 +111,19 @@ public static bool Move(BHoMAdapter source, BHoMAdapter target, object request =
                 return false;
             }
 
+            if(!source.BeforeMove(target, actualRequest, pullType, pullCfg, pushType, pushCfg))
+            {
+                BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Move. Please rectify those issues to use the Move component.");
+                return false;
+            }
+
 
-            return source.Move(target, actualRequest, pullType, pullCfg, pushType, pushCfg);
+            bool result = source.Move(target, actualRequest, pullType, pullCfg, pushType, pushCfg);
+
+            if(!source.AfterMove(target, actualRequest, pullType, pullCfg, pushType, pushCfg))
+                BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Move. Please take note of any additional warnings/errors received from the Move component.");
+
+            return result;
         }
 
         /*************************************/
@@ -122,3 +133,4 @@ public static bool Move(BHoMAdapter source, BHoMAdapter target, object request =
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/Pull.cs b/BHoM_UI/Components/Adapter/Pull.cs
index ea49f56..d45f0f8 100644
--- a/BHoM_UI/Components/Adapter/Pull.cs
+++ b/BHoM_UI/Components/Adapter/Pull.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -117,7 +117,18 @@ public static IEnumerable<object> Pull(BHoMAdapter adapter, object request = nul
                 return null;
             }
 
-            return adapter.Pull(actualRequest, pullType, pullConfig);
+            if(!adapter.BeforePull(actualRequest, pullType, pullConfig))
+            {
+                BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Pull. Please rectify those issues to use the Pull component.");
+                return null;
+            }
+
+            IEnumerable<object> result = adapter.Pull(actualRequest, pullType, pullConfig);
+
+            if(!adapter.AfterPull(actualRequest, pullType, pullConfig))
+                BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Pull. Please take note of any additional warnings/errors received from the Pull component.");
+
+            return result;
         }
 
         /*************************************/
@@ -133,3 +144,4 @@ public static IEnumerable<object> Pull(BHoMAdapter adapter, object request = nul
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/Push.cs b/BHoM_UI/Components/Adapter/Push.cs
index ee4e6b7..2921164 100644
--- a/BHoM_UI/Components/Adapter/Push.cs
+++ b/BHoM_UI/Components/Adapter/Push.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -109,8 +109,17 @@ public static Output<List<object>, bool> Push(BHoMAdapter adapter, IEnumerable<o
                 return noOutput;
             }
 
+            if(!adapter.BeforePush(objects, tag, pt, pushConfig))
+            {
+                BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Push. Please rectify those issues to use the Push component.");
+                return noOutput;
+            }
+
             List<object> result = adapter.Push(objects, tag, pt, pushConfig);
 
+            if(!adapter.AfterPush(objects, tag, pt, pushConfig))
+                BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Push. Please take note of any additional warnings/errors received from the Push component.");
+
             return BH.Engine.Base.Create.Output(result, objects?.Count() == result?.Count());
         }
 
@@ -121,3 +130,4 @@ public static Output<List<object>, bool> Push(BHoMAdapter adapter, IEnumerable<o
 
 
 
+
diff --git a/BHoM_UI/Components/Adapter/Remove.cs b/BHoM_UI/Components/Adapter/Remove.cs
index 2e18ed3..6e7120d 100644
--- a/BHoM_UI/Components/Adapter/Remove.cs
+++ b/BHoM_UI/Components/Adapter/Remove.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -94,7 +94,18 @@ public static int Remove(BHoMAdapter adapter, object request = null, ActionConfi
                 return 0;
             }
 
-            return adapter.Remove(actualRequest, removeConfig);
+            if(!adapter.BeforeRemove(actualRequest, removeConfig))
+            {
+                BH.Engine.Base.Compute.RecordError($"An error occurred within the setup actions for the Remove. Please rectify those issues to use the Remove component.");
+                return 0;
+            }
+
+            int result = adapter.Remove(actualRequest, removeConfig);
+
+            if(!adapter.AfterRemove(actualRequest, removeConfig))
+                BH.Engine.Base.Compute.RecordWarning($"An error occurred during the tear down operation for the Remove. Please take note of any additional warnings/errors received from the Remove component.");
+
+            return result;
         }
 
         /*************************************/
@@ -104,3 +115,4 @@ public static int Remove(BHoMAdapter adapter, object request = null, ActionConfi
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/Compute.cs b/BHoM_UI/Components/Engine/Compute.cs
index b42ffa0..dfbb836 100644
--- a/BHoM_UI/Components/Engine/Compute.cs
+++ b/BHoM_UI/Components/Engine/Compute.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ public ComputeCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/Convert.cs b/BHoM_UI/Components/Engine/Convert.cs
index e1e99db..89339e2 100644
--- a/BHoM_UI/Components/Engine/Convert.cs
+++ b/BHoM_UI/Components/Engine/Convert.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ public ConvertCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/Explode.cs b/BHoM_UI/Components/Engine/Explode.cs
index 7e2fb6f..7fa910b 100644
--- a/BHoM_UI/Components/Engine/Explode.cs
+++ b/BHoM_UI/Components/Engine/Explode.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -223,3 +223,4 @@ public bool CollectOutputTypes(List<object> objects = null)
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/External.cs b/BHoM_UI/Components/Engine/External.cs
index cd04729..d799d5e 100644
--- a/BHoM_UI/Components/Engine/External.cs
+++ b/BHoM_UI/Components/Engine/External.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -63,3 +63,4 @@ public ExternalCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/FromJson.cs b/BHoM_UI/Components/Engine/FromJson.cs
index 444e475..445ac9b 100644
--- a/BHoM_UI/Components/Engine/FromJson.cs
+++ b/BHoM_UI/Components/Engine/FromJson.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -57,3 +57,4 @@ public FromJsonCaller() : base(typeof(BH.Engine.Serialiser.Convert).GetMethod("F
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/GetEvents.cs b/BHoM_UI/Components/Engine/GetEvents.cs
index 5008d5b..6d99687 100644
--- a/BHoM_UI/Components/Engine/GetEvents.cs
+++ b/BHoM_UI/Components/Engine/GetEvents.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -99,3 +99,4 @@ public static Output<List<Event>, List<Event>, List<Event>, List<Event>> GetEven
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/GetInfo.cs b/BHoM_UI/Components/Engine/GetInfo.cs
index 3d8f756..62434ff 100644
--- a/BHoM_UI/Components/Engine/GetInfo.cs
+++ b/BHoM_UI/Components/Engine/GetInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -104,3 +104,4 @@ public static Output<string, string, string, List<string>, List<Type>, List<Meth
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/GetProperty.cs b/BHoM_UI/Components/Engine/GetProperty.cs
index eac99d8..48cb970 100644
--- a/BHoM_UI/Components/Engine/GetProperty.cs
+++ b/BHoM_UI/Components/Engine/GetProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -96,3 +96,4 @@ public static object GetProperty(object obj, string propName)
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/Modify.cs b/BHoM_UI/Components/Engine/Modify.cs
index 599cbf5..10ff87a 100644
--- a/BHoM_UI/Components/Engine/Modify.cs
+++ b/BHoM_UI/Components/Engine/Modify.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -118,3 +118,4 @@ protected override void SetOutputs(MethodBase method)
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/Query.cs b/BHoM_UI/Components/Engine/Query.cs
index c64bc99..f67fcbf 100644
--- a/BHoM_UI/Components/Engine/Query.cs
+++ b/BHoM_UI/Components/Engine/Query.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ public QueryCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/SetProperty.cs b/BHoM_UI/Components/Engine/SetProperty.cs
index 895aab9..58cbabd 100644
--- a/BHoM_UI/Components/Engine/SetProperty.cs
+++ b/BHoM_UI/Components/Engine/SetProperty.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -191,3 +191,4 @@ private T FirstOrDefault<T>(IEnumerable<T> list)
 
 
 
+
diff --git a/BHoM_UI/Components/Engine/ToJson.cs b/BHoM_UI/Components/Engine/ToJson.cs
index e14a1cc..0d656c7 100644
--- a/BHoM_UI/Components/Engine/ToJson.cs
+++ b/BHoM_UI/Components/Engine/ToJson.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -58,3 +58,4 @@ public ToJsonCaller() : base(typeof(BH.Engine.Serialiser.Convert).GetMethod("ToJ
 
 
 
+
diff --git a/BHoM_UI/Components/UI/FalseStartToggle.cs b/BHoM_UI/Components/UI/FalseStartToggle.cs
index 27de83c..8cd3f38 100644
--- a/BHoM_UI/Components/UI/FalseStartToggle.cs
+++ b/BHoM_UI/Components/UI/FalseStartToggle.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -111,3 +111,4 @@ public override object Run(List<object> inputs)
     }
 }
 
+
diff --git a/BHoM_UI/Components/UI/UnitTest.cs b/BHoM_UI/Components/UI/UnitTest.cs
index 1719d8a..8bf54ca 100644
--- a/BHoM_UI/Components/UI/UnitTest.cs
+++ b/BHoM_UI/Components/UI/UnitTest.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -146,3 +146,4 @@ private List<object> SeparateOutputs(object returnObject)
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateCustom.cs b/BHoM_UI/Components/oM/CreateCustom.cs
index 0981506..2dd7142 100644
--- a/BHoM_UI/Components/oM/CreateCustom.cs
+++ b/BHoM_UI/Components/oM/CreateCustom.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -142,3 +142,4 @@ public override bool RemoveInput(string name)
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateData.cs b/BHoM_UI/Components/oM/CreateData.cs
index feb4ad7..bf60a31 100644
--- a/BHoM_UI/Components/oM/CreateData.cs
+++ b/BHoM_UI/Components/oM/CreateData.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -181,3 +181,4 @@ private void AddSourceLinkToMenu(object menu)
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateDictionary.cs b/BHoM_UI/Components/oM/CreateDictionary.cs
index 68acdae..4fb167c 100644
--- a/BHoM_UI/Components/oM/CreateDictionary.cs
+++ b/BHoM_UI/Components/oM/CreateDictionary.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -91,3 +91,4 @@ public static IDictionary CreateDictionary(List<object> keys, List<object> value
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateEnum.cs b/BHoM_UI/Components/oM/CreateEnum.cs
index 79a03f4..0e68726 100644
--- a/BHoM_UI/Components/oM/CreateEnum.cs
+++ b/BHoM_UI/Components/oM/CreateEnum.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -110,3 +110,4 @@ public override List<string> GetChoiceNames()
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateObject.cs b/BHoM_UI/Components/oM/CreateObject.cs
index 07c903c..1d0a592 100644
--- a/BHoM_UI/Components/oM/CreateObject.cs
+++ b/BHoM_UI/Components/oM/CreateObject.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -74,3 +74,4 @@ public CreateObjectCaller() : base()
 
 
 
+
diff --git a/BHoM_UI/Components/oM/CreateType.cs b/BHoM_UI/Components/oM/CreateType.cs
index cc7605d..453afe6 100644
--- a/BHoM_UI/Components/oM/CreateType.cs
+++ b/BHoM_UI/Components/oM/CreateType.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -121,3 +121,4 @@ public override void AddToMenu(object menu)
 
 
 
+
diff --git a/BHoM_UI/Global/DocumentListener.cs b/BHoM_UI/Global/DocumentListener.cs
index 4224b6a..153b269 100644
--- a/BHoM_UI/Global/DocumentListener.cs
+++ b/BHoM_UI/Global/DocumentListener.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -226,3 +226,4 @@ private static Label GetCell(string text)
 
 
 
+
diff --git a/BHoM_UI/Global/GlobalSearch.cs b/BHoM_UI/Global/GlobalSearch.cs
index 6401b6c..581dc67 100644
--- a/BHoM_UI/Global/GlobalSearch.cs
+++ b/BHoM_UI/Global/GlobalSearch.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -155,9 +155,20 @@ private static void M_SearchMenu_Disposed(object sender, EventArgs e)
 
         private static void ShowWithConstraint(SearchConfig config)
         {
+            var settings = BH.Engine.Settings.Query.GetSettings(typeof(BH.oM.UI.SearchSettings)) as SearchSettings;
+            List<string> excludedToolkits = new List<string>();
+            if (settings != null)
+                excludedToolkits = settings.Toolkits.Where(x => !x.Include).Select(x => x.Toolkit).ToList();
+
             if (config != null)
             {
-                m_SearchMenu.PossibleItems = m_PossibleItems.Select(x =>
+                m_SearchMenu.PossibleItems = m_PossibleItems.Where(x =>
+                {
+                    if (excludedToolkits.Any(y => x.Text.Contains(y)))
+                        return false;
+
+                    return true; //If the text does not contain any of the excluded toolkits then include it in this display
+                }).Select(x =>
                 {
                     SearchItem withWeight = x.ShallowClone() as SearchItem;
                     withWeight.Weight = withWeight.Weight(config);
@@ -166,7 +177,13 @@ private static void ShowWithConstraint(SearchConfig config)
             }
             else
             {
-                m_SearchMenu.PossibleItems = m_PossibleItems;
+                m_SearchMenu.PossibleItems = m_PossibleItems.Where(x =>
+                {
+                    if (excludedToolkits.Any(y => x.Text.Contains(y)))
+                        return false;
+
+                    return true; //If the text does not contain any of the excluded toolkits then include it in this display
+                }).ToList();
             }
 
             m_SearchMenu.HitsOnEmptySearch = config != null;
@@ -189,3 +206,4 @@ private static void ShowWithConstraint(SearchConfig config)
 
 
 
+
diff --git a/BHoM_UI/Global/Initialisation.cs b/BHoM_UI/Global/Initialisation.cs
index 0d8b5c7..bbc4034 100644
--- a/BHoM_UI/Global/Initialisation.cs
+++ b/BHoM_UI/Global/Initialisation.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -145,3 +145,4 @@ private static bool InitialiseToolkit(IInitialisationSettings settings)
 
 
 
+
diff --git a/BHoM_UI/Global/SearchMenu.cs b/BHoM_UI/Global/SearchMenu.cs
index 59399f7..5fe12b8 100644
--- a/BHoM_UI/Global/SearchMenu.cs
+++ b/BHoM_UI/Global/SearchMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -333,3 +333,4 @@ protected List<SearchItem> GetComponentItems()
 
 
 
+
diff --git a/BHoM_UI/Global/SearchMenu_WinForm.cs b/BHoM_UI/Global/SearchMenu_WinForm.cs
index 1c163a2..543437a 100644
--- a/BHoM_UI/Global/SearchMenu_WinForm.cs
+++ b/BHoM_UI/Global/SearchMenu_WinForm.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -254,3 +254,4 @@ protected override void RefreshSearchResults(List<SearchItem> hits)
 
 
 
+
diff --git a/BHoM_UI/Global/SearchMenu_Wpf.cs b/BHoM_UI/Global/SearchMenu_Wpf.cs
index bed9bd0..dcf88bf 100644
--- a/BHoM_UI/Global/SearchMenu_Wpf.cs
+++ b/BHoM_UI/Global/SearchMenu_Wpf.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -260,3 +260,4 @@ public static ImageSource GetImage(Bitmap bmp)
 
 
 
+
diff --git a/BHoM_UI/Menus/IItemSelectorMenu.cs b/BHoM_UI/Menus/IItemSelectorMenu.cs
index 89493ca..167ac71 100644
--- a/BHoM_UI/Menus/IItemSelectorMenu.cs
+++ b/BHoM_UI/Menus/IItemSelectorMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -40,3 +40,4 @@ public interface IItemSelectorMenu
 
 
 
+
diff --git a/BHoM_UI/Menus/ItemSelector.cs b/BHoM_UI/Menus/ItemSelector.cs
index 8eea69e..742ecdd 100644
--- a/BHoM_UI/Menus/ItemSelector.cs
+++ b/BHoM_UI/Menus/ItemSelector.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -127,3 +127,4 @@ private void M_Menu_ItemSelected(object sender, object e)
 
 
 
+
diff --git a/BHoM_UI/Menus/ItemSelectorMenu.cs b/BHoM_UI/Menus/ItemSelectorMenu.cs
index 2176610..0153945 100644
--- a/BHoM_UI/Menus/ItemSelectorMenu.cs
+++ b/BHoM_UI/Menus/ItemSelectorMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -112,3 +112,4 @@ protected void ReturnSelectedItem(object item)
 
 
 
+
diff --git a/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs b/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs
index 0b4bad2..f4ed17b 100644
--- a/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs
+++ b/BHoM_UI/Menus/ItemSelectorMenu_WinForm.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -176,3 +176,4 @@ protected void Search_TextChanged(object sender, EventArgs e)
 
 
 
+
diff --git a/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs b/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs
index 9e25cc5..e5cb618 100644
--- a/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs
+++ b/BHoM_UI/Menus/ItemSelectorMenu_Wpf.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -186,3 +186,4 @@ private void Menu_SizeChanged(object sender, SizeChangedEventArgs e)
 
 
 
+
diff --git a/BHoM_UI/Menus/ParamSelectorMenu.cs b/BHoM_UI/Menus/ParamSelectorMenu.cs
index 758b654..4444a25 100644
--- a/BHoM_UI/Menus/ParamSelectorMenu.cs
+++ b/BHoM_UI/Menus/ParamSelectorMenu.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -232,3 +232,4 @@ protected string ParamLabel()
 
 
 
+
diff --git a/BHoM_UI/Properties/AssemblyInfo.cs b/BHoM_UI/Properties/AssemblyInfo.cs
index 3af873c..0a2d1d6 100644
--- a/BHoM_UI/Properties/AssemblyInfo.cs
+++ b/BHoM_UI/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+
 
 
 
diff --git a/BHoM_UI/Properties/Resources.Designer.cs b/BHoM_UI/Properties/Resources.Designer.cs
index 6b688f1..b5f6719 100644
--- a/BHoM_UI/Properties/Resources.Designer.cs
+++ b/BHoM_UI/Properties/Resources.Designer.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -657,3 +657,4 @@ internal static System.Drawing.Icon BHoM_Icon
 
 
 
+
diff --git a/BHoM_Windows_UI/BHoM_Windows_UI.csproj b/BHoM_Windows_UI/BHoM_Windows_UI.csproj
new file mode 100644
index 0000000..9b62b50
--- /dev/null
+++ b/BHoM_Windows_UI/BHoM_Windows_UI.csproj
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9BA156D1-851D-4267-A94F-6F238D17B634}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>BH.UI.Base.Windows</RootNamespace>
+    <AssemblyName>BHoM_Windows_UI</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\Build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\Build\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="BHoM">
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="BHoM_Engine">
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM_Engine.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Settings_Engine">
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Settings_Engine.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Xaml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Interface\ISettingsWindow.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Settings\SearchSettingsWindow.xaml.cs">
+      <DependentUpon>SearchSettingsWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModel\ToolkitSelectItemModel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Settings\SearchSettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UI_oM\UI_oM.csproj">
+      <Project>{50d4c1ed-c16c-4365-a742-938bf49ec4b0}</Project>
+      <Name>UI_oM</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\BHoM_Logo.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetDir)$(TargetFileName)"  "$(ProgramData)\BHoM\Assemblies" /Y</PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/BHoM_Windows_UI/Interface/ISettingsWindow.cs b/BHoM_Windows_UI/Interface/ISettingsWindow.cs
new file mode 100644
index 0000000..14483f3
--- /dev/null
+++ b/BHoM_Windows_UI/Interface/ISettingsWindow.cs
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM 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 Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BH.UI.Base.Windows
+{
+    public interface ISettingsWindow
+    {
+        void OnPopUpClose();
+    }
+}
diff --git a/BHoM_Windows_UI/Properties/AssemblyInfo.cs b/BHoM_Windows_UI/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..cce90ed
--- /dev/null
+++ b/BHoM_Windows_UI/Properties/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM 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 Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("BHoM_Windows_UI")]
+[assembly: AssemblyDescription("https://github.com/BHoM/BHoM_UI")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("BuroHappold Engineering")]
+[assembly: AssemblyProduct("BHoM_Windows_UI")]
+[assembly: AssemblyCopyright("Copyright © BuroHappold Engineering 2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("9ba156d1-851d-4267-a94f-6f238d17b634")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
diff --git a/BHoM_Windows_UI/Properties/Resources.Designer.cs b/BHoM_Windows_UI/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..dbcebdd
--- /dev/null
+++ b/BHoM_Windows_UI/Properties/Resources.Designer.cs
@@ -0,0 +1,95 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM 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 Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace BH.UI.Base.Windows.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("BH.UI.Base.Windows.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap BHoM_Logo {
+            get {
+                object obj = ResourceManager.GetObject("BHoM_Logo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+    }
+}
diff --git a/BHoM_Windows_UI/Properties/Resources.resx b/BHoM_Windows_UI/Properties/Resources.resx
new file mode 100644
index 0000000..cefdf13
--- /dev/null
+++ b/BHoM_Windows_UI/Properties/Resources.resx
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="BHoM_Logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\BHoM_Logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/BHoM_Windows_UI/Resources/BHoM_Logo.png b/BHoM_Windows_UI/Resources/BHoM_Logo.png
new file mode 100644
index 0000000..e38b7cc
Binary files /dev/null and b/BHoM_Windows_UI/Resources/BHoM_Logo.png differ
diff --git a/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml
new file mode 100644
index 0000000..ded9dde
--- /dev/null
+++ b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml
@@ -0,0 +1,68 @@
+<Window x:Class="BH.UI.Base.Windows.Settings.SearchSettingsWindow"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:BH.UI.Base.Windows.Settings"
+             mc:Ignorable="d" 
+             Title="BHoM UI Settings" Height="500" Width="375"
+            ShowInTaskbar="True"
+            ResizeMode="CanMinimize"
+            WindowStartupLocation="CenterOwner"
+            Topmost="True"
+            BorderBrush="Black"
+            BorderThickness="1" WindowStyle="SingleBorderWindow">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="100"/>
+            <RowDefinition Height="75"/>
+            <RowDefinition Height="30"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="80"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+        <Image Grid.Row="0" Grid.Column="0" Margin="5,5,5,5" Height="Auto" Width="Auto" Source="..\Resources\BHoM_Logo.png"/>
+
+        <StackPanel Grid.Row="0" Grid.Column="1" Height="Auto" Width="Auto" VerticalAlignment="Center">
+            <TextBlock Margin="0 10 0 10" FontSize="20" FontFamily="Arial Black" FontWeight="Bold" TextWrapping="Wrap">
+                The Buildings and
+                <LineBreak/>
+                Habitats object Model
+            </TextBlock>
+            <TextBlock FontSize="12" FontFamily="Arial Black" TextWrapping="Wrap" VerticalAlignment="Bottom">
+            SUSTAINABLE CODE AT SCALE
+            </TextBlock>
+            <TextBlock Name="VersionTextBlock" FontSize="10" Margin="0 10 0 0" FontFamily="Arial Black" TextWrapping="Wrap" VerticalAlignment="Bottom">
+            </TextBlock>
+        </StackPanel>
+
+        <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="Refine your search results in the BHoM search menu (ctrl + shift + b) to only show items from toolkits selected below. Uncheck the box next to a toolkit to exclude that toolkit from your search results." HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="WrapWithOverflow" TextAlignment="Center" Padding="2" />
+
+        <StackPanel Grid.Row="2" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center">
+            <StackPanel.Resources>
+                <Style TargetType="{x:Type Button}">
+                    <Setter Property="Margin" Value="10,0,0,0"/>
+                    <Setter Property="Padding" Value="2" />
+                </Style>
+            </StackPanel.Resources>
+            <Button Name="SelectAllBtn" Content="Unselect all" Width="70" Background="#0DCAF0" Click="SelectAll" ToolTip="Clicking this will uncheck all toolkits currently selected."/>
+            <Button Content="Load" Width="50" Background="#F0AD4E" Click="LoadSettings" ToolTip="Select a settings file from your system to load in. You will have the chance to inspect those settings before they are used. You will need to hit the Save button to confirm those settings." />
+            <Button Content="Save"  Width="50" Background="#5CB85C" Click="SaveAll" ToolTip="Save the settings currently selected. This will export settings to your harddrive so they can be loaded again next time you use BHoM, as well as loaded into memory to take effect from the point you hit this button. The settings window will close once settings are saved."/>
+        </StackPanel>
+        
+        <ScrollViewer Grid.Row="3" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" Padding="2">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+
+                <StackPanel Name="ToolkitCheckboxGridLeft" Grid.Column="0" />
+                <StackPanel Name="ToolkitCheckboxGridRight" Grid.Column="1" />
+            </Grid>
+        </ScrollViewer>
+    </Grid>
+</Window>
diff --git a/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml.cs b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml.cs
new file mode 100644
index 0000000..988ffad
--- /dev/null
+++ b/BHoM_Windows_UI/Settings/SearchSettingsWindow.xaml.cs
@@ -0,0 +1,246 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM 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 Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics.Eventing.Reader;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+using BH.Engine.Settings;
+using BH.oM.UI;
+using BH.UI.Base.Windows.ViewModel;
+
+namespace BH.UI.Base.Windows.Settings
+{
+
+    public partial class SearchSettingsWindow : Window
+    {
+
+        public SearchSettingsWindow(ISettingsWindow parent)
+        {
+            InitializeComponent();
+            LoadSettings();
+            LoadFromLoadedAssemblies();
+
+            m_ToolkitItems = m_ToolkitItems.OrderBy(x => x.Toolkit).ToList();
+            m_ToolkitItems.ForEach(x => ConvertToCheckbox(x));
+
+            UIParent = parent;
+
+            this.ShowDialog();
+        }
+
+        /*************************************/
+
+        private void LoadSettings()
+        {
+            var existingSettings = Query.GetSettings(typeof(BH.oM.UI.SearchSettings)) as SearchSettings;
+            if (existingSettings != null)
+            {
+                m_Settings = existingSettings;
+                m_ToolkitItems.AddRange(existingSettings.Toolkits.Select(x => new ToolkitSelectItemModel(x)));
+            }
+            else
+                m_Settings = new SearchSettings();
+        }
+
+        /*************************************/
+
+        private void LoadFromLoadedAssemblies()
+        {
+            var allTypes = BH.Engine.Base.Query.BHoMTypeList();
+            var fullNames = allTypes.Select(x => x.FullName).ToList();
+
+            var toolkits = fullNames.Select(x =>
+            {
+                var split = x.Split('.');
+                if (split.Length < 3)
+                    return null;
+
+                var toolkit = split[2];
+                if (toolkit == "Adapters" || toolkit == "Revit" && split.Length > 3)
+                    toolkit = split[3];
+
+                return toolkit;
+            }).Where(x => !string.IsNullOrEmpty(x)).ToList();
+
+            var toolkitItems = toolkits.Distinct().Select(x =>
+            {
+                return new ToolkitSelectItem()
+                {
+                    Toolkit = x,
+                    Include = true,
+                };
+            }).ToList();
+
+            toolkitItems = toolkitItems.Where(x => !m_ToolkitItems.Any(y => y.Toolkit == x.Toolkit)).ToList();
+            m_ToolkitItems.AddRange(toolkitItems.Select(x => new ToolkitSelectItemModel(x)));
+        }
+
+        /*************************************/
+
+        private void ConvertToCheckbox(ToolkitSelectItemModel toolkitItem)
+        {
+            CheckBox checkBox = new CheckBox();
+            checkBox.IsChecked = toolkitItem.Include;
+            checkBox.HorizontalAlignment = HorizontalAlignment.Right;
+            checkBox.Margin = new Thickness(10, 0, 0, 0);
+
+            var bind = new Binding();
+            bind.Source = toolkitItem;
+            bind.Path = new PropertyPath("Include");
+            bind.UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged;
+            bind.Mode = BindingMode.TwoWay;
+            BindingOperations.SetBinding(checkBox, CheckBox.IsCheckedProperty, bind);
+            
+            TextBlock textBlock = new TextBlock();
+            textBlock.Text = toolkitItem.Toolkit;
+            textBlock.HorizontalAlignment = HorizontalAlignment.Left;
+            textBlock.VerticalAlignment = VerticalAlignment.Center;
+            textBlock.TextAlignment = TextAlignment.Center;
+            textBlock.Margin = new Thickness(2, 0, 0, 0);
+
+            StackPanel childPanel = new StackPanel();
+            childPanel.Orientation = Orientation.Horizontal;
+            childPanel.Children.Add(checkBox);
+            childPanel.Children.Add(textBlock);
+            childPanel.Margin = new Thickness(0, 0, 0, 10);
+
+            if(m_PanelIndex == 0)
+            {
+                ToolkitCheckboxGridLeft.Children.Add(childPanel);
+                m_PanelIndex++;
+            }
+            else if(m_PanelIndex == 1)
+            {
+                ToolkitCheckboxGridRight.Children.Add(childPanel);
+                m_PanelIndex = 0;
+            }
+        }
+
+        /*************************************/
+
+        private void LoadSettings(object sender, EventArgs e)
+        {
+            Microsoft.Win32.OpenFileDialog openFileDlg = new Microsoft.Win32.OpenFileDialog();
+            openFileDlg.DefaultExt = ".json";
+            openFileDlg.Filter = "JSON Files (*json)|*json";
+
+            bool? result = openFileDlg.ShowDialog();
+            if (result.HasValue && result.Value)
+            {
+                var filePath = openFileDlg.FileName;
+                try
+                {
+                    BH.Engine.Base.Compute.ThrowErrorsAsExceptions(true);
+                    BH.Engine.Settings.Compute.LoadSettingsFromFile(filePath);
+                    BH.Engine.Base.Compute.ThrowErrorsAsExceptions(false);
+
+                    var existingSettings = Query.GetSettings(typeof(BH.oM.UI.SearchSettings)) as SearchSettings;
+                    if (existingSettings != null)
+                    {
+                        m_Settings = existingSettings;
+                        existingSettings.Toolkits.ForEach(x =>
+                        {
+                            var item = m_ToolkitItems.Where(y => y.Toolkit == x.Toolkit).FirstOrDefault();
+                            if (item == null)
+                            {
+                                var newModel = new ToolkitSelectItemModel(x);
+                                ConvertToCheckbox(newModel);
+                                m_ToolkitItems.Add(newModel);
+                            }
+                            else
+                                item.Include = x.Include;
+                        });
+
+                        m_ToolkitItems = m_ToolkitItems.OrderBy(x => x.Toolkit).ToList();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show($"An error occurred in loading that settings file. Settings have not been loaded. The error recorded was {ex.Message}", "Error loading settings file.", MessageBoxButton.OK);
+                    BH.Engine.Base.Compute.ThrowErrorsAsExceptions(false); //Just in case - belt and braces
+                }
+            }
+        }
+
+        /*************************************/
+
+        private void SaveAll(object sender, EventArgs e)
+        {
+            m_Settings.Toolkits = m_ToolkitItems.Select(x => x.ToItem()).ToList();
+            BH.Engine.Settings.Compute.SaveSettings(m_Settings, true);
+            this.Close();
+        }
+
+        /*************************************/
+
+        private void SelectAll(object sender, EventArgs e)
+        {
+            m_SelectAll = !m_SelectAll;
+            m_ToolkitItems.ForEach(x => x.Include = m_SelectAll);
+
+            if (m_SelectAll)
+            {
+                SelectAllBtn.Content = "Unselect all";
+                SelectAllBtn.ToolTip = "Clicking this will uncheck all toolkits currently selected.";
+            }
+            else
+            {
+                SelectAllBtn.Content = "Select all";
+                SelectAllBtn.ToolTip = "Clicking this will check all toolkits currently not selected.";
+            }
+        }
+
+        /*************************************/
+
+        protected override void OnClosed(EventArgs e)
+        {
+            UIParent.OnPopUpClose();
+            base.OnClosed(e);
+        }
+
+        /***************************************************/
+        /**** Private Properties                        ****/
+        /***************************************************/
+
+        private int m_PanelIndex = 0;
+        private bool m_SelectAll = true;
+
+        private List<ToolkitSelectItemModel> m_ToolkitItems = new List<ToolkitSelectItemModel>();
+        private SearchSettings m_Settings = null;
+        private ISettingsWindow UIParent { get; set; }
+    }
+}
diff --git a/BHoM_Windows_UI/ViewModel/ToolkitSelectItemModel.cs b/BHoM_Windows_UI/ViewModel/ToolkitSelectItemModel.cs
new file mode 100644
index 0000000..e1c35ee
--- /dev/null
+++ b/BHoM_Windows_UI/ViewModel/ToolkitSelectItemModel.cs
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the Buildings and Habitats object Model (BHoM)
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
+ *
+ * Each contributor holds copyright over their respective contributions.
+ * The project versioning (Git) records all such contribution source information.
+ *                                           
+ *                                                                              
+ * The BHoM is free software: you can redistribute it and/or modify         
+ * it under the terms of the GNU Lesser General Public License as published by  
+ * the Free Software Foundation, either version 3.0 of the License, or          
+ * (at your option) any later version.                                          
+ *                                                                              
+ * The BHoM 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 Lesser General Public License for more details.                          
+ *                                                                            
+ * You should have received a copy of the GNU Lesser General Public License     
+ * along with this code. If not, see <https://www.gnu.org/licenses/lgpl-3.0.html>.      
+ */
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using BH.oM.UI;
+
+namespace BH.UI.Base.Windows.ViewModel
+{
+    internal class ToolkitSelectItemModel : INotifyPropertyChanged
+    {
+        public ToolkitSelectItemModel(ToolkitSelectItem item)
+        {
+            Toolkit = item.Toolkit;
+            Include = item.Include;
+        }
+
+        public ToolkitSelectItem ToItem()
+        {
+            return new ToolkitSelectItem()
+            {
+                Toolkit = this.Toolkit,
+                Include = this.Include,
+            };
+        }
+
+        private bool m_Include;
+
+        public virtual string Toolkit { get; set; }
+        public virtual bool Include
+        { 
+            get
+            {
+                return m_Include;
+            }
+            set
+            {
+                m_Include = value;
+                NotifyPropertyChanged();
+            }    
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            if(PropertyChanged != null)
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/UI_Engine/Compute/Constructor.cs b/UI_Engine/Compute/Constructor.cs
index 670ae5a..c175bdc 100644
--- a/UI_Engine/Compute/Constructor.cs
+++ b/UI_Engine/Compute/Constructor.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -70,3 +70,4 @@ public static Func<object[], object> Constructor(Type type, List<ParamInfo> para
 
 
 
+
diff --git a/UI_Engine/Compute/ConstructorText.cs b/UI_Engine/Compute/ConstructorText.cs
index 8bf2880..58e9042 100644
--- a/UI_Engine/Compute/ConstructorText.cs
+++ b/UI_Engine/Compute/ConstructorText.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -90,3 +90,4 @@ public static string ConstructorText(this Type type, int maxParams = 5, int maxC
 
 
 
+
diff --git a/UI_Engine/Compute/LoadAssemblies.cs b/UI_Engine/Compute/LoadAssemblies.cs
index a6449b8..b1d888e 100644
--- a/UI_Engine/Compute/LoadAssemblies.cs
+++ b/UI_Engine/Compute/LoadAssemblies.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ public static void LoadAssemblies()
 
 
 
+
diff --git a/UI_Engine/Compute/LogUsage.cs b/UI_Engine/Compute/LogUsage.cs
index 2567ca0..030771a 100644
--- a/UI_Engine/Compute/LogUsage.cs
+++ b/UI_Engine/Compute/LogUsage.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -224,3 +224,4 @@ private static void TriggerUIEndOpening()
 
 
 
+
diff --git a/UI_Engine/Compute/Organise.cs b/UI_Engine/Compute/Organise.cs
index 3bde5bd..4a4bb39 100644
--- a/UI_Engine/Compute/Organise.cs
+++ b/UI_Engine/Compute/Organise.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -133,3 +133,4 @@ private static Output<List<SearchItem>, Tree<object>> OrganiseObjects(this List<
 
 
 
+
diff --git a/UI_Engine/Compute/RecordError.cs b/UI_Engine/Compute/RecordError.cs
index 85f520b..b5db393 100644
--- a/UI_Engine/Compute/RecordError.cs
+++ b/UI_Engine/Compute/RecordError.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -81,3 +81,4 @@ public static void RecordExecutionError(Exception e)
 
 
 
+
diff --git a/UI_Engine/Compute/SaveSettings.cs b/UI_Engine/Compute/SaveSettings.cs
index 8cf9254..7af8cd1 100644
--- a/UI_Engine/Compute/SaveSettings.cs
+++ b/UI_Engine/Compute/SaveSettings.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -75,3 +75,4 @@ public static bool SaveSettings(ISettings settings)
 
 
 
+
diff --git a/UI_Engine/Compute/SetProjectID.cs b/UI_Engine/Compute/SetProjectID.cs
index c995e33..d21ea59 100644
--- a/UI_Engine/Compute/SetProjectID.cs
+++ b/UI_Engine/Compute/SetProjectID.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -65,3 +65,4 @@ public static bool SetProjectID(string projectID)
 
 
 
+
diff --git a/UI_Engine/Create/InputAccessor.cs b/UI_Engine/Create/InputAccessor.cs
index a08fa75..ac4c47f 100644
--- a/UI_Engine/Create/InputAccessor.cs
+++ b/UI_Engine/Create/InputAccessor.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -98,3 +98,4 @@ public static Func<IDataAccessor, int, object> InputAccessor(Type accessorType,
 
 
 
+
diff --git a/UI_Engine/Create/OutputAccessor.cs b/UI_Engine/Create/OutputAccessor.cs
index 2387b10..6c579bd 100644
--- a/UI_Engine/Create/OutputAccessor.cs
+++ b/UI_Engine/Create/OutputAccessor.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -62,3 +62,4 @@ public static Func<IDataAccessor, object, int, bool> OutputAccessor(Type accesso
 
 
 
+
diff --git a/UI_Engine/Create/ParamInfo.cs b/UI_Engine/Create/ParamInfo.cs
index dde2d80..4c495e0 100644
--- a/UI_Engine/Create/ParamInfo.cs
+++ b/UI_Engine/Create/ParamInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -105,3 +105,4 @@ public static ParamInfo ParamInfo(this ParameterInfo parameter, string descripti
 
 
 
+
diff --git a/UI_Engine/Objects/DocumentLoading.cs b/UI_Engine/Objects/DocumentLoading.cs
index 597af21..2657968 100644
--- a/UI_Engine/Objects/DocumentLoading.cs
+++ b/UI_Engine/Objects/DocumentLoading.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -42,3 +42,4 @@ public static void SetDocumentOpeningState(bool state)
     }
 }
 
+
diff --git a/UI_Engine/Properties/AssemblyInfo.cs b/UI_Engine/Properties/AssemblyInfo.cs
index 1d3a0a0..20492e0 100644
--- a/UI_Engine/Properties/AssemblyInfo.cs
+++ b/UI_Engine/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+
 
 
 
diff --git a/UI_Engine/Query/AreMatching.cs b/UI_Engine/Query/AreMatching.cs
index 64521e1..435fb12 100644
--- a/UI_Engine/Query/AreMatching.cs
+++ b/UI_Engine/Query/AreMatching.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -60,3 +60,4 @@ public static bool AreMatching(List<PropertyInfo> props, List<ParamInfo> oldList
 
 
 
+
diff --git a/UI_Engine/Query/Changes.cs b/UI_Engine/Query/Changes.cs
index ddb844f..b4096a7 100644
--- a/UI_Engine/Query/Changes.cs
+++ b/UI_Engine/Query/Changes.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -114,3 +114,4 @@ private static void Move(this List<ParamInfo> list, int from, int to)
 
 
 
+
diff --git a/UI_Engine/Query/Depth.cs b/UI_Engine/Query/Depth.cs
index 406e146..ccd1bd4 100644
--- a/UI_Engine/Query/Depth.cs
+++ b/UI_Engine/Query/Depth.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -48,3 +48,4 @@ public static int Depth(this ParamInfo info)
 
 
 
+
diff --git a/UI_Engine/Query/Hits.cs b/UI_Engine/Query/Hits.cs
index 1be57a4..91deb19 100644
--- a/UI_Engine/Query/Hits.cs
+++ b/UI_Engine/Query/Hits.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -60,3 +60,4 @@ public static List<SearchItem> Hits(this List<SearchItem> items, string search,
 
 
 
+
diff --git a/UI_Engine/Query/Information.cs b/UI_Engine/Query/Information.cs
index 6162eb4..b24ba09 100644
--- a/UI_Engine/Query/Information.cs
+++ b/UI_Engine/Query/Information.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -107,3 +107,4 @@ public static BHoMInformation Information()
         }
     }
 }
+
diff --git a/UI_Engine/Query/Items.cs b/UI_Engine/Query/Items.cs
index 3b76b0e..399fe85 100644
--- a/UI_Engine/Query/Items.cs
+++ b/UI_Engine/Query/Items.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -192,3 +192,4 @@ public static List<MethodBase> ExternalItems()
 
 
 
+
diff --git a/UI_Engine/Query/MatchWith.cs b/UI_Engine/Query/MatchWith.cs
index 8381f9d..2a1a3a2 100644
--- a/UI_Engine/Query/MatchWith.cs
+++ b/UI_Engine/Query/MatchWith.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -102,3 +102,4 @@ private static bool IsMatchingName(this ParamInfo param, string name)
 
 
 
+
diff --git a/UI_Engine/Query/OutputParams.cs b/UI_Engine/Query/OutputParams.cs
index f7df8df..9a0fa0b 100644
--- a/UI_Engine/Query/OutputParams.cs
+++ b/UI_Engine/Query/OutputParams.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -148,7 +148,7 @@ private static void CollectOutputTypes(IEnumerable<IDictionary> objects, ref Dic
 
         private static void CollectOutputTypes(IEnumerable<CustomObject> objects, ref Dictionary<string, List<Type>> properties)
         {
-            foreach (KeyValuePair<string, object> prop in objects.SelectMany(x => x.CustomData).Distinct())
+            foreach (KeyValuePair<string, object> prop in objects.SelectMany(x => x.CustomData))
             {
                 if (!properties.ContainsKey(prop.Key))
                     properties[prop.Key] = new List<Type>();
@@ -183,3 +183,4 @@ private static void CollectOutputTypes(Type type, ref Dictionary<string, List<Ty
 
 
 
+
diff --git a/UI_Engine/Query/SelectionIndex.cs b/UI_Engine/Query/SelectionIndex.cs
index 22ee9ef..53608ea 100644
--- a/UI_Engine/Query/SelectionIndex.cs
+++ b/UI_Engine/Query/SelectionIndex.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -52,3 +52,4 @@ public static int SelectionIndex(this List<ParamInfo> parameters, int index)
 
 
 
+
diff --git a/UI_Engine/Query/Settings.cs b/UI_Engine/Query/Settings.cs
index 900af02..9a019f2 100644
--- a/UI_Engine/Query/Settings.cs
+++ b/UI_Engine/Query/Settings.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -108,3 +108,4 @@ public static ISettings Settings(string toolkitName)
 
 
 
+
diff --git a/UI_Engine/Query/SubType.cs b/UI_Engine/Query/SubType.cs
index b93bdb5..4ab6fe4 100644
--- a/UI_Engine/Query/SubType.cs
+++ b/UI_Engine/Query/SubType.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -48,3 +48,4 @@ public static Type SubType(this ParamInfo info)
 
 
 
+
diff --git a/UI_Engine/Query/ToText.cs b/UI_Engine/Query/ToText.cs
index 6bcd442..b66229a 100644
--- a/UI_Engine/Query/ToText.cs
+++ b/UI_Engine/Query/ToText.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -102,3 +102,4 @@ private static string ToText(IParamUpdate update)
 
 
 
+
diff --git a/UI_Engine/Query/UsageLogFileName.cs b/UI_Engine/Query/UsageLogFileName.cs
index 6951d91..b56988f 100644
--- a/UI_Engine/Query/UsageLogFileName.cs
+++ b/UI_Engine/Query/UsageLogFileName.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -54,3 +54,4 @@ public static string UsageLogFileName(string uiName)
     }
 }
 
+
diff --git a/UI_Engine/Query/UsageLogFolder.cs b/UI_Engine/Query/UsageLogFolder.cs
index 72171c4..3d9a1d5 100644
--- a/UI_Engine/Query/UsageLogFolder.cs
+++ b/UI_Engine/Query/UsageLogFolder.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -48,3 +48,4 @@ public static string UsageLogFolder()
     }
 }
 
+
diff --git a/UI_Engine/Query/Weight.cs b/UI_Engine/Query/Weight.cs
index cef8a7d..8780f53 100644
--- a/UI_Engine/Query/Weight.cs
+++ b/UI_Engine/Query/Weight.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -242,3 +242,4 @@ private static Type TryGetPropertyType(this PropertyInfo property)
 
 
 
+
diff --git a/UI_oM/BHoMInformation.cs b/UI_oM/BHoMInformation.cs
index 7ee295f..982052c 100644
--- a/UI_oM/BHoMInformation.cs
+++ b/UI_oM/BHoMInformation.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -39,3 +39,4 @@ public class BHoMInformation : BHoMObject
         public virtual List<string> Assemblies { get; set; }
     }
 }
+
diff --git a/UI_oM/ComponentRequest.cs b/UI_oM/ComponentRequest.cs
index 3f6a093..b2e2360 100644
--- a/UI_oM/ComponentRequest.cs
+++ b/UI_oM/ComponentRequest.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -49,3 +49,4 @@ public class ComponentRequest : BHoMObject
 
 
 
+
diff --git a/UI_oM/CustomItem.cs b/UI_oM/CustomItem.cs
index 561fae0..1896484 100644
--- a/UI_oM/CustomItem.cs
+++ b/UI_oM/CustomItem.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -49,3 +49,4 @@ public class CustomItem : BHoMObject
 
 
 
+
diff --git a/UI_oM/Interfaces/IDataAccessor.cs b/UI_oM/Interfaces/IDataAccessor.cs
index 75f1921..d6e31b8 100644
--- a/UI_oM/Interfaces/IDataAccessor.cs
+++ b/UI_oM/Interfaces/IDataAccessor.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -67,3 +67,4 @@ public interface IDataAccessor : IObject
         /*************************************/
     }
 }
+
diff --git a/UI_oM/Interfaces/IParamUpdate.cs b/UI_oM/Interfaces/IParamUpdate.cs
index 7b56447..1b1300e 100644
--- a/UI_oM/Interfaces/IParamUpdate.cs
+++ b/UI_oM/Interfaces/IParamUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -41,3 +41,4 @@ public interface IParamUpdate : IUpdate, IObject
         /***************************************************/
     }
 }
+
diff --git a/UI_oM/Interfaces/IUpdate.cs b/UI_oM/Interfaces/IUpdate.cs
index 707fe13..5f20ce5 100644
--- a/UI_oM/Interfaces/IUpdate.cs
+++ b/UI_oM/Interfaces/IUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -35,3 +35,4 @@ public interface IUpdate : IObject
 
     }
 }
+
diff --git a/UI_oM/ParamInfo.cs b/UI_oM/ParamInfo.cs
index 778502b..78a95d9 100644
--- a/UI_oM/ParamInfo.cs
+++ b/UI_oM/ParamInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -58,3 +58,4 @@ public class ParamInfo : BHoMObject
 
 
 
+
diff --git a/UI_oM/ParamKind.cs b/UI_oM/ParamKind.cs
index f0aa638..610ced4 100644
--- a/UI_oM/ParamKind.cs
+++ b/UI_oM/ParamKind.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -39,3 +39,4 @@ public enum ParamKind
 
 
 
+
diff --git a/UI_oM/ParamOldIndexFragment.cs b/UI_oM/ParamOldIndexFragment.cs
index 1870667..7294714 100644
--- a/UI_oM/ParamOldIndexFragment.cs
+++ b/UI_oM/ParamOldIndexFragment.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public class ParamOldIndexFragment : IFragment
 
 
 
+
diff --git a/UI_oM/PreviousNamesFragment.cs b/UI_oM/PreviousNamesFragment.cs
index 23df3c7..764fcda 100644
--- a/UI_oM/PreviousNamesFragment.cs
+++ b/UI_oM/PreviousNamesFragment.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public class PreviousNamesFragment : IFragment
 
 
 
+
diff --git a/UI_oM/ProjectIDEvent.cs b/UI_oM/ProjectIDEvent.cs
index fe72dcf..38021f6 100644
--- a/UI_oM/ProjectIDEvent.cs
+++ b/UI_oM/ProjectIDEvent.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -49,3 +49,4 @@ public class ProjectIDEvent : Event
 
 
 
+
diff --git a/UI_oM/Properties/AssemblyInfo.cs b/UI_oM/Properties/AssemblyInfo.cs
index b70bf91..0a7f59a 100644
--- a/UI_oM/Properties/AssemblyInfo.cs
+++ b/UI_oM/Properties/AssemblyInfo.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -55,7 +55,8 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+
 
 
 
diff --git a/UI_oM/SearchConfig.cs b/UI_oM/SearchConfig.cs
index 24d7847..134a2d1 100644
--- a/UI_oM/SearchConfig.cs
+++ b/UI_oM/SearchConfig.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class SearchConfig : BHoMObject
 
 
 
+
diff --git a/UI_oM/SearchItem.cs b/UI_oM/SearchItem.cs
index 0f0e5cf..05dad27 100644
--- a/UI_oM/SearchItem.cs
+++ b/UI_oM/SearchItem.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -54,3 +54,4 @@ public class SearchItem : BHoMObject
 
 
 
+
diff --git a/UI_oM/Interfaces/IInitialisationSettings.cs b/UI_oM/Settings/SearchSettings.cs
similarity index 84%
rename from UI_oM/Interfaces/IInitialisationSettings.cs
rename to UI_oM/Settings/SearchSettings.cs
index fe2361e..c190952 100644
--- a/UI_oM/Interfaces/IInitialisationSettings.cs
+++ b/UI_oM/Settings/SearchSettings.cs
@@ -1,6 +1,6 @@
-/*
+/*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -23,27 +23,21 @@
 using BH.oM.Base;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BH.oM.UI
 {
-    [Description("Toolkit Settings that contain an initialisation method to be ran when the UI starts.")]
-    public interface IInitialisationSettings : IImmutable
+    public class SearchSettings : ISettings
     {
         /***************************************************/
         /**** Properties                                ****/
         /***************************************************/
 
-        string InitialisationMethod { get; }
+        public virtual List<ToolkitSelectItem> Toolkits { get; set; } = new List<ToolkitSelectItem>();
 
         /***************************************************/
     }
-}
-
-
-
-
+}
\ No newline at end of file
diff --git a/UI_oM/UsageLogEntry.cs b/UI_oM/Settings/ToolkitSelectItem.cs
similarity index 58%
rename from UI_oM/UsageLogEntry.cs
rename to UI_oM/Settings/ToolkitSelectItem.cs
index af28c0a..045a2c0 100644
--- a/UI_oM/UsageLogEntry.cs
+++ b/UI_oM/Settings/ToolkitSelectItem.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -21,48 +21,22 @@
  */
 
 using BH.oM.Base;
-using BH.oM.Base.Debugging;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace BH.oM.UI
 {
-    public class UsageLogEntry : BHoMObject
+    [Description("For each toolkit in BHoM, allocate a boolean flag for whether it should appear in search results or not.")]
+    public class ToolkitSelectItem : BHoMObject
     {
-        /***************************************************/
-        /**** Properties                                ****/
-        /***************************************************/
+        [Description("The name of the toolkit that this item refers to.")]
+        public virtual string Toolkit { get; set; }
 
-        public virtual DateTime Time { get; set; } = DateTime.UtcNow;
-
-        public virtual string UI { get; set; } = "";
-
-        public virtual string UiVersion { get; set; } = "";
-
-        public virtual string BHoMVersion { get; set; } = "";
-
-        public virtual Guid ComponentId { get; set; } = Guid.Empty;
-
-        public virtual string CallerName { get; set; } = "";
-
-        public virtual object SelectedItem { get; set; } = null;
-
-        public virtual string FileId { get; set; } = "";
-
-        public virtual string FileName { get; set; } = "";
-
-        public virtual string ProjectID { get; set; } = "";
-
-        public virtual List<Event> Errors { get; set; } = new List<Event>();
-
-
-        /***************************************************/
+        [Description("Determine whether to include the toolkit in search results or not.")]
+        public virtual bool Include { get; set; } = true;
     }
-}
-
-
-
-
+}
\ No newline at end of file
diff --git a/UI_oM/TriggerLogUsageArgs.cs b/UI_oM/TriggerLogUsageArgs.cs
index a6217c0..c2a3edd 100644
--- a/UI_oM/TriggerLogUsageArgs.cs
+++ b/UI_oM/TriggerLogUsageArgs.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -41,3 +41,4 @@ public class TriggerLogUsageArgs : EventArgs, IObject
     }
 }
 
+
diff --git a/UI_oM/UI_oM.csproj b/UI_oM/UI_oM.csproj
index 12edf1a..7859e79 100644
--- a/UI_oM/UI_oM.csproj
+++ b/UI_oM/UI_oM.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -32,12 +32,12 @@
   <ItemGroup>
     <Reference Include="BHoM">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\BHoM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\BHoM.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Geometry_oM">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>C:\ProgramData\BHoM\Assemblies\Geometry_oM.dll</HintPath>
+      <HintPath>$(ProgramData)\BHoM\Assemblies\Geometry_oM.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System" />
@@ -55,6 +55,8 @@
     <Compile Include="ComponentRequest.cs" />
     <Compile Include="Interfaces\IDataAccessor.cs" />
     <Compile Include="PreviousNamesFragment.cs" />
+    <Compile Include="Settings\SearchSettings.cs" />
+    <Compile Include="Settings\ToolkitSelectItem.cs" />
     <Compile Include="TriggerLogUsageArgs.cs" />
     <Compile Include="Updates\OutputsUpdate.cs" />
     <Compile Include="Updates\InputsUpdate.cs" />
@@ -67,9 +69,7 @@
     <Compile Include="Updates\ComponentUpdate.cs" />
     <Compile Include="Updates\CallerUpdate.cs" />
     <Compile Include="Updates\CallerUpdateCause.cs" />
-    <Compile Include="Interfaces\IInitialisationSettings.cs" />
     <Compile Include="ProjectIDEvent.cs" />
-    <Compile Include="UsageLogEntry.cs" />
     <Compile Include="ParamOldIndexFragment.cs" />
     <Compile Include="CustomItem.cs" />
     <Compile Include="SearchConfig.cs" />
@@ -89,4 +89,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UI_oM/Updates/CallerUpdate.cs b/UI_oM/Updates/CallerUpdate.cs
index c998176..8367e3c 100644
--- a/UI_oM/Updates/CallerUpdate.cs
+++ b/UI_oM/Updates/CallerUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -51,3 +51,4 @@ public class CallerUpdate : BHoMObject, IUpdate
 
 
 
+
diff --git a/UI_oM/Updates/CallerUpdateCause.cs b/UI_oM/Updates/CallerUpdateCause.cs
index 4ca93a4..f6378b1 100644
--- a/UI_oM/Updates/CallerUpdateCause.cs
+++ b/UI_oM/Updates/CallerUpdateCause.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -46,3 +46,4 @@ public enum CallerUpdateCause
 
 
 
+
diff --git a/UI_oM/Updates/ComponentUpdate.cs b/UI_oM/Updates/ComponentUpdate.cs
index a155b47..057d2bd 100644
--- a/UI_oM/Updates/ComponentUpdate.cs
+++ b/UI_oM/Updates/ComponentUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class ComponentUpdate : BHoMObject, IUpdate
 
 
 
+
diff --git a/UI_oM/Updates/InputsUpdate.cs b/UI_oM/Updates/InputsUpdate.cs
index 18ac3a1..96ae6ef 100644
--- a/UI_oM/Updates/InputsUpdate.cs
+++ b/UI_oM/Updates/InputsUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public class InputsUpdate : BHoMObject, IUpdate
 
 
 
+
diff --git a/UI_oM/Updates/OutputsUpdate.cs b/UI_oM/Updates/OutputsUpdate.cs
index 739dfc3..e67c42e 100644
--- a/UI_oM/Updates/OutputsUpdate.cs
+++ b/UI_oM/Updates/OutputsUpdate.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public class OutputsUpdate : BHoMObject, IUpdate
 
 
 
+
diff --git a/UI_oM/Updates/ParamAdded.cs b/UI_oM/Updates/ParamAdded.cs
index e460f06..91c7d4f 100644
--- a/UI_oM/Updates/ParamAdded.cs
+++ b/UI_oM/Updates/ParamAdded.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class ParamAdded : BHoMObject, IParamUpdate
 
 
 
+
diff --git a/UI_oM/Updates/ParamMoved.cs b/UI_oM/Updates/ParamMoved.cs
index f98e662..9eff4f4 100644
--- a/UI_oM/Updates/ParamMoved.cs
+++ b/UI_oM/Updates/ParamMoved.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class ParamMoved : BHoMObject, IParamUpdate
 
 
 
+
diff --git a/UI_oM/Updates/ParamRemoved.cs b/UI_oM/Updates/ParamRemoved.cs
index f6c64d0..a912eb9 100644
--- a/UI_oM/Updates/ParamRemoved.cs
+++ b/UI_oM/Updates/ParamRemoved.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -45,3 +45,4 @@ public class ParamRemoved : BHoMObject, IParamUpdate
 
 
 
+
diff --git a/UI_oM/Updates/ParamReplaced.cs b/UI_oM/Updates/ParamReplaced.cs
index 5236294..903c3b3 100644
--- a/UI_oM/Updates/ParamReplaced.cs
+++ b/UI_oM/Updates/ParamReplaced.cs
@@ -1,6 +1,6 @@
 /*
  * This file is part of the Buildings and Habitats object Model (BHoM)
- * Copyright (c) 2015 - 2023, the respective contributors. All rights reserved.
+ * Copyright (c) 2015 - 2024, the respective contributors. All rights reserved.
  *
  * Each contributor holds copyright over their respective contributions.
  * The project versioning (Git) records all such contribution source information.
@@ -47,3 +47,4 @@ public class ParamUpdated : BHoMObject, IParamUpdate
 
 
 
+