diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1efeba6a8..49d7d2d32 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,30 +1,46 @@
 <!---
 
-Provide a short summary in the Title above. Examples of good PR titles:
+Provide a short summary in the Title above. Use the following template:
 
-* "Feature: adds metrics to component"
+category(project): summary
 
-* "Fix: resolves duplication in comment thread"
+Categories:
 
-* "Update: apollo v2.34.0"
+* feat: (new feature for the user, not a new feature for build script)
+* fix: (bug fix for the user, not a fix to a build script)
+* docs: (changes to the documentation)
+* style: (formatting, missing semi colons, etc; no production code change)
+* refactor: (refactoring production code, eg. renaming a variable)
+* test: (adding missing tests, refactoring tests; no production code change)
+* chore: (updating grunt tasks etc; no production code change)
+
+Example:
+
+feat(revit): added category filter to send
 
 -->
 
-## Description & motivation
+## Description
 
 <!---
 
-Describe your changes, and why you're making them.  What benefit will this have to others?
+Describe your changes, and why you're making them.
+
+Link related github issues here ->
+Fixes #85, Fixes #22, Connects #123
 
-Is this linked to an open Github issue, a thread in Speckle community,
-or another pull request? Link it here.
+-->
+
+## User Value
 
-If it is related to a Github issue, and resolves it, please link to the issue number, e.g.:
-Fixes #85, Fixes #22, Fixes username/repo#123
-Connects #123
+<!---
 
+Describe in 1 sentence the user value.
+
+This can also be a link to the relevant thread in Speckle community, or a link to the Linear issue.
 -->
 
+
 ## Changes:
 
 <!---
@@ -68,35 +84,10 @@ Describe what tests have been added or amended, and why these demonstrate it wor
 
 <!---
 
-This checklist is mostly useful as a reminder of small things that can easily be
-
-forgotten – it is meant as a helpful tool rather than hoops to jump through.
-
-Put an `x` between the square brackets, e.g. [x], for all the items that apply,
-
-make notes next to any that haven't been addressed, and remove any items that are not relevant to this PR.
+This checklist is a useful reminder of related tasks to uphold our repo quality. Amend this list as needed for the pr.
 
 -->
-
-- [ ] My pull request follows the guidelines in the [Contributing guide](https://github.com/specklesystems/speckle-server/blob/main/CONTRIBUTING.md)?
-- [ ] My pull request does not duplicate any other open [Pull Requests](../../pulls) for the same update/change?
 - [ ] My commits are related to the pull request and do not amend unrelated code or documentation.
-- [ ] My code follows a similar style to existing code.
 - [ ] I have added appropriate tests.
 - [ ] I have updated or added relevant documentation.
 
-## References
-
-<!---
-
-(Optional -- remove this section if not needed )
-
-Include **important** links regarding the implementation of this PR.
-
-This usually includes a RFC or an aggregation of issues and/or individual conversations
-
-that helped put this solution together. This helps ensure we retain and share knowledge
-
-regarding the implementation, and may help others understand motivation and design decisions etc..
-
--->
diff --git a/.github/workflows/ci.yml b/.github/workflows/pr.yml
similarity index 100%
rename from .github/workflows/ci.yml
rename to .github/workflows/pr.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/release.yml
similarity index 100%
rename from .github/workflows/main.yml
rename to .github/workflows/release.yml
diff --git a/Build/Consts.cs b/Build/Consts.cs
index 8fa95d562..965100be5 100644
--- a/Build/Consts.cs
+++ b/Build/Consts.cs
@@ -58,6 +58,13 @@ public static class Consts
         new("Connectors/Tekla/Speckle.Connector.Tekla2023", "net48"),
         new("Connectors/Tekla/Speckle.Connector.Tekla2024", "net48")
       ]
+    ),
+    new(
+      "etabs",
+      [
+        new("Connectors/CSi/Speckle.Connectors.ETABS21", "net48"),
+        new("Connectors/CSi/Speckle.Connectors.ETABS22", "net8.0-windows"),
+      ]
     )
   };
 }
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSelectionBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSelectionBinding.cs
index d243d12b7..180156939 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSelectionBinding.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSelectionBinding.cs
@@ -12,15 +12,18 @@ public class ArcGISSelectionBinding : ISelectionBinding
   public string Name => "selectionBinding";
   public IBrowserBridge Parent { get; }
 
-  public ArcGISSelectionBinding(IBrowserBridge parent, MapMembersUtils mapMemberUtils)
+  public ArcGISSelectionBinding(
+    IBrowserBridge parent,
+    MapMembersUtils mapMemberUtils,
+    ITopLevelExceptionHandler topLevelExceptionHandler
+  )
   {
     _mapMemberUtils = mapMemberUtils;
     Parent = parent;
-    var topLevelHandler = parent.TopLevelExceptionHandler;
 
     // example: https://github.com/Esri/arcgis-pro-sdk-community-samples/blob/master/Map-Authoring/QueryBuilderControl/DefinitionQueryDockPaneViewModel.cs
     // MapViewEventArgs args = new(MapView.Active);
-    TOCSelectionChangedEvent.Subscribe(_ => topLevelHandler.CatchUnhandled(OnSelectionChanged), true);
+    TOCSelectionChangedEvent.Subscribe(_ => topLevelExceptionHandler.CatchUnhandled(OnSelectionChanged), true);
   }
 
   private void OnSelectionChanged()
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
index 3114b7c64..22fadd614 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/ArcGISSendBinding.cs
@@ -15,6 +15,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -69,7 +70,9 @@ public ArcGISSendBinding(
     ILogger<ArcGISSendBinding> logger,
     IArcGISConversionSettingsFactory arcGisConversionSettingsFactory,
     MapMembersUtils mapMemberUtils,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator,
+    ITopLevelExceptionHandler topLevelExceptionHandler
   )
   {
     _store = store;
@@ -79,7 +82,7 @@ IThreadContext threadContext
     _sendConversionCache = sendConversionCache;
     _operationProgressManager = operationProgressManager;
     _logger = logger;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
     _arcGISConversionSettingsFactory = arcGisConversionSettingsFactory;
     _mapMemberUtils = mapMemberUtils;
     _threadContext = threadContext;
@@ -87,12 +90,11 @@ IThreadContext threadContext
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
     SubscribeToArcGISEvents();
-    _store.DocumentChanged += (_, _) =>
-    {
-      _sendConversionCache.ClearCache();
-    };
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private void OnDocumentStoreChangedEvent(object _) => _sendConversionCache.ClearCache();
+
   private void SubscribeToArcGISEvents()
   {
     LayersRemovedEvent.Subscribe(
@@ -201,7 +203,7 @@ private void SubscribeToAnyDataSourceChange(Table layerTable)
   {
     RowCreatedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),
@@ -209,7 +211,7 @@ private void SubscribeToAnyDataSourceChange(Table layerTable)
     );
     RowChangedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),
@@ -217,7 +219,7 @@ private void SubscribeToAnyDataSourceChange(Table layerTable)
     );
     RowDeletedEvent.Subscribe(
       (args) =>
-        Parent.TopLevelExceptionHandler.FireAndForget(async () =>
+        _topLevelExceptionHandler.FireAndForget(async () =>
         {
           await OnRowChanged(args);
         }),
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs
index d3881899e..b94bb3909 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Bindings/BasicConnectorBinding.cs
@@ -3,6 +3,7 @@
 using Speckle.Connectors.ArcGIS.Utils;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -21,20 +22,23 @@ public class BasicConnectorBinding : IBasicConnectorBinding
   private readonly DocumentModelStore _store;
   private readonly ISpeckleApplication _speckleApplication;
 
-  public BasicConnectorBinding(DocumentModelStore store, IBrowserBridge parent, ISpeckleApplication speckleApplication)
+  public BasicConnectorBinding(
+    DocumentModelStore store,
+    IBrowserBridge parent,
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
+  )
   {
     _store = store;
     _speckleApplication = speckleApplication;
     Parent = parent;
     Commands = new BasicConnectorBindingCommands(parent);
 
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public string GetSourceApplicationName() => _speckleApplication.Slug;
 
   public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Config.daml b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Config.daml
index acb8e4c5c..6c1b6c751 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Config.daml
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Config.daml
@@ -20,7 +20,7 @@
 <ArcGIS defaultAssembly="Speckle.Connectors.ArcGIS3.dll" defaultNamespace="Speckle.Connectors.ArcGIS" xmlns="http://schemas.esri.com/DADF/Registry" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.esri.com/DADF/Registry file:///C:/Program%20Files/ArcGIS/Pro/bin/ArcGIS.Desktop.Framework.xsd">
 	<AddInInfo id="{6CB1D25C-B8BF-4A33-9099-C1F8D1B32EFC}" version="1.0" desktopVersion="3.0.34047">
 		<Name>Speckle</Name>
-		<Description>Speckle connector for ArcGIS</Description>
+		<Description>Next Gen Speckle Connector (Beta) for ArcGIS</Description>
 		<Image>Images\AddinDesktop32.png</Image>
 		<Author>Speckle Systems</Author>
 		<Company>Speckle Systems</Company>
@@ -33,14 +33,14 @@
 		<insertModule id="ConnectorArcGIS_Module" className="SpeckleModule" autoLoad="false" caption="SpeckleModule">
 			<!-- uncomment to have the control hosted on a separate tab-->
 			<tabs>
-				<!--<tab id="Speckle_Tab1" caption="New Tab">
+				<tab id="Speckle_Tab1" caption="Speckle">
           <group refID="Speckle_Group1"/>
-        </tab>-->
+        </tab>
 			</tabs>
 			<groups>
 				<!-- comment this out if you have no controls on the Addin tab to avoid
-              an empty group-->
-				<group id="Speckle_Group1" caption="Speckle" appearsOnAddInTab="true" keytip="G1">
+              an empty group. change appearsOnAddinTab to "True" if control is to be in the addin tab-->
+				<group id="Speckle_Group1" caption="Speckle" appearsOnAddInTab="false" keytip="G1">
 					<!-- host controls within groups -->
 					<button refID="SpeckleDUI3_SpeckleDUI3OpenButton" size="large" />
 				</group>
@@ -59,7 +59,7 @@
 			</controls>
 
             <dockPanes>
-                <dockPane id="SpeckleDUI3_SpeckleDUI3" caption="Speckle (Beta) for ArcGIS" className="SpeckleDUI3ViewModel" keytip="DockPane" initiallyVisible="true" dock="group" dockWith="esri_core_projectDockPane">
+                <dockPane id="SpeckleDUI3_SpeckleDUI3" caption="Speckle (Beta)" className="SpeckleDUI3ViewModel" keytip="DockPane" initiallyVisible="true" dock="group" dockWith="esri_core_projectDockPane">
                     <content className="SpeckleDUI3Wrapper" />
                 </dockPane>
             </dockPanes>
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs
index 301c13272..08ea8dbd9 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs
@@ -37,7 +37,6 @@ public static void AddArcGIS(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
     serviceCollection.AddSingleton(DefaultTraversal.CreateTraversalFunc());
 
     // register send operation and dependencies
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs
index 1d5eee795..64370fdf2 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/SpeckleModule.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.ArcGIS.DependencyInjection;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
 using Speckle.Converters.ArcGIS3;
 using Speckle.Sdk.Host;
 using Module = ArcGIS.Desktop.Framework.Contracts.Module;
@@ -34,6 +35,7 @@ public SpeckleModule()
     services.AddArcGIS();
     services.AddArcGISConverters();
     Container = services.BuildServiceProvider();
+    Container.UseDUI();
   }
 
   private HostAppVersion GetVersion()
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGISThreadContext.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGISThreadContext.cs
index 42297eb00..8e4e2e239 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGISThreadContext.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGISThreadContext.cs
@@ -1,4 +1,4 @@
-using ArcGIS.Desktop.Framework.Threading.Tasks;
+using ArcGIS.Desktop.Framework.Threading.Tasks;
 using Speckle.Connectors.Common.Threading;
 
 namespace Speckle.Connectors.ArcGIS.Utils;
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs
index 0e6e5e1da..1669f0520 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/Utils/ArcGisDocumentStore.cs
@@ -4,6 +4,7 @@
 using ArcGIS.Desktop.Mapping.Events;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 
@@ -12,15 +13,18 @@ namespace Speckle.Connectors.ArcGIS.Utils;
 public class ArcGISDocumentStore : DocumentModelStore
 {
   private readonly IThreadContext _threadContext;
+  private readonly IEventAggregator _eventAggregator;
 
   public ArcGISDocumentStore(
     IJsonSerializer jsonSerializer,
     ITopLevelExceptionHandler topLevelExceptionHandler,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
     _threadContext = threadContext;
+    _eventAggregator = eventAggregator;
     ActiveMapViewChangedEvent.Subscribe(a => topLevelExceptionHandler.CatchUnhandled(() => OnMapViewChanged(a)), true);
     ProjectSavingEvent.Subscribe(
       _ =>
@@ -38,13 +42,16 @@ IThreadContext threadContext
       },
       true
     );
+  }
 
+  public override async Task OnDocumentStoreInitialized()
+  {
     // in case plugin was loaded into already opened Map, read metadata from the current Map
     if (!IsDocumentInit && MapView.Active != null)
     {
       IsDocumentInit = true;
       LoadState();
-      OnDocumentChanged();
+      await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
     }
   }
 
@@ -69,7 +76,7 @@ private void OnProjectSaving()
   /// <summary>
   /// On map view switch, this event trigger twice, first for outgoing view, second for incoming view.
   /// </summary>
-  private void OnMapViewChanged(ActiveMapViewChangedEventArgs args)
+  private async void OnMapViewChanged(ActiveMapViewChangedEventArgs args)
   {
     if (args.IncomingView is null)
     {
@@ -78,7 +85,7 @@ private void OnMapViewChanged(ActiveMapViewChangedEventArgs args)
 
     IsDocumentInit = true;
     LoadState();
-    OnDocumentChanged();
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
   }
 
   protected override void HostAppSaveState(string modelCardState) =>
diff --git a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
index 87469b826..46fa2ef5a 100644
--- a/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
+++ b/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/packages.lock.json
@@ -166,11 +166,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -231,9 +226,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -241,8 +236,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -266,7 +261,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -296,37 +291,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net6.0-windows7.0/win-x64": {
diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
index 02feb356d..8b8055345 100644
--- a/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Autocad2022/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -299,7 +294,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -335,37 +330,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
index 484e8c0be..478a7b76b 100644
--- a/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Autocad2023/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -299,7 +294,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -335,37 +330,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json
index a3a07fbbb..156c39ad6 100644
--- a/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Autocad2024/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -300,7 +295,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -336,37 +331,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json
index 91726308a..d8938faee 100644
--- a/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Autocad2025/packages.lock.json
@@ -155,11 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -220,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -230,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -256,7 +251,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -292,36 +287,42 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net8.0-windows7.0/win-x64": {
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs
index e5f8116f8..053340429 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadBasicConnectorBinding.cs
@@ -4,6 +4,7 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -31,6 +32,7 @@ public AutocadBasicConnectorBinding(
     IAccountManager accountManager,
     ISpeckleApplication speckleApplication,
     ILogger<AutocadBasicConnectorBinding> logger,
+    IEventAggregator eventAggregator,
     IThreadContext threadContext
   )
   {
@@ -39,15 +41,13 @@ IThreadContext threadContext
     _accountManager = accountManager;
     _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
     _logger = logger;
     _threadContext = threadContext;
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
 
   public string GetSourceApplicationName() => _speckleApplication.Slug;
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs
index 104341c33..81b03b338 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSelectionBinding.cs
@@ -1,38 +1,48 @@
+using Autodesk.AutoCAD.ApplicationServices;
 using Autodesk.AutoCAD.DatabaseServices;
 using Autodesk.AutoCAD.EditorInput;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
-using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.Autocad.Plugin;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 
 namespace Speckle.Connectors.Autocad.Bindings;
 
 public class AutocadSelectionBinding : ISelectionBinding
 {
   private const string SELECTION_EVENT = "setSelection";
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-  private readonly IThreadContext _threadContext;
-  private readonly HashSet<Document> _visitedDocuments = new();
+  private readonly IEventAggregator _eventAggregator;
+  private readonly HashSet<string> _visitedDocuments = new();
 
   public string Name => "selectionBinding";
 
   public IBrowserBridge Parent { get; }
 
-  public AutocadSelectionBinding(IBrowserBridge parent, IThreadContext threadContext)
+  public AutocadSelectionBinding(IBrowserBridge parent, IEventAggregator eventAggregator)
   {
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _eventAggregator = eventAggregator;
     Parent = parent;
-    _threadContext = threadContext;
 
     // POC: Use here Context for doc. In converters it's OK but we are still lacking to use context into bindings.
     // It is with the case of if binding created with already a document
     // This is valid when user opens acad file directly double clicking
     TryRegisterDocumentForSelection(Application.DocumentManager.MdiActiveDocument);
-    Application.DocumentManager.DocumentActivated += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() => OnDocumentChanged(e.Document));
+    eventAggregator.GetEvent<DocumentActivatedEvent>().Subscribe(OnDocumentChanged);
+    eventAggregator.GetEvent<ImpliedSelectionChangedEvent>().Subscribe(OnSelectionChanged);
+    eventAggregator.GetEvent<DocumentToBeDestroyedEvent>().Subscribe(OnDocumentDestroyed);
   }
 
-  private void OnDocumentChanged(Document? document) => TryRegisterDocumentForSelection(document);
+  private void OnDocumentDestroyed(DocumentCollectionEventArgs e)
+  {
+    if (!_visitedDocuments.Contains(e.Document.Name))
+    {
+      e.Document.ImpliedSelectionChanged -= DocumentOnImpliedSelectionChanged;
+      _visitedDocuments.Remove(e.Document.Name);
+    }
+  }
+
+  private void OnDocumentChanged(DocumentCollectionEventArgs e) => TryRegisterDocumentForSelection(e.Document);
 
   private void TryRegisterDocumentForSelection(Document? document)
   {
@@ -41,21 +51,24 @@ private void TryRegisterDocumentForSelection(Document? document)
       return;
     }
 
-    if (!_visitedDocuments.Contains(document))
+    if (!_visitedDocuments.Contains(document.Name))
     {
-      document.ImpliedSelectionChanged += (_, _) =>
-        _topLevelExceptionHandler.FireAndForget(async () => await _threadContext.RunOnMainAsync(OnSelectionChanged));
+      document.ImpliedSelectionChanged += DocumentOnImpliedSelectionChanged;
 
-      _visitedDocuments.Add(document);
+      _visitedDocuments.Add(document.Name);
     }
   }
 
+  // ReSharper disable once AsyncVoidMethod
+  private async void DocumentOnImpliedSelectionChanged(object? sender, EventArgs e) =>
+    await _eventAggregator.GetEvent<ImpliedSelectionChangedEvent>().PublishAsync(e);
+
   // NOTE: Autocad 2022 caused problems, so we need to refactor things a bit in here to always store
   // selection info locally (and get it updated by the event, which we can control to run on the main thread).
   // Ui requests to GetSelection() should just return this local copy that is kept up to date by the event handler.
   private SelectionInfo _selectionInfo;
 
-  private async Task OnSelectionChanged()
+  private async Task OnSelectionChanged(EventArgs _)
   {
     _selectionInfo = GetSelectionInternal();
     await Parent.Send(SELECTION_EVENT, _selectionInfo);
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs
index 5f556e623..5d44affc5 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBaseBinding.cs
@@ -1,16 +1,19 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
+using Autodesk.AutoCAD.ApplicationServices;
 using Autodesk.AutoCAD.DatabaseServices;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Autocad.HostApp.Extensions;
 using Speckle.Connectors.Autocad.Operations.Send;
+using Speckle.Connectors.Autocad.Plugin;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -22,6 +25,7 @@
 
 namespace Speckle.Connectors.Autocad.Bindings;
 
+[SuppressMessage("ReSharper", "AsyncVoidMethod")]
 public abstract class AutocadSendBaseBinding : ISendBinding
 {
   public string Name => "sendBinding";
@@ -30,16 +34,15 @@ public abstract class AutocadSendBaseBinding : ISendBinding
   public IBrowserBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly IAutocadIdleManager _idleManager;
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
   private readonly IServiceProvider _serviceProvider;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<AutocadSendBinding> _logger;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
   private readonly ISpeckleApplication _speckleApplication;
   private readonly IThreadContext _threadContext;
+  private readonly IEventAggregator _eventAggregator;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -51,7 +54,6 @@ public abstract class AutocadSendBaseBinding : ISendBinding
 
   protected AutocadSendBaseBinding(
     DocumentModelStore store,
-    IAutocadIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     CancellationManager cancellationManager,
@@ -60,11 +62,11 @@ protected AutocadSendBaseBinding(
     IOperationProgressManager operationProgressManager,
     ILogger<AutocadSendBinding> logger,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
   {
     _store = store;
-    _idleManager = idleManager;
     _serviceProvider = serviceProvider;
     _cancellationManager = cancellationManager;
     _sendFilters = sendFilters.ToList();
@@ -73,28 +75,46 @@ IThreadContext threadContext
     _logger = logger;
     _speckleApplication = speckleApplication;
     _threadContext = threadContext;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler;
+    _eventAggregator = eventAggregator;
     Parent = parent;
     Commands = new SendBindingUICommands(parent);
 
-    Application.DocumentManager.DocumentActivated += (_, args) =>
-      _topLevelExceptionHandler.CatchUnhandled(() => SubscribeToObjectChanges(args.Document));
-
     if (Application.DocumentManager.CurrentDocument != null)
     {
       // catches the case when autocad just opens up with a blank new doc
-      SubscribeToObjectChanges(Application.DocumentManager.CurrentDocument);
+      TryRegisterSubscribeToObjectChanges(Application.DocumentManager.CurrentDocument);
     }
     // Since ids of the objects generates from same seed, we should clear the cache always whenever doc swapped.
-    _store.DocumentChanged += (_, _) =>
+
+    eventAggregator.GetEvent<DocumentActivatedEvent>().Subscribe(SubscribeToObjectChanges);
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
+    eventAggregator.GetEvent<DocumentToBeDestroyedEvent>().Subscribe(OnDocumentDestroyed);
+    eventAggregator.GetEvent<ObjectAppendedEvent>().Subscribe(OnObjectAppended);
+    eventAggregator.GetEvent<ObjectErasedEvent>().Subscribe(ObjectErased);
+    eventAggregator.GetEvent<ObjectModifiedEvent>().Subscribe(ObjectModified);
+  }
+
+  private void OnDocumentDestroyed(DocumentCollectionEventArgs args)
+  {
+    Document doc = args.Document;
+    if (!_docSubsTracker.Contains(doc.Name))
     {
-      _sendConversionCache.ClearCache();
-    };
+      doc.Database.ObjectAppended -= DatabaseOnObjectAppended;
+      doc.Database.ObjectErased -= DatabaseOnObjectErased;
+      doc.Database.ObjectModified -= DatabaseObjectModified;
+
+      _docSubsTracker.Remove(doc.Name);
+    }
   }
 
+  private void OnDocumentStoreChangedEvent(object _) => _sendConversionCache.ClearCache();
+
   private readonly List<string> _docSubsTracker = new();
 
-  private void SubscribeToObjectChanges(Document doc)
+  private void SubscribeToObjectChanges(DocumentCollectionEventArgs e) =>
+    TryRegisterSubscribeToObjectChanges(e.Document);
+
+  private void TryRegisterSubscribeToObjectChanges(Document? doc)
   {
     if (doc == null || doc.Database == null || _docSubsTracker.Contains(doc.Name))
     {
@@ -102,23 +122,33 @@ private void SubscribeToObjectChanges(Document doc)
     }
 
     _docSubsTracker.Add(doc.Name);
-    doc.Database.ObjectAppended += (_, e) => OnObjectChanged(e.DBObject);
-    doc.Database.ObjectErased += (_, e) => OnObjectChanged(e.DBObject);
-    doc.Database.ObjectModified += (_, e) => OnObjectChanged(e.DBObject);
+    doc.Database.ObjectAppended += DatabaseOnObjectAppended;
+    doc.Database.ObjectErased += DatabaseOnObjectErased;
+    doc.Database.ObjectModified += DatabaseObjectModified;
   }
 
-  private void OnObjectChanged(DBObject dbObject)
-  {
-    _topLevelExceptionHandler.CatchUnhandled(() => OnChangeChangedObjectIds(dbObject));
-  }
+  private async void DatabaseOnObjectAppended(object sender, ObjectEventArgs e) =>
+    await _eventAggregator.GetEvent<ObjectAppendedEvent>().PublishAsync(e);
+
+  private async void DatabaseOnObjectErased(object sender, ObjectErasedEventArgs e) =>
+    await _eventAggregator.GetEvent<ObjectErasedEvent>().PublishAsync(e);
+
+  private async void DatabaseObjectModified(object sender, ObjectEventArgs e) =>
+    await _eventAggregator.GetEvent<ObjectModifiedEvent>().PublishAsync(e);
+
+  private void OnObjectAppended(ObjectEventArgs e) => OnChangeChangedObjectIds(e.DBObject);
+
+  private void ObjectErased(ObjectErasedEventArgs e) => OnChangeChangedObjectIds(e.DBObject);
+
+  private void ObjectModified(ObjectEventArgs e) => OnChangeChangedObjectIds(e.DBObject);
 
   private void OnChangeChangedObjectIds(DBObject dBObject)
   {
     ChangedObjectIds[dBObject.GetSpeckleApplicationId()] = 1;
-    _idleManager.SubscribeToIdle(nameof(AutocadSendBinding), async () => await RunExpirationChecks());
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(AutocadSendBinding), RunExpirationChecks);
   }
 
-  private async Task RunExpirationChecks()
+  private async Task RunExpirationChecks(object _)
   {
     var senders = _store.GetSenders();
     string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs
index ddd5c223c..2745539ca 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Bindings/AutocadSendBinding.cs
@@ -1,11 +1,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Converters.Autocad;
@@ -20,7 +20,6 @@ public sealed class AutocadSendBinding : AutocadSendBaseBinding
 
   public AutocadSendBinding(
     DocumentModelStore store,
-    IAutocadIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     CancellationManager cancellationManager,
@@ -30,11 +29,11 @@ public AutocadSendBinding(
     ILogger<AutocadSendBinding> logger,
     IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(
       store,
-      idleManager,
       parent,
       sendFilters,
       cancellationManager,
@@ -43,7 +42,8 @@ IThreadContext threadContext
       operationProgressManager,
       logger,
       speckleApplication,
-      threadContext
+      threadContext,
+      eventAggregator
     )
   {
     _autocadConversionSettingsFactory = autocadConversionSettingsFactory;
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs
index 8ce12c190..a40b6a8e7 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/SharedRegistration.cs
@@ -13,7 +13,6 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Sdk.Models.GraphTraversal;
@@ -49,8 +48,6 @@ public static void AddAutocadBase(this IServiceCollection serviceCollection)
     serviceCollection.AddScoped<AutocadMaterialUnpacker>();
     serviceCollection.AddScoped<IAutocadMaterialBaker, AutocadMaterialBaker>();
 
-    serviceCollection.AddSingleton<IAppIdleManager, AutocadIdleManager>();
-
     // operation progress manager
     serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
 
@@ -61,8 +58,6 @@ public static void AddAutocadBase(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, AutocadBasicConnectorBinding>();
     serviceCollection.AddSingleton<IBinding, ConfigBinding>();
-
-    serviceCollection.RegisterTopLevelExceptionHandler();
   }
 
   public static void LoadSend(this IServiceCollection serviceCollection)
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadDocumentModelStore.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadDocumentModelStore.cs
index c8319d638..fc8894f99 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadDocumentModelStore.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadDocumentModelStore.cs
@@ -1,4 +1,6 @@
-using Speckle.Connectors.DUI.Bridge;
+using Autodesk.AutoCAD.ApplicationServices;
+using Speckle.Connectors.Autocad.Plugin;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 
@@ -6,20 +8,31 @@ namespace Speckle.Connectors.Autocad.HostApp;
 
 public class AutocadDocumentStore : DocumentModelStore
 {
-  private readonly string _nullDocumentName = "Null Doc";
+  private const string NULL_DOCUMENT_NAME = "Null Doc";
   private string _previousDocName;
   private readonly AutocadDocumentManager _autocadDocumentManager;
+  private readonly IEventAggregator _eventAggregator;
 
   public AutocadDocumentStore(
     IJsonSerializer jsonSerializer,
     AutocadDocumentManager autocadDocumentManager,
-    ITopLevelExceptionHandler topLevelExceptionHandler
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
     _autocadDocumentManager = autocadDocumentManager;
-    _previousDocName = _nullDocumentName;
+    _eventAggregator = eventAggregator;
+    _previousDocName = NULL_DOCUMENT_NAME;
 
+    eventAggregator.GetEvent<DocumentActivatedEvent>().Subscribe(DocChanged);
+
+    // since below event triggered as secondary, it breaks the logic in OnDocChangeInternal function, leaving it here for now.
+    // Autodesk.AutoCAD.ApplicationServices.Application.DocumentWindowCollection.DocumentWindowActivated += (_, args) =>
+    //  OnDocChangeInternal((Document)args.DocumentWindow.Document);
+  }
+
+  public override async Task OnDocumentStoreInitialized()
+  {
     // POC: Will be addressed to move it into AutocadContext!
     if (Application.DocumentManager.MdiActiveDocument != null)
     {
@@ -27,20 +40,15 @@ ITopLevelExceptionHandler topLevelExceptionHandler
       // POC: this logic might go when we have document management in context
       // It is with the case of if binding created with already a document
       // This is valid when user opens acad file directly double clicking
-      OnDocChangeInternal(Application.DocumentManager.MdiActiveDocument);
+      await TryDocChanged(Application.DocumentManager.MdiActiveDocument);
     }
-
-    Application.DocumentManager.DocumentActivated += (_, e) =>
-      topLevelExceptionHandler.CatchUnhandled(() => OnDocChangeInternal(e.Document));
-
-    // since below event triggered as secondary, it breaks the logic in OnDocChangeInternal function, leaving it here for now.
-    // Autodesk.AutoCAD.ApplicationServices.Application.DocumentWindowCollection.DocumentWindowActivated += (_, args) =>
-    //  OnDocChangeInternal((Document)args.DocumentWindow.Document);
   }
 
-  private void OnDocChangeInternal(Document? doc)
+  private async Task DocChanged(DocumentCollectionEventArgs e) => await TryDocChanged(e.Document);
+
+  private async Task TryDocChanged(Document? doc)
   {
-    var currentDocName = doc != null ? doc.Name : _nullDocumentName;
+    var currentDocName = doc != null ? doc.Name : NULL_DOCUMENT_NAME;
     if (_previousDocName == currentDocName)
     {
       return;
@@ -48,7 +56,7 @@ private void OnDocChangeInternal(Document? doc)
 
     _previousDocName = currentDocName;
     LoadState();
-    OnDocumentChanged();
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
   }
 
   protected override void LoadState()
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadIdleManager.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadIdleManager.cs
deleted file mode 100644
index 10ebddb6f..000000000
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/HostApp/AutocadIdleManager.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using Speckle.Connectors.DUI.Bridge;
-using Speckle.InterfaceGenerator;
-
-namespace Speckle.Connectors.Autocad.HostApp;
-
-public partial interface IAutocadIdleManager : IAppIdleManager;
-
-[GenerateAutoInterface]
-public sealed class AutocadIdleManager(IIdleCallManager idleCallManager)
-  : AppIdleManager(idleCallManager),
-    IAutocadIdleManager
-{
-  private readonly IIdleCallManager _idleCallManager = idleCallManager;
-
-  protected override void AddEvent()
-  {
-    Application.Idle += AutocadAppOnIdle;
-  }
-
-  private void AutocadAppOnIdle(object? sender, EventArgs e) =>
-    _idleCallManager.AppOnIdle(() => Application.Idle -= AutocadAppOnIdle);
-}
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs
index cbc69d098..7d9ad38ca 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadCommand.cs
@@ -3,6 +3,8 @@
 using Autodesk.AutoCAD.Windows;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.WebView;
 #if AUTOCAD
 using Speckle.Connectors.Autocad.DependencyInjection;
@@ -30,7 +32,7 @@ public void Command()
       return;
     }
 
-    PaletteSet = new PaletteSet($"Speckle (Beta) for {AppUtils.App.Name}", s_id)
+    PaletteSet = new PaletteSet($"Speckle (Beta)", s_id)
     {
       Size = new Size(400, 500),
       DockEnabled = (DockSides)((int)DockSides.Left + (int)DockSides.Right)
@@ -47,10 +49,12 @@ public void Command()
     services.AddCivil3dConverters();
 #endif
     Container = services.BuildServiceProvider();
+    AutocadEvents.Register(Container.GetRequiredService<IEventAggregator>());
+    Container.UseDUI();
 
     var panelWebView = Container.GetRequiredService<DUI3ControlWebView>();
 
-    PaletteSet.AddVisual($"Speckle (Beta) for {AppUtils.App.Name} WebView", panelWebView);
+    PaletteSet.AddVisual("Speckle (Beta)", panelWebView);
 
     FocusPalette();
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadEvents.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadEvents.cs
new file mode 100644
index 000000000..5531620fa
--- /dev/null
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadEvents.cs
@@ -0,0 +1,38 @@
+using Autodesk.AutoCAD.ApplicationServices;
+using Autodesk.AutoCAD.DatabaseServices;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.Autocad.Plugin;
+
+public class DocumentActivatedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentCollectionEventArgs>(threadContext, exceptionHandler);
+
+public class DocumentToBeDestroyedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentCollectionEventArgs>(threadContext, exceptionHandler);
+
+public class ImpliedSelectionChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<EventArgs>(threadContext, exceptionHandler);
+
+public class ObjectAppendedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<ObjectEventArgs>(threadContext, exceptionHandler);
+
+public class ObjectErasedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<ObjectErasedEventArgs>(threadContext, exceptionHandler);
+
+public class ObjectModifiedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<ObjectEventArgs>(threadContext, exceptionHandler);
+
+public static class AutocadEvents
+{
+  public static void Register(IEventAggregator eventAggregator)
+  {
+    Application.Idle += async (_, e) => await eventAggregator.GetEvent<IdleEvent>().PublishAsync(e);
+
+    Application.DocumentManager.DocumentActivated += async (_, e) =>
+      await eventAggregator.GetEvent<DocumentActivatedEvent>().PublishAsync(e);
+    Application.DocumentManager.DocumentToBeDestroyed += async (_, e) =>
+      await eventAggregator.GetEvent<DocumentToBeDestroyedEvent>().PublishAsync(e);
+  }
+}
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadRibbon.cs b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadRibbon.cs
index 7d6dc8b30..fef1accfd 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadRibbon.cs
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Plugin/AutocadRibbon.cs
@@ -46,20 +46,20 @@ public bool CreateRibbon()
 
   private void Create()
   {
-    RibbonTab tab = FindOrMakeTab("Add-ins");
-    RibbonPanelSource source = new() { Title = "Speckle 2 (New Beta)" };
+    RibbonTab tab = FindOrMakeTab("Speckle");
+    RibbonPanelSource source = new() { Title = "Speckle (Beta)" };
     RibbonPanel panel = new() { Source = source };
     tab.Panels.Add(panel);
 
     RibbonToolTip speckleToolTip =
       new()
       {
-        Title = "Speckle 2 (New Beta)",
-        Content = "Speckle Connector for " + AppUtils.App.Name,
+        Title = "Speckle (Beta)",
+        Content = $"Next Gen Speckle Connector (Beta) for {AppUtils.App.Name}",
         IsHelpEnabled = true // Without this "Press F1 for help" does not appear in the tooltip
       };
 
-    _ = CreateSpeckleButton("Connector " + AppUtils.App.Name + " (New)", source, null, speckleToolTip, "logo");
+    _ = CreateSpeckleButton("Speckle (Beta)", source, null, speckleToolTip, "logo");
   }
 
   private void ComponentManager_ItemInitialized(object? sender, RibbonItemEventArgs e)
diff --git a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems
index 682bf35e2..6db58dd45 100644
--- a/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems
+++ b/Connectors/Autocad/Speckle.Connectors.AutocadShared/Speckle.Connectors.AutocadShared.projitems
@@ -29,7 +29,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadDocumentManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadDocumentModelStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\AutocadMaterialUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\DatabaseExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\Extensions\DocumentExtensions.cs" />
@@ -41,6 +40,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObject.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBaseBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\AutocadRootObjectBuilder.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadEvents.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadRibbon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadExtensionApplication.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\AutocadCommand.cs" />
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json
index f21270c3d..835e57ba6 100644
--- a/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2022/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -309,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -345,37 +340,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json
index 6c84659e4..372b388ac 100644
--- a/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2023/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -309,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -345,37 +340,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
index afb4ab323..e30f8280c 100644
--- a/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2024/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -309,7 +304,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -345,37 +340,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json
index 54a134f77..13ba996a1 100644
--- a/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json
+++ b/Connectors/Autocad/Speckle.Connectors.Civil3d2025/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -229,9 +224,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -239,8 +234,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -266,7 +261,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -302,36 +297,42 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net8.0-windows7.0/win-x64": {
diff --git a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs
index 4b26c74ef..880b6b5af 100644
--- a/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs
+++ b/Connectors/Autocad/Speckle.Connectors.Civil3dShared/Bindings/Civil3dSendBinding.cs
@@ -1,12 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Autocad.Bindings;
-using Speckle.Connectors.Autocad.HostApp;
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Cancellation;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Converters.Autocad;
@@ -23,7 +23,6 @@ public sealed class Civil3dSendBinding : AutocadSendBaseBinding
 
   public Civil3dSendBinding(
     DocumentModelStore store,
-    IAutocadIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     CancellationManager cancellationManager,
@@ -34,11 +33,11 @@ public Civil3dSendBinding(
     ICivil3dConversionSettingsFactory civil3dConversionSettingsFactory,
     IAutocadConversionSettingsFactory autocadConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
-    IThreadContext threadContext
+    IThreadContext threadContext,
+    IEventAggregator eventAggregator
   )
     : base(
       store,
-      idleManager,
       parent,
       sendFilters,
       cancellationManager,
@@ -47,7 +46,8 @@ IThreadContext threadContext
       operationProgressManager,
       logger,
       speckleApplication,
-      threadContext
+      threadContext,
+      eventAggregator
     )
   {
     _civil3dConversionSettingsFactory = civil3dConversionSettingsFactory;
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedBasicConnectorBinding.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedBasicConnectorBinding.cs
index bb0039cc2..0eaaae4d2 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedBasicConnectorBinding.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedBasicConnectorBinding.cs
@@ -1,5 +1,6 @@
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -10,7 +11,7 @@ public class CsiSharedBasicConnectorBinding : IBasicConnectorBinding
 {
   private readonly ISpeckleApplication _speckleApplication;
   private readonly DocumentModelStore _store;
-
+  private readonly IEventAggregator _eventAggregator;
   public string Name => "baseBinding";
   public IBrowserBridge Parent { get; }
   public BasicConnectorBindingCommands Commands { get; }
@@ -18,22 +19,28 @@ public class CsiSharedBasicConnectorBinding : IBasicConnectorBinding
   public CsiSharedBasicConnectorBinding(
     IBrowserBridge parent,
     ISpeckleApplication speckleApplication,
-    DocumentModelStore store
+    DocumentModelStore store,
+    IEventAggregator eventAggregator
   )
   {
     Parent = parent;
     _speckleApplication = speckleApplication;
     _store = store;
-    Commands = new BasicConnectorBindingCommands(parent);
+    Commands = new BasicConnectorBindingCommands(Parent);
+    _eventAggregator = eventAggregator;
+
+    _eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
 
   public string GetSourceApplicationName() => _speckleApplication.Slug;
 
   public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
 
-  public DocumentInfo? GetDocumentInfo() => new DocumentInfo("ETABS Model", "ETABS Model", "1");
+  public DocumentInfo? GetDocumentInfo() => new("ETABS Model", "ETABS Model", "1");
 
   public DocumentModelStore GetDocumentState() => _store;
 
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSelectionBinding.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSelectionBinding.cs
index 7981a3029..19c2573f6 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSelectionBinding.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSelectionBinding.cs
@@ -1,20 +1,43 @@
-using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.CSiShared.Events;
+using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Connectors.CSiShared.Utils;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+using Speckle.Converters.CSiShared.Utils;
 
 namespace Speckle.Connectors.CSiShared.Bindings;
 
-public class CsiSharedSelectionBinding : ISelectionBinding
+public sealed class CsiSharedSelectionBinding : ISelectionBinding
 {
-  public string Name => "selectionBinding";
-  public IBrowserBridge Parent { get; }
   private readonly ICsiApplicationService _csiApplicationService;
+  private HashSet<string> _lastSelection = new();
 
-  public CsiSharedSelectionBinding(IBrowserBridge parent, ICsiApplicationService csiApplicationService)
+  public IBrowserBridge Parent { get; }
+  public string Name => "selectionBinding";
+
+  public CsiSharedSelectionBinding(
+    IBrowserBridge parent,
+    ICsiApplicationService csiApplicationService,
+    IEventAggregator eventAggregator
+  )
   {
     Parent = parent;
     _csiApplicationService = csiApplicationService;
+
+    eventAggregator.GetEvent<SelectionBindingEvent>().SubscribePeriodic(TimeSpan.FromSeconds(1), CheckSelectionChanged);
+  }
+
+  private void CheckSelectionChanged(object _)
+  {
+    var currentSelection = GetSelection();
+    var currentIds = new HashSet<string>(currentSelection.SelectedObjectIds);
+
+    if (!_lastSelection.SetEquals(currentIds))
+    {
+      _lastSelection = currentIds;
+      Parent.Send(SelectionBindingEvents.SET_SELECTION, currentSelection);
+    }
   }
 
   /// <summary>
@@ -25,21 +48,9 @@ public CsiSharedSelectionBinding(IBrowserBridge parent, ICsiApplicationService c
   /// </remarks>
   public SelectionInfo GetSelection()
   {
-    // TODO: Since this is standard across CSi Suite - better stored in an enum?
-    var objectTypeMap = new Dictionary<int, string>
-    {
-      { 1, "Point" },
-      { 2, "Frame" },
-      { 3, "Cable" },
-      { 4, "Tendon" },
-      { 5, "Area" },
-      { 6, "Solid" },
-      { 7, "Link" }
-    };
-
     int numberItems = 0;
-    int[] objectType = Array.Empty<int>();
-    string[] objectName = Array.Empty<string>();
+    int[] objectType = [];
+    string[] objectName = [];
 
     _csiApplicationService.SapModel.SelectObj.GetSelected(ref numberItems, ref objectType, ref objectName);
 
@@ -48,10 +59,10 @@ public SelectionInfo GetSelection()
 
     for (int i = 0; i < numberItems; i++)
     {
-      var typeKey = objectType[i];
-      var typeName = objectTypeMap.TryGetValue(typeKey, out var name) ? name : $"Unknown ({typeKey})";
+      var typeKey = (ModelObjectType)objectType[i];
+      var typeName = typeKey.ToString();
 
-      encodedIds.Add(ObjectIdentifier.Encode(typeKey, objectName[i]));
+      encodedIds.Add(ObjectIdentifier.Encode(objectType[i], objectName[i]));
       typeCounts[typeName] = (typeCounts.TryGetValue(typeName, out var count) ? count : 0) + 1; // NOTE: Cross-framework compatibility (net 48 and net8)
     }
 
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs
index 0c297fd8d..a07d566c9 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Bindings/CsiSharedSendBinding.cs
@@ -27,7 +27,6 @@ public sealed class CsiSharedSendBinding : ISendBinding
   public IBrowserBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly IAppIdleManager _idleManager;
   private readonly IServiceProvider _serviceProvider;
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
@@ -40,7 +39,6 @@ public sealed class CsiSharedSendBinding : ISendBinding
 
   public CsiSharedSendBinding(
     DocumentModelStore store,
-    IAppIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     IServiceProvider serviceProvider,
@@ -54,7 +52,6 @@ ICsiApplicationService csiApplicationService
   )
   {
     _store = store;
-    _idleManager = idleManager;
     _serviceProvider = serviceProvider;
     _sendFilters = sendFilters.ToList();
     _cancellationManager = cancellationManager;
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Events/ModelChangedEvent.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Events/ModelChangedEvent.cs
new file mode 100644
index 000000000..5f3a8d12f
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Events/ModelChangedEvent.cs
@@ -0,0 +1,8 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.CSiShared.Events;
+
+public class ModelChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : PeriodicThreadedEvent(threadContext, exceptionHandler);
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Events/SelectionBindingEvent.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Events/SelectionBindingEvent.cs
new file mode 100644
index 000000000..f3cace6f9
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Events/SelectionBindingEvent.cs
@@ -0,0 +1,8 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.CSiShared.Events;
+
+public class SelectionBindingEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : PeriodicThreadedEvent(threadContext, exceptionHandler);
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiApplicationService.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiApplicationService.cs
index 9614ce5a2..fe2fba816 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiApplicationService.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiApplicationService.cs
@@ -13,22 +13,4 @@ namespace Speckle.Connectors.CSiShared.HostApp;
 public interface ICsiApplicationService
 {
   cSapModel SapModel { get; }
-  void Initialize(cSapModel sapModel, cPluginCallback pluginCallback);
-}
-
-public class CsiApplicationService : ICsiApplicationService
-{
-  public cSapModel SapModel { get; private set; }
-  private cPluginCallback _pluginCallback;
-
-  public CsiApplicationService()
-  {
-    SapModel = null!;
-  }
-
-  public void Initialize(cSapModel sapModel, cPluginCallback pluginCallback)
-  {
-    SapModel = sapModel;
-    _pluginCallback = pluginCallback;
-  }
 }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs
index ab7f97353..bb8497885 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiDocumentModelStore.cs
@@ -1,5 +1,7 @@
 using System.IO;
 using Microsoft.Extensions.Logging;
+using Speckle.Connectors.CSiShared.Events;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 using Speckle.Sdk;
@@ -13,34 +15,73 @@ public class CsiDocumentModelStore : DocumentModelStore
   private readonly ISpeckleApplication _speckleApplication;
   private readonly ILogger<CsiDocumentModelStore> _logger;
   private readonly ICsiApplicationService _csiApplicationService;
+  private readonly IEventAggregator _eventAggregator;
+  private string _lastModelFilename = string.Empty;
   private string HostAppUserDataPath { get; set; }
   private string DocumentStateFile { get; set; }
   private string ModelPathHash { get; set; }
 
   public CsiDocumentModelStore(
-    IJsonSerializer jsonSerializerSettings,
+    IJsonSerializer jsonSerializer,
     ISpeckleApplication speckleApplication,
     ILogger<CsiDocumentModelStore> logger,
-    ICsiApplicationService csiApplicationService
+    ICsiApplicationService csiApplicationService,
+    IEventAggregator eventAggregator
   )
-    : base(jsonSerializerSettings)
+    : base(jsonSerializer)
   {
     _speckleApplication = speckleApplication;
     _logger = logger;
     _csiApplicationService = csiApplicationService;
+    _eventAggregator = eventAggregator;
+    eventAggregator.GetEvent<ModelChangedEvent>().SubscribePeriodic(TimeSpan.FromSeconds(1), CheckModelChanges);
+  }
+
+  private async Task CheckModelChanges(object _)
+  {
+    string currentFilename = _csiApplicationService.SapModel.GetModelFilename();
+
+    if (string.IsNullOrEmpty(currentFilename) || currentFilename == _lastModelFilename)
+    {
+      return;
+    }
+
+    _lastModelFilename = currentFilename;
     SetPaths();
     LoadState();
+
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
+  }
+
+  public override Task OnDocumentStoreInitialized()
+  {
+    var currentFilename = _csiApplicationService.SapModel.GetModelFilename();
+    if (!string.IsNullOrEmpty(currentFilename))
+    {
+      _lastModelFilename = currentFilename;
+      SetPaths();
+      LoadState();
+    }
+    return Task.CompletedTask;
   }
 
   private void SetPaths()
   {
-    ModelPathHash = Crypt.Md5(_csiApplicationService.SapModel.GetModelFilepath(), length: 32);
-    HostAppUserDataPath = Path.Combine(
-      SpecklePathProvider.UserSpeckleFolderPath,
-      "ConnectorsFileData",
-      _speckleApplication.Slug
-    );
-    DocumentStateFile = Path.Combine(HostAppUserDataPath, $"{ModelPathHash}.json");
+    try
+    {
+      ModelPathHash = Crypt.Md5(_csiApplicationService.SapModel.GetModelFilename(), length: 32);
+      HostAppUserDataPath = Path.Combine(
+        SpecklePathProvider.UserSpeckleFolderPath,
+        "ConnectorsFileData",
+        _speckleApplication.Slug
+      );
+      DocumentStateFile = Path.Combine(HostAppUserDataPath, $"{ModelPathHash}.json");
+      _logger.LogDebug($"Paths set - Hash: {ModelPathHash}, File: {DocumentStateFile}");
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogError(ex, "Error in setting paths for CsiDocumentModelStore");
+    }
   }
 
   protected override void HostAppSaveState(string modelCardState)
@@ -51,29 +92,32 @@ protected override void HostAppSaveState(string modelCardState)
       {
         Directory.CreateDirectory(HostAppUserDataPath);
       }
+
       File.WriteAllText(DocumentStateFile, modelCardState);
     }
     catch (Exception ex) when (!ex.IsFatal())
     {
-      _logger.LogError(ex.Message);
+      _logger.LogError(ex, "Failed to save state");
     }
   }
 
   protected override void LoadState()
   {
-    if (!Directory.Exists(HostAppUserDataPath))
+    try
     {
-      ClearAndSave();
-      return;
-    }
+      if (!File.Exists(DocumentStateFile))
+      {
+        ClearAndSave();
+        return;
+      }
 
-    if (!File.Exists(DocumentStateFile))
+      string serializedState = File.ReadAllText(DocumentStateFile);
+      LoadFromString(serializedState);
+    }
+    catch (Exception ex) when (!ex.IsFatal())
     {
+      _logger.LogError(ex, "Failed to load state, initializing empty state");
       ClearAndSave();
-      return;
     }
-
-    string serializedState = File.ReadAllText(DocumentStateFile);
-    LoadFromString(serializedState);
   }
 }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiIdleManager.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiIdleManager.cs
deleted file mode 100644
index 59d50296b..000000000
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/CsiIdleManager.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connectors.CSiShared.HostApp;
-
-public sealed class CsiIdleManager : AppIdleManager
-{
-  private readonly IIdleCallManager _idleCallManager;
-
-  public CsiIdleManager(IIdleCallManager idleCallManager)
-    : base(idleCallManager)
-  {
-    _idleCallManager = idleCallManager;
-  }
-
-  protected override void AddEvent()
-  {
-    // TODO: CSi specific idle handling can be added here if needed
-    _idleCallManager.AppOnIdle(() => { });
-  }
-}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiFrameSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiFrameSectionPropertyExtractor.cs
new file mode 100644
index 000000000..0750f116b
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiFrameSectionPropertyExtractor.cs
@@ -0,0 +1,115 @@
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+/// <summary>
+/// Base frame section property extractor for CSi products.
+/// </summary>
+/// <remarks>
+/// Handles common Csi API calls for frame section properties
+/// Provides foundation for application-specific extractors.
+/// </remarks>
+public class CsiFrameSectionPropertyExtractor : IFrameSectionPropertyExtractor
+{
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+
+  public CsiFrameSectionPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  {
+    _settingsStore = settingsStore;
+  }
+
+  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    GetMaterialName(sectionName, properties);
+    GetSectionProperties(sectionName, properties);
+    GetPropertyModifiers(sectionName, properties);
+  }
+
+  private void GetMaterialName(string sectionName, Dictionary<string, object?> properties)
+  {
+    // get material name
+    string materialName = string.Empty;
+    _settingsStore.Current.SapModel.PropFrame.GetMaterial(sectionName, ref materialName);
+
+    // append to General Data of properties dictionary
+    Dictionary<string, object?> generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Material"] = materialName;
+  }
+
+  private void GetSectionProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    double crossSectionalArea = 0,
+      shearAreaInMajorAxisDirection = 0,
+      shearAreaInMinorAxisDirection = 0,
+      torsionalConstant = 0,
+      momentOfInertiaAboutMajorAxis = 0,
+      momentOfInertiaAboutMinorAxis = 0,
+      sectionModulusAboutMajorAxis = 0,
+      sectionModulusAboutMinorAxis = 0,
+      plasticModulusAboutMajorAxis = 0,
+      plasticModulusAboutMinorAxis = 0,
+      radiusOfGyrationAboutMajorAxis = 0,
+      radiusOfGyrationAboutMinorAxis = 0;
+
+    _settingsStore.Current.SapModel.PropFrame.GetSectProps(
+      sectionName,
+      ref crossSectionalArea,
+      ref shearAreaInMajorAxisDirection,
+      ref shearAreaInMinorAxisDirection,
+      ref torsionalConstant,
+      ref momentOfInertiaAboutMajorAxis,
+      ref momentOfInertiaAboutMinorAxis,
+      ref sectionModulusAboutMajorAxis,
+      ref sectionModulusAboutMinorAxis,
+      ref plasticModulusAboutMajorAxis,
+      ref plasticModulusAboutMinorAxis,
+      ref radiusOfGyrationAboutMajorAxis,
+      ref radiusOfGyrationAboutMinorAxis
+    );
+
+    string distanceUnit = _settingsStore.Current.SpeckleUnits;
+    string areaUnit = $"{distanceUnit}²"; // // TODO: Formalize this better
+    string modulusUnit = $"{distanceUnit}³"; // // TODO: Formalize this better
+    string inertiaUnit = $"{distanceUnit}\u2074"; // TODO: Formalize this better
+
+    Dictionary<string, object?> mechanicalProperties = properties.EnsureNested(
+      SectionPropertyCategory.SECTION_PROPERTIES
+    );
+    mechanicalProperties.AddWithUnits("Area", crossSectionalArea, areaUnit);
+    mechanicalProperties.AddWithUnits("As2", shearAreaInMajorAxisDirection, areaUnit);
+    mechanicalProperties.AddWithUnits("As3", shearAreaInMinorAxisDirection, areaUnit);
+    mechanicalProperties.AddWithUnits("J", torsionalConstant, inertiaUnit);
+    mechanicalProperties.AddWithUnits("I22", momentOfInertiaAboutMajorAxis, inertiaUnit);
+    mechanicalProperties.AddWithUnits("I33", momentOfInertiaAboutMinorAxis, inertiaUnit);
+    mechanicalProperties.AddWithUnits("S22", sectionModulusAboutMajorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("S33", sectionModulusAboutMinorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("Z22", plasticModulusAboutMajorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("Z33", plasticModulusAboutMinorAxis, modulusUnit);
+    mechanicalProperties.AddWithUnits("R22", radiusOfGyrationAboutMajorAxis, distanceUnit);
+    mechanicalProperties.AddWithUnits("R33", radiusOfGyrationAboutMinorAxis, distanceUnit);
+  }
+
+  private void GetPropertyModifiers(string sectionName, Dictionary<string, object?> properties)
+  {
+    double[] stiffnessModifiersArray = [];
+    _settingsStore.Current.SapModel.PropFrame.GetModifiers(sectionName, ref stiffnessModifiersArray);
+
+    Dictionary<string, object?> modifiers =
+      new()
+      {
+        ["Cross-section (Axial) Area"] = stiffnessModifiersArray[0],
+        ["Shear Area in 2 Direction"] = stiffnessModifiersArray[1],
+        ["Shear Area in 3 Direction"] = stiffnessModifiersArray[2],
+        ["Torsional Constant"] = stiffnessModifiersArray[3],
+        ["Moment of Inertia about 2 Axis"] = stiffnessModifiersArray[4],
+        ["Moment of Inertia about 3 Axis"] = stiffnessModifiersArray[5],
+        ["Mass"] = stiffnessModifiersArray[6],
+        ["Weight"] = stiffnessModifiersArray[7],
+      };
+
+    Dictionary<string, object?> generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Modifiers"] = modifiers;
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiMaterialPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiMaterialPropertyExtractor.cs
new file mode 100644
index 000000000..279ba1b17
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiMaterialPropertyExtractor.cs
@@ -0,0 +1,212 @@
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+/// <summary>
+/// Base material property extractor for CSi products.
+/// </summary>
+/// <remarks>
+/// Currently, all material property extraction can happen on a CsiShared level which simplifies things a lot.
+/// Properties depend on the directional symmetry of the material, hence the switch statements.
+/// </remarks>
+public class CsiMaterialPropertyExtractor
+{
+  /// <summary>
+  /// Property strings for all mechanical properties, used by numerous methods.
+  /// </summary>
+  private static class MechanicalPropertyNames
+  {
+    public const string MODULUS_OF_ELASTICITY = "Modulus of Elasticity, E";
+    public const string MODULUS_OF_ELASTICITY_ARRAY = "Modulus of Elasticity Array, E";
+    public const string POISSON_RATIO = "Poisson's Ratio, U";
+    public const string POISSON_RATIO_ARRAY = "Poisson's Ratio Array, U";
+    public const string THERMAL_COEFFICIENT = "Coefficient of Thermal Expansion, A";
+    public const string THERMAL_COEFFICIENT_ARRAY = "Coefficient of Thermal Expansion Array, A";
+    public const string SHEAR_MODULUS = "Shear Modulus, G";
+    public const string SHEAR_MODULUS_ARRAY = "Shear Modulus Array, G";
+  }
+
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+
+  public CsiMaterialPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  {
+    _settingsStore = settingsStore;
+  }
+
+  public void ExtractProperties(string materialName, Dictionary<string, object?> properties)
+  {
+    GetGeneralProperties(materialName, properties);
+    GetWeightAndMassProperties(materialName, properties); // TODO: Add units
+    GetMechanicalProperties(materialName, properties); // TODO: Add units
+  }
+
+  private void GetGeneralProperties(string materialName, Dictionary<string, object?> properties)
+  {
+    {
+      eMatType materialType = default;
+      int materialColor = 0;
+      string materialNotes = string.Empty;
+      string materialGuid = string.Empty;
+
+      _settingsStore.Current.SapModel.PropMaterial.GetMaterial(
+        materialName,
+        ref materialType,
+        ref materialColor,
+        ref materialNotes,
+        ref materialGuid
+      );
+
+      var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+      generalData["Name"] = materialName;
+      generalData["Type"] = materialType.ToString();
+      generalData["Notes"] = materialNotes;
+    }
+  }
+
+  private void GetWeightAndMassProperties(string materialName, Dictionary<string, object?> properties)
+  {
+    double weightPerUnitVolume = double.NaN;
+    double massPerUnitVolume = double.NaN;
+
+    _settingsStore.Current.SapModel.PropMaterial.GetWeightAndMass(
+      materialName,
+      ref weightPerUnitVolume,
+      ref massPerUnitVolume
+    );
+
+    var weightAndMass = properties.EnsureNested("Weight and Mass");
+    weightAndMass["Weight per Unit Volume"] = weightPerUnitVolume;
+    weightAndMass["Mass per Unit Volume"] = massPerUnitVolume;
+  }
+
+  private void GetMechanicalProperties(string materialName, Dictionary<string, object?> properties)
+  {
+    int materialDirectionalSymmetryKey = 0;
+    eMatType materialType = default;
+
+    _settingsStore.Current.SapModel.PropMaterial.GetTypeOAPI(
+      materialName,
+      ref materialType,
+      ref materialDirectionalSymmetryKey
+    );
+
+    var materialDirectionalSymmetryValue = materialDirectionalSymmetryKey switch
+    {
+      0 => DirectionalSymmetryType.ISOTROPIC,
+      1 => DirectionalSymmetryType.ORTHOTROPIC,
+      2 => DirectionalSymmetryType.ANISOTROPIC,
+      3 => DirectionalSymmetryType.UNIAXIAL,
+      _ => throw new ArgumentException($"Unknown symmetry type: {materialDirectionalSymmetryKey}")
+    };
+
+    var mechanicalProperties = properties.EnsureNested("Mechanical Properties");
+    mechanicalProperties["Directional Symmetry Type"] = materialDirectionalSymmetryValue.ToString();
+
+    GetMechanicalPropertiesByType(materialName, materialDirectionalSymmetryValue, mechanicalProperties);
+  }
+
+  private void GetMechanicalPropertiesByType(
+    string materialName,
+    DirectionalSymmetryType directionalSymmetryType,
+    Dictionary<string, object?> mechanicalProperties
+  )
+  {
+    switch (directionalSymmetryType)
+    {
+      case DirectionalSymmetryType.ISOTROPIC:
+        ExtractIsotropicProperties(materialName, mechanicalProperties);
+        break;
+      case DirectionalSymmetryType.ORTHOTROPIC:
+        ExtractOrthotropicProperties(materialName, mechanicalProperties);
+        break;
+      case DirectionalSymmetryType.ANISOTROPIC:
+        ExtractAnisotropicProperties(materialName, mechanicalProperties);
+        break;
+      case DirectionalSymmetryType.UNIAXIAL:
+        ExtractUniaxialProperties(materialName, mechanicalProperties);
+        break;
+      default:
+        throw new ArgumentException($"Unknown directional symmetry type: {directionalSymmetryType}");
+    }
+  }
+
+  private void ExtractIsotropicProperties(string materialName, Dictionary<string, object?> mechanicalProperties)
+  {
+    double modulusOfElasticity = double.NaN;
+    double poissonRatio = double.NaN;
+    double thermalCoefficient = double.NaN;
+    double shearModulus = double.NaN;
+
+    _settingsStore.Current.SapModel.PropMaterial.GetMPIsotropic(
+      materialName,
+      ref modulusOfElasticity,
+      ref poissonRatio,
+      ref thermalCoefficient,
+      ref shearModulus
+    );
+
+    mechanicalProperties[MechanicalPropertyNames.MODULUS_OF_ELASTICITY] = modulusOfElasticity;
+    mechanicalProperties[MechanicalPropertyNames.POISSON_RATIO] = poissonRatio;
+    mechanicalProperties[MechanicalPropertyNames.THERMAL_COEFFICIENT] = thermalCoefficient;
+    mechanicalProperties[MechanicalPropertyNames.SHEAR_MODULUS] = shearModulus;
+  }
+
+  private void ExtractOrthotropicProperties(string materialName, Dictionary<string, object?> mechanicalProperties)
+  {
+    double[] modulusOfElasticityArray = [];
+    double[] poissonRatioArray = [];
+    double[] thermalCoefficientArray = [];
+    double[] shearModulusArray = [];
+
+    _settingsStore.Current.SapModel.PropMaterial.GetMPOrthotropic(
+      materialName,
+      ref modulusOfElasticityArray,
+      ref poissonRatioArray,
+      ref thermalCoefficientArray,
+      ref shearModulusArray
+    );
+
+    mechanicalProperties[MechanicalPropertyNames.MODULUS_OF_ELASTICITY_ARRAY] = modulusOfElasticityArray;
+    mechanicalProperties[MechanicalPropertyNames.POISSON_RATIO_ARRAY] = poissonRatioArray;
+    mechanicalProperties[MechanicalPropertyNames.THERMAL_COEFFICIENT_ARRAY] = thermalCoefficientArray;
+    mechanicalProperties[MechanicalPropertyNames.SHEAR_MODULUS_ARRAY] = shearModulusArray;
+  }
+
+  private void ExtractAnisotropicProperties(string materialName, Dictionary<string, object?> mechanicalProperties)
+  {
+    double[] modulusOfElasticityArray = [];
+    double[] poissonRatioArray = [];
+    double[] thermalCoefficientArray = [];
+    double[] shearModulusArray = [];
+
+    _settingsStore.Current.SapModel.PropMaterial.GetMPAnisotropic(
+      materialName,
+      ref modulusOfElasticityArray,
+      ref poissonRatioArray,
+      ref thermalCoefficientArray,
+      ref shearModulusArray
+    );
+
+    mechanicalProperties[MechanicalPropertyNames.MODULUS_OF_ELASTICITY_ARRAY] = modulusOfElasticityArray;
+    mechanicalProperties[MechanicalPropertyNames.POISSON_RATIO_ARRAY] = poissonRatioArray;
+    mechanicalProperties[MechanicalPropertyNames.THERMAL_COEFFICIENT_ARRAY] = thermalCoefficientArray;
+    mechanicalProperties[MechanicalPropertyNames.SHEAR_MODULUS_ARRAY] = shearModulusArray;
+  }
+
+  private void ExtractUniaxialProperties(string materialName, Dictionary<string, object?> mechanicalProperties)
+  {
+    double modulusOfElasticity = double.NaN;
+    double thermalCoefficient = double.NaN;
+
+    _settingsStore.Current.SapModel.PropMaterial.GetMPUniaxial(
+      materialName,
+      ref modulusOfElasticity,
+      ref thermalCoefficient
+    );
+
+    mechanicalProperties[MechanicalPropertyNames.MODULUS_OF_ELASTICITY] = modulusOfElasticity;
+    mechanicalProperties[MechanicalPropertyNames.THERMAL_COEFFICIENT] = thermalCoefficient;
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiShellSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiShellSectionPropertyExtractor.cs
new file mode 100644
index 000000000..6d2d82bee
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/CsiShellSectionPropertyExtractor.cs
@@ -0,0 +1,68 @@
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+/// <summary>
+/// Base shell section property extractor for CSi products.
+/// </summary>
+/// <remarks>
+/// Handles common Csi API calls for shell section properties.
+/// Provides foundation for application-specific extractors.
+/// </remarks>
+public class CsiShellSectionPropertyExtractor : IShellSectionPropertyExtractor
+{
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+
+  public CsiShellSectionPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  {
+    _settingsStore = settingsStore;
+  }
+
+  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    GetPropertyType(sectionName, properties);
+    GetPropertyModifiers(sectionName, properties);
+  }
+
+  private void GetPropertyType(string sectionName, Dictionary<string, object?> properties)
+  {
+    int propertyTypeKey = 1;
+    _settingsStore.Current.SapModel.PropArea.GetTypeOAPI(sectionName, ref propertyTypeKey);
+    var propertyTypeValue = propertyTypeKey switch
+    {
+      1 => AreaPropertyType.SHELL,
+      2 => AreaPropertyType.PLANE,
+      3 => AreaPropertyType.ASOLID,
+      _ => throw new ArgumentException($"Unknown property type: {propertyTypeKey}"),
+    };
+
+    var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Property Type"] = propertyTypeValue.ToString();
+  }
+
+  private void GetPropertyModifiers(string sectionName, Dictionary<string, object?> properties)
+  {
+    double[] stiffnessModifiersArray = [];
+    _settingsStore.Current.SapModel.PropArea.GetModifiers(sectionName, ref stiffnessModifiersArray);
+
+    Dictionary<string, object?> modifiers =
+      new()
+      {
+        ["Membrane f11 Direction"] = stiffnessModifiersArray[0],
+        ["Membrane f22 Direction"] = stiffnessModifiersArray[1],
+        ["Membrane f12 Direction"] = stiffnessModifiersArray[2],
+        ["Bending m11 Direction"] = stiffnessModifiersArray[3],
+        ["Bending m22 Direction"] = stiffnessModifiersArray[3],
+        ["Bending m12 Direction"] = stiffnessModifiersArray[4],
+        ["Shear v13 Direction"] = stiffnessModifiersArray[5],
+        ["Shear v23 Direction"] = stiffnessModifiersArray[6],
+        ["Mass"] = stiffnessModifiersArray[7],
+        ["Weight"] = stiffnessModifiersArray[8]
+      };
+
+    var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+    generalData["Modifiers"] = modifiers;
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IApplicationSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IApplicationSectionPropertyExtractor.cs
new file mode 100644
index 000000000..e16d3b3ea
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/IApplicationSectionPropertyExtractor.cs
@@ -0,0 +1,18 @@
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+/// <summary>
+/// Contract for host application specific section property extraction.
+/// </summary>
+/// <remarks>
+/// Mirrors property extraction system pattern by composing with base extractor.
+/// Enables both shared and application-specific property extraction in one call.
+/// </remarks>
+public interface IApplicationSectionPropertyExtractor
+{
+  void ExtractProperties(string sectionName, Dictionary<string, object?> properties);
+}
+
+// NOTE: Seemingly silly, but allows us to register the correct extractor for the correct type.
+public interface IApplicationFrameSectionPropertyExtractor : IApplicationSectionPropertyExtractor { }
+
+public interface IApplicationShellSectionPropertyExtractor : IApplicationSectionPropertyExtractor { }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionPropertyExtractor.cs
new file mode 100644
index 000000000..5f401cdd1
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionPropertyExtractor.cs
@@ -0,0 +1,14 @@
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+/// <summary>
+/// Core contract for section property extraction common across CSi products.
+/// </summary>
+public interface ISectionPropertyExtractor
+{
+  void ExtractProperties(string sectionName, Dictionary<string, object?> properties);
+}
+
+// NOTE: Seemingly silly, but allows us to register the correct extractor for the correct type.
+public interface IFrameSectionPropertyExtractor : ISectionPropertyExtractor { }
+
+public interface IShellSectionPropertyExtractor : ISectionPropertyExtractor { }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionUnpacker.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionUnpacker.cs
new file mode 100644
index 000000000..cee5215b5
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/Helpers/ISectionUnpacker.cs
@@ -0,0 +1,10 @@
+using Speckle.Sdk.Models.Proxies;
+
+namespace Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+// NOTE: Interface because Etabs and Sap2000 section unpacking and extraction is different.
+// At ServiceRegistration, we inject the correct implementation of the ISectionUnpacker
+public interface ISectionUnpacker
+{
+  IEnumerable<GroupProxy> UnpackSections();
+}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/MaterialUnpacker.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/MaterialUnpacker.cs
new file mode 100644
index 000000000..1de645a85
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/HostApp/MaterialUnpacker.cs
@@ -0,0 +1,51 @@
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
+using Speckle.Sdk.Models.Proxies;
+
+namespace Speckle.Connectors.CSiShared.HostApp;
+
+/// <summary>
+/// Creates material proxies based on stored entries from the materials cache
+/// </summary>
+public class MaterialUnpacker
+{
+  private readonly CsiMaterialPropertyExtractor _propertyExtractor;
+  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
+
+  public MaterialUnpacker(
+    CsiMaterialPropertyExtractor propertyExtractor,
+    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton
+  )
+  {
+    _propertyExtractor = propertyExtractor;
+    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
+  }
+
+  // Creates a list of material proxies from the csi materials cache
+  public IEnumerable<IProxyCollection> UnpackMaterials()
+  {
+    foreach (var kvp in _csiToSpeckleCacheSingleton.MaterialCache)
+    {
+      // get the cached entry
+      string materialName = kvp.Key;
+      List<string> sectionIds = kvp.Value;
+
+      // get the properties of the material
+      Dictionary<string, object?> properties = new(); // create empty dictionary
+      _propertyExtractor.ExtractProperties(materialName, properties); // dictionary mutated with respective properties
+
+      // create the material proxy
+      GroupProxy materialProxy =
+        new()
+        {
+          id = materialName,
+          name = materialName,
+          applicationId = materialName,
+          objects = sectionIds,
+          ["properties"] = properties
+        };
+
+      yield return materialProxy;
+    }
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs
index c76aa8dfd..0faec5b5c 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Operations/Send/CsiRootObjectBuilder.cs
@@ -1,11 +1,12 @@
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Builders;
-using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
 using Speckle.Converters.Common;
 using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Extensions;
 using Speckle.Sdk;
 using Speckle.Sdk.Logging;
 using Speckle.Sdk.Models;
@@ -13,35 +14,60 @@
 
 namespace Speckle.Connectors.CSiShared.Builders;
 
+/// <summary>
+/// Manages the conversion of CSi model objects and establishes proxy-based relationships.
+/// </summary>
+/// <remarks>
+/// Core responsibilities:
+/// - Converts ICsiWrappers to Speckle objects through caching-aware conversion
+/// - Creates proxy objects for materials and sections from model data
+/// - Establishes relationships between objects and their dependencies
+///
+/// The builder follows a two-phase process:
+/// 1. Conversion Phase: ICsiWrappers → Speckle objects with cached results handling
+/// 2. Relationship Phase: Material/section proxy creation and relationship mapping
+/// </remarks>
 public class CsiRootObjectBuilder : IRootObjectBuilder<ICsiWrapper>
 {
   private readonly IRootToSpeckleConverter _rootToSpeckleConverter;
-  private readonly ISendConversionCache _sendConversionCache;
   private readonly IConverterSettingsStore<CsiConversionSettings> _converterSettings;
   private readonly CsiSendCollectionManager _sendCollectionManager;
+  private readonly MaterialUnpacker _materialUnpacker;
+  private readonly ISectionUnpacker _sectionUnpacker;
   private readonly ILogger<CsiRootObjectBuilder> _logger;
   private readonly ISdkActivityFactory _activityFactory;
   private readonly ICsiApplicationService _csiApplicationService;
 
   public CsiRootObjectBuilder(
     IRootToSpeckleConverter rootToSpeckleConverter,
-    ISendConversionCache sendConversionCache,
     IConverterSettingsStore<CsiConversionSettings> converterSettings,
     CsiSendCollectionManager sendCollectionManager,
+    MaterialUnpacker materialUnpacker,
+    ISectionUnpacker sectionUnpacker,
     ILogger<CsiRootObjectBuilder> logger,
     ISdkActivityFactory activityFactory,
     ICsiApplicationService csiApplicationService
   )
   {
-    _sendConversionCache = sendConversionCache;
     _converterSettings = converterSettings;
     _sendCollectionManager = sendCollectionManager;
+    _materialUnpacker = materialUnpacker;
+    _sectionUnpacker = sectionUnpacker;
     _rootToSpeckleConverter = rootToSpeckleConverter;
     _logger = logger;
     _activityFactory = activityFactory;
     _csiApplicationService = csiApplicationService;
   }
 
+  /// <summary>
+  /// Converts Csi objects into a Speckle-compatible object hierarchy with established relationships.
+  /// </summary>
+  /// <remarks>
+  /// Operation sequence:
+  /// 1. Creates root collection with model metadata
+  /// 2. Converts each object with caching and progress tracking
+  /// 3. Creates proxies for materials and sections
+  /// </remarks>
   public async Task<RootObjectBuilderResult> BuildAsync(
     IReadOnlyList<ICsiWrapper> csiObjects,
     SendInfo sendInfo,
@@ -52,8 +78,8 @@ CancellationToken cancellationToken
     using var activity = _activityFactory.Start("Build");
 
     string modelFileName = _csiApplicationService.SapModel.GetModelFilename(false) ?? "Unnamed model";
-    Collection rootObjectCollection = new() { name = modelFileName };
-    rootObjectCollection["units"] = _converterSettings.Current.SpeckleUnits;
+    Collection rootObjectCollection =
+      new() { name = modelFileName, ["units"] = _converterSettings.Current.SpeckleUnits };
 
     List<SendConversionResult> results = new(csiObjects.Count);
     int count = 0;
@@ -65,7 +91,7 @@ CancellationToken cancellationToken
         cancellationToken.ThrowIfCancellationRequested();
         using var _2 = _activityFactory.Start("Convert");
 
-        var result = ConvertCSiObject(csiObject, rootObjectCollection, sendInfo.ProjectId);
+        var result = ConvertCsiObject(csiObject, rootObjectCollection);
         results.Add(result);
 
         count++;
@@ -79,28 +105,37 @@ CancellationToken cancellationToken
       throw new SpeckleException("Failed to convert all objects.");
     }
 
+    using (var _ = _activityFactory.Start("Process Proxies"))
+    {
+      // Create and add material proxies
+      rootObjectCollection[ProxyKeys.MATERIAL] = _materialUnpacker.UnpackMaterials().ToList();
+
+      // Create and all section proxies (frame and shell)
+      rootObjectCollection[ProxyKeys.SECTION] = _sectionUnpacker.UnpackSections().ToList();
+    }
+
     return new RootObjectBuilderResult(rootObjectCollection, results);
   }
 
-  private SendConversionResult ConvertCSiObject(ICsiWrapper csiObject, Collection typeCollection, string projectId)
+  /// <summary>
+  /// Converts a single Csi wrapper "object" to a data object with appropriate collection management.
+  /// </summary>
+  private SendConversionResult ConvertCsiObject(ICsiWrapper csiObject, Collection typeCollection)
   {
-    string applicationId = $"{csiObject.ObjectType}{csiObject.Name}"; // TODO: NO! Use GUID
     string sourceType = csiObject.ObjectName;
+    string applicationId = csiObject switch
+    {
+      CsiFrameWrapper frameWrapper => frameWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiJointWrapper jointWrapper => jointWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      CsiShellWrapper shellWrapper => shellWrapper.GetSpeckleApplicationId(_csiApplicationService.SapModel),
+      _ => throw new ArgumentException($"Unsupported wrapper type: {csiObject.GetType()}", nameof(csiObject))
+    };
 
     try
     {
-      Base converted;
-      if (_sendConversionCache.TryGetValue(projectId, applicationId, out ObjectReference? value))
-      {
-        converted = value;
-      }
-      else
-      {
-        converted = _rootToSpeckleConverter.Convert(csiObject);
-      }
+      Base converted = _rootToSpeckleConverter.Convert(csiObject);
 
       var collection = _sendCollectionManager.AddObjectCollectionToRoot(converted, typeCollection);
-      collection.elements ??= new List<Base>();
       collection.elements.Add(converted);
 
       return new(Status.SUCCESS, applicationId, sourceType, converted);
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/CsiPluginBase.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/CsiPluginBase.cs
index 35be6a110..eb7c6df1e 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/CsiPluginBase.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/CsiPluginBase.cs
@@ -10,8 +10,8 @@ public abstract class CSiPluginBase : cPluginContract, IDisposable
   public void Main(ref cSapModel sapModel, ref cPluginCallback pluginCallback)
   {
     _panel = CreateForm();
-    _panel.SetSapModel(ref sapModel, ref pluginCallback);
-    _panel.FormClosed += (s, e) => Dispose();
+    _panel.Initialize(ref sapModel, ref pluginCallback);
+    _panel.FormClosed += (_, _) => Dispose();
 
     if (string.Equals(s_modality, "Non-Modal", StringComparison.OrdinalIgnoreCase))
     {
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/SpeckleFormBase.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/SpeckleFormBase.cs
index a3a81cad1..f3b01b9c6 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/SpeckleFormBase.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Plugin/SpeckleFormBase.cs
@@ -1,8 +1,10 @@
 using System.ComponentModel;
+using System.Reflection;
 using System.Windows.Forms.Integration;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.Common;
 using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.CSiShared;
 using Speckle.Sdk.Host;
@@ -10,28 +12,23 @@
 namespace Speckle.Connectors.CSiShared;
 
 [DesignerCategory("")]
-public abstract class SpeckleFormBase : Form
+public abstract class SpeckleFormBase : Form, ICsiApplicationService
 {
-  protected ElementHost Host { get; set; }
-  public static new ServiceProvider? Container { get; set; }
-  private cSapModel _sapModel;
+  private ElementHost Host { get; set; }
   private cPluginCallback _pluginCallback;
+  private bool _disposed;
+#pragma warning disable CA2213
+  private ServiceProvider _container;
+#pragma warning restore CA2213
 
   protected SpeckleFormBase()
   {
     Text = "Speckle (Beta)";
-
-    var services = new ServiceCollection();
-    ConfigureServices(services);
-
-    Container = services.BuildServiceProvider();
-
-    var webview = Container.GetRequiredService<DUI3ControlWebView>();
-    Host = new() { Child = webview, Dock = DockStyle.Fill };
-    Controls.Add(Host);
-    FormClosing += Form1Closing;
+    Size = new System.Drawing.Size(400, 600);
   }
 
+  public cSapModel SapModel { get; private set; }
+
   protected virtual void ConfigureServices(IServiceCollection services)
   {
     services.Initialize(GetHostApplication(), GetVersion());
@@ -43,23 +40,61 @@ protected virtual void ConfigureServices(IServiceCollection services)
 
   protected abstract HostAppVersion GetVersion();
 
-  public void SetSapModel(ref cSapModel sapModel, ref cPluginCallback pluginCallback)
+  public void Initialize(ref cSapModel sapModel, ref cPluginCallback pluginCallback)
   {
-    _sapModel = sapModel;
+    // store app-specific model and callback references (callback if at all possible?)
+    SapModel = sapModel;
     _pluginCallback = pluginCallback;
 
-    var csiService = Container.GetRequiredService<ICsiApplicationService>();
-    csiService.Initialize(sapModel, pluginCallback);
-  }
+    string assemblyName =
+      Assembly.GetExecutingAssembly().GetName().Name
+      ?? throw new InvalidOperationException("Could not determine executing assembly name");
+    string resourcePath = $"{assemblyName}.Resources.et_element_Speckle.bmp";
 
-  protected void Form1Closing(object? sender, FormClosingEventArgs e)
-  {
-    Host.Dispose();
-    _pluginCallback.Finish(0);
+    // load and set the speckle icon from embedded resources
+    using (var stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resourcePath))
+    {
+      if (stream == null)
+      {
+        throw new InvalidOperationException($"Could not find resource: {resourcePath}");
+      }
+
+      using var bmp = new Bitmap(stream);
+      Icon = Icon.FromHandle(bmp.GetHicon());
+    }
+
+    // configure dependency injection services
+    var services = new ServiceCollection();
+    services.AddSingleton<ICsiApplicationService>(this);
+    ConfigureServices(services);
+
+    // build service container and initialize ui framework
+    _container = services.BuildServiceProvider();
+    _container.UseDUI();
+
+    // setup webview control and form properties
+    var webview = _container.GetRequiredService<DUI3ControlWebView>();
+    Host = new() { Child = webview, Dock = DockStyle.Fill };
+    Controls.Add(Host);
+    FormBorderStyle = FormBorderStyle.Sizable;
+    // this.TopLevel = true;
+    // TODO: Get IntrPtr for Csi window
+    FormClosing += Form1Closing;
   }
 
-  public new void ShowDialog()
+  private void Form1Closing(object? sender, FormClosingEventArgs e) => _pluginCallback.Finish(0);
+
+  protected override void Dispose(bool disposing)
   {
-    base.ShowDialog();
+    if (!_disposed)
+    {
+      if (disposing)
+      {
+        _container.Dispose();
+        Host.Dispose();
+        base.Dispose(disposing);
+      }
+      _disposed = true;
+    }
   }
 }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Resources/et_element_Speckle.bmp b/Connectors/CSi/Speckle.Connectors.CSiShared/Resources/et_element_Speckle.bmp
new file mode 100644
index 000000000..36085a0d9
Binary files /dev/null and b/Connectors/CSi/Speckle.Connectors.CSiShared/Resources/et_element_Speckle.bmp differ
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs b/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs
index 59945da1e..41b60f2a2 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/ServiceRegistration.cs
@@ -7,12 +7,14 @@
 using Speckle.Connectors.CSiShared.Builders;
 using Speckle.Connectors.CSiShared.Filters;
 using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
 
 namespace Speckle.Connectors.CSiShared;
 
@@ -21,7 +23,6 @@ public static class ServiceRegistration
   public static IServiceCollection AddCsi(this IServiceCollection services)
   {
     services.AddSingleton<IBrowserBridge, BrowserBridge>();
-    services.AddSingleton<ICsiApplicationService, CsiApplicationService>();
 
     services.AddConnectorUtils();
     services.AddDUI<DefaultThreadContext, CsiDocumentModelStore>();
@@ -33,7 +34,6 @@ public static IServiceCollection AddCsi(this IServiceCollection services)
 
     services.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     services.AddSingleton<IBasicConnectorBinding, CsiSharedBasicConnectorBinding>();
-    services.AddSingleton<IAppIdleManager, CsiIdleManager>();
 
     services.AddSingleton<IBinding, CsiSharedSelectionBinding>();
     services.AddSingleton<IBinding, CsiSharedSendBinding>();
@@ -43,7 +43,13 @@ public static IServiceCollection AddCsi(this IServiceCollection services)
     services.AddScoped<IRootObjectBuilder<ICsiWrapper>, CsiRootObjectBuilder>();
     services.AddScoped<SendOperation<ICsiWrapper>>();
 
-    services.RegisterTopLevelExceptionHandler();
+    services.AddScoped<CsiMaterialPropertyExtractor>();
+    services.AddScoped<MaterialUnpacker>();
+    services.AddScoped<IFrameSectionPropertyExtractor, CsiFrameSectionPropertyExtractor>();
+    services.AddScoped<IShellSectionPropertyExtractor, CsiShellSectionPropertyExtractor>();
+
+    // add converter caches
+    services.AddScoped<CsiToSpeckleCacheSingleton>();
 
     return services;
   }
diff --git a/Connectors/CSi/Speckle.Connectors.CSiShared/Speckle.Connectors.CSiShared.projitems b/Connectors/CSi/Speckle.Connectors.CSiShared/Speckle.Connectors.CSiShared.projitems
index be32df90c..9a8f7a298 100644
--- a/Connectors/CSi/Speckle.Connectors.CSiShared/Speckle.Connectors.CSiShared.projitems
+++ b/Connectors/CSi/Speckle.Connectors.CSiShared/Speckle.Connectors.CSiShared.projitems
@@ -8,20 +8,36 @@
   <PropertyGroup Label="Configuration">
     <Import_RootNamespace>Speckle.Connectors.CSiShared</Import_RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Resources\et_element_Speckle.bmp">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedBasicConnectorBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSelectionBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\CsiSharedSendBinding.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Events\ModelChangedEvent.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Events\SelectionBindingEvent.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Filters\CsiSharedSelectionFilter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\MaterialUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiSendCollectionManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiFrameSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiMaterialPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\CsiShellSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\IApplicationSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\ISectionUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\CsiRootObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\CsiPluginBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\SpeckleFormBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiApplicationService.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiDocumentModelStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\CsiIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ServiceRegistration.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Utils\ObjectIdentifiers.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\et_element_Speckle.bmp" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Connectors/CSi/Speckle.Connectors.ETABS21/Plugin/SpeckleForm.cs b/Connectors/CSi/Speckle.Connectors.ETABS21/Plugin/SpeckleForm.cs
index 79043b5ee..349144d0c 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABS21/Plugin/SpeckleForm.cs
+++ b/Connectors/CSi/Speckle.Connectors.ETABS21/Plugin/SpeckleForm.cs
@@ -8,5 +8,5 @@ namespace Speckle.Connectors.ETABS21;
 
 public class SpeckleForm : EtabsSpeckleFormBase
 {
-  protected override HostAppVersion GetVersion() => HostAppVersion.v2021; // TODO: We need a v21
+  protected override HostAppVersion GetVersion() => HostAppVersion.v21;
 }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json
index b91ba7385..bd723179d 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json
+++ b/Connectors/CSi/Speckle.Connectors.ETABS21/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -292,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.etabs21": {
@@ -334,37 +329,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABS22/Plugin/SpeckleForm.cs b/Connectors/CSi/Speckle.Connectors.ETABS22/Plugin/SpeckleForm.cs
index 920ed8d0f..c25e9b5ca 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABS22/Plugin/SpeckleForm.cs
+++ b/Connectors/CSi/Speckle.Connectors.ETABS22/Plugin/SpeckleForm.cs
@@ -8,5 +8,5 @@ namespace Speckle.Connectors.ETABS22;
 
 public class SpeckleForm : EtabsSpeckleFormBase
 {
-  protected override HostAppVersion GetVersion() => HostAppVersion.v2021; // TODO: v22
+  protected override HostAppVersion GetVersion() => HostAppVersion.v22;
 }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json
index f1ea26d2d..e0d61f403 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json
+++ b/Connectors/CSi/Speckle.Connectors.ETABS22/packages.lock.json
@@ -155,11 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -220,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -230,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -248,7 +243,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.etabs22": {
@@ -290,36 +285,42 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs
new file mode 100644
index 000000000..528974450
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSectionUnpacker.cs
@@ -0,0 +1,110 @@
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Connectors.ETABSShared.HostApp.Helpers;
+using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
+using Speckle.Sdk.Models.Proxies;
+
+namespace Speckle.Connectors.ETABSShared.HostApp;
+
+/// <summary>
+/// Unpacks and creates proxies for frame and shell sections from the model.
+/// </summary>
+/// <remarks>
+/// Provides a unified approach to section extraction across different section types.
+/// Leverages specialized extractors to handle complex property retrieval. Centralizes
+/// section proxy creation with robust error handling and logging mechanisms.
+/// </remarks>
+public class EtabsSectionUnpacker : ISectionUnpacker
+{
+  private readonly EtabsSectionPropertyExtractor _propertyExtractor;
+  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
+
+  public EtabsSectionUnpacker(
+    EtabsSectionPropertyExtractor propertyExtractor,
+    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton
+  )
+  {
+    _propertyExtractor = propertyExtractor;
+    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
+  }
+
+  public IEnumerable<GroupProxy> UnpackSections()
+  {
+    foreach (GroupProxy frameSectionProxy in UnpackFrameSections())
+    {
+      yield return frameSectionProxy;
+    }
+
+    foreach (GroupProxy shellSectionProxy in UnpackShellSections())
+    {
+      yield return shellSectionProxy;
+    }
+  }
+
+  private IEnumerable<GroupProxy> UnpackFrameSections()
+  {
+    foreach (var entry in _csiToSpeckleCacheSingleton.FrameSectionCache)
+    {
+      string sectionName = entry.Key;
+      List<string> frameIds = entry.Value;
+
+      // Initialize properties outside the if statement
+      Dictionary<string, object?> properties = new Dictionary<string, object?>();
+
+      // get the properties of the section
+      // openings will have objects assigned to them, but won't have properties
+      // sectionName is initialized with string.Empty, but api ref returns string "None"
+      if (sectionName != "None")
+      {
+        properties = _propertyExtractor.ExtractFrameSectionProperties(sectionName);
+      }
+
+      // create the section proxy
+      GroupProxy sectionProxy =
+        new()
+        {
+          id = sectionName,
+          name = sectionName,
+          applicationId = sectionName,
+          objects = frameIds,
+          ["type"] = "Frame Section", // since sectionProxies are a flat list, need some way to distinguish from shell
+          ["properties"] = properties // openings will just have an empty dict here
+        };
+
+      yield return sectionProxy;
+    }
+  }
+
+  private IEnumerable<GroupProxy> UnpackShellSections()
+  {
+    foreach (var entry in _csiToSpeckleCacheSingleton.ShellSectionCache)
+    {
+      string sectionName = entry.Key;
+      List<string> frameIds = entry.Value;
+
+      // Initialize properties outside the if statement
+      Dictionary<string, object?> properties = new Dictionary<string, object?>();
+
+      // get the properties of the section
+      // openings will have objects assigned to them, but won't have properties
+      // sectionName is initialized with string.Empty, but api ref returns string "None"
+      if (sectionName != "None")
+      {
+        properties = _propertyExtractor.ExtractShellSectionProperties(sectionName);
+      }
+
+      // create the section proxy
+      GroupProxy sectionProxy =
+        new()
+        {
+          id = sectionName,
+          name = sectionName,
+          applicationId = sectionName,
+          objects = frameIds,
+          ["type"] = "Shell Section", // since sectionProxies are a flat list, need some way to distinguish from frame
+          ["properties"] = properties // openings will just have an empty dict here
+        };
+
+      yield return sectionProxy;
+    }
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSendCollectionManager.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSendCollectionManager.cs
index b721c2d18..8726d1cc5 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSendCollectionManager.cs
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/EtabsSendCollectionManager.cs
@@ -1,6 +1,7 @@
 using Speckle.Connectors.CSiShared.HostApp;
 using Speckle.Converters.Common;
 using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 
@@ -47,9 +48,14 @@ private string GetObjectLevelFromObject(Base obj)
       return DEFAULT_LEVEL;
     }
 
-    if (properties.TryGetValue("Object ID", out var objectId) && objectId is Dictionary<string, object> parameters)
+    if (
+      properties.TryGetValue(ObjectPropertyCategory.OBJECT_ID, out var objectId)
+      && objectId is Dictionary<string, object> parameters
+    )
     {
-      return parameters.TryGetValue("level", out var level) ? level?.ToString() ?? DEFAULT_LEVEL : DEFAULT_LEVEL;
+      return parameters.TryGetValue(CommonObjectProperty.LEVEL, out var level)
+        ? level?.ToString() ?? DEFAULT_LEVEL
+        : DEFAULT_LEVEL;
     }
 
     return DEFAULT_LEVEL;
@@ -66,11 +72,17 @@ private ElementCategory GetElementCategoryFromObject(Base obj)
     }
 
     // For frames and shells, get design orientation from Object ID
-    if ((type == "Frame" || type == "Shell") && obj["properties"] is Dictionary<string, object> properties)
+    if (
+      (type == ModelObjectType.FRAME.ToString() || type == ModelObjectType.SHELL.ToString())
+      && obj["properties"] is Dictionary<string, object> properties
+    )
     {
-      if (properties.TryGetValue("Object ID", out var objectId) && objectId is Dictionary<string, object> parameters)
+      if (
+        properties.TryGetValue(ObjectPropertyCategory.OBJECT_ID, out var objectId)
+        && objectId is Dictionary<string, object> parameters
+      )
       {
-        if (parameters.TryGetValue("designOrientation", out var orientation))
+        if (parameters.TryGetValue(CommonObjectProperty.DESIGN_ORIENTATION, out var orientation))
         {
           return GetCategoryFromDesignOrientation(orientation?.ToString(), type);
         }
@@ -78,7 +90,7 @@ private ElementCategory GetElementCategoryFromObject(Base obj)
     }
 
     // For joints, simply categorize as joints
-    return type == "Joint" ? ElementCategory.JOINT : ElementCategory.OTHER;
+    return type == ModelObjectType.JOINT.ToString() ? ElementCategory.JOINT : ElementCategory.OTHER;
   }
 
   private ElementCategory GetCategoryFromDesignOrientation(string? orientation, string type)
@@ -90,12 +102,12 @@ private ElementCategory GetCategoryFromDesignOrientation(string? orientation, st
 
     return (orientation, type) switch
     {
-      ("Column", "Frame") => ElementCategory.COLUMN,
-      ("Beam", "Frame") => ElementCategory.BEAM,
-      ("Brace", "Frame") => ElementCategory.BRACE,
-      ("Wall", "Shell") => ElementCategory.WALL,
-      ("Floor", "Shell") => ElementCategory.FLOOR,
-      ("Ramp", "Shell") => ElementCategory.RAMP,
+      ("Column", nameof(ModelObjectType.FRAME)) => ElementCategory.COLUMN,
+      ("Beam", nameof(ModelObjectType.FRAME)) => ElementCategory.BEAM,
+      ("Brace", nameof(ModelObjectType.FRAME)) => ElementCategory.BRACE,
+      ("Wall", nameof(ModelObjectType.SHELL)) => ElementCategory.WALL,
+      ("Floor", nameof(ModelObjectType.SHELL)) => ElementCategory.FLOOR,
+      ("Ramp", nameof(ModelObjectType.SHELL)) => ElementCategory.RAMP,
       _ => ElementCategory.OTHER
     };
   }
@@ -138,16 +150,4 @@ private Collection CreateCategoryCollection(ElementCategory category, Collection
     levelCollection.elements.Add(categoryCollection);
     return categoryCollection;
   }
-
-  private enum ElementCategory
-  {
-    COLUMN,
-    BEAM,
-    BRACE,
-    WALL,
-    FLOOR,
-    RAMP,
-    JOINT,
-    OTHER
-  }
 }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsFrameSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsFrameSectionPropertyExtractor.cs
new file mode 100644
index 000000000..97b9c9a91
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsFrameSectionPropertyExtractor.cs
@@ -0,0 +1,76 @@
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.ETABSShared.HostApp.Helpers;
+
+/// <summary>
+/// Extracts ETABS-specific frame section properties.
+/// </summary>
+public class EtabsFrameSectionPropertyExtractor : IApplicationFrameSectionPropertyExtractor
+{
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+
+  public EtabsFrameSectionPropertyExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  {
+    _settingsStore = settingsStore;
+  }
+
+  /// <summary>
+  /// Gets generalised frame section properties
+  /// </summary>
+  /// <remarks>
+  /// Sap2000 doesn't support this method, unfortunately
+  /// Alternative is to account for extraction according to section type - we're talking over 40 section types!
+  /// This way, we get basic information with minimal computational costs.
+  /// </remarks>
+  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    // Get all frame properties
+    int numberOfNames = 0;
+    string[] names = [];
+    eFramePropType[] propTypes = [];
+    double[] t3 = [],
+      t2 = [],
+      tf = [],
+      tw = [],
+      t2b = [],
+      tfb = [],
+      area = [];
+
+    _settingsStore.Current.SapModel.PropFrame.GetAllFrameProperties_2(
+      ref numberOfNames,
+      ref names,
+      ref propTypes,
+      ref t3,
+      ref t2,
+      ref tf,
+      ref tw,
+      ref t2b,
+      ref tfb,
+      ref area
+    );
+
+    // Find the index of the current section
+    int sectionIndex = Array.IndexOf(names, sectionName);
+
+    if (sectionIndex != -1)
+    {
+      // General Data
+      var generalData = properties.EnsureNested(SectionPropertyCategory.GENERAL_DATA);
+      generalData["Section Shape"] = propTypes[sectionIndex].ToString();
+
+      // Section Dimensions
+      string unit = _settingsStore.Current.SpeckleUnits;
+      var sectionDimensions = properties.EnsureNested(SectionPropertyCategory.SECTION_DIMENSIONS);
+      sectionDimensions.AddWithUnits("t3", t3[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("t2", t2[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tf", tf[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tw", tw[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("t2b", t2b[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("tfb", tfb[sectionIndex], unit);
+      sectionDimensions.AddWithUnits("Area", area[sectionIndex], $"{unit}²");
+    }
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsSectionPropertyExtractor.cs
new file mode 100644
index 000000000..93e0f3d30
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsSectionPropertyExtractor.cs
@@ -0,0 +1,53 @@
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+
+namespace Speckle.Connectors.ETABSShared.HostApp.Helpers;
+
+/// <summary>
+/// Coordinates property extraction combining base CSi and ETABS-specific properties.
+/// </summary>
+/// <remarks>
+/// Mirrors property extraction system pattern used in EtabsPropertiesExtractor.
+/// Composition handled at coordinator level rather than individual extractors.
+/// </remarks>
+public class EtabsSectionPropertyExtractor
+{
+  private readonly IFrameSectionPropertyExtractor _csiFrameExtractor;
+  private readonly IShellSectionPropertyExtractor _csiShellExtractor;
+  private readonly IApplicationFrameSectionPropertyExtractor _etabsFrameExtractor;
+  private readonly IApplicationShellSectionPropertyExtractor _etabsShellExtractor;
+
+  public EtabsSectionPropertyExtractor(
+    IFrameSectionPropertyExtractor csiFrameExtractor,
+    IShellSectionPropertyExtractor csiShellExtractor,
+    IApplicationFrameSectionPropertyExtractor etabsFrameExtractor,
+    IApplicationShellSectionPropertyExtractor etabsShellExtractor
+  )
+  {
+    _csiFrameExtractor = csiFrameExtractor;
+    _csiShellExtractor = csiShellExtractor;
+    _etabsFrameExtractor = etabsFrameExtractor;
+    _etabsShellExtractor = etabsShellExtractor;
+  }
+
+  /// <summary>
+  /// Extract the frame section properties on both a Csi and app-specific level
+  /// </summary>
+  public Dictionary<string, object?> ExtractFrameSectionProperties(string sectionName)
+  {
+    Dictionary<string, object?> properties = new();
+    _csiFrameExtractor.ExtractProperties(sectionName, properties);
+    _etabsFrameExtractor.ExtractProperties(sectionName, properties);
+    return properties;
+  }
+
+  /// <summary>
+  /// Extract the shell section properties on both a Csi and app-specific level
+  /// </summary>
+  public Dictionary<string, object?> ExtractShellSectionProperties(string sectionName)
+  {
+    Dictionary<string, object?> properties = new();
+    _csiShellExtractor.ExtractProperties(sectionName, properties);
+    _etabsShellExtractor.ExtractProperties(sectionName, properties);
+    return properties;
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionPropertyExtractor.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionPropertyExtractor.cs
new file mode 100644
index 000000000..4e137a72d
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionPropertyExtractor.cs
@@ -0,0 +1,64 @@
+using Microsoft.Extensions.Logging;
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.ETABSShared.HostApp.Helpers;
+
+/// <summary>
+/// Extracts ETABS-specific shell section properties.
+/// </summary>
+public class EtabsShellSectionPropertyExtractor : IApplicationShellSectionPropertyExtractor
+{
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+  private readonly ILogger<EtabsShellSectionPropertyExtractor> _logger;
+  private readonly EtabsShellSectionResolver _etabsShellSectionResolver;
+
+  public EtabsShellSectionPropertyExtractor(
+    IConverterSettingsStore<CsiConversionSettings> settingsStore,
+    ILogger<EtabsShellSectionPropertyExtractor> logger,
+    EtabsShellSectionResolver etabsShellSectionResolver
+  )
+  {
+    _settingsStore = settingsStore;
+    _logger = logger;
+    _etabsShellSectionResolver = etabsShellSectionResolver;
+  }
+
+  /// <summary>
+  /// Extract shell section properties
+  /// </summary>
+  /// <remarks>
+  /// sectionName is unique across all types (Wall, Slab and Deck)
+  /// There is no general query such as PropArea.GetShell() - rather we have to be specific on the type, for example
+  /// PropArea.GetWall() or PropArea.GetDeck() BUT we can't get the building type given a SectionName.
+  /// Hence the introduction of ResolveSection.
+  /// </remarks>
+  public void ExtractProperties(string sectionName, Dictionary<string, object?> properties)
+  {
+    // Step 01: Finding the appropriate api query for the unknown section type (wall, deck or slab)
+    Dictionary<string, object?> resolvedProperties = _etabsShellSectionResolver.ResolveSection(sectionName);
+
+    // Step 02: Mutate properties dictionary with resolved properties
+    foreach (var nestedDictionary in resolvedProperties)
+    {
+      if (nestedDictionary.Value is not Dictionary<string, object?> nestedValues)
+      {
+        _logger.LogWarning(
+          "Unexpected value type for key {Key} in section {SectionName}. Expected Dictionary<string, object?>, got {ActualType}",
+          nestedDictionary.Key,
+          sectionName,
+          nestedDictionary.Value?.GetType().Name ?? "null"
+        );
+        continue;
+      }
+
+      var nestedProperties = properties.EnsureNested(nestedDictionary.Key);
+      foreach (var kvp in nestedValues)
+      {
+        nestedProperties[kvp.Key] = kvp.Value;
+      }
+    }
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionResolver.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionResolver.cs
new file mode 100644
index 000000000..1d48f7c43
--- /dev/null
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/HostApp/Helpers/EtabsShellSectionResolver.cs
@@ -0,0 +1,182 @@
+using Speckle.Converters.Common;
+using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Utils;
+
+namespace Speckle.Connectors.ETABSShared.HostApp.Helpers;
+
+/// <summary>
+/// Attempts to resolve the section type and retrieve its properties by trying different section resolvers.
+/// </summary>
+/// <remarks>
+/// This service focuses solely on determining the correct section type and returning its properties.
+/// Since section names are unique across different types (Wall, Slab, Deck), it uses a try-and-fail approach
+/// rather than attempting to predetermine the type. The first successful resolution is returned.
+/// </remarks>
+public record AreaSectionResult
+{
+  public bool Success { get; init; }
+  public Dictionary<string, object?> Properties { get; init; }
+}
+
+public interface IAreaSectionResolver
+{
+  AreaSectionResult TryResolveSection(string sectionName);
+}
+
+public class EtabsShellSectionResolver
+{
+  private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+  private readonly IEnumerable<IAreaSectionResolver> _resolvers;
+
+  public EtabsShellSectionResolver(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  {
+    _settingsStore = settingsStore;
+    _resolvers =
+    [
+      new WallSectionResolver(_settingsStore),
+      new SlabSectionResolver(_settingsStore),
+      new DeckSectionResolver(_settingsStore)
+    ];
+  }
+
+  public Dictionary<String, object?> ResolveSection(string sectionName)
+  {
+    foreach (var resolver in _resolvers)
+    {
+      var result = resolver.TryResolveSection(sectionName);
+      if (result.Success)
+      {
+        return result.Properties;
+      }
+    }
+
+    throw new InvalidOperationException($"Section '{sectionName}' could not be resolved to any known type.");
+  }
+}
+
+public class WallSectionResolver(IConverterSettingsStore<CsiConversionSettings> settingsStore) : IAreaSectionResolver
+{
+  public AreaSectionResult TryResolveSection(string sectionName)
+  {
+    eWallPropType wallPropType = default;
+    eShellType shellType = default;
+    string matProp = string.Empty;
+    double thickness = 0.0;
+    int color = 0;
+    string notes = string.Empty;
+    string guid = string.Empty;
+
+    var result = settingsStore.Current.SapModel.PropArea.GetWall(
+      sectionName,
+      ref wallPropType,
+      ref shellType,
+      ref matProp,
+      ref thickness,
+      ref color,
+      ref notes,
+      ref guid
+    );
+
+    Dictionary<string, object?> generalData = [];
+    generalData["Property Name"] = sectionName;
+    generalData["Property Type"] = wallPropType.ToString();
+    generalData["Material"] = matProp;
+    generalData["Modeling Type"] = shellType.ToString();
+    generalData["Display Color"] = color;
+    generalData["Notes"] = notes;
+
+    Dictionary<string, object?> propertyData = [];
+    propertyData["Type"] = "Wall";
+    propertyData.AddWithUnits("Thickness", thickness, settingsStore.Current.SpeckleUnits);
+
+    Dictionary<string, object?> properties = [];
+    properties[SectionPropertyCategory.GENERAL_DATA] = generalData;
+    properties[SectionPropertyCategory.PROPERTY_DATA] = propertyData;
+
+    return new AreaSectionResult { Success = result == 0, Properties = properties };
+  }
+}
+
+public class SlabSectionResolver(IConverterSettingsStore<CsiConversionSettings> settingsStore) : IAreaSectionResolver
+{
+  public AreaSectionResult TryResolveSection(string sectionName)
+  {
+    eSlabType slabType = default;
+    eShellType shellType = default;
+    string matProp = string.Empty;
+    double thickness = 0.0;
+    int color = 0;
+    string notes = string.Empty;
+    string guid = string.Empty;
+
+    var result = settingsStore.Current.SapModel.PropArea.GetSlab(
+      sectionName,
+      ref slabType,
+      ref shellType,
+      ref matProp,
+      ref thickness,
+      ref color,
+      ref notes,
+      ref guid
+    );
+
+    Dictionary<string, object?> generalData = [];
+    generalData["Property Name"] = sectionName;
+    generalData["Material"] = matProp;
+    generalData["Modeling Type"] = shellType.ToString();
+    generalData["Display Color"] = color;
+    generalData["Notes"] = notes;
+
+    Dictionary<string, object?> propertyData = [];
+    propertyData["Type"] = slabType.ToString();
+    propertyData.AddWithUnits("Thickness", thickness, settingsStore.Current.SpeckleUnits);
+
+    Dictionary<string, object?> properties = [];
+    properties[SectionPropertyCategory.GENERAL_DATA] = generalData;
+    properties[SectionPropertyCategory.PROPERTY_DATA] = propertyData;
+
+    return new AreaSectionResult { Success = result == 0, Properties = properties };
+  }
+}
+
+public class DeckSectionResolver(IConverterSettingsStore<CsiConversionSettings> settingsStore) : IAreaSectionResolver
+{
+  public AreaSectionResult TryResolveSection(string sectionName)
+  {
+    eDeckType deckType = default;
+    eShellType shellType = default;
+    string deckMatProp = string.Empty;
+    double thickness = 0.0;
+    int color = 0;
+    string notes = string.Empty;
+    string guid = string.Empty;
+
+    var result = settingsStore.Current.SapModel.PropArea.GetDeck(
+      sectionName,
+      ref deckType,
+      ref shellType,
+      ref deckMatProp,
+      ref thickness,
+      ref color,
+      ref notes,
+      ref guid
+    );
+
+    Dictionary<string, object?> generalData = [];
+    generalData["Property Name"] = sectionName;
+    generalData["Property Type"] = deckType.ToString();
+    generalData["Material"] = deckMatProp;
+    generalData["Modeling Type"] = shellType.ToString();
+    generalData["Display Color"] = color;
+    generalData["Notes"] = notes;
+
+    Dictionary<string, object?> propertyData = [];
+    propertyData.AddWithUnits("Thickness", thickness, settingsStore.Current.SpeckleUnits);
+
+    Dictionary<string, object?> properties = [];
+    properties[SectionPropertyCategory.GENERAL_DATA] = generalData;
+    properties[SectionPropertyCategory.PROPERTY_DATA] = propertyData;
+
+    return new AreaSectionResult { Success = result == 0, Properties = properties };
+  }
+}
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/Plugin/EtabsPluginBase.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/Plugin/EtabsPluginBase.cs
index f0965c12e..342d6f47c 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABSShared/Plugin/EtabsPluginBase.cs
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/Plugin/EtabsPluginBase.cs
@@ -7,7 +7,7 @@ public abstract class EtabsPluginBase : CSiPluginBase
 {
   public override int Info(ref string text)
   {
-    text = "Hey Speckler! This is our next-gen ETABS Connector.";
+    text = "Next Gen Speckle Connector for ETABS";
     return 0;
   }
 
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/ServiceRegistration.cs b/Connectors/CSi/Speckle.Connectors.ETABSShared/ServiceRegistration.cs
index b4fcbc991..871a32cd6 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABSShared/ServiceRegistration.cs
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/ServiceRegistration.cs
@@ -1,6 +1,8 @@
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.CSiShared.HostApp;
+using Speckle.Connectors.CSiShared.HostApp.Helpers;
 using Speckle.Connectors.ETABSShared.HostApp;
+using Speckle.Connectors.ETABSShared.HostApp.Helpers;
 using Speckle.Converters.ETABSShared;
 
 namespace Speckle.Connectors.ETABSShared;
@@ -10,7 +12,12 @@ public static class ServiceRegistration
   public static IServiceCollection AddEtabs(this IServiceCollection services)
   {
     services.AddEtabsConverters();
+    services.AddScoped<IApplicationFrameSectionPropertyExtractor, EtabsFrameSectionPropertyExtractor>();
+    services.AddScoped<IApplicationShellSectionPropertyExtractor, EtabsShellSectionPropertyExtractor>();
+    services.AddScoped<EtabsSectionPropertyExtractor>();
+    services.AddScoped<EtabsShellSectionResolver>();
     services.AddScoped<CsiSendCollectionManager, EtabsSendCollectionManager>();
+    services.AddScoped<ISectionUnpacker, EtabsSectionUnpacker>();
 
     return services;
   }
diff --git a/Connectors/CSi/Speckle.Connectors.ETABSShared/Speckle.Connectors.ETABSShared.projitems b/Connectors/CSi/Speckle.Connectors.ETABSShared/Speckle.Connectors.ETABSShared.projitems
index badbea3c9..d6f11f0f8 100644
--- a/Connectors/CSi/Speckle.Connectors.ETABSShared/Speckle.Connectors.ETABSShared.projitems
+++ b/Connectors/CSi/Speckle.Connectors.ETABSShared/Speckle.Connectors.ETABSShared.projitems
@@ -9,7 +9,12 @@
     <Import_RootNamespace>Speckle.Connectors.ETABSShared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\EtabsSectionUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\EtabsSendCollectionManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\EtabsFrameSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\EtabsSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\EtabsShellSectionPropertyExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\Helpers\EtabsShellSectionResolver.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\EtabsPluginBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\EtabsSpeckleFormBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ServiceRegistration.cs" />
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json
index 78f291dd2..17b6d6484 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2020/packages.lock.json
@@ -41,11 +41,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2020": {
@@ -345,28 +340,34 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json
index f7936f3b4..d30f9c64c 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2021/packages.lock.json
@@ -41,11 +41,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2021": {
@@ -345,28 +340,34 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json
index 279106ad5..6f3fa4114 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2022/packages.lock.json
@@ -41,11 +41,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2022": {
@@ -345,28 +340,34 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json
index db7b70b3c..fffd92db0 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2023/packages.lock.json
@@ -41,11 +41,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2023": {
@@ -345,28 +340,34 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json
index a9a1f0e9b..dd28eb3f3 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2024/packages.lock.json
@@ -41,11 +41,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2024": {
@@ -345,28 +340,34 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json
index 25f6aa285..c98f6b675 100644
--- a/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json
+++ b/Connectors/Navisworks/Speckle.Connectors.Navisworks2025/packages.lock.json
@@ -47,11 +47,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -179,11 +179,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -279,9 +274,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -289,8 +284,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -307,7 +302,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.navisworks2025": {
@@ -345,28 +340,34 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     ".NETFramework,Version=v4.8/win-x64": {
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksBasicConnectorBinding.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksBasicConnectorBinding.cs
index 8d893c8cc..9aa3f531d 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksBasicConnectorBinding.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksBasicConnectorBinding.cs
@@ -1,5 +1,3 @@
-using Speckle.Connector.Navisworks.HostApp;
-using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
@@ -15,23 +13,17 @@ public class NavisworksBasicConnectorBinding : IBasicConnectorBinding
   public BasicConnectorBindingCommands Commands { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly ISendConversionCache _sendConversionCache;
   private readonly ISpeckleApplication _speckleApplication;
-  private readonly NavisworksDocumentEvents _documentEvents;
 
   public NavisworksBasicConnectorBinding(
     IBrowserBridge parent,
     DocumentModelStore store,
-    ISendConversionCache sendConversionCache,
-    ISpeckleApplication speckleApplication,
-    NavisworksDocumentEvents documentEvents
+    ISpeckleApplication speckleApplication
   )
   {
     Parent = parent;
     _store = store;
-    _sendConversionCache = sendConversionCache;
     _speckleApplication = speckleApplication;
-    _documentEvents = documentEvents;
     Commands = new BasicConnectorBindingCommands(parent);
   }
 
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSelectionBinding.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSelectionBinding.cs
index e7920c205..1d02160de 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSelectionBinding.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Bindings/NavisworksSelectionBinding.cs
@@ -1,37 +1,38 @@
 using Speckle.Connector.Navisworks.Services;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 
 namespace Speckle.Connector.Navisworks.Bindings;
 
 public class NavisworksSelectionBinding : ISelectionBinding
 {
-  private readonly IAppIdleManager _appIdleManager;
   private readonly IElementSelectionService _selectionService;
+  private readonly IEventAggregator _eventAggregator;
   private const string SELECTION_EVENT = "setSelection";
   public string Name { get; } = "selectionBinding";
   public IBrowserBridge Parent { get; }
 
   public NavisworksSelectionBinding(
-    IAppIdleManager idleManager,
     IBrowserBridge parent,
-    IElementSelectionService selectionService
+    IElementSelectionService selectionService,
+    IEventAggregator eventAggregator
   )
   {
     _selectionService = selectionService;
-    _appIdleManager = idleManager;
+    _eventAggregator = eventAggregator;
     Parent = parent;
 
-    NavisworksApp.ActiveDocument.CurrentSelection.Changed += OnSelectionChange;
+    eventAggregator.GetEvent<SelectionChangedEvent>().Subscribe(OnSelectionChange);
   }
 
-  private void OnSelectionChange(object? o, EventArgs eventArgs) =>
-    _appIdleManager.SubscribeToIdle(nameof(NavisworksSelectionBinding), async () => await UpdateSelectionAsync());
+  private void OnSelectionChange(object _) =>
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(NavisworksSelectionBinding), UpdateSelectionAsync);
 
-  private async Task UpdateSelectionAsync()
+  private async Task UpdateSelectionAsync(object _)
   {
     var selInfo = GetSelection();
-    await Parent.Send<SelectionInfo>(SELECTION_EVENT, selInfo);
+    await Parent.Send(SELECTION_EVENT, selInfo);
   }
 
   public SelectionInfo GetSelection()
@@ -52,7 +53,7 @@ public SelectionInfo GetSelection()
     );
 
     return new SelectionInfo(
-      [.. selectedObjectsIds],
+      selectedObjectsIds,
       $"{selectedObjectsIds.Count} object{(selectedObjectsIds.Count != 1 ? "s" : "")}"
     );
   }
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs
index b953302de..cd8028276 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/DependencyInjection/NavisworksConnectorServiceRegistration.cs
@@ -12,7 +12,6 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
@@ -60,9 +59,7 @@ public static void AddNavisworks(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IOperationProgressManager, OperationProgressManager>();
 
     // Register Intercom/interop
-    serviceCollection.RegisterTopLevelExceptionHandler();
     serviceCollection.AddTransient<CancellationManager>();
-    serviceCollection.AddSingleton<IAppIdleManager, NavisworksIdleManager>();
     serviceCollection.AddSingleton<NavisworksDocumentModelStore>();
     serviceCollection.AddSingleton<DocumentModelStore>(sp => sp.GetRequiredService<NavisworksDocumentModelStore>());
     serviceCollection.AddSingleton<NavisworksDocumentEvents>();
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksDocumentEvents.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksDocumentEvents.cs
index 69e05e171..093efc6e1 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksDocumentEvents.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksDocumentEvents.cs
@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connector.Navisworks.Bindings;
 using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 
 namespace Speckle.Connector.Navisworks.HostApp;
 
@@ -9,17 +9,14 @@ namespace Speckle.Connector.Navisworks.HostApp;
 /// Manages document and model state change notifications for the Navisworks connector.
 /// Coalesces various document events into batched updates to be processed during idle time.
 /// </summary>
-public sealed class NavisworksDocumentEvents : IDisposable
+public sealed class NavisworksDocumentEvents
 {
   private readonly IServiceProvider _serviceProvider;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
-  private readonly IAppIdleManager _idleManager;
-  private readonly IBrowserBridge _parent;
+  private readonly IEventAggregator _eventAggregator;
   private readonly object _subscriptionLock = new();
 
   private bool _isSubscribed;
   private bool _isProcessing;
-  private bool _disposed;
 
   private int _priorModelCount;
   private int _finalModelCount;
@@ -28,28 +25,22 @@ public sealed class NavisworksDocumentEvents : IDisposable
   /// Initializes a new instance of the <see cref="NavisworksDocumentEvents"/> class and subscribes to document events.
   /// </summary>
   /// <param name="serviceProvider">The service provider for dependency injection.</param>
-  /// <param name="topLevelExceptionHandler">Handles exceptions during event processing.</param>
-  /// <param name="idleManager">Manages idle processing.</param>
-  public NavisworksDocumentEvents(
-    IServiceProvider serviceProvider,
-    ITopLevelExceptionHandler topLevelExceptionHandler,
-    IAppIdleManager idleManager,
-    IBrowserBridge parent
-  )
+  public NavisworksDocumentEvents(IServiceProvider serviceProvider, IEventAggregator eventAggregator)
   {
     _serviceProvider = serviceProvider;
-    _topLevelExceptionHandler = topLevelExceptionHandler;
-    _idleManager = idleManager;
+    _eventAggregator = eventAggregator;
 
-    _parent = parent;
-
-    SubscribeToDocumentModelEvents();
+    _eventAggregator.GetEvent<ActiveDocumentChangingEvent>().Subscribe(UnsubscribeFromDocumentModelEvents);
+    _eventAggregator.GetEvent<ActiveDocumentChangedEvent>().Subscribe(SubscribeToDocumentModelEvents);
+    _eventAggregator.GetEvent<CollectionChangingEvent>().Subscribe(HandleDocumentModelCountChanging);
+    _eventAggregator.GetEvent<CollectionChangedEvent>().Subscribe(HandleDocumentModelCountChanged);
+    SubscribeToDocumentModelEvents(new object());
   }
 
   /// <summary>
   /// Subscribes to document-level events to monitor model state changes.
   /// </summary>
-  private void SubscribeToDocumentModelEvents()
+  private void SubscribeToDocumentModelEvents(object _)
   {
     lock (_subscriptionLock)
     {
@@ -61,73 +52,39 @@ private void SubscribeToDocumentModelEvents()
       var activeDocument = NavisworksApp.ActiveDocument;
       if (activeDocument != null)
       {
-        activeDocument.Models.CollectionChanging += HandleDocumentModelCountChanging;
-        activeDocument.Models.CollectionChanged += HandleDocumentModelCountChanged;
+        activeDocument.Models.CollectionChanged += OnCollectionChanged;
+        activeDocument.Models.CollectionChanging += OnCollectionChanging;
       }
 
       _isSubscribed = true;
     }
   }
 
+  private async void OnCollectionChanged(object sender, EventArgs _) =>
+    await _eventAggregator.GetEvent<CollectionChangedEvent>().PublishAsync(sender);
+
+  private async void OnCollectionChanging(object sender, EventArgs _) =>
+    await _eventAggregator.GetEvent<CollectionChangingEvent>().PublishAsync(sender);
+
   /// <summary>
   /// Tracks the current model count before changes occur.
   /// </summary>
-  private void HandleDocumentModelCountChanging(object sender, EventArgs e) =>
+  private void HandleDocumentModelCountChanging(object sender) =>
     _priorModelCount = ((NAV.Document)sender).Models.Count;
 
   /// <summary>
   /// Schedules processing of model count changes during idle time.
   /// </summary>
-  private void HandleDocumentModelCountChanged(object sender, EventArgs e)
+  private void HandleDocumentModelCountChanged(object sender)
   {
     _finalModelCount = ((NAV.Document)sender).Models.Count;
 
-    _topLevelExceptionHandler.CatchUnhandled(
-      () =>
-        _idleManager.SubscribeToIdle(nameof(NavisworksDocumentEvents), async () => await ProcessModelStateChangeAsync())
-    );
-  }
-
-  private async Task ProcessModelStateChangeAsync()
-  {
-    if (_isProcessing)
-    {
-      return;
-    }
-
-    _isProcessing = true;
-
-    try
-    {
-      var store = _serviceProvider.GetRequiredService<NavisworksDocumentModelStore>();
-      var basicBinding = _serviceProvider.GetRequiredService<IBasicConnectorBinding>();
-      var commands = (basicBinding as NavisworksBasicConnectorBinding)?.Commands;
-
-      switch (_finalModelCount)
-      {
-        case 0 when _priorModelCount > 0:
-          store.ClearAndSave();
-          break;
-        case > 0 when _priorModelCount == 0:
-          store.ReloadState();
-          break;
-      }
-
-      if (commands != null)
-      {
-        await commands.NotifyDocumentChanged();
-      }
-    }
-    finally
-    {
-      _isProcessing = false;
-    }
+    _eventAggregator
+      .GetEvent<IdleEvent>()
+      .OneTimeSubscribe(nameof(NavisworksDocumentEvents), ProcessModelStateChangeAsync);
   }
 
-  /// <summary>
-  /// Processes model state changes by updating the store and notifying commands.
-  /// </summary>
-  private async Task NotifyValidModelStateChange()
+  private async Task ProcessModelStateChangeAsync(object _)
   {
     if (_isProcessing)
     {
@@ -145,11 +102,9 @@ private async Task NotifyValidModelStateChange()
       switch (_finalModelCount)
       {
         case 0 when _priorModelCount > 0:
-          // Clear the store when models are removed
           store.ClearAndSave();
           break;
         case > 0 when _priorModelCount == 0:
-          // Load state when models are added
           store.ReloadState();
           break;
       }
@@ -165,7 +120,7 @@ private async Task NotifyValidModelStateChange()
     }
   }
 
-  private void UnsubscribeFromDocumentModelEvents()
+  private void UnsubscribeFromDocumentModelEvents(object _)
   {
     var activeDocument = NavisworksApp.ActiveDocument;
     if (activeDocument != null)
@@ -178,39 +133,13 @@ private void UnsubscribeFromDocumentModelEvents()
 
   private void UnsubscribeFromModelEvents(NAV.Document document)
   {
-    document.Models.CollectionChanged -= HandleDocumentModelCountChanged;
-    document.Models.CollectionChanging -= HandleDocumentModelCountChanging;
+    document.Models.CollectionChanged -= OnCollectionChanged;
+    document.Models.CollectionChanging -= OnCollectionChanging;
 
-    var sendBinding = _serviceProvider.GetRequiredService<NavisworksSendBinding>();
+    var sendBinding = _serviceProvider
+      .GetRequiredService<IEnumerable<IBinding>>()
+      .OfType<NavisworksSendBinding>()
+      .First();
     sendBinding.CancelAllSendOperations();
   }
-
-  /// <summary>
-  /// Disposes of resources and unsubscribes from events.
-  /// </summary>
-  public void Dispose()
-  {
-    Dispose(true);
-    GC.SuppressFinalize(this);
-  }
-
-  private void Dispose(bool disposing)
-  {
-    if (_disposed)
-    {
-      return;
-    }
-
-    if (disposing)
-    {
-      UnsubscribeFromDocumentModelEvents();
-    }
-
-    _disposed = true;
-  }
-
-  ~NavisworksDocumentEvents()
-  {
-    Dispose(false);
-  }
 }
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksIdleManager.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksIdleManager.cs
deleted file mode 100644
index 2a9087774..000000000
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/HostApp/NavisworksIdleManager.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connector.Navisworks.HostApp;
-
-/// <summary>
-/// Manages the scheduling of deferred operations during Navisworks idle periods.
-/// Ensures UI updates and operations are batched efficiently to prevent UI freezing.
-/// </summary>
-public sealed class NavisworksIdleManager : AppIdleManager
-{
-  private readonly IIdleCallManager _idleCallManager;
-
-  /// <summary>
-  /// Initializes a new instance of the NavisworksIdleManager.
-  /// </summary>
-  /// <param name="idleCallManager">The manager responsible for queuing and executing deferred operations.</param>
-  public NavisworksIdleManager(IIdleCallManager idleCallManager)
-    : base(idleCallManager)
-  {
-    _idleCallManager = idleCallManager;
-  }
-
-  /// <summary>
-  /// Subscribes to Navisworks idle events when operations are queued.
-  /// </summary>
-  protected override void AddEvent() => NavisworksApp.Idle += NavisworksAppOnIdle;
-
-  private void NavisworksAppOnIdle(object? sender, EventArgs e) =>
-    _idleCallManager.AppOnIdle(() => NavisworksApp.Idle -= NavisworksAppOnIdle);
-}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/NavisworksEvents.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/NavisworksEvents.cs
new file mode 100644
index 000000000..39f77a10a
--- /dev/null
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/NavisworksEvents.cs
@@ -0,0 +1,34 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connector.Navisworks;
+
+public class SelectionChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class ActiveDocumentChangingEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class ActiveDocumentChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class CollectionChangingEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class CollectionChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public static class NavisworksEvents
+{
+  public static void Register(IEventAggregator eventAggregator)
+  {
+    NavisworksApp.Idle += async (_, _) => await eventAggregator.GetEvent<IdleEvent>().PublishAsync(new object());
+    NavisworksApp.ActiveDocument.CurrentSelection.Changed += async (_, _) =>
+      await eventAggregator.GetEvent<SelectionChangedEvent>().PublishAsync(new object());
+    NavisworksApp.ActiveDocumentChanging += async (_, _) =>
+      await eventAggregator.GetEvent<ActiveDocumentChangingEvent>().PublishAsync(new object());
+    NavisworksApp.ActiveDocumentChanged += async (_, _) =>
+      await eventAggregator.GetEvent<ActiveDocumentChangedEvent>().PublishAsync(new object());
+  }
+}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksRootObjectBuilder.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksRootObjectBuilder.cs
index 46d14b0a8..4dfabdc83 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksRootObjectBuilder.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/NavisworksRootObjectBuilder.cs
@@ -5,6 +5,7 @@
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Operations;
+using Speckle.Converter.Navisworks.Helpers;
 using Speckle.Converter.Navisworks.Settings;
 using Speckle.Converters.Common;
 using Speckle.Objects.Data;
@@ -194,12 +195,23 @@ HashSet<string> processedPaths
           finalElements.Add(collection);
           break;
         default:
-          finalElements.Add(CreateNavisworksObject(kvp.Value));
+          if (CreateNavisworksObject(kvp.Value) is { } navisworksObject)
+          {
+            finalElements.Add(navisworksObject);
+          }
+
           break;
       }
     }
   }
 
+  private (string name, string path) GetContext(string applicationId)
+  {
+    var modelItem = elementSelectionService.GetModelItemFromPath(applicationId);
+    var context = HierarchyHelper.ExtractContext(modelItem);
+    return (context.Name, context.Path);
+  }
+
   /// <summary>
   /// Processes and adds any remaining non-grouped elements.
   /// </summary>
@@ -207,30 +219,45 @@ HashSet<string> processedPaths
   /// Handles both Collection and Base type elements differently.
   /// Only processes elements that weren't handled in grouped processing.
   /// </remarks>
-  private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases) =>
-    new()
+  private NavisworksObject CreateNavisworksObject(string groupKey, List<Base> siblingBases)
+  {
+    (string name, string path) = GetContext(groupKey);
+
+    return new NavisworksObject
     {
-      name = elementSelectionService.GetModelItemFromPath(groupKey).DisplayName ?? string.Empty,
+      name = name,
       displayValue = siblingBases.SelectMany(b => b["displayValue"] as List<Base> ?? []).ToList(),
       properties = siblingBases.First()["properties"] as Dictionary<string, object?> ?? [],
       units = converterSettings.Current.Derived.SpeckleUnits,
-      applicationId = groupKey
+      applicationId = groupKey,
+      ["path"] = path
     };
+  }
 
   /// <summary>
   /// Creates a NavisworksObject from a single converted base.
   /// </summary>
   /// <param name="convertedBase">The converted Speckle Base object.</param>
   /// <returns>A new NavisworksObject containing the converted data.</returns>
-  private NavisworksObject CreateNavisworksObject(Base convertedBase) =>
-    new()
+  private NavisworksObject? CreateNavisworksObject(Base convertedBase)
+  {
+    if (convertedBase.applicationId == null)
     {
-      name = convertedBase["name"] as string ?? string.Empty,
+      return null;
+    }
+
+    (string name, string path) = GetContext(convertedBase.applicationId);
+
+    return new NavisworksObject
+    {
+      name = name,
       displayValue = convertedBase["displayValue"] as List<Base> ?? [],
       properties = convertedBase["properties"] as Dictionary<string, object?> ?? [],
       units = converterSettings.Current.Derived.SpeckleUnits,
-      applicationId = convertedBase.applicationId
+      applicationId = convertedBase.applicationId,
+      ["path"] = path
     };
+  }
 
   private Task AddProxiesToCollection(
     Collection rootCollection,
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/ToSpeckleSettingsManagerNavisworks.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/ToSpeckleSettingsManagerNavisworks.cs
index d90be1218..c90c493f3 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/ToSpeckleSettingsManagerNavisworks.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Operations/Send/Settings/ToSpeckleSettingsManagerNavisworks.cs
@@ -73,6 +73,7 @@ public OriginMode GetOriginMode(SenderModelCard modelCard)
           EvictCacheForModelCard(modelCard);
         }
       }
+
       _originModeCache[modelCard.ModelCardId.NotNull()] = origin;
       return origin;
     }
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/AppUtils.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/AppUtils.cs
deleted file mode 100644
index f6cac386a..000000000
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/AppUtils.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using Speckle.Sdk.Host;
-
-namespace Speckle.Connector.Navisworks.NavisPlugin;
-
-public static class AppUtils
-{
-  public static HostApplication App =>
-#if NAVIS
-    HostApplications.Navisworks;
-#else
-    throw new NotSupportedException();
-#endif
-  public static HostAppVersion Version =>
-#if NAVIS2020
-    HostAppVersion.v2020;
-#elif NAVIS2021
-    HostAppVersion.v2021;
-#elif NAVIS2022
-    HostAppVersion.v2022;
-#elif NAVIS2023
-    HostAppVersion.v2023;
-#elif NAVIS2024
-    HostAppVersion.v2024;
-#elif NAVIS2025
-    HostAppVersion.v2025;
-#elif NAVIS2026
-    HostAppVersion.v2026;
-#else
-    throw new NotSupportedException("This version is not supported");
-#endif
-}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Commands.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Commands.cs
deleted file mode 100644
index 00bf0f0ea..000000000
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Commands.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Speckle.Connector.Navisworks.Plugin;
-
-public abstract class LaunchSpeckleConnector
-{
-  public const string COMMAND = "Speckle_Launch";
-  public const string PLUGIN = "SpeckleUI3";
-}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/DockableConnectorPane.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/DockableConnectorPane.cs
index a06842db6..f654b3b16 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/DockableConnectorPane.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/DockableConnectorPane.cs
@@ -3,7 +3,11 @@
 using System.Windows.Forms.Integration;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connector.Navisworks.DependencyInjection;
+using Speckle.Connector.Navisworks.HostApp;
+using Speckle.Connector.Navisworks.Plugin.Tools;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converter.Navisworks.DependencyInjection;
 using Speckle.Sdk.Host;
@@ -13,12 +17,12 @@ namespace Speckle.Connector.Navisworks.Plugin;
 [
   NAV.Plugins.DockPanePlugin(450, 750, FixedSize = false, AutoScroll = true, MinimumHeight = 410, MinimumWidth = 250),
   NAV.Plugins.Plugin(
-    LaunchSpeckleConnector.PLUGIN,
-    "Speckle",
-    DisplayName = "Speckle",
+    SpeckleV3Tool.PLUGIN,
+    SpeckleV3Tool.DEVELOPER_ID,
+    DisplayName = SpeckleV3Tool.DISPLAY_NAME,
     Options = NAV.Plugins.PluginOptions.None,
     ToolTip = "Speckle Connector for Navisworks",
-    ExtendedToolTip = "Speckle Connector for Navisworks"
+    ExtendedToolTip = "Next Gen Speckle Connector (Beta) for Navisworks"
   )
 ]
 [SuppressMessage(
@@ -36,12 +40,15 @@ public override Control CreateControlPane()
 
     var services = new ServiceCollection();
 
-    services.Initialize(HostApplications.Navisworks, HostAppVersion.v2024);
+    services.Initialize(HostApplications.Navisworks, SpeckleV3Tool.Version);
 
     services.AddNavisworks();
     services.AddNavisworksConverter();
 
     Container = services.BuildServiceProvider();
+    NavisworksEvents.Register(Container.GetRequiredService<IEventAggregator>());
+    Container.UseDUI();
+    Container.GetRequiredService<NavisworksDocumentEvents>();
 
     var u = Container.GetRequiredService<DUI3ControlWebView>();
 
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.name b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.name
index ac79a9a2f..88c2545d3 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.name
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.name
@@ -2,8 +2,9 @@
 # do NOT need translating.
 $utf8
 
-# DisplayName=
-# SpeckleNextGen
-
-# Speckle.DisplayName=
-# SpeckleNextGen
+DisplayName=Speckle
+Speckle.DisplayName=Speckle
+SpeckleV3.Title=Speckle (Beta)
+SpeckleV2.Title=Speckle
+Speckle_Launch.DisplayName=Speckle (Beta)
+Speckle_Launch_V2.DisplayName=Speckle
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml
index 787daf4a5..a4e2eb5b1 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml
@@ -1,14 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+
 <RibbonControl
   x:Uid="Speckle_Ribbon"
   xmlns="clr-namespace:Autodesk.Windows;assembly=AdWindows"
-  xmlns:gui="clr-namespace:Autodesk.Navisworks.Gui.Roamer.AIRLook;assembly=navisworks.gui.roamer"
-  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+  xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+  xmlns:gui="clr-namespace:Autodesk.Navisworks.Gui.Roamer.AIRLook;assembly=navisworks.gui.roamer">
   <RibbonTab Id="Speckle" KeyTip="SP">
-    <!-- SPECKLE -->
-    <RibbonPanel x:Uid="RibbonPanel">
-      <RibbonPanelSource Id="RibbonPanelSource" x:Uid="RibbonPanelSource" KeyTip="SP" Title="Speckle">
-        <gui:NWRibbonButton x:Uid="Button_Speckle_LaunchSpeckleConnector" IsVisible="False" Id="Speckle_Launch"
-                            Size="Large" KeyTip="S" ShowText="True" Orientation="Vertical" />
+    <RibbonPanel x:Uid="Panel_Speckle">
+      <RibbonPanelSource Id="SpeckleV3Source" x:Uid="PanelSource_Speckle_V3" Title="Speckle">
+        <gui:NWRibbonButton
+          x:Uid="Button_Speckle_V3"
+          Id="Speckle_Launch"
+          Size="Large"
+          KeyTip="3"
+          ShowText="True"
+          Orientation="Vertical" />
+        <gui:NWRibbonButton
+          x:Uid="Button_Speckle_V2"
+          Id="Speckle_Launch_V2"
+          Size="Large"
+          KeyTip="2"
+          ShowText="True"
+          Orientation="Vertical" />
       </RibbonPanelSource>
     </RibbonPanel>
   </RibbonTab>
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml.cs
index ce80c808e..a3018a8a2 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml.cs
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/NavisworksRibbon.xaml.cs
@@ -1,171 +1,122 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-#if DEBUG
-using System.Text;
-#endif
+using Speckle.Connector.Navisworks.Plugin.Tools;
 
 namespace Speckle.Connector.Navisworks.Plugin;
 
+/// <summary>
+/// Handles plugin state and ribbon management for the Speckle V3 and V2 connectors.
+/// </summary>
 [
-  NAV.Plugins.Plugin("SpeckleNavisworksNextGen", "Speckle", DisplayName = "Speckle Next Gen"),
-  NAV.Plugins.Strings("NavisworksRibbon.name"),
+  NAV.Plugins.Plugin(SpeckleV3Tool.PLUGIN_ID, SpeckleV3Tool.DEVELOPER_ID, DisplayName = SpeckleV3Tool.DISPLAY_NAME),
+  NAV.Plugins.Strings(SpeckleV3Tool.RIBBON_STRINGS),
   NAV.Plugins.RibbonLayout("NavisworksRibbon.xaml"),
-  NAV.Plugins.RibbonTab("Speckle", DisplayName = "Speckle Next Gen", LoadForCanExecute = true),
+  NAV.Plugins.RibbonTab(
+    SpeckleV3Tool.RIBBON_TAB_ID,
+    DisplayName = SpeckleV3Tool.RIBBON_TAB_DISPLAY_NAME,
+    LoadForCanExecute = true
+  ),
   NAV.Plugins.Command(
-    LaunchSpeckleConnector.COMMAND,
+    SpeckleV3Tool.COMMAND,
     LoadForCanExecute = true,
-    Icon = "Resources/s2logo16.png",
-    LargeIcon = "Resources/s2logo32.png",
-    ToolTip = "Next Gen Speckle Connector for Navisworks",
-    DisplayName = "Speckle\rConnector"
+    Icon = "Resources/v3_logo16.png",
+    LargeIcon = "Resources/v3_logo32.png",
+    ToolTip = "Speckle Connector for Navisworks",
+    DisplayName = "$Speckle_Launch.DisplayName"
   ),
+  NAV.Plugins.Command(
+    SpeckleV2Tool.COMMAND,
+    LoadForCanExecute = true,
+    Icon = "Resources/v2_logo16.png",
+    LargeIcon = "Resources/v2_logo32.png",
+    ToolTip = "Legacy Speckle v2 Connector",
+    DisplayName = "$Speckle_Launch_V2.DisplayName"
+  )
 ]
-[SuppressMessage(
-  "design",
-  "CA1812:Avoid uninstantiated internal classes",
-  Justification = "Instantiated by Navisworks"
-)]
 internal sealed class RibbonHandler : NAV.Plugins.CommandHandlerPlugin
 {
-  // ReSharper disable once CollectionNeverQueried.Local
-  private static readonly Dictionary<NAV.Plugins.Plugin, bool> s_loadedPlugins = [];
+  private static bool? s_isV2PluginAvailable; // Nullable to indicate uncached state.
+  private static bool s_isV2RibbonHidden; // Tracks if the ribbon tab is already hidden.
 
-  /// <summary>
-  /// Determines the state of a command in Navisworks.
-  /// </summary>
-  /// <param name="commandId">The ID of the command to check.</param>
-  /// <returns>The state of the command.</returns>
-  public override NAV.Plugins.CommandState CanExecuteCommand(string commandId) =>
-    commandId == LaunchSpeckleConnector.COMMAND
-      ? new NAV.Plugins.CommandState(true)
-      : new NAV.Plugins.CommandState(false);
+  static RibbonHandler()
+  {
+    // Subscribe to the static PluginRecordsChanged event
+    NAV.ApplicationParts.ApplicationPlugins.PluginRecordsChanged += OnPluginRecordsChanged;
+  }
+
+  private static void OnPluginRecordsChanged(object sender, EventArgs e) => s_isV2PluginAvailable = null;
 
   /// <summary>
-  /// Loads a plugin in Navisworks.
+  /// Determines whether a command can be executed and manages V2 plugin visibility.
   /// </summary>
-  /// <param name="plugin">The name of the plugin to load.</param>
-  /// <param name="notAutomatedCheck">Optional. Specifies whether to check if the application is automated. Default is true.</param>
-  /// <param name="command">Optional. The command associated with the plugin. Default is an empty string.</param>
-  private static void LoadPlugin(string plugin, bool notAutomatedCheck = true, string command = "")
+  /// <param name="commandId">The command identifier to check.</param>
+  /// <returns>A CommandState indicating whether the command can be executed.</returns>
+  public override NAV.Plugins.CommandState CanExecuteCommand(string commandId)
   {
-    if (ShouldSkipLoad(notAutomatedCheck))
+    switch (commandId)
     {
-      return;
-    }
+      case SpeckleV3Tool.COMMAND:
+        return new NAV.Plugins.CommandState(true);
+      case SpeckleV2Tool.COMMAND:
+      {
+        // Find the v2 plugin
+        NAV.Plugins.PluginRecord? v2Plugin = PluginUtilities.FindV2Plugin();
+        s_isV2PluginAvailable = v2Plugin != null;
 
-    if (ShouldSkipPluginLoad(plugin, command))
-    {
-      return;
-    }
+        // Pass the plugin to the method for managing ribbon visibility
+        HideV2RibbonTab();
 
-    var pluginRecord = NavisworksApp.Plugins.FindPlugin(plugin + ".Speckle");
-    if (pluginRecord is null)
-    {
-      return;
+        return new NAV.Plugins.CommandState((bool)s_isV2PluginAvailable);
+      }
+      default:
+        return new NAV.Plugins.CommandState(false);
     }
-
-    var loadedPlugin = pluginRecord.LoadedPlugin ?? pluginRecord.LoadPlugin();
-
-    ActivatePluginPane(pluginRecord, loadedPlugin, command);
   }
 
-  /// <summary>
-  /// Checks whether the load should be skipped based on the notAutomatedCheck flag and application automation status.
-  /// </summary>
-  /// <param name="notAutomatedCheck">The flag indicating whether to check if the application is automated.</param>
-  /// <returns>True if the load should be skipped, False otherwise.</returns>
-  private static bool ShouldSkipLoad(bool notAutomatedCheck) => notAutomatedCheck && NavisworksApp.IsAutomated;
-
-  /// <summary>
-  /// Checks whether the plugin load should be skipped based on the plugin and command values.
-  /// </summary>
-  /// <param name="plugin">The name of the plugin.</param>
-  /// <param name="command">The command associated with the plugin.</param>
-  /// <returns>True if the plugin load should be skipped, False otherwise.</returns>
-  private static bool ShouldSkipPluginLoad(string plugin, string command) =>
-    string.IsNullOrEmpty(plugin) || string.IsNullOrEmpty(command);
-
-  /// <summary>
-  /// Activates the plugin's pane if it is of the right type.
-  /// </summary>
-  /// <param name="pluginRecord">The plugin record.</param>
-  /// <param name="loadedPlugin">The loaded plugin instance.</param>
-  /// <param name="command">The command associated with the plugin.</param>
-  private static void ActivatePluginPane(NAV.Plugins.PluginRecord pluginRecord, object loadedPlugin, string command)
+  private static void HideV2RibbonTab()
   {
-    if (ShouldActivatePluginPane(pluginRecord))
+    if (s_isV2RibbonHidden)
     {
-      var dockPanePlugin = (NAV.Plugins.DockPanePlugin)loadedPlugin;
-      dockPanePlugin.ActivatePane();
-
-      s_loadedPlugins[dockPanePlugin] = true;
+      return; // Skip if already hidden.
     }
-    else
+
+    var v2RibbonTab = Autodesk.Windows.ComponentManager.Ribbon.Tabs.FirstOrDefault(tab =>
+      tab.Id == SpeckleV2Tool.RIBBON_TAB_ID + SpeckleV2Tool.PLUGIN_SUFFIX
+    );
+
+    if (v2RibbonTab == null)
     {
-#if DEBUG
-      ShowPluginInfoMessageBox();
-      ShowPluginNotLoadedMessageBox(command);
-#endif
+      return;
     }
+
+    Autodesk.Windows.ComponentManager.Ribbon.Tabs.Remove(v2RibbonTab);
+    s_isV2RibbonHidden = true; // Mark as hidden to avoid redundant calls.
   }
 
   /// <summary>
-  /// Checks whether the plugin's pane should be activated based on the plugin record.
+  /// Executes the specified command after validating the Navisworks version.
   /// </summary>
-  /// <param name="pluginRecord">The plugin record.</param>
-  /// <returns>True if the plugin's pane should be activated, False otherwise.</returns>
-  private static bool ShouldActivatePluginPane(NAV.Plugins.PluginRecord pluginRecord) =>
-    pluginRecord.IsLoaded && pluginRecord is NAV.Plugins.DockPanePluginRecord && pluginRecord.IsEnabled;
-
+  /// <param name="commandId">The command to execute.</param>
+  /// <param name="parameters">Additional command parameters.</param>
+  /// <returns>0 if successful, non-zero otherwise.</returns>
   public override int ExecuteCommand(string commandId, params string[] parameters)
   {
-    // ReSharper disable once RedundantAssignment
-    var buildVersion = string.Empty;
-
-#if NAVIS2020
-    buildVersion = "2020";
-#endif
-#if NAVIS2021
-    buildVersion = "2021";
-#endif
-#if NAVIS2022
-    buildVersion = "2022";
-#endif
-#if NAVIS2023
-    buildVersion = "2023";
-#endif
-#if NAVIS2024
-    buildVersion = "2024";
-#endif
-#if NAVIS2025
-    buildVersion = "2025";
-#endif
-
-    // Version
-    if (!NavisworksApp.Version.RuntimeProductName.Contains(buildVersion))
+    if (!IsValidVersion())
     {
-      MessageBox.Show(
-        "This Add-In was built for Navisworks "
-          + buildVersion
-          + ", please contact jonathon@speckle.systems for assistance...",
-        "Cannot Continue!",
-        MessageBoxButtons.OK,
-        MessageBoxIcon.Error
-      );
       return 0;
     }
 
     switch (commandId)
     {
-      case LaunchSpeckleConnector.COMMAND:
-      {
-        LoadPlugin(LaunchSpeckleConnector.PLUGIN, command: commandId);
+      case SpeckleV3Tool.COMMAND:
+        HandleCommand(SpeckleV3Tool.PLUGIN, commandId);
         break;
-      }
 
+      case SpeckleV2Tool.COMMAND:
+        HandleCommand(SpeckleV2Tool.PLUGIN, $"{SpeckleV2Tool.PLUGIN}.{SpeckleV2Tool.DEVELOPER_ID}");
+        break;
       default:
       {
-        MessageBox.Show("You have clicked on an unexpected command with ID = '" + commandId + "'");
+        MessageBox.Show($"You have clicked on an unexpected command with ID = '{commandId}'");
         break;
       }
     }
@@ -173,25 +124,37 @@ public override int ExecuteCommand(string commandId, params string[] parameters)
     return 0;
   }
 
-#if DEBUG
-  /// <summary>
-  /// Shows a message box displaying plugin information.
-  /// </summary>
-  private static void ShowPluginInfoMessageBox()
+  private static void HandleCommand(string pluginId, string commandId)
   {
-    var sb = new StringBuilder();
-    foreach (var pr in NavisworksApp.Plugins.PluginRecords)
+    if (PluginUtilities.ShouldSkipLoad(pluginId, commandId, true))
     {
-      sb.AppendLine(pr.Name + ": " + pr.DisplayName + ", " + pr.Id);
+      return;
     }
 
-    MessageBox.Show(sb.ToString());
+    var pluginRecord = NavisworksApp.Plugins.FindPlugin(pluginId + SpeckleV3Tool.PLUGIN_SUFFIX);
+    if (pluginRecord == null)
+    {
+      return;
+    }
+
+    _ = pluginRecord.LoadedPlugin ?? pluginRecord.LoadPlugin();
+    PluginUtilities.ActivatePluginPane(pluginRecord);
   }
 
-  /// <summary>
-  /// Shows a message box indicating that the plugin was not loaded.
-  /// </summary>
-  /// <param name="command">The command associated with the plugin.</param>
-  private static void ShowPluginNotLoadedMessageBox(string command) => MessageBox.Show(command + " Plugin not loaded.");
-#endif
+  private static bool IsValidVersion()
+  {
+    if (NavisworksApp.Version.RuntimeProductName.Contains(SpeckleV3Tool.Version.ToString().Replace("v", "")))
+    {
+      return true;
+    }
+
+    MessageBox.Show(
+      $"This Add-In was built for Navisworks {SpeckleV3Tool.Version}, "
+        + $"please contact support@speckle.systems for assistance...",
+      "Cannot Continue!",
+      MessageBoxButtons.OK,
+      MessageBoxIcon.Error
+    );
+    return false;
+  }
 }
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/PackageContents.xml b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/PackageContents.xml
index 3830371c3..b2d9acd59 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/PackageContents.xml
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/PackageContents.xml
@@ -2,36 +2,42 @@
 
 <ApplicationPackage SchemaVersion="1.0" AutodeskProduct="Navisworks" Name="Speckle for Navisworks"
                     Description="Welcome to Multiplayer BIM." AppVersion="0.1.0" FriendlyVersion="0.1.0">
-    <CompanyDetails Name="Speckle" />
+    <CompanyDetails Name="Speckle"/>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw22" SeriesMax="Nw22" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw22" SeriesMax="Nw22"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2025/Speckle.Connectors.Navisworks2025.dll" AppDescription="Speckle.Connector.Navisworks2025" />
+                        ModuleName="./Contents/2025/Speckle.Connectors.Navisworks2025.dll"
+                        AppDescription="Speckle.Connector.Navisworks2025"/>
     </Components>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw21" SeriesMax="Nw21" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw21" SeriesMax="Nw21"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2024/Speckle.Connectors.Navisworks2024.dll" AppDescription="Speckle.Connector.Navisworks2024" />
+                        ModuleName="./Contents/2024/Speckle.Connectors.Navisworks2024.dll"
+                        AppDescription="Speckle.Connector.Navisworks2024"/>
     </Components>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw20" SeriesMax="Nw20" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw20" SeriesMax="Nw20"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2023/Speckle.Connectors.Navisworks2023.dll" AppDescription="Speckle.Connector.Navisworks2023" />
+                        ModuleName="./Contents/2023/Speckle.Connectors.Navisworks2023.dll"
+                        AppDescription="Speckle.Connector.Navisworks2023"/>
     </Components>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw19" SeriesMax="Nw19" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw19" SeriesMax="Nw19"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2022/Speckle.Connectors.Navisworks2022.dll" AppDescription="Speckle.Connector.Navisworks2022" />
+                        ModuleName="./Contents/2022/Speckle.Connectors.Navisworks2022.dll"
+                        AppDescription="Speckle.Connector.Navisworks2022"/>
     </Components>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw18" SeriesMax="Nw18" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw18" SeriesMax="Nw18"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2021/Speckle.Connectors.Navisworks2021.dll" AppDescription="Speckle.Connector.Navisworks2021" />
+                        ModuleName="./Contents/2021/Speckle.Connectors.Navisworks2021.dll"
+                        AppDescription="Speckle.Connector.Navisworks2021"/>
     </Components>
     <Components>
-        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw17" SeriesMax="Nw17" />
+        <RuntimeRequirements OS="Win64" Platform="NAVMAN|NAVSIM" SeriesMin="Nw17" SeriesMax="Nw17"/>
         <ComponentEntry AppName="SpeckleNavisworks" AppType="ManagedPlugin" Version="0.1.0"
-                        ModuleName="./Contents/2020/Speckle.Connectors.Navisworks2020.dll" AppDescription="Speckle.Connector.Navisworks2020" />
+                        ModuleName="./Contents/2020/Speckle.Connectors.Navisworks2020.dll"
+                        AppDescription="Speckle.Connector.Navisworks2020"/>
     </Components>
 
 </ApplicationPackage>
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV2Tool.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV2Tool.cs
new file mode 100644
index 000000000..bb6f04a9b
--- /dev/null
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV2Tool.cs
@@ -0,0 +1,10 @@
+namespace Speckle.Connector.Navisworks.Plugin.Tools;
+
+public static class SpeckleV2Tool
+{
+  public const string COMMAND = "Speckle_Launch_V2";
+  public const string PLUGIN = "SpeckleUI";
+  public const string RIBBON_TAB_ID = "SpeckleNavisworks.Speckle";
+  public const string PLUGIN_SUFFIX = ".Speckle";
+  public const string DEVELOPER_ID = "Speckle";
+}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV3Tool.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV3Tool.cs
new file mode 100644
index 000000000..50bf27676
--- /dev/null
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Tools/SpeckleV3Tool.cs
@@ -0,0 +1,41 @@
+using Speckle.Sdk.Host;
+
+namespace Speckle.Connector.Navisworks.Plugin.Tools;
+
+public static class SpeckleV3Tool
+{
+  public const string DEVELOPER_ID = "Speckle";
+  public const string COMMAND = "Speckle_Launch";
+  public const string PLUGIN = "SpeckleUI3";
+  public const string PLUGIN_ID = "SpeckleNavisworksNextGen";
+  public const string DISPLAY_NAME = "Speckle (Beta)";
+  public const string RIBBON_TAB_ID = "Speckle";
+  public const string RIBBON_TAB_DISPLAY_NAME = "Speckle";
+  public const string RIBBON_STRINGS = "NavisworksRibbon.name";
+  public const string PLUGIN_SUFFIX = ".Speckle";
+
+  public static HostApplication App =>
+#if NAVIS
+    HostApplications.Navisworks;
+#else
+    throw new NotSupportedException();
+#endif
+  public static HostAppVersion Version =>
+#if NAVIS2020
+    HostAppVersion.v2020;
+#elif NAVIS2021
+    HostAppVersion.v2021;
+#elif NAVIS2022
+    HostAppVersion.v2022;
+#elif NAVIS2023
+    HostAppVersion.v2023;
+#elif NAVIS2024
+    HostAppVersion.v2024;
+#elif NAVIS2025
+    HostAppVersion.v2025;
+#elif NAVIS2026
+    HostAppVersion.v2026;
+#else
+    throw new NotSupportedException("This version is not supported");
+#endif
+}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Utilities.cs b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Utilities.cs
new file mode 100644
index 000000000..f9c786910
--- /dev/null
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Plugin/Utilities.cs
@@ -0,0 +1,31 @@
+using Autodesk.Navisworks.Api.Plugins;
+using Speckle.Connector.Navisworks.Plugin.Tools;
+
+namespace Speckle.Connector.Navisworks.Plugin;
+
+internal static class PluginUtilities
+{
+  public static bool ShouldSkipLoad(string plugin, string command, bool notAutomatedCheck) =>
+    notAutomatedCheck && NavisworksApp.IsAutomated || string.IsNullOrEmpty(plugin) || string.IsNullOrEmpty(command);
+
+  internal static PluginRecord? FindV2Plugin()
+  {
+    var pluginRecords = NavisworksApp.Plugins.PluginRecords;
+    var v2Plugin = pluginRecords.FirstOrDefault(p => p.Id == SpeckleV2Tool.RIBBON_TAB_ID);
+
+    return v2Plugin ?? null;
+  }
+
+  public static void ActivatePluginPane(PluginRecord? pluginRecord)
+  {
+    if (pluginRecord is null || !pluginRecord.IsEnabled || !pluginRecord.IsLoaded)
+    {
+      return;
+    }
+
+    if (pluginRecord.LoadedPlugin is DockPanePlugin dockPanePlugin)
+    {
+      dockPanePlugin.ActivatePane();
+    }
+  }
+}
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo16.png b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo16.png
new file mode 100644
index 000000000..5520837af
Binary files /dev/null and b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo16.png differ
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo32.png b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo32.png
new file mode 100644
index 000000000..a96460dad
Binary files /dev/null and b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v2_logo32.png differ
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/s2logo16.png b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v3_logo16.png
similarity index 100%
rename from Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/s2logo16.png
rename to Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v3_logo16.png
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/s2logo32.png b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v3_logo32.png
similarity index 100%
rename from Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/s2logo32.png
rename to Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Resources/v3_logo32.png
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.projitems b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.projitems
index cd6db0018..f8bf8a012 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.projitems
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.projitems
@@ -9,44 +9,51 @@
     <Import_RootNamespace>Speckle.Connectors.NavisworksShared</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksBasicConnectorBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksSelectionBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksSendBinding.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\NavisworksConnectorServiceRegistration.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ElementSelectionService.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksColorUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksDocumentEvents.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksDocumentModelStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksIdleManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksMaterialUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\GeometryNodeMerger.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ConvertHiddenEleementsSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\IncludeInternalPropertiesSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\OriginModeSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManagerNavisworks.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\VisualRepresentationSetting.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\NavisworksSelectionFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PathConstants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\AppUtils.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Commands.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\DockableConnectorPane.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\NavisworksRibbon.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksBasicConnectorBinding.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksSelectionBinding.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Bindings\NavisworksSendBinding.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)DependencyInjection\NavisworksConnectorServiceRegistration.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ElementSelectionService.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksColorUnpacker.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksDocumentEvents.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksDocumentModelStore.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)HostApp\NavisworksMaterialUnpacker.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)NavisworksEvents.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\GeometryNodeMerger.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\NavisworksRootObjectBuilder.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ConvertHiddenEleementsSetting.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\IncludeInternalPropertiesSetting.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\OriginModeSetting.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManagerNavisworks.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\VisualRepresentationSetting.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Filters\NavisworksSelectionFilter.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)PathConstants.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\DockableConnectorPane.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\NavisworksRibbon.xaml.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Tools\SpeckleV2Tool.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Tools\SpeckleV3Tool.cs"/>
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\Utilities.cs"/>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml" />
+    <Content Include="$(MSBuildThisFileDirectory)Plugin\BrowserPane.xaml"/>
     <Content Include="$(MSBuildThisFileDirectory)Plugin\PackageContents.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="$(MSBuildThisFileDirectory)Plugin\NavisworksRibbon.name">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Resources\s2logo16.png">
+    <Content Include="$(MSBuildThisFileDirectory)Resources\v2_logo16.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(MSBuildThisFileDirectory)Resources\s2logo32.png">
+    <Content Include="$(MSBuildThisFileDirectory)Resources\v2_logo32.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\v3_logo16.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\v3_logo32.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -55,4 +62,4 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.shproj b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.shproj
index 1e6d1b02a..b41ae7048 100644
--- a/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.shproj
+++ b/Connectors/Navisworks/Speckle.Connectors.NavisworksShared/Speckle.Connectors.NavisworksShared.shproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup Label="Globals">
-        <ProjectGuid>{62813838-52F7-43CB-9062-BB2611C00C79}</ProjectGuid>
-    </PropertyGroup>
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
-            Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
-    <Import Project="Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{62813838-52F7-43CB-9062-BB2611C00C79}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
+          Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"/>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props"/>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props"/>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets"/>
+  <Import Project="Speckle.Connectors.NavisworksShared.projitems" Label="Shared"/>
 </Project>
diff --git a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json
index f9871f8ae..be1879d7c 100644
--- a/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json
+++ b/Connectors/Revit/Speckle.Connectors.Revit2022/packages.lock.json
@@ -192,11 +192,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -292,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -302,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -313,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.revit2022": {
@@ -350,13 +345,19 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Revit.API": {
@@ -367,26 +368,26 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
index b7d2e4e92..8dbf49d37 100644
--- a/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
+++ b/Connectors/Revit/Speckle.Connectors.Revit2023/packages.lock.json
@@ -192,11 +192,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -292,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -302,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -313,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.revit2023": {
@@ -350,13 +345,19 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Revit.API": {
@@ -367,26 +368,26 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json
index faff91d90..947e93812 100644
--- a/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json
+++ b/Connectors/Revit/Speckle.Connectors.Revit2024/packages.lock.json
@@ -192,11 +192,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -292,9 +287,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -302,8 +297,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -313,7 +308,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.revit2024": {
@@ -350,13 +345,19 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Revit.API": {
@@ -367,26 +368,26 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json
index 9ad9ee9e3..38bd8e118 100644
--- a/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json
+++ b/Connectors/Revit/Speckle.Connectors.Revit2025/packages.lock.json
@@ -177,11 +177,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -242,9 +237,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -252,8 +247,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.revit2025": {
@@ -300,13 +295,19 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Revit.API": {
@@ -317,25 +318,25 @@
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net8.0-windows7.0/win-x64": {
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs
index c4ce8e66c..9a2db88a4 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/BasicConnectorBindingRevit.cs
@@ -1,5 +1,6 @@
 using Autodesk.Revit.DB;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.RevitShared;
@@ -19,14 +20,15 @@ internal sealed class BasicConnectorBindingRevit : IBasicConnectorBinding
   public BasicConnectorBindingCommands Commands { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly RevitContext _revitContext;
+  private readonly IRevitContext _revitContext;
   private readonly ISpeckleApplication _speckleApplication;
 
   public BasicConnectorBindingRevit(
     DocumentModelStore store,
     IBrowserBridge parent,
-    RevitContext revitContext,
-    ISpeckleApplication speckleApplication
+    IRevitContext revitContext,
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
   )
   {
     Name = "baseBinding";
@@ -36,14 +38,11 @@ ISpeckleApplication speckleApplication
     _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
 
-    // POC: event binding?
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
 
   public string GetSourceApplicationName() => _speckleApplication.Slug;
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitBaseBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitBaseBinding.cs
index 04c363a18..6f71371f0 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitBaseBinding.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitBaseBinding.cs
@@ -1,7 +1,5 @@
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.DUI.Models;
-using Speckle.Converters.RevitShared.Helpers;
 
 namespace Speckle.Connectors.Revit.Bindings;
 
@@ -11,14 +9,9 @@ internal abstract class RevitBaseBinding : IBinding
   public string Name { get; }
   public IBrowserBridge Parent { get; }
 
-  protected readonly DocumentModelStore Store;
-  protected readonly RevitContext RevitContext;
-
-  protected RevitBaseBinding(string name, DocumentModelStore store, IBrowserBridge parent, RevitContext revitContext)
+  protected RevitBaseBinding(string name, IBrowserBridge parent)
   {
     Name = name;
     Parent = parent;
-    Store = store;
-    RevitContext = revitContext;
   }
 }
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs
index 27cb51e56..e16ae8d28 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/RevitSendBinding.cs
@@ -8,6 +8,7 @@
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -16,6 +17,7 @@
 using Speckle.Connectors.DUI.Settings;
 using Speckle.Connectors.Revit.HostApp;
 using Speckle.Connectors.Revit.Operations.Send.Settings;
+using Speckle.Connectors.Revit.Plugin;
 using Speckle.Connectors.RevitShared.Operations.Send.Filters;
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
@@ -27,7 +29,8 @@ namespace Speckle.Connectors.Revit.Bindings;
 
 internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
 {
-  private readonly IAppIdleManager _idleManager;
+  private readonly IRevitContext _revitContext;
+  private readonly DocumentModelStore _store;
   private readonly CancellationManager _cancellationManager;
   private readonly IServiceProvider _serviceProvider;
   private readonly ISendConversionCache _sendConversionCache;
@@ -37,6 +40,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
   private readonly ElementUnpacker _elementUnpacker;
   private readonly IRevitConversionSettingsFactory _revitConversionSettingsFactory;
   private readonly ISpeckleApplication _speckleApplication;
+  private readonly IEventAggregator _eventAggregator;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Note we're using a concurrent dictionary here as the expiry check method is not thread safe, and this was causing problems. See:
@@ -47,8 +51,7 @@ internal sealed class RevitSendBinding : RevitBaseBinding, ISendBinding
   private ConcurrentDictionary<ElementId, byte> ChangedObjectIds { get; set; } = new();
 
   public RevitSendBinding(
-    IAppIdleManager idleManager,
-    RevitContext revitContext,
+    IRevitContext revitContext,
     DocumentModelStore store,
     CancellationManager cancellationManager,
     IBrowserBridge bridge,
@@ -59,11 +62,13 @@ public RevitSendBinding(
     ILogger<RevitSendBinding> logger,
     ElementUnpacker elementUnpacker,
     IRevitConversionSettingsFactory revitConversionSettingsFactory,
-    ISpeckleApplication speckleApplication
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
   )
-    : base("sendBinding", store, bridge, revitContext)
+    : base("sendBinding", bridge)
   {
-    _idleManager = idleManager;
+    _revitContext = revitContext;
+    _store = store;
     _cancellationManager = cancellationManager;
     _serviceProvider = serviceProvider;
     _sendConversionCache = sendConversionCache;
@@ -73,22 +78,23 @@ ISpeckleApplication speckleApplication
     _elementUnpacker = elementUnpacker;
     _revitConversionSettingsFactory = revitConversionSettingsFactory;
     _speckleApplication = speckleApplication;
-    var topLevelExceptionHandler = Parent.TopLevelExceptionHandler;
+    _eventAggregator = eventAggregator;
 
     Commands = new SendBindingUICommands(bridge);
     // TODO expiry events
     // TODO filters need refresh events
 
-    revitContext.UIApplication.NotNull().Application.DocumentChanged += (_, e) =>
-      topLevelExceptionHandler.CatchUnhandled(() => DocChangeHandler(e));
-    Store.DocumentChanged += (_, _) => topLevelExceptionHandler.FireAndForget(async () => await OnDocumentChanged());
+    eventAggregator.GetEvent<DocumentChangedEvent>().Subscribe(DocChangeHandler);
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public List<ISendFilter> GetSendFilters() =>
     [
       new RevitSelectionFilter() { IsDefault = true },
-      new RevitViewsFilter(RevitContext),
-      new RevitCategoriesFilter(RevitContext)
+      new RevitViewsFilter(_revitContext),
+      new RevitCategoriesFilter(_revitContext)
     ];
 
   public List<ICardSetting> GetSendSettings() =>
@@ -107,7 +113,7 @@ public async Task Send(string modelCardId)
     // Note: removed top level handling thing as it was confusing me
     try
     {
-      if (Store.GetModelById(modelCardId) is not SenderModelCard modelCard)
+      if (_store.GetModelById(modelCardId) is not SenderModelCard modelCard)
       {
         // Handle as GLOBAL ERROR at BrowserBridge
         throw new InvalidOperationException("No publish model card was found.");
@@ -167,12 +173,12 @@ public async Task Send(string modelCardId)
   private async Task<List<Element>> RefreshElementsOnSender(SenderModelCard modelCard)
   {
     var activeUIDoc =
-      RevitContext.UIApplication?.ActiveUIDocument
+      _revitContext.UIApplication.ActiveUIDocument
       ?? throw new SpeckleException("Unable to retrieve active UI document");
 
     if (modelCard.SendFilter is IRevitSendFilter viewFilter)
     {
-      viewFilter.SetContext(RevitContext);
+      viewFilter.SetContext(_revitContext);
     }
 
     var selectedObjects = modelCard.SendFilter.NotNull().RefreshObjectIds();
@@ -243,13 +249,13 @@ private void DocChangeHandler(Autodesk.Revit.DB.Events.DocumentChangedEventArgs
 
     if (addedElementIds.Count > 0)
     {
-      _idleManager.SubscribeToIdle(nameof(PostSetObjectIds), PostSetObjectIds);
+      _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(PostSetObjectIds), PostSetObjectIds);
     }
 
     if (HaveUnitsChanged(e.GetDocument()))
     {
       var objectIds = new List<string>();
-      foreach (var sender in Store.GetSenders().ToList())
+      foreach (var sender in _store.GetSenders().ToList())
       {
         if (sender.SendFilter is null)
         {
@@ -263,8 +269,8 @@ private void DocChangeHandler(Autodesk.Revit.DB.Events.DocumentChangedEventArgs
       _sendConversionCache.EvictObjects(unpackedObjectIds);
     }
 
-    _idleManager.SubscribeToIdle(nameof(CheckFilterExpiration), CheckFilterExpiration);
-    _idleManager.SubscribeToIdle(nameof(RunExpirationChecks), RunExpirationChecks);
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(CheckFilterExpiration), CheckFilterExpiration);
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RunExpirationChecks), RunExpirationChecks);
   }
 
   // Keeps track of doc and current units
@@ -301,9 +307,9 @@ private bool HaveUnitsChanged(Document doc)
     return false;
   }
 
-  private async Task PostSetObjectIds()
+  private async Task PostSetObjectIds(object _)
   {
-    foreach (var sender in Store.GetSenders().ToList())
+    foreach (var sender in _store.GetSenders().ToList())
     {
       await RefreshElementsOnSender(sender);
     }
@@ -312,7 +318,7 @@ private async Task PostSetObjectIds()
   /// <summary>
   /// Notifies ui if any filters need refreshing. Currently, this only applies for view filters.
   /// </summary>
-  private async Task CheckFilterExpiration()
+  private async Task CheckFilterExpiration(object _)
   {
     // NOTE: below code seems like more make sense in terms of performance but it causes unmanaged exception on Revit
     // using var viewCollector = new FilteredElementCollector(RevitContext.UIApplication?.ActiveUIDocument.Document);
@@ -323,17 +329,17 @@ private async Task CheckFilterExpiration()
     //    await Commands.RefreshSendFilters();
     // }
 
-    if (ChangedObjectIds.Keys.Any(e => RevitContext.UIApplication?.ActiveUIDocument.Document.GetElement(e) is View))
+    if (ChangedObjectIds.Keys.Any(e => _revitContext.UIApplication.ActiveUIDocument.Document.GetElement(e) is View))
     {
       await Commands.RefreshSendFilters();
     }
   }
 
-  private async Task RunExpirationChecks()
+  private async Task RunExpirationChecks(object _)
   {
-    var senders = Store.GetSenders().ToList();
+    var senders = _store.GetSenders().ToList();
     // string[] objectIdsList = ChangedObjectIds.Keys.ToArray();
-    var doc = RevitContext.UIApplication?.ActiveUIDocument.Document;
+    var doc = _revitContext.UIApplication.ActiveUIDocument.Document;
 
     if (doc == null)
     {
@@ -384,7 +390,7 @@ private async Task RunExpirationChecks()
     {
       if (modelCard.SendFilter is IRevitSendFilter viewFilter)
       {
-        viewFilter.SetContext(RevitContext);
+        viewFilter.SetContext(_revitContext);
       }
 
       var selectedObjects = modelCard.SendFilter.NotNull().IdMap.NotNull().Values;
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/SelectionBinding.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/SelectionBinding.cs
index eabb03f7f..6c194ce67 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/SelectionBinding.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Bindings/SelectionBinding.cs
@@ -1,41 +1,27 @@
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.DUI.Models;
+using Speckle.Connectors.DUI.Eventing;
+using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.Revit.Bindings;
 
 // POC: we need a base a RevitBaseBinding
-internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding, IDisposable
+internal sealed class SelectionBinding : RevitBaseBinding, ISelectionBinding
 {
-#if REVIT2022
-  private readonly System.Timers.Timer _selectionTimer;
-#endif
+  private readonly IRevitContext _revitContext;
 
-  public SelectionBinding(
-    RevitContext revitContext,
-    DocumentModelStore store,
-    IAppIdleManager revitIdleManager,
-    IBrowserBridge parent
-  )
-    : base("selectionBinding", store, parent, revitContext)
+  public SelectionBinding(IRevitContext revitContext, IBrowserBridge parent, IEventAggregator eventAggregator)
+    : base("selectionBinding", parent)
   {
-#if REVIT2022
-    // NOTE: getting the selection data should be a fast function all, even for '000s of elements - and having a timer hitting it every 1s is ok.
-    _selectionTimer = new System.Timers.Timer(1000);
-    _selectionTimer.Elapsed += (_, _) => parent.TopLevelExceptionHandler.CatchUnhandled(OnSelectionChanged);
-    _selectionTimer.Start();
-#else
-
-    RevitContext.UIApplication.NotNull().SelectionChanged += (_, _) =>
-      revitIdleManager.SubscribeToIdle(nameof(SelectionBinding), OnSelectionChanged);
-#endif
+    _revitContext = revitContext;
+    eventAggregator.GetEvent<SelectionChangedEvent>().Subscribe(OnSelectionChanged);
   }
 
-  private void OnSelectionChanged()
+  private void OnSelectionChanged(object _)
   {
-    if (RevitContext.UIApplication == null || RevitContext.UIApplication.ActiveUIDocument == null)
+    if (_revitContext.UIApplication.ActiveUIDocument == null)
     {
       return;
     }
@@ -44,12 +30,12 @@ private void OnSelectionChanged()
 
   public SelectionInfo GetSelection()
   {
-    if (RevitContext.UIApplication == null || RevitContext.UIApplication.ActiveUIDocument == null)
+    if (_revitContext.UIApplication.ActiveUIDocument == null)
     {
       return new SelectionInfo(Array.Empty<string>(), "No objects selected.");
     }
 
-    var activeUIDoc = RevitContext.UIApplication.ActiveUIDocument.NotNull();
+    var activeUIDoc = _revitContext.UIApplication.ActiveUIDocument.NotNull();
 
     // POC: this was also being called on shutdown
     // probably the bridge needs to be able to know if the plugin has been terminated
@@ -60,11 +46,4 @@ public SelectionInfo GetSelection()
       .ToList();
     return new SelectionInfo(selectionIds, $"{selectionIds.Count} objects selected.");
   }
-
-  public void Dispose()
-  {
-#if REVIT2022
-    _selectionTimer.Dispose();
-#endif
-  }
 }
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/DependencyInjection/RevitConnectorModule.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/DependencyInjection/RevitConnectorModule.cs
index b719cc2d4..7910a0400 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/DependencyInjection/RevitConnectorModule.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/DependencyInjection/RevitConnectorModule.cs
@@ -15,6 +15,7 @@
 using Speckle.Connectors.Revit.Operations.Send.Settings;
 using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.Common;
+using Speckle.Converters.RevitShared.Helpers;
 using Speckle.Sdk.Models.GraphTraversal;
 
 namespace Speckle.Connectors.Revit.DependencyInjection;
@@ -41,12 +42,10 @@ public static void AddRevit(this IServiceCollection serviceCollection)
     serviceCollection.AddSingleton<IBinding, SelectionBinding>();
     serviceCollection.AddSingleton<IBinding, RevitSendBinding>();
     serviceCollection.AddSingleton<IBinding, RevitReceiveBinding>();
-    serviceCollection.AddSingleton<IAppIdleManager, RevitIdleManager>();
-
-    serviceCollection.RegisterTopLevelExceptionHandler();
 
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, BasicConnectorBindingRevit>();
+    serviceCollection.AddSingleton<IRevitContext>(sp => sp.GetRequiredService<IRevitPlugin>());
 
     // send operation and dependencies
     serviceCollection.AddScoped<SendOperation<ElementId>>();
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/ElementUnpacker.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/ElementUnpacker.cs
index b30ec74b0..e2ccb5fa1 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/ElementUnpacker.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/ElementUnpacker.cs
@@ -9,9 +9,9 @@ namespace Speckle.Connectors.Revit.HostApp;
 /// </summary>
 public class ElementUnpacker
 {
-  private readonly RevitContext _revitContext;
+  private readonly IRevitContext _revitContext;
 
-  public ElementUnpacker(RevitContext revitContext)
+  public ElementUnpacker(IRevitContext revitContext)
   {
     _revitContext = revitContext;
   }
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitDocumentStore.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitDocumentStore.cs
index 5b8629853..ceedd2d3a 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitDocumentStore.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/HostApp/RevitDocumentStore.cs
@@ -1,12 +1,11 @@
 using Autodesk.Revit.DB;
 using Autodesk.Revit.DB.ExtensibleStorage;
-using Autodesk.Revit.UI;
 using Autodesk.Revit.UI.Events;
-using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
+using Speckle.Connectors.Revit.Plugin;
 using Speckle.Converters.RevitShared.Helpers;
-using Speckle.Sdk.Common;
 
 namespace Speckle.Connectors.Revit.HostApp;
 
@@ -16,46 +15,43 @@ internal sealed class RevitDocumentStore : DocumentModelStore
   // POC: move to somewhere central?
   private static readonly Guid s_revitDocumentStoreId = new("D35B3695-EDC9-4E15-B62A-D3FC2CB83FA3");
 
-  private readonly RevitContext _revitContext;
-  private readonly IAppIdleManager _idleManager;
+  private readonly IRevitContext _revitContext;
   private readonly DocumentModelStorageSchema _documentModelStorageSchema;
   private readonly IdStorageSchema _idStorageSchema;
+  private readonly IEventAggregator _eventAggregator;
 
   public RevitDocumentStore(
-    IAppIdleManager idleManager,
-    RevitContext revitContext,
+    IRevitContext revitContext,
     IJsonSerializer jsonSerializer,
     DocumentModelStorageSchema documentModelStorageSchema,
     IdStorageSchema idStorageSchema,
-    ITopLevelExceptionHandler topLevelExceptionHandler
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
-    _idleManager = idleManager;
     _revitContext = revitContext;
     _documentModelStorageSchema = documentModelStorageSchema;
     _idStorageSchema = idStorageSchema;
+    _eventAggregator = eventAggregator;
 
-    UIApplication uiApplication = _revitContext.UIApplication.NotNull();
-
-    uiApplication.ViewActivated += (s, e) => topLevelExceptionHandler.CatchUnhandled(() => OnViewActivated(s, e));
-
-    uiApplication.Application.DocumentOpening += (_, _) =>
-      topLevelExceptionHandler.CatchUnhandled(() => IsDocumentInit = false);
-
-    uiApplication.Application.DocumentOpened += (_, _) =>
-      topLevelExceptionHandler.CatchUnhandled(() => IsDocumentInit = false);
+    eventAggregator.GetEvent<DocumentOpenedEvent>().Subscribe(OnDocumentOpen);
+    eventAggregator.GetEvent<DocumentOpeningEvent>().Subscribe(OnDocumentOpen);
+    eventAggregator.GetEvent<ViewActivatedEvent>().Subscribe(OnViewActivated);
 
     // There is no event that we can hook here for double-click file open...
     // It is kind of harmless since we create this object as "SingleInstance".
     LoadState();
-    OnDocumentChanged();
   }
 
+  private void OnDocumentOpen(object _) => IsDocumentInit = false;
+
+  public override Task OnDocumentStoreInitialized() =>
+    _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
+
   /// <summary>
   /// This is the place where we track document switch for new document -> Responsible to Read from new doc
   /// </summary>
-  private void OnViewActivated(object? _, ViewActivatedEventArgs e)
+  private void OnViewActivated(ViewActivatedEventArgs e)
   {
     if (e.Document == null)
     {
@@ -69,14 +65,13 @@ private void OnViewActivated(object? _, ViewActivatedEventArgs e)
     }
 
     IsDocumentInit = true;
-    _idleManager.SubscribeToIdle(
-      nameof(RevitDocumentStore),
-      () =>
-      {
-        LoadState();
-        OnDocumentChanged();
-      }
-    );
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RevitDocumentStore), OnIdleEvent);
+  }
+
+  private async Task OnIdleEvent(object _)
+  {
+    LoadState();
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
   }
 
   protected override void HostAppSaveState(string modelCardState)
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs
index fe576b8b3..628721059 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/IRevitSendFilter.cs
@@ -4,5 +4,5 @@ namespace Speckle.Connectors.RevitShared.Operations.Send.Filters;
 
 public interface IRevitSendFilter
 {
-  public void SetContext(RevitContext revitContext);
+  public void SetContext(IRevitContext revitContext);
 }
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs
index 5a3f9b3ee..b926089a6 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitCategoriesFilter.cs
@@ -11,7 +11,7 @@ public record CategoryData(string Name, string Id);
 
 public class RevitCategoriesFilter : DiscriminatedObject, ISendFilter, IRevitSendFilter
 {
-  private RevitContext _revitContext;
+  private IRevitContext _revitContext;
   private Document? _doc;
   public string Id { get; set; } = "revitCategories";
   public string Name { get; set; } = "Categories";
@@ -24,10 +24,10 @@ public class RevitCategoriesFilter : DiscriminatedObject, ISendFilter, IRevitSen
 
   public RevitCategoriesFilter() { }
 
-  public RevitCategoriesFilter(RevitContext revitContext)
+  public RevitCategoriesFilter(IRevitContext revitContext)
   {
     _revitContext = revitContext;
-    _doc = _revitContext.UIApplication?.ActiveUIDocument.Document;
+    _doc = _revitContext.UIApplication.ActiveUIDocument.Document;
 
     GetCategories();
   }
@@ -83,7 +83,7 @@ private void GetCategories()
   /// NOTE: this is needed since we need doc on `GetObjectIds()` function after it deserialized.
   /// DI doesn't help here to pass RevitContext from constructor.
   /// </summary>
-  public void SetContext(RevitContext revitContext)
+  public void SetContext(IRevitContext revitContext)
   {
     _revitContext = revitContext;
     _doc = _revitContext.UIApplication?.ActiveUIDocument.Document;
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs
index ac54ab0c6..41af5b1b9 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Filters/RevitViewsFilter.cs
@@ -8,7 +8,7 @@ namespace Speckle.Connectors.RevitShared.Operations.Send.Filters;
 
 public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilter
 {
-  private RevitContext _revitContext;
+  private IRevitContext _revitContext;
   private Document? _doc;
   public string Id { get; set; } = "revitViews";
   public string Name { get; set; } = "Views";
@@ -21,7 +21,7 @@ public class RevitViewsFilter : DiscriminatedObject, ISendFilter, IRevitSendFilt
 
   public RevitViewsFilter() { }
 
-  public RevitViewsFilter(RevitContext revitContext)
+  public RevitViewsFilter(IRevitContext revitContext)
   {
     _revitContext = revitContext;
     _doc = _revitContext.UIApplication?.ActiveUIDocument.Document;
@@ -109,7 +109,7 @@ or ViewType.AreaPlan
   /// NOTE: this is needed since we need doc on `GetObjectIds()` function after it deserialized.
   /// DI doesn't help here to pass RevitContext from constructor.
   /// </summary>
-  public void SetContext(RevitContext revitContext)
+  public void SetContext(IRevitContext revitContext)
   {
     _revitContext = revitContext;
     _doc = _revitContext.UIApplication?.ActiveUIDocument.Document;
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs
index f1e55df9b..5fd21feed 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Operations/Send/Settings/ToSpeckleSettingsManager.cs
@@ -13,7 +13,7 @@ namespace Speckle.Connectors.Revit.Operations.Send.Settings;
 [GenerateAutoInterface]
 public class ToSpeckleSettingsManager : IToSpeckleSettingsManager
 {
-  private readonly RevitContext _revitContext;
+  private readonly IRevitContext _revitContext;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly ElementUnpacker _elementUnpacker;
 
@@ -23,7 +23,7 @@ public class ToSpeckleSettingsManager : IToSpeckleSettingsManager
   private readonly Dictionary<string, bool?> _sendNullParamsCache = new();
 
   public ToSpeckleSettingsManager(
-    RevitContext revitContext,
+    IRevitContext revitContext,
     ISendConversionCache sendConversionCache,
     ElementUnpacker elementUnpacker
   )
@@ -68,7 +68,7 @@ out ReferencePointType referencePoint
     {
       // get the current transform from setting first
       // we are doing this because we can't track if reference points were changed between send operations.
-      Transform? currentTransform = GetTransform(_revitContext, referencePoint);
+      Transform? currentTransform = GetTransform(referencePoint);
 
       if (_referencePointCache.TryGetValue(modelCard.ModelCardId.NotNull(), out Transform? previousTransform))
       {
@@ -109,11 +109,11 @@ private void EvictCacheForModelCard(SenderModelCard modelCard)
     _sendConversionCache.EvictObjects(unpackedObjectIds);
   }
 
-  private Transform? GetTransform(RevitContext context, ReferencePointType referencePointType)
+  private Transform? GetTransform(ReferencePointType referencePointType)
   {
     Transform? referencePointTransform = null;
 
-    if (context.UIApplication is UIApplication uiApplication)
+    if (_revitContext.UIApplication is UIApplication uiApplication)
     {
       // first get the main doc base points and reference setting transform
       using FilteredElementCollector filteredElementCollector = new(uiApplication.ActiveUIDocument.Document);
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/IRevitPlugin.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/IRevitPlugin.cs
index fb88ffc44..5ba7f1d52 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/IRevitPlugin.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/IRevitPlugin.cs
@@ -1,6 +1,8 @@
+using Speckle.Converters.RevitShared.Helpers;
+
 namespace Speckle.Connectors.Revit.Plugin;
 
-internal interface IRevitPlugin
+internal interface IRevitPlugin : IRevitContext
 {
   void Initialise();
   void Shutdown();
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitCefPlugin.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitCefPlugin.cs
index 30b5bb5a3..6b0cd3685 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitCefPlugin.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitCefPlugin.cs
@@ -3,15 +3,13 @@
 using System.Reflection;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using Autodesk.Revit.ApplicationServices;
 using Autodesk.Revit.UI;
 using CefSharp;
 using Microsoft.Extensions.DependencyInjection;
-using Revit.Async;
 using Speckle.Connectors.Common;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
-using Speckle.Converters.RevitShared.Helpers;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Sdk;
 
 namespace Speckle.Connectors.Revit.Plugin;
@@ -21,7 +19,6 @@ internal sealed class RevitCefPlugin : IRevitPlugin
   private readonly UIControlledApplication _uIControlledApplication;
   private readonly IServiceProvider _serviceProvider; // should be lazy to ensure the bindings are not created too early
   private readonly BindingOptions _bindingOptions;
-  private readonly RevitContext _revitContext;
   private readonly CefSharpPanel _cefSharpPanel;
   private readonly ISpeckleApplication _speckleApplication;
 
@@ -29,17 +26,17 @@ public RevitCefPlugin(
     UIControlledApplication uIControlledApplication,
     IServiceProvider serviceProvider,
     BindingOptions bindingOptions,
-    RevitContext revitContext,
     CefSharpPanel cefSharpPanel,
-    ISpeckleApplication speckleApplication
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
   )
   {
     _uIControlledApplication = uIControlledApplication;
     _serviceProvider = serviceProvider;
     _bindingOptions = bindingOptions;
-    _revitContext = revitContext;
     _cefSharpPanel = cefSharpPanel;
     _speckleApplication = speckleApplication;
+    eventAggregator.GetEvent<ApplicationInitializedEvent>().Subscribe(OnApplicationInitialized);
   }
 
   public void Initialise()
@@ -47,7 +44,6 @@ public void Initialise()
     // Create and register panels before app initialized. this is needed for double-click file open
     CreateTabAndRibbonPanel(_uIControlledApplication);
     RegisterDockablePane();
-    _uIControlledApplication.ControlledApplication.ApplicationInitialized += OnApplicationInitialized;
   }
 
   public void Shutdown()
@@ -94,27 +90,14 @@ private void CreateTabAndRibbonPanel(UIControlledApplication application)
       $"Speckle.Connectors.Revit{_speckleApplication.HostApplicationVersion}.Assets.logo32.png",
       path
     );
-    dui3Button.ToolTip = "Speckle (Beta) for Revit";
-    //dui3Button.AvailabilityClassName = typeof(CmdAvailabilityViews).FullName;
+    dui3Button.ToolTip = "Next Gen Speckle Connector (Beta) for Revit";
     dui3Button.SetContextualHelp(new ContextualHelp(ContextualHelpType.Url, "https://speckle.systems"));
   }
 
-  private void OnApplicationInitialized(object? sender, Autodesk.Revit.DB.Events.ApplicationInitializedEventArgs e)
+  private void OnApplicationInitialized(UIApplication uiApplication)
   {
-    var uiApplication = new UIApplication(sender as Application);
-    _revitContext.UIApplication = uiApplication;
+    UIApplication = uiApplication;
 
-    // POC: might be worth to interface this out, we shall see...
-    RevitTask.Initialize(uiApplication);
-
-    PostApplicationInit(); // for double-click file open
-  }
-
-  /// <summary>
-  /// Actions to run after UiApplication initialized. This is needed for double-click file open issue.
-  /// </summary>
-  private void PostApplicationInit()
-  {
     var bindings = _serviceProvider.GetRequiredService<IEnumerable<IBinding>>();
     // binding the bindings to each bridge
     foreach (IBinding binding in bindings)
@@ -123,7 +106,7 @@ private void PostApplicationInit()
       binding.Parent.AssociateWithBinding(binding);
     }
 
-    _cefSharpPanel.Browser.IsBrowserInitializedChanged += (sender, e) =>
+    _cefSharpPanel.Browser.IsBrowserInitializedChanged += (_, e) =>
     {
       if (e.NewValue is false)
       {
@@ -159,7 +142,7 @@ private void RegisterDockablePane()
     // Otherwise pane cannot be registered for double-click file open.
     _uIControlledApplication.RegisterDockablePane(
       RevitExternalApplication.DockablePanelId,
-      "Speckle (Beta) for Revit",
+      "Speckle (Beta)",
       _cefSharpPanel
     );
   }
@@ -181,4 +164,6 @@ private void RegisterDockablePane()
 
     return null;
   }
+
+  public UIApplication UIApplication { get; private set; }
 }
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitEvents.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitEvents.cs
new file mode 100644
index 000000000..a8adbec8d
--- /dev/null
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitEvents.cs
@@ -0,0 +1,72 @@
+using Autodesk.Revit.ApplicationServices;
+using Autodesk.Revit.UI;
+using Autodesk.Revit.UI.Events;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.Revit.Plugin;
+
+public class ApplicationInitializedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<UIApplication>(threadContext, exceptionHandler);
+
+public class ViewActivatedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<ViewActivatedEventArgs>(threadContext, exceptionHandler);
+
+public class DocumentOpeningEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class DocumentOpenedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class SelectionChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class DocumentChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<Autodesk.Revit.DB.Events.DocumentChangedEventArgs>(threadContext, exceptionHandler);
+
+#if REVIT2022
+public class PeriodicSelectionEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : PeriodicThreadedEvent(threadContext, exceptionHandler);
+#endif
+
+public static class RevitEvents
+{
+  private static IEventAggregator? s_eventAggregator;
+
+  public static void Register(IEventAggregator eventAggregator, UIControlledApplication application)
+  {
+    s_eventAggregator = eventAggregator;
+    application.Idling += async (_, _) => await eventAggregator.GetEvent<IdleEvent>().PublishAsync(new object());
+    application.ControlledApplication.ApplicationInitialized += async (sender, _) =>
+      await eventAggregator
+        .GetEvent<ApplicationInitializedEvent>()
+        .PublishAsync(new UIApplication(sender as Application));
+    application.ViewActivated += async (_, args) =>
+      await eventAggregator.GetEvent<ViewActivatedEvent>().PublishAsync(args);
+    application.ControlledApplication.DocumentOpened += async (_, _) =>
+      await eventAggregator.GetEvent<DocumentOpenedEvent>().PublishAsync(new object());
+    application.ControlledApplication.DocumentOpening += async (_, _) =>
+      await eventAggregator.GetEvent<DocumentOpeningEvent>().PublishAsync(new object());
+    application.ControlledApplication.DocumentChanged += async (_, args) =>
+      await eventAggregator.GetEvent<DocumentChangedEvent>().PublishAsync(args);
+
+#if REVIT2022
+    // NOTE: getting the selection data should be a fast function all, even for '000s of elements - and having a timer hitting it every 1s is ok.
+    eventAggregator.GetEvent<PeriodicSelectionEvent>().SubscribePeriodic(TimeSpan.FromSeconds(1), OnSelectionChanged);
+#else
+
+    application.SelectionChanged += (_, _) =>
+      eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe("Selection", OnSelectionChanged);
+#endif
+  }
+
+  private static async Task OnSelectionChanged(object _)
+  {
+    if (s_eventAggregator is null)
+    {
+      return;
+    }
+    await s_eventAggregator.GetEvent<SelectionChangedEvent>().PublishAsync(new object());
+  }
+}
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitExternalApplication.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitExternalApplication.cs
index 3eb15365b..35ea4541b 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitExternalApplication.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitExternalApplication.cs
@@ -1,7 +1,10 @@
 using Autodesk.Revit.UI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Revit.Async;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.Revit.DependencyInjection;
 using Speckle.Converters.RevitShared;
 using Speckle.Sdk;
@@ -47,7 +50,10 @@ public Result OnStartup(UIControlledApplication application)
       services.AddRevitConverters();
       services.AddSingleton(application);
       _container = services.BuildServiceProvider();
+      _container.UseDUI();
 
+      RevitTask.Initialize(application);
+      RevitEvents.Register(_container.GetRequiredService<IEventAggregator>(), application);
       // resolve root object
       _revitPlugin = _container.GetRequiredService<IRevitPlugin>();
       _revitPlugin.Initialise();
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitThreadContext.cs b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitThreadContext.cs
index c64c86c5a..3d0cd8216 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitThreadContext.cs
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Plugin/RevitThreadContext.cs
@@ -1,4 +1,4 @@
-using Revit.Async;
+using Revit.Async;
 using Speckle.Connectors.Common.Threading;
 
 namespace Speckle.Connectors.Revit.Plugin;
diff --git a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems
index 890736c53..615ffb90e 100644
--- a/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems
+++ b/Connectors/Revit/Speckle.Connectors.RevitShared/Speckle.Connectors.RevitShared.projitems
@@ -44,10 +44,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ReferencePointSetting.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\DetailLevelSetting.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitEvents.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\IRevitPlugin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitExternalApplication.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitIdleManager.cs" />    
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitThreadContext.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\RevitCefPlugin.cs" />
   </ItemGroup>
diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj b/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
index 241571403..98fdcd57d 100644
--- a/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
+++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/Speckle.Connectors.Rhino7.csproj
@@ -29,4 +29,9 @@
   </ItemGroup>
   
   <Import Project="..\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <None Include="..\Toolbars\Speckle.Connectors.Rhino.rui" Link="$(AssemblyName).rui" CopyToOutputDirectory="PreserveNewest"/>
+  </ItemGroup>
+
 </Project>
diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
index 3622f74b7..9864217c0 100644
--- a/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
+++ b/Connectors/Rhino/Speckle.Connectors.Rhino7/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.rhino7": {
@@ -344,37 +339,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj b/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj
index c3880e351..0f5bf14f3 100644
--- a/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj
+++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/Speckle.Connectors.Rhino8.csproj
@@ -29,5 +29,8 @@
   </ItemGroup>
   
   <Import Project="..\Speckle.Connectors.RhinoShared\Speckle.Connectors.RhinoShared.projitems" Label="Shared" />
-  
+
+  <ItemGroup>
+    <None Include="..\Toolbars\Speckle.Connectors.Rhino.rui" Link="$(AssemblyName).rui" CopyToOutputDirectory="PreserveNewest"/>
+  </ItemGroup>
 </Project>
diff --git a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json
index ff20c1dba..d41ae9c94 100644
--- a/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json
+++ b/Connectors/Rhino/Speckle.Connectors.Rhino8/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -273,9 +268,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -283,8 +278,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -301,7 +296,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.converters.rhino8": {
@@ -344,37 +339,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs
index b34e002d0..3904c2f4b 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoBasicConnectorBinding.cs
@@ -4,6 +4,7 @@
 using Speckle.Connectors.Common.Caching;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.Rhino.Extensions;
@@ -26,7 +27,8 @@ public RhinoBasicConnectorBinding(
     DocumentModelStore store,
     IBrowserBridge parent,
     ISendConversionCache sendConversionCache,
-    ISpeckleApplication speckleApplication
+    ISpeckleApplication speckleApplication,
+    IEventAggregator eventAggregator
   )
   {
     _store = store;
@@ -35,13 +37,14 @@ ISpeckleApplication speckleApplication
     _speckleApplication = speckleApplication;
     Commands = new BasicConnectorBindingCommands(parent);
 
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-        // Note: this prevents scaling issues when copy-pasting from one rhino doc to another in the same session.
-        _sendConversionCache.ClearCache();
-      });
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
+  }
+
+  private async Task OnDocumentStoreChangedEvent(object _)
+  {
+    await Commands.NotifyDocumentChanged();
+    // Note: this prevents scaling issues when copy-pasting from one rhino doc to another in the same session.
+    _sendConversionCache.ClearCache();
   }
 
   public string GetConnectorVersion() => _speckleApplication.SpeckleVersion;
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSelectionBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSelectionBinding.cs
index d2679b8b3..87dad466f 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSelectionBinding.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSelectionBinding.cs
@@ -2,31 +2,32 @@
 using Rhino.DocObjects;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+using Speckle.Connectors.RhinoShared;
 
 namespace Speckle.Connectors.Rhino.Bindings;
 
 public class RhinoSelectionBinding : ISelectionBinding
 {
-  private readonly IAppIdleManager _idleManager;
   private const string SELECTION_EVENT = "setSelection";
+  private readonly IEventAggregator _eventAggregator;
 
   public string Name => "selectionBinding";
   public IBrowserBridge Parent { get; }
 
-  public RhinoSelectionBinding(IAppIdleManager idleManager, IBrowserBridge parent)
+  public RhinoSelectionBinding(IBrowserBridge parent, IEventAggregator eventAggregator)
   {
-    _idleManager = idleManager;
     Parent = parent;
-
-    RhinoDoc.SelectObjects += OnSelectionChange;
-    RhinoDoc.DeselectObjects += OnSelectionChange;
-    RhinoDoc.DeselectAllObjects += OnSelectionChange;
+    _eventAggregator = eventAggregator;
+    eventAggregator.GetEvent<SelectObjects>().Subscribe(OnSelectionChange);
+    eventAggregator.GetEvent<DeselectObjects>().Subscribe(OnSelectionChange);
+    eventAggregator.GetEvent<DeselectAllObjects>().Subscribe(OnSelectionChange);
   }
 
-  private void OnSelectionChange(object? o, EventArgs eventArgs) =>
-    _idleManager.SubscribeToIdle(nameof(RhinoSelectionBinding), UpdateSelection);
+  private void OnSelectionChange(EventArgs eventArgs) =>
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSelectionBinding), UpdateSelection);
 
-  private void UpdateSelection()
+  private void UpdateSelection(object _)
   {
     SelectionInfo selInfo = GetSelection();
     Parent.Send(SELECTION_EVENT, selInfo);
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs
index 61e389faa..c27d0b26d 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Bindings/RhinoSendBinding.cs
@@ -10,12 +10,14 @@
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.Settings;
+using Speckle.Connectors.RhinoShared;
 using Speckle.Converters.Common;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
@@ -31,17 +33,16 @@ public sealed class RhinoSendBinding : ISendBinding
   public IBrowserBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly IAppIdleManager _idleManager;
   private readonly IServiceProvider _serviceProvider;
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
   private readonly ISendConversionCache _sendConversionCache;
   private readonly IOperationProgressManager _operationProgressManager;
   private readonly ILogger<RhinoSendBinding> _logger;
-  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
   private readonly IRhinoConversionSettingsFactory _rhinoConversionSettingsFactory;
   private readonly ISpeckleApplication _speckleApplication;
   private readonly ISdkActivityFactory _activityFactory;
+  private readonly IEventAggregator _eventAggregator;
 
   /// <summary>
   /// Used internally to aggregate the changed objects' id. Objects in this list will be reconverted.
@@ -63,7 +64,6 @@ public sealed class RhinoSendBinding : ISendBinding
 
   public RhinoSendBinding(
     DocumentModelStore store,
-    IAppIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     IServiceProvider serviceProvider,
@@ -73,11 +73,11 @@ public RhinoSendBinding(
     ILogger<RhinoSendBinding> logger,
     IRhinoConversionSettingsFactory rhinoConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
-    ISdkActivityFactory activityFactory
+    ISdkActivityFactory activityFactory,
+    IEventAggregator eventAggregator
   )
   {
     _store = store;
-    _idleManager = idleManager;
     _serviceProvider = serviceProvider;
     _sendFilters = sendFilters.ToList();
     _cancellationManager = cancellationManager;
@@ -86,187 +86,198 @@ ISdkActivityFactory activityFactory
     _logger = logger;
     _rhinoConversionSettingsFactory = rhinoConversionSettingsFactory;
     _speckleApplication = speckleApplication;
-    _topLevelExceptionHandler = parent.TopLevelExceptionHandler.Parent.TopLevelExceptionHandler;
     Parent = parent;
     Commands = new SendBindingUICommands(parent); // POC: Commands are tightly coupled with their bindings, at least for now, saves us injecting a factory.
     _activityFactory = activityFactory;
+    _eventAggregator = eventAggregator;
     PreviousUnitSystem = RhinoDoc.ActiveDoc.ModelUnitSystem;
-    SubscribeToRhinoEvents();
+    SubscribeToRhinoEvents(eventAggregator);
   }
 
-  private void SubscribeToRhinoEvents()
+  private void SubscribeToRhinoEvents(IEventAggregator eventAggregator)
   {
-    Command.BeginCommand += (_, e) =>
+    eventAggregator.GetEvent<BeginCommandEvent>().Subscribe(OnBeginCommandEvent);
+
+    eventAggregator.GetEvent<ActiveDocumentChanged>().Subscribe(OnActiveDocumentChanged);
+
+    // NOTE: BE CAREFUL handling things in this event handler since it is triggered whenever we save something into file!
+    eventAggregator.GetEvent<DocumentPropertiesChanged>().Subscribe(OnDocumentPropertiesChanged);
+
+    eventAggregator.GetEvent<AddRhinoObject>().Subscribe(OnAddRhinoObject);
+
+    eventAggregator.GetEvent<DeleteRhinoObject>().Subscribe(OnDeleteRhinoObject);
+
+    // NOTE: Catches an object's material change from one user defined doc material to another. Does not catch (as the top event is not triggered) swapping material sources for an object or moving to/from the default material (this is handled below)!
+    eventAggregator.GetEvent<RenderMaterialsTableEvent>().Subscribe(OnRenderMaterialsTableEvent);
+
+    eventAggregator.GetEvent<GroupTableEvent>().Subscribe(OnGroupTableEvent);
+
+    eventAggregator.GetEvent<LayerTableEvent>().Subscribe(OnLayerTableEvent);
+
+    // Catches and stores changed material ids. These are then used in the expiry checks to invalidate all objects that have assigned any of those material ids.
+    eventAggregator.GetEvent<MaterialTableEvent>().Subscribe(OnMaterialTableEvent);
+
+    eventAggregator.GetEvent<ModifyObjectAttributes>().Subscribe(OnModifyObjectAttributes);
+
+    eventAggregator.GetEvent<ReplaceRhinoObject>().Subscribe(OnReplaceRhinoObject);
+  }
+
+  private void OnActiveDocumentChanged(DocumentEventArgs e) => PreviousUnitSystem = e.Document.ModelUnitSystem;
+
+  private async Task OnDocumentPropertiesChanged(DocumentEventArgs e)
+  {
+    var newUnit = e.Document.ModelUnitSystem;
+    if (newUnit != PreviousUnitSystem)
     {
-      if (e.CommandEnglishName == "BlockEdit")
-      {
-        var selectedObject = RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false).First();
-        ChangedObjectIds[selectedObject.Id.ToString()] = 1;
-      }
+      PreviousUnitSystem = newUnit;
 
-      if (e.CommandEnglishName == "Ungroup")
-      {
-        foreach (RhinoObject selectedObject in RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false))
-        {
-          ChangedObjectIdsInGroupsOrLayers[selectedObject.Id.ToString()] = 1;
-        }
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      }
-    };
+      await InvalidateAllSender();
+    }
+  }
 
-    RhinoDoc.ActiveDocumentChanged += (_, e) =>
+  private void OnBeginCommandEvent(CommandEventArgs e)
+  {
+    if (e.CommandEnglishName == "BlockEdit")
     {
-      PreviousUnitSystem = e.Document.ModelUnitSystem;
-    };
+      var selectedObject = RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false).First();
+      ChangedObjectIds[selectedObject.Id.ToString()] = 1;
+    }
 
-    // NOTE: BE CAREFUL handling things in this event handler since it is triggered whenever we save something into file!
-    RhinoDoc.DocumentPropertiesChanged += async (_, e) =>
+    if (e.CommandEnglishName == "Ungroup")
     {
-      var newUnit = e.Document.ModelUnitSystem;
-      if (newUnit != PreviousUnitSystem)
+      foreach (RhinoObject selectedObject in RhinoDoc.ActiveDoc.Objects.GetSelectedObjects(false, false))
       {
-        PreviousUnitSystem = newUnit;
-
-        await InvalidateAllSender();
+        ChangedObjectIdsInGroupsOrLayers[selectedObject.Id.ToString()] = 1;
       }
-    };
-
-    RhinoDoc.AddRhinoObject += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+      _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+    }
+  }
 
-        ChangedObjectIds[e.ObjectId.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      });
+  private void OnAddRhinoObject(RhinoObjectEventArgs e)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    RhinoDoc.DeleteRhinoObject += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    ChangedObjectIds[e.ObjectId.ToString()] = 1;
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+  }
 
-        ChangedObjectIds[e.ObjectId.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      });
+  private void OnDeleteRhinoObject(RhinoObjectEventArgs e)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    // NOTE: Catches an object's material change from one user defined doc material to another. Does not catch (as the top event is not triggered) swapping material sources for an object or moving to/from the default material (this is handled below)!
-    RhinoDoc.RenderMaterialsTableEvent += (_, args) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    ChangedObjectIds[e.ObjectId.ToString()] = 1;
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+  }
 
-        if (args is RhinoDoc.RenderMaterialAssignmentChangedEventArgs changedEventArgs)
-        {
-          ChangedObjectIds[changedEventArgs.ObjectId.ToString()] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-        }
-      });
+  private void OnRenderMaterialsTableEvent(RhinoDoc.RenderContentTableEventArgs e)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    RhinoDoc.GroupTableEvent += (_, args) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    if (e is RhinoDoc.RenderMaterialAssignmentChangedEventArgs changedEventArgs)
+    {
+      ChangedObjectIds[changedEventArgs.ObjectId.ToString()] = 1;
+      _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+    }
+  }
 
-        foreach (var obj in RhinoDoc.ActiveDoc.Groups.GroupMembers(args.GroupIndex))
-        {
-          ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
-        }
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      });
+  private void OnGroupTableEvent(GroupTableEventArgs args)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    RhinoDoc.LayerTableEvent += (_, args) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    foreach (var obj in RhinoDoc.ActiveDoc.Groups.GroupMembers(args.GroupIndex))
+    {
+      ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
+    }
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+  }
 
-        if (
-          args.EventType == LayerTableEventType.Deleted
-          || args.EventType == LayerTableEventType.Current
-          || args.EventType == LayerTableEventType.Added
-        )
-        {
-          return;
-        }
+  private void OnLayerTableEvent(LayerTableEventArgs args)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-        var layer = RhinoDoc.ActiveDoc.Layers[args.LayerIndex];
+    if (
+      args.EventType == LayerTableEventType.Deleted
+      || args.EventType == LayerTableEventType.Current
+      || args.EventType == LayerTableEventType.Added
+    )
+    {
+      return;
+    }
 
-        // add all objects from the changed layers and sublayers to the non-destructively changed object list.
-        var allLayers = args.Document.Layers.Where(l => l.FullPath.Contains(layer.Name)); // not  e imperfect, but layer.GetChildren(true) is valid only in v8 and above; this filter will include the original layer.
-        foreach (var childLayer in allLayers)
-        {
-          var sublayerObjs = RhinoDoc.ActiveDoc.Objects.FindByLayer(childLayer) ?? [];
-          foreach (var obj in sublayerObjs)
-          {
-            ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
-          }
-        }
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      });
+    var layer = RhinoDoc.ActiveDoc.Layers[args.LayerIndex];
 
-    // Catches and stores changed material ids. These are then used in the expiry checks to invalidate all objects that have assigned any of those material ids.
-    RhinoDoc.MaterialTableEvent += (_, args) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
+    // add all objects from the changed layers and sublayers to the non-destructively changed object list.
+    var allLayers = args.Document.Layers.Where(l => l.FullPath.Contains(layer.Name)); // not  e imperfect, but layer.GetChildren(true) is valid only in v8 and above; this filter will include the original layer.
+    foreach (var childLayer in allLayers)
+    {
+      var sublayerObjs = RhinoDoc.ActiveDoc.Objects.FindByLayer(childLayer) ?? [];
+      foreach (var obj in sublayerObjs)
       {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+        ChangedObjectIdsInGroupsOrLayers[obj.Id.ToString()] = 1;
+      }
+    }
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+  }
 
-        if (args.EventType == MaterialTableEventType.Modified)
-        {
-          ChangedMaterialIndexes[args.Index] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-        }
-      });
+  private void OnMaterialTableEvent(MaterialTableEventArgs args)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    RhinoDoc.ModifyObjectAttributes += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    if (args.EventType == MaterialTableEventType.Modified)
+    {
+      ChangedMaterialIndexes[args.Index] = 1;
+      _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+    }
+  }
 
-        // NOTE: not sure yet we want to track every attribute changes yet. TBD
-        // NOTE: we might want to track here user strings too (once we send them out), and more!
-        if (
-          e.OldAttributes.LayerIndex != e.NewAttributes.LayerIndex
-          || e.OldAttributes.MaterialSource != e.NewAttributes.MaterialSource
-          || e.OldAttributes.MaterialIndex != e.NewAttributes.MaterialIndex // NOTE: this does not work when swapping around from custom doc materials, it works when you swap TO/FROM default material
-        )
-        {
-          ChangedObjectIds[e.RhinoObject.Id.ToString()] = 1;
-          _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-        }
-      });
+  private void OnModifyObjectAttributes(RhinoModifyObjectAttributesEventArgs e)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-    RhinoDoc.ReplaceRhinoObject += (_, e) =>
-      _topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (!_store.IsDocumentInit)
-        {
-          return;
-        }
+    // NOTE: not sure yet we want to track every attribute changes yet. TBD
+    // NOTE: we might want to track here user strings too (once we send them out), and more!
+    if (
+      e.OldAttributes.LayerIndex != e.NewAttributes.LayerIndex
+      || e.OldAttributes.MaterialSource != e.NewAttributes.MaterialSource
+      || e.OldAttributes.MaterialIndex != e.NewAttributes.MaterialIndex // NOTE: this does not work when swapping around from custom doc materials, it works when you swap TO/FROM default material
+    )
+    {
+      ChangedObjectIds[e.RhinoObject.Id.ToString()] = 1;
+      _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
+    }
+  }
+
+  private void OnReplaceRhinoObject(RhinoReplaceObjectEventArgs e)
+  {
+    if (!_store.IsDocumentInit)
+    {
+      return;
+    }
 
-        ChangedObjectIds[e.NewRhinoObject.Id.ToString()] = 1;
-        ChangedObjectIds[e.OldRhinoObject.Id.ToString()] = 1;
-        _idleManager.SubscribeToIdle(nameof(RhinoSendBinding), RunExpirationChecks);
-      });
+    ChangedObjectIds[e.NewRhinoObject.Id.ToString()] = 1;
+    ChangedObjectIds[e.OldRhinoObject.Id.ToString()] = 1;
+    _eventAggregator.GetEvent<IdleEvent>().OneTimeSubscribe(nameof(RhinoSendBinding), RunExpirationChecks);
   }
 
   public List<ISendFilter> GetSendFilters() => _sendFilters;
@@ -333,7 +344,7 @@ public async Task Send(string modelCardId)
   /// <summary>
   /// Checks if any sender model cards contain any of the changed objects. If so, also updates the changed objects hashset for each model card - this last part is important for on send change detection.
   /// </summary>
-  private async Task RunExpirationChecks()
+  private async Task RunExpirationChecks(object _)
   {
     // Note: added here a guard against executing this if there's no active doc present.
     if (RhinoDoc.ActiveDoc == null)
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoDocumentStore.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoDocumentStore.cs
index a921eb153..0048a26a7 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoDocumentStore.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoDocumentStore.cs
@@ -1,36 +1,42 @@
 using Rhino;
-using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
+using Speckle.Connectors.RhinoShared;
 
 namespace Speckle.Connectors.Rhino.HostApp;
 
 public class RhinoDocumentStore : DocumentModelStore
 {
+  private readonly IEventAggregator _eventAggregator;
   private const string SPECKLE_KEY = "Speckle_DUI3";
   public override bool IsDocumentInit { get; set; } = true; // Note: because of rhino implementation details regarding expiry checking of sender cards.
 
-  public RhinoDocumentStore(IJsonSerializer jsonSerializer, ITopLevelExceptionHandler topLevelExceptionHandler)
+  public RhinoDocumentStore(IJsonSerializer jsonSerializer, IEventAggregator eventAggregator)
     : base(jsonSerializer)
   {
-    RhinoDoc.BeginOpenDocument += (_, _) => topLevelExceptionHandler.CatchUnhandled(() => IsDocumentInit = false);
-    RhinoDoc.EndOpenDocument += (_, e) =>
-      topLevelExceptionHandler.CatchUnhandled(() =>
-      {
-        if (e.Merge)
-        {
-          return;
-        }
-
-        if (e.Document == null)
-        {
-          return;
-        }
-
-        IsDocumentInit = true;
-        LoadState();
-        OnDocumentChanged();
-      });
+    _eventAggregator = eventAggregator;
+    eventAggregator.GetEvent<BeginOpenDocument>().Subscribe(OnBeginOpenDocument);
+    eventAggregator.GetEvent<EndOpenDocument>().Subscribe(OnEndOpenDocument);
+  }
+
+  private void OnBeginOpenDocument(object _) => IsDocumentInit = false;
+
+  private async Task OnEndOpenDocument(DocumentOpenEventArgs e)
+  {
+    if (e.Merge)
+    {
+      return;
+    }
+
+    if (e.Document == null)
+    {
+      return;
+    }
+
+    IsDocumentInit = true;
+    LoadState();
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
   }
 
   protected override void HostAppSaveState(string modelCardState)
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoIdleManager.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoIdleManager.cs
deleted file mode 100644
index f536f5786..000000000
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/HostApp/RhinoIdleManager.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using Rhino;
-using Speckle.Connectors.DUI.Bridge;
-
-namespace Speckle.Connectors.Rhino.HostApp;
-
-/// <summary>
-/// Rhino Idle Manager is a helper util to manage deferred actions.
-/// </summary>
-public sealed class RhinoIdleManager(IIdleCallManager idleCallManager) : AppIdleManager(idleCallManager)
-{
-  private readonly IIdleCallManager _idleCallManager = idleCallManager;
-
-  protected override void AddEvent()
-  {
-    RhinoApp.Idle += RhinoAppOnIdle;
-  }
-
-  private void RhinoAppOnIdle(object? sender, EventArgs e) =>
-    _idleCallManager.AppOnIdle(() => RhinoApp.Idle -= RhinoAppOnIdle);
-}
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/RhinoPlugin.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/RhinoPlugin.cs
deleted file mode 100644
index 3a060c253..000000000
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/RhinoPlugin.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Rhino;
-using Speckle.Connectors.DUI.Bridge;
-using Speckle.Connectors.Rhino.Plugin;
-using Speckle.InterfaceGenerator;
-
-namespace Speckle.Connectors.Rhino.DependencyInjection;
-
-[GenerateAutoInterface]
-public class RhinoPlugin : IRhinoPlugin
-{
-  private readonly IAppIdleManager _idleManager;
-
-  public RhinoPlugin(IAppIdleManager idleManager)
-  {
-    _idleManager = idleManager;
-  }
-
-  public void Initialise() =>
-    _idleManager.SubscribeToIdle(
-      nameof(RhinoPlugin),
-      () => RhinoApp.RunScript(SpeckleConnectorsRhinoCommand.Instance.EnglishName, false)
-    );
-
-  public void Shutdown() { }
-}
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoCommand.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoCommand.cs
index 704965ad7..3305bb036 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoCommand.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoCommand.cs
@@ -23,7 +23,7 @@ public SpeckleConnectorsRhinoCommand()
     Panels.RegisterPanel(
       SpeckleConnectorsRhinoPlugin.Instance,
       typeof(SpeckleRhinoPanelHost),
-      "Speckle (Beta) for Rhino",
+      "Speckle (Beta)",
       new Icon(iconPath),
       PanelType.System
     );
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoPlugin.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoPlugin.cs
index a1158578e..dd9845a6b 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoPlugin.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Plugin/Speckle.Connectors.RhinoPlugin.cs
@@ -1,7 +1,10 @@
 using Microsoft.Extensions.DependencyInjection;
 using Rhino.PlugIns;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.Rhino.DependencyInjection;
+using Speckle.Connectors.RhinoShared;
 using Speckle.Converters.Rhino;
 using Speckle.Sdk;
 using Speckle.Sdk.Host;
@@ -19,10 +22,9 @@ namespace Speckle.Connectors.Rhino.Plugin;
 ///</summary>
 public class SpeckleConnectorsRhinoPlugin : PlugIn
 {
-  private IRhinoPlugin? _rhinoPlugin;
   private IDisposable? _disposableLogger;
 
-  protected override string LocalPlugInName => "Speckle (Beta) for Rhino";
+  protected override string LocalPlugInName => "Speckle (Beta)";
   public ServiceProvider? Container { get; private set; }
 
   public SpeckleConnectorsRhinoPlugin()
@@ -51,10 +53,8 @@ protected override LoadReturnCode OnLoad(ref string errorMessage)
 
       // but the Rhino connector has `.rhp` as it is extension.
       Container = services.BuildServiceProvider();
-
-      // Resolve root plugin object and initialise.
-      _rhinoPlugin = Container.GetRequiredService<IRhinoPlugin>();
-      _rhinoPlugin.Initialise();
+      RhinoEvents.Register(Container.GetRequiredService<IEventAggregator>());
+      Container.UseDUI();
 
       return LoadReturnCode.Success;
     }
@@ -78,7 +78,6 @@ private HostAppVersion GetVersion()
 
   protected override void OnShutdown()
   {
-    _rhinoPlugin?.Shutdown();
     _disposableLogger?.Dispose();
     Container?.Dispose();
     base.OnShutdown();
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs
index a5ad1c12d..82bf48c49 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Registration/ServiceRegistration.cs
@@ -11,7 +11,6 @@
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI;
 using Speckle.Connectors.DUI.Bindings;
-using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models.Card.SendFilter;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Connectors.Rhino.Bindings;
@@ -36,17 +35,11 @@ public static void AddRhino(this IServiceCollection serviceCollection)
     serviceCollection.AddDUI<DefaultThreadContext, RhinoDocumentStore>();
     serviceCollection.AddDUIView();
 
-    // Register other connector specific types
-    serviceCollection.AddSingleton<IRhinoPlugin, RhinoPlugin>();
-    serviceCollection.AddSingleton<IAppIdleManager, RhinoIdleManager>();
-
     // Register bindings
     serviceCollection.AddSingleton<IBinding, TestBinding>();
     serviceCollection.AddSingleton<IBinding, ConfigBinding>(); // POC: Easier like this for now, should be cleaned up later
     serviceCollection.AddSingleton<IBinding, AccountBinding>();
 
-    serviceCollection.RegisterTopLevelExceptionHandler();
-
     serviceCollection.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     serviceCollection.AddSingleton<IBasicConnectorBinding, RhinoBasicConnectorBinding>();
 
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/RhinoEvents.cs b/Connectors/Rhino/Speckle.Connectors.RhinoShared/RhinoEvents.cs
new file mode 100644
index 000000000..67c8acd53
--- /dev/null
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/RhinoEvents.cs
@@ -0,0 +1,87 @@
+using Rhino;
+using Rhino.Commands;
+using Rhino.DocObjects;
+using Rhino.DocObjects.Tables;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.RhinoShared;
+
+public class BeginOpenDocument(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentOpenEventArgs>(threadContext, exceptionHandler);
+
+public class EndOpenDocument(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentOpenEventArgs>(threadContext, exceptionHandler);
+
+public class SelectObjects(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoObjectSelectionEventArgs>(threadContext, exceptionHandler);
+
+public class DeselectObjects(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoObjectSelectionEventArgs>(threadContext, exceptionHandler);
+
+public class DeselectAllObjects(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoDeselectAllObjectsEventArgs>(threadContext, exceptionHandler);
+
+public class ActiveDocumentChanged(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentEventArgs>(threadContext, exceptionHandler);
+
+public class DocumentPropertiesChanged(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<DocumentEventArgs>(threadContext, exceptionHandler);
+
+public class AddRhinoObject(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoObjectEventArgs>(threadContext, exceptionHandler);
+
+public class DeleteRhinoObject(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoObjectEventArgs>(threadContext, exceptionHandler);
+
+public class RenderMaterialsTableEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoDoc.RenderContentTableEventArgs>(threadContext, exceptionHandler);
+
+public class MaterialTableEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<MaterialTableEventArgs>(threadContext, exceptionHandler);
+
+public class ModifyObjectAttributes(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoModifyObjectAttributesEventArgs>(threadContext, exceptionHandler);
+
+public class ReplaceRhinoObject(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<RhinoReplaceObjectEventArgs>(threadContext, exceptionHandler);
+
+public class GroupTableEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<GroupTableEventArgs>(threadContext, exceptionHandler);
+
+public class LayerTableEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<LayerTableEventArgs>(threadContext, exceptionHandler);
+
+public class BeginCommandEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<CommandEventArgs>(threadContext, exceptionHandler);
+
+public static class RhinoEvents
+{
+  public static void Register(IEventAggregator eventAggregator)
+  {
+    RhinoApp.Idle += async (_, e) => await eventAggregator.GetEvent<IdleEvent>().PublishAsync(e);
+
+    RhinoDoc.BeginOpenDocument += async (_, e) => await eventAggregator.GetEvent<BeginOpenDocument>().PublishAsync(e);
+    RhinoDoc.EndOpenDocument += async (_, e) => await eventAggregator.GetEvent<EndOpenDocument>().PublishAsync(e);
+    RhinoDoc.SelectObjects += async (_, e) => await eventAggregator.GetEvent<SelectObjects>().PublishAsync(e);
+    RhinoDoc.DeselectObjects += async (_, e) => await eventAggregator.GetEvent<DeselectObjects>().PublishAsync(e);
+    RhinoDoc.DeselectAllObjects += async (_, e) => await eventAggregator.GetEvent<DeselectAllObjects>().PublishAsync(e);
+    RhinoDoc.ActiveDocumentChanged += async (_, e) =>
+      await eventAggregator.GetEvent<ActiveDocumentChanged>().PublishAsync(e);
+    RhinoDoc.DocumentPropertiesChanged += async (_, e) =>
+      await eventAggregator.GetEvent<DocumentPropertiesChanged>().PublishAsync(e);
+    RhinoDoc.AddRhinoObject += async (_, e) => await eventAggregator.GetEvent<AddRhinoObject>().PublishAsync(e);
+    RhinoDoc.DeleteRhinoObject += async (_, e) => await eventAggregator.GetEvent<DeleteRhinoObject>().PublishAsync(e);
+    RhinoDoc.RenderMaterialsTableEvent += async (_, e) =>
+      await eventAggregator.GetEvent<RenderMaterialsTableEvent>().PublishAsync(e);
+    RhinoDoc.MaterialTableEvent += async (_, e) => await eventAggregator.GetEvent<MaterialTableEvent>().PublishAsync(e);
+    RhinoDoc.ModifyObjectAttributes += async (_, e) =>
+      await eventAggregator.GetEvent<ModifyObjectAttributes>().PublishAsync(e);
+    RhinoDoc.ReplaceRhinoObject += async (_, e) => await eventAggregator.GetEvent<ReplaceRhinoObject>().PublishAsync(e);
+    RhinoDoc.GroupTableEvent += async (_, e) => await eventAggregator.GetEvent<GroupTableEvent>().PublishAsync(e);
+    RhinoDoc.LayerTableEvent += async (_, e) => await eventAggregator.GetEvent<LayerTableEvent>().PublishAsync(e);
+
+    Command.BeginCommand += async (_, e) => await eventAggregator.GetEvent<BeginCommandEvent>().PublishAsync(e);
+  }
+}
diff --git a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems
index 42d4d5842..2f211fc27 100644
--- a/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems
+++ b/Connectors/Rhino/Speckle.Connectors.RhinoShared/Speckle.Connectors.RhinoShared.projitems
@@ -21,6 +21,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\RhinoReceiveBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\RhinoSendBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\RhinoSelectionBinding.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RhinoEvents.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Registration\ServiceRegistration.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\BoundingBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\SpeckleApplicationIdExtensions.cs" />
@@ -32,7 +33,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoDocumentStore.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoGroupBaker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoGroupUnpacker.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoInstanceBaker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoInstanceUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\RhinoLayerBaker.cs" />
@@ -43,7 +43,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\DisableRedrawScope.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Receive\RhinoHostObjectBuilder.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\RhinoRootObjectBuilder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Plugin\RhinoPlugin.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\Speckle.Connectors.RhinoCommand.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Plugin\Speckle.Connectors.RhinoPlugin.cs" />
   </ItemGroup>
diff --git a/Connectors/Rhino/Toolbars/Speckle.Connectors.Rhino.rui b/Connectors/Rhino/Toolbars/Speckle.Connectors.Rhino.rui
new file mode 100644
index 000000000..10eb32fc2
--- /dev/null
+++ b/Connectors/Rhino/Toolbars/Speckle.Connectors.Rhino.rui
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RhinoUI major_ver="3" minor_ver="0" guid="e229f0f5-9c65-41e4-abd2-62423a284cb2" localize="False" default_language_id="1033" dpi_scale="125">
+  <extend_rhino_menus />
+  <menus />
+  <tool_bar_groups>
+    <tool_bar_group guid="5f6ad164-78bd-4114-b29f-e9066a676b02" dock_bar_guid32="00000000-0000-0000-0000-000000000000" dock_bar_guid64="13f3b878-ee25-45a7-8e82-4204663c5120" active_tool_bar_group="00813814-f9b4-4271-8b13-886976b6d3b2" single_file="False" hide_single_tab="False" point_floating="684,402">
+      <text>
+        <locale_1033>Speckle (Beta)</locale_1033>
+      </text>
+      <tool_bar_group_item guid="00813814-f9b4-4271-8b13-886976b6d3b2" major_version="1" minor_version="1">
+        <text>
+          <locale_1033>Toolbar 00</locale_1033>
+        </text>
+        <tool_bar_id>a0d74d7e-bd20-499e-9984-fca521394029</tool_bar_id>
+      </tool_bar_group_item>
+      <dock_bar_info dpi_scale="125" dock_bar="False" docking="True" horz="False" visible="False" floating="True" mru_float_style="8192" bar_id="59472" mru_width="32767" point_pos="-2,-2" float_point="684,402" rect_mru_dock_pos="0,0,0,0" dock_location_u="59420" dock_location="left" float_size="271,65" />
+    </tool_bar_group>
+  </tool_bar_groups>
+  <tool_bars>
+    <tool_bar guid="a0d74d7e-bd20-499e-9984-fca521394029" bitmap_id="51e103c3-0e8e-4cf4-a32d-69d7fa5baa8e" item_display_style="control_and_text">
+      <text>
+        <locale_1033>Speckle (Beta)</locale_1033>
+      </text>
+      <tool_bar_item guid="9c871acc-1ed0-4b29-9c90-c576cf0c9874" button_display_mode="control_and_text" display_style_from_parent="False">
+        <text>
+          <locale_1033>Toolbar item</locale_1033>
+        </text>
+        <left_macro_id>5937e6d4-d2f5-4831-abdb-2c54f5903731</left_macro_id>
+      </tool_bar_item>
+      <tool_bar_item guid="f31da9e3-4ded-4f52-bf08-4f5c49bbd1cc" button_style="spacer" />
+      <tool_bar_item guid="af61c39b-a8b7-4cf9-b221-f63c2dcb0cf2" button_display_mode="control_and_text" display_style_from_parent="False">
+        <left_macro_id>7c8cd3c6-87fb-4047-9c5a-cb38defaa5c1</left_macro_id>
+      </tool_bar_item>
+    </tool_bar>
+  </tool_bars>
+  <macros>
+    <macro_item guid="5937e6d4-d2f5-4831-abdb-2c54f5903731" bitmap_id="26fce8b0-6f57-4acd-a04d-67515a58a367">
+      <text>
+        <locale_1033>Macro</locale_1033>
+      </text>
+      <tooltip>
+        <locale_1033>The Next Gen Speckle Connector (Beta) for Rhino</locale_1033>
+      </tooltip>
+      <help_text>
+        <locale_1033 />
+      </help_text>
+      <button_text>
+        <locale_1033>Speckle (Beta)</locale_1033>
+      </button_text>
+      <menu_text>
+        <locale_1033 />
+      </menu_text>
+      <script>SpeckleBeta</script>
+    </macro_item>
+    <macro_item guid="7c8cd3c6-87fb-4047-9c5a-cb38defaa5c1" bitmap_id="998b7353-c03c-4284-aa62-5b46327731e0">
+      <text>
+        <locale_1033>Macro 00</locale_1033>
+      </text>
+      <tooltip>
+        <locale_1033>Opens the Speckle Community Help Page in your browser</locale_1033>
+      </tooltip>
+      <help_text>
+        <locale_1033 />
+      </help_text>
+      <button_text>
+        <locale_1033>Get Help</locale_1033>
+      </button_text>
+      <menu_text>
+        <locale_1033 />
+      </menu_text>
+      <script>_-WebBrowser Navigate "https://speckle.community/c/help" _EnterEnd</script>
+    </macro_item>
+  </macros>
+  <bitmaps>
+    <small_bitmap item_width="16" item_height="16">
+      <bitmap_item guid="51e103c3-0e8e-4cf4-a32d-69d7fa5baa8e" index="0" />
+      <bitmap_item guid="26fce8b0-6f57-4acd-a04d-67515a58a367" index="1" />
+      <bitmap_item guid="998b7353-c03c-4284-aa62-5b46327731e0" index="2" />
+      <bitmap>iVBORw0KGgoAAAANSUhEUgAAABAAAAAwCAYAAAAYX/pXAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+jwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH8SURBVEhL7ZRfSFNRHMdHZWaPZShUMA2yFwlf
+esgHR2kvQRT5EiTYe/RU2BztzmihCGNEZUJORKIeKgz6M9jCIqG/tJwPmqUZsXLadtcM2r3bPZ+4
+d2yQuw3q+X7gy/n3Ox/OOQ/HZltF1yPsRkI4usJ0OkN4zgY1vyukDTvD2nh3KPfJFQa9xtjQ1BxB
+n/ifOMMcNgRmktNBOPlA0HFHcOiG4MCIoGVIo+lqjnpfjs0X8ykK7O0LrHNn/zmmgmpvCiXWURzz
+dYiqnnxfXTxFXd9iecG+gUlWJlup9X5n8P5dQObh40E2ehR+Rts5MvC0vEDPekmlsX8WId8CUvBj
+jJoLy1R5Mn/UlQiWnh0k96EbEfODfBPEFyAOxGDlHmLpOnzuQx7fby6o642TmvOhqS9BTAEzwCzw
+HpgGLUp6vp89vhlzgZ4Kd5Zvbzvh123IBUEL5VtljPTU0fJXqPQoVEoKm3pSZD+2IRLHEfIJRPIY
+2flW2vwTxrpeVyGpJgIp/0iXLp9BfbGTTKSB9JsGlOgu1Nf1BEfzJyjUlQgKiV/bSjJQzXSg0Ri/
+CjSTHN1CYqS2/BWKgis17PU+N/rKO4fR7jg/x/LwthKBx0xQyAYpQyKwHUfvRMmaIdDZ3RKx/01g
+GldGXntOXVjjzjxZ9RtYWFhYWFhYWNh+AwX3pT9YtYnUAAAAAElFTkSuQmCC</bitmap>
+    </small_bitmap>
+    <normal_bitmap item_width="24" item_height="24">
+      <bitmap_item guid="51e103c3-0e8e-4cf4-a32d-69d7fa5baa8e" index="0" />
+      <bitmap_item guid="26fce8b0-6f57-4acd-a04d-67515a58a367" index="1" />
+      <bitmap_item guid="998b7353-c03c-4284-aa62-5b46327731e0" index="2" />
+      <bitmap>iVBORw0KGgoAAAANSUhEUgAAABgAAABICAYAAADs+TUPAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+jwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAgSSURBVFhH7ZZ7VBTXAca37ooaU9PTxppoTGJz
+TNMF01CPsOsjqFRtBV8FKbC7idI2ttZ4NEFQcB+IVOQomig+MGrNqW9hwSiogBgVEAwKAvLaJSQI
+KoIYxN2Z2Zn79cwsrOzsIrb5l++c32Fn7r3fb+buzFkkkoEMZCADGchABjKQgTwz0dl4k2dtDpkU
+nYPp0blYwrMuB4a157iEmBwuNTaHO7gul8tfl8uWxOSw38bksK08/DpH0fxVjSWfpFkrYy6wTd0T
+qNhc4MfA96zNIYGrC8kwifeUmwj4eyM+TWdcJv4oLnD3YnNJjCDgmbPU7Dqpm8hzwIqzBMtOE2jS
+CIKOEcw/TDD7EIHffg4+e1h472LhtYPFr5JZ/OJfdobF2eAQ8MjDGjEmicXITSxGxLN4cQMLD70N
+Mt3/j5PgzeBGlwk8yp11GB5ndRyH7v4af0m94DgeaqAxbVedy7p+BcMMVqw+lQW6WYN5qdcc57+9
+uR2PKuKELRAuIMUE5t5KxH9lxIgNT55f4LOjBrfK/glLbSA+M34ODz2NoH1VIB1ZwA95WHfsMgbr
+bNAbM0CZl6KudDlm7Cx/fsHwOAvmpBShIO9vyM5eidEJrSgr3Q2wjQDbhMbK7Ri3uQ3pWTqU5y9F
+QEohfhr3P9xBDx56BnN3Xsb8vRUgHccAtAN4CPyQgfD91zBvRz6GGSiXdX0KhupphO7Jxcf/yUf0
+yUIYMouQfK4ARRWZgK0GQJsdrh636jKw5+IVJGUVQJtRjMjjhVDtyXHciVsBP2i6FAprQxK4jq+A
+rjzAWgCwtwB8D+AOgGb7X64aYEoBaxHI4zxQ3+1C+yV/jE540LeAZ1zifZSXJOLJg3RwTDHAlQGo
+AsDfQW0v+OPbAHcL1vYMNF3/BD7JNc/eoh5+nXQXh899gc6mbeAsGYAtH+CuAqSwmwKAuwyOOgNL
+SzLO5G6GT3J1/98Bz2AdIzB20wPEHj2FJw0rgMfbAPowwJwCmJP2z13bwTQtw77MrRiX2OxU3qeA
+f2qGGGg7eho/j3sES7EPuOaFIO1qkI4ldh6Ggbu7ANSNSZi1/So8dE/XeRjovgX8lQ/RU8KLxR9/
+/FkqLHlvg739O9hMvmBMSjBmBdgGH7A13rBcGY+tX+i6L85+UT1r3QqEiTr7BJ7MlBB0ZbwGa85Y
+dF54HS3Z7+Du+XfQefF1WPPHouvMGNQdeQ8v6O2PJr+Wv8hnCnp4Y8N3uL9nDB7uG4m2AyNRfWAC
+Zmy+Au9N5Sg5MAXtX/4SHV+ORPuhVyBPePr09NCvQLHxGlp3jULJ5z7Qbt2InxkeIWL/GcQfO4CX
+DJ1YsSUFV3dPQ9vBVxCYlO2yvl/BKMM9fJj4b3jH33RswfHjkajLXiTs9RAdBc/4KqiTjmL0hhaX
+9bzA8CyBmKF6Cnf2j8eD/WMxPfGqy7gY4Yffe/JN9W+n3DA9j+C1uGZs2RYtMGtTrvP4epqTaWmL
+bD39RKqjW2U6ukUQ+Pnly7ynlvqPDWpslWlpSqqlW6U6plG6nq4apKWKBsVSl2RaJlOmY05IY6kU
+AZ1tk1RrM8j0zHIeqY5dLNXagqTrbYFSLRUg1Vuny/TMVEGAmrCXuVr11q6Tc/Po0pA8y8VFWaQ+
+fIbjf5vuQC8ZhNOvvoATcg/x2DNDGtUqW3UY15U2F7YbIaAu/wlcg6aJlKmHkywfOYxeC7k0+XHO
+6NXCGeUMlyZ/wqXLr5N0z/UkzXMS9k4cLO50CjFrIkitCk4CU3gXVx1yhCsNqOQLYfSCO7h0uZmk
+eS2DRPITca8jgqBeDWvuArAVoWBKFgMNGjtFs11KxXBpXoQYPTXiXkd4gaOwN7eDgexJwOn3XErF
+cGnyLnLyN57ibiF9Cr72AzImADfnARcULqViOKNXvLhbCKlWRaBGBSduhwKZ7wLFc+yy2lDgUrew
+p/TsRJHA8wggGSTul9DRyggmWgkntEqgNND1rurDgfIFQIE/kDcFuBEIZNlFnNEzAwffGCrul9Br
+lBFMlBK9sSW8by80a3Dv0gIQcy+JWYOO4iCQ8oWASQVc634Q0iecQL6fTNzvXrBlulDWkj8fH70s
+xZ3c+Q5BZ+libJn9KuqM3dtXFWy/gwyvfeJuIW4FO/yFxY+uByP5j2Pw8FqQQ2CpCMXJVV64d3nh
+0+8n3RMwehrE3ULcCdjUWY7CrrI/O29RgwbWyrCn5+rCBAHJfHemuFuIW8GhPzgVsrVqtBhD0HAw
+GEylymmM3yIuTX4L6ONtdidgDs5u5kwa0lPCX62lVIXOwnCQeue74UoDWojRc7K41xF3AtvGKXFc
+g6aAL6DKVWg7H+pEV3G4vbw+/C65EfCBuNMp7gR0lCKcNKr8ObOqlX8sK5MW4co/5gl8E7MAXUV2
+AcwaA/R615erd9wJbJFTfw/oB5H6D2ZwJvV5tk5tYSrVoCvUsNWpGJjV35B6jQZYLBX3ucSt4FPl
+zMcrfUfxkFT/tzlTeL1jz03qdlKyWN0zLszR+4wQ9zrCRik+FAvEkOshji+VVIXDtm2m0zgV6Wuj
+I5Vx369WDBP3S6yRk2fTkb4PxaW94U7PA0xqu6AgGLb4913mUFFKCxWlDBb3S8hqxRgq0rdAvMAJ
+wzSwh+aAPToXtqTpruM9rFHoxP0S/gWhohR7XSY/J21/He/4TEcpEsX9Qu4v93uRjlKcpaJ8KXFB
+fzyIeKt/AR9ET3zJukb5Eb1GcYpZoyhjonwr+sMa5VvRuuStXucUq3p3/hevS6SebTfArQAAAABJ
+RU5ErkJggg==</bitmap>
+    </normal_bitmap>
+    <large_bitmap item_width="32" item_height="32">
+      <bitmap_item guid="51e103c3-0e8e-4cf4-a32d-69d7fa5baa8e" index="0" />
+      <bitmap_item guid="26fce8b0-6f57-4acd-a04d-67515a58a367" index="1" />
+      <bitmap_item guid="998b7353-c03c-4284-aa62-5b46327731e0" index="2" />
+      <bitmap>iVBORw0KGgoAAAANSUhEUgAAACAAAABgCAYAAAB8InCYAAAAAXNSR0IArs4c6QAAAARnQU1BAACx
+jwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAAiSURBVGhD7cEBAQAAAIIg/69uSEABAAAAAAAA
+AAAAAADvBjBgAAExh6+sAAAAAElFTkSuQmCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==</bitmap>
+    </large_bitmap>
+  </bitmaps>
+  <scripts />
+</RhinoUI>
\ No newline at end of file
diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
index 463949c95..1299ba28d 100644
--- a/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
+++ b/Connectors/Tekla/Speckle.Connector.Tekla2023/packages.lock.json
@@ -35,11 +35,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Tekla.Structures.Dialog": {
@@ -212,11 +212,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -327,14 +322,21 @@
         "resolved": "2023.0.1",
         "contentHash": "24KbR++C2WYEIyDymIHX/AVuHYcgwyQrvgExMKDnMobQPNM+AmMNnwdyYxBbw4AvYXd8QHoi+lmmavhTCL8E3w=="
       },
+      "speckle.common.meshtriangulation": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.DoubleNumerics": "[4.1.0, )",
+          "Speckle.Triangle": "[1.0.0, )"
+        }
+      },
       "speckle.connectors.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -342,8 +344,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -359,6 +361,7 @@
       "speckle.converter.tekla2023": {
         "type": "Project",
         "dependencies": {
+          "Speckle.Common.MeshTriangulation": "[1.0.0, )",
           "Speckle.Converters.Common": "[1.0.0, )",
           "Tekla.Structures.Drawing": "[2023.0.1, )",
           "Tekla.Structures.Model": "[2023.0.1, )"
@@ -368,7 +371,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -404,28 +407,40 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
+      },
+      "Speckle.Triangle": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
       }
     }
   }
diff --git a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json
index 34e4cd10c..244335d09 100644
--- a/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json
+++ b/Connectors/Tekla/Speckle.Connector.Tekla2024/packages.lock.json
@@ -35,11 +35,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Tekla.Structures.Dialog": {
@@ -231,11 +231,6 @@
         "resolved": "0.11.4",
         "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -408,14 +403,21 @@
         "resolved": "2.2.22312",
         "contentHash": "OMwJAhps/tnmV99suab65b7Ex+H9mebbdNRaHwogPEwCRefWUr7/WaA4p43nfb+FxmBFO5FtudN3EEarggTSow=="
       },
+      "speckle.common.meshtriangulation": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.DoubleNumerics": "[4.1.0, )",
+          "Speckle.Triangle": "[1.0.0, )"
+        }
+      },
       "speckle.connectors.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -423,8 +425,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -440,6 +442,7 @@
       "speckle.converter.tekla2024": {
         "type": "Project",
         "dependencies": {
+          "Speckle.Common.MeshTriangulation": "[1.0.0, )",
           "Speckle.Converters.Common": "[1.0.0, )",
           "Tekla.Structures.Drawing": "[2024.0.4, )",
           "Tekla.Structures.Model": "[2024.0.4, )"
@@ -449,7 +452,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -485,28 +488,40 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
+      },
+      "Speckle.Triangle": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
       }
     }
   }
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs
index 519ac132e..c7abd1ae4 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaBasicConnectorBinding.cs
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Models.Card;
 using Speckle.Sdk;
@@ -25,6 +26,7 @@ public TeklaBasicConnectorBinding(
     ISpeckleApplication speckleApplication,
     DocumentModelStore store,
     ILogger<TeklaBasicConnectorBinding> logger,
+    IEventAggregator eventAggregator,
     TSM.Model model
   )
   {
@@ -34,13 +36,11 @@ TSM.Model model
     _logger = logger;
     _model = model;
     Commands = new BasicConnectorBindingCommands(parent);
-    _store.DocumentChanged += (_, _) =>
-      parent.TopLevelExceptionHandler.FireAndForget(async () =>
-      {
-        await Commands.NotifyDocumentChanged();
-      });
+    eventAggregator.GetEvent<DocumentStoreChangedEvent>().Subscribe(OnDocumentStoreChangedEvent);
   }
 
+  private async Task OnDocumentStoreChangedEvent(object _) => await Commands.NotifyDocumentChanged();
+
   public string GetSourceApplicationName() => _speckleApplication.Slug;
 
   public string GetSourceApplicationVersion() => _speckleApplication.HostApplicationVersion;
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs
index 710d0d5b5..050849193 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSelectionBinding.cs
@@ -1,41 +1,37 @@
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Tekla.Structures.Model;
 
 namespace Speckle.Connectors.TeklaShared.Bindings;
 
 public class TeklaSelectionBinding : ISelectionBinding
 {
-  private readonly IAppIdleManager _idleManager;
   private const string SELECTION_EVENT = "setSelection";
-  private readonly Events _events;
   private readonly object _selectionEventHandlerLock = new object();
   private readonly Tekla.Structures.Model.UI.ModelObjectSelector _selector;
+  private readonly IEventAggregator _eventAggregator;
 
   public string Name => "selectionBinding";
   public IBrowserBridge Parent { get; }
 
   public TeklaSelectionBinding(
-    IAppIdleManager idleManager,
     IBrowserBridge parent,
-    Events events,
-    Tekla.Structures.Model.UI.ModelObjectSelector selector
+    Tekla.Structures.Model.UI.ModelObjectSelector selector,
+    IEventAggregator eventAggregator
   )
   {
-    _idleManager = idleManager;
     Parent = parent;
-    _events = events;
     _selector = selector;
+    _eventAggregator = eventAggregator;
 
-    _events.SelectionChange += Events_SelectionChangeEvent;
-    _events.Register();
+    eventAggregator.GetEvent<SelectionChangeEvent>().Subscribe(OnSelectionChangeEvent);
   }
 
-  private void Events_SelectionChangeEvent()
+  private void OnSelectionChangeEvent(object _)
   {
     lock (_selectionEventHandlerLock)
     {
-      _idleManager.SubscribeToIdle(nameof(TeklaSelectionBinding), UpdateSelection);
       UpdateSelection();
     }
   }
@@ -43,16 +39,11 @@ private void Events_SelectionChangeEvent()
   private void UpdateSelection()
   {
     SelectionInfo selInfo = GetSelection();
-    Parent.Send(SELECTION_EVENT, selInfo);
+    Parent.Send2(SELECTION_EVENT, selInfo);
   }
 
   public SelectionInfo GetSelection()
   {
-    if (_selector == null)
-    {
-      return new SelectionInfo(new List<string>(), "No objects selected.");
-    }
-
     var objectIds = new List<string>();
     var objectTypes = new List<string>();
 
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs
index cff0f1198..f8d0d4990 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Bindings/TeklaSendBinding.cs
@@ -6,6 +6,7 @@
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Exceptions;
 using Speckle.Connectors.DUI.Logging;
 using Speckle.Connectors.DUI.Models;
@@ -24,14 +25,13 @@
 
 namespace Speckle.Connectors.TeklaShared.Bindings;
 
-public sealed class TeklaSendBinding : ISendBinding, IDisposable
+public sealed class TeklaSendBinding : ISendBinding
 {
   public string Name => "sendBinding";
   public SendBindingUICommands Commands { get; }
   public IBrowserBridge Parent { get; }
 
   private readonly DocumentModelStore _store;
-  private readonly IAppIdleManager _idleManager;
   private readonly IServiceProvider _serviceProvider;
   private readonly List<ISendFilter> _sendFilters;
   private readonly CancellationManager _cancellationManager;
@@ -42,14 +42,12 @@ public sealed class TeklaSendBinding : ISendBinding, IDisposable
   private readonly ISpeckleApplication _speckleApplication;
   private readonly ISdkActivityFactory _activityFactory;
   private readonly Model _model;
-  private readonly Events _events;
   private readonly ToSpeckleSettingsManager _toSpeckleSettingsManager;
 
   private ConcurrentDictionary<string, byte> ChangedObjectIds { get; set; } = new();
 
   public TeklaSendBinding(
     DocumentModelStore store,
-    IAppIdleManager idleManager,
     IBrowserBridge parent,
     IEnumerable<ISendFilter> sendFilters,
     IServiceProvider serviceProvider,
@@ -60,11 +58,11 @@ public TeklaSendBinding(
     ITeklaConversionSettingsFactory teklaConversionSettingsFactory,
     ISpeckleApplication speckleApplication,
     ISdkActivityFactory activityFactory,
-    ToSpeckleSettingsManager toSpeckleSettingsManager
+    ToSpeckleSettingsManager toSpeckleSettingsManager,
+    IEventAggregator eventAggregator
   )
   {
     _store = store;
-    _idleManager = idleManager;
     _serviceProvider = serviceProvider;
     _sendFilters = sendFilters.ToList();
     _cancellationManager = cancellationManager;
@@ -79,14 +77,7 @@ ToSpeckleSettingsManager toSpeckleSettingsManager
     _toSpeckleSettingsManager = toSpeckleSettingsManager;
 
     _model = new Model();
-    _events = new Events();
-    SubscribeToTeklaEvents();
-  }
-
-  private void SubscribeToTeklaEvents()
-  {
-    _events.ModelObjectChanged += ModelHandler_OnChange;
-    _events.Register();
+    eventAggregator.GetEvent<ModelObjectChangedEvent>().Subscribe(ModelHandler_OnChange);
   }
 
   // subscribes the all changes in a modelobject
@@ -195,15 +186,4 @@ private async Task RunExpirationChecks()
 
     ChangedObjectIds = new ConcurrentDictionary<string, byte>();
   }
-
-  private bool _disposed;
-
-  public void Dispose()
-  {
-    if (!_disposed)
-    {
-      _events.UnRegister();
-      _disposed = true;
-    }
-  }
 }
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Events.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/Events.cs
new file mode 100644
index 000000000..c9999f26c
--- /dev/null
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Events.cs
@@ -0,0 +1,27 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+
+namespace Speckle.Connectors.TeklaShared;
+
+public class SelectionChangeEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class ModelObjectChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<List<TSM.ChangeData>>(threadContext, exceptionHandler);
+
+public class ModelLoadEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public static class TeklaEvents
+{
+  public static void Register(Tekla.Structures.Model.Events events, IEventAggregator eventAggregator)
+  {
+    events.UnRegister();
+    events.SelectionChange += async () =>
+      await eventAggregator.GetEvent<SelectionChangeEvent>().PublishAsync(new object());
+    events.ModelObjectChanged += async x => await eventAggregator.GetEvent<ModelObjectChangedEvent>().PublishAsync(x);
+    events.ModelLoad += async () => await eventAggregator.GetEvent<ModelLoadEvent>().PublishAsync(new object());
+    events.Register();
+  }
+}
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs
index 5f75cb37e..117722657 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaDocumentModelStore.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Logging;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Connectors.DUI.Utils;
 using Speckle.Sdk;
@@ -10,34 +11,40 @@ namespace Speckle.Connectors.TeklaShared.HostApp;
 public class TeklaDocumentModelStore : DocumentModelStore
 {
   private readonly ILogger<TeklaDocumentModelStore> _logger;
+  private readonly IEventAggregator _eventAggregator;
   private readonly ISqLiteJsonCacheManager _jsonCacheManager;
-  private readonly TSM.Events _events;
   private readonly TSM.Model _model;
   private string? _modelKey;
 
   public TeklaDocumentModelStore(
     IJsonSerializer jsonSerializer,
     ILogger<TeklaDocumentModelStore> logger,
-    ISqLiteJsonCacheManagerFactory jsonCacheManagerFactory
+    ISqLiteJsonCacheManagerFactory jsonCacheManagerFactory,
+    IEventAggregator eventAggregator
   )
     : base(jsonSerializer)
   {
     _logger = logger;
+    _eventAggregator = eventAggregator;
     _jsonCacheManager = jsonCacheManagerFactory.CreateForUser("ConnectorsFileData");
-    _events = new TSM.Events();
     _model = new TSM.Model();
     GenerateKey();
-    _events.ModelLoad += () =>
-    {
-      GenerateKey();
-      LoadState();
-      OnDocumentChanged();
-    };
-    _events.Register();
+    eventAggregator.GetEvent<ModelLoadEvent>().Subscribe(OnModelLoadEvent);
+  }
+
+  private async Task OnModelLoadEvent(object _)
+  {
+    GenerateKey();
+    LoadState();
+    await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
+  }
+
+  public override async Task OnDocumentStoreInitialized()
+  {
     if (SpeckleTeklaPanelHost.IsInitialized)
     {
       LoadState();
-      OnDocumentChanged();
+      await _eventAggregator.GetEvent<DocumentStoreChangedEvent>().PublishAsync(new object());
     }
   }
 
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaIdleManager.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaIdleManager.cs
deleted file mode 100644
index 851020e61..000000000
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/HostApp/TeklaIdleManager.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using Speckle.Connectors.DUI.Bridge;
-using Tekla.Structures.Model;
-
-namespace Speckle.Connectors.TeklaShared.HostApp;
-
-public sealed class TeklaIdleManager : AppIdleManager
-{
-  private readonly IIdleCallManager _idleCallManager;
-  private readonly Events _events;
-
-  public TeklaIdleManager(IIdleCallManager idleCallManager, Events events)
-    : base(idleCallManager)
-  {
-    _idleCallManager = idleCallManager;
-    _events = events;
-  }
-
-  protected override void AddEvent()
-  {
-    _events.ModelSave += TeklaEventsOnIdle;
-    _events.Register();
-  }
-
-  private void TeklaEventsOnIdle()
-  {
-    _idleCallManager.AppOnIdle(() =>
-    {
-      _events.ModelSave -= TeklaEventsOnIdle;
-      _events.UnRegister();
-    });
-  }
-}
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs
index d9d42e0cf..f058061e8 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/ServiceRegistration.cs
@@ -35,15 +35,11 @@ public static IServiceCollection AddTekla(this IServiceCollection services)
     services.AddDUI<DefaultThreadContext, TeklaDocumentModelStore>();
     services.AddDUIView();
 
-    services.AddSingleton<IAppIdleManager, TeklaIdleManager>();
-
     services.AddSingleton<IBinding, TestBinding>();
     services.AddSingleton<IBinding, ConfigBinding>();
     services.AddSingleton<IBinding, AccountBinding>();
     services.AddSingleton<IBasicConnectorBinding, TeklaBasicConnectorBinding>();
 
-    services.RegisterTopLevelExceptionHandler();
-
     services.AddSingleton<IBinding>(sp => sp.GetRequiredService<IBasicConnectorBinding>());
     services.AddSingleton<IBinding, TeklaSendBinding>();
     services.AddSingleton<IBinding, TeklaSelectionBinding>();
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems
index e9782ec4d..330527ed7 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/Speckle.Connectors.TeklaShared.projitems
@@ -17,13 +17,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\TeklaBasicConnectorBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\TeklaSelectionBinding.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Bindings\TeklaSendBinding.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Events.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\ModelObjectExtension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\SpeckleApplicationIdExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Filters\TeklaSelectionFilter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)GlobalUsing.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\SendCollectionManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\TeklaDocumentModelStore.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HostApp\TeklaIdleManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HostApp\TeklaMaterialUnpacker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\SendRebarsAsSolidSetting.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Operations\Send\Settings\ToSpeckleSettingsManager.cs" />
diff --git a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs
index e957a4d17..3e05ed870 100644
--- a/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs
+++ b/Connectors/Tekla/Speckle.Connector.TeklaShared/SpeckleTeklaPanelHost.cs
@@ -5,6 +5,8 @@
 using System.Windows.Forms.Integration;
 using Microsoft.Extensions.DependencyInjection;
 using Speckle.Connectors.Common;
+using Speckle.Connectors.DUI;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.WebView;
 using Speckle.Converters.TeklaShared;
 using Speckle.Sdk.Host;
@@ -67,8 +69,8 @@ private void InitializeInstance()
   {
     s_instance = this; // Assign the current instance to the static field
 
-    this.Text = "Speckle (Beta)";
-    this.Name = "Speckle (Beta)";
+    Text = "Speckle (Beta)";
+    Name = "Speckle (Beta)";
 
     string assemblyName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
     string resourcePath = $"{assemblyName}.Resources.et_element_Speckle.bmp";
@@ -80,7 +82,7 @@ private void InitializeInstance()
       }
 
       using var bmp = new Bitmap(stream);
-      this.Icon = Icon.FromHandle(bmp.GetHicon());
+      Icon = Icon.FromHandle(bmp.GetHicon());
     }
 
     var services = new ServiceCollection();
@@ -89,6 +91,8 @@ private void InitializeInstance()
     services.AddTeklaConverters();
 
     Container = services.BuildServiceProvider();
+    TeklaEvents.Register(Container.GetRequiredService<Events>(), Container.GetRequiredService<IEventAggregator>());
+    Container.UseDUI();
 
     Model = new Model();
     if (!Model.GetConnectionStatus())
@@ -106,7 +110,7 @@ private void InitializeInstance()
     Controls.Add(Host);
     Operation.DisplayPrompt("Speckle connector initialized.");
 
-    this.TopLevel = true;
+    TopLevel = true;
     SetWindowLongPtr(Handle, GWL_HWNDPARENT, MainWindow.Frame.Handle);
     Show();
     Activate();
diff --git a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json
index 0d425bf72..35bb6a83e 100644
--- a/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json
+++ b/Converters/ArcGIS/Speckle.Converters.ArcGIS3/packages.lock.json
@@ -160,11 +160,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -224,7 +219,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -245,37 +240,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json
index 1bb82d001..8a25c8424 100644
--- a/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json
+++ b/Converters/Autocad/Speckle.Converters.Autocad2022/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
index 38e839500..33be69c89 100644
--- a/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
+++ b/Converters/Autocad/Speckle.Converters.Autocad2023/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json
index 9c9879c19..74598178c 100644
--- a/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json
+++ b/Converters/Autocad/Speckle.Converters.Autocad2024/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -292,7 +287,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -328,37 +323,43 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json
index 24f36c22a..996e7d915 100644
--- a/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json
+++ b/Converters/Autocad/Speckle.Converters.Autocad2025/packages.lock.json
@@ -155,11 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -220,9 +215,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -230,8 +225,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -248,7 +243,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -284,36 +279,42 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/CsiWrappers.cs b/Converters/CSi/Speckle.Converters.CSiShared/CsiWrappers.cs
index 63d01448a..ab5b02da0 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/CsiWrappers.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/CsiWrappers.cs
@@ -1,9 +1,11 @@
+using Speckle.Converters.CSiShared.Utils;
+
 namespace Speckle.Converters.CSiShared;
 
 public interface ICsiWrapper
 {
   string Name { get; set; }
-  int ObjectType { get; }
+  ModelObjectType ObjectType { get; }
   string ObjectName { get; }
 }
 
@@ -18,50 +20,50 @@ public interface ICsiWrapper
 public abstract class CsiWrapperBase : ICsiWrapper
 {
   public required string Name { get; set; }
-  public abstract int ObjectType { get; }
+  public abstract ModelObjectType ObjectType { get; }
   public abstract string ObjectName { get; }
 }
 
 public class CsiJointWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 1;
-  public override string ObjectName => "Joint";
+  public override ModelObjectType ObjectType => ModelObjectType.JOINT;
+  public override string ObjectName => ModelObjectType.JOINT.ToString();
 }
 
 public class CsiFrameWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 2;
-  public override string ObjectName => "Frame";
+  public override ModelObjectType ObjectType => ModelObjectType.FRAME;
+  public override string ObjectName => ModelObjectType.FRAME.ToString();
 }
 
 public class CsiCableWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 3;
-  public override string ObjectName => "Cable";
+  public override ModelObjectType ObjectType => ModelObjectType.CABLE;
+  public override string ObjectName => ModelObjectType.CABLE.ToString();
 }
 
 public class CsiTendonWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 4;
-  public override string ObjectName => "Tendon";
+  public override ModelObjectType ObjectType => ModelObjectType.TENDON;
+  public override string ObjectName => ModelObjectType.TENDON.ToString();
 }
 
 public class CsiShellWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 5;
-  public override string ObjectName => "Shell";
+  public override ModelObjectType ObjectType => ModelObjectType.SHELL;
+  public override string ObjectName => ModelObjectType.SHELL.ToString();
 }
 
 public class CsiSolidWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 6;
-  public override string ObjectName => "Solid";
+  public override ModelObjectType ObjectType => ModelObjectType.SOLID;
+  public override string ObjectName => ModelObjectType.SOLID.ToString();
 }
 
 public class CsiLinkWrapper : CsiWrapperBase
 {
-  public override int ObjectType => 7;
-  public override string ObjectName => "Link";
+  public override ModelObjectType ObjectType => ModelObjectType.LINK;
+  public override string ObjectName => ModelObjectType.LINK.ToString();
 }
 
 /// <summary>
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ServiceRegistration.cs b/Converters/CSi/Speckle.Converters.CSiShared/ServiceRegistration.cs
index 5928293d7..6444e7a93 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/ServiceRegistration.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ServiceRegistration.cs
@@ -23,6 +23,9 @@ public static IServiceCollection AddCsiConverters(this IServiceCollection servic
     serviceCollection.AddScoped<SharedPropertiesExtractor>();
     serviceCollection.AddScoped<DisplayValueExtractor>();
 
+    // Register connector caches
+    serviceCollection.AddScoped<CsiToSpeckleCacheSingleton>();
+
     // Settings and unit conversions
     serviceCollection.AddApplicationConverters<CsiToSpeckleUnitConverter, eUnits>(converterAssembly);
     serviceCollection.AddScoped<
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/Speckle.Converters.CSiShared.projitems b/Converters/CSi/Speckle.Converters.CSiShared/Speckle.Converters.CSiShared.projitems
index 7d59d119a..0e921da4e 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/Speckle.Converters.CSiShared.projitems
+++ b/Converters/CSi/Speckle.Converters.CSiShared/Speckle.Converters.CSiShared.projitems
@@ -20,6 +20,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\CsiFramePropertiesExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\CsiJointPropertiesExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\CsiShellPropertiesExtractor.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\CsiToSpeckleCacheSingleton.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\LineToSpeckleConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\MeshToSpeckleConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Raw\PointToSpeckleConverter.cs" />
@@ -27,6 +28,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\DisplayValueExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\Helpers\IApplicationPropertiesExtractor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ToSpeckle\TopLevel\CsiObjectToSpeckleConverterBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Utils\DictionaryUtils.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utils\Constants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utils\DictionaryExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Utils\Enums.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiFramePropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiFramePropertiesExtractor.cs
index 63be4e657..6e6354663 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiFramePropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiFramePropertiesExtractor.cs
@@ -21,18 +21,25 @@ namespace Speckle.Converters.CSiShared.ToSpeckle.Helpers;
 public sealed class CsiFramePropertiesExtractor
 {
   private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+
+  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
+
   private static readonly string[] s_releaseKeys =
   [
-    "axial",
-    "minorShear",
-    "majorShear",
-    "torsion",
-    "minorBending",
-    "majorBending"
+    "Axial",
+    "Shear 2 (Major)",
+    "Shear 3 (Minor)",
+    "Torsion",
+    "Moment 22 (Minor)",
+    "Moment 33 (Major)"
   ]; // Note: caching keys for better performance
 
-  public CsiFramePropertiesExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  public CsiFramePropertiesExtractor(
+    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton,
+    IConverterSettingsStore<CsiConversionSettings> settingsStore
+  )
   {
+    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
     _settingsStore = settingsStore;
   }
 
@@ -40,17 +47,52 @@ public void ExtractProperties(CsiFrameWrapper frame, PropertyExtractionResult fr
   {
     frameData.ApplicationId = frame.GetSpeckleApplicationId(_settingsStore.Current.SapModel);
 
-    var geometry = DictionaryUtils.EnsureNestedDictionary(frameData.Properties, "Geometry");
-    (geometry["startJointName"], geometry["endJointName"]) = GetEndPointNames(frame);
-
-    var assignments = DictionaryUtils.EnsureNestedDictionary(frameData.Properties, "Assignments");
-    assignments["groups"] = new List<string>(GetGroupAssigns(frame));
-    assignments["materialOverwrite"] = GetMaterialOverwrite(frame);
-    assignments["localAxis"] = GetLocalAxes(frame);
-    assignments["propertyModifiers"] = GetModifiers(frame);
-    assignments["endReleases"] = GetReleases(frame);
-    assignments["sectionProperty"] = GetSectionName(frame);
-    assignments["path"] = GetPathType(frame);
+    var geometry = frameData.Properties.EnsureNested(ObjectPropertyCategory.GEOMETRY);
+    (geometry["I-End Joint"], geometry["J-End Joint"]) = GetEndPointNames(frame);
+
+    var assignments = frameData.Properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    assignments[CommonObjectProperty.GROUPS] = GetGroupAssigns(frame);
+    assignments[CommonObjectProperty.MATERIAL_OVERWRITE] = GetMaterialOverwrite(frame);
+    assignments[CommonObjectProperty.LOCAL_AXIS_2_ANGLE] = GetLocalAxes(frame);
+    assignments[CommonObjectProperty.PROPERTY_MODIFIERS] = GetModifiers(frame);
+    assignments["End Releases"] = GetReleases(frame);
+
+    // NOTE: sectionId and materialId a "quick-fix" to enable filtering in the viewer etc.
+    // Assign sectionId to variable as this will be an argument for the GetMaterialName method
+    string sectionId = GetSectionName(frame);
+    string materialId = GetMaterialName(sectionId);
+    assignments[ObjectPropertyKey.SECTION_ID] = sectionId;
+    assignments[ObjectPropertyKey.MATERIAL_ID] = materialId;
+
+    // store the object, section, and material id relationships in their corresponding caches to be accessed by the connector
+    if (!string.IsNullOrEmpty(sectionId))
+    {
+      if (_csiToSpeckleCacheSingleton.FrameSectionCache.TryGetValue(sectionId, out List<string>? frameIds))
+      {
+        frameIds.Add(frameData.ApplicationId);
+      }
+      else
+      {
+        _csiToSpeckleCacheSingleton.FrameSectionCache.Add(sectionId, [frameData.ApplicationId]);
+      }
+
+      if (!string.IsNullOrEmpty(materialId))
+      {
+        if (_csiToSpeckleCacheSingleton.MaterialCache.TryGetValue(materialId, out List<string>? sectionIds))
+        {
+          // Since this is happening on the object level, we could be processing the same sectionIds (from different
+          // objects) many times. This is not necessary since we just want a set of sectionId corresponding to material
+          if (!sectionIds.Contains(sectionId))
+          {
+            sectionIds.Add(sectionId);
+          }
+        }
+        else
+        {
+          _csiToSpeckleCacheSingleton.MaterialCache.Add(materialId, [sectionId]);
+        }
+      }
+    }
   }
 
   private string[] GetGroupAssigns(CsiFrameWrapper frame)
@@ -66,30 +108,35 @@ private string[] GetGroupAssigns(CsiFrameWrapper frame)
     double angle = 0;
     bool advanced = false;
     _ = _settingsStore.Current.SapModel.FrameObj.GetLocalAxes(frame.Name, ref angle, ref advanced);
-    return new Dictionary<string, object?> { ["angle"] = angle, ["advanced"] = advanced.ToString() };
+
+    Dictionary<string, object?> resultsDictionary = [];
+    resultsDictionary.AddWithUnits(CommonObjectProperty.ANGLE, angle, "Degrees");
+    resultsDictionary[CommonObjectProperty.ADVANCED] = advanced.ToString();
+
+    return resultsDictionary;
   }
 
   private string GetMaterialOverwrite(CsiFrameWrapper frame)
   {
-    string propName = "None";
+    string propName = string.Empty;
     _ = _settingsStore.Current.SapModel.FrameObj.GetMaterialOverwrite(frame.Name, ref propName);
     return propName;
   }
 
   private Dictionary<string, double?> GetModifiers(CsiFrameWrapper frame)
   {
-    double[] value = Array.Empty<double>();
+    double[] value = [];
     _ = _settingsStore.Current.SapModel.FrameObj.GetModifiers(frame.Name, ref value);
     return new Dictionary<string, double?>
     {
-      ["crossSectionalAreaModifier"] = value[0],
-      ["shearAreaInLocal2DirectionModifier"] = value[1],
-      ["shearAreaInLocal3DirectionModifier"] = value[2],
-      ["torsionalConstantModifier"] = value[3],
-      ["momentOfInertiaAboutLocal2AxisModifier"] = value[4],
-      ["momentOfInertiaAboutLocal3AxisModifier"] = value[5],
-      ["massModifier"] = value[6],
-      ["weightModifier"] = value[7]
+      ["Area"] = value[0],
+      ["As2"] = value[1],
+      ["As3"] = value[2],
+      ["Torsion"] = value[3],
+      ["I22"] = value[4],
+      ["I33"] = value[5],
+      ["Mass"] = value[6],
+      ["Weight"] = value[7]
     };
   }
 
@@ -103,35 +150,31 @@ private string GetMaterialOverwrite(CsiFrameWrapper frame)
 
   private Dictionary<string, object?> GetReleases(CsiFrameWrapper frame)
   {
-    bool[] ii = Array.Empty<bool>(),
-      jj = Array.Empty<bool>();
-    double[] startValue = Array.Empty<double>(),
-      endValue = Array.Empty<double>();
+    bool[] ii = [],
+      jj = [];
+    double[] startValue = [],
+      endValue = [];
 
     _ = _settingsStore.Current.SapModel.FrameObj.GetReleases(frame.Name, ref ii, ref jj, ref startValue, ref endValue);
 
-    var startNodes = s_releaseKeys
-      .Select(
-        (key, index) =>
-          new KeyValuePair<string, object?>(
-            $"{key}StartNode",
-            new Dictionary<string, object?> { ["release"] = ii[index], ["stiffness"] = startValue[index] }
-          )
-      )
-      .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
+    return new Dictionary<string, object?>
+    {
+      ["End-I"] = CreateNodeReleases(ii, startValue),
+      ["End-J"] = CreateNodeReleases(jj, endValue),
+    };
+  }
 
-    var endNodes = s_releaseKeys
+  // NOTE: Avoid duplicate dictionary creation logic for End-I and End-J in GetReleases() method
+  private static Dictionary<string, object?> CreateNodeReleases(bool[] releases, double[] values) =>
+    s_releaseKeys
       .Select(
-        (key, index) =>
-          new KeyValuePair<string, object?>(
-            $"{key}EndNode",
-            new Dictionary<string, object?> { ["release"] = jj[index], ["stiffness"] = endValue[index] }
+        (key, i) => // for each key, we want both the key (string) and index
+          new KeyValuePair<string, object?>( // for each key, create dictionary with Release and Stiffness
+            key,
+            new Dictionary<string, object?> { ["Release"] = releases[i], ["Stiffness"] = values[i] }
           )
       )
-      .ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-
-    return startNodes.Concat(endNodes).ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-  }
+      .ToDictionary(x => x.Key, x => x.Value);
 
   private string GetSectionName(CsiFrameWrapper frame)
   {
@@ -141,10 +184,12 @@ private string GetSectionName(CsiFrameWrapper frame)
     return sectionName;
   }
 
-  private string GetPathType(CsiFrameWrapper frame)
+  // NOTE: This is a little convoluted as we aren't on the cFrameObj level, but one deeper.
+  // As noted in ExtractProperties, this is just a quick-fix to get some displayable materialId parameter
+  private string GetMaterialName(string sectionName)
   {
-    string pathType = string.Empty;
-    _ = _settingsStore.Current.SapModel.FrameObj.GetTypeOAPI(frame.Name, ref pathType);
-    return pathType;
+    string materialName = string.Empty;
+    _ = _settingsStore.Current.SapModel.PropFrame.GetMaterial(sectionName, ref materialName);
+    return materialName;
   }
 }
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiJointPropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiJointPropertiesExtractor.cs
index 5b3baf53c..d1c7bc4c5 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiJointPropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiJointPropertiesExtractor.cs
@@ -34,9 +34,9 @@ public void ExtractProperties(CsiJointWrapper joint, PropertyExtractionResult jo
   {
     jointData.ApplicationId = joint.GetSpeckleApplicationId(_settingsStore.Current.SapModel);
 
-    var assignments = DictionaryUtils.EnsureNestedDictionary(jointData.Properties, "Assignments");
-    assignments["groups"] = new List<string>(GetGroupAssigns(joint));
-    assignments["restraints"] = GetRestraints(joint);
+    var assignments = jointData.Properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    assignments[CommonObjectProperty.GROUPS] = new List<string>(GetGroupAssigns(joint));
+    assignments["Restraints"] = GetRestraints(joint);
   }
 
   private string[] GetGroupAssigns(CsiJointWrapper joint)
@@ -49,16 +49,16 @@ private string[] GetGroupAssigns(CsiJointWrapper joint)
 
   private Dictionary<string, bool?> GetRestraints(CsiJointWrapper joint)
   {
-    bool[] restraints = Array.Empty<bool>();
+    bool[] restraints = [];
     _ = _settingsStore.Current.SapModel.PointObj.GetRestraint(joint.Name, ref restraints);
     return new Dictionary<string, bool?>
     {
-      ["U1"] = restraints[0],
-      ["U2"] = restraints[1],
-      ["U3"] = restraints[2],
-      ["R1"] = restraints[3],
-      ["R2"] = restraints[4],
-      ["R3"] = restraints[5],
+      ["UX Restrained"] = restraints[0],
+      ["UY Restrained"] = restraints[1],
+      ["UZ Restrained"] = restraints[2],
+      ["RX Restrained"] = restraints[3],
+      ["RY Restrained"] = restraints[4],
+      ["RZ Restrained"] = restraints[5],
     };
   }
 }
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiShellPropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiShellPropertiesExtractor.cs
index 1e5310e97..3e7411b0e 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiShellPropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiShellPropertiesExtractor.cs
@@ -31,15 +31,14 @@ public void ExtractProperties(CsiShellWrapper shell, PropertyExtractionResult sh
   {
     shellData.ApplicationId = shell.GetSpeckleApplicationId(_settingsStore.Current.SapModel);
 
-    var geometry = DictionaryUtils.EnsureNestedDictionary(shellData.Properties, "Geometry");
-    geometry["shellVerticesJointNames"] = GetPointNames(shell);
+    var geometry = shellData.Properties.EnsureNested(ObjectPropertyCategory.GEOMETRY);
+    geometry["Joints"] = GetPointNames(shell); // TODO: 🪲 Viewer shows 4 but only displays 3
 
-    var assignments = DictionaryUtils.EnsureNestedDictionary(shellData.Properties, "Assignments");
-    assignments["groups"] = new List<string>(GetGroupAssigns(shell));
-    assignments["localAxis"] = GetLocalAxes(shell);
-    assignments["materialOverwrite"] = GetMaterialOverwrite(shell);
-    assignments["propertyModifiers"] = GetModifiers(shell);
-    assignments["sectionProperty"] = GetSectionName(shell);
+    var assignments = shellData.Properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    assignments[CommonObjectProperty.GROUPS] = GetGroupAssigns(shell);
+    assignments[CommonObjectProperty.LOCAL_AXIS_2_ANGLE] = GetLocalAxes(shell);
+    assignments[CommonObjectProperty.MATERIAL_OVERWRITE] = GetMaterialOverwrite(shell);
+    assignments[CommonObjectProperty.PROPERTY_MODIFIERS] = GetModifiers(shell);
   }
 
   private string[] GetGroupAssigns(CsiShellWrapper shell)
@@ -55,47 +54,45 @@ private string[] GetGroupAssigns(CsiShellWrapper shell)
     double angle = 0;
     bool advanced = false;
     _ = _settingsStore.Current.SapModel.AreaObj.GetLocalAxes(shell.Name, ref angle, ref advanced);
-    return new Dictionary<string, object?> { ["angle"] = angle, ["advanced"] = advanced.ToString() };
+
+    Dictionary<string, object?> resultsDictionary = [];
+    resultsDictionary.AddWithUnits(CommonObjectProperty.ANGLE, angle, "Degrees");
+    resultsDictionary[CommonObjectProperty.ADVANCED] = advanced.ToString();
+
+    return resultsDictionary;
   }
 
   private string GetMaterialOverwrite(CsiShellWrapper shell)
   {
-    string propName = "None";
+    string propName = string.Empty;
     _ = _settingsStore.Current.SapModel.AreaObj.GetMaterialOverwrite(shell.Name, ref propName);
     return propName;
   }
 
   private Dictionary<string, double?> GetModifiers(CsiShellWrapper shell)
   {
-    double[] value = Array.Empty<double>();
+    double[] value = [];
     _ = _settingsStore.Current.SapModel.AreaObj.GetModifiers(shell.Name, ref value);
     return new Dictionary<string, double?>
     {
-      ["membraneF11Modifier"] = value[0],
-      ["membraneF22Modifier"] = value[1],
-      ["membraneF12Modifier"] = value[2],
-      ["bendingM11Modifier"] = value[3],
-      ["bendingM22Modifier"] = value[4],
-      ["bendingM12Modifier"] = value[5],
-      ["shearV13Modifier"] = value[6],
-      ["shearV23Modifier"] = value[7],
-      ["massModifier"] = value[8],
-      ["weightModifier"] = value[9]
+      ["Membrane F11 Modifier"] = value[0],
+      ["Membrane F22 Modifier"] = value[1],
+      ["Membrane F12 Modifier"] = value[2],
+      ["Bending M11 Modifier"] = value[3],
+      ["Bending M22 Modifier"] = value[4],
+      ["Bending M12 Modifier"] = value[5],
+      ["Shear V13 Modifier"] = value[6],
+      ["Shear V23 Modifier"] = value[7],
+      ["Mass"] = value[8],
+      ["Weight"] = value[9]
     };
   }
 
   private string[] GetPointNames(CsiShellWrapper shell)
   {
     int numberPoints = 0;
-    string[] pointNames = Array.Empty<string>();
+    string[] pointNames = [];
     _ = _settingsStore.Current.SapModel.AreaObj.GetPoints(shell.Name, ref numberPoints, ref pointNames);
     return pointNames;
   }
-
-  private string GetSectionName(CsiShellWrapper shell)
-  {
-    string sectionName = string.Empty;
-    _ = _settingsStore.Current.SapModel.AreaObj.GetProperty(shell.Name, ref sectionName);
-    return sectionName;
-  }
 }
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiToSpeckleCacheSingleton.cs b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiToSpeckleCacheSingleton.cs
new file mode 100644
index 000000000..c192dc39f
--- /dev/null
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/CsiToSpeckleCacheSingleton.cs
@@ -0,0 +1,19 @@
+namespace Speckle.Converters.CSiShared.ToSpeckle.Helpers;
+
+public class CsiToSpeckleCacheSingleton
+{
+  /// <summary>
+  /// A map of (material id, section ids). Assumes the material id is the unique name of the material
+  /// </summary>
+  public Dictionary<string, List<string>> MaterialCache { get; set; } = new();
+
+  /// <summary>
+  /// A map of (section id, frame object id). Assumes the section id is the unique name of the section
+  /// </summary>
+  public Dictionary<string, List<string>> FrameSectionCache { get; set; } = new();
+
+  /// <summary>
+  /// A map of (section id, shell object id). Assumes the section id is the unique name of the section
+  /// </summary>
+  public Dictionary<string, List<string>> ShellSectionCache { get; set; } = new();
+}
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/IApplicationPropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/IApplicationPropertiesExtractor.cs
index 51e7524f3..1dbb03e2e 100644
--- a/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/IApplicationPropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.CSiShared/ToSpeckle/Helpers/IApplicationPropertiesExtractor.cs
@@ -1,6 +1,6 @@
 namespace Speckle.Converters.CSiShared.ToSpeckle.Helpers;
 
-public struct PropertyExtractionResult
+public class PropertyExtractionResult
 {
   public string Name { get; set; }
   public string Type { get; set; }
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/Utils/Constants.cs b/Converters/CSi/Speckle.Converters.CSiShared/Utils/Constants.cs
new file mode 100644
index 000000000..49995873a
--- /dev/null
+++ b/Converters/CSi/Speckle.Converters.CSiShared/Utils/Constants.cs
@@ -0,0 +1,54 @@
+namespace Speckle.Converters.CSiShared.Utils;
+
+// NOTE: Space for string consts used across multiple files and in multiple contexts
+// Separate onto dedicated files if this gets too long
+
+/// <summary>
+/// These categories mirror the UI. Nested within the properties are the repeated categories
+/// This happens across frame, shell and joint objects.
+/// The consts formalise the assignable property categories and reduce typos.
+/// </summary>
+public static class ObjectPropertyCategory
+{
+  public const string ASSIGNMENTS = "Assignments";
+  public const string DESIGN = "Design";
+  public const string GEOMETRY = "Geometry";
+  public const string OBJECT_ID = "Object ID";
+}
+
+/// <summary>
+/// These strings are repeatedly used as keys when building the properties dictionary for objects
+/// </summary>
+public static class ObjectPropertyKey
+{
+  public const string MATERIAL_ID = "Material";
+  public const string SECTION_ID = "Section Property";
+}
+
+/// <summary>
+/// These strings are repeatedly used group properties (mimics the host app UI)
+/// </summary>
+public static class SectionPropertyCategory
+{
+  public const string GENERAL_DATA = "General Data";
+  public const string SECTION_PROPERTIES = "Section Properties";
+  public const string SECTION_DIMENSIONS = "Section Dimensions";
+  public const string PROPERTY_DATA = "Property Data";
+}
+
+/// <summary>
+/// These strings are properties repeated and common to various object types (joint, frame, shell etc.)
+/// </summary>
+public static class CommonObjectProperty
+{
+  public const string LABEL = "Label";
+  public const string LEVEL = "Level";
+  public const string GROUPS = "Groups";
+  public const string SPRING_ASSIGNMENT = "Spring Assignment";
+  public const string LOCAL_AXIS_2_ANGLE = "Local Axis 2 Angle";
+  public const string MATERIAL_OVERWRITE = "Material Overwrite";
+  public const string PROPERTY_MODIFIERS = "Property Modifiers";
+  public const string ANGLE = "Angle";
+  public const string ADVANCED = "Advanced";
+  public const string DESIGN_ORIENTATION = "Design Orientation";
+}
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryExtensions.cs b/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryExtensions.cs
new file mode 100644
index 000000000..bf936b519
--- /dev/null
+++ b/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryExtensions.cs
@@ -0,0 +1,42 @@
+namespace Speckle.Converters.CSiShared.Utils;
+
+/// <summary>
+/// Provides extension methods for dictionary operations common across the CSI converter.
+/// </summary>
+public static class DictionaryExtensions
+{
+  /// <summary>
+  /// Ensures a nested dictionary exists at the specified key, creating it if necessary.
+  /// Used for organizing properties into hierarchical categories (e.g., "Geometry", "Assignments", "Design").
+  /// </summary>
+  /// <remarks>
+  /// This pattern is used throughout property extractors to maintain consistent property organization.
+  /// </remarks>
+  public static Dictionary<string, object?> EnsureNested(this Dictionary<string, object?> dictionary, string key)
+  {
+    if (!dictionary.TryGetValue(key, out var obj) || obj is not Dictionary<string, object?> nestedDictionary)
+    {
+      nestedDictionary = [];
+      dictionary[key] = nestedDictionary;
+    }
+
+    return nestedDictionary;
+  }
+
+  /// <summary>
+  /// Adds a value with its associated units to a parent dictionary using a standardized format.
+  /// Creates a nested dictionary with 'name', 'value', and 'units' keys.
+  /// </summary>
+  public static void AddWithUnits(
+    this Dictionary<string, object?> dictionary,
+    string key,
+    object value,
+    string? units = null
+  ) =>
+    dictionary[key] = new Dictionary<string, object?>
+    {
+      ["name"] = key,
+      ["value"] = value,
+      ["units"] = units
+    };
+}
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryUtils.cs b/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryUtils.cs
deleted file mode 100644
index 257e7e5dd..000000000
--- a/Converters/CSi/Speckle.Converters.CSiShared/Utils/DictionaryUtils.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace Speckle.Converters.CSiShared.Utils;
-
-/// <summary>
-/// Provides utility methods for dictionary operations common across the CSI converter.
-/// </summary>
-public static class DictionaryUtils
-{
-  /// <summary>
-  /// Ensures a nested dictionary exists at the specified key, creating it if necessary.
-  /// Used for organizing properties into hierarchical categories (e.g., "Geometry", "Assignments", "Design").
-  /// </summary>
-  /// <param name="dictionary">The parent dictionary to check or modify</param>
-  /// <param name="key">The key where the nested dictionary should exist</param>
-  /// <returns>
-  /// The existing nested dictionary if present, or a new empty dictionary after adding it to the parent
-  /// </returns>
-  /// <remarks>
-  /// Common usage:
-  /// <code>
-  /// var geometry = DictionaryUtils.EnsureNestedDictionary(properties, "Geometry");
-  /// geometry["startPoint"] = startPoint;
-  /// geometry["endPoint"] = endPoint;
-  /// </code>
-  /// This pattern is used throughout property extractors to maintain consistent property organization.
-  /// </remarks>
-  public static Dictionary<string, object?> EnsureNestedDictionary(Dictionary<string, object?> dictionary, string key)
-  {
-    if (!dictionary.TryGetValue(key, out var obj) || obj is not Dictionary<string, object?> nestedDictionary)
-    {
-      nestedDictionary = new Dictionary<string, object?>();
-      dictionary[key] = nestedDictionary;
-    }
-
-    return nestedDictionary;
-  }
-}
diff --git a/Converters/CSi/Speckle.Converters.CSiShared/Utils/Enums.cs b/Converters/CSi/Speckle.Converters.CSiShared/Utils/Enums.cs
new file mode 100644
index 000000000..78e36e495
--- /dev/null
+++ b/Converters/CSi/Speckle.Converters.CSiShared/Utils/Enums.cs
@@ -0,0 +1,42 @@
+namespace Speckle.Converters.CSiShared.Utils;
+
+// NOTE: Should number of enums become too large -> dedicated files.
+public enum ModelObjectType
+{
+  NONE = 0,
+  JOINT = 1,
+  FRAME = 2,
+  CABLE = 3,
+  TENDON = 4,
+  SHELL = 5,
+  SOLID = 6,
+  LINK = 7
+}
+
+public enum ElementCategory
+{
+  COLUMN,
+  BEAM,
+  BRACE,
+  WALL,
+  FLOOR,
+  RAMP,
+  JOINT,
+  OTHER
+}
+
+public enum DirectionalSymmetryType
+{
+  ISOTROPIC,
+  ORTHOTROPIC,
+  ANISOTROPIC,
+  UNIAXIAL
+}
+
+public enum AreaPropertyType
+{
+  NONE = 0,
+  SHELL = 1,
+  PLANE = 2,
+  ASOLID = 3
+}
diff --git a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json
index 817d3dbbd..870cef532 100644
--- a/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json
+++ b/Converters/CSi/Speckle.Converters.ETABS21/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json
index fbf0014f1..cac6de1b0 100644
--- a/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json
+++ b/Converters/CSi/Speckle.Converters.ETABS22/packages.lock.json
@@ -155,11 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -219,7 +214,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -240,36 +235,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsFramePropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsFramePropertiesExtractor.cs
index e7aa57f56..d1b452529 100644
--- a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsFramePropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsFramePropertiesExtractor.cs
@@ -33,15 +33,15 @@ public EtabsFramePropertiesExtractor(IConverterSettingsStore<CsiConversionSettin
 
   public void ExtractProperties(CsiFrameWrapper frame, Dictionary<string, object?> properties)
   {
-    var objectId = DictionaryUtils.EnsureNestedDictionary(properties, "Object ID");
-    objectId["designOrientation"] = GetDesignOrientation(frame);
-    (objectId["label"], objectId["level"]) = GetLabelAndLevel(frame);
+    var objectId = properties.EnsureNested(ObjectPropertyCategory.OBJECT_ID);
+    objectId[CommonObjectProperty.DESIGN_ORIENTATION] = GetDesignOrientation(frame);
+    (objectId[CommonObjectProperty.LABEL], objectId[CommonObjectProperty.LEVEL]) = GetLabelAndLevel(frame);
 
-    var assignments = DictionaryUtils.EnsureNestedDictionary(properties, "Assignments");
-    assignments["springAssignment"] = GetSpringAssignmentName(frame);
+    var assignments = properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    assignments[CommonObjectProperty.SPRING_ASSIGNMENT] = GetSpringAssignmentName(frame);
 
-    var design = DictionaryUtils.EnsureNestedDictionary(properties, "Design");
-    design["designProcedure"] = GetDesignProcedure(frame);
+    var design = properties.EnsureNested(ObjectPropertyCategory.DESIGN);
+    design["Design Procedure"] = GetDesignProcedure(frame);
   }
 
   private (string label, string level) GetLabelAndLevel(CsiFrameWrapper frame)
@@ -77,7 +77,7 @@ private string GetDesignProcedure(CsiFrameWrapper frame)
 
   private string GetSpringAssignmentName(CsiFrameWrapper frame)
   {
-    string springPropertyName = "None"; // Is there a better way to handle null?
+    string springPropertyName = string.Empty;
     _ = _settingsStore.Current.SapModel.FrameObj.GetSpringAssignment(frame.Name, ref springPropertyName);
     return springPropertyName;
   }
diff --git a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsJointPropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsJointPropertiesExtractor.cs
index 9709ae653..55414ec0a 100644
--- a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsJointPropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsJointPropertiesExtractor.cs
@@ -33,18 +33,18 @@ public EtabsJointPropertiesExtractor(IConverterSettingsStore<CsiConversionSettin
 
   public void ExtractProperties(CsiJointWrapper joint, Dictionary<string, object?> properties)
   {
-    var objectId = DictionaryUtils.EnsureNestedDictionary(properties, "Object ID");
-    (objectId["label"], objectId["level"]) = GetLabelAndLevel(joint);
+    var objectId = properties.EnsureNested(ObjectPropertyCategory.OBJECT_ID);
+    (objectId[CommonObjectProperty.LABEL], objectId[CommonObjectProperty.LEVEL]) = GetLabelAndLevel(joint);
 
-    var assignments = DictionaryUtils.EnsureNestedDictionary(properties, "Assignments");
-    (assignments["diaphragmOption"], assignments["diaphragmName"]) = GetAssignedDiaphragm(joint);
-    assignments["springAssignment"] = GetSpringAssignmentName(joint);
+    var assignments = properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    (assignments["Diaphragm Option"], assignments["Diaphragm Name"]) = GetAssignedDiaphragm(joint);
+    assignments[CommonObjectProperty.SPRING_ASSIGNMENT] = GetSpringAssignmentName(joint);
   }
 
   private (string diaphramOption, string diaphragmName) GetAssignedDiaphragm(CsiJointWrapper joint)
   {
     eDiaphragmOption diaphragmOption = eDiaphragmOption.Disconnect;
-    string diaphragmName = "None"; // Is there a better way to handle null?
+    string diaphragmName = string.Empty;
     _ = _settingsStore.Current.SapModel.PointObj.GetDiaphragm(joint.Name, ref diaphragmOption, ref diaphragmName);
     return (diaphragmOption.ToString(), diaphragmName);
   }
@@ -59,7 +59,7 @@ public void ExtractProperties(CsiJointWrapper joint, Dictionary<string, object?>
 
   private string GetSpringAssignmentName(CsiJointWrapper joint)
   {
-    string springPropertyName = "None"; // Is there a better way to handle null?
+    string springPropertyName = string.Empty;
     _ = _settingsStore.Current.SapModel.PointObj.GetSpringAssignment(joint.Name, ref springPropertyName);
     return springPropertyName;
   }
diff --git a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsShellPropertiesExtractor.cs b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsShellPropertiesExtractor.cs
index 638b3fb7c..6bb53f528 100644
--- a/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsShellPropertiesExtractor.cs
+++ b/Converters/CSi/Speckle.Converters.ETABSShared/ToSpeckle/Helpers/EtabsShellPropertiesExtractor.cs
@@ -1,5 +1,7 @@
+using System.Collections.Concurrent;
 using Speckle.Converters.Common;
 using Speckle.Converters.CSiShared;
+using Speckle.Converters.CSiShared.Extensions;
 using Speckle.Converters.CSiShared.ToSpeckle.Helpers;
 using Speckle.Converters.CSiShared.Utils;
 
@@ -25,24 +27,69 @@ namespace Speckle.Converters.ETABSShared.ToSpeckle.Helpers;
 public sealed class EtabsShellPropertiesExtractor
 {
   private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+  private readonly MaterialNameLookup _materialNameLookup;
+  private readonly CsiToSpeckleCacheSingleton _csiToSpeckleCacheSingleton;
 
-  public EtabsShellPropertiesExtractor(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+  public EtabsShellPropertiesExtractor(
+    CsiToSpeckleCacheSingleton csiToSpeckleCacheSingleton,
+    IConverterSettingsStore<CsiConversionSettings> settingsStore
+  )
   {
     _settingsStore = settingsStore;
+    _materialNameLookup = new MaterialNameLookup(settingsStore);
+    _csiToSpeckleCacheSingleton = csiToSpeckleCacheSingleton;
   }
 
   public void ExtractProperties(CsiShellWrapper shell, Dictionary<string, object?> properties)
   {
-    var objectId = DictionaryUtils.EnsureNestedDictionary(properties, "Object ID");
-    objectId["designOrientation"] = GetDesignOrientation(shell);
-    (objectId["label"], objectId["level"]) = GetLabelAndLevel(shell);
-
-    var assignments = DictionaryUtils.EnsureNestedDictionary(properties, "Assignments");
-    assignments["diaphragmName"] = GetAssignedDiaphragmName(shell);
-    assignments["isOpening"] = IsOpening(shell);
-    assignments["pierAssignment"] = GetPierAssignmentName(shell);
-    assignments["spandrelAssignment"] = GetSpandrelAssignmentName(shell);
-    assignments["springAssignmentName"] = GetSpringAssignmentName(shell);
+    var objectId = properties.EnsureNested(ObjectPropertyCategory.OBJECT_ID);
+    objectId[CommonObjectProperty.DESIGN_ORIENTATION] = GetDesignOrientation(shell);
+    (objectId[CommonObjectProperty.LABEL], objectId[CommonObjectProperty.LEVEL]) = GetLabelAndLevel(shell);
+
+    var assignments = properties.EnsureNested(ObjectPropertyCategory.ASSIGNMENTS);
+    assignments["Diaphragm"] = GetAssignedDiaphragmName(shell);
+    assignments["Opening"] = IsOpening(shell);
+    assignments["Pier"] = GetPierAssignmentName(shell);
+    assignments["Spandrel"] = GetSpandrelAssignmentName(shell);
+    assignments[CommonObjectProperty.SPRING_ASSIGNMENT] = GetSpringAssignmentName(shell);
+
+    // NOTE: Section Property and Material are a "quick-fix" to enable filtering in the viewer etc.
+    // Assign Section Property to variable as this will be an argument for the GetMaterialName method
+    string shellAppId = shell.GetSpeckleApplicationId(_settingsStore.Current.SapModel);
+    string sectionId = GetSectionName(shell);
+    string materialId = _materialNameLookup.GetMaterialForSection(sectionId);
+    assignments[ObjectPropertyKey.SECTION_ID] = sectionId;
+    assignments[ObjectPropertyKey.MATERIAL_ID] = materialId;
+
+    // store the object, section, and material id relationships in their corresponding caches to be accessed by the connector
+    if (!string.IsNullOrEmpty(sectionId))
+    {
+      if (_csiToSpeckleCacheSingleton.ShellSectionCache.TryGetValue(sectionId, out List<string>? shellIds))
+      {
+        shellIds.Add(shellAppId);
+      }
+      else
+      {
+        _csiToSpeckleCacheSingleton.ShellSectionCache.Add(sectionId, new List<string>() { shellAppId });
+      }
+
+      if (!string.IsNullOrEmpty(materialId))
+      {
+        if (_csiToSpeckleCacheSingleton.MaterialCache.TryGetValue(materialId, out List<string>? sectionIds))
+        {
+          // Since this is happening on the object level, we could be processing the same sectionIds (from different
+          // objects) many times. This is not necessary since we just want a set of sectionId corresponding to material
+          if (!sectionIds.Contains(sectionId))
+          {
+            sectionIds.Add(sectionId);
+          }
+        }
+        else
+        {
+          _csiToSpeckleCacheSingleton.MaterialCache.Add(materialId, new List<string>() { sectionId });
+        }
+      }
+    }
   }
 
   private (string label, string level) GetLabelAndLevel(CsiShellWrapper shell)
@@ -62,7 +109,7 @@ private string GetDesignOrientation(CsiShellWrapper shell)
 
   private string GetAssignedDiaphragmName(CsiShellWrapper shell)
   {
-    string diaphragmName = "None"; // Is there a better way to handle null?
+    string diaphragmName = string.Empty;
     _ = _settingsStore.Current.SapModel.AreaObj.GetDiaphragm(shell.Name, ref diaphragmName);
     return diaphragmName;
   }
@@ -76,22 +123,99 @@ private string IsOpening(CsiShellWrapper shell)
 
   private string GetPierAssignmentName(CsiShellWrapper shell)
   {
-    string pierAssignment = "None"; // Is there a better way to handle null?
+    string pierAssignment = string.Empty;
     _ = _settingsStore.Current.SapModel.AreaObj.GetPier(shell.Name, ref pierAssignment);
     return pierAssignment;
   }
 
   private string GetSpandrelAssignmentName(CsiShellWrapper shell)
   {
-    string spandrelAssignment = "None"; // Is there a better way to handle null?
+    string spandrelAssignment = string.Empty;
     _ = _settingsStore.Current.SapModel.AreaObj.GetSpandrel(shell.Name, ref spandrelAssignment);
     return spandrelAssignment;
   }
 
   private string GetSpringAssignmentName(CsiShellWrapper shell)
   {
-    string springAssignmentName = "None"; // Is there a better way to handle null?
+    string springAssignmentName = string.Empty;
     _ = _settingsStore.Current.SapModel.AreaObj.GetSpringAssignment(shell.Name, ref springAssignmentName);
     return springAssignmentName;
   }
+
+  // NOTE: Moved from CsiShellPropertiesExtractor because of the materialId issue.
+  // Results of the cDatabaseTable query for "Area Section Property Definitions - Summary" vary between Sap and Etabs
+  private string GetSectionName(CsiShellWrapper shell)
+  {
+    string sectionName = string.Empty;
+    _ = _settingsStore.Current.SapModel.AreaObj.GetProperty(shell.Name, ref sectionName);
+    return sectionName;
+  }
+
+  // TODO: This is a temporary solution until proper DatabaseTables implementation is available.
+  // FrameObj can use the following query: PropFrame.GetMaterial
+  // AreaObj doesn't have a PropArea.GetMaterial method
+  // So, what to do? Simplest solution: query the cDatabaseTable for the summary of area sections
+  // Cache the results as a dictionary where keys are sectionName and values are materialId
+  // Use the cached result to return the material string given a section name
+  // This is a temporary solution! The use of cDatabaseTable are being explored as a way to simplify a lot moving forward
+  private sealed class MaterialNameLookup
+  {
+    private readonly IConverterSettingsStore<CsiConversionSettings> _settingsStore;
+    private readonly ConcurrentDictionary<string, string> _materialLookup = new();
+    private bool _isInitialized;
+
+    public MaterialNameLookup(IConverterSettingsStore<CsiConversionSettings> settingsStore)
+    {
+      _settingsStore = settingsStore;
+    }
+
+    public string GetMaterialForSection(string sectionName)
+    {
+      if (!_isInitialized)
+      {
+        InitializeCache();
+      }
+
+      return _materialLookup.TryGetValue(sectionName, out string? value) ? value : string.Empty;
+    }
+
+    private void InitializeCache()
+    {
+      string[] fieldKeyList = [],
+        fieldKeysIncluded = [],
+        tableData = [];
+      int tableVersion = 0,
+        numberOfRecords = 0;
+
+      int result = _settingsStore.Current.SapModel.DatabaseTables.GetTableForDisplayArray(
+        "Area Section Property Definitions - Summary",
+        ref fieldKeyList,
+        "",
+        ref tableVersion,
+        ref fieldKeysIncluded,
+        ref numberOfRecords,
+        ref tableData
+      );
+
+      if (result != 0 || numberOfRecords == 0)
+      {
+        _isInitialized = true; // Mark as initialized even on failure
+        return;
+      }
+
+      // Process each record (each record has fieldKeysIncluded.Length columns)
+      for (int i = 0; i < tableData.Length; i += fieldKeysIncluded.Length)
+      {
+        string name = tableData[i]; // Name is first column
+        string material = tableData[i + 3]; // Material is fourth column
+
+        if (!string.IsNullOrEmpty(name))
+        {
+          _materialLookup.TryAdd(name, material);
+        }
+      }
+
+      _isInitialized = true;
+    }
+  }
 }
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json
index 847871f2c..6025cd895 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json
+++ b/Converters/Civil3d/Speckle.Converters.Civil3d2022/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -272,7 +267,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -293,37 +288,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json
index d2561827d..76b6b1b9d 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json
+++ b/Converters/Civil3d/Speckle.Converters.Civil3d2023/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -272,7 +267,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -293,37 +288,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json
index 312cd35cc..92e8f5a29 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json
+++ b/Converters/Civil3d/Speckle.Converters.Civil3d2024/packages.lock.json
@@ -173,11 +173,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -272,7 +267,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -293,37 +288,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json
index 6249dd317..a33d838da 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json
+++ b/Converters/Civil3d/Speckle.Converters.Civil3d2025/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -229,9 +224,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -239,8 +234,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui.webview": {
@@ -257,7 +252,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -293,36 +288,42 @@
         "resolved": "1.0.1938.49",
         "contentHash": "z8KnFnaTYzhA/ZnyRX0qGfS1NU5ZBJeClAH64F0fVDvdDJTvME7xl6zTJ0Jlfe1BtL3C0NH9xTy64shg2baKdw=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs
index 8f49b1017..0f2c2e695 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs
+++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/CorridorDisplayValueExtractor.cs
@@ -94,6 +94,11 @@ public void ProcessCorridorSolids(CDB.Corridor corridor)
     {
       foreach (ADB.ObjectId solidId in corridor.ExportSolids(param, corridor.Database))
       {
+        if (solidId.IsNull) // unclear why this happens
+        {
+          continue;
+        }
+
         SOG.Mesh? mesh = null;
         var solid = tr.GetObject(solidId, ADB.OpenMode.ForRead);
         if (solid is ADB.Solid3d solid3d)
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs
index 495915200..c2e2d934a 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs
+++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/Helpers/DisplayValueExtractor.cs
@@ -36,6 +36,11 @@ public IEnumerable<Base> GetDisplayValue(CDB.Entity entity)
   {
     switch (entity)
     {
+      // POC: we are sending featurelines as approximated polylines because they are 2.5d curves:
+      // they can have line or arc segments, and each vertex can have different elevations.
+      // there is no native type that can capture the full 3d representation of these curves.
+      // if this becomes essential, can explore a hack where each point is converted to 2d, and separate line/arc segments are calculated, and then their points readjusted with 3d z values
+      // SurveyFigures inherit from featureline
       case CDB.FeatureLine featureline:
         SOG.Polyline featurelinePolyline = _pointCollectionConverter.Convert(
           featureline.GetPoints(Autodesk.Civil.FeatureLinePointType.PIPoint)
diff --git a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs
index 3c2478d59..753aae8ae 100644
--- a/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs
+++ b/Converters/Civil3d/Speckle.Converters.Civil3dShared/ToSpeckle/Properties/GeneralPropertiesExtractor.cs
@@ -141,14 +141,22 @@ private void ProcessCorridorFeaturelinePoints(
       int pointCount = 0;
       foreach (CDB.FeatureLinePoint point in featureline.FeatureLinePoints)
       {
-        pointsDict[pointCount.ToString()] = new Dictionary<string, object?>()
+        Dictionary<string, object?> pointPropertiesDict =
+          new()
+          {
+            ["station"] = point.Station,
+            ["xyz"] = point.XYZ.ToArray(),
+            ["isBreak"] = point.IsBreak
+          };
+
+        // not all points have offsets. Accessing the offset property in this case will throw.
+        try
         {
-          ["station"] = point.Station,
-          ["xyz"] = point.XYZ.ToArray(),
-          ["isBreak"] = point.IsBreak,
-          ["offset"] = point.Offset
-        };
+          pointPropertiesDict["offset"] = point.Offset;
+        }
+        catch (ArgumentException) { } // do nothing - offset property will not be included
 
+        pointsDict[pointCount.ToString()] = pointPropertiesDict;
         pointCount++;
       }
 
@@ -303,19 +311,23 @@ CDB.FeatureLineCollection featurelineCollection in offsetFeaturelineCollection.F
       generalPropertiesDict["Design Critera"] = designCriteriaDict;
     }
 
-    // get offset alignment props
+    // get offset alignment props.
     if (alignment.IsOffsetAlignment)
     {
-      var offsetInfo = alignment.OffsetAlignmentInfo;
-      Dictionary<string, object?> offsetAlignmentDict =
-        new()
+      try
+      {
+        // accessing "OffsetAlignmentInfo" on offset alignments will sometimes throw /shrug.
+        // this happens when an offset alignment is unlinked from the parent and the CreateMode is still set to "ManuallyCreation"
+        // https://help.autodesk.com/view/CIV3D/2024/ENU/?guid=2ecbe421-4c08-cbde-d078-56a9f03b93f9
+        var offsetInfo = alignment.OffsetAlignmentInfo;
+        generalPropertiesDict["Offset Parameters"] = new Dictionary<string, object?>
         {
           ["side"] = offsetInfo.Side.ToString(),
           ["parentAlignmentId"] = offsetInfo.ParentAlignmentId.GetSpeckleApplicationId(),
           ["nominalOffset"] = offsetInfo.NominalOffset
         };
-
-      generalPropertiesDict["Offset Parameters"] = offsetAlignmentDict;
+      }
+      catch (InvalidOperationException) { } // do nothing
     }
 
     return generalPropertiesDict;
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json
index beb730041..e3d455167 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2020/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json
index f0b65eefb..e19dc736b 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2021/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json
index ac7cebf3a..b8337ec2e 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2022/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json
index a105edc4c..844d792f5 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2023/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json
index 316c826d7..5310f2f39 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2024/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json
index 056191e6d..9949130bc 100644
--- a/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json
+++ b/Converters/Navisworks/Speckle.Converters.Navisworks2025/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -285,7 +280,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.DependencyInjection": {
@@ -315,37 +310,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/HierarchyHelper.cs b/Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/HierarchyHelper.cs
new file mode 100644
index 000000000..47113e2c8
--- /dev/null
+++ b/Converters/Navisworks/Speckle.Converters.NavisworksShared/Helpers/HierarchyHelper.cs
@@ -0,0 +1,59 @@
+namespace Speckle.Converter.Navisworks.Helpers;
+
+/// <summary>
+/// Helper class for extracting hierarchical context from Navisworks model items in a single traversal.
+/// </summary>
+public static class HierarchyHelper
+{
+  private const char PATH_DELIMITER = '>';
+
+  /// <summary>
+  /// Extracts the meaningful name and path from a ModelItem in a single traversal.
+  /// </summary>
+  public static (string Name, string Path) ExtractContext(NAV.ModelItem modelItem)
+  {
+    if (modelItem == null)
+    {
+      throw new ArgumentNullException(nameof(modelItem));
+    }
+
+    var ancestors = new List<string>();
+    var meaningfulName = string.Empty;
+    var current = modelItem;
+
+    // Start with the root document name if available
+    if (modelItem.HasModel && !string.IsNullOrEmpty(modelItem.Model.FileName))
+    {
+      ancestors.Add(Path.GetFileNameWithoutExtension(modelItem.Model.FileName));
+    }
+
+    // Traverse up the tree once, collecting both name and path information
+    while (current != null)
+    {
+      if (IsMeaningfulNode(current))
+      {
+        // First meaningful name we find is our object name (if we haven't found one yet)
+        if (string.IsNullOrEmpty(meaningfulName))
+        {
+          meaningfulName = current.DisplayName;
+        }
+        // Add to ancestors if it's not a duplicate
+        else if (ancestors.Count == 0 || ancestors.Last() != current.DisplayName)
+        {
+          ancestors.Add(current.DisplayName);
+        }
+      }
+      current = current.Parent;
+    }
+
+    // Build path excluding the name we found
+    ancestors.Reverse();
+
+    var path = string.Join($" {PATH_DELIMITER} ", ancestors);
+
+    return (meaningfulName, path);
+  }
+
+  private static bool IsMeaningfulNode(NAV.ModelItem item) =>
+    !string.IsNullOrEmpty(item.DisplayName) && (!item.HasGeometry || !string.IsNullOrEmpty(item.ClassDisplayName));
+}
diff --git a/Converters/Navisworks/Speckle.Converters.NavisworksShared/Speckle.Converters.NavisworksShared.projitems b/Converters/Navisworks/Speckle.Converters.NavisworksShared/Speckle.Converters.NavisworksShared.projitems
index 121b8a9a4..d791e58b9 100644
--- a/Converters/Navisworks/Speckle.Converters.NavisworksShared/Speckle.Converters.NavisworksShared.projitems
+++ b/Converters/Navisworks/Speckle.Converters.NavisworksShared/Speckle.Converters.NavisworksShared.projitems
@@ -22,6 +22,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Geometries\Primitives.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Geometries\TransformMatrix.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ColorConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Helpers\HierarchyHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\ElementSelectionHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\PrimitiveProcessor.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Helpers\PropertyHelpers.cs" />
diff --git a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json
index 6273fe7ec..f4b667e1f 100644
--- a/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2022.Tests/packages.lock.json
@@ -250,11 +250,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -345,7 +340,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.testing": {
@@ -373,36 +368,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json
index a96161d91..23895a7c5 100644
--- a/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2022/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json
index abb3a4180..6f3dcd606 100644
--- a/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2023.Tests/packages.lock.json
@@ -250,11 +250,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -345,7 +340,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.testing": {
@@ -373,36 +368,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
index 642607ccd..a82da87cb 100644
--- a/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2023/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json
index 02bbc1902..ada3fe588 100644
--- a/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2024.Tests/packages.lock.json
@@ -250,11 +250,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -345,7 +340,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.testing": {
@@ -373,36 +368,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json
index 7404b3b6d..df0008c0d 100644
--- a/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2024/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json
index bfa8ed9a5..2e91d1230 100644
--- a/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json
+++ b/Converters/Revit/Speckle.Converters.Revit2025/packages.lock.json
@@ -155,11 +155,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -219,7 +214,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -240,36 +235,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitContext.cs b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitContext.cs
index 59c3892a7..7c9702600 100644
--- a/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitContext.cs
+++ b/Converters/Revit/Speckle.Converters.RevitShared/Helpers/RevitContext.cs
@@ -2,21 +2,7 @@
 
 namespace Speckle.Converters.RevitShared.Helpers;
 
-public class RevitContext
+public interface IRevitContext
 {
-  private UIApplication? _uiApplication;
-
-  public UIApplication? UIApplication
-  {
-    get => _uiApplication;
-    set
-    {
-      if (_uiApplication != null)
-      {
-        throw new ArgumentException("UIApplication already set");
-      }
-
-      _uiApplication = value;
-    }
-  }
+  public UIApplication UIApplication { get; }
 }
diff --git a/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs b/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs
index b6b8e1bef..1b42b7156 100644
--- a/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs
+++ b/Converters/Revit/Speckle.Converters.RevitShared/ServiceRegistration.cs
@@ -25,8 +25,6 @@ public static IServiceCollection AddRevitConverters(this IServiceCollection serv
     serviceCollection.AddApplicationConverters<RevitToSpeckleUnitConverter, DB.ForgeTypeId>(converterAssembly);
 
     serviceCollection.AddScoped<IRootToHostConverter, RevitRootToHostConverter>();
-    serviceCollection.AddSingleton(new RevitContext());
-
     serviceCollection.AddSingleton(new RevitToHostCacheSingleton());
     serviceCollection.AddSingleton(new RevitToSpeckleCacheSingleton());
 
diff --git a/Converters/Revit/Speckle.Converters.RevitShared/Settings/RevitConversionSettingsFactory.cs b/Converters/Revit/Speckle.Converters.RevitShared/Settings/RevitConversionSettingsFactory.cs
index 93339a409..f1ea559f6 100644
--- a/Converters/Revit/Speckle.Converters.RevitShared/Settings/RevitConversionSettingsFactory.cs
+++ b/Converters/Revit/Speckle.Converters.RevitShared/Settings/RevitConversionSettingsFactory.cs
@@ -1,13 +1,12 @@
 using Speckle.Converters.Common;
 using Speckle.Converters.RevitShared.Helpers;
 using Speckle.InterfaceGenerator;
-using Speckle.Sdk.Common;
 
 namespace Speckle.Converters.RevitShared.Settings;
 
 [GenerateAutoInterface]
 public class RevitConversionSettingsFactory(
-  RevitContext revitContext,
+  IRevitContext revitContext,
   IHostToSpeckleUnitConverter<DB.ForgeTypeId> unitConverter
 ) : IRevitConversionSettingsFactory
 {
@@ -18,7 +17,7 @@ public RevitConversionSettings Create(
     double tolerance = 0.0164042 // 5mm in ft
   )
   {
-    var document = revitContext.UIApplication.NotNull().ActiveUIDocument.Document;
+    var document = revitContext.UIApplication.ActiveUIDocument.Document;
     return new(
       document,
       detailLevelType,
diff --git a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json
index 4619d787f..7f4f0718b 100644
--- a/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json
+++ b/Converters/Rhino/Speckle.Converters.Rhino7.Tests/packages.lock.json
@@ -250,11 +250,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -345,7 +340,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.testing": {
@@ -373,36 +368,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
index d3211c7ca..da9753754 100644
--- a/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
+++ b/Converters/Rhino/Speckle.Converters.Rhino7/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json
index 9faafa0d6..4b4dac9c8 100644
--- a/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json
+++ b/Converters/Rhino/Speckle.Converters.Rhino8/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -263,7 +258,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -284,37 +279,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/MeshToHostConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/MeshToHostConverter.cs
index 1ea03d8e7..10d39b3fb 100644
--- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/MeshToHostConverter.cs
+++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/MeshToHostConverter.cs
@@ -22,8 +22,6 @@ public MeshToHostConverter(ITypedConverter<IReadOnlyList<double>, Point3dList> p
   /// <remarks>⚠️ This conversion does NOT perform scaling.</remarks>
   public RG.Mesh Convert(SOG.Mesh target)
   {
-    target.AlignVerticesWithTexCoordsByIndex();
-
     RG.Mesh m = new();
 
     var vertices = _pointListConverter.Convert(target.vertices);
diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/PointCloudToHostConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/PointCloudToHostConverter.cs
index ee2e3052b..da2d3dcff 100644
--- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/PointCloudToHostConverter.cs
+++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToHost/Raw/PointCloudToHostConverter.cs
@@ -1,6 +1,7 @@
 using System.Drawing;
 using Rhino.Collections;
 using Speckle.Converters.Common.Objects;
+using Speckle.Sdk.Common.Exceptions;
 
 namespace Speckle.Converters.Rhino.ToHost.Raw;
 
@@ -22,10 +23,17 @@ public PointCloudToHostConverter(ITypedConverter<IReadOnlyList<double>, Point3dL
   public RG.PointCloud Convert(SOG.Pointcloud target)
   {
     var rhinoPoints = _pointListConverter.Convert(target.points);
-    var rhinoPointCloud = new RG.PointCloud(rhinoPoints);
 
-    if (target.colors.Count == rhinoPoints.Count)
+    var rhinoPointCloud = new RG.PointCloud(rhinoPoints);
+    if (target.colors.Count != 0)
     {
+      if (target.colors.Count != rhinoPoints.Count)
+      {
+        throw new ValidationException(
+          $"{target} has mismatched numbers of colors ({target.colors.Count}) and points ({rhinoPoints.Count})"
+        );
+      }
+
       for (int i = 0; i < rhinoPoints.Count; i++)
       {
         rhinoPointCloud[i].Color = Color.FromArgb(target.colors[i]);
diff --git a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/NurbsSurfaceToSpeckleConverter.cs b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/NurbsSurfaceToSpeckleConverter.cs
index c42c87e47..2cc0e56a6 100644
--- a/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/NurbsSurfaceToSpeckleConverter.cs
+++ b/Converters/Rhino/Speckle.Converters.RhinoShared/ToSpeckle/Raw/NurbsSurfaceToSpeckleConverter.cs
@@ -31,7 +31,8 @@ IConverterSettingsStore<RhinoConversionSettings> settingsStore
   /// <returns>A Surface object representing the converted NurbsSurface.</returns>
   public SOG.Surface Convert(RG.NurbsSurface target)
   {
-    var result = new SOG.Surface
+    var controlPoints = ControlPointsToSpeckle(target.Points);
+    var result = new SOG.Surface(controlPoints)
     {
       degreeU = target.OrderU - 1,
       degreeV = target.OrderV - 1,
@@ -43,11 +44,9 @@ public SOG.Surface Convert(RG.NurbsSurface target)
       knotsU = target.KnotsU.ToList(),
       knotsV = target.KnotsV.ToList(),
       units = _settingsStore.Current.SpeckleUnits,
-      bbox = _boxConverter.Convert(new RG.Box(target.GetBoundingBox(true)))
+      bbox = _boxConverter.Convert(new RG.Box(target.GetBoundingBox(true))),
     };
 
-    result.SetControlPoints(ControlPointsToSpeckle(target.Points));
-
     return result;
   }
 
diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj
index 0c6c2d77f..b03f3f491 100644
--- a/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj
+++ b/Converters/Tekla/Speckle.Converter.Tekla2023/Speckle.Converter.Tekla2023.csproj
@@ -15,6 +15,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj" />
   </ItemGroup>
 
   <Import Project="..\Speckle.Converters.TeklaShared\Speckle.Converters.TeklaShared.projitems" Label="Shared" />
diff --git a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json
index 4a6b6c90c..46a594fe6 100644
--- a/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json
+++ b/Converters/Tekla/Speckle.Converter.Tekla2023/packages.lock.json
@@ -181,11 +181,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -296,11 +291,18 @@
         "resolved": "2023.0.1",
         "contentHash": "24KbR++C2WYEIyDymIHX/AVuHYcgwyQrvgExMKDnMobQPNM+AmMNnwdyYxBbw4AvYXd8QHoi+lmmavhTCL8E3w=="
       },
+      "speckle.common.meshtriangulation": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.DoubleNumerics": "[4.1.0, )",
+          "Speckle.Triangle": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -321,37 +323,49 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
+      },
+      "Speckle.Triangle": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
       },
       "Tekla.Structures.Dialog": {
         "type": "CentralTransitive",
diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj b/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj
index 6dfdf7d0b..7c07d5358 100644
--- a/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj
+++ b/Converters/Tekla/Speckle.Converter.Tekla2024/Speckle.Converter.Tekla2024.csproj
@@ -14,6 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj" />
     <ProjectReference Include="..\..\..\Sdk\Speckle.Converters.Common\Speckle.Converters.Common.csproj" />
   </ItemGroup>
 
diff --git a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json
index 2f5138b6a..8ac0b0c3b 100644
--- a/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json
+++ b/Converters/Tekla/Speckle.Converter.Tekla2024/packages.lock.json
@@ -191,11 +191,6 @@
         "resolved": "0.11.4",
         "contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -337,11 +332,18 @@
           "Tekla.Technology.Serialization": "4.1.1"
         }
       },
+      "speckle.common.meshtriangulation": {
+        "type": "Project",
+        "dependencies": {
+          "Speckle.DoubleNumerics": "[4.1.0, )",
+          "Speckle.Triangle": "[1.0.0, )"
+        }
+      },
       "speckle.converters.common": {
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "Microsoft.Extensions.Logging": {
@@ -362,37 +364,49 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
+      },
+      "Speckle.Triangle": {
+        "type": "CentralTransitive",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
       },
       "Tekla.Structures.Plugins": {
         "type": "CentralTransitive",
diff --git a/DUI3/Speckle.Connectors.DUI.Tests/Bridge/IdleCallManagerTests.cs b/DUI3/Speckle.Connectors.DUI.Tests/Bridge/IdleCallManagerTests.cs
index 9c8397023..611f6af7f 100644
--- a/DUI3/Speckle.Connectors.DUI.Tests/Bridge/IdleCallManagerTests.cs
+++ b/DUI3/Speckle.Connectors.DUI.Tests/Bridge/IdleCallManagerTests.cs
@@ -15,7 +15,7 @@ public void SubscribeToIdleTest()
     var sut = new IdleCallManager(handler.Object);
     var action = Create<Action>();
     var addEvent = Create<Action>();
-    handler.Setup(x => x.CatchUnhandled(It.IsAny<Action>()));
+    handler.Setup(x => x.CatchUnhandled(It.IsAny<Action>())).Returns(new Result());
     sut.SubscribeToIdle("id", action.Object, addEvent.Object);
   }
 
diff --git a/DUI3/Speckle.Connectors.DUI.Tests/Bridge/TopLevelExceptionHandlerTests.cs b/DUI3/Speckle.Connectors.DUI.Tests/Bridge/TopLevelExceptionHandlerTests.cs
index 8ba16dc14..cfa7deebb 100644
--- a/DUI3/Speckle.Connectors.DUI.Tests/Bridge/TopLevelExceptionHandlerTests.cs
+++ b/DUI3/Speckle.Connectors.DUI.Tests/Bridge/TopLevelExceptionHandlerTests.cs
@@ -2,8 +2,9 @@
 using Microsoft.Extensions.Logging;
 using Moq;
 using NUnit.Framework;
-using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Testing;
 
 namespace Speckle.Connectors.DUI.Tests.Bridge;
@@ -14,8 +15,8 @@ public class TopLevelExceptionHandlerTests : MoqTest
   public void CatchUnhandledAction_Happy()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var eventAggregator = Create<IEventAggregator>();
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     sut.CatchUnhandled(() => { });
   }
@@ -24,13 +25,13 @@ public void CatchUnhandledAction_Happy()
   public void CatchUnhandledAction_Exception()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
+    var eventAggregator = Create<IEventAggregator>();
 
-    bridge
-      .Setup(x => x.Send(BasicConnectorBindingCommands.SET_GLOBAL_NOTIFICATION, It.IsAny<object>(), default))
-      .Returns(Task.CompletedTask);
+    eventAggregator
+      .Setup(x => x.GetEvent<ExceptionEvent>())
+      .Returns(new ExceptionEvent(Create<IThreadContext>().Object, Create<ITopLevelExceptionHandler>().Object));
 
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     sut.CatchUnhandled(() => throw new InvalidOperationException());
   }
@@ -40,8 +41,8 @@ public void CatchUnhandledFunc_Happy()
   {
     var val = 2;
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var eventAggregator = Create<IEventAggregator>();
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     var returnVal = sut.CatchUnhandled(() => val);
     returnVal.Value.Should().Be(val);
@@ -53,13 +54,13 @@ public void CatchUnhandledFunc_Happy()
   public void CatchUnhandledFunc_Exception()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
+    var eventAggregator = Create<IEventAggregator>();
 
-    bridge
-      .Setup(x => x.Send(BasicConnectorBindingCommands.SET_GLOBAL_NOTIFICATION, It.IsAny<object>(), default))
-      .Returns(Task.CompletedTask);
+    eventAggregator
+      .Setup(x => x.GetEvent<ExceptionEvent>())
+      .Returns(new ExceptionEvent(Create<IThreadContext>().Object, Create<ITopLevelExceptionHandler>().Object));
 
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     var returnVal = sut.CatchUnhandled((Func<string>)(() => throw new InvalidOperationException()));
     returnVal.Value.Should().BeNull();
@@ -71,13 +72,12 @@ public void CatchUnhandledFunc_Exception()
   public void CatchUnhandledFunc_Exception_Fatal()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var eventAggregator = Create<IEventAggregator>();
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
-    var exception = Assert.Throws<AggregateException>(
+    Assert.Throws<AppDomainUnloadedException>(
       () => sut.CatchUnhandled(new Func<string>(() => throw new AppDomainUnloadedException()))
     );
-    exception.InnerExceptions.Single().Should().BeOfType<AppDomainUnloadedException>();
   }
 
   [Test]
@@ -85,8 +85,8 @@ public async Task CatchUnhandledFuncAsync_Happy()
   {
     var val = 2;
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var eventAggregator = Create<IEventAggregator>();
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     var returnVal = await sut.CatchUnhandledAsync(() => Task.FromResult(val));
     returnVal.Value.Should().Be(val);
@@ -98,13 +98,13 @@ public async Task CatchUnhandledFuncAsync_Happy()
   public async Task CatchUnhandledFuncAsync_Exception()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
+    var eventAggregator = Create<IEventAggregator>();
 
-    bridge
-      .Setup(x => x.Send(BasicConnectorBindingCommands.SET_GLOBAL_NOTIFICATION, It.IsAny<object>(), default))
-      .Returns(Task.CompletedTask);
+    eventAggregator
+      .Setup(x => x.GetEvent<ExceptionEvent>())
+      .Returns(new ExceptionEvent(Create<IThreadContext>().Object, Create<ITopLevelExceptionHandler>().Object));
 
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     var returnVal = await sut.CatchUnhandledAsync(new Func<Task<string>>(() => throw new InvalidOperationException()));
     returnVal.Value.Should().BeNull();
@@ -116,8 +116,8 @@ public async Task CatchUnhandledFuncAsync_Exception()
   public void CatchUnhandledFuncAsync_Exception_Fatal()
   {
     var logger = Create<ILogger<TopLevelExceptionHandler>>(MockBehavior.Loose);
-    var bridge = Create<IBrowserBridge>();
-    var sut = new TopLevelExceptionHandler(logger.Object, bridge.Object);
+    var eventAggregator = Create<IEventAggregator>();
+    var sut = new TopLevelExceptionHandler(logger.Object, eventAggregator.Object);
 
     var exception = Assert.ThrowsAsync<AppDomainUnloadedException>(
       async () => await sut.CatchUnhandledAsync(new Func<Task<string>>(() => throw new AppDomainUnloadedException()))
diff --git a/DUI3/Speckle.Connectors.DUI.Tests/Eventing/EventAggregatorTests.cs b/DUI3/Speckle.Connectors.DUI.Tests/Eventing/EventAggregatorTests.cs
new file mode 100644
index 000000000..eed472fc6
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI.Tests/Eventing/EventAggregatorTests.cs
@@ -0,0 +1,440 @@
+using FluentAssertions;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
+using Speckle.Testing;
+
+namespace Speckle.Connectors.DUI.Tests.Eventing;
+
+public class TestEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class TestOneTimeEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : OneTimeThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class TestPeriodicThreadedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : PeriodicThreadedEvent(threadContext, exceptionHandler);
+
+public class EventAggregatorTests : MoqTest
+{
+  [Test]
+  public async Task Sub_Async_DisposeToken()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Sub_Async_DisposeToken(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    await eventAggregator.GetEvent<TestEvent>().PublishAsync(new object());
+
+    s_val.Should().BeTrue();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+    subscriptionToken.Dispose();
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private SubscriptionToken Test_Sub_Async_DisposeToken(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestEvent>().Subscribe(OnTestAsyncSubscribe);
+    return subscriptionToken;
+  }
+
+  [Test]
+  public async Task Sub_Async_SubscribeToken()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Sub_Async_DisposeToken(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    await eventAggregator.GetEvent<TestEvent>().PublishAsync(new object());
+
+    s_val.Should().BeTrue();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+    eventAggregator.GetEvent<TestEvent>().Unsubscribe(subscriptionToken);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  [Test]
+  public async Task Sub_Sync()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Sub_Sync(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    await eventAggregator.GetEvent<TestEvent>().PublishAsync(new object());
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+    s_val.Should().BeTrue();
+    eventAggregator.GetEvent<TestEvent>().Unsubscribe(subscriptionToken);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private SubscriptionToken Test_Sub_Sync(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestEvent>().Subscribe(OnTestSyncSubscribe);
+    return subscriptionToken;
+  }
+
+  [Test]
+  public async Task Sub_Sync_Static()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Sub_Sync_Static(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    await eventAggregator.GetEvent<TestEvent>().PublishAsync(new object());
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+    s_val.Should().BeTrue();
+    eventAggregator.GetEvent<TestEvent>().Unsubscribe(subscriptionToken);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private static SubscriptionToken Test_Sub_Sync_Static(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestEvent>().Subscribe(OnTestSyncStaticSubscribe);
+    return subscriptionToken;
+  }
+
+  private static void OnTestSyncStaticSubscribe(object _)
+  {
+    s_val = true;
+  }
+
+  [Test]
+  public async Task Sub_Async_Static()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Sub_Async_Static(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    await eventAggregator.GetEvent<TestEvent>().PublishAsync(new object());
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+    s_val.Should().BeTrue();
+    eventAggregator.GetEvent<TestEvent>().Unsubscribe(subscriptionToken);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private static SubscriptionToken Test_Sub_Async_Static(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestEvent>().Subscribe(OnTestAsyncStaticSubscribe);
+    return subscriptionToken;
+  }
+
+  private static Task OnTestAsyncStaticSubscribe(object _)
+  {
+    s_val = true;
+    return Task.CompletedTask;
+  }
+
+  private Task OnTestAsyncSubscribe(object _)
+  {
+    s_val = true;
+    return Task.CompletedTask;
+  }
+
+  [Test]
+  public async Task Onetime_Async()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestOneTimeEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Onetime_Sub_Async(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+
+    await eventAggregator.GetEvent<TestOneTimeEvent>().PublishAsync(new object());
+
+    s_val.Should().BeTrue();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+    subscriptionToken.Dispose();
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private SubscriptionToken Test_Onetime_Sub_Async(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestOneTimeEvent>().OneTimeSubscribe("test", OnTestAsyncSubscribe);
+    return subscriptionToken;
+  }
+
+  private SubscriptionToken Test_Onetime_Sub_Sync(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator.GetEvent<TestOneTimeEvent>().OneTimeSubscribe("test", OnTestSyncSubscribe);
+    return subscriptionToken;
+  }
+
+  private void OnTestSyncSubscribe(object _)
+  {
+    s_val = true;
+  }
+
+  [Test]
+  public async Task Onetime_Sync()
+  {
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestOneTimeEvent>();
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Onetime_Sub_Sync(serviceProvider);
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+
+    await eventAggregator.GetEvent<TestOneTimeEvent>().PublishAsync(new object());
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+    s_val.Should().BeTrue();
+    eventAggregator.GetEvent<TestOneTimeEvent>().Unsubscribe(subscriptionToken);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private static bool s_val;
+
+  [Test]
+  public async Task Sub_WeakReference()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestEvent>();
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+    TestWeakReference(serviceProvider);
+
+    s_val.Should().BeFalse();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    GC.Collect();
+
+    await serviceProvider.GetRequiredService<IEventAggregator>().GetEvent<TestEvent>().PublishAsync(new object());
+    s_val.Should().BeFalse();
+  }
+
+  //keep in a separate method to avoid referencing ObjectWithAction
+  private static void TestWeakReference(IServiceProvider serviceProvider)
+  {
+    var x = new ObjectWithAction(
+      new Action(() =>
+      {
+        s_val = true;
+      })
+    );
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    eventAggregator.GetEvent<TestEvent>().Subscribe(x.Test1);
+    x = null;
+  }
+
+  private sealed class ObjectWithAction(Action action)
+  {
+    public void Test1(object _)
+    {
+      action();
+    }
+  }
+
+  [Test]
+  public async Task Periodic_Async()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestPeriodicThreadedEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Periodic_Sub_Async(serviceProvider);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+
+    await Task.Delay(2000);
+    s_val.Should().BeTrue();
+    subscriptionToken.Unsubscribe();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+    subscriptionToken.Dispose();
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private SubscriptionToken Test_Periodic_Sub_Async(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator
+      .GetEvent<TestPeriodicThreadedEvent>()
+      .SubscribePeriodic(TimeSpan.FromSeconds(1), OnTestAsyncSubscribe);
+    return subscriptionToken;
+  }
+
+  [Test]
+  public async Task Periodic_Sync()
+  {
+    s_val = false;
+    var services = new ServiceCollection();
+    var exceptionHandler = new TopLevelExceptionHandler(
+      Create<ILogger<TopLevelExceptionHandler>>().Object,
+      Create<IEventAggregator>().Object
+    );
+    services.AddSingleton(Create<IThreadContext>().Object);
+    services.AddSingleton<ITopLevelExceptionHandler>(exceptionHandler);
+    services.AddTransient<TestPeriodicThreadedEvent>();
+
+    services.AddSingleton<IEventAggregator, EventAggregator>();
+    var serviceProvider = services.BuildServiceProvider();
+
+    var subscriptionToken = Test_Periodic_Sub_Sync(serviceProvider);
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeTrue();
+
+    await Task.Delay(2000);
+    s_val.Should().BeTrue();
+    subscriptionToken.Unsubscribe();
+
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+    subscriptionToken.Dispose();
+    GC.Collect();
+    GC.WaitForPendingFinalizers();
+    subscriptionToken.IsActive.Should().BeFalse();
+  }
+
+  private SubscriptionToken Test_Periodic_Sub_Sync(IServiceProvider serviceProvider)
+  {
+    var eventAggregator = serviceProvider.GetRequiredService<IEventAggregator>();
+    var subscriptionToken = eventAggregator
+      .GetEvent<TestPeriodicThreadedEvent>()
+      .SubscribePeriodic(TimeSpan.FromSeconds(1), OnTestSyncSubscribe);
+    return subscriptionToken;
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json
index 82b409d57..b5b64866f 100644
--- a/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json
+++ b/DUI3/Speckle.Connectors.DUI.Tests/packages.lock.json
@@ -236,11 +236,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -324,9 +319,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -334,8 +329,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -375,36 +370,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
index 5b3ceecbb..39f891aa3 100644
--- a/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
+++ b/DUI3/Speckle.Connectors.DUI.WebView/packages.lock.json
@@ -164,11 +164,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -264,9 +259,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -274,8 +269,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -308,37 +303,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net6.0-windows7.0": {
@@ -500,11 +501,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -565,9 +561,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.dui": {
@@ -575,8 +571,8 @@
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
           "Speckle.Connectors.Common": "[1.0.0, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -609,37 +605,43 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs b/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs
index 3724eed44..d5923dc30 100644
--- a/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs
+++ b/DUI3/Speckle.Connectors.DUI/Bindings/OperationProgressManager.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Connectors.DUI.Bridge;
 using Speckle.Connectors.DUI.Models.Card;
diff --git a/DUI3/Speckle.Connectors.DUI/Bindings/TopLevelExceptionHandlerBinding.cs b/DUI3/Speckle.Connectors.DUI/Bindings/TopLevelExceptionHandlerBinding.cs
index 617722d69..2fec4a7ca 100644
--- a/DUI3/Speckle.Connectors.DUI/Bindings/TopLevelExceptionHandlerBinding.cs
+++ b/DUI3/Speckle.Connectors.DUI/Bindings/TopLevelExceptionHandlerBinding.cs
@@ -2,10 +2,6 @@
 
 namespace Speckle.Connectors.DUI.Bindings;
 
-/// <summary>
-/// Simple binding that can be injected into non-<see cref="IBinding"/> services to get access to the <see cref="IBrowserBridge.TopLevelExceptionHandler"/>
-/// </summary>
-/// <param name="parent"></param>
 public sealed class TopLevelExceptionHandlerBinding(IBrowserBridge parent) : IBinding
 {
   public string Name => "topLevelExceptionHandlerBinding";
diff --git a/DUI3/Speckle.Connectors.DUI/Bridge/BrowserBridge.cs b/DUI3/Speckle.Connectors.DUI/Bridge/BrowserBridge.cs
index f692e41c3..0939a63d7 100644
--- a/DUI3/Speckle.Connectors.DUI/Bridge/BrowserBridge.cs
+++ b/DUI3/Speckle.Connectors.DUI/Bridge/BrowserBridge.cs
@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Utils;
 using Speckle.Newtonsoft.Json;
 using Speckle.Sdk.Common;
@@ -27,7 +28,8 @@ public sealed class BrowserBridge : IBrowserBridge
   /// </summary>
 
   private readonly ConcurrentDictionary<string, string?> _resultsStore = new();
-  public ITopLevelExceptionHandler TopLevelExceptionHandler { get; }
+
+  private readonly ITopLevelExceptionHandler _topLevelExceptionHandler;
   private readonly IThreadContext _threadContext;
   private readonly IThreadOptions _threadOptions;
 
@@ -60,20 +62,35 @@ public BrowserBridge(
     IThreadContext threadContext,
     IJsonSerializer jsonSerializer,
     ILogger<BrowserBridge> logger,
-    ILogger<TopLevelExceptionHandler> topLogger,
     IBrowserScriptExecutor browserScriptExecutor,
-    IThreadOptions threadOptions
+    IThreadOptions threadOptions,
+    IEventAggregator eventAggregator,
+    ITopLevelExceptionHandler topLevelExceptionHandler
   )
   {
     _threadContext = threadContext;
     _jsonSerializer = jsonSerializer;
     _logger = logger;
-    TopLevelExceptionHandler = new TopLevelExceptionHandler(topLogger, this);
     // Capture the main thread's SynchronizationContext
     _browserScriptExecutor = browserScriptExecutor;
     _threadOptions = threadOptions;
+    _topLevelExceptionHandler = topLevelExceptionHandler;
+    eventAggregator.GetEvent<ExceptionEvent>().Subscribe(OnExceptionEvent, ThreadOption.MainThread);
   }
 
+  private async Task OnExceptionEvent(Exception ex) =>
+    await Send(
+        BasicConnectorBindingCommands.SET_GLOBAL_NOTIFICATION,
+        new
+        {
+          type = ToastNotificationType.DANGER,
+          title = "Unhandled Exception Occurred",
+          description = ex.ToFormattedString(),
+          autoClose = false
+        }
+      )
+      .ConfigureAwait(false);
+
   public void AssociateWithBinding(IBinding binding)
   {
     // set via binding property to ensure explosion if already bound
@@ -110,12 +127,14 @@ public void RunMethod(string methodName, string requestId, string methodArgs) =>
       .RunOnThreadAsync(
         async () =>
         {
-          var task = await TopLevelExceptionHandler.CatchUnhandledAsync(async () =>
-          {
-            var result = await ExecuteMethod(methodName, methodArgs);
-            string resultJson = _jsonSerializer.Serialize(result);
-            NotifyUIMethodCallResultReady(requestId, resultJson);
-          });
+          var task = await _topLevelExceptionHandler
+            .CatchUnhandledAsync(async () =>
+            {
+              var result = await ExecuteMethod(methodName, methodArgs).ConfigureAwait(false);
+              string resultJson = _jsonSerializer.Serialize(result);
+              NotifyUIMethodCallResultReady(requestId, resultJson);
+            })
+            .ConfigureAwait(false);
           if (task.Exception is not null)
           {
             string resultJson = SerializeFormattedException(task.Exception);
diff --git a/DUI3/Speckle.Connectors.DUI/Bridge/IBrowserBridge.cs b/DUI3/Speckle.Connectors.DUI/Bridge/IBrowserBridge.cs
index 65ec766df..20c85708f 100644
--- a/DUI3/Speckle.Connectors.DUI/Bridge/IBrowserBridge.cs
+++ b/DUI3/Speckle.Connectors.DUI/Bridge/IBrowserBridge.cs
@@ -42,5 +42,4 @@ public Task Send<T>(string eventName, T data, CancellationToken cancellationToke
 
   public void Send2<T>(string eventName, T data)
     where T : class;
-  public ITopLevelExceptionHandler TopLevelExceptionHandler { get; }
 }
diff --git a/DUI3/Speckle.Connectors.DUI/Bridge/TopLevelExceptionHandler.cs b/DUI3/Speckle.Connectors.DUI/Bridge/TopLevelExceptionHandler.cs
index 1684e3c81..7699552a8 100644
--- a/DUI3/Speckle.Connectors.DUI/Bridge/TopLevelExceptionHandler.cs
+++ b/DUI3/Speckle.Connectors.DUI/Bridge/TopLevelExceptionHandler.cs
@@ -1,8 +1,7 @@
 using Microsoft.Extensions.Logging;
-using Speckle.Connectors.DUI.Bindings;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk;
-using Speckle.Sdk.Models.Extensions;
 
 namespace Speckle.Connectors.DUI.Bridge;
 
@@ -23,15 +22,15 @@ namespace Speckle.Connectors.DUI.Bridge;
 public sealed class TopLevelExceptionHandler : ITopLevelExceptionHandler
 {
   private readonly ILogger<TopLevelExceptionHandler> _logger;
-  public IBrowserBridge Parent { get; }
+  private readonly IEventAggregator _eventAggregator;
   public string Name => nameof(TopLevelExceptionHandler);
 
   private const string UNHANDLED_LOGGER_TEMPLATE = "An unhandled Exception occured";
 
-  internal TopLevelExceptionHandler(ILogger<TopLevelExceptionHandler> logger, IBrowserBridge bridge)
+  public TopLevelExceptionHandler(ILogger<TopLevelExceptionHandler> logger, IEventAggregator eventAggregator)
   {
     _logger = logger;
-    Parent = bridge;
+    _eventAggregator = eventAggregator;
   }
 
   /// <summary>
@@ -41,43 +40,34 @@ internal TopLevelExceptionHandler(ILogger<TopLevelExceptionHandler> logger, IBro
   /// <param name="function">The function to invoke and provide error handling for</param>
   /// <exception cref="Exception"><see cref="ExceptionHelpers.IsFatal"/> will be rethrown, these should be allowed to bubble up to the host app</exception>
   /// <seealso cref="ExceptionHelpers.IsFatal"/>
-  public void CatchUnhandled(Action function)
+  public Result CatchUnhandled(Action function)
   {
-    _ = CatchUnhandled<object?>(() =>
+    var r = CatchUnhandled(() =>
     {
       function();
-      return null;
+      return true;
     });
+    if (r.IsSuccess)
+    {
+      return new Result();
+    }
+    return new Result(r.Exception);
   }
 
   /// <inheritdoc cref="CatchUnhandled(Action)"/>
   /// <typeparam name="T"><paramref name="function"/> return type</typeparam>
   /// <returns>A result pattern struct (where exceptions have been handled)</returns>
-  public Result<T> CatchUnhandled<T>(Func<T> function) =>
-    CatchUnhandledAsync(() => Task.FromResult(function.Invoke())).Result; //Safe to do a .Result because this as an already completed and non-async Task from the Task.FromResult
-
-  /// <inheritdoc cref="CatchUnhandled(Action)"/>
-  /// <returns>A result pattern struct (where exceptions have been handled)</returns>
-  public async Task<Result> CatchUnhandledAsync(Func<Task> function)
+  public Result<T> CatchUnhandled<T>(Func<T> function)
   {
     try
     {
-      try
-      {
-        await function();
-        return new Result();
-      }
-      catch (Exception ex) when (!ex.IsFatal())
-      {
-        _logger.LogError(ex, UNHANDLED_LOGGER_TEMPLATE);
-        await SetGlobalNotification(
-          ToastNotificationType.DANGER,
-          "Unhandled Exception Occured",
-          ex.ToFormattedString(),
-          false
-        );
-        return new(ex);
-      }
+      return new Result<T>(function());
+    }
+    catch (Exception ex) when (!ex.IsFatal())
+    {
+      _logger.LogError(ex, UNHANDLED_LOGGER_TEMPLATE);
+      _eventAggregator.GetEvent<ExceptionEvent>().PublishAsync(ex).Wait();
+      return new(ex);
     }
     catch (Exception ex)
     {
@@ -86,6 +76,22 @@ await SetGlobalNotification(
     }
   }
 
+  /// <inheritdoc cref="CatchUnhandled(Action)"/>
+  /// <returns>A result pattern struct (where exceptions have been handled)</returns>
+  public async Task<Result> CatchUnhandledAsync(Func<Task> function)
+  {
+    var r = await CatchUnhandledAsync(async () =>
+    {
+      await function();
+      return true;
+    });
+    if (r.IsSuccess)
+    {
+      return new Result();
+    }
+    return new Result(r.Exception);
+  }
+
   ///<inheritdoc cref="CatchUnhandled{T}(Func{T})"/>
   public async Task<Result<T>> CatchUnhandledAsync<T>(Func<Task<T>> function)
   {
@@ -97,7 +103,8 @@ public async Task<Result<T>> CatchUnhandledAsync<T>(Func<Task<T>> function)
       }
       catch (Exception ex) when (!ex.IsFatal())
       {
-        await HandleException(ex);
+        _logger.LogError(ex, UNHANDLED_LOGGER_TEMPLATE);
+        await _eventAggregator.GetEvent<ExceptionEvent>().PublishAsync(ex);
         return new(ex);
       }
     }
@@ -108,32 +115,6 @@ public async Task<Result<T>> CatchUnhandledAsync<T>(Func<Task<T>> function)
     }
   }
 
-  private async Task HandleException(Exception ex)
-  {
-    _logger.LogError(ex, UNHANDLED_LOGGER_TEMPLATE);
-
-    try
-    {
-      await SetGlobalNotification(
-        ToastNotificationType.DANGER,
-        "Unhandled Exception Occured",
-        ex.ToFormattedString(),
-        false
-      );
-    }
-    catch (Exception toastEx)
-    {
-      // Not only was a top level exception caught, but our attempt to display a toast failed!
-      // Toasts can fail if the BrowserBridge is not yet associated with a binding
-      // For this reason, binding authors should avoid doing anything in
-      // the constructors of bindings that may try and use the bridge!
-      AggregateException aggregateException =
-        new("An Unhandled top level exception was caught, and the toast failed to display it!", [toastEx, ex]);
-
-      throw aggregateException;
-    }
-  }
-
   /// <summary>
   /// Triggers an async action without explicitly needing to await it. <br/>
   /// Any <see cref="Exception"/> thrown by invoking <paramref name="function"/> will be handled by the <see cref="ITopLevelExceptionHandler"/><br/>
@@ -143,17 +124,5 @@ await SetGlobalNotification(
   /// In cases where you can use <see langword="await"/> keyword, you should prefer using <see cref="CatchUnhandledAsync"/>
   /// </remarks>
   /// <param name="function"><inheritdoc cref="CatchUnhandled{T}(Func{T})"/></param>
-  public async void FireAndForget(Func<Task> function) => await CatchUnhandledAsync(function);
-
-  private async Task SetGlobalNotification(ToastNotificationType type, string title, string message, bool autoClose) =>
-    await Parent.Send(
-      BasicConnectorBindingCommands.SET_GLOBAL_NOTIFICATION, //TODO: We could move these constants into a DUI3 constants static class
-      new
-      {
-        type,
-        title,
-        description = message,
-        autoClose
-      }
-    );
+  public async void FireAndForget(Func<Task> function) => await CatchUnhandledAsync(function).ConfigureAwait(false);
 }
diff --git a/DUI3/Speckle.Connectors.DUI/ContainerRegistration.cs b/DUI3/Speckle.Connectors.DUI/ContainerRegistration.cs
index ce594de8a..c05fe2332 100644
--- a/DUI3/Speckle.Connectors.DUI/ContainerRegistration.cs
+++ b/DUI3/Speckle.Connectors.DUI/ContainerRegistration.cs
@@ -1,8 +1,11 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Logging;
 using Speckle.Connectors.Common.Threading;
 using Speckle.Connectors.DUI.Bindings;
 using Speckle.Connectors.DUI.Bridge;
+using Speckle.Connectors.DUI.Eventing;
 using Speckle.Connectors.DUI.Models;
 using Speckle.Sdk;
 using Speckle.Sdk.Transports;
@@ -23,16 +26,49 @@ public static void AddDUI<TThreadContext, TDocumentStore>(this IServiceCollectio
 
     serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetAssembly(typeof(IdleCallManager)));
     serviceCollection.AddMatchingInterfacesAsTransient(Assembly.GetAssembly(typeof(IServerTransportFactory)));
-  }
+    serviceCollection.AddEventsAsTransient(Assembly.GetAssembly(typeof(TDocumentStore)));
+    serviceCollection.AddEventsAsTransient(Assembly.GetAssembly(typeof(IdleCallManager)));
+    serviceCollection.AddSingleton<IEventAggregator, EventAggregator>();
 
-  public static void RegisterTopLevelExceptionHandler(this IServiceCollection serviceCollection)
-  {
     serviceCollection.AddSingleton<IBinding, TopLevelExceptionHandlerBinding>(sp =>
       sp.GetRequiredService<TopLevelExceptionHandlerBinding>()
     );
     serviceCollection.AddSingleton<TopLevelExceptionHandlerBinding>();
-    serviceCollection.AddSingleton<ITopLevelExceptionHandler>(c =>
-      c.GetRequiredService<TopLevelExceptionHandlerBinding>().Parent.TopLevelExceptionHandler
-    );
+    serviceCollection.AddSingleton<ITopLevelExceptionHandler, TopLevelExceptionHandler>();
+    serviceCollection.AddTransient<ExceptionEvent>();
+  }
+
+  public static IServiceCollection AddEventsAsTransient(this IServiceCollection serviceCollection, Assembly assembly)
+  {
+    foreach (var type in assembly.ExportedTypes.Where(t => t.IsNonAbstractClass()))
+    {
+      if (type.FindInterfaces((i, _) => i == typeof(ISpeckleEvent), null).Length != 0)
+      {
+        serviceCollection.TryAddTransient(type);
+      }
+    }
+
+    return serviceCollection;
+  }
+
+  public static IServiceProvider UseDUI(this IServiceProvider serviceProvider, bool initializeDocumentStore = true)
+  {
+    //observe the unobserved!
+    TaskScheduler.UnobservedTaskException += async (_, args) =>
+    {
+      await serviceProvider
+        .GetRequiredService<IEventAggregator>()
+        .GetEvent<ExceptionEvent>()
+        .PublishAsync(args.Exception);
+      serviceProvider.GetRequiredService<ILogger>().LogError(args.Exception, "Unobserved task exception");
+      args.SetObserved();
+    };
+
+    if (initializeDocumentStore)
+    {
+      serviceProvider.GetRequiredService<DocumentModelStore>().OnDocumentStoreInitialized().Wait();
+    }
+
+    return serviceProvider;
   }
 }
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/DelegateReference.cs b/DUI3/Speckle.Connectors.DUI/Eventing/DelegateReference.cs
new file mode 100644
index 000000000..153b224e8
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/DelegateReference.cs
@@ -0,0 +1,76 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using Speckle.Sdk.Common;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public class DelegateReference
+{
+  private readonly WeakReference<object>? _weakReference;
+  private readonly MethodInfo _method;
+  private readonly Type _delegateType;
+
+  public DelegateReference(Delegate @delegate, EventFeatures features)
+  {
+    var target = @delegate.Target;
+    _method = @delegate.Method;
+    var messageType = @delegate.Method.GetParameters()[0].ParameterType;
+    if (features.HasFlag(EventFeatures.IsAsync))
+    {
+      _delegateType = typeof(Func<,>).MakeGenericType(messageType, typeof(Task));
+    }
+    else
+    {
+      _delegateType = typeof(Action<>).MakeGenericType(messageType);
+    }
+    if (target != null)
+    {
+      //anonymous methods are always strong....should we do this? - doing a brief search says yes
+      if (
+        features.HasFlag(EventFeatures.ForceStrongReference)
+        || Attribute.IsDefined(_method.DeclaringType.NotNull(), typeof(CompilerGeneratedAttribute))
+      )
+      {
+        throw new EventSubscriptionException("Cannot subscribe to a delegate that was generated by the compiler.");
+      }
+
+      _weakReference = new WeakReference<object>(target);
+    }
+    else
+    {
+      _weakReference = null;
+    }
+  }
+
+  public async Task<bool> Invoke(object message)
+  {
+    if (_weakReference == null)
+    {
+      var method = Delegate.CreateDelegate(_delegateType, null, _method);
+
+      var task = method.DynamicInvoke(message) as Task;
+
+      if (task is not null)
+      {
+        await task;
+      }
+
+      return true;
+    }
+    if (!_weakReference.TryGetTarget(out object target))
+    {
+      return false;
+    }
+
+    var method2 = Delegate.CreateDelegate(_delegateType, target, _method);
+
+    var task2 = method2.DynamicInvoke(message) as Task;
+
+    if (task2 is not null)
+    {
+      await task2;
+    }
+
+    return true;
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/EventAggregator.cs b/DUI3/Speckle.Connectors.DUI/Eventing/EventAggregator.cs
new file mode 100644
index 000000000..eea2f87ac
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/EventAggregator.cs
@@ -0,0 +1,31 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public interface IEventAggregator
+{
+  TEventType GetEvent<TEventType>()
+    where TEventType : EventBase;
+}
+
+//based on Prism.Events at verison 8
+// which was MIT https://github.com/PrismLibrary/Prism/tree/952e343f585b068ccb7d3478d3982485253a0508/src/Prism.Events
+// License https://github.com/PrismLibrary/Prism/blob/952e343f585b068ccb7d3478d3982485253a0508/LICENSE
+public class EventAggregator(IServiceProvider serviceProvider) : IEventAggregator
+{
+  private readonly Dictionary<Type, EventBase> _events = new();
+
+  public TEventType GetEvent<TEventType>()
+    where TEventType : EventBase
+  {
+    lock (_events)
+    {
+      if (!_events.TryGetValue(typeof(TEventType), out var existingEvent))
+      {
+        existingEvent = (TEventType)serviceProvider.GetRequiredService(typeof(TEventType));
+        _events[typeof(TEventType)] = existingEvent;
+      }
+      return (TEventType)existingEvent;
+    }
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/EventBase.cs b/DUI3/Speckle.Connectors.DUI/Eventing/EventBase.cs
new file mode 100644
index 000000000..09911fbb0
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/EventBase.cs
@@ -0,0 +1,84 @@
+namespace Speckle.Connectors.DUI.Eventing;
+
+///<summary>
+/// Defines a base class to publish and subscribe to events.
+///</summary>
+public abstract class EventBase
+{
+  private readonly List<IEventSubscription> _subscriptions = new();
+
+  protected SubscriptionToken InternalSubscribe(IEventSubscription eventSubscription)
+  {
+    lock (_subscriptions)
+    {
+      _subscriptions.Add(eventSubscription);
+    }
+    return eventSubscription.SubscriptionToken;
+  }
+
+  protected async Task InternalPublish(params object[] arguments)
+  {
+    var executionStrategies = PruneAndReturnStrategies();
+    foreach (var executionStrategy in executionStrategies)
+    {
+      await executionStrategy(arguments);
+    }
+  }
+
+  private IEnumerable<Func<object[], Task>> PruneAndReturnStrategies()
+  {
+    lock (_subscriptions)
+    {
+      for (var i = _subscriptions.Count - 1; i >= 0; i--)
+      {
+        var listItem = _subscriptions[i].GetExecutionStrategy();
+
+        if (listItem == null)
+        {
+          // Prune from main list. Log?
+          _subscriptions.RemoveAt(i);
+        }
+        else
+        {
+          yield return listItem;
+        }
+      }
+    }
+  }
+
+  public void Unsubscribe(SubscriptionToken token)
+  {
+    lock (_subscriptions)
+    {
+      IEventSubscription? subscription = _subscriptions.FirstOrDefault(evt => evt.SubscriptionToken.Equals(token));
+      if (subscription != null)
+      {
+        _subscriptions.Remove(subscription);
+        token.Unsubscribe(); //calling dispose is circular
+      }
+    }
+  }
+
+  public bool Contains(SubscriptionToken token)
+  {
+    lock (_subscriptions)
+    {
+      IEventSubscription subscription = _subscriptions.FirstOrDefault(evt => evt.SubscriptionToken == token);
+      return subscription != null;
+    }
+  }
+
+  public void Prune()
+  {
+    lock (_subscriptions)
+    {
+      for (var i = _subscriptions.Count - 1; i >= 0; i--)
+      {
+        if (_subscriptions[i].GetExecutionStrategy() == null)
+        {
+          _subscriptions.RemoveAt(i);
+        }
+      }
+    }
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/EventFeatures.cs b/DUI3/Speckle.Connectors.DUI/Eventing/EventFeatures.cs
new file mode 100644
index 000000000..95b9cb6bc
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/EventFeatures.cs
@@ -0,0 +1,11 @@
+// ReSharper disable InconsistentNaming
+namespace Speckle.Connectors.DUI.Eventing;
+
+[Flags]
+public enum EventFeatures
+{
+  None = 0,
+  OneTime = 1,
+  IsAsync = 2,
+  ForceStrongReference = 4
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscription.cs b/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscription.cs
new file mode 100644
index 000000000..4f38e3741
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscription.cs
@@ -0,0 +1,54 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public class EventSubscription<TPayload>(
+  DelegateReference actionReference,
+  IThreadContext threadContext,
+  ITopLevelExceptionHandler exceptionHandler,
+  SubscriptionToken token,
+  ThreadOption threadOption,
+  EventFeatures features
+) : IEventSubscription
+  where TPayload : notnull
+{
+  public SubscriptionToken SubscriptionToken => token;
+
+  public Func<object[], Task>? GetExecutionStrategy() =>
+    async arguments =>
+    {
+      TPayload argument = (TPayload)arguments[0];
+      await InvokeAction(argument);
+    };
+
+  private async Task InvokeAction(TPayload argument)
+  {
+    switch (threadOption)
+    {
+      case ThreadOption.MainThread:
+        await threadContext.RunOnMainAsync(() => Invoke(argument));
+        break;
+      case ThreadOption.WorkerThread:
+        await threadContext.RunOnWorkerAsync(() => Invoke(argument));
+        break;
+      case ThreadOption.PublisherThread:
+      default:
+        await Invoke(argument);
+        break;
+    }
+  }
+
+  private async Task Invoke(TPayload argument) =>
+    await exceptionHandler.CatchUnhandledAsync(async () =>
+    {
+      if (!(await actionReference.Invoke(argument)))
+      {
+        SubscriptionToken.Dispose();
+      }
+      else if (features.HasFlag(EventFeatures.OneTime))
+      {
+        SubscriptionToken.Dispose();
+      }
+    });
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscriptionException.cs b/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscriptionException.cs
new file mode 100644
index 000000000..e0fe936d6
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/EventSubscriptionException.cs
@@ -0,0 +1,14 @@
+using Speckle.Sdk;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public class EventSubscriptionException : SpeckleException
+{
+  public EventSubscriptionException(string message)
+    : base(message) { }
+
+  public EventSubscriptionException() { }
+
+  public EventSubscriptionException(string message, Exception innerException)
+    : base(message, innerException) { }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/Events.cs b/DUI3/Speckle.Connectors.DUI/Eventing/Events.cs
new file mode 100644
index 000000000..05c3cc59d
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/Events.cs
@@ -0,0 +1,13 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public class ExceptionEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<Exception>(threadContext, exceptionHandler);
+
+public class DocumentStoreChangedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : ThreadedEvent<object>(threadContext, exceptionHandler);
+
+public class IdleEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : OneTimeThreadedEvent<object>(threadContext, exceptionHandler);
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/IEventSubscription.cs b/DUI3/Speckle.Connectors.DUI/Eventing/IEventSubscription.cs
new file mode 100644
index 000000000..64286c1d9
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/IEventSubscription.cs
@@ -0,0 +1,8 @@
+namespace Speckle.Connectors.DUI.Eventing;
+
+public interface IEventSubscription
+{
+  SubscriptionToken SubscriptionToken { get; }
+
+  Func<object[], Task>? GetExecutionStrategy();
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/ISpeckleEvent.cs b/DUI3/Speckle.Connectors.DUI/Eventing/ISpeckleEvent.cs
new file mode 100644
index 000000000..0d8e00cc1
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/ISpeckleEvent.cs
@@ -0,0 +1,6 @@
+namespace Speckle.Connectors.DUI.Eventing;
+
+public interface ISpeckleEvent
+{
+  string Name { get; }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/OneTimeThreadedEvent.cs b/DUI3/Speckle.Connectors.DUI/Eventing/OneTimeThreadedEvent.cs
new file mode 100644
index 000000000..85a19eae0
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/OneTimeThreadedEvent.cs
@@ -0,0 +1,76 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public abstract class OneTimeThreadedEvent<T>(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : SpeckleEvent<T>(threadContext, exceptionHandler)
+  where T : notnull
+{
+  private readonly Dictionary<string, SubscriptionToken> _activeTokens = new();
+
+  public SubscriptionToken OneTimeSubscribe(
+    string id,
+    Func<T, Task> action,
+    ThreadOption threadOption = ThreadOption.PublisherThread
+  )
+  {
+    lock (_activeTokens)
+    {
+      if (_activeTokens.TryGetValue(id, out var token))
+      {
+        if (token.IsActive)
+        {
+          return token;
+        }
+        _activeTokens.Remove(id);
+      }
+      token = Subscribe(action, threadOption, EventFeatures.OneTime | EventFeatures.IsAsync);
+      _activeTokens.Add(id, token);
+      return token;
+    }
+  }
+
+  public SubscriptionToken OneTimeSubscribe(
+    string id,
+    Action<T> action,
+    ThreadOption threadOption = ThreadOption.PublisherThread
+  )
+  {
+    lock (_activeTokens)
+    {
+      if (_activeTokens.TryGetValue(id, out var token))
+      {
+        if (token.IsActive)
+        {
+          return token;
+        }
+        _activeTokens.Remove(id);
+      }
+      token = Subscribe(action, threadOption, EventFeatures.OneTime);
+      _activeTokens.Add(id, token);
+      return token;
+    }
+  }
+
+  public async Task PublishAsync(T payload)
+  {
+    SubscriptionToken[] tokensToDestory = [];
+    lock (_activeTokens)
+    {
+      if (_activeTokens.Count > 0)
+      {
+        tokensToDestory = _activeTokens.Values.ToArray();
+        _activeTokens.Clear();
+      }
+    }
+    await InternalPublish(payload);
+    if (tokensToDestory.Length > 0)
+    {
+      foreach (var token in tokensToDestory)
+      {
+        token.Dispose();
+      }
+    }
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/PeriodicThreadedEvent.cs b/DUI3/Speckle.Connectors.DUI/Eventing/PeriodicThreadedEvent.cs
new file mode 100644
index 000000000..4ed436e32
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/PeriodicThreadedEvent.cs
@@ -0,0 +1,47 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public abstract class PeriodicThreadedEvent(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : SpeckleEvent<object>(threadContext, exceptionHandler)
+{
+  public SubscriptionToken SubscribePeriodic(
+    TimeSpan period,
+    Func<object, Task> action,
+    ThreadOption threadOption = ThreadOption.PublisherThread
+  )
+  {
+    var token = Subscribe(action, threadOption, EventFeatures.IsAsync);
+    StartPeriodic(token, period);
+    return token;
+  }
+
+  public SubscriptionToken SubscribePeriodic(
+    TimeSpan period,
+    Action<object> action,
+    ThreadOption threadOption = ThreadOption.PublisherThread
+  )
+  {
+    var token = Subscribe(action, threadOption, EventFeatures.None);
+    StartPeriodic(token, period);
+    return token;
+  }
+
+  private void StartPeriodic(SubscriptionToken token, TimeSpan period) =>
+    Task
+      .Factory.StartNew(
+        async () =>
+        {
+          while (token.IsActive)
+          {
+            await Task.Delay(period);
+            await InternalPublish(new object());
+          }
+        },
+        default,
+        TaskCreationOptions.LongRunning,
+        TaskScheduler.Current
+      )
+      .Wait();
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/SpeckleEvent.cs b/DUI3/Speckle.Connectors.DUI/Eventing/SpeckleEvent.cs
new file mode 100644
index 000000000..d427b3250
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/SpeckleEvent.cs
@@ -0,0 +1,49 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+using Speckle.Sdk.Common;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public abstract class SpeckleEvent<T>(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : EventBase,
+    ISpeckleEvent
+  where T : notnull
+{
+  public string Name { get; } = typeof(T).Name;
+
+  protected SubscriptionToken Subscribe(Func<T, Task> action, ThreadOption threadOption, EventFeatures features)
+  {
+    ValidateDelegate(action);
+    features |= EventFeatures.IsAsync;
+    var actionReference = new DelegateReference(action, features);
+    return Subscribe(actionReference, threadOption, features);
+  }
+
+  protected SubscriptionToken Subscribe(Action<T> action, ThreadOption threadOption, EventFeatures features)
+  {
+    var actionReference = new DelegateReference(action, features);
+    return Subscribe(actionReference, threadOption, features);
+  }
+
+  private void ValidateDelegate(Delegate @delegate)
+  {
+    if (Attribute.IsDefined(@delegate.Method.DeclaringType.NotNull(), typeof(CompilerGeneratedAttribute)))
+    {
+      throw new EventSubscriptionException("Cannot subscribe to a delegate that was generated by the compiler.");
+    }
+  }
+
+  [SuppressMessage("Reliability", "CA2000:Dispose objects before losing scope")]
+  private SubscriptionToken Subscribe(
+    DelegateReference actionReference,
+    ThreadOption threadOption,
+    EventFeatures features
+  )
+  {
+    EventSubscription<T> subscription =
+      new(actionReference, threadContext, exceptionHandler, new(Unsubscribe), threadOption, features);
+    return InternalSubscribe(subscription);
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/SubscriptionToken.cs b/DUI3/Speckle.Connectors.DUI/Eventing/SubscriptionToken.cs
new file mode 100644
index 000000000..72ba66afc
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/SubscriptionToken.cs
@@ -0,0 +1,58 @@
+namespace Speckle.Connectors.DUI.Eventing;
+
+//based on Prism.Events
+public sealed class SubscriptionToken(Action<SubscriptionToken> unsubscribeAction)
+  : IEquatable<SubscriptionToken>,
+    IDisposable
+{
+  private readonly Guid _token = Guid.NewGuid();
+  private Action<SubscriptionToken>? _unsubscribeAction = unsubscribeAction;
+
+  public bool Equals(SubscriptionToken? other)
+  {
+    if (other == null)
+    {
+      return false;
+    }
+
+    return Equals(_token, other._token);
+  }
+
+  public override bool Equals(object? obj)
+  {
+    if (ReferenceEquals(this, obj))
+    {
+      return true;
+    }
+
+    return Equals(obj as SubscriptionToken);
+  }
+
+  public override int GetHashCode() => _token.GetHashCode();
+
+  public bool IsActive => _unsubscribeAction != null;
+
+  public void Unsubscribe() => _unsubscribeAction = null;
+
+  ~SubscriptionToken() => Dispose(false);
+
+  public void Dispose()
+  {
+    Dispose(true);
+    GC.SuppressFinalize(this);
+  }
+
+  private void Dispose(bool isDisposing)
+  {
+    // While the SubscriptionToken class implements IDisposable, in the case of weak subscriptions
+    // (i.e. keepSubscriberReferenceAlive set to false in the Subscribe method) it's not necessary to unsubscribe,
+    // as no resources should be kept alive by the event subscription.
+    // In such cases, if a warning is issued, it could be suppressed.
+
+    if (isDisposing && _unsubscribeAction != null)
+    {
+      _unsubscribeAction(this);
+      Unsubscribe();
+    }
+  }
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/ThreadOption.cs b/DUI3/Speckle.Connectors.DUI/Eventing/ThreadOption.cs
new file mode 100644
index 000000000..6866be71e
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/ThreadOption.cs
@@ -0,0 +1,8 @@
+namespace Speckle.Connectors.DUI.Eventing;
+
+public enum ThreadOption
+{
+  PublisherThread,
+  MainThread,
+  WorkerThread
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Eventing/ThreadedEvent.cs b/DUI3/Speckle.Connectors.DUI/Eventing/ThreadedEvent.cs
new file mode 100644
index 000000000..080055277
--- /dev/null
+++ b/DUI3/Speckle.Connectors.DUI/Eventing/ThreadedEvent.cs
@@ -0,0 +1,17 @@
+using Speckle.Connectors.Common.Threading;
+using Speckle.Connectors.DUI.Bridge;
+
+namespace Speckle.Connectors.DUI.Eventing;
+
+public abstract class ThreadedEvent<T>(IThreadContext threadContext, ITopLevelExceptionHandler exceptionHandler)
+  : SpeckleEvent<T>(threadContext, exceptionHandler)
+  where T : notnull
+{
+  public Task PublishAsync(T payload) => InternalPublish(payload);
+
+  public SubscriptionToken Subscribe(Func<T, Task> action, ThreadOption threadOption = ThreadOption.PublisherThread) =>
+    Subscribe(action, threadOption, EventFeatures.IsAsync);
+
+  public SubscriptionToken Subscribe(Action<T> action, ThreadOption threadOption = ThreadOption.PublisherThread) =>
+    Subscribe(action, threadOption, EventFeatures.None);
+}
diff --git a/DUI3/Speckle.Connectors.DUI/Models/DocumentModelStore.cs b/DUI3/Speckle.Connectors.DUI/Models/DocumentModelStore.cs
index 62c4a7984..b42cd2a0e 100644
--- a/DUI3/Speckle.Connectors.DUI/Models/DocumentModelStore.cs
+++ b/DUI3/Speckle.Connectors.DUI/Models/DocumentModelStore.cs
@@ -13,12 +13,6 @@ public abstract class DocumentModelStore(IJsonSerializer serializer)
 {
   private readonly List<ModelCard> _models = new();
 
-  /// <summary>
-  /// This event is triggered by each specific host app implementation of the document model store.
-  /// </summary>
-  // POC: unsure about the PublicAPI annotation, unsure if this changed handle should live here on the store...  :/
-  public event EventHandler? DocumentChanged;
-
   //needed for javascript UI
   public IReadOnlyList<ModelCard> Models
   {
@@ -31,6 +25,8 @@ public IReadOnlyList<ModelCard> Models
     }
   }
 
+  public virtual Task OnDocumentStoreInitialized() => Task.CompletedTask;
+
   public virtual bool IsDocumentInit { get; set; }
 
   // TODO: not sure about this, throwing an exception, needs some thought...
@@ -88,8 +84,6 @@ public void RemoveModel(ModelCard model)
     }
   }
 
-  protected void OnDocumentChanged() => DocumentChanged?.Invoke(this, EventArgs.Empty);
-
   public IEnumerable<SenderModelCard> GetSenders()
   {
     lock (_models)
diff --git a/DUI3/Speckle.Connectors.DUI/packages.lock.json b/DUI3/Speckle.Connectors.DUI/packages.lock.json
index 5a2313abd..008d88d6e 100644
--- a/DUI3/Speckle.Connectors.DUI/packages.lock.json
+++ b/DUI3/Speckle.Connectors.DUI/packages.lock.json
@@ -50,26 +50,26 @@
       },
       "Speckle.Sdk": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       },
       "GraphQL.Client": {
         "type": "Transitive",
@@ -205,11 +205,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -314,9 +309,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -343,13 +338,19 @@
           "Microsoft.Extensions.Options": "2.2.0"
         }
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       }
     }
diff --git a/Directory.Build.props b/Directory.Build.props
index 858928479..c3487fd78 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
     <EnableWindowsTargeting>true</EnableWindowsTargeting> <!-- windows packs for .net core  -->
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
   </PropertyGroup>
-  
+
   <PropertyGroup Label="Analyers">
     <EnableNetAnalyzers>true</EnableNetAnalyzers>
     <AnalysisLevel>latest-AllEnabledByDefault</AnalysisLevel>
@@ -19,7 +19,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    
+
     <!-- Ingored warnings, some aspirational but too noisy for now, some by design.  -->
     <NoWarn>
       <!--Disabled by design-->
@@ -43,19 +43,19 @@
     <RepositoryType>git</RepositoryType>
     <!-- Expose the repository root to all projects -->
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
-    
+
   </PropertyGroup>
-  
+
   <ItemGroup>
     <!-- This file contains the configuration for some analyzer warnings, such as cyclomatic
 complexity threshold -->
     <AdditionalFiles Include="$(RepositoryRoot)CodeMetricsConfig.txt"/>
   </ItemGroup>
-  
+
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
-  
+
   <PropertyGroup>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6a648e78a..c55d6efa0 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,56 +1,58 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Ara3D.Buffers" Version="1.4.5" />
-    <PackageVersion Include="Ara3D.Logging" Version="1.4.5" />
-    <PackageVersion Include="Ara3D.Utils" Version="1.4.5" />
-    <PackageVersion Include="altcover" Version="8.9.3" />
-    <PackageVersion Include="Bullseye" Version="5.0.0" />
-    <PackageVersion Include="CefSharp.Wpf" Version="92.0.260" />
-    <PackageVersion Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.1" />
-    <PackageVersion Include="Glob" Version="1.1.9" />
-    <PackageVersion Include="ILRepack.FullAuto" Version="1.6.0" />
-    <PackageVersion Include="Moq" Version="4.20.70" />
-    <PackageVersion Include="Microsoft.Build" Version="17.11.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
-    <PackageVersion Include="NUnit" Version="4.1.0" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.2.0" />
-    <PackageVersion Include="NUnit3TestAdapter" version="4.6.0" />
-    <PackageVersion Include="Revit.Async" Version="2.1.1" />
-    <PackageVersion Include="RhinoCommon" Version="8.9.24194.18121" />
-    <PackageVersion Include="RhinoWindows" Version="8.9.24194.18121" />
-    <PackageVersion Include="Speckle.CSI.API" Version="2.4.0" />
-    <PackageVersion Include="Tekla.Structures.Dialog" Version="2024.0.4" PrivateAssets="all" IncludeAssets="compile; build" />
-    <PackageVersion Include="Tekla.Structures.Drawing" Version="2024.0.4" />
-    <PackageVersion Include="Tekla.Structures.Model" Version="2024.0.4" />
-    <PackageVersion Include="Tekla.Structures.Plugins" Version="2024.0.4" PrivateAssets="all" IncludeAssets="compile; build" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
-    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" version="1.9.0" />
-    <PackageVersion Include="Serilog" Version="4.0.1" />
-    <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
-    <PackageVersion Include="Speckle.AutoCAD.API" Version="2022.0.2" />
-    <PackageVersion Include="Speckle.Civil3D.API" Version="2022.0.2" />
-    <PackageVersion Include="Speckle.Revit.API" Version="2023.0.0" />
-    <PackageVersion Include="Speckle.Navisworks.API" Version="2024.0.0" />
-    <PackageVersion Include="Speckle.Revit2022.Fakes" Version="0.3.1" />
-    <PackageVersion Include="Speckle.Revit2023.Fakes" Version="0.3.1" />
-    <PackageVersion Include="Speckle.Revit2024.Fakes" Version="0.3.1" />
-    <PackageVersion Include="Speckle.Rhino7.Fakes" Version="0.3.1" />
-    <PackageVersion Include="Speckle.Objects" Version="3.1.0-dev.228" />
-    <PackageVersion Include="Speckle.Sdk" Version="3.1.0-dev.228" />
-    <PackageVersion Include="Speckle.Sdk.Dependencies" Version="3.1.0-dev.228" />
-    <PackageVersion Include="SimpleExec" Version="12.0.0" />
-    <GlobalPackageReference Include="PolySharp" Version="1.14.1" />
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <GlobalPackageReference Include="Speckle.InterfaceGenerator" Version="0.9.6" />
-    <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
+    <PackageVersion Include="Ara3D.Buffers" Version="1.4.5"/>
+    <PackageVersion Include="Ara3D.Logging" Version="1.4.5"/>
+    <PackageVersion Include="Ara3D.Utils" Version="1.4.5"/>
+    <PackageVersion Include="altcover" Version="8.9.3"/>
+    <PackageVersion Include="Bullseye" Version="5.0.0"/>
+    <PackageVersion Include="CefSharp.Wpf" Version="92.0.260"/>
+    <PackageVersion Include="Esri.ArcGISPro.Extensions30" Version="3.2.0.49743"/>
+    <PackageVersion Include="FluentAssertions" Version="6.12.1"/>
+    <PackageVersion Include="Glob" Version="1.1.9"/>
+    <PackageVersion Include="ILRepack.FullAuto" Version="1.6.0"/>
+    <PackageVersion Include="Moq" Version="4.20.70"/>
+    <PackageVersion Include="Microsoft.Build" Version="17.11.4"/>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="2.2.0"/>
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0"/>
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0"/>
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1938.49"/>
+    <PackageVersion Include="NUnit" Version="4.1.0"/>
+    <PackageVersion Include="NUnit.Analyzers" Version="4.2.0"/>
+    <PackageVersion Include="NUnit3TestAdapter" version="4.6.0"/>
+    <PackageVersion Include="Revit.Async" Version="2.1.1"/>
+    <PackageVersion Include="RhinoCommon" Version="8.9.24194.18121"/>
+    <PackageVersion Include="RhinoWindows" Version="8.9.24194.18121"/>
+    <PackageVersion Include="Speckle.CSI.API" Version="2.4.0"/>
+    <PackageVersion Include="Speckle.DoubleNumerics" Version="4.1.0" />
+    <PackageVersion Include="Speckle.Triangle" Version="1.0.0" />
+    <PackageVersion Include="Tekla.Structures.Dialog" Version="2024.0.4" PrivateAssets="all" IncludeAssets="compile; build"/>
+    <PackageVersion Include="Tekla.Structures.Drawing" Version="2024.0.4"/>
+    <PackageVersion Include="Tekla.Structures.Model" Version="2024.0.4"/>
+    <PackageVersion Include="Tekla.Structures.Plugins" Version="2024.0.4" PrivateAssets="all" IncludeAssets="compile; build"/>
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" version="1.9.0"/>
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" version="1.9.0"/>
+    <PackageVersion Include="Serilog" Version="4.0.1"/>
+    <PackageVersion Include="Serilog.Exceptions" Version="8.4.0"/>
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0"/>
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>
+    <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0"/>
+    <PackageVersion Include="Speckle.AutoCAD.API" Version="2022.0.2"/>
+    <PackageVersion Include="Speckle.Civil3D.API" Version="2022.0.2"/>
+    <PackageVersion Include="Speckle.Revit.API" Version="2023.0.0"/>
+    <PackageVersion Include="Speckle.Navisworks.API" Version="2024.0.0"/>
+    <PackageVersion Include="Speckle.Revit2022.Fakes" Version="0.3.1"/>
+    <PackageVersion Include="Speckle.Revit2023.Fakes" Version="0.3.1"/>
+    <PackageVersion Include="Speckle.Revit2024.Fakes" Version="0.3.1"/>
+    <PackageVersion Include="Speckle.Rhino7.Fakes" Version="0.3.1"/>
+    <PackageVersion Include="Speckle.Objects" Version="3.1.0-dev.249"/>
+    <PackageVersion Include="Speckle.Sdk" Version="3.1.0-dev.249"/>
+    <PackageVersion Include="Speckle.Sdk.Dependencies" Version="3.1.0-dev.249"/>
+    <PackageVersion Include="SimpleExec" Version="12.0.0"/>
+    <GlobalPackageReference Include="PolySharp" Version="1.14.1"/>
+    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
+    <GlobalPackageReference Include="Speckle.InterfaceGenerator" Version="0.9.6"/>
+    <GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3"/>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs
index a8d0c4758..104befd98 100644
--- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs
+++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs
@@ -3,6 +3,7 @@
 using Ara3D.Utils;
 //using JetBrains.Profiler.SelfApi;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging.Abstractions;
 using Speckle.Importers.Ifc;
 using Speckle.Importers.Ifc.Ara3D.IfcParser;
 using Speckle.Importers.Ifc.Converters;
@@ -47,6 +48,8 @@
   new DummyServerObjectManager(),
   new BaseChildFinder(new BasePropertyGatherer()),
   new ObjectSerializerFactory(new BasePropertyGatherer()),
+  new NullLoggerFactory(),
+  default,
   new SerializeProcessOptions(SkipServer: true)
 );
 Console.WriteLine($"Caching to Speckle: {cache}");
@@ -56,7 +59,7 @@
 config.SaveToDir("C:\\Users\\adam\\dotTraceSnapshots");
 DotMemory.Attach(config);
 DotMemory.GetSnapshot("Before");*/
-var (rootId, _) = await process2.Serialize(b, default).ConfigureAwait(false);
+var (rootId, _) = await process2.Serialize(b).ConfigureAwait(false);
 Console.WriteLine(rootId);
 ms2 = stopwatch.ElapsedMilliseconds;
 Console.WriteLine($"Converted to JSON: {ms2 - ms} ms");
diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json
index 13a4b3737..7b6240f54 100644
--- a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json
+++ b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json
@@ -149,11 +149,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -216,8 +211,8 @@
           "Ara3D.Logging": "[1.4.5, )",
           "Ara3D.Utils": "[1.4.5, )",
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )"
         }
       },
       "Ara3D.Buffers": {
@@ -271,36 +266,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Import.cs b/Importers/Ifc/Speckle.Importers.Ifc/Import.cs
index b32fa2c2e..1f5e6a5ce 100644
--- a/Importers/Ifc/Speckle.Importers.Ifc/Import.cs
+++ b/Importers/Ifc/Speckle.Importers.Ifc/Import.cs
@@ -81,9 +81,10 @@ public static async Task<string> Ifc(
       streamId,
       token,
       progress,
+      default,
       new SerializeProcessOptions(true, true, true, false)
     );
-    var (rootId, _) = await process.Serialize(b, default).ConfigureAwait(false);
+    var (rootId, _) = await process.Serialize(b).ConfigureAwait(false);
     Account account =
       new()
       {
@@ -96,12 +97,12 @@ public static async Task<string> Ifc(
 
     // 8 - Create the version (commit)
     using var apiClient = clientFactory.Create(account);
-    var commitId = await apiClient.Version.Create(
+    var commit = await apiClient.Version.Create(
       new CreateVersionInput(rootId, modelId, streamId, message: commitMessage)
     );
     ms = ms2;
     ms2 = stopwatch.ElapsedMilliseconds;
     Console.WriteLine($"Committed to Speckle: {ms2 - ms} ms");
-    return commitId;
+    return commit.id;
   }
 }
diff --git a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json
index 5c6d2f6a8..8f9c368e6 100644
--- a/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json
+++ b/Importers/Ifc/Speckle.Importers.Ifc/packages.lock.json
@@ -68,27 +68,27 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -207,11 +207,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -285,11 +280,17 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Local.sln b/Local.sln
index bb623c542..0fdbf7b94 100644
--- a/Local.sln
+++ b/Local.sln
@@ -62,8 +62,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HostApps", "HostApps", "{42
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{59E8E8F3-4E42-4E92-83B3-B1C2AB901D18}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\ci.yml = .github\workflows\ci.yml
-		.github\workflows\main.yml = .github\workflows\main.yml
+		.github\workflows\pr.yml = .github\workflows\pr.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{CA8EAE01-AB9F-4EC1-B6F3-73721487E9E1}"
@@ -270,6 +270,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc", "Im
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{20BB9687-2C92-44E9-9E2F-9D2F45641354}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -691,6 +693,12 @@ Global
 		{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Local|Any CPU.Build.0 = Debug|Any CPU
 		{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Local|Any CPU.ActiveCfg = Debug|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Local|Any CPU.Build.0 = Debug|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -814,6 +822,7 @@ Global
 		{0EF6C4D6-AC76-408F-8D32-2F9DA8006077} = {24750B06-C90D-43B1-B2E4-088D531D6748}
 		{9FD99F9B-8D50-4C7A-B3A6-22E28AB5F26B} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077}
 		{B3B126CA-A419-48D1-B117-6DEE1DE1AFAD} = {0EF6C4D6-AC76-408F-8D32-2F9DA8006077}
+		{20BB9687-2C92-44E9-9E2F-9D2F45641354} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EE253116-7070-4E9A-BCE8-2911C251B8C8}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/BaseTransformer.cs b/Sdk/Speckle.Common.MeshTriangulation/BaseTransformer.cs
new file mode 100644
index 000000000..accc077cb
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/BaseTransformer.cs
@@ -0,0 +1,120 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public class BaseTransformer : IBaseTransformer
+{
+  private Matrix4x4 _2DTo3DMatrix;
+  private Matrix4x4 _3DTo2DMatrix;
+  private double _zOffset;
+
+  // creates a target coordinate system, where the Z axis is the plane normal
+  public void SetTargetPlane(Poly3 plane)
+  {
+    Vector3 normal = plane.GetNormal();
+    var (xBasis, yBasis) = ComputeBasisVectors(normal);
+
+    _2DTo3DMatrix = GetTransformationMatrix(xBasis, yBasis, normal);
+    Matrix4x4.Invert(_2DTo3DMatrix, out _3DTo2DMatrix);
+
+    var transformedVertex = Vector3.Transform(plane.Vertices[0], _3DTo2DMatrix);
+    _zOffset = transformedVertex.Z;
+  }
+
+  public Vector3 Vec2ToVec3(Vector2 vec2)
+  {
+    return Vector3.Transform(new Vector3(vec2.X, vec2.Y, _zOffset), _2DTo3DMatrix);
+  }
+
+  public Vector2 Vec3ToVec2(Vector3 vec3)
+  {
+    var transformedVertex = Vector3.Transform(vec3, _3DTo2DMatrix);
+    return new Vector2(transformedVertex.X, transformedVertex.Y);
+  }
+
+  public Poly3 Poly2ToPoly3(Poly2 poly2)
+  {
+    var poly3 = new Poly3();
+
+    foreach (var vertex in poly2.Vertices)
+    {
+      poly3.Vertices.Add(Vec2ToVec3(vertex));
+    }
+
+    return poly3;
+  }
+
+  public Poly2 Poly3ToPoly2(Poly3 poly3)
+  {
+    var poly2 = new Poly2();
+
+    foreach (var vertex in poly3.Vertices)
+    {
+      poly2.Vertices.Add(Vec3ToVec2(vertex));
+    }
+
+    return poly2;
+  }
+
+  public Mesh3 Mesh2ToMesh3(Mesh2 mesh2)
+  {
+    var vertices = new List<Vector3>();
+    foreach (var vertex in mesh2.Vertices)
+    {
+      vertices.Add(Vec2ToVec3(vertex));
+    }
+
+    return new Mesh3(vertices, new List<int>(mesh2.Triangles));
+  }
+
+  public Mesh2 Mesh3ToMesh2(Mesh3 mesh3)
+  {
+    var vertices = new List<Vector2>();
+    foreach (var vertex in mesh3.Vertices)
+    {
+      vertices.Add(Vec3ToVec2(vertex));
+    }
+
+    return new Mesh2(vertices, new List<int>(mesh3.Triangles));
+  }
+
+  private (Vector3 xBasis, Vector3 yBasis) ComputeBasisVectors(Vector3 normal)
+  {
+    // We need two arbitrary orthogonal vectors in the polygon plane
+    // Find an arbitrary vector not parallel to the normal
+    Vector3 arbitrary = Vector3.UnitZ;
+    var angle = Vector3.Dot(normal, arbitrary);
+    if (Math.Abs(angle) > 0.99f)
+    {
+      arbitrary = Vector3.UnitY;
+    }
+
+    // Compute the X and Y basis vectors
+    Vector3 xBasis = Vector3.Normalize(Vector3.Cross(normal, arbitrary));
+    Vector3 yBasis = Vector3.Normalize(Vector3.Cross(normal, xBasis));
+
+    return (xBasis, yBasis);
+  }
+
+  private Matrix4x4 GetTransformationMatrix(Vector3 xBasis, Vector3 yBasis, Vector3 normal)
+  {
+    return new Matrix4x4(
+      xBasis.X,
+      xBasis.Y,
+      xBasis.Z,
+      0,
+      yBasis.X,
+      yBasis.Y,
+      yBasis.Z,
+      0,
+      normal.X,
+      normal.Y,
+      normal.Z,
+      0,
+      0,
+      0,
+      0,
+      1
+    );
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/IBaseTransformer.cs b/Sdk/Speckle.Common.MeshTriangulation/IBaseTransformer.cs
new file mode 100644
index 000000000..7ec380536
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/IBaseTransformer.cs
@@ -0,0 +1,14 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public interface IBaseTransformer
+{
+  void SetTargetPlane(Poly3 plane);
+  Vector2 Vec3ToVec2(Vector3 vec3);
+  Vector3 Vec2ToVec3(Vector2 vec2);
+  Poly2 Poly3ToPoly2(Poly3 poly3);
+  Poly3 Poly2ToPoly3(Poly2 poly2);
+  Mesh2 Mesh3ToMesh2(Mesh3 mesh3);
+  Mesh3 Mesh2ToMesh3(Mesh2 mesh2);
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/ITriangulator.cs b/Sdk/Speckle.Common.MeshTriangulation/ITriangulator.cs
new file mode 100644
index 000000000..7c8be5f04
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/ITriangulator.cs
@@ -0,0 +1,6 @@
+namespace Speckle.Common.MeshTriangulation;
+
+public interface ITriangulator
+{
+  Mesh2 Triangulate(IReadOnlyList<Poly2> polygons);
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/Mesh2.cs b/Sdk/Speckle.Common.MeshTriangulation/Mesh2.cs
new file mode 100644
index 000000000..489074b60
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/Mesh2.cs
@@ -0,0 +1,20 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public readonly struct Mesh2
+{
+  public List<Vector2> Vertices { get; }
+  public List<int> Triangles { get; }
+
+  public Mesh2(List<Vector2> vertices, List<int> triangles)
+  {
+    Vertices = vertices ?? throw new ArgumentNullException(nameof(vertices));
+    Triangles = triangles ?? throw new ArgumentNullException(nameof(triangles));
+
+    if (triangles.Count % 3 != 0)
+    {
+      throw new ArgumentException("Triangles list must be divisible by 3, as each triangle requires 3 indices.");
+    }
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/Mesh3.cs b/Sdk/Speckle.Common.MeshTriangulation/Mesh3.cs
new file mode 100644
index 000000000..59dfe7bdb
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/Mesh3.cs
@@ -0,0 +1,20 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public readonly struct Mesh3
+{
+  public List<Vector3> Vertices { get; }
+  public List<int> Triangles { get; }
+
+  public Mesh3(List<Vector3> vertices, List<int> triangles)
+  {
+    Vertices = vertices ?? throw new ArgumentNullException(nameof(vertices));
+    Triangles = triangles ?? throw new ArgumentNullException(nameof(triangles));
+
+    if (triangles.Count % 3 != 0)
+    {
+      throw new ArgumentException("Triangles list must be divisible by 3, as each triangle requires 3 indices.");
+    }
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/MeshGenerator.cs b/Sdk/Speckle.Common.MeshTriangulation/MeshGenerator.cs
new file mode 100644
index 000000000..12206b118
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/MeshGenerator.cs
@@ -0,0 +1,121 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public sealed class MeshGenerator
+{
+  private readonly IBaseTransformer _baseTransformer;
+  private readonly ITriangulator _triangulator;
+
+  public MeshGenerator(IBaseTransformer baseTransformer, ITriangulator triangulator)
+  {
+    _baseTransformer = baseTransformer;
+    _triangulator = triangulator;
+  }
+
+  // creates a triangulated surface mesh from the given polygons
+  // each polygon has to contain at least 3 points
+  // the frist polygon is the contour of the mesh, it has to be clockwise
+  // the rest of the polygons define the holes, these have to be counterclockwise
+  public Mesh3 TriangulateSurface(IReadOnlyList<Poly3> polygons)
+  {
+    _baseTransformer.SetTargetPlane(polygons[0]);
+    var polygons2D = new List<Poly2>();
+    foreach (var polygon in polygons)
+    {
+      polygons2D.Add(_baseTransformer.Poly3ToPoly2(polygon));
+    }
+    var mesh2 = _triangulator.Triangulate(polygons2D);
+
+    return _baseTransformer.Mesh2ToMesh3(mesh2);
+  }
+
+  // creates an extruded triangle mesh from the given polygons
+  // each polygon has to contain at least 3 points
+  // the frist polygon is the contour of the mesh, it has to be clockwise
+  // the rest of the polygons define the holes, these have to be counterclockwise
+  // the mesh will be extruded in the normal direction by the given height
+  public Mesh3 ExtrudeMesh(IReadOnlyList<Poly3> polygons, double extrusionHeight)
+  {
+    if (polygons.Count < 3)
+    {
+      throw new ArgumentException("No polygon was provided for extrusion");
+    }
+
+    var vertices = new List<Vector3>();
+    var triangles = new List<int>();
+    var tc = 0;
+
+    var normal = polygons[0].GetNormal();
+    var offset = normal * extrusionHeight;
+
+    // the contour has to be clockwise and the holes have to be counterclockwise
+    // if any of the holes is clockwise then it has to be reversed
+    for (var i = 1; i < polygons.Count; i++)
+    {
+      var polyNormal = polygons[i].GetNormal();
+      if ((polyNormal + normal).Length() > 0.01f)
+      {
+        polygons[i].Reverse();
+      }
+    }
+
+    foreach (var polygon in polygons)
+    {
+      for (var curr = 0; curr < polygon.Vertices.Count; curr++)
+      {
+        var next = curr + 1;
+        if (next >= polygon.Vertices.Count)
+        {
+          next = 0;
+        }
+
+        var p1 = polygon.Vertices[curr];
+        var p2 = polygon.Vertices[next];
+        var p3 = polygon.Vertices[curr] + offset;
+
+        var p4 = polygon.Vertices[next];
+        var p5 = polygon.Vertices[next] + offset;
+        var p6 = polygon.Vertices[curr] + offset;
+
+        vertices.Add(p1);
+        vertices.Add(p2);
+        vertices.Add(p3);
+        vertices.Add(p4);
+        vertices.Add(p5);
+        vertices.Add(p6);
+
+        triangles.Add(tc++);
+        triangles.Add(tc++);
+        triangles.Add(tc++);
+        triangles.Add(tc++);
+        triangles.Add(tc++);
+        triangles.Add(tc++);
+      }
+    }
+
+    var cap = TriangulateSurface(polygons);
+
+    // Top cap triangles have to be in reverse order
+    for (var i = 0; i < cap.Vertices.Count; i += 3)
+    {
+      vertices.Add(cap.Vertices[i + 2]);
+      vertices.Add(cap.Vertices[i + 1]);
+      vertices.Add(cap.Vertices[i]);
+
+      triangles.Add(tc++);
+      triangles.Add(tc++);
+      triangles.Add(tc++);
+    }
+
+    // Bottom cap
+    foreach (var vertex in cap.Vertices)
+    {
+      var op = vertex + offset;
+      vertices.Add(op);
+      triangles.Add(tc++);
+    }
+
+    return new Mesh3(vertices, triangles);
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/Poly2.cs b/Sdk/Speckle.Common.MeshTriangulation/Poly2.cs
new file mode 100644
index 000000000..cc943fb1a
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/Poly2.cs
@@ -0,0 +1,18 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public readonly struct Poly2
+{
+  public List<Vector2> Vertices { get; }
+
+  public Poly2()
+  {
+    Vertices = new List<Vector2>();
+  }
+
+  public Poly2(List<Vector2> vertices)
+  {
+    Vertices = vertices ?? throw new ArgumentNullException(nameof(vertices));
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/Poly3.cs b/Sdk/Speckle.Common.MeshTriangulation/Poly3.cs
new file mode 100644
index 000000000..6475d2a93
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/Poly3.cs
@@ -0,0 +1,36 @@
+using Speckle.DoubleNumerics;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public readonly struct Poly3
+{
+  public List<Vector3> Vertices { get; }
+
+  public Poly3()
+  {
+    Vertices = new List<Vector3>();
+  }
+
+  public Poly3(List<Vector3> vertices)
+  {
+    Vertices = vertices ?? throw new ArgumentNullException(nameof(vertices));
+  }
+
+  // helper function, only works on polygons with at least 3 vertices
+  public Vector3 GetNormal()
+  {
+    if (Vertices.Count < 3)
+    {
+      throw new InvalidOperationException("Polygon must have at least 3 points to calculate a normal.");
+    }
+
+    var v1 = Vertices[1] - Vertices[0];
+    var v2 = Vertices[2] - Vertices[0];
+    return Vector3.Normalize(Vector3.Cross(v1, v2));
+  }
+
+  public void Reverse()
+  {
+    Vertices.Reverse();
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/Speckle.Common.MeshTriangulation.csproj b/Sdk/Speckle.Common.MeshTriangulation/Speckle.Common.MeshTriangulation.csproj
new file mode 100644
index 000000000..4e551b066
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/Speckle.Common.MeshTriangulation.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Speckle.DoubleNumerics" />
+    <PackageReference Include="Speckle.Triangle" />
+  </ItemGroup>
+
+</Project>
diff --git a/Sdk/Speckle.Common.MeshTriangulation/TriangleNetTriangulator.cs b/Sdk/Speckle.Common.MeshTriangulation/TriangleNetTriangulator.cs
new file mode 100644
index 000000000..9f57633f0
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/TriangleNetTriangulator.cs
@@ -0,0 +1,75 @@
+using Speckle.DoubleNumerics;
+using TriangleNet.Geometry;
+
+namespace Speckle.Common.MeshTriangulation;
+
+public class TriangleNetTriangulator : ITriangulator
+{
+  public Mesh2 Triangulate(IReadOnlyList<Poly2> polygons)
+  {
+    var poly = new Polygon();
+
+    AddContour(poly, polygons[0]);
+
+    for (int i = 1; i < polygons.Count; i++)
+    {
+      AddHole(poly, polygons[i]);
+    }
+
+    var mesh = poly.Triangulate();
+    var vertices = new List<Vector2>();
+    var triangles = new List<int>();
+    int tc = 0;
+
+    foreach (var triangle in mesh.Triangles)
+    {
+      var v1 = triangle.GetVertex(0);
+      var v2 = triangle.GetVertex(1);
+      var v3 = triangle.GetVertex(2);
+
+      vertices.Add(new Vector2(v1.X, v1.Y));
+      vertices.Add(new Vector2(v2.X, v2.Y));
+      vertices.Add(new Vector2(v3.X, v3.Y));
+
+      triangles.Add(tc++);
+      triangles.Add(tc++);
+      triangles.Add(tc++);
+    }
+
+    return new Mesh2(vertices, triangles);
+  }
+
+  private void AddContour(Polygon p, Poly2 poly2)
+  {
+    var verts = new List<Vertex>();
+    foreach (var v in poly2.Vertices)
+    {
+      verts.Add(new Vertex(v.X, v.Y, 1));
+    }
+
+    p.Add(new Contour(verts, 1));
+  }
+
+  private void AddHole(Polygon p, Poly2 poly2)
+  {
+    var verts = new List<Vertex>();
+    foreach (var v in poly2.Vertices)
+    {
+      verts.Add(new Vertex(v.X, v.Y, 2));
+    }
+
+    // we need a point inside the hole to add it
+    var pointInHole = GetRightPointOfEdge(poly2.Vertices[0], poly2.Vertices[1]);
+    p.Add(new Contour(verts, 2), new Point(pointInHole.X, pointInHole.Y));
+  }
+
+  // picks a point on the right side of the given edge
+  private Vector2 GetRightPointOfEdge(Vector2 a, Vector2 b)
+  {
+    Vector2 ab = b - a;
+    var normal = Vector2.Normalize(new Vector2(-ab.Y, ab.X));
+    var right = -0.01 * normal;
+    var midPoint = Vector2.Lerp(a, b, 0.5f);
+    return midPoint + right;
+  }
+}
diff --git a/Sdk/Speckle.Common.MeshTriangulation/packages.lock.json b/Sdk/Speckle.Common.MeshTriangulation/packages.lock.json
new file mode 100644
index 000000000..295816215
--- /dev/null
+++ b/Sdk/Speckle.Common.MeshTriangulation/packages.lock.json
@@ -0,0 +1,139 @@
+{
+  "version": 2,
+  "dependencies": {
+    ".NETStandard,Version=v2.0": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
+        }
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "NETStandard.Library": {
+        "type": "Direct",
+        "requested": "[2.0.3, )",
+        "resolved": "2.0.3",
+        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "1.1.0"
+        }
+      },
+      "PolySharp": {
+        "type": "Direct",
+        "requested": "[1.14.1, )",
+        "resolved": "1.14.1",
+        "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
+      },
+      "Speckle.DoubleNumerics": {
+        "type": "Direct",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
+      "Speckle.InterfaceGenerator": {
+        "type": "Direct",
+        "requested": "[0.9.6, )",
+        "resolved": "0.9.6",
+        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
+      },
+      "Speckle.Triangle": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.NETCore.Platforms": {
+        "type": "Transitive",
+        "resolved": "1.1.0",
+        "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A=="
+      },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      }
+    },
+    "net8.0": {
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net461": "1.0.3"
+        }
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[8.0.0, )",
+        "resolved": "8.0.0",
+        "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "8.0.0",
+          "Microsoft.SourceLink.Common": "8.0.0"
+        }
+      },
+      "PolySharp": {
+        "type": "Direct",
+        "requested": "[1.14.1, )",
+        "resolved": "1.14.1",
+        "contentHash": "mOOmFYwad3MIOL14VCjj02LljyF1GNw1wP0YVlxtcPvqdxjGGMNdNJJxHptlry3MOd8b40Flm8RPOM8JOlN2sQ=="
+      },
+      "Speckle.DoubleNumerics": {
+        "type": "Direct",
+        "requested": "[4.1.0, )",
+        "resolved": "4.1.0",
+        "contentHash": "20DtS+FsDRsOD9+AU3TwNFZ0qrKo5f6f7B5ZR9wStsIHHHC9k7DpjbCvuNtmnSjx54MD+TJC7wV2f5iyGVPj1A=="
+      },
+      "Speckle.InterfaceGenerator": {
+        "type": "Direct",
+        "requested": "[0.9.6, )",
+        "resolved": "0.9.6",
+        "contentHash": "HKH7tYrYYlCK1ct483hgxERAdVdMtl7gUKW9ijWXxA1UsYR4Z+TrRHYmzZ9qmpu1NnTycSrp005NYM78GDKV1w=="
+      },
+      "Speckle.Triangle": {
+        "type": "Direct",
+        "requested": "[1.0.0, )",
+        "resolved": "1.0.0",
+        "contentHash": "3fWYy5IG9EpkxvqSkRWtgWraYg7ylkg8Ea3WesIqAodjOySYzv+ntdcCP7EW7a5NB3nUhlp27woMAwyKFEF5XQ=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
+      },
+      "Microsoft.NETFramework.ReferenceAssemblies.net461": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "AmOJZwCqnOCNp6PPcf9joyogScWLtwy0M1WkqfEQ0M9nYwyDD7EX9ZjscKS5iYnyvteX7kzSKFCKt9I9dXA6mA=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "8.0.0",
+        "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/Sdk/Speckle.Connectors.Common/Builders/IRootObjectBuilder.cs b/Sdk/Speckle.Connectors.Common/Builders/IRootObjectBuilder.cs
index f1d9acff4..1a728fb44 100644
--- a/Sdk/Speckle.Connectors.Common/Builders/IRootObjectBuilder.cs
+++ b/Sdk/Speckle.Connectors.Common/Builders/IRootObjectBuilder.cs
@@ -1,4 +1,4 @@
-using Speckle.Connectors.Common.Conversion;
+using Speckle.Connectors.Common.Conversion;
 using Speckle.Connectors.Common.Operations;
 using Speckle.Sdk.Models;
 
diff --git a/Sdk/Speckle.Connectors.Common/Operations/ProxyKeys.cs b/Sdk/Speckle.Connectors.Common/Operations/ProxyKeys.cs
index a0abff694..d82612751 100644
--- a/Sdk/Speckle.Connectors.Common/Operations/ProxyKeys.cs
+++ b/Sdk/Speckle.Connectors.Common/Operations/ProxyKeys.cs
@@ -8,4 +8,6 @@ public static class ProxyKeys
   public const string GROUP = "groupProxies";
   public const string PARAMETER_DEFINITIONS = "parameterDefinitions";
   public const string PROPERTYSET_DEFINITIONS = "propertySetDefinitions";
+  public const string MATERIAL = "materialProxies";
+  public const string SECTION = "sectionProxies";
 }
diff --git a/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs b/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs
index c131d0058..357e82566 100644
--- a/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs
+++ b/Sdk/Speckle.Connectors.Common/Operations/SendOperation.cs
@@ -48,7 +48,7 @@ public async Task<SendOperationResult> Execute(
     return new(rootObjId, convertedReferences, buildResult.ConversionResults);
   }
 
-  public async Task<SerializeProcessResults> Send(
+  private async Task<SerializeProcessResults> Send(
     Base commitObject,
     SendInfo sendInfo,
     IProgress<CardProgress> onOperationProgressed,
diff --git a/Sdk/Speckle.Connectors.Common/Threading/DefaultThreadContext.cs b/Sdk/Speckle.Connectors.Common/Threading/DefaultThreadContext.cs
index 1a56531ec..92c22902e 100644
--- a/Sdk/Speckle.Connectors.Common/Threading/DefaultThreadContext.cs
+++ b/Sdk/Speckle.Connectors.Common/Threading/DefaultThreadContext.cs
@@ -1,4 +1,4 @@
-namespace Speckle.Connectors.Common.Threading;
+namespace Speckle.Connectors.Common.Threading;
 
 public class DefaultThreadContext : ThreadContext
 {
diff --git a/Sdk/Speckle.Connectors.Common/Threading/ThreadContextExtensions.cs b/Sdk/Speckle.Connectors.Common/Threading/ThreadContextExtensions.cs
index b6dbf2c59..d0cb56029 100644
--- a/Sdk/Speckle.Connectors.Common/Threading/ThreadContextExtensions.cs
+++ b/Sdk/Speckle.Connectors.Common/Threading/ThreadContextExtensions.cs
@@ -1,4 +1,4 @@
-namespace Speckle.Connectors.Common.Threading;
+namespace Speckle.Connectors.Common.Threading;
 
 public static class ThreadContextExtensions
 {
diff --git a/Sdk/Speckle.Connectors.Common/packages.lock.json b/Sdk/Speckle.Connectors.Common/packages.lock.json
index 78874f8a1..d86c18ae6 100644
--- a/Sdk/Speckle.Connectors.Common/packages.lock.json
+++ b/Sdk/Speckle.Connectors.Common/packages.lock.json
@@ -53,35 +53,35 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       },
       "GraphQL.Client": {
         "type": "Transitive",
@@ -217,11 +217,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -341,6 +336,12 @@
         "requested": "[2.2.0, )",
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+      },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
       }
     },
     "net8.0": {
@@ -386,34 +387,34 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       },
       "GraphQL.Client": {
         "type": "Transitive",
@@ -531,11 +532,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -611,6 +607,12 @@
         "requested": "[2.2.0, )",
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
+      },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
       }
     }
   }
diff --git a/Sdk/Speckle.Connectors.Tests/packages.lock.json b/Sdk/Speckle.Connectors.Tests/packages.lock.json
index 2daff048b..49a55e861 100644
--- a/Sdk/Speckle.Connectors.Tests/packages.lock.json
+++ b/Sdk/Speckle.Connectors.Tests/packages.lock.json
@@ -236,11 +236,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -324,9 +319,9 @@
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Connectors.Logging": "[1.0.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )",
-          "Speckle.Sdk": "[3.1.0-dev.228, )",
-          "Speckle.Sdk.Dependencies": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )",
+          "Speckle.Sdk": "[3.1.0-dev.249, )",
+          "Speckle.Sdk.Dependencies": "[3.1.0-dev.249, )"
         }
       },
       "speckle.connectors.logging": {
@@ -366,36 +361,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json
index 0e9d82396..e76f61625 100644
--- a/Sdk/Speckle.Converters.Common.Tests/packages.lock.json
+++ b/Sdk/Speckle.Converters.Common.Tests/packages.lock.json
@@ -245,11 +245,6 @@
         "resolved": "13.0.1",
         "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -332,7 +327,7 @@
         "type": "Project",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "[2.2.0, )",
-          "Speckle.Objects": "[3.1.0-dev.228, )"
+          "Speckle.Objects": "[3.1.0-dev.249, )"
         }
       },
       "speckle.testing": {
@@ -360,36 +355,42 @@
         "resolved": "2.2.0",
         "contentHash": "B2WqEox8o+4KUOpL7rZPyh6qYjik8tHi2tN8Z9jZkHzED8ElYgZa/h6K+xliB435SqUcWT290Fr2aa8BtZjn8A=="
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Objects": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Sdk/Speckle.Converters.Common/packages.lock.json b/Sdk/Speckle.Converters.Common/packages.lock.json
index 96903d64f..57e906290 100644
--- a/Sdk/Speckle.Converters.Common/packages.lock.json
+++ b/Sdk/Speckle.Converters.Common/packages.lock.json
@@ -50,11 +50,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -191,11 +191,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -307,28 +302,34 @@
           "Microsoft.Extensions.Options": "2.2.0"
         }
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
-          "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+          "Microsoft.Bcl.AsyncInterfaces": "[5.0.0]",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     },
     "net8.0": {
@@ -371,11 +372,11 @@
       },
       "Speckle.Objects": {
         "type": "Direct",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "BxtORgyOorKHmvBUldyL7t747g3wgXPhkjIKi6qVWxhPxZqzswGf9jQD1GZL57dcWkZPgdQ/vmDsowq6K89T/w==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "PoBE+8+q16PGCqdl1WMUqHIV55H7wxzl0g5OHuriZRE4dQr34R4TpNCHVT1M7U5yZzpKPdxRwc6GAIKCfmh8/Q==",
         "dependencies": {
-          "Speckle.Sdk": "3.1.0-dev.228"
+          "Speckle.Sdk": "3.1.0-dev.249"
         }
       },
       "GraphQL.Client": {
@@ -494,11 +495,6 @@
         "resolved": "8.0.0",
         "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
       },
-      "Speckle.DoubleNumerics": {
-        "type": "Transitive",
-        "resolved": "4.0.1",
-        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
-      },
       "Speckle.Newtonsoft.Json": {
         "type": "Transitive",
         "resolved": "13.0.2",
@@ -566,27 +562,33 @@
           "Microsoft.Extensions.Options": "2.2.0"
         }
       },
+      "Speckle.DoubleNumerics": {
+        "type": "CentralTransitive",
+        "requested": "[4.1.0, )",
+        "resolved": "4.0.1",
+        "contentHash": "MzEQ1Im0zTja+tEsdRIk/WlPiKqb22NmTOJcR1ZKm/mz46pezyyID3/wRz6vJUELMpSLnG7LhsxBL+nxbr7V0w=="
+      },
       "Speckle.Sdk": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "2jb3t9KoYEeqGsGLuzR/O3GefG5cs+Zxcpq6dGmHuYLa3cw3nanGJ1X0UkiKFv1CcvZ+aNHPT36QoDVtNvWfow==",
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "ebSNFseiz4Htkwosh7hbdUALXEnOR3AoBWFOg59wSnb/PmbOretRw2BkeUt3dA2v1Errwg5jqJwU2CrkqU3NwA==",
         "dependencies": {
           "GraphQL.Client": "6.0.0",
           "Microsoft.CSharp": "4.7.0",
-          "Microsoft.Data.Sqlite": "7.0.5",
-          "Microsoft.Extensions.DependencyInjection.Abstractions": "2.2.0",
-          "Microsoft.Extensions.Logging": "2.2.0",
+          "Microsoft.Data.Sqlite": "[7.0.5]",
+          "Microsoft.Extensions.DependencyInjection.Abstractions": "[2.2.0]",
+          "Microsoft.Extensions.Logging": "[2.2.0]",
           "Speckle.DoubleNumerics": "4.0.1",
           "Speckle.Newtonsoft.Json": "13.0.2",
-          "Speckle.Sdk.Dependencies": "3.1.0-dev.228"
+          "Speckle.Sdk.Dependencies": "3.1.0-dev.249"
         }
       },
       "Speckle.Sdk.Dependencies": {
         "type": "CentralTransitive",
-        "requested": "[3.1.0-dev.228, )",
-        "resolved": "3.1.0-dev.228",
-        "contentHash": "Ul2flG1qAnpXYESNB2W4o3x7jxW3BFT2L/jdyO7lgsSVGiNhhVskaXVZXHvqGYwlu0y1J/fhFGANsc+1xnCoQA=="
+        "requested": "[3.1.0-dev.249, )",
+        "resolved": "3.1.0-dev.249",
+        "contentHash": "rQrawSfqMl/dgMglWibH6VmsosN6yImjzTzNg52dpTF0lMjaU05ZVL7vQ1lwl5up7iOFnPgGARILyl49XV8Zsw=="
       }
     }
   }
diff --git a/Speckle.Connectors.sln b/Speckle.Connectors.sln
index a767365d0..75e326535 100644
--- a/Speckle.Connectors.sln
+++ b/Speckle.Connectors.sln
@@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{85A13E
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DUI", "DUI", "{FD4D6594-D81E-456F-8F2E-35B09E04A755}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Revit", "Revit", "{D92751C8-1039-4005-90B2-913E55E0B8BD}"
 	ProjectSection(SolutionItems) = preProject
 		Connectors\Revit\Directory.Build.targets = Connectors\Revit\Directory.Build.targets
@@ -73,8 +71,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Connectors", "Connectors",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{59E8E8F3-4E42-4E92-83B3-B1C2AB901D18}"
 	ProjectSection(SolutionItems) = preProject
-		.github\workflows\ci.yml = .github\workflows\ci.yml
-		.github\workflows\main.yml = .github\workflows\main.yml
+		.github\workflows\pr.yml = .github\workflows\pr.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Speckle.Connectors.Civil3d2024", "Connectors\Autocad\Speckle.Connectors.Civil3d2024\Speckle.Connectors.Civil3d2024.csproj", "{CA8EAE01-AB9F-4EC1-B6F3-73721487E9E1}"
@@ -279,6 +277,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Importers", "Importers", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Importers.Ifc.Tester", "Importers\Ifc\Speckle.Importers.Ifc.Tester\Speckle.Importers.Ifc.Tester.csproj", "{FCD6CB79-6B41-4448-99E1-787408AD24B0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Speckle.Common.MeshTriangulation", "Sdk\Speckle.Common.MeshTriangulation\Speckle.Common.MeshTriangulation.csproj", "{B740A025-1035-4A75-865B-7825857D610C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -682,6 +682,12 @@ Global
 		{FCD6CB79-6B41-4448-99E1-787408AD24B0}.Local|Any CPU.Build.0 = Debug|Any CPU
 		{FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCD6CB79-6B41-4448-99E1-787408AD24B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Local|Any CPU.ActiveCfg = Debug|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Local|Any CPU.Build.0 = Debug|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B740A025-1035-4A75-865B-7825857D610C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -692,7 +698,7 @@ Global
 		{DC570FFF-6FE5-47BD-8BC1-B471A6067786} = {FC224610-32D3-454E-9BC1-1219FE8ACD5F}
 		{E1C43415-3200-45F4-8BF9-A4DD7D7F2ED6} = {FC224610-32D3-454E-9BC1-1219FE8ACD5F}
 		{26391930-F86F-47E0-A5F6-B89919E38CE1} = {E9DEBA00-50A4-485D-BA65-D8AB3E3467AB}
-		{D81C0B87-F0C1-4297-A147-02F001FB7E1E} = {FD4D6594-D81E-456F-8F2E-35B09E04A755}
+		{D81C0B87-F0C1-4297-A147-02F001FB7E1E} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 		{7291B93C-615D-42DE-B8C1-3F9DF643E0FC} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 		{8AEF06C0-CA5C-4460-BC2D-ADE5F35D0434} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 		{9584AEE5-CD59-46E6-93E6-2DC2B5285B75} = {42826721-9A18-4762-8BA9-F1429DD5C5B1}
@@ -706,7 +712,7 @@ Global
 		{804E065F-914C-414A-AF84-009312C3CFF6} = {42826721-9A18-4762-8BA9-F1429DD5C5B1}
 		{9ADD1B7A-6401-4202-8613-F668E2FBC0A4} = {4721AA15-AF6E-4A62-A2C3-65564DC563E6}
 		{631C295A-7CCF-4B42-8686-7034E31469E7} = {2D5AE63D-85C0-43D1-84BF-04418ED93F63}
-		{7420652C-3046-4F38-BE64-9B9E69D76FA2} = {FD4D6594-D81E-456F-8F2E-35B09E04A755}
+		{7420652C-3046-4F38-BE64-9B9E69D76FA2} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 		{C50AA3E3-8C31-4131-9DEC-1D8B377D5A89} = {59E8E8F3-4E42-4E92-83B3-B1C2AB901D18}
 		{CA8EAE01-AB9F-4EC1-B6F3-73721487E9E1} = {2F45036E-D817-41E9-B82F-DBE013EC95D0}
 		{35175682-DA83-4C0A-A49D-B191F5885D8E} = {4721AA15-AF6E-4A62-A2C3-65564DC563E6}
@@ -733,7 +739,7 @@ Global
 		{7F1FDCF2-0CE8-4119-B3C1-F2CC6D7E1C36} = {0AF38BA3-65A0-481B-8CBB-B82E406E1575}
 		{19424B55-058C-4E9C-B86F-700AEF9EAEC3} = {0AF38BA3-65A0-481B-8CBB-B82E406E1575}
 		{0AF38BA3-65A0-481B-8CBB-B82E406E1575} = {D92751C8-1039-4005-90B2-913E55E0B8BD}
-		{EB83A3A3-F9B6-4281-8EBF-F7289FB5D885} = {FD4D6594-D81E-456F-8F2E-35B09E04A755}
+		{EB83A3A3-F9B6-4281-8EBF-F7289FB5D885} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 		{D8069A23-AD2E-4C9E-8574-7E8C45296A46} = {0AF38BA3-65A0-481B-8CBB-B82E406E1575}
 		{2D5AE63D-85C0-43D1-84BF-04418ED93F63} = {804E065F-914C-414A-AF84-009312C3CFF6}
 		{2F45036E-D817-41E9-B82F-DBE013EC95D0} = {804E065F-914C-414A-AF84-009312C3CFF6}
@@ -805,6 +811,7 @@ Global
 		{E6B7A640-F85C-41C9-8226-B5310A98822D} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF}
 		{F93052A6-6937-443F-8F1F-4A967A8A2BEF} = {336F0341-5C39-40F7-9377-122FED4E4549}
 		{FCD6CB79-6B41-4448-99E1-787408AD24B0} = {F93052A6-6937-443F-8F1F-4A967A8A2BEF}
+		{B740A025-1035-4A75-865B-7825857D610C} = {2E00592E-558D-492D-88F9-3ECEE4C0C7DA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EE253116-7070-4E9A-BCE8-2911C251B8C8}
@@ -826,6 +833,7 @@ Global
 		Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{25172c49-7aa4-4739-bb07-69785094c379}*SharedItemsImports = 5
 		Converters\Revit\Speckle.Converters.RevitShared\Speckle.Converters.RevitShared.projitems*{26391930-f86f-47e0-a5f6-b89919e38ce1}*SharedItemsImports = 5
 		Converters\Civil3d\Speckle.Converters.Civil3dShared\Speckle.Converters.Civil3dShared.projitems*{35175682-da83-4c0a-a49d-b191f5885d8e}*SharedItemsImports = 13
+		Converters\CSi\Speckle.Converters.ETABSShared\Speckle.Converters.ETABSShared.projitems*{36377858-d696-4567-ab05-637f4ec841f5}*SharedItemsImports = 13
 		Connectors\Tekla\Speckle.Connector.TeklaShared\Speckle.Connectors.TeklaShared.projitems*{3ab9028b-b2d2-464b-9ba3-39c192441e50}*SharedItemsImports = 13
 		Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{41bc679f-887f-44cf-971d-a5502ee87db0}*SharedItemsImports = 13
 		Connectors\Autocad\Speckle.Connectors.AutocadShared\Speckle.Connectors.AutocadShared.projitems*{4459f2b1-a340-488e-a856-eb2ae9c72ad4}*SharedItemsImports = 5